Passed
Pull Request — master (#4234)
by
unknown
09:29 queued 04:21
created
index.php 1 patch
Spacing   +83 added lines, -83 removed lines patch added patch discarded remove patch
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 csrfProtector::init();
74 74
 
75 75
 // Load functions
76
-require_once __DIR__. '/includes/config/include.php';
76
+require_once __DIR__.'/includes/config/include.php';
77 77
 require_once __DIR__.'/sources/main.functions.php';
78 78
 
79 79
 // init
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
 $SETTINGS = $antiXss->xss_clean($SETTINGS);
102 102
 
103 103
 // Load Core library
104
-require_once $SETTINGS['cpassman_dir'] . '/sources/core.php';
104
+require_once $SETTINGS['cpassman_dir'].'/sources/core.php';
105 105
 // Prepare POST variables
106 106
 $post_language = filter_input(INPUT_POST, 'language', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
107 107
 $session_user_language = $session->get('user-language');
@@ -127,8 +127,8 @@  discard block
 block discarded – undo
127 127
     //get default language
128 128
     $dataLanguage = DB::queryFirstRow(
129 129
         'SELECT m.valeur AS valeur, l.flag AS flag
130
-        FROM ' . prefixTable('misc') . ' AS m
131
-        INNER JOIN ' . prefixTable('languages') . ' AS l ON (m.valeur = l.name)
130
+        FROM ' . prefixTable('misc').' AS m
131
+        INNER JOIN ' . prefixTable('languages').' AS l ON (m.valeur = l.name)
132 132
         WHERE m.type=%s_type AND m.intitule=%s_intitule',
133 133
         [
134 134
             'type' => 'admin',
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
         $session_user_language = $SETTINGS['default_language'];
160 160
     }
161 161
 }
162
-$lang = new Language($session_user_language, __DIR__. '/includes/language/'); 
162
+$lang = new Language($session_user_language, __DIR__.'/includes/language/'); 
163 163
 
164 164
 if (isset($SETTINGS['cpassman_dir']) === false || $SETTINGS['cpassman_dir'] === '') {
165 165
     $SETTINGS['cpassman_dir'] = __DIR__;
@@ -221,10 +221,10 @@  discard block
 block discarded – undo
221 221
     <!-- Toastr -->
222 222
     <link rel="stylesheet" href="plugins/toastr/toastr.min.css" />
223 223
     <!-- favicon -->
224
-    <link rel="shortcut icon" type="image/png" href="<?php echo isset($SETTINGS['favicon']) === true ? $SETTINGS['favicon'] : '';?>"/>
224
+    <link rel="shortcut icon" type="image/png" href="<?php echo isset($SETTINGS['favicon']) === true ? $SETTINGS['favicon'] : ''; ?>"/>
225 225
     <!-- Custom style -->
226 226
     <?php
227
-    if (file_exists(__DIR__ . '/includes/css/custom.css') === true) {?>
227
+    if (file_exists(__DIR__.'/includes/css/custom.css') === true) {?>
228 228
         <link rel="stylesheet" href="includes/css/custom.css">
229 229
     <?php
230 230
     } ?>
@@ -288,7 +288,7 @@  discard block
 block discarded – undo
288 288
                         <div class="dropdown show">
289 289
                             <a class="btn btn-primary dropdown-toggle" href="#" data-toggle="dropdown">
290 290
                                 <?php
291
-                                    echo $session_name . '&nbsp;' . $session_lastname; ?>
291
+                                    echo $session_name.'&nbsp;'.$session_lastname; ?>
292 292
                             </a>
293 293
 
294 294
                             <div class="dropdown-menu dropdown-menu-right">
@@ -312,7 +312,7 @@  discard block
 block discarded – undo
312 312
                                     </a>
313 313
                                 <?php
314 314
                                     } ?>
315
-                                <a class="dropdown-item user-menu<?php echo (int) $session_user_admin === 1 ? ' hidden' : '';?>" href="#" data-name="generate-new_keys">
315
+                                <a class="dropdown-item user-menu<?php echo (int) $session_user_admin === 1 ? ' hidden' : ''; ?>" href="#" data-name="generate-new_keys">
316 316
                                     <i class="fa-solid fa-spray-can-sparkles fa-fw mr-2"></i><?php echo $lang->get('generate_new_keys'); ?>
317 317
                                 </a>
318 318
 
@@ -343,7 +343,7 @@  discard block
 block discarded – undo
343 343
             <!-- Main Sidebar Container -->
344 344
             <aside class="main-sidebar sidebar-dark-primary elevation-4">
345 345
                 <!-- Brand Logo -->
346
-                <a href="<?php echo $SETTINGS['cpassman_url'] . '/index.php?page=' . ((int) $session_user_admin === 1 ? 'admin' : 'items'); ?>" class="brand-link">
346
+                <a href="<?php echo $SETTINGS['cpassman_url'].'/index.php?page='.((int) $session_user_admin === 1 ? 'admin' : 'items'); ?>" class="brand-link">
347 347
                     <img src="includes/images/teampass-logo2-home.png" alt="Teampass Logo" class="brand-image">
348 348
                     <span class="brand-text font-weight-light"><?php echo TP_TOOL_NAME; ?></span>
349 349
                 </a>
@@ -361,20 +361,20 @@  discard block
 block discarded – undo
361 361
                         <a href="#" data-name="items" class="nav-link', $get['page'] === 'items' ? ' active' : '', '">
362 362
                         <i class="nav-icon fa-solid fa-key"></i>
363 363
                         <p>
364
-                            ' . $lang->get('pw') . '
364
+                            ' . $lang->get('pw').'
365 365
                         </p>
366 366
                         </a>
367 367
                     </li>';
368 368
                                 }
369 369
 
370 370
     // IMPORT menu
371
-    if (isset($SETTINGS['allow_import']) === true && (int) $SETTINGS['allow_import'] === 1&& $session_user_admin === 0) {
371
+    if (isset($SETTINGS['allow_import']) === true && (int) $SETTINGS['allow_import'] === 1 && $session_user_admin === 0) {
372 372
         echo '
373 373
                     <li class="nav-item">
374 374
                         <a href="#" data-name="import" class="nav-link', $get['page'] === 'import' ? ' active' : '', '">
375 375
                         <i class="nav-icon fa-solid fa-file-import"></i>
376 376
                         <p>
377
-                            ' . $lang->get('import') . '
377
+                            ' . $lang->get('import').'
378 378
                         </p>
379 379
                         </a>
380 380
                     </li>';
@@ -395,7 +395,7 @@  discard block
 block discarded – undo
395 395
                         <a href="#" data-name="export" class="nav-link', $get['page'] === 'export' ? ' active' : '', '">
396 396
                         <i class="nav-icon fa-solid fa-file-export"></i>
397 397
                         <p>
398
-                            ' . $lang->get('export') . '
398
+                            ' . $lang->get('export').'
399 399
                         </p>
400 400
                         </a>
401 401
                     </li>';
@@ -422,7 +422,7 @@  discard block
 block discarded – undo
422 422
                         <a href="#" data-name="search" class="nav-link', $get['page'] === 'search' ? ' active' : '', '">
423 423
                         <i class="nav-icon fa-solid fa-search"></i>
424 424
                         <p>
425
-                            ' . $lang->get('find') . '
425
+                            ' . $lang->get('find').'
426 426
                         </p>
427 427
                         </a>
428 428
                     </li>';
@@ -438,7 +438,7 @@  discard block
 block discarded – undo
438 438
                         <a href="#" data-name="favourites" class="nav-link', $get['page'] === 'admin' ? ' favourites' : '', '">
439 439
                         <i class="nav-icon fa-solid fa-star"></i>
440 440
                         <p>
441
-                            ' . $lang->get('favorites') . '
441
+                            ' . $lang->get('favorites').'
442 442
                         </p>
443 443
                         </a>
444 444
                     </li>';
@@ -468,7 +468,7 @@  discard block
 block discarded – undo
468 468
                         <a href="#" data-name="suggestion" class="nav-link', $get['page'] === 'suggestion' ? ' active' : '', '">
469 469
                         <i class="nav-icon fa-solid fa-lightbulb"></i>
470 470
                         <p>
471
-                            ' . $lang->get('suggestion_menu') . '
471
+                            ' . $lang->get('suggestion_menu').'
472 472
                         </p>
473 473
                         </a>
474 474
                     </li>';
@@ -481,7 +481,7 @@  discard block
 block discarded – undo
481 481
                         <a href="#" data-name="admin" class="nav-link', $get['page'] === 'admin' ? ' active' : '', '">
482 482
                         <i class="nav-icon fa-solid fa-info"></i>
483 483
                         <p>
484
-                            ' . $lang->get('admin_main') . '
484
+                            ' . $lang->get('admin_main').'
485 485
                         </p>
486 486
                         </a>
487 487
                     </li>
@@ -489,7 +489,7 @@  discard block
 block discarded – undo
489 489
                         <a href="#" class="nav-link">
490 490
                             <i class="nav-icon fa-solid fa-wrench"></i>
491 491
                             <p>
492
-                                ' . $lang->get('admin_settings') . '
492
+                                ' . $lang->get('admin_settings').'
493 493
                                 <i class="fa-solid fa-angle-left right"></i>
494 494
                             </p>
495 495
                         </a>
@@ -497,43 +497,43 @@  discard block
 block discarded – undo
497 497
                             <li class="nav-item">
498 498
                                 <a href="#" data-name="options" class="nav-link', $get['page'] === 'options' ? ' active' : '', '">
499 499
                                     <i class="fa-solid fa-check-double nav-icon"></i>
500
-                                    <p>' . $lang->get('options') . '</p>
500
+                                    <p>' . $lang->get('options').'</p>
501 501
                                 </a>
502 502
                             </li>
503 503
                             <li class="nav-item">
504 504
                                 <a href="#" data-name="2fa" class="nav-link', $get['page'] === '2fa' ? ' active' : '', '">
505 505
                                     <i class="fa-solid fa-qrcode nav-icon"></i>
506
-                                    <p>' . $lang->get('mfa_short') . '</p>
506
+                                    <p>' . $lang->get('mfa_short').'</p>
507 507
                                 </a>
508 508
                             </li>
509 509
                             <li class="nav-item">
510 510
                                 <a href="#" data-name="api" class="nav-link', $get['page'] === 'api' ? ' active' : '', '">
511 511
                                     <i class="fa-solid fa-cubes nav-icon"></i>
512
-                                    <p>' . $lang->get('api') . '</p>
512
+                                    <p>' . $lang->get('api').'</p>
513 513
                                 </a>
514 514
                             </li>
515 515
                             <li class="nav-item">
516 516
                                 <a href="#" data-name="backups" class="nav-link', $get['page'] === 'backups' ? ' active' : '', '">
517 517
                                     <i class="fa-solid fa-database nav-icon"></i>
518
-                                    <p>' . $lang->get('backups') . '</p>
518
+                                    <p>' . $lang->get('backups').'</p>
519 519
                                 </a>
520 520
                             </li>
521 521
                             <li class="nav-item">
522 522
                                 <a href="#" data-name="emails" class="nav-link', $get['page'] === 'emails' ? ' active' : '', '">
523 523
                                     <i class="fa-solid fa-envelope nav-icon"></i>
524
-                                    <p>' . $lang->get('emails') . '</p>
524
+                                    <p>' . $lang->get('emails').'</p>
525 525
                                 </a>
526 526
                             </li>
527 527
                             <li class="nav-item">
528 528
                                 <a href="#" data-name="fields" class="nav-link', $get['page'] === 'fields' ? ' active' : '', '">
529 529
                                     <i class="fa-solid fa-keyboard nav-icon"></i>
530
-                                    <p>' . $lang->get('fields') . '</p>
530
+                                    <p>' . $lang->get('fields').'</p>
531 531
                                 </a>
532 532
                             </li>
533 533
                             <li class="nav-item">
534 534
                                 <a href="#" data-name="ldap" class="nav-link', $get['page'] === 'ldap' ? ' active' : '', '">
535 535
                                     <i class="fa-solid fa-id-card nav-icon"></i>
536
-                                    <p>' . $lang->get('ldap') . '</p>
536
+                                    <p>' . $lang->get('ldap').'</p>
537 537
                                 </a>
538 538
                             </li>';
539 539
 if (WIP === true) {
@@ -541,7 +541,7 @@  discard block
 block discarded – undo
541 541
                             <li class="nav-item">
542 542
                                 <a href="#" data-name="oauth" class="nav-link', $get['page'] === 'oauth' ? ' active' : '', '">
543 543
                                     <i class="fa-solid fa-plug nav-icon"></i>
544
-                                    <p>' . $lang->get('oauth') . '</p>
544
+                                    <p>' . $lang->get('oauth').'</p>
545 545
                                 </a>
546 546
                             </li>';
547 547
 }
@@ -549,13 +549,13 @@  discard block
 block discarded – undo
549 549
                             <li class="nav-item">
550 550
                                 <a href="#" data-name="uploads" class="nav-link', $get['page'] === 'uploads' ? ' active' : '', '">
551 551
                                     <i class="fa-solid fa-file-upload nav-icon"></i>
552
-                                    <p>' . $lang->get('uploads') . '</p>
552
+                                    <p>' . $lang->get('uploads').'</p>
553 553
                                 </a>
554 554
                             </li>
555 555
                             <li class="nav-item">
556 556
                                 <a href="#" data-name="statistics" class="nav-link', $get['page'] === 'statistics' ? ' active' : '', '">
557 557
                                     <i class="fa-solid fa-chart-bar nav-icon"></i>
558
-                                    <p>' . $lang->get('statistics') . '</p>
558
+                                    <p>' . $lang->get('statistics').'</p>
559 559
                                 </a>
560 560
                             </li>
561 561
                         </ul>
@@ -566,7 +566,7 @@  discard block
 block discarded – undo
566 566
                     <li class="nav-item">
567 567
                         <a href="#" data-name="tasks" class="nav-link', $get['page'] === 'tasks' ? ' active' : '', '">
568 568
                         <i class="fa-solid fa-tasks nav-icon"></i>
569
-                        <p>' . $lang->get('tasks') . '</p>
569
+                        <p>' . $lang->get('tasks').'</p>
570 570
                         </a>
571 571
                     </li>';
572 572
                     }
@@ -583,7 +583,7 @@  discard block
 block discarded – undo
583 583
                         <a href="#" data-name="tools" class="nav-link', $get['page'] === 'tools' ? ' active' : '', '">
584 584
                         <i class="nav-icon fa-solid fa-screwdriver-wrench"></i>
585 585
                         <p>
586
-                            ' . $lang->get('tools') . '
586
+                            ' . $lang->get('tools').'
587 587
                         </p>
588 588
                         </a>
589 589
                     </li>';
@@ -593,7 +593,7 @@  discard block
 block discarded – undo
593 593
                         <a href="#" data-name="folders" class="nav-link', $get['page'] === 'folders' ? ' active' : '', '">
594 594
                         <i class="nav-icon fa-solid fa-folder-open"></i>
595 595
                         <p>
596
-                            ' . $lang->get('folders') . '
596
+                            ' . $lang->get('folders').'
597 597
                         </p>
598 598
                         </a>
599 599
                     </li>
@@ -601,7 +601,7 @@  discard block
 block discarded – undo
601 601
                         <a href="#" data-name="roles" class="nav-link', $get['page'] === 'roles' ? ' active' : '', '">
602 602
                         <i class="nav-icon fa-solid fa-graduation-cap"></i>
603 603
                         <p>
604
-                            ' . $lang->get('roles') . '
604
+                            ' . $lang->get('roles').'
605 605
                         </p>
606 606
                         </a>
607 607
                     </li>
@@ -609,38 +609,38 @@  discard block
 block discarded – undo
609 609
                         <a href="#" data-name="users" class="nav-link', $get['page'] === 'users' ? ' active' : '', '">
610 610
                         <i class="nav-icon fa-solid fa-users"></i>
611 611
                         <p>
612
-                            ' . $lang->get('users') . '
612
+                            ' . $lang->get('users').'
613 613
                         </p>
614 614
                         </a>
615 615
                     </li>
616 616
                     <li class="nav-item has-treeview', $menuUtilities === true ? ' menu-open' : '', '">
617 617
                         <a href="#" class="nav-link">
618 618
                         <i class="nav-icon fa-solid fa-cubes"></i>
619
-                        <p>' . $lang->get('admin_views') . '<i class="fa-solid fa-angle-left right"></i></p>
619
+                        <p>' . $lang->get('admin_views').'<i class="fa-solid fa-angle-left right"></i></p>
620 620
                         </a>
621 621
                         <ul class="nav nav-treeview">
622 622
                             <li class="nav-item">
623 623
                                 <a href="#" data-name="utilities.renewal" class="nav-link', $get['page'] === 'utilities.renewal' ? ' active' : '', '">
624 624
                                 <i class="far fa-calendar-alt nav-icon"></i>
625
-                                <p>' . $lang->get('renewal') . '</p>
625
+                                <p>' . $lang->get('renewal').'</p>
626 626
                                 </a>
627 627
                             </li>
628 628
                             <li class="nav-item">
629 629
                                 <a href="#" data-name="utilities.deletion" class="nav-link', $get['page'] === 'utilities.deletion' ? ' active' : '', '">
630 630
                                 <i class="fa-solid fa-trash-alt nav-icon"></i>
631
-                                <p>' . $lang->get('deletion') . '</p>
631
+                                <p>' . $lang->get('deletion').'</p>
632 632
                                 </a>
633 633
                             </li>
634 634
                             <li class="nav-item">
635 635
                                 <a href="#" data-name="utilities.logs" class="nav-link', $get['page'] === 'utilities.logs' ? ' active' : '', '">
636 636
                                 <i class="fa-solid fa-history nav-icon"></i>
637
-                                <p>' . $lang->get('logs') . '</p>
637
+                                <p>' . $lang->get('logs').'</p>
638 638
                                 </a>
639 639
                             </li>
640 640
                             <li class="nav-item">
641 641
                                 <a href="#" data-name="utilities.database" class="nav-link', $get['page'] === 'utilities.database' ? ' active' : '', '">
642 642
                                 <i class="fa-solid fa-database nav-icon"></i>
643
-                                <p>' . $lang->get('database') . '</p>
643
+                                <p>' . $lang->get('database').'</p>
644 644
                                 </a>
645 645
                             </li>
646 646
                         </ul>
@@ -651,10 +651,10 @@  discard block
 block discarded – undo
651 651
                     <!-- /.sidebar-menu -->
652 652
                 <div class="menu-footer">
653 653
                     <div class="" id="sidebar-footer">
654
-                        <i class="fa-solid fa-clock-o mr-2 infotip text-info pointer" title="<?php echo $lang->get('server_time') . ' ' .
655
-                            date($SETTINGS['date_format'], (int) $server['request_time']) . ' - ' .
654
+                        <i class="fa-solid fa-clock-o mr-2 infotip text-info pointer" title="<?php echo $lang->get('server_time').' '.
655
+                            date($SETTINGS['date_format'], (int) $server['request_time']).' - '.
656 656
                             date($SETTINGS['time_format'], (int) $server['request_time']); ?>"></i>
657
-                        <i class="fa-solid fa-users mr-2 infotip text-info pointer" title="<?php echo $session_nb_users_online . ' ' . $lang->get('users_online'); ?>"></i>
657
+                        <i class="fa-solid fa-users mr-2 infotip text-info pointer" title="<?php echo $session_nb_users_online.' '.$lang->get('users_online'); ?>"></i>
658 658
                         <a href="<?php echo DOCUMENTATION_URL; ?>" target="_blank" class="text-info"><i class="fa-solid fa-book mr-2 infotip" title="<?php echo $lang->get('documentation_canal'); ?>"></i></a>
659 659
                         <a href="<?php echo HELP_URL; ?>" target="_blank" class="text-info"><i class="fa-solid fa-life-ring mr-2 infotip" title="<?php echo $lang->get('admin_help'); ?>"></i></a>
660 660
                         <i class="fa-solid fa-bug infotip pointer text-info" title="<?php echo $lang->get('bugs_page'); ?>" onclick="generateBugReport()"></i>
@@ -803,7 +803,7 @@  discard block
 block discarded – undo
803 803
                                 </div>
804 804
                                 <div class="mt-3">                                    
805 805
                                     <label>
806
-                                        <span class="mr-2 pointer fw-normal"><i class="fa-solid fa-eye mr-2 text-orange"></i><?php echo $lang->get('show_user_password');?></span>
806
+                                        <span class="mr-2 pointer fw-normal"><i class="fa-solid fa-eye mr-2 text-orange"></i><?php echo $lang->get('show_user_password'); ?></span>
807 807
                                         <input type="checkbox" id="dialog-admin-change-user-password-do-show-password" class="pointer">
808 808
                                     </label>
809 809
                                 </div>
@@ -962,34 +962,34 @@  discard block
 block discarded – undo
962 962
                     if ($get['page'] === 'items') {
963 963
                         // SHow page with Items
964 964
                         if ((int) $session_user_admin !== 1) {
965
-                            include $SETTINGS['cpassman_dir'] . '/pages/items.php';
965
+                            include $SETTINGS['cpassman_dir'].'/pages/items.php';
966 966
                         } elseif ((int) $session_user_admin === 1) {
967
-                            include $SETTINGS['cpassman_dir'] . '/pages/admin.php';
967
+                            include $SETTINGS['cpassman_dir'].'/pages/admin.php';
968 968
                         } else {
969 969
                             $session->set('system-error_code', ERR_NOT_ALLOWED);
970 970
                             //not allowed page
971
-                            include $SETTINGS['cpassman_dir'] . '/error.php';
971
+                            include $SETTINGS['cpassman_dir'].'/error.php';
972 972
                         }
973 973
                     } elseif (in_array($get['page'], array_keys($mngPages)) === true) {
974 974
                         // Define if user is allowed to see management pages
975 975
                         if ($session_user_admin === 1) {
976 976
                             // deepcode ignore FileInclusion: $get['page'] is secured through usage of array_keys test bellow
977
-                            include $SETTINGS['cpassman_dir'] . '/pages/' . basename($mngPages[$get['page']]);
977
+                            include $SETTINGS['cpassman_dir'].'/pages/'.basename($mngPages[$get['page']]);
978 978
                         } elseif ($session_user_manager === 1 || $session_user_human_resources === 1) {
979 979
                             if ($get['page'] === 'manage_main' || $get['page'] === 'manage_settings'
980 980
                             ) {
981 981
                                 $session->set('system-error_code', ERR_NOT_ALLOWED);
982 982
                                 //not allowed page
983
-                                include $SETTINGS['cpassman_dir'] . '/error.php';
983
+                                include $SETTINGS['cpassman_dir'].'/error.php';
984 984
                             }
985 985
                         } else {
986 986
                             $session->set('system-error_code', ERR_NOT_ALLOWED);
987 987
                             //not allowed page
988
-                            include $SETTINGS['cpassman_dir'] . '/error.php';
988
+                            include $SETTINGS['cpassman_dir'].'/error.php';
989 989
                         }
990
-                    } elseif (empty($get['page']) === false && file_exists($SETTINGS['cpassman_dir'] . '/pages/' . $get['page'] . '.php') === true) {
990
+                    } elseif (empty($get['page']) === false && file_exists($SETTINGS['cpassman_dir'].'/pages/'.$get['page'].'.php') === true) {
991 991
                         // deepcode ignore FileInclusion: $get['page'] is tested against file_exists just below
992
-                        include $SETTINGS['cpassman_dir'] . '/pages/' . basename($get['page'] . '.php');
992
+                        include $SETTINGS['cpassman_dir'].'/pages/'.basename($get['page'].'.php');
993 993
                     } else {
994 994
                         $session->set('system-array_roles', ERR_NOT_EXIST);
995 995
                         //page doesn't exist
@@ -1038,7 +1038,7 @@  discard block
 block discarded – undo
1038 1038
         echo '
1039 1039
 <input type="hidden" id="temps_restant" value="', $session->get('user-session_duration') ?? '', '" />';
1040 1040
 // display an item in the context of OTV link
1041
-} elseif ((null === $session->get('user-validite_pw')|| empty($session->get('user-validite_pw')) === true || empty($session->get('user-id')) === true)
1041
+} elseif ((null === $session->get('user-validite_pw') || empty($session->get('user-validite_pw')) === true || empty($session->get('user-id')) === true)
1042 1042
     && empty($get['otv']) === false
1043 1043
 ) {
1044 1044
     // case where one-shot viewer
@@ -1057,7 +1057,7 @@  discard block
 block discarded – undo
1057 1057
                 FILTER_SANITIZE_URL
1058 1058
             )
1059 1059
         );
1060
-        include $SETTINGS['cpassman_dir'] . '/error.php';
1060
+        include $SETTINGS['cpassman_dir'].'/error.php';
1061 1061
     }
1062 1062
 } elseif (//(empty($session->get('user-id')) === false && $session->get('user-id') !== null) ||
1063 1063
         empty($session->get('user-id')) === true
@@ -1089,7 +1089,7 @@  discard block
 block discarded – undo
1089 1089
     }
