Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Reversed lost changes with the previous commit

Browse Source
This commit is contained in:
Marcos García
2012-08-03 23:29:08 +02:00
parent ba41a94bca
commit b8add21d93
1 changed files with 1904 additions and 1898 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
htdocs/core/lib/functions.lib.php
View File

@@ -3863,24 +3863,29 @@ function dol_validElement($element)
*/ */
function picto_from_langcode($codelang) function picto_from_langcode($codelang)
{ {
$ret=''; global $langs;
if (! empty($codelang))
if ($codelang == 'auto')
{ {
if ($codelang == 'auto') $ret=img_picto('',DOL_URL_ROOT.'/theme/common/flags/int.png','',1); return img_picto_common($langs->trans('AutoDetectLang'), 'flags/int.png');
else { }
//print $codelang;
$langtocountryflag=array('ar_AR'=>'','ca_ES'=>'catalonia','da_DA'=>'dk','fr_CA'=>'mq','sv_SV'=>'se'); $langtocountryflag = array(
$tmpcode=''; 'ar_AR' => '',
if (isset($langtocountryflag[$codelang])) $tmpcode=$langtocountryflag[$codelang]; 'ca_ES' => 'catalonia',
'da_DA' => 'dk',
'fr_CA' => 'mq',
'sv_SV' => 'se'
);
if (isset($langtocountryflag[$codelang])) $flagImage = $langtocountryflag[$codelang];
else else
{ {
$tmparray = explode('_', $codelang); $tmparray = explode('_', $codelang);
$tmpcode=empty($tmparray[1])?$tmparray[0]:$tmparray[1]; $flagImage = empty($tmparray[1]) ? $tmparray[0] : $tmparray[1];
} }
if ($tmpcode) $ret.=img_picto($codelang,DOL_URL_ROOT.'/theme/common/flags/'.strtolower($tmpcode).'.png','',1);
} return img_picto_common($codelang, 'flags/'.strtolower($flagImage).'.png');
}
return $ret;
} }
/** /**
@@ -4100,9 +4105,10 @@ function getCurrencySymbol($currency_code)
if (! function_exists('getmypid')) if (! function_exists('getmypid'))
{ {
/** /**
* Return PID * Return random PID
* Some web hosts disable this php function for security reasons
* *
* @return void * @return int
*/ */
function getmypid() function getmypid()
{ {