starred/newznab-tmux
1
0
Fork 0
mirror of https://github.com/NNTmux/newznab-tmux.git synced 2026-08-29 01:08:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use output of userCheck if it passes the json check

Browse Source
This commit is contained in:
DariusIII
2019-04-05 13:19:05 +02:00
parent f64915f421
commit a2f75488b1
3 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/RssController.php
+30 -6
View File
@@ -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);