diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php
index 6580db4e8f3..e1e468b0cec 100644
--- a/htdocs/admin/bank.php
+++ b/htdocs/admin/bank.php
@@ -275,8 +275,7 @@ print ' ';
/*
* Document templates generators
*/
-//if (! empty($conf->global->MAIN_FEATURES_LEVEL))
-//{
+
print load_fiche_titre($langs->trans("BankAccountModelModule"), '', '');
// Load array def with activated templates
@@ -466,8 +465,7 @@ print ' ';
/*
* Document templates generators
*/
-//if (! empty($conf->global->MAIN_FEATURES_LEVEL))
-//{
+
print load_fiche_titre($langs->trans("Other"), '', '');
print "
\n";
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 9c2b91ec586..2cbb14bb2dd 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -542,7 +542,7 @@ if ($mode == 'common' || $mode == 'commonkanban') {
$moreforfilter .= '';
$moreforfilter .= $form->selectarray('search_nature', $arrayofnatures, dol_escape_htmltag($search_nature), $langs->trans('Origin'), 0, 0, '', 0, 0, 0, '', 'maxwidth200', 1);
$moreforfilter .= '
';
- if (!empty($conf->global->MAIN_FEATURES_LEVEL)) {
+ if (getDolGlobalInt('MAIN_FEATURES_LEVEL')) {
$array_version = array('stable'=>$langs->transnoentitiesnoconv("Stable"));
if ($conf->global->MAIN_FEATURES_LEVEL < 0) {
$array_version['deprecated'] = $langs->trans("Deprecated");
diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php
index 207642fe8e3..88a02e90457 100644
--- a/htdocs/admin/prelevement.php
+++ b/htdocs/admin/prelevement.php
@@ -297,7 +297,7 @@ foreach ($dirmodels as $reldir)
$module = new $classname($db);
$modulequalified=1;
- if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified=0;
+ if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified=0;
if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified=0;
if ($modulequalified) {
diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php
index 10b3d1bd47b..2f272cd986f 100644
--- a/htdocs/admin/syslog.php
+++ b/htdocs/admin/syslog.php
@@ -187,8 +187,6 @@ if (!empty($conf->global->MAIN_MODULE_MULTICOMPANY) && $user->entity) {
}
-//print "conf->global->MAIN_FEATURES_LEVEL = ".$conf->global->MAIN_FEATURES_LEVEL." \n";
-
// Output mode
print load_fiche_titre($langs->trans("SyslogOutput"), '', '');
@@ -207,7 +205,7 @@ foreach ($syslogModules as $moduleName) {
$moduleactive = (int) $module->isActive();
//print $moduleName." = ".$moduleactive." - ".$module->getName()." ".($moduleactive == -1)." \n";
- if (($moduleactive == -1) && empty($conf->global->MAIN_FEATURES_LEVEL)) {
+ if (($moduleactive == -1) && getDolGlobalInt('MAIN_FEATURES_LEVEL') == 0) {
continue; // Some modules are hidden if not activable and not into debug mode (end user must not see them)
}
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index f07623ed5d0..e9a6eaeb390 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -556,7 +556,7 @@ if ($mode == 'searchkey') {
print ''.img_edit_add($langs->trans("TranslationOverwriteKey")).' ';
}
- if (!empty($conf->global->MAIN_FEATURES_LEVEL)) {
+ if (getDolGlobalInt('MAIN_FEATURES_LEVEL')) {
$transifexlangfile = '$'; // $ means 'All'
//$transifexurl = 'https://www.transifex.com/dolibarr-association/dolibarr/translate/#'.$langcode.'/'.$transifexlangfile.'?key='.$key;
$transifexurl = 'https://www.transifex.com/dolibarr-association/dolibarr/translate/#'.$langcode.'/'.$transifexlangfile.'?q=key%3A'.$key;
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index c046281f18e..896448d7b9a 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -2679,7 +2679,7 @@ if ($action == 'create') {
$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem, $compatibleImportElementsList);
// Show online signature link
- $useonlinesignature = $conf->global->MAIN_FEATURES_LEVEL; // Replace this with 1 when feature to make online signature is ok
+ $useonlinesignature = 1; // Replace this with 1 when feature to make online signature is ok
if ($object->statut != Propal::STATUS_DRAFT && $useonlinesignature) {
print ' ';
diff --git a/htdocs/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php
index 13619fe5aa3..4196fb32b68 100644
--- a/htdocs/core/class/html.formadmin.class.php
+++ b/htdocs/core/class/html.formadmin.class.php
@@ -304,7 +304,7 @@ class FormAdmin
if (preg_match('/\.lib/i', $filelib)) {
continue;
}
- if (empty($conf->global->MAIN_FEATURES_LEVEL) && in_array($file, $expdevmenu)) {
+ if (getDolGlobalInt('MAIN_FEATURES_LEVEL') == 0 && in_array($file, $expdevmenu)) {
continue;
}
diff --git a/htdocs/core/class/infobox.class.php b/htdocs/core/class/infobox.class.php
index adde51c4974..0cd34e13193 100644
--- a/htdocs/core/class/infobox.class.php
+++ b/htdocs/core/class/infobox.class.php
@@ -37,7 +37,7 @@ class InfoBox
{
global $conf;
- if (empty($conf->global->MAIN_FEATURES_LEVEL) || $conf->global->MAIN_FEATURES_LEVEL < 2) {
+ if (getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
return array(
0 => 'Home',
1 => 'UsersHome',
diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index b535d2b3585..e741adc84b5 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -589,7 +589,7 @@ class Translate
}
/* Disabled. There is too many cases where translation of $newstr is not defined is normal (like when output with setEventMessage an already translated string)
- if (! empty($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL >= 2)
+ if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2)
{
dol_syslog(__METHOD__." MAIN_FEATURES_LEVEL=DEVELOP: missing translation for key '".$newstr."' in ".$_SERVER["PHP_SELF"], LOG_DEBUG);
}*/
diff --git a/htdocs/core/get_info.php b/htdocs/core/get_info.php
index 4927be6a005..ee21aac0de3 100644
--- a/htdocs/core/get_info.php
+++ b/htdocs/core/get_info.php
@@ -83,8 +83,8 @@ if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
$appli .= " ".DOL_VERSION;
}
-if (!empty($conf->global->MAIN_FEATURES_LEVEL)) {
- $appli .= " ".$langs->trans("LevelOfFeature").': '.$conf->global->MAIN_FEATURES_LEVEL;
+if (getDolGlobalInt('MAIN_FEATURES_LEVEL')) {
+ $appli .= " ".$langs->trans("LevelOfFeature").': '.getDolGlobalInt('MAIN_FEATURES_LEVEL');
}
$logouttext = '';
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index c71b3ad0802..25dec3e47bb 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4537,7 +4537,7 @@ function dol_print_error($db = '', $error = '', $errors = null)
if ($_SERVER['DOCUMENT_ROOT']) { // Mode web
$out .= $langs->trans("DolibarrHasDetectedError").". \n";
- if (!empty($conf->global->MAIN_FEATURES_LEVEL)) {
+ if (getDolGlobalInt('MAIN_FEATURES_LEVEL') > 0) {
$out .= "You use an experimental or develop level of features, so please do NOT report any bugs or vulnerability, except if problem is confirmed after moving option MAIN_FEATURES_LEVEL back to 0. \n";
}
$out .= $langs->trans("InformationToHelpDiagnose").": \n";
@@ -4545,7 +4545,7 @@ function dol_print_error($db = '', $error = '', $errors = null)
$out .= "".$langs->trans("Date").": ".dol_print_date(time(), 'dayhourlog')." \n";
$out .= "".$langs->trans("Dolibarr").": ".DOL_VERSION." - https://www.dolibarr.org \n";
if (isset($conf->global->MAIN_FEATURES_LEVEL)) {
- $out .= "".$langs->trans("LevelOfFeature").": ".dol_htmlentities($conf->global->MAIN_FEATURES_LEVEL, ENT_COMPAT)." \n";
+ $out .= "".$langs->trans("LevelOfFeature").": ".getDolGlobalInt('MAIN_FEATURES_LEVEL')." \n";
}
if (function_exists("phpversion")) {
$out .= "".$langs->trans("PHP").": ".phpversion()." \n";
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index c66bcdfc2d8..e9e06708f7c 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -471,14 +471,6 @@ function project_timesheet_prepare_head($mode, $fuser = null)
$h++;
}
- /*if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
- {
- $head[$h][0] = DOL_URL_ROOT."/projet/activity/perline.php".($param?'?'.$param:'');
- $head[$h][1] = $langs->trans("InputDetail");
- $head[$h][2] = 'inputperline';
- $h++;
- }*/
-
complete_head_from_modules($conf, $langs, null, $head, $h, 'project_timesheet');
complete_head_from_modules($conf, $langs, null, $head, $h, 'project_timesheet', 'remove');
@@ -517,7 +509,7 @@ function project_admin_prepare_head()
$head[$h][2] = 'attributes_task';
$h++;
- if (! empty($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL >= 2) {
+ if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
$langs->load("members");
$head[$h][0] = DOL_URL_ROOT.'/projet/admin/website.php';
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index c0a48b97222..93e20b06afe 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -151,7 +151,6 @@ $sqlusedforexport = '';
$head = array();
$upload_dir = $conf->export->dir_temp.'/'.$user->id;
-//$usefilters=($conf->global->MAIN_FEATURES_LEVEL > 1);
$usefilters = 1;
// Security check
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index c1f3231c737..25bc42046a9 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -523,7 +523,6 @@ if ((!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && getDolGlobalInt(
dol_syslog("--- Access to ".(empty($_SERVER["REQUEST_METHOD"]) ? '' : $_SERVER["REQUEST_METHOD"].' ').$_SERVER["PHP_SELF"]." refused by CSRF protection (invalid token), so we disable POST and some GET parameters - referer=".$_SERVER['HTTP_REFERER'].", action=".GETPOST('action', 'aZ09').", _GET|POST['token']=".GETPOST('token', 'alpha').", _SESSION['token']=".$_SESSION['token'], LOG_WARNING);
//print 'Unset POST by CSRF protection in main.inc.php.'; // Do not output anything because this create problems when using the BACK button on browsers.
setEventMessages('SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry', null, 'warnings');
- //if ($conf->global->MAIN_FEATURES_LEVEL >= 1) setEventMessages('Unset POST and GET params by CSRF protection in main.inc.php (Token provided was not generated by the previous page).'." \n".'$_SERVER[REQUEST_URI] = '.$_SERVER['REQUEST_URI'].' $_SERVER[REQUEST_METHOD] = '.$_SERVER['REQUEST_METHOD'].' GETPOST(token) = '.GETPOST('token', 'alpha').' $_SESSION[token] = '.$_SESSION['token'], null, 'warnings');
if (isset($_POST['id'])) $savid = ((int) $_POST['id']);
unset($_POST);
//unset($_POST['action']); unset($_POST['massaction']);
@@ -1437,8 +1436,8 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
print ' '."\n"; // Do not index
print ' '."\n"; // Scale for mobile device
print ' '."\n";
- if (!empty($conf->global->MAIN_FEATURES_LEVEL)) {
- print ' '."\n";
+ if (getDolGlobalInt('MAIN_FEATURES_LEVEL')) {
+ print ' '."\n";
}
// Favicon
$favicon = DOL_URL_ROOT.'/theme/dolibarr_256x256_color.png';
@@ -1628,11 +1627,6 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
} else {
print ''."\n";
}
- /*if (! empty($conf->global->MAIN_FEATURES_LEVEL) && ! defined('JS_JQUERY_MIGRATE_DISABLED'))
- {
- if (defined('JS_JQUERY_MIGRATE') && constant('JS_JQUERY_MIGRATE')) print ''."\n";
- else print ''."\n";
- }*/
if (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) {
print ''."\n";
} else {
@@ -1842,8 +1836,8 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
$appli .= " ".DOL_VERSION;
}
- if (!empty($conf->global->MAIN_FEATURES_LEVEL)) {
- $appli .= " ".$langs->trans("LevelOfFeature").': '.$conf->global->MAIN_FEATURES_LEVEL;
+ if (getDolGlobalInt('MAIN_FEATURES_LEVEL')) {
+ $appli .= " ".$langs->trans("LevelOfFeature").': '.getDolGlobalInt('MAIN_FEATURES_LEVEL');
}
$logouttext = '';
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index 536eb0546cc..2f272ceca1c 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -833,7 +833,7 @@ print '';
print '';
if (!empty($conf->expedition->enabled)) {
- if (!empty($conf->global->MAIN_FEATURES_LEVEL)) { // Visible on experimental only because seems to not be implemented everywhere (only on proposal)
+ if (getDolGlobalInt('MAIN_FEATURES_LEVEL') > 0) { // Visible on experimental only because seems to not be implemented everywhere (only on proposal)
print '';
print ''.$langs->trans("AskForPreferredShippingMethod").' ';
print ' ';
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 7d0c9b154c4..995558ae2f5 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -848,7 +848,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
}
}
- if (!empty($conf->stripe->enabled) && !empty($conf->stripeconnect->enabled) && $conf->global->MAIN_FEATURES_LEVEL >= 2) {
+ if (!empty($conf->stripe->enabled) && !empty($conf->stripeconnect->enabled) && getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
$permissiontowrite = $user->rights->societe->creer;
$stripesupplieracc = $stripe->getStripeAccount($service, $object->id); // Get Stripe OAuth connect account (no network access here)
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index 0bb351bf977..06f417e48df 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -356,7 +356,7 @@ print img_picto('', 'bank_account').' ';
$form->select_comptes($conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS, 'STRIPE_BANK_ACCOUNT_FOR_PAYMENTS', 0, '', 1);
print ' ';
-if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { // What is this for ?
+if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) { // What is this for ?
print '';
print $langs->trans("BankAccountForBankTransfer").' ';
print img_picto('', 'bank_account').' ';
@@ -446,15 +446,6 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { // TODO Not used by current code
print ' ';
}
-// Warehouse for automatic decrement
-//if ($conf->global->MAIN_FEATURES_LEVEL >= 2) // warehouse to reduce stock for online payment
-//{
-// print '';
-// print $langs->trans("ONLINE_PAYMENT_WAREHOUSE").' ';
-// print $formproduct->selectWarehouses($conf->global->ONLINE_PAYMENT_WAREHOUSE, 'ONLINE_PAYMENT_WAREHOUSE', '', 1, $disabled);
-// print ' ';
-//}
-
print '';
print $langs->trans("CSSUrlForPaymentForm").' ';
print ' ';
diff --git a/htdocs/theme/eldy/main_menu_fa_icons.inc.php b/htdocs/theme/eldy/main_menu_fa_icons.inc.php
index a9e5e80c009..f193af733c9 100644
--- a/htdocs/theme/eldy/main_menu_fa_icons.inc.php
+++ b/htdocs/theme/eldy/main_menu_fa_icons.inc.php
@@ -53,7 +53,7 @@ div.mainmenu.bank::before {
content: "\f19c";
}
-global->MAIN_FEATURES_LEVEL == 2) { ?>
+
/* TESTING USAGE OF SVG WITHOUT FONT */
div.mainmenu.cashdesk {
line-height: 26px;