phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] addressbook/inc/hook_admin.inc.php antispam/inc...


From: Dave Hall
Subject: [Phpgroupware-cvs] addressbook/inc/hook_admin.inc.php antispam/inc...
Date: Sat, 09 Sep 2006 09:04:51 +0000

CVSROOT:        /cvsroot/phpgroupware
Module name:    tts
Changes by:     Dave Hall <skwashd>     06/09/09 09:04:51

Modified files:
        addressbook/inc: hook_admin.inc.php 
        antispam/inc   : hook_admin.inc.php 
        backup/inc     : hook_admin.inc.php 
        bookkeeping/inc: hook_admin.inc.php 
        bookmarks/inc  : hook_admin.inc.php 
        calendar/inc   : hook_admin.inc.php 
        chora/inc      : hook_admin.inc.php 
        comic/inc      : hook_admin.inc.php 
        fax/inc        : hook_admin.inc.php 
        felamimail/inc : hook_admin.inc.php 
        filemanager/inc: hook_admin.inc.php 
        forum/inc      : hook_admin.inc.php 
        fudforum/inc   : hook_admin.inc.php 
        ged/inc        : hook_admin.inc.php 
        hr/inc         : hook_admin.inc.php 
        hrm/inc        : hook_admin.inc.php 
        javassh/inc    : hook_admin.inc.php 
        messenger/inc  : hook_admin.inc.php 
        nntp/inc       : hook_admin.inc.php 
        notes/inc      : hook_admin.inc.php 
        pbwebmaui/inc  : hook_admin.inc.php 
        phpbrain/inc   : hook_admin.inc.php 
        projects/inc   : hook_admin.inc.php 
        property/inc   : hook_admin.inc.php 
        qmailldap/inc  : hook_admin.inc.php 
        registration/inc: hook_admin.inc.php 
        sitemgr/inc    : hook_admin.inc.php 
        sync/inc       : hook_admin.inc.php 
        todo/inc       : hook_admin.inc.php 
        inc            : hook_admin.inc.php 

Log message:
        fix link extrvars arg

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/addressbook/inc/hook_admin.inc.php?cvsroot=phpgroupware&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/antispam/inc/hook_admin.inc.php?cvsroot=phpgroupware&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/backup/inc/hook_admin.inc.php?cvsroot=phpgroupware&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/bookkeeping/inc/hook_admin.inc.php?cvsroot=phpgroupware&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/bookmarks/inc/hook_admin.inc.php?cvsroot=phpgroupware&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/hook_admin.inc.php?cvsroot=phpgroupware&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/chora/inc/hook_admin.inc.php?cvsroot=phpgroupware&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/comic/inc/hook_admin.inc.php?cvsroot=phpgroupware&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/fax/inc/hook_admin.inc.php?cvsroot=phpgroupware&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/hook_admin.inc.php?cvsroot=phpgroupware&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/filemanager/inc/hook_admin.inc.php?cvsroot=phpgroupware&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/forum/inc/hook_admin.inc.php?cvsroot=phpgroupware&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/fudforum/inc/hook_admin.inc.php?cvsroot=phpgroupware&r1=1.1.1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/ged/inc/hook_admin.inc.php?cvsroot=phpgroupware&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/hr/inc/hook_admin.inc.php?cvsroot=phpgroupware&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/hrm/inc/hook_admin.inc.php?cvsroot=phpgroupware&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/javassh/inc/hook_admin.inc.php?cvsroot=phpgroupware&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/messenger/inc/hook_admin.inc.php?cvsroot=phpgroupware&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/nntp/inc/hook_admin.inc.php?cvsroot=phpgroupware&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/notes/inc/hook_admin.inc.php?cvsroot=phpgroupware&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/pbwebmaui/inc/hook_admin.inc.php?cvsroot=phpgroupware&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/phpbrain/inc/hook_admin.inc.php?cvsroot=phpgroupware&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/projects/inc/hook_admin.inc.php?cvsroot=phpgroupware&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/property/inc/hook_admin.inc.php?cvsroot=phpgroupware&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/qmailldap/inc/hook_admin.inc.php?cvsroot=phpgroupware&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/registration/inc/hook_admin.inc.php?cvsroot=phpgroupware&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/sitemgr/inc/hook_admin.inc.php?cvsroot=phpgroupware&only_with_tag=skwashd-16-compat&r1=1.2.2.2&r2=1.2.2.2.4.1
http://cvs.savannah.gnu.org/viewcvs/sync/inc/hook_admin.inc.php?cvsroot=phpgroupware&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/todo/inc/hook_admin.inc.php?cvsroot=phpgroupware&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/tts/inc/hook_admin.inc.php?cvsroot=phpgroupware&r1=1.6&r2=1.7

Patches:
Index: addressbook/inc/hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/hook_admin.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- addressbook/inc/hook_admin.inc.php  9 Sep 2006 05:37:38 -0000       1.18
+++ addressbook/inc/hook_admin.inc.php  9 Sep 2006 09:04:48 -0000       1.19
@@ -10,7 +10,7 @@
        *  option) any later version.                                           
   *
        
\**************************************************************************/
 
-       // $Id: hook_admin.inc.php,v 1.18 2006/09/09 05:37:38 skwashd Exp $
+       // $Id: hook_admin.inc.php,v 1.19 2006/09/09 09:04:48 skwashd Exp $
        // $Source: /cvsroot/phpgroupware/addressbook/inc/hook_admin.inc.php,v $
 
        // Only Modify the $file and $title variables.....
@@ -26,5 +26,5 @@
                'Notes Types Manager'                   =>  
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'addressbook.uicatalog_contact_note_type.view') )
        );
        //Do not modify below this line
-       display_section($appname,$title,$file);
+       $GLOBALS['phpgw']->common->display_mainscreen($appname,$file);
 ?>

Index: antispam/inc/hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/antispam/inc/hook_admin.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- antispam/inc/hook_admin.inc.php     23 Apr 2003 01:17:49 -0000      1.2
+++ antispam/inc/hook_admin.inc.php     9 Sep 2006 09:04:48 -0000       1.3
@@ -13,13 +13,13 @@
        *  Free Software Foundation; either version 2 of the License, or (at 
your  *
        *  option) any later version.                                           
   *
        
