extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-11 08:28:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Formatting cleanup

Browse Source
This commit is contained in:
Miles Lott 2004-03-14 17:31:43 +00:00
parent 52865de3ce
commit 06b80fa3bf
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
phpgwapi/inc/class.translation_sql.inc.php
View File

@ -5,7 +5,7 @@
* and Dan Kuykendall <seek3r@phpgroupware.org> * * and Dan Kuykendall <seek3r@phpgroupware.org> *
* Handles multi-language support use SQL tables * * Handles multi-language support use SQL tables *
* Copyright (C) 2000, 2001 Joseph Engo * * Copyright (C) 2000, 2001 Joseph Engo *
* -------------------------------------------------------------------------* * ------------------------------------------------------------------------ *
* This library is part of the phpGroupWare API * * This library is part of the phpGroupWare API *
* http://www.phpgroupware.org/api * * http://www.phpgroupware.org/api *
* ------------------------------------------------------------------------ * * ------------------------------------------------------------------------ *
@ -263,7 +263,10 @@
if (!$from) if (!$from)
{ {
$from = $this->mbstring ? strtolower(mb_detect_encoding($data)) : 'iso-8859-1'; $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"; //echo "<p>autodetected charset of '$data' = '$from'</p>\n";
} }
/* /*
@ -274,9 +277,8 @@
{ {
case 'gb2312': case 'gb2312':
case 'gb18030': case 'gb18030':
$from = "EUC-CN"; $from = 'EUC-CN';
break; break;
case 'us-ascii': case 'us-ascii':
$from = 'iso-8859-1'; $from = 'iso-8859-1';
break; break;
@ -327,7 +329,7 @@
if (!isset($GLOBALS['phpgw_info']['server']) && $upgrademethod != 'dumpold') 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()) if ($this->db->next_record())
{ {
$GLOBALS['phpgw_info']['server']['lang_ctimes'] = unserialize(stripslashes($this->db->f('config_value'))); $GLOBALS['phpgw_info']['server']['lang_ctimes'] = unserialize(stripslashes($this->db->f('config_value')));
@ -343,7 +345,7 @@
if ($upgrademethod == 'dumpold') if ($upgrademethod == 'dumpold')
{ {
// dont delete the custom main- & loginscreen messages every time // 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'; //echo '<br>Test: dumpold';
$GLOBALS['phpgw_info']['server']['lang_ctimes'] = array(); $GLOBALS['phpgw_info']['server']['lang_ctimes'] = array();
} }