summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2010-08-23 15:10:40 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2010-08-23 15:10:40 (GMT)
commit22ae9707b24287f54b4c500221e2df721176c663 (patch)
treef3dc4a725cef5af79821789faf291628010a152c
parentb0c4a3c4ed68f130998b15fb3e69df9a5de72949 (diff)
downloadkolab-webadmin-22ae9707b24287f54b4c500221e2df721176c663.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/index.php.in11
2 files changed, 7 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 5abcdfd..48a96e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
2010-08-23 Gunnar Wrobel <p@rdus.de>
* kolab-webadmin.spec:
+ * www/admin/index.php.in:
* www/admin/settings/index.php.in:
Support template based configuration of the web admin.
diff --git a/www/admin/index.php.in b/www/admin/index.php.in
index 4ec30d3..8515587 100644
--- a/www/admin/index.php.in
+++ b/www/admin/index.php.in
@@ -39,11 +39,12 @@ $maincontent = 'welcome.tpl';
if( $auth->group() == 'admin' ) {
$domains = $ldap->domains();
foreach( $domains as $domain ) {
- if( !exists_group( 'hostmaster@'.$domain ) ||
- !exists_group( 'postmaster@'.$domain ) ||
- !exists_group( 'abuse@'.$domain ) ||
- !exists_group( 'virusalert@'.$domain ) ||
- !exists_group( 'MAILER-DAEMON@'.$domain ) ) {
+ if( (!exists_group( 'hostmaster@'.$domain ) ||
+ !exists_group( 'postmaster@'.$domain ) ||
+ !exists_group( 'abuse@'.$domain ) ||
+ !exists_group( 'virusalert@'.$domain ) ||
+ !exists_group( 'MAILER-DAEMON@'.$domain ))
+ && !HIDE_ADMINISTRATIVE_EMAILSETTINGS) {
// Ok, user did not set up system aliases
$maincontent = 'systemaliasnagscreen.tpl';
}