@@ -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; |
@@ -322,7 +322,7 @@ discard block |
||
| 322 | 322 | |
| 323 | 323 | if (!$error) { |
| 324 | 324 | // File transfer |
| 325 | - $object->copyFilesForTicket(''); // trackid is forced to '' because files were uploaded when no id for ticket exists yet and trackid was '' |
|
| 325 | + $object->copyFilesForTicket(''); // trackid is forced to '' because files were uploaded when no id for ticket exists yet and trackid was '' |
|
| 326 | 326 | } |
| 327 | 327 | } |
| 328 | 328 | if (!$error) { |
@@ -704,7 +704,7 @@ discard block |
||
| 704 | 704 | |
| 705 | 705 | print load_fiche_titre($langs->trans('NewTicket'), '', 'ticket'); |
| 706 | 706 | |
| 707 | - $formticket->trackid = ''; // TODO Use a unique key 'tic' to avoid conflict in upload file feature |
|
| 707 | + $formticket->trackid = ''; // TODO Use a unique key 'tic' to avoid conflict in upload file feature |
|
| 708 | 708 | $formticket->withfromsocid = $socid ? $socid : $user->socid; |
| 709 | 709 | $formticket->withfromcontactid = $contactid ? $contactid : ''; |
| 710 | 710 | $formticket->withtitletopic = 1; |
@@ -732,7 +732,7 @@ discard block |
||
| 732 | 732 | |
| 733 | 733 | print dol_get_fiche_head($head, 'tabTicket', $langs->trans('Ticket'), -1, 'ticket'); |
| 734 | 734 | |
| 735 | - $formticket->trackid = $object->track_id; // TODO Use a unique key 'tic' to avoid conflict in upload file feature |
|
| 735 | + $formticket->trackid = $object->track_id; // TODO Use a unique key 'tic' to avoid conflict in upload file feature |
|
| 736 | 736 | $formticket->withfromsocid = $object->socid; |
| 737 | 737 | $formticket->withtitletopic = 1; |
| 738 | 738 | // $formticket->withnotifytiersatcreate = ($notifyTiers ? 1 : (getDolGlobalString('TICKET_CHECK_NOTIFY_THIRDPARTY_AT_CREATION') ? 1 : 0)); |
@@ -971,8 +971,8 @@ discard block |
||
| 971 | 971 | $morehtmlref .= $formcontract->formSelectContract($_SERVER["PHP_SELF"] . '?id=' . $object->id, $object->socid, $object->fk_contract, 'contratid', 0, 1, 1, 1); |
| 972 | 972 | } else { |
| 973 | 973 | $morehtmlref .= '<a class="editfielda" href="' . $_SERVER["PHP_SELF"] . '?action=edit_contrat&token=' . newToken() . '&id=' . $object->id . '">'; |
| 974 | - $morehtmlref .= img_edit($langs->trans('SetContract')); |
|
| 975 | - $morehtmlref .= '</a>'; |
|
| 974 | + $morehtmlref .= img_edit($langs->trans('SetContract')); |
|
| 975 | + $morehtmlref .= '</a>'; |
|
| 976 | 976 | } |
| 977 | 977 | } else { |
| 978 | 978 | if (!empty($object->fk_contract)) { |
@@ -192,7 +192,9 @@ discard block |
||
| 192 | 192 | |
| 193 | 193 | if (($action == 'add' || ($action == 'update' && $object->status < Ticket::STATUS_CLOSED)) && $permissiontoadd) { |
| 194 | 194 | $ifErrorAction = $action == 'add' ? 'create' : 'edit'; |
| 195 | - if ($action == 'add') $object->track_id = null; |
|
| 195 | + if ($action == 'add') { |
|
| 196 | + $object->track_id = null; |
|
| 197 | + } |
|
| 196 | 198 | $error = 0; |
| 197 | 199 | |
| 198 | 200 | $fieldsToCheck = [ |
@@ -344,7 +346,9 @@ discard block |
||
| 344 | 346 | $db->rollback(); |
| 345 | 347 | setEventMessages($object->error, $object->errors, 'errors'); |
| 346 | 348 | } |
| 347 | - } else $action = $ifErrorAction; |
|
| 349 | + } else { |
|
| 350 | + $action = $ifErrorAction; |
|
| 351 | + } |
|
| 348 | 352 | } |
| 349 | 353 | |
| 350 | 354 | // Mark as Read |
@@ -987,7 +987,7 @@ discard block |
||
| 987 | 987 | } 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'])) { |
| 988 | 988 | $cssforfield .= ($cssforfield ? ' ' : '') . 'right'; |
| 989 | 989 | } |
| 990 | - $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
| 990 | + $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
| 991 | 991 | if (!empty($arrayfields['t.' . $key]['checked'])) { |
| 992 | 992 | 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"; |
| 993 | 993 | $totalarray['nbfield']++; |
@@ -1156,11 +1156,11 @@ discard block |
||
| 1156 | 1156 | $should_show_warning = (getDolGlobalString('TICKET_DELAY_SINCE_LAST_RESPONSE') || getDolGlobalString('TICKET_DELAY_BEFORE_FIRST_RESPONSE')); |
| 1157 | 1157 | if ($is_open && $should_show_warning) { |
| 1158 | 1158 | $date_last_msg_sent = (int) $object->date_last_msg_sent; |
| 1159 | - $hour_diff = ($now - $date_last_msg_sent) / 3600 ; |
|
| 1159 | + $hour_diff = ($now - $date_last_msg_sent) / 3600; |
|
| 1160 | 1160 | |
| 1161 | 1161 | if (getDolGlobalString('TICKET_DELAY_BEFORE_FIRST_RESPONSE') && $date_last_msg_sent == 0) { |
| 1162 | - $creation_date = $object->datec; |
|
| 1163 | - $hour_diff_creation = ($now - $creation_date) / 3600 ; |
|
| 1162 | + $creation_date = $object->datec; |
|
| 1163 | + $hour_diff_creation = ($now - $creation_date) / 3600; |
|
| 1164 | 1164 | if ($hour_diff_creation > getDolGlobalInt('TICKET_DELAY_BEFORE_FIRST_RESPONSE')) { |
| 1165 | 1165 | print " " . img_picto($langs->trans('Late') . ' : ' . $langs->trans('TicketsDelayForFirstResponseTooLong', getDolGlobalString('TICKET_DELAY_BEFORE_FIRST_RESPONSE')), 'warning', 'style="color: red;"', false, 0, 0, '', ''); |
| 1166 | 1166 | } |
@@ -1256,7 +1256,7 @@ discard block |
||
| 1256 | 1256 | |
| 1257 | 1257 | print '</table>' . "\n"; |
| 1258 | 1258 | print '</div>' . "\n"; |
| 1259 | -print '</div>' . "\n"; // end div-responsive-inside |
|
| 1259 | +print '</div>' . "\n"; // end div-responsive-inside |
|
| 1260 | 1260 | |
| 1261 | 1261 | print '</form>' . "\n"; |
| 1262 | 1262 | |
@@ -92,7 +92,7 @@ |
||
| 92 | 92 | accessforbidden(); |
| 93 | 93 | } |
| 94 | 94 | |
| 95 | -$permissiontoadd = $user->hasRight('ticket', 'write'); // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles |
|
| 95 | +$permissiontoadd = $user->hasRight('ticket', 'write'); // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles |
|
| 96 | 96 | |
| 97 | 97 | |
| 98 | 98 | /* |
@@ -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>'; |