steffen: server/kolab-webadmin/kolab-webadmin/www/admin/administrator index.php, 1.4, 1.5

cvs at intevation.de cvs at intevation.de
Fri Nov 19 02:32:28 CET 2004


Author: steffen

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

Modified Files:
	index.php 
Log Message:
Fix for Issue485 (manager gone from webgui)

Index: index.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/administrator/index.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- index.php	20 Aug 2004 02:10:00 -0000	1.4
+++ index.php	19 Nov 2004 01:32:26 -0000	1.5
@@ -36,7 +36,8 @@
   $result = ldap_search($ldap->connection, $base_dn, $filter, array( 'uid', 'sn', 'cn', 'kolabdeleteflag' ));
 
   if( $result ) {
-	$title = _('Manage Administrators (').count($maintainers)._(' Administrators)');
+	$count = count($maintainers)-1;
+	$title = _('Manage Administrators (').$count._(' Administrators)');
 	// if there are more than 2000 entries, split in 26 categories for every letter,
 	// or if more than 50, put in groups, or else just show all.
 	if (false && $count > 2000) {
@@ -57,21 +58,23 @@
 		$dn = ldap_get_dn($ldap->connection,$entry);
 		$deleted = array_key_exists('kolabdeleteflag',$attrs)?$attrs['kolabdeleteflag'][0]:"FALSE";
         $userid = $attrs['uid'][0];
-        $sn = $attrs['sn'][0];
-        $cn = $attrs['cn'][0];
-        $a = strlen($sn);
-        $b = strlen($cn);
-        $fn = substr($cn, 0, $b - $a);
-		// skip admins and maintainers
-		if( array_key_exists( $dn, $maintainers ) ) {
-		  $entries[] = array( 'dn' => $dn,
-							  'sn' => $sn,
-							  'fn' => $fn,
-							  'uid' => $userid,
-							  'deleted' => $deleted );
+		if( $userid != 'manager' ) {
+		  $sn = $attrs['sn'][0];
+		  $cn = $attrs['cn'][0];
+		  $a = strlen($sn);
+		  $b = strlen($cn);
+		  $fn = substr($cn, 0, $b - $a);
+		  // skip admins and maintainers
+		  if( array_key_exists( $dn, $maintainers ) ) {
+			$entries[] = array( 'dn' => $dn,
+								'sn' => $sn,
+								'fn' => $fn,
+								'uid' => $userid,
+								'deleted' => $deleted );
+		  }
 		}
 		$entry = ldap_next_entry( $ldap->connection,$entry );
-	  }
+	  }	  
 	}
   }
 }





More information about the commits mailing list