@@ -178,7 +178,7 @@ |
||
178 | 178 | |
179 | 179 | $newcode = $code; |
180 | 180 | if (!preg_match('/^\w+$/', $code) || dol_strlen($code) > 32) { |
181 | - $newcode = dol_hash($newcode, 'md5'); // No need for security here, we can use md5 |
|
181 | + $newcode = dol_hash($newcode, 'md5'); // No need for security here, we can use md5 |
|
182 | 182 | } |
183 | 183 | |
184 | 184 | $filebarcode = $conf->barcode->dir_temp . '/barcode_' . $newcode . '_' . $encoding . '.png'; |
@@ -349,7 +349,7 @@ discard block |
||
349 | 349 | $pdf->MultiCell(0, 3, ''); // Set interline to 3 |
350 | 350 | $pdf->SetTextColor(0, 0, 0); |
351 | 351 | |
352 | - $tab_top = 90; // position of top tab |
|
352 | + $tab_top = 90; // position of top tab |
|
353 | 353 | $tab_top_newpage = (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD') ? 42 + $top_shift : 10); |
354 | 354 | |
355 | 355 | $tab_height = $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext; |
@@ -1227,7 +1227,7 @@ discard block |
||
1227 | 1227 | // Show recipient |
1228 | 1228 | $widthrecbox = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 92 : 100; |
1229 | 1229 | if ($this->page_largeur < 210) { |
1230 | - $widthrecbox = 84; // To work with US executive format |
|
1230 | + $widthrecbox = 84; // To work with US executive format |
|
1231 | 1231 | } |
1232 | 1232 | $posy = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 40 : 42; |
1233 | 1233 | $posx = $this->page_largeur - $this->marge_droite - $widthrecbox; |
@@ -129,7 +129,7 @@ |
||
129 | 129 | |
130 | 130 | // Array to add new pages in new tabs |
131 | 131 | $this->tabs = array(); |
132 | - $this->tabs[] = array('data' => 'user:+skill_tab:Skills:hrm:1:/hrm/skill_tab.php?id=__ID__&objecttype=user'); // To add a new tab identified by code tabname1 |
|
132 | + $this->tabs[] = array('data' => 'user:+skill_tab:Skills:hrm:1:/hrm/skill_tab.php?id=__ID__&objecttype=user'); // To add a new tab identified by code tabname1 |
|
133 | 133 | //$this->tabs[] = array('data'=>'job:+tabname1:Poste:mylangfile@hrm:1:/hrm/poste_list.php?fk_job=__ID__'); // To add a new tab identified by code tabname1 |
134 | 134 | // Example: |
135 | 135 | // $this->tabs[] = array('data'=>'objecttype:+tabname1:Title1:mylangfile@hrm:$user->rights->hrm->read:/hrm/mynewtab1.php?id=__ID__'); // To add a new tab identified by code tabname1 |
@@ -173,7 +173,7 @@ |
||
173 | 173 | $maxfilesizearray = getMaxFileSizeArray(); |
174 | 174 | $maxmin = $maxfilesizearray['maxmin']; |
175 | 175 | if ($maxmin > 0) { |
176 | - $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
176 | + $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
177 | 177 | } |
178 | 178 | $texte .= ' <input type="file" name="uploadfile">'; |
179 | 179 | $texte .= '<input type="hidden" value="STOCK_ADDON_PDF_ODT_PATH" name="keyforuploaddir">'; |
@@ -630,7 +630,7 @@ |
||
630 | 630 | |
631 | 631 | |
632 | 632 | if (empty($hidetop)) { |
633 | - $pdf->line($this->marge_gauche, $tab_top + 11, $this->page_largeur - $this->marge_droite, $tab_top + 11); // line takes a position y in 2nd parameter and 4th parameter |
|
633 | + $pdf->line($this->marge_gauche, $tab_top + 11, $this->page_largeur - $this->marge_droite, $tab_top + 11); // line takes a position y in 2nd parameter and 4th parameter |
|
634 | 634 | $pdf->SetXY($this->posxdesc - 1, $tab_top + 1); |
635 | 635 | $pdf->MultiCell($this->wref, 3, $outputlangs->transnoentities("Ref"), '', 'L'); |
636 | 636 | } |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | $nbContact = $obj->nb; |
86 | 86 | } |
87 | 87 | |
88 | - dol_setcache($cachekey, $nbContact, 120); // If setting cache fails, this is not a problem, so we do not test result. |
|
88 | + dol_setcache($cachekey, $nbContact, 120); // If setting cache fails, this is not a problem, so we do not test result. |
|
89 | 89 | } |
90 | 90 | |
91 | 91 | $head[$h][0] = constant('BASE_URL') . '/societe/contact.php?socid=' . $object->id; |
@@ -164,7 +164,7 @@ discard block |
||
164 | 164 | } else { |
165 | 165 | dol_print_error($db); |
166 | 166 | } |
167 | - dol_setcache($cachekey, $nbProject, 120); // If setting cache fails, this is not a problem, so we do not test result. |
|
167 | + dol_setcache($cachekey, $nbProject, 120); // If setting cache fails, this is not a problem, so we do not test result. |
|
168 | 168 | } |
169 | 169 | $head[$h][0] = constant('BASE_URL') . '/societe/project.php?socid=' . $object->id; |
170 | 170 | $head[$h][1] = $langs->trans("Projects"); |
@@ -330,7 +330,7 @@ discard block |
||
330 | 330 | } else { |
331 | 331 | dol_print_error($db); |
332 | 332 | } |
333 | - dol_setcache($cachekey, $nbTicket, 120); // If setting cache fails, this is not a problem, so we do not test result. |
|
333 | + dol_setcache($cachekey, $nbTicket, 120); // If setting cache fails, this is not a problem, so we do not test result. |
|
334 | 334 | } |
335 | 335 | |
336 | 336 | $head[$h][0] = constant('BASE_URL') . '/ticket/list.php?socid=' . urlencode((string) ($object->id)); |
@@ -376,7 +376,7 @@ discard block |
||
376 | 376 | } else { |
377 | 377 | dol_print_error($db); |
378 | 378 | } |
379 | - dol_setcache($cachekey, $nbNotif, 120); // If setting cache fails, this is not a problem, so we do not test result. |
|
379 | + dol_setcache($cachekey, $nbNotif, 120); // If setting cache fails, this is not a problem, so we do not test result. |
|
380 | 380 | } |
381 | 381 | |
382 | 382 | $head[$h][0] = constant('BASE_URL') . '/societe/notify/card.php?socid=' . urlencode((string) ($object->id)); |
@@ -419,7 +419,7 @@ discard block |
||
419 | 419 | $nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$')); |
420 | 420 | $nbLinks = Link::count($db, $object->element, $object->id); |
421 | 421 | $totalAttached = $nbFiles + $nbLinks; |
422 | - dol_setcache($cachekey, $totalAttached, 120); // If setting cache fails, this is not a problem, so we do not test result. |
|
422 | + dol_setcache($cachekey, $totalAttached, 120); // If setting cache fails, this is not a problem, so we do not test result. |
|
423 | 423 | } |
424 | 424 | |
425 | 425 | $head[$h][0] = constant('BASE_URL') . '/societe/document.php?socid=' . $object->id; |
@@ -453,7 +453,7 @@ discard block |
||
453 | 453 | } else { |
454 | 454 | dol_syslog('Failed to count actioncomm ' . $db->lasterror(), LOG_ERR); |
455 | 455 | } |
456 | - dol_setcache($cachekey, $nbEvent, 120); // If setting cache fails, this is not a problem, so we do not test result. |
|
456 | + dol_setcache($cachekey, $nbEvent, 120); // If setting cache fails, this is not a problem, so we do not test result. |
|
457 | 457 | } |
458 | 458 | |
459 | 459 | $head[$h][1] .= '/'; |
@@ -854,7 +854,7 @@ discard block |
||
854 | 854 | return false; |
855 | 855 | } |
856 | 856 | |
857 | - $country_code_in_EEC = getCountriesInEEC(); // This make a database call but there is a cache done into $conf->cache['country_code_in_EEC'] |
|
857 | + $country_code_in_EEC = getCountriesInEEC(); // This make a database call but there is a cache done into $conf->cache['country_code_in_EEC'] |
|
858 | 858 | |
859 | 859 | //print "dd".$object->country_code; |
860 | 860 | return in_array($object->country_code, $country_code_in_EEC); |
@@ -1300,7 +1300,7 @@ discard block |
||
1300 | 1300 | $mode = 'view'; |
1301 | 1301 | |
1302 | 1302 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
1303 | - $htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
1303 | + $htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
1304 | 1304 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
1305 | 1305 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
1306 | 1306 | |
@@ -1846,7 +1846,7 @@ discard block |
||
1846 | 1846 | |
1847 | 1847 | // Fields from hook |
1848 | 1848 | $parameters = array('sql' => &$sql, 'filterobj' => $filterobj, 'objcon' => $objcon); |
1849 | - $reshook = $hookmanager->executeHooks('showActionsDoneListSelect', $parameters); // Note that $action and $object may have been modified by hook |
|
1849 | + $reshook = $hookmanager->executeHooks('showActionsDoneListSelect', $parameters); // Note that $action and $object may have been modified by hook |
|
1850 | 1850 | if (!empty($hookmanager->resPrint)) { |
1851 | 1851 | $sql .= $hookmanager->resPrint; |
1852 | 1852 | } |
@@ -1868,7 +1868,7 @@ discard block |
||
1868 | 1868 | |
1869 | 1869 | // Fields from hook |
1870 | 1870 | $parameters = array('sql' => &$sql, 'filterobj' => $filterobj, 'objcon' => $objcon); |
1871 | - $reshook = $hookmanager->executeHooks('showActionsDoneListFrom', $parameters); // Note that $action and $object may have been modified by hook |
|
1871 | + $reshook = $hookmanager->executeHooks('showActionsDoneListFrom', $parameters); // Note that $action and $object may have been modified by hook |
|
1872 | 1872 | if (!empty($hookmanager->resPrint)) { |
1873 | 1873 | $sql .= $hookmanager->resPrint; |
1874 | 1874 | } |
@@ -1993,7 +1993,7 @@ discard block |
||
1993 | 1993 | |
1994 | 1994 | // Fields from hook |
1995 | 1995 | $parameters = array('sql' => &$sql, 'filterobj' => $filterobj, 'objcon' => $objcon, 'module' => $module); |
1996 | - $reshook = $hookmanager->executeHooks('showActionsDoneListWhere', $parameters); // Note that $action and $object may have been modified by hook |
|
1996 | + $reshook = $hookmanager->executeHooks('showActionsDoneListWhere', $parameters); // Note that $action and $object may have been modified by hook |
|
1997 | 1997 | if (!empty($hookmanager->resPrint)) { |
1998 | 1998 | $sql .= $hookmanager->resPrint; |
1999 | 1999 | } |
@@ -2693,14 +2693,14 @@ discard block |
||
2693 | 2693 | $parammessageform = 'ONLINE_PAYMENT_MESSAGE_FORM_' . $suffix; |
2694 | 2694 | if (getDolGlobalString($parammessageform) !== '') { |
2695 | 2695 | print $langs->transnoentities(getDolGlobalString($parammessageform)); |
2696 | - } elseif (getDolGlobalString('ONLINE_PAYMENT_MESSAGE_FORM') !== '') { |
|
2696 | + } elseif (getDolGlobalString('ONLINE_PAYMENT_MESSAGE_FORM') !== '') { |
|
2697 | 2697 | print $langs->transnoentities(getDolGlobalString('ONLINE_PAYMENT_MESSAGE_FORM')); |
2698 | 2698 | } |
2699 | 2699 | |
2700 | 2700 | // Add other message if VAT exists |
2701 | 2701 | if (!empty($object->total_vat) || !empty($object->total_tva)) { |
2702 | 2702 | $parammessageform = 'ONLINE_PAYMENT_MESSAGE_FORMIFVAT_' . $suffix; |
2703 | - if (getDolGlobalString($parammessageform) !== '') { |
|
2703 | + if (getDolGlobalString($parammessageform) !== '') { |
|
2704 | 2704 | print $langs->transnoentities(getDolGlobalString($parammessageform)); |
2705 | 2705 | } elseif (getDolGlobalString('ONLINE_PAYMENT_MESSAGE_FORMIFVAT') !== '') { |
2706 | 2706 | print $langs->transnoentities(getDolGlobalString('ONLINE_PAYMENT_MESSAGE_FORMIFVAT')); |
@@ -414,9 +414,9 @@ |
||
414 | 414 | |
415 | 415 | if ($multicurrency_code) { |
416 | 416 | // Restore setup of currency accurency |
417 | - $conf->global->MAIN_MAX_DECIMALS_UNIT = $savMAIN_MAX_DECIMALS_UNIT; // @phan-suppress-current-line PhanPossiblyUndeclaredVariable |
|
418 | - $conf->global->MAIN_MAX_DECIMALS_TOT = $savMAIN_MAX_DECIMALS_TOT; // @phan-suppress-current-line PhanPossiblyUndeclaredVariable |
|
419 | - $conf->global->MAIN_ROUNDING_RULE_TOT = $savMAIN_ROUNDING_RULE_TOT; // @phan-suppress-current-line PhanPossiblyUndeclaredVariable |
|
417 | + $conf->global->MAIN_MAX_DECIMALS_UNIT = $savMAIN_MAX_DECIMALS_UNIT; // @phan-suppress-current-line PhanPossiblyUndeclaredVariable |
|
418 | + $conf->global->MAIN_MAX_DECIMALS_TOT = $savMAIN_MAX_DECIMALS_TOT; // @phan-suppress-current-line PhanPossiblyUndeclaredVariable |
|
419 | + $conf->global->MAIN_ROUNDING_RULE_TOT = $savMAIN_ROUNDING_RULE_TOT; // @phan-suppress-current-line PhanPossiblyUndeclaredVariable |
|
420 | 420 | } |
421 | 421 | |
422 | 422 | $result[16] = $newresult[0]; |
@@ -81,7 +81,7 @@ |
||
81 | 81 | // Turning on or off the ssl target certificate |
82 | 82 | if ($ssl_verifypeer < 0) { |
83 | 83 | global $dolibarr_main_prod; |
84 | - $ssl_verifypeer = ($dolibarr_main_prod ? true : false); |
|
84 | + $ssl_verifypeer = ($dolibarr_main_prod ? true : false); |
|
85 | 85 | } |
86 | 86 | if (getDolGlobalString('MAIN_CURL_DISABLE_VERIFYPEER')) { |
87 | 87 | $ssl_verifypeer = 0; |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | $content = preg_replace('/<a href="([^"]+)" target="([^"]+)">([^<]+)<\/a>/', '[\3](\1)', $content); |
40 | 40 | |
41 | 41 | // Replace HTML comments |
42 | - $content = preg_replace('/<!--.*-->/Ums', '', $content); // We remove HTML comment that are not MD comment because they will be escaped and output when setSafeMode is set to true. |
|
42 | + $content = preg_replace('/<!--.*-->/Ums', '', $content); // We remove HTML comment that are not MD comment because they will be escaped and output when setSafeMode is set to true. |
|
43 | 43 | |
44 | 44 | if (is_array($replaceimagepath)) { |
45 | 45 | foreach ($replaceimagepath as $key => $val) { |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | if ($parser == 'parsedown') { |
52 | 52 | include_once DOL_DOCUMENT_ROOT . '/includes/parsedown/Parsedown.php'; |
53 | 53 | $parsedown = new Parsedown(); |
54 | - $parsedown->setSafeMode(true); // This will escape HTML link <a href=""> into html entities but markdown links are ok |
|
54 | + $parsedown->setSafeMode(true); // This will escape HTML link <a href=""> into html entities but markdown links are ok |
|
55 | 55 | |
56 | 56 | // Because HTML will be HTML entity encoded, we replace tag we want to keep |
57 | 57 | $content = preg_replace('/<span style="([^"]+)">/', '<!-- SPAN_STYLE_\1 -->', $content); |