@@ -99,19 +99,19 @@ discard block |
||
| 99 | 99 | $text = Crypto::decrypt($message, $key); |
| 100 | 100 | } |
| 101 | 101 | } catch (CryptoException\WrongKeyOrModifiedCiphertextException $ex) { |
| 102 | - error_log('TEAMPASS-Error-Wrong key or modified ciphertext: ' . $ex->getMessage()); |
|
| 102 | + error_log('TEAMPASS-Error-Wrong key or modified ciphertext: '.$ex->getMessage()); |
|
| 103 | 103 | $err = 'wrong_key_or_modified_ciphertext'; |
| 104 | 104 | } catch (CryptoException\BadFormatException $ex) { |
| 105 | - error_log('TEAMPASS-Error-Bad format exception: ' . $ex->getMessage()); |
|
| 105 | + error_log('TEAMPASS-Error-Bad format exception: '.$ex->getMessage()); |
|
| 106 | 106 | $err = 'bad_format'; |
| 107 | 107 | } catch (CryptoException\EnvironmentIsBrokenException $ex) { |
| 108 | - error_log('TEAMPASS-Error-Environment: ' . $ex->getMessage()); |
|
| 108 | + error_log('TEAMPASS-Error-Environment: '.$ex->getMessage()); |
|
| 109 | 109 | $err = 'environment_error'; |
| 110 | 110 | } catch (CryptoException\IOException $ex) { |
| 111 | - error_log('TEAMPASS-Error-IO: ' . $ex->getMessage()); |
|
| 111 | + error_log('TEAMPASS-Error-IO: '.$ex->getMessage()); |
|
| 112 | 112 | $err = 'io_error'; |
| 113 | 113 | } catch (Exception $ex) { |
| 114 | - error_log('TEAMPASS-Error-Unexpected exception: ' . $ex->getMessage()); |
|
| 114 | + error_log('TEAMPASS-Error-Unexpected exception: '.$ex->getMessage()); |
|
| 115 | 115 | $err = 'unexpected_error'; |
| 116 | 116 | } |
| 117 | 117 | |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | */ |
| 197 | 197 | function trimElement($chaine, string $element): string |
| 198 | 198 | { |
| 199 | - if (! empty($chaine)) { |
|
| 199 | + if (!empty($chaine)) { |
|
| 200 | 200 | if (is_array($chaine) === true) { |
| 201 | 201 | $chaine = implode(';', $chaine); |
| 202 | 202 | } |
@@ -244,8 +244,8 @@ discard block |
||
| 244 | 244 | */ |
| 245 | 245 | function db_error_handler(array $params): void |
| 246 | 246 | { |
| 247 | - echo 'Error: ' . $params['error'] . "<br>\n"; |
|
| 248 | - echo 'Query: ' . $params['query'] . "<br>\n"; |
|
| 247 | + echo 'Error: '.$params['error']."<br>\n"; |
|
| 248 | + echo 'Query: '.$params['query']."<br>\n"; |
|
| 249 | 249 | throw new Exception('Error - Query', 1); |
| 250 | 250 | } |
| 251 | 251 | |
@@ -319,7 +319,7 @@ discard block |
||
| 319 | 319 | $session->set('user-forbiden_personal_folders', []); |
| 320 | 320 | |
| 321 | 321 | // Get list of Folders |
| 322 | - $rows = DB::query('SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', 0); |
|
| 322 | + $rows = DB::query('SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', 0); |
|
| 323 | 323 | foreach ($rows as $record) { |
| 324 | 324 | array_push($groupesVisibles, $record['id']); |
| 325 | 325 | } |
@@ -328,20 +328,20 @@ discard block |
||
| 328 | 328 | // get complete list of ROLES |
| 329 | 329 | $tmp = array_filter(explode(';', $idFonctions !== null ? $idFonctions : '')); |
| 330 | 330 | $rows = DB::query( |
| 331 | - 'SELECT * FROM ' . prefixTable('roles_title') . ' |
|
| 331 | + 'SELECT * FROM '.prefixTable('roles_title').' |
|
| 332 | 332 | ORDER BY title ASC' |
| 333 | 333 | ); |
| 334 | 334 | foreach ($rows as $record) { |
| 335 | - if (! empty($record['id']) && ! in_array($record['id'], $tmp)) { |
|
| 335 | + if (!empty($record['id']) && !in_array($record['id'], $tmp)) { |
|
| 336 | 336 | array_push($tmp, $record['id']); |
| 337 | 337 | } |
| 338 | 338 | } |
| 339 | 339 | $session->set('user-roles', implode(';', $tmp)); |
| 340 | 340 | $session->set('user-admin', 1); |
| 341 | 341 | // Check if admin has created Folders and Roles |
| 342 | - DB::query('SELECT * FROM ' . prefixTable('nested_tree') . ''); |
|
| 342 | + DB::query('SELECT * FROM '.prefixTable('nested_tree').''); |
|
| 343 | 343 | $session->set('user-nb_folders', DB::count()); |
| 344 | - DB::query('SELECT * FROM ' . prefixTable('roles_title')); |
|
| 344 | + DB::query('SELECT * FROM '.prefixTable('roles_title')); |
|
| 345 | 345 | $session->set('user-nb_roles', DB::count()); |
| 346 | 346 | |
| 347 | 347 | return true; |
@@ -424,7 +424,7 @@ discard block |
||
| 424 | 424 | // Does this user is allowed to see other items |
| 425 | 425 | $inc = 0; |
| 426 | 426 | $rows = DB::query( |
| 427 | - 'SELECT id, id_tree FROM ' . prefixTable('items') . ' |
|
| 427 | + 'SELECT id, id_tree FROM '.prefixTable('items').' |
|
| 428 | 428 | WHERE restricted_to LIKE %ss AND inactif = %s'. |
| 429 | 429 | (count($allowedFolders) > 0 ? ' AND id_tree NOT IN ('.implode(',', $allowedFolders).')' : ''), |
| 430 | 430 | $globalsUserId, |
@@ -441,8 +441,8 @@ discard block |
||
| 441 | 441 | // Check for the users roles if some specific rights exist on items |
| 442 | 442 | $rows = DB::query( |
| 443 | 443 | 'SELECT i.id_tree, r.item_id |
| 444 | - FROM ' . prefixTable('items') . ' as i |
|
| 445 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' as r ON (r.item_id=i.id) |
|
| 444 | + FROM ' . prefixTable('items').' as i |
|
| 445 | + INNER JOIN ' . prefixTable('restriction_to_roles').' as r ON (r.item_id=i.id) |
|
| 446 | 446 | WHERE i.id_tree <> "" '. |
| 447 | 447 | (count($userRoles) > 0 ? 'AND r.role_id IN %li ' : ''). |
| 448 | 448 | 'ORDER BY i.id_tree ASC', |
@@ -486,18 +486,18 @@ discard block |
||
| 486 | 486 | $session->set('system-list_restricted_folders_for_items', $restrictedFoldersForItems); |
| 487 | 487 | $session->set('user-forbiden_personal_folders', $noAccessPersonalFolders); |
| 488 | 488 | // Folders and Roles numbers |
| 489 | - DB::queryFirstRow('SELECT id FROM ' . prefixTable('nested_tree') . ''); |
|
| 490 | - DB::queryFirstRow('SELECT id FROM ' . prefixTable('nested_tree') . ''); |
|
| 489 | + DB::queryFirstRow('SELECT id FROM '.prefixTable('nested_tree').''); |
|
| 490 | + DB::queryFirstRow('SELECT id FROM '.prefixTable('nested_tree').''); |
|
| 491 | 491 | $session->set('user-nb_folders', DB::count()); |
| 492 | - DB::queryFirstRow('SELECT id FROM ' . prefixTable('roles_title')); |
|
| 493 | - DB::queryFirstRow('SELECT id FROM ' . prefixTable('roles_title')); |
|
| 492 | + DB::queryFirstRow('SELECT id FROM '.prefixTable('roles_title')); |
|
| 493 | + DB::queryFirstRow('SELECT id FROM '.prefixTable('roles_title')); |
|
| 494 | 494 | $session->set('user-nb_roles', DB::count()); |
| 495 | 495 | // check if change proposals on User's items |
| 496 | 496 | if (isset($SETTINGS['enable_suggestion']) === true && (int) $SETTINGS['enable_suggestion'] === 1) { |
| 497 | 497 | $countNewItems = DB::query( |
| 498 | 498 | 'SELECT COUNT(*) |
| 499 | - FROM ' . prefixTable('items_change') . ' AS c |
|
| 500 | - LEFT JOIN ' . prefixTable('log_items') . ' AS i ON (c.item_id = i.id_item) |
|
| 499 | + FROM ' . prefixTable('items_change').' AS c |
|
| 500 | + LEFT JOIN ' . prefixTable('log_items').' AS i ON (c.item_id = i.id_item) |
|
| 501 | 501 | WHERE i.action = %s AND i.id_user = %i', |
| 502 | 502 | 'at_creation', |
| 503 | 503 | $globalsUserId |
@@ -524,7 +524,7 @@ discard block |
||
| 524 | 524 | { |
| 525 | 525 | $rows = DB::query( |
| 526 | 526 | 'SELECT * |
| 527 | - FROM ' . prefixTable('roles_values') . ' |
|
| 527 | + FROM ' . prefixTable('roles_values').' |
|
| 528 | 528 | WHERE type IN %ls'.(count($userRoles) > 0 ? ' AND role_id IN %li' : ''), |
| 529 | 529 | ['W', 'ND', 'NE', 'NDNE', 'R'], |
| 530 | 530 | $userRoles, |
@@ -591,7 +591,7 @@ discard block |
||
| 591 | 591 | ) { |
| 592 | 592 | $persoFld = DB::queryFirstRow( |
| 593 | 593 | 'SELECT id |
| 594 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 594 | + FROM ' . prefixTable('nested_tree').' |
|
| 595 | 595 | WHERE title = %s AND personal_folder = %i'. |
| 596 | 596 | (count($allowedFolders) > 0 ? ' AND id NOT IN ('.implode(',', $allowedFolders).')' : ''), |
| 597 | 597 | $globalsUserId, |
@@ -624,7 +624,7 @@ discard block |
||
| 624 | 624 | } |
| 625 | 625 | $persoFlds = DB::query( |
| 626 | 626 | 'SELECT id |
| 627 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 627 | + FROM ' . prefixTable('nested_tree').' |
|
| 628 | 628 | WHERE %l', |
| 629 | 629 | $where |
| 630 | 630 | ); |
@@ -692,12 +692,12 @@ discard block |
||
| 692 | 692 | //Load Tree |
| 693 | 693 | $tree = new NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title'); |
| 694 | 694 | // truncate table |
| 695 | - DB::query('TRUNCATE TABLE ' . prefixTable('cache')); |
|
| 695 | + DB::query('TRUNCATE TABLE '.prefixTable('cache')); |
|
| 696 | 696 | // reload date |
| 697 | 697 | $rows = DB::query( |
| 698 | 698 | 'SELECT * |
| 699 | - FROM ' . prefixTable('items') . ' as i |
|
| 700 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 699 | + FROM ' . prefixTable('items').' as i |
|
| 700 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 701 | 701 | AND l.action = %s |
| 702 | 702 | AND i.inactif = %i', |
| 703 | 703 | 'at_creation', |
@@ -709,18 +709,18 @@ discard block |
||
| 709 | 709 | $tags = ''; |
| 710 | 710 | $itemTags = DB::query( |
| 711 | 711 | 'SELECT tag |
| 712 | - FROM ' . prefixTable('tags') . ' |
|
| 712 | + FROM ' . prefixTable('tags').' |
|
| 713 | 713 | WHERE item_id = %i AND tag != ""', |
| 714 | 714 | $record['id'] |
| 715 | 715 | ); |
| 716 | 716 | foreach ($itemTags as $itemTag) { |
| 717 | - $tags .= $itemTag['tag'] . ' '; |
|
| 717 | + $tags .= $itemTag['tag'].' '; |
|
| 718 | 718 | } |
| 719 | 719 | |
| 720 | 720 | // Get renewal period |
| 721 | 721 | $resNT = DB::queryFirstRow( |
| 722 | 722 | 'SELECT renewal_period |
| 723 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 723 | + FROM ' . prefixTable('nested_tree').' |
|
| 724 | 724 | WHERE id = %i', |
| 725 | 725 | $record['id_tree'] |
| 726 | 726 | ); |
@@ -733,7 +733,7 @@ discard block |
||
| 733 | 733 | // Is this a User id? |
| 734 | 734 | $user = DB::queryFirstRow( |
| 735 | 735 | 'SELECT id, login |
| 736 | - FROM ' . prefixTable('users') . ' |
|
| 736 | + FROM ' . prefixTable('users').' |
|
| 737 | 737 | WHERE id = %i', |
| 738 | 738 | $elem->title |
| 739 | 739 | ); |
@@ -751,11 +751,11 @@ discard block |
||
| 751 | 751 | 'id' => $record['id'], |
| 752 | 752 | 'label' => $record['label'], |
| 753 | 753 | 'description' => $record['description'] ?? '', |
| 754 | - 'url' => isset($record['url']) && ! empty($record['url']) ? $record['url'] : '0', |
|
| 754 | + 'url' => isset($record['url']) && !empty($record['url']) ? $record['url'] : '0', |
|
| 755 | 755 | 'tags' => $tags, |
| 756 | 756 | 'id_tree' => $record['id_tree'], |
| 757 | 757 | 'perso' => $record['perso'], |
| 758 | - 'restricted_to' => isset($record['restricted_to']) && ! empty($record['restricted_to']) ? $record['restricted_to'] : '0', |
|
| 758 | + 'restricted_to' => isset($record['restricted_to']) && !empty($record['restricted_to']) ? $record['restricted_to'] : '0', |
|
| 759 | 759 | 'login' => $record['login'] ?? '', |
| 760 | 760 | 'folder' => implode(' » ', $folder), |
| 761 | 761 | 'author' => $record['id_user'], |
@@ -784,7 +784,7 @@ discard block |
||
| 784 | 784 | // get new value from db |
| 785 | 785 | $data = DB::queryFirstRow( |
| 786 | 786 | 'SELECT label, description, id_tree, perso, restricted_to, login, url |
| 787 | - FROM ' . prefixTable('items') . ' |
|
| 787 | + FROM ' . prefixTable('items').' |
|
| 788 | 788 | WHERE id=%i', |
| 789 | 789 | $ident |
| 790 | 790 | ); |
@@ -792,12 +792,12 @@ discard block |
||
| 792 | 792 | $tags = ''; |
| 793 | 793 | $itemTags = DB::query( |
| 794 | 794 | 'SELECT tag |
| 795 | - FROM ' . prefixTable('tags') . ' |
|
| 795 | + FROM ' . prefixTable('tags').' |
|
| 796 | 796 | WHERE item_id = %i AND tag != ""', |
| 797 | 797 | $ident |
| 798 | 798 | ); |
| 799 | 799 | foreach ($itemTags as $itemTag) { |
| 800 | - $tags .= $itemTag['tag'] . ' '; |
|
| 800 | + $tags .= $itemTag['tag'].' '; |
|
| 801 | 801 | } |
| 802 | 802 | // form id_tree to full foldername |
| 803 | 803 | $folder = []; |
@@ -808,7 +808,7 @@ discard block |
||
| 808 | 808 | // Is this a User id? |
| 809 | 809 | $user = DB::queryFirstRow( |
| 810 | 810 | 'SELECT id, login |
| 811 | - FROM ' . prefixTable('users') . ' |
|
| 811 | + FROM ' . prefixTable('users').' |
|
| 812 | 812 | WHERE id = %i', |
| 813 | 813 | $elem->title |
| 814 | 814 | ); |
@@ -826,10 +826,10 @@ discard block |
||
| 826 | 826 | 'label' => $data['label'], |
| 827 | 827 | 'description' => $data['description'], |
| 828 | 828 | 'tags' => $tags, |
| 829 | - 'url' => isset($data['url']) && ! empty($data['url']) ? $data['url'] : '0', |
|
| 829 | + 'url' => isset($data['url']) && !empty($data['url']) ? $data['url'] : '0', |
|
| 830 | 830 | 'id_tree' => $data['id_tree'], |
| 831 | 831 | 'perso' => $data['perso'], |
| 832 | - 'restricted_to' => isset($data['restricted_to']) && ! empty($data['restricted_to']) ? $data['restricted_to'] : '0', |
|
| 832 | + 'restricted_to' => isset($data['restricted_to']) && !empty($data['restricted_to']) ? $data['restricted_to'] : '0', |
|
| 833 | 833 | 'login' => $data['login'] ?? '', |
| 834 | 834 | 'folder' => implode(' » ', $folder), |
| 835 | 835 | 'author' => $session->get('user-id'), |
@@ -859,8 +859,8 @@ discard block |
||
| 859 | 859 | // get new value from db |
| 860 | 860 | $data = DB::queryFirstRow( |
| 861 | 861 | 'SELECT i.label, i.description, i.id_tree as id_tree, i.perso, i.restricted_to, i.id, i.login, i.url, l.date |
| 862 | - FROM ' . prefixTable('items') . ' as i |
|
| 863 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 862 | + FROM ' . prefixTable('items').' as i |
|
| 863 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 864 | 864 | WHERE i.id = %i |
| 865 | 865 | AND l.action = %s', |
| 866 | 866 | $ident, |
@@ -870,12 +870,12 @@ discard block |
||
| 870 | 870 | $tags = ''; |
| 871 | 871 | $itemTags = DB::query( |
| 872 | 872 | 'SELECT tag |
| 873 | - FROM ' . prefixTable('tags') . ' |
|
| 873 | + FROM ' . prefixTable('tags').' |
|
| 874 | 874 | WHERE item_id = %i AND tag != ""', |
| 875 | 875 | $ident |
| 876 | 876 | ); |
| 877 | 877 | foreach ($itemTags as $itemTag) { |
| 878 | - $tags .= $itemTag['tag'] . ' '; |
|
| 878 | + $tags .= $itemTag['tag'].' '; |
|
| 879 | 879 | } |
| 880 | 880 | // form id_tree to full foldername |
| 881 | 881 | $folder = []; |
@@ -886,7 +886,7 @@ discard block |
||
| 886 | 886 | // Is this a User id? |
| 887 | 887 | $user = DB::queryFirstRow( |
| 888 | 888 | 'SELECT id, login |
| 889 | - FROM ' . prefixTable('users') . ' |
|
| 889 | + FROM ' . prefixTable('users').' |
|
| 890 | 890 | WHERE id = %i', |
| 891 | 891 | $elem->title |
| 892 | 892 | ); |
@@ -905,7 +905,7 @@ discard block |
||
| 905 | 905 | 'label' => $data['label'], |
| 906 | 906 | 'description' => $data['description'], |
| 907 | 907 | 'tags' => empty($tags) === false ? $tags : 'None', |
| 908 | - 'url' => isset($data['url']) && ! empty($data['url']) ? $data['url'] : '0', |
|
| 908 | + 'url' => isset($data['url']) && !empty($data['url']) ? $data['url'] : '0', |
|
| 909 | 909 | 'id_tree' => $data['id_tree'], |
| 910 | 910 | 'perso' => isset($data['perso']) && empty($data['perso']) === false && $data['perso'] !== 'None' ? $data['perso'] : '0', |
| 911 | 911 | 'restricted_to' => isset($data['restricted_to']) && empty($data['restricted_to']) === false ? $data['restricted_to'] : '0', |
@@ -927,53 +927,53 @@ discard block |
||
| 927 | 927 | function getStatisticsData(array $SETTINGS): array |
| 928 | 928 | { |
| 929 | 929 | DB::query( |
| 930 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', |
|
| 930 | + 'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', |
|
| 931 | 931 | 0 |
| 932 | 932 | ); |
| 933 | 933 | $counter_folders = DB::count(); |
| 934 | 934 | DB::query( |
| 935 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', |
|
| 935 | + 'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', |
|
| 936 | 936 | 1 |
| 937 | 937 | ); |
| 938 | 938 | $counter_folders_perso = DB::count(); |
| 939 | 939 | DB::query( |
| 940 | - 'SELECT id FROM ' . prefixTable('items') . ' WHERE perso = %i', |
|
| 940 | + 'SELECT id FROM '.prefixTable('items').' WHERE perso = %i', |
|
| 941 | 941 | 0 |
| 942 | 942 | ); |
| 943 | 943 | $counter_items = DB::count(); |
| 944 | 944 | DB::query( |
| 945 | - 'SELECT id FROM ' . prefixTable('items') . ' WHERE perso = %i', |
|
| 945 | + 'SELECT id FROM '.prefixTable('items').' WHERE perso = %i', |
|
| 946 | 946 | 1 |
| 947 | 947 | ); |
| 948 | 948 | $counter_items_perso = DB::count(); |
| 949 | 949 | DB::query( |
| 950 | - 'SELECT id FROM ' . prefixTable('users') . ' WHERE login NOT IN (%s, %s, %s)', |
|
| 950 | + 'SELECT id FROM '.prefixTable('users').' WHERE login NOT IN (%s, %s, %s)', |
|
| 951 | 951 | 'OTV', 'TP', 'API' |
| 952 | 952 | ); |
| 953 | 953 | $counter_users = DB::count(); |
| 954 | 954 | DB::query( |
| 955 | - 'SELECT id FROM ' . prefixTable('users') . ' WHERE admin = %i', |
|
| 955 | + 'SELECT id FROM '.prefixTable('users').' WHERE admin = %i', |
|
| 956 | 956 | 1 |
| 957 | 957 | ); |
| 958 | 958 | $admins = DB::count(); |
| 959 | 959 | DB::query( |
| 960 | - 'SELECT id FROM ' . prefixTable('users') . ' WHERE gestionnaire = %i', |
|
| 960 | + 'SELECT id FROM '.prefixTable('users').' WHERE gestionnaire = %i', |
|
| 961 | 961 | 1 |
| 962 | 962 | ); |
| 963 | 963 | $managers = DB::count(); |
| 964 | 964 | DB::query( |
| 965 | - 'SELECT id FROM ' . prefixTable('users') . ' WHERE read_only = %i', |
|
| 965 | + 'SELECT id FROM '.prefixTable('users').' WHERE read_only = %i', |
|
| 966 | 966 | 1 |
| 967 | 967 | ); |
| 968 | 968 | $readOnly = DB::count(); |
| 969 | 969 | // list the languages |
| 970 | 970 | $usedLang = []; |
| 971 | 971 | $tp_languages = DB::query( |
| 972 | - 'SELECT name FROM ' . prefixTable('languages') |
|
| 972 | + 'SELECT name FROM '.prefixTable('languages') |
|
| 973 | 973 | ); |
| 974 | 974 | foreach ($tp_languages as $tp_language) { |
| 975 | 975 | DB::query( |
| 976 | - 'SELECT * FROM ' . prefixTable('users') . ' WHERE user_language = %s', |
|
| 976 | + 'SELECT * FROM '.prefixTable('users').' WHERE user_language = %s', |
|
| 977 | 977 | $tp_language['name'] |
| 978 | 978 | ); |
| 979 | 979 | $usedLang[$tp_language['name']] = round((DB::count() * 100 / $counter_users), 0); |
@@ -982,12 +982,12 @@ discard block |
||
| 982 | 982 | // get list of ips |
| 983 | 983 | $usedIp = []; |
| 984 | 984 | $tp_ips = DB::query( |
| 985 | - 'SELECT user_ip FROM ' . prefixTable('users') |
|
| 985 | + 'SELECT user_ip FROM '.prefixTable('users') |
|
| 986 | 986 | ); |
| 987 | 987 | foreach ($tp_ips as $ip) { |
| 988 | 988 | if (array_key_exists($ip['user_ip'], $usedIp)) { |
| 989 | 989 | $usedIp[$ip['user_ip']] += $usedIp[$ip['user_ip']]; |
| 990 | - } elseif (! empty($ip['user_ip']) && $ip['user_ip'] !== 'none') { |
|
| 990 | + } elseif (!empty($ip['user_ip']) && $ip['user_ip'] !== 'none') { |
|
| 991 | 991 | $usedIp[$ip['user_ip']] = 1; |
| 992 | 992 | } |
| 993 | 993 | } |
@@ -1082,7 +1082,7 @@ discard block |
||
| 1082 | 1082 | <table width="600" cellpadding="0" cellspacing="0" border="0" class="container" bgcolor="#ffffff" style="border-spacing: 0; border-bottom: 1px solid #e0e0e0; box-shadow: 0 0 3px #ddd; color: #434343; font-family: Helvetica, Verdana, sans-serif;"> |
| 1083 | 1083 | <tr><td class="container-padding" bgcolor="#ffffff" style="border-collapse: collapse; border-left: 1px solid #e0e0e0; background-color: #ffffff; padding-left: 30px; padding-right: 30px;"> |
| 1084 | 1084 | <br><div style="float:right;">' . |
| 1085 | - $textMail . |
|
| 1085 | + $textMail. |
|
| 1086 | 1086 | '<br><br></td></tr></table> |
| 1087 | 1087 | </td></tr></table> |
| 1088 | 1088 | <br></body></html>'; |
@@ -1163,7 +1163,7 @@ discard block |
||
| 1163 | 1163 | { |
| 1164 | 1164 | array_walk_recursive( |
| 1165 | 1165 | $array, |
| 1166 | - static function (&$item): void { |
|
| 1166 | + static function(&$item): void { |
|
| 1167 | 1167 | if (mb_detect_encoding((string) $item, 'utf-8', true) === false) { |
| 1168 | 1168 | $item = mb_convert_encoding($item, 'ISO-8859-1', 'UTF-8'); |
| 1169 | 1169 | } |
@@ -1274,7 +1274,7 @@ discard block |
||
| 1274 | 1274 | */ |
| 1275 | 1275 | function prefixTable(string $table): string |
| 1276 | 1276 | { |
| 1277 | - $safeTable = htmlspecialchars(DB_PREFIX . $table); |
|
| 1277 | + $safeTable = htmlspecialchars(DB_PREFIX.$table); |
|
| 1278 | 1278 | return $safeTable; |
| 1279 | 1279 | } |
| 1280 | 1280 | |
@@ -1391,7 +1391,7 @@ discard block |
||
| 1391 | 1391 | function send_syslog($message, $host, $port, $component = 'teampass'): void |
| 1392 | 1392 | { |
| 1393 | 1393 | $sock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP); |
| 1394 | - $syslog_message = '<123>' . date('M d H:i:s ') . $component . ': ' . $message; |
|
| 1394 | + $syslog_message = '<123>'.date('M d H:i:s ').$component.': '.$message; |
|
| 1395 | 1395 | socket_sendto($sock, (string) $syslog_message, strlen($syslog_message), 0, (string) $host, (int) $port); |
| 1396 | 1396 | socket_close($sock); |
| 1397 | 1397 | } |
@@ -1438,14 +1438,14 @@ discard block |
||
| 1438 | 1438 | if (isset($SETTINGS['syslog_enable']) === true && (int) $SETTINGS['syslog_enable'] === 1) { |
| 1439 | 1439 | if ($type === 'user_mngt') { |
| 1440 | 1440 | send_syslog( |
| 1441 | - 'action=' . str_replace('at_', '', $label) . ' attribute=user user=' . $who . ' userid="' . $login . '" change="' . $field_1 . '" ', |
|
| 1441 | + 'action='.str_replace('at_', '', $label).' attribute=user user='.$who.' userid="'.$login.'" change="'.$field_1.'" ', |
|
| 1442 | 1442 | $SETTINGS['syslog_host'], |
| 1443 | 1443 | $SETTINGS['syslog_port'], |
| 1444 | 1444 | 'teampass' |
| 1445 | 1445 | ); |
| 1446 | 1446 | } else { |
| 1447 | 1447 | send_syslog( |
| 1448 | - 'action=' . $type . ' attribute=' . $label . ' user=' . $who . ' userid="' . $login . '" ', |
|
| 1448 | + 'action='.$type.' attribute='.$label.' user='.$who.' userid="'.$login.'" ', |
|
| 1449 | 1449 | $SETTINGS['syslog_host'], |
| 1450 | 1450 | $SETTINGS['syslog_port'], |
| 1451 | 1451 | 'teampass' |
@@ -1520,7 +1520,7 @@ discard block |
||
| 1520 | 1520 | if (empty($item_label) === true) { |
| 1521 | 1521 | $dataItem = DB::queryFirstRow( |
| 1522 | 1522 | 'SELECT id, id_tree, label |
| 1523 | - FROM ' . prefixTable('items') . ' |
|
| 1523 | + FROM ' . prefixTable('items').' |
|
| 1524 | 1524 | WHERE id = %i', |
| 1525 | 1525 | $item_id |
| 1526 | 1526 | ); |
@@ -1528,11 +1528,11 @@ discard block |
||
| 1528 | 1528 | } |
| 1529 | 1529 | |
| 1530 | 1530 | send_syslog( |
| 1531 | - 'action=' . str_replace('at_', '', $action) . |
|
| 1532 | - ' attribute=' . str_replace('at_', '', $attribute[0]) . |
|
| 1533 | - ' itemno=' . $item_id . |
|
| 1534 | - ' user=' . (is_null($login) === true ? '' : addslashes((string) $login)) . |
|
| 1535 | - ' itemname="' . addslashes($item_label) . '"', |
|
| 1531 | + 'action='.str_replace('at_', '', $action). |
|
| 1532 | + ' attribute='.str_replace('at_', '', $attribute[0]). |
|
| 1533 | + ' itemno='.$item_id. |
|
| 1534 | + ' user='.(is_null($login) === true ? '' : addslashes((string) $login)). |
|
| 1535 | + ' itemname="'.addslashes($item_label).'"', |
|
| 1536 | 1536 | $SETTINGS['syslog_host'], |
| 1537 | 1537 | $SETTINGS['syslog_port'], |
| 1538 | 1538 | 'teampass' |
@@ -1563,8 +1563,8 @@ discard block |
||
| 1563 | 1563 | // send email to user that what to be notified |
| 1564 | 1564 | $notification = DB::queryFirstField( |
| 1565 | 1565 | 'SELECT email |
| 1566 | - FROM ' . prefixTable('notification') . ' AS n |
|
| 1567 | - INNER JOIN ' . prefixTable('users') . ' AS u ON (n.user_id = u.id) |
|
| 1566 | + FROM ' . prefixTable('notification').' AS n |
|
| 1567 | + INNER JOIN ' . prefixTable('users').' AS u ON (n.user_id = u.id) |
|
| 1568 | 1568 | WHERE n.item_id = %i AND n.user_id != %i', |
| 1569 | 1569 | $item_id, |
| 1570 | 1570 | $globalsUserId |
@@ -1575,7 +1575,7 @@ discard block |
||
| 1575 | 1575 | // Get list of changes |
| 1576 | 1576 | $htmlChanges = '<ul>'; |
| 1577 | 1577 | foreach ($changes as $change) { |
| 1578 | - $htmlChanges .= '<li>' . $change . '</li>'; |
|
| 1578 | + $htmlChanges .= '<li>'.$change.'</li>'; |
|
| 1579 | 1579 | } |
| 1580 | 1580 | $htmlChanges .= '</ul>'; |
| 1581 | 1581 | // send email |
@@ -1612,15 +1612,15 @@ discard block |
||
| 1612 | 1612 | $path = ''; |
| 1613 | 1613 | foreach ($arbo as $elem) { |
| 1614 | 1614 | if (empty($path) === true) { |
| 1615 | - $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES) . ' '; |
|
| 1615 | + $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES).' '; |
|
| 1616 | 1616 | } else { |
| 1617 | - $path .= '→ ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 1617 | + $path .= '→ '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 1618 | 1618 | } |
| 1619 | 1619 | } |
| 1620 | 1620 | |
| 1621 | 1621 | // Build text to show user |
| 1622 | 1622 | if (empty($label) === false) { |
| 1623 | - return empty($path) === true ? addslashes($label) : addslashes($label) . ' (' . $path . ')'; |
|
| 1623 | + return empty($path) === true ? addslashes($label) : addslashes($label).' ('.$path.')'; |
|
| 1624 | 1624 | } |
| 1625 | 1625 | return empty($path) === true ? '' : $path; |
| 1626 | 1626 | } |
@@ -1676,7 +1676,7 @@ discard block |
||
| 1676 | 1676 | { |
| 1677 | 1677 | // Perform a copy if the file exists |
| 1678 | 1678 | if (file_exists($configFilePath)) { |
| 1679 | - $backupFilePath = $configFilePath . '.' . date('Y_m_d_His', time()); |
|
| 1679 | + $backupFilePath = $configFilePath.'.'.date('Y_m_d_His', time()); |
|
| 1680 | 1680 | if (!copy($configFilePath, $backupFilePath)) { |
| 1681 | 1681 | return "ERROR: Could not copy file '$configFilePath'"; |
| 1682 | 1682 | } |
@@ -1684,10 +1684,10 @@ discard block |
||
| 1684 | 1684 | |
| 1685 | 1685 | // Regenerate the config file |
| 1686 | 1686 | $data = ["<?php\n", "global \$SETTINGS;\n", "\$SETTINGS = array (\n"]; |
| 1687 | - $rows = DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type=%s', 'admin'); |
|
| 1687 | + $rows = DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type=%s', 'admin'); |
|
| 1688 | 1688 | foreach ($rows as $record) { |
| 1689 | 1689 | $value = getEncryptedValue($record['valeur'], $record['is_encrypted']); |
| 1690 | - $data[] = " '{$record['intitule']}' => '". htmlspecialchars_decode($value, ENT_COMPAT) . "',\n"; |
|
| 1690 | + $data[] = " '{$record['intitule']}' => '".htmlspecialchars_decode($value, ENT_COMPAT)."',\n"; |
|
| 1691 | 1691 | } |
| 1692 | 1692 | $data[] = ");\n"; |
| 1693 | 1693 | $data = array_unique($data); |
@@ -1732,7 +1732,7 @@ discard block |
||
| 1732 | 1732 | { |
| 1733 | 1733 | global $SETTINGS; |
| 1734 | 1734 | /* LOAD CPASSMAN SETTINGS */ |
| 1735 | - if (! isset($SETTINGS['loaded']) || $SETTINGS['loaded'] !== 1) { |
|
| 1735 | + if (!isset($SETTINGS['loaded']) || $SETTINGS['loaded'] !== 1) { |
|
| 1736 | 1736 | $SETTINGS = []; |
| 1737 | 1737 | $SETTINGS['duplicate_folder'] = 0; |
| 1738 | 1738 | //by default, this is set to 0; |
@@ -1742,7 +1742,7 @@ discard block |
||
| 1742 | 1742 | //by default, this value is set to 5; |
| 1743 | 1743 | $settings = []; |
| 1744 | 1744 | $rows = DB::query( |
| 1745 | - 'SELECT * FROM ' . prefixTable('misc') . ' WHERE type=%s_type OR type=%s_type2', |
|
| 1745 | + 'SELECT * FROM '.prefixTable('misc').' WHERE type=%s_type OR type=%s_type2', |
|
| 1746 | 1746 | [ |
| 1747 | 1747 | 'type' => 'admin', |
| 1748 | 1748 | 'type2' => 'settings', |
@@ -1774,7 +1774,7 @@ discard block |
||
| 1774 | 1774 | $source_cf = []; |
| 1775 | 1775 | $rows = DB::query( |
| 1776 | 1776 | 'SELECT id_category |
| 1777 | - FROM ' . prefixTable('categories_folders') . ' |
|
| 1777 | + FROM ' . prefixTable('categories_folders').' |
|
| 1778 | 1778 | WHERE id_folder = %i', |
| 1779 | 1779 | $source_id |
| 1780 | 1780 | ); |
@@ -1785,7 +1785,7 @@ discard block |
||
| 1785 | 1785 | $target_cf = []; |
| 1786 | 1786 | $rows = DB::query( |
| 1787 | 1787 | 'SELECT id_category |
| 1788 | - FROM ' . prefixTable('categories_folders') . ' |
|
| 1788 | + FROM ' . prefixTable('categories_folders').' |
|
| 1789 | 1789 | WHERE id_folder = %i', |
| 1790 | 1790 | $target_id |
| 1791 | 1791 | ); |
@@ -1880,10 +1880,10 @@ discard block |
||
| 1880 | 1880 | } catch (CryptoException\WrongKeyOrModifiedCiphertextException $ex) { |
| 1881 | 1881 | $err = 'wrong_key'; |
| 1882 | 1882 | } catch (CryptoException\EnvironmentIsBrokenException $ex) { |
| 1883 | - error_log('TEAMPASS-Error-Environment: ' . $ex->getMessage()); |
|
| 1883 | + error_log('TEAMPASS-Error-Environment: '.$ex->getMessage()); |
|
| 1884 | 1884 | $err = 'environment_error'; |
| 1885 | 1885 | } catch (CryptoException\IOException $ex) { |
| 1886 | - error_log('TEAMPASS-Error-General: ' . $ex->getMessage()); |
|
| 1886 | + error_log('TEAMPASS-Error-General: '.$ex->getMessage()); |
|
| 1887 | 1887 | $err = 'general_error'; |
| 1888 | 1888 | } |
| 1889 | 1889 | |
@@ -1915,10 +1915,10 @@ discard block |
||
| 1915 | 1915 | } catch (CryptoException\WrongKeyOrModifiedCiphertextException $ex) { |
| 1916 | 1916 | $err = 'wrong_key'; |
| 1917 | 1917 | } catch (CryptoException\EnvironmentIsBrokenException $ex) { |
| 1918 | - error_log('TEAMPASS-Error-Environment: ' . $ex->getMessage()); |
|
| 1918 | + error_log('TEAMPASS-Error-Environment: '.$ex->getMessage()); |
|
| 1919 | 1919 | $err = 'environment_error'; |
| 1920 | 1920 | } catch (CryptoException\IOException $ex) { |
| 1921 | - error_log('TEAMPASS-Error-General: ' . $ex->getMessage()); |
|
| 1921 | + error_log('TEAMPASS-Error-General: '.$ex->getMessage()); |
|
| 1922 | 1922 | $err = 'general_error'; |
| 1923 | 1923 | } |
| 1924 | 1924 | |
@@ -2004,7 +2004,7 @@ discard block |
||
| 2004 | 2004 | ) { |
| 2005 | 2005 | // Check if the path exists |
| 2006 | 2006 | $path = basename($path); |
| 2007 | - if (! file_exists($path)) { |
|
| 2007 | + if (!file_exists($path)) { |
|
| 2008 | 2008 | return false; |
| 2009 | 2009 | } |
| 2010 | 2010 | |
@@ -2057,7 +2057,7 @@ discard block |
||
| 2057 | 2057 | // Load item data |
| 2058 | 2058 | $data = DB::queryFirstRow( |
| 2059 | 2059 | 'SELECT id_tree |
| 2060 | - FROM ' . prefixTable('items') . ' |
|
| 2060 | + FROM ' . prefixTable('items').' |
|
| 2061 | 2061 | WHERE id = %i', |
| 2062 | 2062 | $item_id |
| 2063 | 2063 | ); |
@@ -2120,7 +2120,7 @@ discard block |
||
| 2120 | 2120 | } |
| 2121 | 2121 | $host .= substr(explode(".", $email[1])[0], -1, 1); |
| 2122 | 2122 | } |
| 2123 | - $email = $name . "@" . $host . "." . explode(".", $email[1])[1]; |
|
| 2123 | + $email = $name."@".$host.".".explode(".", $email[1])[1]; |
|
| 2124 | 2124 | return $email; |
| 2125 | 2125 | } |
| 2126 | 2126 | |
@@ -2151,11 +2151,11 @@ discard block |
||
| 2151 | 2151 | function formatSizeUnits(int $bytes): string |
| 2152 | 2152 | { |
| 2153 | 2153 | if ($bytes >= 1073741824) { |
| 2154 | - $bytes = number_format($bytes / 1073741824, 2) . ' GB'; |
|
| 2154 | + $bytes = number_format($bytes / 1073741824, 2).' GB'; |
|
| 2155 | 2155 | } elseif ($bytes >= 1048576) { |
| 2156 | - $bytes = number_format($bytes / 1048576, 2) . ' MB'; |
|
| 2156 | + $bytes = number_format($bytes / 1048576, 2).' MB'; |
|
| 2157 | 2157 | } elseif ($bytes >= 1024) { |
| 2158 | - $bytes = number_format($bytes / 1024, 2) . ' KB'; |
|
| 2158 | + $bytes = number_format($bytes / 1024, 2).' KB'; |
|
| 2159 | 2159 | } elseif ($bytes > 1) { |
| 2160 | 2160 | $bytes .= ' bytes'; |
| 2161 | 2161 | } elseif ($bytes === 1) { |
@@ -2322,7 +2322,7 @@ discard block |
||
| 2322 | 2322 | */ |
| 2323 | 2323 | function generateKeyIntegrityHash(string $userSeed, string $publicKey, string $serverSecret): string |
| 2324 | 2324 | { |
| 2325 | - return hash_hmac('sha256', $userSeed . $publicKey, $serverSecret); |
|
| 2325 | + return hash_hmac('sha256', $userSeed.$publicKey, $serverSecret); |
|
| 2326 | 2326 | } |
| 2327 | 2327 | |
| 2328 | 2328 | /** |
@@ -2397,7 +2397,7 @@ discard block |
||
| 2397 | 2397 | 'security_alert', |
| 2398 | 2398 | 'key_integrity_check_failed', |
| 2399 | 2399 | (string) $userInfo['id'], |
| 2400 | - 'User: ' . $userInfo['login'] |
|
| 2400 | + 'User: '.$userInfo['login'] |
|
| 2401 | 2401 | ); |
| 2402 | 2402 | return [ |
| 2403 | 2403 | 'success' => false, |
@@ -2444,7 +2444,7 @@ discard block |
||
| 2444 | 2444 | 'user_connection', |
| 2445 | 2445 | 'auto_reencryption_success', |
| 2446 | 2446 | (string) $userInfo['id'], |
| 2447 | - 'User: ' . $userInfo['login'] |
|
| 2447 | + 'User: '.$userInfo['login'] |
|
| 2448 | 2448 | ); |
| 2449 | 2449 | |
| 2450 | 2450 | // Store in session for immediate use |
@@ -2463,12 +2463,12 @@ discard block |
||
| 2463 | 2463 | 'security_alert', |
| 2464 | 2464 | 'auto_reencryption_failed', |
| 2465 | 2465 | (string) $userInfo['id'], |
| 2466 | - 'User: ' . $userInfo['login'] . ' - Error: ' . $e->getMessage() |
|
| 2466 | + 'User: '.$userInfo['login'].' - Error: '.$e->getMessage() |
|
| 2467 | 2467 | ); |
| 2468 | 2468 | |
| 2469 | 2469 | return [ |
| 2470 | 2470 | 'success' => false, |
| 2471 | - 'error' => 'decryption_failed: ' . $e->getMessage(), |
|
| 2471 | + 'error' => 'decryption_failed: '.$e->getMessage(), |
|
| 2472 | 2472 | 'private_key_clear' => '', |
| 2473 | 2473 | ]; |
| 2474 | 2474 | } |
@@ -2535,7 +2535,7 @@ discard block |
||
| 2535 | 2535 | 'security_alert', |
| 2536 | 2536 | 'auto_reencryption_critical_failure', |
| 2537 | 2537 | (string) $userId, |
| 2538 | - 'User: ' . $userInfo['login'] . ' - disabled due to key recovery failure' |
|
| 2538 | + 'User: '.$userInfo['login'].' - disabled due to key recovery failure' |
|
| 2539 | 2539 | ); |
| 2540 | 2540 | |
| 2541 | 2541 | return false; |
@@ -2693,7 +2693,7 @@ discard block |
||
| 2693 | 2693 | $cipher->enableContinuousBuffer(); |
| 2694 | 2694 | |
| 2695 | 2695 | // Encrypt the file content |
| 2696 | - $filePath = filter_var($fileInPath . '/' . $fileInName, FILTER_SANITIZE_URL); |
|
| 2696 | + $filePath = filter_var($fileInPath.'/'.$fileInName, FILTER_SANITIZE_URL); |
|
| 2697 | 2697 | $fileContent = file_get_contents($filePath); |
| 2698 | 2698 | $plaintext = $fileContent; |
| 2699 | 2699 | $ciphertext = $cipher->encrypt($plaintext); |
@@ -2701,9 +2701,9 @@ discard block |
||
| 2701 | 2701 | // Save new file |
| 2702 | 2702 | // deepcode ignore InsecureHash: is simply used to get a unique name |
| 2703 | 2703 | $hash = uniqid('', true); |
| 2704 | - $fileOut = $fileInPath . '/' . TP_FILE_PREFIX . $hash; |
|
| 2704 | + $fileOut = $fileInPath.'/'.TP_FILE_PREFIX.$hash; |
|
| 2705 | 2705 | file_put_contents($fileOut, $ciphertext); |
| 2706 | - unlink($fileInPath . '/' . $fileInName); |
|
| 2706 | + unlink($fileInPath.'/'.$fileInName); |
|
| 2707 | 2707 | return [ |
| 2708 | 2708 | 'fileHash' => base64_encode($hash), |
| 2709 | 2709 | 'objectKey' => base64_encode($objectKey), |
@@ -2719,9 +2719,9 @@ discard block |
||
| 2719 | 2719 | * |
| 2720 | 2720 | * @return string|array |
| 2721 | 2721 | */ |
| 2722 | -function decryptFile(string $fileName, string $filePath, string $key): string|array |
|
| 2722 | +function decryptFile(string $fileName, string $filePath, string $key): string | array |
|
| 2723 | 2723 | { |
| 2724 | - if (! defined('FILE_BUFFER_SIZE')) { |
|
| 2724 | + if (!defined('FILE_BUFFER_SIZE')) { |
|
| 2725 | 2725 | define('FILE_BUFFER_SIZE', 128 * 1024); |
| 2726 | 2726 | } |
| 2727 | 2727 | |
@@ -2738,7 +2738,7 @@ discard block |
||
| 2738 | 2738 | $cipher->enableContinuousBuffer(); |
| 2739 | 2739 | $cipher->disablePadding(); |
| 2740 | 2740 | // Get file content |
| 2741 | - $safeFilePath = realpath($filePath . '/' . TP_FILE_PREFIX . $safeFileName); |
|
| 2741 | + $safeFilePath = realpath($filePath.'/'.TP_FILE_PREFIX.$safeFileName); |
|
| 2742 | 2742 | if ($safeFilePath !== false && file_exists($safeFilePath)) { |
| 2743 | 2743 | $ciphertext = file_get_contents(filter_var($safeFilePath, FILTER_SANITIZE_URL)); |
| 2744 | 2744 | } else { |
@@ -2835,7 +2835,7 @@ discard block |
||
| 2835 | 2835 | // Get public keys for all target users |
| 2836 | 2836 | $users = DB::query( |
| 2837 | 2837 | 'SELECT id, public_key |
| 2838 | - FROM ' . prefixTable('users') . ' |
|
| 2838 | + FROM ' . prefixTable('users').' |
|
| 2839 | 2839 | WHERE id IN %li |
| 2840 | 2840 | AND public_key != ""', |
| 2841 | 2841 | $userIds |
@@ -2874,7 +2874,7 @@ discard block |
||
| 2874 | 2874 | } |
| 2875 | 2875 | $users = DB::query( |
| 2876 | 2876 | 'SELECT id, public_key |
| 2877 | - FROM ' . prefixTable('users') . ' |
|
| 2877 | + FROM ' . prefixTable('users').' |
|
| 2878 | 2878 | WHERE id NOT IN %li |
| 2879 | 2879 | AND public_key != ""', |
| 2880 | 2880 | $user_ids |
@@ -2883,7 +2883,7 @@ discard block |
||
| 2883 | 2883 | // Insert in DB the new object key for this item by user |
| 2884 | 2884 | if (count($objectKeyArray) === 0) { |
| 2885 | 2885 | if (WIP === true) { |
| 2886 | - error_log('TEAMPASS Debug - storeUsersShareKey case1 - ' . $object_name . ' - ' . $post_object_id . ' - ' . $user['id']); |
|
| 2886 | + error_log('TEAMPASS Debug - storeUsersShareKey case1 - '.$object_name.' - '.$post_object_id.' - '.$user['id']); |
|
| 2887 | 2887 | } |
| 2888 | 2888 | |
| 2889 | 2889 | insertOrUpdateSharekey( |
@@ -2895,7 +2895,7 @@ discard block |
||
| 2895 | 2895 | } else { |
| 2896 | 2896 | foreach ($objectKeyArray as $object) { |
| 2897 | 2897 | if (WIP === true) { |
| 2898 | - error_log('TEAMPASS Debug - storeUsersShareKey case2 - ' . $object_name . ' - ' . $object['objectId'] . ' - ' . $user['id']); |
|
| 2898 | + error_log('TEAMPASS Debug - storeUsersShareKey case2 - '.$object_name.' - '.$object['objectId'].' - '.$user['id']); |
|
| 2899 | 2899 | } |
| 2900 | 2900 | |
| 2901 | 2901 | insertOrUpdateSharekey( |
@@ -2928,7 +2928,7 @@ discard block |
||
| 2928 | 2928 | ): bool { |
| 2929 | 2929 | try { |
| 2930 | 2930 | DB::query( |
| 2931 | - 'INSERT INTO ' . $tableName . ' |
|
| 2931 | + 'INSERT INTO '.$tableName.' |
|
| 2932 | 2932 | (object_id, user_id, share_key) |
| 2933 | 2933 | VALUES (%i, %i, %s) |
| 2934 | 2934 | ON DUPLICATE KEY UPDATE share_key = VALUES(share_key)', |
@@ -2938,7 +2938,7 @@ discard block |
||
| 2938 | 2938 | ); |
| 2939 | 2939 | return true; |
| 2940 | 2940 | } catch (Exception $e) { |
| 2941 | - error_log('TEAMPASS Error - insertOrUpdateSharekey: ' . $e->getMessage()); |
|
| 2941 | + error_log('TEAMPASS Error - insertOrUpdateSharekey: '.$e->getMessage()); |
|
| 2942 | 2942 | return false; |
| 2943 | 2943 | } |
| 2944 | 2944 | } |
@@ -2953,7 +2953,7 @@ discard block |
||
| 2953 | 2953 | function isBase64(string $str): bool |
| 2954 | 2954 | { |
| 2955 | 2955 | $str = (string) trim($str); |
| 2956 | - if (! isset($str[0])) { |
|
| 2956 | + if (!isset($str[0])) { |
|
| 2957 | 2957 | return false; |
| 2958 | 2958 | } |
| 2959 | 2959 | |
@@ -3027,7 +3027,7 @@ discard block |
||
| 3027 | 3027 | } catch (\LdapRecord\Auth\BindException $e) { |
| 3028 | 3028 | $error = $e->getDetailedError(); |
| 3029 | 3029 | if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) { |
| 3030 | - error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage()); |
|
| 3030 | + error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage()); |
|
| 3031 | 3031 | } |
| 3032 | 3032 | // deepcode ignore ServerLeak: No important data is sent |
| 3033 | 3033 | echo 'An error occurred.'; |
@@ -3044,7 +3044,7 @@ discard block |
||
| 3044 | 3044 | } catch (\LdapRecord\Auth\BindException $e) { |
| 3045 | 3045 | $error = $e->getDetailedError(); |
| 3046 | 3046 | if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) { |
| 3047 | - error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage()); |
|
| 3047 | + error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage()); |
|
| 3048 | 3048 | } |
| 3049 | 3049 | // deepcode ignore ServerLeak: No important data is sent |
| 3050 | 3050 | echo 'An error occurred.'; |
@@ -3080,7 +3080,7 @@ discard block |
||
| 3080 | 3080 | // expect if personal item |
| 3081 | 3081 | DB::delete( |
| 3082 | 3082 | prefixTable('sharekeys_items'), |
| 3083 | - 'user_id = %i',// AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)'', |
|
| 3083 | + 'user_id = %i', // AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)'', |
|
| 3084 | 3084 | $userId |
| 3085 | 3085 | ); |
| 3086 | 3086 | // Remove all item sharekeys files |
@@ -3104,7 +3104,7 @@ discard block |
||
| 3104 | 3104 | // Remove all item sharekeys suggestions |
| 3105 | 3105 | DB::delete( |
| 3106 | 3106 | prefixTable('sharekeys_suggestions'), |
| 3107 | - 'user_id = %i',// AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)', |
|
| 3107 | + 'user_id = %i', // AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)', |
|
| 3108 | 3108 | $userId |
| 3109 | 3109 | ); |
| 3110 | 3110 | return false; |
@@ -3125,7 +3125,7 @@ discard block |
||
| 3125 | 3125 | foreach (DateTimeZone::listIdentifiers() as $timezone) { |
| 3126 | 3126 | $now->setTimezone(new DateTimeZone($timezone)); |
| 3127 | 3127 | $offsets[] = $offset = $now->getOffset(); |
| 3128 | - $timezones[$timezone] = '(' . format_GMT_offset($offset) . ') ' . format_timezone_name($timezone); |
|
| 3128 | + $timezones[$timezone] = '('.format_GMT_offset($offset).') '.format_timezone_name($timezone); |
|
| 3129 | 3129 | } |
| 3130 | 3130 | |
| 3131 | 3131 | array_multisort($offsets, $timezones); |
@@ -3145,7 +3145,7 @@ discard block |
||
| 3145 | 3145 | { |
| 3146 | 3146 | $hours = intval($offset / 3600); |
| 3147 | 3147 | $minutes = abs(intval($offset % 3600 / 60)); |
| 3148 | - return 'GMT' . ($offset ? sprintf('%+03d:%02d', $hours, $minutes) : ''); |
|
| 3148 | + return 'GMT'.($offset ? sprintf('%+03d:%02d', $hours, $minutes) : ''); |
|
| 3149 | 3149 | } |
| 3150 | 3150 | |
| 3151 | 3151 | /** |
@@ -3244,8 +3244,7 @@ discard block |
||
| 3244 | 3244 | { |
| 3245 | 3245 | if (isset($array[$key]) === true |
| 3246 | 3246 | && (is_int($value) === true ? |
| 3247 | - (int) $array[$key] === $value : |
|
| 3248 | - (string) $array[$key] === $value) |
|
| 3247 | + (int) $array[$key] === $value : (string) $array[$key] === $value) |
|
| 3249 | 3248 | ) { |
| 3250 | 3249 | return true; |
| 3251 | 3250 | } |
@@ -3267,8 +3266,7 @@ discard block |
||
| 3267 | 3266 | { |
| 3268 | 3267 | if (isset($var) === false |
| 3269 | 3268 | || (is_int($value) === true ? |
| 3270 | - (int) $var === $value : |
|
| 3271 | - (string) $var === $value) |
|
| 3269 | + (int) $var === $value : (string) $var === $value) |
|
| 3272 | 3270 | ) { |
| 3273 | 3271 | return true; |
| 3274 | 3272 | } |
@@ -3319,7 +3317,7 @@ discard block |
||
| 3319 | 3317 | */ |
| 3320 | 3318 | function isSetArrayOfValues(array $arrayOfValues): bool |
| 3321 | 3319 | { |
| 3322 | - foreach($arrayOfValues as $value) { |
|
| 3320 | + foreach ($arrayOfValues as $value) { |
|
| 3323 | 3321 | if (isset($value) === false) { |
| 3324 | 3322 | return false; |
| 3325 | 3323 | } |
@@ -3341,7 +3339,7 @@ discard block |
||
| 3341 | 3339 | /*PHP8 - integer|string*/$value |
| 3342 | 3340 | ) : bool |
| 3343 | 3341 | { |
| 3344 | - foreach($arrayOfVars as $variable) { |
|
| 3342 | + foreach ($arrayOfVars as $variable) { |
|
| 3345 | 3343 | if ($variable !== $value) { |
| 3346 | 3344 | return false; |
| 3347 | 3345 | } |
@@ -3361,7 +3359,7 @@ discard block |
||
| 3361 | 3359 | /*PHP8 - integer|string*/$value |
| 3362 | 3360 | ) : bool |
| 3363 | 3361 | { |
| 3364 | - foreach($arrayOfVars as $variable) { |
|
| 3362 | + foreach ($arrayOfVars as $variable) { |
|
| 3365 | 3363 | if ($variable === $value) { |
| 3366 | 3364 | return true; |
| 3367 | 3365 | } |
@@ -3375,7 +3373,7 @@ discard block |
||
| 3375 | 3373 | * @param string|int|null $value |
| 3376 | 3374 | * @return boolean |
| 3377 | 3375 | */ |
| 3378 | -function isValueSetNullEmpty(string|int|null $value) : bool |
|
| 3376 | +function isValueSetNullEmpty(string | int | null $value) : bool |
|
| 3379 | 3377 | { |
| 3380 | 3378 | if (is_null($value) === true || empty($value) === true) { |
| 3381 | 3379 | return true; |
@@ -3430,7 +3428,7 @@ discard block |
||
| 3430 | 3428 | * @param array $filters |
| 3431 | 3429 | * @return array|string |
| 3432 | 3430 | */ |
| 3433 | -function dataSanitizer(array $data, array $filters): array|string |
|
| 3431 | +function dataSanitizer(array $data, array $filters): array | string |
|
| 3434 | 3432 | { |
| 3435 | 3433 | // Load Sanitizer library |
| 3436 | 3434 | $sanitizer = new Sanitizer($data, $filters); |
@@ -3459,7 +3457,7 @@ discard block |
||
| 3459 | 3457 | // Exists ? |
| 3460 | 3458 | $userCacheId = DB::queryFirstRow( |
| 3461 | 3459 | 'SELECT increment_id |
| 3462 | - FROM ' . prefixTable('cache_tree') . ' |
|
| 3460 | + FROM ' . prefixTable('cache_tree').' |
|
| 3463 | 3461 | WHERE user_id = %i', |
| 3464 | 3462 | $user_id |
| 3465 | 3463 | ); |
@@ -3510,7 +3508,7 @@ discard block |
||
| 3510 | 3508 | */ |
| 3511 | 3509 | function pourcentage(float $nombre, float $total, float $pourcentage): float |
| 3512 | 3510 | { |
| 3513 | - $resultat = ($nombre/$total) * $pourcentage; |
|
| 3511 | + $resultat = ($nombre / $total) * $pourcentage; |
|
| 3514 | 3512 | return round($resultat); |
| 3515 | 3513 | } |
| 3516 | 3514 | |
@@ -3540,7 +3538,7 @@ discard block |
||
| 3540 | 3538 | |
| 3541 | 3539 | // Get last folder update |
| 3542 | 3540 | $lastFolderChange = DB::queryFirstRow( |
| 3543 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' |
|
| 3541 | + 'SELECT valeur FROM '.prefixTable('misc').' |
|
| 3544 | 3542 | WHERE type = %s AND intitule = %s', |
| 3545 | 3543 | 'timestamp', |
| 3546 | 3544 | 'last_folder_change' |
@@ -3561,7 +3559,7 @@ discard block |
||
| 3561 | 3559 | // Does this user has a tree cache |
| 3562 | 3560 | $userCacheTree = DB::queryFirstRow( |
| 3563 | 3561 | 'SELECT '.$fieldName.' |
| 3564 | - FROM ' . prefixTable('cache_tree') . ' |
|
| 3562 | + FROM ' . prefixTable('cache_tree').' |
|
| 3565 | 3563 | WHERE user_id = %i', |
| 3566 | 3564 | $session->get('user-id') |
| 3567 | 3565 | ); |
@@ -3599,7 +3597,7 @@ discard block |
||
| 3599 | 3597 | if (count($folderIds) === 0) { |
| 3600 | 3598 | $folderIds = DB::queryFirstColumn( |
| 3601 | 3599 | 'SELECT id |
| 3602 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 3600 | + FROM ' . prefixTable('nested_tree').' |
|
| 3603 | 3601 | WHERE personal_folder=%i', |
| 3604 | 3602 | 0 |
| 3605 | 3603 | ); |
@@ -3616,8 +3614,8 @@ discard block |
||
| 3616 | 3614 | $rows_tmp = DB::query( |
| 3617 | 3615 | 'SELECT c.id, c.title, c.level, c.type, c.masked, c.order, c.encrypted_data, c.role_visibility, c.is_mandatory, |
| 3618 | 3616 | f.id_category AS category_id |
| 3619 | - FROM ' . prefixTable('categories_folders') . ' AS f |
|
| 3620 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (f.id_category = c.parent_id) |
|
| 3617 | + FROM ' . prefixTable('categories_folders').' AS f |
|
| 3618 | + INNER JOIN ' . prefixTable('categories').' AS c ON (f.id_category = c.parent_id) |
|
| 3621 | 3619 | WHERE id_folder=%i', |
| 3622 | 3620 | $folder |
| 3623 | 3621 | ); |
@@ -3643,7 +3641,7 @@ discard block |
||
| 3643 | 3641 | $valTemp = ''; |
| 3644 | 3642 | $data = DB::queryFirstRow( |
| 3645 | 3643 | 'SELECT valeur |
| 3646 | - FROM ' . prefixTable('misc') . ' |
|
| 3644 | + FROM ' . prefixTable('misc').' |
|
| 3647 | 3645 | WHERE type = %s AND intitule=%i', |
| 3648 | 3646 | 'complex', |
| 3649 | 3647 | $folder |
@@ -3660,14 +3658,14 @@ discard block |
||
| 3660 | 3658 | $valTemp = ''; |
| 3661 | 3659 | $rows_tmp = DB::query( |
| 3662 | 3660 | 'SELECT t.title |
| 3663 | - FROM ' . prefixTable('roles_values') . ' as v |
|
| 3664 | - INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id) |
|
| 3661 | + FROM ' . prefixTable('roles_values').' as v |
|
| 3662 | + INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id) |
|
| 3665 | 3663 | WHERE v.folder_id = %i |
| 3666 | 3664 | GROUP BY title', |
| 3667 | 3665 | $folder |
| 3668 | 3666 | ); |
| 3669 | 3667 | foreach ($rows_tmp as $record) { |
| 3670 | - $valTemp .= (empty($valTemp) === true ? '' : ' - ') . $record['title']; |
|
| 3668 | + $valTemp .= (empty($valTemp) === true ? '' : ' - ').$record['title']; |
|
| 3671 | 3669 | } |
| 3672 | 3670 | $arr_data['visibilityRoles'] = $valTemp; |
| 3673 | 3671 | |
@@ -3700,7 +3698,7 @@ discard block |
||
| 3700 | 3698 | // loop on users and check if user has this role |
| 3701 | 3699 | $rows = DB::query( |
| 3702 | 3700 | 'SELECT id, fonction_id |
| 3703 | - FROM ' . prefixTable('users') . ' |
|
| 3701 | + FROM ' . prefixTable('users').' |
|
| 3704 | 3702 | WHERE id != %i AND admin = 0 AND fonction_id IS NOT NULL AND fonction_id != ""', |
| 3705 | 3703 | $session->get('user-id') |
| 3706 | 3704 | ); |
@@ -3732,7 +3730,7 @@ discard block |
||
| 3732 | 3730 | |
| 3733 | 3731 | $val = DB::queryFirstRow( |
| 3734 | 3732 | 'SELECT * |
| 3735 | - FROM ' . prefixTable('users') . ' |
|
| 3733 | + FROM ' . prefixTable('users').' |
|
| 3736 | 3734 | WHERE id = %i', |
| 3737 | 3735 | $userId |
| 3738 | 3736 | ); |
@@ -3748,12 +3746,12 @@ discard block |
||
| 3748 | 3746 | function upgradeRequired(): bool |
| 3749 | 3747 | { |
| 3750 | 3748 | // Get settings.php |
| 3751 | - include_once __DIR__. '/../includes/config/settings.php'; |
|
| 3749 | + include_once __DIR__.'/../includes/config/settings.php'; |
|
| 3752 | 3750 | |
| 3753 | 3751 | // Get timestamp in DB |
| 3754 | 3752 | $val = DB::queryFirstRow( |
| 3755 | 3753 | 'SELECT valeur |
| 3756 | - FROM ' . prefixTable('misc') . ' |
|
| 3754 | + FROM ' . prefixTable('misc').' |
|
| 3757 | 3755 | WHERE type = %s AND intitule = %s', |
| 3758 | 3756 | 'admin', |
| 3759 | 3757 | 'upgrade_timestamp' |
@@ -3806,7 +3804,7 @@ discard block |
||
| 3806 | 3804 | // prepapre background tasks for item keys generation |
| 3807 | 3805 | $userTP = DB::queryFirstRow( |
| 3808 | 3806 | 'SELECT pw, public_key, private_key |
| 3809 | - FROM ' . prefixTable('users') . ' |
|
| 3807 | + FROM ' . prefixTable('users').' |
|
| 3810 | 3808 | WHERE id = %i', |
| 3811 | 3809 | TP_USER_ID |
| 3812 | 3810 | ); |
@@ -3867,7 +3865,7 @@ discard block |
||
| 3867 | 3865 | } |
| 3868 | 3866 | |
| 3869 | 3867 | // Generate new keys |
| 3870 | - if ($user_self_change === true && empty($recovery_public_key) === false && empty($recovery_private_key) === false){ |
|
| 3868 | + if ($user_self_change === true && empty($recovery_public_key) === false && empty($recovery_private_key) === false) { |
|
| 3871 | 3869 | $userKeys = [ |
| 3872 | 3870 | 'public_key' => $recovery_public_key, |
| 3873 | 3871 | 'private_key_clear' => $recovery_private_key, |
@@ -3918,8 +3916,8 @@ discard block |
||
| 3918 | 3916 | 'process_type' => 'create_user_keys', |
| 3919 | 3917 | 'arguments' => json_encode([ |
| 3920 | 3918 | 'new_user_id' => (int) $userId, |
| 3921 | - 'new_user_pwd' => cryption($passwordClear, '','encrypt')['string'], |
|
| 3922 | - 'new_user_code' => cryption(empty($encryptionKey) === true ? uniqidReal(20) : $encryptionKey, '','encrypt')['string'], |
|
| 3919 | + 'new_user_pwd' => cryption($passwordClear, '', 'encrypt')['string'], |
|
| 3920 | + 'new_user_code' => cryption(empty($encryptionKey) === true ? uniqidReal(20) : $encryptionKey, '', 'encrypt')['string'], |
|
| 3923 | 3921 | 'owner_id' => (int) TP_USER_ID, |
| 3924 | 3922 | 'creator_pwd' => $userTP['pw'], |
| 3925 | 3923 | 'send_email' => $sendEmailToUser === true ? 1 : 0, |
@@ -3991,19 +3989,19 @@ discard block |
||
| 3991 | 3989 | |
| 3992 | 3990 | // Prepare the subtask queries |
| 3993 | 3991 | $queries = [ |
| 3994 | - 'step20' => 'SELECT * FROM ' . prefixTable('items'), |
|
| 3992 | + 'step20' => 'SELECT * FROM '.prefixTable('items'), |
|
| 3995 | 3993 | |
| 3996 | - 'step30' => 'SELECT * FROM ' . prefixTable('log_items') . |
|
| 3994 | + 'step30' => 'SELECT * FROM '.prefixTable('log_items'). |
|
| 3997 | 3995 | ' WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"', |
| 3998 | 3996 | |
| 3999 | - 'step40' => 'SELECT * FROM ' . prefixTable('categories_items') . |
|
| 3997 | + 'step40' => 'SELECT * FROM '.prefixTable('categories_items'). |
|
| 4000 | 3998 | ' WHERE encryption_type = "teampass_aes"', |
| 4001 | 3999 | |
| 4002 | - 'step50' => 'SELECT * FROM ' . prefixTable('suggestion'), |
|
| 4000 | + 'step50' => 'SELECT * FROM '.prefixTable('suggestion'), |
|
| 4003 | 4001 | |
| 4004 | - 'step60' => 'SELECT * FROM ' . prefixTable('files') . ' AS f |
|
| 4005 | - INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = f.id_item |
|
| 4006 | - WHERE f.status = "' . TP_ENCRYPTION_NAME . '"' |
|
| 4002 | + 'step60' => 'SELECT * FROM '.prefixTable('files').' AS f |
|
| 4003 | + INNER JOIN ' . prefixTable('items').' AS i ON i.id = f.id_item |
|
| 4004 | + WHERE f.status = "' . TP_ENCRYPTION_NAME.'"' |
|
| 4007 | 4005 | ]; |
| 4008 | 4006 | |
| 4009 | 4007 | // Perform loop on $queries to create sub-tasks |
@@ -4193,7 +4191,7 @@ discard block |
||
| 4193 | 4191 | */ |
| 4194 | 4192 | function createTaskForItem( |
| 4195 | 4193 | string $processType, |
| 4196 | - string|array $taskName, |
|
| 4194 | + string | array $taskName, |
|
| 4197 | 4195 | int $itemId, |
| 4198 | 4196 | int $userId, |
| 4199 | 4197 | string $objectKey, |
@@ -4217,7 +4215,7 @@ discard block |
||
| 4217 | 4215 | 'object_key' => $objectKey, |
| 4218 | 4216 | 'author' => (int) $userId, |
| 4219 | 4217 | ]), |
| 4220 | - 'item_id' => (int) $parentId !== -1 ? $parentId : null, |
|
| 4218 | + 'item_id' => (int) $parentId !== -1 ? $parentId : null, |
|
| 4221 | 4219 | ) |
| 4222 | 4220 | ); |
| 4223 | 4221 | $processId = DB::insertId(); |
@@ -4227,7 +4225,7 @@ discard block |
||
| 4227 | 4225 | if (is_array($taskName) === false) { |
| 4228 | 4226 | $taskName = [$taskName]; |
| 4229 | 4227 | } |
| 4230 | - foreach($taskName as $task) { |
|
| 4228 | + foreach ($taskName as $task) { |
|
| 4231 | 4229 | if (WIP === true) error_log('createTaskForItem - task: '.$task); |
| 4232 | 4230 | switch ($task) { |
| 4233 | 4231 | case 'item_password': |
@@ -4324,7 +4322,7 @@ discard block |
||
| 4324 | 4322 | * @param integer $user_id |
| 4325 | 4323 | * @return void |
| 4326 | 4324 | */ |
| 4327 | -function purgeUnnecessaryKeys(bool $allUsers = true, int $user_id=0) |
|
| 4325 | +function purgeUnnecessaryKeys(bool $allUsers = true, int $user_id = 0) |
|
| 4328 | 4326 | { |
| 4329 | 4327 | if ($allUsers === true) { |
| 4330 | 4328 | // Load class DB |
@@ -4334,7 +4332,7 @@ discard block |
||
| 4334 | 4332 | |
| 4335 | 4333 | $users = DB::query( |
| 4336 | 4334 | 'SELECT id |
| 4337 | - FROM ' . prefixTable('users') . ' |
|
| 4335 | + FROM ' . prefixTable('users').' |
|
| 4338 | 4336 | WHERE id NOT IN ('.OTV_USER_ID.', '.TP_USER_ID.', '.SSH_USER_ID.', '.API_USER_ID.') |
| 4339 | 4337 | ORDER BY login ASC' |
| 4340 | 4338 | ); |
@@ -4352,7 +4350,7 @@ discard block |
||
| 4352 | 4350 | * @param integer $user_id |
| 4353 | 4351 | * @return void |
| 4354 | 4352 | */ |
| 4355 | -function purgeUnnecessaryKeysForUser(int $user_id=0) |
|
| 4353 | +function purgeUnnecessaryKeysForUser(int $user_id = 0) |
|
| 4356 | 4354 | { |
| 4357 | 4355 | if ($user_id === 0) { |
| 4358 | 4356 | return; |
@@ -4363,8 +4361,8 @@ discard block |
||
| 4363 | 4361 | |
| 4364 | 4362 | $personalItems = DB::queryFirstColumn( |
| 4365 | 4363 | 'SELECT id |
| 4366 | - FROM ' . prefixTable('items') . ' AS i |
|
| 4367 | - INNER JOIN ' . prefixTable('log_items') . ' AS li ON li.id_item = i.id |
|
| 4364 | + FROM ' . prefixTable('items').' AS i |
|
| 4365 | + INNER JOIN ' . prefixTable('log_items').' AS li ON li.id_item = i.id |
|
| 4368 | 4366 | WHERE i.perso = 1 AND li.action = "at_creation" AND li.id_user IN (%i, '.TP_USER_ID.')', |
| 4369 | 4367 | $user_id |
| 4370 | 4368 | ); |
@@ -4374,28 +4372,28 @@ discard block |
||
| 4374 | 4372 | prefixTable('sharekeys_items'), |
| 4375 | 4373 | 'object_id IN %li AND user_id NOT IN %ls', |
| 4376 | 4374 | $personalItems, |
| 4377 | - [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID] |
|
| 4375 | + [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID] |
|
| 4378 | 4376 | ); |
| 4379 | 4377 | // Files keys |
| 4380 | 4378 | DB::delete( |
| 4381 | 4379 | prefixTable('sharekeys_files'), |
| 4382 | 4380 | 'object_id IN %li AND user_id NOT IN %ls', |
| 4383 | 4381 | $personalItems, |
| 4384 | - [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID] |
|
| 4382 | + [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID] |
|
| 4385 | 4383 | ); |
| 4386 | 4384 | // Fields keys |
| 4387 | 4385 | DB::delete( |
| 4388 | 4386 | prefixTable('sharekeys_fields'), |
| 4389 | 4387 | 'object_id IN %li AND user_id NOT IN %ls', |
| 4390 | 4388 | $personalItems, |
| 4391 | - [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID] |
|
| 4389 | + [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID] |
|
| 4392 | 4390 | ); |
| 4393 | 4391 | // Logs keys |
| 4394 | 4392 | DB::delete( |
| 4395 | 4393 | prefixTable('sharekeys_logs'), |
| 4396 | 4394 | 'object_id IN %li AND user_id NOT IN %ls', |
| 4397 | 4395 | $personalItems, |
| 4398 | - [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID] |
|
| 4396 | + [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID] |
|
| 4399 | 4397 | ); |
| 4400 | 4398 | } |
| 4401 | 4399 | } |
@@ -4413,7 +4411,7 @@ discard block |
||
| 4413 | 4411 | // Check if user exists |
| 4414 | 4412 | $userInfo = DB::queryFirstRow( |
| 4415 | 4413 | 'SELECT login |
| 4416 | - FROM ' . prefixTable('users') . ' |
|
| 4414 | + FROM ' . prefixTable('users').' |
|
| 4417 | 4415 | WHERE id = %i', |
| 4418 | 4416 | $userId |
| 4419 | 4417 | ); |
@@ -4422,7 +4420,7 @@ discard block |
||
| 4422 | 4420 | $now = (int) time(); |
| 4423 | 4421 | // Prepare file content |
| 4424 | 4422 | $export_value = file_get_contents(__DIR__."/../includes/core/teampass_ascii.txt")."\n". |
| 4425 | - "Generation date: ".date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $now)."\n\n". |
|
| 4423 | + "Generation date: ".date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $now)."\n\n". |
|
| 4426 | 4424 | "RECOVERY KEYS - Not to be shared - To be store safely\n\n". |
| 4427 | 4425 | "Public Key:\n".$session->get('user-public_key')."\n\n". |
| 4428 | 4426 | "Private Key:\n".$session->get('user-private_key')."\n\n"; |
@@ -4445,7 +4443,7 @@ discard block |
||
| 4445 | 4443 | return prepareExchangedData( |
| 4446 | 4444 | array( |
| 4447 | 4445 | 'error' => false, |
| 4448 | - 'datetime' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $now), |
|
| 4446 | + 'datetime' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $now), |
|
| 4449 | 4447 | 'timestamp' => $now, |
| 4450 | 4448 | 'content' => base64_encode($export_value), |
| 4451 | 4449 | 'login' => $userInfo['login'], |
@@ -4471,8 +4469,8 @@ discard block |
||
| 4471 | 4469 | */ |
| 4472 | 4470 | function loadClasses(string $className = ''): void |
| 4473 | 4471 | { |
| 4474 | - require_once __DIR__. '/../includes/config/include.php'; |
|
| 4475 | - require_once __DIR__. '/../includes/config/settings.php'; |
|
| 4472 | + require_once __DIR__.'/../includes/config/include.php'; |
|
| 4473 | + require_once __DIR__.'/../includes/config/settings.php'; |
|
| 4476 | 4474 | require_once __DIR__.'/../vendor/autoload.php'; |
| 4477 | 4475 | |
| 4478 | 4476 | if (defined('DB_PASSWD_CLEAR') === false) { |
@@ -4685,7 +4683,7 @@ discard block |
||
| 4685 | 4683 | |
| 4686 | 4684 | // Get current user hash |
| 4687 | 4685 | $userHash = DB::queryFirstRow( |
| 4688 | - "SELECT pw FROM " . prefixtable('users') . " WHERE id = %d;", |
|
| 4686 | + "SELECT pw FROM ".prefixtable('users')." WHERE id = %d;", |
|
| 4689 | 4687 | $session->get('user-id') |
| 4690 | 4688 | )['pw']; |
| 4691 | 4689 | |
@@ -4733,11 +4731,11 @@ discard block |
||
| 4733 | 4731 | } |
| 4734 | 4732 | |
| 4735 | 4733 | // Alternative: serialize ou json selon le contexte |
| 4736 | - return get_class($value) . (method_exists($value, 'getId') ? '#' . $value->getId() : ''); |
|
| 4734 | + return get_class($value).(method_exists($value, 'getId') ? '#'.$value->getId() : ''); |
|
| 4737 | 4735 | } |
| 4738 | 4736 | |
| 4739 | 4737 | if (is_resource($value)) { |
| 4740 | - return 'Resource#' . get_resource_id($value) . ' of type ' . get_resource_type($value); |
|
| 4738 | + return 'Resource#'.get_resource_id($value).' of type '.get_resource_type($value); |
|
| 4741 | 4739 | } |
| 4742 | 4740 | |
| 4743 | 4741 | // Cas par défaut |
@@ -4757,7 +4755,7 @@ discard block |
||
| 4757 | 4755 | // Refuse access if user does not exist and/or is admin |
| 4758 | 4756 | $user = DB::queryFirstRow( |
| 4759 | 4757 | 'SELECT admin |
| 4760 | - FROM ' . prefixTable('users') . ' |
|
| 4758 | + FROM ' . prefixTable('users').' |
|
| 4761 | 4759 | WHERE id = %i', |
| 4762 | 4760 | $userId |
| 4763 | 4761 | ); |
@@ -4768,8 +4766,8 @@ discard block |
||
| 4768 | 4766 | // Get file info |
| 4769 | 4767 | $file = DB::queryFirstRow( |
| 4770 | 4768 | 'SELECT f.id_item, i.id_tree |
| 4771 | - FROM ' . prefixTable('files') . ' as f |
|
| 4772 | - INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = f.id_item |
|
| 4769 | + FROM ' . prefixTable('files').' as f |
|
| 4770 | + INNER JOIN ' . prefixTable('items').' AS i ON i.id = f.id_item |
|
| 4773 | 4771 | WHERE f.id = %i', |
| 4774 | 4772 | $fileId |
| 4775 | 4773 | ); |
@@ -4778,7 +4776,7 @@ discard block |
||
| 4778 | 4776 | } |
| 4779 | 4777 | |
| 4780 | 4778 | // Check if user has access to the item |
| 4781 | - include_once __DIR__. '/items.queries.php'; |
|
| 4779 | + include_once __DIR__.'/items.queries.php'; |
|
| 4782 | 4780 | $itemAccess = getCurrentAccessRights( |
| 4783 | 4781 | (int) filter_var($userId, FILTER_SANITIZE_NUMBER_INT), |
| 4784 | 4782 | (int) filter_var($file['id_item'], FILTER_SANITIZE_NUMBER_INT), |
@@ -4811,7 +4809,7 @@ discard block |
||
| 4811 | 4809 | // Refuse access if user does not exist and/or is not admin |
| 4812 | 4810 | $user = DB::queryFirstRow( |
| 4813 | 4811 | 'SELECT admin |
| 4814 | - FROM ' . prefixTable('users') . ' |
|
| 4812 | + FROM ' . prefixTable('users').' |
|
| 4815 | 4813 | WHERE id = %i', |
| 4816 | 4814 | $userId |
| 4817 | 4815 | ); |
@@ -4822,7 +4820,7 @@ discard block |
||
| 4822 | 4820 | // Ensure that user has performed the backup |
| 4823 | 4821 | DB::queryFirstRow( |
| 4824 | 4822 | 'SELECT f.id |
| 4825 | - FROM ' . prefixTable('log_system') . ' as f |
|
| 4823 | + FROM ' . prefixTable('log_system').' as f |
|
| 4826 | 4824 | WHERE f.type = %s AND f.label = %s AND f.qui = %i AND f.field_1 = %s', |
| 4827 | 4825 | 'admin_action', |
| 4828 | 4826 | 'dataBase backup', |
@@ -4849,7 +4847,7 @@ discard block |
||
| 4849 | 4847 | // Refuse access if user does not exist and/or is admin |
| 4850 | 4848 | $user = DB::queryFirstRow( |
| 4851 | 4849 | 'SELECT admin |
| 4852 | - FROM ' . prefixTable('users') . ' |
|
| 4850 | + FROM ' . prefixTable('users').' |
|
| 4853 | 4851 | WHERE id = %i', |
| 4854 | 4852 | $userId |
| 4855 | 4853 | ); |
@@ -4860,7 +4858,7 @@ discard block |
||
| 4860 | 4858 | // Get item info |
| 4861 | 4859 | $item = DB::queryFirstRow( |
| 4862 | 4860 | 'SELECT i.perso, i.id_tree |
| 4863 | - FROM ' . prefixTable('items') . ' as i |
|
| 4861 | + FROM ' . prefixTable('items').' as i |
|
| 4864 | 4862 | WHERE i.id = %i', |
| 4865 | 4863 | $itemId |
| 4866 | 4864 | ); |
@@ -4871,7 +4869,7 @@ discard block |
||
| 4871 | 4869 | // Get item owner |
| 4872 | 4870 | $itemOwner = DB::queryFirstRow( |
| 4873 | 4871 | 'SELECT li.id_user |
| 4874 | - FROM ' . prefixTable('log_items') . ' as li |
|
| 4872 | + FROM ' . prefixTable('log_items').' as li |
|
| 4875 | 4873 | WHERE li.id_item = %i AND li.action = %s', |
| 4876 | 4874 | $itemId, |
| 4877 | 4875 | 'at_creation' |
@@ -4885,25 +4883,25 @@ discard block |
||
| 4885 | 4883 | prefixTable('sharekeys_items'), |
| 4886 | 4884 | 'object_id = %i AND user_id NOT IN %ls', |
| 4887 | 4885 | $itemId, |
| 4888 | - [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID] |
|
| 4886 | + [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID] |
|
| 4889 | 4887 | ); |
| 4890 | 4888 | DB::delete( |
| 4891 | 4889 | prefixTable('sharekeys_files'), |
| 4892 | 4890 | 'object_id IN (SELECT id FROM '.prefixTable('files').' WHERE id_item = %i) AND user_id NOT IN %ls', |
| 4893 | 4891 | $itemId, |
| 4894 | - [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID] |
|
| 4892 | + [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID] |
|
| 4895 | 4893 | ); |
| 4896 | 4894 | DB::delete( |
| 4897 | 4895 | prefixTable('sharekeys_fields'), |
| 4898 | 4896 | 'object_id IN (SELECT id FROM '.prefixTable('fields').' WHERE id_item = %i) AND user_id NOT IN %ls', |
| 4899 | 4897 | $itemId, |
| 4900 | - [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID] |
|
| 4898 | + [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID] |
|
| 4901 | 4899 | ); |
| 4902 | 4900 | DB::delete( |
| 4903 | 4901 | prefixTable('sharekeys_logs'), |
| 4904 | 4902 | 'object_id IN (SELECT id FROM '.prefixTable('log_items').' WHERE id_item = %i) AND user_id NOT IN %ls', |
| 4905 | 4903 | $itemId, |
| 4906 | - [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID] |
|
| 4904 | + [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID] |
|
| 4907 | 4905 | ); |
| 4908 | 4906 | |
| 4909 | 4907 | return true; |
@@ -4975,7 +4973,7 @@ discard block |
||
| 4975 | 4973 | |
| 4976 | 4974 | // 2. Check if user actually has personal items to migrate |
| 4977 | 4975 | $personalFolderId = DB::queryFirstField( |
| 4978 | - "SELECT id FROM ".prefixTable('nested_tree') ." |
|
| 4976 | + "SELECT id FROM ".prefixTable('nested_tree')." |
|
| 4979 | 4977 | WHERE personal_folder = 1 |
| 4980 | 4978 | AND title = %s", |
| 4981 | 4979 | $userId |
@@ -5055,8 +5053,8 @@ discard block |
||
| 5055 | 5053 | 'process_type' => 'migrate_user_personal_items', |
| 5056 | 5054 | 'arguments' => json_encode([ |
| 5057 | 5055 | 'user_id' => (int) $userId, |
| 5058 | - 'user_pwd' => cryption($passwordClear, '','encrypt')['string'], |
|
| 5059 | - 'user_private_key' => cryption($privateKeyDecrypted, '','encrypt')['string'], |
|
| 5056 | + 'user_pwd' => cryption($passwordClear, '', 'encrypt')['string'], |
|
| 5057 | + 'user_private_key' => cryption($privateKeyDecrypted, '', 'encrypt')['string'], |
|
| 5060 | 5058 | 'personal_folders_ids' => $personalFolderIds, |
| 5061 | 5059 | ]), |
| 5062 | 5060 | 'is_in_progress' => 0, |
@@ -5085,19 +5083,19 @@ discard block |
||
| 5085 | 5083 | { |
| 5086 | 5084 | // Prepare the subtask queries |
| 5087 | 5085 | $queries = [ |
| 5088 | - 'user-personal-items-migration-step10' => 'SELECT * FROM ' . prefixTable('items'), |
|
| 5086 | + 'user-personal-items-migration-step10' => 'SELECT * FROM '.prefixTable('items'), |
|
| 5089 | 5087 | |
| 5090 | - 'user-personal-items-migration-step20' => 'SELECT * FROM ' . prefixTable('log_items') . |
|
| 5088 | + 'user-personal-items-migration-step20' => 'SELECT * FROM '.prefixTable('log_items'). |
|
| 5091 | 5089 | ' WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"', |
| 5092 | 5090 | |
| 5093 | - 'user-personal-items-migration-step30' => 'SELECT * FROM ' . prefixTable('categories_items') . |
|
| 5091 | + 'user-personal-items-migration-step30' => 'SELECT * FROM '.prefixTable('categories_items'). |
|
| 5094 | 5092 | ' WHERE encryption_type = "teampass_aes"', |
| 5095 | 5093 | |
| 5096 | - 'user-personal-items-migration-step40' => 'SELECT * FROM ' . prefixTable('suggestion'), |
|
| 5094 | + 'user-personal-items-migration-step40' => 'SELECT * FROM '.prefixTable('suggestion'), |
|
| 5097 | 5095 | |
| 5098 | - 'user-personal-items-migration-step50' => 'SELECT * FROM ' . prefixTable('files') . ' AS f |
|
| 5099 | - INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = f.id_item |
|
| 5100 | - WHERE f.status = "' . TP_ENCRYPTION_NAME . '"' |
|
| 5096 | + 'user-personal-items-migration-step50' => 'SELECT * FROM '.prefixTable('files').' AS f |
|
| 5097 | + INNER JOIN ' . prefixTable('items').' AS i ON i.id = f.id_item |
|
| 5098 | + WHERE f.status = "' . TP_ENCRYPTION_NAME.'"' |
|
| 5101 | 5099 | ]; |
| 5102 | 5100 | |
| 5103 | 5101 | // Perform loop on $queries to create sub-tasks |