From efeeab4108e6d8d7af47be7dc982d753fc92853c Mon Sep 17 00:00:00 2001 From: "Laurent Destailleur (aka Eldy)" Date: Tue, 4 Feb 2025 23:58:14 +0100 Subject: [PATCH] Debug v22 --- htdocs/core/ajax/ajaxdirpreview.php | 4 ++++ htdocs/core/class/html.form.class.php | 2 +- htdocs/modulebuilder/template/myobject_list.php | 2 +- htdocs/user/group/list.php | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/htdocs/core/ajax/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php index cf4bf9f79bc..cfab01f54a4 100644 --- a/htdocs/core/ajax/ajaxdirpreview.php +++ b/htdocs/core/ajax/ajaxdirpreview.php @@ -96,11 +96,15 @@ if (!isset($mode) || $mode != 'noajax') { // For ajax call } } else { // When no an ajax call (include from other file) + /* + * @var string $module + */ ' @phan-var-force int $section @phan-var-force string $module @phan-var-force string $showonrightsize '; + $rootdirfordoc = $conf->ecm->dir_output; $ecmdir = new EcmDirectory($db); diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 2faab59a652..57769c5b7cd 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -9449,7 +9449,7 @@ class Form * @param string $htmlname Name of HTML field * @param array $array Array with array of fields we could show. This array may be modified according to setup of user. * @param string $varpage Id of context for page. Can be set by caller with $varpage=(empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage); - * @param string $pos Position colon on liste value 'left' or '' (meaning 'right'). + * @param string $pos Position of the colon in list: 'left' or '' (meaning 'right'). * @return string HTML multiselect string * @see selectarray() */ diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php index 85bf290801a..2451c35d972 100644 --- a/htdocs/modulebuilder/template/myobject_list.php +++ b/htdocs/modulebuilder/template/myobject_list.php @@ -606,7 +606,7 @@ if (!empty($moreforfilter)) { } $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, $conf->main_checkbox_left_column); // This also change content of $arrayfields with user setup +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, $conf->main_checkbox_left_column ? 'left' : ''); // This also change content of $arrayfields with user setup $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); diff --git a/htdocs/user/group/list.php b/htdocs/user/group/list.php index f892164abf2..8c7a4d1b5fb 100644 --- a/htdocs/user/group/list.php +++ b/htdocs/user/group/list.php @@ -355,7 +355,7 @@ if (!empty($moreforfilter)) { } $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, $conf->main_checkbox_left_column); // This also change content of $arrayfields with user setup +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, $conf->main_checkbox_left_column ? 'left' : ''); // This also change content of $arrayfields with user setup $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');