[Phpgroupware-cvs] setup/lang.php, 1.49

[nomail]

Update of /setup
Modified Files:
        Branch: 
          lang.php

date: 2004/12/30 08:43:15;  author: skwashd;  state: Exp;  lines: +22 -4

Log Message:
adding missing files to new HEAD
=====================================================================
Index: setup/lang.php
diff -u setup/lang.php:1.48 setup/lang.php:1.49
--- setup/lang.php:1.48 Thu May 29 07:58:45 2003
+++ setup/lang.php      Thu Dec 30 08:43:15 2004
@@ -152,7 +152,7 @@
                        $GLOBALS['phpgw_setup']->db->transaction_commit();
                        
                        $GLOBALS['phpgw_setup']->db->query("DELETE from 
phpgw_config WHERE config_app='phpgwapi' AND 
config_name='lang_ctimes'",__LINE__,__FILE__);
-                       $GLOBALS['phpgw_setup']->db->query($query="INSERT INTO 
phpgw_config(config_app,config_name,config_value) VALUES 
('phpgwapi','lang_ctimes','".
+                       $GLOBALS['phpgw_setup']->db->query("INSERT INTO 
phpgw_config(config_app,config_name,config_value) VALUES 
('phpgwapi','lang_ctimes','".
                                
addslashes(serialize($GLOBALS['phpgw_info']['server']['lang_ctimes']))."')",__LINE__,__FILE__);
                }
                if(address@hidden)
@@ -189,13 +189,26 @@
                        $td_align    = @$newinstall ? ' align="center"' : '';
                        $hidden_var1 = @$newinstall ? '<input type="hidden" 
name="newinstall" value="True">' : '';
 
+                       $dir = dir('../phpgwapi/setup');
+                       while(($file = $dir->read()) !== false)
+                       {
+                               if(substr($file, 0, 6) == 'phpgw_')
+                               {
+                                       $avail_lang[] = "'" . substr($file, 6, 
2) . "'";
+                               }
+                       }
+
                        if (address@hidden && 
!isset($GLOBALS['phpgw_info']['setup']['installed_langs']))
                        {
                                
$GLOBALS['phpgw_setup']->detection->check_lang(false);  // get installed langs
                        }
                        $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'");
+                       $db2 = $GLOBALS['phpgw_setup']->db;
+                       $GLOBALS['phpgw_setup']->db->query('SELECT 
lang_id,lang_name, available '
+                                                       . 'FROM phpgw_languages 
'
+                                                       . 'WHERE lang_id 
IN('.implode(',', $avail_lang).')');
+
                        while ($GLOBALS['phpgw_setup']->db->next_record())
                        {
                                $id = $GLOBALS['phpgw_setup']->db->f('lang_id');
@@ -205,6 +218,11 @@
                                        
.(@$GLOBALS['phpgw_info']['setup']['installed_langs'][$id]?' SELECTED':'').'>'
                                        . 
$GLOBALS['phpgw_setup']->db->f('lang_name') . '</option>'
                                        ."\n";
+                               
if(strtoupper($GLOBALS['phpgw_setup']->db->f('available')) != 'YES')
+                               {
+                                       $db2->query("UPDATE phpgw_languages SET 
available = 'Yes' "
+                                               ."WHERE 
lang_id='".$GLOBALS['phpgw_setup']->db->f('lang_id')."'");
+                               }
                        }
 
                        if (address@hidden)
@@ -237,7 +255,7 @@
                        $setup_tpl->set_var('lang_install',lang('install'));
                        $setup_tpl->set_var('lang_cancel',lang('cancel'));
 
-                       $ConfigDomain = 
$GLOBALS['HTTP_COOKIE_VARS']['ConfigDomain'] ? 
$GLOBALS['HTTP_COOKIE_VARS']['ConfigDomain'] : $_POST['ConfigDomain'];
+                       $ConfigDomain = $_COOKIE['ConfigDomain'] ? 
$_COOKIE['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');
                        $GLOBALS['phpgw_setup']->html->show_footer();