steffen: server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist list.php, 1.9, 1.10

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	list.php 
Log Message:
groupOfNames changes

Index: list.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist/list.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- list.php	9 Aug 2004 10:42:35 -0000	1.9
+++ list.php	11 Aug 2004 13:03:07 -0000	1.10
@@ -1,6 +1,6 @@
 <?php
 /*
- *  Copyright (c) 2004 Klarälvdalens Datakonsult AB
+ *  Copyright (c) 2004 Klarälvdalens Datakonsult AB
  *
  *    Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
  *
@@ -40,6 +40,7 @@
 function checkemaillist( $form, $key, $value ) {
   if( $key == 'members' ) {
 	$lst = array_unique( array_filter( array_map( 'trim', preg_split( '/\n/', $value ) ), 'strlen') );
+	if( count($lst) < 1 ) return _('Please add at least one member');
 	/*foreach( $lst as $a ) {
 	  if( !ereg('.*@.*', $a ) ) return 'Invalid email address syntax';
 	}*/
@@ -80,7 +81,7 @@
   unset( $m['count'] );
   $form->entries['members']['value'] = join("\r\n", 
 											array_map( create_function( '$dn', 
-											'global $ldap;return $ldap->uidForDn($dn);' ), $m) );
+											'global $ldap;return $ldap->mailForDn($dn);' ), $m) );
   $internaldn = 'cn=internal,'.domain_dn();
   debug("internaldn=\"$internaldn\"");
   debug("dn=\"$dn\"");
@@ -113,7 +114,7 @@
 								 'comment' => _('Required') ),
 				  'members' => array( 'name' => _('Members'),
 									  'type' => 'textarea',
-									  'comment' => _('One UID per line'),
+									  'comment' => _('One email address per line'),
 									  'validation' => 'checkemaillist'));
 
 $entries['hidden'] = array( 'name' => 'Hidden',
@@ -163,11 +164,11 @@
 		$ldap_object['member'] = array();
 		$lst = array_unique( array_filter( array_map( 'trim', preg_split( '/\n/', trim($_POST['members']) ) ), 'strlen') );
 		foreach( $lst as $a ) {
-		  $memberdn = $ldap->dnForUid($a);
+		  $memberdn = $ldap->dnForMail($a);
 		  if( $memberdn ) {
 			$ldap_object['member'][] = $memberdn;
 		  } else {
-			$errors[] = _("No such UID $a");
+			$errors[] = _("No user with address $a");
 			break;
 		  }
 		}