steffen: server/kolab-webadmin/kolab-webadmin/php/admin/include menu.php, 1.14, 1.15

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include
In directory doto:/tmp/cvs-serv6749/kolab-webadmin/php/admin/include

Modified Files:
	menu.php 
Log Message:
patches from wrobel

Index: menu.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/menu.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- menu.php	24 Jul 2005 21:47:41 -0000	1.14
+++ menu.php	17 May 2006 23:15:32 -0000	1.15
@@ -41,13 +41,16 @@
 												 array( 'name' => _('Vacation'),
 														'url'  => 'vacation.php' )));
 }
-if( $auth->group() == "admin" || $auth->group() == "maintainer" || $auth->group() == 'domain-maintainer') {
+if( $auth->group() == "admin" || $auth->group() == "maintainer") {
   $menuitems['addressbook'] = array( 'name' => _('Addressbook'),
 									 'url'  => $topdir.'/addressbook/',
 									 'title' => _('Manage Address Book'),
 									 'submenu' => array( 
 														array( 'name' => _('Create New vCard'),
 															   'url' => 'addr.php?action=create' )));
+
+}
+if( $auth->group() == "admin" || $auth->group() == "maintainer" || $auth->group() == 'domain-maintainer') {
   $menuitems['sf'] = array( 'name' => _('Shared Folder'),
 							'url'  => $topdir.'/sharedfolder/',
 							'title' => _('Manage Shared Folders'),
@@ -76,8 +79,6 @@
 									   'submenu' => array(
 														  array( 'name' => _('Create New Domain Maintainer'),
 																 'url'   => 'domainmaintainer.php?action=create' ) ) );
-}
-if( $auth->group() == 'admin' ) {
   $menuitems['maintainer'] = array( 'name' => _('Maintainers'),
 									'url'  => $topdir.'/maintainer/',
 									'title' => _('Manage Maintainers'),
@@ -89,8 +90,17 @@
   $menuitems['maintainer'] = array( 'name' => _('Maintainers'),
 									'url'  => $topdir.'/maintainer/maintainer.php?action=modify&dn='.urlencode($mdn),
 									'title' => _('Manage Maintainer') );  
+  $menuitems['domain-maintainer'] = array( 'name' => _('Domain Maintainers'),
+									   'url'  => $topdir.'/domainmaintainer/',
+									   'title' => _('Manage Domain Maintainers'),
+									   'submenu' => array(
+														  array( 'name' => _('Create New Domain Maintainer'),
+																 'url'   => 'domainmaintainer.php?action=create' ) ) );
 } else if( $auth->group() == 'domain-maintainer' ) {
-  // Domain maintainer
+  $mdn = $auth->dn();
+  $menuitems['domain-maintainer'] = array( 'name' => _('Domain Maintainers'),
+									'url'  => $topdir.'/domainmaintainer/domainmaintainer.php?action=modify&dn='.urlencode($mdn),
+									'title' => _('Manage Domain Maintainer') );  
 }
 if( $auth->group() == 'admin' ) {
   $menuitems['service'] = array( 'name' => _('Services'),