steffen: server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist list.php, 1.15, 1.16

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	list.php 
Log Message:
mail attribute for kolabGroupOfNames -- its not used for _anything_ internally (Issue533)

Index: list.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist/list.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- list.php	11 Mar 2005 09:11:15 -0000	1.15
+++ list.php	27 Apr 2005 19:47:49 -0000	1.16
@@ -52,6 +52,13 @@
   return '';
 }
 
+function mail_domain()
+{
+  global $ldap;
+  $kolab = $ldap->read( 'k=kolab,'.$_SESSION['base_dn'] );
+  return $kolab['postfix-mydomain'][0];
+}
+
 function checkuniquemail( $form, $key, $value ) {
   global $ldap;
   if( $key == 'cn' ) {
@@ -164,8 +171,11 @@
 
 		$ldap_object = array('objectClass' => 'kolabGroupOfNames');
 		$cn = strtolower(trim($_POST['cn']));
+
+		// Keep cn and mail in sync
 		$ldap_object['cn'] = $cn;
-		
+		$ldap_object['mail'] = $cn.'@'.mail_domain();
+
 		$ldap_object['member'] = array();
 		$lst = array_unique( array_filter( array_map( 'trim', preg_split( '/\n/', trim($_POST['members']) ) ), 'strlen') );
 		foreach( $lst as $a ) {