[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: setup lang.php,1.30,1.30.2.1
|
From: |
Mark A Peters <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: setup lang.php,1.30,1.30.2.1 |
|
Date: |
Fri, 12 Apr 2002 21:58:00 -0400 |
Update of /cvsroot/phpgroupware/setup
In directory subversions:/tmp/cvs-serv24009
Modified Files:
Tag: Version-0_9_14-branch
lang.php
Log Message:
Changed a few things over to GLOBALS.
Index: lang.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/lang.php,v
retrieving revision 1.30
retrieving revision 1.30.2.1
diff -C2 -r1.30 -r1.30.2.1
*** lang.php 8 Jan 2002 14:42:59 -0000 1.30
--- lang.php 13 Apr 2002 01:57:56 -0000 1.30.2.1
***************
*** 24,33 ****
// Authorize the user to use setup app and load the database
// Does not return unless user is authorized
! if (!$phpgw_setup->auth('Config'))
{
Header('Location: index.php');
exit;
}
! $phpgw_setup->loaddb();
include(PHPGW_API_INC.'/class.common.inc.php');
--- 24,33 ----
// Authorize the user to use setup app and load the database
// Does not return unless user is authorized
! if (!$GLOBALS['phpgw_setup']->auth('Config'))
{
Header('Location: index.php');
exit;
}
! $GLOBALS['phpgw_setup']->loaddb();
include(PHPGW_API_INC.'/class.common.inc.php');
***************
*** 43,56 ****
}
! if ($HTTP_POST_VARS['submit'])
{
! $lang_selected = $HTTP_POST_VARS['lang_selected'];
! $upgrademethod = $HTTP_POST_VARS['upgrademethod'];
! $phpgw_setup->db->transaction_begin();
if (count($lang_selected))
{
if ($upgrademethod == 'dumpold')
{
! $phpgw_setup->db->query("DELETE FROM
lang",__LINE__,__FILE__);
//echo '<br>Test: dumpold';
}
--- 43,56 ----
}
! 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))
{
if ($upgrademethod == 'dumpold')
{
! $GLOBALS['phpgw_setup']->db->query("DELETE FROM
lang",__LINE__,__FILE__);
//echo '<br>Test: dumpold';
}
***************
*** 62,69 ****
{
//echo "<br>Test: addonlynew - select
count(*) from lang where lang='$lang'";
! $phpgw_setup->db->query("SELECT
COUNT(*) FROM lang WHERE lang='$lang'",__LINE__,__FILE__);
! $phpgw_setup->db->next_record();
! if ($phpgw_setup->db->f(0) == 0)
{
//echo '<br>Test: addonlynew -
True';
--- 62,69 ----
{
//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();
! if ($GLOBALS['phpgw_setup']->db->f(0)
== 0)
{
//echo '<br>Test: addonlynew -
True';
***************
*** 74,79 ****
{
//echo '<br>Test: loop above file()';
! $setup_info =
$phpgw_setup->get_versions();
! $setup_info =
$phpgw_setup->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
***************
*** 82,86 ****
$appfile = PHPGW_SERVER_ROOT .
SEP . $app['name'] . SEP . 'setup' . SEP . 'phpgw_' . strtolower($lang) .
'.lang';
//echo '<br>Checking in: ' .
$app['name'];
!
if($phpgw_setup->app_registered($app['name']) && file_exists($appfile))
{
//echo '<br>Including:
' . $appfile;
--- 82,86 ----
$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;
***************
*** 94,112 ****
{
$addit = False;
!
list($message_id,$app_name,$phpgw_setup->db_lang,$content) =
explode("\t",$line);
! $message_id =
$phpgw_setup->db->db_addslashes(chop($message_id));
//echo '<br>APPNAME:' .
$app_name . ' PHRASE:' . $message_id;
! $app_name =
$phpgw_setup->db->db_addslashes(chop($app_name));
! $phpgw_setup->db_lang
= $phpgw_setup->db->db_addslashes(chop($phpgw_setup->db_lang));
! $content =
$phpgw_setup->db->db_addslashes(chop($content));
if ($upgrademethod ==
'addmissing')
{
//echo
'<br>Test: addmissing';
!
$phpgw_setup->db->query("SELECT COUNT(*) FROM lang WHERE
message_id='$message_id' and lang='$phpgw_setup->db_lang'",__LINE__,__FILE__);
!
$phpgw_setup->db->next_record();
! if
($phpgw_setup->db->f(0) == 0)
{
! //echo
'<br>Test: addmissing - True - Total: ' . $phpgw_setup->db->f(0);
$addit
= True;
}
--- 94,112 ----
{
$addit = False;
!
list($message_id,$app_name,$GLOBALS['phpgw_setup']->db_lang,$content) =
explode("\t",$line);
! $message_id =
$GLOBALS['phpgw_setup']->db->db_addslashes(chop($message_id));
//echo '<br>APPNAME:' .
$app_name . ' PHRASE:' . $message_id;
! $app_name =
$GLOBALS['phpgw_setup']->db->db_addslashes(chop($app_name));
!
$GLOBALS['phpgw_setup']->db_lang =
$GLOBALS['phpgw_setup']->db->db_addslashes(chop($GLOBALS['phpgw_setup']->db_lang));
! $content =
$GLOBALS['phpgw_setup']->db->db_addslashes(chop($content));
if ($upgrademethod ==
'addmissing')
{
//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."'",__LINE__,__FILE__);
!
$GLOBALS['phpgw_setup']->db->next_record();
! if
($GLOBALS['phpgw_setup']->db->f(0) == 0)
{
! //echo
'<br>Test: addmissing - True - Total: ' . $GLOBALS['phpgw_setup']->db->f(0);
$addit
= True;
}
***************
*** 117,122 ****
if($message_id
&& $content)
{
! // echo
"<br>adding - insert into lang values
('$message_id','$app_name','$phpgw_setup->db_lang','$content')";
!
$phpgw_setup->db->query("INSERT into lang VALUES
('$message_id','$app_name','$phpgw_setup->db_lang','$content')",__LINE__,__FILE__);
}
}
--- 117,122 ----
if($message_id
&& $content)
{
! // echo
"<br>adding - insert into lang values
('$message_id','$app_name','$GLOBALS['phpgw_setup']->db_lang','$content')";
!
$GLOBALS['phpgw_setup']->db->query("INSERT into lang VALUES
('$message_id','$app_name','".$GLOBALS['phpgw_setup']->db_lang."','$content')",__LINE__,__FILE__);
}
}
***************
*** 125,129 ****
}
}
! $phpgw_setup->db->transaction_commit();
}
--- 125,129 ----
}
}
! $GLOBALS['phpgw_setup']->db->transaction_commit();
}
***************
*** 144,148 ****
if (!$included)
{
! $tpl_root = $phpgw_setup->setup_tpl_dir('setup');
$setup_tpl =
CreateObject('phpgwapi.Template',$tpl_root);
$setup_tpl->set_file(array(
--- 144,148 ----
if (!$included)
{
! $tpl_root =
$GLOBALS['phpgw_setup']->setup_tpl_dir('setup');
$setup_tpl =
CreateObject('phpgwapi.Template',$tpl_root);
$setup_tpl->set_file(array(
***************
*** 164,174 ****
$select_box_desc = lang('Select which languages you
would like to use');
$select_box = '';
! $phpgw_setup->db->query("select lang_id,lang_name from
languages where available='Yes'");
! while ($phpgw_setup->db->next_record())
{
$select_box_langs =
$select_box_langs
! .'<option value="' .
$phpgw_setup->db->f('lang_id') . '">'
! . $phpgw_setup->db->f('lang_name') .
'</option>'
."\n";
}
--- 164,174 ----
$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";
}
***************
*** 204,211 ****
$setup_tpl->set_var('lang_cancel',lang('cancel'));
! $ConfigDomain = $HTTP_COOKIE_VARS['ConfigDomain'] ?
$HTTP_COOKIE_VARS['ConfigDomain'] : $HTTP_POST_VARS['ConfigDomain'];
!
$phpgw_setup->show_header("$stage_title",False,'config',$ConfigDomain . '(' .
$phpgw_domain[$ConfigDomain]['db_type'] . ')');
$setup_tpl->pparse('out','T_lang_main');
! $phpgw_setup->show_footer();
}
}
--- 204,211 ----
$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.30,1.30.2.1,
Mark A Peters <address@hidden> <=