From dc262e923b8c899768d8d8a7e3840301e23a0a5f Mon Sep 17 00:00:00 2001 From: DariusIII Date: Thu, 27 Jul 2017 13:58:24 +0200 Subject: [PATCH] Rearrange release related admin code --- www/admin/release-edit.php | 47 +++-- www/admin/release-list.php | 8 +- www/admin/show-edit.php | 14 +- .../shared/templates/admin/release-edit.tpl | 199 +++++++++--------- .../shared/templates/admin/release-list.tpl | 69 +++--- 5 files changed, 171 insertions(+), 166 deletions(-) diff --git a/www/admin/release-edit.php b/www/admin/release-edit.php index 67cbf1eaa..a01d6585c 100644 --- a/www/admin/release-edit.php +++ b/www/admin/release-edit.php @@ -5,44 +5,47 @@ require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . 'smarty.php'; use nntmux\Category; use nntmux\Releases; -$page = new AdminPage(true); +$page = new AdminPage(); $releases = new Releases(['Settings' => $page->settings]); $category = new Category(['Settings' => $page->settings]); $id = 0; // Set the current action. -$action = (isset($_REQUEST['action']) ? $_REQUEST['action'] : 'view'); -$from = (isset($_POST['from']) ? $_POST['from'] : WWW_TOP . "/release-list.php"); +$action = ($_REQUEST['action'] ?? 'view'); switch ($action) { case 'submit': - $releases->update($_POST["id"], - $_POST["name"], - $_POST["searchname"], - $_POST["fromname"], - $_POST["category"], - $_POST["totalpart"], - $_POST["grabs"], - $_POST["size"], - $_POST["postdate"], - $_POST["adddate"], - $_POST["videos_id"], - $_POST["tv_episodes_id"], - $_POST["imdbid"], - $_POST["anidbid"]); - header("Location:" . $from); + $releases->update($_POST['id'], + $_POST['name'], + $_POST['searchname'], + $_POST['fromname'], + $_POST['category'], + $_POST['totalpart'], + $_POST['grabs'], + $_POST['size'], + $_POST['postdate'], + $_POST['adddate'], + $_POST['videos_id'], + $_POST['tv_episodes_id'], + $_POST['imdbid'], + $_POST['anidbid']); + + if (isset($_POST['from']) && !empty($_POST['from'])) { + header('Location:' . $_POST['from']); + exit; + } + header('Location:' . WWW_TOP . '/release-list.php'); break; case 'view': default: - $page->title = "Release Edit"; - $id = $_GET["id"]; - $release = $releases->getByID($id); + $page->title = 'Release Edit'; + $id = $_GET['id']; + $release = $releases->getById($id); $page->smarty->assign('release', $release); break; } -$page->smarty->assign('from', $from); $page->smarty->assign('yesno_ids', [1, 0]); $page->smarty->assign('yesno_names', ['Yes', 'No']); $page->smarty->assign('catlist', $category->getForSelect(false)); diff --git a/www/admin/release-list.php b/www/admin/release-list.php index c73971799..653bba058 100644 --- a/www/admin/release-list.php +++ b/www/admin/release-list.php @@ -8,16 +8,16 @@ $page = new AdminPage(); $releases = new Releases(); -$page->title = "Release List"; +$page->title = 'Release List'; $releasecount = $releases->getCount(); -$offset = isset($_REQUEST["offset"]) ? $_REQUEST["offset"] : 0; +$offset = $_REQUEST['offset'] ?? 0; $page->smarty->assign('pagertotalitems',$releasecount); $page->smarty->assign('pageroffset',$offset); $page->smarty->assign('pageritemsperpage',ITEMS_PER_PAGE); -$page->smarty->assign('pagerquerybase', WWW_TOP."/release-list.php?offset="); -$pager = $page->smarty->fetch("pager.tpl"); +$page->smarty->assign('pagerquerybase', WWW_TOP. '/release-list.php?offset='); +$pager = $page->smarty->fetch('pager.tpl'); $page->smarty->assign('pager', $pager); $releaselist = $releases->getRange($offset, ITEMS_PER_PAGE); diff --git a/www/admin/show-edit.php b/www/admin/show-edit.php index 58b26d4ad..614a7a6c6 100755 --- a/www/admin/show-edit.php +++ b/www/admin/show-edit.php @@ -9,30 +9,30 @@ $page = new AdminPage(); $tv = new smartyTV(['Settings' => $page->settings]); $video = new Videos(['Settings' => $page->settings]); -switch ((isset($_REQUEST['action']) ? $_REQUEST['action'] : 'view')) { +switch ($_REQUEST['action'] ?? 'view') { case 'submit': //TODO: Use a function that allows overwrites //$tv->update($_POST["id"], $_POST["title"],$_POST["summary"], $_POST['countries_id']); if (isset($_POST['from']) && !empty($_POST['from'])) { - header("Location:" . $_POST['from']); + header('Location:' . $_POST['from']); exit; } - header("Location:" . WWW_TOP . "/show-list.php"); + header('Location:' . WWW_TOP . '/show-list.php'); break; case 'view': default: - if (isset($_GET["id"])) { - $page->title = "TV Show Edit"; - $show = $video->getByVideoID($_GET["id"]); + if (isset($_GET['id'])) { + $page->title = 'TV Show Edit'; + $show = $video->getByVideoID($_GET['id']); } break; } $page->smarty->assign('show', $show); -$page->title = "Edit TV Show Data"; +$page->title = 'Edit TV Show Data'; $page->content = $page->smarty->fetch('show-edit.tpl'); $page->render(); diff --git a/www/themes/shared/templates/admin/release-edit.tpl b/www/themes/shared/templates/admin/release-edit.tpl index 3034f2ee7..b1dc48d00 100644 --- a/www/themes/shared/templates/admin/release-edit.tpl +++ b/www/themes/shared/templates/admin/release-edit.tpl @@ -1,100 +1,101 @@
-

