steffen: server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist index.php, 1.3, 1.4 list.php, 1.10, 1.11

cvs at intevation.de cvs at intevation.de
Thu Aug 12 12:55:41 CEST 2004


Author: steffen

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

Modified Files:
	index.php list.php 
Log Message:
*BOMB*. Changes to support the new schema

Index: index.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist/index.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- index.php	9 Aug 2004 10:42:35 -0000	1.3
+++ index.php	12 Aug 2004 10:55:39 -0000	1.4
@@ -44,7 +44,7 @@
 if( !$errors ) {
   if (isset($_SESSION['base_dn'])) $base_dn = $_SESSION['base_dn'];
   else $base_dn = 'k=kolab';
-  $filter = "(&(cn=*)(objectclass=groupOfNames))";
+  $filter = "(&(cn=*)(objectclass=kolabgroupofnames))";
   $result = ldap_search($ldap->connection, $base_dn, $filter);
   if( $result ) {
 	$count = ldap_count_entries($ldap->connection, $result);
@@ -56,11 +56,11 @@
 	  $attrs = ldap_get_attributes($ldap->connection, $entry);
 	  $dn = ldap_get_dn($ldap->connection,$entry);
 	  $cn = $attrs['cn'][0];
-	  $deleteflag = $attrs['deleteflag'][0];
-	  $homeserver = _('not yet implemented');
+	  $kolabdeleteflag = $attrs['kolabdeleteflag'][0];
+	  $kolabhomeserver = _('not yet implemented');
 	  $entries[] = array( 'dn' => $dn,
 						  'cn' => $cn,
-						  'deleted' => $deleteflag );
+						  'deleted' => $kolabdeleteflag );
 	  $entry = ldap_next_entry( $ldap->connection,$entry );
 	}
   }

Index: list.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist/list.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- list.php	11 Aug 2004 13:03:07 -0000	1.10
+++ list.php	12 Aug 2004 10:55:39 -0000	1.11
@@ -157,7 +157,7 @@
 		else $visible = true;
 		if (!$visible) $dl_root = "cn=internal,".$dl_root;
 
-		$ldap_object = array('objectClass' => 'groupOfNames');
+		$ldap_object = array('objectClass' => 'kolabgroupofnames');
 		$cn = trim($_POST['cn']);
 		$ldap_object['cn'] = $cn;
 		
@@ -253,7 +253,7 @@
 	}
 	break;
   case 'modify':
-	$result = $ldap->search( $dn, '(objectClass=groupOfNames)' );
+	$result = $ldap->search( $dn, '(objectClass=kolabgroupofnames)' );
 	if( $result ) {
 	  $ldap_object = ldap_get_entries( $ldap->connection, $result );
 	  if( $ldap_object['count'] == 1 ) {
@@ -269,7 +269,7 @@
 	}
 	break;
   case 'delete':
-	$result = $ldap->search( $dn, '(objectClass=groupOfNames)' );
+	$result = $ldap->search( $dn, '(objectClass=kolabgroupofnames)' );
 	if( $result ) {
 	  $ldap_object = ldap_get_entries( $ldap->connection, $result );
 	  if( $ldap_object['count'] == 1 ) {





More information about the commits mailing list