kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-18 15:39:50 +00:00
Code Issues Projects Releases Wiki Activity

Make it easier to switch between v1/v2 layout.

Browse Source
This commit is contained in:
James Cole
2021-01-31 20:35:54 +01:00
parent fd8a59924d
commit ffe18c63a5
88 changed files with 176 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/Auth/ForgotPasswordController.php
View File

@@ -77,7 +77,7 @@ class ForgotPasswordController extends Controller
$message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider);
Log::error($message);
return view('error', compact('message'));
return prefixView('error', compact('message'));
}
// @codeCoverageIgnoreEnd
@@ -118,7 +118,7 @@ class ForgotPasswordController extends Controller
if ('eloquent' !== $loginProvider) {
$message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider);
return view('error', compact('message'));
return prefixView('error', compact('message'));
}
// is allowed to?
@@ -130,6 +130,6 @@ class ForgotPasswordController extends Controller
$allowRegistration = false;
}
return view('auth.passwords.email')->with(compact('allowRegistration', 'pageTitle'));
return prefixView('auth.passwords.email')->with(compact('allowRegistration', 'pageTitle'));
}
}

2
app/Http/Controllers/Auth/LoginController.php
View File

@@ -160,7 +160,7 @@ class LoginController extends Controller
}
return view('auth.login', compact('allowRegistration', 'email', 'remember', 'allowReset', 'title'));
return prefixView('auth.login', compact('allowRegistration', 'email', 'remember', 'allowReset', 'title'));
}
/**

6
app/Http/Controllers/Auth/RegisterController.php
View File

@@ -98,7 +98,7 @@ class RegisterController extends Controller
if (false === $allowRegistration) {
$message = 'Registration is currently not available.';
return view('error', compact('message'));
return prefixView('error', compact('message'));
}
$this->validator($request->all())->validate();
@@ -149,12 +149,12 @@ class RegisterController extends Controller
if (false === $allowRegistration) {
$message = 'Registration is currently not available.';
return view('error', compact('message'));
return prefixView('error', compact('message'));
}
$email = $request->old('email');
return view('auth.register', compact('isDemoSite', 'email', 'pageTitle'));
return prefixView('auth.register', compact('isDemoSite', 'email', 'pageTitle'));
}
}

6
app/Http/Controllers/Auth/ResetPasswordController.php
View File

@@ -85,7 +85,7 @@ class ResetPasswordController extends Controller
if ('eloquent' !== $loginProvider) {
$message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider);
return view('error', compact('message'));
return prefixView('error', compact('message'));
}
$rules = [
@@ -130,7 +130,7 @@ class ResetPasswordController extends Controller
if ('eloquent' !== $loginProvider) {
$message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider);
return view('error', compact('message'));
return prefixView('error', compact('message'));
}
// is allowed to register?
@@ -143,7 +143,7 @@ class ResetPasswordController extends Controller
}
/** @noinspection PhpUndefinedFieldInspection */
return view('auth.passwords.reset')->with(
return prefixView('auth.passwords.reset')->with(
['token' => $token, 'email' => $request->email, 'allowRegistration' => $allowRegistration, 'pageTitle' => $pageTitle]
);
}

2
app/Http/Controllers/Auth/TwoFactorController.php
View File

@@ -47,7 +47,7 @@ class TwoFactorController extends Controller
$siteOwner = config('firefly.site_owner');
$title = (string) trans('firefly.two_factor_forgot_title');
return view('auth.lost-two-factor', compact('user', 'siteOwner', 'title'));
return prefixView('auth.lost-two-factor', compact('user', 'siteOwner', 'title'));
}
/**