@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | * along with this program. If not, see <https://www.gnu.org/licenses/>. |
19 | 19 | */ |
20 | 20 | |
21 | - use Luracast\Restler\RestException; |
|
21 | + use Luracast\Restler\RestException; |
|
22 | 22 | |
23 | 23 | require_once constant('DOL_DOCUMENT_ROOT') . '/ticket/class/ticket.class.php'; |
24 | 24 | require_once constant('DOL_DOCUMENT_ROOT') . '/core/lib/ticket.lib.php'; |
@@ -465,7 +465,7 @@ discard block |
||
465 | 465 | return $ticket; |
466 | 466 | } |
467 | 467 | |
468 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
468 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
469 | 469 | /** |
470 | 470 | * Clean sensible object datas |
471 | 471 | * |
@@ -477,7 +477,7 @@ discard block |
||
477 | 477 | */ |
478 | 478 | protected function _cleanObjectDatas($object) |
479 | 479 | { |
480 | - // phpcs:enable |
|
480 | + // phpcs:enable |
|
481 | 481 | $object = parent::_cleanObjectDatas($object); |
482 | 482 | |
483 | 483 | // Other attributes to clean |
@@ -566,7 +566,7 @@ discard block |
||
566 | 566 | return $this->LibStatut($this->status, $mode); |
567 | 567 | } |
568 | 568 | |
569 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
569 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
570 | 570 | /** |
571 | 571 | * Return the status |
572 | 572 | * |
@@ -576,7 +576,7 @@ discard block |
||
576 | 576 | */ |
577 | 577 | public function LibStatut($status, $mode = 0) |
578 | 578 | { |
579 | - // phpcs:enable |
|
579 | + // phpcs:enable |
|
580 | 580 | if (empty($this->labelStatus) || empty($this->labelStatusShort)) { |
581 | 581 | global $langs; |
582 | 582 | //$langs->load("mymodule@mymodule"); |
@@ -1467,7 +1467,7 @@ discard block |
||
1467 | 1467 | } |
1468 | 1468 | |
1469 | 1469 | |
1470 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1470 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1471 | 1471 | /** |
1472 | 1472 | * Return status label of object |
1473 | 1473 | * |
@@ -1479,7 +1479,7 @@ discard block |
||
1479 | 1479 | */ |
1480 | 1480 | public function LibStatut($status, $mode = 0, $notooltip = 0, $progress = 0) |
1481 | 1481 | { |
1482 | - // phpcs:enable |
|
1482 | + // phpcs:enable |
|
1483 | 1483 | global $langs, $hookmanager; |
1484 | 1484 | |
1485 | 1485 | $labelStatus = (isset($status) && !empty($this->labelStatus[$status])) ? $this->labelStatus[$status] : ''; |
@@ -2433,7 +2433,7 @@ discard block |
||
2433 | 2433 | } |
2434 | 2434 | |
2435 | 2435 | |
2436 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2436 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2437 | 2437 | /** |
2438 | 2438 | * Return if at least one photo is available |
2439 | 2439 | * |
@@ -2442,7 +2442,7 @@ discard block |
||
2442 | 2442 | */ |
2443 | 2443 | public function is_photo_available($sdir) |
2444 | 2444 | { |
2445 | - // phpcs:enable |
|
2445 | + // phpcs:enable |
|
2446 | 2446 | include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php'; |
2447 | 2447 | |
2448 | 2448 | global $conf; |
@@ -3059,7 +3059,7 @@ discard block |
||
3059 | 3059 | return $is_sent; |
3060 | 3060 | } |
3061 | 3061 | |
3062 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
3062 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
3063 | 3063 | /** |
3064 | 3064 | * Load indicators for dashboard (this->nbtodo and this->nbtodolate) |
3065 | 3065 | * |
@@ -3069,7 +3069,7 @@ discard block |
||
3069 | 3069 | */ |
3070 | 3070 | public function load_board($user, $mode) |
3071 | 3071 | { |
3072 | - // phpcs:enable |
|
3072 | + // phpcs:enable |
|
3073 | 3073 | global $user, $langs; |
3074 | 3074 | |
3075 | 3075 | $now = dol_now(); |
@@ -263,14 +263,14 @@ discard block |
||
263 | 263 | /** |
264 | 264 | * Status |
265 | 265 | */ |
266 | - const STATUS_NOT_READ = 0; // Draft. Not take into account yet. |
|
267 | - const STATUS_READ = 1; // Ticket was read. |
|
268 | - const STATUS_ASSIGNED = 2; // Ticket was just assigned to someone. Not in progress yet. |
|
269 | - const STATUS_IN_PROGRESS = 3; // In progress |
|
270 | - const STATUS_NEED_MORE_INFO = 5; // Waiting requester feedback |
|
271 | - const STATUS_WAITING = 7; // On hold |
|
272 | - const STATUS_CLOSED = 8; // Closed - Solved |
|
273 | - const STATUS_CANCELED = 9; // Closed - Not solved |
|
266 | + const STATUS_NOT_READ = 0; // Draft. Not take into account yet. |
|
267 | + const STATUS_READ = 1; // Ticket was read. |
|
268 | + const STATUS_ASSIGNED = 2; // Ticket was just assigned to someone. Not in progress yet. |
|
269 | + const STATUS_IN_PROGRESS = 3; // In progress |
|
270 | + const STATUS_NEED_MORE_INFO = 5; // Waiting requester feedback |
|
271 | + const STATUS_WAITING = 7; // On hold |
|
272 | + const STATUS_CLOSED = 8; // Closed - Solved |
|
273 | + const STATUS_CANCELED = 9; // Closed - Not solved |
|
274 | 274 | |
275 | 275 | |
276 | 276 | /** |
@@ -1854,7 +1854,7 @@ discard block |
||
1854 | 1854 | $actioncomm->socid = $this->socid; |
1855 | 1855 | $actioncomm->label = $this->subject; |
1856 | 1856 | $actioncomm->note_private = $this->message; |
1857 | - $actioncomm->userassigned = array($user->id => array('id' => $user->id,'transparency' => 0)); |
|
1857 | + $actioncomm->userassigned = array($user->id => array('id' => $user->id, 'transparency' => 0)); |
|
1858 | 1858 | $actioncomm->userownerid = $user->id; |
1859 | 1859 | $actioncomm->datep = $now; |
1860 | 1860 | $actioncomm->percentage = -1; // percentage is not relevant for punctual events |
@@ -2429,7 +2429,7 @@ discard block |
||
2429 | 2429 | 'email' => $obj->email, |
2430 | 2430 | 'rowid' => $obj->rowid, |
2431 | 2431 | 'code' => $obj->code, |
2432 | - 'libelle' => $labelType, // deprecated, replaced with labeltype |
|
2432 | + 'libelle' => $labelType, // deprecated, replaced with labeltype |
|
2433 | 2433 | 'labeltype' => $labelType, |
2434 | 2434 | 'status' => $obj->statuslink, |
2435 | 2435 | 'statuscontact' => $obj->statuscontact, |
@@ -2514,7 +2514,7 @@ discard block |
||
2514 | 2514 | if (is_resource($handle)) { |
2515 | 2515 | while (($file = readdir($handle)) !== false) { |
2516 | 2516 | if (!utf8_check($file)) { |
2517 | - $file = mb_convert_encoding($file, 'UTF-8', 'ISO-8859-1'); // To be sure data is stored in UTF8 in memory |
|
2517 | + $file = mb_convert_encoding($file, 'UTF-8', 'ISO-8859-1'); // To be sure data is stored in UTF8 in memory |
|
2518 | 2518 | } |
2519 | 2519 | if (dol_is_file($dir . $file)) { |
2520 | 2520 | return true; |
@@ -2552,7 +2552,7 @@ discard block |
||
2552 | 2552 | $formmail->trackid = (is_null($forcetrackid) ? 'tic' . $this->id : ''); |
2553 | 2553 | $attachedfiles = $formmail->get_attached_files(); |
2554 | 2554 | |
2555 | - $filepath = $attachedfiles['paths']; // path is for example user->dir_temp.'/'.$user->id.'/'... |
|
2555 | + $filepath = $attachedfiles['paths']; // path is for example user->dir_temp.'/'.$user->id.'/'... |
|
2556 | 2556 | $filename = $attachedfiles['names']; |
2557 | 2557 | $mimetype = $attachedfiles['mimes']; |
2558 | 2558 | |
@@ -2980,7 +2980,7 @@ discard block |
||
2980 | 2980 | if ($result) { |
2981 | 2981 | // update last_msg_sent date (for last message sent to external users) |
2982 | 2982 | $this->date_last_msg_sent = dol_now(); |
2983 | - $this->update($user, 1); // disable trigger when updating date_last_msg_sent. sendTicketMessageByEmail already create an event in actioncomm table. |
|
2983 | + $this->update($user, 1); // disable trigger when updating date_last_msg_sent. sendTicketMessageByEmail already create an event in actioncomm table. |
|
2984 | 2984 | } |
2985 | 2985 | } |
2986 | 2986 | } |
@@ -69,21 +69,21 @@ |
||
69 | 69 | |
70 | 70 | |
71 | 71 | if (empty($fk_expense) || $fk_expense < 0) { |
72 | - $rep->errorMessage = $langs->transnoentitiesnoconv('ErrorBadValueForParameter', $fk_expense, 'fk_expense'); |
|
72 | + $rep->errorMessage = $langs->transnoentitiesnoconv('ErrorBadValueForParameter', $fk_expense, 'fk_expense'); |
|
73 | 73 | } elseif (empty($fk_c_exp_tax_cat) || $fk_c_exp_tax_cat < 0) { |
74 | - $rep->errorMessage = $langs->transnoentitiesnoconv('ErrorBadValueForParameter', $fk_c_exp_tax_cat, 'fk_c_exp_tax_cat'); |
|
74 | + $rep->errorMessage = $langs->transnoentitiesnoconv('ErrorBadValueForParameter', $fk_c_exp_tax_cat, 'fk_c_exp_tax_cat'); |
|
75 | 75 | |
76 | 76 | $rep->response_status = 'error'; |
77 | 77 | } else { |
78 | 78 | // @see ndfp.class.php:3576 (method: compute_total_km) |
79 | 79 | $expense = new ExpenseReport($db); |
80 | 80 | if ($expense->fetch($fk_expense) <= 0) { |
81 | - $rep->errorMessage = $langs->transnoentitiesnoconv('ErrorRecordNotFound'); |
|
81 | + $rep->errorMessage = $langs->transnoentitiesnoconv('ErrorRecordNotFound'); |
|
82 | 82 | $rep->response_status = 'error'; |
83 | 83 | } else { |
84 | 84 | $userauthor = new User($db); |
85 | 85 | if ($userauthor->fetch($expense->fk_user_author) <= 0) { |
86 | - $rep->errorMessage = $langs->transnoentitiesnoconv('ErrorRecordNotFound'); |
|
86 | + $rep->errorMessage = $langs->transnoentitiesnoconv('ErrorRecordNotFound'); |
|
87 | 87 | $rep->response_status = 'error'; |
88 | 88 | } else { |
89 | 89 | $expense = new ExpenseReport($db); |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | } |
154 | 154 | $result = restrictedArea($user, 'expensereport', $object->id, 'expensereport'); |
155 | 155 | |
156 | -$permissiontoadd = $user->hasRight('expensereport', 'creer'); // Used by the include of actions_dellink.inc.php |
|
156 | +$permissiontoadd = $user->hasRight('expensereport', 'creer'); // Used by the include of actions_dellink.inc.php |
|
157 | 157 | |
158 | 158 | |
159 | 159 | /* |
@@ -2384,7 +2384,7 @@ discard block |
||
2384 | 2384 | |
2385 | 2385 | // Quantity |
2386 | 2386 | print '<td class="right">'; |
2387 | - print '<input type="text" min="0" class="input_qty right maxwidth50" name="qty" value="' . dol_escape_htmltag($line->qty) . '" />'; // We must be able to enter decimal qty |
|
2387 | + print '<input type="text" min="0" class="input_qty right maxwidth50" name="qty" value="' . dol_escape_htmltag($line->qty) . '" />'; // We must be able to enter decimal qty |
|
2388 | 2388 | print '</td>'; |
2389 | 2389 | |
2390 | 2390 | //print '<td class="right">'.$langs->trans('AmountHT').'</td>'; |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | $search_date_endday = GETPOSTINT('search_date_endday'); |
68 | 68 | $search_date_endmonth = GETPOSTINT('search_date_endmonth'); |
69 | 69 | $search_date_endyear = GETPOSTINT('search_date_endyear'); |
70 | -$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
70 | +$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
71 | 71 | $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear); |
72 | 72 | $search_user = GETPOST('search_user', 'alpha'); |
73 | 73 | $search_payment_type = GETPOST('search_payment_type'); |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | 'pndf.amount' => array('label' => "Amount", 'checked' => 1, 'position' => 70), |
115 | 115 | ); |
116 | 116 | $arrayfields = dol_sort_array($arrayfields, 'position'); |
117 | -'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
117 | +'@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 | 118 | |
119 | 119 | // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context |
120 | 120 | $hookmanager->initHooks(array('paymentexpensereportlist')); |
@@ -420,7 +420,7 @@ discard block |
||
420 | 420 | } |
421 | 421 | |
422 | 422 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
423 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
423 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
424 | 424 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
425 | 425 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
426 | 426 |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | $search_date_startendday = GETPOSTINT('search_date_startendday'); |
118 | 118 | $search_date_startendmonth = GETPOSTINT('search_date_startendmonth'); |
119 | 119 | $search_date_startendyear = GETPOSTINT('search_date_startendyear'); |
120 | -$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
120 | +$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
121 | 121 | $search_date_startend = dol_mktime(23, 59, 59, $search_date_startendmonth, $search_date_startendday, $search_date_startendyear); |
122 | 122 | |
123 | 123 | $search_date_endday = GETPOSTINT('search_date_endday'); |
@@ -126,10 +126,10 @@ discard block |
||
126 | 126 | $search_date_endendday = GETPOSTINT('search_date_endendday'); |
127 | 127 | $search_date_endendmonth = GETPOSTINT('search_date_endendmonth'); |
128 | 128 | $search_date_endendyear = GETPOSTINT('search_date_endendyear'); |
129 | -$search_date_end = dol_mktime(0, 0, 0, $search_date_endmonth, $search_date_endday, $search_date_endyear); // Use tzserver |
|
129 | +$search_date_end = dol_mktime(0, 0, 0, $search_date_endmonth, $search_date_endday, $search_date_endyear); // Use tzserver |
|
130 | 130 | $search_date_endend = dol_mktime(23, 59, 59, $search_date_endendmonth, $search_date_endendday, $search_date_endendyear); |
131 | 131 | |
132 | -$optioncss = GETPOST('optioncss', 'alpha'); |
|
132 | +$optioncss = GETPOST('optioncss', 'alpha'); |
|
133 | 133 | |
134 | 134 | if ($search_status == '') { |
135 | 135 | $search_status = -1; |
@@ -588,7 +588,7 @@ discard block |
||
588 | 588 | } |
589 | 589 | |
590 | 590 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
591 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
591 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
592 | 592 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
593 | 593 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
594 | 594 |
@@ -96,7 +96,7 @@ |
||
96 | 96 | } |
97 | 97 | } |
98 | 98 | |
99 | -$permissiontoadd = $user->hasRight('expensereport', 'creer'); // Used by the include of actions_dellink.inc.php |
|
99 | +$permissiontoadd = $user->hasRight('expensereport', 'creer'); // Used by the include of actions_dellink.inc.php |
|
100 | 100 | |
101 | 101 | |
102 | 102 | /* |
@@ -717,7 +717,7 @@ discard block |
||
717 | 717 | |
718 | 718 | |
719 | 719 | |
720 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
720 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
721 | 721 | /** |
722 | 722 | * Clean sensible object datas |
723 | 723 | * |
@@ -726,7 +726,7 @@ discard block |
||
726 | 726 | */ |
727 | 727 | protected function _cleanObjectDatas($object) |
728 | 728 | { |
729 | - // phpcs:enable |
|
729 | + // phpcs:enable |
|
730 | 730 | $object = parent::_cleanObjectDatas($object); |
731 | 731 | |
732 | 732 | unset($object->fk_statut); |