mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-23 15:18:58 +01:00
Formatting cleanup
This commit is contained in:
parent
52865de3ce
commit
06b80fa3bf
@ -5,7 +5,7 @@
|
||||
* and Dan Kuykendall <seek3r@phpgroupware.org> *
|
||||
* Handles multi-language support use SQL tables *
|
||||
* Copyright (C) 2000, 2001 Joseph Engo *
|
||||
* -------------------------------------------------------------------------*
|
||||
* ------------------------------------------------------------------------ *
|
||||
* This library is part of the phpGroupWare API *
|
||||
* http://www.phpgroupware.org/api *
|
||||
* ------------------------------------------------------------------------ *
|
||||
@ -263,7 +263,10 @@
|
||||
if (!$from)
|
||||
{
|
||||
$from = $this->mbstring ? strtolower(mb_detect_encoding($data)) : 'iso-8859-1';
|
||||
if ($from == 'ascii') $from = 'iso-8859-1';
|
||||
if($from == 'ascii')
|
||||
{
|
||||
$from = 'iso-8859-1';
|
||||
}
|
||||
//echo "<p>autodetected charset of '$data' = '$from'</p>\n";
|
||||
}
|
||||
/*
|
||||
@ -274,9 +277,8 @@
|
||||
{
|
||||
case 'gb2312':
|
||||
case 'gb18030':
|
||||
$from = "EUC-CN";
|
||||
$from = 'EUC-CN';
|
||||
break;
|
||||
|
||||
case 'us-ascii':
|
||||
$from = 'iso-8859-1';
|
||||
break;
|
||||
@ -327,7 +329,7 @@
|
||||
|
||||
if (!isset($GLOBALS['phpgw_info']['server']) && $upgrademethod != 'dumpold')
|
||||
{
|
||||
$this->db->query("select * from phpgw_config WHERE config_app='phpgwapi' AND config_name='lang_ctimes'",__LINE__,__FILE__);
|
||||
$this->db->query("SELECT * FROM phpgw_config WHERE config_app='phpgwapi' AND config_name='lang_ctimes'",__LINE__,__FILE__);
|
||||
if ($this->db->next_record())
|
||||
{
|
||||
$GLOBALS['phpgw_info']['server']['lang_ctimes'] = unserialize(stripslashes($this->db->f('config_value')));
|
||||
@ -343,7 +345,7 @@
|
||||
if ($upgrademethod == 'dumpold')
|
||||
{
|
||||
// dont delete the custom main- & loginscreen messages every time
|
||||
$this->db->query("DELETE FROM phpgw_lang where app_name != 'mainscreen' AND app_name != 'loginscreen'",__LINE__,__FILE__);
|
||||
$this->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();
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user