\**************************************************************************/
-       /* $Id: hook_admin.inc.php,v 1.2 2003/04/23 01:17:49 ceb Exp $ */
+       /* $Id: hook_admin.inc.php,v 1.3 2006/09/09 09:04:48 skwashd Exp $ */
 
        {
                $file = array
                (
-                       'DefaultRules'  =>      
$GLOBALS['phpgw']->link('/index.php','menuaction=antispam.checker.default_settings&address@hidden'),
-                       'Rules' =>      
$GLOBALS['phpgw']->link('/index.php','menuaction=antispam.main_manager.handle_rules')
+                       'DefaultRules'  =>      
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'antispam.checker.default_settings', 'id' => '@GLOBAL') ),
+                       'Rules'                 =>      
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'antispam.main_manager.handle_rules') )
                );
                //Do not modify below this line
                $GLOBALS['phpgw']->common->display_mainscreen($appname,$file);

Index: backup/inc/hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/backup/inc/hook_admin.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- backup/inc/hook_admin.inc.php       19 Apr 2003 23:18:52 -0000      1.4
+++ backup/inc/hook_admin.inc.php       9 Sep 2006 09:04:48 -0000       1.5
@@ -8,14 +8,14 @@
   *  Free Software Foundation; either version 2 of the License, or (at your  *
   *  option) any later version.                                              *
   \**************************************************************************/
-  /* $Id: hook_admin.inc.php,v 1.4 2003/04/19 23:18:52 ceb Exp $ */
+  /* $Id: hook_admin.inc.php,v 1.5 2006/09/09 09:04:48 skwashd Exp $ */
 
        {
 // Only Modify the $file and $title variables.....
-               $file = Array
+               $file = array
                (
-                       'Site Configuration'    => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=' 
. $appname),
-                       'Backup Administration' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=backup.uibackup.backup_admin')
+                       'Site Configuration'    => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'admin.uiconfig.index', 'appname' => $appname) ),
+                       'Backup Administration' => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'backup.uibackup.backup_admin') )
                );
 
 //Do not modify below this line

Index: bookkeeping/inc/hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/bookkeeping/inc/hook_admin.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- bookkeeping/inc/hook_admin.inc.php  1 Dec 2003 16:31:34 -0000       1.11
+++ bookkeeping/inc/hook_admin.inc.php  9 Sep 2006 09:04:48 -0000       1.12
@@ -1,6 +1,6 @@
 <?php
        
/**************************************************************************\
-       * phpGroupWare - projects administration                                
   *
+       * phpGroupWare - bookkeeping                                            
   *
        * http://www.phpgroupware.org                                           
   *
        * --------------------------------------------                          
   *
        *  This program is free software; you can redistribute it and/or modify 
it *
@@ -8,16 +8,16 @@
        *  Free Software Foundation; either version 2 of the License, or (at 
your  *
        *  option) any later version.                                           
   *
        
\**************************************************************************/
-       /* $Id: hook_admin.inc.php,v 1.11 2003/12/01 16:31:34 ceb Exp $ */
+       /* $Id: hook_admin.inc.php,v 1.12 2006/09/09 09:04:48 skwashd Exp $ */
 
        {
 // Only Modify the $file and $title variables.....
-               $file = Array
+               $file = array
                (
-                       'Site Configuration'    => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=' 
. $appname),
-                       'Global Categories'             => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname='
 . $appname)
+                       'Site Configuration'    => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'admin.uiconfig.index', 'appname' => 'bookkeeping') ),
+                       'Global Categories'             => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'admin.uicategories.index', 'appname' => 'bookkeeping') )
                );
-//Do not modify below this line
-               display_section($appname,$appname,$file);
+               //Do not modify below this line
+               $GLOBALS['phpgw']->common->display_mainscreen($appname,$file);
        }
 ?>

Index: bookmarks/inc/hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/bookmarks/inc/hook_admin.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- bookmarks/inc/hook_admin.inc.php    28 Apr 2005 18:59:46 -0000      1.10
+++ bookmarks/inc/hook_admin.inc.php    9 Sep 2006 09:04:48 -0000       1.11
@@ -5,13 +5,13 @@
        * @copyright Copyright (C) 2005 Free Software Foundation, Inc. 
http://www.fsf.org/
        * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
        * @package bookmarks
-       * @version $Id: hook_admin.inc.php,v 1.10 2005/04/28 18:59:46 powerstat 
Exp $
+       * @version $Id: hook_admin.inc.php,v 1.11 2006/09/09 09:04:48 skwashd 
Exp $
        */
 
        $file = Array
        (
-               'Site Configuration' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=' 
. $appname),
-               'Global Categories' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname='
 . $appname)
+               'Site Configuration' => $GLOBALS['phpgw']->link('/index.php', 
array('menuaction' => 'admin.uiconfig.index', 'appname' => 'bookmarks') ),
+               'Global Categories' => $GLOBALS['phpgw']->link('/index.php', 
array('menuaction' => 'admin.uicategories.index', 'appname' => 'bookmarks') )
        );
        $GLOBALS['phpgw']->common->display_mainscreen($appname,$file);
 ?>

Index: calendar/inc/hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/hook_admin.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- calendar/inc/hook_admin.inc.php     9 Sep 2006 05:33:30 -0000       1.16
+++ calendar/inc/hook_admin.inc.php     9 Sep 2006 09:04:48 -0000       1.17
@@ -10,7 +10,7 @@
        *  option) any later version.                                           
   *
        
\**************************************************************************/
 
-       /* $Id: hook_admin.inc.php,v 1.16 2006/09/09 05:33:30 skwashd Exp $ */
+       /* $Id: hook_admin.inc.php,v 1.17 2006/09/09 09:04:48 skwashd Exp $ */
 {
 // Only Modify the $file and $title variables.....
        $title = $appname;
@@ -22,6 +22,6 @@
                'Global Categories'                             => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'admin.uicategories.index', 'appname' => 'calendar') )
        );
 //Do not modify below this line
-       display_section($appname,$title,$file);
+       $GLOBALS['phpgw']->common->display_mainscreen($appname,$file);
 }
 ?>

Index: chora/inc/hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/chora/inc/hook_admin.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- chora/inc/hook_admin.inc.php        23 Apr 2003 01:39:18 -0000      1.9
+++ chora/inc/hook_admin.inc.php        9 Sep 2006 09:04:49 -0000       1.10
@@ -9,12 +9,12 @@
        *  Free Software Foundation; either version 2 of the License, or (at 
your  *
        *  option) any later version.                                           
   *
        
