diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php
index 080f06c6fa3..d6b6d6e428a 100644
--- a/htdocs/admin/sms.php
+++ b/htdocs/admin/sms.php
@@ -172,7 +172,7 @@ if ($action == 'edit') {
// Disable
print '
| '.$langs->trans("MAIN_DISABLE_ALL_SMS").' | ';
- print $form->selectyesno('MAIN_DISABLE_ALL_SMS', empty($conf->global->MAIN_DISABLE_ALL_SMS) ? '' : $conf->global->MAIN_DISABLE_ALL_SMS, 1);
+ print $form->selectyesno('MAIN_DISABLE_ALL_SMS', getDolGlobalString('MAIN_DISABLE_ALL_SMS'), 1);
print ' |
';
// Separator
@@ -189,7 +189,7 @@ if ($action == 'edit') {
// From
print '| '.$langs->trans("MAIN_MAIL_SMS_FROM", $langs->transnoentities("Undefined")).' | ';
- print ' |
';
// Autocopy to
@@ -213,14 +213,14 @@ if ($action == 'edit') {
print '| '.$langs->trans("Parameter").' | '.$langs->trans("Value").' |
';
// Disable
- print '| '.$langs->trans("MAIN_DISABLE_ALL_SMS").' | '.yn(empty($conf->global->MAIN_DISABLE_ALL_SMS) ? '' : $conf->global->MAIN_DISABLE_ALL_SMS).' |
';
+ print '| '.$langs->trans("MAIN_DISABLE_ALL_SMS").' | '.yn(getDolGlobalString('MAIN_DISABLE_ALL_SMS')).' |
';
// Separator
print '| |
';
// Method
print '| '.$langs->trans("MAIN_SMS_SENDMODE").' | ';
- $text = empty($conf->global->MAIN_SMS_SENDMODE) ? '' : $listofmethods[$conf->global->MAIN_SMS_SENDMODE];
+ $text = empty(getDolGlobalString('MAIN_SMS_SENDMODE')) ? '' : $listofmethods[getDolGlobalString('MAIN_SMS_SENDMODE')];
if (empty($text)) {
$text = $langs->trans("Undefined").' '.img_warning();
}
@@ -229,7 +229,7 @@ if ($action == 'edit') {
// From
print ' |
| '.$langs->trans("MAIN_MAIL_SMS_FROM", $langs->transnoentities("Undefined")).' | ';
- print ''.(empty($conf->global->MAIN_MAIL_SMS_FROM) ? '' : $conf->global->MAIN_MAIL_SMS_FROM);
+ print ' | '.getDolGlobalString('MAIN_MAIL_SMS_FROM');
if (!empty($conf->global->MAIN_MAIL_SMS_FROM) && !isValidPhone($conf->global->MAIN_MAIL_SMS_FROM)) {
print ' '.img_warning($langs->trans("ErrorBadPhone"));
}
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 779d8b10912..cee99749d00 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -1228,14 +1228,14 @@ function complete_dictionary_with_modules(&$taborder, &$tabname, &$tablib, &$tab
// We discard modules according to features level (PS: if module is activated we always show it)
$const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', get_class($objMod)));
- if ($objMod->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2 && empty($conf->global->$const_name)) {
+ if ($objMod->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2 && empty(getDolGlobalString($const_name))) {
$modulequalified = 0;
}
- if ($objMod->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && empty($conf->global->$const_name)) {
+ if ($objMod->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1 && empty(getDolGlobalString($const_name))) {
$modulequalified = 0;
}
//If module is not activated disqualified
- if (empty($conf->global->$const_name)) {
+ if (empty(getDolGlobalString($const_name))) {
$modulequalified = 0;
}
diff --git a/htdocs/core/modules/modPartnership.class.php b/htdocs/core/modules/modPartnership.class.php
index 289300f5f29..17c137a7e3c 100644
--- a/htdocs/core/modules/modPartnership.class.php
+++ b/htdocs/core/modules/modPartnership.class.php
@@ -177,7 +177,7 @@ class modPartnership extends DolibarrModules
// Array to add new pages in new tabs
$this->tabs = array();
- $tabtoadd = (!empty($conf->global->PARTNERSHIP_IS_MANAGED_FOR) && $conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member') ? 'member' : 'thirdparty';
+ $tabtoadd = (!empty(getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR')) && getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR') == 'member') ? 'member' : 'thirdparty';
if ($tabtoadd == 'member') {
$this->tabs[] = array('data'=>'member:+partnership:Partnership:partnership@partnership:$user->rights->partnership->read:/partnership/partnership.php?socid=__ID__');
|