[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: setup lang.php,1.39,1.40
|
From: |
Mark A Peters <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: setup lang.php,1.39,1.40 |
|
Date: |
Sun, 15 Sep 2002 19:21:04 -0400 |
Update of /cvsroot/phpgroupware/setup
In directory subversions:/tmp/cvs-serv11783/setup
Modified Files:
lang.php
Log Message:
Will now stop (error) when inserting bad data.
Index: lang.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/lang.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** lang.php 11 Aug 2002 23:54:57 -0000 1.39
--- lang.php 15 Sep 2002 23:21:01 -0000 1.40
***************
*** 12,19 ****
/* $Id$ */
! $GLOBALS['phpgw_info'] = array();
! if (address@hidden'included'])
{
! $GLOBALS['phpgw_info']['flags'] = Array(
'noheader' => True,
'nonavbar' => True,
--- 12,19 ----
/* $Id$ */
! $phpgw_info = array();
! if (!$included)
{
! $GLOBALS['phpgw_info']['flags'] = array(
'noheader' => True,
'nonavbar' => True,
***************
*** 30,38 ****
}
$GLOBALS['phpgw_setup']->loaddb();
include(PHPGW_API_INC.'/class.common.inc.php');
$common = new common;
-
- $newinstall = False;
-
// this is not used
//$sep = $common->filesystem_separator();
--- 30,36 ----
}
$GLOBALS['phpgw_setup']->loaddb();
+
include(PHPGW_API_INC.'/class.common.inc.php');
$common = new common;
// this is not used
//$sep = $common->filesystem_separator();
***************
*** 45,66 ****
}
! $setup_info_temp = $GLOBALS['phpgw_setup']->detection->get_versions();
! $setup_info =
$GLOBALS['phpgw_setup']->detection->get_db_versions($setup_info_temp);
!
!
if($GLOBALS['phpgw_setup']->alessthanb($setup_info['phpgwapi']['currentver'],
'0.9.15.002'))
! {
! $langtbl = 'lang';
! $langstbl = 'languages';
! }
! else
! {
! $langtbl = 'phpgw_lang';
! $langstbl = 'phpgw_languages';
! }
!
! 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))
--- 43,50 ----
}
! if (@$GLOBALS['HTTP_POST_VARS']['submit'])
{
! $lang_selected = @$GLOBALS['HTTP_POST_VARS']['lang_selected'];
! $upgrademethod = @$GLOBALS['HTTP_POST_VARS']['upgrademethod'];
$GLOBALS['phpgw_setup']->db->transaction_begin();
if (count($lang_selected))
***************
*** 68,72 ****
if ($upgrademethod == 'dumpold')
{
! $GLOBALS['phpgw_setup']->db->query('DELETE FROM
'.$langtbl,__LINE__,__FILE__);
//echo '<br>Test: dumpold';
}
--- 52,56 ----
if ($upgrademethod == 'dumpold')
{
! $GLOBALS['phpgw_setup']->db->query("DELETE FROM
lang",__LINE__,__FILE__);
//echo '<br>Test: dumpold';
}
***************
*** 77,82 ****
if ($upgrademethod == 'addonlynew')
{
! //echo "<br>Test: addonlynew - select
count(*) from lang where lang='$lang'";
!
$GLOBALS['phpgw_setup']->db->query("SELECT COUNT(*) FROM $langtbl WHERE
lang='$lang'",__LINE__,__FILE__);
$GLOBALS['phpgw_setup']->db->next_record();
--- 61,66 ----
if ($upgrademethod == 'addonlynew')
{
! //echo "<br>Test: addonlynew - select
count(*) from lang where lang='".$lang."'";
!
$GLOBALS['phpgw_setup']->db->query("SELECT COUNT(*) FROM lang WHERE
lang='".$lang."'",__LINE__,__FILE__);
$GLOBALS['phpgw_setup']->db->next_record();
***************
*** 90,95 ****
{
//echo '<br>Test: loop above file()';
! $setup_info =
$GLOBALS['phpgw_setup']->detection->get_versions();
! $setup_info =
$GLOBALS['phpgw_setup']->detection->get_db_versions($setup_info);
$raw = $raw_file = array();
// Visit each app/setup dir, look for a
lang file
--- 74,79 ----
{
//echo '<br>Test: loop above file()';
! $setup_info =
$GLOBALS['phpgw_setup']->get_versions();
! $setup_info =
$GLOBALS['phpgw_setup']->get_db_versions($setup_info);
$raw = $raw_file = array();
// Visit each app/setup dir, look for a
lang file
***************
*** 119,124 ****
{
//echo
'<br>Test: addmissing';
!
$GLOBALS['phpgw_setup']->db->query("SELECT COUNT(*) FROM $langtbl WHERE
message_id='$message_id' and lang='"
! .
$GLOBALS['phpgw_setup']->db_lang . "'",__LINE__,__FILE__);
$GLOBALS['phpgw_setup']->db->next_record();
--- 103,107 ----
{
//echo
'<br>Test: addmissing';
!
$GLOBALS['phpgw_setup']->db->query("SELECT COUNT(*) FROM lang WHERE
message_id='".$message_id."' and lang='".$GLOBALS['phpgw_setup']->db_lang."'
and (app_name='".$app_name."' or app_name='common')",__LINE__,__FILE__);
$GLOBALS['phpgw_setup']->db->next_record();
***************
*** 134,140 ****
if($message_id
&& $content)
{
! // echo
"<br>adding - insert into $langtbl(message_id,app_name,lang,content) values
('$message_id','$app_name','" . $GLOBALS['phpgw_setup']->db_lang .
"','$content')";
!
$GLOBALS['phpgw_setup']->db->query("INSERT INTO
$langtbl(message_id,app_name,lang,content) VALUES ('$message_id','$app_name','"
!
. $GLOBALS['phpgw_setup']->db_lang . "','$content')",__LINE__,__FILE__);
}
}
--- 117,126 ----
if($message_id
&& $content)
{
! //echo
"<br>adding - insert into lang values
('".$message_id."','".$app_name."','".$GLOBALS['phpgw_setup']->db_lang."','".$content."')";
! $result
= $GLOBALS['phpgw_setup']->db->query("INSERT INTO
lang(message_id,app_name,lang,content)
VALUES('".$message_id."','".$app_name."','".$GLOBALS['phpgw_setup']->db_lang."','".$content."')",__LINE__,__FILE__);
! if
(intval($result) <= 0)
! {
!
echo '<br>Error inserting record: lang values
('".$message_id."','".$app_name."','".$GLOBALS['phpgw_setup']->db_lang."','".$content."')";
! }
}
}
***************
*** 146,150 ****
}
! if(address@hidden'included'])
{
Header('Location: index.php');
--- 132,136 ----
}
! if(!$included)
{
Header('Location: index.php');
***************
*** 154,158 ****
else
{
! if (@get_var('cancel',Array('POST')))
{
Header('Location: index.php');
--- 140,144 ----
else
{
! if ($GLOBALS['HTTP_POST_VARS']['cancel'])
{
Header('Location: index.php');
***************
*** 160,167 ****
}
! if (address@hidden'included'])
{
! $tpl_root =
$GLOBALS['phpgw_setup']->html->setup_tpl_dir('setup');
! $setup_tpl = CreateObject('setup.Template',$tpl_root);
$setup_tpl->set_file(array(
'T_head' => 'head.tpl',
--- 146,153 ----
}
! if (!$included)
{
! $tpl_root =
$GLOBALS['phpgw_setup']->setup_tpl_dir('setup');
! $setup_tpl =
CreateObject('phpgwapi.Template',$tpl_root);
$setup_tpl->set_file(array(
'T_head' => 'head.tpl',
***************
*** 180,198 ****
$hidden_var1 = $newinstall ? '<input type="hidden"
name="newinstall" value="True">' : '';
- $GLOBALS['phpgw_setup']->db->query("SELECT DISTINCT
lang FROM $langtbl",__LINE__,__FILE__);
- $installed_langs = array();
- while(@$GLOBALS['phpgw_setup']->db->next_record())
- {
-
$installed_langs[$GLOBALS['phpgw_setup']->db->f('lang')] = ' selected';
- }
-
$select_box_desc = lang('Select which languages you
would like to use');
! $select_box_langs = '';
! $GLOBALS['phpgw_setup']->db->query("SELECT
lang_id,lang_name from $langstbl WHERE available='Yes' ORDER BY(lang_name)");
while ($GLOBALS['phpgw_setup']->db->next_record())
{
! $select_box_langs .= '<option value="' .
$GLOBALS['phpgw_setup']->db->f('lang_id')
! . '"' .
$installed_langs[$GLOBALS['phpgw_setup']->db->f('lang_id')] . '>'
! .
$GLOBALS['phpgw_setup']->db->f('lang_name') . '</option>' . "\n";
}
--- 166,179 ----
$hidden_var1 = $newinstall ? '<input type="hidden"
name="newinstall" value="True">' : '';
$select_box_desc = lang('Select which languages you
would like to use');
! $select_box = '';
! $GLOBALS['phpgw_setup']->db->query("select
lang_id,lang_name from languages where available='Yes'");
while ($GLOBALS['phpgw_setup']->db->next_record())
{
! $select_box_langs =
! $select_box_langs
! .'<option value="' .
$GLOBALS['phpgw_setup']->db->f('lang_id') . '">'
! .
$GLOBALS['phpgw_setup']->db->f('lang_name') . '</option>'
! ."\n";
}
***************
*** 227,234 ****
$setup_tpl->set_var('lang_cancel',lang('cancel'));
! $ConfigDomain =
get_var('ConfigDomain',Array('POST','COOKIE'));
!
$GLOBALS['phpgw_setup']->html->show_header("$stage_title",False,'config',$ConfigDomain
. '(' . $phpgw_domain[$ConfigDomain]['db_type'] . ')');
$setup_tpl->pparse('out','T_lang_main');
! $GLOBALS['phpgw_setup']->html->show_footer();
}
}
--- 208,215 ----
$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']->show_header("$stage_title",False,'config',$ConfigDomain
. '(' . $phpgw_domain[$ConfigDomain]['db_type'] . ')');
$setup_tpl->pparse('out','T_lang_main');
! $GLOBALS['phpgw_setup']->show_footer();
}
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: setup lang.php,1.39,1.40,
Mark A Peters <address@hidden> <=