steffen: server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist list.php, 1.6, 1.7

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	list.php 
Log Message:
use uids for distribution lists

Index: list.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist/list.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- list.php	7 Jul 2004 16:51:13 -0000	1.6
+++ list.php	14 Jul 2004 00:49:06 -0000	1.7
@@ -59,7 +59,9 @@
   $form->entries['action']['value'] = 'save';
   $m = $ldap_object['member'];
   unset( $m['count'] );
-  $form->entries['members']['value'] = join("\r\n", $m);
+  $form->entries['members']['value'] = join("\r\n", 
+											array_map( create_function( '$dn', 
+											'global $ldap;return $ldap->uidForDn($dn);' ), $m) );
   $internaldn = 'cn=internal,'.domain_dn();
   debug("internaldn=\"$internaldn\"");
   debug("dn=\"$dn\"");
@@ -92,7 +94,7 @@
 								 'comment' => 'Required' ),
 				  'members' => array( 'name' => 'Members',
 									  'type' => 'textarea',
-									  'comment' => 'One DN per line',
+									  'comment' => 'One UID per line',
 									  'validation' => 'checkemaillist'));
 
 $entries['hidden'] = array( 'name' => 'Hidden',
@@ -142,7 +144,13 @@
 		$ldap_object['member'] = array();
 		$lst = array_unique( array_filter( array_map( 'trim', preg_split( '/\n/', trim($_POST['members']) ) ), 'strlen') );
 		foreach( $lst as $a ) {
-		  $ldap_object['member'][] = $a;
+		  $memberdn = $ldap->dnForUid($a);
+		  if( $memberdn ) {
+			$ldap_object['member'][] = $memberdn;
+		  } else {
+			$errors[] = "No such UID $a";
+			break;
+		  }
 		}
 		if( !$ldap_object['member'] ) unset($ldap_object['member']);