summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2010-08-23 15:01:26 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2010-08-23 15:01:26 (GMT)
commitb0c4a3c4ed68f130998b15fb3e69df9a5de72949 (patch)
tree76b2cec5cbb1ccc2f0d545025f3b19d0069dbea0
parentf47beaf22f091cc7323fd9a9bf8f990b17373dd4 (diff)
downloadkolab-webadmin-b0c4a3c4ed68f130998b15fb3e69df9a5de72949.tar.gz
Complete kolab/issue4512 (Allow to hide the admin mail settings in the web admin)
-rw-r--r--ChangeLog1
-rw-r--r--www/admin/settings/index.php.in5
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fac1fe0..5abcdfd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
2010-08-23 Gunnar Wrobel <p@rdus.de>
* kolab-webadmin.spec:
+ * www/admin/settings/index.php.in:
Support template based configuration of the web admin.
kolab/issue4512 (Allow to hide the admin mail settings in the web admin)
diff --git a/www/admin/settings/index.php.in b/www/admin/settings/index.php.in
index 986d0c6..6dc5ba9 100644
--- a/www/admin/settings/index.php.in
+++ b/www/admin/settings/index.php.in
@@ -317,7 +317,10 @@ $smarty->assign( 'maincontent', 'settings.tpl' );
$systemaliasconf = array();
-if( $auth->group() == 'admin' ) {
+// Section administrative email addresses may be hidden by
+// setting HIDE_ADMINISTRATIVE_EMAILSETTINGS to 'true' in
+// php/admin/include/conf.php
+if( $auth->group() == 'admin' && !HIDE_ADMINISTRATIVE_EMAILSETTINGS) {
$domain_count = 0;
foreach( $ldap->domains() as $domain ) {
if( !exists_group( 'hostmaster@'.$domain ) ||