\**************************************************************************/
-       /* $Id: hook_admin.inc.php,v 1.9 2003/04/23 01:39:18 ceb Exp $ */
+       /* $Id: hook_admin.inc.php,v 1.10 2006/09/09 09:04:49 skwashd Exp $ */
 
        {
                $file = Array
                (
-                       'Site Configuration'     => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=' 
. $appname),
+                       'Site Configuration'            => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'admin.uiconfig.index', 'appname' => $appname) ),
                        'Edit CVS Repository List' => 
$GLOBALS['phpgw']->link('/chora/sites.php')
                );
 

Index: comic/inc/hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/comic/inc/hook_admin.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- comic/inc/hook_admin.inc.php        20 Jul 2004 23:51:55 -0000      1.11
+++ comic/inc/hook_admin.inc.php        9 Sep 2006 09:04:49 -0000       1.12
@@ -10,16 +10,16 @@
        *  option) any later version.                                           
   *
        
\**************************************************************************/
 
-       /* $Id: hook_admin.inc.php,v 1.11 2004/07/20 23:51:55 skwashd Exp $ */
+       /* $Id: hook_admin.inc.php,v 1.12 2006/09/09 09:04:49 skwashd Exp $ */
 {
 // Only Modify the $file and $title variables.....
-       $title = 'Daily Comics';
-       $file = Array(
+       $file = array
+       (
                'Global Options'                => 
$GLOBALS['phpgw']->link('/comic/admin_options.php'),
                'Global Comics' => 
$GLOBALS['phpgw']->link('/comic/admin_comics.php'),
                'Reset Comic Data'      => 
$GLOBALS['phpgw']->link('/comic/admin_comics_reset.php')
        );
 //Do not modify below this line
-       display_section($appname,$title,$file);
+       $GLOBALS['phpgw']->common->display_mainscreen($appname,$file);
 }
 ?>

Index: fax/inc/hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/fax/inc/hook_admin.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- fax/inc/hook_admin.inc.php  23 Apr 2003 01:41:26 -0000      1.3
+++ fax/inc/hook_admin.inc.php  9 Sep 2006 09:04:49 -0000       1.4
@@ -14,12 +14,12 @@
 *  option) any later version.                                              *
 \**************************************************************************/
 
-/* $Id: hook_admin.inc.php,v 1.3 2003/04/23 01:41:26 ceb Exp $ */
+/* $Id: hook_admin.inc.php,v 1.4 2006/09/09 09:04:49 skwashd Exp $ */
 
 {
        $file = array
          (
-          'Global settings'    =>      
$GLOBALS['phpgw']->link('/index.php','menuaction=fax.manager.globalsettings')
+               'Global settings'       =>      
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'fax.manager.globalsettings') )
           );
     
        //Do not modify below this line

Index: felamimail/inc/hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/hook_admin.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- felamimail/inc/hook_admin.inc.php   23 Apr 2003 01:42:02 -0000      1.7
+++ felamimail/inc/hook_admin.inc.php   9 Sep 2006 09:04:49 -0000       1.8
@@ -8,12 +8,12 @@
        *  Free Software Foundation; either version 2 of the License, or (at 
your  *
        *  option) any later version.                                           
   *
        
\**************************************************************************/
-       /* $Id: hook_admin.inc.php,v 1.7 2003/04/23 01:42:02 ceb Exp $ */
+       /* $Id: hook_admin.inc.php,v 1.8 2006/09/09 09:04:49 skwashd Exp $ */
        {
 // Only Modify the $file and $title variables.....
                $file = Array
                (
-                       'Site Configuration' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=' 
. $appname)
+                       'Site Configuration' => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction=admin.uiconfig.index', 
'appname' => 'felamimail') )
                );
 //Do not modify below this line
        $GLOBALS['phpgw']->common->display_mainscreen($appname,$file);

Index: filemanager/inc/hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/filemanager/inc/hook_admin.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- filemanager/inc/hook_admin.inc.php  28 Apr 2005 20:45:53 -0000      1.8
+++ filemanager/inc/hook_admin.inc.php  9 Sep 2006 09:04:49 -0000       1.9
@@ -5,17 +5,17 @@
        * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc 
http://www.fsf.org/
        * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
        * @package filemanager
-       * @version $Id: hook_admin.inc.php,v 1.8 2005/04/28 20:45:53 powerstat 
Exp $
+       * @version $Id: hook_admin.inc.php,v 1.9 2006/09/09 09:04:49 skwashd 
Exp $
        */
 
        {
 // Only Modify the $file and $title variables.....
-               $file = Array
+               $file = array
                (
-                       'site configuration'            => 
$GLOBALS['phpgw']->link('/index.php','menuaction=filemanager.uifilemanager.admin'),
-                       'edit user menu actions'        => 
$GLOBALS['phpgw']->link('/index.php','menuaction=filemanager.uifilemanager.edit_actions')
+                       'site configuration'            => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'filemanager.uifilemanager.admin') ),
+                       'edit user menu actions'        => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'filemanager.uifilemanager.edit_actions') )
                );
 // Do not modify below this line
-               display_section($appname,$appname,$file);
+       $GLOBALS['phpgw']->common->display_mainscreen($appname,$file);
        }
 ?>

Index: forum/inc/hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/forum/inc/hook_admin.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- forum/inc/hook_admin.inc.php        23 Apr 2003 01:42:25 -0000      1.22
+++ forum/inc/hook_admin.inc.php        9 Sep 2006 09:04:49 -0000       1.23
@@ -8,13 +8,12 @@
        *  Free Software Foundation; either version 2 of the License, or (at 
your  *
        *  option) any later version.                                           
   *
        
\**************************************************************************/
-       /* $Id: hook_admin.inc.php,v 1.22 2003/04/23 01:42:25 ceb Exp $ */
+       /* $Id: hook_admin.inc.php,v 1.23 2006/09/09 09:04:49 skwashd Exp $ */
 
        {
                $file = Array
                (
-//                     'Forum Administration' => 
$GLOBALS['phpgw']->link('/forum/admin/index.php','appname='.$appname)
-                       'Forum Administration' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=forum.uiadmin.index')
+                       'Forum Administration' => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'forum.uiadmin.index') )
                );
 
 //Do not modify below this line

Index: fudforum/inc/hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/fudforum/inc/hook_admin.inc.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -b -r1.1.1.1 -r1.2
--- fudforum/inc/hook_admin.inc.php     1 Nov 2003 22:57:15 -0000       1.1.1.1
+++ fudforum/inc/hook_admin.inc.php     9 Sep 2006 09:04:49 -0000       1.2
@@ -8,7 +8,7 @@
        *  Free Software Foundation; either version 2 of the License, or (at 
your  *
        *  option) any later version.                                           
   *
        
