gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/addressbook addr.php.in, 1.5, 1.6

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/addressbook
In directory doto:/tmp/cvs-serv7188/kolab-webadmin/kolab-webadmin/www/admin/addressbook

Modified Files:
	addr.php.in 
Log Message:
Fixed kolab/issue1742 (https://intevation.de/roundup/kolab/issue1742)


Index: addr.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/addressbook/addr.php.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- addr.php.in	16 Mar 2007 12:17:24 -0000	1.5
+++ addr.php.in	24 May 2007 09:31:05 -0000	1.6
@@ -85,7 +85,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;
@@ -153,6 +153,7 @@
 	$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 @@
 		$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);