Apply fixes from StyleCI

[ci skip] [skip ci]
This commit is contained in:
DariusIII
2018-03-29 13:54:56 +00:00
committed by StyleCI Bot
parent b39bb373b4
commit 74df5848e4
7 changed files with 22 additions and 29 deletions
@@ -2,12 +2,12 @@
namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use App\Mail\ForgottenPassword;
use App\Models\Settings;
use App\Models\User;
use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
use App\Models\Settings;
use App\Mail\ForgottenPassword;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Mail;
use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
class ForgotPasswordController extends Controller
{
@@ -36,7 +36,6 @@ class ForgotPasswordController extends Controller
public function showLinkRequestForm()
{
$sent = '';
$email = request()->input('email') ?? '';
$rssToken = request()->input('apikey') ?? '';
@@ -64,7 +63,6 @@ class ForgotPasswordController extends Controller
$sent = true;
}
$theme = Settings::settingValue('site.main.style');
$title = 'Forgotten Password';
@@ -67,6 +67,7 @@ class LoginController extends Controller
}
app('smarty.view')->assign('error', 'These credentials do not match our records.');
return redirect()->back()
->withInput()
->withErrors([
@@ -2,13 +2,13 @@
namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use App\Mail\PasswordReset;
use App\Models\Settings;
use App\Models\User;
use Illuminate\Foundation\Auth\ResetsPasswords;
use App\Models\Settings;
use App\Mail\PasswordReset;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Mail;
use Illuminate\Foundation\Auth\ResetsPasswords;
class ResetPasswordController extends Controller
{
+6 -9
View File
@@ -2,16 +2,16 @@
namespace App\Http\Controllers;
use App\Models\Category;
use App\Models\Forumpost;
use App\Models\Menu;
use App\Models\RoleExcludedCategory;
use App\Models\Settings;
use App\Models\User;
use Blacklight\Contents;
use Blacklight\db\DB;
use Blacklight\SABnzbd;
use App\Models\Category;
use App\Models\Settings;
use Blacklight\Contents;
use App\Models\Forumpost;
use Illuminate\Http\Request;
use App\Models\RoleExcludedCategory;
use Illuminate\Support\Facades\Auth;
class BasePageController extends Controller
@@ -54,8 +54,6 @@ class BasePageController extends Controller
*/
public $serverurl = '';
/**
* Public access to Captcha object for error checking.
*
@@ -106,7 +104,6 @@ class BasePageController extends Controller
$this->smarty->error_reporting = E_ALL & ~E_NOTICE;
$this->smarty->assign('serverroot', url('/'));
}
/**
@@ -158,7 +155,7 @@ class BasePageController extends Controller
*/
public function show404(): void
{
abort(404);
abort(404);
}
/**
+7 -8
View File
@@ -2,14 +2,14 @@
namespace App\Http\Controllers;
use App\Models\ReleaseComment;
use App\Models\Settings;
use App\Models\User;
use App\Models\UserDownload;
use App\Models\UserExcludedCategory;
use App\Models\UserRequest;
use Blacklight\SABnzbd;
use App\Models\Settings;
use App\Models\UserRequest;
use App\Models\UserDownload;
use Illuminate\Http\Request;
use App\Models\ReleaseComment;
use App\Models\UserExcludedCategory;
use Illuminate\Support\Facades\Auth;
class ProfileController extends BasePageController
@@ -33,7 +33,6 @@ class ProfileController extends BasePageController
*/
public function show(Request $request)
{
$sab = new SABnzbd();
$userID = Auth::id();
@@ -101,7 +100,7 @@ class ProfileController extends BasePageController
];
$sabSettings = [1 => 'Site', 2 => 'Cookie'];
// Pager must be fetched after the variables are assigned to smarty.
// Pager must be fetched after the variables are assigned to smarty.
$this->smarty->assign(
[
'pager' => $this->smarty->fetch($theme.'/pager.tpl'),
@@ -129,6 +128,6 @@ class ProfileController extends BasePageController
'meta_description' => $meta_description,
]
);
$this->pagerender();
$this->pagerender();
}
}
-1
View File
@@ -3,7 +3,6 @@
require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'resources/views/themes/smarty.php';
$kernel = $app->make(\Illuminate\Contracts\Http\Kernel::class);
$response = $kernel->handle($request = \Illuminate\Http\Request::capture());
-1
View File
@@ -41,7 +41,6 @@ Route::post('/resetpassword', 'Auth\ResetPasswordController@reset');
Route::get('/profile', 'ProfileController@show')->middleware('auth');
Route::get('/browse', function () {
redirect('/browse');
})->middleware('auth');