\**************************************************************************/
-       /* $Id: hook_admin.inc.php,v 1.1.1.1 2003/11/01 22:57:15 skwashd Exp $ 
*/
+       /* $Id: hook_admin.inc.php,v 1.2 2006/09/09 09:04:49 skwashd Exp $ */
 
        {
                $file = Array
@@ -17,6 +17,6 @@
                );
 
 //Do not modify below this line
-               display_section($appname,$file);
+       $GLOBALS['phpgw']->common->display_mainscreen($appname,$file);
        }
 ?>

Index: ged/inc/hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/ged/inc/hook_admin.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- ged/inc/hook_admin.inc.php  17 Jun 2006 18:25:07 -0000      1.4
+++ ged/inc/hook_admin.inc.php  9 Sep 2006 09:04:49 -0000       1.5
@@ -13,12 +13,11 @@
 
   {
 // Only Modify the $file and $title variables.....
-    $file=Array
+    $file = array
     (
-      'Site 
Configuration'=>$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname='
 . $appname)
-//      
'Accountancy'=>$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_admins&action=pbo'),
+      'Site Configuration' => $GLOBALS['phpgw']->link('/index.php', 
array('menuaction' => 'admin.uiconfig.index', 'appname' => 'ged') )
     );
 //Do not modify below this line
-    display_section($appname,$appname,$file);
+       $GLOBALS['phpgw']->common->display_mainscreen($appname,$file);
   }
 ?>

Index: hr/inc/hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/hr/inc/hook_admin.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- hr/inc/hook_admin.inc.php   15 Nov 2005 14:09:42 -0000      1.1
+++ hr/inc/hook_admin.inc.php   9 Sep 2006 09:04:49 -0000       1.2
@@ -9,18 +9,11 @@
   *  Free Software Foundation; either version 2 of the License, or (at your  *
   *  option) any later version.                                              *
   \**************************************************************************/
-  /* $Id: hook_admin.inc.php,v 1.1 2005/11/15 14:09:42 skwashd Exp $ */
+  /* $Id: hook_admin.inc.php,v 1.2 2006/09/09 09:04:49 skwashd Exp $ */
        {
                $file = array
                (
-                               /*
-                               'Site Configuration'    => 
$GLOBALS['phpgw']->link('/index.php', 
-                                                               array
-                                                               (
-                                                                       
'menuaction'    => 'admin.uiconfig.index',
-                                                                       
'appname'       => 'hr'
-                                                               ) ),
-                               */
+
                                'Global Categories'     => 
$GLOBALS['phpgw']->link('/index.php',
                                                                array
                                                                (
@@ -33,6 +26,6 @@
                                                                        
'menuaction'    => 'hr.hr_acl_ui.acllist'
                                                                ) ),
                );
-               display_section($appname,$appname,$file);
+               $GLOBALS['phpgw']->common->display_mainscreen($appname,$file);
        }
 ?>

Index: hrm/inc/hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/hrm/inc/hook_admin.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- hrm/inc/hook_admin.inc.php  15 May 2006 09:09:48 -0000      1.8
+++ hrm/inc/hook_admin.inc.php  9 Sep 2006 09:04:49 -0000       1.9
@@ -8,25 +8,18 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package hrm
        * @subpackage admin
-       * @version $Id: hook_admin.inc.php,v 1.8 2006/05/15 09:09:48 sigurdne 
Exp $
+       * @version $Id: hook_admin.inc.php,v 1.9 2006/09/09 09:04:49 skwashd 
Exp $
        */
 
                {
                        $file = array
                        (
-       //                      'Configuration' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=' 
. $appname),
-                               'Global Categories'     => 
$GLOBALS['phpgw']->link('/index.php',
-                                                               array
-                                                               (
-                                                                       
'menuaction'    => 'admin.uicategories.index',
-                                                                       
'appname'       => 'hrm'
-                                                               ) ),
-
-                               'training category'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=training'),
-                               'skill level'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=skill_level'),
-                               'experience category'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=experience'),
-                               'qualification category'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=qualification'),
-                               'Configure Access Permissions'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uiadmin_acl.list_acl&acl_app='.$appname),
+                               'Global Categories'     => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'admin.uicategories.index', 'appname' => 'hrm') ),
+                               'training category'=> 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'hrm.uicategory.index', 'type' => 'training') ),
+                               'skill level'=> 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'hrm.uicategory.index', 'type' => 'skill_level') ),
+                               'experience category'=> 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'hrm.uicategory.index', 'type' => 'experience') ),
+                               'qualification category'=> 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'hrm.uicategory.index', 'type' => 'qualification') ),
+                               'Configure Access Permissions'=> 
$GLOBALS['phpgw']->link('/index.php', 
array('menuaction=preferences.uiadmin_acl.list_acl', 'acl_app' => 'hrm') ),
                        );
-                       display_section($appname,$appname,$file);
+                       
$GLOBALS['phpgw']->common->display_mainscreen($appname,$file);
                }

Index: javassh/inc/hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/javassh/inc/hook_admin.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- javassh/inc/hook_admin.inc.php      15 May 2005 12:29:54 -0000      1.3
+++ javassh/inc/hook_admin.inc.php      9 Sep 2006 09:04:49 -0000       1.4
@@ -1,30 +1,23 @@
 <?php
- /**********************************************************************\
- * phpGroupWare - JavaSSH                                              *
- * http://www.phpgroupware.org                                         *
- * This program is part of the GNU project, see http://www.gnu.org/    *
- *                                                                     *
- * Copyright 2002, 2003 Free Software Foundation, Inc.                 *
- *                                                                     *
- * Originally Written by Dave Hall - <skwashd at phpgroupware.org>     *
- * --------------------------------------------                                
*
- *  Development Sponsored by Advantage Business Systems - abcsinc.com  *
- * --------------------------------------------                                
*
- * This program is Free Software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or   *
- * at your option) any later version.                                  *
- \**********************************************************************/
- /* $Id: hook_admin.inc.php,v 1.3 2005/05/15 12:29:54 skwashd Exp $ */
+ /**
+ * phpGroupWare JavaSSH admin hook
+ *
+ * @author Dave Hall skwashd at phpgroupware.org
+ * @copyright Copyright (c) 2002-2006 Free Software Foundation, Inc. 
http://fsf.org
+ * @license GNU General Public License
+ * @internal Development Sponsored by Advantage Business Systems - 
http://abcsinc.com
+ * @package javassh
+ * @subpackage admin
+ * @version $Id: hook_admin.inc.php,v 1.4 2006/09/09 09:04:49 skwashd Exp $
+ */
 
