nilsteampassnet /
TeamPass
@@ -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 | |
| 54 | 54 | // DO check for "users" rights |
@@ -57,18 +57,18 @@ discard block |
||
| 57 | 57 | || (checkUser($_SESSION['user_id'], $_SESSION['key'], 'profile', $SETTINGS) === false && (null === $isprofileupdate || $isprofileupdate === false)) |
| 58 | 58 | ) { |
| 59 | 59 | $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page |
| 60 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 60 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 61 | 61 | exit(); |
| 62 | 62 | } |
| 63 | 63 | |
| 64 | -require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php'; |
|
| 64 | +require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php'; |
|
| 65 | 65 | header('Content-type: text/html; charset=utf-8'); |
| 66 | -require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php'; |
|
| 67 | -require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 68 | -require_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php'; |
|
| 66 | +require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php'; |
|
| 67 | +require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 68 | +require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php'; |
|
| 69 | 69 | |
| 70 | 70 | // Connect to mysql server |
| 71 | -require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 71 | +require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 72 | 72 | if (defined('DB_PASSWD_CLEAR') === false) { |
| 73 | 73 | define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS)); |
| 74 | 74 | } |
@@ -123,7 +123,7 @@ discard block |
||
| 123 | 123 | // Prepare variables |
| 124 | 124 | $login = filter_var($dataReceived['login'], FILTER_SANITIZE_STRING); |
| 125 | 125 | $email = filter_var($dataReceived['email'], FILTER_SANITIZE_EMAIL); |
| 126 | - $password = '';//filter_var($dataReceived['pw'], FILTER_SANITIZE_STRING); |
|
| 126 | + $password = ''; //filter_var($dataReceived['pw'], FILTER_SANITIZE_STRING); |
|
| 127 | 127 | $lastname = filter_var($dataReceived['lastname'], FILTER_SANITIZE_STRING); |
| 128 | 128 | $name = filter_var($dataReceived['name'], FILTER_SANITIZE_STRING); |
| 129 | 129 | $is_admin = filter_var($dataReceived['admin'], FILTER_SANITIZE_NUMBER_INT); |
@@ -153,7 +153,7 @@ discard block |
||
| 153 | 153 | // Check if user already exists |
| 154 | 154 | $data = DB::query( |
| 155 | 155 | 'SELECT id, fonction_id, groupes_interdits, groupes_visibles |
| 156 | - FROM ' . prefixTable('users') . ' |
|
| 156 | + FROM ' . prefixTable('users').' |
|
| 157 | 157 | WHERE login = %s', |
| 158 | 158 | $login |
| 159 | 159 | ); |
@@ -372,14 +372,14 @@ discard block |
||
| 372 | 372 | |
| 373 | 373 | // decrypt and retrieve data in JSON format |
| 374 | 374 | $dataReceived = prepareExchangedData( |
| 375 | - $SETTINGS['cpassman_dir'],$post_data, 'decode'); |
|
| 375 | + $SETTINGS['cpassman_dir'], $post_data, 'decode'); |
|
| 376 | 376 | |
| 377 | 377 | // Prepare variables |
| 378 | 378 | $post_id = filter_var($dataReceived['user_id'], FILTER_SANITIZE_NUMBER_INT); |
| 379 | 379 | |
| 380 | 380 | // Get info about user to delete |
| 381 | 381 | $data_user = DB::queryfirstrow( |
| 382 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 382 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 383 | 383 | WHERE id = %i', |
| 384 | 384 | $post_id |
| 385 | 385 | ); |
@@ -398,7 +398,7 @@ discard block |
||
| 398 | 398 | ); |
| 399 | 399 | // delete personal folder and subfolders |
| 400 | 400 | $data = DB::queryfirstrow( |
| 401 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' |
|
| 401 | + 'SELECT id FROM '.prefixTable('nested_tree').' |
|
| 402 | 402 | WHERE title = %s AND personal_folder = %i', |
| 403 | 403 | $post_id, |
| 404 | 404 | '1' |
@@ -411,7 +411,7 @@ discard block |
||
| 411 | 411 | DB::delete(prefixTable('nested_tree'), 'id = %i AND personal_folder = %i', $folder->id, '1'); |
| 412 | 412 | // delete items & logs |
| 413 | 413 | $items = DB::query( |
| 414 | - 'SELECT id FROM ' . prefixTable('items') . ' |
|
| 414 | + 'SELECT id FROM '.prefixTable('items').' |
|
| 415 | 415 | WHERE id_tree=%i AND perso = %i', |
| 416 | 416 | $folder->id, |
| 417 | 417 | '1' |
@@ -435,7 +435,7 @@ discard block |
||
| 435 | 435 | // Delete any process related to user |
| 436 | 436 | $processes = DB::query( |
| 437 | 437 | 'SELECT increment_id |
| 438 | - FROM ' . prefixTable('processes') . ' |
|
| 438 | + FROM ' . prefixTable('processes').' |
|
| 439 | 439 | WHERE JSON_EXTRACT(arguments, "$.new_user_id") = %i', |
| 440 | 440 | $post_id |
| 441 | 441 | ); |
@@ -491,7 +491,7 @@ discard block |
||
| 491 | 491 | // Check KEY |
| 492 | 492 | if (filter_input(INPUT_POST, 'key', FILTER_SANITIZE_STRING) !== filter_var($_SESSION['key'], FILTER_SANITIZE_STRING)) { |
| 493 | 493 | echo prepareExchangedData( |
| 494 | - $SETTINGS['cpassman_dir'],array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode'); |
|
| 494 | + $SETTINGS['cpassman_dir'], array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode'); |
|
| 495 | 495 | break; |
| 496 | 496 | } |
| 497 | 497 | |
@@ -499,7 +499,7 @@ discard block |
||
| 499 | 499 | |
| 500 | 500 | // Get info about user to delete |
| 501 | 501 | $data_user = DB::queryfirstrow( |
| 502 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 502 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 503 | 503 | WHERE id = %i', |
| 504 | 504 | $post_id |
| 505 | 505 | ); |
@@ -519,10 +519,10 @@ discard block |
||
| 519 | 519 | $post_id |
| 520 | 520 | ); |
| 521 | 521 | echo prepareExchangedData( |
| 522 | - $SETTINGS['cpassman_dir'],array('error' => ''), 'encode'); |
|
| 522 | + $SETTINGS['cpassman_dir'], array('error' => ''), 'encode'); |
|
| 523 | 523 | } else { |
| 524 | 524 | echo prepareExchangedData( |
| 525 | - $SETTINGS['cpassman_dir'],array('error' => 'not_allowed'), 'encode'); |
|
| 525 | + $SETTINGS['cpassman_dir'], array('error' => 'not_allowed'), 'encode'); |
|
| 526 | 526 | } |
| 527 | 527 | break; |
| 528 | 528 | /* |
@@ -535,7 +535,7 @@ discard block |
||
| 535 | 535 | || $_SESSION['is_admin'] !== '1' |
| 536 | 536 | ) { |
| 537 | 537 | echo prepareExchangedData( |
| 538 | - $SETTINGS['cpassman_dir'],array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode'); |
|
| 538 | + $SETTINGS['cpassman_dir'], array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode'); |
|
| 539 | 539 | exit(); |
| 540 | 540 | } |
| 541 | 541 | |
@@ -544,7 +544,7 @@ discard block |
||
| 544 | 544 | |
| 545 | 545 | // Get info about user to delete |
| 546 | 546 | $data_user = DB::queryfirstrow( |
| 547 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 547 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 548 | 548 | WHERE id = %i', |
| 549 | 549 | $post_id |
| 550 | 550 | ); |
@@ -567,10 +567,10 @@ discard block |
||
| 567 | 567 | ); |
| 568 | 568 | |
| 569 | 569 | echo prepareExchangedData( |
| 570 | - $SETTINGS['cpassman_dir'],array('error' => ''), 'encode'); |
|
| 570 | + $SETTINGS['cpassman_dir'], array('error' => ''), 'encode'); |
|
| 571 | 571 | } else { |
| 572 | 572 | echo prepareExchangedData( |
| 573 | - $SETTINGS['cpassman_dir'],array('error' => 'not_allowed'), 'encode'); |
|
| 573 | + $SETTINGS['cpassman_dir'], array('error' => 'not_allowed'), 'encode'); |
|
| 574 | 574 | } |
| 575 | 575 | break; |
| 576 | 576 | /* |
@@ -580,7 +580,7 @@ discard block |
||
| 580 | 580 | // Check KEY |
| 581 | 581 | if (filter_input(INPUT_POST, 'key', FILTER_SANITIZE_STRING) !== filter_var($_SESSION['key'], FILTER_SANITIZE_STRING)) { |
| 582 | 582 | echo prepareExchangedData( |
| 583 | - $SETTINGS['cpassman_dir'],array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode'); |
|
| 583 | + $SETTINGS['cpassman_dir'], array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode'); |
|
| 584 | 584 | break; |
| 585 | 585 | } |
| 586 | 586 | |
@@ -590,7 +590,7 @@ discard block |
||
| 590 | 590 | // Get info about user to delete |
| 591 | 591 | $data_user = DB::queryfirstrow( |
| 592 | 592 | 'SELECT admin, isAdministratedByRole, can_manage_all_users, gestionnaire |
| 593 | - FROM ' . prefixTable('users') . ' |
|
| 593 | + FROM ' . prefixTable('users').' |
|
| 594 | 594 | WHERE id = %i', |
| 595 | 595 | $post_id |
| 596 | 596 | ); |
@@ -615,10 +615,10 @@ discard block |
||
| 615 | 615 | $post_id |
| 616 | 616 | ); |
| 617 | 617 | echo prepareExchangedData( |
| 618 | - $SETTINGS['cpassman_dir'],array('error' => ''), 'encode'); |
|
| 618 | + $SETTINGS['cpassman_dir'], array('error' => ''), 'encode'); |
|
| 619 | 619 | } else { |
| 620 | 620 | echo prepareExchangedData( |
| 621 | - $SETTINGS['cpassman_dir'],array('error' => 'not_allowed'), 'encode'); |
|
| 621 | + $SETTINGS['cpassman_dir'], array('error' => 'not_allowed'), 'encode'); |
|
| 622 | 622 | } |
| 623 | 623 | break; |
| 624 | 624 | /* |
@@ -628,7 +628,7 @@ discard block |
||
| 628 | 628 | // Check KEY |
| 629 | 629 | if (filter_input(INPUT_POST, 'key', FILTER_SANITIZE_STRING) !== filter_var($_SESSION['key'], FILTER_SANITIZE_STRING)) { |
| 630 | 630 | echo prepareExchangedData( |
| 631 | - $SETTINGS['cpassman_dir'],array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode'); |
|
| 631 | + $SETTINGS['cpassman_dir'], array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode'); |
|
| 632 | 632 | break; |
| 633 | 633 | } |
| 634 | 634 | |
@@ -637,7 +637,7 @@ discard block |
||
| 637 | 637 | |
| 638 | 638 | // Get info about user to delete |
| 639 | 639 | $data_user = DB::queryfirstrow( |
| 640 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 640 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 641 | 641 | WHERE id = %i', |
| 642 | 642 | $post_id |
| 643 | 643 | ); |
@@ -659,10 +659,10 @@ discard block |
||
| 659 | 659 | $post_id |
| 660 | 660 | ); |
| 661 | 661 | echo prepareExchangedData( |
| 662 | - $SETTINGS['cpassman_dir'],array('error' => ''), 'encode'); |
|
| 662 | + $SETTINGS['cpassman_dir'], array('error' => ''), 'encode'); |
|
| 663 | 663 | } else { |
| 664 | 664 | echo prepareExchangedData( |
| 665 | - $SETTINGS['cpassman_dir'],array('error' => 'not_allowed'), 'encode'); |
|
| 665 | + $SETTINGS['cpassman_dir'], array('error' => 'not_allowed'), 'encode'); |
|
| 666 | 666 | } |
| 667 | 667 | break; |
| 668 | 668 | /* |
@@ -673,7 +673,7 @@ discard block |
||
| 673 | 673 | // Check KEY |
| 674 | 674 | if (filter_input(INPUT_POST, 'key', FILTER_SANITIZE_STRING) !== filter_var($_SESSION['key'], FILTER_SANITIZE_STRING)) { |
| 675 | 675 | echo prepareExchangedData( |
| 676 | - $SETTINGS['cpassman_dir'],array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode'); |
|
| 676 | + $SETTINGS['cpassman_dir'], array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode'); |
|
| 677 | 677 | break; |
| 678 | 678 | } |
| 679 | 679 | |
@@ -683,7 +683,7 @@ discard block |
||
| 683 | 683 | // Get info about user to delete |
| 684 | 684 | $data_user = DB::queryfirstrow( |
| 685 | 685 | 'SELECT admin, isAdministratedByRole, gestionnaire |
| 686 | - FROM ' . prefixTable('users') . ' |
|
| 686 | + FROM ' . prefixTable('users').' |
|
| 687 | 687 | WHERE id = %i', |
| 688 | 688 | $post_id |
| 689 | 689 | ); |
@@ -706,10 +706,10 @@ discard block |
||
| 706 | 706 | $post_id |
| 707 | 707 | ); |
| 708 | 708 | echo prepareExchangedData( |
| 709 | - $SETTINGS['cpassman_dir'],array('error' => ''), 'encode'); |
|
| 709 | + $SETTINGS['cpassman_dir'], array('error' => ''), 'encode'); |
|
| 710 | 710 | } else { |
| 711 | 711 | echo prepareExchangedData( |
| 712 | - $SETTINGS['cpassman_dir'],array('error' => 'not_allowed'), 'encode'); |
|
| 712 | + $SETTINGS['cpassman_dir'], array('error' => 'not_allowed'), 'encode'); |
|
| 713 | 713 | } |
| 714 | 714 | break; |
| 715 | 715 | /* |
@@ -719,7 +719,7 @@ discard block |
||
| 719 | 719 | // Check KEY |
| 720 | 720 | if (filter_input(INPUT_POST, 'key', FILTER_SANITIZE_STRING) !== filter_var($_SESSION['key'], FILTER_SANITIZE_STRING)) { |
| 721 | 721 | echo prepareExchangedData( |
| 722 | - $SETTINGS['cpassman_dir'],array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode'); |
|
| 722 | + $SETTINGS['cpassman_dir'], array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode'); |
|
| 723 | 723 | break; |
| 724 | 724 | } |
| 725 | 725 | |
@@ -729,7 +729,7 @@ discard block |
||
| 729 | 729 | // Get info about user to delete |
| 730 | 730 | $data_user = DB::queryfirstrow( |
| 731 | 731 | 'SELECT admin, isAdministratedByRole, gestionnaire |
| 732 | - FROM ' . prefixTable('users') . ' |
|
| 732 | + FROM ' . prefixTable('users').' |
|
| 733 | 733 | WHERE id = %i', |
| 734 | 734 | $post_id |
| 735 | 735 | ); |
@@ -749,10 +749,10 @@ discard block |
||
| 749 | 749 | $post_id |
| 750 | 750 | ); |
| 751 | 751 | echo prepareExchangedData( |
| 752 | - $SETTINGS['cpassman_dir'],array('error' => ''), 'encode'); |
|
| 752 | + $SETTINGS['cpassman_dir'], array('error' => ''), 'encode'); |
|
| 753 | 753 | } else { |
| 754 | 754 | echo prepareExchangedData( |
| 755 | - $SETTINGS['cpassman_dir'],array('error' => 'not_allowed'), 'encode'); |
|
| 755 | + $SETTINGS['cpassman_dir'], array('error' => 'not_allowed'), 'encode'); |
|
| 756 | 756 | } |
| 757 | 757 | break; |
| 758 | 758 | |
@@ -771,7 +771,7 @@ discard block |
||
| 771 | 771 | // Get info about user to delete |
| 772 | 772 | $data_user = DB::queryfirstrow( |
| 773 | 773 | 'SELECT admin, isAdministratedByRole, gestionnaire |
| 774 | - FROM ' . prefixTable('users') . ' |
|
| 774 | + FROM ' . prefixTable('users').' |
|
| 775 | 775 | WHERE id = %i', |
| 776 | 776 | $post_id |
| 777 | 777 | ); |
@@ -810,7 +810,7 @@ discard block |
||
| 810 | 810 | $return = array(); |
| 811 | 811 | // Check if folder exists |
| 812 | 812 | $data = DB::query( |
| 813 | - 'SELECT * FROM ' . prefixTable('nested_tree') . ' |
|
| 813 | + 'SELECT * FROM '.prefixTable('nested_tree').' |
|
| 814 | 814 | WHERE title = %s AND parent_id = %i', |
| 815 | 815 | filter_input(INPUT_POST, 'domain', FILTER_SANITIZE_STRING), |
| 816 | 816 | '0' |
@@ -823,7 +823,7 @@ discard block |
||
| 823 | 823 | } |
| 824 | 824 | // Check if role exists |
| 825 | 825 | $data = DB::query( |
| 826 | - 'SELECT * FROM ' . prefixTable('roles_title') . ' |
|
| 826 | + 'SELECT * FROM '.prefixTable('roles_title').' |
|
| 827 | 827 | WHERE title = %s', |
| 828 | 828 | filter_input(INPUT_POST, 'domain', FILTER_SANITIZE_STRING) |
| 829 | 829 | ); |
@@ -843,7 +843,7 @@ discard block |
||
| 843 | 843 | case 'user_log_items': |
| 844 | 844 | $nb_pages = 1; |
| 845 | 845 | $logs = $sql_filter = ''; |
| 846 | - $pages = '<table style=\'border-top:1px solid #969696;\'><tr><td>' . langHdl('pages') . ' : </td>'; |
|
| 846 | + $pages = '<table style=\'border-top:1px solid #969696;\'><tr><td>'.langHdl('pages').' : </td>'; |
|
| 847 | 847 | |
| 848 | 848 | // Prepare POST variables |
| 849 | 849 | $post_nb_items_by_page = filter_input(INPUT_POST, 'nb_items_by_page', FILTER_SANITIZE_NUMBER_INT); |
@@ -855,14 +855,14 @@ discard block |
||
| 855 | 855 | && !empty(filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_STRING)) |
| 856 | 856 | && filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_STRING) !== 'all' |
| 857 | 857 | ) { |
| 858 | - $sql_filter = " AND l.action = '" . filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_STRING) . "'"; |
|
| 858 | + $sql_filter = " AND l.action = '".filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_STRING)."'"; |
|
| 859 | 859 | } |
| 860 | 860 | // get number of pages |
| 861 | 861 | DB::query( |
| 862 | 862 | 'SELECT * |
| 863 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 864 | - INNER JOIN ' . prefixTable('items') . ' as i ON (l.id_item=i.id) |
|
| 865 | - INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 863 | + FROM ' . prefixTable('log_items').' as l |
|
| 864 | + INNER JOIN ' . prefixTable('items').' as i ON (l.id_item=i.id) |
|
| 865 | + INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 866 | 866 | WHERE l.id_user = %i ' . $sql_filter, |
| 867 | 867 | filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT) |
| 868 | 868 | ); |
@@ -880,19 +880,19 @@ discard block |
||
| 880 | 880 | // launch query |
| 881 | 881 | $rows = DB::query( |
| 882 | 882 | 'SELECT l.date as date, u.login as login, i.label as label, l.action as action |
| 883 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 884 | - INNER JOIN ' . prefixTable('items') . ' as i ON (l.id_item=i.id) |
|
| 885 | - INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 886 | - WHERE l.id_user = %i ' . $sql_filter . ' |
|
| 883 | + FROM ' . prefixTable('log_items').' as l |
|
| 884 | + INNER JOIN ' . prefixTable('items').' as i ON (l.id_item=i.id) |
|
| 885 | + INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 886 | + WHERE l.id_user = %i ' . $sql_filter.' |
|
| 887 | 887 | ORDER BY date DESC |
| 888 | - LIMIT ' . intval($start) . ',' . intval($post_nb_items_by_page), |
|
| 888 | + LIMIT ' . intval($start).','.intval($post_nb_items_by_page), |
|
| 889 | 889 | filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT) |
| 890 | 890 | ); |
| 891 | 891 | } else { |
| 892 | 892 | // get number of pages |
| 893 | 893 | DB::query( |
| 894 | 894 | 'SELECT * |
| 895 | - FROM ' . prefixTable('log_system') . ' |
|
| 895 | + FROM ' . prefixTable('log_system').' |
|
| 896 | 896 | WHERE type = %s AND field_1=%i', |
| 897 | 897 | 'user_mngt', |
| 898 | 898 | filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT) |
@@ -911,7 +911,7 @@ discard block |
||
| 911 | 911 | // launch query |
| 912 | 912 | $rows = DB::query( |
| 913 | 913 | 'SELECT * |
| 914 | - FROM ' . prefixTable('log_system') . ' |
|
| 914 | + FROM ' . prefixTable('log_system').' |
|
| 915 | 915 | WHERE type = %s AND field_1 = %i |
| 916 | 916 | ORDER BY date DESC |
| 917 | 917 | LIMIT %i, %i', |
@@ -925,7 +925,7 @@ discard block |
||
| 925 | 925 | if (isset($counter) && $counter != 0) { |
| 926 | 926 | $nb_pages = ceil($counter / intval($post_nb_items_by_page)); |
| 927 | 927 | for ($i = 1; $i <= $nb_pages; ++$i) { |
| 928 | - $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>'; |
|
| 928 | + $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>'; |
|
| 929 | 929 | } |
| 930 | 930 | } |
| 931 | 931 | $pages .= '</tr></table>'; |
@@ -934,7 +934,7 @@ discard block |
||
| 934 | 934 | if ($post_scope === 'user_mngt') { |
| 935 | 935 | $user = DB::queryfirstrow( |
| 936 | 936 | 'SELECT login |
| 937 | - from ' . prefixTable('users') . ' |
|
| 937 | + from ' . prefixTable('users').' |
|
| 938 | 938 | WHERE id=%i', |
| 939 | 939 | $record['qui'] |
| 940 | 940 | ); |
@@ -944,7 +944,7 @@ discard block |
||
| 944 | 944 | if ($tmp[0] == 'at_user_initial_pwd_changed') { |
| 945 | 945 | $label = langHdl('log_user_initial_pwd_changed'); |
| 946 | 946 | } elseif ($tmp[0] == 'at_user_email_changed') { |
| 947 | - $label = langHdl('log_user_email_changed') . $tmp[1]; |
|
| 947 | + $label = langHdl('log_user_email_changed').$tmp[1]; |
|
| 948 | 948 | } elseif ($tmp[0] == 'at_user_added') { |
| 949 | 949 | $label = langHdl('log_user_created'); |
| 950 | 950 | } elseif ($tmp[0] == 'at_user_locked') { |
@@ -955,14 +955,14 @@ discard block |
||
| 955 | 955 | $label = langHdl('log_user_pwd_changed'); |
| 956 | 956 | } |
| 957 | 957 | // prepare log |
| 958 | - $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>'; |
|
| 958 | + $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>'; |
|
| 959 | 959 | } else { |
| 960 | - $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>'; |
|
| 960 | + $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>'; |
|
| 961 | 961 | } |
| 962 | 962 | } |
| 963 | 963 | } |
| 964 | 964 | |
| 965 | - echo '[ { "table_logs": "' . ($logs) . '", "pages": "' . ($pages) . '", "error" : "no" } ]'; |
|
| 965 | + echo '[ { "table_logs": "'.($logs).'", "pages": "'.($pages).'", "error" : "no" } ]'; |
|
| 966 | 966 | break; |
| 967 | 967 | |
| 968 | 968 | /* |
@@ -988,7 +988,7 @@ discard block |
||
| 988 | 988 | } else { |
| 989 | 989 | // Get folder id for Admin |
| 990 | 990 | $admin_folder = DB::queryFirstRow( |
| 991 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' |
|
| 991 | + 'SELECT id FROM '.prefixTable('nested_tree').' |
|
| 992 | 992 | WHERE title = %i AND personal_folder = %i', |
| 993 | 993 | intval($_SESSION['user_id']), |
| 994 | 994 | '1' |
@@ -999,15 +999,15 @@ discard block |
||
| 999 | 999 | // Get each Items in PF |
| 1000 | 1000 | $rows = DB::query( |
| 1001 | 1001 | 'SELECT i.pw, i.label, l.id_user |
| 1002 | - FROM ' . prefixTable('items') . ' as i |
|
| 1003 | - LEFT JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item=i.id) |
|
| 1002 | + FROM ' . prefixTable('items').' as i |
|
| 1003 | + LEFT JOIN ' . prefixTable('log_items').' as l ON (l.id_item=i.id) |
|
| 1004 | 1004 | WHERE l.action = %s AND i.perso=%i AND i.id_tree=%i', |
| 1005 | 1005 | 'at_creation', |
| 1006 | 1006 | '1', |
| 1007 | 1007 | intval($folder->id) |
| 1008 | 1008 | ); |
| 1009 | 1009 | foreach ($rows as $record) { |
| 1010 | - echo $record['label'] . ' - '; |
|
| 1010 | + echo $record['label'].' - '; |
|
| 1011 | 1011 | // Change user |
| 1012 | 1012 | DB::update( |
| 1013 | 1013 | prefixTable('log_items'), |
@@ -1042,7 +1042,7 @@ discard block |
||
| 1042 | 1042 | // Get info about user to delete |
| 1043 | 1043 | $data_user = DB::queryfirstrow( |
| 1044 | 1044 | 'SELECT admin, isAdministratedByRole, gestionnaire |
| 1045 | - FROM ' . prefixTable('users') . ' |
|
| 1045 | + FROM ' . prefixTable('users').' |
|
| 1046 | 1046 | WHERE id = %i', |
| 1047 | 1047 | $post_user_id |
| 1048 | 1048 | ); |
@@ -1079,7 +1079,7 @@ discard block |
||
| 1079 | 1079 | |
| 1080 | 1080 | // Do |
| 1081 | 1081 | $rows = DB::query( |
| 1082 | - 'SELECT id FROM ' . prefixTable('users') . ' |
|
| 1082 | + 'SELECT id FROM '.prefixTable('users').' |
|
| 1083 | 1083 | WHERE timestamp != %s AND admin != %i', |
| 1084 | 1084 | '', |
| 1085 | 1085 | '1' |
@@ -1088,7 +1088,7 @@ discard block |
||
| 1088 | 1088 | // Get info about user to delete |
| 1089 | 1089 | $data_user = DB::queryfirstrow( |
| 1090 | 1090 | 'SELECT admin, isAdministratedByRole, gestionnaire |
| 1091 | - FROM ' . prefixTable('users') . ' |
|
| 1091 | + FROM ' . prefixTable('users').' |
|
| 1092 | 1092 | WHERE id = %i', |
| 1093 | 1093 | $record['id'] |
| 1094 | 1094 | ); |
@@ -1141,7 +1141,7 @@ discard block |
||
| 1141 | 1141 | |
| 1142 | 1142 | // decrypt and retrieve data in JSON format |
| 1143 | 1143 | $dataReceived = prepareExchangedData( |
| 1144 | - $SETTINGS['cpassman_dir'],$post_data, 'decode'); |
|
| 1144 | + $SETTINGS['cpassman_dir'], $post_data, 'decode'); |
|
| 1145 | 1145 | |
| 1146 | 1146 | // Prepare variables |
| 1147 | 1147 | $post_id = filter_var($dataReceived['user_id'], FILTER_SANITIZE_NUMBER_INT); |
@@ -1149,7 +1149,7 @@ discard block |
||
| 1149 | 1149 | // Get info about user |
| 1150 | 1150 | $rowUser = DB::queryfirstrow( |
| 1151 | 1151 | 'SELECT * |
| 1152 | - FROM ' . prefixTable('users') . ' |
|
| 1152 | + FROM ' . prefixTable('users').' |
|
| 1153 | 1153 | WHERE id = %i', |
| 1154 | 1154 | $post_id |
| 1155 | 1155 | ); |
@@ -1167,7 +1167,7 @@ discard block |
||
| 1167 | 1167 | $arrFldAllowed = array(); |
| 1168 | 1168 | |
| 1169 | 1169 | //Build tree |
| 1170 | - $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries'); |
|
| 1170 | + $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries'); |
|
| 1171 | 1171 | $tree->register(); |
| 1172 | 1172 | $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title'); |
| 1173 | 1173 | |
@@ -1178,7 +1178,7 @@ discard block |
||
| 1178 | 1178 | // array of roles for actual user |
| 1179 | 1179 | $my_functions = explode(';', $_SESSION['fonction_id']); |
| 1180 | 1180 | |
| 1181 | - $rows = DB::query('SELECT id,title,creator_id FROM ' . prefixTable('roles_title')); |
|
| 1181 | + $rows = DB::query('SELECT id,title,creator_id FROM '.prefixTable('roles_title')); |
|
| 1182 | 1182 | foreach ($rows as $record) { |
| 1183 | 1183 | if ( |
| 1184 | 1184 | (int) $_SESSION['is_admin'] === 1 |
@@ -1214,7 +1214,7 @@ discard block |
||
| 1214 | 1214 | $rolesList = array(); |
| 1215 | 1215 | $managedBy = array(); |
| 1216 | 1216 | $selected = ''; |
| 1217 | - $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title') . ' ORDER BY title ASC'); |
|
| 1217 | + $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title').' ORDER BY title ASC'); |
|
| 1218 | 1218 | foreach ($rows as $reccord) { |
| 1219 | 1219 | $rolesList[$reccord['id']] = array('id' => $reccord['id'], 'title' => $reccord['title']); |
| 1220 | 1220 | } |
@@ -1245,7 +1245,7 @@ discard block |
||
| 1245 | 1245 | array_push( |
| 1246 | 1246 | $managedBy, |
| 1247 | 1247 | array( |
| 1248 | - 'title' => langHdl('managers_of') . ' ' . $fonction['title'], |
|
| 1248 | + 'title' => langHdl('managers_of').' '.$fonction['title'], |
|
| 1249 | 1249 | 'id' => $fonction['id'], |
| 1250 | 1250 | 'selected' => $selected, |
| 1251 | 1251 | ) |
@@ -1327,9 +1327,9 @@ discard block |
||
| 1327 | 1327 | |
| 1328 | 1328 | // get USER STATUS |
| 1329 | 1329 | if ($rowUser['disabled'] == 1) { |
| 1330 | - $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>'; |
|
| 1330 | + $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>'; |
|
| 1331 | 1331 | } else { |
| 1332 | - $arrData['info'] = langHdl('user_info_active') . '<br><input type="checkbox" value="lock" class="chk"> ' . langHdl('user_info_lock_question'); |
|
| 1332 | + $arrData['info'] = langHdl('user_info_active').'<br><input type="checkbox" value="lock" class="chk"> '.langHdl('user_info_lock_question'); |
|
| 1333 | 1333 | } |
| 1334 | 1334 | |
| 1335 | 1335 | $arrData['error'] = false; |
@@ -1401,7 +1401,7 @@ discard block |
||
| 1401 | 1401 | |
| 1402 | 1402 | // decrypt and retrieve data in JSON format |
| 1403 | 1403 | $dataReceived = prepareExchangedData( |
| 1404 | - $SETTINGS['cpassman_dir'],$post_data, 'decode'); |
|
| 1404 | + $SETTINGS['cpassman_dir'], $post_data, 'decode'); |
|
| 1405 | 1405 | |
| 1406 | 1406 | // Prepare variables |
| 1407 | 1407 | $post_id = filter_var($dataReceived['user_id'], FILTER_SANITIZE_STRING); |
@@ -1426,7 +1426,7 @@ discard block |
||
| 1426 | 1426 | // count number of admins |
| 1427 | 1427 | $users = DB::query( |
| 1428 | 1428 | 'SELECT id |
| 1429 | - FROM ' . prefixTable('users') . ' |
|
| 1429 | + FROM ' . prefixTable('users').' |
|
| 1430 | 1430 | WHERE admin = 1 AND email != "" AND pw != ""' |
| 1431 | 1431 | ); |
| 1432 | 1432 | if (DB::count() === 1) { |
@@ -1515,7 +1515,7 @@ discard block |
||
| 1515 | 1515 | |
| 1516 | 1516 | // Get info about user to delete |
| 1517 | 1517 | $data_user = DB::queryfirstrow( |
| 1518 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 1518 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 1519 | 1519 | WHERE id = %i', |
| 1520 | 1520 | $post_id |
| 1521 | 1521 | ); |
@@ -1536,7 +1536,7 @@ discard block |
||
| 1536 | 1536 | ); |
| 1537 | 1537 | // delete personal folder and subfolders |
| 1538 | 1538 | $data = DB::queryfirstrow( |
| 1539 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' |
|
| 1539 | + 'SELECT id FROM '.prefixTable('nested_tree').' |
|
| 1540 | 1540 | WHERE title = %s AND personal_folder = %i', |
| 1541 | 1541 | $post_id, |
| 1542 | 1542 | '1' |
@@ -1549,7 +1549,7 @@ discard block |
||
| 1549 | 1549 | DB::delete(prefixTable('nested_tree'), 'id = %i AND personal_folder = %i', $folder->id, '1'); |
| 1550 | 1550 | // delete items & logs |
| 1551 | 1551 | $items = DB::query( |
| 1552 | - 'SELECT id FROM ' . prefixTable('items') . ' |
|
| 1552 | + 'SELECT id FROM '.prefixTable('items').' |
|
| 1553 | 1553 | WHERE id_tree=%i AND perso = %i', |
| 1554 | 1554 | $folder->id, |
| 1555 | 1555 | '1' |
@@ -1570,7 +1570,7 @@ discard block |
||
| 1570 | 1570 | } else { |
| 1571 | 1571 | // Get old data about user |
| 1572 | 1572 | $oldData = DB::queryfirstrow( |
| 1573 | - 'SELECT * FROM ' . prefixTable('users') . ' |
|
| 1573 | + 'SELECT * FROM '.prefixTable('users').' |
|
| 1574 | 1574 | WHERE id = %i', |
| 1575 | 1575 | $post_id |
| 1576 | 1576 | ); |
@@ -1600,7 +1600,7 @@ discard block |
||
| 1600 | 1600 | |
| 1601 | 1601 | // update LOG |
| 1602 | 1602 | if ($oldData['email'] !== $post_email) { |
| 1603 | - logEvents($SETTINGS, 'user_mngt', 'at_user_email_changed:' . $oldData['email'], (string) $_SESSION['user_id'], $_SESSION['login'], $post_id); |
|
| 1603 | + logEvents($SETTINGS, 'user_mngt', 'at_user_email_changed:'.$oldData['email'], (string) $_SESSION['user_id'], $_SESSION['login'], $post_id); |
|
| 1604 | 1604 | } |
| 1605 | 1605 | } |
| 1606 | 1606 | echo prepareExchangedData( |
@@ -1653,14 +1653,14 @@ discard block |
||
| 1653 | 1653 | |
| 1654 | 1654 | // decrypt and retrieve data in JSON format |
| 1655 | 1655 | $dataReceived = prepareExchangedData( |
| 1656 | - $SETTINGS['cpassman_dir'],$post_data, 'decode'); |
|
| 1656 | + $SETTINGS['cpassman_dir'], $post_data, 'decode'); |
|
| 1657 | 1657 | |
| 1658 | 1658 | // Prepare variables |
| 1659 | 1659 | $post_id = filter_var($dataReceived['user_id'], FILTER_SANITIZE_NUMBER_INT); |
| 1660 | 1660 | |
| 1661 | 1661 | // Get info about user to delete |
| 1662 | 1662 | $data_user = DB::queryfirstrow( |
| 1663 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 1663 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 1664 | 1664 | WHERE id = %i', |
| 1665 | 1665 | $post_id |
| 1666 | 1666 | ); |
@@ -1712,7 +1712,7 @@ discard block |
||
| 1712 | 1712 | } |
| 1713 | 1713 | |
| 1714 | 1714 | DB::queryfirstrow( |
| 1715 | - 'SELECT * FROM ' . prefixTable('users') . ' |
|
| 1715 | + 'SELECT * FROM '.prefixTable('users').' |
|
| 1716 | 1716 | WHERE login = %s', |
| 1717 | 1717 | filter_input(INPUT_POST, 'login', FILTER_SANITIZE_STRING) |
| 1718 | 1718 | ); |
@@ -1757,7 +1757,7 @@ discard block |
||
| 1757 | 1757 | |
| 1758 | 1758 | // decrypt and retrieve data in JSON format |
| 1759 | 1759 | $dataReceived = prepareExchangedData( |
| 1760 | - $SETTINGS['cpassman_dir'],$post_data, 'decode'); |
|
| 1760 | + $SETTINGS['cpassman_dir'], $post_data, 'decode'); |
|
| 1761 | 1761 | |
| 1762 | 1762 | // Prepare variables |
| 1763 | 1763 | $post_id = filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT); |
@@ -1765,14 +1765,14 @@ discard block |
||
| 1765 | 1765 | $arrData = array(); |
| 1766 | 1766 | |
| 1767 | 1767 | //Build tree |
| 1768 | - $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries'); |
|
| 1768 | + $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries'); |
|
| 1769 | 1769 | $tree->register(); |
| 1770 | 1770 | $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title'); |
| 1771 | 1771 | |
| 1772 | 1772 | // get User info |
| 1773 | 1773 | $rowUser = DB::queryFirstRow( |
| 1774 | 1774 | 'SELECT login, name, lastname, email, disabled, fonction_id, groupes_interdits, groupes_visibles, isAdministratedByRole, avatar_thumb |
| 1775 | - FROM ' . prefixTable('users') . ' |
|
| 1775 | + FROM ' . prefixTable('users').' |
|
| 1776 | 1776 | WHERE id = %i', |
| 1777 | 1777 | $post_id |
| 1778 | 1778 | ); |
@@ -1790,7 +1790,7 @@ discard block |
||
| 1790 | 1790 | // refine folders based upon roles |
| 1791 | 1791 | $rows = DB::query( |
| 1792 | 1792 | 'SELECT folder_id, type |
| 1793 | - FROM ' . prefixTable('roles_values') . ' |
|
| 1793 | + FROM ' . prefixTable('roles_values').' |
|
| 1794 | 1794 | WHERE role_id IN %ls |
| 1795 | 1795 | ORDER BY folder_id ASC', |
| 1796 | 1796 | $arrData['functions'] |
@@ -1813,7 +1813,7 @@ discard block |
||
| 1813 | 1813 | } |
| 1814 | 1814 | |
| 1815 | 1815 | // add allowed folders |
| 1816 | - foreach($arrData['allowed_folders'] as $Fld) { |
|
| 1816 | + foreach ($arrData['allowed_folders'] as $Fld) { |
|
| 1817 | 1817 | array_push($arrFolders, array('id' => $Fld, 'type' => 'W', 'special' => true)); |
| 1818 | 1818 | } |
| 1819 | 1819 | |
@@ -1824,7 +1824,7 @@ discard block |
||
| 1824 | 1824 | // get folder name |
| 1825 | 1825 | $row = DB::queryFirstRow( |
| 1826 | 1826 | 'SELECT title, nlevel, id |
| 1827 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 1827 | + FROM ' . prefixTable('nested_tree').' |
|
| 1828 | 1828 | WHERE id = %i', |
| 1829 | 1829 | $fld['id'] |
| 1830 | 1830 | ); |
@@ -1837,36 +1837,36 @@ discard block |
||
| 1837 | 1837 | |
| 1838 | 1838 | // manage right icon |
| 1839 | 1839 | if ($fld['type'] == 'W') { |
| 1840 | - $label = '<i class="fas fa-indent infotip text-success mr-2" title="' . langHdl('write') . '"></i>' . |
|
| 1841 | - '<i class="fas fa-edit infotip text-success mr-2" title="' . langHdl('edit') . '"></i>' . |
|
| 1842 | - '<i class="fas fa-eraser infotip text-success" title="' . langHdl('delete') . '"></i>'; |
|
| 1840 | + $label = '<i class="fas fa-indent infotip text-success mr-2" title="'.langHdl('write').'"></i>'. |
|
| 1841 | + '<i class="fas fa-edit infotip text-success mr-2" title="'.langHdl('edit').'"></i>'. |
|
| 1842 | + '<i class="fas fa-eraser infotip text-success" title="'.langHdl('delete').'"></i>'; |
|
| 1843 | 1843 | } elseif ($fld['type'] == 'ND') { |
| 1844 | - $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . langHdl('write') . '"></i>' . |
|
| 1845 | - '<i class="fas fa-edit infotip text-success mr-2" title="' . langHdl('edit') . '"></i>' . |
|
| 1846 | - '<i class="fas fa-eraser infotip text-danger" title="' . langHdl('no_delete') . '"></i>'; |
|
| 1844 | + $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.langHdl('write').'"></i>'. |
|
| 1845 | + '<i class="fas fa-edit infotip text-success mr-2" title="'.langHdl('edit').'"></i>'. |
|
| 1846 | + '<i class="fas fa-eraser infotip text-danger" title="'.langHdl('no_delete').'"></i>'; |
|
| 1847 | 1847 | } elseif ($fld['type'] == 'NE') { |
| 1848 | - $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . langHdl('write') . '"></i>' . |
|
| 1849 | - '<i class="fas fa-edit infotip text-danger mr-2" title="' . langHdl('no_edit') . '"></i>' . |
|
| 1850 | - '<i class="fas fa-eraser infotip text-success" title="' . langHdl('delete') . '"></i>'; |
|
| 1848 | + $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.langHdl('write').'"></i>'. |
|
| 1849 | + '<i class="fas fa-edit infotip text-danger mr-2" title="'.langHdl('no_edit').'"></i>'. |
|
| 1850 | + '<i class="fas fa-eraser infotip text-success" title="'.langHdl('delete').'"></i>'; |
|
| 1851 | 1851 | } elseif ($fld['type'] == 'NDNE') { |
| 1852 | - $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . langHdl('write') . '"></i>' . |
|
| 1853 | - '<i class="fas fa-edit infotip text-danger mr-2" title="' . langHdl('no_edit') . '"></i>' . |
|
| 1854 | - '<i class="fas fa-eraser infotip text-danger" title="' . langHdl('no_delete') . '"></i>'; |
|
| 1852 | + $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.langHdl('write').'"></i>'. |
|
| 1853 | + '<i class="fas fa-edit infotip text-danger mr-2" title="'.langHdl('no_edit').'"></i>'. |
|
| 1854 | + '<i class="fas fa-eraser infotip text-danger" title="'.langHdl('no_delete').'"></i>'; |
|
| 1855 | 1855 | } else { |
| 1856 | - $label = '<i class="fas fa-eye infotip text-info mr-2" title="' . langHdl('read') . '"></i>'; |
|
| 1856 | + $label = '<i class="fas fa-eye infotip text-info mr-2" title="'.langHdl('read').'"></i>'; |
|
| 1857 | 1857 | } |
| 1858 | 1858 | |
| 1859 | - $html .= '<tr><td>' . $ident . $row['title'] . |
|
| 1860 | - ' <small class="text-info">[' . $row['id'] . ']</small>'. |
|
| 1861 | - ($fld['special'] === true ? '<i class="fas fa-user-tag infotip text-primary ml-5" title="' . langHdl('user_specific_right') . '"></i>' : ''). |
|
| 1862 | - '</td><td>' . $label . '</td></tr>'; |
|
| 1859 | + $html .= '<tr><td>'.$ident.$row['title']. |
|
| 1860 | + ' <small class="text-info">['.$row['id'].']</small>'. |
|
| 1861 | + ($fld['special'] === true ? '<i class="fas fa-user-tag infotip text-primary ml-5" title="'.langHdl('user_specific_right').'"></i>' : ''). |
|
| 1862 | + '</td><td>'.$label.'</td></tr>'; |
|
| 1863 | 1863 | break; |
| 1864 | 1864 | } |
| 1865 | 1865 | } |
| 1866 | 1866 | } |
| 1867 | 1867 | |
| 1868 | - $html_full = '<table id="table-folders" class="table table-bordered table-striped dt-responsive nowrap" style="width:100%"><tbody>' . |
|
| 1869 | - $html . '</tbody></table>'; |
|
| 1868 | + $html_full = '<table id="table-folders" class="table table-bordered table-striped dt-responsive nowrap" style="width:100%"><tbody>'. |
|
| 1869 | + $html.'</tbody></table>'; |
|
| 1870 | 1870 | } else { |
| 1871 | 1871 | $html_full = ''; |
| 1872 | 1872 | } |
@@ -1915,7 +1915,7 @@ discard block |
||
| 1915 | 1915 | if ((int) $_SESSION['is_admin'] === 0 && (int) $_SESSION['user_can_manage_all_users'] === 0) { |
| 1916 | 1916 | $rows = DB::query( |
| 1917 | 1917 | 'SELECT * |
| 1918 | - FROM ' . prefixTable('users') . ' |
|
| 1918 | + FROM ' . prefixTable('users').' |
|
| 1919 | 1919 | WHERE admin = %i AND isAdministratedByRole IN %ls', |
| 1920 | 1920 | '0', |
| 1921 | 1921 | array_filter($_SESSION['user_roles']) |
@@ -1923,7 +1923,7 @@ discard block |
||
| 1923 | 1923 | } else { |
| 1924 | 1924 | $rows = DB::query( |
| 1925 | 1925 | 'SELECT * |
| 1926 | - FROM ' . prefixTable('users') . ' |
|
| 1926 | + FROM ' . prefixTable('users').' |
|
| 1927 | 1927 | WHERE admin = %i', |
| 1928 | 1928 | '0' |
| 1929 | 1929 | ); |
@@ -1935,7 +1935,7 @@ discard block |
||
| 1935 | 1935 | $groupIds = []; |
| 1936 | 1936 | foreach (explode(';', $record['fonction_id']) as $group) { |
| 1937 | 1937 | $tmp = DB::queryfirstrow( |
| 1938 | - 'SELECT id, title FROM ' . prefixTable('roles_title') . ' |
|
| 1938 | + 'SELECT id, title FROM '.prefixTable('roles_title').' |
|
| 1939 | 1939 | WHERE id = %i', |
| 1940 | 1940 | $group |
| 1941 | 1941 | ); |
@@ -1947,7 +1947,7 @@ discard block |
||
| 1947 | 1947 | |
| 1948 | 1948 | // Get managed_by |
| 1949 | 1949 | $managedBy = DB::queryfirstrow( |
| 1950 | - 'SELECT id, title FROM ' . prefixTable('roles_title') . ' |
|
| 1950 | + 'SELECT id, title FROM '.prefixTable('roles_title').' |
|
| 1951 | 1951 | WHERE id = %i', |
| 1952 | 1952 | $record['isAdministratedByRole'] |
| 1953 | 1953 | ); |
@@ -1957,7 +1957,7 @@ discard block |
||
| 1957 | 1957 | $foldersAllowedIds = []; |
| 1958 | 1958 | foreach (explode(';', $record['groupes_visibles']) as $role) { |
| 1959 | 1959 | $tmp = DB::queryfirstrow( |
| 1960 | - 'SELECT id, title FROM ' . prefixTable('nested_tree') . ' |
|
| 1960 | + 'SELECT id, title FROM '.prefixTable('nested_tree').' |
|
| 1961 | 1961 | WHERE id = %i', |
| 1962 | 1962 | $role |
| 1963 | 1963 | ); |
@@ -1970,7 +1970,7 @@ discard block |
||
| 1970 | 1970 | $foldersForbiddenIds = []; |
| 1971 | 1971 | foreach (explode(';', $record['groupes_interdits']) as $role) { |
| 1972 | 1972 | $tmp = DB::queryfirstrow( |
| 1973 | - 'SELECT id, title FROM ' . prefixTable('nested_tree') . ' |
|
| 1973 | + 'SELECT id, title FROM '.prefixTable('nested_tree').' |
|
| 1974 | 1974 | WHERE id = %i', |
| 1975 | 1975 | $role |
| 1976 | 1976 | ); |
@@ -1988,7 +1988,7 @@ discard block |
||
| 1988 | 1988 | 'login' => $record['login'], |
| 1989 | 1989 | 'groups' => implode(', ', $groups), |
| 1990 | 1990 | 'groupIds' => $groupIds, |
| 1991 | - 'managedBy' => $managedBy=== null ? langHdl('administrator') : $managedBy['title'], |
|
| 1991 | + 'managedBy' => $managedBy === null ? langHdl('administrator') : $managedBy['title'], |
|
| 1992 | 1992 | 'managedById' => $managedBy === null ? 0 : $managedBy['id'], |
| 1993 | 1993 | 'foldersAllowed' => implode(', ', $foldersAllowed), |
| 1994 | 1994 | 'foldersAllowedIds' => $foldersAllowedIds, |
@@ -2044,7 +2044,7 @@ discard block |
||
| 2044 | 2044 | |
| 2045 | 2045 | // decrypt and retreive data in JSON format |
| 2046 | 2046 | $dataReceived = prepareExchangedData( |
| 2047 | - $SETTINGS['cpassman_dir'],$post_data, 'decode'); |
|
| 2047 | + $SETTINGS['cpassman_dir'], $post_data, 'decode'); |
|
| 2048 | 2048 | |
| 2049 | 2049 | $post_source_id = filter_var(htmlspecialchars_decode($dataReceived['source_id']), FILTER_SANITIZE_NUMBER_INT); |
| 2050 | 2050 | $post_destination_ids = filter_var_array($dataReceived['destination_ids'], FILTER_SANITIZE_NUMBER_INT); |
@@ -2070,7 +2070,7 @@ discard block |
||
| 2070 | 2070 | |
| 2071 | 2071 | // Get info about user |
| 2072 | 2072 | $data_user = DB::queryfirstrow( |
| 2073 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 2073 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 2074 | 2074 | WHERE id = %i', |
| 2075 | 2075 | $post_source_id |
| 2076 | 2076 | ); |
@@ -2226,7 +2226,7 @@ discard block |
||
| 2226 | 2226 | |
| 2227 | 2227 | // decrypt and retrieve data in JSON format |
| 2228 | 2228 | $dataReceived = prepareExchangedData( |
| 2229 | - $SETTINGS['cpassman_dir'],$post_data, 'decode'); |
|
| 2229 | + $SETTINGS['cpassman_dir'], $post_data, 'decode'); |
|
| 2230 | 2230 | |
| 2231 | 2231 | // prepare variables |
| 2232 | 2232 | $post_user_id = filter_var($dataReceived['user_id'], FILTER_SANITIZE_NUMBER_INT); |
@@ -2238,14 +2238,14 @@ discard block |
||
| 2238 | 2238 | if (empty($post_context) === false && $post_context === 'add_one_role_to_user') { |
| 2239 | 2239 | $data_user = DB::queryfirstrow( |
| 2240 | 2240 | 'SELECT fonction_id |
| 2241 | - FROM ' . prefixTable('users') . ' |
|
| 2241 | + FROM ' . prefixTable('users').' |
|
| 2242 | 2242 | WHERE id = %i', |
| 2243 | 2243 | $post_user_id |
| 2244 | 2244 | ); |
| 2245 | 2245 | |
| 2246 | 2246 | if ($data_user) { |
| 2247 | 2247 | // Ensure array is unique |
| 2248 | - $post_new_value = str_replace(',', ';', $data_user['fonction_id']) . ';' . $post_new_value; |
|
| 2248 | + $post_new_value = str_replace(',', ';', $data_user['fonction_id']).';'.$post_new_value; |
|
| 2249 | 2249 | $post_new_value = implode(';', array_unique(explode(';', $post_new_value))); |
| 2250 | 2250 | } else { |
| 2251 | 2251 | // User not found |
@@ -2280,7 +2280,7 @@ discard block |
||
| 2280 | 2280 | 'id = %i', |
| 2281 | 2281 | $post_user_id |
| 2282 | 2282 | ); |
| 2283 | - } else if($post_field === 'user_api_key') { |
|
| 2283 | + } else if ($post_field === 'user_api_key') { |
|
| 2284 | 2284 | $_SESSION['user']['api-key'] = $post_new_value; |
| 2285 | 2285 | } |
| 2286 | 2286 | |
@@ -2317,7 +2317,7 @@ discard block |
||
| 2317 | 2317 | if (filter_input(INPUT_POST, 'step', FILTER_SANITIZE_STRING) === 'refresh') { |
| 2318 | 2318 | $record = DB::queryFirstRow( |
| 2319 | 2319 | 'SELECT user_ip_lastdate |
| 2320 | - FROM ' . prefixTable('users') . ' |
|
| 2320 | + FROM ' . prefixTable('users').' |
|
| 2321 | 2321 | WHERE id = %i', |
| 2322 | 2322 | $_SESSION['user_id'] |
| 2323 | 2323 | ); |
@@ -2390,38 +2390,38 @@ discard block |
||
| 2390 | 2390 | } |
| 2391 | 2391 | |
| 2392 | 2392 | // Load expected libraries |
| 2393 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php'; |
|
| 2394 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Arr.php'; |
|
| 2395 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Symfony/contracts/Translation/TranslatorInterface.php'; |
|
| 2396 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonTimeZone.php'; |
|
| 2397 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Units.php'; |
|
| 2398 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Week.php'; |
|
| 2399 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Timestamp.php'; |
|
| 2400 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Test.php'; |
|
| 2401 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/ObjectInitialisation.php'; |
|
| 2402 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Serialization.php'; |
|
| 2403 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/IntervalRounding.php'; |
|
| 2404 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Rounding.php'; |
|
| 2405 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Localization.php'; |
|
| 2406 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Options.php'; |
|
| 2407 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Cast.php'; |
|
| 2408 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mutability.php'; |
|
| 2409 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Modifiers.php'; |
|
| 2410 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mixin.php'; |
|
| 2411 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Macro.php'; |
|
| 2412 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Difference.php'; |
|
| 2413 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Creator.php'; |
|
| 2414 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Converter.php'; |
|
| 2415 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Comparison.php'; |
|
| 2416 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Boundaries.php'; |
|
| 2417 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Date.php'; |
|
| 2418 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonInterface.php'; |
|
| 2419 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Carbon.php'; |
|
| 2420 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/DetectsErrors.php'; |
|
| 2421 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Connection.php'; |
|
| 2422 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapInterface.php'; |
|
| 2423 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/HandlesConnection.php'; |
|
| 2424 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Ldap.php'; |
|
| 2393 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php'; |
|
| 2394 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Arr.php'; |
|
| 2395 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Symfony/contracts/Translation/TranslatorInterface.php'; |
|
| 2396 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonTimeZone.php'; |
|
| 2397 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Units.php'; |
|
| 2398 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Week.php'; |
|
| 2399 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Timestamp.php'; |
|
| 2400 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Test.php'; |
|
| 2401 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/ObjectInitialisation.php'; |
|
| 2402 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Serialization.php'; |
|
| 2403 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/IntervalRounding.php'; |
|
| 2404 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Rounding.php'; |
|
| 2405 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Localization.php'; |
|
| 2406 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Options.php'; |
|
| 2407 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Cast.php'; |
|
| 2408 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mutability.php'; |
|
| 2409 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Modifiers.php'; |
|
| 2410 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mixin.php'; |
|
| 2411 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Macro.php'; |
|
| 2412 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Difference.php'; |
|
| 2413 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Creator.php'; |
|
| 2414 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Converter.php'; |
|
| 2415 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Comparison.php'; |
|
| 2416 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Boundaries.php'; |
|
| 2417 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Date.php'; |
|
| 2418 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonInterface.php'; |
|
| 2419 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Carbon.php'; |
|
| 2420 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/DetectsErrors.php'; |
|
| 2421 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Connection.php'; |
|
| 2422 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapInterface.php'; |
|
| 2423 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/HandlesConnection.php'; |
|
| 2424 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Ldap.php'; |
|
| 2425 | 2425 | |
| 2426 | 2426 | // Build ldap configuration array |
| 2427 | 2427 | $config = [ |
@@ -2461,7 +2461,7 @@ discard block |
||
| 2461 | 2461 | $SETTINGS['cpassman_dir'], |
| 2462 | 2462 | array( |
| 2463 | 2463 | 'error' => true, |
| 2464 | - 'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage(). "<br>".$error->getDiagnosticMessage(), |
|
| 2464 | + 'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage()."<br>".$error->getDiagnosticMessage(), |
|
| 2465 | 2465 | ), |
| 2466 | 2466 | 'encode' |
| 2467 | 2467 | ); |
@@ -2482,12 +2482,12 @@ discard block |
||
| 2482 | 2482 | ->whereHas($SETTINGS['ldap_user_attribute']) |
| 2483 | 2483 | ->get(); |
| 2484 | 2484 | |
| 2485 | - foreach($users as $i => $adUser) { |
|
| 2485 | + foreach ($users as $i => $adUser) { |
|
| 2486 | 2486 | if (isset($adUser[$SETTINGS['ldap_user_attribute']]) === false) continue; |
| 2487 | 2487 | |
| 2488 | 2488 | // Build the list of all groups in AD |
| 2489 | 2489 | if (isset($adUser['memberof']) === true) { |
| 2490 | - foreach($adUser['memberof'] as $j => $adUserGroup) { |
|
| 2490 | + foreach ($adUser['memberof'] as $j => $adUserGroup) { |
|
| 2491 | 2491 | if (empty($adUserGroup) === false && $j !== "count") { |
| 2492 | 2492 | $adGroup = substr($adUserGroup, 3, strpos($adUserGroup, ',') - 3); |
| 2493 | 2493 | if (in_array($adGroup, $adRoles) === false && empty($adGroup) === false) { |
@@ -2503,7 +2503,7 @@ discard block |
||
| 2503 | 2503 | // Get his ID |
| 2504 | 2504 | $userInfo = DB::queryfirstrow( |
| 2505 | 2505 | 'SELECT id, login, fonction_id, auth_type |
| 2506 | - FROM ' . prefixTable('users') . ' |
|
| 2506 | + FROM ' . prefixTable('users').' |
|
| 2507 | 2507 | WHERE login = %s', |
| 2508 | 2508 | $userLogin |
| 2509 | 2509 | ); |
@@ -2538,7 +2538,7 @@ discard block |
||
| 2538 | 2538 | } |
| 2539 | 2539 | |
| 2540 | 2540 | // Get all groups in Teampass |
| 2541 | - $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title')); |
|
| 2541 | + $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title')); |
|
| 2542 | 2542 | foreach ($rows as $record) { |
| 2543 | 2543 | array_push( |
| 2544 | 2544 | $teampassRoles, |
@@ -2612,7 +2612,7 @@ discard block |
||
| 2612 | 2612 | // Check if user already exists |
| 2613 | 2613 | $data = DB::query( |
| 2614 | 2614 | 'SELECT id, fonction_id, groupes_interdits, groupes_visibles |
| 2615 | - FROM ' . prefixTable('users') . ' |
|
| 2615 | + FROM ' . prefixTable('users').' |
|
| 2616 | 2616 | WHERE login = %s', |
| 2617 | 2617 | $post_login |
| 2618 | 2618 | ); |
@@ -2722,7 +2722,7 @@ discard block |
||
| 2722 | 2722 | ); |
| 2723 | 2723 | |
| 2724 | 2724 | // Rebuild tree |
| 2725 | - $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries'); |
|
| 2725 | + $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries'); |
|
| 2726 | 2726 | $tree->register(); |
| 2727 | 2727 | $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title'); |
| 2728 | 2728 | $tree->rebuild(); |
@@ -2803,7 +2803,7 @@ discard block |
||
| 2803 | 2803 | // Check if user already exists |
| 2804 | 2804 | DB::query( |
| 2805 | 2805 | 'SELECT id |
| 2806 | - FROM ' . prefixTable('users') . ' |
|
| 2806 | + FROM ' . prefixTable('users').' |
|
| 2807 | 2807 | WHERE id = %i', |
| 2808 | 2808 | $post_id |
| 2809 | 2809 | ); |
@@ -2860,7 +2860,7 @@ discard block |
||
| 2860 | 2860 | |
| 2861 | 2861 | // decrypt and retrieve data in JSON format |
| 2862 | 2862 | $dataReceived = prepareExchangedData( |
| 2863 | - $SETTINGS['cpassman_dir'],$post_data, 'decode'); |
|
| 2863 | + $SETTINGS['cpassman_dir'], $post_data, 'decode'); |
|
| 2864 | 2864 | |
| 2865 | 2865 | // Prepare variables |
| 2866 | 2866 | $post_userid = filter_var($dataReceived['user_id'], FILTER_SANITIZE_NUMBER_INT); |
@@ -2884,7 +2884,7 @@ discard block |
||
| 2884 | 2884 | // Check if user already exists |
| 2885 | 2885 | $userInfo = DB::queryfirstrow( |
| 2886 | 2886 | 'SELECT id, private_key, public_key |
| 2887 | - FROM ' . prefixTable('users') . ' |
|
| 2887 | + FROM ' . prefixTable('users').' |
|
| 2888 | 2888 | WHERE id = %i', |
| 2889 | 2889 | $post_userid |
| 2890 | 2890 | ); |
@@ -2933,7 +2933,7 @@ discard block |
||
| 2933 | 2933 | if (count($_SESSION['personal_folders']) > 0) { |
| 2934 | 2934 | DB::query( |
| 2935 | 2935 | 'SELECT id |
| 2936 | - FROM ' . prefixTable('items') . ' |
|
| 2936 | + FROM ' . prefixTable('items').' |
|
| 2937 | 2937 | WHERE id_tree IN %ls', |
| 2938 | 2938 | $_SESSION['personal_folders'] |
| 2939 | 2939 | ); |
@@ -3018,7 +3018,7 @@ discard block |
||
| 3018 | 3018 | // Check if user already exists |
| 3019 | 3019 | DB::query( |
| 3020 | 3020 | 'SELECT id |
| 3021 | - FROM ' . prefixTable('users') . ' |
|
| 3021 | + FROM ' . prefixTable('users').' |
|
| 3022 | 3022 | WHERE id = %i', |
| 3023 | 3023 | $post_id |
| 3024 | 3024 | ); |
@@ -3145,10 +3145,10 @@ discard block |
||
| 3145 | 3145 | 'process_type' => 'create_user_keys', |
| 3146 | 3146 | 'arguments' => json_encode([ |
| 3147 | 3147 | 'new_user_id' => (int) $post_user_id, |
| 3148 | - 'new_user_pwd' => cryption($post_user_pwd, '','encrypt', $SETTINGS)['string'], |
|
| 3148 | + 'new_user_pwd' => cryption($post_user_pwd, '', 'encrypt', $SETTINGS)['string'], |
|
| 3149 | 3149 | 'new_user_code' => $post_user_code, |
| 3150 | 3150 | 'owner_id' => (int) $_SESSION['user_id'], |
| 3151 | - 'creator_pwd' => cryption($_SESSION['user_pwd'], '','encrypt', $SETTINGS)['string'], |
|
| 3151 | + 'creator_pwd' => cryption($_SESSION['user_pwd'], '', 'encrypt', $SETTINGS)['string'], |
|
| 3152 | 3152 | ]), |
| 3153 | 3153 | 'updated_at' => '', |
| 3154 | 3154 | 'finished_at' => '', |
@@ -3269,7 +3269,7 @@ discard block |
||
| 3269 | 3269 | |
| 3270 | 3270 | // Get info about user |
| 3271 | 3271 | $data_user = DB::queryfirstrow( |
| 3272 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 3272 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 3273 | 3273 | WHERE id = %i', |
| 3274 | 3274 | $value[1] |
| 3275 | 3275 | ); |
@@ -3302,7 +3302,7 @@ discard block |
||
| 3302 | 3302 | logEvents( |
| 3303 | 3303 | $SETTINGS, |
| 3304 | 3304 | 'user_mngt', |
| 3305 | - 'at_user_new_' . $value[0] . ':' . $value[1], |
|
| 3305 | + 'at_user_new_'.$value[0].':'.$value[1], |
|
| 3306 | 3306 | (string) $_SESSION['user_id'], |
| 3307 | 3307 | $_SESSION['login'], |
| 3308 | 3308 | filter_input(INPUT_POST, 'id', FILTER_SANITIZE_STRING) |
@@ -3333,7 +3333,7 @@ discard block |
||
| 3333 | 3333 | |
| 3334 | 3334 | // Get info about user |
| 3335 | 3335 | $data_user = DB::queryfirstrow( |
| 3336 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 3336 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 3337 | 3337 | WHERE id = %i', |
| 3338 | 3338 | $value[1] |
| 3339 | 3339 | ); |
@@ -47,8 +47,8 @@ discard block |
||
| 47 | 47 | date_default_timezone_set(isset($SETTINGS['timezone']) === true ? $SETTINGS['timezone'] : 'UTC'); |
| 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 | $post_type = filter_input(INPUT_POST, 'type', FILTER_SANITIZE_STRING); |
| 53 | 53 | if ( |
| 54 | 54 | isset($post_type) === true |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | && checkUser($_SESSION['user_id'], $_SESSION['key'], 'home', $SETTINGS) === false |
| 65 | 65 | ) { |
| 66 | 66 | $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page |
| 67 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 67 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 68 | 68 | exit(); |
| 69 | 69 | } elseif ((isset($_SESSION['user_id']) === true |
| 70 | 70 | && isset($_SESSION['key'])) === true |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | mainQuery($SETTINGS); |
| 77 | 77 | } else { |
| 78 | 78 | $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page |
| 79 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 79 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 80 | 80 | exit(); |
| 81 | 81 | } |
| 82 | 82 | |
@@ -91,13 +91,13 @@ discard block |
||
| 91 | 91 | |
| 92 | 92 | |
| 93 | 93 | // Includes |
| 94 | - include_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php'; |
|
| 95 | - include_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php'; |
|
| 96 | - include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 97 | - include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php'; |
|
| 94 | + include_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php'; |
|
| 95 | + include_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php'; |
|
| 96 | + include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 97 | + include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php'; |
|
| 98 | 98 | |
| 99 | 99 | // Connect to mysql server |
| 100 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 100 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 101 | 101 | |
| 102 | 102 | DB::$host = DB_HOST; |
| 103 | 103 | DB::$user = DB_USER; |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | DB::$connect_options = DB_CONNECT_OPTIONS; |
| 110 | 110 | |
| 111 | 111 | // User's language loading |
| 112 | - include_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php'; |
|
| 112 | + include_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php'; |
|
| 113 | 113 | |
| 114 | 114 | // Prepare post variables |
| 115 | 115 | $post_key = filter_input(INPUT_POST, 'key', FILTER_SANITIZE_STRING); |
@@ -501,7 +501,7 @@ discard block |
||
| 501 | 501 | $pwdlib = new PasswordLib\PasswordLib(); |
| 502 | 502 | // generate key |
| 503 | 503 | $key = $pwdlib->getRandomToken(filter_input(INPUT_POST, 'size', FILTER_SANITIZE_NUMBER_INT)); |
| 504 | - return '[{"key" : "' . htmlentities($key, ENT_QUOTES) . '"}]'; |
|
| 504 | + return '[{"key" : "'.htmlentities($key, ENT_QUOTES).'"}]'; |
|
| 505 | 505 | |
| 506 | 506 | /* |
| 507 | 507 | * Default case |
@@ -615,7 +615,7 @@ discard block |
||
| 615 | 615 | ) |
| 616 | 616 | ); |
| 617 | 617 | |
| 618 | - return '[{"token" : "' . $token . '"}]'; |
|
| 618 | + return '[{"token" : "'.$token.'"}]'; |
|
| 619 | 619 | |
| 620 | 620 | /* |
| 621 | 621 | * Default case |
@@ -676,7 +676,7 @@ discard block |
||
| 676 | 676 | // get number of items |
| 677 | 677 | DB::queryFirstRow( |
| 678 | 678 | 'SELECT increment_id |
| 679 | - FROM ' . prefixTable('sharekeys_items') . |
|
| 679 | + FROM ' . prefixTable('sharekeys_items'). |
|
| 680 | 680 | ' WHERE user_id = %i', |
| 681 | 681 | $userId |
| 682 | 682 | ); |
@@ -732,7 +732,7 @@ discard block |
||
| 732 | 732 | // check if expected security level is reached |
| 733 | 733 | $dataUser = DB::queryfirstrow( |
| 734 | 734 | 'SELECT * |
| 735 | - FROM ' . prefixTable('users') . ' WHERE id = %i', |
|
| 735 | + FROM ' . prefixTable('users').' WHERE id = %i', |
|
| 736 | 736 | $post_user_id |
| 737 | 737 | ); |
| 738 | 738 | |
@@ -753,8 +753,8 @@ discard block |
||
| 753 | 753 | if (empty($dataUser['fonction_id']) === false) { |
| 754 | 754 | $data = DB::queryFirstRow( |
| 755 | 755 | 'SELECT complexity |
| 756 | - FROM ' . prefixTable('roles_title') . ' |
|
| 757 | - WHERE id IN (' . $dataUser['fonction_id'] . ') |
|
| 756 | + FROM ' . prefixTable('roles_title').' |
|
| 757 | + WHERE id IN (' . $dataUser['fonction_id'].') |
|
| 758 | 758 | ORDER BY complexity DESC' |
| 759 | 759 | ); |
| 760 | 760 | } else { |
@@ -768,8 +768,8 @@ discard block |
||
| 768 | 768 | $SETTINGS['cpassman_dir'], |
| 769 | 769 | array( |
| 770 | 770 | 'error' => true, |
| 771 | - 'message' => '<div style="margin:10px 0 10px 15px;">' . langHdl('complexity_level_not_reached') . '.<br>' . |
|
| 772 | - langHdl('expected_complexity_level') . ': <b>' . TP_PW_COMPLEXITY[$data['complexity']][1] . '</b></div>', |
|
| 771 | + 'message' => '<div style="margin:10px 0 10px 15px;">'.langHdl('complexity_level_not_reached').'.<br>'. |
|
| 772 | + langHdl('expected_complexity_level').': <b>'.TP_PW_COMPLEXITY[$data['complexity']][1].'</b></div>', |
|
| 773 | 773 | ), |
| 774 | 774 | 'encode' |
| 775 | 775 | ); |
@@ -875,14 +875,14 @@ discard block |
||
| 875 | 875 | // Get data about user |
| 876 | 876 | $data = DB::queryfirstrow( |
| 877 | 877 | 'SELECT id, email, pw |
| 878 | - FROM ' . prefixTable('users') . ' |
|
| 878 | + FROM ' . prefixTable('users').' |
|
| 879 | 879 | WHERE login = %s', |
| 880 | 880 | $post_login |
| 881 | 881 | ); |
| 882 | 882 | } else { |
| 883 | 883 | $data = DB::queryfirstrow( |
| 884 | 884 | 'SELECT id, login, email, pw |
| 885 | - FROM ' . prefixTable('users') . ' |
|
| 885 | + FROM ' . prefixTable('users').' |
|
| 886 | 886 | WHERE id = %i', |
| 887 | 887 | $post_id |
| 888 | 888 | ); |
@@ -892,7 +892,7 @@ discard block |
||
| 892 | 892 | $counter = DB::count(); |
| 893 | 893 | |
| 894 | 894 | // load passwordLib library |
| 895 | - $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'] . '/includes/libraries'); |
|
| 895 | + $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'].'/includes/libraries'); |
|
| 896 | 896 | $pwdlib->register(); |
| 897 | 897 | $pwdlib = new PasswordLib\PasswordLib(); |
| 898 | 898 | |
@@ -941,7 +941,7 @@ discard block |
||
| 941 | 941 | } |
| 942 | 942 | |
| 943 | 943 | // generate new GA user code |
| 944 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php'; |
|
| 944 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php'; |
|
| 945 | 945 | $tfa = new Authentication\TwoFactorAuth\TwoFactorAuth($SETTINGS['ga_website_name']); |
| 946 | 946 | $gaSecretKey = $tfa->createSecret(); |
| 947 | 947 | $gaTemporaryCode = GenerateCryptKey(12, false, true, true, false, true, $SETTINGS); |
@@ -981,7 +981,7 @@ discard block |
||
| 981 | 981 | 'email' => $data['email'], |
| 982 | 982 | 'email_result' => str_replace( |
| 983 | 983 | '#email#', |
| 984 | - '<b>' . obfuscateEmail($data['email']) . '</b>', |
|
| 984 | + '<b>'.obfuscateEmail($data['email']).'</b>', |
|
| 985 | 985 | addslashes(langHdl('admin_email_result_ok')) |
| 986 | 986 | ), |
| 987 | 987 | ), |
@@ -998,7 +998,7 @@ discard block |
||
| 998 | 998 | 'email' => $data['email'], |
| 999 | 999 | 'email_result' => str_replace( |
| 1000 | 1000 | '#email#', |
| 1001 | - '<b>' . obfuscateEmail($data['email']) . '</b>', |
|
| 1001 | + '<b>'.obfuscateEmail($data['email']).'</b>', |
|
| 1002 | 1002 | addslashes(langHdl('admin_email_result_ok')) |
| 1003 | 1003 | ), |
| 1004 | 1004 | ), |
@@ -1012,7 +1012,7 @@ discard block |
||
| 1012 | 1012 | { |
| 1013 | 1013 | if (isKeyExistingAndEqual('enable_send_email_on_user_login', 1, $SETTINGS) === true) { |
| 1014 | 1014 | $row = DB::queryFirstRow( |
| 1015 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', |
|
| 1015 | + 'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', |
|
| 1016 | 1016 | 'cron', |
| 1017 | 1017 | 'sending_emails' |
| 1018 | 1018 | ); |
@@ -1020,7 +1020,7 @@ discard block |
||
| 1020 | 1020 | if ((int) (time() - $row['valeur']) >= 300 || (int) $row['valeur'] === 0) { |
| 1021 | 1021 | $rows = DB::query( |
| 1022 | 1022 | 'SELECT * |
| 1023 | - FROM ' . prefixTable('emails') . |
|
| 1023 | + FROM ' . prefixTable('emails'). |
|
| 1024 | 1024 | ' WHERE status != %s', |
| 1025 | 1025 | 'sent' |
| 1026 | 1026 | ); |
@@ -1126,8 +1126,8 @@ discard block |
||
| 1126 | 1126 | $arr_html = array(); |
| 1127 | 1127 | $rows = DB::query( |
| 1128 | 1128 | 'SELECT i.id AS id, i.label AS label, i.id_tree AS id_tree, l.date, i.perso AS perso, i.restricted_to AS restricted |
| 1129 | - FROM ' . prefixTable('log_items') . ' AS l |
|
| 1130 | - RIGHT JOIN ' . prefixTable('items') . ' AS i ON (l.id_item = i.id) |
|
| 1129 | + FROM ' . prefixTable('log_items').' AS l |
|
| 1130 | + RIGHT JOIN ' . prefixTable('items').' AS i ON (l.id_item = i.id) |
|
| 1131 | 1131 | WHERE l.action = %s AND l.id_user = %i |
| 1132 | 1132 | ORDER BY l.date DESC |
| 1133 | 1133 | LIMIT 0, 100', |
@@ -1159,7 +1159,7 @@ discard block |
||
| 1159 | 1159 | if (isKeyExistingAndEqual('enable_suggestion', 1, $SETTINGS) === true |
| 1160 | 1160 | && ((int) $_SESSION['user_admin'] === 1 || (int) $_SESSION['user_manager'] === 1) |
| 1161 | 1161 | ) { |
| 1162 | - DB::query('SELECT * FROM ' . prefixTable('suggestion')); |
|
| 1162 | + DB::query('SELECT * FROM '.prefixTable('suggestion')); |
|
| 1163 | 1163 | $nb_suggestions_waiting = DB::count(); |
| 1164 | 1164 | } |
| 1165 | 1165 | |
@@ -1193,13 +1193,13 @@ discard block |
||
| 1193 | 1193 | if ($data === 'stat_languages') { |
| 1194 | 1194 | $tmp = ''; |
| 1195 | 1195 | foreach ($stats_data[$data] as $key => $value) { |
| 1196 | - $tmp .= $tmp === '' ? $key . '-' . $value : ',' . $key . '-' . $value; |
|
| 1196 | + $tmp .= $tmp === '' ? $key.'-'.$value : ','.$key.'-'.$value; |
|
| 1197 | 1197 | } |
| 1198 | 1198 | $statsToSend[$data] = $tmp; |
| 1199 | 1199 | } elseif ($data === 'stat_country') { |
| 1200 | 1200 | $tmp = ''; |
| 1201 | 1201 | foreach ($stats_data[$data] as $key => $value) { |
| 1202 | - $tmp .= $tmp === '' ? $key . '-' . $value : ',' . $key . '-' . $value; |
|
| 1202 | + $tmp .= $tmp === '' ? $key.'-'.$value : ','.$key.'-'.$value; |
|
| 1203 | 1203 | } |
| 1204 | 1204 | $statsToSend[$data] = $tmp; |
| 1205 | 1205 | } else { |
@@ -1274,8 +1274,8 @@ discard block |
||
| 1274 | 1274 | $url_found = substr($line, 19, strlen($line) - 22); |
| 1275 | 1275 | if (empty($url_found) === false) { |
| 1276 | 1276 | $tmp = parse_url($url_found); |
| 1277 | - $anonym_url = $tmp['scheme'] . '://<anonym_url>' . (isset($tmp['path']) === true ? $tmp['path'] : ''); |
|
| 1278 | - $line = "'cpassman_url' => '" . $anonym_url . "\n"; |
|
| 1277 | + $anonym_url = $tmp['scheme'].'://<anonym_url>'.(isset($tmp['path']) === true ? $tmp['path'] : ''); |
|
| 1278 | + $line = "'cpassman_url' => '".$anonym_url."\n"; |
|
| 1279 | 1279 | } else { |
| 1280 | 1280 | $line = "'cpassman_url' => \n"; |
| 1281 | 1281 | } |
@@ -1305,7 +1305,7 @@ discard block |
||
| 1305 | 1305 | $teampass_errors = ''; |
| 1306 | 1306 | $rows = DB::query( |
| 1307 | 1307 | 'SELECT label, date AS error_date |
| 1308 | - FROM ' . prefixTable('log_system') . " |
|
| 1308 | + FROM ' . prefixTable('log_system')." |
|
| 1309 | 1309 | WHERE `type` LIKE 'error' |
| 1310 | 1310 | ORDER BY `date` DESC |
| 1311 | 1311 | LIMIT 0, 10" |
@@ -1313,9 +1313,9 @@ discard block |
||
| 1313 | 1313 | if (DB::count() > 0) { |
| 1314 | 1314 | foreach ($rows as $record) { |
| 1315 | 1315 | if (empty($teampass_errors) === true) { |
| 1316 | - $teampass_errors = ' * ' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['error_date']) . ' - ' . $record['label']; |
|
| 1316 | + $teampass_errors = ' * '.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['error_date']).' - '.$record['label']; |
|
| 1317 | 1317 | } else { |
| 1318 | - $teampass_errors .= ' * ' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['error_date']) . ' - ' . $record['label']; |
|
| 1318 | + $teampass_errors .= ' * '.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['error_date']).' - '.$record['label']; |
|
| 1319 | 1319 | } |
| 1320 | 1320 | } |
| 1321 | 1321 | } |
@@ -1324,7 +1324,7 @@ discard block |
||
| 1324 | 1324 | |
| 1325 | 1325 | // Now prepare text |
| 1326 | 1326 | $txt = '### Page on which it happened |
| 1327 | -' . $data['current_page'] . ' |
|
| 1327 | +' . $data['current_page'].' |
|
| 1328 | 1328 | |
| 1329 | 1329 | ### Steps to reproduce |
| 1330 | 1330 | 1. |
@@ -1339,39 +1339,39 @@ discard block |
||
| 1339 | 1339 | Tell us what happens instead |
| 1340 | 1340 | |
| 1341 | 1341 | ### Server configuration |
| 1342 | -**Operating system**: ' . php_uname() . ' |
|
| 1342 | +**Operating system**: ' . php_uname().' |
|
| 1343 | 1343 | |
| 1344 | -**Web server:** ' . $_SERVER['SERVER_SOFTWARE'] . ' |
|
| 1344 | +**Web server:** ' . $_SERVER['SERVER_SOFTWARE'].' |
|
| 1345 | 1345 | |
| 1346 | -**Database:** ' . ($link === false ? langHdl('undefined') : mysqli_get_server_info($link)) . ' |
|
| 1346 | +**Database:** ' . ($link === false ? langHdl('undefined') : mysqli_get_server_info($link)).' |
|
| 1347 | 1347 | |
| 1348 | -**PHP version:** ' . PHP_VERSION . ' |
|
| 1348 | +**PHP version:** ' . PHP_VERSION.' |
|
| 1349 | 1349 | |
| 1350 | -**Teampass version:** ' . TP_VERSION_FULL . ' |
|
| 1350 | +**Teampass version:** ' . TP_VERSION_FULL.' |
|
| 1351 | 1351 | |
| 1352 | 1352 | **Teampass configuration file:** |
| 1353 | 1353 | ``` |
| 1354 | -' . $list_of_options . ' |
|
| 1354 | +' . $list_of_options.' |
|
| 1355 | 1355 | ``` |
| 1356 | 1356 | |
| 1357 | 1357 | **Updated from an older Teampass or fresh install:** |
| 1358 | 1358 | |
| 1359 | 1359 | ### Client configuration |
| 1360 | 1360 | |
| 1361 | -**Browser:** ' . $data['browser_name'] . ' - ' . $data['browser_version'] . ' |
|
| 1361 | +**Browser:** ' . $data['browser_name'].' - '.$data['browser_version'].' |
|
| 1362 | 1362 | |
| 1363 | -**Operating system:** ' . $data['os'] . ' - ' . $data['os_archi'] . 'bits |
|
| 1363 | +**Operating system:** ' . $data['os'].' - '.$data['os_archi'].'bits |
|
| 1364 | 1364 | |
| 1365 | 1365 | ### Logs |
| 1366 | 1366 | |
| 1367 | 1367 | #### Web server error log |
| 1368 | 1368 | ``` |
| 1369 | -' . $err['message'] . ' - ' . $err['file'] . ' (' . $err['line'] . ') |
|
| 1369 | +' . $err['message'].' - '.$err['file'].' ('.$err['line'].') |
|
| 1370 | 1370 | ``` |
| 1371 | 1371 | |
| 1372 | 1372 | #### Teampass 10 last system errors |
| 1373 | 1373 | ``` |
| 1374 | -' . $teampass_errors . ' |
|
| 1374 | +' . $teampass_errors.' |
|
| 1375 | 1375 | ``` |
| 1376 | 1376 | |
| 1377 | 1377 | #### Log from the web-browser developer console (CTRL + SHIFT + i) |
@@ -1408,7 +1408,7 @@ discard block |
||
| 1408 | 1408 | // Check if user exists |
| 1409 | 1409 | $userInfo = DB::queryFirstRow( |
| 1410 | 1410 | 'SELECT public_key, private_key, pw, auth_type |
| 1411 | - FROM ' . prefixTable('users') . ' |
|
| 1411 | + FROM ' . prefixTable('users').' |
|
| 1412 | 1412 | WHERE id = %i', |
| 1413 | 1413 | $post_user_id |
| 1414 | 1414 | ); |
@@ -1417,7 +1417,7 @@ discard block |
||
| 1417 | 1417 | // Get one item |
| 1418 | 1418 | $currentUserKey = DB::queryFirstRow( |
| 1419 | 1419 | 'SELECT object_id, share_key, increment_id |
| 1420 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 1420 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 1421 | 1421 | WHERE user_id = %i', |
| 1422 | 1422 | $post_user_id |
| 1423 | 1423 | ); |
@@ -1458,7 +1458,7 @@ discard block |
||
| 1458 | 1458 | |
| 1459 | 1459 | // Use the password check |
| 1460 | 1460 | // load passwordLib library |
| 1461 | - $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'] . '/includes/libraries'); |
|
| 1461 | + $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'].'/includes/libraries'); |
|
| 1462 | 1462 | $pwdlib->register(); |
| 1463 | 1463 | $pwdlib = new PasswordLib\PasswordLib(); |
| 1464 | 1464 | |
@@ -1517,7 +1517,7 @@ discard block |
||
| 1517 | 1517 | // Get user info |
| 1518 | 1518 | $userData = DB::queryFirstRow( |
| 1519 | 1519 | 'SELECT private_key |
| 1520 | - FROM ' . prefixTable('users') . ' |
|
| 1520 | + FROM ' . prefixTable('users').' |
|
| 1521 | 1521 | WHERE id = %i', |
| 1522 | 1522 | $post_user_id |
| 1523 | 1523 | ); |
@@ -1544,7 +1544,7 @@ discard block |
||
| 1544 | 1544 | ); |
| 1545 | 1545 | |
| 1546 | 1546 | // Load superGlobals |
| 1547 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 1547 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 1548 | 1548 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 1549 | 1549 | |
| 1550 | 1550 | $superGlobal->put('private_key', $privateKey, 'SESSION', 'user'); |
@@ -1584,7 +1584,7 @@ discard block |
||
| 1584 | 1584 | // Get user info |
| 1585 | 1585 | $userData = DB::queryFirstRow( |
| 1586 | 1586 | 'SELECT email, auth_type, login |
| 1587 | - FROM ' . prefixTable('users') . ' |
|
| 1587 | + FROM ' . prefixTable('users').' |
|
| 1588 | 1588 | WHERE id = %i', |
| 1589 | 1589 | $post_user_id |
| 1590 | 1590 | ); |
@@ -1724,7 +1724,7 @@ discard block |
||
| 1724 | 1724 | // Get user info |
| 1725 | 1725 | $userData = DB::queryFirstRow( |
| 1726 | 1726 | 'SELECT email, auth_type, login |
| 1727 | - FROM ' . prefixTable('users') . ' |
|
| 1727 | + FROM ' . prefixTable('users').' |
|
| 1728 | 1728 | WHERE id = %i', |
| 1729 | 1729 | $post_user_id |
| 1730 | 1730 | ); |
@@ -1788,13 +1788,13 @@ discard block |
||
| 1788 | 1788 | // Check if user exists |
| 1789 | 1789 | DB::queryFirstRow( |
| 1790 | 1790 | 'SELECT * |
| 1791 | - FROM ' . prefixTable('users') . ' |
|
| 1791 | + FROM ' . prefixTable('users').' |
|
| 1792 | 1792 | WHERE id = %i', |
| 1793 | 1793 | $post_user_id |
| 1794 | 1794 | ); |
| 1795 | 1795 | if (DB::count() > 0) { |
| 1796 | 1796 | // Include libraries |
| 1797 | - include_once $SETTINGS['cpassman_dir'] . '/sources/aes.functions.php'; |
|
| 1797 | + include_once $SETTINGS['cpassman_dir'].'/sources/aes.functions.php'; |
|
| 1798 | 1798 | |
| 1799 | 1799 | // CLear old sharekeys |
| 1800 | 1800 | if ($post_self_change === false) { |
@@ -1860,13 +1860,13 @@ discard block |
||
| 1860 | 1860 | // Check if user exists |
| 1861 | 1861 | $userInfo = DB::queryFirstRow( |
| 1862 | 1862 | 'SELECT public_key |
| 1863 | - FROM ' . prefixTable('users') . ' |
|
| 1863 | + FROM ' . prefixTable('users').' |
|
| 1864 | 1864 | WHERE id = %i', |
| 1865 | 1865 | $post_user_id |
| 1866 | 1866 | ); |
| 1867 | 1867 | if (isset($userInfo['public_key']) === true) { |
| 1868 | 1868 | // Include libraries |
| 1869 | - include_once $SETTINGS['cpassman_dir'] . '/sources/aes.functions.php'; |
|
| 1869 | + include_once $SETTINGS['cpassman_dir'].'/sources/aes.functions.php'; |
|
| 1870 | 1870 | $return = []; |
| 1871 | 1871 | |
| 1872 | 1872 | // WHAT STEP TO PERFORM? |
@@ -2012,15 +2012,15 @@ discard block |
||
| 2012 | 2012 | // Loop on items |
| 2013 | 2013 | $rows = DB::query( |
| 2014 | 2014 | 'SELECT id, pw |
| 2015 | - FROM ' . prefixTable('items') . ' |
|
| 2015 | + FROM ' . prefixTable('items').' |
|
| 2016 | 2016 | WHERE perso = 0 |
| 2017 | - LIMIT ' . $post_start . ', ' . $post_length |
|
| 2017 | + LIMIT ' . $post_start.', '.$post_length |
|
| 2018 | 2018 | ); |
| 2019 | 2019 | foreach ($rows as $record) { |
| 2020 | 2020 | // Get itemKey from current user |
| 2021 | 2021 | $currentUserKey = DB::queryFirstRow( |
| 2022 | 2022 | 'SELECT share_key, increment_id |
| 2023 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2023 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2024 | 2024 | WHERE object_id = %i AND user_id = %i', |
| 2025 | 2025 | $record['id'], |
| 2026 | 2026 | $_SESSION['user_id'] |
@@ -2048,7 +2048,7 @@ discard block |
||
| 2048 | 2048 | if ((int) $post_user_id !== (int) $_SESSION['user_id']) { |
| 2049 | 2049 | $currentUserKey = DB::queryFirstRow( |
| 2050 | 2050 | 'SELECT increment_id |
| 2051 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2051 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2052 | 2052 | WHERE object_id = %i AND user_id = %i', |
| 2053 | 2053 | $record['id'], |
| 2054 | 2054 | $post_user_id |
@@ -2081,7 +2081,7 @@ discard block |
||
| 2081 | 2081 | // SHould we change step? |
| 2082 | 2082 | DB::query( |
| 2083 | 2083 | 'SELECT * |
| 2084 | - FROM ' . prefixTable('items') . ' |
|
| 2084 | + FROM ' . prefixTable('items').' |
|
| 2085 | 2085 | WHERE perso = 0' |
| 2086 | 2086 | ); |
| 2087 | 2087 | |
@@ -2105,15 +2105,15 @@ discard block |
||
| 2105 | 2105 | // Loop on logs |
| 2106 | 2106 | $rows = DB::query( |
| 2107 | 2107 | 'SELECT increment_id |
| 2108 | - FROM ' . prefixTable('log_items') . ' |
|
| 2108 | + FROM ' . prefixTable('log_items').' |
|
| 2109 | 2109 | WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes" |
| 2110 | - LIMIT ' . $post_start . ', ' . $post_length |
|
| 2110 | + LIMIT ' . $post_start.', '.$post_length |
|
| 2111 | 2111 | ); |
| 2112 | 2112 | foreach ($rows as $record) { |
| 2113 | 2113 | // Get itemKey from current user |
| 2114 | 2114 | $currentUserKey = DB::queryFirstRow( |
| 2115 | 2115 | 'SELECT share_key |
| 2116 | - FROM ' . prefixTable('sharekeys_logs') . ' |
|
| 2116 | + FROM ' . prefixTable('sharekeys_logs').' |
|
| 2117 | 2117 | WHERE object_id = %i AND user_id = %i', |
| 2118 | 2118 | $record['increment_id'], |
| 2119 | 2119 | $_SESSION['user_id'] |
@@ -2140,7 +2140,7 @@ discard block |
||
| 2140 | 2140 | if ((int) $post_user_id !== (int) $_SESSION['user_id']) { |
| 2141 | 2141 | $currentUserKey = DB::queryFirstRow( |
| 2142 | 2142 | 'SELECT increment_id |
| 2143 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2143 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2144 | 2144 | WHERE object_id = %i AND user_id = %i', |
| 2145 | 2145 | $record['id'], |
| 2146 | 2146 | $post_user_id |
@@ -2162,7 +2162,7 @@ discard block |
||
| 2162 | 2162 | // SHould we change step? |
| 2163 | 2163 | DB::query( |
| 2164 | 2164 | 'SELECT increment_id |
| 2165 | - FROM ' . prefixTable('log_items') . ' |
|
| 2165 | + FROM ' . prefixTable('log_items').' |
|
| 2166 | 2166 | WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"' |
| 2167 | 2167 | ); |
| 2168 | 2168 | |
@@ -2186,15 +2186,15 @@ discard block |
||
| 2186 | 2186 | // Loop on fields |
| 2187 | 2187 | $rows = DB::query( |
| 2188 | 2188 | 'SELECT id |
| 2189 | - FROM ' . prefixTable('categories_items') . ' |
|
| 2189 | + FROM ' . prefixTable('categories_items').' |
|
| 2190 | 2190 | WHERE encryption_type = "teampass_aes" |
| 2191 | - LIMIT ' . $post_start . ', ' . $post_length |
|
| 2191 | + LIMIT ' . $post_start.', '.$post_length |
|
| 2192 | 2192 | ); |
| 2193 | 2193 | foreach ($rows as $record) { |
| 2194 | 2194 | // Get itemKey from current user |
| 2195 | 2195 | $currentUserKey = DB::queryFirstRow( |
| 2196 | 2196 | 'SELECT share_key |
| 2197 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 2197 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 2198 | 2198 | WHERE object_id = %i AND user_id = %i', |
| 2199 | 2199 | $record['id'], |
| 2200 | 2200 | $_SESSION['user_id'] |
@@ -2221,7 +2221,7 @@ discard block |
||
| 2221 | 2221 | if ((int) $post_user_id !== (int) $_SESSION['user_id']) { |
| 2222 | 2222 | $currentUserKey = DB::queryFirstRow( |
| 2223 | 2223 | 'SELECT increment_id |
| 2224 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2224 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2225 | 2225 | WHERE object_id = %i AND user_id = %i', |
| 2226 | 2226 | $record['id'], |
| 2227 | 2227 | $post_user_id |
@@ -2243,7 +2243,7 @@ discard block |
||
| 2243 | 2243 | // SHould we change step? |
| 2244 | 2244 | DB::query( |
| 2245 | 2245 | 'SELECT * |
| 2246 | - FROM ' . prefixTable('categories_items') . ' |
|
| 2246 | + FROM ' . prefixTable('categories_items').' |
|
| 2247 | 2247 | WHERE encryption_type = "teampass_aes"' |
| 2248 | 2248 | ); |
| 2249 | 2249 | |
@@ -2267,14 +2267,14 @@ discard block |
||
| 2267 | 2267 | // Loop on suggestions |
| 2268 | 2268 | $rows = DB::query( |
| 2269 | 2269 | 'SELECT id |
| 2270 | - FROM ' . prefixTable('suggestion') . ' |
|
| 2271 | - LIMIT ' . $post_start . ', ' . $post_length |
|
| 2270 | + FROM ' . prefixTable('suggestion').' |
|
| 2271 | + LIMIT ' . $post_start.', '.$post_length |
|
| 2272 | 2272 | ); |
| 2273 | 2273 | foreach ($rows as $record) { |
| 2274 | 2274 | // Get itemKey from current user |
| 2275 | 2275 | $currentUserKey = DB::queryFirstRow( |
| 2276 | 2276 | 'SELECT share_key |
| 2277 | - FROM ' . prefixTable('sharekeys_suggestions') . ' |
|
| 2277 | + FROM ' . prefixTable('sharekeys_suggestions').' |
|
| 2278 | 2278 | WHERE object_id = %i AND user_id = %i', |
| 2279 | 2279 | $record['id'], |
| 2280 | 2280 | $_SESSION['user_id'] |
@@ -2301,7 +2301,7 @@ discard block |
||
| 2301 | 2301 | if ((int) $post_user_id !== (int) $_SESSION['user_id']) { |
| 2302 | 2302 | $currentUserKey = DB::queryFirstRow( |
| 2303 | 2303 | 'SELECT increment_id |
| 2304 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2304 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2305 | 2305 | WHERE object_id = %i AND user_id = %i', |
| 2306 | 2306 | $record['id'], |
| 2307 | 2307 | $post_user_id |
@@ -2346,15 +2346,15 @@ discard block |
||
| 2346 | 2346 | // Loop on files |
| 2347 | 2347 | $rows = DB::query( |
| 2348 | 2348 | 'SELECT id |
| 2349 | - FROM ' . prefixTable('files') . ' |
|
| 2350 | - WHERE status = "' . TP_ENCRYPTION_NAME . '" |
|
| 2351 | - LIMIT ' . $post_start . ', ' . $post_length |
|
| 2349 | + FROM ' . prefixTable('files').' |
|
| 2350 | + WHERE status = "' . TP_ENCRYPTION_NAME.'" |
|
| 2351 | + LIMIT ' . $post_start.', '.$post_length |
|
| 2352 | 2352 | ); //aes_encryption |
| 2353 | 2353 | foreach ($rows as $record) { |
| 2354 | 2354 | // Get itemKey from current user |
| 2355 | 2355 | $currentUserKey = DB::queryFirstRow( |
| 2356 | 2356 | 'SELECT share_key |
| 2357 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
| 2357 | + FROM ' . prefixTable('sharekeys_files').' |
|
| 2358 | 2358 | WHERE object_id = %i AND user_id = %i', |
| 2359 | 2359 | $record['id'], |
| 2360 | 2360 | $_SESSION['user_id'] |
@@ -2381,7 +2381,7 @@ discard block |
||
| 2381 | 2381 | if ((int) $post_user_id !== (int) $_SESSION['user_id']) { |
| 2382 | 2382 | $currentUserKey = DB::queryFirstRow( |
| 2383 | 2383 | 'SELECT increment_id |
| 2384 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2384 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2385 | 2385 | WHERE object_id = %i AND user_id = %i', |
| 2386 | 2386 | $record['id'], |
| 2387 | 2387 | $post_user_id |
@@ -2403,8 +2403,8 @@ discard block |
||
| 2403 | 2403 | // SHould we change step? |
| 2404 | 2404 | DB::query( |
| 2405 | 2405 | 'SELECT * |
| 2406 | - FROM ' . prefixTable('files') . ' |
|
| 2407 | - WHERE status = "' . TP_ENCRYPTION_NAME . '"' |
|
| 2406 | + FROM ' . prefixTable('files').' |
|
| 2407 | + WHERE status = "' . TP_ENCRYPTION_NAME.'"' |
|
| 2408 | 2408 | ); |
| 2409 | 2409 | |
| 2410 | 2410 | $next_start = (int) $post_start + (int) $post_length; |
@@ -2436,16 +2436,16 @@ discard block |
||
| 2436 | 2436 | if (count($_SESSION['personal_folders']) > 0) { |
| 2437 | 2437 | $rows = DB::query( |
| 2438 | 2438 | 'SELECT id, pw |
| 2439 | - FROM ' . prefixTable('items') . ' |
|
| 2439 | + FROM ' . prefixTable('items').' |
|
| 2440 | 2440 | WHERE perso = 1 AND id_tree IN %ls |
| 2441 | - LIMIT ' . $post_start . ', ' . $post_length, |
|
| 2441 | + LIMIT ' . $post_start.', '.$post_length, |
|
| 2442 | 2442 | $_SESSION['personal_folders'] |
| 2443 | 2443 | ); |
| 2444 | 2444 | foreach ($rows as $record) { |
| 2445 | 2445 | // Get itemKey from current user |
| 2446 | 2446 | $currentUserKey = DB::queryFirstRow( |
| 2447 | 2447 | 'SELECT share_key, increment_id |
| 2448 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2448 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2449 | 2449 | WHERE object_id = %i AND user_id = %i', |
| 2450 | 2450 | $record['id'], |
| 2451 | 2451 | $_SESSION['user_id'] |
@@ -2472,7 +2472,7 @@ discard block |
||
| 2472 | 2472 | if ((int) $post_user_id !== (int) $_SESSION['user_id']) { |
| 2473 | 2473 | $currentUserKey = DB::queryFirstRow( |
| 2474 | 2474 | 'SELECT increment_id |
| 2475 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2475 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2476 | 2476 | WHERE object_id = %i AND user_id = %i', |
| 2477 | 2477 | $record['id'], |
| 2478 | 2478 | $post_user_id |
@@ -2495,7 +2495,7 @@ discard block |
||
| 2495 | 2495 | // SHould we change step? |
| 2496 | 2496 | DB::query( |
| 2497 | 2497 | 'SELECT * |
| 2498 | - FROM ' . prefixTable('items') . ' |
|
| 2498 | + FROM ' . prefixTable('items').' |
|
| 2499 | 2499 | WHERE perso = 0' |
| 2500 | 2500 | ); |
| 2501 | 2501 | |
@@ -2519,7 +2519,7 @@ discard block |
||
| 2519 | 2519 | // Check if user exists |
| 2520 | 2520 | $userInfo = DB::queryFirstRow( |
| 2521 | 2521 | 'SELECT public_key, encrypted_psk |
| 2522 | - FROM ' . prefixTable('users') . ' |
|
| 2522 | + FROM ' . prefixTable('users').' |
|
| 2523 | 2523 | WHERE id = %i', |
| 2524 | 2524 | $post_user_id |
| 2525 | 2525 | ); |
@@ -2545,9 +2545,9 @@ discard block |
||
| 2545 | 2545 | // Loop on persoanl items |
| 2546 | 2546 | $rows = DB::query( |
| 2547 | 2547 | 'SELECT id, pw |
| 2548 | - FROM ' . prefixTable('items') . ' |
|
| 2548 | + FROM ' . prefixTable('items').' |
|
| 2549 | 2549 | WHERE perso = 1 AND id_tree IN %ls |
| 2550 | - LIMIT ' . $post_start . ', ' . $post_length, |
|
| 2550 | + LIMIT ' . $post_start.', '.$post_length, |
|
| 2551 | 2551 | $_SESSION['personal_folders'] |
| 2552 | 2552 | ); |
| 2553 | 2553 | $countUserPersonalItems = DB::count(); |
@@ -2590,7 +2590,7 @@ discard block |
||
| 2590 | 2590 | // Loop on files |
| 2591 | 2591 | $rows = DB::query( |
| 2592 | 2592 | 'SELECT id, file |
| 2593 | - FROM ' . prefixTable('files') . ' |
|
| 2593 | + FROM ' . prefixTable('files').' |
|
| 2594 | 2594 | WHERE status != %s |
| 2595 | 2595 | AND id_item = %i', |
| 2596 | 2596 | TP_ENCRYPTION_NAME, |
@@ -2601,14 +2601,14 @@ discard block |
||
| 2601 | 2601 | // Now decrypt the file |
| 2602 | 2602 | prepareFileWithDefuse( |
| 2603 | 2603 | 'decrypt', |
| 2604 | - $SETTINGS['path_to_upload_folder'] . '/' . $record2['file'], |
|
| 2605 | - $SETTINGS['path_to_upload_folder'] . '/' . $record2['file'] . '.delete', |
|
| 2604 | + $SETTINGS['path_to_upload_folder'].'/'.$record2['file'], |
|
| 2605 | + $SETTINGS['path_to_upload_folder'].'/'.$record2['file'].'.delete', |
|
| 2606 | 2606 | $SETTINGS, |
| 2607 | 2607 | $post_user_psk |
| 2608 | 2608 | ); |
| 2609 | 2609 | |
| 2610 | 2610 | // Encrypt the file |
| 2611 | - $encryptedFile = encryptFile($record2['file'] . '.delete', $SETTINGS['path_to_upload_folder']); |
|
| 2611 | + $encryptedFile = encryptFile($record2['file'].'.delete', $SETTINGS['path_to_upload_folder']); |
|
| 2612 | 2612 | |
| 2613 | 2613 | DB::update( |
| 2614 | 2614 | prefixTable('files'), |
@@ -2631,7 +2631,7 @@ discard block |
||
| 2631 | 2631 | ); |
| 2632 | 2632 | |
| 2633 | 2633 | // Unlink original file |
| 2634 | - unlink($SETTINGS['path_to_upload_folder'] . '/' . $record2['file']); |
|
| 2634 | + unlink($SETTINGS['path_to_upload_folder'].'/'.$record2['file']); |
|
| 2635 | 2635 | } |
| 2636 | 2636 | } |
| 2637 | 2637 | } |
@@ -2703,7 +2703,7 @@ discard block |
||
| 2703 | 2703 | // Get user info |
| 2704 | 2704 | $userData = DB::queryFirstRow( |
| 2705 | 2705 | 'SELECT '.$post_fields.' |
| 2706 | - FROM ' . prefixTable('users') . ' |
|
| 2706 | + FROM ' . prefixTable('users').' |
|
| 2707 | 2707 | WHERE id = %i', |
| 2708 | 2708 | $post_user_id |
| 2709 | 2709 | ); |
@@ -2749,7 +2749,7 @@ discard block |
||
| 2749 | 2749 | // Get user info |
| 2750 | 2750 | $userData = DB::queryFirstRow( |
| 2751 | 2751 | 'SELECT auth_type, login, private_key |
| 2752 | - FROM ' . prefixTable('users') . ' |
|
| 2752 | + FROM ' . prefixTable('users').' |
|
| 2753 | 2753 | WHERE id = %i', |
| 2754 | 2754 | $post_user_id |
| 2755 | 2755 | ); |
@@ -2771,7 +2771,7 @@ discard block |
||
| 2771 | 2771 | } |
| 2772 | 2772 | |
| 2773 | 2773 | // Load superGlobals |
| 2774 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 2774 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 2775 | 2775 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 2776 | 2776 | |
| 2777 | 2777 | if ($superGlobal->get('private_key', 'SESSION', 'user') === $privateKey) { |
@@ -2805,7 +2805,7 @@ discard block |
||
| 2805 | 2805 | $SETTINGS['cpassman_dir'], |
| 2806 | 2806 | array( |
| 2807 | 2807 | 'error' => false, |
| 2808 | - 'message' => langHdl('done'),'', |
|
| 2808 | + 'message' => langHdl('done'), '', |
|
| 2809 | 2809 | ), |
| 2810 | 2810 | 'encode' |
| 2811 | 2811 | ); |
@@ -2845,7 +2845,7 @@ discard block |
||
| 2845 | 2845 | // Get user info |
| 2846 | 2846 | $userData = DB::queryFirstRow( |
| 2847 | 2847 | 'SELECT auth_type, login, private_key, special |
| 2848 | - FROM ' . prefixTable('users') . ' |
|
| 2848 | + FROM ' . prefixTable('users').' |
|
| 2849 | 2849 | WHERE id = %i', |
| 2850 | 2850 | $post_user_id |
| 2851 | 2851 | ); |
@@ -2875,7 +2875,7 @@ discard block |
||
| 2875 | 2875 | ); |
| 2876 | 2876 | |
| 2877 | 2877 | // Load superGlobals |
| 2878 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 2878 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 2879 | 2879 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 2880 | 2880 | $superGlobal->put('private_key', $privateKey, 'SESSION', 'user'); |
| 2881 | 2881 | |
@@ -2883,7 +2883,7 @@ discard block |
||
| 2883 | 2883 | $SETTINGS['cpassman_dir'], |
| 2884 | 2884 | array( |
| 2885 | 2885 | 'error' => false, |
| 2886 | - 'message' => langHdl('done'),'', |
|
| 2886 | + 'message' => langHdl('done'), '', |
|
| 2887 | 2887 | ), |
| 2888 | 2888 | 'encode' |
| 2889 | 2889 | ); |
@@ -2908,14 +2908,14 @@ discard block |
||
| 2908 | 2908 | // Get one item |
| 2909 | 2909 | $record = DB::queryFirstRow( |
| 2910 | 2910 | 'SELECT id, pw |
| 2911 | - FROM ' . prefixTable('items') . ' |
|
| 2911 | + FROM ' . prefixTable('items').' |
|
| 2912 | 2912 | WHERE perso = 0' |
| 2913 | 2913 | ); |
| 2914 | 2914 | |
| 2915 | 2915 | // Get itemKey from current user |
| 2916 | 2916 | $currentUserKey = DB::queryFirstRow( |
| 2917 | 2917 | 'SELECT share_key, increment_id |
| 2918 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2918 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2919 | 2919 | WHERE object_id = %i AND user_id = %i', |
| 2920 | 2920 | $record['id'], |
| 2921 | 2921 | $post_user_id |
@@ -2943,7 +2943,7 @@ discard block |
||
| 2943 | 2943 | ); |
| 2944 | 2944 | |
| 2945 | 2945 | // Load superGlobals |
| 2946 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 2946 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 2947 | 2947 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 2948 | 2948 | $superGlobal->put('private_key', $privateKey, 'SESSION', 'user'); |
| 2949 | 2949 | |
@@ -3000,7 +3000,7 @@ discard block |
||
| 3000 | 3000 | $_SESSION['user_id'] |
| 3001 | 3001 | ); |
| 3002 | 3002 | // Return data |
| 3003 | - return '[{"new_value":"' . $_SESSION['sessionDuration'] . '"}]'; |
|
| 3003 | + return '[{"new_value":"'.$_SESSION['sessionDuration'].'"}]'; |
|
| 3004 | 3004 | } |
| 3005 | 3005 | |
| 3006 | 3006 | return '[{"new_value":"expired"}]'; |
