[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] addressbook/inc/hook_sidebox_menu.inc.php admin... [s
|
From: |
Dave Hall |
|
Subject: |
[Phpgroupware-cvs] addressbook/inc/hook_sidebox_menu.inc.php admin... [skwashd-16-compat] |
|
Date: |
Sat, 09 Sep 2006 10:38:51 +0000 |
CVSROOT: /cvsroot/phpgroupware
Module name: sitemgr
Branch: skwashd-16-compat
Changes by: Dave Hall <skwashd> 06/09/09 10:38:51
Modified files:
addressbook/inc: hook_sidebox_menu.inc.php
admin/inc : hook_sidebox_menu.inc.php
bookkeeping/inc: hook_sidebox_menu.inc.php
calendar/inc : hook_sidebox_menu.inc.php
filemanager/inc: hook_sidebox_menu.inc.php
javassh/inc : hook_sidebox_menu.inc.php
news_admin/inc : hook_sidebox_menu.inc.php
projects/inc : hook_sidebox_menu.inc.php
inc : hook_sidebox_menu.inc.php
Log message:
fixing link()s
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/addressbook/inc/hook_sidebox_menu.inc.php?cvsroot=phpgroupware&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/admin/inc/hook_sidebox_menu.inc.php?cvsroot=phpgroupware&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/bookkeeping/inc/hook_sidebox_menu.inc.php?cvsroot=phpgroupware&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/hook_sidebox_menu.inc.php?cvsroot=phpgroupware&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/filemanager/inc/hook_sidebox_menu.inc.php?cvsroot=phpgroupware&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/javassh/inc/hook_sidebox_menu.inc.php?cvsroot=phpgroupware&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/news_admin/inc/hook_sidebox_menu.inc.php?cvsroot=phpgroupware&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/projects/inc/hook_sidebox_menu.inc.php?cvsroot=phpgroupware&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/sitemgr/inc/hook_sidebox_menu.inc.php?cvsroot=phpgroupware&only_with_tag=skwashd-16-compat&r1=1.1.2.1&r2=1.1.2.1.4.1
Patches:
Index: addressbook/inc/hook_sidebox_menu.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/hook_sidebox_menu.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- addressbook/inc/hook_sidebox_menu.inc.php 15 May 2005 13:34:30 -0000
1.6
+++ addressbook/inc/hook_sidebox_menu.inc.php 9 Sep 2006 10:38:50 -0000
1.7
@@ -1,31 +1,52 @@
<?php
$menu_title = $GLOBALS['phpgw_info']['apps'][$appname]['title'] . ' '.
lang('Menu');
-$file = Array(
- array('text' => 'New Person',
- 'url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.add_person')),
-
- array('text' => 'New Org',
- 'url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.add_org')),
+ $file = array
+ (
+ array
+ (
+ 'text' => 'New Person',
+ 'url' => $GLOBALS['phpgw']->link('/index.php',
array('menuaction' => 'addressbook.uiaddressbook.add_person'))
+ ),
+
+ array
+ (
+ 'text' => 'New Org',
+ 'url' => $GLOBALS['phpgw']->link('/index.php',
array('menuaction' => 'addressbook.uiaddressbook.add_org'))
+ ),
array('text' => '_NewLine_'),
- array('text' => 'Add VCard',
- 'url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uivcard.in')),
-
- array('text' => 'Categorize Persons',
- 'url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uicategorize_contacts.index')),
- array('text' => 'Import Contacts',
- 'url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiXport.import')),
-
- array('text' => 'Import CSV',
- 'url' =>
$GLOBALS['phpgw']->link('/addressbook/csv_import.php')),
-
- array('text' => 'Export Contacts',
- 'url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiXport.export')),
-
- array('text' => '_NewLine_') // give a newline
+ array
+ (
+ 'text' => 'Add VCard',
+ 'url' => $GLOBALS['phpgw']->link('/index.php',
array('menuaction' => 'addressbook.uivcard.in'))
+ ),
+
+ array
+ (
+ 'text' => 'Categorize Persons',
+ 'url' => $GLOBALS['phpgw']->link('/index.php',
array('menuaction' => 'addressbook.uicategorize_contacts.index'))
+ ),
+
+ array
+ (
+ 'text' => 'Import Contacts',
+ 'url' => $GLOBALS['phpgw']->link('/index.php',
array('menuaction' => 'addressbook.uiXport.import'))
+ ),
+
+ array
+ (
+ 'text' => 'Import CSV',
+ 'url' =>
$GLOBALS['phpgw']->link('/addressbook/csv_import.php')
+ ),
+
+ array
+ (
+ 'text' => 'Export Contacts',
+ 'url' => $GLOBALS['phpgw']->link('/index.php',
array('menuaction' => 'addressbook.uiXport.export'))
+ )
);
-display_sidebox($appname,$menu_title,$file);
+ display_sidebox($appname,$menu_title,$file);
?>
Index: admin/inc/hook_sidebox_menu.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/hook_sidebox_menu.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- admin/inc/hook_sidebox_menu.inc.php 6 Aug 2006 10:03:24 -0000 1.4
+++ admin/inc/hook_sidebox_menu.inc.php 9 Sep 2006 10:38:50 -0000 1.5
@@ -7,7 +7,7 @@
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package admin
* @subpackage hooks
- * @version $Id: hook_sidebox_menu.inc.php,v 1.4 2006/08/06 10:03:24
skwashd Exp $
+ * @version $Id: hook_sidebox_menu.inc.php,v 1.5 2006/09/09 10:38:50
skwashd Exp $
*/
{
@@ -26,7 +26,7 @@
if (!
$GLOBALS['phpgw']->acl->check('site_config_access',1,'admin'))
{
$file[] = array('text' => 'Site Configuration',
- 'url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=admin'));
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'admin.uiconfig.index', 'appname' => 'admin')) );
}
/*
@@ -40,74 +40,74 @@
if (! $GLOBALS['phpgw']->acl->check('account_access',1,'admin'))
{
$file[] = array('text' => 'addressmasters',
- 'url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaclmanager.list_addressmasters&account_id='
. $GLOBALS['phpgw_info']['user']['account_id']));
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'admin.uiaclmanager.list_addressmasters', 'account_id' =>
$GLOBALS['phpgw_info']['user']['account_id'])));
}
if (! $GLOBALS['phpgw']->acl->check('account_access',1,'admin'))
{
$file[] = array('text' => 'User Accounts',
- 'url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.list_users'));
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'admin.uiaccounts.list_users')));
}
if (! $GLOBALS['phpgw']->acl->check('group_access',1,'admin'))
{
$file[] = array('text' => 'User Groups',
- 'url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.list_groups'));
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'admin.uiaccounts.list_groups')));
}
if (!
$GLOBALS['phpgw']->acl->check('applications_access',1,'admin'))
{
$file[] = array('text' => 'Applications',
- 'url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.get_list'));
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'admin.uiapplications.get_list')));
}
if (!
$GLOBALS['phpgw']->acl->check('global_categories_access',1,'admin'))
{
$file[] = array('text' => 'Global Categories',
- 'url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index'));
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'admin.uicategories.index')));
}
if
(!$GLOBALS['phpgw']->acl->check('mainscreen_message_access',1,'admin') ||
!$GLOBALS['phpgw']->acl->check('mainscreen_message_access',2,'admin'))
{
$file[] = array('text' => 'Change Main Screen Message',
- 'url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uimainscreen.index'));
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'admin.uimainscreen.index')));
}
if (!
$GLOBALS['phpgw']->acl->check('current_sessions_access',1,'admin'))
{
$file[] = array('text' => 'View Sessions',
- 'url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicurrentsessions.list_sessions'));
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'admin.uicurrentsessions.list_sessions')));
}
if (!
$GLOBALS['phpgw']->acl->check('access_log_access',1,'admin'))
{
$file[] = array('text' => 'View Access Log',
- 'url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccess_history.list_history'));
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'admin.uiaccess_history.list_history')));
}
if (!
$GLOBALS['phpgw']->acl->check('error_log_access',1,'admin'))
{
$file[] = array('text' => 'View Error Log',
- 'url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uilog.list_log'));
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'admin.uilog.list_log')));
}
if (!
$GLOBALS['phpgw']->acl->check('error_log_access',1,'admin'))
{
$file[] = array ('text' => 'Edit Log Levels',
- 'url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiloglevels.edit_log_levels'));
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'admin.uiloglevels.edit_log_levels')));
}
if (!
$GLOBALS['phpgw']->acl->check('applications_access',16,'admin'))
{
$file[] = array('text' => 'Find and Register all
Application Hooks',
- 'url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.register_all_hooks'));
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'admin.uiapplications.register_all_hooks')));
}
if (!
$GLOBALS['phpgw']->acl->check('asyncservice_access',1,'admin'))
{
$file[] = array ('text' => 'Asynchronous timed
services',
- 'url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiasyncservice.index'));
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'admin.uiasyncservice.index')));
}
if (! $GLOBALS['phpgw']->acl->check('info_access',1,'admin'))
Index: bookkeeping/inc/hook_sidebox_menu.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/bookkeeping/inc/hook_sidebox_menu.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- bookkeeping/inc/hook_sidebox_menu.inc.php 1 Dec 2003 16:31:34 -0000
1.1
+++ bookkeeping/inc/hook_sidebox_menu.inc.php 9 Sep 2006 10:38:51 -0000
1.2
@@ -9,7 +9,7 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\**************************************************************************/
- /* $Id: hook_sidebox_menu.inc.php,v 1.1 2003/12/01 16:31:34 ceb Exp $ */
+ /* $Id: hook_sidebox_menu.inc.php,v 1.2 2006/09/09 10:38:51 skwashd Exp
$ */
{
/*
@@ -21,6 +21,7 @@
display_sidebox can be called as much as you like
*/
+ /* this is majorly broken so commenting it out for now, feel
free to fix it
$appname = 'bookkeeping';
$menu_title = $GLOBALS['phpgw_info']['apps'][$appname]['title']
. ' '. lang('Menu');
@@ -54,5 +55,7 @@
);
display_sidebox($appname,$menu_title,$file);
}
+
+ */
}
?>
Index: calendar/inc/hook_sidebox_menu.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/hook_sidebox_menu.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- calendar/inc/hook_sidebox_menu.inc.php 16 Dec 2005 13:24:44 -0000
1.4
+++ calendar/inc/hook_sidebox_menu.inc.php 9 Sep 2006 10:38:51 -0000
1.5
@@ -10,7 +10,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: hook_sidebox_menu.inc.php,v 1.4 2005/12/16 13:24:44 skwashd Exp $ */
+ /* $Id: hook_sidebox_menu.inc.php,v 1.5 2006/09/09 10:38:51 skwashd Exp $ */
{
/*
@@ -78,13 +78,13 @@
$menu_title = lang('Administration');
$file = Array(
array('text' => 'Configuration',
- 'url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=calendar')),
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'admin.uiconfig.index&appname=calendar'))),
array('text' => 'Custom Fields',
- 'url'
=>$GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uicustom_fields.index')),
+ 'url'
=>$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'calendar.uicustom_fields.index'))),
array('text' => 'Holiday Management',
- 'url'
=>$GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uiholiday.admin')),
+ 'url'
=>$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'calendar.uiholiday.admin'))),
array('text' => 'Global Categories',
- 'url'
=>$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname=calendar')),
+ 'url'
=>$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'admin.uicategories.index', 'appname' => 'calendar'))),
);
display_sidebox($appname,$menu_title,$file);
}
Index: filemanager/inc/hook_sidebox_menu.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/filemanager/inc/hook_sidebox_menu.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- filemanager/inc/hook_sidebox_menu.inc.php 28 Apr 2005 20:45:53 -0000
1.3
+++ filemanager/inc/hook_sidebox_menu.inc.php 9 Sep 2006 10:38:51 -0000
1.4
@@ -11,7 +11,7 @@
* @copyright Copyright (C) 2003-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_sidebox_menu.inc.php,v 1.3 2005/04/28 20:45:53
powerstat Exp $
+ * @version $Id: hook_sidebox_menu.inc.php,v 1.4 2006/09/09 10:38:51
skwashd Exp $
* @internal $Source:
/cvsroot/phpgroupware/filemanager/inc/hook_sidebox_menu.inc.php,v $
*/
@@ -21,7 +21,7 @@
$menu_title = $GLOBALS['phpgw_info']['apps'][$appname]['title']
. ' '. lang('Menu');
$file[] = array('text' => 'Preferences',
- 'url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=filemanager.uifilemanager.preferences'));
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'filemanager.uifilemanager.preferences')));
display_sidebox($appname,$menu_title,$file);
}
Index: javassh/inc/hook_sidebox_menu.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/javassh/inc/hook_sidebox_menu.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- javassh/inc/hook_sidebox_menu.inc.php 15 May 2005 12:29:54 -0000
1.2
+++ javassh/inc/hook_sidebox_menu.inc.php 9 Sep 2006 10:38:51 -0000
1.3
@@ -10,7 +10,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: hook_sidebox_menu.inc.php,v 1.2 2005/05/15 12:29:54 skwashd Exp $ */
+ /* $Id: hook_sidebox_menu.inc.php,v 1.3 2006/09/09 10:38:51 skwashd Exp $ */
{
/*
@@ -23,6 +23,7 @@
display_sidebox can be called as much as you like
*/
+ $file = array();
$menu_title = $GLOBALS['phpgw_info']['apps'][$appname]['title'] . ' '.
lang('Menu');
$bo_jssh = createObject('javassh.bo_jssh');
$servers = $bo_jssh->get_servers();
@@ -30,12 +31,10 @@
{
if(isset($GLOBALS['phpgw_info']['user']['apps']['admin']))
{
- $file = array(
- array(
+ $file[] = array
+ (
'text' => 'no servers
available - please add one',
- 'url' =>
$GLOBALS['phpgw']->link('/index.php',
- array('menuaction',
'javassh.ui_jssh.list_servers'))
- )
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction',
'javassh.ui_jssh.list_servers'))
);
}
else
@@ -46,25 +45,32 @@
}
foreach($servers as $server)
{
- $file[] = array('text' => $server['title'],
- 'url' => $GLOBALS['phpgw']->link('/index.php',
array('menuaction' => 'javassh.ui_jssh.connect',
-
'server' => $server['server_id']
-
)
- )
+ $file[] = array
+ (
+ 'text' => $server['title'],
+ 'url' => $GLOBALS['phpgw']->link('/index.php',
array('menuaction' => 'javassh.ui_jssh.connect', 'server' =>
$server['server_id']))
);
}
display_sidebox($appname,$menu_title,$file);
if ($GLOBALS['phpgw_info']['user']['apps']['admin'])
{
+ $file = array();
$menu_title = lang('Administration');
- $file = Array(
- array('text' => 'Site Configuration',
- 'url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=javassh')),
- array('text' => 'Manage Servers',
- 'url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=javassh.ui_jssh.admin_list')),
+ $file[] = array
+ (
+ array
+ (
+ 'text' => 'Site Configuration',
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'admin.uiconfig.index&appname=javassh'))
+ ),
+
+ array
+ (
+ 'text' => 'Manage Servers',
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'javassh.ui_jssh.admin_list'))
+ )
);
-
display_sidebox($appname,$menu_title,$file);
}
}
Index: news_admin/inc/hook_sidebox_menu.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/news_admin/inc/hook_sidebox_menu.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- news_admin/inc/hook_sidebox_menu.inc.php 15 May 2005 12:25:42 -0000
1.2
+++ news_admin/inc/hook_sidebox_menu.inc.php 9 Sep 2006 10:38:51 -0000
1.3
@@ -6,24 +6,19 @@
* (c) 2004 FSF
*/
- $file[] = array('text' => 'show all news',
- 'url' => $GLOBALS['phpgw']->link('/index.php',
- array('menuaction' =>
'news_admin.uinews.read_news',
- 'start' => 0,
- 'cat_id' => 'all'
- )
- )
+ $file[] = array
+ (
+ 'text' => 'show all news',
+ 'url' => $GLOBALS['phpgw']->link('/index.php',
array('menuaction' => 'news_admin.uinews.read_news','start' => 0, 'cat_id' =>
'all'))
);
- if(intval($_GET['cat_id'])
+ if ( isset($_GET['cat_id'])
&& ExecMethod('news_admin.boacl.is_writeable', $_GET['cat_id']))
{
- $file[] = array('text' => 'add news item to this category',
- 'url' => $GLOBALS['phpgw']->link('/index.php',
- array('menuaction' =>
'news_admin.uinews.add',
- 'cat_id' =>
$_GET['cat_id']
- )
- )
+ $file[] = array
+ (
+ 'text' => 'add news item to this category',
+ 'url' => $GLOBALS['phpgw']->link('/index.php',
array('menuaction' => 'news_admin.uinews.add', 'cat_id' => $_GET['cat_id']
) )
);
}
Index: projects/inc/hook_sidebox_menu.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/hook_sidebox_menu.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- projects/inc/hook_sidebox_menu.inc.php 9 Apr 2005 22:36:30 -0000
1.14
+++ projects/inc/hook_sidebox_menu.inc.php 9 Sep 2006 10:38:51 -0000
1.15
@@ -7,7 +7,7 @@
* @copyright Copyright (C) 2003-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_sidebox_menu.inc.php,v 1.14 2005/04/09 22:36:30
ceb Exp $
+ * @version $Id: hook_sidebox_menu.inc.php,v 1.15 2006/09/09 10:38:51
skwashd Exp $
* $Source:
/cvsroot/phpgroupware/projects/inc/hook_sidebox_menu.inc.php,v $
*/
@@ -15,45 +15,79 @@
$boprojects = CreateObject('projects.boprojects');
$appname = 'projects';
+ $file = array();
+
$menu_title = lang('projects');
- $file[] = array('text' => 'Projects',
- 'url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_projects&action=mains'));
- $file[] = array('text' => 'Sub projects',
- 'url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_projects&action=subs'));
- $file[] = array('text' => 'Work hours',
- 'url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojecthours.list_projects&action=mains'));
+ $file[] = array
+ (
+ 'text' => 'Projects',
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'projects.uiprojects.list_projects', 'action' => 'mains') )
+ );
+ $file[] = array
+ (
+ 'text' => 'Sub projects',
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'projects.uiprojects.list_projects', 'action' => 'subs') )
+ );
+ $file[] = array
+ (
+ 'text' => 'Work hours',
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'projects.uiprojecthours.list_projects', 'action' => 'mains') )
+ );
display_sidebox($appname,$menu_title,$file);
unset($file);
$menu_title = lang('Statistics');
- $file[] = array('text' => 'Gantt Chart',
- 'url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uistatistics.list_projects&view=gantt'));
- $file[] = array('text' => 'Projects per employee',
- 'url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uistatistics.list_users'));
- $file[] = array('text' => 'Employees per project',
- 'url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uistatistics.list_projects&view=user'));
- $file[] = array('text' => 'work hours statistic',
- 'url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uistatistics.list_users_worktimes'));
+ $file[] = array
+ (
+ 'text' => 'Gantt Chart',
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'projects.uistatistics.list_projects', 'view' => 'gantt'))
+ );
+
+ $file[] = array
+ (
+ 'text' => 'Projects per employee',
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'projects.uistatistics.list_users'))
+ );
+ $file[] = array
+ (
+ 'text' => 'Employees per project',
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'projects.uistatistics.list_projects', 'view' => 'user'))
+ );
+ $file[] = array
+ (
+ 'text' => 'work hours statistic',
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'projects.uistatistics.list_users_worktimes'))
+ );
display_sidebox($appname,$menu_title,$file);
unset($file);
if ($boprojects->isprojectadmin('pad') ||
$boprojects->isprojectadmin('pmanager'))
{
+ $file = array();
$menu_title = lang('administration');
- $file[] = array('text' => 'Budget',
- 'url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_budget&action=mains'));
+ $file[] = array
+ (
+ 'text' => 'Budget',
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'projects.uiprojects.list_budget', 'action' => 'mains'))
+ );
switch($boprojects->siteconfig['accounting'])
{
case 'activity':
- $file[] = array('text' =>
'Activities',
-
'url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiconfig.list_activities&action=act'));
+ $file[] = array
+ (
+ 'text' => 'Activities',
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'projects.uiconfig.list_activities', 'action' => 'act'))
+ );
break;
default:
- $file[] = array('text' =>
'Accounting',
-
'url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiconfig.list_employees&action=accounting'));
+ $file[] = array
+ (
+ 'text' => 'Accounting',
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'projects.uiconfig.list_employees', 'action' => 'accounting'))
+ );
}
display_sidebox($appname,$menu_title,$file);
Index: sitemgr/inc/hook_sidebox_menu.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/hook_sidebox_menu.inc.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.1.4.1
diff -u -b -r1.1.2.1 -r1.1.2.1.4.1
--- sitemgr/inc/hook_sidebox_menu.inc.php 23 Jun 2003 20:31:21 -0000
1.1.2.1
+++ sitemgr/inc/hook_sidebox_menu.inc.php 9 Sep 2006 10:38:51 -0000
1.1.2.1.4.1
@@ -10,7 +10,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: hook_sidebox_menu.inc.php,v 1.1.2.1 2003/06/23 20:31:21 totschnig
Exp $ */
+ /* $Id: hook_sidebox_menu.inc.php,v 1.1.2.1.4.1 2006/09/09 10:38:51 skwashd
Exp $ */
{
/*
@@ -24,13 +24,14 @@
*/
$menu_title = lang('Website') . ' ' .
$GLOBALS['Common_BO']->sites->current_site['site_name'];
- $file = $GLOBALS['Common_BO']->sitemenu;
- display_sidebox($appname,$menu_title,$file);
- $file = $GLOBALS['Common_BO']->othermenu;
- if ($file)
+ $menu = $GLOBALS['Common_BO']->sitemenu;
+ display_sidebox($appname,$menu_title,$menu);
+
+ $sites = $GLOBALS['Common_BO']->othermenu;
+ if ( is_array($sites) && count($sites) )
{
$menu_title = lang('Other websites');
- display_sidebox($appname,$menu_title,$file);
+ display_sidebox($appname, $menu_title, $sites);
}
}
?>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] addressbook/inc/hook_sidebox_menu.inc.php admin... [skwashd-16-compat],
Dave Hall <=