steffen: server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist list.php, 1.1, 1.2
cvs at intevation.de
cvs at intevation.de
Fri May 21 15:03:11 CEST 2004
Author: steffen
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist
In directory doto:/tmp/cvs-serv21090/kolab-webadmin/www/admin/distributionlist
Modified Files:
list.php
Log Message:
bugfixes
Index: list.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist/list.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- list.php 17 May 2004 15:24:26 -0000 1.1
+++ list.php 21 May 2004 13:03:09 -0000 1.2
@@ -21,9 +21,9 @@
function checkemaillist( $form, $key, $value ) {
if( $key == 'members' ) {
$lst = array_unique( array_filter( array_map( 'trim', preg_split( '/\n/', $value ) ), 'strlen') );
- foreach( $lst as $a ) {
+ /*foreach( $lst as $a ) {
if( !ereg('.*@.*', $a ) ) return 'Invalid email address syntax';
- }
+ }*/
}
return '';
}
@@ -60,7 +60,7 @@
'comment' => 'Required' ),
'members' => array( 'name' => 'Members',
'type' => 'textarea',
- 'comment' => 'One address per line',
+ 'comment' => 'One DN per line',
'validation' => 'checkemaillist'));
@@ -96,7 +96,11 @@
$cn = trim($_POST['cn']);
$ldap_object['cn'] = $cn;
-
+ $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;
+ }
if ($action == "save") {
if (!$errors) {
@@ -111,14 +115,14 @@
array_push($errors, "LDAP Error: could not rename ".$dn.
" to ".$newdn." ".ldap_error($ldap->connection));
} else {
- $messages[] = 'Shared folder updated';
+ $messages[] = 'Distribution List updated';
}
$dn = $newdn;
} else array_push($errors,"LDAP Error: could not read ".$dn." ".ldap_error($ldap->connection));
} else {
if (!ldap_modify($ldap->connection, $dn, $ldap_object))
array_push($errors, "LDAP Error: could not modify object ".$dn." ".ldap_error($ldap->connection));
- else $messages[] = 'Shared folder updated';
+ else $messages[] = 'Distribution List updated';
}
}
} else {
@@ -126,7 +130,7 @@
$dn = "cn=".$ldap_object['cn'].",".$sf_root;
if ($dn && !ldap_add($ldap->connection, $dn, $ldap_object))
array_push($errors, "LDAP Error: could not add object ".$dn." ".ldap_error($ldap->connection));
- else $messages[] = 'Shared folder '.$cn.' added';
+ else $messages[] = 'Distribution List '.$cn.' added';
}
if ($errors) {
//print("<div class=\"maintitle\"> Create New Address Book Entry </div>\n");
@@ -161,7 +165,7 @@
}
break;
case 'delete':
- $result = $ldap->search( $dn, '(objectClass=sharedfolder)' );
+ $result = $ldap->search( $dn, '(objectClass=groupOfNames)' );
if( $result ) {
$ldap_object = ldap_get_entries( $ldap->connection, $result );
if( $ldap_object['count'] == 1 ) {
@@ -171,7 +175,7 @@
$form->entries[$key]['attrs'] = 'readonly';
}
$form->submittext = 'Delete';
- $heading = 'Delete Shared Folder';
+ $heading = 'Delete Distribution List';
$content = $form->outputForm();
} else {
array_push($errors, "Error: Multiple results returned for DN $dn");
@@ -183,7 +187,7 @@
$ldap_object = array();
$ldap_object['deleteflag'] = 'TRUE';
if( ldap_modify($ldap->connection, $dn, $ldap_object) ) {
- $messages[] = 'Shared folder '.$_REQUEST['cn'].' marked for deletion';
+ $messages[] = 'Distribution List '.$_REQUEST['cn'].' marked for deletion';
$heading = 'Entry Deleted';
$contenttemplate = 'sfdeleted.tpl';
} else {
More information about the commits
mailing list