[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: setup lang.php,1.47,1.48
From: |
Ralf Becker <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: setup lang.php,1.47,1.48 |
Date: |
Thu, 29 May 2003 03:58:47 -0400 |
Update of /cvsroot/phpgroupware/setup
In directory subversions:/tmp/cvs-serv19527
Modified Files:
lang.php
Log Message:
changed $GLOBALS[HTTP_POST_VARS] to $_POST to get the automatic lang-update
working again
merged skwashd's changes from .16
Index: lang.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/lang.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -r1.47 -r1.48
*** lang.php 2 Apr 2003 17:46:37 -0000 1.47
--- lang.php 29 May 2003 07:58:45 -0000 1.48
***************
*** 13,17 ****
$phpgw_info = array();
! if (!$included)
{
$GLOBALS['phpgw_info']['flags'] = array(
--- 13,17 ----
$phpgw_info = array();
! if (address@hidden)
{
$GLOBALS['phpgw_info']['flags'] = array(
***************
*** 48,55 ****
}
! if (@$GLOBALS['HTTP_POST_VARS']['submit'])
{
! $lang_selected = @$GLOBALS['HTTP_POST_VARS']['lang_selected'];
! $upgrademethod = @$GLOBALS['HTTP_POST_VARS']['upgrademethod'];
if (!isset($GLOBALS['phpgw_info']['server']) && $upgrademethod
!= 'dumpold')
--- 48,55 ----
}
! if (@$_POST['submit'])
{
! $lang_selected = @$_POST['lang_selected'];
! $upgrademethod = @$_POST['upgrademethod'];
if (!isset($GLOBALS['phpgw_info']['server']) && $upgrademethod
!= 'dumpold')
***************
*** 97,103 ****
while (list($key,$app) =
each($setup_info))
{
! $appfile = PHPGW_SERVER_ROOT .
SEP . $app['name'] . SEP . 'setup' . SEP . 'phpgw_' . strtolower($lang) .
'.lang';
//echo '<br>Checking in: ' .
$app['name'];
!
if($GLOBALS['phpgw_setup']->app_registered($app['name']) &&
file_exists($appfile))
{
//echo '<br>Including:
' . $appfile;
--- 97,103 ----
while (list($key,$app) =
each($setup_info))
{
! $appfile = PHPGW_SERVER_ROOT .
SEP . @$app['name'] . SEP . 'setup' . SEP . 'phpgw_' . strtolower($lang) .
'.lang';
//echo '<br>Checking in: ' .
$app['name'];
!
if($GLOBALS['phpgw_setup']->app_registered(@$app['name']) &&
file_exists($appfile))
{
//echo '<br>Including:
' . $appfile;
***************
*** 134,138 ****
}
! if ($addit ||
$newinstall || $upgrademethod == 'addonlynew' || $upgrademethod == 'dumpold')
{
if($message_id
&& $content)
--- 134,138 ----
}
! if ($addit ||
@$newinstall || $upgrademethod == 'addonlynew' || $upgrademethod == 'dumpold')
{
if($message_id
&& $content)
***************
*** 156,160 ****
addslashes(serialize($GLOBALS['phpgw_info']['server']['lang_ctimes']))."')",__LINE__,__FILE__);
}
! if(!$included)
{
Header('Location: index.php');
--- 156,160 ----
addslashes(serialize($GLOBALS['phpgw_info']['server']['lang_ctimes']))."')",__LINE__,__FILE__);
}
! if(address@hidden)
{
Header('Location: index.php');
***************
*** 164,168 ****
else
{
! if ($GLOBALS['HTTP_POST_VARS']['cancel'])
{
Header('Location: index.php');
--- 164,168 ----
else
{
! if (@$_POST['cancel'])
{
Header('Location: index.php');
***************
*** 170,174 ****
}
! if (!$included)
{
$tpl_root =
$GLOBALS['phpgw_setup']->html->setup_tpl_dir('setup');
--- 170,174 ----
}
! if (address@hidden)
{
$tpl_root =
$GLOBALS['phpgw_setup']->html->setup_tpl_dir('setup');
***************
*** 185,194 ****
$stage_title = lang('Multi-Language support setup');
$stage_desc = lang('This program will help you upgrade
or install different languages for phpGroupWare');
! $tbl_width = $newinstall ? '60%' : '80%';
! $td_colspan = $newinstall ? '1' : '2';
! $td_align = $newinstall ? ' align="center"' : '';
! $hidden_var1 = $newinstall ? '<input type="hidden"
name="newinstall" value="True">' : '';
! if (!$newinstall &&
!isset($GLOBALS['phpgw_info']['setup']['installed_langs']))
{
$GLOBALS['phpgw_setup']->detection->check_lang(false); // get installed langs
--- 185,194 ----
$stage_title = lang('Multi-Language support setup');
$stage_desc = lang('This program will help you upgrade
or install different languages for phpGroupWare');
! $tbl_width = @$newinstall ? '60%' : '80%';
! $td_colspan = @$newinstall ? '1' : '2';
! $td_align = @$newinstall ? ' align="center"' : '';
! $hidden_var1 = @$newinstall ? '<input type="hidden"
name="newinstall" value="True">' : '';
! if (address@hidden &&
!isset($GLOBALS['phpgw_info']['setup']['installed_langs']))
{
$GLOBALS['phpgw_setup']->detection->check_lang(false); // get installed langs
***************
*** 201,212 ****
$id = $GLOBALS['phpgw_setup']->db->f('lang_id');
$select_box_langs =
! $select_box_langs
.'<option value="' . $id . '"'
!
.($GLOBALS['phpgw_info']['setup']['installed_langs'][$id]?' SELECTED':'').'>'
.
$GLOBALS['phpgw_setup']->db->f('lang_name') . '</option>'
."\n";
}
! if (! $newinstall)
{
$meth_desc = lang('Select which method of
upgrade you would like to do');
--- 201,212 ----
$id = $GLOBALS['phpgw_setup']->db->f('lang_id');
$select_box_langs =
! @$select_box_langs
.'<option value="' . $id . '"'
!
.(@$GLOBALS['phpgw_info']['setup']['installed_langs'][$id]?' SELECTED':'').'>'
.
$GLOBALS['phpgw_setup']->db->f('lang_name') . '</option>'
."\n";
}
! if (address@hidden)
{
$meth_desc = lang('Select which method of
upgrade you would like to do');
***************
*** 238,242 ****
$setup_tpl->set_var('lang_cancel',lang('cancel'));
! $ConfigDomain =
$GLOBALS['HTTP_COOKIE_VARS']['ConfigDomain'] ?
$GLOBALS['HTTP_COOKIE_VARS']['ConfigDomain'] :
$GLOBALS['HTTP_POST_VARS']['ConfigDomain'];
$GLOBALS['phpgw_setup']->html->show_header("$stage_title",False,'config',$ConfigDomain
. '(' . $phpgw_domain[$ConfigDomain]['db_type'] . ')');
$setup_tpl->pparse('out','T_lang_main');
--- 238,242 ----
$setup_tpl->set_var('lang_cancel',lang('cancel'));
! $ConfigDomain =
$GLOBALS['HTTP_COOKIE_VARS']['ConfigDomain'] ?
$GLOBALS['HTTP_COOKIE_VARS']['ConfigDomain'] : $_POST['ConfigDomain'];
$GLOBALS['phpgw_setup']->html->show_header("$stage_title",False,'config',$ConfigDomain
. '(' . $phpgw_domain[$ConfigDomain]['db_type'] . ')');
$setup_tpl->pparse('out','T_lang_main');
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: setup lang.php,1.47,1.48,
Ralf Becker <address@hidden> <=