[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] admin/inc class.uiserver.inc.php
|
From: |
Dave Hall |
|
Subject: |
[Phpgroupware-cvs] admin/inc class.uiserver.inc.php |
|
Date: |
Mon, 20 Feb 2006 13:20:53 +0000 |
CVSROOT: /cvsroot/phpgroupware
Module name: admin
Branch:
Changes by: Dave Hall <address@hidden> 06/02/20 13:20:53
Modified files:
inc : class.uiserver.inc.php
Log message:
fix up globals and redirected links, then disbale as it is broken
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/admin/inc/class.uiserver.inc.php.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
Patches:
Index: admin/inc/class.uiserver.inc.php
diff -u admin/inc/class.uiserver.inc.php:1.11
admin/inc/class.uiserver.inc.php:1.12
--- admin/inc/class.uiserver.inc.php:1.11 Tue Feb 14 08:48:21 2006
+++ admin/inc/class.uiserver.inc.php Mon Feb 20 13:20:53 2006
@@ -9,16 +9,18 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: class.uiserver.inc.php,v 1.11 2006/02/14 08:48:21 skwashd Exp $ */
+ /* $Id: class.uiserver.inc.php,v 1.12 2006/02/20 13:20:53 skwashd Exp $ */
class uiserver
{
- var $public_functions = array(
+ var $public_functions = array();
+ /* as it doesn't work lets disable it for now - skwashd
'list_servers' => True,
'edit' => True,
'add' => True,
'delete' => True
);
+ */
var $start = 0;
var $limit = 0;
@@ -180,41 +182,42 @@
$GLOBALS['phpgw']->template->set_block('form','add','addhandle');
$GLOBALS['phpgw']->template->set_block('form','edit','edithandle');
- $server =
$this->bo->read($GLOBALS['HTTP_GET_VARS']['server_id']);
+ $server = $this->bo->read($_GET['server_id']);
- if ($GLOBALS['HTTP_POST_VARS']['submit'])
+ if ( isset($_POST['submit']) && $_POST['submit'] )
{
$errorcount = 0;
- $tmp =
$is->name2id($GLOBALS['HTTP_POST_VARS']['server_name']);
+ $tmp = $is->name2id($_POST['server_name']);
- if($tmp &&
$GLOBALS['HTTP_POST_VARS']['server_id'])
+ if($tmp && isset($_POST['server_id']) &&
$_POST['server_id'])
{
$error[$errorcount++] = lang('That
server name has been used already !');
}
- if (!$GLOBALS['HTTP_POST_VARS']['server_name'])
+ if ( !isset($_POST['server_name']) ||
!$_POST['server_name'] )
{
$error[$errorcount++] = lang('Please
enter a name for that server !');
}
if (!$error)
{
+ //FIXME use proper escaping, but not
needed as this isn't currently used
$server_info = array(
- 'server_name' =>
addslashes($GLOBALS['HTTP_POST_VARS']['server_name']),
- 'server_url' =>
addslashes($GLOBALS['HTTP_POST_VARS']['server_url']),
- 'trust_level' =>
intval($GLOBALS['HTTP_POST_VARS']['trust_level']),
- 'trust_rel' =>
intval($GLOBALS['HTTP_POST_VARS']['trust_rel']),
- 'username' =>
addslashes($GLOBALS['HTTP_POST_VARS']['server_username']),
- 'password' =>
$GLOBALS['HTTP_POST_VARS']['server_password'] ?
$GLOBALS['HTTP_POST_VARS']['server_password'] : $server['password'],
- 'server_mode' =>
addslashes($GLOBALS['HTTP_POST_VARS']['server_mode']),
- 'server_security' =>
addslashes($GLOBALS['HTTP_POST_VARS']['server_security']),
- 'admin_name' =>
addslashes($GLOBALS['HTTP_POST_VARS']['admin_name']),
- 'admin_email' =>
addslashes($GLOBALS['HTTP_POST_VARS']['admin_email'])
+ 'server_name' =>
addslashes($_POST['server_name']),
+ 'server_url' =>
addslashes($_POST['server_url']),
+ 'trust_level' =>
intval($_POST['trust_level']),
+ 'trust_rel' =>
intval($_POST['trust_rel']),
+ 'username' =>
addslashes($_POST['server_username']),
+ 'password' =>
isset($_POST['server_password']) && $_POST['server_password'] ?
$_POST['server_password'] : $server['password'],
+ 'server_mode' =>
addslashes($_POST['server_mode']),
+ 'server_security' =>
addslashes($_POST['server_security']),
+ 'admin_name' =>
addslashes($_POST['admin_name']),
+ 'admin_email' =>
addslashes($_POST['admin_email'])
);
-
if($GLOBALS['HTTP_GET_VARS']['server_id'])
+ if ( isset($_GET['server_id']) &&
$_GET['server_id'] )
{
- $server_info['server_id'] =
$GLOBALS['HTTP_GET_VARS']['server_id'];
+ $server_info['server_id'] =
$_GET['server_id'];
}
$newid = $this->bo->edit($server_info);
$server = $this->bo->read($newid ?
$newid : $server_info['server_id']);
@@ -225,27 +228,27 @@
{
$GLOBALS['phpgw']->template->set_var('message',$GLOBALS['phpgw']->common->error_list($error));
}
- if (($GLOBALS['HTTP_POST_VARS']['submit']) && (!$error)
&& (!$errorcount))
+ if ( isset($_POST['submit']) && $_POST['submit'] &&
(!$error) && (!$errorcount))
{
- if($GLOBALS['HTTP_GET_VARS']['server_id'])
+ if ( isset($_GET['server_id']) &&
$_GET['server_id'] )
{
-
$GLOBALS['phpgw']->template->set_var('message',lang('Server %1 has been
updated',$GLOBALS['HTTP_POST_VARS']['server_name']));
+
$GLOBALS['phpgw']->template->set_var('message',lang('Server %1 has been
updated',$_POST['server_name']));
}
else
{
-
$GLOBALS['phpgw']->template->set_var('message',lang('Server %1 has been
added',$GLOBALS['HTTP_POST_VARS']['server_name']));
+
$GLOBALS['phpgw']->template->set_var('message',lang('Server %1 has been
added',$_POST['server_name']));
}
}
- if ((!$GLOBALS['HTTP_POST_VARS']['submit']) &&
(!$error) && (!$errorcount))
+ if ( !(isset($_POST['submit']) && $_POST['submit']) &&
(!$error) && (!$errorcount) )
{
$GLOBALS['phpgw']->template->set_var('message','');
}
$GLOBALS['phpgw']->common->phpgw_header();
-
$GLOBALS['phpgw']->template->set_var('title_servers',$GLOBALS['HTTP_GET_VARS']['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='
. $GLOBALS['HTTP_GET_VARS']['server_id']));
-
$GLOBALS['phpgw']->template->set_var('deleteurl',$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiserver.delete&server_id='
. $GLOBALS['HTTP_GET_VARS']['server_id']));
+
$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('lang_name',lang('Server name'));
@@ -275,7 +278,7 @@
$GLOBALS['phpgw']->template->set_var('trust_relationship',$this->formatted_list('trust_rel',$is->trust_relationships,$server['trust_rel'],True));
$GLOBALS['phpgw']->template->set_var('admin_name',$GLOBALS['phpgw']->strip_html($server['admin_name']));
$GLOBALS['phpgw']->template->set_var('admin_email',$GLOBALS['phpgw']->strip_html($server['admin_email']));
-
$GLOBALS['phpgw']->template->set_var('server_id',$GLOBALS['HTTP_GET_VARS']['server_id']);
+
$GLOBALS['phpgw']->template->set_var('server_id',$_GET['server_id']);
$GLOBALS['phpgw']->template->set_var('edithandle','');
$GLOBALS['phpgw']->template->set_var('addhandle','');
@@ -286,11 +289,11 @@
function delete()
{
- $server_id = $GLOBALS['HTTP_POST_VARS']['server_id'] ?
$GLOBALS['HTTP_POST_VARS']['server_id'] :
$GLOBALS['HTTP_GET_VARS']['server_id'];
- if ($GLOBALS['HTTP_POST_VARS']['confirm'])
+ $server_id = isset($_POST['server_id']) ?
$_POST['server_id'] : $_GET['server_id'];
+ if ($_POST['confirm'])
{
$this->bo->delete($server_id);
- Header('Location: ' .
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiserver.list_servers'));
+ $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'admin.uiserver.list_servers') );
}
else
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] admin/inc class.uiserver.inc.php,
Dave Hall <=