Merge pull request #1906 from Micdu70/patch-7

Update extsearch engine (TorrentLeech)

Author: Novik

plugins/extsearch/engines/TorrentLeech.php

@@ -2,33 +2,34 @@
 
 class TorrentLeechEngine extends commonEngine
 {
-	public $defaults = array( "public"=>false, "page_size"=>100, "auth"=>1 );
 
-	public $categories = array( 'all'=>'', 
-		'Movies'=>'/categories/8,9,11,37,43,14,12,13,47,15,29',
-		'TV'=>'/categories/26,32,27',
-		'Games'=>'/categories/17,42,18,19,40,20,21,39,22,28,30,48',
+	public $defaults = array( "public"=>false, "page_size"=>35, "auth"=>1 );
+
+	public $categories = array( 'all'=>'',
+		'Movies'=>'/categories/8,9,11,12,13,14,15,29,37,43,47',
+		'TV'=>'/categories/26,27,32',
+		'Games'=>'/categories/17,18,19,20,21,22,28,30,39,40,42,48',
 		'Apps'=>'/categories/23,24,25,33',
 		'Education'=>'/categories/38',
 		'Animation'=>'/categories/34,35',
 		'Books'=>'/categories/45,46',
 		'Music'=>'/categories/16,31',
-		'Foreign'=>'/categories/36,44',
+		'Foreign'=>'/categories/36,44'
 		);
 
 	protected static function getInnerCategory($cat)
 	{
 		$categories = array
 		(
-			'8'=>'Movies','9'=>'Movies','11'=>'Movies','37'=>'Movies','43'=>'Movies','12'=>'Movies','14'=>'Movies','13'=>'Movies','47'=>'Movies','15'=>'Movies','29'=>'Movies',
+			'8'=>'Movies','9'=>'Movies','11'=>'Movies','12'=>'Movies','13'=>'Movies','14'=>'Movies','15'=>'Movies','29'=>'Movies','37'=>'Movies','43'=>'Movies','47'=>'Movies',
 			'26'=>'TV','27'=>'TV','32'=>'TV',
-			'17'=>'Games','42'=>'Games','18'=>'Games','19'=>'Games','40'=>'Games','20'=>'Games','21'=>'Games','39'=>'Games','22'=>'Games','28'=>'Games','30'=>'Games','48'=>'Games',
-			'33'=>'Apps','23'=>'Apps','24'=>'Apps','25'=>'Apps',
+			'17'=>'Games','18'=>'Games','19'=>'Games','20'=>'Games','21'=>'Games','22'=>'Games','28'=>'Games','30'=>'Games','39'=>'Games','40'=>'Games','42'=>'Games','48'=>'Games',
+			'23'=>'Apps','24'=>'Apps','25'=>'Apps','33'=>'Apps',
 			'38'=>'Education',
 			'34'=>'Animation','35'=>'Animation',
 			'45'=>'Books','46'=>'Books',
 			'16'=>'Music','31'=>'Music',
-			'36'=>'Foreign','44'=>'Foreign' 
+			'36'=>'Foreign','44'=>'Foreign'
 		);
 		return(array_key_exists($cat,$categories) ? $categories[$cat] : '');
 	}
@@ -40,15 +41,15 @@ public function action($what,$cat,&$ret,$limit,$useGlobalCats)
 		if($useGlobalCats)
 		{
 			$categories = array
-			( 
-				'all'=>'', 
-				'movies'=>'/categories/8,9,11,37,43,14,12,13,47,15,29,36', 
-				'tv'=>'/categories/26,27,32,44', 
-				'music'=>'/categories/16,31', 
-				'games'=>'/categories/17,42,18,19,40,20,21,39,22,28,30,48', 
-				'anime'=>'/categories/34', 
-				'software'=>'/categories/23,24,25,33', 
-				'books'=>'/categories/45,46' 
+			(
+				'all'=>'',
+				'movies'=>'/categories/8,9,11,12,13,14,15,29,36,37,43,47',
+				'tv'=>'/categories/26,27,32,44',
+				'music'=>'/categories/16,31',
+				'games'=>'/categories/17,18,19,20,21,22,28,30,39,40,42,48',
+				'anime'=>'/categories/34',
+				'software'=>'/categories/23,24,25,33',
+				'books'=>'/categories/45,46'
 			);
 		}
 		else
@@ -62,7 +63,7 @@ public function action($what,$cat,&$ret,$limit,$useGlobalCats)
 		for( $pg = 1; $pg < 11; $pg++ )
 		{
 			$cli = $this->fetch( Snoopy::linkencode($url.'/torrents/browse/list/query/'.$what.'/orderby/seeders/order/desc/page/'.$pg).$cat, false );
-                        if( ($cli==false) || 
+                        if( ($cli==false) ||
                         	!( $data = json_decode($cli->results) ) ||
                         	!property_exists($data,'torrentList') )
 			{

plugins/loginmgr/accounts/TorrentLeech.php

@@ -6,7 +6,7 @@ class TorrentLeechAccount extends commonAccount
 
 	protected function isOK($client)
 	{
-		return(strpos($client->results, '>Password')===false);
+		return(strpos($client->results, '<input type="password"')===false);
 	}
 	protected function login($client,$login,$password,&$url,&$method,&$content_type,&$body,&$is_result_fetched)
 	{
@@ -15,7 +15,7 @@ protected function login($client,$login,$password,&$url,&$method,&$content_type,
 		{
                         $client->setcookies();
 			$client->referer = $this->url;
-        		if($client->fetch( $this->url."/user/account/login","POST","application/x-www-form-urlencoded", 
+        		if($client->fetch( $this->url."/user/account/login","POST","application/x-www-form-urlencoded",
 				"username=".rawurlencode($login)."&password=".rawurlencode($password).'&login=submit' ))
 			{
 				$client->setcookies();