diff --git a/www/pages/predb.php b/www/pages/predb.php index 21ac6b032..eedaa8ab6 100644 --- a/www/pages/predb.php +++ b/www/pages/predb.php @@ -10,9 +10,9 @@ $predb = new PreDb(); $offset = (isset($_REQUEST["offset"]) && ctype_digit($_REQUEST['offset'])) ? $_REQUEST["offset"] : 0; -if (isset($_REQUEST['prehashsearch'])) { - $lastSearch = $_REQUEST['prehashsearch']; - $parr = $predb->getAll($offset, ITEMS_PER_PAGE, $_REQUEST['prehashsearch']); +if (isset($_REQUEST['presearch'])) { + $lastSearch = $_REQUEST['presearch']; + $parr = $predb->getAll($offset, ITEMS_PER_PAGE, $_REQUEST['presearch']); } else { $lastSearch = ''; $parr = $predb->getAll($offset, ITEMS_PER_PAGE); @@ -21,7 +21,7 @@ if (isset($_REQUEST['prehashsearch'])) { $page->smarty->assign('pagertotalitems', $parr['count']); $page->smarty->assign('pageroffset', $offset); $page->smarty->assign('pageritemsperpage', ITEMS_PER_PAGE); -$page->smarty->assign('pagerquerybase', WWW_TOP . "/prehash/&offset="); +$page->smarty->assign('pagerquerybase', WWW_TOP . "/predb/&offset="); $page->smarty->assign('pagerquerysuffix', "#results"); $page->smarty->assign('lastSearch', $lastSearch); @@ -30,10 +30,10 @@ $page->smarty->assign('pager', $pager); $page->smarty->assign('results', $parr['arr']); -$page->title = "Browse Prehash"; -$page->meta_title = "View Prehash info"; -$page->meta_keywords = "view,prehash,info,description,details"; -$page->meta_description = "View Prehash info"; +$page->title = "Browse PreDb"; +$page->meta_title = "View PreDb info"; +$page->meta_keywords = "view,predb,info,description,details"; +$page->meta_description = "View PreDb info"; -$page->content = $page->smarty->fetch('prehash.tpl'); +$page->content = $page->smarty->fetch('predb.tpl'); $page->render(); diff --git a/www/pages/preinfo.php b/www/pages/preinfo.php index 887cb77e8..c39543f18 100644 --- a/www/pages/preinfo.php +++ b/www/pages/preinfo.php @@ -153,7 +153,7 @@ if (isset($_GET['type'])) { $preData = $db->query( sprintf(' SELECT p.* - FROM prehash p + FROM predb p INNER JOIN groups g ON g.id = p.groupid WHERE requestid = %d AND g.name = %s @@ -177,7 +177,7 @@ if (isset($_GET['type'])) { if (isset($_GET['title'])) { $db = new newznab\db\Settings(); $preData = $db->query( - sprintf('SELECT * FROM prehash p WHERE p.title %s %s %s LIKE %s LIMIT %d OFFSET %d', + sprintf('SELECT * FROM predb p WHERE p.title %s %s %s LIKE %s LIMIT %d OFFSET %d', $newer, $older, $nuked, @@ -195,7 +195,7 @@ if (isset($_GET['type'])) { if (isset($_GET['md5']) && strlen($_GET['title']) === 32) { $db = new newznab\db\Settings(); $preData = $db->query( - sprintf('SELECT * FROM prehash p INNER JOIN predbhash ph ON ph.pre_id = p.id WHERE MATCH(hashes) AGAINST (%s) %s %s %s LIMIT %d OFFSET %d', + sprintf('SELECT * FROM predb p INNER JOIN predbhash ph ON ph.pre_id = p.id WHERE MATCH(hashes) AGAINST (%s) %s %s %s LIMIT %d OFFSET %d', $db->escapeString($_GET['md5']), $newer, $older, @@ -212,7 +212,7 @@ if (isset($_GET['type'])) { if (isset($_GET['sha1']) && strlen($_GET['sha1']) === 40) { $db = new newznab\db\Settings(); $preData = $db->query( - sprintf('SELECT * FROM prehash p INNER JOIN predbhash ph ON ph.pre_id = p.id WHERE MATCH(hashes) AGAINST (%s) %s %s %s LIMIT %d OFFSET %d', + sprintf('SELECT * FROM predb p INNER JOIN predbhash ph ON ph.pre_id = p.id WHERE MATCH(hashes) AGAINST (%s) %s %s %s LIMIT %d OFFSET %d', $db->escapeString($_GET['sha1']), $newer, $older, @@ -228,7 +228,7 @@ if (isset($_GET['type'])) { case 'all': $db = new newznab\db\Settings(); $preData = $db->query( - sprintf('SELECT * FROM prehash p WHERE 1=1 %s %s %s ORDER BY p.predate DESC LIMIT %d OFFSET %d', + sprintf('SELECT * FROM predb p WHERE 1=1 %s %s %s ORDER BY p.predate DESC LIMIT %d OFFSET %d', $newer, $older, $nuked, @@ -291,4 +291,4 @@ function sanitize($string) { //return $string; return preg_replace('/[^\x{0009}\x{000a}\x{000d}\x{0020}-\x{D7FF}\x{E000}-\x{FFFD}]+/u', '.', $string); -} \ No newline at end of file +} diff --git a/www/pages/upcoming.php b/www/pages/upcoming.php index a0dd2d4d3..79fd9071d 100644 --- a/www/pages/upcoming.php +++ b/www/pages/upcoming.php @@ -1,12 +1,14 @@ users->isLoggedIn()) { $page->show403(); } -$m = new Movie(); +$pdo = new Settings(); +$tmdb = new TmdbAPI($pdo->getSetting('tmdbkey')); if (!isset($_GET["id"])) { $_GET["id"] = 1; @@ -17,8 +19,8 @@ $cpurl = $user['cp_url']; $page->smarty->assign('cpapi', $cpapi); $page->smarty->assign('cpurl', $cpurl); -$data = $m->getUpcoming($_GET["id"]); -//print_r(json_decode($data["info"])->movies);die(); +$data = $tmdb->upcomingMovies(); + if (!$data || $data["info"] == "") { $page->smarty->assign("nodata", "No upcoming data."); } else { diff --git a/www/themes/Charisma/templates/basepage.tpl b/www/themes/Charisma/templates/basepage.tpl index fe8d91f29..bb1f12e39 100755 --- a/www/themes/Charisma/templates/basepage.tpl +++ b/www/themes/Charisma/templates/basepage.tpl @@ -137,7 +137,7 @@
  • Adult
  • Books
  • Browse All Releases -
  • PreDb
    • diff --git a/www/themes/Charisma/templates/predb.tpl b/www/themes/Charisma/templates/predb.tpl index 14948a062..0fecb5b01 100755 --- a/www/themes/Charisma/templates/predb.tpl +++ b/www/themes/Charisma/templates/predb.tpl @@ -2,10 +2,10 @@ {$site->adbrowse} {/if}

    {$page->title}

    -