Clean code

This commit is contained in:
Laurent Destailleur 2017-09-16 13:14:46 +02:00
parent 9077b5f374
commit 0cf67944fa
4 changed files with 8 additions and 8 deletions

View File

@ -880,7 +880,7 @@ class ActionComm extends CommonObject
} }
if (! empty($filter)) $sql.= $filter; if (! empty($filter)) $sql.= $filter;
if ($sortorder && $sortfield) $sql.=$db->order($sortfield, $sortorder); if ($sortorder && $sortfield) $sql.=$db->order($sortfield, $sortorder);
if ($limit) $sql.=$db->plimit($limit); $sql.=$db->plimit($limit, 0);
dol_syslog(get_class()."::getActions", LOG_DEBUG); dol_syslog(get_class()."::getActions", LOG_DEBUG);
$resql=$db->query($sql); $resql=$db->query($sql);

View File

@ -414,7 +414,7 @@ if ($resql)
print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
print '<input type="hidden" name="page" value="'.$page.'">'; print '<input type="hidden" name="page" value="'.$page.'">';
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_commercial.png', 0, '', '', $limit); print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_commercial.png', 0, '', '', $limit, GETPOST('massaction','alpha')?1:0);
if ($massaction == 'presend') if ($massaction == 'presend')
{ {

View File

@ -1082,7 +1082,7 @@ class Form
$sql.=")"; $sql.=")";
} }
$sql.=$this->db->order("nom","ASC"); $sql.=$this->db->order("nom","ASC");
if ($limit > 0) $sql.=$this->db->plimit($limit); $sql.=$this->db->plimit($limit, 0);
// Build output string // Build output string
dol_syslog(get_class($this)."::select_thirdparty_list", LOG_DEBUG); dol_syslog(get_class($this)."::select_thirdparty_list", LOG_DEBUG);
@ -1966,7 +1966,7 @@ class Form
$sql.= ' GROUP BY'.$selectFields; $sql.= ' GROUP BY'.$selectFields;
} }
$sql.= $db->order("p.ref"); $sql.= $db->order("p.ref");
$sql.= $db->plimit($limit); $sql.= $db->plimit($limit, 0);
// Build output string // Build output string
dol_syslog(get_class($this)."::select_produits_list search product", LOG_DEBUG); dol_syslog(get_class($this)."::select_produits_list search product", LOG_DEBUG);
@ -2390,7 +2390,7 @@ class Form
$sql.=')'; $sql.=')';
} }
$sql.= " ORDER BY pfp.ref_fourn DESC, pfp.quantity ASC"; $sql.= " ORDER BY pfp.ref_fourn DESC, pfp.quantity ASC";
$sql.= $db->plimit($limit); $sql.= $db->plimit($limit, 0);
// Build output string // Build output string

View File

@ -293,13 +293,13 @@ jQuery(document).ready(function() {
$arrayofselected=is_array($toselect)?$toselect:array(); $arrayofselected=is_array($toselect)?$toselect:array();
$param=''; $param='';
if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage; if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit; if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
foreach($search as $key => $val) foreach($search as $key => $val)
{ {
$param.= '&search_'.$key.'='.urlencode($search[$key]); $param.= '&search_'.$key.'='.urlencode($search[$key]);
} }
if ($optioncss != '') $param.='&optioncss='.$optioncss; if ($optioncss != '') $param.='&optioncss='.urlencode($optioncss);
// Add $param from extra fields // Add $param from extra fields
foreach ($search_array_options as $key => $val) foreach ($search_array_options as $key => $val)
{ {