@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('users') === false) { |
| 70 | 70 | // Not allowed page |
| 71 | 71 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 72 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 72 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 73 | 73 | exit; |
| 74 | 74 | } |
| 75 | 75 | |
@@ -92,24 +92,24 @@ discard block |
||
| 92 | 92 | // If administrator then all roles are shown |
| 93 | 93 | // else only the Roles the users is associated to. |
| 94 | 94 | if ((int) $session->get('user-admin') === 1) { |
| 95 | - $optionsManagedBy .= '<option value="0">' . $lang->get('administrators_only') . '</option>'; |
|
| 95 | + $optionsManagedBy .= '<option value="0">'.$lang->get('administrators_only').'</option>'; |
|
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | $rows = DB::query( |
| 99 | 99 | 'SELECT id, title, creator_id |
| 100 | - FROM ' . prefixTable('roles_title') . ' |
|
| 100 | + FROM ' . prefixTable('roles_title').' |
|
| 101 | 101 | ORDER BY title ASC' |
| 102 | 102 | ); |
| 103 | 103 | foreach ($rows as $record) { |
| 104 | 104 | if ((int) $session->get('user-admin') === 1 || in_array($record['id'], $session->get('user-roles_array')) === true) { |
| 105 | - $optionsManagedBy .= '<option value="' . $record['id'] . '">' . $lang->get('managers_of') . ' ' . addslashes($record['title']) . '</option>'; |
|
| 105 | + $optionsManagedBy .= '<option value="'.$record['id'].'">'.$lang->get('managers_of').' '.addslashes($record['title']).'</option>'; |
|
| 106 | 106 | } |
| 107 | 107 | if ( |
| 108 | 108 | (int) $session->get('user-admin') === 1 |
| 109 | 109 | || (((int) $session->get('user-manager') === 1 || (int) $session->get('user-can_manage_all_users') === 1) |
| 110 | 110 | && (in_array($record['id'], $userRoles) === true) || (int) $record['creator_id'] === (int) $session->get('user-id')) |
| 111 | 111 | ) { |
| 112 | - $optionsRoles .= '<option value="' . $record['id'] . '">' . addslashes($record['title']) . '</option>'; |
|
| 112 | + $optionsRoles .= '<option value="'.$record['id'].'">'.addslashes($record['title']).'</option>'; |
|
| 113 | 113 | } |
| 114 | 114 | } |
| 115 | 115 | |
@@ -124,7 +124,7 @@ discard block |
||
| 124 | 124 | for ($y = 1; $y < $t->nlevel; ++$y) { |
| 125 | 125 | $ident .= ' '; |
| 126 | 126 | } |
| 127 | - $foldersList .= '<option value="' . $t->id . '">' . $ident . htmlspecialchars($t->title, ENT_COMPAT, 'UTF-8') . '</option>'; |
|
| 127 | + $foldersList .= '<option value="'.$t->id.'">'.$ident.htmlspecialchars($t->title, ENT_COMPAT, 'UTF-8').'</option>'; |
|
| 128 | 128 | } |
| 129 | 129 | } |
| 130 | 130 | |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | { |
| 146 | 146 | // Table is teampass_users with the prefix {teampass_users} in MeekroDB context. |
| 147 | 147 | // 'disabled = 1' indicates a deleted/disabled user account. |
| 148 | - return (int)DB::queryFirstField("SELECT COUNT(id) FROM " . prefixTable('users') . " WHERE deleted_at IS NOT NULL"); |
|
| 148 | + return (int) DB::queryFirstField("SELECT COUNT(id) FROM ".prefixTable('users')." WHERE deleted_at IS NOT NULL"); |
|
| 149 | 149 | } |
| 150 | 150 | |
| 151 | 151 | $deleted_users_count = count_deleted_users(); |
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | $blink_class = 'blink_me'; |
| 160 | 160 | |
| 161 | 161 | // Create the badge HTML with the count |
| 162 | - $count_badge_html = ' <span class="badge badge-danger ml-1">' . $deleted_users_count . '</span>'; |
|
| 162 | + $count_badge_html = ' <span class="badge badge-danger ml-1">'.$deleted_users_count.'</span>'; |
|
| 163 | 163 | } |
| 164 | 164 | ?> |
| 165 | 165 | |
@@ -194,13 +194,13 @@ discard block |
||
| 194 | 194 | </button><?php |
| 195 | 195 | echo isset($SETTINGS['ldap_mode']) === true && (int) $SETTINGS['ldap_mode'] === 1 && (int) $session->get('user-admin') === 1 ? |
| 196 | 196 | '<button type="button" class="btn btn-primary btn-sm tp-action mr-2" data-action="ldap-sync"> |
| 197 | - <i class="fa-solid fa-address-card mr-2"></i>' . $lang->get('ldap_synchronization') . ' |
|
| 197 | + <i class="fa-solid fa-address-card mr-2"></i>' . $lang->get('ldap_synchronization').' |
|
| 198 | 198 | </button>' : ''; |
| 199 | 199 | ?> |
| 200 | 200 | </button><?php |
| 201 | 201 | echo isset($SETTINGS['oauth2_enabled']) === true && (int) $SETTINGS['oauth2_enabled'] === 1 && (int) $session->get('user-admin') === 1 ? |
| 202 | 202 | '<button type="button" class="btn btn-primary btn-sm tp-action mr-2" data-action="oauth2-sync"> |
| 203 | - <i class="fa-solid fa-plug mr-2"></i>' . $lang->get('oauth2_synchronization') . ' |
|
| 203 | + <i class="fa-solid fa-plug mr-2"></i>' . $lang->get('oauth2_synchronization').' |
|
| 204 | 204 | </button>' : ''; |
| 205 | 205 | ?> |
| 206 | 206 | <button type="button" class="btn btn-primary btn-sm tp-action mr-2 <?php echo $blink_class; ?>" data-action="deleted-users"> |
@@ -210,8 +210,8 @@ discard block |
||
| 210 | 210 | </div> |
| 211 | 211 | |
| 212 | 212 | <!-- /.card-header --> |
| 213 | - <div class="card-body form user-content with-header-menu <?php echo $showNewUser ? 'hidden' : '';?>" id="users-list" data-content="refresh"> |
|
| 214 | - <label><input type="checkbox" id="warnings_display" class="tp-action pointer" data-action="refresh"><span class="ml-2 pointer"><?php echo $lang->get('display_warning_icons');?></span></label> |
|
| 213 | + <div class="card-body form user-content with-header-menu <?php echo $showNewUser ? 'hidden' : ''; ?>" id="users-list" data-content="refresh"> |
|
| 214 | + <label><input type="checkbox" id="warnings_display" class="tp-action pointer" data-action="refresh"><span class="ml-2 pointer"><?php echo $lang->get('display_warning_icons'); ?></span></label> |
|
| 215 | 215 | <table id="table-users" class="table table-striped nowrap table-responsive-sm"> |
| 216 | 216 | <thead> |
| 217 | 217 | <tr> |
@@ -275,7 +275,7 @@ discard block |
||
| 275 | 275 | <?php |
| 276 | 276 | foreach (TP_PW_COMPLEXITY as $entry) { |
| 277 | 277 | echo ' |
| 278 | - <option value="' . $entry[0] . '">' . addslashes($entry[1]) . '</option>'; |
|
| 278 | + <option value="' . $entry[0].'">'.addslashes($entry[1]).'</option>'; |
|
| 279 | 279 | } |
| 280 | 280 | ?> |
| 281 | 281 | </select> |
@@ -352,7 +352,7 @@ discard block |
||
| 352 | 352 | <?php |
| 353 | 353 | foreach (TP_PW_COMPLEXITY as $entry) { |
| 354 | 354 | echo ' |
| 355 | - <option value="' . $entry[0] . '">' . addslashes($entry[1]) . '</option>'; |
|
| 355 | + <option value="' . $entry[0].'">'.addslashes($entry[1]).'</option>'; |
|
| 356 | 356 | } |
| 357 | 357 | ?> |
| 358 | 358 | </select> |
@@ -390,7 +390,7 @@ discard block |
||
| 390 | 390 | </div> |
| 391 | 391 | |
| 392 | 392 | <!-- USER FORM --> |
| 393 | - <div class="row <?php echo $showNewUser ? '' : 'hidden';?> extra-form user-content" id="row-form" data-content="new" data-content-alternative="edit"> |
|
| 393 | + <div class="row <?php echo $showNewUser ? '' : 'hidden'; ?> extra-form user-content" id="row-form" data-content="new" data-content-alternative="edit"> |
|
| 394 | 394 | <div class="col-12"> |
| 395 | 395 | <div class="card card-primary"> |
| 396 | 396 | <div class="card-header"> |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('profile') === false) { |
| 75 | 75 | // Not allowed page |
| 76 | 76 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 77 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 77 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 78 | 78 | exit; |
| 79 | 79 | } |
| 80 | 80 | |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | |
| 146 | 146 | // Get info about user to modify |
| 147 | 147 | $targetUserInfos = DB::queryFirstRow( |
| 148 | - 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 148 | + 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 149 | 149 | WHERE id = %i', |
| 150 | 150 | (int) $dataReceived['user_id'] |
| 151 | 151 | ); |
@@ -277,7 +277,7 @@ discard block |
||
| 277 | 277 | // Check if user already exists (active user) |
| 278 | 278 | $data = DB::query( |
| 279 | 279 | 'SELECT id, fonction_id, groupes_interdits, groupes_visibles |
| 280 | - FROM ' . prefixTable('users') . ' |
|
| 280 | + FROM ' . prefixTable('users').' |
|
| 281 | 281 | WHERE login = %s |
| 282 | 282 | AND deleted_at IS NULL', |
| 283 | 283 | $login |
@@ -286,10 +286,10 @@ discard block |
||
| 286 | 286 | // Check if a soft-deleted user with this login exists |
| 287 | 287 | $deletedUser = DB::queryFirstRow( |
| 288 | 288 | 'SELECT id, login, deleted_at |
| 289 | - FROM ' . prefixTable('users') . ' |
|
| 289 | + FROM ' . prefixTable('users').' |
|
| 290 | 290 | WHERE login LIKE %s |
| 291 | 291 | AND deleted_at IS NOT NULL', |
| 292 | - $login . '_deleted_%' |
|
| 292 | + $login.'_deleted_%' |
|
| 293 | 293 | ); |
| 294 | 294 | |
| 295 | 295 | if (DB::count() === 0 && empty($deletedUser) === true) { |
@@ -469,7 +469,7 @@ discard block |
||
| 469 | 469 | // Check if it's a soft-deleted user |
| 470 | 470 | $errorMessage = $lang->get('error_user_exists'); |
| 471 | 471 | if (empty($deletedUser) === false) { |
| 472 | - $errorMessage = 'A deleted user with this login already exists (ID: ' . $deletedUser['id'] . '). Please restore the user instead of creating a new one.'; |
|
| 472 | + $errorMessage = 'A deleted user with this login already exists (ID: '.$deletedUser['id'].'). Please restore the user instead of creating a new one.'; |
|
| 473 | 473 | } |
| 474 | 474 | |
| 475 | 475 | echo prepareExchangedData( |
@@ -508,7 +508,7 @@ discard block |
||
| 508 | 508 | } |
| 509 | 509 | |
| 510 | 510 | // Prepare variables |
| 511 | - $userId = filter_var($dataReceived['user_id'], FILTER_SANITIZE_NUMBER_INT); |
|
| 511 | + $userId = filter_var($dataReceived['user_id'], FILTER_SANITIZE_NUMBER_INT); |
|
| 512 | 512 | |
| 513 | 513 | if (empty($userId)) { |
| 514 | 514 | echo prepareExchangedData( |
@@ -523,7 +523,7 @@ discard block |
||
| 523 | 523 | |
| 524 | 524 | // Get info about user to delete |
| 525 | 525 | $data_user = DB::queryFirstRow( |
| 526 | - 'SELECT login, admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 526 | + 'SELECT login, admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 527 | 527 | WHERE id = %i', |
| 528 | 528 | $userId |
| 529 | 529 | ); |
@@ -540,7 +540,7 @@ discard block |
||
| 540 | 540 | || ((int) $session->get('user-can_manage_all_users') === 1 && (int) $data_user['admin'] !== 1) |
| 541 | 541 | ) { |
| 542 | 542 | $timestamp = time(); |
| 543 | - $deletedSuffix = '_deleted_' . $timestamp; |
|
| 543 | + $deletedSuffix = '_deleted_'.$timestamp; |
|
| 544 | 544 | |
| 545 | 545 | // delete user in database |
| 546 | 546 | DB::update( |
@@ -678,7 +678,7 @@ discard block |
||
| 678 | 678 | echo prepareExchangedData( |
| 679 | 679 | [ |
| 680 | 680 | 'error' => true, |
| 681 | - 'message' => $lang->get('error') . ': ' . $e->getMessage(), |
|
| 681 | + 'message' => $lang->get('error').': '.$e->getMessage(), |
|
| 682 | 682 | ], |
| 683 | 683 | 'encode' |
| 684 | 684 | ); |
@@ -692,7 +692,7 @@ discard block |
||
| 692 | 692 | $return = array(); |
| 693 | 693 | // Check if folder exists |
| 694 | 694 | $data = DB::query( |
| 695 | - 'SELECT * FROM ' . prefixTable('nested_tree') . ' |
|
| 695 | + 'SELECT * FROM '.prefixTable('nested_tree').' |
|
| 696 | 696 | WHERE title = %s AND parent_id = %i', |
| 697 | 697 | filter_input(INPUT_POST, 'domain', FILTER_SANITIZE_FULL_SPECIAL_CHARS), |
| 698 | 698 | '0' |
@@ -705,7 +705,7 @@ discard block |
||
| 705 | 705 | } |
| 706 | 706 | // Check if role exists |
| 707 | 707 | $data = DB::query( |
| 708 | - 'SELECT * FROM ' . prefixTable('roles_title') . ' |
|
| 708 | + 'SELECT * FROM '.prefixTable('roles_title').' |
|
| 709 | 709 | WHERE title = %s', |
| 710 | 710 | filter_input(INPUT_POST, 'domain', FILTER_SANITIZE_FULL_SPECIAL_CHARS) |
| 711 | 711 | ); |
@@ -734,7 +734,7 @@ discard block |
||
| 734 | 734 | // Get info about user to delete |
| 735 | 735 | $data_user = DB::queryFirstRow( |
| 736 | 736 | 'SELECT admin, isAdministratedByRole, gestionnaire |
| 737 | - FROM ' . prefixTable('users') . ' |
|
| 737 | + FROM ' . prefixTable('users').' |
|
| 738 | 738 | WHERE id = %i', |
| 739 | 739 | $post_user_id |
| 740 | 740 | ); |
@@ -790,7 +790,7 @@ discard block |
||
| 790 | 790 | // Get info about user |
| 791 | 791 | $rowUser = DB::queryFirstRow( |
| 792 | 792 | 'SELECT * |
| 793 | - FROM ' . prefixTable('users') . ' |
|
| 793 | + FROM ' . prefixTable('users').' |
|
| 794 | 794 | WHERE id = %i', |
| 795 | 795 | $post_id |
| 796 | 796 | ); |
@@ -818,7 +818,7 @@ discard block |
||
| 818 | 818 | $session->set('user-roles_array', explode(';', $session->get('user-roles'))); |
| 819 | 819 | $rows = DB::query(' |
| 820 | 820 | SELECT id,title,creator_id |
| 821 | - FROM ' . prefixTable('roles_title') .' |
|
| 821 | + FROM ' . prefixTable('roles_title').' |
|
| 822 | 822 | WHERE id IN %li', |
| 823 | 823 | $session->get('user-roles_array') |
| 824 | 824 | ); |
@@ -856,7 +856,7 @@ discard block |
||
| 856 | 856 | $rolesList = array(); |
| 857 | 857 | $managedBy = array(); |
| 858 | 858 | $selected = ''; |
| 859 | - $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title') . ' ORDER BY title ASC'); |
|
| 859 | + $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title').' ORDER BY title ASC'); |
|
| 860 | 860 | foreach ($rows as $reccord) { |
| 861 | 861 | $rolesList[$reccord['id']] = array('id' => $reccord['id'], 'title' => $reccord['title']); |
| 862 | 862 | } |
@@ -887,7 +887,7 @@ discard block |
||
| 887 | 887 | array_push( |
| 888 | 888 | $managedBy, |
| 889 | 889 | array( |
| 890 | - 'title' => $lang->get('managers_of') . ' ' . $fonction['title'], |
|
| 890 | + 'title' => $lang->get('managers_of').' '.$fonction['title'], |
|
| 891 | 891 | 'id' => $fonction['id'], |
| 892 | 892 | 'selected' => $selected, |
| 893 | 893 | ) |
@@ -969,9 +969,9 @@ discard block |
||
| 969 | 969 | |
| 970 | 970 | // get USER STATUS |
| 971 | 971 | if ($rowUser['disabled'] == 1) { |
| 972 | - $arrData['info'] = $lang->get('user_info_locked') . '<br><input type="checkbox" value="unlock" name="1" class="chk"> <label for="1">' . $lang->get('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">' . $lang->get('user_info_delete_question') . '</label>'; |
|
| 972 | + $arrData['info'] = $lang->get('user_info_locked').'<br><input type="checkbox" value="unlock" name="1" class="chk"> <label for="1">'.$lang->get('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">'.$lang->get('user_info_delete_question').'</label>'; |
|
| 973 | 973 | } else { |
| 974 | - $arrData['info'] = $lang->get('user_info_active') . '<br><input type="checkbox" value="lock" class="chk"> ' . $lang->get('user_info_lock_question'); |
|
| 974 | + $arrData['info'] = $lang->get('user_info_active').'<br><input type="checkbox" value="lock" class="chk"> '.$lang->get('user_info_lock_question'); |
|
| 975 | 975 | } |
| 976 | 976 | |
| 977 | 977 | $arrData['error'] = false; |
@@ -1058,7 +1058,7 @@ discard block |
||
| 1058 | 1058 | |
| 1059 | 1059 | // Get info about user to modify |
| 1060 | 1060 | $data_user = DB::queryFirstRow( |
| 1061 | - 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 1061 | + 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 1062 | 1062 | WHERE id = %i', |
| 1063 | 1063 | $post_id |
| 1064 | 1064 | ); |
@@ -1069,7 +1069,7 @@ discard block |
||
| 1069 | 1069 | // count number of admins |
| 1070 | 1070 | $users = DB::query( |
| 1071 | 1071 | 'SELECT id |
| 1072 | - FROM ' . prefixTable('users') . ' |
|
| 1072 | + FROM ' . prefixTable('users').' |
|
| 1073 | 1073 | WHERE admin = 1 AND email != "" AND pw != "" AND id != %i', |
| 1074 | 1074 | $post_id |
| 1075 | 1075 | ); |
@@ -1092,7 +1092,7 @@ discard block |
||
| 1092 | 1092 | // Exclude roles from AD - PR #3635 |
| 1093 | 1093 | $adRoles = DB::query( |
| 1094 | 1094 | 'SELECT roles_from_ad_groups |
| 1095 | - FROM ' . prefixTable('users') . ' |
|
| 1095 | + FROM ' . prefixTable('users').' |
|
| 1096 | 1096 | WHERE id = %i', |
| 1097 | 1097 | $post_id |
| 1098 | 1098 | )[0]['roles_from_ad_groups']; |
@@ -1194,7 +1194,7 @@ discard block |
||
| 1194 | 1194 | ); |
| 1195 | 1195 | // delete personal folder and subfolders |
| 1196 | 1196 | $data = DB::queryFirstRow( |
| 1197 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' |
|
| 1197 | + 'SELECT id FROM '.prefixTable('nested_tree').' |
|
| 1198 | 1198 | WHERE title = %s AND personal_folder = %i', |
| 1199 | 1199 | $post_id, |
| 1200 | 1200 | '1' |
@@ -1207,7 +1207,7 @@ discard block |
||
| 1207 | 1207 | DB::delete(prefixTable('nested_tree'), 'id = %i AND personal_folder = %i', $folder->id, '1'); |
| 1208 | 1208 | // delete items & logs |
| 1209 | 1209 | $items = DB::query( |
| 1210 | - 'SELECT id FROM ' . prefixTable('items') . ' |
|
| 1210 | + 'SELECT id FROM '.prefixTable('items').' |
|
| 1211 | 1211 | WHERE id_tree=%i AND perso = %i', |
| 1212 | 1212 | $folder->id, |
| 1213 | 1213 | '1' |
@@ -1228,7 +1228,7 @@ discard block |
||
| 1228 | 1228 | } else { |
| 1229 | 1229 | // Get old data about user |
| 1230 | 1230 | $oldData = DB::queryFirstRow( |
| 1231 | - 'SELECT * FROM ' . prefixTable('users') . ' |
|
| 1231 | + 'SELECT * FROM '.prefixTable('users').' |
|
| 1232 | 1232 | WHERE id = %i', |
| 1233 | 1233 | $post_id |
| 1234 | 1234 | ); |
@@ -1265,7 +1265,7 @@ discard block |
||
| 1265 | 1265 | |
| 1266 | 1266 | // update LOG |
| 1267 | 1267 | if ($oldData['email'] !== $post_email) { |
| 1268 | - logEvents($SETTINGS, 'user_mngt', 'at_user_email_changed:' . $oldData['email'], (string) $session->get('user-id'), $session->get('user-login'), $post_id); |
|
| 1268 | + logEvents($SETTINGS, 'user_mngt', 'at_user_email_changed:'.$oldData['email'], (string) $session->get('user-id'), $session->get('user-login'), $post_id); |
|
| 1269 | 1269 | } |
| 1270 | 1270 | } |
| 1271 | 1271 | echo prepareExchangedData( |
@@ -1314,7 +1314,7 @@ discard block |
||
| 1314 | 1314 | |
| 1315 | 1315 | $login = (string) filter_input(INPUT_POST, 'login', FILTER_SANITIZE_FULL_SPECIAL_CHARS); |
| 1316 | 1316 | DB::queryFirstRow( |
| 1317 | - 'SELECT * FROM ' . prefixTable('users') . ' |
|
| 1317 | + 'SELECT * FROM '.prefixTable('users').' |
|
| 1318 | 1318 | WHERE (login = %s AND deleted_at IS NULL) |
| 1319 | 1319 | OR login LIKE %s', |
| 1320 | 1320 | $login, |
@@ -1367,7 +1367,7 @@ discard block |
||
| 1367 | 1367 | // get User info |
| 1368 | 1368 | $rowUser = DB::queryFirstRow( |
| 1369 | 1369 | 'SELECT id, login, name, lastname, email, disabled, fonction_id, groupes_interdits, groupes_visibles, isAdministratedByRole, avatar_thumb, roles_from_ad_groups |
| 1370 | - FROM ' . prefixTable('users') . ' |
|
| 1370 | + FROM ' . prefixTable('users').' |
|
| 1371 | 1371 | WHERE id = %i', |
| 1372 | 1372 | $post_id |
| 1373 | 1373 | ); |
@@ -1378,7 +1378,7 @@ discard block |
||
| 1378 | 1378 | $html = ''; |
| 1379 | 1379 | |
| 1380 | 1380 | if (isset($SETTINGS['ldap_mode']) === true && (int) $SETTINGS['ldap_mode'] === 1 && isset($SETTINGS['enable_ad_users_with_ad_groups']) === true && (int) $SETTINGS['enable_ad_users_with_ad_groups'] === 1) { |
| 1381 | - $rowUser['fonction_id'] = empty($rowUser['fonction_id']) === true ? $rowUser['roles_from_ad_groups'] : $rowUser['fonction_id']. ';' . $rowUser['roles_from_ad_groups']; |
|
| 1381 | + $rowUser['fonction_id'] = empty($rowUser['fonction_id']) === true ? $rowUser['roles_from_ad_groups'] : $rowUser['fonction_id'].';'.$rowUser['roles_from_ad_groups']; |
|
| 1382 | 1382 | } |
| 1383 | 1383 | $arrData['functions'] = array_filter(explode(';', $rowUser['fonction_id'])); |
| 1384 | 1384 | $arrData['allowed_folders'] = array_filter(explode(';', $rowUser['groupes_visibles'])); |
@@ -1389,8 +1389,8 @@ discard block |
||
| 1389 | 1389 | // refine folders based upon roles |
| 1390 | 1390 | $rows = DB::query( |
| 1391 | 1391 | 'SELECT rv.folder_id, rv.type |
| 1392 | - FROM ' . prefixTable('roles_values') . ' as rv |
|
| 1393 | - INNER JOIN ' . prefixTable('nested_tree') . ' as nt ON rv.folder_id = nt.id |
|
| 1392 | + FROM ' . prefixTable('roles_values').' as rv |
|
| 1393 | + INNER JOIN ' . prefixTable('nested_tree').' as nt ON rv.folder_id = nt.id |
|
| 1394 | 1394 | WHERE rv.role_id IN %ls AND nt.personal_folder = 0 |
| 1395 | 1395 | ORDER BY rv.folder_id ASC', |
| 1396 | 1396 | $arrData['functions'] |
@@ -1413,7 +1413,7 @@ discard block |
||
| 1413 | 1413 | } |
| 1414 | 1414 | |
| 1415 | 1415 | // add allowed folders |
| 1416 | - foreach($arrData['allowed_folders'] as $Fld) { |
|
| 1416 | + foreach ($arrData['allowed_folders'] as $Fld) { |
|
| 1417 | 1417 | array_push($arrFolders, array('id' => $Fld, 'type' => 'W', 'special' => true)); |
| 1418 | 1418 | } |
| 1419 | 1419 | |
@@ -1428,7 +1428,7 @@ discard block |
||
| 1428 | 1428 | // get folder name |
| 1429 | 1429 | $row = DB::queryFirstRow( |
| 1430 | 1430 | 'SELECT title, nlevel, id |
| 1431 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 1431 | + FROM ' . prefixTable('nested_tree').' |
|
| 1432 | 1432 | WHERE id = %i', |
| 1433 | 1433 | $fld['id'] |
| 1434 | 1434 | ); |
@@ -1446,8 +1446,8 @@ discard block |
||
| 1446 | 1446 | } |
| 1447 | 1447 | } |
| 1448 | 1448 | |
| 1449 | - $html_full = '<table id="table-folders" class="table table-bordered table-striped dt-responsive nowrap" style="width:100%"><tbody>' . |
|
| 1450 | - $html . '</tbody></table>'; |
|
| 1449 | + $html_full = '<table id="table-folders" class="table table-bordered table-striped dt-responsive nowrap" style="width:100%"><tbody>'. |
|
| 1450 | + $html.'</tbody></table>'; |
|
| 1451 | 1451 | } else { |
| 1452 | 1452 | $html_full = ''; |
| 1453 | 1453 | } |
@@ -1497,7 +1497,7 @@ discard block |
||
| 1497 | 1497 | if ((int) $session->get('user-admin') === 0 && (int) $session->get('user-can_manage_all_users') === 0) { |
| 1498 | 1498 | $rows = DB::query( |
| 1499 | 1499 | 'SELECT * |
| 1500 | - FROM ' . prefixTable('users') . ' |
|
| 1500 | + FROM ' . prefixTable('users').' |
|
| 1501 | 1501 | WHERE admin = %i AND isAdministratedByRole IN %ls AND deleted_at IS NULL and disabled = %i', |
| 1502 | 1502 | 0, |
| 1503 | 1503 | array_filter($session->get('user-roles_array')), |
@@ -1506,7 +1506,7 @@ discard block |
||
| 1506 | 1506 | } else { |
| 1507 | 1507 | $rows = DB::query( |
| 1508 | 1508 | 'SELECT * |
| 1509 | - FROM ' . prefixTable('users') . ' |
|
| 1509 | + FROM ' . prefixTable('users').' |
|
| 1510 | 1510 | WHERE admin = %i AND deleted_at IS NULL and disabled = %i', |
| 1511 | 1511 | 0, |
| 1512 | 1512 | 0 |
@@ -1519,7 +1519,7 @@ discard block |
||
| 1519 | 1519 | $groupIds = []; |
| 1520 | 1520 | foreach (explode(';', $record['fonction_id']) as $group) { |
| 1521 | 1521 | $tmp = DB::queryFirstRow( |
| 1522 | - 'SELECT id, title FROM ' . prefixTable('roles_title') . ' |
|
| 1522 | + 'SELECT id, title FROM '.prefixTable('roles_title').' |
|
| 1523 | 1523 | WHERE id = %i', |
| 1524 | 1524 | $group |
| 1525 | 1525 | ); |
@@ -1531,7 +1531,7 @@ discard block |
||
| 1531 | 1531 | |
| 1532 | 1532 | // Get managed_by |
| 1533 | 1533 | $managedBy = DB::queryFirstRow( |
| 1534 | - 'SELECT id, title FROM ' . prefixTable('roles_title') . ' |
|
| 1534 | + 'SELECT id, title FROM '.prefixTable('roles_title').' |
|
| 1535 | 1535 | WHERE id = %i', |
| 1536 | 1536 | $record['isAdministratedByRole'] |
| 1537 | 1537 | ); |
@@ -1541,7 +1541,7 @@ discard block |
||
| 1541 | 1541 | $foldersAllowedIds = []; |
| 1542 | 1542 | foreach (explode(';', $record['groupes_visibles']) as $role) { |
| 1543 | 1543 | $tmp = DB::queryFirstRow( |
| 1544 | - 'SELECT id, title FROM ' . prefixTable('nested_tree') . ' |
|
| 1544 | + 'SELECT id, title FROM '.prefixTable('nested_tree').' |
|
| 1545 | 1545 | WHERE id = %i', |
| 1546 | 1546 | $role |
| 1547 | 1547 | ); |
@@ -1554,7 +1554,7 @@ discard block |
||
| 1554 | 1554 | $foldersForbiddenIds = []; |
| 1555 | 1555 | foreach (explode(';', $record['groupes_interdits']) as $role) { |
| 1556 | 1556 | $tmp = DB::queryFirstRow( |
| 1557 | - 'SELECT id, title FROM ' . prefixTable('nested_tree') . ' |
|
| 1557 | + 'SELECT id, title FROM '.prefixTable('nested_tree').' |
|
| 1558 | 1558 | WHERE id = %i', |
| 1559 | 1559 | $role |
| 1560 | 1560 | ); |
@@ -1572,7 +1572,7 @@ discard block |
||
| 1572 | 1572 | 'login' => $record['login'], |
| 1573 | 1573 | 'groups' => implode(', ', $groups), |
| 1574 | 1574 | 'groupIds' => $groupIds, |
| 1575 | - 'managedBy' => $managedBy=== null ? $lang->get('administrator') : $managedBy['title'], |
|
| 1575 | + 'managedBy' => $managedBy === null ? $lang->get('administrator') : $managedBy['title'], |
|
| 1576 | 1576 | 'managedById' => $managedBy === null ? 0 : $managedBy['id'], |
| 1577 | 1577 | 'foldersAllowed' => implode(', ', $foldersAllowed), |
| 1578 | 1578 | 'foldersAllowedIds' => $foldersAllowedIds, |
@@ -1673,7 +1673,7 @@ discard block |
||
| 1673 | 1673 | |
| 1674 | 1674 | // Get info about user |
| 1675 | 1675 | $data_user = DB::queryFirstRow( |
| 1676 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 1676 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 1677 | 1677 | WHERE id = %i', |
| 1678 | 1678 | $inputData['source_id'] |
| 1679 | 1679 | ); |
@@ -1905,14 +1905,14 @@ discard block |
||
| 1905 | 1905 | if (empty($post_context) === false && $post_context === 'add_one_role_to_user') { |
| 1906 | 1906 | $data_user = DB::queryFirstRow( |
| 1907 | 1907 | 'SELECT fonction_id, public_key |
| 1908 | - FROM ' . prefixTable('users') . ' |
|
| 1908 | + FROM ' . prefixTable('users').' |
|
| 1909 | 1909 | WHERE id = %i', |
| 1910 | 1910 | $post_user_id |
| 1911 | 1911 | ); |
| 1912 | 1912 | |
| 1913 | 1913 | if ($data_user) { |
| 1914 | 1914 | // Ensure array is unique |
| 1915 | - $post_new_value = str_replace(',', ';', $data_user['fonction_id']) . ';' . $post_new_value; |
|
| 1915 | + $post_new_value = str_replace(',', ';', $data_user['fonction_id']).';'.$post_new_value; |
|
| 1916 | 1916 | $post_new_value = implode(';', array_unique(explode(';', $post_new_value))); |
| 1917 | 1917 | } else { |
| 1918 | 1918 | // User not found |
@@ -1928,14 +1928,14 @@ discard block |
||
| 1928 | 1928 | } |
| 1929 | 1929 | |
| 1930 | 1930 | // Manage specific case of api key |
| 1931 | - if($post_field === 'user_api_key') { |
|
| 1931 | + if ($post_field === 'user_api_key') { |
|
| 1932 | 1932 | $encrypted_key = encryptUserObjectKey(base64_encode($post_new_value), $session->get('user-public_key')); |
| 1933 | 1933 | $session->set('user-api_key', $post_new_value); |
| 1934 | 1934 | |
| 1935 | 1935 | // test if user has an api key |
| 1936 | 1936 | $data_user = DB::queryFirstRow( |
| 1937 | 1937 | 'SELECT value |
| 1938 | - FROM ' . prefixTable('api') . ' |
|
| 1938 | + FROM ' . prefixTable('api').' |
|
| 1939 | 1939 | WHERE user_id = %i', |
| 1940 | 1940 | $post_user_id |
| 1941 | 1941 | ); |
@@ -2055,7 +2055,7 @@ discard block |
||
| 2055 | 2055 | } catch (\LdapRecord\Auth\BindException $e) { |
| 2056 | 2056 | $error = $e->getDetailedError(); |
| 2057 | 2057 | if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) { |
| 2058 | - error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage()); |
|
| 2058 | + error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage()); |
|
| 2059 | 2059 | } |
| 2060 | 2060 | // deepcode ignore ServerLeak: No important data is sent and it is encrypted before sending |
| 2061 | 2061 | echo prepareExchangedData( |
@@ -2085,7 +2085,7 @@ discard block |
||
| 2085 | 2085 | } catch (\LdapRecord\Auth\BindException $e) { |
| 2086 | 2086 | $error = $e->getDetailedError(); |
| 2087 | 2087 | if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) { |
| 2088 | - error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage()); |
|
| 2088 | + error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage()); |
|
| 2089 | 2089 | } |
| 2090 | 2090 | // deepcode ignore ServerLeak: No important data is sent and it is encrypted before sending |
| 2091 | 2091 | echo prepareExchangedData( |
@@ -2102,7 +2102,7 @@ discard block |
||
| 2102 | 2102 | if (isset($adUser[$SETTINGS['ldap_user_attribute']][0]) === false) continue; |
| 2103 | 2103 | // Build the list of all groups in AD |
| 2104 | 2104 | if (isset($adUser['memberof']) === true) { |
| 2105 | - foreach($adUser['memberof'] as $j => $adUserGroup) { |
|
| 2105 | + foreach ($adUser['memberof'] as $j => $adUserGroup) { |
|
| 2106 | 2106 | if (empty($adUserGroup) === false && $j !== "count") { |
| 2107 | 2107 | $adGroup = substr($adUserGroup, 3, strpos($adUserGroup, ',') - 3); |
| 2108 | 2108 | if (in_array($adGroup, $adRoles) === false && empty($adGroup) === false) { |
@@ -2118,7 +2118,7 @@ discard block |
||
| 2118 | 2118 | // Get his ID |
| 2119 | 2119 | $userInfo = DB::queryFirstRow( |
| 2120 | 2120 | 'SELECT id, login, fonction_id, auth_type |
| 2121 | - FROM ' . prefixTable('users') . ' |
|
| 2121 | + FROM ' . prefixTable('users').' |
|
| 2122 | 2122 | WHERE login = %s', |
| 2123 | 2123 | $userLogin |
| 2124 | 2124 | ); |
@@ -2154,7 +2154,7 @@ discard block |
||
| 2154 | 2154 | |
| 2155 | 2155 | // Get all groups in Teampass |
| 2156 | 2156 | $teampassRoles = array(); |
| 2157 | - $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title')); |
|
| 2157 | + $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title')); |
|
| 2158 | 2158 | foreach ($rows as $record) { |
| 2159 | 2159 | array_push( |
| 2160 | 2160 | $teampassRoles, |
@@ -2219,7 +2219,7 @@ discard block |
||
| 2219 | 2219 | // Check if user already exists |
| 2220 | 2220 | $data = DB::query( |
| 2221 | 2221 | 'SELECT id, fonction_id, groupes_interdits, groupes_visibles |
| 2222 | - FROM ' . prefixTable('users') . ' |
|
| 2222 | + FROM ' . prefixTable('users').' |
|
| 2223 | 2223 | WHERE login = %s', |
| 2224 | 2224 | $post_login |
| 2225 | 2225 | ); |
@@ -2414,7 +2414,7 @@ discard block |
||
| 2414 | 2414 | // Check if user already exists |
| 2415 | 2415 | DB::query( |
| 2416 | 2416 | 'SELECT id |
| 2417 | - FROM ' . prefixTable('users') . ' |
|
| 2417 | + FROM ' . prefixTable('users').' |
|
| 2418 | 2418 | WHERE id = %i', |
| 2419 | 2419 | $post_id |
| 2420 | 2420 | ); |
@@ -2476,7 +2476,7 @@ discard block |
||
| 2476 | 2476 | // Get all groups in Teampass |
| 2477 | 2477 | $teampassRoles = array(); |
| 2478 | 2478 | $titleToIdMap = []; |
| 2479 | - $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title')); |
|
| 2479 | + $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title')); |
|
| 2480 | 2480 | foreach ($rows as $record) { |
| 2481 | 2481 | array_push( |
| 2482 | 2482 | $teampassRoles, |
@@ -2522,7 +2522,7 @@ discard block |
||
| 2522 | 2522 | // Get his ID |
| 2523 | 2523 | $userInfo = DB::queryFirstRow( |
| 2524 | 2524 | 'SELECT id, login, fonction_id, auth_type |
| 2525 | - FROM ' . prefixTable('users') . ' |
|
| 2525 | + FROM ' . prefixTable('users').' |
|
| 2526 | 2526 | WHERE login = %s', |
| 2527 | 2527 | $userLogin |
| 2528 | 2528 | ); |
@@ -2629,7 +2629,7 @@ discard block |
||
| 2629 | 2629 | // Check if user already exists |
| 2630 | 2630 | DB::query( |
| 2631 | 2631 | 'SELECT id |
| 2632 | - FROM ' . prefixTable('users') . ' |
|
| 2632 | + FROM ' . prefixTable('users').' |
|
| 2633 | 2633 | WHERE id = %i', |
| 2634 | 2634 | $post_id |
| 2635 | 2635 | ); |
@@ -2695,7 +2695,7 @@ discard block |
||
| 2695 | 2695 | // Search TP_USER in db |
| 2696 | 2696 | $userTP = DB::queryFirstRow( |
| 2697 | 2697 | 'SELECT pw |
| 2698 | - FROM ' . prefixTable('users') . ' |
|
| 2698 | + FROM ' . prefixTable('users').' |
|
| 2699 | 2699 | WHERE id = %i', |
| 2700 | 2700 | TP_USER_ID |
| 2701 | 2701 | ); |
@@ -2718,7 +2718,7 @@ discard block |
||
| 2718 | 2718 | 'arguments' => json_encode([ |
| 2719 | 2719 | 'new_user_id' => (int) $post_user_id, |
| 2720 | 2720 | 'new_user_pwd' => '', |
| 2721 | - 'new_user_code' => cryption($post_user_code, '','encrypt', $SETTINGS)['string'], |
|
| 2721 | + 'new_user_code' => cryption($post_user_code, '', 'encrypt', $SETTINGS)['string'], |
|
| 2722 | 2722 | 'owner_id' => (int) TP_USER_ID, |
| 2723 | 2723 | 'creator_pwd' => $userTP['pw'], |
| 2724 | 2724 | 'email_body' => $lang->get('email_body_user_config_5'), |
@@ -2825,17 +2825,17 @@ discard block |
||
| 2825 | 2825 | // get user info |
| 2826 | 2826 | $processesProgress = DB::query( |
| 2827 | 2827 | 'SELECT u.ongoing_process_id, pt.task, pt.updated_at, pt.finished_at, pt.is_in_progress |
| 2828 | - FROM ' . prefixTable('users') . ' AS u |
|
| 2829 | - INNER JOIN ' . prefixTable('background_subtasks') . ' AS pt ON (pt.task_id = u.ongoing_process_id) |
|
| 2828 | + FROM ' . prefixTable('users').' AS u |
|
| 2829 | + INNER JOIN ' . prefixTable('background_subtasks').' AS pt ON (pt.task_id = u.ongoing_process_id) |
|
| 2830 | 2830 | WHERE u.id = %i', |
| 2831 | 2831 | $user_id |
| 2832 | 2832 | ); |
| 2833 | 2833 | |
| 2834 | 2834 | $finished_steps = 0; |
| 2835 | 2835 | $nb_steps = count($processesProgress); |
| 2836 | - foreach($processesProgress as $process) { |
|
| 2836 | + foreach ($processesProgress as $process) { |
|
| 2837 | 2837 | if ((int) $process['is_in_progress'] === -1) { |
| 2838 | - $finished_steps ++; |
|
| 2838 | + $finished_steps++; |
|
| 2839 | 2839 | } |
| 2840 | 2840 | } |
| 2841 | 2841 | |
@@ -2844,7 +2844,7 @@ discard block |
||
| 2844 | 2844 | 'error' => false, |
| 2845 | 2845 | 'message' => '', |
| 2846 | 2846 | 'user_id' => $user_id, |
| 2847 | - 'status' => $finished_steps === $nb_steps ? 'finished' : number_format($finished_steps/$nb_steps*100, 0).'%', |
|
| 2847 | + 'status' => $finished_steps === $nb_steps ? 'finished' : number_format($finished_steps / $nb_steps * 100, 0).'%', |
|
| 2848 | 2848 | 'debug' => $finished_steps.",".$nb_steps, |
| 2849 | 2849 | ), |
| 2850 | 2850 | 'encode' |
@@ -2977,7 +2977,7 @@ discard block |
||
| 2977 | 2977 | } |
| 2978 | 2978 | |
| 2979 | 2979 | $result = purgeDeletedUserById($userId); |
| 2980 | - $deletedAccountsCount = (int) DB::queryFirstField("SELECT COUNT(id) FROM " . prefixTable('users') . " WHERE deleted_at IS NOT NULL"); |
|
| 2980 | + $deletedAccountsCount = (int) DB::queryFirstField("SELECT COUNT(id) FROM ".prefixTable('users')." WHERE deleted_at IS NOT NULL"); |
|
| 2981 | 2981 | |
| 2982 | 2982 | echo prepareExchangedData( |
| 2983 | 2983 | [ |
@@ -3017,13 +3017,13 @@ discard block |
||
| 3017 | 3017 | |
| 3018 | 3018 | // Prepare variables |
| 3019 | 3019 | $daysRetention = filter_var($dataReceived['days_retention'], FILTER_SANITIZE_NUMBER_INT); |
| 3020 | - $daysRetention = empty($daysRetention) ? 90 : (int)$daysRetention; |
|
| 3020 | + $daysRetention = empty($daysRetention) ? 90 : (int) $daysRetention; |
|
| 3021 | 3021 | $cutoffTimestamp = time() - ($daysRetention * 86400); |
| 3022 | 3022 | |
| 3023 | 3023 | try { |
| 3024 | 3024 | // Get list of users to delete |
| 3025 | 3025 | $users = DB::query( |
| 3026 | - "SELECT id FROM " . prefixTable("users") . " |
|
| 3026 | + "SELECT id FROM ".prefixTable("users")." |
|
| 3027 | 3027 | WHERE deleted_at IS NOT NULL |
| 3028 | 3028 | AND deleted_at > 0 |
| 3029 | 3029 | AND deleted_at < %i |
@@ -3047,7 +3047,7 @@ discard block |
||
| 3047 | 3047 | echo prepareExchangedData( |
| 3048 | 3048 | [ |
| 3049 | 3049 | 'error' => true, |
| 3050 | - 'message' => $lang->get('error') . ': ' . $e->getMessage(), |
|
| 3050 | + 'message' => $lang->get('error').': '.$e->getMessage(), |
|
| 3051 | 3051 | ], |
| 3052 | 3052 | 'encode' |
| 3053 | 3053 | ); |
@@ -3101,10 +3101,10 @@ discard block |
||
| 3101 | 3101 | |
| 3102 | 3102 | $purgedCount = 0; |
| 3103 | 3103 | $errors = []; |
| 3104 | - $cutoffTimestamp = time() - ((int)$daysRetention * 86400); |
|
| 3104 | + $cutoffTimestamp = time() - ((int) $daysRetention * 86400); |
|
| 3105 | 3105 | |
| 3106 | 3106 | foreach ($userIds as $userId) { |
| 3107 | - $userId = (int)$userId; |
|
| 3107 | + $userId = (int) $userId; |
|
| 3108 | 3108 | |
| 3109 | 3109 | try { |
| 3110 | 3110 | $result = purgeDeletedUserById($userId); |
@@ -3112,11 +3112,11 @@ discard block |
||
| 3112 | 3112 | |
| 3113 | 3113 | } catch (Exception $e) { |
| 3114 | 3114 | DB::rollback(); |
| 3115 | - $errors[] = "User ID $userId: " . $e->getMessage(); |
|
| 3115 | + $errors[] = "User ID $userId: ".$e->getMessage(); |
|
| 3116 | 3116 | } |
| 3117 | 3117 | } |
| 3118 | 3118 | |
| 3119 | - $deletedAccountsCount = (int) DB::queryFirstField("SELECT COUNT(id) FROM " . prefixTable('users') . " WHERE deleted_at IS NOT NULL"); |
|
| 3119 | + $deletedAccountsCount = (int) DB::queryFirstField("SELECT COUNT(id) FROM ".prefixTable('users')." WHERE deleted_at IS NOT NULL"); |
|
| 3120 | 3120 | |
| 3121 | 3121 | echo prepareExchangedData( |
| 3122 | 3122 | [ |
@@ -3124,7 +3124,7 @@ discard block |
||
| 3124 | 3124 | 'purged_count' => $purgedCount, |
| 3125 | 3125 | 'total_in_batch' => count($userIds), |
| 3126 | 3126 | 'errors' => $errors, |
| 3127 | - 'message' => $purgedCount . ' user(s) purged in this batch', |
|
| 3127 | + 'message' => $purgedCount.' user(s) purged in this batch', |
|
| 3128 | 3128 | 'deletedAccountsCount' => $deletedAccountsCount, |
| 3129 | 3129 | ], |
| 3130 | 3130 | 'encode' |
@@ -3159,7 +3159,7 @@ discard block |
||
| 3159 | 3159 | |
| 3160 | 3160 | // Get info about user |
| 3161 | 3161 | $data_user = DB::queryFirstRow( |
| 3162 | - 'SELECT login FROM ' . prefixTable('users') . ' WHERE id = %i', |
|
| 3162 | + 'SELECT login FROM '.prefixTable('users').' WHERE id = %i', |
|
| 3163 | 3163 | $userId |
| 3164 | 3164 | ); |
| 3165 | 3165 | |
@@ -3172,12 +3172,12 @@ discard block |
||
| 3172 | 3172 | } |
| 3173 | 3173 | |
| 3174 | 3174 | // Remove user suffix "_deleted_timestamp" |
| 3175 | - $deletedSuffix = '_deleted_' . substr($data_user['login'], strrpos($data_user['login'], '_deleted_') + 9); |
|
| 3175 | + $deletedSuffix = '_deleted_'.substr($data_user['login'], strrpos($data_user['login'], '_deleted_') + 9); |
|
| 3176 | 3176 | $originalLogin = str_replace($deletedSuffix, '', $data_user['login']); |
| 3177 | 3177 | |
| 3178 | 3178 | // Check if an active user with the original login already exists |
| 3179 | 3179 | $existingUser = DB::queryFirstRow( |
| 3180 | - 'SELECT id FROM ' . prefixTable('users') . ' |
|
| 3180 | + 'SELECT id FROM '.prefixTable('users').' |
|
| 3181 | 3181 | WHERE login = %s AND deleted_at IS NULL AND id != %i', |
| 3182 | 3182 | $originalLogin, |
| 3183 | 3183 | $userId |
@@ -3187,7 +3187,7 @@ discard block |
||
| 3187 | 3187 | echo prepareExchangedData( |
| 3188 | 3188 | array( |
| 3189 | 3189 | 'error' => true, |
| 3190 | - 'message' => 'Cannot restore user: an active user with login "' . $originalLogin . '" already exists (ID: ' . $existingUser['id'] . ')' |
|
| 3190 | + 'message' => 'Cannot restore user: an active user with login "'.$originalLogin.'" already exists (ID: '.$existingUser['id'].')' |
|
| 3191 | 3191 | ), |
| 3192 | 3192 | 'encode' |
| 3193 | 3193 | ); |
@@ -3220,7 +3220,7 @@ discard block |
||
| 3220 | 3220 | |
| 3221 | 3221 | // Get info about user |
| 3222 | 3222 | $data_user = DB::queryFirstRow( |
| 3223 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 3223 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 3224 | 3224 | WHERE id = %i', |
| 3225 | 3225 | $value[1] |
| 3226 | 3226 | ); |
@@ -3254,7 +3254,7 @@ discard block |
||
| 3254 | 3254 | logEvents( |
| 3255 | 3255 | $SETTINGS, |
| 3256 | 3256 | 'user_mngt', |
| 3257 | - 'at_user_new_' . $value[0] . ':' . $value[1], |
|
| 3257 | + 'at_user_new_'.$value[0].':'.$value[1], |
|
| 3258 | 3258 | (string) $session->get('user-id'), |
| 3259 | 3259 | $session->get('user-login'), |
| 3260 | 3260 | filter_input(INPUT_POST, 'id', FILTER_SANITIZE_FULL_SPECIAL_CHARS) |
@@ -3289,7 +3289,7 @@ discard block |
||
| 3289 | 3289 | |
| 3290 | 3290 | // Get info about user |
| 3291 | 3291 | $data_user = DB::queryFirstRow( |
| 3292 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 3292 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 3293 | 3293 | WHERE id = %i', |
| 3294 | 3294 | $id[1] |
| 3295 | 3295 | ); |
@@ -3328,7 +3328,7 @@ discard block |
||
| 3328 | 3328 | $users = DB::query( |
| 3329 | 3329 | "SELECT id, login, email, deleted_at, |
| 3330 | 3330 | DATEDIFF(NOW(), FROM_UNIXTIME(deleted_at)) as days_since_deletion |
| 3331 | - FROM " . prefixTable("users") . " |
|
| 3331 | + FROM " . prefixTable("users")." |
|
| 3332 | 3332 | WHERE deleted_at IS NOT NULL |
| 3333 | 3333 | AND deleted_at > 0 |
| 3334 | 3334 | ORDER BY deleted_at DESC" |
@@ -3354,7 +3354,7 @@ discard block |
||
| 3354 | 3354 | |
| 3355 | 3355 | // Vérifier que l'utilisateur est bien marqué deleted |
| 3356 | 3356 | $user = DB::queryFirstRow( |
| 3357 | - "SELECT id, login, deleted_at FROM " . prefixTable("users") . " |
|
| 3357 | + "SELECT id, login, deleted_at FROM ".prefixTable("users")." |
|
| 3358 | 3358 | WHERE id = %i |
| 3359 | 3359 | AND deleted_at IS NOT NULL |
| 3360 | 3360 | AND deleted_at > 0", |
@@ -3394,7 +3394,7 @@ discard block |
||
| 3394 | 3394 | |
| 3395 | 3395 | // delete personal folder and subfolders |
| 3396 | 3396 | $data = DB::queryFirstRow( |
| 3397 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' |
|
| 3397 | + 'SELECT id FROM '.prefixTable('nested_tree').' |
|
| 3398 | 3398 | WHERE title = %s AND personal_folder = %i', |
| 3399 | 3399 | $userId, |
| 3400 | 3400 | '1' |
@@ -3416,7 +3416,7 @@ discard block |
||
| 3416 | 3416 | DB::delete(prefixTable('nested_tree'), 'id = %i AND personal_folder = %i', $folder->id, '1'); |
| 3417 | 3417 | // delete items & logs |
| 3418 | 3418 | $items = DB::query( |
| 3419 | - 'SELECT id FROM ' . prefixTable('items') . ' |
|
| 3419 | + 'SELECT id FROM '.prefixTable('items').' |
|
| 3420 | 3420 | WHERE id_tree=%i AND perso = %i', |
| 3421 | 3421 | $folder->id, |
| 3422 | 3422 | '1' |
@@ -3446,7 +3446,7 @@ discard block |
||
| 3446 | 3446 | // Delete any process related to user |
| 3447 | 3447 | $processes = DB::query( |
| 3448 | 3448 | 'SELECT increment_id |
| 3449 | - FROM ' . prefixTable('background_tasks') . ' |
|
| 3449 | + FROM ' . prefixTable('background_tasks').' |
|
| 3450 | 3450 | WHERE JSON_EXTRACT(arguments, "$.new_user_id") = %i', |
| 3451 | 3451 | $userId |
| 3452 | 3452 | ); |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | ) { |
| 80 | 80 | // Not allowed page |
| 81 | 81 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 82 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 82 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 83 | 83 | exit; |
| 84 | 84 | } |
| 85 | 85 | |
@@ -166,7 +166,7 @@ discard block |
||
| 166 | 166 | ); |
| 167 | 167 | |
| 168 | 168 | // Initialisation |
| 169 | - $file = $SETTINGS['path_to_files_folder'] . '/' . $data['valeur']; |
|
| 169 | + $file = $SETTINGS['path_to_files_folder'].'/'.$data['valeur']; |
|
| 170 | 170 | $importation_possible = true; |
| 171 | 171 | $valuesToImport = []; |
| 172 | 172 | $items_number = 0; |
@@ -223,26 +223,26 @@ discard block |
||
| 223 | 223 | 'ISO-8859-1', |
| 224 | 224 | 'ISO-8859-15', |
| 225 | 225 | 'Windows-1252', |
| 226 | - 'Windows-1251', // Cyrillique |
|
| 227 | - 'CP1251', // Cyrillique alternatif |
|
| 228 | - 'KOI8-R', // Cyrillique russe |
|
| 229 | - 'Shift_JIS', // Japonais |
|
| 230 | - 'EUC-JP', // Japonais |
|
| 231 | - 'ISO-2022-JP', // Japonais |
|
| 232 | - 'TIS-620', // ThaĂŻ |
|
| 233 | - 'Windows-874', // ThaĂŻ Windows |
|
| 234 | - 'Big5', // Chinois traditionnel |
|
| 235 | - 'GB2312', // Chinois simplifié |
|
| 236 | - 'GBK', // Chinois simplifié étendu |
|
| 237 | - 'EUC-KR', // Coréen |
|
| 238 | - 'ISO-8859-2', // Europe centrale |
|
| 239 | - 'ISO-8859-5', // Cyrillique ISO |
|
| 240 | - 'ISO-8859-7', // Grec |
|
| 241 | - 'Windows-1250', // Europe centrale |
|
| 242 | - 'Windows-1253', // Grec |
|
| 243 | - 'Windows-1254', // Turc |
|
| 244 | - 'Windows-1255', // Hébreu |
|
| 245 | - 'Windows-1256', // Arabe |
|
| 226 | + 'Windows-1251', // Cyrillique |
|
| 227 | + 'CP1251', // Cyrillique alternatif |
|
| 228 | + 'KOI8-R', // Cyrillique russe |
|
| 229 | + 'Shift_JIS', // Japonais |
|
| 230 | + 'EUC-JP', // Japonais |
|
| 231 | + 'ISO-2022-JP', // Japonais |
|
| 232 | + 'TIS-620', // ThaĂŻ |
|
| 233 | + 'Windows-874', // ThaĂŻ Windows |
|
| 234 | + 'Big5', // Chinois traditionnel |
|
| 235 | + 'GB2312', // Chinois simplifié |
|
| 236 | + 'GBK', // Chinois simplifié étendu |
|
| 237 | + 'EUC-KR', // Coréen |
|
| 238 | + 'ISO-8859-2', // Europe centrale |
|
| 239 | + 'ISO-8859-5', // Cyrillique ISO |
|
| 240 | + 'ISO-8859-7', // Grec |
|
| 241 | + 'Windows-1250', // Europe centrale |
|
| 242 | + 'Windows-1253', // Grec |
|
| 243 | + 'Windows-1254', // Turc |
|
| 244 | + 'Windows-1255', // Hébreu |
|
| 245 | + 'Windows-1256', // Arabe |
|
| 246 | 246 | ]; |
| 247 | 247 | |
| 248 | 248 | // Get the list of encodings supported by the system |
@@ -285,7 +285,7 @@ discard block |
||
| 285 | 285 | |
| 286 | 286 | // Get the data and ensure columns are correctly mapped |
| 287 | 287 | $interpreter = new Interpreter(); |
| 288 | - $interpreter->addObserver(function (array $row) use (&$valuesToImport, $header) { |
|
| 288 | + $interpreter->addObserver(function(array $row) use (&$valuesToImport, $header) { |
|
| 289 | 289 | $rowData = array_combine($header, $row); |
| 290 | 290 | |
| 291 | 291 | if ($rowData !== false) { |
@@ -338,7 +338,7 @@ discard block |
||
| 338 | 338 | // Handle multiple lignes description |
| 339 | 339 | if (strpos($comments, '<br>') !== false || strpos($label, '<br>') !== false) { |
| 340 | 340 | $continue_on_next_line = true; |
| 341 | - $comment .= " " . $label . " " . $comments; |
|
| 341 | + $comment .= " ".$label." ".$comments; |
|
| 342 | 342 | } else { |
| 343 | 343 | // Insert previous line if changing line |
| 344 | 344 | if (!empty($label)) { |
@@ -347,7 +347,7 @@ discard block |
||
| 347 | 347 | // Insert in batch |
| 348 | 348 | $batchInsert[] = array( |
| 349 | 349 | 'label' => $label, |
| 350 | - 'description' => $comment . $comments, |
|
| 350 | + 'description' => $comment.$comments, |
|
| 351 | 351 | 'pwd' => $pwd, |
| 352 | 352 | 'url' => $url, |
| 353 | 353 | 'folder' => ((int) $session->get('user-admin') === 1 || (int) $session->get('user-manager') === 1 || (int) $session->get('user-can_manage_all_users') === 1) ? $folder : '', |
@@ -378,7 +378,7 @@ discard block |
||
| 378 | 378 | // Insert in batch |
| 379 | 379 | $batchInsert[] = array( |
| 380 | 380 | 'label' => $label, |
| 381 | - 'description' => $comment . $comments, |
|
| 381 | + 'description' => $comment.$comments, |
|
| 382 | 382 | 'pwd' => $pwd, |
| 383 | 383 | 'url' => $url, |
| 384 | 384 | 'folder' => ((int) $session->get('user-admin') === 1 || (int) $session->get('user-manager') === 1 || (int) $session->get('user-can_manage_all_users') === 1) ? $folder : '', |
@@ -402,10 +402,10 @@ discard block |
||
| 402 | 402 | $values = []; |
| 403 | 403 | |
| 404 | 404 | foreach ($batchInsert as $data) { |
| 405 | - $values[] = "('" . implode("','", array_map('addslashes', $data)) . "')"; |
|
| 405 | + $values[] = "('".implode("','", array_map('addslashes', $data))."')"; |
|
| 406 | 406 | } |
| 407 | 407 | |
| 408 | - $sql = "INSERT INTO `$tableName` (`label`, `description`, `pwd`, `url`, `folder`, `login`, `operation_id`) VALUES " . implode(',', $values); |
|
| 408 | + $sql = "INSERT INTO `$tableName` (`label`, `description`, `pwd`, `url`, `folder`, `login`, `operation_id`) VALUES ".implode(',', $values); |
|
| 409 | 409 | |
| 410 | 410 | DB::query($sql); |
| 411 | 411 | } |
@@ -491,7 +491,7 @@ discard block |
||
| 491 | 491 | $parentId = $dataReceived['folderId']; // Strating with provided folder |
| 492 | 492 | |
| 493 | 493 | foreach ($parts as $part) { |
| 494 | - $currentPath = trim($currentPath . "/" . $part, "/"); |
|
| 494 | + $currentPath = trim($currentPath."/".$part, "/"); |
|
| 495 | 495 | $currentFolder = $part; |
| 496 | 496 | |
| 497 | 497 | // Check if this folder has already been created |
@@ -559,7 +559,7 @@ discard block |
||
| 559 | 559 | // Get ID of existing folder |
| 560 | 560 | $ret = DB::queryFirstRow( |
| 561 | 561 | 'SELECT * |
| 562 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 562 | + FROM ' . prefixTable('nested_tree').' |
|
| 563 | 563 | WHERE title = %s', |
| 564 | 564 | $currentFolder |
| 565 | 565 | ); |
@@ -805,9 +805,9 @@ discard block |
||
| 805 | 805 | ]; |
| 806 | 806 | |
| 807 | 807 | error_log( |
| 808 | - 'SQL Error during import | increment_id: ' . $item['increment_id'] . |
|
| 809 | - ' | Message: ' . $e->getMessage() . |
|
| 810 | - ' | StackTrace: ' . $e->getTraceAsString() |
|
| 808 | + 'SQL Error during import | increment_id: '.$item['increment_id']. |
|
| 809 | + ' | Message: '.$e->getMessage(). |
|
| 810 | + ' | StackTrace: '.$e->getTraceAsString() |
|
| 811 | 811 | ); |
| 812 | 812 | } |
| 813 | 813 | } |
@@ -1122,7 +1122,7 @@ discard block |
||
| 1122 | 1122 | ]; |
| 1123 | 1123 | $startPathLevel = 1; |
| 1124 | 1124 | |
| 1125 | - foreach($post_folders as $folder) { |
|
| 1125 | + foreach ($post_folders as $folder) { |
|
| 1126 | 1126 | // get parent id |
| 1127 | 1127 | if (!isset($arrFolders[$folder['parentFolderId']])) { |
| 1128 | 1128 | // If parent folder is not in the array, it means it is the destination folder |
@@ -1197,7 +1197,7 @@ discard block |
||
| 1197 | 1197 | DB::startTransaction(); |
| 1198 | 1198 | |
| 1199 | 1199 | // Import all items |
| 1200 | - foreach($post_items as $item) { |
|
| 1200 | + foreach ($post_items as $item) { |
|
| 1201 | 1201 | // get info about this folder |
| 1202 | 1202 | $destinationFolderMore = DB::queryFirstRow( |
| 1203 | 1203 | 'SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i', |
@@ -1219,7 +1219,7 @@ discard block |
||
| 1219 | 1219 | $cryptedStuff['objectKey'] = ''; |
| 1220 | 1220 | } |
| 1221 | 1221 | $post_password = $cryptedStuff['encrypted']; |
| 1222 | - $folderId = isset($post_folders[$item['parentFolderId']]['id']) ? (int)$post_folders[$item['parentFolderId']]['id'] : 0; |
|
| 1222 | + $folderId = isset($post_folders[$item['parentFolderId']]['id']) ? (int) $post_folders[$item['parentFolderId']]['id'] : 0; |
|
| 1223 | 1223 | |
| 1224 | 1224 | //ADD item |
| 1225 | 1225 | DB::insert( |
@@ -1406,7 +1406,7 @@ discard block |
||
| 1406 | 1406 | |
| 1407 | 1407 | //For each role to which the user depends on, add the folder just created. |
| 1408 | 1408 | // (if not personal, otherwise, add to user-personal_folders) |
| 1409 | - if ( $isPersonalFolder ) { |
|
| 1409 | + if ($isPersonalFolder) { |
|
| 1410 | 1410 | SessionManager::addRemoveFromSessionArray('user-personal_folders', [$id], 'add'); |
| 1411 | 1411 | } else { |
| 1412 | 1412 | foreach ($session->get('system-array_roles') as $role) { |
@@ -1470,7 +1470,7 @@ discard block |
||
| 1470 | 1470 | ]; |
| 1471 | 1471 | } |
| 1472 | 1472 | |
| 1473 | -spl_autoload_register(function ($class) { |
|
| 1473 | +spl_autoload_register(function($class) { |
|
| 1474 | 1474 | $prefix = 'League\\Csv\\'; |
| 1475 | 1475 | $base_dir = __DIR__.'/src/'; |
| 1476 | 1476 | $len = strlen($prefix); |
@@ -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 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 { |
@@ -2834,7 +2834,7 @@ discard block |
||
| 2834 | 2834 | } |
| 2835 | 2835 | $users = DB::query( |
| 2836 | 2836 | 'SELECT id, public_key |
| 2837 | - FROM ' . prefixTable('users') . ' |
|
| 2837 | + FROM ' . prefixTable('users').' |
|
| 2838 | 2838 | WHERE id NOT IN %li |
| 2839 | 2839 | AND public_key != ""', |
| 2840 | 2840 | $user_ids |
@@ -2843,7 +2843,7 @@ discard block |
||
| 2843 | 2843 | // Insert in DB the new object key for this item by user |
| 2844 | 2844 | if (count($objectKeyArray) === 0) { |
| 2845 | 2845 | if (WIP === true) { |
| 2846 | - error_log('TEAMPASS Debug - storeUsersShareKey case1 - ' . $object_name . ' - ' . $post_object_id . ' - ' . $user['id']); |
|
| 2846 | + error_log('TEAMPASS Debug - storeUsersShareKey case1 - '.$object_name.' - '.$post_object_id.' - '.$user['id']); |
|
| 2847 | 2847 | } |
| 2848 | 2848 | |
| 2849 | 2849 | insertOrUpdateSharekey( |
@@ -2855,7 +2855,7 @@ discard block |
||
| 2855 | 2855 | } else { |
| 2856 | 2856 | foreach ($objectKeyArray as $object) { |
| 2857 | 2857 | if (WIP === true) { |
| 2858 | - error_log('TEAMPASS Debug - storeUsersShareKey case2 - ' . $object_name . ' - ' . $object['objectId'] . ' - ' . $user['id']); |
|
| 2858 | + error_log('TEAMPASS Debug - storeUsersShareKey case2 - '.$object_name.' - '.$object['objectId'].' - '.$user['id']); |
|
| 2859 | 2859 | } |
| 2860 | 2860 | |
| 2861 | 2861 | insertOrUpdateSharekey( |
@@ -2887,7 +2887,7 @@ discard block |
||
| 2887 | 2887 | ): bool { |
| 2888 | 2888 | try { |
| 2889 | 2889 | DB::query( |
| 2890 | - 'INSERT INTO ' . $tableName . ' |
|
| 2890 | + 'INSERT INTO '.$tableName.' |
|
| 2891 | 2891 | (object_id, user_id, share_key) |
| 2892 | 2892 | VALUES (%i, %i, %s) |
| 2893 | 2893 | ON DUPLICATE KEY UPDATE share_key = VALUES(share_key)', |
@@ -2897,7 +2897,7 @@ discard block |
||
| 2897 | 2897 | ); |
| 2898 | 2898 | return true; |
| 2899 | 2899 | } catch (Exception $e) { |
| 2900 | - error_log('TEAMPASS Error - insertOrUpdateSharekey: ' . $e->getMessage()); |
|
| 2900 | + error_log('TEAMPASS Error - insertOrUpdateSharekey: '.$e->getMessage()); |
|
| 2901 | 2901 | return false; |
| 2902 | 2902 | } |
| 2903 | 2903 | } |
@@ -2912,7 +2912,7 @@ discard block |
||
| 2912 | 2912 | function isBase64(string $str): bool |
| 2913 | 2913 | { |
| 2914 | 2914 | $str = (string) trim($str); |
| 2915 | - if (! isset($str[0])) { |
|
| 2915 | + if (!isset($str[0])) { |
|
| 2916 | 2916 | return false; |
| 2917 | 2917 | } |
| 2918 | 2918 | |
@@ -2986,7 +2986,7 @@ discard block |
||
| 2986 | 2986 | } catch (\LdapRecord\Auth\BindException $e) { |
| 2987 | 2987 | $error = $e->getDetailedError(); |
| 2988 | 2988 | if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) { |
| 2989 | - error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage()); |
|
| 2989 | + error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage()); |
|
| 2990 | 2990 | } |
| 2991 | 2991 | // deepcode ignore ServerLeak: No important data is sent |
| 2992 | 2992 | echo 'An error occurred.'; |
@@ -3003,7 +3003,7 @@ discard block |
||
| 3003 | 3003 | } catch (\LdapRecord\Auth\BindException $e) { |
| 3004 | 3004 | $error = $e->getDetailedError(); |
| 3005 | 3005 | if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) { |
| 3006 | - error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage()); |
|
| 3006 | + error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage()); |
|
| 3007 | 3007 | } |
| 3008 | 3008 | // deepcode ignore ServerLeak: No important data is sent |
| 3009 | 3009 | echo 'An error occurred.'; |
@@ -3039,7 +3039,7 @@ discard block |
||
| 3039 | 3039 | // expect if personal item |
| 3040 | 3040 | DB::delete( |
| 3041 | 3041 | prefixTable('sharekeys_items'), |
| 3042 | - 'user_id = %i',// AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)'', |
|
| 3042 | + 'user_id = %i', // AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)'', |
|
| 3043 | 3043 | $userId |
| 3044 | 3044 | ); |
| 3045 | 3045 | // Remove all item sharekeys files |
@@ -3063,7 +3063,7 @@ discard block |
||
| 3063 | 3063 | // Remove all item sharekeys suggestions |
| 3064 | 3064 | DB::delete( |
| 3065 | 3065 | prefixTable('sharekeys_suggestions'), |
| 3066 | - 'user_id = %i',// AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)', |
|
| 3066 | + 'user_id = %i', // AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)', |
|
| 3067 | 3067 | $userId |
| 3068 | 3068 | ); |
| 3069 | 3069 | return false; |
@@ -3084,7 +3084,7 @@ discard block |
||
| 3084 | 3084 | foreach (DateTimeZone::listIdentifiers() as $timezone) { |
| 3085 | 3085 | $now->setTimezone(new DateTimeZone($timezone)); |
| 3086 | 3086 | $offsets[] = $offset = $now->getOffset(); |
| 3087 | - $timezones[$timezone] = '(' . format_GMT_offset($offset) . ') ' . format_timezone_name($timezone); |
|
| 3087 | + $timezones[$timezone] = '('.format_GMT_offset($offset).') '.format_timezone_name($timezone); |
|
| 3088 | 3088 | } |
| 3089 | 3089 | |
| 3090 | 3090 | array_multisort($offsets, $timezones); |
@@ -3104,7 +3104,7 @@ discard block |
||
| 3104 | 3104 | { |
| 3105 | 3105 | $hours = intval($offset / 3600); |
| 3106 | 3106 | $minutes = abs(intval($offset % 3600 / 60)); |
| 3107 | - return 'GMT' . ($offset ? sprintf('%+03d:%02d', $hours, $minutes) : ''); |
|
| 3107 | + return 'GMT'.($offset ? sprintf('%+03d:%02d', $hours, $minutes) : ''); |
|
| 3108 | 3108 | } |
| 3109 | 3109 | |
| 3110 | 3110 | /** |
@@ -3203,8 +3203,7 @@ discard block |
||
| 3203 | 3203 | { |
| 3204 | 3204 | if (isset($array[$key]) === true |
| 3205 | 3205 | && (is_int($value) === true ? |
| 3206 | - (int) $array[$key] === $value : |
|
| 3207 | - (string) $array[$key] === $value) |
|
| 3206 | + (int) $array[$key] === $value : (string) $array[$key] === $value) |
|
| 3208 | 3207 | ) { |
| 3209 | 3208 | return true; |
| 3210 | 3209 | } |
@@ -3226,8 +3225,7 @@ discard block |
||
| 3226 | 3225 | { |
| 3227 | 3226 | if (isset($var) === false |
| 3228 | 3227 | || (is_int($value) === true ? |
| 3229 | - (int) $var === $value : |
|
| 3230 | - (string) $var === $value) |
|
| 3228 | + (int) $var === $value : (string) $var === $value) |
|
| 3231 | 3229 | ) { |
| 3232 | 3230 | return true; |
| 3233 | 3231 | } |
@@ -3278,7 +3276,7 @@ discard block |
||
| 3278 | 3276 | */ |
| 3279 | 3277 | function isSetArrayOfValues(array $arrayOfValues): bool |
| 3280 | 3278 | { |
| 3281 | - foreach($arrayOfValues as $value) { |
|
| 3279 | + foreach ($arrayOfValues as $value) { |
|
| 3282 | 3280 | if (isset($value) === false) { |
| 3283 | 3281 | return false; |
| 3284 | 3282 | } |
@@ -3300,7 +3298,7 @@ discard block |
||
| 3300 | 3298 | /*PHP8 - integer|string*/$value |
| 3301 | 3299 | ) : bool |
| 3302 | 3300 | { |
| 3303 | - foreach($arrayOfVars as $variable) { |
|
| 3301 | + foreach ($arrayOfVars as $variable) { |
|
| 3304 | 3302 | if ($variable !== $value) { |
| 3305 | 3303 | return false; |
| 3306 | 3304 | } |
@@ -3320,7 +3318,7 @@ discard block |
||
| 3320 | 3318 | /*PHP8 - integer|string*/$value |
| 3321 | 3319 | ) : bool |
| 3322 | 3320 | { |
| 3323 | - foreach($arrayOfVars as $variable) { |
|
| 3321 | + foreach ($arrayOfVars as $variable) { |
|
| 3324 | 3322 | if ($variable === $value) { |
| 3325 | 3323 | return true; |
| 3326 | 3324 | } |
@@ -3334,7 +3332,7 @@ discard block |
||
| 3334 | 3332 | * @param string|int|null $value |
| 3335 | 3333 | * @return boolean |
| 3336 | 3334 | */ |
| 3337 | -function isValueSetNullEmpty(string|int|null $value) : bool |
|
| 3335 | +function isValueSetNullEmpty(string | int | null $value) : bool |
|
| 3338 | 3336 | { |
| 3339 | 3337 | if (is_null($value) === true || empty($value) === true) { |
| 3340 | 3338 | return true; |
@@ -3389,7 +3387,7 @@ discard block |
||
| 3389 | 3387 | * @param array $filters |
| 3390 | 3388 | * @return array|string |
| 3391 | 3389 | */ |
| 3392 | -function dataSanitizer(array $data, array $filters): array|string |
|
| 3390 | +function dataSanitizer(array $data, array $filters): array | string |
|
| 3393 | 3391 | { |
| 3394 | 3392 | // Load Sanitizer library |
| 3395 | 3393 | $sanitizer = new Sanitizer($data, $filters); |
@@ -3418,7 +3416,7 @@ discard block |
||
| 3418 | 3416 | // Exists ? |
| 3419 | 3417 | $userCacheId = DB::queryFirstRow( |
| 3420 | 3418 | 'SELECT increment_id |
| 3421 | - FROM ' . prefixTable('cache_tree') . ' |
|
| 3419 | + FROM ' . prefixTable('cache_tree').' |
|
| 3422 | 3420 | WHERE user_id = %i', |
| 3423 | 3421 | $user_id |
| 3424 | 3422 | ); |
@@ -3469,7 +3467,7 @@ discard block |
||
| 3469 | 3467 | */ |
| 3470 | 3468 | function pourcentage(float $nombre, float $total, float $pourcentage): float |
| 3471 | 3469 | { |
| 3472 | - $resultat = ($nombre/$total) * $pourcentage; |
|
| 3470 | + $resultat = ($nombre / $total) * $pourcentage; |
|
| 3473 | 3471 | return round($resultat); |
| 3474 | 3472 | } |
| 3475 | 3473 | |
@@ -3499,7 +3497,7 @@ discard block |
||
| 3499 | 3497 | |
| 3500 | 3498 | // Get last folder update |
| 3501 | 3499 | $lastFolderChange = DB::queryFirstRow( |
| 3502 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' |
|
| 3500 | + 'SELECT valeur FROM '.prefixTable('misc').' |
|
| 3503 | 3501 | WHERE type = %s AND intitule = %s', |
| 3504 | 3502 | 'timestamp', |
| 3505 | 3503 | 'last_folder_change' |
@@ -3520,7 +3518,7 @@ discard block |
||
| 3520 | 3518 | // Does this user has a tree cache |
| 3521 | 3519 | $userCacheTree = DB::queryFirstRow( |
| 3522 | 3520 | 'SELECT '.$fieldName.' |
| 3523 | - FROM ' . prefixTable('cache_tree') . ' |
|
| 3521 | + FROM ' . prefixTable('cache_tree').' |
|
| 3524 | 3522 | WHERE user_id = %i', |
| 3525 | 3523 | $session->get('user-id') |
| 3526 | 3524 | ); |
@@ -3558,7 +3556,7 @@ discard block |
||
| 3558 | 3556 | if (count($folderIds) === 0) { |
| 3559 | 3557 | $folderIds = DB::queryFirstColumn( |
| 3560 | 3558 | 'SELECT id |
| 3561 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 3559 | + FROM ' . prefixTable('nested_tree').' |
|
| 3562 | 3560 | WHERE personal_folder=%i', |
| 3563 | 3561 | 0 |
| 3564 | 3562 | ); |
@@ -3575,8 +3573,8 @@ discard block |
||
| 3575 | 3573 | $rows_tmp = DB::query( |
| 3576 | 3574 | 'SELECT c.id, c.title, c.level, c.type, c.masked, c.order, c.encrypted_data, c.role_visibility, c.is_mandatory, |
| 3577 | 3575 | f.id_category AS category_id |
| 3578 | - FROM ' . prefixTable('categories_folders') . ' AS f |
|
| 3579 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (f.id_category = c.parent_id) |
|
| 3576 | + FROM ' . prefixTable('categories_folders').' AS f |
|
| 3577 | + INNER JOIN ' . prefixTable('categories').' AS c ON (f.id_category = c.parent_id) |
|
| 3580 | 3578 | WHERE id_folder=%i', |
| 3581 | 3579 | $folder |
| 3582 | 3580 | ); |
@@ -3602,7 +3600,7 @@ discard block |
||
| 3602 | 3600 | $valTemp = ''; |
| 3603 | 3601 | $data = DB::queryFirstRow( |
| 3604 | 3602 | 'SELECT valeur |
| 3605 | - FROM ' . prefixTable('misc') . ' |
|
| 3603 | + FROM ' . prefixTable('misc').' |
|
| 3606 | 3604 | WHERE type = %s AND intitule=%i', |
| 3607 | 3605 | 'complex', |
| 3608 | 3606 | $folder |
@@ -3619,14 +3617,14 @@ discard block |
||
| 3619 | 3617 | $valTemp = ''; |
| 3620 | 3618 | $rows_tmp = DB::query( |
| 3621 | 3619 | 'SELECT t.title |
| 3622 | - FROM ' . prefixTable('roles_values') . ' as v |
|
| 3623 | - INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id) |
|
| 3620 | + FROM ' . prefixTable('roles_values').' as v |
|
| 3621 | + INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id) |
|
| 3624 | 3622 | WHERE v.folder_id = %i |
| 3625 | 3623 | GROUP BY title', |
| 3626 | 3624 | $folder |
| 3627 | 3625 | ); |
| 3628 | 3626 | foreach ($rows_tmp as $record) { |
| 3629 | - $valTemp .= (empty($valTemp) === true ? '' : ' - ') . $record['title']; |
|
| 3627 | + $valTemp .= (empty($valTemp) === true ? '' : ' - ').$record['title']; |
|
| 3630 | 3628 | } |
| 3631 | 3629 | $arr_data['visibilityRoles'] = $valTemp; |
| 3632 | 3630 | |
@@ -3659,7 +3657,7 @@ discard block |
||
| 3659 | 3657 | // loop on users and check if user has this role |
| 3660 | 3658 | $rows = DB::query( |
| 3661 | 3659 | 'SELECT id, fonction_id |
| 3662 | - FROM ' . prefixTable('users') . ' |
|
| 3660 | + FROM ' . prefixTable('users').' |
|
| 3663 | 3661 | WHERE id != %i AND admin = 0 AND fonction_id IS NOT NULL AND fonction_id != ""', |
| 3664 | 3662 | $session->get('user-id') |
| 3665 | 3663 | ); |
@@ -3691,7 +3689,7 @@ discard block |
||
| 3691 | 3689 | |
| 3692 | 3690 | $val = DB::queryFirstRow( |
| 3693 | 3691 | 'SELECT * |
| 3694 | - FROM ' . prefixTable('users') . ' |
|
| 3692 | + FROM ' . prefixTable('users').' |
|
| 3695 | 3693 | WHERE id = %i', |
| 3696 | 3694 | $userId |
| 3697 | 3695 | ); |
@@ -3707,12 +3705,12 @@ discard block |
||
| 3707 | 3705 | function upgradeRequired(): bool |
| 3708 | 3706 | { |
| 3709 | 3707 | // Get settings.php |
| 3710 | - include_once __DIR__. '/../includes/config/settings.php'; |
|
| 3708 | + include_once __DIR__.'/../includes/config/settings.php'; |
|
| 3711 | 3709 | |
| 3712 | 3710 | // Get timestamp in DB |
| 3713 | 3711 | $val = DB::queryFirstRow( |
| 3714 | 3712 | 'SELECT valeur |
| 3715 | - FROM ' . prefixTable('misc') . ' |
|
| 3713 | + FROM ' . prefixTable('misc').' |
|
| 3716 | 3714 | WHERE type = %s AND intitule = %s', |
| 3717 | 3715 | 'admin', |
| 3718 | 3716 | 'upgrade_timestamp' |
@@ -3765,7 +3763,7 @@ discard block |
||
| 3765 | 3763 | // prepapre background tasks for item keys generation |
| 3766 | 3764 | $userTP = DB::queryFirstRow( |
| 3767 | 3765 | 'SELECT pw, public_key, private_key |
| 3768 | - FROM ' . prefixTable('users') . ' |
|
| 3766 | + FROM ' . prefixTable('users').' |
|
| 3769 | 3767 | WHERE id = %i', |
| 3770 | 3768 | TP_USER_ID |
| 3771 | 3769 | ); |
@@ -3826,7 +3824,7 @@ discard block |
||
| 3826 | 3824 | } |
| 3827 | 3825 | |
| 3828 | 3826 | // Generate new keys |
| 3829 | - if ($user_self_change === true && empty($recovery_public_key) === false && empty($recovery_private_key) === false){ |
|
| 3827 | + if ($user_self_change === true && empty($recovery_public_key) === false && empty($recovery_private_key) === false) { |
|
| 3830 | 3828 | $userKeys = [ |
| 3831 | 3829 | 'public_key' => $recovery_public_key, |
| 3832 | 3830 | 'private_key_clear' => $recovery_private_key, |
@@ -3877,8 +3875,8 @@ discard block |
||
| 3877 | 3875 | 'process_type' => 'create_user_keys', |
| 3878 | 3876 | 'arguments' => json_encode([ |
| 3879 | 3877 | 'new_user_id' => (int) $userId, |
| 3880 | - 'new_user_pwd' => cryption($passwordClear, '','encrypt')['string'], |
|
| 3881 | - 'new_user_code' => cryption(empty($encryptionKey) === true ? uniqidReal(20) : $encryptionKey, '','encrypt')['string'], |
|
| 3878 | + 'new_user_pwd' => cryption($passwordClear, '', 'encrypt')['string'], |
|
| 3879 | + 'new_user_code' => cryption(empty($encryptionKey) === true ? uniqidReal(20) : $encryptionKey, '', 'encrypt')['string'], |
|
| 3882 | 3880 | 'owner_id' => (int) TP_USER_ID, |
| 3883 | 3881 | 'creator_pwd' => $userTP['pw'], |
| 3884 | 3882 | 'send_email' => $sendEmailToUser === true ? 1 : 0, |
@@ -3950,19 +3948,19 @@ discard block |
||
| 3950 | 3948 | |
| 3951 | 3949 | // Prepare the subtask queries |
| 3952 | 3950 | $queries = [ |
| 3953 | - 'step20' => 'SELECT * FROM ' . prefixTable('items'), |
|
| 3951 | + 'step20' => 'SELECT * FROM '.prefixTable('items'), |
|
| 3954 | 3952 | |
| 3955 | - 'step30' => 'SELECT * FROM ' . prefixTable('log_items') . |
|
| 3953 | + 'step30' => 'SELECT * FROM '.prefixTable('log_items'). |
|
| 3956 | 3954 | ' WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"', |
| 3957 | 3955 | |
| 3958 | - 'step40' => 'SELECT * FROM ' . prefixTable('categories_items') . |
|
| 3956 | + 'step40' => 'SELECT * FROM '.prefixTable('categories_items'). |
|
| 3959 | 3957 | ' WHERE encryption_type = "teampass_aes"', |
| 3960 | 3958 | |
| 3961 | - 'step50' => 'SELECT * FROM ' . prefixTable('suggestion'), |
|
| 3959 | + 'step50' => 'SELECT * FROM '.prefixTable('suggestion'), |
|
| 3962 | 3960 | |
| 3963 | - 'step60' => 'SELECT * FROM ' . prefixTable('files') . ' AS f |
|
| 3964 | - INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = f.id_item |
|
| 3965 | - WHERE f.status = "' . TP_ENCRYPTION_NAME . '"' |
|
| 3961 | + 'step60' => 'SELECT * FROM '.prefixTable('files').' AS f |
|
| 3962 | + INNER JOIN ' . prefixTable('items').' AS i ON i.id = f.id_item |
|
| 3963 | + WHERE f.status = "' . TP_ENCRYPTION_NAME.'"' |
|
| 3966 | 3964 | ]; |
| 3967 | 3965 | |
| 3968 | 3966 | // Perform loop on $queries to create sub-tasks |
@@ -4152,7 +4150,7 @@ discard block |
||
| 4152 | 4150 | */ |
| 4153 | 4151 | function createTaskForItem( |
| 4154 | 4152 | string $processType, |
| 4155 | - string|array $taskName, |
|
| 4153 | + string | array $taskName, |
|
| 4156 | 4154 | int $itemId, |
| 4157 | 4155 | int $userId, |
| 4158 | 4156 | string $objectKey, |
@@ -4176,7 +4174,7 @@ discard block |
||
| 4176 | 4174 | 'object_key' => $objectKey, |
| 4177 | 4175 | 'author' => (int) $userId, |
| 4178 | 4176 | ]), |
| 4179 | - 'item_id' => (int) $parentId !== -1 ? $parentId : null, |
|
| 4177 | + 'item_id' => (int) $parentId !== -1 ? $parentId : null, |
|
| 4180 | 4178 | ) |
| 4181 | 4179 | ); |
| 4182 | 4180 | $processId = DB::insertId(); |
@@ -4186,7 +4184,7 @@ discard block |
||
| 4186 | 4184 | if (is_array($taskName) === false) { |
| 4187 | 4185 | $taskName = [$taskName]; |
| 4188 | 4186 | } |
| 4189 | - foreach($taskName as $task) { |
|
| 4187 | + foreach ($taskName as $task) { |
|
| 4190 | 4188 | if (WIP === true) error_log('createTaskForItem - task: '.$task); |
| 4191 | 4189 | switch ($task) { |
| 4192 | 4190 | case 'item_password': |
@@ -4283,7 +4281,7 @@ discard block |
||
| 4283 | 4281 | * @param integer $user_id |
| 4284 | 4282 | * @return void |
| 4285 | 4283 | */ |
| 4286 | -function purgeUnnecessaryKeys(bool $allUsers = true, int $user_id=0) |
|
| 4284 | +function purgeUnnecessaryKeys(bool $allUsers = true, int $user_id = 0) |
|
| 4287 | 4285 | { |
| 4288 | 4286 | if ($allUsers === true) { |
| 4289 | 4287 | // Load class DB |
@@ -4293,7 +4291,7 @@ discard block |
||
| 4293 | 4291 | |
| 4294 | 4292 | $users = DB::query( |
| 4295 | 4293 | 'SELECT id |
| 4296 | - FROM ' . prefixTable('users') . ' |
|
| 4294 | + FROM ' . prefixTable('users').' |
|
| 4297 | 4295 | WHERE id NOT IN ('.OTV_USER_ID.', '.TP_USER_ID.', '.SSH_USER_ID.', '.API_USER_ID.') |
| 4298 | 4296 | ORDER BY login ASC' |
| 4299 | 4297 | ); |
@@ -4311,7 +4309,7 @@ discard block |
||
| 4311 | 4309 | * @param integer $user_id |
| 4312 | 4310 | * @return void |
| 4313 | 4311 | */ |
| 4314 | -function purgeUnnecessaryKeysForUser(int $user_id=0) |
|
| 4312 | +function purgeUnnecessaryKeysForUser(int $user_id = 0) |
|
| 4315 | 4313 | { |
| 4316 | 4314 | if ($user_id === 0) { |
| 4317 | 4315 | return; |
@@ -4322,8 +4320,8 @@ discard block |
||
| 4322 | 4320 | |
| 4323 | 4321 | $personalItems = DB::queryFirstColumn( |
| 4324 | 4322 | 'SELECT id |
| 4325 | - FROM ' . prefixTable('items') . ' AS i |
|
| 4326 | - INNER JOIN ' . prefixTable('log_items') . ' AS li ON li.id_item = i.id |
|
| 4323 | + FROM ' . prefixTable('items').' AS i |
|
| 4324 | + INNER JOIN ' . prefixTable('log_items').' AS li ON li.id_item = i.id |
|
| 4327 | 4325 | WHERE i.perso = 1 AND li.action = "at_creation" AND li.id_user IN (%i, '.TP_USER_ID.')', |
| 4328 | 4326 | $user_id |
| 4329 | 4327 | ); |
@@ -4333,28 +4331,28 @@ discard block |
||
| 4333 | 4331 | prefixTable('sharekeys_items'), |
| 4334 | 4332 | 'object_id IN %li AND user_id NOT IN %ls', |
| 4335 | 4333 | $personalItems, |
| 4336 | - [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID] |
|
| 4334 | + [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID] |
|
| 4337 | 4335 | ); |
| 4338 | 4336 | // Files keys |
| 4339 | 4337 | DB::delete( |
| 4340 | 4338 | prefixTable('sharekeys_files'), |
| 4341 | 4339 | 'object_id IN %li AND user_id NOT IN %ls', |
| 4342 | 4340 | $personalItems, |
| 4343 | - [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID] |
|
| 4341 | + [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID] |
|
| 4344 | 4342 | ); |
| 4345 | 4343 | // Fields keys |
| 4346 | 4344 | DB::delete( |
| 4347 | 4345 | prefixTable('sharekeys_fields'), |
| 4348 | 4346 | 'object_id IN %li AND user_id NOT IN %ls', |
| 4349 | 4347 | $personalItems, |
| 4350 | - [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID] |
|
| 4348 | + [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID] |
|
| 4351 | 4349 | ); |
| 4352 | 4350 | // Logs keys |
| 4353 | 4351 | DB::delete( |
| 4354 | 4352 | prefixTable('sharekeys_logs'), |
| 4355 | 4353 | 'object_id IN %li AND user_id NOT IN %ls', |
| 4356 | 4354 | $personalItems, |
| 4357 | - [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID] |
|
| 4355 | + [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID] |
|
| 4358 | 4356 | ); |
| 4359 | 4357 | } |
| 4360 | 4358 | } |
@@ -4372,7 +4370,7 @@ discard block |
||
| 4372 | 4370 | // Check if user exists |
| 4373 | 4371 | $userInfo = DB::queryFirstRow( |
| 4374 | 4372 | 'SELECT login |
| 4375 | - FROM ' . prefixTable('users') . ' |
|
| 4373 | + FROM ' . prefixTable('users').' |
|
| 4376 | 4374 | WHERE id = %i', |
| 4377 | 4375 | $userId |
| 4378 | 4376 | ); |
@@ -4381,7 +4379,7 @@ discard block |
||
| 4381 | 4379 | $now = (int) time(); |
| 4382 | 4380 | // Prepare file content |
| 4383 | 4381 | $export_value = file_get_contents(__DIR__."/../includes/core/teampass_ascii.txt")."\n". |
| 4384 | - "Generation date: ".date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $now)."\n\n". |
|
| 4382 | + "Generation date: ".date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $now)."\n\n". |
|
| 4385 | 4383 | "RECOVERY KEYS - Not to be shared - To be store safely\n\n". |
| 4386 | 4384 | "Public Key:\n".$session->get('user-public_key')."\n\n". |
| 4387 | 4385 | "Private Key:\n".$session->get('user-private_key')."\n\n"; |
@@ -4404,7 +4402,7 @@ discard block |
||
| 4404 | 4402 | return prepareExchangedData( |
| 4405 | 4403 | array( |
| 4406 | 4404 | 'error' => false, |
| 4407 | - 'datetime' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $now), |
|
| 4405 | + 'datetime' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $now), |
|
| 4408 | 4406 | 'timestamp' => $now, |
| 4409 | 4407 | 'content' => base64_encode($export_value), |
| 4410 | 4408 | 'login' => $userInfo['login'], |
@@ -4430,8 +4428,8 @@ discard block |
||
| 4430 | 4428 | */ |
| 4431 | 4429 | function loadClasses(string $className = ''): void |
| 4432 | 4430 | { |
| 4433 | - require_once __DIR__. '/../includes/config/include.php'; |
|
| 4434 | - require_once __DIR__. '/../includes/config/settings.php'; |
|
| 4431 | + require_once __DIR__.'/../includes/config/include.php'; |
|
| 4432 | + require_once __DIR__.'/../includes/config/settings.php'; |
|
| 4435 | 4433 | require_once __DIR__.'/../vendor/autoload.php'; |
| 4436 | 4434 | |
| 4437 | 4435 | if (defined('DB_PASSWD_CLEAR') === false) { |
@@ -4644,7 +4642,7 @@ discard block |
||
| 4644 | 4642 | |
| 4645 | 4643 | // Get current user hash |
| 4646 | 4644 | $userHash = DB::queryFirstRow( |
| 4647 | - "SELECT pw FROM " . prefixtable('users') . " WHERE id = %d;", |
|
| 4645 | + "SELECT pw FROM ".prefixtable('users')." WHERE id = %d;", |
|
| 4648 | 4646 | $session->get('user-id') |
| 4649 | 4647 | )['pw']; |
| 4650 | 4648 | |
@@ -4692,11 +4690,11 @@ discard block |
||
| 4692 | 4690 | } |
| 4693 | 4691 | |
| 4694 | 4692 | // Alternative: serialize ou json selon le contexte |
| 4695 | - return get_class($value) . (method_exists($value, 'getId') ? '#' . $value->getId() : ''); |
|
| 4693 | + return get_class($value).(method_exists($value, 'getId') ? '#'.$value->getId() : ''); |
|
| 4696 | 4694 | } |
| 4697 | 4695 | |
| 4698 | 4696 | if (is_resource($value)) { |
| 4699 | - return 'Resource#' . get_resource_id($value) . ' of type ' . get_resource_type($value); |
|
| 4697 | + return 'Resource#'.get_resource_id($value).' of type '.get_resource_type($value); |
|
| 4700 | 4698 | } |
| 4701 | 4699 | |
| 4702 | 4700 | // Cas par défaut |
@@ -4716,7 +4714,7 @@ discard block |
||
| 4716 | 4714 | // Refuse access if user does not exist and/or is admin |
| 4717 | 4715 | $user = DB::queryFirstRow( |
| 4718 | 4716 | 'SELECT admin |
| 4719 | - FROM ' . prefixTable('users') . ' |
|
| 4717 | + FROM ' . prefixTable('users').' |
|
| 4720 | 4718 | WHERE id = %i', |
| 4721 | 4719 | $userId |
| 4722 | 4720 | ); |
@@ -4727,8 +4725,8 @@ discard block |
||
| 4727 | 4725 | // Get file info |
| 4728 | 4726 | $file = DB::queryFirstRow( |
| 4729 | 4727 | 'SELECT f.id_item, i.id_tree |
| 4730 | - FROM ' . prefixTable('files') . ' as f |
|
| 4731 | - INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = f.id_item |
|
| 4728 | + FROM ' . prefixTable('files').' as f |
|
| 4729 | + INNER JOIN ' . prefixTable('items').' AS i ON i.id = f.id_item |
|
| 4732 | 4730 | WHERE f.id = %i', |
| 4733 | 4731 | $fileId |
| 4734 | 4732 | ); |
@@ -4737,7 +4735,7 @@ discard block |
||
| 4737 | 4735 | } |
| 4738 | 4736 | |
| 4739 | 4737 | // Check if user has access to the item |
| 4740 | - include_once __DIR__. '/items.queries.php'; |
|
| 4738 | + include_once __DIR__.'/items.queries.php'; |
|
| 4741 | 4739 | $itemAccess = getCurrentAccessRights( |
| 4742 | 4740 | (int) filter_var($userId, FILTER_SANITIZE_NUMBER_INT), |
| 4743 | 4741 | (int) filter_var($file['id_item'], FILTER_SANITIZE_NUMBER_INT), |
@@ -4770,7 +4768,7 @@ discard block |
||
| 4770 | 4768 | // Refuse access if user does not exist and/or is not admin |
| 4771 | 4769 | $user = DB::queryFirstRow( |
| 4772 | 4770 | 'SELECT admin |
| 4773 | - FROM ' . prefixTable('users') . ' |
|
| 4771 | + FROM ' . prefixTable('users').' |
|
| 4774 | 4772 | WHERE id = %i', |
| 4775 | 4773 | $userId |
| 4776 | 4774 | ); |
@@ -4781,7 +4779,7 @@ discard block |
||
| 4781 | 4779 | // Ensure that user has performed the backup |
| 4782 | 4780 | DB::queryFirstRow( |
| 4783 | 4781 | 'SELECT f.id |
| 4784 | - FROM ' . prefixTable('log_system') . ' as f |
|
| 4782 | + FROM ' . prefixTable('log_system').' as f |
|
| 4785 | 4783 | WHERE f.type = %s AND f.label = %s AND f.qui = %i AND f.field_1 = %s', |
| 4786 | 4784 | 'admin_action', |
| 4787 | 4785 | 'dataBase backup', |
@@ -4808,7 +4806,7 @@ discard block |
||
| 4808 | 4806 | // Refuse access if user does not exist and/or is admin |
| 4809 | 4807 | $user = DB::queryFirstRow( |
| 4810 | 4808 | 'SELECT admin |
| 4811 | - FROM ' . prefixTable('users') . ' |
|
| 4809 | + FROM ' . prefixTable('users').' |
|
| 4812 | 4810 | WHERE id = %i', |
| 4813 | 4811 | $userId |
| 4814 | 4812 | ); |
@@ -4819,7 +4817,7 @@ discard block |
||
| 4819 | 4817 | // Get item info |
| 4820 | 4818 | $item = DB::queryFirstRow( |
| 4821 | 4819 | 'SELECT i.perso, i.id_tree |
| 4822 | - FROM ' . prefixTable('items') . ' as i |
|
| 4820 | + FROM ' . prefixTable('items').' as i |
|
| 4823 | 4821 | WHERE i.id = %i', |
| 4824 | 4822 | $itemId |
| 4825 | 4823 | ); |
@@ -4830,7 +4828,7 @@ discard block |
||
| 4830 | 4828 | // Get item owner |
| 4831 | 4829 | $itemOwner = DB::queryFirstRow( |
| 4832 | 4830 | 'SELECT li.id_user |
| 4833 | - FROM ' . prefixTable('log_items') . ' as li |
|
| 4831 | + FROM ' . prefixTable('log_items').' as li |
|
| 4834 | 4832 | WHERE li.id_item = %i AND li.action = %s', |
| 4835 | 4833 | $itemId, |
| 4836 | 4834 | 'at_creation' |
@@ -4844,25 +4842,25 @@ discard block |
||
| 4844 | 4842 | prefixTable('sharekeys_items'), |
| 4845 | 4843 | 'object_id = %i AND user_id NOT IN %ls', |
| 4846 | 4844 | $itemId, |
| 4847 | - [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID] |
|
| 4845 | + [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID] |
|
| 4848 | 4846 | ); |
| 4849 | 4847 | DB::delete( |
| 4850 | 4848 | prefixTable('sharekeys_files'), |
| 4851 | 4849 | 'object_id IN (SELECT id FROM '.prefixTable('files').' WHERE id_item = %i) AND user_id NOT IN %ls', |
| 4852 | 4850 | $itemId, |
| 4853 | - [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID] |
|
| 4851 | + [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID] |
|
| 4854 | 4852 | ); |
| 4855 | 4853 | DB::delete( |
| 4856 | 4854 | prefixTable('sharekeys_fields'), |
| 4857 | 4855 | 'object_id IN (SELECT id FROM '.prefixTable('fields').' WHERE id_item = %i) AND user_id NOT IN %ls', |
| 4858 | 4856 | $itemId, |
| 4859 | - [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID] |
|
| 4857 | + [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID] |
|
| 4860 | 4858 | ); |
| 4861 | 4859 | DB::delete( |
| 4862 | 4860 | prefixTable('sharekeys_logs'), |
| 4863 | 4861 | 'object_id IN (SELECT id FROM '.prefixTable('log_items').' WHERE id_item = %i) AND user_id NOT IN %ls', |
| 4864 | 4862 | $itemId, |
| 4865 | - [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID] |
|
| 4863 | + [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID] |
|
| 4866 | 4864 | ); |
| 4867 | 4865 | |
| 4868 | 4866 | return true; |
@@ -4934,7 +4932,7 @@ discard block |
||
| 4934 | 4932 | |
| 4935 | 4933 | // 2. Check if user actually has personal items to migrate |
| 4936 | 4934 | $personalFolderId = DB::queryFirstField( |
| 4937 | - "SELECT id FROM ".prefixTable('nested_tree') ." |
|
| 4935 | + "SELECT id FROM ".prefixTable('nested_tree')." |
|
| 4938 | 4936 | WHERE personal_folder = 1 |
| 4939 | 4937 | AND title = %s", |
| 4940 | 4938 | $userId |
@@ -5014,8 +5012,8 @@ discard block |
||
| 5014 | 5012 | 'process_type' => 'migrate_user_personal_items', |
| 5015 | 5013 | 'arguments' => json_encode([ |
| 5016 | 5014 | 'user_id' => (int) $userId, |
| 5017 | - 'user_pwd' => cryption($passwordClear, '','encrypt')['string'], |
|
| 5018 | - 'user_private_key' => cryption($privateKeyDecrypted, '','encrypt')['string'], |
|
| 5015 | + 'user_pwd' => cryption($passwordClear, '', 'encrypt')['string'], |
|
| 5016 | + 'user_private_key' => cryption($privateKeyDecrypted, '', 'encrypt')['string'], |
|
| 5019 | 5017 | 'personal_folders_ids' => $personalFolderIds, |
| 5020 | 5018 | ]), |
| 5021 | 5019 | 'is_in_progress' => 0, |
@@ -5044,19 +5042,19 @@ discard block |
||
| 5044 | 5042 | { |
| 5045 | 5043 | // Prepare the subtask queries |
| 5046 | 5044 | $queries = [ |
| 5047 | - 'user-personal-items-migration-step10' => 'SELECT * FROM ' . prefixTable('items'), |
|
| 5045 | + 'user-personal-items-migration-step10' => 'SELECT * FROM '.prefixTable('items'), |
|
| 5048 | 5046 | |
| 5049 | - 'user-personal-items-migration-step20' => 'SELECT * FROM ' . prefixTable('log_items') . |
|
| 5047 | + 'user-personal-items-migration-step20' => 'SELECT * FROM '.prefixTable('log_items'). |
|
| 5050 | 5048 | ' WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"', |
| 5051 | 5049 | |
| 5052 | - 'user-personal-items-migration-step30' => 'SELECT * FROM ' . prefixTable('categories_items') . |
|
| 5050 | + 'user-personal-items-migration-step30' => 'SELECT * FROM '.prefixTable('categories_items'). |
|
| 5053 | 5051 | ' WHERE encryption_type = "teampass_aes"', |
| 5054 | 5052 | |
| 5055 | - 'user-personal-items-migration-step40' => 'SELECT * FROM ' . prefixTable('suggestion'), |
|
| 5053 | + 'user-personal-items-migration-step40' => 'SELECT * FROM '.prefixTable('suggestion'), |
|
| 5056 | 5054 | |
| 5057 | - 'user-personal-items-migration-step50' => 'SELECT * FROM ' . prefixTable('files') . ' AS f |
|
| 5058 | - INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = f.id_item |
|
| 5059 | - WHERE f.status = "' . TP_ENCRYPTION_NAME . '"' |
|
| 5055 | + 'user-personal-items-migration-step50' => 'SELECT * FROM '.prefixTable('files').' AS f |
|
| 5056 | + INNER JOIN ' . prefixTable('items').' AS i ON i.id = f.id_item |
|
| 5057 | + WHERE f.status = "' . TP_ENCRYPTION_NAME.'"' |
|
| 5060 | 5058 | ]; |
| 5061 | 5059 | |
| 5062 | 5060 | // Perform loop on $queries to create sub-tasks |