diff --git a/Changelog b/Changelog index 67951ec80..bf261f24e 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2019-04-05 DariusIII + * Chg: Use output of userCheck if it passes the json check * Chg: Don't use constant for multiprocessing path, use the path directly 2019-04-04 DariusIII * Chg: Update laravel/framework (v5.8.9 => v5.8.10) diff --git a/app/Http/Controllers/MyShowsController.php b/app/Http/Controllers/MyShowsController.php index 70637e178..ea1d1b4fc 100644 --- a/app/Http/Controllers/MyShowsController.php +++ b/app/Http/Controllers/MyShowsController.php @@ -139,7 +139,7 @@ class MyShowsController extends BasePageController $results = []; foreach ($shows as $showk => $show) { $showcats = explode('|', $show['categories']); - if (\is_array($showcats) && \count($showcats) > 0) { + if (\is_array($showcats) && ! empty($showcats)) { $catarr = []; foreach ($showcats as $scat) { if (! empty($scat)) { diff --git a/app/Http/Controllers/RssController.php b/app/Http/Controllers/RssController.php index 0fa240c0b..d4d855692 100644 --- a/app/Http/Controllers/RssController.php +++ b/app/Http/Controllers/RssController.php @@ -13,8 +13,8 @@ class RssController extends BasePageController { /** * @param \Illuminate\Http\Request $request - * @return void - * @throws \Exception + * + * @return array|\Illuminate\Http\JsonResponse * @throws \Throwable */ public function myMoviesRss(Request $request) @@ -24,6 +24,10 @@ class RssController extends BasePageController $user = $this->userCheck($request); + if (is_json($user)) { + return $user; + } + $outputXML = (! ($request->has('o') && $request->input('o') === 'json')); $userNum = ($request->has('num') && is_numeric($request->input('num')) ? abs($request->input('num')) : 0); @@ -35,7 +39,8 @@ class RssController extends BasePageController /** * @param \Illuminate\Http\Request $request - * @throws \Exception + * + * @return array|\Illuminate\Http\JsonResponse * @throws \Throwable */ public function myShowsRss(Request $request) @@ -43,6 +48,9 @@ class RssController extends BasePageController $rss = new RSS(['Settings' => $this->settings]); $offset = 0; $user = $this->userCheck($request); + if (is_json($user)) { + return $user; + } $userAirDate = $request->has('airdate') && is_numeric($request->input('airdate')) ? abs($request->input('airdate')) : -1; $userNum = ($request->has('num') && is_numeric($request->input('num')) ? abs($request->input('num')) : 0); $relData = $rss->getShowsRss($userNum, $user['user_id'], User::getCategoryExclusionById($user['user_id']), $userAirDate); @@ -53,7 +61,8 @@ class RssController extends BasePageController /** * @param \Illuminate\Http\Request $request - * @throws \Exception + * + * @return array|\Illuminate\Http\JsonResponse * @throws \Throwable */ public function fullFeedRss(Request $request) @@ -61,6 +70,9 @@ class RssController extends BasePageController $rss = new RSS(['Settings' => $this->settings]); $offset = 0; $user = $this->userCheck($request); + if (is_json($user)) { + return $user; + } $userAirDate = $request->has('airdate') && is_numeric($request->input('airdate')) ? abs($request->input('airdate')) : -1; $userNum = ($request->has('num') && is_numeric($request->input('num')) ? abs($request->input('num')) : 0); $userLimit = $request->has('limit') && is_numeric($request->input('limit')) ? $request->input('limit') : 100; @@ -117,12 +129,21 @@ class RssController extends BasePageController $this->pagerender(); } + /** + * @param \Illuminate\Http\Request $request + * + * @return array|\Illuminate\Http\JsonResponse + * @throws \Throwable + */ public function cartRss(Request $request) { $this->setPrefs(); $rss = new RSS(['Settings' => $this->settings]); $offset = 0; $user = $this->userCheck($request); + if (is_json($user)) { + return $user; + } $outputXML = (! ($request->has('o') && $request->input('o') === 'json')); $userAirDate = $request->has('airdate') && is_numeric($request->input('airdate')) ? abs($request->input('airdate')) : -1; $userNum = ($request->has('num') && is_numeric($request->input('num')) ? abs($request->input('num')) : 0); @@ -140,8 +161,8 @@ class RssController extends BasePageController /** * @param \Illuminate\Http\Request $request - * @return \Illuminate\Http\JsonResponse - * @throws \Exception + * + * @return array|\Illuminate\Http\JsonResponse * @throws \Throwable */ public function categoryFeedRss(Request $request) @@ -154,6 +175,9 @@ class RssController extends BasePageController } $user = $this->userCheck($request); + if (is_json($user)) { + return $user; + } $categoryId = explode(',', $request->input('id')); $userAirDate = $request->has('airdate') && is_numeric($request->input('airdate')) ? abs($request->input('airdate')) : -1; $userNum = ($request->has('num') && is_numeric($request->input('num')) ? abs($request->input('num')) : 0);