[Phpgroupware-cvs] CVS: setup lang.php,1.46,1.46.2.1

[Ralf Becker <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        lang.php 
Log Message:
changes to get HEAD setup working in 0.9.16


Index: lang.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/lang.php,v
retrieving revision 1.46
retrieving revision 1.46.2.1
diff -C2 -r1.46 -r1.46.2.1
*** lang.php    22 Mar 2003 01:32:30 -0000      1.46
--- lang.php    26 Mar 2003 23:59:29 -0000      1.46.2.1
***************
*** 63,67 ****
                        {
                                // 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();
--- 63,67 ----
                        {
                                // dont delete the custom main- & loginscreen 
messages every time
!                               $GLOBALS['phpgw_setup']->db->query("DELETE FROM 
lang where app_name != 'mainscreen' AND app_name != 
'loginscreen'",__LINE__,__FILE__);
                                //echo '<br>Test: dumpold';
                                $GLOBALS['phpgw_info']['server']['lang_ctimes'] 
= array();
***************
*** 73,78 ****
                                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();
  
--- 73,78 ----
                                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();
  
***************
*** 117,121 ****
                                                        {
                                                                //echo 
'<br>Test: addmissing';
!                                                               
$GLOBALS['phpgw_setup']->db->query("SELECT COUNT(*) FROM phpgw_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();
  
--- 117,121 ----
                                                        {
                                                                //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();
  
***************
*** 132,139 ****
                                                                {
                                                                        //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 
phpgw_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: phpgw_lang values 
('".$message_id."','".$app_name."','".$GLOBALS['phpgw_setup']->db_lang."','".$content."')";
                                                                        }
                                                                }
--- 132,139 ----
                                                                {
                                                                        //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."')";
                                                                        }
                                                                }
***************
*** 190,194 ****
                        $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 phpgw_languages where available='Yes'");
                        while ($GLOBALS['phpgw_setup']->db->next_record())
                        {
--- 190,194 ----
                        $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())
                        {