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 '| ' . $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 ' |