diff --git a/Changelog b/Changelog index 5176e9f53..0dc2aeaef 100755 --- a/Changelog +++ b/Changelog @@ -1,3 +1,5 @@ +2018-11-22 DariusIII + * Chg: Change pointless 404 page usage where not needed, replace with redirects 2018-11-21 DariusIII * Fix: Fix bad movie caching * Chg: Update config/permission.php diff --git a/app/Http/Controllers/AdultController.php b/app/Http/Controllers/AdultController.php index 166a94c52..6caad6cef 100644 --- a/app/Http/Controllers/AdultController.php +++ b/app/Http/Controllers/AdultController.php @@ -82,7 +82,7 @@ class AdultController extends BasePageController if ($cdata !== null) { $this->smarty->assign('catname', $cdata); } else { - $this->show404(); + $this->smarty->assign('catname', 'All'); } } diff --git a/app/Http/Controllers/AnimeController.php b/app/Http/Controllers/AnimeController.php index fe2972317..75fae744d 100644 --- a/app/Http/Controllers/AnimeController.php +++ b/app/Http/Controllers/AnimeController.php @@ -51,7 +51,7 @@ class AnimeController extends BasePageController $meta_description = 'View '.$aniDbInfo->title.' Anime'; if (! $this->releases && ! $aniDbInfo) { - $this->show404(); + $this->smarty->assign('nodata', 'No releases and AniDB info for this series.'); } elseif (! $aniDbInfo) { $this->smarty->assign('nodata', 'No AniDB information for this series.'); } elseif (! $aniDbReleases) { diff --git a/app/Http/Controllers/BooksController.php b/app/Http/Controllers/BooksController.php index 9c27a7359..1217860d7 100644 --- a/app/Http/Controllers/BooksController.php +++ b/app/Http/Controllers/BooksController.php @@ -81,7 +81,7 @@ class BooksController extends BasePageController if ($cdata !== null) { $this->smarty->assign('catname', $cdata); } else { - $this->show404(); + $this->smarty->assign('catname', 'All'); } } diff --git a/app/Http/Controllers/ConsoleController.php b/app/Http/Controllers/ConsoleController.php index f569bb00b..19d25c8e7 100644 --- a/app/Http/Controllers/ConsoleController.php +++ b/app/Http/Controllers/ConsoleController.php @@ -93,7 +93,7 @@ class ConsoleController extends BasePageController if ($cdata !== null) { $this->smarty->assign('catname', $cdata); } else { - return response()->json(['message' => 'There are no categories set.'], 404); + $this->smarty->assign('catname', 'All'); } } diff --git a/app/Http/Controllers/GamesController.php b/app/Http/Controllers/GamesController.php index cdaf56afe..3066f2c3a 100644 --- a/app/Http/Controllers/GamesController.php +++ b/app/Http/Controllers/GamesController.php @@ -69,7 +69,7 @@ class GamesController extends BasePageController if ($cdata !== null) { $this->smarty->assign('catname', $cdata); } else { - $this->show404(); + $this->smarty->assign('catname', 'All'); } } diff --git a/app/Http/Controllers/MovieController.php b/app/Http/Controllers/MovieController.php index 459537a7d..a68ec8076 100644 --- a/app/Http/Controllers/MovieController.php +++ b/app/Http/Controllers/MovieController.php @@ -149,7 +149,7 @@ class MovieController extends BasePageController if ($cdata !== null) { $this->smarty->assign('catname', $cdata); } else { - return response()->json(['message' => 'There are no categories set.'], 404); + $this->smarty->assign('catname', 'All'); } } diff --git a/app/Http/Controllers/MusicController.php b/app/Http/Controllers/MusicController.php index a85a43de6..d499cc781 100644 --- a/app/Http/Controllers/MusicController.php +++ b/app/Http/Controllers/MusicController.php @@ -91,7 +91,7 @@ class MusicController extends BasePageController if ($cdata !== null) { $this->smarty->assign('catname', $cdata); } else { - $this->show404(); + $this->smarty->assign('catname', 'All'); } } diff --git a/app/Http/Controllers/MyShowsController.php b/app/Http/Controllers/MyShowsController.php index 8771a3d24..9cf5cbe12 100644 --- a/app/Http/Controllers/MyShowsController.php +++ b/app/Http/Controllers/MyShowsController.php @@ -47,12 +47,12 @@ class MyShowsController extends BasePageController case 'doadd': $show = UserSerie::getShow($this->userdata->id, $videoId); if ($show) { - $this->show404('Already subscribed'); - } else { - $show = Video::getByVideoID($videoId); - if (! $show) { - $this->show404('No matching show.'); - } + return redirect('myshows'); + } + + $show = Video::getByVideoID($videoId); + if (! $show) { + return redirect('myshows'); } if ($action === 'doadd') { @@ -91,7 +91,7 @@ class MyShowsController extends BasePageController $show = UserSerie::getShow($this->userdata->id, $videoId); if (! $show) { - $this->show404(); + return redirect('myshows'); } if ($action === 'doedit') {