Mirrors/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2024-07-29 20:15:55 +02:00
Code Issues Actions 34 Packages Projects Releases Wiki Activity

Rename username to loginName

Browse Source 
UID and login name are two different things.
This commit is contained in:
Lukas Reschke 2016-04-15 19:02:19 +02:00
parent 8a650a51be
commit fee95084ae
No known key found for this signature in database
GPG Key ID: 9AB0ADB949B6898C
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/Controller/LoginController.php
View File

@ -95,10 +95,10 @@ class LoginController extends Controller {
$parameters['messages'] = $messages;
if ($user !== '') {
$parameters['username'] = $user;
$parameters['loginName'] = $user;
$parameters['user_autofocus'] = false;
} else {
$parameters['username'] = '';
$parameters['loginName'] = '';
$parameters['user_autofocus'] = true;
}
if (!empty($redirect_url)) {
@ -120,10 +120,10 @@ class LoginController extends Controller {
$parameters['rememberLoginState'] = !empty($remember_login) ? $remember_login : 0;
if ($user !== '') {
$parameters['username'] = $user;
$parameters['loginName'] = $user;
$parameters['user_autofocus'] = false;
} else {
$parameters['username'] = '';
$parameters['loginName'] = '';
$parameters['user_autofocus'] = true;
}

2
core/templates/login.php
View File

@ -41,7 +41,7 @@ script('core', [
<p class="grouptop">
<input type="text" name="user" id="user"
placeholder="<?php p($l->t('Username')); ?>"
value="<?php p($_['username']); ?>"
value="<?php p($_['loginName']); ?>"
<?php p($_['user_autofocus'] ? 'autofocus' : ''); ?>
autocomplete="on" autocapitalize="off" autocorrect="off" required>
<label for="user" class="infield"><?php p($l->t('Username')); ?></label>

6
tests/core/controller/LoginControllerTest.php
View File

@ -104,7 +104,7 @@ class LoginControllerTest extends TestCase {
'MessageArray1',
'MessageArray2',
],
'username' => '',
'loginName' => '',
'user_autofocus' => true,
'canResetPassword' => true,
'alt_login' => [],
@ -162,7 +162,7 @@ class LoginControllerTest extends TestCase {
'login',
[
'messages' => [],
'username' => 'LdapUser',
'loginName' => 'LdapUser',
'user_autofocus' => false,
'canResetPassword' => $expectedResult,
'alt_login' => [],
@ -200,7 +200,7 @@ class LoginControllerTest extends TestCase {
'login',
[
'messages' => [],
'username' => '0',
'loginName' => '0',
'user_autofocus' => false,
'canResetPassword' => false,
'alt_login' => [],