[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] addressbook/inc/hook_preferences.inc.php calend...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] addressbook/inc/hook_preferences.inc.php calend... |
|
Date: |
Mon, 18 Sep 2006 09:31:03 +0000 |
CVSROOT: /sources/phpgroupware
Module name: sms
Changes by: Sigurd Nes <sigurdne> 06/09/18 09:31:03
Modified files:
addressbook/inc: hook_preferences.inc.php
calendar/inc : hook_preferences.inc.php
filemanager/inc: hook_preferences.inc.php
hrm/inc : hook_preferences.inc.php
preferences : preferences.php
property/inc : hook_preferences.inc.php
inc : hook_preferences.inc.php
Log message:
link
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/addressbook/inc/hook_preferences.inc.php?cvsroot=phpgroupware&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/hook_preferences.inc.php?cvsroot=phpgroupware&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/filemanager/inc/hook_preferences.inc.php?cvsroot=phpgroupware&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/hrm/inc/hook_preferences.inc.php?cvsroot=phpgroupware&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/preferences/preferences.php?cvsroot=phpgroupware&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/property/inc/hook_preferences.inc.php?cvsroot=phpgroupware&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/sms/inc/hook_preferences.inc.php?cvsroot=phpgroupware&r1=1.1&r2=1.2
Patches:
Index: addressbook/inc/hook_preferences.inc.php
===================================================================
RCS file: /sources/phpgroupware/addressbook/inc/hook_preferences.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- addressbook/inc/hook_preferences.inc.php 21 Mar 2006 13:02:12 -0000
1.25
+++ addressbook/inc/hook_preferences.inc.php 18 Sep 2006 09:31:02 -0000
1.26
@@ -10,14 +10,14 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: hook_preferences.inc.php,v 1.25 2006/03/21 13:02:12 sigurdne Exp $ */
+ /* $Id: hook_preferences.inc.php,v 1.26 2006/09/18 09:31:02 sigurdne Exp $ */
{
// Only Modify the $file and $title variables.....
$title = $appname;
$file = Array(
'Preferences' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'addressbook.uiaddressbook_prefs.index')),
- 'Grant Access' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uiadmin_acl.aclprefs&acl_app='.$appname),
- 'Edit Categories' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uicategories.index&cats_app='.$appname
. '&cats_level=True&global_cats=True')
+ 'Grant Access' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'preferences.uiadmin_acl.aclprefs','acl_app'=>
$appname)),
+ 'Edit Categories' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'preferences.uicategories.index','cats_app'=>
$appname, 'cats_level'=> True, 'global_cats'=> True))
);
//Do not modify below this line
display_section($appname,$title,$file);
Index: calendar/inc/hook_preferences.inc.php
===================================================================
RCS file: /sources/phpgroupware/calendar/inc/hook_preferences.inc.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- calendar/inc/hook_preferences.inc.php 21 Mar 2006 13:01:00 -0000
1.27
+++ calendar/inc/hook_preferences.inc.php 18 Sep 2006 09:31:02 -0000
1.28
@@ -9,14 +9,14 @@
* Free Software Foundation; either version 2 of the License, or (at your *
* option) any later version. *
\**************************************************************************/
- /* $Id: hook_preferences.inc.php,v 1.27 2006/03/21 13:01:00 sigurdne Exp $ */
+ /* $Id: hook_preferences.inc.php,v 1.28 2006/09/18 09:31:02 sigurdne Exp $ */
{
// Only Modify the $file and $title variables.....
$title = $appname;
$file = array(
- 'Preferences' =>
$GLOBALS['phpgw']->link('/preferences/preferences.php','appname='.$appname),
- 'Grant Access' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uiadmin_acl.aclprefs&acl_app='.$appname),
- 'Edit Categories' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uicategories.index&cats_app='.$appname.'&cats_level=True&global_cats=True')
+ 'Preferences' =>
$GLOBALS['phpgw']->link('/preferences/preferences.php',array('appname'=>
$appname)),
+ 'Grant Access' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction' =>
'preferences.uiadmin_acl.aclprefs', 'acl_app'=> $appname)),
+ 'Edit Categories' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'preferences.uicategories.index', 'cats_app'=> $appname, 'cats_level'=> True,
'global_cats' =>True))
);
//Do not modify below this line
display_section($appname,$title,$file);
Index: filemanager/inc/hook_preferences.inc.php
===================================================================
RCS file: /sources/phpgroupware/filemanager/inc/hook_preferences.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- filemanager/inc/hook_preferences.inc.php 28 Apr 2005 20:45:53 -0000
1.17
+++ filemanager/inc/hook_preferences.inc.php 18 Sep 2006 09:31:02 -0000
1.18
@@ -5,11 +5,11 @@
* @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_preferences.inc.php,v 1.17 2005/04/28 20:45:53
powerstat Exp $
+ * @version $Id: hook_preferences.inc.php,v 1.18 2006/09/18 09:31:02
sigurdne Exp $
*/
{
- $file = array('Preferences' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=filemanager.uifilemanager.preferences'));
+ $file = array('Preferences' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'filemanager.uifilemanager.preferences')));
//'Grant Access' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uiaclprefs.index&acl_app='.$appname));
//Do not modify below this line
display_section($appname,$file);
Index: hrm/inc/hook_preferences.inc.php
===================================================================
RCS file: /sources/phpgroupware/hrm/inc/hook_preferences.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- hrm/inc/hook_preferences.inc.php 22 May 2006 12:09:48 -0000 1.5
+++ hrm/inc/hook_preferences.inc.php 18 Sep 2006 09:31:02 -0000 1.6
@@ -8,13 +8,13 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package hrm
* @subpackage core
- * @version $Id: hook_preferences.inc.php,v 1.5 2006/05/22 12:09:48
sigurdne Exp $
+ * @version $Id: hook_preferences.inc.php,v 1.6 2006/09/18 09:31:02
sigurdne Exp $
*/
$title = $appname;
$file = Array(
- 'Preferences' =>
$GLOBALS['phpgw']->link('/preferences/preferences.php','appname='.$appname .
'&type=user'),
- 'Grant Access' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uiadmin_acl.aclprefs&acl_app='.$appname)
+ 'Preferences' =>
$GLOBALS['phpgw']->link('/preferences/preferences.php',array('appname'=>
$appname, 'type'=> 'user')),
+ 'Grant Access' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'preferences.uiadmin_acl.aclprefs', 'acl_app'=> $appname))
);
display_section($appname,$file);
Index: preferences/preferences.php
===================================================================
RCS file: /sources/phpgroupware/preferences/preferences.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- preferences/preferences.php 17 Apr 2005 15:14:31 -0000 1.38
+++ preferences/preferences.php 18 Sep 2006 09:31:02 -0000 1.39
@@ -5,7 +5,7 @@
* @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 preferences
- * @version $Id: preferences.php,v 1.38 2005/04/17 15:14:31 powerstat
Exp $
+ * @version $Id: preferences.php,v 1.39 2006/09/18 09:31:02 sigurdne Exp
$
*/
$GLOBALS['phpgw_info']['flags'] = array(
@@ -567,7 +567,7 @@
echo parse_navbar();
$t->set_var('messages',$error);
-
$t->set_var('action_url',$GLOBALS['phpgw']->link('/preferences/preferences.php','appname='
. $_GET['appname']));
+
$t->set_var('action_url',$GLOBALS['phpgw']->link('/preferences/preferences.php',array('appname'=>
$_GET['appname'])));
$t->set_var('th_bg', $GLOBALS['phpgw_info']['theme']['th_bg']);
$t->set_var('th_text',$GLOBALS['phpgw_info']['theme']['th_text']);
$t->set_var('row_on', $GLOBALS['phpgw_info']['theme']['row_on']);
@@ -621,15 +621,15 @@
{
$tabs[] = array(
'label' => lang('Your preferences'),
- 'link' =>
$GLOBALS['phpgw']->link('/preferences/preferences.php','appname=' .
$_GET['appname'] . "&type=user")
+ 'link' =>
$GLOBALS['phpgw']->link('/preferences/preferences.php',array('appname'=>
$_GET['appname'], 'type'=> 'user'))
);
$tabs[] = array(
'label' => lang('Default preferences'),
- 'link' =>
$GLOBALS['phpgw']->link('/preferences/preferences.php','appname=' .
$_GET['appname'] . "&type=default")
+ 'link' =>
$GLOBALS['phpgw']->link('/preferences/preferences.php',array('appname'=>
$_GET['appname'], 'type'=> 'default'))
);
$tabs[] = array(
'label' => lang('Forced preferences'),
- 'link' =>
$GLOBALS['phpgw']->link('/preferences/preferences.php','appname=' .
$_GET['appname'] . "&type=forced")
+ 'link' =>
$GLOBALS['phpgw']->link('/preferences/preferences.php',array('appname'=>
$_GET['appname'], 'type'=> 'forced'))
);
switch($GLOBALS['type'])
Index: property/inc/hook_preferences.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/hook_preferences.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- property/inc/hook_preferences.inc.php 3 Feb 2006 12:05:49 -0000
1.7
+++ property/inc/hook_preferences.inc.php 18 Sep 2006 09:31:03 -0000
1.8
@@ -8,13 +8,13 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage core
- * @version $Id: hook_preferences.inc.php,v 1.7 2006/02/03 12:05:49
sigurdne Exp $
+ * @version $Id: hook_preferences.inc.php,v 1.8 2006/09/18 09:31:03
sigurdne Exp $
*/
$title = $appname;
$file = Array(
- 'Preferences' =>
$GLOBALS['phpgw']->link('/preferences/preferences.php','appname='.$appname .
'&type=user'),
- 'Grant Access' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uiadmin.aclprefs&acl_app='.$appname)
+ 'Preferences' =>
$GLOBALS['phpgw']->link('/preferences/preferences.php',array('appname'=>
$appname, 'type'=> 'user')),
+ 'Grant Access' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$appname.'.uiadmin.aclprefs', 'acl_app'=> $appname))
);
display_section($appname,$file);
Index: sms/inc/hook_preferences.inc.php
===================================================================
RCS file: /sources/phpgroupware/sms/inc/hook_preferences.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- sms/inc/hook_preferences.inc.php 16 May 2006 19:45:49 -0000 1.1
+++ sms/inc/hook_preferences.inc.php 18 Sep 2006 09:31:03 -0000 1.2
@@ -8,13 +8,13 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package SMS
* @subpackage core
- * @version $Id: hook_preferences.inc.php,v 1.1 2006/05/16 19:45:49
sigurdne Exp $
+ * @version $Id: hook_preferences.inc.php,v 1.2 2006/09/18 09:31:03
sigurdne Exp $
*/
$title = $appname;
$file = Array(
- 'Preferences' =>
$GLOBALS['phpgw']->link('/preferences/preferences.php','appname='.$appname .
'&type=user'),
- 'Grant Access' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uiadmin_acl.aclprefs&acl_app='.$appname)
+ 'Preferences' =>
$GLOBALS['phpgw']->link('/preferences/preferences.php',array('appname'=>
$appname, 'type'=> 'user')),
+ 'Grant Access' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'preferences.uiadmin_acl.aclprefs', 'acl_app'=> $appname))
);
display_section($appname,$file);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] addressbook/inc/hook_preferences.inc.php calend...,
Sigurd Nes <=