gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/user user.php.in, 1.17, 1.18
cvs at kolab.org
cvs at kolab.org
Thu May 24 11:31:07 CEST 2007
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user
In directory doto:/tmp/cvs-serv7188/kolab-webadmin/kolab-webadmin/www/admin/user
Modified Files:
user.php.in
Log Message:
Fixed kolab/issue1742 (https://intevation.de/roundup/kolab/issue1742)
Index: user.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- user.php.in 16 Mar 2007 12:17:24 -0000 1.17
+++ user.php.in 24 May 2007 09:31:04 -0000 1.18
@@ -128,7 +128,7 @@
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;
@@ -144,7 +144,7 @@
$str = '';
foreach( $lst as $uid ) {
if( $ldap->countMail( $_SESSION['base_dn'], $uid, $excludedn ) > 0 ) {
- $str .= _('UID ').MySmarty::htmlentities($uid)._(' collision <br />');
+ $str .= _('UID ').MySmarty::htmlentities($uid)._(' collides with an address already used for another user, a vCard or a distribution list.<br />');
}
}
return $str;
@@ -496,6 +496,7 @@
switch( $action ) {
case 'firstsave':
debug("adding checkuniquemail to validation");
+ $ldap_object['objectClass'] = array('top', 'inetOrgPerson','kolabInetOrgPerson');
$form->entries['mail']['validation'] = array( $form->entries['mail']['validation'], 'checkuniquemail');
case 'save':
if( $form->isSubmitted() ) {
@@ -504,7 +505,6 @@
$content = $form->outputForm();
} else {
$ldap_object = array();
- $ldap_object['objectClass'] = array('top', 'inetOrgPerson','kolabInetOrgPerson');
$ldap_object['sn'] = trim($_POST['sn']);
$ldap_object['cn'] = trim($_POST['givenname']).' '.$ldap_object['sn'];
$ldap_object['givenName'] = trim($_POST['givenname']);
@@ -624,11 +624,6 @@
'(&(objectClass=kolabGroupOfNames)(!(kolabDeleteFlag=*))(member='.$ldap->escape($dn).'))',
array( 'dn', 'mail' ) );
$distlists = $ldap->getEntries();
- unset( $distlists['count'] );
- foreach( $distlists as $distlist ) {
- $dlcn = $distlist['mail'][0];
- $errors[] = sprintf(_("Account DN could not be modified, distribution list <a href='@webserver_web_prefix@/admin/distributionlist/list.php?action=modify&dn=%s'>'%s'</a> depends on it. To modify this account, first remove it from the distribution list."), urlencode($distlist['dn']), $dlcn );
- }
if (($result=ldap_read($ldap->connection,$dn,"(objectclass=*)")) &&
($entry=ldap_first_entry($ldap->connection,$result)) &&
More information about the commits
mailing list