@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | dolibarr_set_const($db, "MAIN_IHM_PARAMS_REV", getDolGlobalInt('MAIN_IHM_PARAMS_REV') + 1, 'chaine', 0, '', $conf->entity); |
82 | 82 | require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; |
83 | 83 | |
84 | - $logofile = $conf->mycompany->dir_output.'/logos/' . getDolGlobalString('MAIN_LOGIN_BACKGROUND'); |
|
84 | + $logofile = $conf->mycompany->dir_output.'/logos/'.getDolGlobalString('MAIN_LOGIN_BACKGROUND'); |
|
85 | 85 | dol_delete_file($logofile); |
86 | 86 | dolibarr_del_const($db, "MAIN_LOGIN_BACKGROUND", $conf->entity); |
87 | 87 | $mysoc->logo = ''; |
@@ -225,14 +225,14 @@ discard block |
||
225 | 225 | dolibarr_set_const($db, "THEME_ELDY_USE_CHECKED", $val, 'chaine', 0, '', $conf->entity); |
226 | 226 | } |
227 | 227 | |
228 | - $val=(implode(',', (colorStringToArray(GETPOST('THEME_ELDY_BTNACTION'), array())))); |
|
228 | + $val = (implode(',', (colorStringToArray(GETPOST('THEME_ELDY_BTNACTION'), array())))); |
|
229 | 229 | if ($val == '') { |
230 | 230 | dolibarr_del_const($db, 'THEME_ELDY_BTNACTION', $conf->entity); |
231 | 231 | } else { |
232 | 232 | dolibarr_set_const($db, 'THEME_ELDY_BTNACTION', $val, 'chaine', 0, '', $conf->entity); |
233 | 233 | } |
234 | 234 | |
235 | - $val=(implode(',', (colorStringToArray(GETPOST('THEME_ELDY_TEXTBTNACTION'), array())))); |
|
235 | + $val = (implode(',', (colorStringToArray(GETPOST('THEME_ELDY_TEXTBTNACTION'), array())))); |
|
236 | 236 | if ($val == '') { |
237 | 237 | dolibarr_del_const($db, 'THEME_ELDY_TEXTBTNACTION', $conf->entity); |
238 | 238 | } else { |
@@ -273,7 +273,7 @@ discard block |
||
273 | 273 | //dolibarr_set_const($db, "MAIN_HELP_DISABLELINK", GETPOST("MAIN_HELP_DISABLELINK", 'aZ09'), 'chaine', 0, '', 0); // Param for all entities |
274 | 274 | |
275 | 275 | $varforimage = 'imagebackground'; |
276 | - $dirforimage = $conf->mycompany->dir_output . '/logos/'; |
|
276 | + $dirforimage = $conf->mycompany->dir_output.'/logos/'; |
|
277 | 277 | if ($_FILES[$varforimage]["tmp_name"]) { |
278 | 278 | $reg = array(); |
279 | 279 | if (preg_match('/([^\\/:]+)$/i', $_FILES[$varforimage]["name"], $reg)) { |
@@ -281,11 +281,11 @@ discard block |
||
281 | 281 | |
282 | 282 | $isimage = image_format_supported($original_file); |
283 | 283 | if ($isimage >= 0) { |
284 | - dol_syslog("Move file " . $_FILES[$varforimage]["tmp_name"] . " to " . $dirforimage . $original_file); |
|
284 | + dol_syslog("Move file ".$_FILES[$varforimage]["tmp_name"]." to ".$dirforimage.$original_file); |
|
285 | 285 | if (!is_dir($dirforimage)) { |
286 | 286 | dol_mkdir($dirforimage); |
287 | 287 | } |
288 | - $result = dol_move_uploaded_file($_FILES[$varforimage]["tmp_name"], $dirforimage . $original_file, 1, 0, $_FILES[$varforimage]['error']); |
|
288 | + $result = dol_move_uploaded_file($_FILES[$varforimage]["tmp_name"], $dirforimage.$original_file, 1, 0, $_FILES[$varforimage]['error']); |
|
289 | 289 | if ($result > 0) { |
290 | 290 | dolibarr_set_const($db, "MAIN_LOGIN_BACKGROUND", $original_file, 'chaine', 0, '', $conf->entity); |
291 | 291 | } elseif (preg_match('/^ErrorFileIsInfectedWithAVirus/', $result)) { |
@@ -389,17 +389,17 @@ discard block |
||
389 | 389 | print '</tr>'; |
390 | 390 | |
391 | 391 | // Multilingual GUI |
392 | - print '<tr class="oddeven"><td>' . $langs->trans("EnableMultilangInterface") . '</td><td>'; |
|
392 | + print '<tr class="oddeven"><td>'.$langs->trans("EnableMultilangInterface").'</td><td>'; |
|
393 | 393 | print ajax_constantonoff("MAIN_MULTILANGS", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '', 'language'); |
394 | 394 | print '</td>'; |
395 | 395 | print '</tr>'; |
396 | 396 | |
397 | - print '</table>' . "\n"; |
|
397 | + print '</table>'."\n"; |
|
398 | 398 | print '</div>'; |
399 | 399 | |
400 | 400 | print '<div class="center">'; |
401 | - print '<input class="button button-save reposition" type="submit" name="submit" value="' . $langs->trans("Save") . '">'; |
|
402 | - print '<input class="button button-cancel reposition" type="submit" name="cancel" value="' . $langs->trans("Cancel") . '">'; |
|
401 | + print '<input class="button button-save reposition" type="submit" name="submit" value="'.$langs->trans("Save").'">'; |
|
402 | + print '<input class="button button-cancel reposition" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">'; |
|
403 | 403 | print '</div>'; |
404 | 404 | |
405 | 405 | print '<br>'; |
@@ -416,29 +416,29 @@ discard block |
||
416 | 416 | print '</tr>'; |
417 | 417 | |
418 | 418 | // Show Quick Add link |
419 | - print '<tr class="oddeven"><td>' . $langs->trans("ShowQuickAddLink") . '</td><td>'; |
|
419 | + print '<tr class="oddeven"><td>'.$langs->trans("ShowQuickAddLink").'</td><td>'; |
|
420 | 420 | print ajax_constantonoff("MAIN_USE_TOP_MENU_QUICKADD_DROPDOWN", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '', 'other'); |
421 | 421 | print '</td>'; |
422 | 422 | print '</tr>'; |
423 | 423 | |
424 | 424 | // Hide wiki link on login page |
425 | 425 | $pictohelp = '<span class="fa fa-question-circle"></span>'; |
426 | - print '<tr class="oddeven"><td>' . str_replace('{picto}', $pictohelp, $langs->trans("DisableLinkToHelp", '{picto}')) . '</td><td>'; |
|
426 | + print '<tr class="oddeven"><td>'.str_replace('{picto}', $pictohelp, $langs->trans("DisableLinkToHelp", '{picto}')).'</td><td>'; |
|
427 | 427 | print ajax_constantonoff("MAIN_HELP_DISABLELINK", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '', 'other'); |
428 | 428 | //print $form->selectyesno('MAIN_HELP_DISABLELINK', isset($conf->global->MAIN_HELP_DISABLELINK) ? $conf->global->MAIN_HELP_DISABLELINK : 0, 1); |
429 | 429 | print '</td>'; |
430 | 430 | print '</tr>'; |
431 | 431 | |
432 | 432 | // Max size of lists |
433 | - print '<tr class="oddeven"><td>' . $langs->trans("DefaultMaxSizeList") . '</td><td><input class="flat width50" name="MAIN_SIZE_LISTE_LIMIT" value="' . getDolGlobalString('MAIN_SIZE_LISTE_LIMIT') . '"></td>'; |
|
433 | + print '<tr class="oddeven"><td>'.$langs->trans("DefaultMaxSizeList").'</td><td><input class="flat width50" name="MAIN_SIZE_LISTE_LIMIT" value="'.getDolGlobalString('MAIN_SIZE_LISTE_LIMIT').'"></td>'; |
|
434 | 434 | print '</tr>'; |
435 | 435 | |
436 | 436 | // Max size of short lists on customer card |
437 | - print '<tr class="oddeven"><td>' . $langs->trans("DefaultMaxSizeShortList") . '</td><td><input class="flat width50" name="MAIN_SIZE_SHORTLIST_LIMIT" value="' . getDolGlobalString('MAIN_SIZE_SHORTLIST_LIMIT') . '"></td>'; |
|
437 | + print '<tr class="oddeven"><td>'.$langs->trans("DefaultMaxSizeShortList").'</td><td><input class="flat width50" name="MAIN_SIZE_SHORTLIST_LIMIT" value="'.getDolGlobalString('MAIN_SIZE_SHORTLIST_LIMIT').'"></td>'; |
|
438 | 438 | print '</tr>'; |
439 | 439 | |
440 | 440 | // Display checkboxes and fields menu left / right |
441 | - print '<tr class="oddeven"><td>' . $langs->trans("MAIN_CHECKBOX_LEFT_COLUMN") . '</td><td>'; |
|
441 | + print '<tr class="oddeven"><td>'.$langs->trans("MAIN_CHECKBOX_LEFT_COLUMN").'</td><td>'; |
|
442 | 442 | print ajax_constantonoff("MAIN_CHECKBOX_LEFT_COLUMN", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '', 'other'); |
443 | 443 | print '</td>'; |
444 | 444 | print '</tr>'; |
@@ -452,39 +452,39 @@ discard block |
||
452 | 452 | */ |
453 | 453 | |
454 | 454 | // First day for weeks |
455 | - print '<tr class="oddeven"><td>' . $langs->trans("WeekStartOnDay") . '</td><td>'; |
|
455 | + print '<tr class="oddeven"><td>'.$langs->trans("WeekStartOnDay").'</td><td>'; |
|
456 | 456 | print $formother->select_dayofweek((isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : '1'), 'MAIN_START_WEEK', 0); |
457 | 457 | print '</td>'; |
458 | 458 | print '</tr>'; |
459 | 459 | |
460 | 460 | // DefaultWorkingDays |
461 | - print '<tr class="oddeven"><td>' . $langs->trans("DefaultWorkingDays") . '</td><td>'; |
|
462 | - print '<input type="text" name="MAIN_DEFAULT_WORKING_DAYS" size="5" value="' . (isset($conf->global->MAIN_DEFAULT_WORKING_DAYS) ? $conf->global->MAIN_DEFAULT_WORKING_DAYS : '1-5') . '">'; |
|
461 | + print '<tr class="oddeven"><td>'.$langs->trans("DefaultWorkingDays").'</td><td>'; |
|
462 | + print '<input type="text" name="MAIN_DEFAULT_WORKING_DAYS" size="5" value="'.(isset($conf->global->MAIN_DEFAULT_WORKING_DAYS) ? $conf->global->MAIN_DEFAULT_WORKING_DAYS : '1-5').'">'; |
|
463 | 463 | print '</td>'; |
464 | 464 | print '</tr>'; |
465 | 465 | |
466 | 466 | // DefaultWorkingHours |
467 | - print '<tr class="oddeven"><td>' . $langs->trans("DefaultWorkingHours") . '</td><td>'; |
|
468 | - print '<input type="text" name="MAIN_DEFAULT_WORKING_HOURS" size="5" value="' . (isset($conf->global->MAIN_DEFAULT_WORKING_HOURS) ? $conf->global->MAIN_DEFAULT_WORKING_HOURS : '9-18') . '">'; |
|
467 | + print '<tr class="oddeven"><td>'.$langs->trans("DefaultWorkingHours").'</td><td>'; |
|
468 | + print '<input type="text" name="MAIN_DEFAULT_WORKING_HOURS" size="5" value="'.(isset($conf->global->MAIN_DEFAULT_WORKING_HOURS) ? $conf->global->MAIN_DEFAULT_WORKING_HOURS : '9-18').'">'; |
|
469 | 469 | print '</td>'; |
470 | 470 | print '</tr>'; |
471 | 471 | |
472 | 472 | // Firstname/Name |
473 | - print '<tr class="oddeven"><td>' . $langs->trans("FirstnameNamePosition") . '</td><td>'; |
|
474 | - $array = array(0 => $langs->trans("Firstname") . ' ' . $langs->trans("Lastname"), 1 => $langs->trans("Lastname") . ' ' . $langs->trans("Firstname")); |
|
473 | + print '<tr class="oddeven"><td>'.$langs->trans("FirstnameNamePosition").'</td><td>'; |
|
474 | + $array = array(0 => $langs->trans("Firstname").' '.$langs->trans("Lastname"), 1 => $langs->trans("Lastname").' '.$langs->trans("Firstname")); |
|
475 | 475 | print $form->selectarray('MAIN_FIRSTNAME_NAME_POSITION', $array, (isset($conf->global->MAIN_FIRSTNAME_NAME_POSITION) ? $conf->global->MAIN_FIRSTNAME_NAME_POSITION : 0)); |
476 | 476 | print '</td>'; |
477 | 477 | print '</tr>'; |
478 | 478 | |
479 | 479 | // Hide unauthorized menus |
480 | - print '<tr class="oddeven"><td>' . $langs->trans("HideUnauthorizedMenu") . '</td><td>'; |
|
480 | + print '<tr class="oddeven"><td>'.$langs->trans("HideUnauthorizedMenu").'</td><td>'; |
|
481 | 481 | //print $form->selectyesno('MAIN_MENU_HIDE_UNAUTHORIZED', isset($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) ? $conf->global->MAIN_MENU_HIDE_UNAUTHORIZED : 0, 1); |
482 | 482 | print ajax_constantonoff("MAIN_MENU_HIDE_UNAUTHORIZED", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '', 'other'); |
483 | 483 | print '</td>'; |
484 | 484 | print '</tr>'; |
485 | 485 | |
486 | 486 | // Hide unauthorized button |
487 | - print '<tr class="oddeven"><td>' . $langs->trans("ButtonHideUnauthorized") . '</td><td>'; |
|
487 | + print '<tr class="oddeven"><td>'.$langs->trans("ButtonHideUnauthorized").'</td><td>'; |
|
488 | 488 | //print $form->selectyesno('MAIN_BUTTON_HIDE_UNAUTHORIZED', isset($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED) ? $conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED : 0, 1); |
489 | 489 | print ajax_constantonoff("MAIN_BUTTON_HIDE_UNAUTHORIZED", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '', 'other'); |
490 | 490 | print '</td>'; |
@@ -501,7 +501,7 @@ discard block |
||
501 | 501 | |
502 | 502 | |
503 | 503 | // Show search area in top menu |
504 | - print '<tr class="oddeven"><td>' . $langs->trans("ShowSearchAreaInTopMenu") . '</td><td>'; |
|
504 | + print '<tr class="oddeven"><td>'.$langs->trans("ShowSearchAreaInTopMenu").'</td><td>'; |
|
505 | 505 | print ajax_constantonoff("MAIN_USE_TOP_MENU_SEARCH_DROPDOWN", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '', 'other'); |
506 | 506 | print '</td>'; |
507 | 507 | print '</tr>'; |
@@ -510,17 +510,17 @@ discard block |
||
510 | 510 | print '<tr class="oddeven"><td>'; |
511 | 511 | print $form->textwithpicto($langs->trans("ShowBugTrackLink", $langs->transnoentitiesnoconv("FindBug")), $langs->trans("ShowBugTrackLinkDesc")); |
512 | 512 | print '</td><td>'; |
513 | - print '<input type="text" name="MAIN_BUGTRACK_ENABLELINK" value="' . (!getDolGlobalString('MAIN_BUGTRACK_ENABLELINK') ? '' : $conf->global->MAIN_BUGTRACK_ENABLELINK) . '">'; |
|
513 | + print '<input type="text" name="MAIN_BUGTRACK_ENABLELINK" value="'.(!getDolGlobalString('MAIN_BUGTRACK_ENABLELINK') ? '' : $conf->global->MAIN_BUGTRACK_ENABLELINK).'">'; |
|
514 | 514 | print '</td>'; |
515 | 515 | print '</tr>'; |
516 | 516 | |
517 | 517 | // Disable javascript and ajax |
518 | - print '<tr class="oddeven"><td>' . $form->textwithpicto($langs->trans("DisableJavascript"), $langs->trans("DisableJavascriptNote")) . '</td><td>'; |
|
518 | + print '<tr class="oddeven"><td>'.$form->textwithpicto($langs->trans("DisableJavascript"), $langs->trans("DisableJavascriptNote")).'</td><td>'; |
|
519 | 519 | print ajax_constantonoff("MAIN_DISABLE_JAVASCRIPT", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '', 'other'); |
520 | 520 | print '</td>'; |
521 | 521 | print '</tr>'; |
522 | 522 | |
523 | - print '</table>' . "\n"; |
|
523 | + print '</table>'."\n"; |
|
524 | 524 | print '</div>'; |
525 | 525 | } |
526 | 526 | |
@@ -540,9 +540,9 @@ discard block |
||
540 | 540 | complete_substitutions_array($substitutionarray, $langs); |
541 | 541 | |
542 | 542 | print '<tr class="oddeven width25p"><td>'; |
543 | - $texthelp = $langs->trans("FollowingConstantsWillBeSubstituted") . '<br>'; |
|
543 | + $texthelp = $langs->trans("FollowingConstantsWillBeSubstituted").'<br>'; |
|
544 | 544 | foreach ($substitutionarray as $key => $val) { |
545 | - $texthelp .= $key . '<br>'; |
|
545 | + $texthelp .= $key.'<br>'; |
|
546 | 546 | } |
547 | 547 | print $form->textwithpicto($langs->trans("MessageOfDay"), $texthelp, 1, 'help', '', 0, 2, 'tooltipmessageofday'); |
548 | 548 | |
@@ -551,7 +551,7 @@ discard block |
||
551 | 551 | $doleditor = new DolEditor('main_motd', (isset($conf->global->MAIN_MOTD) ? $conf->global->MAIN_MOTD : ''), '', 142, 'dolibarr_notes', 'In', false, true, true, ROWS_4, '90%'); |
552 | 552 | $doleditor->Create(); |
553 | 553 | |
554 | - print '</td></tr>' . "\n"; |
|
554 | + print '</td></tr>'."\n"; |
|
555 | 555 | |
556 | 556 | /* no more need for this option. It is now a widget already controlled by end user |
557 | 557 | print '<tr class="oddeven"><td>' . $langs->trans('BoxstatsDisableGlobal') . '</td><td>'; |
@@ -573,80 +573,80 @@ discard block |
||
573 | 573 | print '</td><td class="titlefieldmiddle">'; |
574 | 574 | print '</td></tr>'; |
575 | 575 | |
576 | - print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableGlobal') . '</td><td>'; |
|
576 | + print '<tr class="oddeven"><td>'.$langs->trans('DashboardDisableGlobal').'</td><td>'; |
|
577 | 577 | print ajax_constantonoff("MAIN_DISABLE_GLOBAL_WORKBOARD", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard'); |
578 | 578 | print '</td>'; |
579 | 579 | print '</tr>'; |
580 | 580 | |
581 | 581 | if (!getDolGlobalString('MAIN_DISABLE_GLOBAL_WORKBOARD')) { |
582 | 582 | // Block meteo |
583 | - print '<tr class="oddeven"><td>' . $langs->trans('MAIN_DISABLE_METEO') . '</td><td>'; |
|
583 | + print '<tr class="oddeven"><td>'.$langs->trans('MAIN_DISABLE_METEO').'</td><td>'; |
|
584 | 584 | print ajax_constantonoff("MAIN_DISABLE_METEO", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard'); |
585 | 585 | print '</td>'; |
586 | 586 | print '</tr>'; |
587 | 587 | |
588 | 588 | // Block agenda |
589 | - print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockAgenda') . '</td><td>'; |
|
589 | + print '<tr class="oddeven"><td>'.$langs->trans('DashboardDisableBlockAgenda').'</td><td>'; |
|
590 | 590 | print ajax_constantonoff("MAIN_DISABLE_BLOCK_AGENDA", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard'); |
591 | 591 | print '</td>'; |
592 | 592 | print '</tr>'; |
593 | 593 | |
594 | 594 | // Block agenda |
595 | - print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockProject') . '</td><td>'; |
|
595 | + print '<tr class="oddeven"><td>'.$langs->trans('DashboardDisableBlockProject').'</td><td>'; |
|
596 | 596 | print ajax_constantonoff("MAIN_DISABLE_BLOCK_PROJECT", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard'); |
597 | 597 | print '</td>'; |
598 | 598 | print '</tr>'; |
599 | 599 | |
600 | 600 | // Block customer |
601 | - print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockCustomer') . '</td><td>'; |
|
601 | + print '<tr class="oddeven"><td>'.$langs->trans('DashboardDisableBlockCustomer').'</td><td>'; |
|
602 | 602 | print ajax_constantonoff("MAIN_DISABLE_BLOCK_CUSTOMER", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard'); |
603 | 603 | print '</td>'; |
604 | 604 | print '</tr>'; |
605 | 605 | |
606 | 606 | // Block supplier |
607 | - print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockSupplier') . '</td><td>'; |
|
607 | + print '<tr class="oddeven"><td>'.$langs->trans('DashboardDisableBlockSupplier').'</td><td>'; |
|
608 | 608 | print ajax_constantonoff("MAIN_DISABLE_BLOCK_SUPPLIER", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard'); |
609 | 609 | print '</td>'; |
610 | 610 | print '</tr>'; |
611 | 611 | |
612 | 612 | // Block contract |
613 | - print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockContract') . '</td><td>'; |
|
613 | + print '<tr class="oddeven"><td>'.$langs->trans('DashboardDisableBlockContract').'</td><td>'; |
|
614 | 614 | print ajax_constantonoff("MAIN_DISABLE_BLOCK_CONTRACT", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard'); |
615 | 615 | print '</td>'; |
616 | 616 | print '</tr>'; |
617 | 617 | |
618 | 618 | // Block ticket |
619 | - print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockTicket') . '</td><td>'; |
|
619 | + print '<tr class="oddeven"><td>'.$langs->trans('DashboardDisableBlockTicket').'</td><td>'; |
|
620 | 620 | print ajax_constantonoff("MAIN_DISABLE_BLOCK_TICKET", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard'); |
621 | 621 | print '</td>'; |
622 | 622 | print '</tr>'; |
623 | 623 | |
624 | 624 | // Block bank |
625 | - print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockBank') . '</td><td>'; |
|
625 | + print '<tr class="oddeven"><td>'.$langs->trans('DashboardDisableBlockBank').'</td><td>'; |
|
626 | 626 | print ajax_constantonoff("MAIN_DISABLE_BLOCK_BANK", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard'); |
627 | 627 | print '</td>'; |
628 | 628 | print '</tr>'; |
629 | 629 | |
630 | 630 | // Block adherent |
631 | - print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockAdherent') . '</td><td>'; |
|
631 | + print '<tr class="oddeven"><td>'.$langs->trans('DashboardDisableBlockAdherent').'</td><td>'; |
|
632 | 632 | print ajax_constantonoff("MAIN_DISABLE_BLOCK_ADHERENT", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard'); |
633 | 633 | print '</td>'; |
634 | 634 | print '</tr>'; |
635 | 635 | |
636 | 636 | // Block expense report |
637 | - print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockExpenseReport') . '</td><td>'; |
|
637 | + print '<tr class="oddeven"><td>'.$langs->trans('DashboardDisableBlockExpenseReport').'</td><td>'; |
|
638 | 638 | print ajax_constantonoff("MAIN_DISABLE_BLOCK_EXPENSEREPORT", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard'); |
639 | 639 | print '</td>'; |
640 | 640 | print '</tr>'; |
641 | 641 | |
642 | 642 | // Block holiday |
643 | - print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockHoliday') . '</td><td>'; |
|
643 | + print '<tr class="oddeven"><td>'.$langs->trans('DashboardDisableBlockHoliday').'</td><td>'; |
|
644 | 644 | print ajax_constantonoff("MAIN_DISABLE_BLOCK_HOLIDAY", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard'); |
645 | 645 | print '</td>'; |
646 | 646 | print '</tr>'; |
647 | 647 | } |
648 | 648 | |
649 | - print '</table>' . "\n"; |
|
649 | + print '</table>'."\n"; |
|
650 | 650 | print '</div>'; |
651 | 651 | } |
652 | 652 | |
@@ -663,7 +663,7 @@ discard block |
||
663 | 663 | print '</td></tr>'; |
664 | 664 | |
665 | 665 | // Hide helpcenter link on login page |
666 | - print '<tr class="oddeven"><td>' . $langs->trans("DisableLinkToHelpCenter") . '</td><td>'; |
|
666 | + print '<tr class="oddeven"><td>'.$langs->trans("DisableLinkToHelpCenter").'</td><td>'; |
|
667 | 667 | print ajax_constantonoff("MAIN_HELPCENTER_DISABLELINK", array(), $conf->entity, 0, 0, 0, 0, 0, 0, '', 'login'); |
668 | 668 | print '</td>'; |
669 | 669 | print '</tr>'; |
@@ -672,18 +672,18 @@ discard block |
||
672 | 672 | $substitutionarray = getCommonSubstitutionArray($langs, 0, array('object', 'objectamount', 'user')); |
673 | 673 | complete_substitutions_array($substitutionarray, $langs); |
674 | 674 | print '<tr class="oddeven"><td>'; |
675 | - $texthelp = $langs->trans("FollowingConstantsWillBeSubstituted") . '<br>'; |
|
675 | + $texthelp = $langs->trans("FollowingConstantsWillBeSubstituted").'<br>'; |
|
676 | 676 | foreach ($substitutionarray as $key => $val) { |
677 | - $texthelp .= $key . '<br>'; |
|
677 | + $texthelp .= $key.'<br>'; |
|
678 | 678 | } |
679 | 679 | print $form->textwithpicto($langs->trans("MessageLogin"), $texthelp, 1, 'help', '', 0, 2, 'tooltipmessagelogin'); |
680 | 680 | print '</td><td>'; |
681 | 681 | $doleditor = new DolEditor('main_home', (isset($conf->global->MAIN_HOME) ? $conf->global->MAIN_HOME : ''), '', 142, 'dolibarr_notes', 'In', false, true, true, ROWS_4, '90%'); |
682 | 682 | $doleditor->Create(); |
683 | - print '</td></tr>' . "\n"; |
|
683 | + print '</td></tr>'."\n"; |
|
684 | 684 | |
685 | 685 | // Background |
686 | - print '<tr class="oddeven"><td><label for="imagebackground">' . $langs->trans("BackgroundImageLogin") . ' (png,jpg)</label></td><td>'; |
|
686 | + print '<tr class="oddeven"><td><label for="imagebackground">'.$langs->trans("BackgroundImageLogin").' (png,jpg)</label></td><td>'; |
|
687 | 687 | print '<div class="centpercent inline-block">'; |
688 | 688 | $disabled = ''; |
689 | 689 | if (getDolGlobalString('ADD_UNSPLASH_LOGIN_BACKGROUND')) { |
@@ -692,25 +692,25 @@ discard block |
||
692 | 692 | $maxfilesizearray = getMaxFileSizeArray(); |
693 | 693 | $maxmin = $maxfilesizearray['maxmin']; |
694 | 694 | if ($maxmin > 0) { |
695 | - print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file |
|
695 | + print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file |
|
696 | 696 | } |
697 | - print '<input type="file" class="flat maxwidthinputfileonsmartphone" name="imagebackground" id="imagebackground"' . $disabled . '>'; |
|
697 | + print '<input type="file" class="flat maxwidthinputfileonsmartphone" name="imagebackground" id="imagebackground"'.$disabled.'>'; |
|
698 | 698 | if ($disabled) { |
699 | - print '(' . $langs->trans("DisabledByOptionADD_UNSPLASH_LOGIN_BACKGROUND") . ') '; |
|
699 | + print '('.$langs->trans("DisabledByOptionADD_UNSPLASH_LOGIN_BACKGROUND").') '; |
|
700 | 700 | } |
701 | 701 | if (getDolGlobalString('MAIN_LOGIN_BACKGROUND')) { |
702 | - print '<a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?action=removebackgroundlogin&token='.newToken().'&mode=login">' . img_delete($langs->trans("Delete")) . '</a>'; |
|
703 | - if (file_exists($conf->mycompany->dir_output . '/logos/' . getDolGlobalString('MAIN_LOGIN_BACKGROUND'))) { |
|
702 | + print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=removebackgroundlogin&token='.newToken().'&mode=login">'.img_delete($langs->trans("Delete")).'</a>'; |
|
703 | + if (file_exists($conf->mycompany->dir_output.'/logos/'.getDolGlobalString('MAIN_LOGIN_BACKGROUND'))) { |
|
704 | 704 | print ' '; |
705 | - print '<img class="paddingleft valignmiddle" width="100" src="' . DOL_URL_ROOT . '/viewimage.php?modulepart=mycompany&file=' . urlencode('logos/' . getDolGlobalString('MAIN_LOGIN_BACKGROUND')) . '">'; |
|
705 | + print '<img class="paddingleft valignmiddle" width="100" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&file='.urlencode('logos/'.getDolGlobalString('MAIN_LOGIN_BACKGROUND')).'">'; |
|
706 | 706 | } |
707 | 707 | } else { |
708 | - print '<img class="paddingleft valignmiddle" width="100" src="' . DOL_URL_ROOT . '/public/theme/common/nophoto.png">'; |
|
708 | + print '<img class="paddingleft valignmiddle" width="100" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png">'; |
|
709 | 709 | } |
710 | 710 | print '</div>'; |
711 | 711 | print '</td></tr>'; |
712 | 712 | |
713 | - print '</table>' . "\n"; |
|
713 | + print '</table>'."\n"; |
|
714 | 714 | print '</div>'; |
715 | 715 | } |
716 | 716 | |
@@ -734,8 +734,8 @@ discard block |
||
734 | 734 | |
735 | 735 | |
736 | 736 | print '<div class="center">'; |
737 | -print '<input class="button button-save reposition buttonforacesave" type="submit" name="submit" value="' . $langs->trans("Save") . '">'; |
|
738 | -print '<input class="button button-cancel reposition" type="submit" name="cancel" value="' . $langs->trans("Cancel") . '">'; |
|
737 | +print '<input class="button button-save reposition buttonforacesave" type="submit" name="submit" value="'.$langs->trans("Save").'">'; |
|
738 | +print '<input class="button button-cancel reposition" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">'; |
|
739 | 739 | print '</div>'; |
740 | 740 | |
741 | 741 | print '</form>'; |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | |
74 | 74 | // Default sort order (if not yet defined by previous GETPOST) |
75 | 75 | if (!$sortfield) { |
76 | - reset($object->fields); // Reset is required to avoid key() to return null. |
|
76 | + reset($object->fields); // Reset is required to avoid key() to return null. |
|
77 | 77 | $sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition. |
78 | 78 | } |
79 | 79 | if (!$sortorder) { |
@@ -536,7 +536,7 @@ discard block |
||
536 | 536 | } |
537 | 537 | |
538 | 538 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
539 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
539 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
540 | 540 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
541 | 541 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
542 | 542 | |
@@ -626,7 +626,7 @@ discard block |
||
626 | 626 | } 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'])) { |
627 | 627 | $cssforfield .= ($cssforfield ? ' ' : '').'right'; |
628 | 628 | } |
629 | - $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
629 | + $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
630 | 630 | if (!empty($arrayfields['t.'.$key]['checked'])) { |
631 | 631 | 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"; |
632 | 632 | $totalarray['nbfield']++; |
@@ -230,7 +230,7 @@ discard block |
||
230 | 230 | $arrayofmassactions = array(); |
231 | 231 | |
232 | 232 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
233 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
233 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
234 | 234 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
235 | 235 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
236 | 236 | |
@@ -317,7 +317,7 @@ discard block |
||
317 | 317 | usort( |
318 | 318 | $moduleList, |
319 | 319 | /** @return int */ |
320 | - function (stdClass $a, stdClass $b) { |
|
320 | + function(stdClass $a, stdClass $b) { |
|
321 | 321 | return strcasecmp($a->name, $b->name); |
322 | 322 | } |
323 | 323 | ); |
@@ -325,7 +325,7 @@ discard block |
||
325 | 325 | usort( |
326 | 326 | $moduleList, |
327 | 327 | /** @return int */ |
328 | - static function (stdClass $a, stdClass $b) { |
|
328 | + static function(stdClass $a, stdClass $b) { |
|
329 | 329 | return strcasecmp($b->name, $a->name); |
330 | 330 | } |
331 | 331 | ); |
@@ -333,7 +333,7 @@ discard block |
||
333 | 333 | usort( |
334 | 334 | $moduleList, |
335 | 335 | /** @return int */ |
336 | - static function (stdClass $a, stdClass $b) { |
|
336 | + static function(stdClass $a, stdClass $b) { |
|
337 | 337 | return strcasecmp($a->version, $b->version); |
338 | 338 | } |
339 | 339 | ); |
@@ -341,7 +341,7 @@ discard block |
||
341 | 341 | usort( |
342 | 342 | $moduleList, |
343 | 343 | /** @return int */ |
344 | - static function (stdClass $a, stdClass $b) { |
|
344 | + static function(stdClass $a, stdClass $b) { |
|
345 | 345 | return strcasecmp($b->version, $a->version); |
346 | 346 | } |
347 | 347 | ); |
@@ -146,38 +146,38 @@ discard block |
||
146 | 146 | $search_date_start_startmonth = GETPOSTINT('search_date_start_startmonth'); |
147 | 147 | $search_date_start_startyear = GETPOSTINT('search_date_start_startyear'); |
148 | 148 | $search_date_start_startday = GETPOSTINT('search_date_start_startday'); |
149 | -$search_date_start_start = dol_mktime(0, 0, 0, $search_date_start_startmonth, $search_date_start_startday, $search_date_start_startyear); // Use tzserver |
|
149 | +$search_date_start_start = dol_mktime(0, 0, 0, $search_date_start_startmonth, $search_date_start_startday, $search_date_start_startyear); // Use tzserver |
|
150 | 150 | $search_date_start_endmonth = GETPOSTINT('search_date_start_endmonth'); |
151 | 151 | $search_date_start_endyear = GETPOSTINT('search_date_start_endyear'); |
152 | 152 | $search_date_start_endday = GETPOSTINT('search_date_start_endday'); |
153 | -$search_date_start_end = dol_mktime(23, 59, 59, $search_date_start_endmonth, $search_date_start_endday, $search_date_start_endyear); // Use tzserver |
|
153 | +$search_date_start_end = dol_mktime(23, 59, 59, $search_date_start_endmonth, $search_date_start_endday, $search_date_start_endyear); // Use tzserver |
|
154 | 154 | |
155 | 155 | $search_date_end_startmonth = GETPOSTINT('search_date_end_startmonth'); |
156 | 156 | $search_date_end_startyear = GETPOSTINT('search_date_end_startyear'); |
157 | 157 | $search_date_end_startday = GETPOSTINT('search_date_end_startday'); |
158 | -$search_date_end_start = dol_mktime(0, 0, 0, $search_date_end_startmonth, $search_date_end_startday, $search_date_end_startyear); // Use tzserver |
|
158 | +$search_date_end_start = dol_mktime(0, 0, 0, $search_date_end_startmonth, $search_date_end_startday, $search_date_end_startyear); // Use tzserver |
|
159 | 159 | $search_date_end_endmonth = GETPOSTINT('search_date_end_endmonth'); |
160 | 160 | $search_date_end_endyear = GETPOSTINT('search_date_end_endyear'); |
161 | 161 | $search_date_end_endday = GETPOSTINT('search_date_end_endday'); |
162 | -$search_date_end_end = dol_mktime(23, 59, 59, $search_date_end_endmonth, $search_date_end_endday, $search_date_end_endyear); // Use tzserver |
|
162 | +$search_date_end_end = dol_mktime(23, 59, 59, $search_date_end_endmonth, $search_date_end_endday, $search_date_end_endyear); // Use tzserver |
|
163 | 163 | |
164 | 164 | $search_date_creation_startmonth = GETPOSTINT('search_date_creation_startmonth'); |
165 | 165 | $search_date_creation_startyear = GETPOSTINT('search_date_creation_startyear'); |
166 | 166 | $search_date_creation_startday = GETPOSTINT('search_date_creation_startday'); |
167 | -$search_date_creation_start = dol_mktime(0, 0, 0, $search_date_creation_startmonth, $search_date_creation_startday, $search_date_creation_startyear); // Use tzserver |
|
167 | +$search_date_creation_start = dol_mktime(0, 0, 0, $search_date_creation_startmonth, $search_date_creation_startday, $search_date_creation_startyear); // Use tzserver |
|
168 | 168 | $search_date_creation_endmonth = GETPOSTINT('search_date_creation_endmonth'); |
169 | 169 | $search_date_creation_endyear = GETPOSTINT('search_date_creation_endyear'); |
170 | 170 | $search_date_creation_endday = GETPOSTINT('search_date_creation_endday'); |
171 | -$search_date_creation_end = dol_mktime(23, 59, 59, $search_date_creation_endmonth, $search_date_creation_endday, $search_date_creation_endyear); // Use tzserver |
|
171 | +$search_date_creation_end = dol_mktime(23, 59, 59, $search_date_creation_endmonth, $search_date_creation_endday, $search_date_creation_endyear); // Use tzserver |
|
172 | 172 | |
173 | 173 | $search_date_modif_startmonth = GETPOSTINT('search_date_modif_startmonth'); |
174 | 174 | $search_date_modif_startyear = GETPOSTINT('search_date_modif_startyear'); |
175 | 175 | $search_date_modif_startday = GETPOSTINT('search_date_modif_startday'); |
176 | -$search_date_modif_start = dol_mktime(0, 0, 0, $search_date_modif_startmonth, $search_date_modif_startday, $search_date_modif_startyear); // Use tzserver |
|
176 | +$search_date_modif_start = dol_mktime(0, 0, 0, $search_date_modif_startmonth, $search_date_modif_startday, $search_date_modif_startyear); // Use tzserver |
|
177 | 177 | $search_date_modif_endmonth = GETPOSTINT('search_date_modif_endmonth'); |
178 | 178 | $search_date_modif_endyear = GETPOSTINT('search_date_modif_endyear'); |
179 | 179 | $search_date_modif_endday = GETPOSTINT('search_date_modif_endday'); |
180 | -$search_date_modif_end = dol_mktime(23, 59, 59, $search_date_modif_endmonth, $search_date_modif_endday, $search_date_modif_endyear); // Use tzserver |
|
180 | +$search_date_modif_end = dol_mktime(23, 59, 59, $search_date_modif_endmonth, $search_date_modif_endday, $search_date_modif_endyear); // Use tzserver |
|
181 | 181 | |
182 | 182 | $search_category_array = array(); |
183 | 183 | |
@@ -263,7 +263,7 @@ discard block |
||
263 | 263 | |
264 | 264 | $object->fields = dol_sort_array($object->fields, 'position'); |
265 | 265 | $arrayfields = dol_sort_array($arrayfields, 'position'); |
266 | -'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
266 | +'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
267 | 267 | |
268 | 268 | |
269 | 269 | /* |
@@ -680,7 +680,7 @@ discard block |
||
680 | 680 | if ($searchCategoryProjectOperator == 0) { |
681 | 681 | $searchCategoryProjectSqlList[] = " EXISTS (SELECT ck.fk_project FROM ".MAIN_DB_PREFIX."categorie_project as ck WHERE p.rowid = ck.fk_project AND ck.fk_categorie = ".((int) $searchCategoryProject).")"; |
682 | 682 | } else { |
683 | - $listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryProject); |
|
683 | + $listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryProject); |
|
684 | 684 | } |
685 | 685 | } |
686 | 686 | } |
@@ -876,7 +876,7 @@ discard block |
||
876 | 876 | $param .= '&search_date_end_endday='.urlencode((string) ($search_date_end_endday)); |
877 | 877 | } |
878 | 878 | if ($search_date_end_end) { |
879 | - $param .= '&search_date_end_end=' . urlencode($search_date_end_end); |
|
879 | + $param .= '&search_date_end_end='.urlencode($search_date_end_end); |
|
880 | 880 | } |
881 | 881 | if ($search_date_creation_startmonth) { |
882 | 882 | $param .= '&search_date_creation_startmonth='.urlencode((string) ($search_date_creation_startmonth)); |
@@ -924,7 +924,7 @@ discard block |
||
924 | 924 | $param .= '&search_date_modif_endday='.urlencode((string) ($search_date_modif_endday)); |
925 | 925 | } |
926 | 926 | if ($search_date_modif_end) { |
927 | - $param .= '&search_date_modif_end=' . urlencode($search_date_modif_end); |
|
927 | + $param .= '&search_date_modif_end='.urlencode($search_date_modif_end); |
|
928 | 928 | } |
929 | 929 | if ($socid) { |
930 | 930 | $param .= '&socid='.urlencode((string) ($socid)); |
@@ -1160,7 +1160,7 @@ discard block |
||
1160 | 1160 | } |
1161 | 1161 | |
1162 | 1162 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
1163 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
1163 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
1164 | 1164 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
1165 | 1165 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
1166 | 1166 |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | $search_date_endday = GETPOSTINT('search_date_endday'); |
94 | 94 | $search_date_endmonth = GETPOSTINT('search_date_endmonth'); |
95 | 95 | $search_date_endyear = GETPOSTINT('search_date_endyear'); |
96 | -$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
96 | +$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
97 | 97 | $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear); |
98 | 98 | $search_datelimit_startday = GETPOSTINT('search_datelimit_startday'); |
99 | 99 | $search_datelimit_startmonth = GETPOSTINT('search_datelimit_startmonth'); |
@@ -183,7 +183,7 @@ discard block |
||
183 | 183 | |
184 | 184 | $object->fields = dol_sort_array($object->fields, 'position'); |
185 | 185 | $arrayfields = dol_sort_array($arrayfields, 'position'); |
186 | -'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
186 | +'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
187 | 187 | |
188 | 188 | $permissiontoread = $user->hasRight('projet', 'lire'); |
189 | 189 | $permissiontocreate = $user->hasRight('projet', 'creer'); |
@@ -470,7 +470,7 @@ discard block |
||
470 | 470 | if ($searchCategoryProjectOperator == 0) { |
471 | 471 | $searchCategoryProjectSqlList[] = " EXISTS (SELECT ck.fk_project FROM ".MAIN_DB_PREFIX."categorie_project as ck WHERE p.rowid = ck.fk_project AND ck.fk_categorie = ".((int) $searchCategoryProject).")"; |
472 | 472 | } else { |
473 | - $listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryProject); |
|
473 | + $listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryProject); |
|
474 | 474 | } |
475 | 475 | } |
476 | 476 | } |
@@ -589,7 +589,7 @@ discard block |
||
589 | 589 | // Direct jump if only one record found |
590 | 590 | if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all) { |
591 | 591 | $obj = $db->fetch_object($resql); |
592 | - $id = $obj->id; // in select, task id has been aliases into 'id' |
|
592 | + $id = $obj->id; // in select, task id has been aliases into 'id' |
|
593 | 593 | header("Location: ".DOL_URL_ROOT.'/projet/tasks/task.php?id='.$id.'&withproject=1'); |
594 | 594 | exit; |
595 | 595 | } |
@@ -598,7 +598,7 @@ discard block |
||
598 | 598 | // Output page |
599 | 599 | // -------------------------------------------------------------------- |
600 | 600 | |
601 | -llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll |
|
601 | +llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll |
|
602 | 602 | |
603 | 603 | $arrayofselected = is_array($toselect) ? $toselect : array(); |
604 | 604 | |
@@ -837,7 +837,7 @@ discard block |
||
837 | 837 | } |
838 | 838 | |
839 | 839 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
840 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
840 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
841 | 841 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
842 | 842 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
843 | 843 |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | |
141 | 141 | $object->fields = dol_sort_array($object->fields, 'position'); |
142 | 142 | $arrayfields = dol_sort_array($arrayfields, 'position'); |
143 | -'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
143 | +'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
144 | 144 | |
145 | 145 | $permissiontoread = $user->hasRight('contrat', 'lire'); |
146 | 146 | $permissiontoadd = $user->hasRight('contrat', 'creer'); |
@@ -559,7 +559,7 @@ discard block |
||
559 | 559 | } |
560 | 560 | |
561 | 561 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
562 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
562 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
563 | 563 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
564 | 564 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
565 | 565 |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | $object = new MyObject($db); |
121 | 121 | $extrafields = new ExtraFields($db); |
122 | 122 | $diroutputmassaction = $conf->mymodule->dir_output.'/temp/massgeneration/'.$user->id; |
123 | -$hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array of activated contexes |
|
123 | +$hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array of activated contexes |
|
124 | 124 | |
125 | 125 | // Fetch optionals attributes and labels |
126 | 126 | $extrafields->fetch_name_optionals_label($object->table_element); |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | |
131 | 131 | // Default sort order (if not yet defined by previous GETPOST) |
132 | 132 | if (!$sortfield) { |
133 | - reset($object->fields); // Reset is required to avoid key() to return null. |
|
133 | + reset($object->fields); // Reset is required to avoid key() to return null. |
|
134 | 134 | $sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition. |
135 | 135 | } |
136 | 136 | if (!$sortorder) { |
@@ -448,7 +448,7 @@ discard block |
||
448 | 448 | // Output page |
449 | 449 | // -------------------------------------------------------------------- |
450 | 450 | |
451 | -llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'mod-mymodule page-list bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll |
|
451 | +llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'mod-mymodule page-list bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll |
|
452 | 452 | |
453 | 453 | // Example : Adding jquery code |
454 | 454 | // print '<script type="text/javascript"> |
@@ -580,7 +580,7 @@ discard block |
||
580 | 580 | } |
581 | 581 | |
582 | 582 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
583 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
583 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
584 | 584 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
585 | 585 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
586 | 586 | |
@@ -673,7 +673,7 @@ discard block |
||
673 | 673 | } 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'])) { |
674 | 674 | $cssforfield .= ($cssforfield ? ' ' : '').'right'; |
675 | 675 | } |
676 | - $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
676 | + $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
677 | 677 | if (!empty($arrayfields['t.'.$key]['checked'])) { |
678 | 678 | 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"; |
679 | 679 | $totalarray['nbfield']++; |
@@ -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 | // Example : Adding jquery code |
392 | 392 | // print '<script type="text/javascript"> |
@@ -517,7 +517,7 @@ discard block |
||
517 | 517 | } |
518 | 518 | |
519 | 519 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
520 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
520 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
521 | 521 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
522 | 522 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
523 | 523 | |
@@ -611,7 +611,7 @@ discard block |
||
611 | 611 | } elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'rowid' && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) { |
612 | 612 | $cssforfield .= ($cssforfield ? ' ' : '').'right'; |
613 | 613 | } |
614 | - $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
614 | + $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
615 | 615 | if (!empty($arrayfields['t.'.$key]['checked'])) { |
616 | 616 | 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"; |
617 | 617 | $totalarray['nbfield']++; |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | $object = new Calendar($db); |
67 | 67 | $extrafields = new ExtraFields($db); |
68 | 68 | $diroutputmassaction = $conf->bookcal->dir_output.'/temp/massgeneration/'.$user->id; |
69 | -$hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array of activated contexes |
|
69 | +$hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array of activated contexes |
|
70 | 70 | |
71 | 71 | // Fetch optionals attributes and labels |
72 | 72 | $extrafields->fetch_name_optionals_label($object->table_element); |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | |
77 | 77 | // Default sort order (if not yet defined by previous GETPOST) |
78 | 78 | if (!$sortfield) { |
79 | - reset($object->fields); // Reset is required to avoid key() to return null. |
|
79 | + reset($object->fields); // Reset is required to avoid key() to return null. |
|
80 | 80 | $sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition. |
81 | 81 | } |
82 | 82 | if (!$sortorder) { |
@@ -382,7 +382,7 @@ discard block |
||
382 | 382 | // Output page |
383 | 383 | // -------------------------------------------------------------------- |
384 | 384 | |
385 | -llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll |
|
385 | +llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll |
|
386 | 386 | |
387 | 387 | $arrayofselected = is_array($toselect) ? $toselect : array(); |
388 | 388 | |
@@ -499,7 +499,7 @@ discard block |
||
499 | 499 | } |
500 | 500 | |
501 | 501 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
502 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
502 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
503 | 503 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
504 | 504 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
505 | 505 | |
@@ -592,7 +592,7 @@ discard block |
||
592 | 592 | } elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'rowid' && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) { |
593 | 593 | $cssforfield .= ($cssforfield ? ' ' : '').'right'; |
594 | 594 | } |
595 | - $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
595 | + $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
596 | 596 | if (!empty($arrayfields['t.'.$key]['checked'])) { |
597 | 597 | 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"; |
598 | 598 | $totalarray['nbfield']++; |