-{
-// Only Modify the $file and $title variables.....
-       $title = $appname;
-       $file = Array(
-               'Site Configuration'    => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=' 
. $appname),
-               'Manage Servers'        => 
$GLOBALS['phpgw']->link('/index.php','menuaction=javassh.ui_jssh.admin_list'),
+       {
+               $file = array
+               (
+                       'Site Configuration'    => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'admin.uiconfig.index', 'appname' => 'javassh') ),
+                       'Manage Servers'                => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'javassh.ui_jssh.admin_list') ),
        );
-//Do not modify below this line
-       display_section($appname,$title,$file);
-}
+               $GLOBALS['phpgw']->common->display_mainscreen($appname,$file);
+       }
+
 ?>

Index: messenger/inc/hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/messenger/inc/hook_admin.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- messenger/inc/hook_admin.inc.php    9 Apr 2006 13:53:18 -0000       1.8
+++ messenger/inc/hook_admin.inc.php    9 Sep 2006 09:04:49 -0000       1.9
@@ -11,15 +11,14 @@
        *  Free Software Foundation; either version 2 of the License, or (at 
your  *
        *  option) any later version.                                           
   *
        
\**************************************************************************/
-       /* $Id: hook_admin.inc.php,v 1.8 2006/04/09 13:53:18 skwashd Exp $ */
+       /* $Id: hook_admin.inc.php,v 1.9 2006/09/09 09:04:49 skwashd Exp $ */
 
+       {
        $file = Array
        (
-
-               // later maybe, was not enabled before imap backend was added 
'Compose global message' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=messenger.uimessenger.compose_global')
-                               'Site Configuration' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=' 
. $appname)
+                       'Site Configuration'    => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'admin.uiconfig.index', 'appname' => 'messenger') ),
        );
-
-       display_section($appname,$file);
+               $GLOBALS['phpgw']->common->display_mainscreen($appname,$file);
+       }
 
 ?>

Index: nntp/inc/hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/nntp/inc/hook_admin.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- nntp/inc/hook_admin.inc.php 29 Aug 2006 15:31:38 -0000      1.14
+++ nntp/inc/hook_admin.inc.php 9 Sep 2006 09:04:50 -0000       1.15
@@ -8,12 +8,12 @@
        *  Free Software Foundation; either version 2 of the License, or (at 
your  *
        *  option) any later version.                                           
   *
        
\**************************************************************************/
-       /* $Id: hook_admin.inc.php,v 1.14 2006/08/29 15:31:38 skwashd Exp $ */
+       /* $Id: hook_admin.inc.php,v 1.15 2006/09/09 09:04:50 skwashd Exp $ */
 
        {
                $file = Array
                (
-                       'Site Configuration'    => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=' 
. $appname),
+                       'Site Configuration'    => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'admin.uiconfig.index', 'appname' => 'nntp') ),
                        'Network News'                  => 
$GLOBALS['phpgw']->link('/nntp/admin.php')
                );
 //Do not modify below this line

Index: notes/inc/hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/notes/inc/hook_admin.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- notes/inc/hook_admin.inc.php        28 Apr 2005 18:33:52 -0000      1.9
+++ notes/inc/hook_admin.inc.php        9 Sep 2006 09:04:50 -0000       1.10
@@ -5,15 +5,15 @@
        * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
        * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
        * @package notes
-       * @version $Id: hook_admin.inc.php,v 1.9 2005/04/28 18:33:52 powerstat 
Exp $
+       * @version $Id: hook_admin.inc.php,v 1.10 2006/09/09 09:04:50 skwashd 
Exp $
        * @internal $Source: 
/cvsroot/phpgroupware/notes/inc/hook_admin.inc.php,v $
        */
 
        {
                $file = array
                (
-                       'Global Categories' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname='
 . $appname . '&global_cats=True')
+                       'Global Categories' => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'admin.uicategories.index', 'appname' => 'notes', 'global_cats' => 'true') )
                );
-               display_section($appname,$file);
+               $GLOBALS['phpgw']->common->display_mainscreen($appname,$file);
        }
 ?>
\ No newline at end of file

Index: pbwebmaui/inc/hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/pbwebmaui/inc/hook_admin.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- pbwebmaui/inc/hook_admin.inc.php    10 May 2005 12:38:50 -0000      1.3
+++ pbwebmaui/inc/hook_admin.inc.php    9 Sep 2006 09:04:50 -0000       1.4
@@ -6,14 +6,15 @@
  * @copyright Copyright (C) 2003,2005 Free Software Foundation 
http://www.fsf.org/
  * @license http://www.fsf.org/licenses/gpl.html GNU General Public License
  * @package pbwebmaui
- * @version $Id: hook_admin.inc.php,v 1.3 2005/05/10 12:38:50 powerstat Exp $
+ * @version $Id: hook_admin.inc.php,v 1.4 2006/09/09 09:04:50 skwashd Exp $
  */
 
-       $values = array
+       {
+               $file = Array
                (
-                       'Site Configuration' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=pbwebmaui.uipbwebmaui.show_adminSiteConf'),
+                       'Site Configuration'    => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'pbwebmaui.uipbwebmaui.show_adminSiteConf') ),
                        'Domain Administration' => 
$GLOBALS['phpgw']->link('/pbwebmaui/index.php'),
                );
-
-               display_section($appname,$appname,$values);
+               $GLOBALS['phpgw']->common->display_mainscreen($appname,$file);
+       }
 ?>
\ No newline at end of file

Index: phpbrain/inc/hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpbrain/inc/hook_admin.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- phpbrain/inc/hook_admin.inc.php     9 May 2006 05:14:07 -0000       1.11
+++ phpbrain/inc/hook_admin.inc.php     9 Sep 2006 09:04:50 -0000       1.12
@@ -15,14 +15,14 @@
 *  option) any later version.                                              *
 \**************************************************************************/
 
-       /* $Id: hook_admin.inc.php,v 1.11 2006/05/09 05:14:07 skwashd Exp $ */
+       /* $Id: hook_admin.inc.php,v 1.12 2006/09/09 09:04:50 skwashd Exp $ */
 
        {
                $file = array
                (
-                       'Site Configuration'            => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=' 
. $appname),
-                       'Global Categories'                     => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname=phpbrain')
+                       'Site Configuration'            => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'admin.uiconfig.index', 'appname' => 'phpbrain') ),
+                       'Global Categories'                     => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'admin.uicategories.index', 'appname' => 'phpbrain') )
                );
