nilsteampassnet /
TeamPass
@@ -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'], 'profile', $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 | ?> |
@@ -212,7 +212,7 @@ discard block |
||
| 212 | 212 | $('#profile-username').html($('#profile-user-name').val() + ' ' + $('#profile-user-lastname').val()); |
| 213 | 213 | |
| 214 | 214 | // reload page in case of language change |
| 215 | - if ($('#profile-user-language').val().toLowerCase() !== '<?php echo $_SESSION['user_language'];?>') { |
|
| 215 | + if ($('#profile-user-language').val().toLowerCase() !== '<?php echo $_SESSION['user_language']; ?>') { |
|
| 216 | 216 | // prepare reload |
| 217 | 217 | $(this).delay(3000).queue(function() { |
| 218 | 218 | document.location.href = "index.php?page=profile"; |
@@ -223,7 +223,7 @@ discard block |
||
| 223 | 223 | // Inform user |
| 224 | 224 | toastr.remove(); |
| 225 | 225 | toastr.info( |
| 226 | - '<?php echo langHdl('alert_page_will_reload') . ' ... ' . langHdl('please_wait'); ?>', |
|
| 226 | + '<?php echo langHdl('alert_page_will_reload').' ... '.langHdl('please_wait'); ?>', |
|
| 227 | 227 | '', { |
| 228 | 228 | timeOut: 3000, |
| 229 | 229 | progressBar: true |
@@ -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 | } |
@@ -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) { |
@@ -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 | } |
@@ -128,12 +128,12 @@ discard block |
||
| 128 | 128 | |
| 129 | 129 | // decrypt and retrieve data in JSON format |
| 130 | 130 | $dataReceived = prepareExchangedData( |
| 131 | - $SETTINGS['cpassman_dir'],$post_data, 'decode'); |
|
| 131 | + $SETTINGS['cpassman_dir'], $post_data, 'decode'); |
|
| 132 | 132 | |
| 133 | 133 | // Prepare variables |
| 134 | 134 | $login = filter_var($dataReceived['login'], FILTER_SANITIZE_STRING); |
| 135 | 135 | $email = filter_var($dataReceived['email'], FILTER_SANITIZE_EMAIL); |
| 136 | - $password = '';//filter_var($dataReceived['pw'], FILTER_SANITIZE_STRING); |
|
| 136 | + $password = ''; //filter_var($dataReceived['pw'], FILTER_SANITIZE_STRING); |
|
| 137 | 137 | $lastname = filter_var($dataReceived['lastname'], FILTER_SANITIZE_STRING); |
| 138 | 138 | $name = filter_var($dataReceived['name'], FILTER_SANITIZE_STRING); |
| 139 | 139 | $is_admin = filter_var($dataReceived['admin'], FILTER_SANITIZE_NUMBER_INT); |
@@ -163,7 +163,7 @@ discard block |
||
| 163 | 163 | // Check if user already exists |
| 164 | 164 | $data = DB::query( |
| 165 | 165 | 'SELECT id, fonction_id, groupes_interdits, groupes_visibles |
| 166 | - FROM ' . prefixTable('users') . ' |
|
| 166 | + FROM ' . prefixTable('users').' |
|
| 167 | 167 | WHERE login = %s', |
| 168 | 168 | $login |
| 169 | 169 | ); |
@@ -379,14 +379,14 @@ discard block |
||
| 379 | 379 | |
| 380 | 380 | // decrypt and retrieve data in JSON format |
| 381 | 381 | $dataReceived = prepareExchangedData( |
| 382 | - $SETTINGS['cpassman_dir'],$post_data, 'decode'); |
|
| 382 | + $SETTINGS['cpassman_dir'], $post_data, 'decode'); |
|
| 383 | 383 | |
| 384 | 384 | // Prepare variables |
| 385 | 385 | $post_id = filter_var($dataReceived['user_id'], FILTER_SANITIZE_NUMBER_INT); |
| 386 | 386 | |
| 387 | 387 | // Get info about user to delete |
| 388 | 388 | $data_user = DB::queryfirstrow( |
| 389 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 389 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 390 | 390 | WHERE id = %i', |
| 391 | 391 | $post_id |
| 392 | 392 | ); |
@@ -405,7 +405,7 @@ discard block |
||
| 405 | 405 | ); |
| 406 | 406 | // delete personal folder and subfolders |
| 407 | 407 | $data = DB::queryfirstrow( |
| 408 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' |
|
| 408 | + 'SELECT id FROM '.prefixTable('nested_tree').' |
|
| 409 | 409 | WHERE title = %s AND personal_folder = %i', |
| 410 | 410 | $post_id, |
| 411 | 411 | '1' |
@@ -418,7 +418,7 @@ discard block |
||
| 418 | 418 | DB::delete(prefixTable('nested_tree'), 'id = %i AND personal_folder = %i', $folder->id, '1'); |
| 419 | 419 | // delete items & logs |
| 420 | 420 | $items = DB::query( |
| 421 | - 'SELECT id FROM ' . prefixTable('items') . ' |
|
| 421 | + 'SELECT id FROM '.prefixTable('items').' |
|
| 422 | 422 | WHERE id_tree=%i AND perso = %i', |
| 423 | 423 | $folder->id, |
| 424 | 424 | '1' |
@@ -470,7 +470,7 @@ discard block |
||
| 470 | 470 | // Check KEY |
| 471 | 471 | if (filter_input(INPUT_POST, 'key', FILTER_SANITIZE_STRING) !== filter_var($_SESSION['key'], FILTER_SANITIZE_STRING)) { |
| 472 | 472 | echo prepareExchangedData( |
| 473 | - $SETTINGS['cpassman_dir'],array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode'); |
|
| 473 | + $SETTINGS['cpassman_dir'], array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode'); |
|
| 474 | 474 | break; |
| 475 | 475 | } |
| 476 | 476 | |
@@ -478,7 +478,7 @@ discard block |
||
| 478 | 478 | |
| 479 | 479 | // Get info about user to delete |
| 480 | 480 | $data_user = DB::queryfirstrow( |
| 481 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 481 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 482 | 482 | WHERE id = %i', |
| 483 | 483 | $post_id |
| 484 | 484 | ); |
@@ -498,10 +498,10 @@ discard block |
||
| 498 | 498 | $post_id |
| 499 | 499 | ); |
| 500 | 500 | echo prepareExchangedData( |
| 501 | - $SETTINGS['cpassman_dir'],array('error' => ''), 'encode'); |
|
| 501 | + $SETTINGS['cpassman_dir'], array('error' => ''), 'encode'); |
|
| 502 | 502 | } else { |
| 503 | 503 | echo prepareExchangedData( |
| 504 | - $SETTINGS['cpassman_dir'],array('error' => 'not_allowed'), 'encode'); |
|
| 504 | + $SETTINGS['cpassman_dir'], array('error' => 'not_allowed'), 'encode'); |
|
| 505 | 505 | } |
| 506 | 506 | break; |
| 507 | 507 | /* |
@@ -514,7 +514,7 @@ discard block |
||
| 514 | 514 | || $_SESSION['is_admin'] !== '1' |
| 515 | 515 | ) { |
| 516 | 516 | echo prepareExchangedData( |
| 517 | - $SETTINGS['cpassman_dir'],array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode'); |
|
| 517 | + $SETTINGS['cpassman_dir'], array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode'); |
|
| 518 | 518 | exit(); |
| 519 | 519 | } |
| 520 | 520 | |
@@ -523,7 +523,7 @@ discard block |
||
| 523 | 523 | |
| 524 | 524 | // Get info about user to delete |
| 525 | 525 | $data_user = DB::queryfirstrow( |
| 526 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 526 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 527 | 527 | WHERE id = %i', |
| 528 | 528 | $post_id |
| 529 | 529 | ); |
@@ -546,10 +546,10 @@ discard block |
||
| 546 | 546 | ); |
| 547 | 547 | |
| 548 | 548 | echo prepareExchangedData( |
| 549 | - $SETTINGS['cpassman_dir'],array('error' => ''), 'encode'); |
|
| 549 | + $SETTINGS['cpassman_dir'], array('error' => ''), 'encode'); |
|
| 550 | 550 | } else { |
| 551 | 551 | echo prepareExchangedData( |
| 552 | - $SETTINGS['cpassman_dir'],array('error' => 'not_allowed'), 'encode'); |
|
| 552 | + $SETTINGS['cpassman_dir'], array('error' => 'not_allowed'), 'encode'); |
|
| 553 | 553 | } |
| 554 | 554 | break; |
| 555 | 555 | /* |
@@ -559,7 +559,7 @@ discard block |
||
| 559 | 559 | // Check KEY |
| 560 | 560 | if (filter_input(INPUT_POST, 'key', FILTER_SANITIZE_STRING) !== filter_var($_SESSION['key'], FILTER_SANITIZE_STRING)) { |
| 561 | 561 | echo prepareExchangedData( |
| 562 | - $SETTINGS['cpassman_dir'],array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode'); |
|
| 562 | + $SETTINGS['cpassman_dir'], array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode'); |
|
| 563 | 563 | break; |
| 564 | 564 | } |
| 565 | 565 | |
@@ -569,7 +569,7 @@ discard block |
||
| 569 | 569 | // Get info about user to delete |
| 570 | 570 | $data_user = DB::queryfirstrow( |
| 571 | 571 | 'SELECT admin, isAdministratedByRole, can_manage_all_users, gestionnaire |
| 572 | - FROM ' . prefixTable('users') . ' |
|
| 572 | + FROM ' . prefixTable('users').' |
|
| 573 | 573 | WHERE id = %i', |
| 574 | 574 | $post_id |
| 575 | 575 | ); |
@@ -594,10 +594,10 @@ discard block |
||
| 594 | 594 | $post_id |
| 595 | 595 | ); |
| 596 | 596 | echo prepareExchangedData( |
| 597 | - $SETTINGS['cpassman_dir'],array('error' => ''), 'encode'); |
|
| 597 | + $SETTINGS['cpassman_dir'], array('error' => ''), 'encode'); |
|
| 598 | 598 | } else { |
| 599 | 599 | echo prepareExchangedData( |
| 600 | - $SETTINGS['cpassman_dir'],array('error' => 'not_allowed'), 'encode'); |
|
| 600 | + $SETTINGS['cpassman_dir'], array('error' => 'not_allowed'), 'encode'); |
|
| 601 | 601 | } |
| 602 | 602 | break; |
| 603 | 603 | /* |
@@ -607,7 +607,7 @@ discard block |
||
| 607 | 607 | // Check KEY |
| 608 | 608 | if (filter_input(INPUT_POST, 'key', FILTER_SANITIZE_STRING) !== filter_var($_SESSION['key'], FILTER_SANITIZE_STRING)) { |
| 609 | 609 | echo prepareExchangedData( |
| 610 | - $SETTINGS['cpassman_dir'],array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode'); |
|
| 610 | + $SETTINGS['cpassman_dir'], array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode'); |
|
| 611 | 611 | break; |
| 612 | 612 | } |
| 613 | 613 | |
@@ -616,7 +616,7 @@ discard block |
||
| 616 | 616 | |
| 617 | 617 | // Get info about user to delete |
| 618 | 618 | $data_user = DB::queryfirstrow( |
| 619 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 619 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 620 | 620 | WHERE id = %i', |
| 621 | 621 | $post_id |
| 622 | 622 | ); |
@@ -638,10 +638,10 @@ discard block |
||
| 638 | 638 | $post_id |
| 639 | 639 | ); |
| 640 | 640 | echo prepareExchangedData( |
| 641 | - $SETTINGS['cpassman_dir'],array('error' => ''), 'encode'); |
|
| 641 | + $SETTINGS['cpassman_dir'], array('error' => ''), 'encode'); |
|
| 642 | 642 | } else { |
| 643 | 643 | echo prepareExchangedData( |
| 644 | - $SETTINGS['cpassman_dir'],array('error' => 'not_allowed'), 'encode'); |
|
| 644 | + $SETTINGS['cpassman_dir'], array('error' => 'not_allowed'), 'encode'); |
|
| 645 | 645 | } |
| 646 | 646 | break; |
| 647 | 647 | /* |
@@ -652,7 +652,7 @@ discard block |
||
| 652 | 652 | // Check KEY |
| 653 | 653 | if (filter_input(INPUT_POST, 'key', FILTER_SANITIZE_STRING) !== filter_var($_SESSION['key'], FILTER_SANITIZE_STRING)) { |
| 654 | 654 | echo prepareExchangedData( |
| 655 | - $SETTINGS['cpassman_dir'],array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode'); |
|
| 655 | + $SETTINGS['cpassman_dir'], array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode'); |
|
| 656 | 656 | break; |
| 657 | 657 | } |
| 658 | 658 | |
@@ -662,7 +662,7 @@ discard block |
||
| 662 | 662 | // Get info about user to delete |
| 663 | 663 | $data_user = DB::queryfirstrow( |
| 664 | 664 | 'SELECT admin, isAdministratedByRole, gestionnaire |
| 665 | - FROM ' . prefixTable('users') . ' |
|
| 665 | + FROM ' . prefixTable('users').' |
|
| 666 | 666 | WHERE id = %i', |
| 667 | 667 | $post_id |
| 668 | 668 | ); |
@@ -685,10 +685,10 @@ discard block |
||
| 685 | 685 | $post_id |
| 686 | 686 | ); |
| 687 | 687 | echo prepareExchangedData( |
| 688 | - $SETTINGS['cpassman_dir'],array('error' => ''), 'encode'); |
|
| 688 | + $SETTINGS['cpassman_dir'], array('error' => ''), 'encode'); |
|
| 689 | 689 | } else { |
| 690 | 690 | echo prepareExchangedData( |
| 691 | - $SETTINGS['cpassman_dir'],array('error' => 'not_allowed'), 'encode'); |
|
| 691 | + $SETTINGS['cpassman_dir'], array('error' => 'not_allowed'), 'encode'); |
|
| 692 | 692 | } |
| 693 | 693 | break; |
| 694 | 694 | /* |
@@ -698,7 +698,7 @@ discard block |
||
| 698 | 698 | // Check KEY |
| 699 | 699 | if (filter_input(INPUT_POST, 'key', FILTER_SANITIZE_STRING) !== filter_var($_SESSION['key'], FILTER_SANITIZE_STRING)) { |
| 700 | 700 | echo prepareExchangedData( |
| 701 | - $SETTINGS['cpassman_dir'],array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode'); |
|
| 701 | + $SETTINGS['cpassman_dir'], array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode'); |
|
| 702 | 702 | break; |
| 703 | 703 | } |
| 704 | 704 | |
@@ -708,7 +708,7 @@ discard block |
||
| 708 | 708 | // Get info about user to delete |
| 709 | 709 | $data_user = DB::queryfirstrow( |
| 710 | 710 | 'SELECT admin, isAdministratedByRole, gestionnaire |
| 711 | - FROM ' . prefixTable('users') . ' |
|
| 711 | + FROM ' . prefixTable('users').' |
|
| 712 | 712 | WHERE id = %i', |
| 713 | 713 | $post_id |
| 714 | 714 | ); |
@@ -728,10 +728,10 @@ discard block |
||
| 728 | 728 | $post_id |
| 729 | 729 | ); |
| 730 | 730 | echo prepareExchangedData( |
| 731 | - $SETTINGS['cpassman_dir'],array('error' => ''), 'encode'); |
|
| 731 | + $SETTINGS['cpassman_dir'], array('error' => ''), 'encode'); |
|
| 732 | 732 | } else { |
| 733 | 733 | echo prepareExchangedData( |
| 734 | - $SETTINGS['cpassman_dir'],array('error' => 'not_allowed'), 'encode'); |
|
| 734 | + $SETTINGS['cpassman_dir'], array('error' => 'not_allowed'), 'encode'); |
|
| 735 | 735 | } |
| 736 | 736 | break; |
| 737 | 737 | |
@@ -750,7 +750,7 @@ discard block |
||
| 750 | 750 | // Get info about user to delete |
| 751 | 751 | $data_user = DB::queryfirstrow( |
| 752 | 752 | 'SELECT admin, isAdministratedByRole, gestionnaire |
| 753 | - FROM ' . prefixTable('users') . ' |
|
| 753 | + FROM ' . prefixTable('users').' |
|
| 754 | 754 | WHERE id = %i', |
| 755 | 755 | $post_id |
| 756 | 756 | ); |
@@ -789,7 +789,7 @@ discard block |
||
| 789 | 789 | $return = array(); |
| 790 | 790 | // Check if folder exists |
| 791 | 791 | $data = DB::query( |
| 792 | - 'SELECT * FROM ' . prefixTable('nested_tree') . ' |
|
| 792 | + 'SELECT * FROM '.prefixTable('nested_tree').' |
|
| 793 | 793 | WHERE title = %s AND parent_id = %i', |
| 794 | 794 | filter_input(INPUT_POST, 'domain', FILTER_SANITIZE_STRING), |
| 795 | 795 | '0' |
@@ -802,7 +802,7 @@ discard block |
||
| 802 | 802 | } |
| 803 | 803 | // Check if role exists |
| 804 | 804 | $data = DB::query( |
| 805 | - 'SELECT * FROM ' . prefixTable('roles_title') . ' |
|
| 805 | + 'SELECT * FROM '.prefixTable('roles_title').' |
|
| 806 | 806 | WHERE title = %s', |
| 807 | 807 | filter_input(INPUT_POST, 'domain', FILTER_SANITIZE_STRING) |
| 808 | 808 | ); |
@@ -822,7 +822,7 @@ discard block |
||
| 822 | 822 | case 'user_log_items': |
| 823 | 823 | $nb_pages = 1; |
| 824 | 824 | $logs = $sql_filter = ''; |
| 825 | - $pages = '<table style=\'border-top:1px solid #969696;\'><tr><td>' . langHdl('pages') . ' : </td>'; |
|
| 825 | + $pages = '<table style=\'border-top:1px solid #969696;\'><tr><td>'.langHdl('pages').' : </td>'; |
|
| 826 | 826 | |
| 827 | 827 | // Prepare POST variables |
| 828 | 828 | $post_nb_items_by_page = filter_input(INPUT_POST, 'nb_items_by_page', FILTER_SANITIZE_NUMBER_INT); |
@@ -834,14 +834,14 @@ discard block |
||
| 834 | 834 | && !empty(filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_STRING)) |
| 835 | 835 | && filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_STRING) !== 'all' |
| 836 | 836 | ) { |
| 837 | - $sql_filter = " AND l.action = '" . filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_STRING) . "'"; |
|
| 837 | + $sql_filter = " AND l.action = '".filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_STRING)."'"; |
|
| 838 | 838 | } |
| 839 | 839 | // get number of pages |
| 840 | 840 | DB::query( |
| 841 | 841 | 'SELECT * |
| 842 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 843 | - INNER JOIN ' . prefixTable('items') . ' as i ON (l.id_item=i.id) |
|
| 844 | - INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 842 | + FROM ' . prefixTable('log_items').' as l |
|
| 843 | + INNER JOIN ' . prefixTable('items').' as i ON (l.id_item=i.id) |
|
| 844 | + INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 845 | 845 | WHERE l.id_user = %i ' . $sql_filter, |
| 846 | 846 | filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT) |
| 847 | 847 | ); |
@@ -859,19 +859,19 @@ discard block |
||
| 859 | 859 | // launch query |
| 860 | 860 | $rows = DB::query( |
| 861 | 861 | 'SELECT l.date as date, u.login as login, i.label as label, l.action as action |
| 862 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 863 | - INNER JOIN ' . prefixTable('items') . ' as i ON (l.id_item=i.id) |
|
| 864 | - INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 865 | - WHERE l.id_user = %i ' . $sql_filter . ' |
|
| 862 | + FROM ' . prefixTable('log_items').' as l |
|
| 863 | + INNER JOIN ' . prefixTable('items').' as i ON (l.id_item=i.id) |
|
| 864 | + INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 865 | + WHERE l.id_user = %i ' . $sql_filter.' |
|
| 866 | 866 | ORDER BY date DESC |
| 867 | - LIMIT ' . intval($start) . ',' . intval($post_nb_items_by_page), |
|
| 867 | + LIMIT ' . intval($start).','.intval($post_nb_items_by_page), |
|
| 868 | 868 | filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT) |
| 869 | 869 | ); |
| 870 | 870 | } else { |
| 871 | 871 | // get number of pages |
| 872 | 872 | DB::query( |
| 873 | 873 | 'SELECT * |
| 874 | - FROM ' . prefixTable('log_system') . ' |
|
| 874 | + FROM ' . prefixTable('log_system').' |
|
| 875 | 875 | WHERE type = %s AND field_1=%i', |
| 876 | 876 | 'user_mngt', |
| 877 | 877 | filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT) |
@@ -890,7 +890,7 @@ discard block |
||
| 890 | 890 | // launch query |
| 891 | 891 | $rows = DB::query( |
| 892 | 892 | 'SELECT * |
| 893 | - FROM ' . prefixTable('log_system') . ' |
|
| 893 | + FROM ' . prefixTable('log_system').' |
|
| 894 | 894 | WHERE type = %s AND field_1 = %i |
| 895 | 895 | ORDER BY date DESC |
| 896 | 896 | LIMIT %i, %i', |
@@ -904,7 +904,7 @@ discard block |
||
| 904 | 904 | if (isset($counter) && $counter != 0) { |
| 905 | 905 | $nb_pages = ceil($counter / intval($post_nb_items_by_page)); |
| 906 | 906 | for ($i = 1; $i <= $nb_pages; ++$i) { |
| 907 | - $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>'; |
|
| 907 | + $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>'; |
|
| 908 | 908 | } |
| 909 | 909 | } |
| 910 | 910 | $pages .= '</tr></table>'; |
@@ -913,7 +913,7 @@ discard block |
||
| 913 | 913 | if ($post_scope === 'user_mngt') { |
| 914 | 914 | $user = DB::queryfirstrow( |
| 915 | 915 | 'SELECT login |
| 916 | - from ' . prefixTable('users') . ' |
|
| 916 | + from ' . prefixTable('users').' |
|
| 917 | 917 | WHERE id=%i', |
| 918 | 918 | $record['qui'] |
| 919 | 919 | ); |
@@ -923,7 +923,7 @@ discard block |
||
| 923 | 923 | if ($tmp[0] == 'at_user_initial_pwd_changed') { |
| 924 | 924 | $label = langHdl('log_user_initial_pwd_changed'); |
| 925 | 925 | } elseif ($tmp[0] == 'at_user_email_changed') { |
| 926 | - $label = langHdl('log_user_email_changed') . $tmp[1]; |
|
| 926 | + $label = langHdl('log_user_email_changed').$tmp[1]; |
|
| 927 | 927 | } elseif ($tmp[0] == 'at_user_added') { |
| 928 | 928 | $label = langHdl('log_user_created'); |
| 929 | 929 | } elseif ($tmp[0] == 'at_user_locked') { |
@@ -934,14 +934,14 @@ discard block |
||
| 934 | 934 | $label = langHdl('log_user_pwd_changed'); |
| 935 | 935 | } |
| 936 | 936 | // prepare log |
| 937 | - $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>'; |
|
| 937 | + $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>'; |
|
| 938 | 938 | } else { |
| 939 | - $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>'; |
|
| 939 | + $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>'; |
|
| 940 | 940 | } |
| 941 | 941 | } |
| 942 | 942 | } |
| 943 | 943 | |
| 944 | - echo '[ { "table_logs": "' . ($logs) . '", "pages": "' . ($pages) . '", "error" : "no" } ]'; |
|
| 944 | + echo '[ { "table_logs": "'.($logs).'", "pages": "'.($pages).'", "error" : "no" } ]'; |
|
| 945 | 945 | break; |
| 946 | 946 | |
| 947 | 947 | /* |
@@ -967,7 +967,7 @@ discard block |
||
| 967 | 967 | } else { |
| 968 | 968 | // Get folder id for Admin |
| 969 | 969 | $admin_folder = DB::queryFirstRow( |
| 970 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' |
|
| 970 | + 'SELECT id FROM '.prefixTable('nested_tree').' |
|
| 971 | 971 | WHERE title = %i AND personal_folder = %i', |
| 972 | 972 | intval($_SESSION['user_id']), |
| 973 | 973 | '1' |
@@ -978,15 +978,15 @@ discard block |
||
| 978 | 978 | // Get each Items in PF |
| 979 | 979 | $rows = DB::query( |
| 980 | 980 | 'SELECT i.pw, i.label, l.id_user |
| 981 | - FROM ' . prefixTable('items') . ' as i |
|
| 982 | - LEFT JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item=i.id) |
|
| 981 | + FROM ' . prefixTable('items').' as i |
|
| 982 | + LEFT JOIN ' . prefixTable('log_items').' as l ON (l.id_item=i.id) |
|
| 983 | 983 | WHERE l.action = %s AND i.perso=%i AND i.id_tree=%i', |
| 984 | 984 | 'at_creation', |
| 985 | 985 | '1', |
| 986 | 986 | intval($folder->id) |
| 987 | 987 | ); |
| 988 | 988 | foreach ($rows as $record) { |
| 989 | - echo $record['label'] . ' - '; |
|
| 989 | + echo $record['label'].' - '; |
|
| 990 | 990 | // Change user |
| 991 | 991 | DB::update( |
| 992 | 992 | prefixTable('log_items'), |
@@ -1021,7 +1021,7 @@ discard block |
||
| 1021 | 1021 | // Get info about user to delete |
| 1022 | 1022 | $data_user = DB::queryfirstrow( |
| 1023 | 1023 | 'SELECT admin, isAdministratedByRole, gestionnaire |
| 1024 | - FROM ' . prefixTable('users') . ' |
|
| 1024 | + FROM ' . prefixTable('users').' |
|
| 1025 | 1025 | WHERE id = %i', |
| 1026 | 1026 | $post_user_id |
| 1027 | 1027 | ); |
@@ -1058,7 +1058,7 @@ discard block |
||
| 1058 | 1058 | |
| 1059 | 1059 | // Do |
| 1060 | 1060 | $rows = DB::query( |
| 1061 | - 'SELECT id FROM ' . prefixTable('users') . ' |
|
| 1061 | + 'SELECT id FROM '.prefixTable('users').' |
|
| 1062 | 1062 | WHERE timestamp != %s AND admin != %i', |
| 1063 | 1063 | '', |
| 1064 | 1064 | '1' |
@@ -1067,7 +1067,7 @@ discard block |
||
| 1067 | 1067 | // Get info about user to delete |
| 1068 | 1068 | $data_user = DB::queryfirstrow( |
| 1069 | 1069 | 'SELECT admin, isAdministratedByRole, gestionnaire |
| 1070 | - FROM ' . prefixTable('users') . ' |
|
| 1070 | + FROM ' . prefixTable('users').' |
|
| 1071 | 1071 | WHERE id = %i', |
| 1072 | 1072 | $record['id'] |
| 1073 | 1073 | ); |
@@ -1120,7 +1120,7 @@ discard block |
||
| 1120 | 1120 | |
| 1121 | 1121 | // decrypt and retrieve data in JSON format |
| 1122 | 1122 | $dataReceived = prepareExchangedData( |
| 1123 | - $SETTINGS['cpassman_dir'],$post_data, 'decode'); |
|
| 1123 | + $SETTINGS['cpassman_dir'], $post_data, 'decode'); |
|
| 1124 | 1124 | |
| 1125 | 1125 | // Prepare variables |
| 1126 | 1126 | $post_id = filter_var($dataReceived['user_id'], FILTER_SANITIZE_NUMBER_INT); |
@@ -1128,7 +1128,7 @@ discard block |
||
| 1128 | 1128 | // Get info about user |
| 1129 | 1129 | $rowUser = DB::queryfirstrow( |
| 1130 | 1130 | 'SELECT * |
| 1131 | - FROM ' . prefixTable('users') . ' |
|
| 1131 | + FROM ' . prefixTable('users').' |
|
| 1132 | 1132 | WHERE id = %i', |
| 1133 | 1133 | $post_id |
| 1134 | 1134 | ); |
@@ -1146,7 +1146,7 @@ discard block |
||
| 1146 | 1146 | $arrFldAllowed = array(); |
| 1147 | 1147 | |
| 1148 | 1148 | //Build tree |
| 1149 | - $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries'); |
|
| 1149 | + $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries'); |
|
| 1150 | 1150 | $tree->register(); |
| 1151 | 1151 | $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title'); |
| 1152 | 1152 | |
@@ -1157,7 +1157,7 @@ discard block |
||
| 1157 | 1157 | // array of roles for actual user |
| 1158 | 1158 | $my_functions = explode(';', $_SESSION['fonction_id']); |
| 1159 | 1159 | |
| 1160 | - $rows = DB::query('SELECT id,title,creator_id FROM ' . prefixTable('roles_title')); |
|
| 1160 | + $rows = DB::query('SELECT id,title,creator_id FROM '.prefixTable('roles_title')); |
|
| 1161 | 1161 | foreach ($rows as $record) { |
| 1162 | 1162 | if ( |
| 1163 | 1163 | (int) $_SESSION['is_admin'] === 1 |
@@ -1193,7 +1193,7 @@ discard block |
||
| 1193 | 1193 | $rolesList = array(); |
| 1194 | 1194 | $managedBy = array(); |
| 1195 | 1195 | $selected = ''; |
| 1196 | - $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title') . ' ORDER BY title ASC'); |
|
| 1196 | + $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title').' ORDER BY title ASC'); |
|
| 1197 | 1197 | foreach ($rows as $reccord) { |
| 1198 | 1198 | $rolesList[$reccord['id']] = array('id' => $reccord['id'], 'title' => $reccord['title']); |
| 1199 | 1199 | } |
@@ -1224,7 +1224,7 @@ discard block |
||
| 1224 | 1224 | array_push( |
| 1225 | 1225 | $managedBy, |
| 1226 | 1226 | array( |
| 1227 | - 'title' => langHdl('managers_of') . ' ' . $fonction['title'], |
|
| 1227 | + 'title' => langHdl('managers_of').' '.$fonction['title'], |
|
| 1228 | 1228 | 'id' => $fonction['id'], |
| 1229 | 1229 | 'selected' => $selected, |
| 1230 | 1230 | ) |
@@ -1306,9 +1306,9 @@ discard block |
||
| 1306 | 1306 | |
| 1307 | 1307 | // get USER STATUS |
| 1308 | 1308 | if ($rowUser['disabled'] == 1) { |
| 1309 | - $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>'; |
|
| 1309 | + $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>'; |
|
| 1310 | 1310 | } else { |
| 1311 | - $arrData['info'] = langHdl('user_info_active') . '<br><input type="checkbox" value="lock" class="chk"> ' . langHdl('user_info_lock_question'); |
|
| 1311 | + $arrData['info'] = langHdl('user_info_active').'<br><input type="checkbox" value="lock" class="chk"> '.langHdl('user_info_lock_question'); |
|
| 1312 | 1312 | } |
| 1313 | 1313 | |
| 1314 | 1314 | $arrData['error'] = false; |
@@ -1380,7 +1380,7 @@ discard block |
||
| 1380 | 1380 | |
| 1381 | 1381 | // decrypt and retrieve data in JSON format |
| 1382 | 1382 | $dataReceived = prepareExchangedData( |
| 1383 | - $SETTINGS['cpassman_dir'],$post_data, 'decode'); |
|
| 1383 | + $SETTINGS['cpassman_dir'], $post_data, 'decode'); |
|
| 1384 | 1384 | |
| 1385 | 1385 | // Prepare variables |
| 1386 | 1386 | $post_id = filter_var($dataReceived['user_id'], FILTER_SANITIZE_STRING); |
@@ -1405,7 +1405,7 @@ discard block |
||
| 1405 | 1405 | // count number of admins |
| 1406 | 1406 | $users = DB::query( |
| 1407 | 1407 | 'SELECT id |
| 1408 | - FROM ' . prefixTable('users') . ' |
|
| 1408 | + FROM ' . prefixTable('users').' |
|
| 1409 | 1409 | WHERE admin = 1 AND email != "" AND pw != ""' |
| 1410 | 1410 | ); |
| 1411 | 1411 | if (DB::count() === 1) { |
@@ -1494,7 +1494,7 @@ discard block |
||
| 1494 | 1494 | |
| 1495 | 1495 | // Get info about user to delete |
| 1496 | 1496 | $data_user = DB::queryfirstrow( |
| 1497 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 1497 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 1498 | 1498 | WHERE id = %i', |
| 1499 | 1499 | $post_id |
| 1500 | 1500 | ); |
@@ -1515,7 +1515,7 @@ discard block |
||
| 1515 | 1515 | ); |
| 1516 | 1516 | // delete personal folder and subfolders |
| 1517 | 1517 | $data = DB::queryfirstrow( |
| 1518 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' |
|
| 1518 | + 'SELECT id FROM '.prefixTable('nested_tree').' |
|
| 1519 | 1519 | WHERE title = %s AND personal_folder = %i', |
| 1520 | 1520 | $post_id, |
| 1521 | 1521 | '1' |
@@ -1528,7 +1528,7 @@ discard block |
||
| 1528 | 1528 | DB::delete(prefixTable('nested_tree'), 'id = %i AND personal_folder = %i', $folder->id, '1'); |
| 1529 | 1529 | // delete items & logs |
| 1530 | 1530 | $items = DB::query( |
| 1531 | - 'SELECT id FROM ' . prefixTable('items') . ' |
|
| 1531 | + 'SELECT id FROM '.prefixTable('items').' |
|
| 1532 | 1532 | WHERE id_tree=%i AND perso = %i', |
| 1533 | 1533 | $folder->id, |
| 1534 | 1534 | '1' |
@@ -1549,7 +1549,7 @@ discard block |
||
| 1549 | 1549 | } else { |
| 1550 | 1550 | // Get old data about user |
| 1551 | 1551 | $oldData = DB::queryfirstrow( |
| 1552 | - 'SELECT * FROM ' . prefixTable('users') . ' |
|
| 1552 | + 'SELECT * FROM '.prefixTable('users').' |
|
| 1553 | 1553 | WHERE id = %i', |
| 1554 | 1554 | $post_id |
| 1555 | 1555 | ); |
@@ -1579,7 +1579,7 @@ discard block |
||
| 1579 | 1579 | |
| 1580 | 1580 | // update LOG |
| 1581 | 1581 | if ($oldData['email'] !== $post_email) { |
| 1582 | - logEvents($SETTINGS, 'user_mngt', 'at_user_email_changed:' . $oldData['email'], (string) $_SESSION['user_id'], $_SESSION['login'], $post_id); |
|
| 1582 | + logEvents($SETTINGS, 'user_mngt', 'at_user_email_changed:'.$oldData['email'], (string) $_SESSION['user_id'], $_SESSION['login'], $post_id); |
|
| 1583 | 1583 | } |
| 1584 | 1584 | } |
| 1585 | 1585 | echo prepareExchangedData( |
@@ -1632,14 +1632,14 @@ discard block |
||
| 1632 | 1632 | |
| 1633 | 1633 | // decrypt and retrieve data in JSON format |
| 1634 | 1634 | $dataReceived = prepareExchangedData( |
| 1635 | - $SETTINGS['cpassman_dir'],$post_data, 'decode'); |
|
| 1635 | + $SETTINGS['cpassman_dir'], $post_data, 'decode'); |
|
| 1636 | 1636 | |
| 1637 | 1637 | // Prepare variables |
| 1638 | 1638 | $post_id = filter_var($dataReceived['user_id'], FILTER_SANITIZE_NUMBER_INT); |
| 1639 | 1639 | |
| 1640 | 1640 | // Get info about user to delete |
| 1641 | 1641 | $data_user = DB::queryfirstrow( |
| 1642 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 1642 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 1643 | 1643 | WHERE id = %i', |
| 1644 | 1644 | $post_id |
| 1645 | 1645 | ); |
@@ -1691,7 +1691,7 @@ discard block |
||
| 1691 | 1691 | } |
| 1692 | 1692 | |
| 1693 | 1693 | DB::queryfirstrow( |
| 1694 | - 'SELECT * FROM ' . prefixTable('users') . ' |
|
| 1694 | + 'SELECT * FROM '.prefixTable('users').' |
|
| 1695 | 1695 | WHERE login = %s', |
| 1696 | 1696 | filter_input(INPUT_POST, 'login', FILTER_SANITIZE_STRING) |
| 1697 | 1697 | ); |
@@ -1736,7 +1736,7 @@ discard block |
||
| 1736 | 1736 | |
| 1737 | 1737 | // decrypt and retrieve data in JSON format |
| 1738 | 1738 | $dataReceived = prepareExchangedData( |
| 1739 | - $SETTINGS['cpassman_dir'],$post_data, 'decode'); |
|
| 1739 | + $SETTINGS['cpassman_dir'], $post_data, 'decode'); |
|
| 1740 | 1740 | |
| 1741 | 1741 | // Prepare variables |
| 1742 | 1742 | $post_id = filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT); |
@@ -1744,14 +1744,14 @@ discard block |
||
| 1744 | 1744 | $arrData = array(); |
| 1745 | 1745 | |
| 1746 | 1746 | //Build tree |
| 1747 | - $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries'); |
|
| 1747 | + $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries'); |
|
| 1748 | 1748 | $tree->register(); |
| 1749 | 1749 | $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title'); |
| 1750 | 1750 | |
| 1751 | 1751 | // get User info |
| 1752 | 1752 | $rowUser = DB::queryFirstRow( |
| 1753 | 1753 | 'SELECT login, name, lastname, email, disabled, fonction_id, groupes_interdits, groupes_visibles, isAdministratedByRole, avatar_thumb |
| 1754 | - FROM ' . prefixTable('users') . ' |
|
| 1754 | + FROM ' . prefixTable('users').' |
|
| 1755 | 1755 | WHERE id = %i', |
| 1756 | 1756 | $post_id |
| 1757 | 1757 | ); |
@@ -1769,7 +1769,7 @@ discard block |
||
| 1769 | 1769 | // refine folders based upon roles |
| 1770 | 1770 | $rows = DB::query( |
| 1771 | 1771 | 'SELECT folder_id, type |
| 1772 | - FROM ' . prefixTable('roles_values') . ' |
|
| 1772 | + FROM ' . prefixTable('roles_values').' |
|
| 1773 | 1773 | WHERE role_id IN %ls |
| 1774 | 1774 | ORDER BY folder_id ASC', |
| 1775 | 1775 | $arrData['functions'] |
@@ -1792,7 +1792,7 @@ discard block |
||
| 1792 | 1792 | } |
| 1793 | 1793 | |
| 1794 | 1794 | // add allowed folders |
| 1795 | - foreach($arrData['allowed_folders'] as $Fld) { |
|
| 1795 | + foreach ($arrData['allowed_folders'] as $Fld) { |
|
| 1796 | 1796 | array_push($arrFolders, array('id' => $Fld, 'type' => 'W', 'special' => true)); |
| 1797 | 1797 | } |
| 1798 | 1798 | |
@@ -1803,7 +1803,7 @@ discard block |
||
| 1803 | 1803 | // get folder name |
| 1804 | 1804 | $row = DB::queryFirstRow( |
| 1805 | 1805 | 'SELECT title, nlevel, id |
| 1806 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 1806 | + FROM ' . prefixTable('nested_tree').' |
|
| 1807 | 1807 | WHERE id = %i', |
| 1808 | 1808 | $fld['id'] |
| 1809 | 1809 | ); |
@@ -1816,36 +1816,36 @@ discard block |
||
| 1816 | 1816 | |
| 1817 | 1817 | // manage right icon |
| 1818 | 1818 | if ($fld['type'] == 'W') { |
| 1819 | - $label = '<i class="fas fa-indent infotip text-success mr-2" title="' . langHdl('write') . '"></i>' . |
|
| 1820 | - '<i class="fas fa-edit infotip text-success mr-2" title="' . langHdl('edit') . '"></i>' . |
|
| 1821 | - '<i class="fas fa-eraser infotip text-success" title="' . langHdl('delete') . '"></i>'; |
|
| 1819 | + $label = '<i class="fas fa-indent infotip text-success mr-2" title="'.langHdl('write').'"></i>'. |
|
| 1820 | + '<i class="fas fa-edit infotip text-success mr-2" title="'.langHdl('edit').'"></i>'. |
|
| 1821 | + '<i class="fas fa-eraser infotip text-success" title="'.langHdl('delete').'"></i>'; |
|
| 1822 | 1822 | } elseif ($fld['type'] == 'ND') { |
| 1823 | - $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . langHdl('write') . '"></i>' . |
|
| 1824 | - '<i class="fas fa-edit infotip text-success mr-2" title="' . langHdl('edit') . '"></i>' . |
|
| 1825 | - '<i class="fas fa-eraser infotip text-danger" title="' . langHdl('no_delete') . '"></i>'; |
|
| 1823 | + $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.langHdl('write').'"></i>'. |
|
| 1824 | + '<i class="fas fa-edit infotip text-success mr-2" title="'.langHdl('edit').'"></i>'. |
|
| 1825 | + '<i class="fas fa-eraser infotip text-danger" title="'.langHdl('no_delete').'"></i>'; |
|
| 1826 | 1826 | } elseif ($fld['type'] == 'NE') { |
| 1827 | - $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . langHdl('write') . '"></i>' . |
|
| 1828 | - '<i class="fas fa-edit infotip text-danger mr-2" title="' . langHdl('no_edit') . '"></i>' . |
|
| 1829 | - '<i class="fas fa-eraser infotip text-success" title="' . langHdl('delete') . '"></i>'; |
|
| 1827 | + $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.langHdl('write').'"></i>'. |
|
| 1828 | + '<i class="fas fa-edit infotip text-danger mr-2" title="'.langHdl('no_edit').'"></i>'. |
|
| 1829 | + '<i class="fas fa-eraser infotip text-success" title="'.langHdl('delete').'"></i>'; |
|
| 1830 | 1830 | } elseif ($fld['type'] == 'NDNE') { |
| 1831 | - $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . langHdl('write') . '"></i>' . |
|
| 1832 | - '<i class="fas fa-edit infotip text-danger mr-2" title="' . langHdl('no_edit') . '"></i>' . |
|
| 1833 | - '<i class="fas fa-eraser infotip text-danger" title="' . langHdl('no_delete') . '"></i>'; |
|
| 1831 | + $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.langHdl('write').'"></i>'. |
|
| 1832 | + '<i class="fas fa-edit infotip text-danger mr-2" title="'.langHdl('no_edit').'"></i>'. |
|
| 1833 | + '<i class="fas fa-eraser infotip text-danger" title="'.langHdl('no_delete').'"></i>'; |
|
| 1834 | 1834 | } else { |
| 1835 | - $label = '<i class="fas fa-eye infotip text-info mr-2" title="' . langHdl('read') . '"></i>'; |
|
| 1835 | + $label = '<i class="fas fa-eye infotip text-info mr-2" title="'.langHdl('read').'"></i>'; |
|
| 1836 | 1836 | } |
| 1837 | 1837 | |
| 1838 | - $html .= '<tr><td>' . $ident . $row['title'] . |
|
| 1839 | - ' <small class="text-info">[' . $row['id'] . ']</small>'. |
|
| 1840 | - ($fld['special'] === true ? '<i class="fas fa-user-tag infotip text-primary ml-5" title="' . langHdl('user_specific_right') . '"></i>' : ''). |
|
| 1841 | - '</td><td>' . $label . '</td></tr>'; |
|
| 1838 | + $html .= '<tr><td>'.$ident.$row['title']. |
|
| 1839 | + ' <small class="text-info">['.$row['id'].']</small>'. |
|
| 1840 | + ($fld['special'] === true ? '<i class="fas fa-user-tag infotip text-primary ml-5" title="'.langHdl('user_specific_right').'"></i>' : ''). |
|
| 1841 | + '</td><td>'.$label.'</td></tr>'; |
|
| 1842 | 1842 | break; |
| 1843 | 1843 | } |
| 1844 | 1844 | } |
| 1845 | 1845 | } |
| 1846 | 1846 | |
| 1847 | - $html_full = '<table id="table-folders" class="table table-bordered table-striped dt-responsive nowrap" style="width:100%"><tbody>' . |
|
| 1848 | - $html . '</tbody></table>'; |
|
| 1847 | + $html_full = '<table id="table-folders" class="table table-bordered table-striped dt-responsive nowrap" style="width:100%"><tbody>'. |
|
| 1848 | + $html.'</tbody></table>'; |
|
| 1849 | 1849 | } else { |
| 1850 | 1850 | $html_full = ''; |
| 1851 | 1851 | } |
@@ -1894,7 +1894,7 @@ discard block |
||
| 1894 | 1894 | if ((int) $_SESSION['is_admin'] === 0 && (int) $_SESSION['user_can_manage_all_users'] === 0) { |
| 1895 | 1895 | $rows = DB::query( |
| 1896 | 1896 | 'SELECT * |
| 1897 | - FROM ' . prefixTable('users') . ' |
|
| 1897 | + FROM ' . prefixTable('users').' |
|
| 1898 | 1898 | WHERE admin = %i AND isAdministratedByRole IN %ls', |
| 1899 | 1899 | '0', |
| 1900 | 1900 | array_filter($_SESSION['user_roles']) |
@@ -1902,7 +1902,7 @@ discard block |
||
| 1902 | 1902 | } else { |
| 1903 | 1903 | $rows = DB::query( |
| 1904 | 1904 | 'SELECT * |
| 1905 | - FROM ' . prefixTable('users') . ' |
|
| 1905 | + FROM ' . prefixTable('users').' |
|
| 1906 | 1906 | WHERE admin = %i', |
| 1907 | 1907 | '0' |
| 1908 | 1908 | ); |
@@ -1914,7 +1914,7 @@ discard block |
||
| 1914 | 1914 | $groupIds = []; |
| 1915 | 1915 | foreach (explode(';', $record['fonction_id']) as $group) { |
| 1916 | 1916 | $tmp = DB::queryfirstrow( |
| 1917 | - 'SELECT id, title FROM ' . prefixTable('roles_title') . ' |
|
| 1917 | + 'SELECT id, title FROM '.prefixTable('roles_title').' |
|
| 1918 | 1918 | WHERE id = %i', |
| 1919 | 1919 | $group |
| 1920 | 1920 | ); |
@@ -1926,7 +1926,7 @@ discard block |
||
| 1926 | 1926 | |
| 1927 | 1927 | // Get managed_by |
| 1928 | 1928 | $managedBy = DB::queryfirstrow( |
| 1929 | - 'SELECT id, title FROM ' . prefixTable('roles_title') . ' |
|
| 1929 | + 'SELECT id, title FROM '.prefixTable('roles_title').' |
|
| 1930 | 1930 | WHERE id = %i', |
| 1931 | 1931 | $record['isAdministratedByRole'] |
| 1932 | 1932 | ); |
@@ -1936,7 +1936,7 @@ discard block |
||
| 1936 | 1936 | $foldersAllowedIds = []; |
| 1937 | 1937 | foreach (explode(';', $record['groupes_visibles']) as $role) { |
| 1938 | 1938 | $tmp = DB::queryfirstrow( |
| 1939 | - 'SELECT id, title FROM ' . prefixTable('nested_tree') . ' |
|
| 1939 | + 'SELECT id, title FROM '.prefixTable('nested_tree').' |
|
| 1940 | 1940 | WHERE id = %i', |
| 1941 | 1941 | $role |
| 1942 | 1942 | ); |
@@ -1949,7 +1949,7 @@ discard block |
||
| 1949 | 1949 | $foldersForbiddenIds = []; |
| 1950 | 1950 | foreach (explode(';', $record['groupes_interdits']) as $role) { |
| 1951 | 1951 | $tmp = DB::queryfirstrow( |
| 1952 | - 'SELECT id, title FROM ' . prefixTable('nested_tree') . ' |
|
| 1952 | + 'SELECT id, title FROM '.prefixTable('nested_tree').' |
|
| 1953 | 1953 | WHERE id = %i', |
| 1954 | 1954 | $role |
| 1955 | 1955 | ); |
@@ -1967,7 +1967,7 @@ discard block |
||
| 1967 | 1967 | 'login' => $record['login'], |
| 1968 | 1968 | 'groups' => implode(', ', $groups), |
| 1969 | 1969 | 'groupIds' => $groupIds, |
| 1970 | - 'managedBy' => $managedBy=== null ? langHdl('administrator') : $managedBy['title'], |
|
| 1970 | + 'managedBy' => $managedBy === null ? langHdl('administrator') : $managedBy['title'], |
|
| 1971 | 1971 | 'managedById' => $managedBy === null ? 0 : $managedBy['id'], |
| 1972 | 1972 | 'foldersAllowed' => implode(', ', $foldersAllowed), |
| 1973 | 1973 | 'foldersAllowedIds' => $foldersAllowedIds, |
@@ -2023,7 +2023,7 @@ discard block |
||
| 2023 | 2023 | |
| 2024 | 2024 | // decrypt and retreive data in JSON format |
| 2025 | 2025 | $dataReceived = prepareExchangedData( |
| 2026 | - $SETTINGS['cpassman_dir'],$post_data, 'decode'); |
|
| 2026 | + $SETTINGS['cpassman_dir'], $post_data, 'decode'); |
|
| 2027 | 2027 | |
| 2028 | 2028 | $post_source_id = filter_var(htmlspecialchars_decode($dataReceived['source_id']), FILTER_SANITIZE_NUMBER_INT); |
| 2029 | 2029 | $post_destination_ids = filter_var_array($dataReceived['destination_ids'], FILTER_SANITIZE_NUMBER_INT); |
@@ -2049,7 +2049,7 @@ discard block |
||
| 2049 | 2049 | |
| 2050 | 2050 | // Get info about user |
| 2051 | 2051 | $data_user = DB::queryfirstrow( |
| 2052 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 2052 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 2053 | 2053 | WHERE id = %i', |
| 2054 | 2054 | $post_source_id |
| 2055 | 2055 | ); |
@@ -2205,7 +2205,7 @@ discard block |
||
| 2205 | 2205 | |
| 2206 | 2206 | // decrypt and retrieve data in JSON format |
| 2207 | 2207 | $dataReceived = prepareExchangedData( |
| 2208 | - $SETTINGS['cpassman_dir'],$post_data, 'decode'); |
|
| 2208 | + $SETTINGS['cpassman_dir'], $post_data, 'decode'); |
|
| 2209 | 2209 | |
| 2210 | 2210 | // prepare variables |
| 2211 | 2211 | $post_user_id = filter_var($dataReceived['user_id'], FILTER_SANITIZE_NUMBER_INT); |
@@ -2217,14 +2217,14 @@ discard block |
||
| 2217 | 2217 | if (empty($post_context) === false && $post_context === 'add_one_role_to_user') { |
| 2218 | 2218 | $data_user = DB::queryfirstrow( |
| 2219 | 2219 | 'SELECT fonction_id |
| 2220 | - FROM ' . prefixTable('users') . ' |
|
| 2220 | + FROM ' . prefixTable('users').' |
|
| 2221 | 2221 | WHERE id = %i', |
| 2222 | 2222 | $post_user_id |
| 2223 | 2223 | ); |
| 2224 | 2224 | |
| 2225 | 2225 | if ($data_user) { |
| 2226 | 2226 | // Ensure array is unique |
| 2227 | - $post_new_value = str_replace(',', ';', $data_user['fonction_id']) . ';' . $post_new_value; |
|
| 2227 | + $post_new_value = str_replace(',', ';', $data_user['fonction_id']).';'.$post_new_value; |
|
| 2228 | 2228 | $post_new_value = implode(';', array_unique(explode(';', $post_new_value))); |
| 2229 | 2229 | } else { |
| 2230 | 2230 | // User not found |
@@ -2282,7 +2282,7 @@ discard block |
||
| 2282 | 2282 | if (filter_input(INPUT_POST, 'step', FILTER_SANITIZE_STRING) === 'refresh') { |
| 2283 | 2283 | $record = DB::queryFirstRow( |
| 2284 | 2284 | 'SELECT user_ip_lastdate |
| 2285 | - FROM ' . prefixTable('users') . ' |
|
| 2285 | + FROM ' . prefixTable('users').' |
|
| 2286 | 2286 | WHERE id = %i', |
| 2287 | 2287 | $_SESSION['user_id'] |
| 2288 | 2288 | ); |
@@ -2378,38 +2378,38 @@ discard block |
||
| 2378 | 2378 | ]; |
| 2379 | 2379 | |
| 2380 | 2380 | // Load expected libraries |
| 2381 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php'; |
|
| 2382 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Arr.php'; |
|
| 2383 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Symfony/contracts/Translation/TranslatorInterface.php'; |
|
| 2384 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonTimeZone.php'; |
|
| 2385 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Units.php'; |
|
| 2386 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Week.php'; |
|
| 2387 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Timestamp.php'; |
|
| 2388 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Test.php'; |
|
| 2389 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/ObjectInitialisation.php'; |
|
| 2390 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Serialization.php'; |
|
| 2391 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/IntervalRounding.php'; |
|
| 2392 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Rounding.php'; |
|
| 2393 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Localization.php'; |
|
| 2394 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Options.php'; |
|
| 2395 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Cast.php'; |
|
| 2396 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mutability.php'; |
|
| 2397 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Modifiers.php'; |
|
| 2398 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mixin.php'; |
|
| 2399 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Macro.php'; |
|
| 2400 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Difference.php'; |
|
| 2401 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Creator.php'; |
|
| 2402 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Converter.php'; |
|
| 2403 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Comparison.php'; |
|
| 2404 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Boundaries.php'; |
|
| 2405 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Date.php'; |
|
| 2406 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonInterface.php'; |
|
| 2407 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Carbon.php'; |
|
| 2408 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/DetectsErrors.php'; |
|
| 2409 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Connection.php'; |
|
| 2410 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapInterface.php'; |
|
| 2411 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/HandlesConnection.php'; |
|
| 2412 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Ldap.php'; |
|
| 2381 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php'; |
|
| 2382 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Arr.php'; |
|
| 2383 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Symfony/contracts/Translation/TranslatorInterface.php'; |
|
| 2384 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonTimeZone.php'; |
|
| 2385 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Units.php'; |
|
| 2386 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Week.php'; |
|
| 2387 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Timestamp.php'; |
|
| 2388 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Test.php'; |
|
| 2389 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/ObjectInitialisation.php'; |
|
| 2390 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Serialization.php'; |
|
| 2391 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/IntervalRounding.php'; |
|
| 2392 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Rounding.php'; |
|
| 2393 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Localization.php'; |
|
| 2394 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Options.php'; |
|
| 2395 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Cast.php'; |
|
| 2396 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mutability.php'; |
|
| 2397 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Modifiers.php'; |
|
| 2398 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mixin.php'; |
|
| 2399 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Macro.php'; |
|
| 2400 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Difference.php'; |
|
| 2401 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Creator.php'; |
|
| 2402 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Converter.php'; |
|
| 2403 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Comparison.php'; |
|
| 2404 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Boundaries.php'; |
|
| 2405 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Date.php'; |
|
| 2406 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonInterface.php'; |
|
| 2407 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Carbon.php'; |
|
| 2408 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/DetectsErrors.php'; |
|
| 2409 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Connection.php'; |
|
| 2410 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapInterface.php'; |
|
| 2411 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/HandlesConnection.php'; |
|
| 2412 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Ldap.php'; |
|
| 2413 | 2413 | |
| 2414 | 2414 | $ad = new SplClassLoader('LdapRecord', '../includes/libraries'); |
| 2415 | 2415 | $ad->register(); |
@@ -2426,7 +2426,7 @@ discard block |
||
| 2426 | 2426 | $SETTINGS['cpassman_dir'], |
| 2427 | 2427 | array( |
| 2428 | 2428 | 'error' => true, |
| 2429 | - 'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage(). "<br>".$error->getDiagnosticMessage(), |
|
| 2429 | + 'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage()."<br>".$error->getDiagnosticMessage(), |
|
| 2430 | 2430 | ), |
| 2431 | 2431 | 'encode' |
| 2432 | 2432 | ); |
@@ -2457,12 +2457,12 @@ discard block |
||
| 2457 | 2457 | ['objectclass', '=', 'posixaccount'], |
| 2458 | 2458 | ], null, null, 'or')->get(); |
| 2459 | 2459 | |
| 2460 | - foreach($users as $i => $adUser) { |
|
| 2460 | + foreach ($users as $i => $adUser) { |
|
| 2461 | 2461 | if (isset($adUser[$SETTINGS['ldap_user_attribute']]) === false) continue; |
| 2462 | 2462 | |
| 2463 | 2463 | // Build the list of all groups in AD |
| 2464 | 2464 | if (isset($adUser['memberof']) === true) { |
| 2465 | - foreach($adUser['memberof'] as $j => $adUserGroup) { |
|
| 2465 | + foreach ($adUser['memberof'] as $j => $adUserGroup) { |
|
| 2466 | 2466 | if (empty($adUserGroup) === false && $j !== "count") { |
| 2467 | 2467 | $adGroup = substr($adUserGroup, 3, strpos($adUserGroup, ',') - 3); |
| 2468 | 2468 | if (in_array($adGroup, $adRoles) === false && empty($adGroup) === false) { |
@@ -2478,7 +2478,7 @@ discard block |
||
| 2478 | 2478 | // Get his ID |
| 2479 | 2479 | DB::queryfirstrow( |
| 2480 | 2480 | 'SELECT id, fonction_id, auth_type |
| 2481 | - FROM ' . prefixTable('users') . ' |
|
| 2481 | + FROM ' . prefixTable('users').' |
|
| 2482 | 2482 | WHERE login = %s', |
| 2483 | 2483 | $userLogin |
| 2484 | 2484 | ); |
@@ -2513,7 +2513,7 @@ discard block |
||
| 2513 | 2513 | } |
| 2514 | 2514 | |
| 2515 | 2515 | // Get all groups in Teampass |
| 2516 | - $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title')); |
|
| 2516 | + $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title')); |
|
| 2517 | 2517 | foreach ($rows as $record) { |
| 2518 | 2518 | array_push( |
| 2519 | 2519 | $teampassRoles, |
@@ -2556,7 +2556,7 @@ discard block |
||
| 2556 | 2556 | |
| 2557 | 2557 | // decrypt and retrieve data in JSON format |
| 2558 | 2558 | $dataReceived = prepareExchangedData( |
| 2559 | - $SETTINGS['cpassman_dir'],$post_data, 'decode'); |
|
| 2559 | + $SETTINGS['cpassman_dir'], $post_data, 'decode'); |
|
| 2560 | 2560 | |
| 2561 | 2561 | // Prepare variables |
| 2562 | 2562 | $post_login = filter_var($dataReceived['login'], FILTER_SANITIZE_STRING); |
@@ -2583,7 +2583,7 @@ discard block |
||
| 2583 | 2583 | // Check if user already exists |
| 2584 | 2584 | $data = DB::query( |
| 2585 | 2585 | 'SELECT id, fonction_id, groupes_interdits, groupes_visibles |
| 2586 | - FROM ' . prefixTable('users') . ' |
|
| 2586 | + FROM ' . prefixTable('users').' |
|
| 2587 | 2587 | WHERE login = %s', |
| 2588 | 2588 | $post_login |
| 2589 | 2589 | ); |
@@ -2690,7 +2690,7 @@ discard block |
||
| 2690 | 2690 | ); |
| 2691 | 2691 | |
| 2692 | 2692 | // Rebuild tree |
| 2693 | - $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries'); |
|
| 2693 | + $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries'); |
|
| 2694 | 2694 | $tree->register(); |
| 2695 | 2695 | $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title'); |
| 2696 | 2696 | $tree->rebuild(); |
@@ -2767,7 +2767,7 @@ discard block |
||
| 2767 | 2767 | // Check if user already exists |
| 2768 | 2768 | DB::query( |
| 2769 | 2769 | 'SELECT id |
| 2770 | - FROM ' . prefixTable('users') . ' |
|
| 2770 | + FROM ' . prefixTable('users').' |
|
| 2771 | 2771 | WHERE id = %i', |
| 2772 | 2772 | $post_id |
| 2773 | 2773 | ); |
@@ -2824,7 +2824,7 @@ discard block |
||
| 2824 | 2824 | |
| 2825 | 2825 | // decrypt and retrieve data in JSON format |
| 2826 | 2826 | $dataReceived = prepareExchangedData( |
| 2827 | - $SETTINGS['cpassman_dir'],$post_data, 'decode'); |
|
| 2827 | + $SETTINGS['cpassman_dir'], $post_data, 'decode'); |
|
| 2828 | 2828 | |
| 2829 | 2829 | // Prepare variables |
| 2830 | 2830 | $post_userid = filter_var($dataReceived['user_id'], FILTER_SANITIZE_NUMBER_INT); |
@@ -2848,7 +2848,7 @@ discard block |
||
| 2848 | 2848 | // Check if user already exists |
| 2849 | 2849 | $userInfo = DB::queryfirstrow( |
| 2850 | 2850 | 'SELECT id, private_key, public_key |
| 2851 | - FROM ' . prefixTable('users') . ' |
|
| 2851 | + FROM ' . prefixTable('users').' |
|
| 2852 | 2852 | WHERE id = %i', |
| 2853 | 2853 | $post_userid |
| 2854 | 2854 | ); |
@@ -2897,7 +2897,7 @@ discard block |
||
| 2897 | 2897 | if (count($_SESSION['personal_folders']) > 0) { |
| 2898 | 2898 | DB::query( |
| 2899 | 2899 | 'SELECT id |
| 2900 | - FROM ' . prefixTable('items') . ' |
|
| 2900 | + FROM ' . prefixTable('items').' |
|
| 2901 | 2901 | WHERE id_tree IN %ls', |
| 2902 | 2902 | $_SESSION['personal_folders'] |
| 2903 | 2903 | ); |
@@ -2957,7 +2957,7 @@ discard block |
||
| 2957 | 2957 | |
| 2958 | 2958 | // decrypt and retrieve data in JSON format |
| 2959 | 2959 | $dataReceived = prepareExchangedData( |
| 2960 | - $SETTINGS['cpassman_dir'],$post_data, 'decode'); |
|
| 2960 | + $SETTINGS['cpassman_dir'], $post_data, 'decode'); |
|
| 2961 | 2961 | |
| 2962 | 2962 | // Prepare variables |
| 2963 | 2963 | $post_id = filter_var($dataReceived['user_id'], FILTER_SANITIZE_NUMBER_INT); |
@@ -2979,7 +2979,7 @@ discard block |
||
| 2979 | 2979 | // Check if user already exists |
| 2980 | 2980 | DB::query( |
| 2981 | 2981 | 'SELECT id |
| 2982 | - FROM ' . prefixTable('users') . ' |
|
| 2982 | + FROM ' . prefixTable('users').' |
|
| 2983 | 2983 | WHERE id = %i', |
| 2984 | 2984 | $post_id |
| 2985 | 2985 | ); |
@@ -3046,7 +3046,7 @@ discard block |
||
| 3046 | 3046 | |
| 3047 | 3047 | // decrypt and retrieve data in JSON format |
| 3048 | 3048 | $dataReceived = prepareExchangedData( |
| 3049 | - $SETTINGS['cpassman_dir'],$post_data, 'decode'); |
|
| 3049 | + $SETTINGS['cpassman_dir'], $post_data, 'decode'); |
|
| 3050 | 3050 | |
| 3051 | 3051 | // Prepare variables |
| 3052 | 3052 | $post_user_id = filter_var($dataReceived['user_id'], FILTER_SANITIZE_NUMBER_INT); |
@@ -3077,7 +3077,7 @@ discard block |
||
| 3077 | 3077 | |
| 3078 | 3078 | // Get info about user |
| 3079 | 3079 | $data_user = DB::queryfirstrow( |
| 3080 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 3080 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 3081 | 3081 | WHERE id = %i', |
| 3082 | 3082 | $value[1] |
| 3083 | 3083 | ); |
@@ -3110,7 +3110,7 @@ discard block |
||
| 3110 | 3110 | logEvents( |
| 3111 | 3111 | $SETTINGS, |
| 3112 | 3112 | 'user_mngt', |
| 3113 | - 'at_user_new_' . $value[0] . ':' . $value[1], |
|
| 3113 | + 'at_user_new_'.$value[0].':'.$value[1], |
|
| 3114 | 3114 | (string) $_SESSION['user_id'], |
| 3115 | 3115 | $_SESSION['login'], |
| 3116 | 3116 | filter_input(INPUT_POST, 'id', FILTER_SANITIZE_STRING) |
@@ -3142,7 +3142,7 @@ discard block |
||
| 3142 | 3142 | |
| 3143 | 3143 | // Get info about user |
| 3144 | 3144 | $data_user = DB::queryfirstrow( |
| 3145 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 3145 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 3146 | 3146 | WHERE id = %i', |
| 3147 | 3147 | $value[1] |
| 3148 | 3148 | ); |
@@ -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 | } |
@@ -43,15 +43,15 @@ 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'], 'admin', $SETTINGS) === false) { |
| 48 | 48 | $_SESSION['error']['code'] = ERR_NOT_ALLOWED; |
| 49 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 49 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 50 | 50 | exit; |
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | // Load template |
| 54 | -require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 54 | +require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 55 | 55 | // Generates zones |
| 56 | 56 | $zones = timezone_list(); |
| 57 | 57 | ?> |
@@ -260,7 +260,7 @@ discard block |
||
| 260 | 260 | // get list of all timezones |
| 261 | 261 | foreach ($zones as $key => $zone) { |
| 262 | 262 | echo ' |
| 263 | - <option value="' . $key . '"', isset($SETTINGS['timezone']) === true && $SETTINGS['timezone'] === $key ? ' selected' : '', '>' . $zone . '</option>'; |
|
| 263 | + <option value="' . $key.'"', isset($SETTINGS['timezone']) === true && $SETTINGS['timezone'] === $key ? ' selected' : '', '>'.$zone.'</option>'; |
|
| 264 | 264 | } |
| 265 | 265 | ?> |
| 266 | 266 | </select> |
@@ -311,7 +311,7 @@ discard block |
||
| 311 | 311 | <?php |
| 312 | 312 | foreach ($languagesList as $lang) { |
| 313 | 313 | echo ' |
| 314 | - <option value="' . $lang . '"', isset($SETTINGS['default_language']) === true && $SETTINGS['default_language'] === $lang ? ' selected' : '', '>' . $lang . '</option>'; |
|
| 314 | + <option value="' . $lang.'"', isset($SETTINGS['default_language']) === true && $SETTINGS['default_language'] === $lang ? ' selected' : '', '>'.$lang.'</option>'; |
|
| 315 | 315 | } |
| 316 | 316 | ?> |
| 317 | 317 | </select> |
@@ -408,7 +408,7 @@ discard block |
||
| 408 | 408 | <?php |
| 409 | 409 | foreach (TP_PW_COMPLEXITY as $complex) { |
| 410 | 410 | echo ' |
| 411 | - <option value="' . $complex[0] . '"', isset($SETTINGS['personal_saltkey_security_level']) === true && $SETTINGS['personal_saltkey_security_level'] === $complex[0] ? ' selected' : '', '>' . $complex[1] . '</option>'; |
|
| 411 | + <option value="' . $complex[0].'"', isset($SETTINGS['personal_saltkey_security_level']) === true && $SETTINGS['personal_saltkey_security_level'] === $complex[0] ? ' selected' : '', '>'.$complex[1].'</option>'; |
|
| 412 | 412 | } |
| 413 | 413 | ?> |
| 414 | 414 | </select> |
@@ -721,7 +721,7 @@ discard block |
||
| 721 | 721 | ); |
| 722 | 722 | foreach ($roles as $role) { |
| 723 | 723 | echo ' |
| 724 | - <option value="' . $role['id'] . '"', in_array($role['id'], $arrRolesToPrint) === true ? ' selected' : '', '>' . addslashes($role['title']) . '</option>'; |
|
| 724 | + <option value="' . $role['id'].'"', in_array($role['id'], $arrRolesToPrint) === true ? ' selected' : '', '>'.addslashes($role['title']).'</option>'; |
|
| 725 | 725 | } |
| 726 | 726 | } |
| 727 | 727 | ?> |
@@ -894,7 +894,7 @@ discard block |
||
| 894 | 894 | <?php |
| 895 | 895 | foreach (TP_PW_COMPLEXITY as $complex) { |
| 896 | 896 | echo ' |
| 897 | - <option value="' . $complex[0] . '"', isset($SETTINGS['offline_key_level']) === true && $SETTINGS['offline_key_level'] === $complex[0] ? ' selected' : '', '>' . $complex[1] . '</option>'; |
|
| 897 | + <option value="' . $complex[0].'"', isset($SETTINGS['offline_key_level']) === true && $SETTINGS['offline_key_level'] === $complex[0] ? ' selected' : '', '>'.$complex[1].'</option>'; |
|
| 898 | 898 | } |
| 899 | 899 | ?> |
| 900 | 900 | </select> |
@@ -42,11 +42,11 @@ discard block |
||
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | // includes |
| 45 | -require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php'; |
|
| 46 | -require_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php'; |
|
| 47 | -require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 48 | -require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php'; |
|
| 49 | -require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php'; |
|
| 45 | +require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php'; |
|
| 46 | +require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php'; |
|
| 47 | +require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 48 | +require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php'; |
|
| 49 | +require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php'; |
|
| 50 | 50 | |
| 51 | 51 | // header |
| 52 | 52 | header('Content-type: text/html; charset=utf-8'); |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | } |
| 61 | 61 | |
| 62 | 62 | // Connect to mysql server |
| 63 | -require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 63 | +require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 64 | 64 | if (defined('DB_PASSWD_CLEAR') === false) { |
| 65 | 65 | define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS)); |
| 66 | 66 | } |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | DB::$encoding = DB_ENCODING; |
| 73 | 73 | |
| 74 | 74 | // Superglobal load |
| 75 | -require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 75 | +require_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 76 | 76 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 77 | 77 | $get = []; |
| 78 | 78 | $get['user_tree_structure'] = $superGlobal->get('user_tree_structure', 'GET'); |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | $session['personal_visible_groups'] = $superGlobal->get('personal_visible_groups', 'SESSION'); |
| 93 | 93 | |
| 94 | 94 | $lastFolderChange = DB::query( |
| 95 | - 'SELECT * FROM ' . prefixTable('misc') . ' |
|
| 95 | + 'SELECT * FROM '.prefixTable('misc').' |
|
| 96 | 96 | WHERE type = %s AND intitule = %s', |
| 97 | 97 | 'timestamp', |
| 98 | 98 | 'last_folder_change' |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | || (isset($get['force_refresh']) === true && (int) $get['force_refresh'] === 1) |
| 104 | 104 | ) { |
| 105 | 105 | // Build tree |
| 106 | - $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries'); |
|
| 106 | + $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries'); |
|
| 107 | 107 | $tree->register(); |
| 108 | 108 | $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title'); |
| 109 | 109 | |
@@ -213,7 +213,7 @@ discard block |
||
| 213 | 213 | $SETTINGS |
| 214 | 214 | ) { |
| 215 | 215 | // Load library |
| 216 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 216 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 217 | 217 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 218 | 218 | |
| 219 | 219 | // Prepare superGlobal variables |
@@ -262,7 +262,7 @@ discard block |
||
| 262 | 262 | // get count of Items in this folder |
| 263 | 263 | DB::query( |
| 264 | 264 | 'SELECT * |
| 265 | - FROM ' . prefixTable('items') . ' |
|
| 265 | + FROM ' . prefixTable('items').' |
|
| 266 | 266 | WHERE inactif=%i AND id_tree = %i', |
| 267 | 267 | 0, |
| 268 | 268 | $node->id |
@@ -272,7 +272,7 @@ discard block |
||
| 272 | 272 | // get info about current folder |
| 273 | 273 | DB::query( |
| 274 | 274 | 'SELECT * |
| 275 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 275 | + FROM ' . prefixTable('nested_tree').' |
|
| 276 | 276 | WHERE parent_id = %i', |
| 277 | 277 | $node->id |
| 278 | 278 | ); |
@@ -280,11 +280,10 @@ discard block |
||
| 280 | 280 | |
| 281 | 281 | // If personal Folder, convert id into user name |
| 282 | 282 | $node->title = $node->title === $session_user_id && (int) $node->nlevel === 1 ? |
| 283 | - $session_login : |
|
| 284 | - ($node->title === null ? '' : htmlspecialchars_decode($node->title, ENT_QUOTES)); |
|
| 283 | + $session_login : ($node->title === null ? '' : htmlspecialchars_decode($node->title, ENT_QUOTES)); |
|
| 285 | 284 | |
| 286 | 285 | // prepare json return for current node |
| 287 | - $parent = $node->parent_id === 0 ? '#' : 'li_' . $node->parent_id; |
|
| 286 | + $parent = $node->parent_id === 0 ? '#' : 'li_'.$node->parent_id; |
|
| 288 | 287 | |
| 289 | 288 | // special case for READ-ONLY folder |
| 290 | 289 | $title = $session_user_read_only === true && in_array($node->id, $session_personal_folders) === false ? langHdl('read_only_account') : $title; |
@@ -294,33 +293,30 @@ discard block |
||
| 294 | 293 | |
| 295 | 294 | if (in_array($node->id, $session_groupes_visibles)) { |
| 296 | 295 | if (in_array($node->id, $session_read_only_folders)) { |
| 297 | - $text = "<i class='far fa-eye fa-xs mr-1'></i>" . $text; |
|
| 296 | + $text = "<i class='far fa-eye fa-xs mr-1'></i>".$text; |
|
| 298 | 297 | $title = langHdl('read_only_account'); |
| 299 | 298 | $restricted = 1; |
| 300 | 299 | $folderClass = 'folder_not_droppable'; |
| 301 | 300 | } elseif ($session_user_read_only === true && !in_array($node->id, $session_personal_visible_groups)) { |
| 302 | - $text = "<i class='far fa-eye fa-xs mr-1'></i>" . $text; |
|
| 301 | + $text = "<i class='far fa-eye fa-xs mr-1'></i>".$text; |
|
| 303 | 302 | } |
| 304 | 303 | $text .= |
| 305 | - ' <span class=\'badge badge-danger ml-2 items_count\' id=\'itcount_' . $node->id . '\'>' . $itemsNb . '</span>' |
|
| 304 | + ' <span class=\'badge badge-danger ml-2 items_count\' id=\'itcount_'.$node->id.'\'>'.$itemsNb.'</span>' |
|
| 306 | 305 | .(isset($SETTINGS['tree_counters']) && (int) $SETTINGS['tree_counters'] === 1 ? |
| 307 | - '/'.$nbChildrenItems .'/'.(count($nodeDescendants) - 1) : |
|
| 308 | - '') |
|
| 306 | + '/'.$nbChildrenItems.'/'.(count($nodeDescendants) - 1) : '') |
|
| 309 | 307 | .'</span>'; |
| 310 | 308 | } elseif (in_array($node->id, $listFoldersLimitedKeys)) { |
| 311 | 309 | $restricted = 1; |
| 312 | 310 | $text .= |
| 313 | 311 | $session_user_read_only === true ? |
| 314 | - "<i class='far fa-eye fa-xs mr-1'></i>" : |
|
| 315 | - '<span class="badge badge-danger ml-2 items_count" id="itcount_' . $node->id . '">' . count($session_list_folders_limited[$node->id]) . '</span>'; |
|
| 312 | + "<i class='far fa-eye fa-xs mr-1'></i>" : '<span class="badge badge-danger ml-2 items_count" id="itcount_'.$node->id.'">'.count($session_list_folders_limited[$node->id]).'</span>'; |
|
| 316 | 313 | } elseif (in_array($node->id, $listRestrictedFoldersForItemsKeys)) { |
| 317 | 314 | $restricted = 1; |
| 318 | 315 | if ($session_user_read_only === true) { |
| 319 | - $text = "<i class='far fa-eye fa-xs mr-1'></i>" . $text; |
|
| 316 | + $text = "<i class='far fa-eye fa-xs mr-1'></i>".$text; |
|
| 320 | 317 | } |
| 321 | 318 | $text .= $session_user_read_only === true ? |
| 322 | - "<i class='far fa-eye fa-xs mr-1'></i>" : |
|
| 323 | - '<span class="badge badge-danger ml-2 items_count" id="itcount_' . $node->id . '">' . count($session_list_restricted_folders_for_items[$node->id]) . '</span>'; |
|
| 319 | + "<i class='far fa-eye fa-xs mr-1'></i>" : '<span class="badge badge-danger ml-2 items_count" id="itcount_'.$node->id.'">'.count($session_list_restricted_folders_for_items[$node->id]).'</span>'; |
|
| 324 | 320 | } else { |
| 325 | 321 | $restricted = 1; |
| 326 | 322 | $folderClass = 'folder_not_droppable'; |
@@ -342,22 +338,21 @@ discard block |
||
| 342 | 338 | } |
| 343 | 339 | |
| 344 | 340 | // json |
| 345 | - $hide_node === true ? '' : |
|
| 346 | - array_push( |
|
| 341 | + $hide_node === true ? '' : array_push( |
|
| 347 | 342 | $ret_json, |
| 348 | 343 | array( |
| 349 | - 'id' => 'li_' . $node->id, |
|
| 344 | + 'id' => 'li_'.$node->id, |
|
| 350 | 345 | 'parent' => $parent, |
| 351 | - 'text' => ($show_but_block === true ? '<i class="fas fa-times fa-xs text-danger mr-1"></i>' : '') . $text, |
|
| 346 | + 'text' => ($show_but_block === true ? '<i class="fas fa-times fa-xs text-danger mr-1"></i>' : '').$text, |
|
| 352 | 347 | 'children' => ($childrenNb === 0 ? false : true), |
| 353 | 348 | 'li_attr' => array( |
| 354 | 349 | 'class' => ($show_but_block === true ? '' : 'jstreeopen'), |
| 355 | - 'title' => 'ID [' . $node->id . '] ' . ($show_but_block === true ? langHdl('no_access') : $title), |
|
| 350 | + 'title' => 'ID ['.$node->id.'] '.($show_but_block === true ? langHdl('no_access') : $title), |
|
| 356 | 351 | ), |
| 357 | 352 | 'a_attr' => $show_but_block === true ? (array( |
| 358 | - 'id' => 'fld_' . $node->id, |
|
| 353 | + 'id' => 'fld_'.$node->id, |
|
| 359 | 354 | 'class' => $folderClass, |
| 360 | - 'onclick' => 'ListerItems(' . $node->id . ', ' . $restricted . ', 0, 1)', |
|
| 355 | + 'onclick' => 'ListerItems('.$node->id.', '.$restricted.', 0, 1)', |
|
| 361 | 356 | 'data-title' => $node->title, |
| 362 | 357 | )) : '', |
| 363 | 358 | ) |
@@ -450,7 +445,7 @@ discard block |
||
| 450 | 445 | ) === true |
| 451 | 446 | ) { |
| 452 | 447 | DB::query( |
| 453 | - 'SELECT * FROM ' . prefixTable('items') . ' |
|
| 448 | + 'SELECT * FROM '.prefixTable('items').' |
|
| 454 | 449 | WHERE inactif=%i AND id_tree = %i', |
| 455 | 450 | 0, |
| 456 | 451 | $node |
@@ -537,7 +532,7 @@ discard block |
||
| 537 | 532 | { |
| 538 | 533 | // get info about current folder |
| 539 | 534 | DB::query( |
| 540 | - 'SELECT * FROM ' . prefixTable('items') . ' |
|
| 535 | + 'SELECT * FROM '.prefixTable('items').' |
|
| 541 | 536 | WHERE inactif=%i AND id_tree = %i', |
| 542 | 537 | 0, |
| 543 | 538 | $completTree[$nodeId]->id |
@@ -638,7 +633,7 @@ discard block |
||
| 638 | 633 | */ |
| 639 | 634 | |
| 640 | 635 | // prepare json return for current node |
| 641 | - $parent = $completTree[$nodeId]->parent_id === '0' ? '#' : 'li_' . $completTree[$nodeId]->parent_id; |
|
| 636 | + $parent = $completTree[$nodeId]->parent_id === '0' ? '#' : 'li_'.$completTree[$nodeId]->parent_id; |
|
| 642 | 637 | |
| 643 | 638 | // handle displaying |
| 644 | 639 | if ( |
@@ -658,17 +653,17 @@ discard block |
||
| 658 | 653 | array_push( |
| 659 | 654 | $ret_json, |
| 660 | 655 | array( |
| 661 | - 'id' => 'li_' . $completTree[$nodeId]->id, |
|
| 656 | + 'id' => 'li_'.$completTree[$nodeId]->id, |
|
| 662 | 657 | 'parent' => $last_visible_parent === -1 ? $parent : $last_visible_parent, |
| 663 | 658 | 'text' => $text.$completTree[$nodeId]->title.$nodeData['html'], |
| 664 | 659 | 'li_attr' => array( |
| 665 | 660 | 'class' => 'jstreeopen', |
| 666 | - 'title' => 'ID [' . $completTree[$nodeId]->id . '] ' . $nodeData['title'], |
|
| 661 | + 'title' => 'ID ['.$completTree[$nodeId]->id.'] '.$nodeData['title'], |
|
| 667 | 662 | ), |
| 668 | 663 | 'a_attr' => array( |
| 669 | - 'id' => 'fld_' . $completTree[$nodeId]->id, |
|
| 664 | + 'id' => 'fld_'.$completTree[$nodeId]->id, |
|
| 670 | 665 | 'class' => $nodeData['folderClass'], |
| 671 | - 'onclick' => 'ListerItems(' . $completTree[$nodeId]->id . ', ' . $nodeData['restricted'] . ', 0, 1)', |
|
| 666 | + 'onclick' => 'ListerItems('.$completTree[$nodeId]->id.', '.$nodeData['restricted'].', 0, 1)', |
|
| 672 | 667 | 'data-title' => $completTree[$nodeId]->title, |
| 673 | 668 | ), |
| 674 | 669 | ) |
@@ -677,12 +672,12 @@ discard block |
||
| 677 | 672 | array_push( |
| 678 | 673 | $ret_json, |
| 679 | 674 | array( |
| 680 | - 'id' => 'li_' . $completTree[$nodeId]->id, |
|
| 675 | + 'id' => 'li_'.$completTree[$nodeId]->id, |
|
| 681 | 676 | 'parent' => $last_visible_parent === -1 ? $parent : $last_visible_parent, |
| 682 | 677 | 'text' => '<i class="fas fa-times fa-xs text-danger mr-1"></i>'.$text.$completTree[$nodeId]->title.$nodeData['html'], |
| 683 | 678 | 'li_attr' => array( |
| 684 | 679 | 'class' => '', |
| 685 | - 'title' => 'ID [' . $completTree[$nodeId]->id . '] ' . langHdl('no_access'), |
|
| 680 | + 'title' => 'ID ['.$completTree[$nodeId]->id.'] '.langHdl('no_access'), |
|
| 686 | 681 | ), |
| 687 | 682 | ) |
| 688 | 683 | ); |
@@ -745,8 +740,8 @@ discard block |
||
| 745 | 740 | if (in_array($nodeId, $session_groupes_visibles) === true) { |
| 746 | 741 | if (in_array($nodeId, $session_read_only_folders) === true) { |
| 747 | 742 | return [ |
| 748 | - 'html' => '<i class="far fa-eye fa-xs mr-1"></i><span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . $itemsNb . |
|
| 749 | - ($tree_counters === 1 ? '/'.$nbChildrenItems .'/'.(count($nodeDescendants) - 1) : '') . '</span>', |
|
| 743 | + 'html' => '<i class="far fa-eye fa-xs mr-1"></i><span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.$itemsNb. |
|
| 744 | + ($tree_counters === 1 ? '/'.$nbChildrenItems.'/'.(count($nodeDescendants) - 1) : '').'</span>', |
|
| 750 | 745 | 'title' => langHdl('read_only_account'), |
| 751 | 746 | 'restricted' => 1, |
| 752 | 747 | 'folderClass' => 'folder_not_droppable', |
@@ -760,8 +755,8 @@ discard block |
||
| 760 | 755 | && in_array($nodeId, $session_personal_visible_groups) === false |
| 761 | 756 | ) { |
| 762 | 757 | return [ |
| 763 | - 'html' => '<i class="far fa-eye fa-xs mr-1"></i><span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . $itemsNb . |
|
| 764 | - ($tree_counters === 1 ? '/'.$nbChildrenItems .'/'.(count($nodeDescendants) - 1) : '') . '</span>', |
|
| 758 | + 'html' => '<i class="far fa-eye fa-xs mr-1"></i><span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.$itemsNb. |
|
| 759 | + ($tree_counters === 1 ? '/'.$nbChildrenItems.'/'.(count($nodeDescendants) - 1) : '').'</span>', |
|
| 765 | 760 | 'title' => $title, |
| 766 | 761 | 'restricted' => 0, |
| 767 | 762 | 'folderClass' => 'folder', |
@@ -771,8 +766,8 @@ discard block |
||
| 771 | 766 | } |
| 772 | 767 | |
| 773 | 768 | return [ |
| 774 | - 'html' => '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . $itemsNb . |
|
| 775 | - ($tree_counters === 1 ? '/'.$nbChildrenItems .'/'.(count($nodeDescendants) - 1) : '') . '</span>', |
|
| 769 | + 'html' => '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.$itemsNb. |
|
| 770 | + ($tree_counters === 1 ? '/'.$nbChildrenItems.'/'.(count($nodeDescendants) - 1) : '').'</span>', |
|
| 776 | 771 | 'title' => $title, |
| 777 | 772 | 'restricted' => 0, |
| 778 | 773 | 'folderClass' => 'folder', |
@@ -783,8 +778,8 @@ discard block |
||
| 783 | 778 | |
| 784 | 779 | if (in_array($nodeId, $listFoldersLimitedKeys) === true) { |
| 785 | 780 | return [ |
| 786 | - 'html' => ($session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : '') . |
|
| 787 | - '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . count($session_list_folders_limited[$nodeId]) . '</span>', |
|
| 781 | + 'html' => ($session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : ''). |
|
| 782 | + '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.count($session_list_folders_limited[$nodeId]).'</span>', |
|
| 788 | 783 | 'title' => $title, |
| 789 | 784 | 'restricted' => 1, |
| 790 | 785 | 'folderClass' => 'folder', |
@@ -795,8 +790,8 @@ discard block |
||
| 795 | 790 | |
| 796 | 791 | if (in_array($nodeId, $listRestrictedFoldersForItemsKeys) === true) { |
| 797 | 792 | return [ |
| 798 | - 'html' => $session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : '' . |
|
| 799 | - '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . count($session_list_restricted_folders_for_items[$nodeId]) . '</span>', |
|
| 793 | + 'html' => $session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : ''. |
|
| 794 | + '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.count($session_list_restricted_folders_for_items[$nodeId]).'</span>', |
|
| 800 | 795 | 'title' => $title, |
| 801 | 796 | 'restricted' => 1, |
| 802 | 797 | 'folderClass' => 'folder', |
@@ -37,23 +37,23 @@ discard block |
||
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | // Do checks |
| 40 | -require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php'; |
|
| 41 | -require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php'; |
|
| 40 | +require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php'; |
|
| 41 | +require_once $SETTINGS['cpassman_dir'].'/sources/checks.php'; |
|
| 42 | 42 | if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'options', $SETTINGS) === false) { |
| 43 | 43 | // Not allowed page |
| 44 | 44 | $_SESSION['error']['code'] = ERR_NOT_ALLOWED; |
| 45 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 45 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 46 | 46 | exit(); |
| 47 | 47 | } |
| 48 | 48 | |
| 49 | -require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php'; |
|
| 50 | -require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php'; |
|
| 49 | +require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php'; |
|
| 50 | +require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php'; |
|
| 51 | 51 | header('Content-type: text/html; charset=utf-8'); |
| 52 | 52 | header('Cache-Control: no-cache, must-revalidate'); |
| 53 | 53 | require_once 'main.functions.php'; |
| 54 | 54 | |
| 55 | 55 | // Connect to mysql server |
| 56 | -require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 56 | +require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 57 | 57 | DB::$host = DB_HOST; |
| 58 | 58 | DB::$user = DB_USER; |
| 59 | 59 | DB::$password = DB_PASSWD_CLEAR; |
@@ -101,26 +101,26 @@ discard block |
||
| 101 | 101 | |
| 102 | 102 | // Decrypt and retrieve data in JSON format |
| 103 | 103 | $dataReceived = prepareExchangedData( |
| 104 | - $SETTINGS['cpassman_dir'],$post_data, 'decode'); |
|
| 104 | + $SETTINGS['cpassman_dir'], $post_data, 'decode'); |
|
| 105 | 105 | |
| 106 | 106 | // Prepare variables |
| 107 | 107 | $post_key = filter_var($dataReceived['encryptionKey'], FILTER_SANITIZE_STRING); |
| 108 | 108 | |
| 109 | - require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 109 | + require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 110 | 110 | $return = ''; |
| 111 | 111 | |
| 112 | 112 | //Get all tables |
| 113 | 113 | $tables = array(); |
| 114 | 114 | $result = DB::query('SHOW TABLES'); |
| 115 | 115 | foreach ($result as $row) { |
| 116 | - $tables[] = $row['Tables_in_' . DB_NAME]; |
|
| 116 | + $tables[] = $row['Tables_in_'.DB_NAME]; |
|
| 117 | 117 | } |
| 118 | 118 | |
| 119 | 119 | //cycle through |
| 120 | 120 | foreach ($tables as $table) { |
| 121 | 121 | if (empty($pre) || substr_count($table, $pre) > 0) { |
| 122 | 122 | // Do query |
| 123 | - $result = DB::queryRaw('SELECT * FROM ' . $table); |
|
| 123 | + $result = DB::queryRaw('SELECT * FROM '.$table); |
|
| 124 | 124 | DB::queryRaw( |
| 125 | 125 | 'SELECT * |
| 126 | 126 | FROM INFORMATION_SCHEMA.COLUMNS |
@@ -132,19 +132,19 @@ discard block |
||
| 132 | 132 | $numFields = DB::count(); |
| 133 | 133 | |
| 134 | 134 | // prepare a drop table |
| 135 | - $return .= 'DROP TABLE ' . $table . ';'; |
|
| 136 | - $row2 = DB::queryfirstrow('SHOW CREATE TABLE ' . $table); |
|
| 137 | - $return .= "\n\n" . $row2['Create Table'] . ";\n\n"; |
|
| 135 | + $return .= 'DROP TABLE '.$table.';'; |
|
| 136 | + $row2 = DB::queryfirstrow('SHOW CREATE TABLE '.$table); |
|
| 137 | + $return .= "\n\n".$row2['Create Table'].";\n\n"; |
|
| 138 | 138 | |
| 139 | 139 | //prepare all fields and datas |
| 140 | 140 | for ($i = 0; $i < $numFields; ++$i) { |
| 141 | 141 | while ($row = $result->fetch_row()) { |
| 142 | - $return .= 'INSERT INTO ' . $table . ' VALUES('; |
|
| 142 | + $return .= 'INSERT INTO '.$table.' VALUES('; |
|
| 143 | 143 | for ($j = 0; $j < $numFields; ++$j) { |
| 144 | 144 | $row[$j] = addslashes($row[$j]); |
| 145 | 145 | $row[$j] = preg_replace("/\n/", '\\n', $row[$j]); |
| 146 | 146 | if (isset($row[$j])) { |
| 147 | - $return .= '"' . $row[$j] . '"'; |
|
| 147 | + $return .= '"'.$row[$j].'"'; |
|
| 148 | 148 | } else { |
| 149 | 149 | $return .= 'NULL'; |
| 150 | 150 | } |
@@ -164,8 +164,8 @@ discard block |
||
| 164 | 164 | $token = GenerateCryptKey(20, false, true, true, false, true, $SETTINGS); |
| 165 | 165 | |
| 166 | 166 | //save file |
| 167 | - $filename = time() . '-' . $token . '.sql'; |
|
| 168 | - $handle = fopen($SETTINGS['path_to_files_folder'] . '/' . $filename, 'w+'); |
|
| 167 | + $filename = time().'-'.$token.'.sql'; |
|
| 168 | + $handle = fopen($SETTINGS['path_to_files_folder'].'/'.$filename, 'w+'); |
|
| 169 | 169 | if ($handle !== false) { |
| 170 | 170 | //write file |
| 171 | 171 | fwrite($handle, $return); |
@@ -177,17 +177,17 @@ discard block |
||
| 177 | 177 | // Encrypt the file |
| 178 | 178 | prepareFileWithDefuse( |
| 179 | 179 | 'encrypt', |
| 180 | - $SETTINGS['path_to_files_folder'] . '/' . $filename, |
|
| 181 | - $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $filename, |
|
| 180 | + $SETTINGS['path_to_files_folder'].'/'.$filename, |
|
| 181 | + $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$filename, |
|
| 182 | 182 | $SETTINGS, |
| 183 | 183 | $post_key |
| 184 | 184 | ); |
| 185 | 185 | |
| 186 | 186 | // Do clean |
| 187 | - unlink($SETTINGS['path_to_files_folder'] . '/' . $filename); |
|
| 187 | + unlink($SETTINGS['path_to_files_folder'].'/'.$filename); |
|
| 188 | 188 | rename( |
| 189 | - $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $filename, |
|
| 190 | - $SETTINGS['path_to_files_folder'] . '/' . $filename |
|
| 189 | + $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$filename, |
|
| 190 | + $SETTINGS['path_to_files_folder'].'/'.$filename |
|
| 191 | 191 | ); |
| 192 | 192 | } |
| 193 | 193 | |
@@ -208,9 +208,9 @@ discard block |
||
| 208 | 208 | array( |
| 209 | 209 | 'error' => false, |
| 210 | 210 | 'message' => '', |
| 211 | - 'download' => 'sources/downloadFile.php?name=' . urlencode($filename) . |
|
| 212 | - '&sub=files&file=' . $filename . '&type=sql&key=' . $_SESSION['key'] . '&key_tmp=' . |
|
| 213 | - $_SESSION['key_tmp'] . '&pathIsFiles=1', |
|
| 211 | + 'download' => 'sources/downloadFile.php?name='.urlencode($filename). |
|
| 212 | + '&sub=files&file='.$filename.'&type=sql&key='.$_SESSION['key'].'&key_tmp='. |
|
| 213 | + $_SESSION['key_tmp'].'&pathIsFiles=1', |
|
| 214 | 214 | ), |
| 215 | 215 | 'encode' |
| 216 | 216 | ); |
@@ -254,18 +254,18 @@ discard block |
||
| 254 | 254 | |
| 255 | 255 | // Decrypt and retrieve data in JSON format |
| 256 | 256 | $dataReceived = prepareExchangedData( |
| 257 | - $SETTINGS['cpassman_dir'],$post_data, 'decode'); |
|
| 257 | + $SETTINGS['cpassman_dir'], $post_data, 'decode'); |
|
| 258 | 258 | |
| 259 | 259 | // Prepare variables |
| 260 | 260 | $post_key = filter_var($dataReceived['encryptionKey'], FILTER_SANITIZE_STRING); |
| 261 | 261 | $post_backupFile = filter_var($dataReceived['backupFile'], FILTER_SANITIZE_STRING); |
| 262 | 262 | |
| 263 | - include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 263 | + include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 264 | 264 | |
| 265 | 265 | // Get filename from database |
| 266 | 266 | $data = DB::queryFirstRow( |
| 267 | 267 | 'SELECT valeur |
| 268 | - FROM ' . prefixTable('misc') . ' |
|
| 268 | + FROM ' . prefixTable('misc').' |
|
| 269 | 269 | WHERE increment_id = %i', |
| 270 | 270 | $post_backupFile |
| 271 | 271 | ); |
@@ -284,22 +284,22 @@ discard block |
||
| 284 | 284 | // Decrypt the file |
| 285 | 285 | $ret = prepareFileWithDefuse( |
| 286 | 286 | 'decrypt', |
| 287 | - $SETTINGS['path_to_files_folder'] . '/' . $post_backupFile, |
|
| 288 | - $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $post_backupFile, |
|
| 287 | + $SETTINGS['path_to_files_folder'].'/'.$post_backupFile, |
|
| 288 | + $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$post_backupFile, |
|
| 289 | 289 | $SETTINGS, |
| 290 | 290 | $post_key |
| 291 | 291 | ); |
| 292 | 292 | |
| 293 | 293 | if (empty($ret) === false) { |
| 294 | - echo '[{"result":"db_restore" , "message":"' . $ret . '"}]'; |
|
| 294 | + echo '[{"result":"db_restore" , "message":"'.$ret.'"}]'; |
|
| 295 | 295 | break; |
| 296 | 296 | } |
| 297 | 297 | |
| 298 | 298 | // Do clean |
| 299 | - fileDelete($SETTINGS['path_to_files_folder'] . '/' . $post_backupFile, $SETTINGS); |
|
| 300 | - $post_backupFile = $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $post_backupFile; |
|
| 299 | + fileDelete($SETTINGS['path_to_files_folder'].'/'.$post_backupFile, $SETTINGS); |
|
| 300 | + $post_backupFile = $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$post_backupFile; |
|
| 301 | 301 | } else { |
| 302 | - $post_backupFile = $SETTINGS['path_to_files_folder'] . '/' . $post_backupFile; |
|
| 302 | + $post_backupFile = $SETTINGS['path_to_files_folder'].'/'.$post_backupFile; |
|
| 303 | 303 | } |
| 304 | 304 | |
| 305 | 305 | //read sql file |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | require_once 'SecureHandler.php'; |
| 29 | 29 | session_name('teampass_session'); |
| 30 | 30 | session_start(); |
| 31 | -if (! isset($_SESSION['CPM']) || $_SESSION['CPM'] === false || ! isset($_SESSION['key']) || empty($_SESSION['key'])) { |
|
| 31 | +if (!isset($_SESSION['CPM']) || $_SESSION['CPM'] === false || !isset($_SESSION['key']) || empty($_SESSION['key'])) { |
|
| 32 | 32 | die('Hacking attempt...'); |
| 33 | 33 | } |
| 34 | 34 | |
@@ -42,17 +42,17 @@ discard block |
||
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | // Do checks |
| 45 | -require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php'; |
|
| 46 | -require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php'; |
|
| 45 | +require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php'; |
|
| 46 | +require_once $SETTINGS['cpassman_dir'].'/sources/checks.php'; |
|
| 47 | 47 | if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'items', $SETTINGS) === false) { |
| 48 | 48 | // Not allowed page |
| 49 | 49 | $_SESSION['error']['code'] = ERR_NOT_ALLOWED; |
| 50 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 50 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 51 | 51 | exit; |
| 52 | 52 | } |
| 53 | 53 | |
| 54 | -require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php'; |
|
| 55 | -require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php'; |
|
| 54 | +require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php'; |
|
| 55 | +require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php'; |
|
| 56 | 56 | header('Content-type: text/html; charset=utf-8'); |
| 57 | 57 | header('Cache-Control: no-cache, must-revalidate'); |
| 58 | 58 | require_once 'main.functions.php'; |
@@ -60,12 +60,12 @@ discard block |
||
| 60 | 60 | if (isset($_SESSION['groupes_visibles']) === false |
| 61 | 61 | || empty($_SESSION['groupes_visibles']) === true |
| 62 | 62 | ) { |
| 63 | - echo '{"sEcho": ' . intval($_GET['sEcho']) . ' ,"iTotalRecords": "0", "iTotalDisplayRecords": "0", "aaData": [] }'; |
|
| 63 | + echo '{"sEcho": '.intval($_GET['sEcho']).' ,"iTotalRecords": "0", "iTotalDisplayRecords": "0", "aaData": [] }'; |
|
| 64 | 64 | exit; |
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | //Connect to DB |
| 68 | -require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 68 | +require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 69 | 69 | if (defined('DB_PASSWD_CLEAR') === false) { |
| 70 | 70 | define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS)); |
| 71 | 71 | } |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | $folders = $_SESSION['groupes_visibles']; |
| 90 | 90 | } else { |
| 91 | 91 | // Build tree |
| 92 | - $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries'); |
|
| 92 | + $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries'); |
|
| 93 | 93 | $tree->register(); |
| 94 | 94 | $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title'); |
| 95 | 95 | $folders = $tree->getDescendants(filter_var($_GET['limited'], FILTER_SANITIZE_NUMBER_INT), true); |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | |
| 99 | 99 | //Get current user "personal folder" ID |
| 100 | 100 | $row = DB::query( |
| 101 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE title = %i', |
|
| 101 | + 'SELECT id FROM '.prefixTable('nested_tree').' WHERE title = %i', |
|
| 102 | 102 | intval($_SESSION['user_id']) |
| 103 | 103 | ); |
| 104 | 104 | //get list of personal folders |
@@ -107,20 +107,20 @@ discard block |
||
| 107 | 107 | $listPf = ''; |
| 108 | 108 | if (empty($row['id']) === false) { |
| 109 | 109 | $rows = DB::query( |
| 110 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' |
|
| 110 | + 'SELECT id FROM '.prefixTable('nested_tree').' |
|
| 111 | 111 | WHERE personal_folder = 1 AND NOT parent_id = %i AND NOT title = %i', |
| 112 | 112 | filter_var($row['id'], FILTER_SANITIZE_NUMBER_INT), |
| 113 | 113 | filter_var($_SESSION['user_id'], FILTER_SANITIZE_NUMBER_INT) |
| 114 | 114 | ); |
| 115 | 115 | foreach ($rows as $record) { |
| 116 | - if (! in_array($record['id'], $arrayPf)) { |
|
| 116 | + if (!in_array($record['id'], $arrayPf)) { |
|
| 117 | 117 | //build an array of personal folders ids |
| 118 | 118 | array_push($arrayPf, $record['id']); |
| 119 | 119 | //build also a string with those ids |
| 120 | 120 | if (empty($listPf)) { |
| 121 | 121 | $listPf = $record['id']; |
| 122 | 122 | } else { |
| 123 | - $listPf .= ', ' . $record['id']; |
|
| 123 | + $listPf .= ', '.$record['id']; |
|
| 124 | 124 | } |
| 125 | 125 | } |
| 126 | 126 | } |
@@ -130,7 +130,7 @@ discard block |
||
| 130 | 130 | //Paging |
| 131 | 131 | $sLimit = ''; |
| 132 | 132 | if (isset($_GET['start']) === true && $_GET['length'] !== '-1') { |
| 133 | - $sLimit = 'LIMIT ' . filter_var($_GET['start'], FILTER_SANITIZE_NUMBER_INT) . ', ' . filter_var($_GET['length'], FILTER_SANITIZE_NUMBER_INT) . ''; |
|
| 133 | + $sLimit = 'LIMIT '.filter_var($_GET['start'], FILTER_SANITIZE_NUMBER_INT).', '.filter_var($_GET['length'], FILTER_SANITIZE_NUMBER_INT).''; |
|
| 134 | 134 | } |
| 135 | 135 | |
| 136 | 136 | //Ordering |
@@ -143,8 +143,8 @@ discard block |
||
| 143 | 143 | } |
| 144 | 144 | $sOrder = 'ORDER BY '; |
| 145 | 145 | if ($_GET['order'][0]['column'] >= 0) { |
| 146 | - $sOrder .= '' . $aColumns[filter_var($_GET['order'][0]['column'], FILTER_SANITIZE_NUMBER_INT)] . ' ' |
|
| 147 | - . filter_var($_GET['order'][0]['dir'], FILTER_SANITIZE_STRING) . ', '; |
|
| 146 | + $sOrder .= ''.$aColumns[filter_var($_GET['order'][0]['column'], FILTER_SANITIZE_NUMBER_INT)].' ' |
|
| 147 | + . filter_var($_GET['order'][0]['dir'], FILTER_SANITIZE_STRING).', '; |
|
| 148 | 148 | } |
| 149 | 149 | |
| 150 | 150 | $sOrder = substr_replace($sOrder, '', -2); |
@@ -152,7 +152,7 @@ discard block |
||
| 152 | 152 | $sOrder = ''; |
| 153 | 153 | } |
| 154 | 154 | } else { |
| 155 | - $sOrder = 'ORDER BY ' . $aColumns[1] . ' ASC'; |
|
| 155 | + $sOrder = 'ORDER BY '.$aColumns[1].' ASC'; |
|
| 156 | 156 | } |
| 157 | 157 | |
| 158 | 158 | // Define criteria |
@@ -174,9 +174,9 @@ discard block |
||
| 174 | 174 | if (empty($search_criteria) === false) { |
| 175 | 175 | $sWhere .= ' AND ('; |
| 176 | 176 | for ($i = 0; $i < count($aColumns); ++$i) { |
| 177 | - $sWhere .= $aColumns[$i] . ' LIKE %ss_' . $i . ' OR '; |
|
| 177 | + $sWhere .= $aColumns[$i].' LIKE %ss_'.$i.' OR '; |
|
| 178 | 178 | } |
| 179 | - $sWhere = substr_replace((string) $sWhere, '', -3) . ') '; |
|
| 179 | + $sWhere = substr_replace((string) $sWhere, '', -3).') '; |
|
| 180 | 180 | $crit = [ |
| 181 | 181 | 'idtree' => array_unique($folders), |
| 182 | 182 | '0' => $search_criteria, |
@@ -214,13 +214,13 @@ discard block |
||
| 214 | 214 | if (empty($sWhere) === false) { |
| 215 | 215 | $sWhere .= ' AND '; |
| 216 | 216 | } |
| 217 | - $sWhere = 'WHERE ' . $sWhere . 'id_tree NOT IN %ls_pf '; |
|
| 217 | + $sWhere = 'WHERE '.$sWhere.'id_tree NOT IN %ls_pf '; |
|
| 218 | 218 | } else { |
| 219 | - $sWhere = 'WHERE ' . $sWhere; |
|
| 219 | + $sWhere = 'WHERE '.$sWhere; |
|
| 220 | 220 | } |
| 221 | 221 | |
| 222 | 222 | DB::query( |
| 223 | - 'SELECT id FROM ' . prefixTable('cache') . " |
|
| 223 | + 'SELECT id FROM '.prefixTable('cache')." |
|
| 224 | 224 | ${sWhere} |
| 225 | 225 | ${sOrder}", |
| 226 | 226 | $crit |
@@ -228,7 +228,7 @@ discard block |
||
| 228 | 228 | $iTotal = DB::count(); |
| 229 | 229 | $rows = DB::query( |
| 230 | 230 | 'SELECT id, label, description, tags, id_tree, perso, restricted_to, login, folder, author, renewal_period, url, timestamp |
| 231 | - FROM ' . prefixTable('cache') . " |
|
| 231 | + FROM ' . prefixTable('cache')." |
|
| 232 | 232 | ${sWhere} |
| 233 | 233 | ${sOrder} |
| 234 | 234 | ${sLimit}", |
@@ -241,7 +241,7 @@ discard block |
||
| 241 | 241 | if (isset($_GET['type']) === false) { |
| 242 | 242 | $sOutput = '{'; |
| 243 | 243 | if (isset($_GET['draw']) === true) { |
| 244 | - $sOutput .= '"draw": ' . intval($_GET['draw']) . ', '; |
|
| 244 | + $sOutput .= '"draw": '.intval($_GET['draw']).', '; |
|
| 245 | 245 | } |
| 246 | 246 | $sOutput .= '"data": ['; |
| 247 | 247 | $sOutputConst = ''; |
@@ -258,7 +258,7 @@ discard block |
||
| 258 | 258 | foreach (explode(';', $_SESSION['fonction_id']) as $role) { |
| 259 | 259 | //db::debugmode(true); |
| 260 | 260 | $access = DB::queryFirstRow( |
| 261 | - 'SELECT type FROM ' . prefixTable('roles_values') . ' WHERE role_id = %i AND folder_id = %i', |
|
| 261 | + 'SELECT type FROM '.prefixTable('roles_values').' WHERE role_id = %i AND folder_id = %i', |
|
| 262 | 262 | $role, |
| 263 | 263 | $record['id_tree'] |
| 264 | 264 | ); |
@@ -278,7 +278,7 @@ discard block |
||
| 278 | 278 | } |
| 279 | 279 | $accessLevel = count($arrTmp) > 0 ? min($arrTmp) : $accessLevel; |
| 280 | 280 | if ($accessLevel === 0) { |
| 281 | - $checkbox = '<input type=\"checkbox\" value=\"0\" class=\"mass_op_cb\" data-id=\"' . $record['id'] . '\">'; |
|
| 281 | + $checkbox = '<input type=\"checkbox\" value=\"0\" class=\"mass_op_cb\" data-id=\"'.$record['id'].'\">'; |
|
| 282 | 282 | } |
| 283 | 283 | |
| 284 | 284 | if ((int) $accessLevel === 0) { |
@@ -318,22 +318,22 @@ discard block |
||
| 318 | 318 | if (empty($restrictedTo)) { |
| 319 | 319 | $restrictedTo = $_SESSION['user_id']; |
| 320 | 320 | } else { |
| 321 | - $restrictedTo .= ',' . $_SESSION['user_id']; |
|
| 321 | + $restrictedTo .= ','.$_SESSION['user_id']; |
|
| 322 | 322 | } |
| 323 | 323 | } |
| 324 | 324 | |
| 325 | 325 | //col1 |
| 326 | - $sOutputItem .= '"<i class=\"fa fa-external-link-alt infotip mr-2\" title=\"' . langHdl('open_url_link') . '\" onClick=\"window.location.href='index.php?page=items&group=' . $record['id_tree'] . '&id=' . $record['id'] . ''\" style=\"cursor:pointer;\"></i>' . |
|
| 327 | - '<i class=\"fa fa-eye infotip mr-2 item-detail\" title=\"' . langHdl('see_item_title') . '\" data-id=\"' . $record['id'] . '\" data-perso=\"' . $record['perso'] . '\" data-tree-id=\"' . $record['id_tree'] . '\" data-expired=\"' . $expired . '\" data-restricted-to=\"' . $restrictedTo . '\" data-rights=\"' . $right . '\" style=\"cursor:pointer;\"></i>' . $checkbox . '", '; |
|
| 326 | + $sOutputItem .= '"<i class=\"fa fa-external-link-alt infotip mr-2\" title=\"'.langHdl('open_url_link').'\" onClick=\"window.location.href='index.php?page=items&group='.$record['id_tree'].'&id='.$record['id'].''\" style=\"cursor:pointer;\"></i>'. |
|
| 327 | + '<i class=\"fa fa-eye infotip mr-2 item-detail\" title=\"'.langHdl('see_item_title').'\" data-id=\"'.$record['id'].'\" data-perso=\"'.$record['perso'].'\" data-tree-id=\"'.$record['id_tree'].'\" data-expired=\"'.$expired.'\" data-restricted-to=\"'.$restrictedTo.'\" data-rights=\"'.$right.'\" style=\"cursor:pointer;\"></i>'.$checkbox.'", '; |
|
| 328 | 328 | //col2 |
| 329 | - $sOutputItem .= '"<span id=\"item_label-' . $record['id'] . '\">' . stripslashes($record['label']) . '</span>", '; |
|
| 329 | + $sOutputItem .= '"<span id=\"item_label-'.$record['id'].'\">'.stripslashes($record['label']).'</span>", '; |
|
| 330 | 330 | //col3 |
| 331 | - $sOutputItem .= '"' . str_replace('&', '&', htmlspecialchars(stripslashes($record['login']), ENT_QUOTES)) . '", '; |
|
| 331 | + $sOutputItem .= '"'.str_replace('&', '&', htmlspecialchars(stripslashes($record['login']), ENT_QUOTES)).'", '; |
|
| 332 | 332 | //col4 |
| 333 | 333 | //get restriction from ROles |
| 334 | 334 | $restrictedToRole = false; |
| 335 | 335 | $rTmp = DB::queryFirstColumn( |
| 336 | - 'SELECT role_id FROM ' . prefixTable('restriction_to_roles') . ' WHERE item_id = %i', |
|
| 336 | + 'SELECT role_id FROM '.prefixTable('restriction_to_roles').' WHERE item_id = %i', |
|
| 337 | 337 | $record['id'] |
| 338 | 338 | ); |
| 339 | 339 | // We considere here that if user has at least one group similar to the object ones |
@@ -351,14 +351,14 @@ discard block |
||
| 351 | 351 | } else { |
| 352 | 352 | $txt = str_replace(['\n', '<br />', '\\'], [' ', ' ', '', ' '], strip_tags($record['description'])); |
| 353 | 353 | if (strlen($txt) > 50) { |
| 354 | - $sOutputItem .= '"' . substr(stripslashes(preg_replace('~/<[\/]{0,1}[^>]*>\//|[ \t]/~', '', $txt)), 0, 50) . '", '; |
|
| 354 | + $sOutputItem .= '"'.substr(stripslashes(preg_replace('~/<[\/]{0,1}[^>]*>\//|[ \t]/~', '', $txt)), 0, 50).'", '; |
|
| 355 | 355 | } else { |
| 356 | - $sOutputItem .= '"' . stripslashes(preg_replace('~/<[^>]*>|[ \t]/~', '', $txt)) . '", '; |
|
| 356 | + $sOutputItem .= '"'.stripslashes(preg_replace('~/<[^>]*>|[ \t]/~', '', $txt)).'", '; |
|
| 357 | 357 | } |
| 358 | 358 | } |
| 359 | 359 | |
| 360 | 360 | //col5 - TAGS |
| 361 | - $sOutputItem .= '"' . htmlspecialchars(stripslashes($record['tags']), ENT_QUOTES) . '", '; |
|
| 361 | + $sOutputItem .= '"'.htmlspecialchars(stripslashes($record['tags']), ENT_QUOTES).'", '; |
|
| 362 | 362 | // col6 - URL |
| 363 | 363 | if ($record['url'] !== '0') { |
| 364 | 364 | $sOutputItem .= '"'.filter_var($record['url'], FILTER_SANITIZE_URL).'", '; |
@@ -367,7 +367,7 @@ discard block |
||
| 367 | 367 | } |
| 368 | 368 | |
| 369 | 369 | //col7 - Prepare the Treegrid |
| 370 | - $sOutputItem .= '"' . htmlspecialchars(stripslashes($record['folder']), ENT_QUOTES) . '"'; |
|
| 370 | + $sOutputItem .= '"'.htmlspecialchars(stripslashes($record['folder']), ENT_QUOTES).'"'; |
|
| 371 | 371 | //Finish the line |
| 372 | 372 | $sOutputItem .= '], '; |
| 373 | 373 | if ($getItemInList === true) { |
@@ -376,16 +376,16 @@ discard block |
||
| 376 | 376 | --$iTotal; |
| 377 | 377 | } |
| 378 | 378 | } |
| 379 | - if (! empty($sOutputConst)) { |
|
| 379 | + if (!empty($sOutputConst)) { |
|
| 380 | 380 | $sOutput .= substr_replace($sOutputConst, '', -2); |
| 381 | 381 | } |
| 382 | 382 | $sOutput .= '], '; |
| 383 | - $sOutput .= '"recordsTotal": ' . $iTotal . ', '; |
|
| 384 | - $sOutput .= '"recordsFiltered": ' . $iTotal . ' }'; |
|
| 383 | + $sOutput .= '"recordsTotal": '.$iTotal.', '; |
|
| 384 | + $sOutput .= '"recordsFiltered": '.$iTotal.' }'; |
|
| 385 | 385 | echo $sOutput; |
| 386 | 386 | } elseif (isset($_GET['type']) && ($_GET['type'] === 'search_for_items' || $_GET['type'] === 'search_for_items_with_tags')) { |
| 387 | 387 | include_once 'main.functions.php'; |
| 388 | - include_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php'; |
|
| 388 | + include_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php'; |
|
| 389 | 389 | |
| 390 | 390 | $arr_data = []; |
| 391 | 391 | foreach ($rows as $record) { |
@@ -405,7 +405,7 @@ discard block |
||
| 405 | 405 | |
| 406 | 406 | // Anyone can modify? |
| 407 | 407 | $tmp = DB::queryfirstrow( |
| 408 | - 'SELECT anyone_can_modify FROM ' . prefixTable('items') . ' WHERE id = %i', |
|
| 408 | + 'SELECT anyone_can_modify FROM '.prefixTable('items').' WHERE id = %i', |
|
| 409 | 409 | $record['id'] |
| 410 | 410 | ); |
| 411 | 411 | if (count($tmp) > 0) { |
@@ -436,7 +436,7 @@ discard block |
||
| 436 | 436 | // => récupérer un tableau contenant les roles associés à cet ID (a partir table restriction_to_roles) |
| 437 | 437 | $user_is_included_in_role = 0; |
| 438 | 438 | $roles = DB::query( |
| 439 | - 'SELECT role_id FROM ' . prefixTable('restriction_to_roles') . ' WHERE item_id=%i', |
|
| 439 | + 'SELECT role_id FROM '.prefixTable('restriction_to_roles').' WHERE item_id=%i', |
|
| 440 | 440 | $record['id'] |
| 441 | 441 | ); |
| 442 | 442 | if (count($roles) > 0) { |
@@ -459,7 +459,7 @@ discard block |
||
| 459 | 459 | if (empty($restrictedTo)) { |
| 460 | 460 | $restrictedTo = $_SESSION['user_id']; |
| 461 | 461 | } else { |
| 462 | - $restrictedTo .= ',' . $_SESSION['user_id']; |
|
| 462 | + $restrictedTo .= ','.$_SESSION['user_id']; |
|
| 463 | 463 | } |
| 464 | 464 | } |
| 465 | 465 | |
@@ -557,7 +557,7 @@ discard block |
||
| 557 | 557 | $arrTmp = []; |
| 558 | 558 | foreach (explode(';', $_SESSION['fonction_id']) as $role) { |
| 559 | 559 | $access = DB::queryFirstRow( |
| 560 | - 'SELECT type FROM ' . prefixTable('roles_values') . ' WHERE role_id = %i AND folder_id = %i', |
|
| 560 | + 'SELECT type FROM '.prefixTable('roles_values').' WHERE role_id = %i AND folder_id = %i', |
|
| 561 | 561 | $role, |
| 562 | 562 | $record['id_tree'] |
| 563 | 563 | ); |
@@ -606,8 +606,8 @@ discard block |
||
| 606 | 606 | ) { |
| 607 | 607 | $data_item = DB::queryFirstRow( |
| 608 | 608 | 'SELECT i.pw AS pw, s.share_key AS share_key |
| 609 | - FROM ' . prefixTable('items') . ' AS i |
|
| 610 | - INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (s.object_id = i.id) |
|
| 609 | + FROM ' . prefixTable('items').' AS i |
|
| 610 | + INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (s.object_id = i.id) |
|
| 611 | 611 | WHERE i.id = %i AND s.user_id = %i', |
| 612 | 612 | $record['id'], |
| 613 | 613 | $_SESSION['user_id'] |
@@ -653,5 +653,5 @@ discard block |
||
| 653 | 653 | 'start' => (int) (isset($_GET['start']) === true && (int) $_GET['length'] !== -1) ? (int) $_GET['start'] + (int) $_GET['length'] : -1, |
| 654 | 654 | ]; |
| 655 | 655 | echo prepareExchangedData( |
| 656 | - $SETTINGS['cpassman_dir'],$returnValues, 'encode'); |
|
| 656 | + $SETTINGS['cpassman_dir'], $returnValues, 'encode'); |
|
| 657 | 657 | } |
