From 4cc3d90cd4e8583ca189877c4ab3687743521d53 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 17 Apr 2026 17:39:17 +0200 Subject: [PATCH 1/8] Fix missing columns --- htdocs/core/lib/project.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php index f0ffcf20e1d..78f393b3e8f 100644 --- a/htdocs/core/lib/project.lib.php +++ b/htdocs/core/lib/project.lib.php @@ -2509,7 +2509,7 @@ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, & if ($lines[$i]->id > 0) { //var_dump('totalforeachday after taskid='.$lines[$i]->id.' and previous one on level '.$level); //var_dump($totalforeachday); - $ret = projectLinesPerMonth($inc, $firstdaytoshow, $fuser, $lines[$i]->id, ($parent == 0 ? $lineswithoutlevel0 : $lines), $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $isavailable, $oldprojectforbreak, $TWeek); + $ret = projectLinesPerMonth($inc, $firstdaytoshow, $fuser, $lines[$i]->id, ($parent == 0 ? $lineswithoutlevel0 : $lines), $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $isavailable, $oldprojectforbreak, $TWeek, $arrayfields); //var_dump('ret with parent='.$lines[$i]->id.' level='.$level); //var_dump($ret); foreach ($ret as $key => $val) { From 0f7847afb2178804e43c5b1e991ad09dab87aeea Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 18 Apr 2026 09:01:51 +0200 Subject: [PATCH 2/8] Fix responsive --- htdocs/core/class/html.formsetup.class.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htdocs/core/class/html.formsetup.class.php b/htdocs/core/class/html.formsetup.class.php index efbb0283257..45d35afcaca 100644 --- a/htdocs/core/class/html.formsetup.class.php +++ b/htdocs/core/class/html.formsetup.class.php @@ -242,6 +242,7 @@ class FormSetup if ($reshook > 0) { return $hookmanager->resPrint; } else { + $out = '
'; $out = ''; if (empty($hideTitle)) { if (empty($title)) { @@ -265,6 +266,7 @@ class FormSetup $out .= ''; $out .= '
'; + $out .= '
'; return $out; } } From 9525528d84dd609445996cacdd3428947e4fe60c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 18 Apr 2026 09:03:30 +0200 Subject: [PATCH 3/8] Fix --- htdocs/core/class/html.formsetup.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/class/html.formsetup.class.php b/htdocs/core/class/html.formsetup.class.php index 45d35afcaca..539fc6ee041 100644 --- a/htdocs/core/class/html.formsetup.class.php +++ b/htdocs/core/class/html.formsetup.class.php @@ -243,7 +243,7 @@ class FormSetup return $hookmanager->resPrint; } else { $out = '
'; - $out = ''; + $out .= '
'; if (empty($hideTitle)) { if (empty($title)) { $title = $this->langs->transnoentitiesnoconv("Parameter"); From f1b2dd6481e22cacb561d29ffdcd3a50b618479d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 18 Apr 2026 22:53:59 +0200 Subject: [PATCH 4/8] FIX add permission test on legacy filemanager - Credit Aksoum Abderrahmane --- htdocs/core/filemanagerdol/connectors/php/config.inc.php | 9 ++++++++- htdocs/core/filemanagerdol/connectors/php/connector.php | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/htdocs/core/filemanagerdol/connectors/php/config.inc.php b/htdocs/core/filemanagerdol/connectors/php/config.inc.php index 0704d51f615..7cb8b015ec3 100644 --- a/htdocs/core/filemanagerdol/connectors/php/config.inc.php +++ b/htdocs/core/filemanagerdol/connectors/php/config.inc.php @@ -33,9 +33,9 @@ define('NOTOKENRENEWAL', 1); // Disables token renewal // is a security hole if anybody can access without // being an authenticated user. require_once '../../../../main.inc.php'; - /** * @var Conf $conf + * @var User $user * * @var string $dolibarr_main_data_root * @var string $dolibarr_main_url_root @@ -49,6 +49,13 @@ if ($pos == '/') { //define('DOL_URL_ROOT', $pos); $entity = ((!empty($_SESSION['dol_entity']) && $_SESSION['dol_entity'] > 1) ? $_SESSION['dol_entity'] : null); + +if (!empty($user->admin) && !$user->hasRight('website', 'write')) { + accessforbidden('Need to be admin or having write permission on website module'); + exit; +} + + // SECURITY: You must explicitly enable this "connector". (Set it to "true"). // WARNING: don't just set "$Config['Enabled'] = true ;", you must be sure that only // authenticated users can access this file or use some kind of session checking. diff --git a/htdocs/core/filemanagerdol/connectors/php/connector.php b/htdocs/core/filemanagerdol/connectors/php/connector.php index 25d9312015f..94ea7f864cc 100644 --- a/htdocs/core/filemanagerdol/connectors/php/connector.php +++ b/htdocs/core/filemanagerdol/connectors/php/connector.php @@ -26,6 +26,9 @@ ob_start(); require 'config.inc.php'; // This include the main.inc.php +/** + * @var array $Config + */ require 'connector.lib.php'; if (!$Config['Enabled']) { From 27cbf88c9bd6e436e77d3e3c73d758a137f1aed0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 20 Apr 2026 12:50:40 +0200 Subject: [PATCH 5/8] Try a fix for #36949 and #37857 --- htdocs/contrat/class/api_contracts.class.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/htdocs/contrat/class/api_contracts.class.php b/htdocs/contrat/class/api_contracts.class.php index 80083fe486e..62df847ce74 100644 --- a/htdocs/contrat/class/api_contracts.class.php +++ b/htdocs/contrat/class/api_contracts.class.php @@ -36,9 +36,7 @@ class Contracts extends DolibarrApi */ public static $FIELDS = array( 'socid', - 'date_contrat', - 'commercial_signature_id', - 'commercial_suivi_id' + 'date_contrat' ); /** From ee3bcd80007a0f222077f625c32693a149039ef0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 20 Apr 2026 16:47:53 +0200 Subject: [PATCH 6/8] css --- htdocs/website/index.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/website/index.php b/htdocs/website/index.php index 2fed0db1c0d..e838146800e 100644 --- a/htdocs/website/index.php +++ b/htdocs/website/index.php @@ -4162,7 +4162,7 @@ if ($action == 'editcss') { $head = websiteconfigPrepareHead($object); print dol_get_fiche_head($head, 'general', $langs->trans("General"), 0, 'website'); - print ''."\n"; + print ''."\n"; print '
'; // Website @@ -4189,7 +4189,7 @@ if ($action == 'editcss') { $htmltext = ''; print $form->textwithpicto($langs->trans('MainLanguage'), $htmltext, 1, 'help', '', 0, 2, 'WEBSITE_LANG'); print ''; print ''; @@ -4199,7 +4199,7 @@ if ($action == 'editcss') { $htmltext = $langs->trans("Example").': fr,de,sv,it,pt'; print $form->textwithpicto($langs->trans('OtherLanguages'), $htmltext, 1, 'help', '', 0, 2); print ''; print ''; From e88d452eaf3da65867f630b56abd21e363b9f650 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 20 Apr 2026 16:51:32 +0200 Subject: [PATCH 7/8] Doc --- htdocs/core/website.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/website.inc.php b/htdocs/core/website.inc.php index 0097cb3a88c..502ad5968d7 100644 --- a/htdocs/core/website.inc.php +++ b/htdocs/core/website.inc.php @@ -314,7 +314,7 @@ if (!empty($dolibarr_website_allow_custom_php) && $dolibarr_website_allow_custom if (function_exists($systemfunction)) { print '


'; - print 'Website features are protected to be disabled if the PHP system functions ('.implode(',', $systemfunctions).') are not disabled for the website context.
'; + print 'Website features are DISABLED if the PHP system functions ('.implode(',', $systemfunctions).') are NOT disabled for the website context.
'; print 'The value "'.$systemfunction.'" has NOT been found into the current disable_functions=
'; print '
'; - print img_picto('', 'language', 'class="picotfixedwidth"'); + print img_picto('', 'language', 'class="pictofixedwidth"'); print $formadmin->select_language((GETPOSTISSET('WEBSITE_LANG') ? GETPOST('WEBSITE_LANG', 'aZ09comma') : ($object->lang ? $object->lang : '0')), 'WEBSITE_LANG', 0, array(), 1, 0, 0, 'minwidth300', 2, 0, 0, array(), 1); print '
'; - print img_picto('', 'language', 'class="picotfixedwidth"'); + print img_picto('', 'language', 'class="pictofixedwidth"'); print ''; print '