Browse Source

Rename `username` to `loginName`

UID and login name are two different things.
remotes/origin/index-with-prefix
Lukas Reschke 10 years ago
parent
commit
fee95084ae
No known key found for this signature in database GPG Key ID: 9AB0ADB949B6898C
  1. 8
      core/Controller/LoginController.php
  2. 2
      core/templates/login.php
  3. 6
      tests/core/controller/LoginControllerTest.php

8
core/Controller/LoginController.php

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

2
core/templates/login.php

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

6
tests/core/controller/LoginControllerTest.php

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

Loading…
Cancel
Save