lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: refactorize with code

Browse Source
This commit is contained in:
Regis Houssin 2012-03-05 16:01:49 +01:00
parent 513a0673d2
commit 38b3f592d2
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
htdocs/core/class/html.form.class.php
View File

@ -2728,7 +2728,7 @@ class Form
if (count($this->cache_currencies)) return 0; // Cache deja charge if (count($this->cache_currencies)) return 0; // Cache deja charge
$sql = "SELECT code_iso, label"; $sql = "SELECT code, code_iso, label";
$sql.= " FROM ".MAIN_DB_PREFIX."c_currencies"; $sql.= " FROM ".MAIN_DB_PREFIX."c_currencies";
$sql.= " WHERE active = 1"; $sql.= " WHERE active = 1";
$sql.= " ORDER BY code_iso ASC"; $sql.= " ORDER BY code_iso ASC";
@ -2743,12 +2743,14 @@ class Form
{ {
$obj = $this->db->fetch_object($resql); $obj = $this->db->fetch_object($resql);
// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut // Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
$this->cache_currencies[$obj->code_iso] = ($obj->code_iso && $langs->trans("Currency".$obj->code_iso)!="Currency".$obj->code_iso?$langs->trans("Currency".$obj->code_iso):($obj->label!='-'?$obj->label:'')); $this->cache_currencies[$obj->code]['code_iso'] = $obj->code_iso;
$this->cache_currencies[$obj->code]['label'] = ($obj->code_iso && $langs->trans("Currency".$obj->code_iso)!="Currency".$obj->code_iso?$langs->trans("Currency".$obj->code_iso):($obj->label!='-'?$obj->label:''));
$label[$obj->code] = $this->cache_currencies[$obj->code]['label'];
$i++; $i++;
} }
asort($this->cache_currencies); array_multisort($label, SORT_ASC, $this->cache_currencies);
return $num; return $num;
} }
@ -2778,18 +2780,18 @@ class Form
if ($selected=='euro' || $selected=='euros') $selected='EUR'; // Pour compatibilite if ($selected=='euro' || $selected=='euros') $selected='EUR'; // Pour compatibilite
$out.= '<select class="flat" name="'.$htmlname.'">'; $out.= '<select class="flat" name="'.$htmlname.'">';
foreach ($this->cache_currencies as $code_iso => $label) foreach ($this->cache_currencies as $currency)
{ {
if ($selected && $selected == $code_iso) if ($selected && $selected == $currency['code_iso'])
{ {
$out.= '<option value="'.$code_iso.'" selected="selected">'; $out.= '<option value="'.$currency['code_iso'].'" selected="selected">';
} }
else else
{ {
$out.= '<option value="'.$code_iso.'">'; $out.= '<option value="'.$currency['code_iso'].'">';
} }
$out.= $label; $out.= $currency['label'];
if ($code_iso) $out.= ' ('.$code_iso.')'; if ($currency['code_iso']) $out.= ' ('.$currency['code_iso'].')';
$out.= '</option>'; $out.= '</option>';
} }
$out.= '</select>'; $out.= '</select>';