steffen: server/kolab-webadmin/kolab-webadmin/www/admin index.php.in, 1.1, 1.2

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	index.php.in 
Log Message:
Fix for issue1100 (multidomain admin aliases)

Index: index.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/index.php.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- index.php.in	5 Feb 2006 20:13:55 -0000	1.1
+++ index.php.in	22 Feb 2006 00:36:27 -0000	1.2
@@ -1,6 +1,6 @@
 <?php
 /*
- *  Copyright (c) 2004 Klarälvdalens Datakonsult AB
+ *  Copyright (c) 2004-2006 Klarälvdalens Datakonsult AB
  *
  *    Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
  *
@@ -29,7 +29,7 @@
 
 function exists_group( $group ) {
   global $ldap;
-  $filter = '(&(objectClass=kolabGroupOfNames)(cn='.$ldap->escape($group).'))';
+  $filter = '(&(objectClass=kolabGroupOfNames)(mail='.$ldap->escape($group).'))';
   $res = $ldap->search( $_SESSION['base_dn'], $filter, array( 'dn' ) );
   return ( $ldap->count($res) > 0 );
 }
@@ -37,13 +37,16 @@
 /**** Check for system aliases ****/
 $maincontent = 'welcome.tpl';
 if( $auth->group() == 'admin' ) {
-  if( !exists_group( 'hostmaster' ) ||
-	  !exists_group( 'postmaster' ) ||
-	  !exists_group( 'abuse' ) ||
-	  !exists_group( 'virusalert' ) ||
-	  !exists_group( 'MAILER-DAEMON' ) ) {
-	// Ok, user did not set up system aliases
-	$maincontent = 'systemaliasnagscreen.tpl';
+  $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 ) ) {
+	  // Ok, user did not set up system aliases
+	  $maincontent = 'systemaliasnagscreen.tpl';
+	}
   }
 }