-               display_section($appname,$file);
+               $GLOBALS['phpgw']->common->display_mainscreen($appname,$file);
        }
 ?>

Index: projects/inc/hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/hook_admin.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- projects/inc/hook_admin.inc.php     9 Apr 2005 22:36:30 -0000       1.23
+++ projects/inc/hook_admin.inc.php     9 Sep 2006 09:04:50 -0000       1.24
@@ -6,23 +6,20 @@
        * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
        * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
        * @package projects
-       * @version $Id: hook_admin.inc.php,v 1.23 2005/04/09 22:36:30 ceb Exp $
+       * @version $Id: hook_admin.inc.php,v 1.24 2006/09/09 09:04:50 skwashd 
Exp $
        * $Source: /cvsroot/phpgroupware/projects/inc/hook_admin.inc.php,v $
        */
 
        {
-// Only Modify the $file and $title variables.....
                $file = Array
                (
-                       'Site Configuration'            => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=' 
. $appname),
-                       'project administrators'        => 
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiconfig.list_admins'),
-                       'Worktime statusmail'           => 
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiconfig.config_worktime_statusmail'),
-                       'Worktime warnmail'                     => 
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiconfig.config_worktime_warnmail'),
-                       'Workhours booking'                     => 
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiconfig.config_workhours_booking'),
-                       'edit project id help msg'      => 
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiconfig.config_proid_help_msg'),
-                       'Global Categories'                     => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname='
 . $appname)
+                       'Site Configuration'            => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'admin.uiconfig.index', 'appname' => 'projects') ),
+                       'project administrators'        => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'projects.uiconfig.list_admins') ),
+                       'Worktime statusmail'           => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'projects.uiconfig.config_worktime_statusmail') ),
+                       'Worktime warnmail'                     => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'projects.uiconfig.config_worktime_warnmail') ),
+                       'Workhours booking'                     => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'projects.uiconfig.config_workhours_booking') ),
+                       'edit project id help msg'      => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'projects.uiconfig.config_proid_help_msg') ),
                );
-//Do not modify below this line
-               display_section($appname,$appname,$file);
+               $GLOBALS['phpgw']->common->display_mainscreen($appname,$file);
        }
 ?>

Index: property/inc/hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/hook_admin.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- property/inc/hook_admin.inc.php     17 Apr 2006 11:36:05 -0000      1.24
+++ property/inc/hook_admin.inc.php     9 Sep 2006 09:04:50 -0000       1.25
@@ -8,66 +8,66 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage admin
-       * @version $Id: hook_admin.inc.php,v 1.24 2006/04/17 11:36:05 sigurdne 
Exp $
+       * @version $Id: hook_admin.inc.php,v 1.25 2006/09/09 09:04:50 skwashd 
Exp $
        */
 
                {
                        $file = array
                        (
-                               'Configuration' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=' 
. $appname),
-                               'Street'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=street'),
-                               'District'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=district'),
-                               'Part of town'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uip_of_town.index'),
-                               'Admin entity'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uiadmin_entity.index'),
-                               'Admin Location'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uiadmin_location.index'),
-                               'Update the not active category for 
locations'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uilocation.update_cat'),
-                               'Request Categories'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=request'),
-                               'Workorder Categories' => 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=wo'),
-                               'Workorder Detail Categories'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=wo_hours'),
-                               'Ticket Categories'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=ticket'),
-                               'Tenant Claim Categories'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=tenant_claim'),
-                               'Tenant Categories'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=tenant'),
-                               'Tenant Global Categories'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname=fm_tenant&global_cats=True'),
-                               'Tenant Attributes'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uiactor.list_attribute&role=tenant'),
-                               'Tenant'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uiactor.index&role=tenant'),
-                               'Owner'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uiactor.index&role=owner'),
-                               'Owner Categories'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=owner'),
-                               'Owner Attributes'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uiactor.list_attribute&role=owner'),
-                               'Vendor'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uiactor.index&role=vendor'),
-                               'Vendor Categories'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=vendor'),
-                               'Vendor Global Categories'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname=fm_vendor&global_cats=True'),
-                               'Vendor Attributes'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uiactor.list_attribute&role=vendor'),
-                               'Document Categories'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=document'),
-                               'Building Part'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=building_part'),
-                               'Tender chapter'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=tender_chapter'),
-                               'ID Controle'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uiadmin.edit_id'),
-                               'Permissions'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uiadmin.list_acl2'),
-                               'User contact info'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uiadmin.contact_info'),
-                               'Request status'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=request_status'),
-                               'Request condition_type'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=r_condition_type'),
-                               'Workorders status'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=workorder_status'),
-                               'Agreement status'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=agreement_status'),
-                               'Agreement Attributes'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uiagreement.list_attribute'),
-                               'service agreement categories'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=s_agreement'),
-                               'service agreement Attributes'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uis_agreement.list_attribute'),
-                               'service agreement item Attributes'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uis_agreement.list_attribute&role=detail'),
-                               'rental agreement categories'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=r_agreement'),
-                               'rental agreement Attributes'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uir_agreement.list_attribute'),
-                               'rental agreement item Attributes'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uir_agreement.list_attribute&role=detail'),
-                               'Document Status'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=document_status'),
-                               'Unit'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=unit'),
-                               'Key location'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_3.index&type=key_location'),
-                               'Branch'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_3.index&type=branch'),
-                               'Accounting'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uib_account.index'),
-                               'Accounting Categories'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=b_account'),
-                               'Accounting extra'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=dim_d'),
-                               'Import'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uiXport.import'),
-                               'Export'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uiXport.export'),
-                               'Admin Async servises'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uialarm.index'),
-                               'Async servises'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uiasync.index'),
-                               'Admin custom functions'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uiadmin_custom.index'),
+                               'Configuration'                         => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'admin.uiconfig.index', 'appname' => 'property') ),
+                               'Street'                                        
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uicategory.index', 'type' => 'street') ),
+                               'District'                                      
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uicategory.index', 'type' => 'district') ),
+                               'Part of town'                          => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uip_of_town.index') ),
+                               'Admin entity'                          => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uiadmin_entity.index') ),
+                               'Admin Location'                        => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uiadmin_location.index') ),
+                               'Update the not active category for locations'  
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uilocation.update_cat') ),
+                               'Request Categories'            => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uicategory.index', 'type' => 'request') ),
+                               'Workorder Categories'          => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uicategory.index', 'type' => 'wo') ),
+                               'Workorder Detail Categories'   => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uicategory.index', 'type' => 'wo_hours') ),
+                               'Ticket Categories'                     => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uicategory.index', 'type' => 'ticket') ),
+                               'Tenant Claim Categories'       => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uicategory.index', 'type' => 'tenant_claim') ),
+                               'Tenant Categories'                     => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uicategory.index', 'type' => 'tenant') ),
+                               'Tenant Global Categories'      => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'admin.uicategories.index', 'appname' => 'fm_tenant', 'global_cats' => 'True') 
),
+                               'Tenant Attributes'                     => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uiactor.list_attribute', 'role' => 'tenant') ),
+                               'Tenant'                                        
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uiactor.index', 'role' => 'tenant') ),
+                               'Owner'                                         
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uiactor.index', 'role' => 'owner') ),
+                               'Owner Categories'                      => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uicategory.index', 'type' => 'owner') ),
+                               'Owner Attributes'                      => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uiactor.list_attribute', 'role' => 'owner') ),
+                               'Vendor'                                        
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uiactor.index', 'role' => 'vendor') ),
+                               'Vendor Categories'                     => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uicategory.index', 'type' => 'vendor') ),
+                               'Vendor Global Categories'      => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'admin.uicategories.index', 'appname' => 'fm_vendor', 'global_cats' => 'True') 
),
+                               'Vendor Attributes'                     => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uiactor.list_attribute', 'role' => 'vendor') ),
+                               'Document Categories'           => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uicategory.index', 'type' => 'document') ),
+                               'Building Part'                         => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uistandard_2.index', 'type' => 'building_part') ),
+                               'Tender chapter'                        => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uicategory.index', 'type' => 'tender_chapter') ),
+                               'ID Control'                            => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uiadmin.edit_id') ),
+                               'Permissions'                           => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uiadmin.list_acl2') ),
+                               'User contact info'                     => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uiadmin.contact_info') ),
+                               'Request status'                        => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uistandard_2.index', 'type' => 'request_status') ),
+                               'Request condition_type'        => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uicategory.index', 'type' => 'r_condition_type') ),
+                               'Workorders status'                     => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uistandard_2.index', 'type' => 'workorder_status') ),
+                               'Agreement status'                      => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uistandard_2.index', 'type' => 'agreement_status') ),
+                               'Agreement Attributes'          => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uiagreement.list_attribute') ),
+                               'service agreement categories'  => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uicategory.index', 'type' => 's_agreement') ),
+                               'service agreement Attributes'  => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uis_agreement.list_attribute') ),
+                               'service agreement item Attributes'     => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uis_agreement.list_attribute', 'role' => 'detail') ),
+                               'rental agreement categories'   => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uicategory.index', 'type' => 'r_agreement') ),
+                               'rental agreement Attributes'   => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uir_agreement.list_attribute') ),
+                               'rental agreement item Attributes'      => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uir_agreement.list_attribute', 'role' => 'detail') ),
+                               'Document Status'                       => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uistandard_2.index', 'type' => 'document_status') ),
+                               'Unit'                                          
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uistandard_2.index', 'type' => 'unit') ),
+                               'Key location'                          => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uistandard_3.index', 'type' => 'key_location') ),
+                               'Branch'                                        
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uistandard_3.index', 'type' => 'branch') ),
+                               'Accounting'                            => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uib_account.index') ),
+                               'Accounting Categories'         => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uicategory.index', 'type' => 'b_account') ),
+                               'Accounting extra'                      => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uicategory.index', 'type' => 'dim_d') ),
+                               'Import'                                        
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uiXport.import') ),
+                               'Export'                                        
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uiXport.export') ),
+                               'Admin Async servises'          => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uialarm.index') ),
+                               'Async servises'                        => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uiasync.index') ),
+                               'Admin custom functions'        => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uiadmin_custom.index') ),
        );
