summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2010-08-23 09:04:55 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2010-08-23 09:04:55 (GMT)
commit30b3bc5c346519a601488201bfacf93bd845c158 (patch)
tree33eae7284415d5d8a902f161853fdb9a3a3fe0cc
parentfd88a93ad41e18befacbe34e3824adf6e2c824ef (diff)
downloadkolab-webadmin-30b3bc5c346519a601488201bfacf93bd845c158.tar.gz
kolab/issue4515 (Sort some additional lists in the web admin)
-rw-r--r--ChangeLog5
-rw-r--r--lib/KolabAdmin/Ldap.php4
-rw-r--r--www/admin/settings/index.php.in1
3 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1253d6c..65d8d34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2010-08-23 Gunnar Wrobel <p@rdus.de>
+ * lib/KolabAdmin/Ldap.php:
+ * www/admin/settings/index.php.in:
+
+ kolab/issue4515 (Sort some additional lists in the web admin)
+
* php/admin/locale/de/LC_MESSAGES/messages.po:
kolab/issue4511 (Correct the German web admin translation)
diff --git a/lib/KolabAdmin/Ldap.php b/lib/KolabAdmin/Ldap.php
index 5adf608..ac73200 100644
--- a/lib/KolabAdmin/Ldap.php
+++ b/lib/KolabAdmin/Ldap.php
@@ -352,6 +352,7 @@ class KolabLDAP {
$domains[] = $val['cn'][0];
}
}
+ sort($domains);
return $domains;
}
@@ -445,8 +446,9 @@ class KolabLDAP {
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));
diff --git a/www/admin/settings/index.php.in b/www/admin/settings/index.php.in
index 0f78ae9..986d0c6 100644
--- a/www/admin/settings/index.php.in
+++ b/www/admin/settings/index.php.in
@@ -68,6 +68,7 @@ function extract_ldap_values()
$postfixmydomain = $attrs['postfix-mydomain'][0];
$postfixmydestination = $attrs['postfix-mydestination'];
unset($postfixmydestination['count']);
+ sort($postfixmydestination);
unset( $attrs['postfix-mynetworks']['count'] );
$postfixmynetworks = join(', ',$attrs['postfix-mynetworks']);
$postfixallowunauth = $attrs['postfix-allow-unauthenticated'][0];