starred/newznab-tmux
1
0
Fork 0
mirror of https://github.com/NNTmux/newznab-tmux.git synced 2026-09-03 11:49:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix numerous category browsing issues

Browse Source
This commit is contained in:
DariusIII
2018-04-20 14:58:58 +02:00
parent a5e4af54f8
commit 55d3312831
25 changed files with 91 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/BooksController.php
+15 -3
View File
@@ -13,7 +13,7 @@ class BooksController extends BasePageController
*
* @throws \Exception
*/
public function index(Request $request)
public function index(Request $request, $id = '')
{
$this->setPrefs();
$book = new Books(['Settings' => $this->settings]);
@@ -22,15 +22,27 @@ class BooksController extends BasePageController
$btmp = [];
foreach ($boocats as $bcat) {
$btmp[$bcat['id']] = $bcat;
$btmp[] =
[
'id' => $bcat->id,
'title' => $bcat->title,
];
}
$category = Category::BOOKS_ROOT;
if ($id && \in_array($id, array_pluck($btmp, 'title'), false)) {
$cat = Category::query()
->where('title', $id)
->where('parentid', '=', Category::BOOKS_ROOT)
->first(['id']);
$category = $cat !== null ? $cat['id'] : Category::BOOKS_ROOT;
}
$catarray = [];
$catarray[] = $category;
$this->smarty->assign('catlist', $btmp);
$this->smarty->assign('category', $category);
$this->smarty->assign('categorytitle', $id);
$ordering = $book->getBookOrdering();
$orderby = $request->has('ob') && \in_array($request->input('ob'), $ordering, false) ? $request->input('ob') : '';
@@ -64,7 +76,7 @@ class BooksController extends BasePageController
} else {
$cdata = Category::find($category);
if ($cdata !== null) {
$this->smarty->assign('catname', $cdata->parent !== null ? $cdata->parent->title.' > '.$cdata->title : $cdata->title);
$this->smarty->assign('catname', $cdata->parentid !== null ? $cdata->parent->title.' > '.$cdata->title : $cdata->title);
} else {
$this->show404();
}