diff --git a/Changelog b/Changelog index 84c8b1d08..5a62d67bd 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2019-02-25 DariusIII + * Fix: Fix rss routing, remove dead routes from web.php * Chg: Update canihavesomecoffee/thetvdbapi (1.0.9 => 1.1.0) 2019-02-24 DariusIII * Chg: Refactor RSS feeds diff --git a/app/Http/Controllers/BasePageController.php b/app/Http/Controllers/BasePageController.php index 91128c262..3584aee08 100644 --- a/app/Http/Controllers/BasePageController.php +++ b/app/Http/Controllers/BasePageController.php @@ -83,7 +83,7 @@ class BasePageController extends Controller */ public function __construct() { - $this->middleware(['auth', 'web'])->except('api', 'contact', 'showContactForm', 'callback', 'getNzb', 'terms', 'capabilities', 'movie', 'apiSearch', 'tv', 'details', 'failed'); + $this->middleware(['auth', 'web'])->except('api', 'contact', 'showContactForm', 'callback', 'getNzb', 'terms', 'capabilities', 'movie', 'apiSearch', 'tv', 'details', 'failed', 'showRssDesc', 'feedRss', 'categoryRss', 'cartRss', 'myMoviesRss', 'myShowsRss'); // Buffer settings/DB connection. $this->settings = new Settings(); $this->smarty = app('smarty.view'); diff --git a/app/Http/Controllers/RssController.php b/app/Http/Controllers/RssController.php index babc11826..9a467310e 100644 --- a/app/Http/Controllers/RssController.php +++ b/app/Http/Controllers/RssController.php @@ -17,7 +17,7 @@ class RssController extends BasePageController * @throws \Exception * @throws \Throwable */ - public function MyMoviesRss(Request $request) + public function myMoviesRss(Request $request) { $this->setPrefs(); $rss = new RSS(['Settings' => $this->settings]); @@ -39,7 +39,7 @@ class RssController extends BasePageController * @throws \Exception * @throws \Throwable */ - public function MyShowsRss(Request $request) + public function myShowsRss(Request $request) { $this->setPrefs(); $rss = new RSS(['Settings' => $this->settings]); diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index f98612c58..6d409e5be 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -81,7 +81,7 @@ class RouteServiceProvider extends ServiceProvider protected function mapRssRoutes() { Route::prefix('rss') - ->middleware(['api', 'auth:api', ['except' => ['showRssDesc']]]) + ->middleware('api') ->namespace($this->namespace) ->group(base_path('routes/rss.php')); } diff --git a/routes/rss.php b/routes/rss.php index c36305c3c..62a608c9c 100644 --- a/routes/rss.php +++ b/routes/rss.php @@ -10,15 +10,18 @@ | */ -Route::get('mymovies', 'RssController@MyMoviesRss'); -Route::post('mymovies', 'RssController@yMoviesRss'); -Route::get('myshows', 'RssController@yShowsRss'); -Route::post('myshows', 'RssController@myShowsRss'); -Route::get('full-feed', 'RssController@feedRss'); -Route::post('full-feed', 'RssController@feedRss'); +Route::group(['middleware' => ['auth:api']], function () { + Route::get('mymovies', 'RssController@myMoviesRss'); + Route::post('mymovies', 'RssController@myMoviesRss'); + Route::get('myshows', 'RssController@myShowsRss'); + Route::post('myshows', 'RssController@myShowsRss'); + Route::get('full-feed', 'RssController@feedRss'); + Route::post('full-feed', 'RssController@feedRss'); + Route::get('cart', 'RssController@cartRss'); + Route::post('cart', 'RssController@cartRss'); + Route::get('category', 'RssController@categoryRss'); + Route::post('category', 'RssController@categoryRss'); +}); + Route::get('help', 'RssController@showRssDesc'); Route::post('help', 'RssController@showRssDesc'); -Route::get('cart', 'RssController@cartRss'); -Route::post('cart', 'RssController@cartRss'); -Route::get('category', 'RssController@categoryRss'); -Route::post('category', 'RssController@categoryRss'); diff --git a/routes/web.php b/routes/web.php index 8d6bccc92..70301238b 100644 --- a/routes/web.php +++ b/routes/web.php @@ -297,12 +297,6 @@ Route::group(['middleware' => ['role:Admin'], 'prefix' => 'admin', 'namespace' = Route::post('game-list', 'GameController@index'); Route::get('game-edit', 'GameController@edit'); Route::post('game-edit', 'GameController@edit'); - Route::get('menu-list', 'MenuController@index'); - Route::post('menu-list', 'MenuController@index'); - Route::get('menu-edit', 'MenuController@edit'); - Route::post('menu-edit', 'MenuController@edit'); - Route::get('menu-delete/{id}', 'MenuController@destroy'); - Route::post('menu-delete/{id}', 'MenuController@destroy'); Route::get('movie-list', 'MovieController@index'); Route::post('movie-list', 'MovieController@index'); Route::get('movie-edit', 'MovieController@edit'); @@ -337,6 +331,3 @@ Route::group(['middleware' => ['role_or_permission:Admin|Moderator|edit release' Route::get('release-edit', 'ReleasesController@edit'); Route::post('release-edit', 'ReleasesController@edit'); }); - -Route::get('rss', 'RssController@rss'); -Route::post('rss', 'RssController@rss');