';
+ print $object->showOutputField($val, $key, $object->$key, '');
+ print '
';
} elseif ($key == 'rowid') {
print $object->showOutputField($val, $key, $object->id, '');
} else {
diff --git a/htdocs/admin/eventorganization.php b/htdocs/admin/eventorganization.php
index cc9b8d7bca8..0d10602b1c4 100644
--- a/htdocs/admin/eventorganization.php
+++ b/htdocs/admin/eventorganization.php
@@ -83,15 +83,13 @@ if ($cancel) {
$action ='';
}
-if ((float) DOL_VERSION >= 6) {
- include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
-}
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
if ($action == 'updateMask') {
- $maskconstorder = GETPOST('maskconstorder', 'alpha');
+ $maskconstorder = GETPOST('maskconstorder', 'aZ09');
$maskorder = GETPOST('maskorder', 'alpha');
- if ($maskconstorder) {
+ if ($maskconstorder && preg_match('/_MASK$/', $maskconstorder)) {
$res = dolibarr_set_const($db, $maskconstorder, $maskorder, 'chaine', 0, '', $conf->entity);
if (!($res > 0)) {
$error++;
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index 485ce901e5c..1db6a9cc9d6 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -62,9 +62,9 @@ if (empty($conf->global->EXPEDITION_ADDON_NUMBER)) {
include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
if ($action == 'updateMask') {
- $maskconst = GETPOST('maskconstexpedition', 'alpha');
+ $maskconst = GETPOST('maskconstexpedition', 'aZ09');
$maskvalue = GETPOST('maskexpedition', 'alpha');
- if (!empty($maskconst)) {
+ if (!empty($maskconst) && preg_match('/_MASK$/', $maskconst)) {
$res = dolibarr_set_const($db, $maskconst, $maskvalue, 'chaine', 0, '', $conf->entity);
}
diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index 8c20b493105..25bef9fde22 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -58,9 +58,9 @@ $type = 'expensereport';
include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
if ($action == 'updateMask') {
- $maskconst = GETPOST('maskconst', 'alpha');
+ $maskconst = GETPOST('maskconst', 'aZ09');
$maskvalue = GETPOST('maskvalue', 'alpha');
- if ($maskconst) {
+ if ($maskconst && preg_match('/_MASK$/', $maskconst)) {
$res = dolibarr_set_const($db, $maskconst, $maskvalue, 'chaine', 0, '', $conf->entity);
}
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index bbeb25371b9..a364b17cc4b 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -58,24 +58,24 @@ $type = 'invoice';
include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
if ($action == 'updateMask') {
- $maskconstinvoice = GETPOST('maskconstinvoice', 'alpha');
- $maskconstreplacement = GETPOST('maskconstreplacement', 'alpha');
- $maskconstcredit = GETPOST('maskconstcredit', 'alpha');
- $maskconstdeposit = GETPOST('maskconstdeposit', 'alpha');
+ $maskconstinvoice = GETPOST('maskconstinvoice', 'aZ09');
+ $maskconstreplacement = GETPOST('maskconstreplacement', 'aZ09');
+ $maskconstcredit = GETPOST('maskconstcredit', 'aZ09');
+ $maskconstdeposit = GETPOST('maskconstdeposit', 'aZ09');
$maskinvoice = GETPOST('maskinvoice', 'alpha');
$maskreplacement = GETPOST('maskreplacement', 'alpha');
$maskcredit = GETPOST('maskcredit', 'alpha');
$maskdeposit = GETPOST('maskdeposit', 'alpha');
- if ($maskconstinvoice) {
+ if ($maskconstinvoice && preg_match('/_MASK_/', $maskconstinvoice)) {
$res = dolibarr_set_const($db, $maskconstinvoice, $maskinvoice, 'chaine', 0, '', $conf->entity);
}
- if ($maskconstreplacement) {
+ if ($maskconstreplacement && preg_match('/_MASK_/', $maskconstreplacement)) {
$res = dolibarr_set_const($db, $maskconstreplacement, $maskreplacement, 'chaine', 0, '', $conf->entity);
}
- if ($maskconstcredit) {
+ if ($maskconstcredit && preg_match('/_MASK_/', $maskconstcredit)) {
$res = dolibarr_set_const($db, $maskconstcredit, $maskcredit, 'chaine', 0, '', $conf->entity);
}
- if ($maskconstdeposit) {
+ if ($maskconstdeposit && preg_match('/_MASK_/', $maskconstdeposit)) {
$res = dolibarr_set_const($db, $maskconstdeposit, $maskdeposit, 'chaine', 0, '', $conf->entity);
}
diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php
index b6ce3d8b9a5..5a5c2f25c0e 100644
--- a/htdocs/admin/fckeditor.php
+++ b/htdocs/admin/fckeditor.php
@@ -165,14 +165,14 @@ if (empty($conf->use_javascript_ajax)) {
$constante = 'FCKEDITOR_ENABLE_'.$const;
print ''."\n";
print '';
- print ''.img_object("", $picto[$const]).' ';
+ print ''.img_object("", $picto[$const]).' ';
print '';
print $langs->trans($desc);
if ($const == 'DETAILS') {
print ''.$langs->trans("FCKeditorForProductDetails2").' ';
}
print ' ';
- print '';
+ print ' ';
$value = (isset($conf->global->$constante) ? $conf->global->$constante : 0);
if ($value == 0) {
print ''.img_picto($langs->trans("Disabled"), 'switch_off').' ';
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index cf637d37329..2e331b3cc80 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -58,9 +58,9 @@ $type = 'ficheinter';
include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
if ($action == 'updateMask') {
- $maskconst = GETPOST('maskconst', 'alpha');
+ $maskconst = GETPOST('maskconst', 'aZ09');
$maskvalue = GETPOST('maskvalue', 'alpha');
- if ($maskconst) {
+ if ($maskconst && preg_match('/_MASK$/', $maskconst)) {
$res = dolibarr_set_const($db, $maskconst, $maskvalue, 'chaine', 0, '', $conf->entity);
}
diff --git a/htdocs/admin/holiday.php b/htdocs/admin/holiday.php
index 9a60c6b9b84..b85e257c69e 100644
--- a/htdocs/admin/holiday.php
+++ b/htdocs/admin/holiday.php
@@ -58,9 +58,9 @@ if (empty($conf->global->HOLIDAY_ADDON)) {
include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
if ($action == 'updateMask') {
- $maskconst = GETPOST('maskconstholiday', 'alpha');
+ $maskconst = GETPOST('maskconstholiday', 'aZ09');
$maskvalue = GETPOST('maskholiday', 'alpha');
- if ($maskconst) {
+ if ($maskconst && preg_match('/_MASK$/', $maskconst)) {
$res = dolibarr_set_const($db, $maskconst, $maskvalue, 'chaine', 0, '', $conf->entity);
}
diff --git a/htdocs/admin/hrm.php b/htdocs/admin/hrm.php
index 838e9bf9a0b..14d6e8b175f 100644
--- a/htdocs/admin/hrm.php
+++ b/htdocs/admin/hrm.php
@@ -53,7 +53,7 @@ $label = GETPOST('label', 'alpha');
$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php
$scandir = GETPOST('scan_dir', 'alpha');
-$type = 'myobject';
+$type = 'evaluation';
$arrayofparameters = array(
'HRM_MAXRANK'=>array('type'=>'integer','enabled'=>1),
@@ -70,9 +70,7 @@ $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
* Actions
*/
-if ((float) DOL_VERSION >= 6) {
- include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
-}
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
if ($action == 'update') {
$max_rank = GETPOST('HRM_MAXRANK', 'int');
@@ -91,11 +89,11 @@ if ($action == 'update') {
}
}
} elseif ($action == 'updateMask') {
- $maskconstorder = GETPOST('maskconstorder', 'alpha');
- $maskorder = GETPOST('maskorder', 'alpha');
+ $maskconst = GETPOST('maskconstEvaluation', 'aZ09');
+ $maskvalue = GETPOST('maskEvaluation', 'alpha');
- if ($maskconstorder) {
- $res = dolibarr_set_const($db, $maskconstorder, $maskorder, 'chaine', 0, '', $conf->entity);
+ if ($maskconst && preg_match('/_MASK$/', $maskconst)) {
+ $res = dolibarr_set_const($db, $maskconst, $maskvalue, 'chaine', 0, '', $conf->entity);
if (!($res > 0)) {
$error++;
}
@@ -210,10 +208,10 @@ print dol_get_fiche_head($head, 'settings', $langs->trans($page_name), -1, "hrm"
$moduledir = 'hrm';
$myTmpObjects = array();
-$myTmpObjects['evaluation'] = array('includerefgeneration'=>1, 'includedocgeneration'=>0);
+$myTmpObjects['evaluation'] = array('label'=>'Evaluation', 'includerefgeneration'=>1, 'includedocgeneration'=>0);
foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
- if ($myTmpObjectKey == 'MyObject') {
+ if ($myTmpObjectKey != $type) {
continue;
}
if ($myTmpObjectArray['includerefgeneration']) {
@@ -222,7 +220,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
*/
$setupnotempty++;
- print load_fiche_titre($langs->trans("NumberingModules", $myTmpObjectKey), '', '');
+ print load_fiche_titre($langs->trans("NumberingModules").' ('.$myTmpObjectArray['label'].')', '', '');
print '';
print '';
@@ -493,16 +491,16 @@ if ($action == 'edit') {
if ($val['type'] == 'textarea') {
print '\n";
} elseif ($val['type'] == 'integer') {
- print '';
if ($val['type'] == 'textarea') {
- print dol_nl2br($conf->global->{$constname});
+ print dol_nl2br(getDolGlobalString($constname));
} elseif ($val['type']== 'html') {
- print $conf->global->{$constname};
+ print getDolGlobalString($constname);
} elseif ($val['type'] == 'yesno') {
print ajax_constantonoff($constname);
} elseif (preg_match('/emailtemplate:/', $val['type'])) {
@@ -588,14 +586,14 @@ if ($action == 'edit') {
$tmp = explode(':', $val['type']);
- $template = $formmail->getEMailTemplate($db, $tmp[1], $user, $langs, $conf->global->{$constname});
+ $template = $formmail->getEMailTemplate($db, $tmp[1], $user, $langs, getDolGlobalString($constname));
if ($template<0) {
setEventMessages(null, $formmail->errors, 'errors');
}
print $langs->trans($template->label);
} elseif (preg_match('/category:/', $val['type'])) {
$c = new Categorie($db);
- $result = $c->fetch($conf->global->{$constname});
+ $result = $c->fetch(getDolGlobalString($constname));
if ($result < 0) {
setEventMessages(null, $c->errors, 'errors');
}
diff --git a/htdocs/admin/knowledgemanagement.php b/htdocs/admin/knowledgemanagement.php
index b1710a53839..3fc8ebb3724 100644
--- a/htdocs/admin/knowledgemanagement.php
+++ b/htdocs/admin/knowledgemanagement.php
@@ -69,11 +69,11 @@ if (!$user->admin) {
include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
if ($action == 'updateMask') {
- $maskconstorder = GETPOST('maskconstorder', 'alpha');
+ $maskconst = GETPOST('maskconst', 'aZ09');
$maskorder = GETPOST('maskorder', 'alpha');
- if ($maskconstorder) {
- $res = dolibarr_set_const($db, $maskconstorder, $maskorder, 'chaine', 0, '', $conf->entity);
+ if ($maskconst && preg_match('/_MASK$/', $maskconst)) {
+ $res = dolibarr_set_const($db, $maskconst, $maskorder, 'chaine', 0, '', $conf->entity);
if (!($res > 0)) {
$error++;
}
@@ -209,14 +209,14 @@ if ($action == 'edit') {
if ($val['type'] == 'textarea') {
print '\n";
} elseif ($val['type'] == 'html') {
require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
- $doleditor = new DolEditor($constname, $conf->global->{$constname}, '', 160, 'dolibarr_notes', '', false, false, isModEnabled('fckeditor'), ROWS_5, '90%');
+ $doleditor = new DolEditor($constname, getDolGlobalString($constname), '', 160, 'dolibarr_notes', '', false, false, isModEnabled('fckeditor'), ROWS_5, '90%');
$doleditor->Create();
} elseif ($val['type'] == 'yesno') {
- print $form->selectyesno($constname, $conf->global->{$constname}, 1);
+ print $form->selectyesno($constname, getDolGlobalString($constname), 1);
} elseif (preg_match('/emailtemplate:/', $val['type'])) {
include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
$formmail = new FormMail($db);
@@ -275,9 +275,9 @@ if ($action == 'edit') {
print ' ';
if ($val['type'] == 'textarea') {
- print dol_nl2br($conf->global->{$constname});
+ print dol_nl2br(getDolGlobalString($constname));
} elseif ($val['type']== 'html') {
- print $conf->global->{$constname};
+ print getDolGlobalString($constname);
} elseif ($val['type'] == 'yesno') {
print ajax_constantonoff($constname);
} elseif (preg_match('/emailtemplate:/', $val['type'])) {
@@ -286,7 +286,7 @@ if ($action == 'edit') {
$tmp = explode(':', $val['type']);
- $template = $formmail->getEMailTemplate($db, $tmp[1], $user, $langs, $conf->global->{$constname});
+ $template = $formmail->getEMailTemplate($db, $tmp[1], $user, $langs, getDolGlobalString($constname));
if ($template<0) {
setEventMessages(null, $formmail->errors, 'errors');
}
@@ -304,17 +304,17 @@ if ($action == 'edit') {
}
print '' . implode(' ', $toprint) . ' ';
}
diff --git a/htdocs/admin/mails_senderprofile_list.php b/htdocs/admin/mails_senderprofile_list.php
index 95f57d5dfc5..a73b899dd00 100644
--- a/htdocs/admin/mails_senderprofile_list.php
+++ b/htdocs/admin/mails_senderprofile_list.php
@@ -416,7 +416,7 @@ if ($action != 'create') {
print ''.$langs->trans("Label").' '.$langs->trans("Email").' ';
print img_picto('', 'email', 'class="pictofixedwidth"');
- print ' '.$langs->trans("Signature").' ';
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
$doleditor = new DolEditor('signature', GETPOST('signature'), '', 138, 'dolibarr_notes', 'In', true, true, empty($conf->global->FCKEDITOR_ENABLE_USERSIGN) ? 0 : 1, ROWS_4, '90%');
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index e462b7854ac..1cb418cb6c9 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -69,6 +69,7 @@ $search_type_template = GETPOST('search_type_template', 'alpha');
$search_lang = GETPOST('search_lang', 'alpha');
$search_fk_user = GETPOST('search_fk_user', 'intcomma');
$search_topic = GETPOST('search_topic', 'alpha');
+$search_module = GETPOST('search_module', 'alpha');
$acts = array();
$actl = array();
@@ -108,7 +109,7 @@ $tabname[25] = MAIN_DB_PREFIX."c_email_templates";
// Nom des champs en resultat de select pour affichage du dictionnaire
$tabfield = array();
-$tabfield[25] = "label,lang,type_template,fk_user,private,position,topic,joinfiles,content";
+$tabfield[25] = "label,lang,type_template,fk_user,private,position,module,topic,joinfiles,content";
if (!empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) {
$tabfield[25] .= ',content_lines';
}
@@ -290,6 +291,7 @@ if (empty($reshook)) {
$search_lang = '';
$search_fk_user = '';
$search_topic = '';
+ $search_module = '';
$toselect = array();
$search_array_options = array();
}
@@ -598,6 +600,9 @@ if ($search_lang) {
if ($search_fk_user != '' && $search_fk_user != '-1') {
$sql .= natural_search('fk_user', $search_fk_user, 2);
}
+if ($search_module) {
+ $sql .= natural_search('module', $search_module);
+}
if ($search_topic) {
$sql .= natural_search('topic', $search_topic);
}
@@ -703,6 +708,9 @@ if ($action == 'create') {
$valuetoshow = ucfirst($fieldlist[$field]); // Par defaut
$valuetoshow = $langs->trans($valuetoshow); // try to translate
$align = "left";
+ if ($fieldlist[$field] == 'module') {
+ $valuetoshow = '';
+ }
if ($fieldlist[$field] == 'fk_user') {
$valuetoshow = $langs->trans("Owner");
}
@@ -802,9 +810,9 @@ if ($action == 'create') {
$fieldsforcontent = array('topic', 'joinfiles', 'content', 'content_lines');
}
foreach ($fieldsforcontent as $tmpfieldlist) {
- print ' ';
+ print ' ';
- // Label
+ // Topic of email
if ($tmpfieldlist == 'topic') {
print ''.$form->textwithpicto($langs->trans("Topic"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).' ';
}
@@ -882,6 +890,9 @@ if ($search_type_template != '-1') {
if ($search_fk_user > 0) {
$param .= '&search_fk_user='.urlencode($search_fk_user);
}
+if ($search_module) {
+ $param .= '&search_module='.urlencode($search_module);
+}
if ($search_topic) {
$param .= '&search_topic='.urlencode($search_topic);
}
@@ -909,7 +920,9 @@ if ($num > $listlimit) {
print ' ';
foreach ($fieldlist as $field => $value) {
- if ($value == 'label') {
+ if ($value == 'module') {
+ print '';
@@ -917,7 +930,7 @@ foreach ($fieldlist as $field => $value) {
print ' ';
} elseif ($value == 'fk_user') {
print '';
- print $form->select_dolusers($search_fk_user, 'search_fk_user', 1, null, 0, ($user->admin ? '' : 'hierarchyme'), null, 0, 0, 0, '', 0, '', 'maxwidth125', 1);
+ print $form->select_dolusers($search_fk_user, 'search_fk_user', 1, null, 0, ($user->admin ? '' : 'hierarchyme'), null, 0, 0, 0, '', 0, '', 'maxwidth100', 1);
print ' ';
} elseif ($value == 'topic') {
print ' ';
@@ -1052,7 +1072,7 @@ if ($num) {
if ($showfield) {
// Show line for topic, joinfiles and content
print '';
- print '';
+ print ' ';
if ($tmpfieldlist == 'topic') {
print ''.$form->textwithpicto($langs->trans("Topic"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).' ';
print ' ';
if ($user->admin) {
- print $form->select_dolusers(empty($obj->{$value}) ? '' : $obj->{$value}, 'fk_user', 1, null, 0, ($user->admin ? '' : 'hierarchyme'), null, 0, 0, 0, '', 0, '', 'minwidth150 maxwidth200');
+ print $form->select_dolusers(empty($obj->$value) ? '' : $obj->$value, 'fk_user', 1, null, 0, ($user->admin ? '' : 'hierarchyme'), null, 0, 0, 0, '', 0, '', 'minwidth75 maxwidth100');
} else {
if ($context == 'add') { // I am not admin and we show the add form
print $user->getNomUrl(1); // Me
$forcedvalue = $user->id;
} else {
- if ($obj && !empty($obj->{$value}) && $obj->{$value} > 0) {
+ if ($obj && !empty($obj->$value) && $obj->$value > 0) {
$fuser = new User($db);
- $fuser->fetch($obj->{$value});
+ $fuser->fetch($obj->$value);
print $fuser->getNomUrl(1);
$forcedvalue = $fuser->id;
} else {
- $forcedvalue = $obj->{$value};
+ $forcedvalue = $obj->$value;
}
}
$keyname = $value;
@@ -1304,7 +1326,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
if ($context == 'edit') {
$selectedlang = $obj->lang;
}
- print $formadmin->select_language($selectedlang, 'langcode', 0, null, 1, 0, 0, 'maxwidth150');
+ print $formadmin->select_language($selectedlang, 'langcode', 0, null, 1, 0, 0, 'maxwidth100');
} else {
if (!empty($obj->lang)) {
print $obj->lang.' - '.$langs->trans('Language_'.$obj->lang);
@@ -1324,7 +1346,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
print ' ';
} elseif ($context == 'add' && in_array($value, array('topic', 'joinfiles', 'content', 'content_lines'))) {
diff --git a/htdocs/admin/modulehelp.php b/htdocs/admin/modulehelp.php
index e18e65e47a0..1af4b25bb27 100644
--- a/htdocs/admin/modulehelp.php
+++ b/htdocs/admin/modulehelp.php
@@ -372,13 +372,13 @@ if ($mode == 'feature') {
if (count($objMod->depends)) {
$text .= join(',', $objMod->depends);
} else {
- $text .= $langs->trans("None");
+ $text .= ''.$langs->trans("None").' ';
}
$text .= ''.$langs->trans("RequiredBy").': ';
if (count($objMod->requiredby)) {
$text .= join(',', $objMod->requiredby);
} else {
- $text .= $langs->trans("None");
+ $text .= ''.$langs->trans("None").' ';
}
$text .= ''.$langs->trans("No").' ';
}
$text .= ''.$langs->trans("No").' ';
}
$text .= '('.$moduledir.'/sql/data.sql) ';
} else {
- $text .= $langs->trans("No");
+ $text .= ''.$langs->trans("No").' ';
}
$text .= ''.$langs->trans("No").' ';
}
$text .= ''.$langs->trans("No").' ';
}
$text .= ''.$langs->trans("No").' ';
}
$text .= ''.$langs->trans("No").' ';
}
$text .= ''.$langs->trans("No").' ';
}
$text .= ''.$langs->trans("No").' ';
}
$text .= ''.$langs->trans("No").' ';
}
$text .= ''.$langs->trans("No").' ';
}
$text .= ''.$langs->trans("No").' ';
}
$text .= ''.$langs->trans("No").' ';
}
$text .= ''.$langs->trans("AddOtherPagesOrServices").': ';
- $text .= $langs->trans("DetectionNotPossible");
+ $text .= ''.$langs->trans("DetectionNotPossible").' ';
}
@@ -594,7 +597,7 @@ if ($mode == 'changelog') {
if ($changelog) {
$text .= ''.$changelog.'
';
} else {
- $text .= '
'.$langs->trans("NotAvailable").'
';
+ $text .= '
'.$langs->trans("NotAvailable").'
';
}
}
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index bd6a238c0f0..6e0d90499d4 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -65,9 +65,9 @@ $search_version = GETPOST('search_version', 'alpha');
// For dolistore search
$options = array();
$options['per_page'] = 20;
-$options['categorie'] = ((GETPOST('categorie', 'int') ?GETPOST('categorie', 'int') : 0) + 0);
-$options['start'] = ((GETPOST('start', 'int') ?GETPOST('start', 'int') : 0) + 0);
-$options['end'] = ((GETPOST('end', 'int') ?GETPOST('end', 'int') : 0) + 0);
+$options['categorie'] = ((int) (GETPOST('categorie', 'int') ? GETPOST('categorie', 'int') : 0));
+$options['start'] = ((int) (GETPOST('start', 'int') ?GETPOST('start', 'int') : 0));
+$options['end'] = ((int) (GETPOST('end', 'int') ?GETPOST('end', 'int') : 0));
$options['search'] = GETPOST('search_keyword', 'alpha');
$dolistore = new Dolistore(false);
@@ -282,10 +282,39 @@ if ($action == 'set' && $user->admin) {
}
header("Location: ".$_SERVER["PHP_SELF"]."?mode=".$mode.$param.($page_y ? '&page_y='.$page_y : ''));
exit;
+} elseif (getDolGlobalInt("MAIN_FEATURES_LEVEL") > 1 && $action == 'reload' && $user->admin && GETPOST('confirm') == 'yes') {
+ $result = unActivateModule($value, 0);
+ dolibarr_set_const($db, "MAIN_IHM_PARAMS_REV", (int) $conf->global->MAIN_IHM_PARAMS_REV + 1, 'chaine', 0, '', $conf->entity);
+ if ($result) {
+ setEventMessages($result, null, 'errors');
+ header("Location: ".$_SERVER["PHP_SELF"]."?mode=".$mode.$param.($page_y ? '&page_y='.$page_y : ''));
+ }
+ $resarray = activateModule($value, 0, 1);
+ dolibarr_set_const($db, "MAIN_IHM_PARAMS_REV", (int) $conf->global->MAIN_IHM_PARAMS_REV + 1, 'chaine', 0, '', $conf->entity);
+ if (!empty($resarray['errors'])) {
+ setEventMessages('', $resarray['errors'], 'errors');
+ } else {
+ if ($resarray['nbperms'] > 0) {
+ $tmpsql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."user WHERE admin <> 1";
+ $resqltmp = $db->query($tmpsql);
+ if ($resqltmp) {
+ $obj = $db->fetch_object($resqltmp);
+ if ($obj && $obj->nb > 1) {
+ $msg = $langs->trans('ModuleEnabledAdminMustCheckRights');
+ setEventMessages($msg, null, 'warnings');
+ }
+ } else {
+ dol_print_error($db);
+ }
+ }
+ }
+ header("Location: ".$_SERVER["PHP_SELF"]."?mode=".$mode.$param.($page_y ? '&page_y='.$page_y : ''));
+ exit;
}
+
/*
* View
*/
@@ -464,6 +493,19 @@ if ($action == 'reset_confirm' && $user->admin) {
}
}
+if ($action == 'reload_confirm' && $user->admin) {
+ if (!empty($modules[$value])) {
+ $objMod = $modules[$value];
+
+ if (!empty($objMod->langfiles)) {
+ $langs->loadLangs($objMod->langfiles);
+ }
+
+ $form = new Form($db);
+ $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?value='.$value.'&mode='.$mode.$param, $langs->trans('ConfirmReload'), $langs->trans(GETPOST('confirm_message_code')), 'reload', '', 'no', 1);
+ }
+}
+
print $formconfirm;
asort($orders);
@@ -547,6 +589,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, '', 'maxwidth250', 1);
$moreforfilter .= '
';
+
if (getDolGlobalInt('MAIN_FEATURES_LEVEL')) {
$array_version = array('stable'=>$langs->transnoentitiesnoconv("Stable"));
if ($conf->global->MAIN_FEATURES_LEVEL < 0) {
@@ -559,11 +602,12 @@ if ($mode == 'common' || $mode == 'commonkanban') {
$array_version['development'] = $langs->trans("Development");
}
$moreforfilter .= '
';
- $moreforfilter .= $form->selectarray('search_version', $array_version, $search_version, $langs->trans('Version'), 0, 0, '', 0, 0, 0, '', 'maxwidth150', 1);
+ $moreforfilter .= $form->selectarray('search_version', $array_version, $search_version, $langs->transnoentitiesnoconv('Version'), 0, 0, '', 0, 0, 0, '', 'maxwidth150', 1);
$moreforfilter .= '
';
}
+ $array_status = array('active'=>$langs->transnoentitiesnoconv("Enabled"), 'disabled'=>$langs->transnoentitiesnoconv("Disabled"));
$moreforfilter .= '
';
- $moreforfilter .= $form->selectarray('search_status', array('active'=>$langs->transnoentitiesnoconv("Enabled"), 'disabled'=>$langs->transnoentitiesnoconv("Disabled")), $search_status, $langs->trans('Status'), 0, 0, '', 0, 0, 0, '', 'maxwidth150', 1);
+ $moreforfilter .= $form->selectarray('search_status', $array_status, $search_status, $langs->transnoentitiesnoconv('Status'), 0, 0, '', 0, 0, 0, '', 'maxwidth150', 1);
$moreforfilter .= '
';
$moreforfilter .= ' ';
$moreforfilter .= '
';
@@ -641,11 +685,11 @@ if ($mode == 'common' || $mode == 'commonkanban') {
// We discard showing according to filters
if ($search_keyword) {
$qualified = 0;
- if (preg_match('/'.preg_quote($search_keyword).'/i', $modulename)
- || preg_match('/'.preg_quote($search_keyword).'/i', $moduletechnicalname)
- || preg_match('/'.preg_quote($search_keyword).'/i', $moduledesc)
- || preg_match('/'.preg_quote($search_keyword).'/i', $moduledesclong)
- || preg_match('/'.preg_quote($search_keyword).'/i', $moduleauthor)
+ if (preg_match('/'.preg_quote($search_keyword, '/').'/i', $modulename)
+ || preg_match('/'.preg_quote($search_keyword, '/').'/i', $moduletechnicalname)
+ || ($moduledesc && preg_match('/'.preg_quote($search_keyword, '/').'/i', $moduledesc))
+ || ($moduledesclong && preg_match('/'.preg_quote($search_keyword, '/').'/i', $moduledesclong))
+ || ($moduleauthor && preg_match('/'.preg_quote($search_keyword, '/').'/i', $moduleauthor))
) {
$qualified = 1;
}
@@ -734,15 +778,17 @@ if ($mode == 'common' || $mode == 'commonkanban') {
// Version (with picto warning or not)
$version = $objMod->getVersion(0);
$versiontrans = '';
+ $warningstring = '';
if (preg_match('/development/i', $version)) {
- $versiontrans .= img_warning($langs->trans("Development"), '', 'floatleft paddingright');
+ $warningstring = $langs->trans("Development");
}
if (preg_match('/experimental/i', $version)) {
- $versiontrans .= img_warning($langs->trans("Experimental"), '', 'floatleft paddingright');
+ $warningstring = $langs->trans("Experimental");
}
if (preg_match('/deprecated/i', $version)) {
- $versiontrans .= img_warning($langs->trans("Deprecated"), '', 'floatleft paddingright');
+ $warningstring = $langs->trans("Deprecated");
}
+
if ($objMod->isCoreOrExternalModule() == 'external' || preg_match('/development|experimental|deprecated/i', $version)) {
$versiontrans .= $objMod->getVersion(1);
}
@@ -800,12 +846,24 @@ if ($mode == 'common' || $mode == 'commonkanban') {
} else {
if (!empty($objMod->warnings_unactivation[$mysoc->country_code]) && method_exists($objMod, 'alreadyUsed') && $objMod->alreadyUsed()) {
$codeenabledisable .= '
warnings_unactivation[$mysoc->country_code]).'&value='.$modName.'&mode='.$mode.$param.'">';
- $codeenabledisable .= img_picto($langs->trans("Activated"), 'switch_on');
+ $codeenabledisable .= img_picto($langs->trans("Activated").($warningstring ? ' '.$warningstring : ''), 'switch_on');
$codeenabledisable .= ' ';
+ if (getDolGlobalInt("MAIN_FEATURES_LEVEL") > 1) {
+ $codeenabledisable .= ' ';
+ $codeenabledisable .= '
';
+ $codeenabledisable .= img_picto($langs->trans("Reload"), 'refresh', 'class="opacitymedium"');
+ $codeenabledisable .= ' ';
+ }
} else {
$codeenabledisable .= '
';
- $codeenabledisable .= img_picto($langs->trans("Activated"), 'switch_on');
+ $codeenabledisable .= img_picto($langs->trans("Activated").($warningstring ? ' '.$warningstring : ''), 'switch_on');
$codeenabledisable .= ' ';
+ if (getDolGlobalInt("MAIN_FEATURES_LEVEL") > 1) {
+ $codeenabledisable .= ' ';
+ $codeenabledisable .= '
';
+ $codeenabledisable .= img_picto($langs->trans("Reload"), 'refresh', 'class="opacitymedium"');
+ $codeenabledisable .= ' ';
+ }
}
}
@@ -844,10 +902,10 @@ if ($mode == 'common' || $mode == 'commonkanban') {
}
}
}
- } elseif (preg_match('/^([^@]+)@([^@]+)$/i', $objMod->config_page_url, $regs)) {
+ } elseif (preg_match('/^([^@]+)@([^@]+)$/i', (string) $objMod->config_page_url, $regs)) {
$codetoconfig .= '
'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"', false, 0, 0, '', 'fa-15').' ';
} else {
- $codetoconfig .= '
'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"', false, 0, 0, '', 'fa-15').' ';
+ $codetoconfig .= '
'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"', false, 0, 0, '', 'fa-15').' ';
}
} else {
$codetoconfig .= img_picto($langs->trans("NothingToSetup"), "setup", 'class="opacitytransp" style="padding-right: 6px"', false, 0, 0, '', 'fa-15');
@@ -907,7 +965,7 @@ if ($mode == 'common' || $mode == 'commonkanban') {
// Output Kanban
print $objMod->getKanbanView($codeenabledisable, $codetoconfig);
} else {
- print '
'."\n";
+ print ' '."\n";
if (!empty($conf->global->MAIN_MODULES_SHOW_LINENUMBERS)) {
print ''.$linenum.' ';
}
@@ -941,7 +999,7 @@ if ($mode == 'common' || $mode == 'commonkanban') {
print '';
// Version
- print '';
+ print ' ';
if ($objMod->needUpdate) {
$versionTitle = $langs->trans('ModuleUpdateAvailable').' : '.$objMod->lastVersion;
print ''.$versiontrans.' ';
@@ -951,7 +1009,7 @@ if ($mode == 'common' || $mode == 'commonkanban') {
print " \n";
// Link enable/disable
- print '';
+ print ' ';
print $codeenabledisable;
print " \n";
@@ -1075,7 +1133,7 @@ if ($mode == 'marketplace') {
- get_products(!empty($categorie) ? $categorie: ''); ?>
+ get_products(); ?>
@@ -1216,10 +1274,10 @@ if ($mode == 'deploy') {
print ''."\n";
diff --git a/htdocs/admin/mrp.php b/htdocs/admin/mrp.php
index 36a82e965f4..21fff1c45e6 100644
--- a/htdocs/admin/mrp.php
+++ b/htdocs/admin/mrp.php
@@ -52,10 +52,10 @@ $type = 'mrp';
include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
if ($action == 'updateMask') {
- $maskconstmrp = GETPOST('maskconstMo', 'alpha');
+ $maskconstmrp = GETPOST('maskconstMo', 'aZ09');
$maskmrp = GETPOST('maskMo', 'alpha');
- if ($maskconstmrp) {
+ if ($maskconstmrp && preg_match('/_MASK$/', $maskconstmrp)) {
$res = dolibarr_set_const($db, $maskconstmrp, $maskmrp, 'chaine', 0, '', $conf->entity);
}
diff --git a/htdocs/admin/multicurrency.php b/htdocs/admin/multicurrency.php
index 1cf838c08cb..5945ebfb5d5 100644
--- a/htdocs/admin/multicurrency.php
+++ b/htdocs/admin/multicurrency.php
@@ -134,7 +134,8 @@ if ($action == 'add_currency') {
dolibarr_set_const($db, 'MULTICURRENCY_APP_SOURCE', GETPOST('MULTICURRENCY_APP_SOURCE', 'alpha'));
//dolibarr_set_const($db, 'MULTICURRENCY_ALTERNATE_SOURCE', GETPOST('MULTICURRENCY_ALTERNATE_SOURCE', 'alpha'));
} else {
- $result = MultiCurrency::syncRates($conf->global->MULTICURRENCY_APP_ID);
+ $multiurrency = new MultiCurrency($db);
+ $result = $multiurrency->syncRates(getDolGlobalString('MULTICURRENCY_APP_ID'));
if ($result > 0) {
setEventMessages($langs->trans("CurrencyRateSyncSucceed"), null, "mesgs");
}
diff --git a/htdocs/admin/oauth.php b/htdocs/admin/oauth.php
index 64968b1a516..8c082d674db 100644
--- a/htdocs/admin/oauth.php
+++ b/htdocs/admin/oauth.php
@@ -48,6 +48,8 @@ $action = GETPOST('action', 'aZ09');
$provider = GETPOST('provider', 'aZ09');
$label = GETPOST('label', 'aZ09');
+$servicetoeditname = GETPOST('servicetoeditname', 'aZ09');
+
$error = 0;
@@ -72,15 +74,24 @@ if ($action == 'update') {
foreach ($conf->global as $key => $val) {
if (!empty($val) && preg_match('/^OAUTH_.+_ID$/', $key)) {
$constvalue = str_replace('_ID', '', $key);
- if (!dolibarr_set_const($db, $constvalue.'_ID', GETPOST($constvalue.'_ID'), 'chaine', 0, '', $conf->entity)) {
- $error++;
+ $newconstvalue = $constvalue;
+ if (GETPOSTISSET($constvalue.'_NAME')) {
+ $newconstvalue = preg_replace('/-.*$/', '', $constvalue).'-'.GETPOST($constvalue.'_NAME');
+ }
+
+ if (GETPOSTISSET($constvalue.'_ID')) {
+ if (!dolibarr_set_const($db, $newconstvalue.'_ID', GETPOST($constvalue.'_ID'), 'chaine', 0, '', $conf->entity)) {
+ $error++;
+ }
}
// If we reset this provider, we also remove the secret
- if (!dolibarr_set_const($db, $constvalue.'_SECRET', GETPOST($constvalue.'_ID') ? GETPOST($constvalue.'_SECRET') : '', 'chaine', 0, '', $conf->entity)) {
- $error++;
+ if (GETPOSTISSET($constvalue.'_SECRET')) {
+ if (!dolibarr_set_const($db, $newconstvalue.'_SECRET', GETPOST($constvalue.'_ID') ? GETPOST($constvalue.'_SECRET') : '', 'chaine', 0, '', $conf->entity)) {
+ $error++;
+ }
}
if (GETPOSTISSET($constvalue.'_URLAUTHORIZE')) {
- if (!dolibarr_set_const($db, $constvalue.'_URLAUTHORIZE', GETPOST($constvalue.'_URLAUTHORIZE'), 'chaine', 0, '', $conf->entity)) {
+ if (!dolibarr_set_const($db, $newconstvalue.'_URLAUTHORIZE', GETPOST($constvalue.'_URLAUTHORIZE'), 'chaine', 0, '', $conf->entity)) {
$error++;
}
}
@@ -90,14 +101,46 @@ if ($action == 'update') {
} else {
$scopestring = GETPOST($constvalue.'_SCOPE');
}
- if (!dolibarr_set_const($db, $constvalue.'_SCOPE', $scopestring, 'chaine', 0, '', $conf->entity)) {
+ if (!dolibarr_set_const($db, $newconstvalue.'_SCOPE', $scopestring, 'chaine', 0, '', $conf->entity)) {
$error++;
}
- } else {
- if (!dolibarr_set_const($db, $constvalue.'_SCOPE', '', 'chaine', 0, '', $conf->entity)) {
+ } elseif ($newconstvalue !== $constvalue) {
+ if (!dolibarr_set_const($db, $newconstvalue.'_SCOPE', '', 'chaine', 0, '', $conf->entity)) {
$error++;
}
}
+
+ // If name changed, we have to delete old const and proceed few other changes
+ if ($constvalue !== $newconstvalue) {
+ dolibarr_del_const($db, $constvalue.'_ID', $conf->entity);
+ dolibarr_del_const($db, $constvalue.'_SECRET', $conf->entity);
+ dolibarr_del_const($db, $constvalue.'_URLAUTHORIZE', $conf->entity);
+ dolibarr_del_const($db, $constvalue.'_SCOPE', $conf->entity);
+
+ // Update name of token
+ $oldname = preg_replace('/^OAUTH_/', '', $constvalue);
+ $oldprovider = ucfirst(strtolower(preg_replace('/-.*$/', '', $oldname)));
+ $oldlabel = preg_replace('/^.*-/', '', $oldname);
+ $newlabel = preg_replace('/^.*-/', '', $newconstvalue);
+
+
+ $sql = "UPDATE ".MAIN_DB_PREFIX."oauth_token";
+ $sql.= " SET service = '".$db->escape($oldprovider."-".$newlabel)."'";
+ $sql.= " WHERE service = '".$db->escape($oldprovider."-".$oldlabel)."'";
+
+
+ $resql = $db->query($sql);
+ if (!$resql) {
+ $error++;
+ }
+
+ // Update const where the token was used, might not be exhaustive
+ if (getDolGlobalString('MAIN_MAIL_SMTPS_OAUTH_SERVICE') == $oldname) {
+ if (!dolibarr_set_const($db, 'MAIN_MAIL_SMTPS_OAUTH_SERVICE', strtoupper($oldprovider).'-'.$newlabel, 'chaine', 0, '', $conf->entity)) {
+ $error++;
+ }
+ }
+ }
}
}
@@ -270,11 +313,16 @@ if (count($listinsetup) > 0) {
} else {
print $label;
}
- if ($keyforprovider) {
+ if ($servicetoeditname == $key[0]) {
+ print ' ('.$keyforprovider.' )';
} else {
print ' ('.$langs->trans("NoName").' )';
}
+ if (!($servicetoeditname == $key[0])) {
+ print ''.img_edit($langs->transnoentitiesnoconv('Edit'), 1).' ';
+ }
print '';
print '';
if (!empty($supportedoauth2array[$keyforsupportedoauth2array]['urlforcredentials'])) {
@@ -285,7 +333,7 @@ if (count($listinsetup) > 0) {
// Delete
print ' ';
$label = preg_replace('/_NAME$/', '', $keyforsupportedoauth2array);
- print '';
+ print ' ';
print img_picto('', 'delete');
print ' ';
@@ -298,7 +346,8 @@ if (count($listinsetup) > 0) {
$redirect_uri = $urlwithroot.'/core/modules/oauth/'.$supportedoauth2array[$keyforsupportedoauth2array]['callbackfile'].'_oauthcallback.php';
print ' ';
print ''.$langs->trans("UseTheFollowingUrlAsRedirectURI").' ';
- print ' ';
@@ -306,7 +355,7 @@ if (count($listinsetup) > 0) {
if ($keyforsupportedoauth2array == 'OAUTH_OTHER_NAME') {
print '
';
print ''.$langs->trans("URLOfServiceForAuthorization").' ';
- print ' ';
diff --git a/htdocs/admin/oauthlogintokens.php b/htdocs/admin/oauthlogintokens.php
index f798995d525..9a0532880cd 100644
--- a/htdocs/admin/oauthlogintokens.php
+++ b/htdocs/admin/oauthlogintokens.php
@@ -213,7 +213,13 @@ if ($mode == 'setup' && $user->admin) {
$urltocheckperms = '';
}
- $urltorenew .= '&keyforprovider='.urlencode($keyforprovider);
+ if ($urltorenew) {
+ $urltorenew .= '&keyforprovider='.urlencode($keyforprovider);
+ }
+ if ($urltodelete) {
+ $urltodelete .= '&keyforprovider='.urlencode($keyforprovider);
+ }
+
// Show value of token
$tokenobj = null;
diff --git a/htdocs/admin/payment.php b/htdocs/admin/payment.php
index 59da712b266..7b0d0acbf06 100644
--- a/htdocs/admin/payment.php
+++ b/htdocs/admin/payment.php
@@ -51,9 +51,9 @@ if (empty($conf->global->PAYMENT_ADDON)) {
*/
if ($action == 'updateMask') {
- $maskconstpayment = GETPOST('maskconstpayment', 'alpha');
+ $maskconstpayment = GETPOST('maskconstpayment', 'aZ09');
$maskpayment = GETPOST('maskpayment', 'alpha');
- if ($maskconstpayment) {
+ if ($maskconstpayment && preg_match('/_MASK$/', $maskconstpayment)) {
$res = dolibarr_set_const($db, $maskconstpayment, $maskpayment, 'chaine', 0, '', $conf->entity);
}
diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php
index ef20ab6e205..42c766d1a22 100644
--- a/htdocs/admin/perms.php
+++ b/htdocs/admin/perms.php
@@ -227,7 +227,7 @@ if ($result) {
// Tick
if ($obj->bydefault == 1) {
print '
';
- print '';
+ print ' ';
//print img_edit_remove();
print img_picto('', 'switch_on');
print ' ';
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index 7883cc7da20..10044e33b5b 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -58,9 +58,9 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
$error = 0;
if ($action == 'updateMask') {
- $maskconstpropal = GETPOST('maskconstpropal', 'alpha');
+ $maskconstpropal = GETPOST('maskconstpropal', 'aZ09');
$maskpropal = GETPOST('maskpropal', 'alpha');
- if ($maskconstpropal) {
+ if ($maskconstpropal && preg_match('/_MASK$/', $maskconstpropal)) {
$res = dolibarr_set_const($db, $maskconstpropal, $maskpropal, 'chaine', 0, '', $conf->entity);
}
diff --git a/htdocs/admin/reception_setup.php b/htdocs/admin/reception_setup.php
index c86db66e464..32f6c5b226e 100644
--- a/htdocs/admin/reception_setup.php
+++ b/htdocs/admin/reception_setup.php
@@ -65,9 +65,9 @@ if (empty($conf->global->RECEPTION_ADDON_NUMBER)) {
include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
if ($action == 'updateMask') {
- $maskconst = GETPOST('maskconstreception', 'alpha');
+ $maskconst = GETPOST('maskconstreception', 'aZ09');
$maskvalue = GETPOST('maskreception', 'alpha');
- if (!empty($maskconst)) {
+ if (!empty($maskconst) && preg_match('/_MASK$/', $maskconst)) {
$res = dolibarr_set_const($db, $maskconst, $maskvalue, 'chaine', 0, '', $conf->entity);
}
diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php
index 33344363cf7..e30e50769bb 100644
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -56,8 +56,8 @@ if ($action == 'activate_encrypt') {
$db->begin();
- // On old version a bug created the constant into user entity, so we delete it to be sure, such entry won't exists. We want it in entity 0 or nowhere.
- dolibarr_del_const($db, "DATABASE_PWD_ENCRYPTED", "1", 'chaine', 0, '', $conf->entity);
+ // On old version, a bug created the constant into user entity, so we delete it to be sure such entry won't exists. We want it in entity 0 or nowhere.
+ dolibarr_del_const($db, "DATABASE_PWD_ENCRYPTED", $conf->entity);
// We set entity=0 (all) because DATABASE_PWD_ENCRYPTED is a setup into conf file, so always shared for everybody
$entityforall = 0;
dolibarr_set_const($db, "DATABASE_PWD_ENCRYPTED", "1", 'chaine', 0, '', $entityforall);
diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index 1d73f5238ad..7a7e49a3129 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -247,7 +247,7 @@ if (isModEnabled('commande')) {
print " \n
\n";
$found++;
-//if (!empty($conf->expedition->enabled))
+//if (isModEnabled('expedition'))
//{
print '';
diff --git a/htdocs/admin/stocktransfer.php b/htdocs/admin/stocktransfer.php
index 3bcd00c1fe8..02c73bb2a76 100644
--- a/htdocs/admin/stocktransfer.php
+++ b/htdocs/admin/stocktransfer.php
@@ -64,10 +64,10 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
if ($action == 'updateMask') {
- $maskconststocktransfer = GETPOST('maskconststocktransfer', 'alpha');
+ $maskconststocktransfer = GETPOST('maskconststocktransfer', 'aZ09');
$maskstocktransfer = GETPOST('maskStockTransfer', 'alpha');
- if ($maskconststocktransfer) {
+ if ($maskconststocktransfer && preg_match('/_MASK$/', $maskconststocktransfer)) {
$res = dolibarr_set_const($db, $maskconststocktransfer, $maskstocktransfer, 'chaine', 0, '', $conf->entity);
if ($res <= 0) $error++;
}
diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index 3524111c96e..bbb97e293fe 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -38,10 +38,6 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
// Load translation files required by the page
$langs->loadLangs(array("admin", "other", "orders"));
-if (!$user->admin) {
- accessforbidden();
-}
-
$type = GETPOST('type', 'alpha');
$value = GETPOST('value', 'alpha');
$action = GETPOST('action', 'aZ09');
@@ -52,26 +48,34 @@ $scandir = GETPOST('scan_dir', 'alpha');
$specimenthirdparty = new Societe($db);
$specimenthirdparty->initAsSpecimen();
+$error = 0;
+
+if (!$user->admin) {
+ accessforbidden();
+}
+
/*
* Actions
*/
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+
if ($action == 'updateMask') {
- $maskconstinvoice = GETPOST('maskconstinvoice', 'alpha');
- $maskconstcredit = GETPOST('maskconstcredit', 'alpha');
- $maskconstdeposit = GETPOST('maskconstdeposit', 'alpha');
+ $maskconstinvoice = GETPOST('maskconstinvoice', 'aZ09');
+ $maskconstcredit = GETPOST('maskconstcredit', 'aZ09');
+ $maskconstdeposit = GETPOST('maskconstdeposit', 'aZ09');
$maskinvoice = GETPOST('maskinvoice', 'alpha');
$maskcredit = GETPOST('maskcredit', 'alpha');
$maskdeposit = GETPOST('maskdeposit', 'alpha');
- if ($maskconstinvoice) {
+ if ($maskconstinvoice && preg_match('/_MASK$/', $maskconstinvoice)) {
$res = dolibarr_set_const($db, $maskconstinvoice, $maskinvoice, 'chaine', 0, '', $conf->entity);
}
- if ($maskconstcredit) {
+ if ($maskconstcredit && preg_match('/_MASK$/', $maskconstcredit)) {
$res = dolibarr_set_const($db, $maskconstcredit, $maskcredit, 'chaine', 0, '', $conf->entity);
}
- if ($maskconstdeposit) {
+ if ($maskconstdeposit && preg_match('/_MASK$/', $maskconstdeposit)) {
$res = dolibarr_set_const($db, $maskconstdeposit, $maskdeposit, 'chaine', 0, '', $conf->entity);
}
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index bb1b94d4385..abee8200cef 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -61,10 +61,10 @@ $specimenthirdparty->initAsSpecimen();
include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
if ($action == 'updateMask') {
- $maskconstorder = GETPOST('maskconstorder', 'alpha');
+ $maskconstorder = GETPOST('maskconstorder', 'aZ09');
$maskvalue = GETPOST('maskorder', 'alpha');
- if ($maskconstorder) {
+ if ($maskconstorder && preg_match('/_MASK$/', $maskconstorder)) {
$res = dolibarr_set_const($db, $maskconstorder, $maskvalue, 'chaine', 0, '', $conf->entity);
}
diff --git a/htdocs/admin/supplier_payment.php b/htdocs/admin/supplier_payment.php
index 86fcccfb8f2..ac00e4846ac 100644
--- a/htdocs/admin/supplier_payment.php
+++ b/htdocs/admin/supplier_payment.php
@@ -52,9 +52,9 @@ $type = 'supplier_payment';
include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
if ($action == 'updateMask') {
- $maskconstsupplierpayment = GETPOST('maskconstsupplierpayment', 'alpha');
+ $maskconstsupplierpayment = GETPOST('maskconstsupplierpayment', 'aZ09');
$masksupplierpayment = GETPOST('masksupplierpayment', 'alpha');
- if ($maskconstsupplierpayment) {
+ if ($maskconstsupplierpayment && preg_match('/_MASK$/', $maskconstsupplierpayment)) {
$res = dolibarr_set_const($db, $maskconstsupplierpayment, $masksupplierpayment, 'chaine', 0, '', $conf->entity);
}
diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php
index 993e19fc796..62be111449d 100644
--- a/htdocs/admin/supplier_proposal.php
+++ b/htdocs/admin/supplier_proposal.php
@@ -55,9 +55,9 @@ $error = 0;
include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
if ($action == 'updateMask') {
- $maskconstsupplier_proposal = GETPOST('maskconstsupplier_proposal', 'alpha');
+ $maskconstsupplier_proposal = GETPOST('maskconstsupplier_proposal', 'aZ09');
$masksupplier_proposal = GETPOST('masksupplier_proposal', 'alpha');
- if ($maskconstsupplier_proposal) {
+ if ($maskconstsupplier_proposal && preg_match('/_MASK$/', $maskconstsupplier_proposal)) {
$res = dolibarr_set_const($db, $maskconstsupplier_proposal, $masksupplier_proposal, 'chaine', 0, '', $conf->entity);
}
diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php
index 71f7fd7f875..cf07dd49539 100644
--- a/htdocs/admin/syslog.php
+++ b/htdocs/admin/syslog.php
@@ -115,9 +115,6 @@ if ($action == 'set') {
// Check configuration
foreach ($activeModules as $modulename) {
- /**
- * @var LogHandler
- */
$module = new $modulename;
$error = $module->checkConfiguration();
}
diff --git a/htdocs/admin/system/database.php b/htdocs/admin/system/database.php
index 8cd1ad3d597..fd983a10924 100644
--- a/htdocs/admin/system/database.php
+++ b/htdocs/admin/system/database.php
@@ -113,7 +113,8 @@ if (!count($listofvars) && !count($listofstatus)) {
if ($key != $param) {
continue;
}
- $val2 = ${$val['var']};
+ $tmpvar = $val['var'];
+ $val2 = ${$tmpvar};
$text = 'Should be in line with value of param '.$val['var'].' thas is '.($val2 ? $val2 : "'' (=".$val['valifempty'].")").' ';
$show = 1;
}
diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index 4a55c1a1160..afe5d4d3520 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -264,7 +264,7 @@ $daylight = round($c - $b);
$val = ($a >= 0 ? '+' : '').$a;
$val .= ' ('.($a == 'unknown' ? 'unknown' : ($a >= 0 ? '+' : '').($a * 3600)).')';
$val .= ' '.getServerTimeZoneString();
-$val .= ' '.$langs->trans("DaylingSavingTime").': '.($daylight === 'unknown' ? 'unknown' : ($a == $c ?yn($daylight) : yn(0).($daylight ? ' ('.$langs->trans('YesInSummer').')' : '')));
+$val .= ' '.$langs->trans("DaylingSavingTime").': '.(is_null($daylight) ? 'unknown' : ($a == $c ?yn($daylight) : yn(0).($daylight ? ' ('.$langs->trans('YesInSummer').')' : '')));
print $form->textwithtooltip($val, $txt, 2, 1, img_info(''));
print ' '."\n"; // value defined in http://fr3.php.net/manual/en/timezones.europe.php
print ' => '.$langs->trans("CurrentHour").' '.dol_print_date(dol_now('gmt'), 'dayhour', 'tzserver').' ';
- print ' ';
}
if ($arrayfields['permission']['checked']) {
diff --git a/htdocs/admin/system/perf.php b/htdocs/admin/system/perf.php
index 6d7ef8f1863..cc9ab7658db 100644
--- a/htdocs/admin/system/perf.php
+++ b/htdocs/admin/system/perf.php
@@ -50,8 +50,13 @@ llxHeader();
print load_fiche_titre($langs->trans("PerfDolibarr"), '', 'title_setup');
-print ''.$langs->trans("YouMayFindPerfAdviceHere", 'https://wiki.dolibarr.org/index.php/FAQ_Increase_Performance').' ('.$langs->trans("Reload").' )'.$langs->trans("YouMayFindPerfAdviceHere", 'https://wiki.dolibarr.org/index.php/FAQ_Increase_Performance').' ';
+print ' ';
+print '';
+print img_picto($langs->trans("Reload"), 'refresh').' ';
+print $langs->trans("Reload");
+print ' ';
+print ''.$langs->trans("YouMayFindSecurityAdviceHere", 'hhttps://wiki.dolibarr.org/index.php/Security_information').' ('.$langs->trans("Reload").' )'.$langs->trans("YouMayFindSecurityAdviceHere", 'hhttps://wiki.dolibarr.org/index.php/Security_information').' ';
+print ' ';
+print '';
+print img_picto($langs->trans("Reload"), 'refresh').' ';
+print $langs->trans("Reload");
+print ' ';
+print 'API_ENDPOINT_RULES = '.(empty($conf->global->API_ENDPOINT_RULES) ? ''.$langs->trans("Undefined").' ('.$langs->trans("Example").': login:0,users:0,setup:1,status:1,tickets:1,...) ' : $conf->global->API_ENDPOINT_RULES)."API_ENDPOINT_RULES = '.getDolGlobalString('API_ENDPOINT_RULES', ''.$langs->trans("Undefined").' ('.$langs->trans("Example").': login:0,users:0,setup:1,status:1,tickets:1,...) ')."MAIN_ALLOW_SVG_FILES_AS_IMAGES = '.(empty($conf->global->MAIN_ALLOW_SVG_FILES_AS_IMAGES) ? '0' : $conf->global->MAIN_ALLOW_SVG_FILES_AS_IMAGES).' ('.$langs->trans("Recommended").': 0) MAIN_ALLOW_SVG_FILES_AS_IMAGES = '.getDolGlobalString('MAIN_ALLOW_SVG_FILES_AS_IMAGES', '0').' ('.$langs->trans("Recommended").': 0) MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE = '.(empty($conf->global->MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE) ? ''.$langs->trans("Undefined").' ' : $conf->global->MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE).' ('.$langs->trans("Recommended").': 1) MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE = '.getDolGlobalString('MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE', ''.$langs->trans("Undefined").' ').' ('.$langs->trans("Recommended").': 1) '.$langs->trans("PasswordEncryption").' : ';
-print 'MAIN_SECURITY_HASH_ALGO = '.(empty($conf->global->MAIN_SECURITY_HASH_ALGO) ? ''.$langs->trans("Undefined").' ' : $conf->global->MAIN_SECURITY_HASH_ALGO)." ";
+print 'MAIN_SECURITY_HASH_ALGO = '.getDolGlobalString('MAIN_SECURITY_HASH_ALGO', ''.$langs->trans("Undefined").' ')." ";
if (empty($conf->global->MAIN_SECURITY_HASH_ALGO)) {
print ' If unset: \'md5\' ';
}
if ($conf->global->MAIN_SECURITY_HASH_ALGO != 'password_hash') {
- print 'MAIN_SECURITY_SALT = '.(empty($conf->global->MAIN_SECURITY_SALT) ? ''.$langs->trans("Undefined").' ' : $conf->global->MAIN_SECURITY_SALT).'MAIN_SECURITY_SALT = '.getDolGlobalString('MAIN_SECURITY_SALT', ''.$langs->trans("Undefined").' ').'('.$langs->trans("Recommended").': password_hash) ';
print 'MAIN_SECURITY_ANTI_SSRF_SERVER_IP = '.(empty($conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP) ? ''.$langs->trans("Undefined").' ('.$langs->trans("Recommended").': List of static IPs of server separated with coma - '.$langs->trans("Note").': common loopback ip like 127.*.*.*, [::1] are already added) ' : $conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP)."MAIN_SECURITY_ANTI_SSRF_SERVER_IP = '.getDolGlobalString('MAIN_SECURITY_ANTI_SSRF_SERVER_IP', ''.$langs->trans("Undefined").' ('.$langs->trans("Recommended").': List of static IPs of server separated with coma - '.$langs->trans("Note").': common loopback ip like 127.*.*.*, [::1] are already added) ')."MAIN_SECURITY_CSRF_WITH_TOKEN = '.(empty($conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN) ? ''.$langs->trans("Undefined").' ' : $conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN).' ('.$langs->trans("Recommended").': '.$langs->trans("Undefined").' '.$langs->trans("or").' 2) '."MAIN_SECURITY_CSRF_WITH_TOKEN = '.getDolGlobalString('MAIN_SECURITY_CSRF_WITH_TOKEN', ''.$langs->trans("Undefined").' ').' ('.$langs->trans("Recommended").': '.$langs->trans("Undefined").' '.$langs->trans("or").' 2) '."MAIN_RESTRICTHTML_ONLY_VALID_HTML = '.(empty($conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML) ? ''.$langs->trans("Undefined").' ('.$langs->trans("Recommended").': 1) ' : $conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML)."MAIN_RESTRICTHTML_ONLY_VALID_HTML = '.getDolGlobalString('MAIN_RESTRICTHTML_ONLY_VALID_HTML', ''.$langs->trans("Undefined").' ('.$langs->trans("Recommended").': 1) ')."MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES = '.(empty($conf->global->MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES) ? ''.$langs->trans("Undefined").' ('.$langs->trans("Recommended").': 1) ' : $conf->global->MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES)."MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES = '.getDolGlobalString('MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES', ''.$langs->trans("Undefined").' ('.$langs->trans("Recommended").': 1) ')."MAIN_SECURITY_CSRF_TOKEN_RENEWAL_ON_EACH_CALL = '.(empty($conf->global->MAIN_SECURITY_CSRF_TOKEN_RENEWAL_ON_EACH_CALL) ? ''.$langs->trans("Undefined").' ('.$langs->trans("Recommended").': '.$langs->trans("Undefined").' '.$langs->trans("or").' 0) ' : $conf->global->MAIN_SECURITY_CSRF_TOKEN_RENEWAL_ON_EACH_CALL)."MAIN_SECURITY_CSRF_TOKEN_RENEWAL_ON_EACH_CALL = '.getDolGlobalString('MAIN_SECURITY_CSRF_TOKEN_RENEWAL_ON_EACH_CALL', ''.$langs->trans("Undefined").' ('.$langs->trans("Recommended").': '.$langs->trans("Undefined").' '.$langs->trans("or").' 0) ')."MAIN_SECURITY_FORCECSP = '.(empty($conf->global->MAIN_SECURITY_FORCECSP) ? ''.$langs->trans("Undefined").' ' : $conf->global->MAIN_SECURITY_FORCECSP).' ('.$langs->trans("Example").": \"frame-ancestors 'self'; default-src 'self'; img-src *;\") MAIN_SECURITY_FORCECSP = '.getDolGlobalString('MAIN_SECURITY_FORCECSP', ''.$langs->trans("Undefined").' ').' ('.$langs->trans("Example").": \"frame-ancestors 'self'; default-src 'self'; img-src *;\") MAIN_SECURITY_FORCERP = '.(empty($conf->global->MAIN_SECURITY_FORCERP) ? ''.$langs->trans("Undefined").' ' : $conf->global->MAIN_SECURITY_FORCERP).' ('.$langs->trans("Recommended").': '.$langs->trans("Undefined").' '.$langs->trans("or")." \"same-origin\" so browser doesn't send any referrer when going into another web site domain) MAIN_SECURITY_FORCERP = '.getDolGlobalString('MAIN_SECURITY_FORCERP', ''.$langs->trans("Undefined").' ').' ('.$langs->trans("Recommended").': '.$langs->trans("Undefined").' '.$langs->trans("or")." \"same-origin\" so browser doesn't send any referrer when going into another web site domain) WEBSITE_MAIN_SECURITY_FORCECSP = '.(empty($conf->global->WEBSITE_MAIN_SECURITY_FORCECSP) ? ''.$langs->trans("Undefined").' ' : $conf->global->WEBSITE_MAIN_SECURITY_FORCECSP).' ('.$langs->trans("Example").": \"frame-ancestors 'self'; default-src 'self'; style-src https://cdnjs.cloudflare.com https://fonts.googleapis.com; script-src https://cdn.transifex.com https://www.googletagmanager.com; object-src https://youtube.com; frame-src https://youtube.com; img-src *;\") WEBSITE_MAIN_SECURITY_FORCECSP = '.getDolGlobalString('WEBSITE_MAIN_SECURITY_FORCECSP', ''.$langs->trans("Undefined").' ');
+print ' ('.$langs->trans("Example").": \"frame-ancestors 'self'; default-src 'self'; style-src https://cdnjs.cloudflare.com https://fonts.googleapis.com; script-src https://cdn.transifex.com https://www.googletagmanager.com; object-src https://youtube.com; frame-src https://youtube.com; img-src *;\") WEBSITE_MAIN_SECURITY_FORCERP = '.(empty($conf->global->WEBSITE_MAIN_SECURITY_FORCERP) ? ''.$langs->trans("Undefined").' ' : $conf->global->WEBSITE_MAIN_SECURITY_FORCERP).' ('.$langs->trans("Recommended").': '.$langs->trans("Undefined").' '.$langs->trans("or")." \"strict-origin-when-cross-origin\") WEBSITE_MAIN_SECURITY_FORCERP = '.getDolGlobalString('WEBSITE_MAIN_SECURITY_FORCERP', ''.$langs->trans("Undefined").' ').' ('.$langs->trans("Recommended").': '.$langs->trans("Undefined").' '.$langs->trans("or")." \"strict-origin-when-cross-origin\") WEBSITE_MAIN_SECURITY_FORCESTS = '.(empty($conf->global->WEBSITE_MAIN_SECURITY_FORCESTS) ? ''.$langs->trans("Undefined").' ' : $conf->global->WEBSITE_MAIN_SECURITY_FORCESTS).' ('.$langs->trans("Example").": \"max-age=31536000; includeSubDomains\") WEBSITE_MAIN_SECURITY_FORCESTS = '.getDolGlobalString('>WEBSITE_MAIN_SECURITY_FORCESTS', ''.$langs->trans("Undefined").' ').' ('.$langs->trans("Example").": \"max-age=31536000; includeSubDomains\") WEBSITE_MAIN_SECURITY_FORCEPP = '.(empty($conf->global->WEBSITE_MAIN_SECURITY_FORCEPP) ? ''.$langs->trans("Undefined").' ' : $conf->global->WEBSITE_MAIN_SECURITY_FORCEPP).' ('.$langs->trans("Example").": \"camera: 'none'; microphone: 'none';\") WEBSITE_MAIN_SECURITY_FORCEPP = '.getDolGlobalString('WEBSITE_MAIN_SECURITY_FORCEPP', ''.$langs->trans("Undefined").' ').' ('.$langs->trans("Example").": \"camera: 'none'; microphone: 'none';\") fail2ban example on GitHub )fail2ban example on GitHub )fail2ban example on GitHub )fail2ban example on GitHub )apache2 virtualhost example on GitHub )';
if ($module->type == 'pdf') {
- print ''.img_object($langs->trans("Preview"), 'pdf').' ';
+ print ''.img_object($langs->trans("Preview"), 'pdf').' ';
} else {
print img_object($langs->trans("PreviewNotAvailable"), 'generic');
}
@@ -526,7 +526,7 @@ if ($conf->use_javascript_ajax) {
print ajax_constantonoff('TICKET_AUTO_READ_WHEN_CREATED_FROM_BACKEND');
} else {
$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
- print $formcategory->selectarray("TICKET_AUTO_READ_WHEN_CREATED_FROM_BACKEND", $arrval, $conf->global->TICKET_AUTO_READ_WHEN_CREATED_FROM_BACKEND);
+ print $formcategory->selectarray("TICKET_AUTO_READ_WHEN_CREATED_FROM_BACKEND", $arrval, getDolGlobalString('TICKET_AUTO_READ_WHEN_CREATED_FROM_BACKEND'));
}
print ' ';
print '';
@@ -542,7 +542,7 @@ if ($conf->use_javascript_ajax) {
print ajax_constantonoff('TICKET_AUTO_ASSIGN_USER_CREATE');
} else {
$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
- print $formcategory->selectarray("TICKET_AUTO_ASSIGN_USER_CREATE", $arrval, $conf->global->TICKET_AUTO_ASSIGN_USER_CREATE);
+ print $formcategory->selectarray("TICKET_AUTO_ASSIGN_USER_CREATE", $arrval, getDolGlobalString('TICKET_AUTO_ASSIGN_USER_CREATE'));
}
print ' ';
print '';
@@ -557,7 +557,7 @@ if ($conf->use_javascript_ajax) {
print ajax_constantonoff('TICKET_NOTIFY_AT_CLOSING');
} else {
$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
- print $formcategory->selectarray("TICKET_NOTIFY_AT_CLOSING", $arrval, $conf->global->TICKET_NOTIFY_AT_CLOSING);
+ print $formcategory->selectarray("TICKET_NOTIFY_AT_CLOSING", $arrval, getDolGlobalString('TICKET_NOTIFY_AT_CLOSING'));
}
print ' ';
print '';
@@ -569,7 +569,7 @@ if (isModEnabled('product')) {
$htmlname = "product_category_id";
print ' '.$langs->trans("TicketChooseProductCategory").' ';
print '';
- $formcategory->selectProductCategory($conf->global->TICKET_PRODUCT_CATEGORY, $htmlname);
+ $formcategory->selectProductCategory(getDolGlobalString('TICKET_PRODUCT_CATEGORY'), $htmlname);
if ($conf->use_javascript_ajax) {
print ajax_combobox('select_'.$htmlname);
}
@@ -583,7 +583,7 @@ if (isModEnabled('product')) {
print ' ';
print ''.$langs->trans("TicketsDelayBeforeFirstAnswer")." ";
print '
- ';
print '';
print $formcategory->textwithpicto('', $langs->trans("TicketsDelayBeforeFirstAnswerHelp"), 1, 'help');
@@ -593,7 +593,7 @@ print ' ';
print '';
print ''.$langs->trans("TicketsDelayBetweenAnswers")." ";
print '
- ';
print '';
print $formcategory->textwithpicto('', $langs->trans("TicketsDelayBetweenAnswersHelp"), 1, 'help');
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index abb5ebfd6ba..fcbc01abef1 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -427,7 +427,7 @@ if ($mode == 'overwrite') {
print ' ';
print ''.img_edit().' ';
+ print ''.img_edit().' ';
print ' ';
print ''.img_delete().' ';
}
diff --git a/htdocs/admin/webhook.php b/htdocs/admin/webhook.php
index b589eac4079..91d3358a92d 100644
--- a/htdocs/admin/webhook.php
+++ b/htdocs/admin/webhook.php
@@ -150,10 +150,10 @@ $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
if ($action == 'updateMask') {
- $maskconst = GETPOST('maskconst', 'alpha');
+ $maskconst = GETPOST('maskconst', 'aZ09');
$maskvalue = GETPOST('maskvalue', 'alpha');
- if ($maskconst) {
+ if ($maskconst && preg_match('/_MASK$/', $maskconst)) {
$res = dolibarr_set_const($db, $maskconst, $maskvalue, 'chaine', 0, '', $conf->entity);
if (!($res > 0)) {
$error++;
@@ -293,14 +293,14 @@ if ($action == 'edit') {
if ($val['type'] == 'textarea') {
print '\n";
} elseif ($val['type']== 'html') {
require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
- $doleditor = new DolEditor($constname, $conf->global->{$constname}, '', 160, 'dolibarr_notes', '', false, false, $conf->fckeditor->enabled, ROWS_5, '90%');
+ $doleditor = new DolEditor($constname, getDolGlobalString($constname), '', 160, 'dolibarr_notes', '', false, false, $conf->fckeditor->enabled, ROWS_5, '90%');
$doleditor->Create();
} elseif ($val['type'] == 'yesno') {
- print $form->selectyesno($constname, $conf->global->{$constname}, 1);
+ print $form->selectyesno($constname, getDolGlobalString($constname), 1);
} elseif (preg_match('/emailtemplate:/', $val['type'])) {
include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
$formmail = new FormMail($db);
@@ -382,9 +382,9 @@ if ($action == 'edit') {
print ' ';
if ($val['type'] == 'textarea') {
- print dol_nl2br($conf->global->{$constname});
+ print dol_nl2br(getDolGlobalString($constname));
} elseif ($val['type']== 'html') {
- print $conf->global->{$constname};
+ print getDolGlobalString($constname);
} elseif ($val['type'] == 'yesno') {
print ajax_constantonoff($constname);
} elseif (preg_match('/emailtemplate:/', $val['type'])) {
@@ -393,14 +393,14 @@ if ($action == 'edit') {
$tmp = explode(':', $val['type']);
- $template = $formmail->getEMailTemplate($db, $tmp[1], $user, $langs, $conf->global->{$constname});
+ $template = $formmail->getEMailTemplate($db, $tmp[1], $user, $langs, getDolGlobalString($constname));
if ($template<0) {
setEventMessages(null, $formmail->errors, 'errors');
}
print $langs->trans($template->label);
} elseif (preg_match('/category:/', $val['type'])) {
$c = new Categorie($db);
- $result = $c->fetch($conf->global->{$constname});
+ $result = $c->fetch(getDolGlobalString($constname));
if ($result < 0) {
setEventMessages(null, $c->errors, 'errors');
} elseif ($result > 0 ) {
@@ -412,25 +412,25 @@ if ($action == 'edit') {
print '' . implode(' ', $toprint) . ' ';
}
diff --git a/htdocs/admin/website.php b/htdocs/admin/website.php
index 3c348d71a12..d8fb57b49f5 100644
--- a/htdocs/admin/website.php
+++ b/htdocs/admin/website.php
@@ -84,7 +84,7 @@ $tablib[1] = "Websites";
// Requests to extract data
$tabsql = array();
-$tabsql[1] = "SELECT f.rowid as rowid, f.entity, f.ref, f.description, f.virtualhost, f.position, f.status, f.date_creation FROM ".MAIN_DB_PREFIX.'website as f WHERE f.entity IN ('.getEntity('website').')';
+$tabsql[1] = "SELECT f.rowid as rowid, f.entity, f.ref, f.description, f.virtualhost, f.position, f.status, f.date_creation, f.lastaccess, f.pageviews_previous_month, f.pageviews_total FROM ".MAIN_DB_PREFIX.'website as f WHERE f.entity IN ('.getEntity('website').')';
// Criteria to sort dictionaries
$tabsqlsort = array();
@@ -92,7 +92,7 @@ $tabsqlsort[1] = "ref ASC";
// Nom des champs en resultat de select pour affichage du dictionnaire
$tabfield = array();
-$tabfield[1] = "ref,description,virtualhost,position,date_creation";
+$tabfield[1] = "ref,description,virtualhost,position,date_creation,lastaccess,pageviews_previous_month,pageviews_total";
// Nom des champs d'edition pour modification d'un enregistrement
$tabfieldvalue = array();
@@ -186,7 +186,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
$sql .= $tabrowid[$id].",";
}
$sql .= $tabfieldinsert[$id];
- $sql .= ",status)";
+ $sql .= ", status, date_creation)";
$sql .= " VALUES(";
// List of values
@@ -211,7 +211,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
}
$i++;
}
- $sql .= ",1)";
+ $sql .= ", 1, '".$db->idate(dol_now())."')";
dol_syslog("actionadd", LOG_DEBUG);
$result = $db->query($sql);
@@ -441,12 +441,10 @@ if ($id) {
// Form to add a new line
if ($tabname[$id]) {
- $fieldlist = explode(',', $tabfield[$id]);
-
// Line for title
print '';
foreach ($fieldlist as $field => $value) {
- if ($fieldlist[$field] == 'date_creation') {
+ if (in_array($fieldlist[$field], array('date_creation', 'lastaccess', 'pageviews_previous_month', 'pageviews_month', 'pageviews_total'))) {
continue;
}
@@ -522,6 +520,7 @@ if ($id) {
print '';
print '
';
// Title of lines
@@ -533,6 +532,10 @@ if ($id) {
$align = "left";
$sortable = 1;
$valuetoshow = '';
+ if (in_array($fieldlist[$field], array('pageviews_total', 'pageviews_previous_month'))) {
+ $align = 'right';
+ }
+
/*
$tmparray=getLabelOfField($fieldlist[$field]);
$showfield=$tmp['showfield'];
@@ -554,14 +557,24 @@ if ($id) {
if ($fieldlist[$field] == 'date_creation') {
$valuetoshow = $langs->trans("DateCreation");
}
+ if ($fieldlist[$field] == 'lastaccess') {
+ $valuetoshow = $langs->trans("LastAccess");
+ }
+ if ($fieldlist[$field] == 'pageviews_previous_month') {
+ $valuetoshow = $langs->trans("PagesViewedPreviousMonth");
+ }
+ if ($fieldlist[$field] == 'pageviews_total') {
+ $valuetoshow = $langs->trans("PagesViewedTotal");
+ }
// Affiche nom du champ
if ($showfield) {
- print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable ? $fieldlist[$field] : ''), ($page ? 'page='.$page.'&' : ''), "", "align=".$align, $sortfield, $sortorder);
+ print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable ? $fieldlist[$field] : ''), ($page ? 'page='.$page.'&' : ''), "", '', $sortfield, $sortorder, $align.' ');
}
}
- print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "status", ($page ? 'page='.$page.'&' : ''), "", 'align="center"', $sortfield, $sortorder);
+ // Status
+ print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "status", ($page ? 'page='.$page.'&' : ''), "", '', $sortfield, $sortorder, 'center ');
print getTitleFieldOfList('');
print getTitleFieldOfList('');
print '';
@@ -581,8 +594,9 @@ if ($id) {
fieldListWebsites($fieldlist, $obj, $tabname[$id], 'edit');
}
- print ' ';
+ print ''.$valuetoshow.' ';
+ print ''.$valuetoshow.' ';
}
}
}
@@ -612,9 +629,10 @@ if ($id) {
$url = $_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(!empty($obj->rowid) ? $obj->rowid : (!empty($obj->code) ? $obj->code : '')).'&code='.(!empty($obj->code) ?urlencode($obj->code) : '').'&';
+
// Active
print '';
- print ''.$actl[($obj->status ? 1 : 0)].' ';
+ print ''.$actl[($obj->status ? 1 : 0)].' ';
print " ";
// Modify link
@@ -633,6 +651,7 @@ if ($id) {
}
print '
';
+ print '
';
print ''.$langs->trans("ApiProductionMode").' ';
$production_mode = (empty($conf->global->API_PRODUCTION_MODE) ?false:true);
if ($production_mode) {
- print '';
+ print ' ';
print img_picto($langs->trans("Activated"), 'switch_on');
print ' ';
+ print ' ';
print img_picto($langs->trans("Disabled"), 'switch_off');
print ' ';
print ''.$langs->trans("API_DISABLE_COMPRESSION").' ';
$disable_compression = (empty($conf->global->API_DISABLE_COMPRESSION) ?false:true);
if ($disable_compression) {
- print '';
+ print ' ';
print img_picto($langs->trans("Activated"), 'switch_on');
print ' ';
+ print ' ';
print img_picto($langs->trans("Disabled"), 'switch_off');
print '
+ * Copyright (C) 2023 Ferran Marcet
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -142,12 +143,38 @@ class DolibarrApiAccess implements iAuthenticate
if (!$login) {
throw new RestException(503, 'Error when searching login user from api key');
}
+
+
+ $genericmessageerroruser = 'Error user not valid (not found or bad status or bad validity dates) (conf->entity='.$conf->entity.')';
+
$fuser = new User($this->db);
$result = $fuser->fetch('', $login, '', 0, (empty($userentity) ? -1 : $conf->entity)); // If user is not entity 0, we search in working entity $conf->entity (that may have been forced to a different value than user entity)
if ($result <= 0) {
- throw new RestException(503, 'Error when fetching user :'.$fuser->error.' (conf->entity='.$conf->entity.')');
+ throw new RestException(503, $genericmessageerroruser);
}
+ // Check if user status is enabled
+ if ($fuser->statut != $fuser::STATUS_ENABLED) {
+ // Status is disabled
+ dol_syslog("The user has been disabled");
+ throw new RestException(503, $genericmessageerroruser);
+ }
+
+ // Check if session was unvalidated by a password change
+ if (($fuser->flagdelsessionsbefore && !empty($_SESSION["dol_logindate"]) && $fuser->flagdelsessionsbefore > $_SESSION["dol_logindate"])) {
+ // Session is no more valid
+ dol_syslog("The user has a date for session invalidation = ".$fuser->flagdelsessionsbefore." and a session date = ".$_SESSION["dol_logindate"].". We must invalidate its sessions.");
+ throw new RestException(503, $genericmessageerroruser);
+ }
+
+ // Check date validity
+ if ($fuser->isNotIntoValidityDateRange()) {
+ // User validity dates are no more valid
+ dol_syslog("The user login has a validity between [".$fuser->datestartvalidity." and ".$fuser->dateendvalidity."], curren date is ".dol_now());
+ throw new RestException(503, $genericmessageerroruser);
+ }
+
+ // User seems valid
$fuser->getrights();
// Set the property $user to the $user of API
diff --git a/htdocs/api/class/api_login.class.php b/htdocs/api/class/api_login.class.php
index d5362f4ac56..0b8d3e64828 100644
--- a/htdocs/api/class/api_login.class.php
+++ b/htdocs/api/class/api_login.class.php
@@ -121,6 +121,9 @@ class Login
include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
$login = checkLoginPassEntity($login, $password, $entity, $authmode, 'api'); // Check credentials.
+ if ($login === '--bad-login-validity--') {
+ $login = '';
+ }
if (empty($login)) {
throw new RestException(403, 'Access denied');
}
diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index 9dcd168f344..17649370ae0 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -319,8 +319,8 @@ class Setup extends DolibarrApi
/**
* Get state by ID.
*
- * @param int $id ID of state
- * @return array Array of cleaned object properties
+ * @param int $id ID of state
+ * @return Object Object with cleaned properties
*
* @url GET dictionary/states/{id}
*
@@ -334,8 +334,8 @@ class Setup extends DolibarrApi
/**
* Get state by Code.
*
- * @param string $code Code of state
- * @return array Array of cleaned object properties
+ * @param string $code Code of state
+ * @return Object Object with cleaned properties
*
* @url GET dictionary/states/byCode/{code}
*
@@ -424,10 +424,9 @@ class Setup extends DolibarrApi
/**
* Get country by ID.
*
- * @param int $id ID of country
- * @param string $lang Code of the language the name of the
- * country must be translated to
- * @return array Array of cleaned object properties
+ * @param int $id ID of country
+ * @param string $lang Code of the language the name of the country must be translated to
+ * @return Object Object with cleaned properties
*
* @url GET dictionary/countries/{id}
*
@@ -441,10 +440,9 @@ class Setup extends DolibarrApi
/**
* Get country by Code.
*
- * @param string $code Code of country (2 characters)
- * @param string $lang Code of the language the name of the
- * country must be translated to
- * @return array Array of cleaned object properties
+ * @param string $code Code of country (2 characters)
+ * @param string $lang Code of the language the name of the country must be translated to
+ * @return Object Object with cleaned properties
*
* @url GET dictionary/countries/byCode/{code}
*
@@ -458,10 +456,9 @@ class Setup extends DolibarrApi
/**
* Get country by Iso.
*
- * @param string $iso ISO of country (3 characters)
- * @param string $lang Code of the language the name of the
- * country must be translated to
- * @return array Array of cleaned object properties
+ * @param string $iso ISO of country (3 characters)
+ * @param string $lang Code of the language the name of the country must be translated to
+ * @return Object Object with cleaned properties
*
* @url GET dictionary/countries/byISO/{iso}
*
@@ -475,9 +472,9 @@ class Setup extends DolibarrApi
/**
* Get state.
*
- * @param int $id ID of state
- * @param string $code Code of state
- * @return array Array of cleaned object properties
+ * @param int $id ID of state
+ * @param string $code Code of state
+ * @return Object Object with cleaned properties
*
* @throws RestException
*/
@@ -498,12 +495,11 @@ class Setup extends DolibarrApi
/**
* Get country.
*
- * @param int $id ID of country
- * @param string $code Code of country (2 characters)
- * @param string $iso ISO of country (3 characters)
- * @param string $lang Code of the language the name of the
- * country must be translated to
- * @return array Array of cleaned object properties
+ * @param int $id ID of country
+ * @param string $code Code of country (2 characters)
+ * @param string $iso ISO of country (3 characters)
+ * @param string $lang Code of the language the name of the country must be translated to
+ * @return Object Object with cleaned properties
*
* @throws RestException
*/
@@ -527,12 +523,12 @@ class Setup extends DolibarrApi
/**
* Get the list of delivery times.
*
- * @param string $sortfield Sort field
- * @param string $sortorder Sort order
- * @param int $limit Number of items per page
- * @param int $page Page number {@min 0}
- * @param int $active Delivery times is active or not {@min 0} {@max 1}
- * @param string $sqlfilters SQL criteria to filter with.
+ * @param string $sortfield Sort field
+ * @param string $sortorder Sort order
+ * @param int $limit Number of items per page
+ * @param int $page Page number {@min 0}
+ * @param int $active Delivery times is active or not {@min 0} {@max 1}
+ * @param string $sqlfilters SQL criteria to filter with.
*
* @url GET dictionary/availability
*
@@ -592,8 +588,8 @@ class Setup extends DolibarrApi
/**
* Clean sensible object datas
*
- * @param Object $object Object to clean
- * @return Object Object with cleaned properties
+ * @param Object $object Object to clean
+ * @return Object Object with cleaned properties
*/
protected function _cleanObjectDatas($object)
{
@@ -1686,6 +1682,68 @@ class Setup extends DolibarrApi
return $list;
}
+ /**
+ * Get the list of incoterms.
+ *
+ * @param string $sortfield Sort field
+ * @param string $sortorder Sort order
+ * @param int $limit Number of items per page
+ * @param int $page Page number (starting from zero)
+ * @param int $active Payment term is active or not {@min 0} {@max 1}
+ * @param string $lang Code of the language the label of the type must be translated to
+ * @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+ * @return array List of incoterm types
+ *
+ * @url GET dictionary/incoterms
+ *
+ * @throws RestException
+ */
+ public function getListOfIncoterms($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $lang = '', $sqlfilters = '')
+ {
+ $list = array();
+
+ $sql = "SELECT rowid, code, active";
+ $sql .= " FROM ".MAIN_DB_PREFIX."c_incoterms as t";
+ $sql .= " WHERE 1=1";
+
+ // Add sql filters
+ if ($sqlfilters) {
+ $errormessage = '';
+ if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
+ throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
+ }
+ $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
+ $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+ }
+
+
+ $sql .= $this->db->order($sortfield, $sortorder);
+
+ if ($limit) {
+ if ($page < 0) {
+ $page = 0;
+ }
+ $offset = $limit * $page;
+
+ $sql .= $this->db->plimit($limit, $offset);
+ }
+
+ $result = $this->db->query($sql);
+
+ if ($result) {
+ $num = $this->db->num_rows($result);
+ $min = min($num, ($limit <= 0 ? $num : $limit));
+ for ($i = 0; $i < $min; $i++) {
+ $type =$this->db->fetch_object($result);
+ $list[] = $type;
+ }
+ } else {
+ throw new RestException(503, 'Error when retrieving list of incoterm types : '.$this->db->lasterror());
+ }
+
+ return $list;
+ }
+
/**
* Get properties of company
*
@@ -1704,11 +1762,6 @@ class Setup extends DolibarrApi
throw new RestException(403, 'Error API open to admin users only or to the users with logins defined into constant API_LOGINS_ALLOWED_FOR_GET_COMPANY');
}
- unset($mysoc->skype);
- unset($mysoc->twitter);
- unset($mysoc->facebook);
- unset($mysoc->linkedin);
-
unset($mysoc->pays);
unset($mysoc->note);
unset($mysoc->nom);
@@ -1786,8 +1839,8 @@ class Setup extends DolibarrApi
/**
* Get establishment by ID.
*
- * @param int $id ID of establishment
- * @return array Array of cleaned object properties
+ * @param int $id ID of establishment
+ * @return Object Object with cleaned properties
*
* @url GET establishments/{id}
*
@@ -1813,7 +1866,7 @@ class Setup extends DolibarrApi
* Note that conf variables that stores security key or password hashes can't be loaded with API.
*
* @param string $constantname Name of conf variable to get
- * @return array|mixed Data without useless information
+ * @return string Data without useless information
*
* @url GET conf/{constantname}
*
@@ -1825,7 +1878,7 @@ class Setup extends DolibarrApi
global $conf;
if (!DolibarrApiAccess::$user->admin
- && (empty($conf->global->API_LOGINS_ALLOWED_FOR_CONST_READ) || DolibarrApiAccess::$user->login != $conf->global->API_LOGINS_ALLOWED_FOR_CONST_READ)) {
+ && (!getDolGlobalString('API_LOGINS_ALLOWED_FOR_CONST_READ') || DolibarrApiAccess::$user->login != getDolGlobalString('API_LOGINS_ALLOWED_FOR_CONST_READ'))) {
throw new RestException(403, 'Error API open to admin users only or to the users with logins defined into constant API_LOGINS_ALLOWED_FOR_CONST_READ');
}
@@ -1836,7 +1889,7 @@ class Setup extends DolibarrApi
throw new RestException(403, 'Forbidden. This parameter cant be read with APIs');
}
- return $conf->global->$constantname;
+ return getDolGlobalString($constantname);
}
/**
diff --git a/htdocs/api/index.php b/htdocs/api/index.php
index 085dd338e69..4e4da2c94cc 100644
--- a/htdocs/api/index.php
+++ b/htdocs/api/index.php
@@ -389,13 +389,13 @@ if (!empty($reg[1]) && ($reg[1] != 'explorer' || ($reg[2] != '/swagger.json' &&
$usecompression = (empty($conf->global->API_DISABLE_COMPRESSION) && !empty($_SERVER['HTTP_ACCEPT_ENCODING']));
$foundonealgorithm = 0;
if ($usecompression) {
- if (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'br') !== false && is_callable('brotli_compress')) {
+ if (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'br') !== false && function_exists('brotli_compress')) {
$foundonealgorithm++;
}
- if (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'bz') !== false && is_callable('bzcompress')) {
+ if (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'bz') !== false && function_exists('bzcompress')) {
$foundonealgorithm++;
}
- if (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== false && is_callable('gzencode')) {
+ if (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== false && function_exists('gzencode')) {
$foundonealgorithm++;
}
if (!$foundonealgorithm) {
@@ -413,13 +413,13 @@ $result = $api->r->handle();
if (Luracast\Restler\Defaults::$returnResponse) {
// We try to compress the data received data
- if (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'br') !== false && is_callable('brotli_compress')) {
+ if (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'br') !== false && function_exists('brotli_compress') && defined('BROTLI_TEXT')) {
header('Content-Encoding: br');
- $result = brotli_compress($result, 11, BROTLI_TEXT);
- } elseif (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'bz') !== false && is_callable('bzcompress')) {
+ $result = brotli_compress($result, 11, constant('BROTLI_TEXT'));
+ } elseif (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'bz') !== false && function_exists('bzcompress')) {
header('Content-Encoding: bz');
$result = bzcompress($result, 9);
- } elseif (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== false && is_callable('gzencode')) {
+ } elseif (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== false && function_exists('gzencode')) {
header('Content-Encoding: gzip');
$result = gzencode($result, 9);
} else {
diff --git a/htdocs/asset/admin/setup.php b/htdocs/asset/admin/setup.php
index 67448b0e304..1b107746319 100644
--- a/htdocs/asset/admin/setup.php
+++ b/htdocs/asset/admin/setup.php
@@ -68,16 +68,14 @@ $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
* Actions
*/
-if ((float) DOL_VERSION >= 6) {
- include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
-}
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
if ($action == 'updateMask') {
- $maskconstorder = GETPOST('maskconstorder', 'alpha');
- $maskorder = GETPOST('maskorder', 'alpha');
+ $maskconst = GETPOST('maskconst', 'alpha');
+ $mask = GETPOST('mask', 'alpha');
- if ($maskconstorder) {
- $res = dolibarr_set_const($db, $maskconstorder, $maskorder, 'chaine', 0, '', $conf->entity);
+ if ($maskconst && preg_match('/_MASK$/', $maskconst)) {
+ $res = dolibarr_set_const($db, $maskconst, $mask, 'chaine', 0, '', $conf->entity);
if (!($res > 0)) {
$error++;
}
@@ -206,7 +204,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
}
if ($myTmpObjectArray['includerefgeneration']) {
/*
- * Orders Numbering model
+ * Assets Numbering model
*/
$setupnotempty++;
@@ -475,14 +473,14 @@ if ($action == 'edit') {
if ($val['type'] == 'textarea') {
print '\n";
} elseif ($val['type']== 'html') {
require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
- $doleditor = new DolEditor($constname, $conf->global->{$constname}, '', 160, 'dolibarr_notes', '', false, false, $conf->fckeditor->enabled, ROWS_5, '90%');
+ $doleditor = new DolEditor($constname, getDolGlobalString($constname), '', 160, 'dolibarr_notes', '', false, false, $conf->fckeditor->enabled, ROWS_5, '90%');
$doleditor->Create();
} elseif ($val['type'] == 'yesno') {
- print $form->selectyesno($constname, $conf->global->{$constname}, 1);
+ print $form->selectyesno($constname, getDolGlobalString($constname), 1);
} elseif (preg_match('/emailtemplate:/', $val['type'])) {
include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
$formmail = new FormMail($db);
@@ -502,7 +500,7 @@ if ($action == 'edit') {
$arrayofmessagename[$modelmail->id] = $langs->trans(preg_replace('/\(|\)/', '', $modelmail->label)) . $moreonlabel;
}
}
- print $form->selectarray($constname, $arrayofmessagename, $conf->global->{$constname}, 'None', 0, 0, '', 0, 0, 0, '', '', 1);
+ print $form->selectarray($constname, $arrayofmessagename, getDolGlobalString($constname), 'None', 0, 0, '', 0, 0, 0, '', '', 1);
} elseif (preg_match('/category:/', $val['type'])) {
require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
@@ -510,11 +508,11 @@ if ($action == 'edit') {
$tmp = explode(':', $val['type']);
print img_picto('', 'category', 'class="pictofixedwidth"');
- print $formother->select_categories($tmp[1], $conf->global->{$constname}, $constname, 0, $langs->trans('CustomersProspectsCategoriesShort'));
+ print $formother->select_categories($tmp[1], getDolGlobalString($constname), $constname, 0, $langs->trans('CustomersProspectsCategoriesShort'));
} elseif (preg_match('/thirdparty_type/', $val['type'])) {
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
$formcompany = new FormCompany($db);
- print $formcompany->selectProspectCustomerType($conf->global->{$constname}, $constname);
+ print $formcompany->selectProspectCustomerType(getDolGlobalString($constname), $constname);
} elseif ($val['type'] == 'securekey') {
print '';
if ($val['type'] == 'textarea') {
- print dol_nl2br($conf->global->{$constname});
+ print dol_nl2br(getDolGlobalString($constname));
} elseif ($val['type']== 'html') {
- print $conf->global->{$constname};
+ print getDolGlobalString($constname);
} elseif ($val['type'] == 'yesno') {
print ajax_constantonoff($constname);
} elseif (preg_match('/emailtemplate:/', $val['type'])) {
@@ -600,14 +598,14 @@ if ($action == 'edit') {
$tmp = explode(':', $val['type']);
- $template = $formmail->getEMailTemplate($db, $tmp[1], $user, $langs, $conf->global->{$constname});
+ $template = $formmail->getEMailTemplate($db, $tmp[1], $user, $langs, getDolGlobalString($constname));
if ($template<0) {
setEventMessages(null, $formmail->errors, 'errors');
}
print $langs->trans($template->label);
} elseif (preg_match('/category:/', $val['type'])) {
$c = new Categorie($db);
- $result = $c->fetch($conf->global->{$constname});
+ $result = $c->fetch(getDolGlobalInt($constname));
if ($result < 0) {
setEventMessages(null, $c->errors, 'errors');
} elseif ($result > 0 ) {
@@ -619,18 +617,18 @@ if ($action == 'edit') {
print '' . implode(' ', $toprint) . ' ';
if (isModEnabled('agenda')) {
- if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create)) {
+ if (!empty($user->rights->agenda->myactions->create) || $user->hasRight('agenda', 'allactions', 'create')) {
print '
' . $langs->trans("AddAction") . ' ';
} else {
print '
' . $langs->trans("AddAction") . ' ';
diff --git a/htdocs/asset/class/asset.class.php b/htdocs/asset/class/asset.class.php
index 7c2b55c045e..c01f4b967c4 100644
--- a/htdocs/asset/class/asset.class.php
+++ b/htdocs/asset/class/asset.class.php
@@ -410,7 +410,7 @@ class Asset extends CommonObject
$sql .= $this->getFieldList('t');
$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
- $sql .= " WHERE t.entity IN (".getEntity($this->table_element).")";
+ $sql .= " WHERE t.entity IN (".getEntity($this->element).")";
} else {
$sql .= " WHERE 1 = 1";
}
diff --git a/htdocs/asset/class/assetmodel.class.php b/htdocs/asset/class/assetmodel.class.php
index fb574e6ea18..a973abc3764 100644
--- a/htdocs/asset/class/assetmodel.class.php
+++ b/htdocs/asset/class/assetmodel.class.php
@@ -348,7 +348,7 @@ class AssetModel extends CommonObject
$sql .= $this->getFieldList('t');
$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
- $sql .= " WHERE t.entity IN (".getEntity($this->table_element).")";
+ $sql .= " WHERE t.entity IN (".getEntity($this->element).")";
} else {
$sql .= " WHERE 1 = 1";
}
diff --git a/htdocs/asset/model/agenda.php b/htdocs/asset/model/agenda.php
index 17fb19fe565..8758d22879c 100644
--- a/htdocs/asset/model/agenda.php
+++ b/htdocs/asset/model/agenda.php
@@ -46,7 +46,7 @@ if (GETPOST('actioncode', 'array')) {
$actioncode = '0';
}
} else {
- $actioncode = GETPOST("actioncode", "alpha", 3) ? GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
+ $actioncode = GETPOST("actioncode", "alpha", 3) ? GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT'));
}
$search_agenda_label = GETPOST('search_agenda_label');
@@ -173,7 +173,7 @@ if ($object->id > 0) {
if (get_class($objthirdparty) == 'Societe') {
$out .= '&socid=' . urlencode($objthirdparty->id);
}
- $out .= (!empty($objcon->id) ? '&contactid=' . urlencode($objcon->id) : '') . '&percentage=-1';
+ $out .= (!empty($objcon->id) ? '&contactid=' . urlencode($objcon->id) : '');
//$out.=$langs->trans("AddAnAction").' ';
//$out.=img_picto($langs->trans("AddAnAction"),'filenew');
//$out.="";
@@ -183,7 +183,7 @@ if ($object->id > 0) {
print '
';
// if (isModEnabled('agenda')) {
- // if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create)) {
+ // if (!empty($user->rights->agenda->myactions->create) || $user->hasRight('agenda', 'allactions', 'create')) {
// print '
' . $langs->trans("AddAction") . ' ';
// } else {
// print '
' . $langs->trans("AddAction") . ' ';
diff --git a/htdocs/asset/tpl/linkedobjectblock.tpl.php b/htdocs/asset/tpl/linkedobjectblock.tpl.php
index aef30995432..11d94714db8 100644
--- a/htdocs/asset/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/asset/tpl/linkedobjectblock.tpl.php
@@ -46,12 +46,12 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
$trclass .= ' liste_sub_total';
}
echo '
';
- echo ''.$langs->trans("Asset");
+ echo ' '.$langs->trans("Asset");
if (!empty($showImportButton) && !empty($conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES)) {
print ' '.$objectlink->getNomUrl(1).' ';
+ echo ''.$objectlink->getNomUrl(1).' ';
echo ''.$objectlink->label.' ';
echo ''.dol_print_date($objectlink->date_start, 'day').' ';
echo '';
diff --git a/htdocs/barcode/codeinit.php b/htdocs/barcode/codeinit.php
index 8ce559031a1..9c45d29cf79 100644
--- a/htdocs/barcode/codeinit.php
+++ b/htdocs/barcode/codeinit.php
@@ -48,7 +48,7 @@ $thirdpartytmp = new Societe($db);
$modBarCodeProduct = '';
$modBarCodeThirdparty = '';
-$maxperinit = 1000;
+$maxperinit = empty($conf->global->BARCODE_INIT_MAX) ? 1000 : $conf->global->BARCODE_INIT_MAX;
// Security check (enable the most restrictive one)
//if ($user->socid > 0) accessforbidden();
@@ -179,14 +179,16 @@ if (!empty($conf->global->BARCODE_PRODUCT_ADDON_NUM)) {
if (preg_match('/^mod_barcode_product_.*php$/', $file)) {
$file = substr($file, 0, dol_strlen($file) - 4);
- try {
- dol_include_once($dirroot.$file.'.php');
- } catch (Exception $e) {
- dol_syslog($e->getMessage(), LOG_ERR);
- }
+ if ($file == $conf->global->BARCODE_PRODUCT_ADDON_NUM) {
+ try {
+ dol_include_once($dirroot.$file.'.php');
+ } catch (Exception $e) {
+ dol_syslog($e->getMessage(), LOG_ERR);
+ }
- $modBarCodeProduct = new $file();
- break;
+ $modBarCodeProduct = new $file();
+ break;
+ }
}
}
closedir($handle);
diff --git a/htdocs/barcode/printsheet.php b/htdocs/barcode/printsheet.php
index 373effecbe8..56361b948f0 100644
--- a/htdocs/barcode/printsheet.php
+++ b/htdocs/barcode/printsheet.php
@@ -226,7 +226,7 @@ if ($action == 'builddoc') {
'code'=>$code,
'encoding'=>$encoding,
'is2d'=>$is2d,
- 'photo'=>$barcodeimage // Photo must be a file that exists with format supported by TCPDF
+ 'photo'=>!empty($barcodeimage) ? $barcodeimage : '' // Photo must be a file that exists with format supported by TCPDF
);
}
} else {
diff --git a/htdocs/blockedlog/class/authority.class.php b/htdocs/blockedlog/class/authority.class.php
index 7240aaf0151..b3dd9b45f47 100644
--- a/htdocs/blockedlog/class/authority.class.php
+++ b/htdocs/blockedlog/class/authority.class.php
@@ -304,8 +304,8 @@ class BlockedLogAuthority
$url = $conf->global->BLOCKEDLOG_AUTHORITY_URL.'/blockedlog/ajax/authority.php?s='.$signature.'&b='.$block->signature;
$res = getURLContent($url);
- echo $block->signature.' '.$url.' '.$res.'';
if (isModEnabled('agenda')) {
- if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create)) {
+ if (!empty($user->rights->agenda->myactions->create) || $user->hasRight('agenda', 'allactions', 'create')) {
print '
'.$langs->trans("AddAction").' ';
} else {
print '
'.$langs->trans("AddAction").' ';
diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index 333b6232f9f..3901e18bac4 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -1,5 +1,5 @@
+/* Copyright (C) 2017-2023 Laurent Destailleur
* Copyright (C) 2019 Frédéric France
*
* This program is free software; you can redistribute it and/or modify
@@ -275,303 +275,303 @@ if (empty($reshook)) {
$object->calculateCosts();
}
}
+}
+/*
+ * View
+ */
- /*
- * View
- */
-
- $form = new Form($db);
- $formfile = new FormFile($db);
+$form = new Form($db);
+$formfile = new FormFile($db);
- $title = $langs->trans('BOM');
- $help_url ='EN:Module_BOM';
- llxHeader('', $title, $help_url);
+$title = $langs->trans('BOM');
+$help_url ='EN:Module_BOM';
+llxHeader('', $title, $help_url);
- // Part to create
- if ($action == 'create') {
- print load_fiche_titre($langs->trans("NewBOM"), '', 'bom');
+// Part to create
+if ($action == 'create') {
+ print load_fiche_titre($langs->trans("NewBOM"), '', 'bom');
- print '';
+ print '';
+}
+
+// Part to edit record
+if (($id || $ref) && $action == 'edit') {
+ print load_fiche_titre($langs->trans("BillOfMaterials"), '', 'cubes');
+
+ print '';
+}
+
+// Part to show record
+if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
+ $head = bomPrepareHead($object);
+ print dol_get_fiche_head($head, 'card', $langs->trans("BillOfMaterials"), -1, 'bom');
+
+ $formconfirm = '';
+
+ // Confirmation to delete
+ if ($action == 'delete') {
+ $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteBillOfMaterials'), $langs->trans('ConfirmDeleteBillOfMaterials'), 'confirm_delete', '', 0, 1);
+ }
+ // Confirmation to delete line
+ if ($action == 'deleteline') {
+ $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_deleteline', '', 0, 1);
}
- // Part to edit record
- if (($id || $ref) && $action == 'edit') {
- print load_fiche_titre($langs->trans("BillOfMaterials"), '', 'cubes');
-
- print '';
- }
-
- // Part to show record
- if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
- $head = bomPrepareHead($object);
- print dol_get_fiche_head($head, 'card', $langs->trans("BillOfMaterials"), -1, 'bom');
-
- $formconfirm = '';
-
- // Confirmation to delete
- if ($action == 'delete') {
- $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteBillOfMaterials'), $langs->trans('ConfirmDeleteBillOfMaterials'), 'confirm_delete', '', 0, 1);
- }
- // Confirmation to delete line
- if ($action == 'deleteline') {
- $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_deleteline', '', 0, 1);
- }
-
- // Confirmation of validation
- if ($action == 'validate') {
- // We check that object has a temporary ref
- $ref = substr($object->ref, 1, 4);
- if ($ref == 'PROV') {
- $object->fetch_product();
- $numref = $object->getNextNumRef($object->product);
- } else {
- $numref = $object->ref;
- }
-
- $text = $langs->trans('ConfirmValidateBom', $numref);
- /*if (isModEnabled('notification'))
- {
- require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php';
- $notify = new Notify($db);
- $text .= ''.$langs->trans("BackToList").' ';
-
- $morehtmlref = '';
- /*
- // Ref bis
- $morehtmlref.=$form->editfieldkey("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->bom->creer, 'string', '', 0, 1);
- $morehtmlref.=$form->editfieldval("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->bom->creer, 'string', '', null, null, '', 1);
- // Thirdparty
- $morehtmlref.='
'.$langs->trans('ThirdParty') . ' : ' . $soc->getNomUrl(1);
- // Project
- if (isModEnabled('project'))
- {
- $langs->load("projects");
- $morehtmlref.='
'.$langs->trans('Project') . ' ';
- if ($permissiontoadd)
- {
- if ($action != 'classify')
- $morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
- if ($action == 'classify') {
- //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
- $morehtmlref.='
';
- } else {
- $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
- }
+ // Confirmation of validation
+ if ($action == 'validate') {
+ // We check that object has a temporary ref
+ $ref = substr($object->ref, 1, 4);
+ if ($ref == 'PROV') {
+ $object->fetch_product();
+ $numref = $object->getNextNumRef($object->product);
} else {
- if (! empty($object->fk_project)) {
- $proj = new Project($db);
- $proj->fetch($object->fk_project);
- $morehtmlref.=$proj->getNomUrl();
- } else {
- $morehtmlref.='';
+ $numref = $object->ref;
+ }
+
+ $text = $langs->trans('ConfirmValidateBom', $numref);
+ /*if (isModEnabled('notification'))
+ {
+ require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php';
+ $notify = new Notify($db);
+ $text .= '
';
+ $text .= $notify->confirmMessage('BOM_VALIDATE', $object->socid, $object);
+ }*/
+
+ $formquestion = array();
+ if (isModEnabled('bom')) {
+ $langs->load("mrp");
+ $forcecombo = 0;
+ if ($conf->browser->name == 'ie') {
+ $forcecombo = 1; // There is a bug in IE10 that make combo inside popup crazy
}
+ $formquestion = array(
+ // 'text' => $langs->trans("ConfirmClone"),
+ // array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1),
+ // array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1),
+ );
}
+
+ $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('Validate'), $text, 'confirm_validate', $formquestion, 0, 1, 220);
+ }
+
+ // Confirmation of closing
+ if ($action == 'close') {
+ $text = $langs->trans('ConfirmCloseBom', $object->ref);
+ /*if (isModEnabled('notification'))
+ {
+ require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php';
+ $notify = new Notify($db);
+ $text .= '
';
+ $text .= $notify->confirmMessage('BOM_CLOSE', $object->socid, $object);
+ }*/
+
+ $formquestion = array();
+ if (isModEnabled('bom')) {
+ $langs->load("mrp");
+ $forcecombo = 0;
+ if ($conf->browser->name == 'ie') {
+ $forcecombo = 1; // There is a bug in IE10 that make combo inside popup crazy
+ }
+ $formquestion = array(
+ // 'text' => $langs->trans("ConfirmClone"),
+ // array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1),
+ // array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1),
+ );
}
- */
- $morehtmlref .= '
'.$langs->trans("BackToList").' ';
+
+ $morehtmlref = '';
+ /*
+ // Ref bis
+ $morehtmlref.=$form->editfieldkey("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->bom->creer, 'string', '', 0, 1);
+ $morehtmlref.=$form->editfieldval("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->bom->creer, 'string', '', null, null, '', 1);
+ // Thirdparty
+ $morehtmlref.='
'.$langs->trans('ThirdParty') . ' : ' . $soc->getNomUrl(1);
+ // Project
+ if (isModEnabled('project'))
+ {
+ $langs->load("projects");
+ $morehtmlref.='
'.$langs->trans('Project') . ' ';
+ if ($permissiontoadd)
+ {
+ if ($action != 'classify')
+ $morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
+ if ($action == 'classify') {
+ //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+ $morehtmlref.='
';
+ } else {
+ $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+ }
+ } else {
+ if (! empty($object->fk_project)) {
+ $proj = new Project($db);
+ $proj->fetch($object->fk_project);
+ $morehtmlref.=$proj->getNomUrl();
+ } else {
+ $morehtmlref.='';
+ }
+ }
+ }
+ */
+ $morehtmlref .= '
';
- print '
';
- print '
';
- print '
'."\n";
+ dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
- // Common attributes
- $keyforbreak = 'duration';
- include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
+
+ print '';
+ print '
';
+ print '
';
+ print '
'."\n";
+
+ // Common attributes
+ $keyforbreak = 'duration';
+ include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
+ $object->calculateCosts();
+ print ''.$form->textwithpicto($langs->trans("TotalCost"), $langs->trans("BOMTotalCost")).' '.price($object->total_cost).' '.$langs->trans("UnitCost").' '.price($object->unit_cost).'
';
+ print '
';
+ print '
';
+
+ print dol_get_fiche_end();
+
+
+
+ /*
+ * Lines
+ */
+
+ if (!empty($object->table_element_line)) {
+ // Products
+ $res = $object->fetchLinesbytypeproduct(0);
$object->calculateCosts();
- print ''.$form->textwithpicto($langs->trans("TotalCost"), $langs->trans("BOMTotalCost")).' '.price($object->total_cost).' '.$langs->trans("UnitCost").' '.price($object->unit_cost).'
';
- print '
';
- print '
';
-
- print dol_get_fiche_end();
-
-
-
- /*
- * Lines
- */
-
- if (!empty($object->table_element_line)) {
- //Products
- $res = $object->fetchLinesbytypeproduct(0);
- $object->calculateCosts();
-
- print ($res == 0 && $object->status >= $object::STATUS_VALIDATED) ? '' : load_fiche_titre($langs->trans('BOMProductsList'), '', 'product');
-
- print '