@@ -53,20 +53,20 @@ discard block |
||
53 | 53 | // Security check |
54 | 54 | if ($user->socid) $socid = $user->socid; |
55 | 55 | |
56 | -$search_ref = GETPOST('search_ref', 'alpha'); |
|
57 | -$search_date_startday = GETPOST('search_date_startday', 'int'); |
|
58 | -$search_date_startmonth = GETPOST('search_date_startmonth', 'int'); |
|
59 | -$search_date_startyear = GETPOST('search_date_startyear', 'int'); |
|
56 | +$search_ref = GETPOST('search_ref', 'alpha'); |
|
57 | +$search_date_startday = GETPOST('search_date_startday', 'int'); |
|
58 | +$search_date_startmonth = GETPOST('search_date_startmonth', 'int'); |
|
59 | +$search_date_startyear = GETPOST('search_date_startyear', 'int'); |
|
60 | 60 | $search_date_endday = GETPOST('search_date_endday', 'int'); |
61 | -$search_date_endmonth = GETPOST('search_date_endmonth', 'int'); |
|
61 | +$search_date_endmonth = GETPOST('search_date_endmonth', 'int'); |
|
62 | 62 | $search_date_endyear = GETPOST('search_date_endyear', 'int'); |
63 | -$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
64 | -$search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear); |
|
65 | -$search_user = GETPOST('search_user', 'alpha'); |
|
63 | +$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
64 | +$search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear); |
|
65 | +$search_user = GETPOST('search_user', 'alpha'); |
|
66 | 66 | $search_payment_type = GETPOST('search_payment_type'); |
67 | -$search_cheque_num = GETPOST('search_cheque_num', 'alpha'); |
|
67 | +$search_cheque_num = GETPOST('search_cheque_num', 'alpha'); |
|
68 | 68 | $search_bank_account = GETPOST('search_bank_account', 'int'); |
69 | -$search_amount = GETPOST('search_amount', 'alpha'); // alpha because we must be able to search on '< x' |
|
69 | +$search_amount = GETPOST('search_amount', 'alpha'); // alpha because we must be able to search on '< x' |
|
70 | 70 | |
71 | 71 | $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit; |
72 | 72 | $sortfield = GETPOST('sortfield', 'aZ09comma'); |
@@ -198,10 +198,10 @@ discard block |
||
198 | 198 | $sql .= natural_search('pndf.rowid', $search_ref); |
199 | 199 | } |
200 | 200 | if ($search_date_start) { |
201 | - $sql .= " AND pndf.datep >= '" . $db->idate($search_date_start) . "'"; |
|
201 | + $sql .= " AND pndf.datep >= '".$db->idate($search_date_start)."'"; |
|
202 | 202 | } |
203 | 203 | if ($search_date_end) { |
204 | - $sql .=" AND pndf.datep <= '" . $db->idate($search_date_end) . "'"; |
|
204 | + $sql .= " AND pndf.datep <= '".$db->idate($search_date_end)."'"; |
|
205 | 205 | } |
206 | 206 | |
207 | 207 | if ($search_user) { |
@@ -303,7 +303,7 @@ |
||
303 | 303 | $sql .= " AND t.".$db->escape($columnName)." >= '".$db->idate($search[$key])."'"; |
304 | 304 | } |
305 | 305 | if (preg_match('/_dtend$/', $key)) { |
306 | - $sql .= " AND t.".$db->escape($columnName)." <= '" . $db->idate($search[$key])."'"; |
|
306 | + $sql .= " AND t.".$db->escape($columnName)." <= '".$db->idate($search[$key])."'"; |
|
307 | 307 | } |
308 | 308 | } |
309 | 309 | } |
@@ -73,7 +73,7 @@ |
||
73 | 73 | { |
74 | 74 | global $conf; |
75 | 75 | |
76 | - $uselogfile = getDolGlobalInt('DEBUGBAR_USE_LOG_FILE'); |
|
76 | + $uselogfile = getDolGlobalInt('DEBUGBAR_USE_LOG_FILE'); |
|
77 | 77 | |
78 | 78 | if ($uselogfile) { |
79 | 79 | $this->getStorageLogs($this->path); |
@@ -507,7 +507,7 @@ |
||
507 | 507 | } elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) { |
508 | 508 | $cssforfield .= ($cssforfield ? ' ' : '').'right'; |
509 | 509 | } |
510 | - $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
510 | + $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
511 | 511 | if (!empty($arrayfields['t.'.$key]['checked'])) { |
512 | 512 | print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n"; |
513 | 513 | $totalarray['nbfield']++; |
@@ -235,7 +235,7 @@ |
||
235 | 235 | if (!function_exists('simplexml_load_string')) { |
236 | 236 | throw new PrestaShopWebserviceException('Method simplexml_load_string not available. Your PHP does not support xml.'); |
237 | 237 | } |
238 | - $xml = simplexml_load_string($response, 'SimpleXMLElement', LIBXML_NOCDATA|LIBXML_NONET); |
|
238 | + $xml = simplexml_load_string($response, 'SimpleXMLElement', LIBXML_NOCDATA | LIBXML_NONET); |
|
239 | 239 | if (libxml_get_errors()) { |
240 | 240 | $msg = var_export(libxml_get_errors(), true); |
241 | 241 | libxml_clear_errors(); |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | if ($backupold) { |
158 | 158 | dol_delete_file($filetpl.'.old'); |
159 | 159 | $result = dol_move($filetpl, $filetpl.'.old', 0, 1, 0, 0); |
160 | - if (! $result) { |
|
160 | + if (!$result) { |
|
161 | 161 | return false; |
162 | 162 | } |
163 | 163 | } else { |
@@ -346,7 +346,7 @@ discard block |
||
346 | 346 | $indexcontent .= " require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n"; |
347 | 347 | $indexcontent .= ' redirectToContainer($_GET[\'pageref\'], $_GET[\'pagealiasalt\'], $_GET[\'pageid\']);'."\n"; |
348 | 348 | $indexcontent .= "}\n"; |
349 | - $indexcontent .= "include_once '".$relpath."/".basename($filetpl)."'\n"; // use .. instead of . |
|
349 | + $indexcontent .= "include_once '".$relpath."/".basename($filetpl)."'\n"; // use .. instead of . |
|
350 | 350 | $indexcontent .= '// END PHP ?>'."\n"; |
351 | 351 | $result = file_put_contents($fileindexsub, $indexcontent); |
352 | 352 | if ($result === false) { |
@@ -254,7 +254,7 @@ |
||
254 | 254 | // Clean data |
255 | 255 | // $this->knowledgerecord->abc = sanitizeVal($this->knowledgerecord->abc, 'alphanohtml'); |
256 | 256 | |
257 | - if ($this->knowledgerecord->create(DolibarrApiAccess::$user)<0) { |
|
257 | + if ($this->knowledgerecord->create(DolibarrApiAccess::$user) < 0) { |
|
258 | 258 | throw new RestException(500, "Error creating KnowledgeRecord", array_merge(array($this->knowledgerecord->error), $this->knowledgerecord->errors)); |
259 | 259 | } |
260 | 260 | return $this->knowledgerecord->id; |
@@ -220,7 +220,7 @@ |
||
220 | 220 | // Clean data |
221 | 221 | // $this->myobject->abc = sanitizeVal($this->myobject->abc, 'alphanohtml'); |
222 | 222 | |
223 | - if ($this->myobject->create(DolibarrApiAccess::$user)<0) { |
|
223 | + if ($this->myobject->create(DolibarrApiAccess::$user) < 0) { |
|
224 | 224 | throw new RestException(500, "Error creating MyObject", array_merge(array($this->myobject->error), $this->myobject->errors)); |
225 | 225 | } |
226 | 226 | return $this->myobject->id; |
@@ -366,7 +366,7 @@ |
||
366 | 366 | $param .= "&type_element=".urlencode($type_element); |
367 | 367 | |
368 | 368 | $total_qty = 0; |
369 | -$num=0; |
|
369 | +$num = 0; |
|
370 | 370 | if ($sql_select) { |
371 | 371 | $resql = $db->query($sql); |
372 | 372 | if (!$resql) { |