Commit 1c4a02a0 authored by Côme Bernigaud's avatar Côme Bernigaud Committed by Benoit Mortier
Browse files

Fixes #3501 Fixed uid and uidNumber confusion

parent e5746981
......@@ -475,10 +475,10 @@ class passwordRecovery {
$ldap->search("(&(objectClass=gosaMailAccount)(uid=".$this->uid."))", array("dn"));
if ($ldap->count() < 1) {
$this->message[] = sprintf(_("Did not found account %s"), $this->uid);
$this->message[] = sprintf(_('Did not found an account with login "%s"'), $this->uid);
return;
} elseif ($ldap->count() > 1) {
$this->message[] = sprintf(_("Found multiple accounts %s"), $this->uid);
$this->message[] = sprintf(_('Found multiple accounts with login "%s"'), $this->uid);
return;
}
......
......@@ -56,9 +56,9 @@
</tr>
{/if}
<tr>
<td><label for="uid">{t}Username{/t}</label></td>
<td><label for="uid">{t}Login{/t}</label></td>
<td>{if $display_username}
<input type="text" name="uid" id="uid" maxlength="40" value="{$uid}" title="{t}Username{/t}" onFocus="nextfield= 'current_password';">
<input type="text" name="uid" id="uid" maxlength="40" value="{$uid}" title="{t}Login{/t}" onFocus="nextfield= 'current_password';">
{else}
<i>{$uid}</i>
{/if}
......
......@@ -78,7 +78,7 @@
</tr>
{/if}
<tr>
<td><label for="uid">{t}Username{/t}</label></td>
<td><label for="uid">{t}Login{/t}</label></td>
<td>
<i>{$uid}</i>
</td>
......
......@@ -572,7 +572,7 @@ function ldap_login_user_htaccess ($username)
$ldap->search("(&(objectClass=gosaAccount)(uid=$username))", array("uid"));
/* Found no uniq match? Strange, because we did above... */
if ($ldap->count() != 1) {
msg_dialog::display(_("LDAP error"), _("Username / UID is not unique inside the LDAP tree!"), FATAL_ERROR_DIALOG);
msg_dialog::display(_("LDAP error"), _("Login (uid) is not unique inside the LDAP tree!"), FATAL_ERROR_DIALOG);
return NULL;
}
$attrs = $ldap->fetch();
......@@ -658,7 +658,7 @@ function ldap_login_user ($username, $password)
/* found more than one matching id */
default:
msg_dialog::display(_("Internal error"), _("Username / UID is not unique inside the LDAP tree. Please contact your Administrator."), FATAL_ERROR_DIALOG);
msg_dialog::display(_("Internal error"), _("Login (uid) is not unique inside the LDAP tree. Please contact your administrator."), FATAL_ERROR_DIALOG);
return NULL;
}
......
......@@ -262,39 +262,39 @@ class configInLdap extends simplePlugin
'fdAccountRDN', FALSE
),
new StringAttribute (
_('Automatic UIDs'), _('Automatic way to generate new user ids'),
_('Automatic logins'), _('Automatic way to generate new users logins'),
'fdIdGenerator', FALSE
),
new BooleanAttribute (
_('Strict naming policy'),
_('Enables strict checking of uids and group names'),
_('Enables strict checking of user and group names'),
'fdStrictNamingRules', FALSE,
TRUE
),
new IntAttribute (
_('GID/UID min id'),
_('The minimum assignable user or group id number to avoid security leaks with uid 0 accounts.'),
_('Group/user min id'),
_('The minimum assignable user or group id to avoid security leaks with id 0 accounts.'),
'fdMinId', FALSE,
0, FALSE, 100
),
new StringAttribute (
_('Next id hook'), _('A script to be called for finding the next free id number for users or groups externaly.'),
_('Next id hook'), _('A script to be called for finding the next free id number for users or groups.'),
'fdNextIdHook', FALSE
),
new IntAttribute (
_('Number base for people'),
_('Where to start looking for a new free user id number.'),
_('Base number for user id'),
_('Where to start looking for a new free user id.'),
'fdUidNumberBase', FALSE,
0, FALSE, 1100
),
new IntAttribute (
_('Number base for groups'),
_('Where to start looking for a new free group id number.'),
_('Base number for group id'),
_('Where to start looking for a new free group id.'),
'fdGidNumberBase', FALSE,
0, FALSE, 1100
),
new StringAttribute (
_('Users RDN'), _('The branch where user are stored.'),
_('Users RDN'), _('The branch where users are stored.'),
'fdUserRDN', TRUE,
'ou=people'
),
......@@ -309,28 +309,28 @@ class configInLdap extends simplePlugin
'ou=aclroles'
),
new SelectAttribute (
_('Id allocation method'), _('Method to allocate uid/gid numbers'),
_('Id allocation method'), _('Method to allocate user/group ids'),
'fdIdAllocationMethod', TRUE,
array('traditional', 'pool'), 'traditional',
array(_('Traditional'), _('Samba unix id pool'))
),
new IntAttribute (
_('Pool uid min'), _('Minimum value for uid when using pool method'),
_('Pool user id min'), _('Minimum value for user id when using pool method'),
'fdUidNumberPoolMin', FALSE,
0, FALSE, 10000
),
new IntAttribute (
_('Pool uid max'), _('Maximum value for uid when using pool method'),
_('Pool user id max'), _('Maximum value for user id when using pool method'),
'fdUidNumberPoolMax', FALSE,
0, FALSE, 40000
),
new IntAttribute (
_('Pool gid min'), _('Minimum value for gid when using pool method'),
_('Pool group id min'), _('Minimum value for group id when using pool method'),
'fdGidNumberPoolMin', FALSE,
0, FALSE, 10000
),
new IntAttribute (
_('Pool gid max'), _('Maximum value for gid when using pool method'),
_('Pool group id max'), _('Maximum value for group id when using pool method'),
'fdGidNumberPoolMax', FALSE,
0, FALSE, 40000
),
......
......@@ -96,16 +96,16 @@ class posixAccount extends simplePlugin
'posixStatus', FALSE
),
new BooleanAttribute(
_('Force UID/GID'), _('Force UID and GID values for this user'),
_('Force user/group id'), _('Force user id and group id values for this user'),
'force_ids', FALSE
),
new IntAttribute(
_('UID'), _('UID value for this user'),
_('User id'), _('User id value for this user'),
'uidNumber', FALSE,
0, FALSE, ''
),
new IntAttribute(
_('GID'), _('GID value for this user'),
_('Group id'), _('Group id value for this user'),
'gidNumber', FALSE,
0, FALSE, ''
)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment