gunnar: server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin Ldap.php, 1.3, 1.4

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin
In directory doto:/tmp/cvs-serv3314/kolab-webadmin/kolab-webadmin/lib/KolabAdmin

Modified Files:
	Ldap.php 
Log Message:
kolab/issue4515 (Sort some additional lists in the web admin)

Index: Ldap.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Ldap.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Ldap.php	21 Feb 2010 10:04:49 -0000	1.3
+++ Ldap.php	23 Aug 2010 09:04:55 -0000	1.4
@@ -352,6 +352,7 @@
 		$domains[] = $val['cn'][0];
 	  }
 	}
+	sort($domains);
 	return $domains;
   }
 
@@ -445,8 +446,9 @@
 	if( $reload || !$this->cached_domains ) {
 	  $kolab_obj = $this->read( 'k=kolab,'.$_SESSION['base_dn'] );
 	  if( !$kolab_obj ) return false;
+	  unset($kolab_obj['postfix-mydestination']['count']);
+	  sort($kolab_obj['postfix-mydestination']);
 	  $this->cached_domains = $kolab_obj['postfix-mydestination'];
-	  unset($this->cached_domains['count']);
 	  debug("loading domains");
 	}
 	debug("ldap->domains() returns ".join(", ", $this->cached_domains));