nilsteampassnet /
TeamPass
@@ -72,8 +72,8 @@ discard block |
||
| 72 | 72 | } |
| 73 | 73 | |
| 74 | 74 | // Include files |
| 75 | -require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php'; |
|
| 76 | -require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php'; |
|
| 75 | +require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php'; |
|
| 76 | +require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php'; |
|
| 77 | 77 | // Quick major version check -> upgrade needed? |
| 78 | 78 | if (isset($SETTINGS['cpassman_version']) === true && version_compare(TP_VERSION, $SETTINGS['cpassman_version']) > 0) { |
| 79 | 79 | // Perform redirection |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | exit; |
| 87 | 87 | } |
| 88 | 88 | |
| 89 | -require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 89 | +require_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 90 | 90 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 91 | 91 | |
| 92 | 92 | if (isset($SETTINGS['cpassman_url']) === false || $SETTINGS['cpassman_url'] === '') { |
@@ -94,8 +94,8 @@ discard block |
||
| 94 | 94 | } |
| 95 | 95 | |
| 96 | 96 | // Include files |
| 97 | -require_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php'; |
|
| 98 | -require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 97 | +require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php'; |
|
| 98 | +require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 99 | 99 | // Open MYSQL database connection |
| 100 | 100 | require_once './includes/libraries/Database/Meekrodb/db.class.php'; |
| 101 | 101 | if (defined('DB_PASSWD_CLEAR') === false) { |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | DB::$port = DB_PORT; |
| 109 | 109 | DB::$encoding = DB_ENCODING; |
| 110 | 110 | // Load Core library |
| 111 | -require_once $SETTINGS['cpassman_dir'] . '/sources/core.php'; |
|
| 111 | +require_once $SETTINGS['cpassman_dir'].'/sources/core.php'; |
|
| 112 | 112 | // Prepare POST variables |
| 113 | 113 | $post_language = filter_input(INPUT_POST, 'language', FILTER_SANITIZE_STRING); |
| 114 | 114 | // Prepare superGlobal variables |
@@ -138,8 +138,8 @@ discard block |
||
| 138 | 138 | //get default language |
| 139 | 139 | $dataLanguage = DB::queryFirstRow( |
| 140 | 140 | 'SELECT m.valeur AS valeur, l.flag AS flag |
| 141 | - FROM ' . prefixTable('misc') . ' AS m |
|
| 142 | - INNER JOIN ' . prefixTable('languages') . ' AS l ON (m.valeur = l.name) |
|
| 141 | + FROM ' . prefixTable('misc').' AS m |
|
| 142 | + INNER JOIN ' . prefixTable('languages').' AS l ON (m.valeur = l.name) |
|
| 143 | 143 | WHERE m.type=%s_type AND m.intitule=%s_intitule', |
| 144 | 144 | [ |
| 145 | 145 | 'type' => 'admin', |
@@ -181,23 +181,23 @@ discard block |
||
| 181 | 181 | |
| 182 | 182 | // Load user languages files |
| 183 | 183 | if (in_array($session_user_language, $languagesList) === true) { |
| 184 | - if (file_exists($SETTINGS['cpassman_dir'] . '/includes/language/' . $session_user_language . '.php') === true) { |
|
| 185 | - $_SESSION['teampass']['lang'] = include $SETTINGS['cpassman_dir'] . '/includes/language/' . $session_user_language . '.php'; |
|
| 184 | + if (file_exists($SETTINGS['cpassman_dir'].'/includes/language/'.$session_user_language.'.php') === true) { |
|
| 185 | + $_SESSION['teampass']['lang'] = include $SETTINGS['cpassman_dir'].'/includes/language/'.$session_user_language.'.php'; |
|
| 186 | 186 | } |
| 187 | 187 | } else { |
| 188 | 188 | $_SESSION['error']['code'] = ERR_NOT_ALLOWED; |
| 189 | 189 | //not allowed page |
| 190 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 190 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 191 | 191 | } |
| 192 | 192 | |
| 193 | 193 | // load 2FA Google |
| 194 | 194 | if (isset($SETTINGS['google_authentication']) === true && $SETTINGS['google_authentication'] === '1') { |
| 195 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php'; |
|
| 195 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php'; |
|
| 196 | 196 | } |
| 197 | 197 | |
| 198 | 198 | // load 2FA Yubico |
| 199 | 199 | if (isset($SETTINGS['yubico_authentication']) === true && $SETTINGS['yubico_authentication'] === '1') { |
| 200 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/Yubico/Yubico.php'; |
|
| 200 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/Yubico/Yubico.php'; |
|
| 201 | 201 | } |
| 202 | 202 | |
| 203 | 203 | // Some template adjust |
@@ -254,7 +254,7 @@ discard block |
||
| 254 | 254 | <!-- Toastr --> |
| 255 | 255 | <link rel="stylesheet" href="plugins/toastr/toastr.min.css" /> |
| 256 | 256 | <!-- favicon --> |
| 257 | - <link rel="shortcut icon" type="image/png" href="<?php echo $SETTINGS['favicon'];?>"/> |
|
| 257 | + <link rel="shortcut icon" type="image/png" href="<?php echo $SETTINGS['favicon']; ?>"/> |
|
| 258 | 258 | </head> |
| 259 | 259 | |
| 260 | 260 | |
@@ -285,7 +285,7 @@ discard block |
||
| 285 | 285 | ), |
| 286 | 286 | 'SESSION' |
| 287 | 287 | ); |
| 288 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 288 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 289 | 289 | } |
| 290 | 290 | } elseif ( |
| 291 | 291 | $session_validite_pw !== null |
@@ -329,7 +329,7 @@ discard block |
||
| 329 | 329 | <div class="dropdown show"> |
| 330 | 330 | <a class="btn btn-primary dropdown-toggle" href="#" data-toggle="dropdown"> |
| 331 | 331 | <?php |
| 332 | - echo $session_name . ' ' . $session_lastname; ?> |
|
| 332 | + echo $session_name.' '.$session_lastname; ?> |
|
| 333 | 333 | </a> |
| 334 | 334 | |
| 335 | 335 | <div class="dropdown-menu dropdown-menu-right"> |
@@ -367,7 +367,7 @@ discard block |
||
| 367 | 367 | <!-- Main Sidebar Container --> |
| 368 | 368 | <aside class="main-sidebar sidebar-dark-primary elevation-4"> |
| 369 | 369 | <!-- Brand Logo --> |
| 370 | - <a href="<?php echo $SETTINGS['cpassman_url'] . '/index.php?page=items'; ?>" class="brand-link"> |
|
| 370 | + <a href="<?php echo $SETTINGS['cpassman_url'].'/index.php?page=items'; ?>" class="brand-link"> |
|
| 371 | 371 | <img src="includes/images/teampass-logo2-home.png" alt="Teampass Logo" class="brand-image"> |
| 372 | 372 | <span class="brand-text font-weight-light"><?php echo TP_TOOL_NAME; ?></span> |
| 373 | 373 | </a> |
@@ -385,7 +385,7 @@ discard block |
||
| 385 | 385 | <a href="#" data-name="items" class="nav-link', $get['page'] === 'items' ? ' active' : '', '"> |
| 386 | 386 | <i class="nav-icon fas fa-key"></i> |
| 387 | 387 | <p> |
| 388 | - ' . langHdl('pw') . ' |
|
| 388 | + ' . langHdl('pw').' |
|
| 389 | 389 | </p> |
| 390 | 390 | </a> |
| 391 | 391 | </li>'; |
@@ -401,7 +401,7 @@ discard block |
||
| 401 | 401 | <a href="#" data-name="import" class="nav-link', $get['page'] === 'import' ? ' active' : '', '"> |
| 402 | 402 | <i class="nav-icon fas fa-file-import"></i> |
| 403 | 403 | <p> |
| 404 | - ' . langHdl('import') . ' |
|
| 404 | + ' . langHdl('import').' |
|
| 405 | 405 | </p> |
| 406 | 406 | </a> |
| 407 | 407 | </li>'; |
@@ -422,7 +422,7 @@ discard block |
||
| 422 | 422 | <a href="#" data-name="export" class="nav-link', $get['page'] === 'export' ? ' active' : '', '"> |
| 423 | 423 | <i class="nav-icon fas fa-file-export"></i> |
| 424 | 424 | <p> |
| 425 | - ' . langHdl('export') . ' |
|
| 425 | + ' . langHdl('export').' |
|
| 426 | 426 | </p> |
| 427 | 427 | </a> |
| 428 | 428 | </li>'; |
@@ -449,7 +449,7 @@ discard block |
||
| 449 | 449 | <a href="#" data-name="search" class="nav-link', $get['page'] === 'search' ? ' active' : '', '"> |
| 450 | 450 | <i class="nav-icon fas fa-search"></i> |
| 451 | 451 | <p> |
| 452 | - ' . langHdl('find') . ' |
|
| 452 | + ' . langHdl('find').' |
|
| 453 | 453 | </p> |
| 454 | 454 | </a> |
| 455 | 455 | </li>'; |
@@ -466,7 +466,7 @@ discard block |
||
| 466 | 466 | <a href="#" data-name="favourites" class="nav-link', $get['page'] === 'admin' ? ' favourites' : '', '"> |
| 467 | 467 | <i class="nav-icon fas fa-star"></i> |
| 468 | 468 | <p> |
| 469 | - ' . langHdl('favorites') . ' |
|
| 469 | + ' . langHdl('favorites').' |
|
| 470 | 470 | </p> |
| 471 | 471 | </a> |
| 472 | 472 | </li>'; |
@@ -496,7 +496,7 @@ discard block |
||
| 496 | 496 | <a href="#" data-name="suggestion" class="nav-link', $get['page'] === 'suggestion' ? ' active' : '', '"> |
| 497 | 497 | <i class="nav-icon fas fa-lightbulb"></i> |
| 498 | 498 | <p> |
| 499 | - ' . langHdl('suggestion_menu') . ' |
|
| 499 | + ' . langHdl('suggestion_menu').' |
|
| 500 | 500 | </p> |
| 501 | 501 | </a> |
| 502 | 502 | </li>'; |
@@ -509,7 +509,7 @@ discard block |
||
| 509 | 509 | <a href="#" data-name="admin" class="nav-link', $get['page'] === 'admin' ? ' active' : '', '"> |
| 510 | 510 | <i class="nav-icon fas fa-info"></i> |
| 511 | 511 | <p> |
| 512 | - ' . langHdl('admin_main') . ' |
|
| 512 | + ' . langHdl('admin_main').' |
|
| 513 | 513 | </p> |
| 514 | 514 | </a> |
| 515 | 515 | </li> |
@@ -517,7 +517,7 @@ discard block |
||
| 517 | 517 | <a href="#" class="nav-link"> |
| 518 | 518 | <i class="nav-icon fas fa-wrench"></i> |
| 519 | 519 | <p> |
| 520 | - ' . langHdl('admin_settings') . ' |
|
| 520 | + ' . langHdl('admin_settings').' |
|
| 521 | 521 | <i class="fas fa-angle-left right"></i> |
| 522 | 522 | </p> |
| 523 | 523 | </a> |
@@ -525,55 +525,55 @@ discard block |
||
| 525 | 525 | <li class="nav-item"> |
| 526 | 526 | <a href="#" data-name="options" class="nav-link', $get['page'] === 'options' ? ' active' : '', '"> |
| 527 | 527 | <i class="fas fa-check-double nav-icon"></i> |
| 528 | - <p>' . langHdl('options') . '</p> |
|
| 528 | + <p>' . langHdl('options').'</p> |
|
| 529 | 529 | </a> |
| 530 | 530 | </li> |
| 531 | 531 | <li class="nav-item"> |
| 532 | 532 | <a href="#" data-name="2fa" class="nav-link', $get['page'] === '2fa' ? ' active' : '', '"> |
| 533 | 533 | <i class="fas fa-qrcode nav-icon"></i> |
| 534 | - <p>' . langHdl('mfa_short') . '</p> |
|
| 534 | + <p>' . langHdl('mfa_short').'</p> |
|
| 535 | 535 | </a> |
| 536 | 536 | </li> |
| 537 | 537 | <li class="nav-item"> |
| 538 | 538 | <a href="#" data-name="api" class="nav-link', $get['page'] === 'api' ? ' active' : '', '"> |
| 539 | 539 | <i class="fas fa-cubes nav-icon"></i> |
| 540 | - <p>' . langHdl('api') . '</p> |
|
| 540 | + <p>' . langHdl('api').'</p> |
|
| 541 | 541 | </a> |
| 542 | 542 | </li> |
| 543 | 543 | <li class="nav-item"> |
| 544 | 544 | <a href="#" data-name="backups" class="nav-link', $get['page'] === 'backups' ? ' active' : '', '"> |
| 545 | 545 | <i class="fas fa-database nav-icon"></i> |
| 546 | - <p>' . langHdl('backups') . '</p> |
|
| 546 | + <p>' . langHdl('backups').'</p> |
|
| 547 | 547 | </a> |
| 548 | 548 | </li> |
| 549 | 549 | <li class="nav-item"> |
| 550 | 550 | <a href="#" data-name="emails" class="nav-link', $get['page'] === 'emails' ? ' active' : '', '"> |
| 551 | 551 | <i class="fas fa-envelope nav-icon"></i> |
| 552 | - <p>' . langHdl('emails') . '</p> |
|
| 552 | + <p>' . langHdl('emails').'</p> |
|
| 553 | 553 | </a> |
| 554 | 554 | </li> |
| 555 | 555 | <li class="nav-item"> |
| 556 | 556 | <a href="#" data-name="fields" class="nav-link', $get['page'] === 'fields' ? ' active' : '', '"> |
| 557 | 557 | <i class="fas fa-keyboard nav-icon"></i> |
| 558 | - <p>' . langHdl('fields') . '</p> |
|
| 558 | + <p>' . langHdl('fields').'</p> |
|
| 559 | 559 | </a> |
| 560 | 560 | </li> |
| 561 | 561 | <li class="nav-item"> |
| 562 | 562 | <a href="#" data-name="ldap" class="nav-link', $get['page'] === 'ldap' ? ' active' : '', '"> |
| 563 | 563 | <i class="fas fa-id-card nav-icon"></i> |
| 564 | - <p>' . langHdl('ldap') . '</p> |
|
| 564 | + <p>' . langHdl('ldap').'</p> |
|
| 565 | 565 | </a> |
| 566 | 566 | </li> |
| 567 | 567 | <li class="nav-item"> |
| 568 | 568 | <a href="#" data-name="uploads" class="nav-link', $get['page'] === 'uploads' ? ' active' : '', '"> |
| 569 | 569 | <i class="fas fa-file-upload nav-icon"></i> |
| 570 | - <p>' . langHdl('uploads') . '</p> |
|
| 570 | + <p>' . langHdl('uploads').'</p> |
|
| 571 | 571 | </a> |
| 572 | 572 | </li> |
| 573 | 573 | <li class="nav-item"> |
| 574 | 574 | <a href="#" data-name="statistics" class="nav-link', $get['page'] === 'statistics' ? ' active' : '', '"> |
| 575 | 575 | <i class="fas fa-chart-bar nav-icon"></i> |
| 576 | - <p>' . langHdl('statistics') . '</p> |
|
| 576 | + <p>' . langHdl('statistics').'</p> |
|
| 577 | 577 | </a> |
| 578 | 578 | </li> |
| 579 | 579 | </ul> |
@@ -582,7 +582,7 @@ discard block |
||
| 582 | 582 | <a href="#" data-name="actions" class="nav-link', $get['page'] === 'actions' ? ' active' : '', '"> |
| 583 | 583 | <i class="nav-icon fas fa-cogs"></i> |
| 584 | 584 | <p> |
| 585 | - ' . langHdl('actions') . ' |
|
| 585 | + ' . langHdl('actions').' |
|
| 586 | 586 | </p> |
| 587 | 587 | </a> |
| 588 | 588 | </li>'; |
@@ -598,7 +598,7 @@ discard block |
||
| 598 | 598 | <a href="#" data-name="folders" class="nav-link', $get['page'] === 'folders' ? ' active' : '', '"> |
| 599 | 599 | <i class="nav-icon fas fa-folder-open"></i> |
| 600 | 600 | <p> |
| 601 | - ' . langHdl('folders') . ' |
|
| 601 | + ' . langHdl('folders').' |
|
| 602 | 602 | </p> |
| 603 | 603 | </a> |
| 604 | 604 | </li> |
@@ -606,7 +606,7 @@ discard block |
||
| 606 | 606 | <a href="#" data-name="roles" class="nav-link', $get['page'] === 'roles' ? ' active' : '', '"> |
| 607 | 607 | <i class="nav-icon fas fa-graduation-cap"></i> |
| 608 | 608 | <p> |
| 609 | - ' . langHdl('roles') . ' |
|
| 609 | + ' . langHdl('roles').' |
|
| 610 | 610 | </p> |
| 611 | 611 | </a> |
| 612 | 612 | </li> |
@@ -614,38 +614,38 @@ discard block |
||
| 614 | 614 | <a href="#" data-name="users" class="nav-link', $get['page'] === 'users' ? ' active' : '', '"> |
| 615 | 615 | <i class="nav-icon fas fa-users"></i> |
| 616 | 616 | <p> |
| 617 | - ' . langHdl('users') . ' |
|
| 617 | + ' . langHdl('users').' |
|
| 618 | 618 | </p> |
| 619 | 619 | </a> |
| 620 | 620 | </li> |
| 621 | 621 | <li class="nav-item has-treeview', $menuUtilities === true ? ' menu-open' : '', '"> |
| 622 | 622 | <a href="#" class="nav-link"> |
| 623 | 623 | <i class="nav-icon fas fa-cubes"></i> |
| 624 | - <p>' . langHdl('admin_views') . '<i class="fas fa-angle-left right"></i></p> |
|
| 624 | + <p>' . langHdl('admin_views').'<i class="fas fa-angle-left right"></i></p> |
|
| 625 | 625 | </a> |
| 626 | 626 | <ul class="nav nav-treeview"> |
| 627 | 627 | <li class="nav-item"> |
| 628 | 628 | <a href="#" data-name="utilities.renewal" class="nav-link', $get['page'] === 'utilities.renewal' ? ' active' : '', '"> |
| 629 | 629 | <i class="far fa-calendar-alt nav-icon"></i> |
| 630 | - <p>' . langHdl('renewal') . '</p> |
|
| 630 | + <p>' . langHdl('renewal').'</p> |
|
| 631 | 631 | </a> |
| 632 | 632 | </li> |
| 633 | 633 | <li class="nav-item"> |
| 634 | 634 | <a href="#" data-name="utilities.deletion" class="nav-link', $get['page'] === 'utilities.deletion' ? ' active' : '', '"> |
| 635 | 635 | <i class="fas fa-trash-alt nav-icon"></i> |
| 636 | - <p>' . langHdl('deletion') . '</p> |
|
| 636 | + <p>' . langHdl('deletion').'</p> |
|
| 637 | 637 | </a> |
| 638 | 638 | </li> |
| 639 | 639 | <li class="nav-item"> |
| 640 | 640 | <a href="#" data-name="utilities.logs" class="nav-link', $get['page'] === 'utilities.logs' ? ' active' : '', '"> |
| 641 | 641 | <i class="fas fa-history nav-icon"></i> |
| 642 | - <p>' . langHdl('logs') . '</p> |
|
| 642 | + <p>' . langHdl('logs').'</p> |
|
| 643 | 643 | </a> |
| 644 | 644 | </li> |
| 645 | 645 | <li class="nav-item"> |
| 646 | 646 | <a href="#" data-name="utilities.database" class="nav-link', $get['page'] === 'utilities.database' ? ' active' : '', '"> |
| 647 | 647 | <i class="fas fa-database nav-icon"></i> |
| 648 | - <p>' . langHdl('database') . '</p> |
|
| 648 | + <p>' . langHdl('database').'</p> |
|
| 649 | 649 | </a> |
| 650 | 650 | </li> |
| 651 | 651 | </ul> |
@@ -656,10 +656,10 @@ discard block |
||
| 656 | 656 | <!-- /.sidebar-menu --> |
| 657 | 657 | <div class="menu-footer"> |
| 658 | 658 | <div class="" id="sidebar-footer"> |
| 659 | - <i class="fas fa-clock-o mr-2 infotip text-info pointer" title="<?php echo langHdl('server_time') . ' ' . |
|
| 660 | - date($SETTINGS['date_format'], (int) $server['request_time']) . ' - ' . |
|
| 659 | + <i class="fas fa-clock-o mr-2 infotip text-info pointer" title="<?php echo langHdl('server_time').' '. |
|
| 660 | + date($SETTINGS['date_format'], (int) $server['request_time']).' - '. |
|
| 661 | 661 | date($SETTINGS['time_format'], (int) $server['request_time']); ?>"></i> |
| 662 | - <i class="fas fa-users mr-2 infotip text-info pointer" title="<?php echo $session_nb_users_online . ' ' . langHdl('users_online'); ?>"></i> |
|
| 662 | + <i class="fas fa-users mr-2 infotip text-info pointer" title="<?php echo $session_nb_users_online.' '.langHdl('users_online'); ?>"></i> |
|
| 663 | 663 | <a href="<?php echo READTHEDOC_URL; ?>" target="_blank" class="text-info"><i class="fas fa-book mr-2 infotip" title="<?php echo langHdl('documentation_canal'); ?> ReadTheDocs"></i></a> |
| 664 | 664 | <a href="<?php echo REDDIT_URL; ?>" target="_blank" class="text-info"><i class="fab fa-reddit-alien mr-2 infotip" title="<?php echo langHdl('admin_help'); ?>"></i></a> |
| 665 | 665 | <i class="fas fa-bug infotip pointer text-info" title="<?php echo langHdl('bugs_page'); ?>" onclick="generateBugReport()"></i> |
@@ -962,18 +962,18 @@ discard block |
||
| 962 | 962 | } elseif ($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['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 | - include $SETTINGS['cpassman_dir'] . '/pages/' . $mngPages[$get['page']]; |
|
| 976 | + include $SETTINGS['cpassman_dir'].'/pages/'.$mngPages[$get['page']]; |
|
| 977 | 977 | } elseif ($session_user_manager === 1 || $session_user_human_resources === 1) { |
| 978 | 978 | if ($get['page'] !== 'manage_main' |
| 979 | 979 | && $get['page'] !== 'manage_settings' |
@@ -982,15 +982,15 @@ discard block |
||
| 982 | 982 | } else { |
| 983 | 983 | $_SESSION['error']['code'] = ERR_NOT_ALLOWED; |
| 984 | 984 | //not allowed page |
| 985 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 985 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 986 | 986 | } |
| 987 | 987 | } else { |
| 988 | 988 | $_SESSION['error']['code'] = ERR_NOT_ALLOWED; |
| 989 | 989 | //not allowed page |
| 990 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 990 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 991 | 991 | } |
| 992 | 992 | } elseif (empty($get['page']) === false) { |
| 993 | - include $SETTINGS['cpassman_dir'] . '/pages/' . $get['page'] . '.php'; |
|
| 993 | + include $SETTINGS['cpassman_dir'].'/pages/'.$get['page'].'.php'; |
|
| 994 | 994 | } else { |
| 995 | 995 | $_SESSION['error']['code'] = ERR_NOT_EXIST; |
| 996 | 996 | //page doesn't exist |
@@ -1080,7 +1080,7 @@ discard block |
||
| 1080 | 1080 | $superGlobal->put('initialUrl', '', 'SESSION'); |
| 1081 | 1081 | |
| 1082 | 1082 | // LOGIN form |
| 1083 | - include $SETTINGS['cpassman_dir'] . '/includes/core/login.php'; |
|
| 1083 | + include $SETTINGS['cpassman_dir'].'/includes/core/login.php'; |
|
| 1084 | 1084 | } |
| 1085 | 1085 | |
| 1086 | 1086 | ?> |
@@ -1270,61 +1270,61 @@ discard block |
||
| 1270 | 1270 | isset($_SESSION['CPM']) === true |
| 1271 | 1271 | && isset($SETTINGS['cpassman_dir']) === true |
| 1272 | 1272 | ) { |
| 1273 | - include_once $SETTINGS['cpassman_dir'] . '/includes/core/load.js.php'; |
|
| 1273 | + include_once $SETTINGS['cpassman_dir'].'/includes/core/load.js.php'; |
|
| 1274 | 1274 | if ($menuAdmin === true) { |
| 1275 | - include_once $SETTINGS['cpassman_dir'] . '/pages/admin.js.php'; |
|
| 1275 | + include_once $SETTINGS['cpassman_dir'].'/pages/admin.js.php'; |
|
| 1276 | 1276 | if ($get['page'] === '2fa') { |
| 1277 | - include_once $SETTINGS['cpassman_dir'] . '/pages/2fa.js.php'; |
|
| 1277 | + include_once $SETTINGS['cpassman_dir'].'/pages/2fa.js.php'; |
|
| 1278 | 1278 | } elseif ($get['page'] === 'api') { |
| 1279 | - include_once $SETTINGS['cpassman_dir'] . '/pages/api.js.php'; |
|
| 1279 | + include_once $SETTINGS['cpassman_dir'].'/pages/api.js.php'; |
|
| 1280 | 1280 | } elseif ($get['page'] === 'backups') { |
| 1281 | - include_once $SETTINGS['cpassman_dir'] . '/pages/backups.js.php'; |
|
| 1281 | + include_once $SETTINGS['cpassman_dir'].'/pages/backups.js.php'; |
|
| 1282 | 1282 | } elseif ($get['page'] === 'emails') { |
| 1283 | - include_once $SETTINGS['cpassman_dir'] . '/pages/emails.js.php'; |
|
| 1283 | + include_once $SETTINGS['cpassman_dir'].'/pages/emails.js.php'; |
|
| 1284 | 1284 | } elseif ($get['page'] === 'ldap') { |
| 1285 | - include_once $SETTINGS['cpassman_dir'] . '/pages/ldap.js.php'; |
|
| 1285 | + include_once $SETTINGS['cpassman_dir'].'/pages/ldap.js.php'; |
|
| 1286 | 1286 | } elseif ($get['page'] === 'uploads') { |
| 1287 | - include_once $SETTINGS['cpassman_dir'] . '/pages/uploads.js.php'; |
|
| 1287 | + include_once $SETTINGS['cpassman_dir'].'/pages/uploads.js.php'; |
|
| 1288 | 1288 | } elseif ($get['page'] === 'actions') { |
| 1289 | - include_once $SETTINGS['cpassman_dir'] . '/pages/actions.js.php'; |
|
| 1289 | + include_once $SETTINGS['cpassman_dir'].'/pages/actions.js.php'; |
|
| 1290 | 1290 | } elseif ($get['page'] === 'fields') { |
| 1291 | - include_once $SETTINGS['cpassman_dir'] . '/pages/fields.js.php'; |
|
| 1291 | + include_once $SETTINGS['cpassman_dir'].'/pages/fields.js.php'; |
|
| 1292 | 1292 | } elseif ($get['page'] === 'options') { |
| 1293 | - include_once $SETTINGS['cpassman_dir'] . '/pages/options.js.php'; |
|
| 1293 | + include_once $SETTINGS['cpassman_dir'].'/pages/options.js.php'; |
|
| 1294 | 1294 | } elseif ($get['page'] === 'statistics') { |
| 1295 | - include_once $SETTINGS['cpassman_dir'] . '/pages/statistics.js.php'; |
|
| 1295 | + include_once $SETTINGS['cpassman_dir'].'/pages/statistics.js.php'; |
|
| 1296 | 1296 | } |
| 1297 | 1297 | } elseif (isset($get['page']) === true && $get['page'] !== '') { |
| 1298 | 1298 | if ($get['page'] === 'items') { |
| 1299 | - include_once $SETTINGS['cpassman_dir'] . '/pages/items.js.php'; |
|
| 1299 | + include_once $SETTINGS['cpassman_dir'].'/pages/items.js.php'; |
|
| 1300 | 1300 | } elseif ($get['page'] === 'import') { |
| 1301 | - include_once $SETTINGS['cpassman_dir'] . '/pages/import.js.php'; |
|
| 1301 | + include_once $SETTINGS['cpassman_dir'].'/pages/import.js.php'; |
|
| 1302 | 1302 | } elseif ($get['page'] === 'export') { |
| 1303 | - include_once $SETTINGS['cpassman_dir'] . '/pages/export.js.php'; |
|
| 1303 | + include_once $SETTINGS['cpassman_dir'].'/pages/export.js.php'; |
|
| 1304 | 1304 | } elseif ($get['page'] === 'offline') { |
| 1305 | - include_once $SETTINGS['cpassman_dir'] . '/pages/offline.js.php'; |
|
| 1305 | + include_once $SETTINGS['cpassman_dir'].'/pages/offline.js.php'; |
|
| 1306 | 1306 | } elseif ($get['page'] === 'search') { |
| 1307 | - include_once $SETTINGS['cpassman_dir'] . '/pages/search.js.php'; |
|
| 1307 | + include_once $SETTINGS['cpassman_dir'].'/pages/search.js.php'; |
|
| 1308 | 1308 | } elseif ($get['page'] === 'profile') { |
| 1309 | - include_once $SETTINGS['cpassman_dir'] . '/pages/profile.js.php'; |
|
| 1309 | + include_once $SETTINGS['cpassman_dir'].'/pages/profile.js.php'; |
|
| 1310 | 1310 | } elseif ($get['page'] === 'favourites') { |
| 1311 | - include_once $SETTINGS['cpassman_dir'] . '/pages/favorites.js.php'; |
|
| 1311 | + include_once $SETTINGS['cpassman_dir'].'/pages/favorites.js.php'; |
|
| 1312 | 1312 | } elseif ($get['page'] === 'folders') { |
| 1313 | - include_once $SETTINGS['cpassman_dir'] . '/pages/folders.js.php'; |
|
| 1313 | + include_once $SETTINGS['cpassman_dir'].'/pages/folders.js.php'; |
|
| 1314 | 1314 | } elseif ($get['page'] === 'users') { |
| 1315 | - include_once $SETTINGS['cpassman_dir'] . '/pages/users.js.php'; |
|
| 1315 | + include_once $SETTINGS['cpassman_dir'].'/pages/users.js.php'; |
|
| 1316 | 1316 | } elseif ($get['page'] === 'roles') { |
| 1317 | - include_once $SETTINGS['cpassman_dir'] . '/pages/roles.js.php'; |
|
| 1317 | + include_once $SETTINGS['cpassman_dir'].'/pages/roles.js.php'; |
|
| 1318 | 1318 | } elseif ($get['page'] === 'utilities.deletion') { |
| 1319 | - include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.deletion.js.php'; |
|
| 1319 | + include_once $SETTINGS['cpassman_dir'].'/pages/utilities.deletion.js.php'; |
|
| 1320 | 1320 | } elseif ($get['page'] === 'utilities.logs') { |
| 1321 | - include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.logs.js.php'; |
|
| 1321 | + include_once $SETTINGS['cpassman_dir'].'/pages/utilities.logs.js.php'; |
|
| 1322 | 1322 | } elseif ($get['page'] === 'utilities.database') { |
| 1323 | - include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.database.js.php'; |
|
| 1323 | + include_once $SETTINGS['cpassman_dir'].'/pages/utilities.database.js.php'; |
|
| 1324 | 1324 | } elseif ($get['page'] === 'utilities.renewal') { |
| 1325 | - include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.renewal.js.php'; |
|
| 1325 | + include_once $SETTINGS['cpassman_dir'].'/pages/utilities.renewal.js.php'; |
|
| 1326 | 1326 | } |
| 1327 | 1327 | } else { |
| 1328 | - include_once $SETTINGS['cpassman_dir'] . '/includes/core/login.js.php'; |
|
| 1328 | + include_once $SETTINGS['cpassman_dir'].'/includes/core/login.js.php'; |
|
| 1329 | 1329 | } |
| 1330 | 1330 | } |
@@ -45,26 +45,26 @@ discard block |
||
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | /* do checks */ |
| 48 | -require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php'; |
|
| 49 | -require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php'; |
|
| 48 | +require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php'; |
|
| 49 | +require_once $SETTINGS['cpassman_dir'].'/sources/checks.php'; |
|
| 50 | 50 | if (!checkUser($_SESSION['user_id'], $_SESSION['key'], 'ldap', $SETTINGS)) { |
| 51 | 51 | $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page |
| 52 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 52 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 53 | 53 | exit(); |
| 54 | 54 | } |
| 55 | 55 | |
| 56 | -require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php'; |
|
| 57 | -require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php'; |
|
| 58 | -require_once $SETTINGS['cpassman_dir'] . '/includes/config/tp.config.php'; |
|
| 56 | +require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php'; |
|
| 57 | +require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php'; |
|
| 58 | +require_once $SETTINGS['cpassman_dir'].'/includes/config/tp.config.php'; |
|
| 59 | 59 | |
| 60 | 60 | header('Content-type: text/html; charset=utf-8'); |
| 61 | 61 | header('Cache-Control: no-cache, no-store, must-revalidate'); |
| 62 | 62 | |
| 63 | -require_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php'; |
|
| 64 | -require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 63 | +require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php'; |
|
| 64 | +require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 65 | 65 | |
| 66 | 66 | // connect to the server |
| 67 | -require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 67 | +require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 68 | 68 | if (defined('DB_PASSWD_CLEAR') === false) { |
| 69 | 69 | define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS)); |
| 70 | 70 | } |
@@ -124,39 +124,39 @@ discard block |
||
| 124 | 124 | ]; |
| 125 | 125 | |
| 126 | 126 | // Load expected libraries |
| 127 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/helpers.php'; |
|
| 128 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php'; |
|
| 129 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Arr.php'; |
|
| 130 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Symfony/contracts/Translation/TranslatorInterface.php'; |
|
| 131 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonTimeZone.php'; |
|
| 132 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Units.php'; |
|
| 133 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Week.php'; |
|
| 134 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Timestamp.php'; |
|
| 135 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Test.php'; |
|
| 136 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/ObjectInitialisation.php'; |
|
| 137 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Serialization.php'; |
|
| 138 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/IntervalRounding.php'; |
|
| 139 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Rounding.php'; |
|
| 140 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Localization.php'; |
|
| 141 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Options.php'; |
|
| 142 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Cast.php'; |
|
| 143 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mutability.php'; |
|
| 144 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Modifiers.php'; |
|
| 145 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mixin.php'; |
|
| 146 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Macro.php'; |
|
| 147 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Difference.php'; |
|
| 148 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Creator.php'; |
|
| 149 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Converter.php'; |
|
| 150 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Comparison.php'; |
|
| 151 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Boundaries.php'; |
|
| 152 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Date.php'; |
|
| 153 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonInterface.php'; |
|
| 154 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Carbon.php'; |
|
| 155 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/DetectsErrors.php'; |
|
| 156 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Connection.php'; |
|
| 157 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapInterface.php'; |
|
| 158 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/HandlesConnection.php'; |
|
| 159 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapBase.php'; |
|
| 127 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/helpers.php'; |
|
| 128 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php'; |
|
| 129 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Arr.php'; |
|
| 130 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Symfony/contracts/Translation/TranslatorInterface.php'; |
|
| 131 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonTimeZone.php'; |
|
| 132 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Units.php'; |
|
| 133 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Week.php'; |
|
| 134 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Timestamp.php'; |
|
| 135 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Test.php'; |
|
| 136 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/ObjectInitialisation.php'; |
|
| 137 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Serialization.php'; |
|
| 138 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/IntervalRounding.php'; |
|
| 139 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Rounding.php'; |
|
| 140 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Localization.php'; |
|
| 141 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Options.php'; |
|
| 142 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Cast.php'; |
|
| 143 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mutability.php'; |
|
| 144 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Modifiers.php'; |
|
| 145 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mixin.php'; |
|
| 146 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Macro.php'; |
|
| 147 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Difference.php'; |
|
| 148 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Creator.php'; |
|
| 149 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Converter.php'; |
|
| 150 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Comparison.php'; |
|
| 151 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Boundaries.php'; |
|
| 152 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Date.php'; |
|
| 153 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonInterface.php'; |
|
| 154 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Carbon.php'; |
|
| 155 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/DetectsErrors.php'; |
|
| 156 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Connection.php'; |
|
| 157 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapInterface.php'; |
|
| 158 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/HandlesConnection.php'; |
|
| 159 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapBase.php'; |
|
| 160 | 160 | |
| 161 | 161 | $ad = new SplClassLoader('LdapRecord', '../includes/libraries'); |
| 162 | 162 | $ad->register(); |
@@ -171,7 +171,7 @@ discard block |
||
| 171 | 171 | echo prepareExchangedData( |
| 172 | 172 | array( |
| 173 | 173 | 'error' => true, |
| 174 | - 'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage(). "<br>".$error->getDiagnosticMessage(), |
|
| 174 | + 'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage()."<br>".$error->getDiagnosticMessage(), |
|
| 175 | 175 | ), |
| 176 | 176 | 'encode' |
| 177 | 177 | ); |
@@ -189,7 +189,7 @@ discard block |
||
| 189 | 189 | echo prepareExchangedData( |
| 190 | 190 | array( |
| 191 | 191 | 'error' => true, |
| 192 | - 'message' => "Error : ".$e->withDetailedError($e),//->detailedError(), |
|
| 192 | + 'message' => "Error : ".$e->withDetailedError($e), //->detailedError(), |
|
| 193 | 193 | ), |
| 194 | 194 | 'encode' |
| 195 | 195 | ); |
@@ -208,7 +208,7 @@ discard block |
||
| 208 | 208 | echo prepareExchangedData( |
| 209 | 209 | array( |
| 210 | 210 | 'error' => true, |
| 211 | - 'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage(). "<br>".$error->getDiagnosticMessage(), |
|
| 211 | + 'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage()."<br>".$error->getDiagnosticMessage(), |
|
| 212 | 212 | ), |
| 213 | 213 | 'encode' |
| 214 | 214 | ); |
@@ -47,8 +47,8 @@ discard block |
||
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | /* do checks */ |
| 50 | -require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php'; |
|
| 51 | -require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php'; |
|
| 50 | +require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php'; |
|
| 51 | +require_once $SETTINGS['cpassman_dir'].'/sources/checks.php'; |
|
| 52 | 52 | $isprofileupdate = filter_input(INPUT_POST, 'isprofileupdate', FILTER_SANITIZE_STRING); |
| 53 | 53 | if ( |
| 54 | 54 | checkUser($_SESSION['user_id'], $_SESSION['key'], 'profile', $SETTINGS) === false |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | || $isprofileupdate === false |
| 60 | 60 | ) { |
| 61 | 61 | $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page |
| 62 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 62 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 63 | 63 | exit(); |
| 64 | 64 | } else { |
| 65 | 65 | // Do special check to allow user to change attributes of his profile |
@@ -68,20 +68,20 @@ discard block |
||
| 68 | 68 | || checkUser($_SESSION['user_id'], $_SESSION['key'], 'profile', $SETTINGS) === false |
| 69 | 69 | ) { |
| 70 | 70 | $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page |
| 71 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 71 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 72 | 72 | exit(); |
| 73 | 73 | } |
| 74 | 74 | } |
| 75 | 75 | } |
| 76 | 76 | |
| 77 | -require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php'; |
|
| 77 | +require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php'; |
|
| 78 | 78 | header('Content-type: text/html; charset=utf-8'); |
| 79 | -require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php'; |
|
| 80 | -require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 81 | -require_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php'; |
|
| 79 | +require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php'; |
|
| 80 | +require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 81 | +require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php'; |
|
| 82 | 82 | |
| 83 | 83 | // Connect to mysql server |
| 84 | -require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 84 | +require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 85 | 85 | if (defined('DB_PASSWD_CLEAR') === false) { |
| 86 | 86 | define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS)); |
| 87 | 87 | } |
@@ -130,7 +130,7 @@ discard block |
||
| 130 | 130 | // Prepare variables |
| 131 | 131 | $login = filter_var($dataReceived['login'], FILTER_SANITIZE_STRING); |
| 132 | 132 | $email = filter_var($dataReceived['email'], FILTER_SANITIZE_EMAIL); |
| 133 | - $password = '';//filter_var($dataReceived['pw'], FILTER_SANITIZE_STRING); |
|
| 133 | + $password = ''; //filter_var($dataReceived['pw'], FILTER_SANITIZE_STRING); |
|
| 134 | 134 | $lastname = filter_var($dataReceived['lastname'], FILTER_SANITIZE_STRING); |
| 135 | 135 | $name = filter_var($dataReceived['name'], FILTER_SANITIZE_STRING); |
| 136 | 136 | $is_admin = filter_var($dataReceived['admin'], FILTER_SANITIZE_NUMBER_INT); |
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | // Check if user already exists |
| 160 | 160 | $data = DB::query( |
| 161 | 161 | 'SELECT id, fonction_id, groupes_interdits, groupes_visibles |
| 162 | - FROM ' . prefixTable('users') . ' |
|
| 162 | + FROM ' . prefixTable('users').' |
|
| 163 | 163 | WHERE login = %s', |
| 164 | 164 | $login |
| 165 | 165 | ); |
@@ -375,7 +375,7 @@ discard block |
||
| 375 | 375 | |
| 376 | 376 | // Get info about user to delete |
| 377 | 377 | $data_user = DB::queryfirstrow( |
| 378 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 378 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 379 | 379 | WHERE id = %i', |
| 380 | 380 | $post_id |
| 381 | 381 | ); |
@@ -394,7 +394,7 @@ discard block |
||
| 394 | 394 | ); |
| 395 | 395 | // delete personal folder and subfolders |
| 396 | 396 | $data = DB::queryfirstrow( |
| 397 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' |
|
| 397 | + 'SELECT id FROM '.prefixTable('nested_tree').' |
|
| 398 | 398 | WHERE title = %s AND personal_folder = %i', |
| 399 | 399 | $post_id, |
| 400 | 400 | '1' |
@@ -407,7 +407,7 @@ discard block |
||
| 407 | 407 | DB::delete(prefixTable('nested_tree'), 'id = %i AND personal_folder = %i', $folder->id, '1'); |
| 408 | 408 | // delete items & logs |
| 409 | 409 | $items = DB::query( |
| 410 | - 'SELECT id FROM ' . prefixTable('items') . ' |
|
| 410 | + 'SELECT id FROM '.prefixTable('items').' |
|
| 411 | 411 | WHERE id_tree=%i AND perso = %i', |
| 412 | 412 | $folder->id, |
| 413 | 413 | '1' |
@@ -464,7 +464,7 @@ discard block |
||
| 464 | 464 | |
| 465 | 465 | // Get info about user to delete |
| 466 | 466 | $data_user = DB::queryfirstrow( |
| 467 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 467 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 468 | 468 | WHERE id = %i', |
| 469 | 469 | $post_id |
| 470 | 470 | ); |
@@ -506,7 +506,7 @@ discard block |
||
| 506 | 506 | |
| 507 | 507 | // Get info about user to delete |
| 508 | 508 | $data_user = DB::queryfirstrow( |
| 509 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 509 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 510 | 510 | WHERE id = %i', |
| 511 | 511 | $post_id |
| 512 | 512 | ); |
@@ -549,7 +549,7 @@ discard block |
||
| 549 | 549 | // Get info about user to delete |
| 550 | 550 | $data_user = DB::queryfirstrow( |
| 551 | 551 | 'SELECT admin, isAdministratedByRole, can_manage_all_users, gestionnaire |
| 552 | - FROM ' . prefixTable('users') . ' |
|
| 552 | + FROM ' . prefixTable('users').' |
|
| 553 | 553 | WHERE id = %i', |
| 554 | 554 | $post_id |
| 555 | 555 | ); |
@@ -593,7 +593,7 @@ discard block |
||
| 593 | 593 | |
| 594 | 594 | // Get info about user to delete |
| 595 | 595 | $data_user = DB::queryfirstrow( |
| 596 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 596 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 597 | 597 | WHERE id = %i', |
| 598 | 598 | $post_id |
| 599 | 599 | ); |
@@ -636,7 +636,7 @@ discard block |
||
| 636 | 636 | // Get info about user to delete |
| 637 | 637 | $data_user = DB::queryfirstrow( |
| 638 | 638 | 'SELECT admin, isAdministratedByRole, gestionnaire |
| 639 | - FROM ' . prefixTable('users') . ' |
|
| 639 | + FROM ' . prefixTable('users').' |
|
| 640 | 640 | WHERE id = %i', |
| 641 | 641 | $post_id |
| 642 | 642 | ); |
@@ -679,7 +679,7 @@ discard block |
||
| 679 | 679 | // Get info about user to delete |
| 680 | 680 | $data_user = DB::queryfirstrow( |
| 681 | 681 | 'SELECT admin, isAdministratedByRole, gestionnaire |
| 682 | - FROM ' . prefixTable('users') . ' |
|
| 682 | + FROM ' . prefixTable('users').' |
|
| 683 | 683 | WHERE id = %i', |
| 684 | 684 | $post_id |
| 685 | 685 | ); |
@@ -719,7 +719,7 @@ discard block |
||
| 719 | 719 | // Get info about user to delete |
| 720 | 720 | $data_user = DB::queryfirstrow( |
| 721 | 721 | 'SELECT admin, isAdministratedByRole, gestionnaire |
| 722 | - FROM ' . prefixTable('users') . ' |
|
| 722 | + FROM ' . prefixTable('users').' |
|
| 723 | 723 | WHERE id = %i', |
| 724 | 724 | $post_id |
| 725 | 725 | ); |
@@ -758,7 +758,7 @@ discard block |
||
| 758 | 758 | $return = array(); |
| 759 | 759 | // Check if folder exists |
| 760 | 760 | $data = DB::query( |
| 761 | - 'SELECT * FROM ' . prefixTable('nested_tree') . ' |
|
| 761 | + 'SELECT * FROM '.prefixTable('nested_tree').' |
|
| 762 | 762 | WHERE title = %s AND parent_id = %i', |
| 763 | 763 | filter_input(INPUT_POST, 'domain', FILTER_SANITIZE_STRING), |
| 764 | 764 | '0' |
@@ -771,7 +771,7 @@ discard block |
||
| 771 | 771 | } |
| 772 | 772 | // Check if role exists |
| 773 | 773 | $data = DB::query( |
| 774 | - 'SELECT * FROM ' . prefixTable('roles_title') . ' |
|
| 774 | + 'SELECT * FROM '.prefixTable('roles_title').' |
|
| 775 | 775 | WHERE title = %s', |
| 776 | 776 | filter_input(INPUT_POST, 'domain', FILTER_SANITIZE_STRING) |
| 777 | 777 | ); |
@@ -791,7 +791,7 @@ discard block |
||
| 791 | 791 | case 'user_log_items': |
| 792 | 792 | $nb_pages = 1; |
| 793 | 793 | $logs = $sql_filter = ''; |
| 794 | - $pages = '<table style=\'border-top:1px solid #969696;\'><tr><td>' . langHdl('pages') . ' : </td>'; |
|
| 794 | + $pages = '<table style=\'border-top:1px solid #969696;\'><tr><td>'.langHdl('pages').' : </td>'; |
|
| 795 | 795 | |
| 796 | 796 | // Prepare POST variables |
| 797 | 797 | $post_nb_items_by_page = filter_input(INPUT_POST, 'nb_items_by_page', FILTER_SANITIZE_NUMBER_INT); |
@@ -803,14 +803,14 @@ discard block |
||
| 803 | 803 | && !empty(filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_STRING)) |
| 804 | 804 | && filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_STRING) !== 'all' |
| 805 | 805 | ) { |
| 806 | - $sql_filter = " AND l.action = '" . filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_STRING) . "'"; |
|
| 806 | + $sql_filter = " AND l.action = '".filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_STRING)."'"; |
|
| 807 | 807 | } |
| 808 | 808 | // get number of pages |
| 809 | 809 | DB::query( |
| 810 | 810 | 'SELECT * |
| 811 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 812 | - INNER JOIN ' . prefixTable('items') . ' as i ON (l.id_item=i.id) |
|
| 813 | - INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 811 | + FROM ' . prefixTable('log_items').' as l |
|
| 812 | + INNER JOIN ' . prefixTable('items').' as i ON (l.id_item=i.id) |
|
| 813 | + INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 814 | 814 | WHERE l.id_user = %i ' . $sql_filter, |
| 815 | 815 | filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT) |
| 816 | 816 | ); |
@@ -828,19 +828,19 @@ discard block |
||
| 828 | 828 | // launch query |
| 829 | 829 | $rows = DB::query( |
| 830 | 830 | 'SELECT l.date as date, u.login as login, i.label as label, l.action as action |
| 831 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 832 | - INNER JOIN ' . prefixTable('items') . ' as i ON (l.id_item=i.id) |
|
| 833 | - INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 834 | - WHERE l.id_user = %i ' . $sql_filter . ' |
|
| 831 | + FROM ' . prefixTable('log_items').' as l |
|
| 832 | + INNER JOIN ' . prefixTable('items').' as i ON (l.id_item=i.id) |
|
| 833 | + INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 834 | + WHERE l.id_user = %i ' . $sql_filter.' |
|
| 835 | 835 | ORDER BY date DESC |
| 836 | - LIMIT ' . intval($start) . ',' . intval($post_nb_items_by_page), |
|
| 836 | + LIMIT ' . intval($start).','.intval($post_nb_items_by_page), |
|
| 837 | 837 | filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT) |
| 838 | 838 | ); |
| 839 | 839 | } else { |
| 840 | 840 | // get number of pages |
| 841 | 841 | DB::query( |
| 842 | 842 | 'SELECT * |
| 843 | - FROM ' . prefixTable('log_system') . ' |
|
| 843 | + FROM ' . prefixTable('log_system').' |
|
| 844 | 844 | WHERE type = %s AND field_1=%i', |
| 845 | 845 | 'user_mngt', |
| 846 | 846 | filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT) |
@@ -859,7 +859,7 @@ discard block |
||
| 859 | 859 | // launch query |
| 860 | 860 | $rows = DB::query( |
| 861 | 861 | 'SELECT * |
| 862 | - FROM ' . prefixTable('log_system') . ' |
|
| 862 | + FROM ' . prefixTable('log_system').' |
|
| 863 | 863 | WHERE type = %s AND field_1 = %i |
| 864 | 864 | ORDER BY date DESC |
| 865 | 865 | LIMIT %i, %i', |
@@ -873,7 +873,7 @@ discard block |
||
| 873 | 873 | if (isset($counter) && $counter != 0) { |
| 874 | 874 | $nb_pages = ceil($counter / intval($post_nb_items_by_page)); |
| 875 | 875 | for ($i = 1; $i <= $nb_pages; ++$i) { |
| 876 | - $pages .= '<td onclick=\'displayLogs(' . $i . ',\"' . $post_scope . '\")\'><span style=\'cursor:pointer;' . (filter_input(INPUT_POST, 'page', FILTER_SANITIZE_NUMBER_INT) === $i ? 'font-weight:bold;font-size:18px;\'>' . $i : '\'>' . $i) . '</span></td>'; |
|
| 876 | + $pages .= '<td onclick=\'displayLogs('.$i.',\"'.$post_scope.'\")\'><span style=\'cursor:pointer;'.(filter_input(INPUT_POST, 'page', FILTER_SANITIZE_NUMBER_INT) === $i ? 'font-weight:bold;font-size:18px;\'>'.$i : '\'>'.$i).'</span></td>'; |
|
| 877 | 877 | } |
| 878 | 878 | } |
| 879 | 879 | $pages .= '</tr></table>'; |
@@ -882,7 +882,7 @@ discard block |
||
| 882 | 882 | if ($post_scope === 'user_mngt') { |
| 883 | 883 | $user = DB::queryfirstrow( |
| 884 | 884 | 'SELECT login |
| 885 | - from ' . prefixTable('users') . ' |
|
| 885 | + from ' . prefixTable('users').' |
|
| 886 | 886 | WHERE id=%i', |
| 887 | 887 | $record['qui'] |
| 888 | 888 | ); |
@@ -892,7 +892,7 @@ discard block |
||
| 892 | 892 | if ($tmp[0] == 'at_user_initial_pwd_changed') { |
| 893 | 893 | $label = langHdl('log_user_initial_pwd_changed'); |
| 894 | 894 | } elseif ($tmp[0] == 'at_user_email_changed') { |
| 895 | - $label = langHdl('log_user_email_changed') . $tmp[1]; |
|
| 895 | + $label = langHdl('log_user_email_changed').$tmp[1]; |
|
| 896 | 896 | } elseif ($tmp[0] == 'at_user_added') { |
| 897 | 897 | $label = langHdl('log_user_created'); |
| 898 | 898 | } elseif ($tmp[0] == 'at_user_locked') { |
@@ -903,14 +903,14 @@ discard block |
||
| 903 | 903 | $label = langHdl('log_user_pwd_changed'); |
| 904 | 904 | } |
| 905 | 905 | // prepare log |
| 906 | - $logs .= '<tr><td>' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . '</td><td align=\"center\">' . $label . '</td><td align=\"center\">' . $user['login'] . '</td><td align=\"center\"></td></tr>'; |
|
| 906 | + $logs .= '<tr><td>'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).'</td><td align=\"center\">'.$label.'</td><td align=\"center\">'.$user['login'].'</td><td align=\"center\"></td></tr>'; |
|
| 907 | 907 | } else { |
| 908 | - $logs .= '<tr><td>' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . '</td><td align=\"center\">' . str_replace('"', '\"', $record['label']) . '</td><td align=\"center\">' . $record['login'] . '</td><td align=\"center\">' . langHdl($record['action']) . '</td></tr>'; |
|
| 908 | + $logs .= '<tr><td>'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).'</td><td align=\"center\">'.str_replace('"', '\"', $record['label']).'</td><td align=\"center\">'.$record['login'].'</td><td align=\"center\">'.langHdl($record['action']).'</td></tr>'; |
|
| 909 | 909 | } |
| 910 | 910 | } |
| 911 | 911 | } |
| 912 | 912 | |
| 913 | - echo '[ { "table_logs": "' . ($logs) . '", "pages": "' . ($pages) . '", "error" : "no" } ]'; |
|
| 913 | + echo '[ { "table_logs": "'.($logs).'", "pages": "'.($pages).'", "error" : "no" } ]'; |
|
| 914 | 914 | break; |
| 915 | 915 | |
| 916 | 916 | /* |
@@ -935,7 +935,7 @@ discard block |
||
| 935 | 935 | } else { |
| 936 | 936 | // Get folder id for Admin |
| 937 | 937 | $admin_folder = DB::queryFirstRow( |
| 938 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' |
|
| 938 | + 'SELECT id FROM '.prefixTable('nested_tree').' |
|
| 939 | 939 | WHERE title = %i AND personal_folder = %i', |
| 940 | 940 | intval($_SESSION['user_id']), |
| 941 | 941 | '1' |
@@ -946,15 +946,15 @@ discard block |
||
| 946 | 946 | // Get each Items in PF |
| 947 | 947 | $rows = DB::query( |
| 948 | 948 | 'SELECT i.pw, i.label, l.id_user |
| 949 | - FROM ' . prefixTable('items') . ' as i |
|
| 950 | - LEFT JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item=i.id) |
|
| 949 | + FROM ' . prefixTable('items').' as i |
|
| 950 | + LEFT JOIN ' . prefixTable('log_items').' as l ON (l.id_item=i.id) |
|
| 951 | 951 | WHERE l.action = %s AND i.perso=%i AND i.id_tree=%i', |
| 952 | 952 | 'at_creation', |
| 953 | 953 | '1', |
| 954 | 954 | intval($folder->id) |
| 955 | 955 | ); |
| 956 | 956 | foreach ($rows as $record) { |
| 957 | - echo $record['label'] . ' - '; |
|
| 957 | + echo $record['label'].' - '; |
|
| 958 | 958 | // Change user |
| 959 | 959 | DB::update( |
| 960 | 960 | prefixTable('log_items'), |
@@ -989,7 +989,7 @@ discard block |
||
| 989 | 989 | // Get info about user to delete |
| 990 | 990 | $data_user = DB::queryfirstrow( |
| 991 | 991 | 'SELECT admin, isAdministratedByRole, gestionnaire |
| 992 | - FROM ' . prefixTable('users') . ' |
|
| 992 | + FROM ' . prefixTable('users').' |
|
| 993 | 993 | WHERE id = %i', |
| 994 | 994 | $post_user_id |
| 995 | 995 | ); |
@@ -1026,7 +1026,7 @@ discard block |
||
| 1026 | 1026 | |
| 1027 | 1027 | // Do |
| 1028 | 1028 | $rows = DB::query( |
| 1029 | - 'SELECT id FROM ' . prefixTable('users') . ' |
|
| 1029 | + 'SELECT id FROM '.prefixTable('users').' |
|
| 1030 | 1030 | WHERE timestamp != %s AND admin != %i', |
| 1031 | 1031 | '', |
| 1032 | 1032 | '1' |
@@ -1035,7 +1035,7 @@ discard block |
||
| 1035 | 1035 | // Get info about user to delete |
| 1036 | 1036 | $data_user = DB::queryfirstrow( |
| 1037 | 1037 | 'SELECT admin, isAdministratedByRole, gestionnaire |
| 1038 | - FROM ' . prefixTable('users') . ' |
|
| 1038 | + FROM ' . prefixTable('users').' |
|
| 1039 | 1039 | WHERE id = %i', |
| 1040 | 1040 | $record['id'] |
| 1041 | 1041 | ); |
@@ -1093,7 +1093,7 @@ discard block |
||
| 1093 | 1093 | // Get info about user |
| 1094 | 1094 | $rowUser = DB::queryfirstrow( |
| 1095 | 1095 | 'SELECT * |
| 1096 | - FROM ' . prefixTable('users') . ' |
|
| 1096 | + FROM ' . prefixTable('users').' |
|
| 1097 | 1097 | WHERE id = %i', |
| 1098 | 1098 | $post_id |
| 1099 | 1099 | ); |
@@ -1111,7 +1111,7 @@ discard block |
||
| 1111 | 1111 | $arrFldAllowed = array(); |
| 1112 | 1112 | |
| 1113 | 1113 | //Build tree |
| 1114 | - $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries'); |
|
| 1114 | + $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries'); |
|
| 1115 | 1115 | $tree->register(); |
| 1116 | 1116 | $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title'); |
| 1117 | 1117 | |
@@ -1122,7 +1122,7 @@ discard block |
||
| 1122 | 1122 | // array of roles for actual user |
| 1123 | 1123 | $my_functions = explode(';', $_SESSION['fonction_id']); |
| 1124 | 1124 | |
| 1125 | - $rows = DB::query('SELECT id,title,creator_id FROM ' . prefixTable('roles_title')); |
|
| 1125 | + $rows = DB::query('SELECT id,title,creator_id FROM '.prefixTable('roles_title')); |
|
| 1126 | 1126 | foreach ($rows as $record) { |
| 1127 | 1127 | if ( |
| 1128 | 1128 | (int) $_SESSION['is_admin'] === 1 |
@@ -1158,7 +1158,7 @@ discard block |
||
| 1158 | 1158 | $rolesList = array(); |
| 1159 | 1159 | $managedBy = array(); |
| 1160 | 1160 | $selected = ''; |
| 1161 | - $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title') . ' ORDER BY title ASC'); |
|
| 1161 | + $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title').' ORDER BY title ASC'); |
|
| 1162 | 1162 | foreach ($rows as $reccord) { |
| 1163 | 1163 | $rolesList[$reccord['id']] = array('id' => $reccord['id'], 'title' => $reccord['title']); |
| 1164 | 1164 | } |
@@ -1189,7 +1189,7 @@ discard block |
||
| 1189 | 1189 | array_push( |
| 1190 | 1190 | $managedBy, |
| 1191 | 1191 | array( |
| 1192 | - 'title' => langHdl('managers_of') . ' ' . $fonction['title'], |
|
| 1192 | + 'title' => langHdl('managers_of').' '.$fonction['title'], |
|
| 1193 | 1193 | 'id' => $fonction['id'], |
| 1194 | 1194 | 'selected' => $selected, |
| 1195 | 1195 | ) |
@@ -1271,9 +1271,9 @@ discard block |
||
| 1271 | 1271 | |
| 1272 | 1272 | // get USER STATUS |
| 1273 | 1273 | if ($rowUser['disabled'] == 1) { |
| 1274 | - $arrData['info'] = langHdl('user_info_locked') . '<br><input type="checkbox" value="unlock" name="1" class="chk"> <label for="1">' . langHdl('user_info_unlock_question') . '</label><br><input type="checkbox" value="delete" id="account_delete" class="chk mr-2" name="2" onclick="confirmDeletion()">label for="2">' . langHdl('user_info_delete_question') . '</label>'; |
|
| 1274 | + $arrData['info'] = langHdl('user_info_locked').'<br><input type="checkbox" value="unlock" name="1" class="chk"> <label for="1">'.langHdl('user_info_unlock_question').'</label><br><input type="checkbox" value="delete" id="account_delete" class="chk mr-2" name="2" onclick="confirmDeletion()">label for="2">'.langHdl('user_info_delete_question').'</label>'; |
|
| 1275 | 1275 | } else { |
| 1276 | - $arrData['info'] = langHdl('user_info_active') . '<br><input type="checkbox" value="lock" class="chk"> ' . langHdl('user_info_lock_question'); |
|
| 1276 | + $arrData['info'] = langHdl('user_info_active').'<br><input type="checkbox" value="lock" class="chk"> '.langHdl('user_info_lock_question'); |
|
| 1277 | 1277 | } |
| 1278 | 1278 | |
| 1279 | 1279 | $arrData['error'] = false; |
@@ -1365,7 +1365,7 @@ discard block |
||
| 1365 | 1365 | // count number of admins |
| 1366 | 1366 | $users = DB::query( |
| 1367 | 1367 | 'SELECT id |
| 1368 | - FROM ' . prefixTable('users') . ' |
|
| 1368 | + FROM ' . prefixTable('users').' |
|
| 1369 | 1369 | WHERE admin = 1 AND email != "" AND pw != ""' |
| 1370 | 1370 | ); |
| 1371 | 1371 | if (DB::count() === 1) { |
@@ -1451,7 +1451,7 @@ discard block |
||
| 1451 | 1451 | |
| 1452 | 1452 | // Get info about user to delete |
| 1453 | 1453 | $data_user = DB::queryfirstrow( |
| 1454 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 1454 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 1455 | 1455 | WHERE id = %i', |
| 1456 | 1456 | $post_id |
| 1457 | 1457 | ); |
@@ -1472,7 +1472,7 @@ discard block |
||
| 1472 | 1472 | ); |
| 1473 | 1473 | // delete personal folder and subfolders |
| 1474 | 1474 | $data = DB::queryfirstrow( |
| 1475 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' |
|
| 1475 | + 'SELECT id FROM '.prefixTable('nested_tree').' |
|
| 1476 | 1476 | WHERE title = %s AND personal_folder = %i', |
| 1477 | 1477 | $post_id, |
| 1478 | 1478 | '1' |
@@ -1485,7 +1485,7 @@ discard block |
||
| 1485 | 1485 | DB::delete(prefixTable('nested_tree'), 'id = %i AND personal_folder = %i', $folder->id, '1'); |
| 1486 | 1486 | // delete items & logs |
| 1487 | 1487 | $items = DB::query( |
| 1488 | - 'SELECT id FROM ' . prefixTable('items') . ' |
|
| 1488 | + 'SELECT id FROM '.prefixTable('items').' |
|
| 1489 | 1489 | WHERE id_tree=%i AND perso = %i', |
| 1490 | 1490 | $folder->id, |
| 1491 | 1491 | '1' |
@@ -1506,7 +1506,7 @@ discard block |
||
| 1506 | 1506 | } else { |
| 1507 | 1507 | // Get old data about user |
| 1508 | 1508 | $oldData = DB::queryfirstrow( |
| 1509 | - 'SELECT * FROM ' . prefixTable('users') . ' |
|
| 1509 | + 'SELECT * FROM '.prefixTable('users').' |
|
| 1510 | 1510 | WHERE id = %i', |
| 1511 | 1511 | $post_id |
| 1512 | 1512 | ); |
@@ -1536,7 +1536,7 @@ discard block |
||
| 1536 | 1536 | |
| 1537 | 1537 | // update LOG |
| 1538 | 1538 | if ($oldData['email'] !== $post_email) { |
| 1539 | - logEvents($SETTINGS, 'user_mngt', 'at_user_email_changed:' . $oldData['email'], (string) $_SESSION['user_id'], $_SESSION['login'], $post_id); |
|
| 1539 | + logEvents($SETTINGS, 'user_mngt', 'at_user_email_changed:'.$oldData['email'], (string) $_SESSION['user_id'], $_SESSION['login'], $post_id); |
|
| 1540 | 1540 | } |
| 1541 | 1541 | } |
| 1542 | 1542 | echo prepareExchangedData( |
@@ -1591,7 +1591,7 @@ discard block |
||
| 1591 | 1591 | |
| 1592 | 1592 | // Get info about user to delete |
| 1593 | 1593 | $data_user = DB::queryfirstrow( |
| 1594 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 1594 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 1595 | 1595 | WHERE id = %i', |
| 1596 | 1596 | $post_id |
| 1597 | 1597 | ); |
@@ -1641,7 +1641,7 @@ discard block |
||
| 1641 | 1641 | } |
| 1642 | 1642 | |
| 1643 | 1643 | DB::queryfirstrow( |
| 1644 | - 'SELECT * FROM ' . prefixTable('users') . ' |
|
| 1644 | + 'SELECT * FROM '.prefixTable('users').' |
|
| 1645 | 1645 | WHERE login = %s', |
| 1646 | 1646 | filter_input(INPUT_POST, 'login', FILTER_SANITIZE_STRING) |
| 1647 | 1647 | ); |
@@ -1690,14 +1690,14 @@ discard block |
||
| 1690 | 1690 | $arrData = array(); |
| 1691 | 1691 | |
| 1692 | 1692 | //Build tree |
| 1693 | - $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries'); |
|
| 1693 | + $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries'); |
|
| 1694 | 1694 | $tree->register(); |
| 1695 | 1695 | $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title'); |
| 1696 | 1696 | |
| 1697 | 1697 | // get User info |
| 1698 | 1698 | $rowUser = DB::queryFirstRow( |
| 1699 | 1699 | 'SELECT login, name, lastname, email, disabled, fonction_id, groupes_interdits, groupes_visibles, isAdministratedByRole, avatar_thumb |
| 1700 | - FROM ' . prefixTable('users') . ' |
|
| 1700 | + FROM ' . prefixTable('users').' |
|
| 1701 | 1701 | WHERE id = %i', |
| 1702 | 1702 | $post_id |
| 1703 | 1703 | ); |
@@ -1715,7 +1715,7 @@ discard block |
||
| 1715 | 1715 | // refine folders based upon roles |
| 1716 | 1716 | $rows = DB::query( |
| 1717 | 1717 | 'SELECT folder_id, type |
| 1718 | - FROM ' . prefixTable('roles_values') . ' |
|
| 1718 | + FROM ' . prefixTable('roles_values').' |
|
| 1719 | 1719 | WHERE role_id IN %ls |
| 1720 | 1720 | ORDER BY folder_id ASC', |
| 1721 | 1721 | $arrData['functions'] |
@@ -1738,7 +1738,7 @@ discard block |
||
| 1738 | 1738 | } |
| 1739 | 1739 | |
| 1740 | 1740 | // add allowed folders |
| 1741 | - foreach($arrData['allowed_folders'] as $Fld) { |
|
| 1741 | + foreach ($arrData['allowed_folders'] as $Fld) { |
|
| 1742 | 1742 | array_push($arrFolders, array('id' => $Fld, 'type' => 'W', 'special' => true)); |
| 1743 | 1743 | } |
| 1744 | 1744 | |
@@ -1749,7 +1749,7 @@ discard block |
||
| 1749 | 1749 | // get folder name |
| 1750 | 1750 | $row = DB::queryFirstRow( |
| 1751 | 1751 | 'SELECT title, nlevel, id |
| 1752 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 1752 | + FROM ' . prefixTable('nested_tree').' |
|
| 1753 | 1753 | WHERE id = %i', |
| 1754 | 1754 | $fld['id'] |
| 1755 | 1755 | ); |
@@ -1762,36 +1762,36 @@ discard block |
||
| 1762 | 1762 | |
| 1763 | 1763 | // manage right icon |
| 1764 | 1764 | if ($fld['type'] == 'W') { |
| 1765 | - $label = '<i class="fas fa-indent infotip text-success mr-2" title="' . langHdl('write') . '"></i>' . |
|
| 1766 | - '<i class="fas fa-edit infotip text-success mr-2" title="' . langHdl('edit') . '"></i>' . |
|
| 1767 | - '<i class="fas fa-eraser infotip text-success" title="' . langHdl('delete') . '"></i>'; |
|
| 1765 | + $label = '<i class="fas fa-indent infotip text-success mr-2" title="'.langHdl('write').'"></i>'. |
|
| 1766 | + '<i class="fas fa-edit infotip text-success mr-2" title="'.langHdl('edit').'"></i>'. |
|
| 1767 | + '<i class="fas fa-eraser infotip text-success" title="'.langHdl('delete').'"></i>'; |
|
| 1768 | 1768 | } elseif ($fld['type'] == 'ND') { |
| 1769 | - $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . langHdl('write') . '"></i>' . |
|
| 1770 | - '<i class="fas fa-edit infotip text-success mr-2" title="' . langHdl('edit') . '"></i>' . |
|
| 1771 | - '<i class="fas fa-eraser infotip text-danger" title="' . langHdl('no_delete') . '"></i>'; |
|
| 1769 | + $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.langHdl('write').'"></i>'. |
|
| 1770 | + '<i class="fas fa-edit infotip text-success mr-2" title="'.langHdl('edit').'"></i>'. |
|
| 1771 | + '<i class="fas fa-eraser infotip text-danger" title="'.langHdl('no_delete').'"></i>'; |
|
| 1772 | 1772 | } elseif ($fld['type'] == 'NE') { |
| 1773 | - $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . langHdl('write') . '"></i>' . |
|
| 1774 | - '<i class="fas fa-edit infotip text-danger mr-2" title="' . langHdl('no_edit') . '"></i>' . |
|
| 1775 | - '<i class="fas fa-eraser infotip text-success" title="' . langHdl('delete') . '"></i>'; |
|
| 1773 | + $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.langHdl('write').'"></i>'. |
|
| 1774 | + '<i class="fas fa-edit infotip text-danger mr-2" title="'.langHdl('no_edit').'"></i>'. |
|
| 1775 | + '<i class="fas fa-eraser infotip text-success" title="'.langHdl('delete').'"></i>'; |
|
| 1776 | 1776 | } elseif ($fld['type'] == 'NDNE') { |
| 1777 | - $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . langHdl('write') . '"></i>' . |
|
| 1778 | - '<i class="fas fa-edit infotip text-danger mr-2" title="' . langHdl('no_edit') . '"></i>' . |
|
| 1779 | - '<i class="fas fa-eraser infotip text-danger" title="' . langHdl('no_delete') . '"></i>'; |
|
| 1777 | + $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.langHdl('write').'"></i>'. |
|
| 1778 | + '<i class="fas fa-edit infotip text-danger mr-2" title="'.langHdl('no_edit').'"></i>'. |
|
| 1779 | + '<i class="fas fa-eraser infotip text-danger" title="'.langHdl('no_delete').'"></i>'; |
|
| 1780 | 1780 | } else { |
| 1781 | - $label = '<i class="fas fa-eye infotip text-info mr-2" title="' . langHdl('read') . '"></i>'; |
|
| 1781 | + $label = '<i class="fas fa-eye infotip text-info mr-2" title="'.langHdl('read').'"></i>'; |
|
| 1782 | 1782 | } |
| 1783 | 1783 | |
| 1784 | - $html .= '<tr><td>' . $ident . $row['title'] . |
|
| 1785 | - ' <small class="text-info">[' . $row['id'] . ']</small>'. |
|
| 1786 | - ($fld['special'] === true ? '<i class="fas fa-user-tag infotip text-primary ml-5" title="' . langHdl('user_specific_right') . '"></i>' : ''). |
|
| 1787 | - '</td><td>' . $label . '</td></tr>'; |
|
| 1784 | + $html .= '<tr><td>'.$ident.$row['title']. |
|
| 1785 | + ' <small class="text-info">['.$row['id'].']</small>'. |
|
| 1786 | + ($fld['special'] === true ? '<i class="fas fa-user-tag infotip text-primary ml-5" title="'.langHdl('user_specific_right').'"></i>' : ''). |
|
| 1787 | + '</td><td>'.$label.'</td></tr>'; |
|
| 1788 | 1788 | break; |
| 1789 | 1789 | } |
| 1790 | 1790 | } |
| 1791 | 1791 | } |
| 1792 | 1792 | |
| 1793 | - $html_full = '<table id="table-folders" class="table table-bordered table-striped dt-responsive nowrap" style="width:100%"><tbody>' . |
|
| 1794 | - $html . '</tbody></table>'; |
|
| 1793 | + $html_full = '<table id="table-folders" class="table table-bordered table-striped dt-responsive nowrap" style="width:100%"><tbody>'. |
|
| 1794 | + $html.'</tbody></table>'; |
|
| 1795 | 1795 | } else { |
| 1796 | 1796 | $html_full = ''; |
| 1797 | 1797 | } |
@@ -1837,7 +1837,7 @@ discard block |
||
| 1837 | 1837 | if ((int) $_SESSION['is_admin'] === 0 && (int) $_SESSION['user_can_manage_all_users'] === 0) { |
| 1838 | 1838 | $rows = DB::query( |
| 1839 | 1839 | 'SELECT * |
| 1840 | - FROM ' . prefixTable('users') . ' |
|
| 1840 | + FROM ' . prefixTable('users').' |
|
| 1841 | 1841 | WHERE admin = %i AND isAdministratedByRole IN %ls', |
| 1842 | 1842 | '0', |
| 1843 | 1843 | array_filter($_SESSION['user_roles']) |
@@ -1845,7 +1845,7 @@ discard block |
||
| 1845 | 1845 | } else { |
| 1846 | 1846 | $rows = DB::query( |
| 1847 | 1847 | 'SELECT * |
| 1848 | - FROM ' . prefixTable('users') . ' |
|
| 1848 | + FROM ' . prefixTable('users').' |
|
| 1849 | 1849 | WHERE admin = %i', |
| 1850 | 1850 | '0' |
| 1851 | 1851 | ); |
@@ -1857,7 +1857,7 @@ discard block |
||
| 1857 | 1857 | $groupIds = []; |
| 1858 | 1858 | foreach (explode(';', $record['fonction_id']) as $group) { |
| 1859 | 1859 | $tmp = DB::queryfirstrow( |
| 1860 | - 'SELECT id, title FROM ' . prefixTable('roles_title') . ' |
|
| 1860 | + 'SELECT id, title FROM '.prefixTable('roles_title').' |
|
| 1861 | 1861 | WHERE id = %i', |
| 1862 | 1862 | $group |
| 1863 | 1863 | ); |
@@ -1869,7 +1869,7 @@ discard block |
||
| 1869 | 1869 | |
| 1870 | 1870 | // Get managed_by |
| 1871 | 1871 | $managedBy = DB::queryfirstrow( |
| 1872 | - 'SELECT id, title FROM ' . prefixTable('roles_title') . ' |
|
| 1872 | + 'SELECT id, title FROM '.prefixTable('roles_title').' |
|
| 1873 | 1873 | WHERE id = %i', |
| 1874 | 1874 | $record['isAdministratedByRole'] |
| 1875 | 1875 | ); |
@@ -1879,7 +1879,7 @@ discard block |
||
| 1879 | 1879 | $foldersAllowedIds = []; |
| 1880 | 1880 | foreach (explode(';', $record['groupes_visibles']) as $role) { |
| 1881 | 1881 | $tmp = DB::queryfirstrow( |
| 1882 | - 'SELECT id, title FROM ' . prefixTable('nested_tree') . ' |
|
| 1882 | + 'SELECT id, title FROM '.prefixTable('nested_tree').' |
|
| 1883 | 1883 | WHERE id = %i', |
| 1884 | 1884 | $role |
| 1885 | 1885 | ); |
@@ -1892,7 +1892,7 @@ discard block |
||
| 1892 | 1892 | $foldersForbiddenIds = []; |
| 1893 | 1893 | foreach (explode(';', $record['groupes_interdits']) as $role) { |
| 1894 | 1894 | $tmp = DB::queryfirstrow( |
| 1895 | - 'SELECT id, title FROM ' . prefixTable('nested_tree') . ' |
|
| 1895 | + 'SELECT id, title FROM '.prefixTable('nested_tree').' |
|
| 1896 | 1896 | WHERE id = %i', |
| 1897 | 1897 | $role |
| 1898 | 1898 | ); |
@@ -1910,7 +1910,7 @@ discard block |
||
| 1910 | 1910 | 'login' => $record['login'], |
| 1911 | 1911 | 'groups' => implode(', ', $groups), |
| 1912 | 1912 | 'groupIds' => $groupIds, |
| 1913 | - 'managedBy' => $managedBy=== null ? langHdl('administrator') : $managedBy['title'], |
|
| 1913 | + 'managedBy' => $managedBy === null ? langHdl('administrator') : $managedBy['title'], |
|
| 1914 | 1914 | 'managedById' => $managedBy === null ? 0 : $managedBy['id'], |
| 1915 | 1915 | 'foldersAllowed' => implode(', ', $foldersAllowed), |
| 1916 | 1916 | 'foldersAllowedIds' => $foldersAllowedIds, |
@@ -1988,7 +1988,7 @@ discard block |
||
| 1988 | 1988 | |
| 1989 | 1989 | // Get info about user |
| 1990 | 1990 | $data_user = DB::queryfirstrow( |
| 1991 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 1991 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 1992 | 1992 | WHERE id = %i', |
| 1993 | 1993 | $post_source_id |
| 1994 | 1994 | ); |
@@ -2148,14 +2148,14 @@ discard block |
||
| 2148 | 2148 | if (empty($post_context) === false && $post_context === 'add_one_role_to_user') { |
| 2149 | 2149 | $data_user = DB::queryfirstrow( |
| 2150 | 2150 | 'SELECT fonction_id |
| 2151 | - FROM ' . prefixTable('users') . ' |
|
| 2151 | + FROM ' . prefixTable('users').' |
|
| 2152 | 2152 | WHERE id = %i', |
| 2153 | 2153 | $post_user_id |
| 2154 | 2154 | ); |
| 2155 | 2155 | |
| 2156 | 2156 | if ($data_user) { |
| 2157 | 2157 | // Ensure array is unique |
| 2158 | - $post_new_value = str_replace(',', ';', $data_user['fonction_id']) . ';' . $post_new_value; |
|
| 2158 | + $post_new_value = str_replace(',', ';', $data_user['fonction_id']).';'.$post_new_value; |
|
| 2159 | 2159 | $post_new_value = implode(';', array_unique(explode(';', $post_new_value))); |
| 2160 | 2160 | } else { |
| 2161 | 2161 | // User not found |
@@ -2210,7 +2210,7 @@ discard block |
||
| 2210 | 2210 | if (filter_input(INPUT_POST, 'step', FILTER_SANITIZE_STRING) === 'refresh') { |
| 2211 | 2211 | $record = DB::queryFirstRow( |
| 2212 | 2212 | 'SELECT user_ip_lastdate |
| 2213 | - FROM ' . prefixTable('users') . ' |
|
| 2213 | + FROM ' . prefixTable('users').' |
|
| 2214 | 2214 | WHERE id = %i', |
| 2215 | 2215 | $_SESSION['user_id'] |
| 2216 | 2216 | ); |
@@ -2302,39 +2302,39 @@ discard block |
||
| 2302 | 2302 | ]; |
| 2303 | 2303 | |
| 2304 | 2304 | // Load expected libraries |
| 2305 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php'; |
|
| 2306 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Arr.php'; |
|
| 2307 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Symfony/contracts/Translation/TranslatorInterface.php'; |
|
| 2308 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonTimeZone.php'; |
|
| 2309 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Units.php'; |
|
| 2310 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Week.php'; |
|
| 2311 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Timestamp.php'; |
|
| 2312 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Test.php'; |
|
| 2313 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/ObjectInitialisation.php'; |
|
| 2314 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Serialization.php'; |
|
| 2315 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/IntervalRounding.php'; |
|
| 2316 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Rounding.php'; |
|
| 2317 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Localization.php'; |
|
| 2318 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Options.php'; |
|
| 2319 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Cast.php'; |
|
| 2320 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mutability.php'; |
|
| 2321 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Modifiers.php'; |
|
| 2322 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mixin.php'; |
|
| 2323 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Macro.php'; |
|
| 2324 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Difference.php'; |
|
| 2325 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Creator.php'; |
|
| 2326 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Converter.php'; |
|
| 2327 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Comparison.php'; |
|
| 2328 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Boundaries.php'; |
|
| 2329 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Date.php'; |
|
| 2330 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonInterface.php'; |
|
| 2331 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Carbon.php'; |
|
| 2332 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/DetectsErrors.php'; |
|
| 2333 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Connection.php'; |
|
| 2334 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapInterface.php'; |
|
| 2335 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapBase.php'; |
|
| 2336 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/HandlesConnection.php'; |
|
| 2337 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Ldap.php'; |
|
| 2305 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php'; |
|
| 2306 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Arr.php'; |
|
| 2307 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Symfony/contracts/Translation/TranslatorInterface.php'; |
|
| 2308 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonTimeZone.php'; |
|
| 2309 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Units.php'; |
|
| 2310 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Week.php'; |
|
| 2311 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Timestamp.php'; |
|
| 2312 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Test.php'; |
|
| 2313 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/ObjectInitialisation.php'; |
|
| 2314 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Serialization.php'; |
|
| 2315 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/IntervalRounding.php'; |
|
| 2316 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Rounding.php'; |
|
| 2317 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Localization.php'; |
|
| 2318 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Options.php'; |
|
| 2319 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Cast.php'; |
|
| 2320 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mutability.php'; |
|
| 2321 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Modifiers.php'; |
|
| 2322 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mixin.php'; |
|
| 2323 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Macro.php'; |
|
| 2324 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Difference.php'; |
|
| 2325 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Creator.php'; |
|
| 2326 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Converter.php'; |
|
| 2327 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Comparison.php'; |
|
| 2328 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Boundaries.php'; |
|
| 2329 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Date.php'; |
|
| 2330 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonInterface.php'; |
|
| 2331 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Carbon.php'; |
|
| 2332 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/DetectsErrors.php'; |
|
| 2333 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Connection.php'; |
|
| 2334 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapInterface.php'; |
|
| 2335 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapBase.php'; |
|
| 2336 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/HandlesConnection.php'; |
|
| 2337 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Ldap.php'; |
|
| 2338 | 2338 | |
| 2339 | 2339 | $ad = new SplClassLoader('LdapRecord', '../includes/libraries'); |
| 2340 | 2340 | $ad->register(); |
@@ -2350,7 +2350,7 @@ discard block |
||
| 2350 | 2350 | echo prepareExchangedData( |
| 2351 | 2351 | array( |
| 2352 | 2352 | 'error' => true, |
| 2353 | - 'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage(). "<br>".$error->getDiagnosticMessage(), |
|
| 2353 | + 'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage()."<br>".$error->getDiagnosticMessage(), |
|
| 2354 | 2354 | ), |
| 2355 | 2355 | 'encode' |
| 2356 | 2356 | ); |
@@ -2381,12 +2381,12 @@ discard block |
||
| 2381 | 2381 | ['objectclass', '=', 'posixaccount'], |
| 2382 | 2382 | ], null, null, 'or')->get(); |
| 2383 | 2383 | |
| 2384 | - foreach($users as $i => $adUser) { |
|
| 2384 | + foreach ($users as $i => $adUser) { |
|
| 2385 | 2385 | if (isset($adUser[$SETTINGS['ldap_user_attribute']]) === false) continue; |
| 2386 | 2386 | |
| 2387 | 2387 | // Build the list of all groups in AD |
| 2388 | 2388 | if (isset($adUser['memberof']) === true) { |
| 2389 | - foreach($adUser['memberof'] as $j => $adUserGroup) { |
|
| 2389 | + foreach ($adUser['memberof'] as $j => $adUserGroup) { |
|
| 2390 | 2390 | if (empty($adUserGroup) === false && $j !== "count") { |
| 2391 | 2391 | $adGroup = substr($adUserGroup, 3, strpos($adUserGroup, ',') - 3); |
| 2392 | 2392 | if (in_array($adGroup, $adRoles) === false && empty($adGroup) === false) { |
@@ -2402,7 +2402,7 @@ discard block |
||
| 2402 | 2402 | // Get his ID |
| 2403 | 2403 | DB::queryfirstrow( |
| 2404 | 2404 | 'SELECT id, fonction_id, auth_type |
| 2405 | - FROM ' . prefixTable('users') . ' |
|
| 2405 | + FROM ' . prefixTable('users').' |
|
| 2406 | 2406 | WHERE login = %s', |
| 2407 | 2407 | $userLogin |
| 2408 | 2408 | ); |
@@ -2437,7 +2437,7 @@ discard block |
||
| 2437 | 2437 | } |
| 2438 | 2438 | |
| 2439 | 2439 | // Get all groups in Teampass |
| 2440 | - $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title')); |
|
| 2440 | + $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title')); |
|
| 2441 | 2441 | foreach ($rows as $record) { |
| 2442 | 2442 | array_push( |
| 2443 | 2443 | $teampassRoles, |
@@ -2503,7 +2503,7 @@ discard block |
||
| 2503 | 2503 | // Check if user already exists |
| 2504 | 2504 | $data = DB::query( |
| 2505 | 2505 | 'SELECT id, fonction_id, groupes_interdits, groupes_visibles |
| 2506 | - FROM ' . prefixTable('users') . ' |
|
| 2506 | + FROM ' . prefixTable('users').' |
|
| 2507 | 2507 | WHERE login = %s', |
| 2508 | 2508 | $post_login |
| 2509 | 2509 | ); |
@@ -2607,7 +2607,7 @@ discard block |
||
| 2607 | 2607 | ); |
| 2608 | 2608 | |
| 2609 | 2609 | // Rebuild tree |
| 2610 | - $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries'); |
|
| 2610 | + $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries'); |
|
| 2611 | 2611 | $tree->register(); |
| 2612 | 2612 | $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title'); |
| 2613 | 2613 | $tree->rebuild(); |
@@ -2677,7 +2677,7 @@ discard block |
||
| 2677 | 2677 | // Check if user already exists |
| 2678 | 2678 | DB::query( |
| 2679 | 2679 | 'SELECT id |
| 2680 | - FROM ' . prefixTable('users') . ' |
|
| 2680 | + FROM ' . prefixTable('users').' |
|
| 2681 | 2681 | WHERE id = %i', |
| 2682 | 2682 | $post_id |
| 2683 | 2683 | ); |
@@ -2753,7 +2753,7 @@ discard block |
||
| 2753 | 2753 | // Check if user already exists |
| 2754 | 2754 | $userInfo = DB::queryfirstrow( |
| 2755 | 2755 | 'SELECT id, private_key, public_key |
| 2756 | - FROM ' . prefixTable('users') . ' |
|
| 2756 | + FROM ' . prefixTable('users').' |
|
| 2757 | 2757 | WHERE id = %i', |
| 2758 | 2758 | $post_userid |
| 2759 | 2759 | ); |
@@ -2800,7 +2800,7 @@ discard block |
||
| 2800 | 2800 | if (count($_SESSION['personal_folders']) > 0) { |
| 2801 | 2801 | DB::query( |
| 2802 | 2802 | 'SELECT id |
| 2803 | - FROM ' . prefixTable('items') . ' |
|
| 2803 | + FROM ' . prefixTable('items').' |
|
| 2804 | 2804 | WHERE id_tree IN %ls', |
| 2805 | 2805 | $_SESSION['personal_folders'] |
| 2806 | 2806 | ); |
@@ -2878,7 +2878,7 @@ discard block |
||
| 2878 | 2878 | // Check if user already exists |
| 2879 | 2879 | DB::query( |
| 2880 | 2880 | 'SELECT id |
| 2881 | - FROM ' . prefixTable('users') . ' |
|
| 2881 | + FROM ' . prefixTable('users').' |
|
| 2882 | 2882 | WHERE id = %i', |
| 2883 | 2883 | $post_id |
| 2884 | 2884 | ); |
@@ -2972,7 +2972,7 @@ discard block |
||
| 2972 | 2972 | |
| 2973 | 2973 | // Get info about user |
| 2974 | 2974 | $data_user = DB::queryfirstrow( |
| 2975 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 2975 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 2976 | 2976 | WHERE id = %i', |
| 2977 | 2977 | $value[1] |
| 2978 | 2978 | ); |
@@ -3005,7 +3005,7 @@ discard block |
||
| 3005 | 3005 | logEvents( |
| 3006 | 3006 | $SETTINGS, |
| 3007 | 3007 | 'user_mngt', |
| 3008 | - 'at_user_new_' . $value[0] . ':' . $value[1], |
|
| 3008 | + 'at_user_new_'.$value[0].':'.$value[1], |
|
| 3009 | 3009 | (string) $_SESSION['user_id'], |
| 3010 | 3010 | $_SESSION['login'], |
| 3011 | 3011 | filter_input(INPUT_POST, 'id', FILTER_SANITIZE_STRING) |
@@ -3037,7 +3037,7 @@ discard block |
||
| 3037 | 3037 | |
| 3038 | 3038 | // Get info about user |
| 3039 | 3039 | $data_user = DB::queryfirstrow( |
| 3040 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 3040 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 3041 | 3041 | WHERE id = %i', |
| 3042 | 3042 | $value[1] |
| 3043 | 3043 | ); |
@@ -2382,7 +2382,9 @@ |
||
| 2382 | 2382 | ], null, null, 'or')->get(); |
| 2383 | 2383 | |
| 2384 | 2384 | foreach($users as $i => $adUser) { |
| 2385 | - if (isset($adUser[$SETTINGS['ldap_user_attribute']]) === false) continue; |
|
| 2385 | + if (isset($adUser[$SETTINGS['ldap_user_attribute']]) === false) { |
|
| 2386 | + continue; |
|
| 2387 | + } |
|
| 2386 | 2388 | |
| 2387 | 2389 | // Build the list of all groups in AD |
| 2388 | 2390 | if (isset($adUser['memberof']) === true) { |
@@ -44,23 +44,23 @@ discard block |
||
| 44 | 44 | throw new Exception("Error file '/includes/config/tp.config.php' not exists", 1); |
| 45 | 45 | } |
| 46 | 46 | |
| 47 | -if (! isset($SETTINGS['cpassman_dir']) || empty($SETTINGS['cpassman_dir']) === true || $SETTINGS['cpassman_dir'] === '.') { |
|
| 47 | +if (!isset($SETTINGS['cpassman_dir']) || empty($SETTINGS['cpassman_dir']) === true || $SETTINGS['cpassman_dir'] === '.') { |
|
| 48 | 48 | $SETTINGS = []; |
| 49 | 49 | $SETTINGS['cpassman_dir'] = '..'; |
| 50 | 50 | } |
| 51 | 51 | |
| 52 | -require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 53 | -require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php'; |
|
| 54 | -require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php'; |
|
| 52 | +require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 53 | +require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php'; |
|
| 54 | +require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php'; |
|
| 55 | 55 | |
| 56 | 56 | // If Debug then clean the files |
| 57 | 57 | if (DEBUGLDAP === true) { |
| 58 | - define('DEBUGLDAPFILE', $SETTINGS['path_to_files_folder'] . '/ldap.debug.txt'); |
|
| 58 | + define('DEBUGLDAPFILE', $SETTINGS['path_to_files_folder'].'/ldap.debug.txt'); |
|
| 59 | 59 | $fp = fopen(DEBUGLDAPFILE, 'w'); |
| 60 | 60 | fclose($fp); |
| 61 | 61 | } |
| 62 | 62 | if (DEBUGDUO === true) { |
| 63 | - define('DEBUGDUOFILE', $SETTINGS['path_to_files_folder'] . '/duo.debug.txt'); |
|
| 63 | + define('DEBUGDUOFILE', $SETTINGS['path_to_files_folder'].'/duo.debug.txt'); |
|
| 64 | 64 | $fp = fopen(DEBUGDUOFILE, 'w'); |
| 65 | 65 | fclose($fp); |
| 66 | 66 | } |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | if (defined('DB_PASSWD_CLEAR') === false) { |
| 77 | 77 | define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS)); |
| 78 | 78 | } |
| 79 | -require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 79 | +require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 80 | 80 | if (defined('DB_PASSWD_CLEAR') === false) { |
| 81 | 81 | define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS)); |
| 82 | 82 | } |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | // This step creates the DUO request encrypted key |
| 94 | 94 | |
| 95 | 95 | // load library |
| 96 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/DuoSecurity/Duo.php'; |
|
| 96 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/DuoSecurity/Duo.php'; |
|
| 97 | 97 | $sig_request = Duo::signRequest( |
| 98 | 98 | $SETTINGS['IKEY'], |
| 99 | 99 | $SETTINGS['SKEY'], |
@@ -104,16 +104,16 @@ discard block |
||
| 104 | 104 | debugIdentify( |
| 105 | 105 | DEBUGDUO, |
| 106 | 106 | DEBUGDUOFILE, |
| 107 | - "\n\n-----\n\n" . |
|
| 108 | - 'sig request : ' . $post_login . "\n" . |
|
| 109 | - 'resp : ' . $sig_request . "\n" |
|
| 107 | + "\n\n-----\n\n". |
|
| 108 | + 'sig request : '.$post_login."\n". |
|
| 109 | + 'resp : '.$sig_request."\n" |
|
| 110 | 110 | ); |
| 111 | 111 | } |
| 112 | 112 | |
| 113 | 113 | // load csrfprotector |
| 114 | - $csrfp_config = include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/csrfp/libs/csrfp.config.php'; |
|
| 114 | + $csrfp_config = include_once $SETTINGS['cpassman_dir'].'/includes/libraries/csrfp/libs/csrfp.config.php'; |
|
| 115 | 115 | // return result |
| 116 | - echo '[{"sig_request" : "' . $sig_request . '" , "csrfp_token" : "' . $csrfp_config['CSRFP_TOKEN'] . '" , "csrfp_key" : "' . filter_var($_COOKIE[$csrfp_config['CSRFP_TOKEN']], FILTER_SANITIZE_STRING) . '"}]'; |
|
| 116 | + echo '[{"sig_request" : "'.$sig_request.'" , "csrfp_token" : "'.$csrfp_config['CSRFP_TOKEN'].'" , "csrfp_key" : "'.filter_var($_COOKIE[$csrfp_config['CSRFP_TOKEN']], FILTER_SANITIZE_STRING).'"}]'; |
|
| 117 | 117 | // --- |
| 118 | 118 | // --- |
| 119 | 119 | } elseif ($post_type === 'identify_duo_user_check') { |
@@ -123,7 +123,7 @@ discard block |
||
| 123 | 123 | //-------- |
| 124 | 124 | |
| 125 | 125 | // load library |
| 126 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/DuoSecurity/Duo.php'; |
|
| 126 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/DuoSecurity/Duo.php'; |
|
| 127 | 127 | $authenticated_username = Duo::verifyResponse( |
| 128 | 128 | $SETTINGS['duo_ikey'], |
| 129 | 129 | $SETTINGS['duo_skey'], |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | // is user in Teampass? |
| 139 | 139 | DB::queryfirstrow( |
| 140 | 140 | 'SELECT id |
| 141 | - FROM ' . prefixTable('users') . ' |
|
| 141 | + FROM ' . prefixTable('users').' |
|
| 142 | 142 | WHERE login = %s', |
| 143 | 143 | $post_login |
| 144 | 144 | ); |
@@ -148,9 +148,9 @@ discard block |
||
| 148 | 148 | } |
| 149 | 149 | } |
| 150 | 150 | |
| 151 | - echo '[{"authenticated_username" : "' . $authenticated_username . '"}]'; |
|
| 151 | + echo '[{"authenticated_username" : "'.$authenticated_username.'"}]'; |
|
| 152 | 152 | } else { |
| 153 | - echo '[{"authenticated_username" : "' . $authenticated_username . '"}]'; |
|
| 153 | + echo '[{"authenticated_username" : "'.$authenticated_username.'"}]'; |
|
| 154 | 154 | } |
| 155 | 155 | // --- |
| 156 | 156 | // --- |
@@ -176,7 +176,7 @@ discard block |
||
| 176 | 176 | } |
| 177 | 177 | |
| 178 | 178 | // Load superGlobals |
| 179 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 179 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 180 | 180 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 181 | 181 | // Prepare GET variables |
| 182 | 182 | $sessionPwdAttempts = $superGlobal->get('pwd_attempts', 'SESSION'); |
@@ -264,19 +264,19 @@ discard block |
||
| 264 | 264 | } else { |
| 265 | 265 | throw new Exception("Error file '/includes/config/tp.config.php' not exists", 1); |
| 266 | 266 | } |
| 267 | - include_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php'; |
|
| 268 | - include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 269 | - include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php'; |
|
| 267 | + include_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php'; |
|
| 268 | + include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 269 | + include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php'; |
|
| 270 | 270 | |
| 271 | 271 | header('Content-type: text/html; charset=utf-8'); |
| 272 | 272 | error_reporting(E_ERROR); |
| 273 | 273 | |
| 274 | 274 | // Load AntiXSS |
| 275 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/voku/helper/AntiXSS.php'; |
|
| 275 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/voku/helper/AntiXSS.php'; |
|
| 276 | 276 | $antiXss = new voku\helper\AntiXSS(); |
| 277 | 277 | |
| 278 | 278 | // Load superGlobals |
| 279 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 279 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 280 | 280 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 281 | 281 | |
| 282 | 282 | // Prepare GET variables |
@@ -290,7 +290,7 @@ discard block |
||
| 290 | 290 | $server['PHP_AUTH_PW'] = $superGlobal->get('PHP_AUTH_PW', 'SERVER'); |
| 291 | 291 | |
| 292 | 292 | // connect to the server |
| 293 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 293 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 294 | 294 | DB::$host = DB_HOST; |
| 295 | 295 | DB::$user = DB_USER; |
| 296 | 296 | DB::$password = defined('DB_PASSWD_CLEAR') === false ? defuseReturnDecrypted(DB_PASSWD, $SETTINGS) : DB_PASSWD_CLEAR; |
@@ -298,7 +298,7 @@ discard block |
||
| 298 | 298 | DB::$port = DB_PORT; |
| 299 | 299 | DB::$encoding = DB_ENCODING; |
| 300 | 300 | // User's language loading |
| 301 | - include_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $sessionUserLanguage . '.php'; |
|
| 301 | + include_once $SETTINGS['cpassman_dir'].'/includes/language/'.$sessionUserLanguage.'.php'; |
|
| 302 | 302 | |
| 303 | 303 | // decrypt and retreive data in JSON format |
| 304 | 304 | if (empty($sessionKey) === true) { |
@@ -450,7 +450,7 @@ discard block |
||
| 450 | 450 | //$arrAttempts = array(); |
| 451 | 451 | $rows = DB::query( |
| 452 | 452 | 'SELECT date |
| 453 | - FROM ' . prefixTable('log_system') . " |
|
| 453 | + FROM ' . prefixTable('log_system')." |
|
| 454 | 454 | WHERE field_1 = %s |
| 455 | 455 | AND type = 'failed_auth' |
| 456 | 456 | AND label = 'password_is_not_correct' |
@@ -466,7 +466,7 @@ discard block |
||
| 466 | 466 | foreach ($rows as $record) { |
| 467 | 467 | array_push( |
| 468 | 468 | $arrAttempts, |
| 469 | - date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) |
|
| 469 | + date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']) |
|
| 470 | 470 | ); |
| 471 | 471 | } |
| 472 | 472 | } |
@@ -604,7 +604,7 @@ discard block |
||
| 604 | 604 | foreach ($superGlobal->get('user_roles', 'SESSION') as $role) { |
| 605 | 605 | $resRoles = DB::queryFirstRow( |
| 606 | 606 | 'SELECT title, complexity |
| 607 | - FROM ' . prefixTable('roles_title') . ' |
|
| 607 | + FROM ' . prefixTable('roles_title').' |
|
| 608 | 608 | WHERE id=%i', |
| 609 | 609 | $role |
| 610 | 610 | ); |
@@ -625,7 +625,7 @@ discard block |
||
| 625 | 625 | |
| 626 | 626 | // build complete array of roles |
| 627 | 627 | $superGlobal->put('arr_roles_full', [], 'SESSION'); |
| 628 | - $rows = DB::query('SELECT id, title FROM ' . prefixTable('roles_title') . ' ORDER BY title ASC'); |
|
| 628 | + $rows = DB::query('SELECT id, title FROM '.prefixTable('roles_title').' ORDER BY title ASC'); |
|
| 629 | 629 | foreach ($rows as $record) { |
| 630 | 630 | $superGlobal->put( |
| 631 | 631 | $record['id'], |
@@ -722,10 +722,10 @@ discard block |
||
| 722 | 722 | $superGlobal->put('latest_items_tab', [], 'SESSION'); |
| 723 | 723 | $superGlobal->put('nb_roles', 0, 'SESSION'); |
| 724 | 724 | foreach ($superGlobal->get('latest_items', 'SESSION') as $item) { |
| 725 | - if (! empty($item)) { |
|
| 725 | + if (!empty($item)) { |
|
| 726 | 726 | $dataLastItems = DB::queryFirstRow( |
| 727 | 727 | 'SELECT id,label,id_tree |
| 728 | - FROM ' . prefixTable('items') . ' |
|
| 728 | + FROM ' . prefixTable('items').' |
|
| 729 | 729 | WHERE id=%i', |
| 730 | 730 | $item |
| 731 | 731 | ); |
@@ -734,7 +734,7 @@ discard block |
||
| 734 | 734 | [ |
| 735 | 735 | 'id' => $item, |
| 736 | 736 | 'label' => $dataLastItems['label'], |
| 737 | - 'url' => 'index.php?page=items&group=' . $dataLastItems['id_tree'] . '&id=' . $item, |
|
| 737 | + 'url' => 'index.php?page=items&group='.$dataLastItems['id_tree'].'&id='.$item, |
|
| 738 | 738 | ], |
| 739 | 739 | 'SESSION', |
| 740 | 740 | 'latest_items_tab' |
@@ -751,12 +751,12 @@ discard block |
||
| 751 | 751 | ) { |
| 752 | 752 | // get all Admin users |
| 753 | 753 | $receivers = ''; |
| 754 | - $rows = DB::query('SELECT email FROM ' . prefixTable('users') . " WHERE admin = %i and email != ''", 1); |
|
| 754 | + $rows = DB::query('SELECT email FROM '.prefixTable('users')." WHERE admin = %i and email != ''", 1); |
|
| 755 | 755 | foreach ($rows as $record) { |
| 756 | 756 | if (empty($receivers)) { |
| 757 | 757 | $receivers = $record['email']; |
| 758 | 758 | } else { |
| 759 | - $receivers = ',' . $record['email']; |
|
| 759 | + $receivers = ','.$record['email']; |
|
| 760 | 760 | } |
| 761 | 761 | } |
| 762 | 762 | // Add email to table |
@@ -772,7 +772,7 @@ discard block |
||
| 772 | 772 | '#tp_time#', |
| 773 | 773 | ], |
| 774 | 774 | [ |
| 775 | - ' ' . $superGlobal->get('login', 'SESSION') . ' (IP: ' . getClientIpServer() . ')', |
|
| 775 | + ' '.$superGlobal->get('login', 'SESSION').' (IP: '.getClientIpServer().')', |
|
| 776 | 776 | date($SETTINGS['date_format'], (int) $superGlobal->get('last_connection', 'SESSION')), |
| 777 | 777 | date($SETTINGS['time_format'], (int) $superGlobal->get('last_connection', 'SESSION')), |
| 778 | 778 | ], |
@@ -990,45 +990,45 @@ discard block |
||
| 990 | 990 | } |
| 991 | 991 | |
| 992 | 992 | // Load expected libraries |
| 993 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Illuminate/Contracts/Auth/Authenticatable.php'; |
|
| 994 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Traits/EnumeratesValues.php'; |
|
| 995 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php'; |
|
| 996 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/helpers.php'; |
|
| 997 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Arr.php'; |
|
| 998 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Contracts/Support/Jsonable.php'; |
|
| 999 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Contracts/Support/Arrayable.php'; |
|
| 1000 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Enumerable.php'; |
|
| 1001 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Collection.php'; |
|
| 1002 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonTimeZone.php'; |
|
| 1003 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Units.php'; |
|
| 1004 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Week.php'; |
|
| 1005 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Timestamp.php'; |
|
| 1006 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Test.php'; |
|
| 1007 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/ObjectInitialisation.php'; |
|
| 1008 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Serialization.php'; |
|
| 1009 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/IntervalRounding.php'; |
|
| 1010 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Rounding.php'; |
|
| 1011 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Localization.php'; |
|
| 1012 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Options.php'; |
|
| 1013 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Cast.php'; |
|
| 1014 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mutability.php'; |
|
| 1015 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Modifiers.php'; |
|
| 1016 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mixin.php'; |
|
| 1017 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Macro.php'; |
|
| 1018 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Difference.php'; |
|
| 1019 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Creator.php'; |
|
| 1020 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Converter.php'; |
|
| 1021 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Comparison.php'; |
|
| 1022 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Boundaries.php'; |
|
| 1023 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Date.php'; |
|
| 1024 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonInterface.php'; |
|
| 1025 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Carbon.php'; |
|
| 1026 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/DetectsErrors.php'; |
|
| 1027 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Connection.php'; |
|
| 1028 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapInterface.php'; |
|
| 1029 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapBase.php'; |
|
| 1030 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/HandlesConnection.php'; |
|
| 1031 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Ldap.php'; |
|
| 993 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Illuminate/Contracts/Auth/Authenticatable.php'; |
|
| 994 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Traits/EnumeratesValues.php'; |
|
| 995 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php'; |
|
| 996 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/helpers.php'; |
|
| 997 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Arr.php'; |
|
| 998 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Contracts/Support/Jsonable.php'; |
|
| 999 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Contracts/Support/Arrayable.php'; |
|
| 1000 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Enumerable.php'; |
|
| 1001 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Collection.php'; |
|
| 1002 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonTimeZone.php'; |
|
| 1003 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Units.php'; |
|
| 1004 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Week.php'; |
|
| 1005 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Timestamp.php'; |
|
| 1006 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Test.php'; |
|
| 1007 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/ObjectInitialisation.php'; |
|
| 1008 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Serialization.php'; |
|
| 1009 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/IntervalRounding.php'; |
|
| 1010 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Rounding.php'; |
|
| 1011 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Localization.php'; |
|
| 1012 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Options.php'; |
|
| 1013 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Cast.php'; |
|
| 1014 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mutability.php'; |
|
| 1015 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Modifiers.php'; |
|
| 1016 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mixin.php'; |
|
| 1017 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Macro.php'; |
|
| 1018 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Difference.php'; |
|
| 1019 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Creator.php'; |
|
| 1020 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Converter.php'; |
|
| 1021 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Comparison.php'; |
|
| 1022 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Boundaries.php'; |
|
| 1023 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Date.php'; |
|
| 1024 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonInterface.php'; |
|
| 1025 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Carbon.php'; |
|
| 1026 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/DetectsErrors.php'; |
|
| 1027 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Connection.php'; |
|
| 1028 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapInterface.php'; |
|
| 1029 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapBase.php'; |
|
| 1030 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/HandlesConnection.php'; |
|
| 1031 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Ldap.php'; |
|
| 1032 | 1032 | $ad = new SplClassLoader('LdapRecord', '../includes/libraries'); |
| 1033 | 1033 | $ad->register(); |
| 1034 | 1034 | $connection = new Connection($config); |
@@ -1040,7 +1040,7 @@ discard block |
||
| 1040 | 1040 | $error = $e->getDetailedError(); |
| 1041 | 1041 | return [ |
| 1042 | 1042 | 'error' => true, |
| 1043 | - 'message' => langHdl('error').' : '.$error->getErrorCode().' - '.$error->getErrorMessage(). '<br>'.$error->getDiagnosticMessage().' '.$config['username'], |
|
| 1043 | + 'message' => langHdl('error').' : '.$error->getErrorCode().' - '.$error->getErrorMessage().'<br>'.$error->getDiagnosticMessage().' '.$config['username'], |
|
| 1044 | 1044 | |
| 1045 | 1045 | ]; |
| 1046 | 1046 | } |
@@ -1068,7 +1068,7 @@ discard block |
||
| 1068 | 1068 | } |
| 1069 | 1069 | |
| 1070 | 1070 | // load passwordLib library |
| 1071 | - $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'] . '/includes/libraries'); |
|
| 1071 | + $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'].'/includes/libraries'); |
|
| 1072 | 1072 | $pwdlib->register(); |
| 1073 | 1073 | $pwdlib = new PasswordLib\PasswordLib(); |
| 1074 | 1074 | $hashedPassword = $pwdlib->createPasswordHash($passwordClear); |
@@ -1127,7 +1127,7 @@ discard block |
||
| 1127 | 1127 | function yubicoMFACheck($dataReceived, string $userInfo, array $SETTINGS): array |
| 1128 | 1128 | { |
| 1129 | 1129 | // Load superGlobals |
| 1130 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 1130 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 1131 | 1131 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 1132 | 1132 | $sessionAdmin = $superGlobal->get('user_admin', 'SESSION'); |
| 1133 | 1133 | $sessionUrl = $superGlobal->get('initial_url', 'SESSION'); |
@@ -1166,7 +1166,7 @@ discard block |
||
| 1166 | 1166 | } |
| 1167 | 1167 | |
| 1168 | 1168 | // Now check yubico validity |
| 1169 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/Yubico/Yubico.php'; |
|
| 1169 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/Yubico/Yubico.php'; |
|
| 1170 | 1170 | $yubi = new Auth_Yubico($yubico_user_id, $yubico_user_key); |
| 1171 | 1171 | $auth = $yubi->verify($yubico_key); |
| 1172 | 1172 | //, null, null, null, 60 |
@@ -1218,7 +1218,7 @@ discard block |
||
| 1218 | 1218 | 'gestionnaire' => '0', |
| 1219 | 1219 | 'can_manage_all_users' => '0', |
| 1220 | 1220 | 'personal_folder' => $SETTINGS['enable_pf_feature'] === '1' ? '1' : '0', |
| 1221 | - 'fonction_id' => (empty($retLDAP['user_info_from_ad'][0]['commonGroupsLdapVsTeampass']) === false ? $retLDAP['user_info_from_ad'][0]['commonGroupsLdapVsTeampass'] . ';' : '') . (isset($SETTINGS['ldap_new_user_role']) === true ? $SETTINGS['ldap_new_user_role'] : '0'), |
|
| 1221 | + 'fonction_id' => (empty($retLDAP['user_info_from_ad'][0]['commonGroupsLdapVsTeampass']) === false ? $retLDAP['user_info_from_ad'][0]['commonGroupsLdapVsTeampass'].';' : '').(isset($SETTINGS['ldap_new_user_role']) === true ? $SETTINGS['ldap_new_user_role'] : '0'), |
|
| 1222 | 1222 | 'groupes_interdits' => '', |
| 1223 | 1223 | 'groupes_visibles' => '', |
| 1224 | 1224 | 'last_pw_change' => (int) time(), |
@@ -1243,7 +1243,7 @@ discard block |
||
| 1243 | 1243 | ] |
| 1244 | 1244 | ); |
| 1245 | 1245 | // Rebuild tree |
| 1246 | - $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries'); |
|
| 1246 | + $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries'); |
|
| 1247 | 1247 | $tree->register(); |
| 1248 | 1248 | $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title'); |
| 1249 | 1249 | $tree->rebuild(); |
@@ -1274,13 +1274,13 @@ discard block |
||
| 1274 | 1274 | && empty($dataReceived['GACode']) === false |
| 1275 | 1275 | ) { |
| 1276 | 1276 | // Load superGlobals |
| 1277 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 1277 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 1278 | 1278 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 1279 | 1279 | $sessionAdmin = $superGlobal->get('user_admin', 'SESSION'); |
| 1280 | 1280 | $sessionUrl = $superGlobal->get('initial_url', 'SESSION'); |
| 1281 | 1281 | $sessionPwdAttempts = $superGlobal->get('pwd_attempts', 'SESSION'); |
| 1282 | 1282 | // load library |
| 1283 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php'; |
|
| 1283 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php'; |
|
| 1284 | 1284 | // create new instance |
| 1285 | 1285 | $tfa = new Authentication\TwoFactorAuth\TwoFactorAuth($SETTINGS['ga_website_name']); |
| 1286 | 1286 | // Init |
@@ -1302,7 +1302,7 @@ discard block |
||
| 1302 | 1302 | $mfaMessage = langHdl('ga_flash_qr_and_login'); |
| 1303 | 1303 | // generate new QR |
| 1304 | 1304 | $new_2fa_qr = $tfa->getQRCodeImageAsDataUri( |
| 1305 | - 'Teampass - ' . $username, |
|
| 1305 | + 'Teampass - '.$username, |
|
| 1306 | 1306 | $userInfo['ga'] |
| 1307 | 1307 | ); |
| 1308 | 1308 | // clear temporary code from DB |
@@ -1315,7 +1315,7 @@ discard block |
||
| 1315 | 1315 | $userInfo['id'] |
| 1316 | 1316 | ); |
| 1317 | 1317 | $firstTime = [ |
| 1318 | - 'value' => '<img src="' . $new_2fa_qr . '">', |
|
| 1318 | + 'value' => '<img src="'.$new_2fa_qr.'">', |
|
| 1319 | 1319 | 'user_admin' => isset($sessionAdmin) ? (int) $sessionAdmin : '', |
| 1320 | 1320 | 'initial_url' => isset($sessionUrl) === true ? $sessionUrl : '', |
| 1321 | 1321 | 'pwd_attempts' => (int) $sessionPwdAttempts, |
@@ -1366,8 +1366,8 @@ discard block |
||
| 1366 | 1366 | // Set to false |
| 1367 | 1367 | $userPasswordVerified = false; |
| 1368 | 1368 | // load passwordLib library |
| 1369 | - include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php'; |
|
| 1370 | - $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'] . '/includes/libraries'); |
|
| 1369 | + include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php'; |
|
| 1370 | + $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'].'/includes/libraries'); |
|
| 1371 | 1371 | $pwdlib->register(); |
| 1372 | 1372 | $pwdlib = new PasswordLib\PasswordLib(); |
| 1373 | 1373 | // Check if old encryption used |
@@ -1498,7 +1498,7 @@ discard block |
||
| 1498 | 1498 | // Brute force management |
| 1499 | 1499 | if ($sessionPwdAttempts > 3) { |
| 1500 | 1500 | // Load superGlobals |
| 1501 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 1501 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 1502 | 1502 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 1503 | 1503 | $superGlobal->put('next_possible_pwd_attempts', time() + 10, 'SESSION'); |
| 1504 | 1504 | $superGlobal->put('pwd_attempts', 0, 'SESSION'); |
@@ -1540,7 +1540,7 @@ discard block |
||
| 1540 | 1540 | // Check if user exists |
| 1541 | 1541 | $userInfo = DB::queryFirstRow( |
| 1542 | 1542 | 'SELECT * |
| 1543 | - FROM ' . prefixTable('users') . ' WHERE login=%s', |
|
| 1543 | + FROM ' . prefixTable('users').' WHERE login=%s', |
|
| 1544 | 1544 | $username |
| 1545 | 1545 | ); |
| 1546 | 1546 | |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | require $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/DuoUniversal/Client.php'; |
| 54 | 54 | |
| 55 | 55 | // Load superGlobals |
| 56 | -include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 56 | +include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 57 | 57 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 58 | 58 | |
| 59 | 59 | |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | $SETTINGS['cpassman_url'].'/duo-callback' |
| 67 | 67 | ); |
| 68 | 68 | } catch (DuoException $e) { |
| 69 | - throw new ErrorException("*** Duo config error. Verify the values in duo.conf are correct ***\n" . $e->getMessage()); |
|
| 69 | + throw new ErrorException("*** Duo config error. Verify the values in duo.conf are correct ***\n".$e->getMessage()); |
|
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | $state = $duo_client->generateState(); |
@@ -43,11 +43,11 @@ discard block |
||
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | /* do checks */ |
| 46 | -require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php'; |
|
| 46 | +require_once $SETTINGS['cpassman_dir'].'/sources/checks.php'; |
|
| 47 | 47 | if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'folders', $SETTINGS) === false) { |
| 48 | 48 | $_SESSION['error']['code'] = ERR_NOT_ALLOWED; |
| 49 | 49 | //not allowed page |
| 50 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 50 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 51 | 51 | exit; |
| 52 | 52 | } |
| 53 | 53 | ?> |
@@ -275,8 +275,8 @@ discard block |
||
| 275 | 275 | if (store.get('teampassApplication').formUserAction === "add_new_user") { |
| 276 | 276 | var data = { |
| 277 | 277 | 'receipt': $('#form-email').val(), |
| 278 | - 'subject': 'TEAMPASS - <?php echo langHdl('temporary_encryption_code');?>', |
|
| 279 | - 'body': '<?php echo langHdl('email_body_new_user');?>', |
|
| 278 | + 'subject': 'TEAMPASS - <?php echo langHdl('temporary_encryption_code'); ?>', |
|
| 279 | + 'body': '<?php echo langHdl('email_body_new_user'); ?>', |
|
| 280 | 280 | 'pre_replace' : { |
| 281 | 281 | '#code#' : store.get('teampassUser').admin_new_user_temporary_encryption_code, |
| 282 | 282 | '#login#' : store.get('teampassUser').admin_new_user_login, |
@@ -286,8 +286,8 @@ discard block |
||
| 286 | 286 | } else { |
| 287 | 287 | var data = { |
| 288 | 288 | 'receipt': $('#form-email').val(), |
| 289 | - 'subject': 'TEAMPASS - <?php echo langHdl('temporary_encryption_code');?>', |
|
| 290 | - 'body': '<?php echo langHdl('email_body_temporary_encryption_code');?>', |
|
| 289 | + 'subject': 'TEAMPASS - <?php echo langHdl('temporary_encryption_code'); ?>', |
|
| 290 | + 'body': '<?php echo langHdl('email_body_temporary_encryption_code'); ?>', |
|
| 291 | 291 | 'pre_replace' : { |
| 292 | 292 | '#enc_code#' : store.get('teampassUser').admin_new_user_temporary_encryption_code, |
| 293 | 293 | } |
@@ -464,13 +464,13 @@ discard block |
||
| 464 | 464 | } |
| 465 | 465 | // Inform user |
| 466 | 466 | $("#warningModalBody").html('<b><?php echo langHdl('encryption_keys'); ?> - ' + |
| 467 | - stepText + '</b> [' + start + ' - ' + (parseInt(start) + <?php echo NUMBER_ITEMS_IN_BATCH;?>) + ']<span id="warningModalBody_extra">' + $nbItemsToConvert + '</span> ' + |
|
| 467 | + stepText + '</b> [' + start + ' - ' + (parseInt(start) + <?php echo NUMBER_ITEMS_IN_BATCH; ?>) + ']<span id="warningModalBody_extra">' + $nbItemsToConvert + '</span> ' + |
|
| 468 | 468 | '... <?php echo langHdl('please_wait'); ?><i class="fas fa-spinner fa-pulse ml-3 text-primary"></i>'); |
| 469 | 469 | |
| 470 | 470 | var data = { |
| 471 | 471 | action: step, |
| 472 | 472 | start: start, |
| 473 | - length: <?php echo NUMBER_ITEMS_IN_BATCH;?>, |
|
| 473 | + length: <?php echo NUMBER_ITEMS_IN_BATCH; ?>, |
|
| 474 | 474 | user_id: userId, |
| 475 | 475 | } |
| 476 | 476 | console.info("Envoi des données :") |
@@ -1236,7 +1236,7 @@ discard block |
||
| 1236 | 1236 | } else { |
| 1237 | 1237 | // Show icon or not |
| 1238 | 1238 | if ($('#user-disabled').prop('checked') === true) { |
| 1239 | - $('#user-login-'+userID).before('<i class="fas fa-user-slash infotip text-danger mr-2" title="<?php echo langHdl('account_is_locked');?>" id="user-disable-'+userID+'"></i>'); |
|
| 1239 | + $('#user-login-'+userID).before('<i class="fas fa-user-slash infotip text-danger mr-2" title="<?php echo langHdl('account_is_locked'); ?>" id="user-disable-'+userID+'"></i>'); |
|
| 1240 | 1240 | } else { |
| 1241 | 1241 | $('#user-disable-'+userID).remove(); |
| 1242 | 1242 | } |
@@ -2081,12 +2081,12 @@ discard block |
||
| 2081 | 2081 | if (step !== 'finished') { |
| 2082 | 2082 | // Inform user |
| 2083 | 2083 | $("#warningModal-progress").html('<b><?php echo langHdl('encryption_keys'); ?> - ' + |
| 2084 | - stepText + '</b> [' + start + ' - ' + (parseInt(start) + <?php echo NUMBER_ITEMS_IN_BATCH;?>) + ']'); |
|
| 2084 | + stepText + '</b> [' + start + ' - ' + (parseInt(start) + <?php echo NUMBER_ITEMS_IN_BATCH; ?>) + ']'); |
|
| 2085 | 2085 | |
| 2086 | 2086 | var data = { |
| 2087 | 2087 | 'action': step, |
| 2088 | 2088 | 'start': start, |
| 2089 | - 'length': <?php echo NUMBER_ITEMS_IN_BATCH;?>, |
|
| 2089 | + 'length': <?php echo NUMBER_ITEMS_IN_BATCH; ?>, |
|
| 2090 | 2090 | 'user_id': userId, |
| 2091 | 2091 | 'self_change': false, |
| 2092 | 2092 | } |