-               display_section($appname,$appname,$file);
-//                     
$GLOBALS['phpgw']->common->display_mainscreen($appname,$file);
+       $GLOBALS['phpgw']->common->display_mainscreen($appname,$file);
+
                }
 ?>

Index: qmailldap/inc/hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/qmailldap/inc/hook_admin.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- qmailldap/inc/hook_admin.inc.php    14 Mar 2005 12:03:10 -0000      1.4
+++ qmailldap/inc/hook_admin.inc.php    9 Sep 2006 09:04:50 -0000       1.5
@@ -8,16 +8,13 @@
        *  Free Software Foundation; either version 2 of the License, or (at 
your  *
        *  option) any later version.                                           
   *
        
\**************************************************************************/
-       /* $Id: hook_admin.inc.php,v 1.4 2005/03/14 12:03:10 ceb Exp $ */
+       /* $Id: hook_admin.inc.php,v 1.5 2006/09/09 09:04:50 skwashd Exp $ */
 
        {
-// Only Modify the $file and $title variables.....
-               $file = Array
+               $file = array
                (
-                       'Site Configuration' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=' 
. $appname)
+                       'Site Configuration'            => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'admin.uiconfig.index', 'appname' => 'qmailldap') ),
                );
-
-//Do not modify below this line
-               display_section($appname,$appname,$file);
+               $GLOBALS['phpgw']->common->display_mainscreen($appname,$file);
        }
 ?>

Index: registration/inc/hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/registration/inc/hook_admin.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- registration/inc/hook_admin.inc.php 23 Apr 2003 01:49:20 -0000      1.7
+++ registration/inc/hook_admin.inc.php 9 Sep 2006 09:04:50 -0000       1.8
@@ -11,12 +11,12 @@
        *  Free Software Foundation; either version 2 of the License, or (at 
your  *
        *  option) any later version.                                           
   *
        
\**************************************************************************/
-       /* $Id: hook_admin.inc.php,v 1.7 2003/04/23 01:49:20 ceb Exp $ */
+       /* $Id: hook_admin.inc.php,v 1.8 2006/09/09 09:04:50 skwashd Exp $ */
 
