diff --git a/newznab/controllers/BasePage.php b/newznab/controllers/BasePage.php index 43c5e94cd..db52445c7 100644 --- a/newznab/controllers/BasePage.php +++ b/newznab/controllers/BasePage.php @@ -133,8 +133,12 @@ class BasePage $this->smarty->assign('userdata',$this->userdata); $this->smarty->assign('loggedin',"true"); - if (!empty($this->userdata['nzbvortex_api_key']) && (!empty($this->userdata['nzbvortex_server_url']))) + if ($this->userdata['nzbvortex_api_key'] != '' && $this->userdata['nzbvortex_server_url'] != '') { $this->smarty->assign('weHasVortex', true); + } + else{ + $this->smarty->assign('weHasVortex', false); + } $sab = new SABnzbd($this); $this->smarty->assign('sabintegrated', $sab->integratedBool); diff --git a/newznab/controllers/PreDB.php b/newznab/controllers/PreDB.php index 19d146a00..a69fd4372 100644 --- a/newznab/controllers/PreDB.php +++ b/newznab/controllers/PreDB.php @@ -57,9 +57,7 @@ class PreDB { // Only use Sphinx if this is a search request if ($dirname) { - $s = new Sites(); - $site = $s->get(); - if ($site->sphinxenabled && $site->sphinxindexpredb) { + if ($this->pdo->getSetting('sphinxenabled') && $this->pdo->getSetting('sphinxindexpredb')) { // Search using Sphinx $sphinx = new Sphinx(); $count = $sphinx->getPreCount($dirname, $category); @@ -84,9 +82,7 @@ class PreDB { // Only use Sphinx if this is a search request if ($dirname) { - $s = new Sites(); - $site = $s->get(); - if ($site->sphinxenabled && $site->sphinxindexpredb) { + if ($this->pdo->getSetting('sphinxenabled') && $this->pdo->getSetting('sphinxindexpredb')) { // Search using Sphinx $sphinx = new Sphinx(); $results = $sphinx->getPreRange($start, $num, $dirname, $category); @@ -209,11 +205,7 @@ class PreDB */ public function nzpreUpdate() { - - $s = new Sites(); - $site = $s->get(); - - if(empty($site->nzpregroup) || empty($site->nzpresubject) || empty($site->nzpreposter) || empty($site->nzprefield) || empty($site->nzprekey)) + if(empty($this->pdo->getSetting('nzpregroup')) || empty($this->pdo->getSetting('nzpresubject')) || empty($this->pdo->getSetting('nzpreposter')) || empty($this->pdo->getSetting('nzprefield')) || empty($this->pdo->getSetting('nzprekey'))) return false; if($this->echooutput) @@ -226,37 +218,37 @@ class PreDB return false; } - $ret = $groupData = $nntp->selectGroup($site->nzpregroup); + $ret = $groupData = $nntp->selectGroup($this->pdo->getSetting('nzpregroup')); if($nntp->isError($ret)) { echo "Predb : Error ".$ret->getMessage()."\n"; return false; } - $ret = $groupMsgs = $nntp->getOverview(($groupData['last']-(!empty($site->nzprearticles) ? $site->nzprearticles : 500)).'-'.$groupData['last']); + $ret = $groupMsgs = $nntp->getOverview(($groupData['last']-(!empty($this->pdo->getSetting('nzprearticles')) ? $this->pdo->getSetting('nzprearticles') : 500)).'-'.$groupData['last']); if($nntp->isError($ret)) { echo "Predb : Error ".$ret->getMessage()."\n"; return false; } $added_updated = 0; - $nzprekey = $site->nzprekey; + $nzprekey = $this->pdo->getSetting('nzprekey'); while(strlen($nzprekey) < 1024) $nzprekey = $nzprekey.$nzprekey; - $cnt = !empty($site->nzprearticles) ? $site->nzprearticles : 500; + $cnt = !empty($this->pdo->getSetting('nzprearticles')) ? $this->pdo->getSetting('nzprearticles') : 500; foreach($groupMsgs as $groupMsg) { if ($cnt%50==0 && $cnt != 0 && $this->echooutput) echo $cnt.".."; $cnt--; - if(preg_match('/^'.$site->nzpresubject.'$/', $groupMsg['Subject']) && preg_match('/^'.$site->nzpreposter.'$/', $groupMsg['From'])) { + if(preg_match('/^'.$this->pdo->getSetting('nzpresubject').'$/', $groupMsg['Subject']) && preg_match('/^'.$this->pdo->getSetting('nzpreposter').'$/', $groupMsg['From'])) { $ret = $msgHeader = $nntp->getHeader($groupMsg['Message-ID']); if($nntp->isError($ret)) continue; for($i=0; $i < count($msgHeader); $i++) { - if(preg_match('/^'.$site->nzprefield.': /', $msgHeader[$i])) { - if($nzpreParse = $this->nzpreParse(str_replace($site->nzprefield.': ', '', $msgHeader[$i]), $nzprekey)) + if(preg_match('/^'.$this->pdo->getSetting('nzprefield').': /', $msgHeader[$i])) { + if($nzpreParse = $this->nzpreParse(str_replace($this->pdo->getSetting('nzprefield').': ', '', $msgHeader[$i]), $nzprekey)) { if ($this->updatePreDB($this->pdo, $nzpreParse)) { diff --git a/newznab/controllers/Sphinx.php b/newznab/controllers/Sphinx.php index c9eef7562..9ef63f681 100644 --- a/newznab/controllers/Sphinx.php +++ b/newznab/controllers/Sphinx.php @@ -924,7 +924,7 @@ class Sphinx . "CONCAT(cp.title, ' > ', c.title) AS category_name, " . "CONCAT(cp.id, ',', c.id) AS category_ids, " . "groups.name as group_name, rn.id AS nfoid, " - . "re.releaseid as reID, cp.id AS categoryParentID, " + . "re.releaseid as reid, cp.id AS categoryParentID, " . "pre.ctime, pre.nuketype, " . "COALESCE(movieinfo.id, 0) AS movieinfoid " . "FROM releases " @@ -1005,7 +1005,7 @@ class Sphinx . "CONCAT(cp.title, ' > ', c.title) AS category_name, " . "CONCAT(cp.id, ',', c.id) AS category_ids, " . "groups.name AS group_name, rn.id AS nfoid, " - . "re.releaseid AS reID " + . "re.releaseid AS reid " . "FROM releases " . "LEFT OUTER JOIN category c " . "ON c.id = releases.categoryid " diff --git a/www/pages/browse.php b/www/pages/browse.php index 27356f65d..f53045574 100644 --- a/www/pages/browse.php +++ b/www/pages/browse.php @@ -14,7 +14,7 @@ if (isset($_REQUEST["g"])) { $grp = $_REQUEST["g"]; } -$catarray = array(); +$catarray = []; $catarray[] = $category; $page->smarty->assign('category', $category); @@ -24,7 +24,7 @@ $offset = (isset($_REQUEST["offset"]) && ctype_digit($_REQUEST['offset'])) ? $_R $ordering = $releases->getBrowseOrdering(); $orderby = isset($_REQUEST["ob"]) && in_array($_REQUEST['ob'], $ordering) ? $_REQUEST["ob"] : ''; -$results = array(); +$results = []; $results = $releases->getBrowseRange($catarray, $offset, ITEMS_PER_PAGE, $orderby, -1, $page->userdata["categoryexclusions"], $grp); $page->smarty->assign('pagertotalitems',$browsecount); diff --git a/www/pages/login.php b/www/pages/login.php index 496fdfb49..058dc045e 100644 --- a/www/pages/login.php +++ b/www/pages/login.php @@ -1,5 +1,7 @@ smarty->assign(['error' => '', 'username' => '', 'rememberme' => '']); + if ($page->isPostBack()) { if (!isset($_POST["username"]) || !isset($_POST["password"])){ diff --git a/www/pages/myshows.php b/www/pages/myshows.php index 1f31004c5..fd92875a5 100644 --- a/www/pages/myshows.php +++ b/www/pages/myshows.php @@ -35,14 +35,14 @@ switch($action) { else { $db = new Settings(); - $show = $db->queryOneRow(sprintf("select releasetitle from tvrage where rageID = %d", $rid)); + $show = $db->queryOneRow(sprintf("select releasetitle from tvrage where rageid = %d", $rid)); if (!$show) $page->show404('Seriously?'); } if ($action == 'doadd') { - $category = (isset($_REQUEST['category']) && is_array($_REQUEST['category']) && !empty($_REQUEST['category'])) ? $_REQUEST['category'] : array(); + $category = (isset($_REQUEST['category']) && is_array($_REQUEST['category']) && !empty($_REQUEST['category'])) ? $_REQUEST['category'] :[]; $us->addShow($users->currentUserId(), $rid, $category); if (isset($_REQUEST['from'])) header("Location:".$_REQUEST['from']); @@ -53,14 +53,14 @@ switch($action) { { $cat = new Category; $tmpcats = $cat->getChildren(Category::CAT_PARENT_TV, true, $page->userdata["categoryexclusions"]); - $categories = array(); + $categories =[]; foreach($tmpcats as $c) - $categories[$c['ID']] = $c['title']; + $categories[$c['id']] = $c['title']; $page->smarty->assign('type', 'add'); $page->smarty->assign('cat_ids', array_keys($categories)); $page->smarty->assign('cat_names', $categories); - $page->smarty->assign('cat_selected', array()); + $page->smarty->assign('cat_selected',[]); $page->smarty->assign('rid', $rid); $page->smarty->assign('show', $show); if (isset($_REQUEST['from'])) @@ -78,7 +78,7 @@ switch($action) { if ($action == 'doedit') { - $category = (isset($_REQUEST['category']) && is_array($_REQUEST['category']) && !empty($_REQUEST['category'])) ? $_REQUEST['category'] : array(); + $category = (isset($_REQUEST['category']) && is_array($_REQUEST['category']) && !empty($_REQUEST['category'])) ? $_REQUEST['category'] :[]; $us->updateShow($users->currentUserId(), $rid, $category); if (isset($_REQUEST['from'])) header("Location:".WWW_TOP.$_REQUEST['from']); @@ -90,14 +90,14 @@ switch($action) { $cat = new Category; $tmpcats = $cat->getChildren(Category::CAT_PARENT_TV, true, $page->userdata["categoryexclusions"]); - $categories = array(); + $categories =[]; foreach($tmpcats as $c) - $categories[$c['ID']] = $c['title']; + $categories[$c['id']] = $c['title']; $page->smarty->assign('type', 'edit'); $page->smarty->assign('cat_ids', array_keys($categories)); $page->smarty->assign('cat_names', $categories); - $page->smarty->assign('cat_selected', explode('|', $show['categoryID'])); + $page->smarty->assign('cat_selected', explode('|', $show['categoryid'])); $page->smarty->assign('rid', $rid); $page->smarty->assign('show', $show); if (isset($_REQUEST['from'])) @@ -122,7 +122,7 @@ switch($action) { $ordering = $releases->getBrowseOrdering(); $orderby = isset($_REQUEST["ob"]) && in_array($_REQUEST['ob'], $ordering) ? $_REQUEST["ob"] : ''; - $results = array(); + $results =[]; $results = $releases->getShowsRange($shows, $offset, ITEMS_PER_PAGE, $orderby, -1, $page->userdata["categoryexclusions"]); $page->smarty->assign('pagertotalitems',$browsecount); @@ -134,8 +134,9 @@ switch($action) { $pager = $page->smarty->fetch("pager.tpl"); $page->smarty->assign('pager', $pager); - foreach($ordering as $ordertype) - $page->smarty->assign('orderby'.$ordertype, WWW_TOP."/myshows/browse?ob=".$ordertype."&offset=0"); + foreach($ordering as $ordertype) { + $page->smarty->assign('orderby' . $ordertype, WWW_TOP . "/myshows/browse?ob=" . $ordertype . "&offset=0"); + } $page->smarty->assign('lastvisit',$page->userdata['lastlogin']); @@ -155,18 +156,18 @@ switch($action) { $cat = new Category; $tmpcats = $cat->getChildren(Category::CAT_PARENT_TV, true, $page->userdata["categoryexclusions"]); - $categories = array(); + $categories =[]; foreach($tmpcats as $c) - $categories[$c['ID']] = $c['title']; + $categories[$c['id']] = $c['title']; $shows = $us->getShows($users->currentUserId()); - $results = array(); + $results =[]; foreach ($shows as $showk=>$show) { - $showcats = explode('|', $show['categoryID']); + $showcats = explode('|', $show['categoryid']); if (is_array($showcats) && sizeof($showcats) > 0) { - $catarr = array(); + $catarr =[]; foreach ($showcats as $scat) { if (!empty($scat)) diff --git a/www/templates/nntmux/views/frontend/articlesmenu.tpl b/www/templates/nntmux/views/frontend/articlesmenu.tpl index 6cbb528b6..da1ef048d 100644 --- a/www/templates/nntmux/views/frontend/articlesmenu.tpl +++ b/www/templates/nntmux/views/frontend/articlesmenu.tpl @@ -1,5 +1,5 @@ {if $articlecontentlist|@count > 0} -
  • +

  • Articles