[Phpgroupware-cvs] CVS: setup lang.php,1.46.2.2,1.46.2.3

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/setup
In directory subversions:/tmp/cvs-serv5936

Modified Files:
      Tag: Version-0_9_16-branch
        lang.php 
Log Message:
changed table-names from lang & languages to phpgw_lang & phpgw_languages (like 
in 0.9.15.002)


Index: lang.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/lang.php,v
retrieving revision 1.46.2.2
retrieving revision 1.46.2.3
diff -C2 -r1.46.2.2 -r1.46.2.3
*** lang.php    2 Apr 2003 10:48:04 -0000       1.46.2.2
--- lang.php    2 Apr 2003 16:57:57 -0000       1.46.2.3
***************
*** 53,61 ****
                $upgrademethod = @$GLOBALS['HTTP_POST_VARS']['upgrademethod'];
                
-               $langTbl = $GLOBALS['phpgw_setup']->alessthanb(
-                       
$GLOBALS['phpgw_info']['server']['versions']['phpgwapi'],
-                       '0.9.15.002'
-               ) ? 'lang' : 'phpgw_lang';
- 
                if (!isset($GLOBALS['phpgw_info']['server']) && $upgrademethod 
!= 'dumpold')
                {
--- 53,56 ----
***************
*** 73,77 ****
                        {
                                // dont delete the custom main- & loginscreen 
messages every time
!                               $GLOBALS['phpgw_setup']->db->query("DELETE FROM 
$langTbl where app_name != 'mainscreen' AND app_name != 
'loginscreen'",__LINE__,__FILE__);
                                //echo '<br>Test: dumpold';
                                $GLOBALS['phpgw_info']['server']['lang_ctimes'] 
= array();
--- 68,72 ----
                        {
                                // dont delete the custom main- & loginscreen 
messages every time
!                               $GLOBALS['phpgw_setup']->db->query("DELETE FROM 
phpgw_lang where app_name != 'mainscreen' AND app_name != 
'loginscreen'",__LINE__,__FILE__);
                                //echo '<br>Test: dumpold';
                                $GLOBALS['phpgw_info']['server']['lang_ctimes'] 
= array();
***************
*** 83,88 ****
                                if ($upgrademethod == 'addonlynew')
                                {
!                                       //echo "<br>Test: addonlynew - select 
count(*) from $langTbl where lang='".$lang."'";
!                                       
$GLOBALS['phpgw_setup']->db->query("SELECT COUNT(*) FROM $langTbl WHERE 
lang='".$lang."'",__LINE__,__FILE__);
                                        
$GLOBALS['phpgw_setup']->db->next_record();
  
--- 78,83 ----
                                if ($upgrademethod == 'addonlynew')
                                {
!                                       //echo "<br>Test: addonlynew - select 
count(*) from phpgw_lang where lang='".$lang."'";
!                                       
$GLOBALS['phpgw_setup']->db->query("SELECT COUNT(*) FROM phpgw_lang WHERE 
lang='".$lang."'",__LINE__,__FILE__);
                                        
$GLOBALS['phpgw_setup']->db->next_record();
  
***************
*** 99,103 ****
                                        $setup_info = 
$GLOBALS['phpgw_setup']->detection->get_db_versions($setup_info);
                                        $raw = array();
!                                       // Visit each app/setup dir, look for a 
$langTbl file
                                        while (list($key,$app) = 
each($setup_info))
                                        {
--- 94,98 ----
                                        $setup_info = 
$GLOBALS['phpgw_setup']->detection->get_db_versions($setup_info);
                                        $raw = array();
!                                       // Visit each app/setup dir, look for a 
phpgw_lang file
                                        while (list($key,$app) = 
each($setup_info))
                                        {
***************
*** 129,133 ****
                                                        {
                                                                //echo 
'<br>Test: addmissing';
!                                                               
$GLOBALS['phpgw_setup']->db->query("SELECT COUNT(*) FROM $langTbl WHERE 
message_id='$message_id' and lang='$lang' and (app_name='$app_name' or 
app_name='common')",__LINE__,__FILE__);
                                                                
$GLOBALS['phpgw_setup']->db->next_record();
  
--- 124,128 ----
                                                        {
                                                                //echo 
'<br>Test: addmissing';
!                                                               
$GLOBALS['phpgw_setup']->db->query("SELECT COUNT(*) FROM phpgw_lang WHERE 
message_id='$message_id' and lang='$lang' and (app_name='$app_name' or 
app_name='common')",__LINE__,__FILE__);
                                                                
$GLOBALS['phpgw_setup']->db->next_record();
  
***************
*** 143,151 ****
                                                                if($message_id 
&& $content)
                                                                {
!                                                                       //echo 
"<br>adding - insert into $langTbl values 
('$message_id','$app_name','$lang','$content')";
!                                                                       $result 
= $GLOBALS['phpgw_setup']->db->query("INSERT INTO 
lang(message_id,app_name,lang,content) 
VALUES('$message_id','$app_name','$lang','$content')",__LINE__,__FILE__);
                                                                        if 
(intval($result) <= 0)
                                                                        {
!                                                                               
//echo "<br>Error inserting record: $langTbl values 
('$message_id','$app_name','$lang','$content')";
                                                                        }
                                                                }
--- 138,146 ----
                                                                if($message_id 
&& $content)
                                                                {
!                                                                       //echo 
"<br>adding - insert into phpgw_lang values 
('$message_id','$app_name','$lang','$content')";
!                                                                       $result 
= $GLOBALS['phpgw_setup']->db->query("INSERT INTO phpgw_lang 
(message_id,app_name,lang,content) 
VALUES('$message_id','$app_name','$lang','$content')",__LINE__,__FILE__);
                                                                        if 
(intval($result) <= 0)
                                                                        {
!                                                                               
echo "<br>Error inserting record: phpgw_lang values 
('$message_id','$app_name','$lang','$content')";
                                                                        }
                                                                }
***************
*** 201,205 ****
                        $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())
                        {
--- 196,200 ----
                        $select_box_desc = lang('Select which languages you 
would like to use');
                        $select_box = '';
!                       $GLOBALS['phpgw_setup']->db->query($q="select 
lang_id,lang_name from phpgw_languages where available='Yes'");
                        while ($GLOBALS['phpgw_setup']->db->next_record())
                        {