From e3be427b4178f4ae2da2c63e67aca77977a641db Mon Sep 17 00:00:00 2001 From: DariusIII Date: Thu, 15 Oct 2015 14:17:46 +0200 Subject: [PATCH] Fix more errors. --- Changelog | 1 + newznab/controllers/Games.php | 10 +++++----- newznab/controllers/NNTP.php | 2 +- newznab/libraries/Forking.php | 4 ++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Changelog b/Changelog index aec258bba..70aba55c9 100755 --- a/Changelog +++ b/Changelog @@ -5,6 +5,7 @@ Fix: Change instantiation of classes Fix: Define missing NN_TMUX folder. Fix: More errors. + Fix: even more errors. 2015-10-15 DariusIII Bug: remove tvrage patch 2015-10-15 DariusIII diff --git a/newznab/controllers/Games.php b/newznab/controllers/Games.php index c062311ef..f72311334 100644 --- a/newznab/controllers/Games.php +++ b/newznab/controllers/Games.php @@ -391,7 +391,7 @@ class Games // Process Steam first before giantbomb // Steam has more details $this->_gameResults = []; - $this->_getGame = new \Steam(); + $this->_getGame = new Steam(); $this->_classUsed = "steam"; $this->_getGame->cookie = $this->cookie; $this->_getGame->searchTerm = $gameInfo['title']; @@ -399,7 +399,7 @@ class Games $this->_gameResults = $this->_getGame->getAll(); } if (count($this->_gameResults) < 1) { - $this->_getGame = new \Desura(); + $this->_getGame = new Desura(); $this->_classUsed = "desura"; $this->_getGame->cookie = $this->cookie; $this->_getGame->searchTerm = $gameInfo['title']; @@ -408,7 +408,7 @@ class Games } } if (count($this->_gameResults) < 1) { - $this->_getGame = new \Greenlight(); + $this->_getGame = new Greenlight(); $this->_classUsed = "gl"; $this->_getGame->cookie = $this->cookie; $this->_getGame->searchTerm = $gameInfo['title']; @@ -771,7 +771,7 @@ class Games return false; } } - } catch (Exception $e) { + } catch (\Exception $e) { $result = false; } @@ -794,7 +794,7 @@ class Games ]; $result = json_decode(json_encode($obj->game($this->_gameID, $fields)), true); $result = $result['results']; - } catch (Exception $e) { + } catch (\Exception $e) { $result = false; } diff --git a/newznab/controllers/NNTP.php b/newznab/controllers/NNTP.php index ec1afc860..ce35c3f91 100644 --- a/newznab/controllers/NNTP.php +++ b/newznab/controllers/NNTP.php @@ -14,7 +14,7 @@ use newznab\utility\Utility; * decoding yEnc articles, decompressing article headers. * Extends PEAR's Net_NNTP_Client class, overrides some functions. */ -class NNTP extends Net_NNTP_Client +class NNTP extends \Net_NNTP_Client { public $pdo; diff --git a/newznab/libraries/Forking.php b/newznab/libraries/Forking.php index 962a080dc..84e28dedb 100644 --- a/newznab/libraries/Forking.php +++ b/newznab/libraries/Forking.php @@ -4,6 +4,10 @@ namespace newznab\libraries; use \newznab\db\Settings; use \newznab\processing\PostProcess; use newznab\controllers\ColorCLI; +use newznab\controllers\NZB; +use newznab\controllers\RequestID; +use newznab\controllers\NNTP; +use newznab\controllers\Nfo; require_once(NN_LIBS . 'forkdaemon-php' . DS . 'fork_daemon.php');