summaryrefslogtreecommitdiff
path: root/www/admin/addressbook/addr.php.in
diff options
context:
space:
mode:
Diffstat (limited to 'www/admin/addressbook/addr.php.in')
-rw-r--r--www/admin/addressbook/addr.php.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/www/admin/addressbook/addr.php.in b/www/admin/addressbook/addr.php.in
index 3b42c09..5cd56cd 100644
--- a/www/admin/addressbook/addr.php.in
+++ b/www/admin/addressbook/addr.php.in
@@ -85,7 +85,7 @@ function checkuniquealias( $form, $key, $value ) {
foreach( $lst as $alias ) {
debug( "looking at $alias, exluding $dn" );
if( $ldap->countMail( $_SESSION['base_dn'], $alias, $excludedn ) > 0 ) {
- $str .= _('Email address ').MySmarty::htmlentities($alias)._(' collision <br />');
+ $str .= _('Email address ').MySmarty::htmlentities($alias)._(' collides with an address already used for another user, a vCard or a distribution list.<br />');
}
}
return $str;
@@ -153,6 +153,7 @@ if( !$errors ) {
$content = $form->outputForm();
break;
case 'firstsave':
+ $ldap_object = array('objectClass' => array( 'top', 'inetOrgPerson', 'kolabInetOrgPerson' ) );
case 'save':
if( $form->isSubmitted() ) {
if( !$form->validate() ) {
@@ -160,7 +161,6 @@ if( !$errors ) {
$content = $form->outputForm();
} else {
$addressbook_root = "cn=external,".$_SESSION['base_dn'];
- $ldap_object = array('objectClass' => array( 'top', 'inetOrgPerson', 'kolabInetOrgPerson' ) );
$firstname = trim($_POST['firstname']);
$lastname = trim($_POST['lastname']);
$ldap_object['sn'] = trim($lastname);