1090 1090
     
1091 1091
     // LOGIN form
1092
-    include $SETTINGS['cpassman_dir'] . '/includes/core/login.php';
1092
+    include $SETTINGS['cpassman_dir'].'/includes/core/login.php';
1093 1093
 } else {
1094 1094
     // Clear session
1095 1095
     $session->invalidate();
@@ -1306,65 +1306,65 @@  discard block
 block discarded – undo
1306 1306
 
1307 1307
 // Load links, css and javascripts
1308 1308
 if (isset($SETTINGS['cpassman_dir']) === true) {
1309
-    include_once $SETTINGS['cpassman_dir'] . '/includes/core/load.js.php';
1309
+    include_once $SETTINGS['cpassman_dir'].'/includes/core/load.js.php';
1310 1310
     if ($menuAdmin === true) {
1311
-        include_once $SETTINGS['cpassman_dir'] . '/pages/admin.js.php';
1311
+        include_once $SETTINGS['cpassman_dir'].'/pages/admin.js.php';
1312 1312
         if ($get['page'] === '2fa') {
1313
-            include_once $SETTINGS['cpassman_dir'] . '/pages/2fa.js.php';
1313
+            include_once $SETTINGS['cpassman_dir'].'/pages/2fa.js.php';
1314 1314
         } elseif ($get['page'] === 'api') {
1315
-            include_once $SETTINGS['cpassman_dir'] . '/pages/api.js.php';
1315
+            include_once $SETTINGS['cpassman_dir'].'/pages/api.js.php';
1316 1316
         } elseif ($get['page'] === 'backups') {
1317
-            include_once $SETTINGS['cpassman_dir'] . '/pages/backups.js.php';
1317
+            include_once $SETTINGS['cpassman_dir'].'/pages/backups.js.php';
1318 1318
         } elseif ($get['page'] === 'emails') {
1319
-            include_once $SETTINGS['cpassman_dir'] . '/pages/emails.js.php';
1319
+            include_once $SETTINGS['cpassman_dir'].'/pages/emails.js.php';
1320 1320
         } elseif ($get['page'] === 'ldap') {
1321
-            include_once $SETTINGS['cpassman_dir'] . '/pages/ldap.js.php';
1321
+            include_once $SETTINGS['cpassman_dir'].'/pages/ldap.js.php';
1322 1322
         } elseif ($get['page'] === 'uploads') {
1323
-            include_once $SETTINGS['cpassman_dir'] . '/pages/uploads.js.php';
1323
+            include_once $SETTINGS['cpassman_dir'].'/pages/uploads.js.php';
1324 1324
         } elseif ($get['page'] === 'fields') {
1325
-            include_once $SETTINGS['cpassman_dir'] . '/pages/fields.js.php';
1325
+            include_once $SETTINGS['cpassman_dir'].'/pages/fields.js.php';
1326 1326
         } elseif ($get['page'] === 'options') {
1327
-            include_once $SETTINGS['cpassman_dir'] . '/pages/options.js.php';
1327
+            include_once $SETTINGS['cpassman_dir'].'/pages/options.js.php';
1328 1328
         } elseif ($get['page'] === 'statistics') {
1329
-            include_once $SETTINGS['cpassman_dir'] . '/pages/statistics.js.php';
1329
+            include_once $SETTINGS['cpassman_dir'].'/pages/statistics.js.php';
1330 1330
         } elseif ($get['page'] === 'tasks') {
1331
-            include_once $SETTINGS['cpassman_dir'] . '/pages/tasks.js.php';
1331
+            include_once $SETTINGS['cpassman_dir'].'/pages/tasks.js.php';
1332 1332
         } elseif ($get['page'] === 'oauth') {
1333
-            include_once $SETTINGS['cpassman_dir'] . '/pages/oauth.js.php';        
1333
+            include_once $SETTINGS['cpassman_dir'].'/pages/oauth.js.php';        
1334 1334
         } elseif ($get['page'] === 'tools') {
1335
-            include_once $SETTINGS['cpassman_dir'] . '/pages/tools.js.php';
1335
+            include_once $SETTINGS['cpassman_dir'].'/pages/tools.js.php';
1336 1336
         }
1337 1337
     } elseif (isset($get['page']) === true && $get['page'] !== '') {
1338 1338
         if ($get['page'] === 'items') {
1339
-            include_once $SETTINGS['cpassman_dir'] . '/pages/items.js.php';
1339
+            include_once $SETTINGS['cpassman_dir'].'/pages/items.js.php';
1340 1340
         } elseif ($get['page'] === 'import') {
1341
-            include_once $SETTINGS['cpassman_dir'] . '/pages/import.js.php';
1341
+            include_once $SETTINGS['cpassman_dir'].'/pages/import.js.php';
1342 1342
         } elseif ($get['page'] === 'export') {
1343
-            include_once $SETTINGS['cpassman_dir'] . '/pages/export.js.php';
1343
+            include_once $SETTINGS['cpassman_dir'].'/pages/export.js.php';
1344 1344
         } elseif ($get['page'] === 'offline') {
1345
-            include_once $SETTINGS['cpassman_dir'] . '/pages/offline.js.php';
1345
+            include_once $SETTINGS['cpassman_dir'].'/pages/offline.js.php';
1346 1346
         } elseif ($get['page'] === 'search') {
1347
-            include_once $SETTINGS['cpassman_dir'] . '/pages/search.js.php';
1347
+            include_once $SETTINGS['cpassman_dir'].'/pages/search.js.php';
1348 1348
         } elseif ($get['page'] === 'profile') {
1349
-            include_once $SETTINGS['cpassman_dir'] . '/pages/profile.js.php';
1349
+            include_once $SETTINGS['cpassman_dir'].'/pages/profile.js.php';
1350 1350
         } elseif ($get['page'] === 'favourites') {
1351
-            include_once $SETTINGS['cpassman_dir'] . '/pages/favorites.js.php';
1351
+            include_once $SETTINGS['cpassman_dir'].'/pages/favorites.js.php';
1352 1352
         } elseif ($get['page'] === 'folders') {
1353
-            include_once $SETTINGS['cpassman_dir'] . '/pages/folders.js.php';
1353
+            include_once $SETTINGS['cpassman_dir'].'/pages/folders.js.php';
1354 1354
         } elseif ($get['page'] === 'users') {
1355
-            include_once $SETTINGS['cpassman_dir'] . '/pages/users.js.php';
1355
+            include_once $SETTINGS['cpassman_dir'].'/pages/users.js.php';
1356 1356
         } elseif ($get['page'] === 'roles') {
1357
-            include_once $SETTINGS['cpassman_dir'] . '/pages/roles.js.php';
1357
+            include_once $SETTINGS['cpassman_dir'].'/pages/roles.js.php';
1358 1358
         } elseif ($get['page'] === 'utilities.deletion') {
1359
-            include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.deletion.js.php';
1359
+            include_once $SETTINGS['cpassman_dir'].'/pages/utilities.deletion.js.php';
1360 1360
         } elseif ($get['page'] === 'utilities.logs') {
1361
-            include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.logs.js.php';
1361
+            include_once $SETTINGS['cpassman_dir'].'/pages/utilities.logs.js.php';
1362 1362
         } elseif ($get['page'] === 'utilities.database') {
1363
-            include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.database.js.php';
1363
+            include_once $SETTINGS['cpassman_dir'].'/pages/utilities.database.js.php';
1364 1364
         } elseif ($get['page'] === 'utilities.renewal') {
1365
-            include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.renewal.js.php';
1365
+            include_once $SETTINGS['cpassman_dir'].'/pages/utilities.renewal.js.php';
1366 1366
         }
1367 1367
     } else {
1368
-        include_once $SETTINGS['cpassman_dir'] . '/includes/core/login.js.php';
1368
+        include_once $SETTINGS['cpassman_dir'].'/includes/core/login.js.php';
1369 1369
     }
1370 1370
 }
Please login to merge, or discard this patch.