mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Also check for an empty string 

PHP. Yay.
This commit is contained in:
Lukas Reschke 2016-04-15 19:51:00 +02:00
parent 17dfffefb3
commit d4a93893bb
No known key found for this signature in database
GPG Key ID: 9AB0ADB949B6898C
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/Controller/LoginController.php
View File

@ -74,7 +74,7 @@ class LoginController extends Controller {
* *
* @return TemplateResponse * @return TemplateResponse
*/ */
public function showLoginForm($user = '', public function showLoginForm($user,
$redirect_url, $redirect_url,
$remember_login) { $remember_login) {
if($this->userSession->isLoggedIn()) { if($this->userSession->isLoggedIn()) {
@ -94,7 +94,7 @@ class LoginController extends Controller {
} }
$parameters['messages'] = $messages; $parameters['messages'] = $messages;
if ($user !== '') { if (!is_null($user) && $user !== '') {
$parameters['loginName'] = $user; $parameters['loginName'] = $user;
$parameters['user_autofocus'] = false; $parameters['user_autofocus'] = false;
} else { } else {
@ -107,7 +107,7 @@ class LoginController extends Controller {
$parameters['canResetPassword'] = true; $parameters['canResetPassword'] = true;
if (!$this->config->getSystemValue('lost_password_link')) { if (!$this->config->getSystemValue('lost_password_link')) {
if ($user !== '') { if (!is_null($user) && $user !== '') {
$userObj = $this->userManager->get($user); $userObj = $this->userManager->get($user);
if ($userObj instanceof IUser) { if ($userObj instanceof IUser) {
$parameters['canResetPassword'] = $userObj->canChangePassword(); $parameters['canResetPassword'] = $userObj->canChangePassword();
@ -119,7 +119,7 @@ class LoginController extends Controller {
$parameters['rememberLoginAllowed'] = \OC_Util::rememberLoginAllowed(); $parameters['rememberLoginAllowed'] = \OC_Util::rememberLoginAllowed();
$parameters['rememberLoginState'] = !empty($remember_login) ? $remember_login : 0; $parameters['rememberLoginState'] = !empty($remember_login) ? $remember_login : 0;
if ($user !== '') { if (!is_null($user) && $user !== '') {
$parameters['loginName'] = $user; $parameters['loginName'] = $user;
$parameters['user_autofocus'] = false; $parameters['user_autofocus'] = false;
} else { } else {