From 7bf8f489f661deb3ffaef7fcfc4cf4eb037725f9 Mon Sep 17 00:00:00 2001 From: MDW Date: Fri, 8 Mar 2024 21:35:32 +0100 Subject: [PATCH] Fix: $addInputLabel is at position 8 (#28711) # Fix: $addInputLabel is at position 8 PhanPluginSuspiciousParamPosition: The position of the argument was incorrect --- .../class/html.formwebportal.class.php | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/htdocs/webportal/class/html.formwebportal.class.php b/htdocs/webportal/class/html.formwebportal.class.php index ea4debb2348..6634426f2df 100644 --- a/htdocs/webportal/class/html.formwebportal.class.php +++ b/htdocs/webportal/class/html.formwebportal.class.php @@ -2,6 +2,7 @@ /* Copyright (C) 2023-2024 Laurent Destailleur * Copyright (C) 2023-2024 Lionel Vessiller * Copyright (C) 2023-2024 Patrice Andreani + * Copyright (C) 2024 MDW * * 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 @@ -707,44 +708,44 @@ class FormWebPortal extends Form $out = $this->inputType('number', $htmlName, dol_escape_htmltag($value), $htmlId, $morecss, $moreparam); break; - case 'text' : - case 'html' : + case 'text': + case 'html': $moreparam .= ($size > 0 ? ' maxlength="' . $size . '"' : ''); $out = $this->inputType('text', $htmlName, dol_escape_htmltag($value), $htmlId, $morecss, $moreparam); break; - case 'email' : + case 'email': $out = $this->inputType('email', $htmlName, dol_escape_htmltag($value), $htmlId, $morecss, $moreparam); break; - case 'tel' : + case 'tel': $out = $this->inputType('tel', $htmlName, dol_escape_htmltag($value), $htmlId, $morecss, $moreparam); break; - case 'url' : + case 'url': $out = $this->inputType('url', $htmlName, dol_escape_htmltag($value), $htmlId, $morecss, $moreparam); break; - case 'price' : + case 'price': if (!empty($value)) { $value = price($value); // $value in memory is a php numeric, we format it into user number format. } $addInputLabel = ' ' . $langs->getCurrencySymbol($conf->currency); - $out = $this->inputType('text', $htmlName, $value, $htmlId, $morecss, $moreparam, $addInputLabel); + $out = $this->inputType('text', $htmlName, $value, $htmlId, $morecss, $moreparam, '', $addInputLabel); break; - case 'double' : + case 'double': if (!empty($value)) { $value = price($value); // $value in memory is a php numeric, we format it into user number format. } $out = $this->inputType('text', $htmlName, $value, $htmlId, $morecss, $moreparam); break; - case 'password' : + case 'password': $out = $this->inputType('password', $htmlName, $value, $htmlId, $morecss, $moreparam); break; - case 'radio' : + case 'radio': foreach ($param['options'] as $keyopt => $valopt) { $htmlId = $htmlName . '_' . $keyopt; $htmlMoreParam = $moreparam . ($value == $keyopt ? ' checked' : ''); @@ -752,7 +753,7 @@ class FormWebPortal extends Form } break; - case 'select' : + case 'select': $out = ''; break; - case 'sellist' : + case 'sellist': $out = ''; break; - case 'link' : + case 'link': $param_list = array_keys($param['options']); // $param_list='ObjectName:classPath[:AddCreateButtonOrNot[:Filter[:Sortfield]]]' $showempty = (($required && $default != '') ? 0 : 1); @@ -931,7 +932,7 @@ class FormWebPortal extends Form break; - default : + default: if (!empty($hidden)) { $out = $this->inputType('hidden', $htmlName, $value, $htmlId); }