@@ -68,7 +68,7 @@ |
||
68 | 68 | // Parameters |
69 | 69 | $action = GETPOST('action', 'aZ09'); |
70 | 70 | $backtopage = GETPOST('backtopage', 'alpha'); |
71 | -$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
71 | +$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
72 | 72 | |
73 | 73 | $value = GETPOST('value', 'alpha'); |
74 | 74 | $label = GETPOST('label', 'alpha'); |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | |
81 | 81 | // Default sort order (if not yet defined by previous GETPOST) |
82 | 82 | if (!$sortfield) { |
83 | - reset($object->fields); // Reset is required to avoid key() to return null. |
|
83 | + reset($object->fields); // Reset is required to avoid key() to return null. |
|
84 | 84 | $sortfield = "t." . key($object->fields); // Set here default search field. By default 1st field in definition. |
85 | 85 | } |
86 | 86 | if (!$sortorder) { |
@@ -390,7 +390,7 @@ discard block |
||
390 | 390 | // Output page |
391 | 391 | // -------------------------------------------------------------------- |
392 | 392 | |
393 | -llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll |
|
393 | +llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll |
|
394 | 394 | |
395 | 395 | // Example : Adding jquery code |
396 | 396 | // print '<script type="text/javascript"> |
@@ -521,7 +521,7 @@ discard block |
||
521 | 521 | } |
522 | 522 | |
523 | 523 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
524 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
524 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
525 | 525 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
526 | 526 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
527 | 527 | |
@@ -615,7 +615,7 @@ discard block |
||
615 | 615 | } elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'rowid' && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) { |
616 | 616 | $cssforfield .= ($cssforfield ? ' ' : '') . 'right'; |
617 | 617 | } |
618 | - $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
618 | + $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
619 | 619 | if (!empty($arrayfields['t.' . $key]['checked'])) { |
620 | 620 | 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"; |
621 | 621 | $totalarray['nbfield']++; |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | $object = new Calendar($db); |
69 | 69 | $extrafields = new ExtraFields($db); |
70 | 70 | $diroutputmassaction = $conf->bookcal->dir_output . '/temp/massgeneration/' . $user->id; |
71 | -$hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array of activated contexes |
|
71 | +$hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array of activated contexes |
|
72 | 72 | |
73 | 73 | // Fetch optionals attributes and labels |
74 | 74 | $extrafields->fetch_name_optionals_label($object->table_element); |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | |
79 | 79 | // Default sort order (if not yet defined by previous GETPOST) |
80 | 80 | if (!$sortfield) { |
81 | - reset($object->fields); // Reset is required to avoid key() to return null. |
|
81 | + reset($object->fields); // Reset is required to avoid key() to return null. |
|
82 | 82 | $sortfield = "t." . key($object->fields); // Set here default search field. By default 1st field in definition. |
83 | 83 | } |
84 | 84 | if (!$sortorder) { |
@@ -386,7 +386,7 @@ discard block |
||
386 | 386 | // Output page |
387 | 387 | // -------------------------------------------------------------------- |
388 | 388 | |
389 | -llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll |
|
389 | +llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll |
|
390 | 390 | |
391 | 391 | $arrayofselected = is_array($toselect) ? $toselect : array(); |
392 | 392 | |
@@ -503,7 +503,7 @@ discard block |
||
503 | 503 | } |
504 | 504 | |
505 | 505 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
506 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
506 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
507 | 507 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
508 | 508 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
509 | 509 | |
@@ -596,7 +596,7 @@ discard block |
||
596 | 596 | } elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'rowid' && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) { |
597 | 597 | $cssforfield .= ($cssforfield ? ' ' : '') . 'right'; |
598 | 598 | } |
599 | - $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
599 | + $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
600 | 600 | if (!empty($arrayfields['t.' . $key]['checked'])) { |
601 | 601 | 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"; |
602 | 602 | $totalarray['nbfield']++; |
@@ -76,7 +76,7 @@ |
||
76 | 76 | include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once. |
77 | 77 | |
78 | 78 | //avoid warning on missing/undef entity |
79 | -$object->entity = (GETPOSTISSET('entity') ? GETPOSTINT('entity') : $conf->entity); |
|
79 | +$object->entity = (GETPOSTISSET('entity') ? GETPOSTINT('entity') : $conf->entity); |
|
80 | 80 | |
81 | 81 | // There is several ways to check permission. |
82 | 82 | // Set $enablepermissioncheck to 1 to enable a minimum low level of checks |
@@ -40,13 +40,13 @@ discard block |
||
40 | 40 | // Get parameters |
41 | 41 | $id = GETPOSTINT('id'); |
42 | 42 | $ref = GETPOST('ref', 'alpha'); |
43 | -$lineid = GETPOSTINT('lineid'); |
|
43 | +$lineid = GETPOSTINT('lineid'); |
|
44 | 44 | |
45 | 45 | $action = GETPOST('action', 'aZ09'); |
46 | 46 | $confirm = GETPOST('confirm', 'alpha'); |
47 | 47 | $cancel = GETPOST('cancel', 'aZ09'); |
48 | 48 | $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : str_replace('_', '', basename(dirname(__FILE__)) . basename(__FILE__, '.php')); // To manage different context of search |
49 | -$backtopage = GETPOST('backtopage', 'alpha'); // if not set, a default page will be used |
|
49 | +$backtopage = GETPOST('backtopage', 'alpha'); // if not set, a default page will be used |
|
50 | 50 | $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); // if not set, $backtopage will be used |
51 | 51 | $backtopagejsfields = GETPOST('backtopagejsfields', 'alpha'); |
52 | 52 | $dol_openinpopup = GETPOST('dol_openinpopup', 'aZ09'); |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | // Load object |
84 | 84 | include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once. |
85 | 85 | |
86 | -$object->entity = (GETPOSTISSET('entity') ? GETPOSTINT('entity') : $conf->entity); |
|
86 | +$object->entity = (GETPOSTISSET('entity') ? GETPOSTINT('entity') : $conf->entity); |
|
87 | 87 | |
88 | 88 | // There is several ways to check permission. |
89 | 89 | // Set $enablepermissioncheck to 1 to enable a minimum low level of checks |
@@ -47,7 +47,7 @@ |
||
47 | 47 | $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'conferenceorboothattendeecard'; // To manage different context of search |
48 | 48 | $backtopage = GETPOST('backtopage', 'alpha'); |
49 | 49 | $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); |
50 | -$lineid = GETPOSTINT('lineid'); |
|
50 | +$lineid = GETPOSTINT('lineid'); |
|
51 | 51 | $mode = GETPOST('mode', 'alpha'); |
52 | 52 | |
53 | 53 | $conf_or_booth_id = GETPOSTINT('conforboothid'); |
@@ -46,15 +46,15 @@ discard block |
||
46 | 46 | $langs->loadLangs(array("eventorganization", "other", "projects", "bills")); |
47 | 47 | |
48 | 48 | // Get Parameters |
49 | -$action = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ... |
|
50 | -$massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists) |
|
51 | -$show_files = GETPOSTINT('show_files'); // Show files area generated by bulk actions ? |
|
52 | -$confirm = GETPOST('confirm', 'alpha'); // Result of a confirmation |
|
53 | -$cancel = GETPOST('cancel', 'alpha'); // We click on a Cancel button |
|
54 | -$toselect = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list |
|
49 | +$action = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ... |
|
50 | +$massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists) |
|
51 | +$show_files = GETPOSTINT('show_files'); // Show files area generated by bulk actions ? |
|
52 | +$confirm = GETPOST('confirm', 'alpha'); // Result of a confirmation |
|
53 | +$cancel = GETPOST('cancel', 'alpha'); // We click on a Cancel button |
|
54 | +$toselect = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list |
|
55 | 55 | $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : str_replace('_', '', basename(dirname(__FILE__)) . basename(__FILE__, '.php')); // To manage different context of search |
56 | -$backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page |
|
57 | -$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print') |
|
56 | +$backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page |
|
57 | +$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print') |
|
58 | 58 | $mode = GETPOST('mode', 'aZ'); |
59 | 59 | |
60 | 60 | $id = GETPOSTINT('id'); |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | |
96 | 96 | // Default sort order (if not yet defined by previous GETPOST) |
97 | 97 | if (!$sortfield) { |
98 | - reset($object->fields); // Reset is required to avoid key() to return null. |
|
98 | + reset($object->fields); // Reset is required to avoid key() to return null. |
|
99 | 99 | $sortfield = "t." . key($object->fields); // Set here default search field. By default 1st field in definition. |
100 | 100 | } |
101 | 101 | if (!$sortorder) { |
@@ -806,7 +806,7 @@ discard block |
||
806 | 806 | } |
807 | 807 | |
808 | 808 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
809 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
809 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
810 | 810 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
811 | 811 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
812 | 812 | |
@@ -898,7 +898,7 @@ discard block |
||
898 | 898 | } 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'])) { |
899 | 899 | $cssforfield .= ($cssforfield ? ' ' : '') . 'right'; |
900 | 900 | } |
901 | - $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
901 | + $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
902 | 902 | if (!empty($arrayfields['t.' . $key]['checked'])) { |
903 | 903 | 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"; |
904 | 904 | $totalarray['nbfield']++; |
@@ -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 |