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

Merge pull request #4075 from GPCsolutions/dolibarr-4074

Browse Source 
Fix #4074 Properly save user theme settings
This commit is contained in:
Laurent Destailleur 2015-11-25 23:51:30 +01:00
commit 02ac828e4c
1 changed files with 50 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
htdocs/user/param_ihm.php
View File

@ -89,35 +89,50 @@ if (empty($reshook)) {
if (!$_POST["cancel"]) { if (!$_POST["cancel"]) {
$tabparam = array(); $tabparam = array();
if ($_POST["check_MAIN_LANG_DEFAULT"] == "on") { if (GETPOST("check_MAIN_LANG_DEFAULT") == "on") {
$tabparam["MAIN_LANG_DEFAULT"] = $_POST["main_lang_default"]; $tabparam["MAIN_LANG_DEFAULT"] = $_POST["main_lang_default"];
} else { } else {
$tabparam["MAIN_LANG_DEFAULT"] = ''; $tabparam["MAIN_LANG_DEFAULT"] = '';
} }
if ($_POST["check_SIZE_LISTE_LIMIT"] == "on") { if (GETPOST("check_SIZE_LISTE_LIMIT") == "on") {
$tabparam["MAIN_SIZE_LISTE_LIMIT"] = $_POST["main_size_liste_limit"]; $tabparam["MAIN_SIZE_LISTE_LIMIT"] = $_POST["main_size_liste_limit"];
} else { } else {
$tabparam["MAIN_SIZE_LISTE_LIMIT"] = ''; $tabparam["MAIN_SIZE_LISTE_LIMIT"] = '';
} }
$val=(join(',',(colorStringToArray(GETPOST('THEME_ELDY_TOPMENU_BACK1'),array())))); if (GETPOST("check_MAIN_THEME") == "on") {
if ($val == '') $tabparam['THEME_ELDY_TOPMENU_BACK1']=''; $tabparam["MAIN_THEME"] = $_POST["main_theme"];
else $tabparam['THEME_ELDY_TOPMENU_BACK1']=join(',',colorStringToArray(GETPOST('THEME_ELDY_TOPMENU_BACK1'),array())); } else {
$tabparam["MAIN_THEME"] = '';
$val=(join(',',(colorStringToArray(GETPOST('THEME_ELDY_BACKTITLE1'),array())))); }
if ($val == '') $tabparam['THEME_ELDY_BACKTITLE1']='';
else $tabparam['THEME_ELDY_BACKTITLE1']=join(',',colorStringToArray(GETPOST('THEME_ELDY_BACKTITLE1'),array()));
if (GETPOST('check_THEME_ELDY_USE_HOVER') == 'on') $tabparam["THEME_ELDY_USE_HOVER"]=1;
else $tabparam["THEME_ELDY_USE_HOVER"]=0;
$tabparam["MAIN_SEARCHFORM_CONTACT"] = $_POST["main_searchform_contact"]; $tabparam["MAIN_SEARCHFORM_CONTACT"] = $_POST["main_searchform_contact"];
$tabparam["MAIN_SEARCHFORM_SOCIETE"]=$_POST["main_searchform_societe"];
$tabparam["MAIN_SEARCHFORM_PRODUITSERVICE"]=$_POST["main_searchform_produitservice"];
$tabparam["MAIN_SEARCHFORM_CONTACT"] = $_POST["main_searchform_contact"]; $val = (implode(',', (colorStringToArray(GETPOST('THEME_ELDY_TOPMENU_BACK1'), array()))));
if ($val == '') {
$tabparam['THEME_ELDY_TOPMENU_BACK1'] = '';
} else {
$tabparam['THEME_ELDY_TOPMENU_BACK1'] = join(',',
colorStringToArray(GETPOST('THEME_ELDY_TOPMENU_BACK1'), array()));
}
$val = (implode(',', (colorStringToArray(GETPOST('THEME_ELDY_BACKTITLE1'), array()))));
if ($val == '') {
$tabparam['THEME_ELDY_BACKTITLE1'] = '';
} else {
$tabparam['THEME_ELDY_BACKTITLE1'] = join(',',
colorStringToArray(GETPOST('THEME_ELDY_BACKTITLE1'), array()));
}
if (GETPOST('check_THEME_ELDY_USE_HOVER') == 'on') {
$tabparam["THEME_ELDY_USE_HOVER"] = 1;
} else {
$tabparam["THEME_ELDY_USE_HOVER"] = 0;
}
$tabparam["MAIN_SEARCHFORM_SOCIETE"] = $_POST["main_searchform_societe"]; $tabparam["MAIN_SEARCHFORM_SOCIETE"] = $_POST["main_searchform_societe"];
$tabparam["MAIN_SEARCHFORM_PRODUITSERVICE"] = $_POST["main_searchform_produitservice"]; $tabparam["MAIN_SEARCHFORM_PRODUITSERVICE"] = $_POST["main_searchform_produitservice"];
$result = dol_set_user_param($db, $conf, $object, $tabparam); $result = dol_set_user_param($db, $conf, $object, $tabparam);