-       $file = Array
+       $file = array
        (
-               'Site Configuration'    => 
$GLOBALS['phpgw']->link('/index.php', 
'menuaction=admin.uiconfig.index&appname=' . $appname),
-               'Manage Fields'      => $GLOBALS['phpgw']->link ('/index.php', 
'menuaction=' . $appname . '.uimanagefields.admin')
+               'Site Configuration'    => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'admin.uiconfig.index', 'appname' => 'registration') ),
+               'Manage Fields'                 => $GLOBALS['phpgw']->link 
('/index.php', array('menuaction' => 'registration.uimanagefields.admin') )
        );
        $GLOBALS['phpgw']->common->display_mainscreen($appname,$file);
 ?>

Index: sitemgr/inc/hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/hook_admin.inc.php,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.2.4.1
diff -u -b -r1.2.2.2 -r1.2.2.2.4.1
--- sitemgr/inc/hook_admin.inc.php      7 Mar 2004 02:50:17 -0000       1.2.2.2
+++ sitemgr/inc/hook_admin.inc.php      9 Sep 2006 09:04:50 -0000       
1.2.2.2.4.1
@@ -8,24 +8,17 @@
        * Free Software Foundation; either version 2 of the License, or (at 
your  *
        * option) any later version.                                            
                                          *
        
\*************************************************************************/
-       /* $Id: hook_admin.inc.php,v 1.2.2.2 2004/03/07 02:50:17 skwashd Exp $ 
*/
+       /* $Id: hook_admin.inc.php,v 1.2.2.2.4.1 2006/09/09 09:04:50 skwashd 
Exp $ */
 
        {
 // Only Modify the $file variable.....
 
-               $file = Array
+               $file = array
                (
-                       'Define Websites' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=sitemgr.Sites_UI.list_sites'),
+                       'Define Websites' => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'sitemgr.Sites_UI.list_sites') ),
                );
 
 //Do not modify below this line
-               if 
(intval(substr($GLOBALS['phpgw_info']['server']['versions']['phpgwapi'],4)) > 
16)
-               {
                        
$GLOBALS['phpgw']->common->display_mainscreen($appname,$file);
                }
-               else
-               {
-                       display_section($appname,$title,$file);
-               }
-       }
 ?>

Index: sync/inc/hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sync/inc/hook_admin.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- sync/inc/hook_admin.inc.php 26 Nov 2004 12:34:57 -0000      1.4
+++ sync/inc/hook_admin.inc.php 9 Sep 2006 09:04:50 -0000       1.5
@@ -1,5 +1,5 @@
 <?php
- /**
+/**
   * Admin Hook for synchronization module 
   *
   * @author      Matthias Leonhardt <address@hidden>
@@ -7,17 +7,17 @@
   * @copyright   Copyright (C) 2004 Free Software Foundation 
http://www.fsf.org/
   * @license     http://www.fsf.org/licenses/gpl.html GNU General Public 
License
   * @package     sync
-  * @subpackage  setup
-  * @version     $Id: hook_admin.inc.php,v 1.4 2004/11/26 12:34:57 fipsfuchs 
Exp $ 
+ * @subpackage  admin
+ * @version     $Id: hook_admin.inc.php,v 1.5 2006/09/09 09:04:50 skwashd Exp 
$ 
   */
 
        {
                $values = array
                (
-      lang('link_admindevicelist') => 
$GLOBALS['phpgw']->link('/index.php',"menuaction=$appname.ui_sync.adminlistdevices"),
-      lang('link_adminsourcelist') => 
$GLOBALS['phpgw']->link('/index.php',"menuaction=$appname.ui_sync.adminlistsources")
+                       lang('link_admindevicelist') => 
$GLOBALS['phpgw']->link('/index.php',array('menuaction' => 
'sync.ui_sync.adminlistdevices') ),
+                       lang('link_adminsourcelist') => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'sync.ui_sync.adminlistsources') )
                );
 
-               display_section($appname,$appname,$values);
+               $GLOBALS['phpgw']->common->display_mainscreen($appname, 
$values);
        }
 ?>
\ No newline at end of file

Index: todo/inc/hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/todo/inc/hook_admin.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- todo/inc/hook_admin.inc.php 12 May 2005 17:44:36 -0000      1.8
+++ todo/inc/hook_admin.inc.php 9 Sep 2006 09:04:51 -0000       1.9
@@ -7,14 +7,13 @@
        * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
        * @package todo
        * @subpackage hooks
-       * @version $Id: hook_admin.inc.php,v 1.8 2005/05/12 17:44:36 fipsfuchs 
Exp $
+       * @version $Id: hook_admin.inc.php,v 1.9 2006/09/09 09:04:51 skwashd 
Exp $
        * @internal $Source: 
/cvsroot/phpgroupware/todo/inc/hook_admin.inc.php,v $
        */
 
-       $title = $appname;
-       $file = Array(
-               'Global Categories'     => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname='
 . $appname . '&global_cats=True')
+       $file = array
+       (
+               'Global Categories'     => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'admin.uicategories.index', 'appname' => 'todo', 'global_cats' => 'True') )
        );
-       display_section($appname,$title,$file);
-               
+       $GLOBALS['phpgw']->common->display_mainscreen($appname,$file);
 ?>

Index: tts/inc/hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/tts/inc/hook_admin.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- tts/inc/hook_admin.inc.php  10 May 2005 16:12:38 -0000      1.6
+++ tts/inc/hook_admin.inc.php  9 Sep 2006 09:04:51 -0000       1.7
@@ -7,14 +7,22 @@
        * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
        * @package tts
        * @subpackage hooks
-       * @version $Id: hook_admin.inc.php,v 1.6 2005/05/10 16:12:38 powerstat 
Exp $
+       * @version $Id: hook_admin.inc.php,v 1.7 2006/09/09 09:04:51 skwashd 
Exp $
        */
 
        $values = array
        (
                'Admin options'     => 
$GLOBALS['phpgw']->link('/tts/admin.php'),
-               'Global Categories' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname=tts')
+               //'ticket types'                => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'tts.ui_ticket_types.index') ),
+               'ticket types'          => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'admin.uicategories.index', 'appname' => 'tts')),
+               'configure access permissions'  => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'preferences.uiadmin_acl.list_acl', 'acl_app' => 'tts'))
        );
 
-       display_section('tts','Trouble Ticket System',$values);
+
+       if (! $GLOBALS['phpgw']->acl->check('custom_fields_access', 1, 'admin'))
+       {
+               $values['custom fields'] = 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'admin.ui_custom_fields2.list_attribute', 'appname' => 'tts') );
+       }
+
+       $GLOBALS['phpgw']->common->display_mainscreen('tts', $values);
 ?>
\ No newline at end of file




reply via email to

[Prev in Thread] Current Thread [Next in Thread]