Pārlūkot izejas kodu

request count is fucked, still need to fix graph pissing me the fuck off

lolcat 1 nedēļu atpakaļ
vecāks
revīzija
1a4b91435a
7 mainītis faili ar 22 papildinājumiem un 19 dzēšanām
  1. 3 3
      images.php
  2. 2 1
      lib/bot_protection.php
  3. 5 3
      lib/frontend.php
  4. 3 3
      music.php
  5. 3 3
      news.php
  6. 3 3
      videos.php
  7. 3 3
      web.php

+ 3 - 3
images.php

@@ -24,6 +24,9 @@ $payload = [
 	"nextpage" => ""
 ];
 
+// increment request count
+$frontend->increment_real_reqs($get["scraper"]);
+
 try{
 	$results = $scraper->image($get);
 	
@@ -32,9 +35,6 @@ try{
 	$frontend->drawscrapererror($error->getMessage(), $get, "images", $payload["timetaken"]);
 }
 
-// increment request count
-$frontend->increment_real_reqs($get["scraper"]);
-
 if(count($results["image"]) === 0){
 	
 	$payload["images"] =

+ 2 - 1
lib/bot_protection.php

@@ -249,7 +249,8 @@ class bot_protection{
 		$frontend->loadheader(
 			$get,
 			$filters,
-			$page
+			$page,
+			false
 		);
 		
 		echo $frontend->load("search.html", $payload);

+ 5 - 3
lib/frontend.php

@@ -118,7 +118,7 @@ class frontend{
 		return trim($html);
 	}
 	
-	public function loadheader(array $get, array $filters, string $page){
+	public function loadheader(array $get, array $filters, string $page, bool $increment_bot_counter = true){
 		
 		echo
 			$this->load("header.html", [
@@ -177,13 +177,15 @@ class frontend{
 		){
 			
 			// bot detected !!
-			apcu_inc(intdiv(time(), 3600) . ".bot_requests", 1, $s, 262800);
+			if($increment_bot_counter){
+				
+				apcu_inc(intdiv(time(), 3600) . ".bot_requests", 1, $s, 262800);
+			}
 			
 			$this->drawerror(
 				"Tshh, blocked!",
 				'Your browser, IP or IP range has been blocked from this 4get instance. If this is an error, please <a href="/about">contact the administrator</a>.'
 			);
-			die();
 		}
 	}
 	

+ 3 - 3
music.php

@@ -26,6 +26,9 @@ $payload = [
 	"left" => ""
 ];
 
+// increment request count
+$frontend->increment_real_reqs($get["scraper"]);
+
 try{
 	$results = $scraper->music($get);
 	
@@ -34,9 +37,6 @@ try{
 	$frontend->drawscrapererror($error->getMessage(), $get, "music", $payload["timetaken"]);
 }
 
-// increment request count
-$frontend->increment_real_reqs($get["scraper"]);
-
 $categories = [
 	"song" => "",
 	"author" => "",

+ 3 - 3
news.php

@@ -26,6 +26,9 @@ $payload = [
 	"left" => ""
 ];
 
+// increment request count
+$frontend->increment_real_reqs($get["scraper"]);
+
 try{
 	$results = $scraper->news($get);
 	
@@ -34,9 +37,6 @@ try{
 	$frontend->drawscrapererror($error->getMessage(), $get, "news", $payload["timetaken"]);
 }
 
-// increment request count
-$frontend->increment_real_reqs($get["scraper"]);
-
 /*
 	Populate links
 */

+ 3 - 3
videos.php

@@ -26,6 +26,9 @@ $payload = [
 	"left" => ""
 ];
 
+// increment request count
+$frontend->increment_real_reqs($get["scraper"]);
+
 try{
 	$results = $scraper->video($get);
 	
@@ -34,9 +37,6 @@ try{
 	$frontend->drawscrapererror($error->getMessage(), $get, "videos", $payload["timetaken"]);
 }
 
-// increment request count
-$frontend->increment_real_reqs($get["scraper"]);
-
 $categories = [
 	"video" => "",
 	"author" => "",

+ 3 - 3
web.php

@@ -26,6 +26,9 @@ $payload = [
 	"left" => ""
 ];
 
+// increment request count
+$frontend->increment_real_reqs($get["scraper"]);
+
 try{
 	$results = $scraper->web($get);
 	
@@ -34,9 +37,6 @@ try{
 	$frontend->drawscrapererror($error->getMessage(), $get, "web", $payload["timetaken"]);
 }
 
-// increment request count
-$frontend->increment_real_reqs($get["scraper"]);
-
 /*
 	Prepend Oracle output, if applicable
 */