diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php index 639448bb882..71ec9f1f7a4 100644 --- a/htdocs/admin/delais.php +++ b/htdocs/admin/delais.php @@ -325,7 +325,7 @@ if (!getDolGlobalString('MAIN_DISABLE_METEO') || getDolGlobalInt('MAIN_DISABLE_M $str_mode_enabled = $str_mode_percentage; } print '
'.$str_mode_enabled.''; - print ''; + print ''; print '

'; } else { diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php index 164a0ce525c..c5b732a51d3 100644 --- a/htdocs/admin/limits.php +++ b/htdocs/admin/limits.php @@ -219,7 +219,7 @@ if ($action == 'edit') { print ''; print $form->textwithpicto($langs->trans("MAIN_ROUNDING_RULE_TOT"), $langs->trans("ParameterActiveForNextInputOnly")); - print ''.(isset($conf->global->$mainroundingruletot) ? $conf->global->$mainroundingruletot : (getDolGlobalString('MAIN_ROUNDING_RULE_TOT') ? $conf->global->MAIN_ROUNDING_RULE_TOT : '')).''; + print ''.(isset($conf->global->$mainroundingruletot) ? $conf->global->$mainroundingruletot : getDolGlobalString('MAIN_ROUNDING_RULE_TOT')).''; print ''; print ''; diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php index fc330d6d4b1..9ef732d73cd 100644 --- a/htdocs/admin/proxy.php +++ b/htdocs/admin/proxy.php @@ -165,7 +165,7 @@ print ''; print ''.$langs->trans("MAIN_PROXY_USE").''; print ''; print ''; -print $form->selectyesno('MAIN_PROXY_USE', (getDolGlobalString('MAIN_PROXY_USE') ? $conf->global->MAIN_PROXY_USE : 0), 1); +print $form->selectyesno('MAIN_PROXY_USE', getDolGlobalInt('MAIN_PROXY_USE'), 1); print ''; print ''; @@ -174,7 +174,7 @@ print ''; print ''.$langs->trans("MAIN_PROXY_HOST").''; print ''; print ''; -print ''; +print ''; print ''; print ''; @@ -183,7 +183,7 @@ print ''; print ''.$langs->trans("MAIN_PROXY_PORT").''; print ''; print ''; -print ''; +print ''; print ''; print ''; @@ -192,7 +192,7 @@ print ''; print ''.$langs->trans("MAIN_PROXY_USER").''; print ''; print ''; -print ''; +print ''; print ''; print ''; @@ -201,7 +201,7 @@ print ''; print ''.$langs->trans("MAIN_PROXY_PASS").''; print ''; print ''; -print ''; +print ''; print ''; print ''; diff --git a/htdocs/admin/taxes.php b/htdocs/admin/taxes.php index ac60811ac98..b3c3b60a579 100644 --- a/htdocs/admin/taxes.php +++ b/htdocs/admin/taxes.php @@ -206,7 +206,7 @@ if (empty($mysoc->tva_assuj)) { print ''; print ''; - print ''; + print ''; print ''; $key = 'CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT'; diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index 1727455fc93..691fbea884b 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -2545,7 +2545,7 @@ if ($action == 'create') { print ''; print img_picto('', 'pdf', 'class="pictofixedwidth"'); $liste = ModelePDFPropales::liste_modeles($db); - $preselected = (getDolGlobalString('PROPALE_ADDON_PDF_ODT_DEFAULT') ? $conf->global->PROPALE_ADDON_PDF_ODT_DEFAULT : getDolGlobalString("PROPALE_ADDON_PDF")); + $preselected = getDolGlobalString('PROPALE_ADDON_PDF_ODT_DEFAULT', getDolGlobalString("PROPALE_ADDON_PDF")); print $form->selectarray('model', $liste, $preselected, 0, 0, 0, '', 0, 0, 0, '', 'maxwidth200 widthcentpercentminusx', 1); print ""; @@ -2562,7 +2562,7 @@ if ($action == 'create') { print ''; print '' . $langs->trans('NotePublic') . ''; print ''; - $note_public = $object->getDefaultCreateValueFor('note_public', (!empty($objectsrc) ? $objectsrc->note_public : (getDolGlobalString('PROPALE_ADDON_NOTE_PUBLIC_DEFAULT') ? $conf->global->PROPALE_ADDON_NOTE_PUBLIC_DEFAULT : null)), 'restricthtml'); + $note_public = $object->getDefaultCreateValueFor('note_public', (!empty($objectsrc) ? $objectsrc->note_public : getDolGlobalString('PROPALE_ADDON_NOTE_PUBLIC_DEFAULT', null), 'restricthtml'); $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', false, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PUBLIC') ? 0 : 1, ROWS_3, '90%'); print $doleditor->Create(1); diff --git a/htdocs/contrat/agenda.php b/htdocs/contrat/agenda.php index 10f95548054..29ecd776066 100644 --- a/htdocs/contrat/agenda.php +++ b/htdocs/contrat/agenda.php @@ -146,7 +146,7 @@ if (isModEnabled('project')) { if ($object->id > 0) { // Load object modContract - $module = (getDolGlobalString('CONTRACT_ADDON') ? $conf->global->CONTRACT_ADDON : 'mod_contract_serpis'); + $module = getDolGlobalString('CONTRACT_ADDON', 'mod_contract_serpis'); if (substr($module, 0, 13) == 'mod_contract_' && substr($module, -3) == 'php') { $module = substr($module, 0, dol_strlen($module) - 4); } diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php index b464ba0fe57..82c0d095852 100644 --- a/htdocs/contrat/card.php +++ b/htdocs/contrat/card.php @@ -1142,7 +1142,7 @@ if (isModEnabled('project')) { } // Load object modContract -$module = (getDolGlobalString('CONTRACT_ADDON') ? $conf->global->CONTRACT_ADDON : 'mod_contract_serpis'); +$module = getDolGlobalString('CONTRACT_ADDON', 'mod_contract_serpis'); if (substr($module, 0, 13) == 'mod_contract_' && substr($module, -3) == 'php') { $module = substr($module, 0, dol_strlen($module) - 4); } diff --git a/htdocs/contrat/messaging.php b/htdocs/contrat/messaging.php index a3fce41f7a2..c8140647354 100644 --- a/htdocs/contrat/messaging.php +++ b/htdocs/contrat/messaging.php @@ -142,7 +142,7 @@ if (empty($reshook)) { $form = new Form($db); // Load object modContract -$module = (getDolGlobalString('CONTRACT_ADDON') ? $conf->global->CONTRACT_ADDON : 'mod_contract_serpis'); +$module = getDolGlobalString('CONTRACT_ADDON', 'mod_contract_serpis'); if (substr($module, 0, 13) == 'mod_contract_' && substr($module, -3) == 'php') { $module = substr($module, 0, dol_strlen($module) - 4); } diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php index cec8b26ecae..edfea0d278c 100644 --- a/htdocs/core/class/html.formmail.class.php +++ b/htdocs/core/class/html.formmail.class.php @@ -711,7 +711,7 @@ class FormMail extends Form // Add also company main email if (getDolGlobalString('MAIN_INFO_SOCIETE_MAIL')) { - $s = (!getDolGlobalString('MAIN_INFO_SOCIETE_NOM') ? $conf->global->MAIN_INFO_SOCIETE_EMAIL : $conf->global->MAIN_INFO_SOCIETE_NOM).' <' . getDolGlobalString('MAIN_INFO_SOCIETE_MAIL').'>'; + $s = getDolGlobalString('MAIN_INFO_SOCIETE_NOM', getDolGlobalString('MAIN_INFO_SOCIETE_EMAIL')).' <' . getDolGlobalString('MAIN_INFO_SOCIETE_MAIL').'>'; $liste['company'] = array('label' => $s, 'data-html' => $s); } diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php index 7dda992eeff..cc4ecafba73 100644 --- a/htdocs/core/lib/usergroups.lib.php +++ b/htdocs/core/lib/usergroups.lib.php @@ -776,7 +776,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false) print ''.$langs->trans("LeftMenuBackgroundColor").''; print ''; if ($edit) { - print $formother->selectColor(colorArrayToHex(colorStringToArray((getDolGlobalString('THEME_ELDY_VERMENU_BACK1') ? $conf->global->THEME_ELDY_VERMENU_BACK1 : ''), array()), ''), 'THEME_ELDY_VERMENU_BACK1', '', 1, array(), '', 'colorbackvmenu1', $default).' '; + print $formother->selectColor(colorArrayToHex(colorStringToArray(getDolGlobalString('THEME_ELDY_VERMENU_BACK1'), array()), ''), 'THEME_ELDY_VERMENU_BACK1', '', 1, array(), '', 'colorbackvmenu1', $default).' '; } else { $color = colorArrayToHex(colorStringToArray(getDolGlobalString('THEME_ELDY_VERMENU_BACK1'), array()), ''); if ($color) { @@ -990,7 +990,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false) print ''.$langs->trans("LinkColor").''; print ''; if ($edit) { - print $formother->selectColor(colorArrayToHex(colorStringToArray((getDolGlobalString('THEME_ELDY_TEXTLINK') ? $conf->global->THEME_ELDY_TEXTLINK : ''), array()), ''), 'THEME_ELDY_TEXTLINK', '', 1, array(), '', 'colortextlink', $default).' '; + print $formother->selectColor(colorArrayToHex(colorStringToArray(getDolGlobalString('THEME_ELDY_TEXTLINK'), array()), ''), 'THEME_ELDY_TEXTLINK', '', 1, array(), '', 'colortextlink', $default).' '; } else { $color = colorArrayToHex(colorStringToArray(getDolGlobalString('THEME_ELDY_TEXTLINK'), array()), ''); if ($color) { @@ -1031,14 +1031,14 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false) if (getDolGlobalString('THEME_ELDY_USE_HOVER') == '1') { $color = colorArrayToHex(colorStringToArray($colorbacklinepairhover)); } else { - $color = colorArrayToHex(colorStringToArray((getDolGlobalString('THEME_ELDY_USE_HOVER') ? $conf->global->THEME_ELDY_USE_HOVER : ''), array()), ''); + $color = colorArrayToHex(colorStringToArray(getDolGlobalString('THEME_ELDY_USE_HOVER'), array()), ''); } print $formother->selectColor($color, 'THEME_ELDY_USE_HOVER', '', 1, array(), '', 'colorbacklinepairhover', $default).' '; } else { if (getDolGlobalString('THEME_ELDY_USE_HOVER') == '1') { $color = colorArrayToHex(colorStringToArray($colorbacklinepairhover)); } else { - $color = colorArrayToHex(colorStringToArray((getDolGlobalString('THEME_ELDY_USE_HOVER') ? $conf->global->THEME_ELDY_USE_HOVER : ''), array()), ''); + $color = colorArrayToHex(colorStringToArray(getDolGlobalString('THEME_ELDY_USE_HOVER'), array()), ''); } if ($color) { if ($color != colorArrayToHex(colorStringToArray($colorbacklinepairhover))) { @@ -1079,14 +1079,14 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false) if (getDolGlobalString('THEME_ELDY_USE_CHECKED') == '1') { $color = 'e6edf0'; } else { - $color = colorArrayToHex(colorStringToArray((getDolGlobalString('THEME_ELDY_USE_CHECKED') ? $conf->global->THEME_ELDY_USE_CHECKED : ''), array()), ''); + $color = colorArrayToHex(colorStringToArray(getDolGlobalString('THEME_ELDY_USE_CHECKED'), array()), ''); } print $formother->selectColor($color, 'THEME_ELDY_USE_CHECKED', '', 1, array(), '', 'colorbacklinepairchecked', $default).' '; } else { if (getDolGlobalString('THEME_ELDY_USE_CHECKED') == '1') { $color = 'e6edf0'; } else { - $color = colorArrayToHex(colorStringToArray((getDolGlobalString('THEME_ELDY_USE_CHECKED') ? $conf->global->THEME_ELDY_USE_CHECKED : ''), array()), ''); + $color = colorArrayToHex(colorStringToArray(getDolGlobalString('THEME_ELDY_USE_CHECKED'), array()), ''); } if ($color) { if ($color != 'e6edf0') { diff --git a/htdocs/core/tpl/massactions_pre.tpl.php b/htdocs/core/tpl/massactions_pre.tpl.php index 59d478e8ba9..2e96ab1d391 100644 --- a/htdocs/core/tpl/massactions_pre.tpl.php +++ b/htdocs/core/tpl/massactions_pre.tpl.php @@ -259,7 +259,7 @@ if ($massaction == 'presend') { include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; $formmail = new FormMail($db); $formmail->withform = -1; - $formmail->fromtype = (GETPOST('fromtype') ? GETPOST('fromtype') : (getDolGlobalString('MAIN_MAIL_DEFAULT_FROMTYPE') ? $conf->global->MAIN_MAIL_DEFAULT_FROMTYPE : 'user')); + $formmail->fromtype = (GETPOST('fromtype') ? GETPOST('fromtype') : getDolGlobalString('MAIN_MAIL_DEFAULT_FROMTYPE', 'user')); if ($formmail->fromtype === 'user') { $formmail->fromid = $user->id; diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php index d3ef5f69610..9cc65b0be54 100644 --- a/htdocs/product/admin/product.php +++ b/htdocs/product/admin/product.php @@ -778,7 +778,7 @@ if (getDolGlobalInt('MAIN_MULTILANGS')) { print ''; print ''.$langs->trans("ViewProductDescInThirdpartyLanguageAbility").''; print ''; - print $form->selectyesno("activate_viewProdTextsInThirdpartyLanguage", (getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE') ? $conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE : 0), 1); + print $form->selectyesno("activate_viewProdTextsInThirdpartyLanguage", getDolGlobalInt('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE'), 1); print ''; print ''; } diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php index 7a00d683fe1..d4c3e66394e 100644 --- a/htdocs/public/payment/paymentok.php +++ b/htdocs/public/payment/paymentok.php @@ -1644,7 +1644,7 @@ if ($ispaymentok) { $cc = ($cc ? ', ' : '').$attendeetovalidate->email_company; } - $from = getDolGlobalString('MAILING_EMAIL_FROM') ? $conf->global->MAILING_EMAIL_FROM : getDolGlobalString("MAIN_MAIL_EMAIL_FROM"); + $from = getDolGlobalString('MAILING_EMAIL_FROM', getDolGlobalString("MAIN_MAIL_EMAIL_FROM")); $urlback = $_SERVER["REQUEST_URI"]; diff --git a/htdocs/webservices/admin/index.php b/htdocs/webservices/admin/index.php index 8b777b023c6..257d4565a89 100644 --- a/htdocs/webservices/admin/index.php +++ b/htdocs/webservices/admin/index.php @@ -93,7 +93,7 @@ print ""; print ''; print ''.$langs->trans("KeyForWebServicesAccess").''; -print ''; +print ''; if (!empty($conf->use_javascript_ajax)) { print ' '.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token" class="linkobject"'); }