Merge branch 'develop' into qual/phan.2024.2.4

htdocs/core/ajax/ajaxdirpreview.php

@@ -96,11 +96,15 @@
 	}
 } 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);

htdocs/core/class/html.form.class.php

@@ -9451,7 +9451,7 @@ public static function multiselectarray($htmlname, $array, $selected = array(),
 	 * @param string 	$htmlname 	Name of HTML field
 	 * @param array<string,array{label:string,checked?:string,enabled?:string,type?:string,langfile?:string,position?:int,help?:string}> 	$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()
 	 */

htdocs/modulebuilder/template/myobject_list.php

@@ -606,7 +606,7 @@
 }
 
 $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) : '');
 

htdocs/user/group/list.php

@@ -355,7 +355,7 @@
 }
 
 $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) : '');