@@ -44,7 +44,7 @@ |
||
| 44 | 44 | |
| 45 | 45 | $action = GETPOST('action', 'aZ09'); |
| 46 | 46 | $value = GETPOST('value', 'alpha'); |
| 47 | -$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
| 47 | +$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
| 48 | 48 | |
| 49 | 49 | $param = GETPOST('param', 'alpha'); |
| 50 | 50 | $cancel = GETPOST('cancel', 'alpha'); |
@@ -401,7 +401,7 @@ discard block |
||
| 401 | 401 | |
| 402 | 402 | $request = $this->executeRequest($url, array(CURLOPT_CUSTOMREQUEST => 'GET')); |
| 403 | 403 | |
| 404 | - $this->checkStatusCode($request);// check the response validity |
|
| 404 | + $this->checkStatusCode($request); // check the response validity |
|
| 405 | 405 | |
| 406 | 406 | return $this->parseXML($request['response']); |
| 407 | 407 | } |
@@ -440,7 +440,7 @@ discard block |
||
| 440 | 440 | throw new PrestaShopWebserviceException('Bad parameters given'); |
| 441 | 441 | } |
| 442 | 442 | $request = $this->executeRequest($url, array(CURLOPT_CUSTOMREQUEST => 'HEAD', CURLOPT_NOBODY => true)); |
| 443 | - $this->checkStatusCode($request);// check the response validity |
|
| 443 | + $this->checkStatusCode($request); // check the response validity |
|
| 444 | 444 | return $request['header']; |
| 445 | 445 | } |
| 446 | 446 | |
@@ -463,8 +463,7 @@ discard block |
||
| 463 | 463 | if (isset($options['url'])) { |
| 464 | 464 | $url = $options['url']; |
| 465 | 465 | } elseif ((isset($options['resource'], $options['id']) || isset($options['url'])) && $options['putXml']) { |
| 466 | - $url = (isset($options['url']) ? $options['url'] : |
|
| 467 | - $this->url . '/api/' . $options['resource'] . '/' . $options['id']); |
|
| 466 | + $url = (isset($options['url']) ? $options['url'] : $this->url . '/api/' . $options['resource'] . '/' . $options['id']); |
|
| 468 | 467 | $xml = $options['putXml']; |
| 469 | 468 | if (isset($options['id_shop'])) { |
| 470 | 469 | $url .= '&id_shop=' . $options['id_shop']; |
@@ -477,7 +476,7 @@ discard block |
||
| 477 | 476 | } |
| 478 | 477 | |
| 479 | 478 | $request = $this->executeRequest($url, array(CURLOPT_CUSTOMREQUEST => 'PUT', CURLOPT_POSTFIELDS => $xml)); |
| 480 | - $this->checkStatusCode($request);// check the response validity |
|
| 479 | + $this->checkStatusCode($request); // check the response validity |
|
| 481 | 480 | return $this->parseXML($request['response']); |
| 482 | 481 | } |
| 483 | 482 | |
@@ -528,7 +527,7 @@ discard block |
||
| 528 | 527 | } |
| 529 | 528 | |
| 530 | 529 | $request = $this->executeRequest($url, array(CURLOPT_CUSTOMREQUEST => 'DELETE')); |
| 531 | - $this->checkStatusCode($request);// check the response validity |
|
| 530 | + $this->checkStatusCode($request); // check the response validity |
|
| 532 | 531 | return true; |
| 533 | 532 | } |
| 534 | 533 | } |
@@ -324,12 +324,12 @@ |
||
| 324 | 324 | //output template |
| 325 | 325 | $html .= '<tr class="app oddeven ' . dol_escape_htmltag($compatible) . '">'; |
| 326 | 326 | $html .= '<td class="center" width="210"><div class="newAppParent">'; |
| 327 | - $html .= $newapp . $images; // No dol_escape_htmltag, it is already escape html |
|
| 327 | + $html .= $newapp . $images; // No dol_escape_htmltag, it is already escape html |
|
| 328 | 328 | $html .= '</div></td>'; |
| 329 | 329 | $html .= '<td class="margeCote"><h2 class="appTitle">'; |
| 330 | 330 | $html .= dol_escape_htmltag($product->name->language[$this->lang - 1]); |
| 331 | 331 | $html .= '<br><small>'; |
| 332 | - $html .= $version; // No dol_escape_htmltag, it is already escape html |
|
| 332 | + $html .= $version; // No dol_escape_htmltag, it is already escape html |
|
| 333 | 333 | $html .= '</small></h2>'; |
| 334 | 334 | $html .= '<small> ' . dol_print_date(dol_stringtotime($product->date_upd), 'dayhour') . ' - ' . $langs->trans('Ref') . ': ' . dol_escape_htmltag($product->reference) . ' - ' . dol_escape_htmltag($langs->trans('Id')) . ': ' . ((int) $product->id) . '</small><br><br>' . dol_escape_htmltag($product->description_short->language[$this->lang - 1]) . '</td>'; |
| 335 | 335 | // do not load if display none |
@@ -42,7 +42,7 @@ |
||
| 42 | 42 | |
| 43 | 43 | $action = GETPOST('action', 'aZ09'); |
| 44 | 44 | $backtopage = GETPOST('backtopage', 'alpha'); |
| 45 | -$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
| 45 | +$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
| 46 | 46 | |
| 47 | 47 | $value = GETPOST('value', 'alpha'); |
| 48 | 48 | $label = GETPOST('label', 'alpha'); |
@@ -49,7 +49,7 @@ |
||
| 49 | 49 | |
| 50 | 50 | $action = GETPOST('action', 'aZ09'); |
| 51 | 51 | $value = GETPOST('value', 'alpha'); |
| 52 | -$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
| 52 | +$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
| 53 | 53 | |
| 54 | 54 | $label = GETPOST('label', 'alpha'); |
| 55 | 55 | $scandir = GETPOST('scan_dir', 'alpha'); |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | |
| 76 | 76 | // Default sort order (if not yet defined by previous GETPOST) |
| 77 | 77 | if (!$sortfield) { |
| 78 | - reset($object->fields); // Reset is required to avoid key() to return null. |
|
| 78 | + reset($object->fields); // Reset is required to avoid key() to return null. |
|
| 79 | 79 | $sortfield = "t." . key($object->fields); // Set here default search field. By default 1st field in definition. |
| 80 | 80 | } |
| 81 | 81 | if (!$sortorder) { |
@@ -540,7 +540,7 @@ discard block |
||
| 540 | 540 | } |
| 541 | 541 | |
| 542 | 542 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
| 543 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
| 543 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
| 544 | 544 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
| 545 | 545 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
| 546 | 546 | |
@@ -630,7 +630,7 @@ discard block |
||
| 630 | 630 | } elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('id', 'rowid', 'ref', 'status')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) { |
| 631 | 631 | $cssforfield .= ($cssforfield ? ' ' : '') . 'right'; |
| 632 | 632 | } |
| 633 | - $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
| 633 | + $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
| 634 | 634 | if (!empty($arrayfields['t.' . $key]['checked'])) { |
| 635 | 635 | print getTitleFieldOfList($arrayfields['t.' . $key]['label'], 0, $_SERVER['PHP_SELF'], 't.' . $key, '', $param, ($cssforfield ? 'class="' . $cssforfield . '"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield . ' ' : ''), 0, (empty($val['helplist']) ? '' : $val['helplist'])) . "\n"; |
| 636 | 636 | $totalarray['nbfield']++; |
@@ -99,7 +99,7 @@ |
||
| 99 | 99 | setEventMessages($langs->trans("ErrorValueCantBeNull", dol_trunc(dol_string_nohtmltag($langs->transnoentitiesnoconv("MAIN_MAX_DECIMALS_SHOWN")), 40)), null, 'errors'); |
| 100 | 100 | $action = 'edit'; |
| 101 | 101 | } |
| 102 | - if (! $error && ((float) $valmainmaxdecimalsshown < $valmainmaxdecimalsunit || (float) $valmainmaxdecimalsshown < $valmainmaxdecimalstot)) { |
|
| 102 | + if (!$error && ((float) $valmainmaxdecimalsshown < $valmainmaxdecimalsunit || (float) $valmainmaxdecimalsshown < $valmainmaxdecimalstot)) { |
|
| 103 | 103 | $langs->load("errors"); |
| 104 | 104 | $error++; |
| 105 | 105 | setEventMessages($langs->trans("ErrorValueForTooLow", dol_trunc(dol_string_nohtmltag($langs->transnoentitiesnoconv("MAIN_MAX_DECIMALS_SHOWN")), 40)), null, 'errors'); |
@@ -49,7 +49,7 @@ |
||
| 49 | 49 | |
| 50 | 50 | $action = GETPOST('action', 'aZ09'); |
| 51 | 51 | $value = GETPOST('value', 'alpha'); |
| 52 | -$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
| 52 | +$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
| 53 | 53 | |
| 54 | 54 | $label = GETPOST('label', 'alpha'); |
| 55 | 55 | $scandir = GETPOST('scan_dir', 'alpha'); |
@@ -49,7 +49,7 @@ |
||
| 49 | 49 | |
| 50 | 50 | $action = GETPOST('action', 'aZ09'); |
| 51 | 51 | $value = GETPOST('value', 'alpha'); |
| 52 | -$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
| 52 | +$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
| 53 | 53 | |
| 54 | 54 | $label = GETPOST('label', 'alpha'); |
| 55 | 55 | $scandir = GETPOST('scan_dir', 'alpha'); |