[Phpgroupware-cvs] CVS: admin/inc hook_acl_manager.inc.php,1.3,1.3.2.1 hook_admin.inc.php,1.26,1.26.2.1

[Mark A Peters <address@hidden>]

Update of /cvsroot/phpgroupware/admin/inc
In directory subversions:/tmp/cvs-serv15194/inc

Modified Files:
      Tag: Version-0_9_14-branch
        hook_acl_manager.inc.php hook_admin.inc.php 
Log Message:
GNU Patch #379.

Index: hook_acl_manager.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/hook_acl_manager.inc.php,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** hook_acl_manager.inc.php    4 Sep 2001 04:26:51 -0000       1.3
--- hook_acl_manager.inc.php    29 Jun 2002 15:58:37 -0000      1.3.2.1
***************
*** 13,17 ****
  
        $GLOBALS['acl_manager']['admin']['site_config_access'] = array(
!               'name' => 'Deny to site configuration',
                'rights' => array(
                        'List config settings'   => 1,
--- 13,17 ----
  
        $GLOBALS['acl_manager']['admin']['site_config_access'] = array(
!               'name' => 'Deny access to site configuration',
                'rights' => array(
                        'List config settings'   => 1,
***************
*** 95,96 ****
--- 95,125 ----
                )
        );
+ 
+       $GLOBALS['acl_manager']['admin']['access_log_access'] = array(
+               'name' => 'Deny access to session log',
+               'rights' => array(
+                       'Show session log' => 1
+               )
+       );
+ 
+       $GLOBALS['acl_manager']['admin']['error_log_access'] = array(
+               'name' => 'Deny access to error log',
+               'rights' => array(
+                       'Show error log' => 1
+               )
+       );
+ 
+       $GLOBALS['acl_manager']['admin']['appreg_access'] = array(
+               'name' => 'Deny access to application registery',
+               'rights' => array(
+                       'Register applications' => 1
+               )
+       );
+ 
+       $GLOBALS['acl_manager']['admin']['info_access'] = array(
+               'name' => 'Deny access to phpinfo',
+               'rights' => array(
+                       'Show phpinfo()' => 1
+               )
+       );
+ 

Index: hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/hook_admin.inc.php,v
retrieving revision 1.26
retrieving revision 1.26.2.1
diff -C2 -r1.26 -r1.26.2.1
*** hook_admin.inc.php  6 Jan 2002 05:01:29 -0000       1.26
--- hook_admin.inc.php  29 Jun 2002 15:58:37 -0000      1.26.2.1
***************
*** 51,61 ****
                $file['View Sessions'] = 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicurrentsessions.list_sessions');
        }
  
!       /* These need to be added still */
!       $file['View Access Log'] = 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccess_history.list_history');
!       $file['View Error Log']  = 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uilog.list_log');
!       $file['Find and Register all Application Hooks'] = 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.boapplications.register_all_hooks');
!       $file['phpInfo']         = "javascript:openwindow('" . 
$GLOBALS['phpgw']->link('/admin/phpinfo.php') . "')"; 
//$GLOBALS['phpgw']->link('/admin/phpinfo.php');
  
        /* Do not modify below this line */
        display_section('admin','admin',$file);
--- 51,75 ----
                $file['View Sessions'] = 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicurrentsessions.list_sessions');
        }
+       
+       if (! $GLOBALS['phpgw']->acl->check('access_log_access',1,'admin'))
+       {
+               $file['View Access Log'] = 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccess_history.list_history');
+       }
  
!       if (! $GLOBALS['phpgw']->acl->check('error_log_access',1,'admin'))
!       {
!               $file['View Error Log']  = 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uilog.list_log');
!       }
  
+       if (! $GLOBALS['phpgw']->acl->check('appreg_access',1,'admin'))
+       {
+               $file['Find and Register all Application Hooks'] = 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.boapplications.register_all_hooks');
+       }
+ 
+       if (! $GLOBALS['phpgw']->acl->check('info_access',1,'admin'))
+       {
+               $file['phpInfo']         = "javascript:openwindow('" . 
$GLOBALS['phpgw']->link('/admin/phpinfo.php') . "')"; 
//$GLOBALS['phpgw']->link('/admin/phpinfo.php');
+       }
+  
        /* Do not modify below this line */
        display_section('admin','admin',$file);