From 23ab8f0334c5deabe3efdc6555ddbebb242db862 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Mon, 24 Sep 2018 11:28:49 +0200 Subject: [PATCH] Use $this->userdata->id variable in place of Auth::(id) in controllers --- Changelog | 2 + app/Http/Controllers/BasePageController.php | 11 +-- app/Http/Controllers/CartController.php | 2 +- app/Http/Controllers/DetailsController.php | 2 +- .../Controllers/FailedReleasesController.php | 2 +- app/Http/Controllers/ForumController.php | 4 +- app/Http/Controllers/GetNzbController.php | 2 +- app/Http/Controllers/MyMoviesController.php | 12 ++-- app/Http/Controllers/ProfileController.php | 2 +- app/Http/Controllers/RssController.php | 2 +- composer.lock | 72 ++++++++++++------- 11 files changed, 70 insertions(+), 43 deletions(-) diff --git a/Changelog b/Changelog index a7cec57d3..c5ba5cd17 100755 --- a/Changelog +++ b/Changelog @@ -1,3 +1,5 @@ +2018-09-24 DariusIII + * Chg: Use $this->userdata->id variable in place of Auth::(id) in controllers 2018-09-22 DariusIIi * Fix: Fix user login by email 2018-09-21 DariusIII diff --git a/app/Http/Controllers/BasePageController.php b/app/Http/Controllers/BasePageController.php index 0903da2fa..5cb41c6e4 100644 --- a/app/Http/Controllers/BasePageController.php +++ b/app/Http/Controllers/BasePageController.php @@ -59,11 +59,9 @@ class BasePageController extends Controller public $page_template = ''; /** - * User settings from the MySQL DB. - * - * @var array|bool + * @var User */ - public $userdata = []; + public $userdata; /** * User's theme. @@ -243,7 +241,7 @@ class BasePageController extends Controller // Update last login every 15 mins. if ((strtotime($this->userdata['now']) - 900) > strtotime($this->userdata['lastlogin'])) { - User::updateSiteAccessed($this->userdata['id']); + User::updateSiteAccessed($this->userdata->id); } $this->smarty->assign('userdata', $this->userdata); @@ -302,6 +300,9 @@ class BasePageController extends Controller $this->smarty->assign('header_menu', $header_menu); } + /** + * Set admin preferences + */ public function setAdminPrefs() { // Tell Smarty which directories to use for templates diff --git a/app/Http/Controllers/CartController.php b/app/Http/Controllers/CartController.php index c250c6d70..941b0dc42 100644 --- a/app/Http/Controllers/CartController.php +++ b/app/Http/Controllers/CartController.php @@ -52,7 +52,7 @@ class CartController extends BasePageController } foreach ($data as $d) { - UsersRelease::addCart(Auth::id(), $d['id']); + UsersRelease::addCart($this->userdata->id, $d['id']); } } diff --git a/app/Http/Controllers/DetailsController.php b/app/Http/Controllers/DetailsController.php index eda57d3b2..8b08b37a2 100644 --- a/app/Http/Controllers/DetailsController.php +++ b/app/Http/Controllers/DetailsController.php @@ -49,7 +49,7 @@ class DetailsController extends BasePageController } if ($this->isPostBack()) { - ReleaseComment::addComment($data['id'], $data['gid'], \request()->input('txtAddComment'), Auth::id(), \request()->ip()); + ReleaseComment::addComment($data['id'], $data['gid'], \request()->input('txtAddComment'), $this->userdata->id, \request()->ip()); } $nfo = ReleaseNfo::getReleaseNfo($data['id']); diff --git a/app/Http/Controllers/FailedReleasesController.php b/app/Http/Controllers/FailedReleasesController.php index d81390e54..cf4cca003 100644 --- a/app/Http/Controllers/FailedReleasesController.php +++ b/app/Http/Controllers/FailedReleasesController.php @@ -20,7 +20,7 @@ class FailedReleasesController extends BasePageController $this->setPrefs(); // Page is accessible only by the rss token, or logged in users. if (Auth::check()) { - $uid = Auth::id(); + $uid = $this->userdata->id; $rssToken = $this->userdata['api_token']; } else { if (! $request->has('userid') || ! $request->has('api_token')) { diff --git a/app/Http/Controllers/ForumController.php b/app/Http/Controllers/ForumController.php index 643b7956c..6f2c57506 100644 --- a/app/Http/Controllers/ForumController.php +++ b/app/Http/Controllers/ForumController.php @@ -18,7 +18,7 @@ class ForumController extends BasePageController { $this->setPrefs(); if ($this->isPostBack() && $request->has('addMessage') && $request->has('addSubject')) { - Forumpost::add(0, Auth::id(), $request->input('addSubject'), $request->input('addMessage')); + Forumpost::add(0, $this->userdata->id, $request->input('addSubject'), $request->input('addMessage')); return redirect('forum'); } @@ -79,7 +79,7 @@ class ForumController extends BasePageController $this->setPrefs(); if ($request->has('addMessage') && $this->isPostBack()) { - Forumpost::add($id, Auth::id(), '', $request->input('addMessage')); + Forumpost::add($id, $this->userdata->id, '', $request->input('addMessage')); return redirect('forumpost/'.$id.'#last'); } diff --git a/app/Http/Controllers/GetNzbController.php b/app/Http/Controllers/GetNzbController.php index 2f20369db..2c9dccbe3 100644 --- a/app/Http/Controllers/GetNzbController.php +++ b/app/Http/Controllers/GetNzbController.php @@ -28,7 +28,7 @@ class GetNzbController extends BasePageController // Page is accessible only by the rss token, or logged in users. if (Auth::check()) { - $uid = Auth::id(); + $uid = $this->userdata->id; $maxDownloads = $this->userdata->role->downloadrequests; $rssToken = $this->userdata['api_token']; if ($this->userdata->hasRole('Disabled') === true) { diff --git a/app/Http/Controllers/MyMoviesController.php b/app/Http/Controllers/MyMoviesController.php index 5f4b30078..fc958fad7 100644 --- a/app/Http/Controllers/MyMoviesController.php +++ b/app/Http/Controllers/MyMoviesController.php @@ -33,7 +33,7 @@ class MyMoviesController extends BasePageController switch ($action) { case 'delete': - $movie = UserMovie::getMovie(Auth::id(), $imdbid); + $movie = UserMovie::getMovie($this->userdata->id, $imdbid); if ($request->has('from')) { header('Location:'.WWW_TOP.$request->input('from')); } else { @@ -42,13 +42,13 @@ class MyMoviesController extends BasePageController if (! $movie) { $this->show404(); } else { - UserMovie::delMovie(Auth::id(), $imdbid); + UserMovie::delMovie($this->userdata->id, $imdbid); } break; case 'add': case 'doadd': - $movie = UserMovie::getMovie(Auth::id(), $imdbid); + $movie = UserMovie::getMovie($this->userdata->id, $imdbid); if ($movie) { $this->show404(); } else { @@ -60,7 +60,7 @@ class MyMoviesController extends BasePageController if ($action === 'doadd') { $category = ($request->has('category') && \is_array($request->input('category')) && ! empty($request->input('category'))) ? $request->input('category') : []; - UserMovie::addMovie(Auth::id(), $imdbid, $category); + UserMovie::addMovie($this->userdata->id, $imdbid, $category); if ($request->has('from')) { header('Location:'.WWW_TOP.$request->input('from')); } else { @@ -89,7 +89,7 @@ class MyMoviesController extends BasePageController break; case 'edit': case 'doedit': - $movie = UserMovie::getMovie(Auth::id(), $imdbid); + $movie = UserMovie::getMovie($this->userdata->id, $imdbid); if (! $movie) { $this->show404(); @@ -97,7 +97,7 @@ class MyMoviesController extends BasePageController if ($action === 'doedit') { $category = ($request->has('category') && \is_array($request->input('category')) && ! empty($request->input('category'))) ? $request->input('category') : []; - UserMovie::updateMovie(Auth::id(), $imdbid, $category); + UserMovie::updateMovie($this->userdata->id, $imdbid, $category); if ($request->has('from')) { redirect($request->input('from')); } else { diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index c4220d4a1..346bc4aa0 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -128,7 +128,7 @@ class ProfileController extends BasePageController $action = $request->input('action') ?? 'view'; - $userid = Auth::id(); + $userid = $this->userdata->id; $data = User::find($userid); if (! $data) { $this->show404('No such user!'); diff --git a/app/Http/Controllers/RssController.php b/app/Http/Controllers/RssController.php index 98388acae..9e7a1a93e 100644 --- a/app/Http/Controllers/RssController.php +++ b/app/Http/Controllers/RssController.php @@ -68,7 +68,7 @@ class RssController extends BasePageController $uid = -1; // User requested a feed, ensure either logged in or passing a valid token. if (Auth::check()) { - $uid = Auth::id(); + $uid = $this->userdata->id; $rssToken = $this->userdata['api_token']; $maxRequests = $this->userdata->role->apirequests; } else { diff --git a/composer.lock b/composer.lock index 843eb2fa8..a46f5b4fa 100644 --- a/composer.lock +++ b/composer.lock @@ -258,7 +258,8 @@ "Gemfile.lock", "*.md" ] - } + }, + "time": "2016-06-06T17:37:52+00:00" }, { "name": "bower-asset/autosize", @@ -287,7 +288,8 @@ "form", "textarea", "ui" - ] + ], + "time": "2017-05-19T15:36:30+00:00" }, { "name": "bower-asset/bootstrap", @@ -336,7 +338,8 @@ "mobile-first", "responsive", "web" - ] + ], + "time": "2016-07-25T15:51:55+00:00" }, { "name": "bower-asset/bootstrap-3.x", @@ -385,7 +388,8 @@ "mobile-first", "responsive", "web" - ] + ], + "time": "2016-07-25T15:51:55+00:00" }, { "name": "bower-asset/bootstrap-datepicker", @@ -414,7 +418,8 @@ }, "license": [ "Apache-2.0" - ] + ], + "time": "2016-08-05T09:50:13+00:00" }, { "name": "bower-asset/bootstrap-hover-dropdown", @@ -444,7 +449,8 @@ "dropdowns", "hover", "twitter" - ] + ], + "time": "2015-12-01T23:35:57+00:00" }, { "name": "bower-asset/bootstrap-progressbar", @@ -478,7 +484,8 @@ }, "license": [ "MIT" - ] + ], + "time": "2015-05-15T18:56:17+00:00" }, { "name": "bower-asset/bootswatch", @@ -609,7 +616,8 @@ "modal", "popup", "ui" - ] + ], + "time": "2016-05-10T22:21:33+00:00" }, { "name": "bower-asset/datatables", @@ -724,7 +732,8 @@ "tests", "examples" ] - } + }, + "time": "2015-01-26T21:19:01+00:00" }, { "name": "bower-asset/flexboxgrid", @@ -760,7 +769,8 @@ "css", "flexbox", "grid" - ] + ], + "time": "2016-08-14T16:43:18+00:00" }, { "name": "bower-asset/font-awesome", @@ -805,7 +815,8 @@ "src", "build.xml" ] - } + }, + "time": "2015-07-20T20:04:00+00:00" }, { "name": "bower-asset/icheck", @@ -855,7 +866,8 @@ "replacement", "skins", "ui" - ] + ], + "time": "2014-03-03T17:36:28+00:00" }, { "name": "bower-asset/jquery", @@ -918,7 +930,8 @@ "javascript", "jquery", "library" - ] + ], + "time": "2016-05-20T17:24:43+00:00" }, { "name": "bower-asset/jquery-3.2.x", @@ -985,7 +998,8 @@ "scroll", "scrolltop", "scrolltotop" - ] + ], + "time": "2017-08-31T15:51:29+00:00" }, { "name": "bower-asset/jquery-migrate-1.4.x", @@ -1004,7 +1018,8 @@ "type": "bower-asset-library", "extra": { "bower-asset-main": "jquery-migrate.js" - } + }, + "time": "2016-04-15T06:38:34+00:00" }, { "name": "bower-asset/jquery-migrate-3.0.x", @@ -1023,7 +1038,8 @@ "type": "bower-asset-library", "extra": { "bower-asset-main": "jquery-migrate.js" - } + }, + "time": "2016-06-10T14:28:59+00:00" }, { "name": "bower-asset/jquery.nicescroll", @@ -1053,7 +1069,8 @@ "demo", "package.json" ] - } + }, + "time": "2016-03-01T20:38:24+00:00" }, { "name": "bower-asset/material-design-iconic-font", @@ -1092,7 +1109,8 @@ "font", "icons", "material" - ] + ], + "time": "2015-11-08T04:50:28+00:00" }, { "name": "bower-asset/materialize", @@ -1151,7 +1169,8 @@ "responsive", "sass", "ux" - ] + ], + "time": "2017-04-15T01:39:28+00:00" }, { "name": "bower-asset/pace", @@ -1197,7 +1216,8 @@ "progress", "progress", "spinner" - ] + ], + "time": "2014-11-06T16:31:34+00:00" }, { "name": "bower-asset/pnotify", @@ -1249,7 +1269,8 @@ "license": [ "Apache-2.0" ], - "description": "JavaScript notification plugin." + "description": "JavaScript notification plugin.", + "time": "2017-07-31T21:50:29+00:00" }, { "name": "bower-asset/respond", @@ -1273,7 +1294,8 @@ "test" ] }, - "description": "Fast and lightweight polyfill for min/max-width CSS3 Media Queries (for IE 6-8, and more)" + "description": "Fast and lightweight polyfill for min/max-width CSS3 Media Queries (for IE 6-8, and more)", + "time": "2013-12-19T04:44:31+00:00" }, { "name": "bower-asset/responsive-tables-js", @@ -1303,7 +1325,8 @@ "jquery", "responsive", "table" - ] + ], + "time": "2015-10-08T14:18:04+00:00" }, { "name": "bower-asset/select2", @@ -1371,7 +1394,8 @@ "scrolling", "slimscroll", "ui" - ] + ], + "time": "2016-06-11T09:19:14+00:00" }, { "name": "bower-asset/tinymce-dist",