kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-22 20:16:22 +00:00
Code Issues Projects Releases Wiki Activity

New views for password reset, login and other user forms.

Browse Source
This commit is contained in:
James Cole
2018-11-25 11:31:02 +01:00
parent 99cc7a9a60
commit 4420df6e5d
41 changed files with 792 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,7 +72,7 @@ class RegisterController extends Controller
{
// is allowed to?
$allowRegistration = true;
$loginProvider = envNonEmpty('LOGIN_PROVIDER','eloquent');
$loginProvider = envNonEmpty('LOGIN_PROVIDER', 'eloquent');
$singleUserMode = FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
$userCount = User::count();
if (true === $singleUserMode && $userCount > 0 && 'eloquent' === $loginProvider) {
@@ -113,10 +113,11 @@ class RegisterController extends Controller
public function showRegistrationForm(Request $request)
{
$allowRegistration = true;
$loginProvider = envNonEmpty('LOGIN_PROVIDER','eloquent');
$loginProvider = envNonEmpty('LOGIN_PROVIDER', 'eloquent');
$isDemoSite = FireflyConfig::get('is_demo_site', config('firefly.configuration.is_demo_site'))->data;
$singleUserMode = FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
$userCount = User::count();
$pageTitle = (string)trans('firefly.register_page_title');
if (true === $isDemoSite) {
$allowRegistration = false;
@@ -138,7 +139,7 @@ class RegisterController extends Controller
$email = $request->old('email');
return view('auth.register', compact('isDemoSite', 'email'));
return view('auth.register', compact('isDemoSite', 'email', 'pageTitle'));
}
}