lolcat 2 лет назад
Родитель
Сommit
640d1d1953
3 измененных файлов с 9 добавлено и 5 удалено
  1. 1 0
      lib/backend.php
  2. 0 3
      lib/fuckhtml.php
  3. 8 2
      scraper/brave.php

+ 1 - 0
lib/backend.php

@@ -75,6 +75,7 @@ class backend{
 				break;
 				break;
 			
 			
 			case "socks5_hostname":
 			case "socks5_hostname":
+			case "socks5a":
 				curl_setopt($curlproc, CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5_HOSTNAME);
 				curl_setopt($curlproc, CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5_HOSTNAME);
 				curl_setopt($curlproc, CURLOPT_PROXY, $address . ":" . $port);
 				curl_setopt($curlproc, CURLOPT_PROXY, $address . ":" . $port);
 				break;
 				break;

+ 0 - 3
lib/fuckhtml.php

@@ -424,8 +424,6 @@ class fuckhtml{
 				$escape = false;
 				$escape = false;
 			}
 			}
 			
 			
-			$lastchar = $json[$i];
-			
 			if(
 			if(
 				$bracket === false &&
 				$bracket === false &&
 				$is_close_bracket === false
 				$is_close_bracket === false
@@ -436,7 +434,6 @@ class fuckhtml{
 					
 					
 					case "[":
 					case "[":
 					case "{":
 					case "{":
-						// dont execute whats in "default"
 						$json_out .= $json[$i];
 						$json_out .= $json[$i];
 						break;
 						break;
 					
 					

+ 8 - 2
scraper/brave.php

@@ -295,6 +295,7 @@ class brave{
 		$html = fread($handle, filesize("scraper/brave.html"));
 		$html = fread($handle, filesize("scraper/brave.html"));
 		fclose($handle);
 		fclose($handle);
 		*/
 		*/
+		
 		try{
 		try{
 			$html =
 			$html =
 				$this->get(
 				$this->get(
@@ -406,9 +407,9 @@ class brave{
 		
 		
 		if(!isset($grep[1])){
 		if(!isset($grep[1])){
 			
 			
-			throw new Exception("Could not get data JS");
+			throw new Exception("Could not grep JavaScript object");
 		}
 		}
-			
+		
 		$data =
 		$data =
 			$this->fuckhtml
 			$this->fuckhtml
 			->parseJsObject(
 			->parseJsObject(
@@ -416,6 +417,11 @@ class brave{
 			);
 			);
 		unset($grep);
 		unset($grep);
 		
 		
+		if($data === null){
+			
+			throw new Exception("Failed to decode JavaScript object");
+		}
+		
 		$data = $data[1]["data"]["body"]["response"];
 		$data = $data[1]["data"]["body"]["response"];
 		
 		
 		/*
 		/*