steffen: server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist index.php, 1.5, 1.6

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	index.php 
Log Message:
bugfix for infinite loop in index.php

Index: index.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist/index.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- index.php	14 Aug 2004 00:52:59 -0000	1.5
+++ index.php	16 Aug 2004 09:28:25 -0000	1.6
@@ -1,6 +1,6 @@
 <?php
 /*
- *  Copyright (c) 2004 Klarälvdalens Datakonsult AB
+ *  Copyright (c) 2004 Klarälvdalens Datakonsult AB
  *  Copyright (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
  *  Copyright (c) 2003 Martin Konold <martin.konold at erfrakon.de>
  *
@@ -44,7 +44,7 @@
 if( !$errors ) {
   if (isset($_SESSION['base_dn'])) $base_dn = $_SESSION['base_dn'];
   else $base_dn = 'k=kolab';
-  $filter = "(&(cn=*)(objectclass=kolabgroupofnames))";
+  $filter = "(&(cn=*)(objectclass=kolabGroupOfNames))";
   $result = ldap_search($ldap->connection, $base_dn, $filter);
   if( $result ) {
 	$count = ldap_count_entries($ldap->connection, $result);
@@ -56,12 +56,13 @@
 	  $attrs = ldap_get_attributes($ldap->connection, $entry);
 	  $dn = ldap_get_dn($ldap->connection,$entry);
 	  $cn = $attrs['cn'][0];
-	  if( $cn == 'admin' || $cn == 'maintainer' ) continue;
-	  $kolabdeleteflag = $attrs['kolabdeleteflag'][0];
-	  $kolabhomeserver = _('not yet implemented');
-	  $entries[] = array( 'dn' => $dn,
-						  'cn' => $cn,
-						  'deleted' => $kolabdeleteflag );
+	  if( $cn != 'admin' && $cn != 'maintainer' ) {
+		$kolabdeleteflag = $attrs['kolabdeleteflag'][0];
+		$kolabhomeserver = _('not yet implemented');
+		$entries[] = array( 'dn' => $dn,
+							'cn' => $cn,
+							'deleted' => $kolabdeleteflag );
+	  }
 	  $entry = ldap_next_entry( $ldap->connection,$entry );
 	}
   }