{$page->title}

- Go back -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- {html_options id="category" name=category options=$catlist selected=$release.categories_id} -
- -
- -
- -
- -
- -
- -
Group: - {$release.group_name} -
- -
- -
- -
- -
-
-
+

{$page->title}

+ Go back +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+ +
+ +
+ {html_options id="category" name=category options=$catlist selected=$release.categories_id} +
+ +
+ +
+ +
+ +
+ +
+ +
Group: + {$release.group_name} +
+ +
+ +
+ +
+ +
+
+ diff --git a/www/themes/shared/templates/admin/release-list.tpl b/www/themes/shared/templates/admin/release-list.tpl index f1565c596..96dfe1763 100644 --- a/www/themes/shared/templates/admin/release-list.tpl +++ b/www/themes/shared/templates/admin/release-list.tpl @@ -1,39 +1,40 @@
-

{$page->title}

+

{$page->title}

-{if $releaselist} -{$pager} + {if $releaselist} + {$pager} + -
+ + + + + + + + + + - - - - - - - - - - + {foreach from=$releaselist item=release} + + + + + + + + + + + {/foreach} - {foreach from=$releaselist item=release} - - - - - - - - - - - {/foreach} - -
namecategorysizefilespostdateadddategrabsoptions
namecategorysizefilespostdateadddategrabsoptions
{$release.searchname|escape:"htmlall"|wordwrap:75:"\n":true} + {$release.category_name}{$release.size|fsize_format:"MB"}{$release.totalpart}{$release.postdate|date_format}{$release.adddate|date_format}{$release.grabs}delete
{$release.searchname|escape:"htmlall"|wordwrap:75:"\n":true}{$release.category_name}{$release.size|fsize_format:"MB"}{$release.totalpart}{$release.postdate|date_format}{$release.adddate|date_format}{$release.grabs}delete
-
- {$pager} -{else} -

No releases available.

-{/if} -
+ +
+ {$pager} + {else} +

No releases available.

+ {/if} +