[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: setup applications.php,1.17,1.18 config.php,1.74
|
From: |
Mark A Peters <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: setup applications.php,1.17,1.18 config.php,1.74,1.75 index.php,1.108,1.109 lang.php,1.36,1.37 ldap.php,1.52,1.53 manageheader.php,1.39,1.40 schematoy.php,1.8,1.9 setup_demo.php,1.27,1.28 sqltoarray.php,1.10,1.11 |
|
Date: |
Mon, 29 Apr 2002 15:49:28 -0400 |
Update of /cvsroot/phpgroupware/setup
In directory subversions:/tmp/cvs-serv9060/setup
Modified Files:
applications.php config.php index.php lang.php ldap.php
manageheader.php schematoy.php setup_demo.php sqltoarray.php
Log Message:
Converting to get_var() for all HTTP_*_VARS.
Index: applications.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/applications.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** applications.php 26 Mar 2002 02:34:38 -0000 1.17
--- applications.php 29 Apr 2002 19:49:23 -0000 1.18
***************
*** 39,43 ****
// Does not return unless user is authorized
! $ConfigDomain = $HTTP_COOKIE_VARS['ConfigDomain'] ?
$HTTP_COOKIE_VARS['ConfigDomain'] : $HTTP_POST_VARS['ConfigDomain'];
$tpl_root = $GLOBALS['phpgw_setup']->html->setup_tpl_dir('setup');
--- 39,43 ----
// Does not return unless user is authorized
! $ConfigDomain = get_var('ConfigDomain',Array('POST','COOKIE'));
$tpl_root = $GLOBALS['phpgw_setup']->html->setup_tpl_dir('setup');
***************
*** 110,114 ****
@ksort($setup_info);
! if(@$HTTP_POST_VARS['cancel'])
{
Header("Location: index.php");
--- 110,114 ----
@ksort($setup_info);
! if(@get_var('cancel',Array('POST')))
{
Header("Location: index.php");
***************
*** 116,120 ****
}
! if(@$HTTP_POST_VARS['submit'])
{
$GLOBALS['phpgw_setup']->html->show_header(lang('Application
Management'),False,'config',$ConfigDomain . '(' .
$phpgw_domain[$ConfigDomain]['db_type'] . ')');
--- 116,120 ----
}
! if(@get_var('submit',Array('POST')))
{
$GLOBALS['phpgw_setup']->html->show_header(lang('Application
Management'),False,'config',$ConfigDomain . '(' .
$phpgw_domain[$ConfigDomain]['db_type'] . ')');
***************
*** 122,129 ****
$setup_tpl->pparse('out','header');
! $appname = $HTTP_POST_VARS['appname'];
! $remove = $HTTP_POST_VARS['remove'];
! $install = $HTTP_POST_VARS['install'];
! $upgrade = $HTTP_POST_VARS['upgrade'];
while (list($appname,$key) = @each($remove))
--- 122,129 ----
$setup_tpl->pparse('out','header');
! $appname = get_var('appname',Array('POST'));
! $remove = get_var('remove',Array('POST'));
! $install = get_var('install',Array('POST'));
! $upgrade = get_var('upgrade',Array('POST'));
while (list($appname,$key) = @each($remove))
***************
*** 221,227 ****
}
! if(@$HTTP_GET_VARS['detail'])
{
- $detail = $HTTP_GET_VARS['detail'];
@ksort($setup_info[$detail]);
@reset($setup_info[$detail]);
--- 221,228 ----
}
! $detail = get_var('detail',Array('GET'));
! $resolve = get_var('resolve',Array('GET'));
! if(@$detail)
{
@ksort($setup_info[$detail]);
@reset($setup_info[$detail]);
***************
*** 259,271 ****
exit;
}
! elseif (@$HTTP_GET_VARS['resolve'])
{
! $resolve = $HTTP_GET_VARS['resolve'];
! $version = $HTTP_GET_VARS['version'];
! $notables = $HTTP_GET_VARS['notables'];
$setup_tpl->set_var('description',lang('Problem resolution').
':');
$setup_tpl->pparse('out','header');
! if($HTTP_GET_VARS['post'])
{
echo '"' . $setup_info[$resolve]['title'] . '" ' .
lang('may be broken') . ' ';
--- 260,271 ----
exit;
}
! elseif (@$resolve)
{
! $version = get_var('version',Array('GET'));
! $notables = get_var('notables',Array('GET'));
$setup_tpl->set_var('description',lang('Problem resolution').
':');
$setup_tpl->pparse('out','header');
! if(get_var('post',Array('GET')))
{
echo '"' . $setup_info[$resolve]['title'] . '" ' .
lang('may be broken') . ' ';
***************
*** 276,280 ****
echo lang('However, the application may still work') .
'.';
}
! elseif ($HTTP_GET_VARS['badinstall'])
{
echo '"' . $setup_info[$resolve]['title'] . '" ' .
lang('is broken') . ' ';
--- 276,280 ----
echo lang('However, the application may still work') .
'.';
}
! elseif(get_var('badinstall',Array('GET')))
{
echo '"' . $setup_info[$resolve]['title'] . '" ' .
lang('is broken') . ' ';
Index: config.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/config.php,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -r1.74 -r1.75
*** config.php 8 Apr 2002 02:33:56 -0000 1.74
--- config.php 29 Apr 2002 19:49:23 -0000 1.75
***************
*** 58,62 ****
}
! if(@$GLOBALS['HTTP_POST_VARS']['cancel'])
{
Header('Location: index.php');
--- 58,62 ----
}
! if(@get_var('cancel',Array('POST')))
{
Header('Location: index.php');
***************
*** 75,79 ****
}
! if(@$GLOBALS['HTTP_POST_VARS']['submit'] &&
@$GLOBALS['HTTP_POST_VARS']['newsettings'])
{
$GLOBALS['phpgw_setup']->db->transaction_begin();
--- 75,80 ----
}
! $newsettings = get_var('newsettings',Array('POST'));
! if(@get_var('submit',Array('POST')) && @$newsettings)
{
$GLOBALS['phpgw_setup']->db->transaction_begin();
***************
*** 82,87 ****
$GLOBALS['phpgw_setup']->db->query("INSERT INTO $configtbl
(config_app,config_name, config_value) values
('phpgwapi','useframes','never')");
- $newsettings = $GLOBALS['HTTP_POST_VARS']['newsettings'];
-
while(list($setting,$value) = @each($newsettings))
{
--- 83,86 ----
***************
*** 142,146 ****
}
! if($error == 'badldapconnection')
{
/* Please check the number and dial again :) */
--- 141,145 ----
}
! if($GLOBALS['error'] == 'badldapconnection')
{
/* Please check the number and dial again :) */
***************
*** 206,210 ****
else
{
!
$t->set_var($value,$current_config[$newval]);
}
break;
--- 205,209 ----
else
{
!
$t->set_var($value,@$current_config[$newval]);
}
break;
***************
*** 220,224 ****
$config = implode('_',$configs);
/* echo $config . '=' .
$current_config[$config]; */
! if($current_config[$config] == $setting)
{
$t->set_var($value,' selected');
--- 219,223 ----
$config = implode('_',$configs);
/* echo $config . '=' .
$current_config[$config]; */
! if(@$current_config[$config] ==
$setting)
{
$t->set_var($value,' selected');
Index: index.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/index.php,v
retrieving revision 1.108
retrieving revision 1.109
diff -C2 -r1.108 -r1.109
*** index.php 13 Apr 2002 03:02:22 -0000 1.108
--- index.php 29 Apr 2002 19:49:24 -0000 1.109
***************
*** 96,100 ****
// end DEBUG code
! switch(@$GLOBALS['HTTP_POST_VARS']['action'])
{
case 'Uninstall all applications':
--- 96,100 ----
// end DEBUG code
! switch(@get_var('action',Array('POST')))
{
case 'Uninstall all applications':
Index: lang.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/lang.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -r1.36 -r1.37
*** lang.php 13 Apr 2002 01:56:57 -0000 1.36
--- lang.php 29 Apr 2002 19:49:24 -0000 1.37
***************
*** 59,66 ****
}
! if (@$GLOBALS['HTTP_POST_VARS']['submit'])
{
! $lang_selected = $HTTP_POST_VARS['lang_selected'];
! $upgrademethod = $HTTP_POST_VARS['upgrademethod'];
$GLOBALS['phpgw_setup']->db->transaction_begin();
if (count($lang_selected))
--- 59,66 ----
}
! if (@get_var('submit',Array('POST')))
{
! $lang_selected = get_var('lang_selected',Array('POST'));
! $upgrademethod = get_var('upgrademethod',Array(POST'));
$GLOBALS['phpgw_setup']->db->transaction_begin();
if (count($lang_selected))
***************
*** 154,158 ****
else
{
! if (@$GLOBALS['HTTP_POST_VARS']['cancel'])
{
Header('Location: index.php');
--- 154,158 ----
else
{
! if (@get_var('cancel',Array('POST')))
{
Header('Location: index.php');
Index: ldap.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/ldap.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -r1.52 -r1.53
*** ldap.php 4 Mar 2002 02:55:53 -0000 1.52
--- ldap.php 29 Apr 2002 19:49:24 -0000 1.53
***************
*** 12,16 ****
/* $Id$ */
! $phpgw_info = array();
$GLOBALS['phpgw_info']['flags'] = array(
'noheader' => True,
--- 12,16 ----
/* $Id$ */
! $GLOBALS['phpgw_info'] = array();
$GLOBALS['phpgw_info']['flags'] = array(
'noheader' => True,
***************
*** 29,33 ****
// Does not return unless user is authorized
! if ($HTTP_POST_VARS['cancel'])
{
Header('Location: index.php');
--- 29,33 ----
// Does not return unless user is authorized
! if (get_var('cancel',Array('POST')))
{
Header('Location: index.php');
***************
*** 46,53 ****
$GLOBALS['phpgw_setup']->html->show_header(lang('LDAP
Config'),'','config',$ConfigDomain);
! if ($error)
{
//echo '<br><center><b>Error:</b> '.$error.'</center>';
! $GLOBALS['phpgw_setup']->html->show_alert_msg('Error',$error);
}
--- 46,53 ----
$GLOBALS['phpgw_setup']->html->show_header(lang('LDAP
Config'),'','config',$ConfigDomain);
! if ($GLOBALS['error'])
{
//echo '<br><center><b>Error:</b> '.$error.'</center>';
!
$GLOBALS['phpgw_setup']->html->show_alert_msg('Error',$GLOBALS['error']);
}
Index: manageheader.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/manageheader.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** manageheader.php 29 Apr 2002 00:26:01 -0000 1.39
--- manageheader.php 29 Apr 2002 19:49:24 -0000 1.40
***************
*** 26,30 ****
#include('../version.inc.php');
! if(@$GLOBALS['HTTP_POST_VARS']['adddomain'])
{
}
--- 26,31 ----
#include('../version.inc.php');
! $adddomain = get_var('adddomain',Array('POST'));
! if(@$adddomain)
{
}
***************
*** 33,44 ****
{
$errors = '';
! @reset($GLOBALS['HTTP_POST_VARS']['domains']);
! while(list($k,$v) =
@each($GLOBALS['HTTP_POST_VARS']['domains']))
{
!
if(isset($GLOBALS['HTTP_POST_VARS']['deletedomain'][$v]))
{
continue;
}
! $dom = $GLOBALS['HTTP_POST_VARS']["setting_$v"];
if(!$dom['config_pass'])
{
--- 34,47 ----
{
$errors = '';
! $domains = get_var('domains',Array('POST'));
! @reset($domains);
! while(list($k,$v) = @each($domains))
{
! $deletedomain = get_var('deletedomain',Array('POST'));
! if(isset($deletedomain[$v]))
{
continue;
}
! $dom = get_var('setting_'.$v,Array('POST'));
if(!$dom['config_pass'])
{
***************
*** 47,51 ****
}
!
if(!$GLOBALS['HTTP_POST_VARS']['setting']['HEADER_ADMIN_PASSWORD'])
{
$errors .= '<br>' . lang("You didn't enter a header
admin password");
--- 50,55 ----
}
! $setting = get_var('setting',Array('POST'));
! if(!$setting['HEADER_ADMIN_PASSWORD'])
{
$errors .= '<br>' . lang("You didn't enter a header
admin password");
***************
*** 115,119 ****
}
! switch(@$GLOBALS['HTTP_POST_VARS']['action'])
{
case 'download':
--- 119,123 ----
}
! switch(@$get_var('action',Array('POST')))
{
case 'download':
***************
*** 285,289 ****
$GLOBALS['phpgw_info']['server']['config_passwd'] =
$GLOBALS['phpgw_domain'][$GLOBALS['phpgw_info']['server']['default_domain']]['config_passwd'];
!
if(@$GLOBALS['HTTP_POST_VARS']['adddomain'])
{
$GLOBALS['phpgw_domain'][lang('new')] = array();
--- 289,293 ----
$GLOBALS['phpgw_info']['server']['config_passwd'] =
$GLOBALS['phpgw_domain'][$GLOBALS['phpgw_info']['server']['default_domain']]['config_passwd'];
! if(@$adddomain)
{
$GLOBALS['phpgw_domain'][lang('new')] = array();
Index: schematoy.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/schematoy.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** schematoy.php 3 Mar 2002 21:52:52 -0000 1.8
--- schematoy.php 29 Apr 2002 19:49:24 -0000 1.9
***************
*** 100,104 ****
@ksort($GLOBALS['setup_info']);
! if ($HTTP_POST_VARS['cancel'])
{
Header('Location: index.php');
--- 100,104 ----
@ksort($GLOBALS['setup_info']);
! if (get_var('cancel',Array('POST')))
{
Header('Location: index.php');
***************
*** 106,119 ****
}
! $ConfigDomain = $HTTP_COOKIE_VARS['ConfigDomain'] ?
$HTTP_COOKIE_VARS['ConfigDomain'] : $HTTP_POST_VARS['ConfigDomain'];
$GLOBALS['phpgw_setup']->html->show_header(lang("Developers' Table
Schema Toy"),False,'config',$ConfigDomain);
! if ($HTTP_POST_VARS['submit'])
{
$GLOBALS['setup_tpl']->set_var('description',lang('App
process') . ':');
$GLOBALS['setup_tpl']->pparse('out','header');
! $appname = $HTTP_POST_VARS['appname'];
! $install = $HTTP_POST_VARS['install'];
while (list($appname,$key) = @each($install))
--- 106,119 ----
}
! $ConfigDomain = get_var('ConfigDomain',Array('POST','COOKIE'));
$GLOBALS['phpgw_setup']->html->show_header(lang("Developers' Table
Schema Toy"),False,'config',$ConfigDomain);
! if(get_var('submit',Array('POST')))
{
$GLOBALS['setup_tpl']->set_var('description',lang('App
process') . ':');
$GLOBALS['setup_tpl']->pparse('out','header');
! $appname = get_var('appname',Array('POST'));
! $install = get_var('install',Array('POST'));
while (list($appname,$key) = @each($install))
***************
*** 170,176 ****
exit;
}
! if($HTTP_POST_VARS['detail'])
{
- $detail = $HTTP_POST_VARS['detail'];
@ksort($GLOBALS['setup_info'][$detail]);
@reset($GLOBALS['setup_info'][$detail]);
--- 170,176 ----
exit;
}
! $detail = get_var('detail',Array('POST'));
! if($detail)
{
@ksort($GLOBALS['setup_info'][$detail]);
@reset($GLOBALS['setup_info'][$detail]);
Index: setup_demo.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/setup_demo.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** setup_demo.php 14 Apr 2002 22:12:59 -0000 1.27
--- setup_demo.php 29 Apr 2002 19:49:24 -0000 1.28
***************
*** 24,28 ****
// Authorize the user to use setup app and load the database
// Does not return unless user is authorized
! if(!$GLOBALS['phpgw_setup']->auth('Config') ||
$HTTP_POST_VARS['cancel'])
{
Header('Location: index.php');
--- 24,28 ----
// Authorize the user to use setup app and load the database
// Does not return unless user is authorized
! if(!$GLOBALS['phpgw_setup']->auth('Config') ||
get_var('cancel',Array('POST')))
{
Header('Location: index.php');
***************
*** 46,50 ****
}
! if(!$HTTP_POST_VARS['submit'])
{
$tpl_root =
$GLOBALS['phpgw_setup']->html->setup_tpl_dir('setup');
--- 46,50 ----
}
! if(!get_var('submit',Array('POST')))
{
$tpl_root =
$GLOBALS['phpgw_setup']->html->setup_tpl_dir('setup');
***************
*** 83,91 ****
{
/* Posted admin data */
! $passwd = $HTTP_POST_VARS['passwd'];
! $passwd2 = $HTTP_POST_VARS['passwd2'];
! $username = $HTTP_POST_VARS['username'];
! $fname = $HTTP_POST_VARS['fname'];
! $lname = $HTTP_POST_VARS['lname'];
if($passwd != $passwd2)
--- 83,91 ----
{
/* Posted admin data */
! $passwd = get_var('passwd',Array('POST'));
! $passwd2 = get_var('passwd2',Array('POST'));
! $username = get_var('username',Array('POST'));
! $fname = get_var('fname',Array('POST'));
! $lname = get_var('lname',Array('POST'));
if($passwd != $passwd2)
***************
*** 161,165 ****
/* Creation of the demo accounts is optional - the checkbox is
on by default. */
! if($HTTP_POST_VARS['create_demo'])
{
/* Create records for demo accounts */
--- 161,165 ----
/* Creation of the demo accounts is optional - the checkbox is
on by default. */
! if(get_var('create_demo',Array('POST')))
{
/* Create records for demo accounts */
Index: sqltoarray.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/sqltoarray.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** sqltoarray.php 3 Mar 2002 21:52:52 -0000 1.10
--- sqltoarray.php 29 Apr 2002 19:49:24 -0000 1.11
***************
*** 32,39 ****
$setup_tpl = CreateObject('phpgwapi.Template',$tpl_root);
! $download = $HTTP_POST_VARS['download'] ? $HTTP_POST_VARS['download'] :
$HTTP_GET_VARS['download'];
! $submit = $HTTP_POST_VARS['submit'] ? $HTTP_POST_VARS['submit'] :
$HTTP_GET_VARS['submit'];
! $showall = $HTTP_POST_VARS['showall'] ? $HTTP_POST_VARS['showall'] :
$HTTP_GET_VARS['showall'];
! $appname = $HTTP_POST_VARS['appname'] ? $HTTP_POST_VARS['appname'] :
$HTTP_GET_VARS['appname'];
if ($download)
{
--- 32,39 ----
$setup_tpl = CreateObject('phpgwapi.Template',$tpl_root);
! $download = get_var('download',Array('GET','POST'));
! $submit = get_var('submit',Array('GET','POST'));
! $showall = get_var('showall',Array('GET','POST'));
! $appname = get_var('appname',Array('GET','POST'));
if ($download)
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: setup applications.php,1.17,1.18 config.php,1.74,1.75 index.php,1.108,1.109 lang.php,1.36,1.37 ldap.php,1.52,1.53 manageheader.php,1.39,1.40 schematoy.php,1.8,1.9 setup_demo.php,1.27,1.28 sqltoarray.php,1.10,1.11,
Mark A Peters <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: etemplate/templates/idsociety/images navbar-over.gif,NONE,1.1 navbar-over.png,NONE,1.1 navbar.gif,NONE,1.1 navbar.png,NONE,1.1
- Next by Date:
[Phpgroupware-cvs] CVS: registration/inc class.uimanagefields.inc.php,1.2,1.3
- Previous by thread:
[Phpgroupware-cvs] CVS: etemplate/templates/idsociety/images navbar-over.gif,NONE,1.1 navbar-over.png,NONE,1.1 navbar.gif,NONE,1.1 navbar.png,NONE,1.1
- Next by thread:
[Phpgroupware-cvs] CVS: registration/inc class.uimanagefields.inc.php,1.2,1.3
- Index(es):