[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] admin/inc class.boaccounts.inc.php class.uiacco...
|
From: |
Caeies |
|
Subject: |
[Phpgroupware-cvs] admin/inc class.boaccounts.inc.php class.uiacco... |
|
Date: |
Wed, 24 Jan 2007 17:33:39 +0000 |
CVSROOT: /cvsroot/phpgroupware
Module name: admin
Changes by: Caeies <Caeies> 07/01/24 17:33:38
Modified files:
inc : class.boaccounts.inc.php
class.uiaccounts.inc.php
class.uimainscreen.inc.php
class.uimenuclass.inc.php
class.uiserver.inc.php
hook_sidebox_menu.inc.php
hook_view_user.inc.php
Log message:
some call to link() fixed
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/admin/inc/class.boaccounts.inc.php?cvsroot=phpgroupware&r1=1.57&r2=1.58
http://cvs.savannah.gnu.org/viewcvs/admin/inc/class.uiaccounts.inc.php?cvsroot=phpgroupware&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/admin/inc/class.uimainscreen.inc.php?cvsroot=phpgroupware&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/admin/inc/class.uimenuclass.inc.php?cvsroot=phpgroupware&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/admin/inc/class.uiserver.inc.php?cvsroot=phpgroupware&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/admin/inc/hook_sidebox_menu.inc.php?cvsroot=phpgroupware&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/admin/inc/hook_view_user.inc.php?cvsroot=phpgroupware&r1=1.4&r2=1.5
Patches:
Index: class.boaccounts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.boaccounts.inc.php,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- class.boaccounts.inc.php 7 Jan 2007 02:21:22 -0000 1.57
+++ class.boaccounts.inc.php 24 Jan 2007 17:33:38 -0000 1.58
@@ -9,7 +9,7 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\**************************************************************************/
- /* $Id: class.boaccounts.inc.php,v 1.57 2007/01/07 02:21:22 skwashd Exp
$ */
+ /* $Id: class.boaccounts.inc.php,v 1.58 2007/01/24 17:33:38 Caeies Exp
$ */
//FIXME define constants for rights so we can fuck all these magic
numbers
@@ -102,7 +102,7 @@
if ($GLOBALS['phpgw']->acl->check('group_access',
PHPGW_ACL_EDIT,'admin'))
{
$error[] = lang('no permission to create
groups');
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=admin.uiaccounts.list_groups');
+ $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'admin.uiaccounts.list_groups'));
}
$old_group = CreateObject('phpgwapi.accounts',
$values['account_id'], 'g');
Index: class.uiaccounts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uiaccounts.inc.php,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- class.uiaccounts.inc.php 7 Jan 2007 02:21:30 -0000 1.68
+++ class.uiaccounts.inc.php 24 Jan 2007 17:33:38 -0000 1.69
@@ -9,7 +9,7 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\**************************************************************************/
- /* $Id: class.uiaccounts.inc.php,v 1.68 2007/01/07 02:21:30 skwashd Exp
$ */
+ /* $Id: class.uiaccounts.inc.php,v 1.69 2007/01/24 17:33:38 Caeies Exp
$ */
class uiaccounts
{
@@ -50,7 +50,7 @@
{
if ((isset($_POST['done']) && $_POST['done']) ||
$GLOBALS['phpgw']->acl->check('group_access', PHPGW_ACL_READ,'admin'))
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=admin.uimainscreen.mainscreen');
+ $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'admin.uimainscreen.mainscreen'));
}
if(isset($_POST['add']) && $_POST['add'])
Index: class.uimainscreen.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uimainscreen.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- class.uimainscreen.inc.php 11 Aug 2006 07:09:27 -0000 1.18
+++ class.uimainscreen.inc.php 24 Jan 2007 17:33:38 -0000 1.19
@@ -9,7 +9,7 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\**************************************************************************/
- /* $Id: class.uimainscreen.inc.php,v 1.18 2006/08/11 07:09:27 skwashd
Exp $ */
+ /* $Id: class.uimainscreen.inc.php,v 1.19 2007/01/24 17:33:38 Caeies
Exp $ */
class uimainscreen
{
@@ -66,7 +66,7 @@
if (empty($select_lang))
{
$GLOBALS['phpgw']->template->set_var('header_lang',lang('Main screen message'));
-
$GLOBALS['phpgw']->template->set_var('form_action',$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uimainscreen.index'));
+
$GLOBALS['phpgw']->template->set_var('form_action',$GLOBALS['phpgw']->link('/index.php',
array('menuaction' => 'admin.uimainscreen.index')));
$GLOBALS['phpgw']->template->set_var('tr_color',$GLOBALS['phpgw_info']['theme']['th_bg']);
$GLOBALS['phpgw']->template->set_var('value',' ');
$GLOBALS['phpgw']->template->fp('rows','row_2',True);
@@ -119,7 +119,7 @@
$GLOBALS['phpgw']->template->set_var('header_lang',lang('Edit login screen
message'));
}
-
$GLOBALS['phpgw']->template->set_var('form_action',$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uimainscreen.index'));
+
$GLOBALS['phpgw']->template->set_var('form_action',$GLOBALS['phpgw']->link('/index.php',
array('menuaction' => 'admin.uimainscreen.index')));
$GLOBALS['phpgw']->template->set_var('select_lang',$select_lang);
$GLOBALS['phpgw']->template->set_var('section',$section);
$GLOBALS['phpgw']->template->set_var('tr_color',$GLOBALS['phpgw_info']['theme']['th_bg']);
Index: class.uimenuclass.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uimenuclass.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- class.uimenuclass.inc.php 14 Feb 2006 08:48:21 -0000 1.12
+++ class.uimenuclass.inc.php 24 Jan 2007 17:33:38 -0000 1.13
@@ -9,7 +9,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: class.uimenuclass.inc.php,v 1.12 2006/02/14 08:48:21 skwashd Exp $ */
+ /* $Id: class.uimenuclass.inc.php,v 1.13 2007/01/24 17:33:38 Caeies Exp $ */
class uimenuclass
{
@@ -69,7 +69,7 @@
{
$destination = 'groups';
}
-
$this->t->set_var('link_done',$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.list_'.$destination));
+
$this->t->set_var('link_done',$GLOBALS['phpgw']->link('/index.php',
array('menuaction' => 'admin.uiaccounts.list_').$destination));
$this->t->set_var('lang_done',lang('Back'));
$this->t->set_var('row_on',$this->rowColor[0]);
Index: class.uiserver.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uiserver.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- class.uiserver.inc.php 20 Feb 2006 13:20:53 -0000 1.12
+++ class.uiserver.inc.php 24 Jan 2007 17:33:38 -0000 1.13
@@ -9,7 +9,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: class.uiserver.inc.php,v 1.12 2006/02/20 13:20:53 skwashd Exp $ */
+ /* $Id: class.uiserver.inc.php,v 1.13 2007/01/24 17:33:38 Caeies Exp $ */
class uiserver
{
@@ -102,11 +102,11 @@
$GLOBALS['phpgw']->template->set_block('server_list_t','server_list','list');
$GLOBALS['phpgw']->template->set_var('lang_action',lang('Server List'));
-
$GLOBALS['phpgw']->template->set_var('add_action',$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiserver.edit'));
+
$GLOBALS['phpgw']->template->set_var('add_action',$GLOBALS['phpgw']->link('/index.php',
array('menuaction' => 'admin.uiserver.edit')));
$GLOBALS['phpgw']->template->set_var('lang_add',lang('Add'));
$GLOBALS['phpgw']->template->set_var('title_servers',lang('Peer Servers'));
$GLOBALS['phpgw']->template->set_var('lang_search',lang('Search'));
-
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiserver.list_servers'));
+
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php',
array('menuaction' => 'admin.uiserver.list_servers')));
$GLOBALS['phpgw']->template->set_var('lang_done',lang('Done'));
$GLOBALS['phpgw']->template->set_var('doneurl',$GLOBALS['phpgw']->link('/admin/index.php'));
@@ -161,10 +161,10 @@
'server_mode' =>
strtoupper($server['server_mode'])
));
-
$GLOBALS['phpgw']->template->set_var('edit',$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiserver.edit&server_id='
. $server_id));
+
$GLOBALS['phpgw']->template->set_var('edit',$GLOBALS['phpgw']->link('/index.php',array('menuaction'
=> 'admin.uiserver.edit', 'server_id' => $server_id)));
$GLOBALS['phpgw']->template->set_var('lang_edit_entry',lang('Edit'));
-
$GLOBALS['phpgw']->template->set_var('delete',$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiserver.delete&server_id='
. $server_id));
+
$GLOBALS['phpgw']->template->set_var('delete',$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'admin.uiserver.delete','server_id'
=> $server_id)));
$GLOBALS['phpgw']->template->set_var('lang_delete_entry',lang('Delete'));
$GLOBALS['phpgw']->template->parse('list','server_list',True);
}
@@ -247,9 +247,9 @@
$GLOBALS['phpgw']->common->phpgw_header();
$GLOBALS['phpgw']->template->set_var('title_servers',$_GET['server_id'] ?
lang('Edit Peer Server') : lang('Add Peer Server'));
-
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiserver.edit&server_id='
. $_GET['server_id']));
-
$GLOBALS['phpgw']->template->set_var('deleteurl',$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiserver.delete&server_id='
. $_GET['server_id']));
-
$GLOBALS['phpgw']->template->set_var('doneurl',$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiserver.list_servers'));
+
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php',array('menuaction'
=> 'admin.uiserver.edit' , 'server_id' => $_GET['server_id'])));
+
$GLOBALS['phpgw']->template->set_var('deleteurl',$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'admin.uiserver.delete',
'server_id' => $_GET['server_id'])));
+
$GLOBALS['phpgw']->template->set_var('doneurl',$GLOBALS['phpgw']->link('/index.php',
array('menuaction' => 'admin.uiserver.list_servers')));
$GLOBALS['phpgw']->template->set_var('lang_name',lang('Server name'));
$GLOBALS['phpgw']->template->set_var('lang_url',lang('Server URL'));
@@ -301,9 +301,9 @@
$GLOBALS['phpgw']->template->set_file(array('server_delete' =>
'delete_common.tpl'));
- $nolink =
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiserver.list_servers');
+ $nolink = $GLOBALS['phpgw']->link('/index.php',
array('menuaction' => 'admin.uiserver.list_servers'));
- $yeslink = '<form method="POST"
name="yesbutton" action="' .
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiserver.delete') . '">'
+ $yeslink = '<form method="POST"
name="yesbutton" action="' . $GLOBALS['phpgw']->link('/index.php',
array('menuaction' => 'admin.uiserver.delete')) . '">'
. '<input type="hidden"
name="server_id" value="' . $server_id . '">'
. '<input type="hidden" name="confirm"
value="True">'
. '<input type="submit"
name="yesbutton" value=Yes>'
Index: hook_sidebox_menu.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/hook_sidebox_menu.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- hook_sidebox_menu.inc.php 9 Sep 2006 10:38:50 -0000 1.5
+++ hook_sidebox_menu.inc.php 24 Jan 2007 17:33:38 -0000 1.6
@@ -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.5 2006/09/09 10:38:50
skwashd Exp $
+ * @version $Id: hook_sidebox_menu.inc.php,v 1.6 2007/01/24 17:33:38
Caeies Exp $
*/
{
@@ -33,7 +33,7 @@
if (!
$GLOBALS['phpgw']->acl->check('peer_server_access',1,'admin'))
{
$file[] = array('text' => 'Peer Servers',
- 'url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiserver.list_servers'));
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'admin.uiserver.list_servers')));
}
*/
Index: hook_view_user.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/hook_view_user.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- hook_view_user.inc.php 14 Feb 2006 08:48:21 -0000 1.4
+++ hook_view_user.inc.php 24 Jan 2007 17:33:38 -0000 1.5
@@ -9,17 +9,17 @@
* option) any later version.
*
\**************************************************************************/
- /* $Id: hook_view_user.inc.php,v 1.4 2006/02/14 08:48:21 skwashd Exp $
*/
+ /* $Id: hook_view_user.inc.php,v 1.5 2007/01/24 17:33:38 Caeies Exp $ */
$GLOBALS['menuData'][] = array(
'description' => 'Login History',
'url' => '/index.php',
- 'extradata' =>
'menuaction=admin.uiaccess_history.list_history'
+ 'extradata' => array('menuaction' =>
'admin.uiaccess_history.list_history')
);
$GLOBALS['menuData'][] = array(
'description' => 'ACL Rights',
'url' => '/index.php',
- 'extradata' => 'menuaction=admin.uiaclmanager.list_apps'
+ 'extradata' => array('menuaction' =>
'admin.uiaclmanager.list_apps')
);
?>
\ No newline at end of file
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] admin/inc class.boaccounts.inc.php class.uiacco...,
Caeies <=