lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code comment

Browse Source
This commit is contained in:
Laurent Destailleur 2018-07-09 15:39:59 +02:00
parent d3d1b6d513
commit 699df860d8
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/core/class/html.form.class.php
View File

@ -1073,10 +1073,10 @@ class Form
$out=''; $out='';
$num=0; $num=0;
$outarray=array(); $outarray=array();
if ($selected === '') $selected = array(); if ($selected === '') $selected = array();
else if (!is_array($selected)) $selected = array($selected); else if (!is_array($selected)) $selected = array($selected);
// Clean $filter that may contains sql conditions so sql code // Clean $filter that may contains sql conditions so sql code
if (function_exists('test_sql_and_script_inject')) $filter = test_sql_and_script_inject($filter, 3); if (function_exists('test_sql_and_script_inject')) $filter = test_sql_and_script_inject($filter, 3);
@ -1335,7 +1335,7 @@ class Form
$langs->load('companies'); $langs->load('companies');
if (empty($htmlid)) $htmlid = $htmlname; if (empty($htmlid)) $htmlid = $htmlname;
if ($selected === '') $selected = array(); if ($selected === '') $selected = array();
else if (!is_array($selected)) $selected = array($selected); else if (!is_array($selected)) $selected = array($selected);
$out=''; $out='';
@ -1484,13 +1484,13 @@ class Form
function select_dolusers($selected='', $htmlname='userid', $show_empty=0, $exclude=null, $disabled=0, $include='', $enableonly='', $force_entity='0', $maxlength=0, $showstatus=0, $morefilter='', $show_every=0, $enableonlytext='', $morecss='', $noactive=0, $outputmode=0, $multiple=false) function select_dolusers($selected='', $htmlname='userid', $show_empty=0, $exclude=null, $disabled=0, $include='', $enableonly='', $force_entity='0', $maxlength=0, $showstatus=0, $morefilter='', $show_every=0, $enableonlytext='', $morecss='', $noactive=0, $outputmode=0, $multiple=false)
{ {
global $conf,$user,$langs; global $conf,$user,$langs;
// If no preselected user defined, we take current user // If no preselected user defined, we take current user
if ((is_numeric($selected) && ($selected < -2 || empty($selected))) && empty($conf->global->SOCIETE_DISABLE_DEFAULT_SALESREPRESENTATIVE)) $selected=$user->id; if ((is_numeric($selected) && ($selected < -2 || empty($selected))) && empty($conf->global->SOCIETE_DISABLE_DEFAULT_SALESREPRESENTATIVE)) $selected=$user->id;
if ($selected === '') $selected = array(); if ($selected === '') $selected = array();
else if (!is_array($selected)) $selected = array($selected); else if (!is_array($selected)) $selected = array($selected);
$excludeUsers=null; $excludeUsers=null;
$includeUsers=null; $includeUsers=null;
@ -1568,7 +1568,7 @@ class Form
if ($show_every) $out.= '<option value="-2"'.((in_array(-2,$selected))?' selected':'').'>-- '.$langs->trans("Everybody").' --</option>'."\n"; if ($show_every) $out.= '<option value="-2"'.((in_array(-2,$selected))?' selected':'').'>-- '.$langs->trans("Everybody").' --</option>'."\n";
$userstatic=new User($this->db); $userstatic=new User($this->db);
while ($i < $num) while ($i < $num)
{ {
$obj = $this->db->fetch_object($resql); $obj = $this->db->fetch_object($resql);
@ -6754,7 +6754,7 @@ class Form
if (is_array($include)) $includeGroups = implode("','",$include); if (is_array($include)) $includeGroups = implode("','",$include);
if (!is_array($selected)) $selected = array($selected); if (!is_array($selected)) $selected = array($selected);
$out=''; $out='';
// On recherche les groupes // On recherche les groupes