diff --git a/htdocs/admin/events.php b/htdocs/admin/events.php index fef00036cc2..afdeca4b7b2 100644 --- a/htdocs/admin/events.php +++ b/htdocs/admin/events.php @@ -122,7 +122,7 @@ foreach ($eventstolog as $key => $arr) { print ''.$arr['id'].''; print ''; $key = 'MAIN_LOGEVENTS_'.$arr['id']; - $value = empty($conf->global->$key) ? '' : $conf->global->$key; + $value = getDolGlobalString($key); print ''; print ''."\n"; } diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php index 83e8c3f8dbf..7dd152fa3d1 100644 --- a/htdocs/admin/external_rss.php +++ b/htdocs/admin/external_rss.php @@ -247,7 +247,7 @@ if ($resql) { //print "x".$idrss; $rssparser = new RssParser($db); - $result = $rssparser->parser($conf->global->$keyrssurl, 5, 300, $conf->externalrss->dir_temp); + $result = $rssparser->parser(getDolGlobalString($keyrssurl), 5, 300, $conf->externalrss->dir_temp); print "
"; print '
'."\n"; diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php index 5e5fd8fb9c0..374685624ba 100644 --- a/htdocs/admin/ldap_contacts.php +++ b/htdocs/admin/ldap_contacts.php @@ -102,7 +102,7 @@ if ($action == 'setvalue' && $user->admin) { $valkey = ''; $key = GETPOST("key"); if ($key) { - $valkey = $conf->global->$key; + $valkey = getDolGlobalString($key); } if (!dolibarr_set_const($db, 'LDAP_KEY_CONTACTS', $valkey, 'chaine', 0, '', $conf->entity)) { $error++; diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php index 878a6c6029a..36ef3b7ad7c 100644 --- a/htdocs/admin/ldap_groups.php +++ b/htdocs/admin/ldap_groups.php @@ -79,7 +79,7 @@ if ($action == 'setvalue' && $user->admin) { $valkey = ''; $key = GETPOST("key"); if ($key) { - $valkey = $conf->global->$key; + $valkey = getDolGlobalString($key); } if (!dolibarr_set_const($db, 'LDAP_KEY_GROUPS', $valkey, 'chaine', 0, '', $conf->entity)) { $error++; diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php index f7a4af5d2fd..2047cb983ca 100644 --- a/htdocs/admin/ldap_members.php +++ b/htdocs/admin/ldap_members.php @@ -147,7 +147,7 @@ if ($action == 'setvalue' && $user->admin) { $valkey = ''; $key = GETPOST("key"); if ($key) { - $valkey = $conf->global->$key; + $valkey = getDolGlobalString($key); } if (!dolibarr_set_const($db, 'LDAP_KEY_MEMBERS', $valkey, 'chaine', 0, '', $conf->entity)) { $error++; diff --git a/htdocs/admin/ldap_members_types.php b/htdocs/admin/ldap_members_types.php index 9c7a517bb1f..26af5ba9191 100644 --- a/htdocs/admin/ldap_members_types.php +++ b/htdocs/admin/ldap_members_types.php @@ -73,7 +73,7 @@ if ($action == 'setvalue' && $user->admin) { $valkey = ''; $key = GETPOST("key"); if ($key) { - $valkey = $conf->global->$key; + $valkey = getDolGlobalString($key); } if (!dolibarr_set_const($db, 'LDAP_KEY_MEMBERS_TYPES', $valkey, 'chaine', 0, '', $conf->entity)) { $error++; diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php index d2c287aef78..54863009e0d 100644 --- a/htdocs/admin/ldap_users.php +++ b/htdocs/admin/ldap_users.php @@ -135,7 +135,7 @@ if ($action == 'setvalue' && $user->admin) { $valkey = ''; $key = GETPOST("key"); if ($key) { - $valkey = $conf->global->$key; + $valkey = getDolGlobalString($key); } if (!dolibarr_set_const($db, 'LDAP_KEY_USERS', $valkey, 'chaine', 0, '', $conf->entity)) { $error++; diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php index 78765aae04e..2a401df047e 100644 --- a/htdocs/admin/notification.php +++ b/htdocs/admin/notification.php @@ -453,7 +453,7 @@ foreach ($listofnotifiedevents as $notifiedevent) { } $param = 'NOTIFICATION_FIXEDEMAIL_'.$notifiedevent['code'].'_THRESHOLD_HIGHER_'.$reg[1]; - $value = GETPOST('NOTIF_'.$notifiedevent['code'].'_old_'.$reg[1].'_key') ? GETPOST('NOTIF_'.$notifiedevent['code'].'_old_'.$reg[1].'_key', 'alpha') : $conf->global->$param; + $value = GETPOST('NOTIF_'.$notifiedevent['code'].'_old_'.$reg[1].'_key') ? GETPOST('NOTIF_'.$notifiedevent['code'].'_old_'.$reg[1].'_key', 'alpha') : getDolGlobalString($param); $s = ''; // Do not use type="email" here, we must be able to enter a list of email with , separator. $arrayemail = explode(',', $value); @@ -464,7 +464,7 @@ foreach ($listofnotifiedevents as $notifiedevent) { $showwarning++; } } - if ((!empty($conf->global->$param)) && $showwarning) { + if (getDolGlobalString($param) && $showwarning) { $s .= ' '.img_warning($langs->trans("ErrorBadEMail")); } print $form->textwithpicto($s, $langs->trans("YouCanUseCommaSeparatorForSeveralRecipients").'
'.$langs->trans("YouCanAlsoUseSupervisorKeyword"), 1, 'help', '', 0, 2); diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php index 30950eae177..26ee5a374f5 100644 --- a/htdocs/admin/pdf.php +++ b/htdocs/admin/pdf.php @@ -367,7 +367,7 @@ for ($i = 1; $i <= 6; $i++) { if ($conf->use_javascript_ajax) { print ajax_constantonoff($keyforconstant); } else { - print $form->selectyesno($keyforconstant, isset($conf->global->$keyforconstant) ? $conf->global->$keyforconstant : 0, 1, $noCountryCode); + print $form->selectyesno($keyforconstant, getDolGlobalString($keyforconstant, 0), 1, $noCountryCode); } print ''; } diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php index 88d590ffc35..a3d5871840b 100644 --- a/htdocs/admin/syslog.php +++ b/htdocs/admin/syslog.php @@ -232,8 +232,8 @@ foreach ($syslogModules as $moduleName) { if (!empty($tmpoption)) { if (GETPOSTISSET($tmpoption)) { $value = GETPOST($tmpoption); - } elseif (!empty($conf->global->$tmpoption)) { - $value = $conf->global->$tmpoption; + } elseif (getDolGlobalString($tmpoption)) { + $value = getDolGlobalString($tmpoption); } } else { $value = (isset($option['default']) ? $option['default'] : ''); diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php index f5ff8ecea9a..4d7d3965a90 100644 --- a/htdocs/admin/workflow.php +++ b/htdocs/admin/workflow.php @@ -315,7 +315,7 @@ foreach ($workflowcodes as $key => $params) { if (!empty($conf->use_javascript_ajax)) { print ajax_constantonoff($key); } else { - if (!empty($conf->global->$key)) { + if (getDolGlobalString($key)) { print ''; print img_picto($langs->trans("Activated"), 'switch_on'); print ''; diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php index 370f407a1de..09837376096 100644 --- a/htdocs/api/class/api_setup.class.php +++ b/htdocs/api/class/api_setup.class.php @@ -2037,8 +2037,8 @@ class Setup extends DolibarrApi $xmlremote = $conf->global->MAIN_FILECHECK_URL; } $param = 'MAIN_FILECHECK_URL_'.DOL_VERSION; - if (empty($xmlremote) && !empty($conf->global->$param)) { - $xmlremote = $conf->global->$param; + if (empty($xmlremote) && getDolGlobalString($param)) { + $xmlremote = getDolGlobalString($param); } if (empty($xmlremote)) { $xmlremote = 'https://www.dolibarr.org/files/stable/signatures/filelist-'.DOL_VERSION.'.xml'; diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php index 4737ff0d9d4..c3b53faccae 100644 --- a/htdocs/comm/card.php +++ b/htdocs/comm/card.php @@ -538,8 +538,8 @@ if ($object->id > 0) { print ''; print $object->price_level; $keyforlabel = 'PRODUIT_MULTIPRICES_LABEL'.$object->price_level; - if (!empty($conf->global->$keyforlabel)) { - print ' - '.$langs->trans($conf->global->$keyforlabel); + if (getDolGlobalString($keyforlabel)) { + print ' - '.$langs->trans(getDolGlobalString($keyforlabel)); } print ""; print ''; diff --git a/htdocs/comm/multiprix.php b/htdocs/comm/multiprix.php index fe6c733713b..d2729885b96 100644 --- a/htdocs/comm/multiprix.php +++ b/htdocs/comm/multiprix.php @@ -110,8 +110,8 @@ if ($_socid > 0) { } print '>'.$i; $keyforlabel = 'PRODUIT_MULTIPRICES_LABEL'.$i; - if (!empty($conf->global->$keyforlabel)) { - print ' - '.$langs->trans($conf->global->$keyforlabel); + if (getDolGlobalString($keyforlabel)) { + print ' - '.$langs->trans(getDolGlobalString($keyforlabel)); } print ''; } diff --git a/htdocs/compta/cashcontrol/report.php b/htdocs/compta/cashcontrol/report.php index e702e05ea2c..b8a062c0111 100644 --- a/htdocs/compta/cashcontrol/report.php +++ b/htdocs/compta/cashcontrol/report.php @@ -281,10 +281,10 @@ if ($resql) { } $transactionspertype[$objp->code] += 1; } else { - if ($conf->global->$var1 == $bankaccount->id) { + if (getDolGlobalString($var1) == $bankaccount->id) { $cash += $objp->amount; - // } elseif ($conf->global->$var2 == $bankaccount->id) $bank+=$objp->amount; - //elseif ($conf->global->$var3 == $bankaccount->id) $cheque+=$objp->amount; + // } elseif (getDolGlobalString($var2) == $bankaccount->id) $bank+=$objp->amount; + //elseif (getDolGlobalString($var3) == $bankaccount->id) $cheque+=$objp->amount; if (empty($transactionspertype['CASH'])) { $transactionspertype['CASH'] = 0; } diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index b819569d041..ba3707fd1bf 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -3925,9 +3925,9 @@ if ($action == 'create') { if (getDolGlobalString('INVOICE_USE_DEFAULT_DOCUMENT')) { // Hidden conf $paramkey = 'FACTURE_ADDON_PDF_'.$object->type; - $preselected = !empty($conf->global->$paramkey) ? $conf->global->$paramkey : $conf->global->FACTURE_ADDON_PDF; + $preselected = getDolGlobalString($paramkey, getDolGlobalString('FACTURE_ADDON_PDF')); } else { - $preselected = $conf->global->FACTURE_ADDON_PDF; + $preselected = getDolGlobalString('FACTURE_ADDON_PDF'); } print $form->selectarray('model', $liste, $preselected, 0, 0, 0, '', 0, 0, 0, '', 'maxwidth200 widthcentpercentminusx', 1); print ""; diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index dad469a8eea..de73c07b98a 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -1689,10 +1689,10 @@ class Facture extends CommonInvoice $modelByTypeConfName = 'FACTURE_ADDON_PDF_' . $deposit->type; - if (!empty($conf->global->$modelByTypeConfName)) { - $deposit->model_pdf = $conf->global->$modelByTypeConfName; + if (getDolGlobalString($modelByTypeConfName)) { + $deposit->model_pdf = getDolGlobalString($modelByTypeConfName); } elseif (getDolGlobalString('FACTURE_ADDON_PDF')) { - $deposit->model_pdf = $conf->global->FACTURE_ADDON_PDF; + $deposit->model_pdf = getDolGlobalString('FACTURE_ADDON_PDF'); } if (!getDolGlobalString('MAIN_DISABLE_PROPAGATE_NOTES_FROM_ORIGIN')) { @@ -3270,7 +3270,7 @@ class Facture extends CommonInvoice // Check for mandatory $keymandatory = 'INVOICE_'.$key.'_MANDATORY_FOR_VALIDATION'; - if (!$vallabel && !empty($conf->global->$keymandatory)) { + if (!$vallabel && getDolGlobalString($keymandatory)) { $langs->load("errors"); $error++; setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv($val)), null, 'errors'); @@ -5219,8 +5219,8 @@ class Facture extends CommonInvoice if (!empty($this->model_pdf)) { $modele = $this->model_pdf; - } elseif (!empty($conf->global->$thisTypeConfName)) { - $modele = $conf->global->$thisTypeConfName; + } elseif (getDolGlobalString($thisTypeConfName)) { + $modele = getDolGlobalString($thisTypeConfName); } elseif (getDolGlobalString('FACTURE_ADDON_PDF')) { $modele = $conf->global->FACTURE_ADDON_PDF; } diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index 6e06696b6a1..f9cbe577064 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -111,7 +111,7 @@ if (empty($reshook)) { */ if ($action == 'create' && $permissiontocreate) { $default_account = ($type == 'bank-transfer' ? 'PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT' : 'PRELEVEMENT_ID_BANKACCOUNT'); - //var_dump($default_account);var_dump($conf->global->$default_account);var_dump($id_bankaccount);exit; + //var_dump($default_account);var_dump(getDolGlobalString($default_account));var_dump($id_bankaccount);exit; if ($id_bankaccount != getDolGlobalInt($default_account)) { $res = dolibarr_set_const($db, $default_account, $id_bankaccount, 'chaine', 0, '', $conf->entity); // Set as default diff --git a/htdocs/core/boxes/box_external_rss.php b/htdocs/core/boxes/box_external_rss.php index 2e4c87c8e2b..f8b7e424a0d 100644 --- a/htdocs/core/boxes/box_external_rss.php +++ b/htdocs/core/boxes/box_external_rss.php @@ -89,7 +89,7 @@ class box_external_rss extends ModeleBoxes $keyforparamtitle = "EXTERNAL_RSS_TITLE_".$site; // Get RSS feed - $url = $conf->global->$keyforparamurl; + $url = getDolGlobalString($keyforparamurl); $rssparser = new RssParser($this->db); $result = $rssparser->parser($url, $this->max, $cachedelay, $conf->externalrss->dir_temp); @@ -98,7 +98,7 @@ class box_external_rss extends ModeleBoxes $description = $rssparser->getDescription(); $link = $rssparser->getLink(); - $title = $langs->trans("BoxTitleLastRssInfos", $max, $conf->global->$keyforparamtitle); + $title = $langs->trans("BoxTitleLastRssInfos", $max, getDolGlobalString($keyforparamtitle)); if ($result < 0 || !empty($rssparser->error)) { // Show warning $errormessage = $langs->trans("FailedToRefreshDataInfoNotUpToDate", ($rssparser->getLastFetchDate() ? dol_print_date($rssparser->getLastFetchDate(), "dayhourtext") : $langs->trans("Unknown"))); diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php index 5f053ae6e18..f09fb48493d 100644 --- a/htdocs/core/class/CMailFile.class.php +++ b/htdocs/core/class/CMailFile.class.php @@ -780,12 +780,12 @@ class CMailFile } // Force parameters - //dol_syslog("CMailFile::sendfile conf->global->".$keyforsmtpserver."=".$conf->global->$keyforsmtpserver." cpnf->global->".$keyforsmtpport."=".$conf->global->$keyforsmtpport, LOG_DEBUG); - if (!empty($conf->global->$keyforsmtpserver)) { - ini_set('SMTP', $conf->global->$keyforsmtpserver); + //dol_syslog("CMailFile::sendfile conf->global->".$keyforsmtpserver."=".getDolGlobalString($keyforsmtpserver)." cpnf->global->".$keyforsmtpport."=".$conf->global->$keyforsmtpport, LOG_DEBUG); + if (getDolGlobalString($keyforsmtpserver)) { + ini_set('SMTP', getDolGlobalString($keyforsmtpserver)); } - if (!empty($conf->global->$keyforsmtpport)) { - ini_set('smtp_port', $conf->global->$keyforsmtpport); + if (getDolGlobalString($keyforsmtpport)) { + ini_set('smtp_port', getDolGlobalString($keyforsmtpport)); } $res = true; @@ -869,10 +869,10 @@ class CMailFile } // Restore parameters - if (!empty($conf->global->$keyforsmtpserver)) { + if (getDolGlobalString($keyforsmtpserver)) { ini_restore('SMTP'); } - if (!empty($conf->global->$keyforsmtpport)) { + if (getDolGlobalString($keyforsmtpport)) { ini_restore('smtp_port'); } } elseif ($this->sendmode == 'smtps') { @@ -1059,7 +1059,7 @@ class CMailFile } // If we use SSL/TLS - $server = $conf->global->$keyforsmtpserver; + $server = getDolGlobalString($keyforsmtpserver); $secure = ''; if (!empty($conf->global->$keyfortls) && function_exists('openssl_open')) { $secure = 'ssl'; @@ -1068,7 +1068,7 @@ class CMailFile $secure = 'tls'; } - $this->transport = new Swift_SmtpTransport($server, $conf->global->$keyforsmtpport, $secure); + $this->transport = new Swift_SmtpTransport($server, getDolGlobalString($keyforsmtpport), $secure); if (!empty($conf->global->$keyforsmtpid)) { $this->transport->setUsername($conf->global->$keyforsmtpid); diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index c5914413282..575b3ab2da2 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -3659,7 +3659,7 @@ abstract class CommonObject } if (!empty($MODULE)) { - if (!empty($conf->global->$MODULE)) { + if (getDolGlobalString($MODULE)) { $modsactivated = explode(',', getDolGlobalString($MODULE)); foreach ($modsactivated as $mod) { if (isModEnabled($mod)) { @@ -5661,8 +5661,8 @@ abstract class CommonObject // If generator is ODT, we must have srctemplatepath defined, if not we set it. if ($obj->type == 'odt' && empty($srctemplatepath)) { $varfortemplatedir = $obj->scandir; - if ($varfortemplatedir && !empty($conf->global->$varfortemplatedir)) { - $dirtoscan = $conf->global->$varfortemplatedir; + if ($varfortemplatedir && getDolGlobalString($varfortemplatedir)) { + $dirtoscan = getDolGlobalString($varfortemplatedir); $listoffiles = array(); @@ -5970,8 +5970,8 @@ abstract class CommonObject $keyforfieldname = strtoupper($newelement.'_DEFAULT_'.$fieldname); //var_dump($keyforfieldname); - if (isset($conf->global->$keyforfieldname)) { - return $conf->global->$keyforfieldname; + if (getDolGlobalString($keyforfieldname)) { + return getDolGlobalString($keyforfieldname); } // TODO Ad here a scan into table llx_overwrite_default with a filter on $this->element and $fieldname diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 6d8fb1a4b7a..f0c62c0bd5c 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -151,7 +151,6 @@ function getMultidirOutput($object, $module = '') function getDolGlobalString($key, $default = '') { global $conf; - // return $conf->global->$key ?? $default; return (string) (isset($conf->global->$key) ? $conf->global->$key : $default); } @@ -166,7 +165,6 @@ function getDolGlobalString($key, $default = '') function getDolGlobalInt($key, $default = 0) { global $conf; - // return $conf->global->$key ?? $default; return (int) (isset($conf->global->$key) ? $conf->global->$key : $default); } @@ -185,7 +183,6 @@ function getDolUserString($key, $default = '', $tmpuser = null) $tmpuser = $user; } - // return $conf->global->$key ?? $default; return (string) (empty($tmpuser->conf->$key) ? $default : $tmpuser->conf->$key); } @@ -204,7 +201,6 @@ function getDolUserInt($key, $default = 0, $tmpuser = null) $tmpuser = $user; } - // return $conf->global->$key ?? $default; return (int) (empty($tmpuser->conf->$key) ? $default : $tmpuser->conf->$key); } diff --git a/htdocs/public/users/view.php b/htdocs/public/users/view.php index d65d937722f..b458378d1c8 100644 --- a/htdocs/public/users/view.php +++ b/htdocs/public/users/view.php @@ -402,10 +402,10 @@ if (!getDolUserInt('USER_PUBLIC_HIDE_COMPANY', 0, $object)) { $logosmall = $mysoc->logo_squarred_small ? $mysoc->logo_squarred_small : $mysoc->logo_small; $logo = $mysoc->logo_squarred ? $mysoc->logo_squarred : $mysoc->logo; $paramlogo = 'ONLINE_USER_LOGO_'.$suffix; - if (!empty($conf->global->$paramlogo)) { - $logosmall = $conf->global->$paramlogo; + if (getDolGlobalString($paramlogo)) { + $logosmall = getDolGlobalString($paramlogo); } elseif (getDolGlobalString('ONLINE_USER_LOGO')) { - $logosmall = $conf->global->ONLINE_USER_LOGO; + $logosmall = getDolGlobalString('ONLINE_USER_LOGO'); } //print ''."\n"; // Define urllogo diff --git a/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php b/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php index bc833ed6a7e..133720a1b8c 100644 --- a/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php +++ b/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php @@ -341,7 +341,7 @@ class doc_generic_recruitmentjobposition_odt extends ModelePDFRecruitmentJobPosi // Line of free text $newfreetext = ''; $paramfreetext = 'ORDER_FREE_TEXT'; - if (!empty($conf->global->$paramfreetext)) { + if (getDolGlobalString($paramfreetext)) { $newfreetext = make_substitutions(getDolGlobalString($paramfreetext), $substitutionarray); } diff --git a/htdocs/takepos/admin/terminal.php b/htdocs/takepos/admin/terminal.php index 1934c0358a0..7acf9a45117 100644 --- a/htdocs/takepos/admin/terminal.php +++ b/htdocs/takepos/admin/terminal.php @@ -250,7 +250,7 @@ if (isModEnabled("banque")) { $name = "CASHDESK_ID_BANKACCOUNT_".$modep->code.$terminaltouse; print ''.$langs->trans("CashDeskBankAccountFor").' '.$langs->trans($modep->label).''; print ''; - if (!empty($conf->global->$name)) { + if (getDolGlobalString($name)) { $atleastonefound++; } $cour = preg_match('/^LIQ.*/', $modep->code) ? 2 : 1;