From e51e18047802c84da9bf97d3921f10d8f3eba5b7 Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Fri, 29 Feb 2008 13:05:22 +0000 Subject: [PATCH] resolving of problems regarding 2 classes responsible for the admin prefs_sidebox (admin_prefs_sidebox_hooks + hook_admin) --- .../class.admin_prefs_sidebox_hooks.inc.php | 20 ++++++++----------- admin/setup/setup.inc.php | 2 -- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/admin/inc/class.admin_prefs_sidebox_hooks.inc.php b/admin/inc/class.admin_prefs_sidebox_hooks.inc.php index 7bfebd6396..5a68de132a 100644 --- a/admin/inc/class.admin_prefs_sidebox_hooks.inc.php +++ b/admin/inc/class.admin_prefs_sidebox_hooks.inc.php @@ -43,20 +43,14 @@ class admin_prefs_sidebox_hooks if (! $GLOBALS['egw']->acl->check('site_config_access',1,'admin')) { $file['Site Configuration'] = $GLOBALS['egw']->link('/index.php','menuaction=admin.uiconfig.index&appname=admin'); - } - - /* + } + + /* disabled it, til it does something useful if (! $GLOBALS['egw']->acl->check('peer_server_access',1,'admin')) { $file['Peer Servers'] = $GLOBALS['egw']->link('/index.php','menuaction=admin.uiserver.list_servers'); - } - */ - if (! $GLOBALS['egw']->acl->check('account_access',1,'admin')) - { - $file['User Accounts'] = $GLOBALS['egw']->link('/index.php','menuaction=admin.uiaccounts.list_users'); } - - + */ if (! $GLOBALS['egw']->acl->check('account_access',1,'admin')) { $file['User Accounts'] = $GLOBALS['egw']->link('/index.php','menuaction=admin.uiaccounts.list_users'); @@ -86,7 +80,7 @@ class admin_prefs_sidebox_hooks { $file['View Sessions'] = $GLOBALS['egw']->link('/index.php','menuaction=admin.uicurrentsessions.list_sessions'); } - + if (! $GLOBALS['egw']->acl->check('access_log_access',1,'admin')) { $file['View Access Log'] = $GLOBALS['egw']->link('/index.php','menuaction=admin.uiaccess_history.list_history'); @@ -114,8 +108,10 @@ class admin_prefs_sidebox_hooks if (! $GLOBALS['egw']->acl->check('info_access',1,'admin')) { - $file['phpInfo'] = "javascript:openwindow('" . $GLOBALS['egw']->link('/admin/phpinfo.php') . "')"; + $file['phpInfo'] = "javascript:openwindow('" . $GLOBALS['egw']->link('/admin/phpinfo.php') . "')"; //$GLOBALS['egw']->link('/admin/phpinfo.php'); } + $file['Admin queue and history'] = $GLOBALS['egw']->link('/index.php','menuaction=admin.admin_cmds.index'); + $file['Remote administration instances'] = $GLOBALS['egw']->link('/index.php','menuaction=admin.admin_cmds.remotes'); if ($location == 'admin') { diff --git a/admin/setup/setup.inc.php b/admin/setup/setup.inc.php index 82b52083ec..ae0b89be2e 100755 --- a/admin/setup/setup.inc.php +++ b/admin/setup/setup.inc.php @@ -33,14 +33,12 @@ $setup_info['admin']['description'] = 'eGroupWare administration application'; $setup_info['admin']['hooks'] = array( 'acl_manager', 'add_def_pref', - 'admin', 'after_navbar', 'config', 'deleteaccount', 'view_user' => 'admin.uiaccounts.edit_view_user_hook', 'edit_user' => 'admin.uiaccounts.edit_view_user_hook', 'group_manager' => 'admin.uiaccounts.edit_group_hook', - 'sidebox_menu', 'topmenu_info' ); $setup_info['admin']['hooks']['preferences'] =$setup_info['admin']['name'].'.admin_prefs_sidebox_hooks.all_hooks';