From 07f4c9b3357dcc05b65fd0a94b800dfd67c9dd7f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 23 Dec 2023 19:47:10 +0100 Subject: [PATCH] Fix warnings --- htdocs/admin/eventorganization.php | 4 ++-- htdocs/admin/fckeditor.php | 2 +- htdocs/admin/hrm.php | 4 ++-- htdocs/admin/knowledgemanagement.php | 2 +- htdocs/admin/modules.php | 2 +- htdocs/admin/webhook.php | 8 ++++---- htdocs/admin/workstation.php | 2 +- htdocs/api/class/api_setup.class.php | 2 +- htdocs/asset/admin/setup.php | 2 +- htdocs/bookcal/admin/setup.php | 2 +- htdocs/core/lib/functions2.lib.php | 3 +-- htdocs/product/admin/product.php | 2 +- htdocs/recruitment/admin/setup.php | 2 +- htdocs/recruitment/admin/setup_candidatures.php | 2 +- htdocs/takepos/index.php | 2 +- htdocs/takepos/invoice.php | 7 ++++--- 16 files changed, 24 insertions(+), 24 deletions(-) diff --git a/htdocs/admin/eventorganization.php b/htdocs/admin/eventorganization.php index c9991c07a38..7e1b74e336e 100644 --- a/htdocs/admin/eventorganization.php +++ b/htdocs/admin/eventorganization.php @@ -154,7 +154,7 @@ if ($action == 'updateMask') { $tmpobjectkey = GETPOST('object'); if (!empty($tmpobjectkey)) { $constforval = 'EVENTORGANIZATION_'.strtoupper($tmpobjectkey).'_ADDON_PDF'; - if ($conf->global->$constforval == "$value") { + if (getDolGlobalString($constforval) == "$value") { dolibarr_del_const($db, $constforval, $conf->entity); } } @@ -279,7 +279,7 @@ if ($action == 'edit') { print dolJSToSetRandomPassword($constname, 'generate_token'.$constname); } elseif ($val['type'] == 'product') { if (isModEnabled("product") || isModEnabled("service")) { - $selected = (empty($conf->global->$constname) ? '' : $conf->global->$constname); + $selected = getDolGlobalString($constname); $form->select_produits($selected, $constname, '', 0); } } else { diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php index 64dc930e5e9..92a235fc178 100644 --- a/htdocs/admin/fckeditor.php +++ b/htdocs/admin/fckeditor.php @@ -173,7 +173,7 @@ if (empty($conf->use_javascript_ajax)) { } print ''; print ''; - $value = (isset($conf->global->$constante) ? $conf->global->$constante : 0); + $value = getDolGlobalInt($constante, 0); if ($value == 0) { print ''.img_picto($langs->trans("Disabled"), 'switch_off').''; } elseif ($value == 1) { diff --git a/htdocs/admin/hrm.php b/htdocs/admin/hrm.php index 423b78bc071..6b75e92bfca 100644 --- a/htdocs/admin/hrm.php +++ b/htdocs/admin/hrm.php @@ -159,7 +159,7 @@ if ($action == 'update') { $tmpobjectkey = GETPOST('object'); if (!empty($tmpobjectkey)) { $constforval = 'HRMTEST_'.strtoupper($tmpobjectkey).'_ADDON_PDF'; - if ($conf->global->$constforval == "$value") { + if (getDolGlobalString($constforval) == "$value") { dolibarr_del_const($db, $constforval, $conf->entity); } } @@ -549,7 +549,7 @@ if ($action == 'edit') { print dolJSToSetRandomPassword($constname, 'generate_token' . $constname); } elseif ($val['type'] == 'product') { if (isModEnabled('product') || isModEnabled('service')) { - $selected = (empty($conf->global->$constname) ? '' : $conf->global->$constname); + $selected = getDolGlobalString($constname); $form->select_produits($selected, $constname, '', 0); } } else { diff --git a/htdocs/admin/knowledgemanagement.php b/htdocs/admin/knowledgemanagement.php index ed99e058328..40e92d8270a 100644 --- a/htdocs/admin/knowledgemanagement.php +++ b/htdocs/admin/knowledgemanagement.php @@ -137,7 +137,7 @@ if ($action == 'updateMask') { $tmpobjectkey = GETPOST('object'); if (!empty($tmpobjectkey)) { $constforval = 'KNOWLEDGEMANAGEMENT_'.strtoupper($tmpobjectkey).'_ADDON_PDF'; - if ($conf->global->$constforval == "$value") { + if (getDolGlobalString($constforval) == "$value") { dolibarr_del_const($db, $constforval, $conf->entity); } } diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index 78fed9249ea..eb3938ac088 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -851,7 +851,7 @@ if ($mode == 'common' || $mode == 'commonkanban') { } // Activate/Disable and Setup (2 columns) - if (!empty($conf->global->$const_name)) { // If module is already activated + if (getDolGlobalString($const_name)) { // If module is already activated // Set $codeenabledisable $disableSetup = 0; if (!empty($arrayofwarnings[$modName])) { diff --git a/htdocs/admin/webhook.php b/htdocs/admin/webhook.php index 155606bc698..cc7527579aa 100644 --- a/htdocs/admin/webhook.php +++ b/htdocs/admin/webhook.php @@ -142,7 +142,7 @@ if ($action == 'updateMask') { $tmpobjectkey = GETPOST('object'); if (!empty($tmpobjectkey)) { $constforval = 'WEBHOOK_'.strtoupper($tmpobjectkey).'_ADDON_PDF'; - if ($conf->global->$constforval == "$value") { + if (getDolGlobalString($constforval) == "$value") { dolibarr_del_const($db, $constforval, $conf->entity); } } @@ -270,7 +270,7 @@ if ($action == 'edit') { print dolJSToSetRandomPassword($constname, 'generate_token'.$constname); } elseif ($val['type'] == 'product') { if (isModEnabled("product") || isModEnabled("service")) { - $selected = (empty($conf->global->$constname) ? '' : $conf->global->$constname); + $selected = getDolGlobalString($constname); $form->select_produits($selected, $constname, '', 0); } } else { @@ -447,7 +447,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) { print ''; $constforvar = 'WEBHOOK_'.strtoupper($myTmpObjectKey).'_ADDON'; - if ($conf->global->$constforvar == $file) { + if (getDolGlobalString($constforvar) == $file) { print img_picto($langs->trans("Activated"), 'switch_on'); } else { print ''; @@ -589,7 +589,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) { // Default print ''; $constforvar = 'WEBHOOK_'.strtoupper($myTmpObjectKey).'_ADDON'; - if ($conf->global->$constforvar == $name) { + if (getDolGlobalString($constforvar) == $name) { //print img_picto($langs->trans("Default"), 'on'); // Even if choice is the default value, we allow to disable it. Replace this with previous line if you need to disable unset print 'scandir).'&label='.urlencode($module->name).'&type='.urlencode($type).'" alt="'.$langs->trans("Disable").'">'.img_picto($langs->trans("Enabled"), 'on').''; diff --git a/htdocs/admin/workstation.php b/htdocs/admin/workstation.php index e1a73810eb1..de2e7de2e74 100644 --- a/htdocs/admin/workstation.php +++ b/htdocs/admin/workstation.php @@ -120,7 +120,7 @@ if ($action == 'updateMask') { $ret = delDocumentModel($value, $type); if ($ret > 0) { $constforval = strtoupper($tmpobjectkey).'_ADDON_PDF'; - if ($conf->global->$constforval == "$value") { + if (getDolGlobalString($constforval) == "$value") { dolibarr_del_const($db, $constforval, $conf->entity); } } diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php index 292add085d2..370f407a1de 100644 --- a/htdocs/api/class/api_setup.class.php +++ b/htdocs/api/class/api_setup.class.php @@ -2098,7 +2098,7 @@ class Setup extends DolibarrApi // Value found $value = ''; if ($constname && getDolGlobalString($constname) != '') { - $value = $conf->global->$constname; + $value = getDolGlobalString($constname); } $valueforchecksum = (empty($value) ? '0' : $value); diff --git a/htdocs/asset/admin/setup.php b/htdocs/asset/admin/setup.php index a184f667b8e..4232e60e481 100644 --- a/htdocs/asset/admin/setup.php +++ b/htdocs/asset/admin/setup.php @@ -139,7 +139,7 @@ if ($action == 'updateMask') { $tmpobjectkey = GETPOST('object'); if (!empty($tmpobjectkey)) { $constforval = 'ASSET_'.strtoupper($tmpobjectkey).'_ADDON_PDF'; - if ($conf->global->$constforval == "$value") { + if (getDolGlobalString($constforval) == "$value") { dolibarr_del_const($db, $constforval, $conf->entity); } } diff --git a/htdocs/bookcal/admin/setup.php b/htdocs/bookcal/admin/setup.php index 5ddcffd25a7..7117deee8e1 100644 --- a/htdocs/bookcal/admin/setup.php +++ b/htdocs/bookcal/admin/setup.php @@ -188,7 +188,7 @@ if ($action == 'updateMask') { $tmpobjectkey = GETPOST('object'); if (!empty($tmpobjectkey)) { $constforval = 'BOOKCAL_'.strtoupper($tmpobjectkey).'_ADDON_PDF'; - if ($conf->global->$constforval == "$value") { + if (getDolGlobalString($constforval) == "$value") { dolibarr_del_const($db, $constforval, $conf->entity); } } diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php index 3ff44d56866..906a658b445 100644 --- a/htdocs/core/lib/functions2.lib.php +++ b/htdocs/core/lib/functions2.lib.php @@ -1893,8 +1893,7 @@ function getListOfModels($db, $type, $maxfilenamelength = 0) include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $const = $obj->description; - //irtoscan.=($dirtoscan?',':'').preg_replace('/[\r\n]+/',',',trim($conf->global->$const)); - $dirtoscan = preg_replace('/[\r\n]+/', ',', trim($conf->global->$const)); + $dirtoscan = preg_replace('/[\r\n]+/', ',', trim(getDolGlobalString($const))); $listoffiles = array(); diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php index 87fd2ce60ae..22e4294eead 100644 --- a/htdocs/product/admin/product.php +++ b/htdocs/product/admin/product.php @@ -765,7 +765,7 @@ if (getDolGlobalString('PRODUCT_CANVAS_ABILITY')) { $const = "PRODUCT_SPECIAL_".strtoupper($file); - if ($conf->global->$const) { + if (getDolGlobalString($const)) { print img_picto($langs->trans("Active"), 'tick'); print ''; print ''.$langs->trans("Disable").''; diff --git a/htdocs/recruitment/admin/setup.php b/htdocs/recruitment/admin/setup.php index d3f56a73092..02c9ceeb336 100644 --- a/htdocs/recruitment/admin/setup.php +++ b/htdocs/recruitment/admin/setup.php @@ -153,7 +153,7 @@ if ($action == 'updateMask') { $tmpobjectkey = GETPOST('object'); if (!empty($tmpobjectkey)) { $constforval = 'RECRUITMENT_'.strtoupper($tmpobjectkey).'_ADDON_PDF'; - if ($conf->global->$constforval == "$value") { + if (getDolGlobalString($constforval) == "$value") { dolibarr_del_const($db, $constforval, $conf->entity); } } diff --git a/htdocs/recruitment/admin/setup_candidatures.php b/htdocs/recruitment/admin/setup_candidatures.php index 9d8e60e44c0..487f39dad84 100644 --- a/htdocs/recruitment/admin/setup_candidatures.php +++ b/htdocs/recruitment/admin/setup_candidatures.php @@ -153,7 +153,7 @@ if ($action == 'updateMask') { $ret = delDocumentModel($value, $type); if ($ret > 0) { $constforval = 'RECRUITMENT_'.strtoupper($tmpobjectkey).'_ADDON_PDF'; - if ($conf->global->$constforval == "$value") { + if (getDolGlobalString($constforval) == "$value") { dolibarr_del_const($db, $constforval, $conf->entity); } } diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php index b3abbe70756..1380c032c86 100644 --- a/htdocs/takepos/index.php +++ b/htdocs/takepos/index.php @@ -1223,7 +1223,7 @@ if (isset($_SESSION["takeposterminal"]) && $_SESSION["takeposterminal"]) { $constantforkey = "CASHDESK_ID_BANKACCOUNT_" . $paycode . $_SESSION["takeposterminal"]; //var_dump($constantforkey.' '.getDolGlobalInt($constantforkey)); - if (!empty($conf->global->$constantforkey) && getDolGlobalInt($constantforkey) > 0) { + if (getDolGlobalInt($constantforkey) > 0) { array_push($paiementsModes, $obj); } } diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php index 094c65fdf84..f76069a7d23 100644 --- a/htdocs/takepos/invoice.php +++ b/htdocs/takepos/invoice.php @@ -323,11 +323,11 @@ if (empty($reshook)) { $prod_batch->find(0, '', '', $line->batch, $line->fk_warehouse); $mouvP = new MouvementStock($db); $mouvP->origin = $invoice; - $mouvP->livraison($user, $line->fk_product, $conf->global->$constantforkey, $line->qty, $line->price, 'TakePOS', '', '', '', $prod_batch->batch, $line->batch); + $mouvP->livraison($user, $line->fk_product, getDolGlobalString($constantforkey), $line->qty, $line->price, 'TakePOS', '', '', '', $prod_batch->batch, $line->batch); } else { $mouvP = new MouvementStock($db); $mouvP->origin = $invoice; - $mouvP->livraison($user, $line->fk_product, $conf->global->$constantforkey, $line->qty, $line->price, 'TakePOS', '', '', ''); + $mouvP->livraison($user, $line->fk_product, getDolGlobalString($constantforkey), $line->qty, $line->price, 'TakePOS', '', '', ''); } } } @@ -534,6 +534,7 @@ if (empty($reshook)) { if (!empty($batch)) { $action="setbatch"; } else { + $nbofsuggested = 0; $prod->load_stock('warehouseopen'); $constantforkey = 'CASHDESK_ID_WAREHOUSE'.$_SESSION["takeposterminal"]; if ($prod->stock_warehouse[getDolGlobalString($constantforkey)]->detail_batch!="") { @@ -561,7 +562,7 @@ if (empty($reshook)) { print ''; $staticwarehouse = new Entrepot($db); if ($warehouse_id > 0) { - $staticwarehouse->fetch($conf->global->$constantforkey); + $staticwarehouse->fetch(getDolGlobalString($constantforkey)); } $detail = ''; $detail .= $langs->trans("LotSerial").': '.$dbatch->batch;