@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | |
116 | 116 | $object->fields = dol_sort_array($object->fields, 'position'); |
117 | 117 | $arrayfields = dol_sort_array($arrayfields, 'position'); |
118 | -'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
118 | +'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
119 | 119 | |
120 | 120 | // Access control |
121 | 121 | // TODO Open this page to a given permission so a sale representative can modify change rates. Permission should be added into module multicurrency. |
@@ -610,7 +610,7 @@ discard block |
||
610 | 610 | print ' - <span class="opacitymedium">' . $obj->name . '</span>'; |
611 | 611 | print "</td>\n"; |
612 | 612 | |
613 | - if (! $i) { |
|
613 | + if (!$i) { |
|
614 | 614 | $totalarray['nbfield']++; |
615 | 615 | } |
616 | 616 | } |
@@ -620,7 +620,7 @@ discard block |
||
620 | 620 | print '<td class="tdoverflowmax200">'; |
621 | 621 | print $obj->rate; |
622 | 622 | print "</td>\n"; |
623 | - if (! $i) { |
|
623 | + if (!$i) { |
|
624 | 624 | $totalarray['nbfield']++; |
625 | 625 | } |
626 | 626 | } |
@@ -630,7 +630,7 @@ discard block |
||
630 | 630 | print '<td class="tdoverflowmax200">'; |
631 | 631 | print $obj->rate_indirect; |
632 | 632 | print "</td>\n"; |
633 | - if (! $i) { |
|
633 | + if (!$i) { |
|
634 | 634 | $totalarray['nbfield']++; |
635 | 635 | } |
636 | 636 | } |
@@ -638,7 +638,7 @@ discard block |
||
638 | 638 | |
639 | 639 | // Fields from hook |
640 | 640 | $parameters = array('arrayfields' => $arrayfields, 'obj' => $obj); |
641 | - $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook |
|
641 | + $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook |
|
642 | 642 | print $hookmanager->resPrint; |
643 | 643 | |
644 | 644 | // Action |
@@ -43,7 +43,7 @@ |
||
43 | 43 | $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : str_replace('_', '', basename(dirname(__FILE__)) . basename(__FILE__, '.php')); // To manage different context of search |
44 | 44 | $backtopage = GETPOST('backtopage', 'alpha'); |
45 | 45 | $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); |
46 | -$lineid = GETPOSTINT('lineid'); |
|
46 | +$lineid = GETPOSTINT('lineid'); |
|
47 | 47 | $dol_openinpopup = GETPOST('dol_openinpopup', 'aZ09'); |
48 | 48 | |
49 | 49 | // Initialize technical objects |
@@ -811,7 +811,7 @@ discard block |
||
811 | 811 | print '<tr class="liste_titre">'; |
812 | 812 | if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { |
813 | 813 | print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ') . "\n"; |
814 | - $totalarray['nbfield']++; // For the column action |
|
814 | + $totalarray['nbfield']++; // For the column action |
|
815 | 815 | } |
816 | 816 | foreach ($object->fields as $key => $val) { |
817 | 817 | $cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']); |
@@ -824,7 +824,7 @@ discard block |
||
824 | 824 | } 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'])) { |
825 | 825 | $cssforfield .= ($cssforfield ? ' ' : '') . 'right'; |
826 | 826 | } |
827 | - $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
827 | + $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
828 | 828 | if (!empty($arrayfields['t.' . $key]['checked'])) { |
829 | 829 | 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"; |
830 | 830 | $totalarray['nbfield']++; |
@@ -845,7 +845,7 @@ discard block |
||
845 | 845 | // Action column |
846 | 846 | if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { |
847 | 847 | print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ') . "\n"; |
848 | - $totalarray['nbfield']++; // For the column action |
|
848 | + $totalarray['nbfield']++; // For the column action |
|
849 | 849 | } |
850 | 850 | print '</tr>' . "\n"; |
851 | 851 |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | $micro_start_time = 0; |
48 | 48 | if (!empty($_SERVER['MAIN_SHOW_TUNING_INFO'])) { |
49 | 49 | list($usec, $sec) = explode(" ", microtime()); |
50 | - $micro_start_time = ((float)$usec + (float)$sec); |
|
50 | + $micro_start_time = ((float) $usec + (float) $sec); |
|
51 | 51 | // Add Xdebug code coverage |
52 | 52 | //define('XDEBUGCOVERAGE',1); |
53 | 53 | if (defined('XDEBUGCOVERAGE')) { |
@@ -64,15 +64,15 @@ discard block |
||
64 | 64 | function getArrayOfEmoji() |
65 | 65 | { |
66 | 66 | $arrayofcommonemoji = array( |
67 | - 'misc' => array('2600', '26FF'), // Miscellaneous Symbols |
|
68 | - 'ding' => array('2700', '27BF'), // Dingbats |
|
69 | - '????' => array('9989', '9989'), // Variation Selectors |
|
70 | - 'vars' => array('FE00', 'FE0F'), // Variation Selectors |
|
71 | - 'pict' => array('1F300', '1F5FF'), // Miscellaneous Symbols and Pictographs |
|
72 | - 'emot' => array('1F600', '1F64F'), // Emoticons |
|
73 | - 'tran' => array('1F680', '1F6FF'), // Transport and Map Symbols |
|
74 | - 'flag' => array('1F1E0', '1F1FF'), // Flags (note: may be 1F1E6 instead of 1F1E0) |
|
75 | - 'supp' => array('1F900', '1F9FF'), // Supplemental Symbols and Pictographs |
|
67 | + 'misc' => array('2600', '26FF'), // Miscellaneous Symbols |
|
68 | + 'ding' => array('2700', '27BF'), // Dingbats |
|
69 | + '????' => array('9989', '9989'), // Variation Selectors |
|
70 | + 'vars' => array('FE00', 'FE0F'), // Variation Selectors |
|
71 | + 'pict' => array('1F300', '1F5FF'), // Miscellaneous Symbols and Pictographs |
|
72 | + 'emot' => array('1F600', '1F64F'), // Emoticons |
|
73 | + 'tran' => array('1F680', '1F6FF'), // Transport and Map Symbols |
|
74 | + 'flag' => array('1F1E0', '1F1FF'), // Flags (note: may be 1F1E6 instead of 1F1E0) |
|
75 | + 'supp' => array('1F900', '1F9FF'), // Supplemental Symbols and Pictographs |
|
76 | 76 | ); |
77 | 77 | |
78 | 78 | return $arrayofcommonemoji; |
@@ -93,12 +93,12 @@ discard block |
||
93 | 93 | if (preg_match('/^x/i', $newstringnumentity)) { // if numeric is hexadecimal |
94 | 94 | $newstringnumentity = hexdec(preg_replace('/^x/i', '', $newstringnumentity)); |
95 | 95 | } else { |
96 | - $newstringnumentity = (int)$newstringnumentity; |
|
96 | + $newstringnumentity = (int) $newstringnumentity; |
|
97 | 97 | } |
98 | 98 | |
99 | 99 | // The numeric values we don't want as entities because they encode ascii char, and why using html entities on ascii except for haking ? |
100 | 100 | if (($newstringnumentity >= 65 && $newstringnumentity <= 90) || ($newstringnumentity >= 97 && $newstringnumentity <= 122)) { |
101 | - return chr((int)$newstringnumentity); |
|
101 | + return chr((int) $newstringnumentity); |
|
102 | 102 | } |
103 | 103 | |
104 | 104 | // The numeric values we want in UTF8 instead of entities because it is emoji |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | //print "before decoding $val\n"; |
135 | 135 | do { |
136 | 136 | $oldval = $val; |
137 | - $val = html_entity_decode($val, ENT_QUOTES | ENT_HTML5); // Decode ':', ''', '	', '&NewLine', ... |
|
137 | + $val = html_entity_decode($val, ENT_QUOTES | ENT_HTML5); // Decode ':', ''', '	', '&NewLine', ... |
|
138 | 138 | // Sometimes we have entities without the ; at end so html_entity_decode does not work but entities is still interpreted by browser. |
139 | 139 | $val = preg_replace_callback( |
140 | 140 | '/&#(x?[0-9][0-9a-f]+;?)/i', |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | * @param string[] $m |
143 | 143 | * @return string |
144 | 144 | */ |
145 | - static function ($m) { |
|
145 | + static function($m) { |
|
146 | 146 | // Decode 'n', ... |
147 | 147 | return realCharForNumericEntities($m); |
148 | 148 | }, |
@@ -183,7 +183,7 @@ discard block |
||
183 | 183 | $inj += preg_match('/user\s*\(/i', $val); // avoid to use function user() or mysql_user() that return current database login |
184 | 184 | $inj += preg_match('/information_schema/i', $val); // avoid to use request that read information_schema database |
185 | 185 | $inj += preg_match('/<svg/i', $val); // <svg can be allowed in POST |
186 | - $inj += preg_match('/update[^&=\w].*set.+=/i', $val); // the [^&=\w] test is to avoid error when request is like action=update&...set... or &updatemodule=...set... |
|
186 | + $inj += preg_match('/update[^&=\w].*set.+=/i', $val); // the [^&=\w] test is to avoid error when request is like action=update&...set... or &updatemodule=...set... |
|
187 | 187 | $inj += preg_match('/union.+select/i', $val); |
188 | 188 | } |
189 | 189 | if ($type == 3) { |
@@ -278,11 +278,11 @@ discard block |
||
278 | 278 | $ip = (empty($_SERVER['REMOTE_ADDR']) ? 'unknown' : $_SERVER['REMOTE_ADDR']); |
279 | 279 | |
280 | 280 | if ($stopcode) { |
281 | - $errormessage = 'Access refused to ' . htmlentities($ip, ENT_COMPAT, 'UTF-8') . ' by SQL or Script injection protection in main.inc.php:analyseVarsForSqlAndScriptsInjection type=' . htmlentities((string)$type, ENT_COMPAT, 'UTF-8'); |
|
281 | + $errormessage = 'Access refused to ' . htmlentities($ip, ENT_COMPAT, 'UTF-8') . ' by SQL or Script injection protection in main.inc.php:analyseVarsForSqlAndScriptsInjection type=' . htmlentities((string) $type, ENT_COMPAT, 'UTF-8'); |
|
282 | 282 | //$errormessage .= ' paramkey='.htmlentities($key, ENT_COMPAT, 'UTF-8'); // Disabled to avoid text injection |
283 | 283 | |
284 | 284 | $errormessage2 = 'page=' . htmlentities((empty($_SERVER["REQUEST_URI"]) ? '' : $_SERVER["REQUEST_URI"]), ENT_COMPAT, 'UTF-8'); |
285 | - $errormessage2 .= ' paramtype=' . htmlentities((string)$type, ENT_COMPAT, 'UTF-8'); |
|
285 | + $errormessage2 .= ' paramtype=' . htmlentities((string) $type, ENT_COMPAT, 'UTF-8'); |
|
286 | 286 | $errormessage2 .= ' paramkey=' . htmlentities($key, ENT_COMPAT, 'UTF-8'); |
287 | 287 | $errormessage2 .= ' paramvalue=' . htmlentities($value, ENT_COMPAT, 'UTF-8'); |
288 | 288 | |
@@ -433,7 +433,7 @@ discard block |
||
433 | 433 | session_set_cookie_params($sessioncookieparams); |
434 | 434 | } |
435 | 435 | session_name($sessionname); |
436 | - dol_session_start(); // This call the open and read of session handler |
|
436 | + dol_session_start(); // This call the open and read of session handler |
|
437 | 437 | //exit; // this exist generates a call to write and close |
438 | 438 | } |
439 | 439 | |
@@ -618,7 +618,7 @@ discard block |
||
618 | 618 | // Note: Using MAIN_SECURITY_CSRF_TOKEN_RENEWAL_ON_EACH_CALL is not recommended: if a user succeed in entering a data from |
619 | 619 | // a public page with a link that make a token regeneration, it can make use of the backoffice no more possible ! |
620 | 620 | // Save in $_SESSION['newtoken'] what will be next token. Into forms, we will add param token = $_SESSION['newtoken'] |
621 | - $token = dol_hash(uniqid((string)mt_rand(), false), 'md5'); // Generates a hash of a random number. We don't need a secured hash, just a changing random value. |
|
621 | + $token = dol_hash(uniqid((string) mt_rand(), false), 'md5'); // Generates a hash of a random number. We don't need a secured hash, just a changing random value. |
|
622 | 622 | $_SESSION['newtoken'] = $token; |
623 | 623 | dol_syslog("NEW TOKEN generated by : " . $_SERVER['PHP_SELF'], LOG_DEBUG); |
624 | 624 | } |
@@ -700,16 +700,16 @@ discard block |
||
700 | 700 | } |
701 | 701 | $savid = null; |
702 | 702 | if (isset($_POST['id'])) { |
703 | - $savid = ((int)$_POST['id']); |
|
703 | + $savid = ((int) $_POST['id']); |
|
704 | 704 | } |
705 | 705 | unset($_POST); |
706 | 706 | unset($_GET['confirm']); |
707 | 707 | unset($_GET['action']); |
708 | 708 | unset($_GET['confirmmassaction']); |
709 | 709 | unset($_GET['massaction']); |
710 | - unset($_GET['token']); // TODO Make a redirect if we have a token in url to remove it ? |
|
710 | + unset($_GET['token']); // TODO Make a redirect if we have a token in url to remove it ? |
|
711 | 711 | if (isset($savid)) { |
712 | - $_POST['id'] = ((int)$savid); |
|
712 | + $_POST['id'] = ((int) $savid); |
|
713 | 713 | } |
714 | 714 | // So rest of code can know something was wrong here |
715 | 715 | $_GET['errorcode'] = 'InvalidToken'; |
@@ -1018,7 +1018,7 @@ discard block |
||
1018 | 1018 | if (!empty($_SERVER["HTTP_USER_AGENT"]) && $_SERVER["HTTP_USER_AGENT"] == 'securitytest') { |
1019 | 1019 | http_response_code(401); // It makes easier to understand if session was broken during security tests |
1020 | 1020 | } |
1021 | - dol_loginfunction($langs, $conf, (!empty($mysoc) ? $mysoc : '')); // This include http headers |
|
1021 | + dol_loginfunction($langs, $conf, (!empty($mysoc) ? $mysoc : '')); // This include http headers |
|
1022 | 1022 | } |
1023 | 1023 | exit; |
1024 | 1024 | } |
@@ -1366,7 +1366,7 @@ discard block |
||
1366 | 1366 | } else { |
1367 | 1367 | // We may have NOLOGIN set, but NOREQUIREUSER not |
1368 | 1368 | if (!empty($user) && method_exists($user, 'loadDefaultValues') && !defined('NODEFAULTVALUES')) { |
1369 | - $user->loadDefaultValues(); // Load default values for everybody (works even if $user->id = 0 |
|
1369 | + $user->loadDefaultValues(); // Load default values for everybody (works even if $user->id = 0 |
|
1370 | 1370 | } |
1371 | 1371 | } |
1372 | 1372 | |
@@ -1537,7 +1537,7 @@ discard block |
||
1537 | 1537 | } |
1538 | 1538 | if (!class_exists('MenuManager')) { |
1539 | 1539 | $menufound = 0; |
1540 | - $dirmenus = array_merge(array("/core/menus/"), (array)$conf->modules_parts['menus']); |
|
1540 | + $dirmenus = array_merge(array("/core/menus/"), (array) $conf->modules_parts['menus']); |
|
1541 | 1541 | foreach ($dirmenus as $dirmenu) { |
1542 | 1542 | $menufound = dol_include_once($dirmenu . "standard/" . $file_menu); |
1543 | 1543 | if (class_exists('MenuManager')) { |
@@ -1992,9 +1992,9 @@ discard block |
||
1992 | 1992 | |
1993 | 1993 | // CSS forced by modules (relative url starting with /) |
1994 | 1994 | if (!empty($conf->modules_parts['css'])) { |
1995 | - $arraycss = (array)$conf->modules_parts['css']; |
|
1995 | + $arraycss = (array) $conf->modules_parts['css']; |
|
1996 | 1996 | foreach ($arraycss as $modcss => $filescss) { |
1997 | - $filescss = (array)$filescss; // To be sure filecss is an array |
|
1997 | + $filescss = (array) $filescss; // To be sure filecss is an array |
|
1998 | 1998 | foreach ($filescss as $cssfile) { |
1999 | 1999 | if (empty($cssfile)) { |
2000 | 2000 | dol_syslog("Warning: module " . $modcss . " declared a css path file into its descriptor that is empty.", LOG_WARNING); |
@@ -2153,9 +2153,9 @@ discard block |
||
2153 | 2153 | |
2154 | 2154 | // JS forced by modules (relative url starting with /) |
2155 | 2155 | if (!empty($conf->modules_parts['js'])) { // $conf->modules_parts['js'] is array('module'=>array('file1','file2')) |
2156 | - $arrayjs = (array)$conf->modules_parts['js']; |
|
2156 | + $arrayjs = (array) $conf->modules_parts['js']; |
|
2157 | 2157 | foreach ($arrayjs as $modjs => $filesjs) { |
2158 | - $filesjs = (array)$filesjs; // To be sure filejs is an array |
|
2158 | + $filesjs = (array) $filesjs; // To be sure filejs is an array |
|
2159 | 2159 | foreach ($filesjs as $jsfile) { |
2160 | 2160 | // jsfile is a relative path |
2161 | 2161 | $urlforjs = dol_buildpath($jsfile, 3); |
@@ -2571,7 +2571,7 @@ discard block |
||
2571 | 2571 | $langFlag = picto_from_langcode($langs->getDefaultLang()); |
2572 | 2572 | $dropdownBody .= '<br><b>' . $langs->trans("CurrentUserLanguage") . ':</b> ' . ($langFlag ? $langFlag . ' ' : '') . $langs->getDefaultLang(); |
2573 | 2573 | |
2574 | - $tz = (int)$_SESSION['dol_tz'] + (int)$_SESSION['dol_dst']; |
|
2574 | + $tz = (int) $_SESSION['dol_tz'] + (int) $_SESSION['dol_dst']; |
|
2575 | 2575 | $dropdownBody .= '<br><b>' . $langs->trans("ClientTZ") . ':</b> ' . ($tz ? ($tz >= 0 ? '+' : '') . $tz : ''); |
2576 | 2576 | $dropdownBody .= ' (' . $_SESSION['dol_tz_string'] . ')'; |
2577 | 2577 | //$dropdownBody .= ' '.$langs->trans("DaylingSavingTime").': '; |
@@ -2617,7 +2617,7 @@ discard block |
||
2617 | 2617 | |
2618 | 2618 | // Defined the links for bottom of card |
2619 | 2619 | $profilLink = '<a accesskey="u" href="' . BASE_URL . '/user/card.php?id=' . $user->id . '" class="button-top-menu-dropdown" title="' . dol_escape_htmltag($langs->trans("YourUserFile") . ' (' . $stringforfirstkey . ' u)') . '"><i class="fa fa-user"></i> ' . $langs->trans("Card") . '</a>'; |
2620 | - $urltovirtualcard = '/user/virtualcard.php?id=' . ((int)$user->id); |
|
2620 | + $urltovirtualcard = '/user/virtualcard.php?id=' . ((int) $user->id); |
|
2621 | 2621 | $virtuelcardLink = dolButtonToOpenUrlInDialogPopup('publicvirtualcardmenu', $langs->transnoentitiesnoconv("PublicVirtualCardUrl") . (is_object($user) ? ' - ' . $user->getFullName($langs) : '') . ' (' . $stringforfirstkey . ' v)', img_picto($langs->trans("PublicVirtualCardUrl") . ' (' . $stringforfirstkey . ' v)', 'card', ''), $urltovirtualcard, '', 'button-top-menu-dropdown marginleftonly nohover', "closeTopMenuLoginDropdown()", '', 'v'); |
2622 | 2622 | $logoutLink = '<a accesskey="l" href="' . $urllogout . '" class="button-top-menu-dropdown" title="' . dol_escape_htmltag($langs->trans("Logout") . ' (' . $stringforfirstkey . ' l)') . '"><i class="fa fa-sign-out-alt padingright"></i><span class="hideonsmartphone">' . $langs->trans("Logout") . '</span></a>'; |
2623 | 2623 | |
@@ -3861,7 +3861,7 @@ discard block |
||
3861 | 3861 | $forceping = GETPOST('forceping', 'alpha'); |
3862 | 3862 | if (($_SERVER["PHP_SELF"] == constant('BASE_URL') . '/index.php') || $forceping) { |
3863 | 3863 | //print '<!-- instance_unique_id='.$conf->file->instance_unique_id.' MAIN_FIRST_PING_OK_ID='.$conf->global->MAIN_FIRST_PING_OK_ID.' -->'; |
3864 | - $hash_unique_id = dol_hash('dolibarr' . $conf->file->instance_unique_id, 'sha256'); // Note: if the global salt changes, this hash changes too so ping may be counted twice. We don't mind. It is for statistics purpose only. |
|
3864 | + $hash_unique_id = dol_hash('dolibarr' . $conf->file->instance_unique_id, 'sha256'); // Note: if the global salt changes, this hash changes too so ping may be counted twice. We don't mind. It is for statistics purpose only. |
|
3865 | 3865 | |
3866 | 3866 | if ( |
3867 | 3867 | !getDolGlobalString('MAIN_FIRST_PING_OK_DATE') |
@@ -3903,8 +3903,8 @@ discard block |
||
3903 | 3903 | hash_algo: 'dol_hash-sha256', |
3904 | 3904 | hash_unique_id: '<?php echo dol_escape_js($hash_unique_id); ?>', |
3905 | 3905 | action: 'dolibarrping', |
3906 | - version: '<?php echo (float)DOL_VERSION; ?>', |
|
3907 | - entity: '<?php echo (int)$conf->entity; ?>', |
|
3906 | + version: '<?php echo (float) DOL_VERSION; ?>', |
|
3907 | + entity: '<?php echo (int) $conf->entity; ?>', |
|
3908 | 3908 | dbtype: '<?php echo dol_escape_js($db->type); ?>', |
3909 | 3909 | country_code: '<?php echo $mysoc->country_code ? dol_escape_js($mysoc->country_code) : 'unknown'; ?>', |
3910 | 3910 | php_version: '<?php echo dol_escape_js(phpversion()); ?>', |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | $search_date_endday = GETPOSTINT('search_date_endday'); |
79 | 79 | $search_date_endmonth = GETPOSTINT('search_date_endmonth'); |
80 | 80 | $search_date_endyear = GETPOSTINT('search_date_endyear'); |
81 | -$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
81 | +$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
82 | 82 | $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear); |
83 | 83 | $optioncss = GETPOST('optioncss', 'alpha'); |
84 | 84 | $socid = GETPOSTINT('socid'); |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | |
107 | 107 | // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context |
108 | 108 | $object = new Fichinter($db); |
109 | -$hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array of activated contexes |
|
109 | +$hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array of activated contexes |
|
110 | 110 | |
111 | 111 | $extrafields = new ExtraFields($db); |
112 | 112 | |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | |
154 | 154 | $object->fields = dol_sort_array($object->fields, 'position'); |
155 | 155 | $arrayfields = dol_sort_array($arrayfields, 'position'); |
156 | -'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
156 | +'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
157 | 157 | |
158 | 158 | // Security check |
159 | 159 | $id = GETPOSTINT('id'); |
@@ -414,7 +414,7 @@ discard block |
||
414 | 414 | // Output page |
415 | 415 | // -------------------------------------------------------------------- |
416 | 416 | |
417 | -llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll |
|
417 | +llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll |
|
418 | 418 | |
419 | 419 | |
420 | 420 | $arrayofselected = is_array($toselect) ? $toselect : array(); |
@@ -567,7 +567,7 @@ discard block |
||
567 | 567 | } |
568 | 568 | |
569 | 569 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
570 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
570 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
571 | 571 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
572 | 572 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
573 | 573 | |
@@ -787,7 +787,7 @@ discard block |
||
787 | 787 | $objectstatic->id = $obj->rowid; |
788 | 788 | $objectstatic->ref = $obj->ref; |
789 | 789 | $objectstatic->ref_client = $obj->ref_client; |
790 | - $objectstatic->statut = $obj->status; // deprecated |
|
790 | + $objectstatic->statut = $obj->status; // deprecated |
|
791 | 791 | $objectstatic->status = $obj->status; |
792 | 792 | |
793 | 793 | $companystatic->name = $obj->name; |
@@ -959,7 +959,7 @@ discard block |
||
959 | 959 | if (!empty($arrayfields['f.note_public']['checked'])) { |
960 | 960 | print '<td class="sensiblehtmlcontent center">'; |
961 | 961 | print dolPrintHTML($obj->note_public); |
962 | - print '</td>';if (!$i) { |
|
962 | + print '</td>'; if (!$i) { |
|
963 | 963 | $totalarray['nbfield']++; |
964 | 964 | } |
965 | 965 | } |
@@ -360,7 +360,7 @@ |
||
360 | 360 | if (isModEnabled('contract')) { |
361 | 361 | $formcontract = new FormContract($db); |
362 | 362 | print "<tr><td>" . $langs->trans("Contract") . "</td><td>"; |
363 | - $contractid = GETPOST('contractid') ? GETPOST('contractid') : (!empty($object->fk_contrat) ? $object->fk_contrat : 0) ; |
|
363 | + $contractid = GETPOST('contractid') ? GETPOST('contractid') : (!empty($object->fk_contrat) ? $object->fk_contrat : 0); |
|
364 | 364 | $numcontract = $formcontract->select_contract($object->thirdparty->id, $contractid, 'contracttid'); |
365 | 365 | print "</td></tr>"; |
366 | 366 | } |
@@ -90,7 +90,7 @@ |
||
90 | 90 | * @param array{time:int} $itemB Message B information |
91 | 91 | * @return int<-1,1> -1 if Item A before Item B, 0 if same, 1 if later. |
92 | 92 | */ |
93 | - static function ($itemA, $itemB) { |
|
93 | + static function($itemA, $itemB) { |
|
94 | 94 | if ($itemA['time'] === $itemB['time']) { |
95 | 95 | return 0; |
96 | 96 | } |
@@ -82,10 +82,10 @@ |
||
82 | 82 | $baseUrl = constant('DOL_URL_ROOT') . '/includes/maximebf/debugbar/src/DebugBar/Resources'; |
83 | 83 | } |
84 | 84 | $renderer = parent::getJavascriptRenderer($baseUrl, $basePath); |
85 | - $renderer->disableVendor('jquery'); // We already have jquery loaded globally by the main.inc.php |
|
86 | - $renderer->disableVendor('fontawesome'); // We already have fontawesome loaded globally by the main.inc.php |
|
87 | - $renderer->disableVendor('highlightjs'); // We don't need this |
|
88 | - $renderer->setEnableJqueryNoConflict(false); // We don't need no conflict |
|
85 | + $renderer->disableVendor('jquery'); // We already have jquery loaded globally by the main.inc.php |
|
86 | + $renderer->disableVendor('fontawesome'); // We already have fontawesome loaded globally by the main.inc.php |
|
87 | + $renderer->disableVendor('highlightjs'); // We don't need this |
|
88 | + $renderer->setEnableJqueryNoConflict(false); // We don't need no conflict |
|
89 | 89 | |
90 | 90 | return $renderer; |
91 | 91 | } |
@@ -57,16 +57,16 @@ |
||
57 | 57 | // Editing global variables not related to a specific theme |
58 | 58 | $constantes = array( |
59 | 59 | 'MEMBER_REMINDER_EMAIL' => array('type' => 'yesno', 'label' => $langs->trans('MEMBER_REMINDER_EMAIL', $langs->transnoentities("Module2300Name"))), |
60 | - 'ADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION' => array('type' => 'emailtemplate:member','label' => ''), |
|
61 | - 'ADHERENT_EMAIL_TEMPLATE_AUTOREGISTER' => array('type' => 'emailtemplate:member','label' => ''), |
|
62 | - 'ADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION' => array('type' => 'emailtemplate:member','label' => ''), |
|
63 | - 'ADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION' => array('type' => 'emailtemplate:member','label' => ''), |
|
64 | - 'ADHERENT_EMAIL_TEMPLATE_CANCELATION' => array('type' => 'emailtemplate:member','label' => ''), |
|
65 | - 'ADHERENT_EMAIL_TEMPLATE_EXCLUSION' => array('type' => 'emailtemplate:member','label' => ''), |
|
66 | - 'ADHERENT_MAIL_FROM' => array('type' => 'string','label' => ''), |
|
67 | - 'ADHERENT_CC_MAIL_FROM' => array('type' => 'string','label' => ''), |
|
68 | - 'ADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT' => array('type' => 'string','label' => ''), |
|
69 | - 'ADHERENT_AUTOREGISTER_NOTIF_MAIL' => array('type' => 'html', 'tooltip' => $helptext,'label' => '') |
|
60 | + 'ADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION' => array('type' => 'emailtemplate:member', 'label' => ''), |
|
61 | + 'ADHERENT_EMAIL_TEMPLATE_AUTOREGISTER' => array('type' => 'emailtemplate:member', 'label' => ''), |
|
62 | + 'ADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION' => array('type' => 'emailtemplate:member', 'label' => ''), |
|
63 | + 'ADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION' => array('type' => 'emailtemplate:member', 'label' => ''), |
|
64 | + 'ADHERENT_EMAIL_TEMPLATE_CANCELATION' => array('type' => 'emailtemplate:member', 'label' => ''), |
|
65 | + 'ADHERENT_EMAIL_TEMPLATE_EXCLUSION' => array('type' => 'emailtemplate:member', 'label' => ''), |
|
66 | + 'ADHERENT_MAIL_FROM' => array('type' => 'string', 'label' => ''), |
|
67 | + 'ADHERENT_CC_MAIL_FROM' => array('type' => 'string', 'label' => ''), |
|
68 | + 'ADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT' => array('type' => 'string', 'label' => ''), |
|
69 | + 'ADHERENT_AUTOREGISTER_NOTIF_MAIL' => array('type' => 'html', 'tooltip' => $helptext, 'label' => '') |
|
70 | 70 | ); |
71 | 71 | |
72 | 72 |