nilsteampassnet /
TeamPass
@@ -29,7 +29,7 @@ |
||
| 29 | 29 | { |
| 30 | 30 | return DB::query( |
| 31 | 31 | 'SELECT * |
| 32 | - FROM ' . prefixTable('users') . ' |
|
| 32 | + FROM ' . prefixTable('users').' |
|
| 33 | 33 | ORDER BY id ASC LIMIT %i', |
| 34 | 34 | $limit |
| 35 | 35 | ); |
@@ -50,18 +50,18 @@ discard block |
||
| 50 | 50 | // Get items |
| 51 | 51 | $rows = DB::query( |
| 52 | 52 | 'SELECT i.id, label, description, i.pw, i.url, i.id_tree, i.login, i.email, i.viewed_no, i.fa_icon, i.inactif, i.perso, t.title as folder_label |
| 53 | - FROM ' . prefixTable('items') . ' AS i |
|
| 53 | + FROM ' . prefixTable('items').' AS i |
|
| 54 | 54 | LEFT JOIN '.prefixTable('nested_tree').' as t ON (t.id = i.id_tree) '. |
| 55 | - $sqlExtra . |
|
| 56 | - " ORDER BY i.id ASC" . |
|
| 57 | - ($limit > 0 ? " LIMIT ". $limit : '') |
|
| 55 | + $sqlExtra. |
|
| 56 | + " ORDER BY i.id ASC". |
|
| 57 | + ($limit > 0 ? " LIMIT ".$limit : '') |
|
| 58 | 58 | ); |
| 59 | 59 | |
| 60 | 60 | $ret = []; |
| 61 | 61 | foreach ($rows as $row) { |
| 62 | 62 | $userKey = DB::queryfirstrow( |
| 63 | 63 | 'SELECT share_key |
| 64 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 64 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 65 | 65 | WHERE user_id = %i AND object_id = %i', |
| 66 | 66 | $userId, |
| 67 | 67 | $row['id'] |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | if (empty($path) === true) { |
| 99 | 99 | $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
| 100 | 100 | } else { |
| 101 | - $path .= '/' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 101 | + $path .= '/'.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 102 | 102 | } |
| 103 | 103 | } |
| 104 | 104 | |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | ) : array |
| 149 | 149 | { |
| 150 | 150 | try { |
| 151 | - include_once API_ROOT_PATH . '/../sources/main.functions.php'; |
|
| 151 | + include_once API_ROOT_PATH.'/../sources/main.functions.php'; |
|
| 152 | 152 | |
| 153 | 153 | // Load config |
| 154 | 154 | $configManager = new ConfigManager(); |
@@ -271,7 +271,7 @@ discard block |
||
| 271 | 271 | } |
| 272 | 272 | |
| 273 | 273 | if (strlen($password) > $SETTINGS['pwd_maximum_length']) { |
| 274 | - throw new Exception('Password is too long (max allowed is ' . $SETTINGS['pwd_maximum_length'] . ' characters)'); |
|
| 274 | + throw new Exception('Password is too long (max allowed is '.$SETTINGS['pwd_maximum_length'].' characters)'); |
|
| 275 | 275 | } |
| 276 | 276 | } |
| 277 | 277 | |
@@ -284,7 +284,7 @@ discard block |
||
| 284 | 284 | { |
| 285 | 285 | $dataFolderSettings = DB::queryFirstRow( |
| 286 | 286 | 'SELECT bloquer_creation, bloquer_modification, personal_folder |
| 287 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 287 | + FROM ' . prefixTable('nested_tree').' |
|
| 288 | 288 | WHERE id = %i', |
| 289 | 289 | $folderId |
| 290 | 290 | ); |
@@ -307,7 +307,7 @@ discard block |
||
| 307 | 307 | { |
| 308 | 308 | $folderComplexity = DB::queryFirstRow( |
| 309 | 309 | 'SELECT valeur |
| 310 | - FROM ' . prefixTable('misc') . ' |
|
| 310 | + FROM ' . prefixTable('misc').' |
|
| 311 | 311 | WHERE type = %s AND intitule = %i', |
| 312 | 312 | 'complex', |
| 313 | 313 | $itemInfos['folderId'] |
@@ -335,7 +335,7 @@ discard block |
||
| 335 | 335 | private function checkForDuplicates(string $label, array $SETTINGS, array $itemInfos) : void |
| 336 | 336 | { |
| 337 | 337 | DB::queryFirstRow( |
| 338 | - 'SELECT * FROM ' . prefixTable('items') . ' |
|
| 338 | + 'SELECT * FROM '.prefixTable('items').' |
|
| 339 | 339 | WHERE label = %s AND inactif = %i', |
| 340 | 340 | $label, |
| 341 | 341 | 0 |
@@ -342,8 +342,8 @@ |
||
| 342 | 342 | ); |
| 343 | 343 | |
| 344 | 344 | if (DB::count() > 0 && ( |
| 345 | - (isset($SETTINGS['duplicate_item']) && (int) $SETTINGS['duplicate_item'] === 0) |
|
| 346 | - && (int) $itemInfos['personal_folder'] === 0) |
|
| 345 | + (isset($SETTINGS['duplicate_item']) && (int) $SETTINGS['duplicate_item'] === 0) |
|
| 346 | + && (int) $itemInfos['personal_folder'] === 0) |
|
| 347 | 347 | ) { |
| 348 | 348 | throw new Exception('Similar item already exists. Duplicates are not allowed.'); |
| 349 | 349 | } |
@@ -401,12 +401,13 @@ |
||
| 401 | 401 | <select class="form-control" id="profile-user-timezone"> |
| 402 | 402 | <?php foreach ($zones as $key => $zone): ?> |
| 403 | 403 | <option value="<?php echo $key; ?>"<?php |
| 404 | - if ($session->has('user-timezone')) |
|
| 405 | - if($session->get('user-timezone') === $key) |
|
| 404 | + if ($session->has('user-timezone')) { |
|
| 405 | + if($session->get('user-timezone') === $key) |
|
| 406 | 406 | echo ' selected'; |
| 407 | - elseif ($session->get('user-timezone') === 'not_defined') |
|
| 408 | - if (isset($SETTINGS['timezone']) && $SETTINGS['timezone'] === $key) |
|
| 407 | + } elseif ($session->get('user-timezone') === 'not_defined') { |
|
| 408 | + if (isset($SETTINGS['timezone']) && $SETTINGS['timezone'] === $key) |
|
| 409 | 409 | echo ' selected'; |
| 410 | + } |
|
| 410 | 411 | ?>><?php echo $zone; ?></option> |
| 411 | 412 | <?php endforeach; ?> |
| 412 | 413 | </select> |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('profile') === false) { |
| 69 | 69 | // Not allowed page |
| 70 | 70 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 71 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 71 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 72 | 72 | exit; |
| 73 | 73 | } |
| 74 | 74 | |
@@ -101,49 +101,49 @@ discard block |
||
| 101 | 101 | $zones = timezone_list(); |
| 102 | 102 | // prepare list of languages |
| 103 | 103 | $languages = DB::query( |
| 104 | - 'SELECT label, name FROM ' . prefixTable('languages') . ' ORDER BY label ASC' |
|
| 104 | + 'SELECT label, name FROM '.prefixTable('languages').' ORDER BY label ASC' |
|
| 105 | 105 | ); |
| 106 | 106 | |
| 107 | 107 | // Do some stats |
| 108 | 108 | $userItemsNumber = DB::queryFirstField( |
| 109 | 109 | 'SELECT COUNT(id_item) as count |
| 110 | - FROM ' . prefixTable('log_items') . ' |
|
| 110 | + FROM ' . prefixTable('log_items').' |
|
| 111 | 111 | WHERE action = "at_creation" AND id_user = %i', |
| 112 | 112 | $session->get('user-id') |
| 113 | 113 | ); |
| 114 | 114 | |
| 115 | 115 | $userModificationNumber = DB::queryFirstField( |
| 116 | 116 | 'SELECT COUNT(id_item) as count |
| 117 | - FROM ' . prefixTable('log_items') . ' |
|
| 117 | + FROM ' . prefixTable('log_items').' |
|
| 118 | 118 | WHERE action = "at_modification" AND id_user = %i', |
| 119 | 119 | $session->get('user-id') |
| 120 | 120 | ); |
| 121 | 121 | |
| 122 | 122 | $userSeenItemsNumber = DB::queryFirstField( |
| 123 | 123 | 'SELECT COUNT(id_item) as count |
| 124 | - FROM ' . prefixTable('log_items') . ' |
|
| 124 | + FROM ' . prefixTable('log_items').' |
|
| 125 | 125 | WHERE action = "at_shown" AND id_user = %i', |
| 126 | 126 | $session->get('user-id') |
| 127 | 127 | ); |
| 128 | 128 | |
| 129 | 129 | $userSeenPasswordsNumber = DB::queryFirstField( |
| 130 | 130 | 'SELECT COUNT(id_item) |
| 131 | - FROM ' . prefixTable('log_items') . ' |
|
| 131 | + FROM ' . prefixTable('log_items').' |
|
| 132 | 132 | WHERE action = "at_password_shown" AND id_user = %i', |
| 133 | 133 | $session->get('user-id') |
| 134 | 134 | ); |
| 135 | 135 | |
| 136 | 136 | $userInfo = DB::queryFirstRow( |
| 137 | 137 | 'SELECT avatar, last_pw_change |
| 138 | - FROM ' . prefixTable('users') . ' |
|
| 138 | + FROM ' . prefixTable('users').' |
|
| 139 | 139 | WHERE id = %i', |
| 140 | 140 | $session->get('user-id') |
| 141 | 141 | ); |
| 142 | 142 | |
| 143 | 143 | if (empty($userInfo['avatar']) === true) { |
| 144 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg'; |
|
| 144 | + $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg'; |
|
| 145 | 145 | } else { |
| 146 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/avatars/' . $userInfo['avatar']; |
|
| 146 | + $avatar = $SETTINGS['cpassman_url'].'/includes/avatars/'.$userInfo['avatar']; |
|
| 147 | 147 | } |
| 148 | 148 | |
| 149 | 149 | // Get Groups name |
@@ -151,7 +151,7 @@ discard block |
||
| 151 | 151 | foreach ($session->get('user-roles_array') as $role) { |
| 152 | 152 | $tmp = DB::queryFirstRow( |
| 153 | 153 | 'SELECT title |
| 154 | - FROM ' . prefixTable('roles_title') . ' |
|
| 154 | + FROM ' . prefixTable('roles_title').' |
|
| 155 | 155 | WHERE id = %i', |
| 156 | 156 | $role |
| 157 | 157 | ); |
@@ -197,7 +197,7 @@ discard block |
||
| 197 | 197 | <h3 id="profile-username" class="text-center"> |
| 198 | 198 | <?php |
| 199 | 199 | if (null !== $session->get('user-name') && empty($session->get('user-name')) === false) { |
| 200 | - echo $session->get('user-name') . ' ' . $session->get('user-lastname'); |
|
| 200 | + echo $session->get('user-name').' '.$session->get('user-lastname'); |
|
| 201 | 201 | } else { |
| 202 | 202 | echo $session->get('user-login'); |
| 203 | 203 | } |
@@ -265,7 +265,7 @@ discard block |
||
| 265 | 265 | } else { |
| 266 | 266 | echo date('d/m/Y', (int) $session->get('user-last_connection')); |
| 267 | 267 | } |
| 268 | - echo ' ' . $lang->get('at') . ' '; |
|
| 268 | + echo ' '.$lang->get('at').' '; |
|
| 269 | 269 | if (isset($SETTINGS['time_format']) === true) { |
| 270 | 270 | echo date($SETTINGS['time_format'], (int) $session->get('user-last_connection')); |
| 271 | 271 | } else { |
@@ -275,7 +275,7 @@ discard block |
||
| 275 | 275 | </a> |
| 276 | 276 | </li> |
| 277 | 277 | <?php |
| 278 | - if (null !== $session->get('user-last_pw_change') && ! empty($session->get('user-last_pw_change') === true)) { |
|
| 278 | + if (null !== $session->get('user-last_pw_change') && !empty($session->get('user-last_pw_change') === true)) { |
|
| 279 | 279 | // Handle last password change string |
| 280 | 280 | if ($session->has('user-last_pw_change') && null !== $session->get('user-last_pw_change')) { |
| 281 | 281 | if (isset($SETTINGS['date_format']) === true) { |
@@ -295,12 +295,12 @@ discard block |
||
| 295 | 295 | ) { |
| 296 | 296 | $numDaysBeforePwExpiration = ''; |
| 297 | 297 | } else { |
| 298 | - $numDaysBeforePwExpiration = $lang['index_pw_expiration'] . ' ' . $session->get('user-num_days_before_exp') . ' ' . $lang['days'] . '.'; |
|
| 298 | + $numDaysBeforePwExpiration = $lang['index_pw_expiration'].' '.$session->get('user-num_days_before_exp').' '.$lang['days'].'.'; |
|
| 299 | 299 | } |
| 300 | 300 | echo ' |
| 301 | 301 | <li class="list-group-item"> |
| 302 | - <b><i class="fas fa-calendar-alt fa-fw fa-lg mr-2"></i>' . $lang->get('index_last_pw_change') . '</b> |
|
| 303 | - <a class="float-right">' . $last_pw_change . ' ' . $numDaysBeforePwExpiration . '</a> |
|
| 302 | + <b><i class="fas fa-calendar-alt fa-fw fa-lg mr-2"></i>' . $lang->get('index_last_pw_change').'</b> |
|
| 303 | + <a class="float-right">' . $last_pw_change.' '.$numDaysBeforePwExpiration.'</a> |
|
| 304 | 304 | </li>'; |
| 305 | 305 | } |
| 306 | 306 | ?> |
@@ -320,7 +320,7 @@ discard block |
||
| 320 | 320 | if (isset($SETTINGS['api']) === true && (int) $SETTINGS['api'] === 1) { |
| 321 | 321 | echo ' |
| 322 | 322 | <li class="list-group-item"> |
| 323 | - <b><i class="fas fa-paper-plane fa-fw fa-lg mr-2"></i>' . $lang->get('user_profile_api_key') . '</b> |
|
| 323 | + <b><i class="fas fa-paper-plane fa-fw fa-lg mr-2"></i>' . $lang->get('user_profile_api_key').'</b> |
|
| 324 | 324 | <button class="btn btn-sm btn-primary float-right" id="copy-api-key"><i class="fa-regular fa-copy pointer"></i></button> |
| 325 | 325 | <a class="float-right mr-2" id="profile-user-api-token">', |
| 326 | 326 | null !== $session->get('user-api_key') ? $session->get('user-api_key') : '', |
@@ -338,12 +338,12 @@ discard block |
||
| 338 | 338 | <?php |
| 339 | 339 | $rows = DB::query( |
| 340 | 340 | 'SELECT label AS labelAction, date, null |
| 341 | - FROM ' . prefixTable('log_system') . ' |
|
| 341 | + FROM ' . prefixTable('log_system').' |
|
| 342 | 342 | WHERE qui = %i |
| 343 | 343 | UNION |
| 344 | 344 | SELECT l.action, l.date, i.label AS itemLabel |
| 345 | - FROM ' . prefixTable('log_items') . ' AS l |
|
| 346 | - INNER JOIN ' . prefixTable('items') . ' AS i ON (l.id_item = i.id) |
|
| 345 | + FROM ' . prefixTable('log_items').' AS l |
|
| 346 | + INNER JOIN ' . prefixTable('items').' AS i ON (l.id_item = i.id) |
|
| 347 | 347 | WHERE l.id_user = %i AND l.action IN ("at_access") |
| 348 | 348 | ORDER BY date DESC |
| 349 | 349 | LIMIT 0, 40', |
@@ -357,9 +357,9 @@ discard block |
||
| 357 | 357 | $text = $lang->get($record['labelAction']); |
| 358 | 358 | } |
| 359 | 359 | if (empty($record['NULL']) === false) { |
| 360 | - $text .= ' ' . $lang->get('for') . ' <span class="font-weight-light">' . addslashes($record['NULL']) . '</span>'; |
|
| 360 | + $text .= ' '.$lang->get('for').' <span class="font-weight-light">'.addslashes($record['NULL']).'</span>'; |
|
| 361 | 361 | } |
| 362 | - echo '<li class="list-group-item">' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - ' . $text . '</li>'; |
|
| 362 | + echo '<li class="list-group-item">'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).' - '.$text.'</li>'; |
|
| 363 | 363 | } |
| 364 | 364 | ?> |
| 365 | 365 | </ul> |
@@ -393,13 +393,13 @@ discard block |
||
| 393 | 393 | <?php endif; /* disable_user_edit_profile */ |
| 394 | 394 | if (($SETTINGS['disable_user_edit_timezone'] ?? '0') === '0') : ?> |
| 395 | 395 | <div class="form-group"> |
| 396 | - <label class="col-sm-10 control-label"><?php echo $lang->get('timezone_selection');?></label> |
|
| 396 | + <label class="col-sm-10 control-label"><?php echo $lang->get('timezone_selection'); ?></label> |
|
| 397 | 397 | <div class="col-sm-10"> |
| 398 | 398 | <select class="form-control" id="profile-user-timezone"> |
| 399 | 399 | <?php foreach ($zones as $key => $zone): ?> |
| 400 | 400 | <option value="<?php echo $key; ?>"<?php |
| 401 | 401 | if ($session->has('user-timezone')) |
| 402 | - if($session->get('user-timezone') === $key) |
|
| 402 | + if ($session->get('user-timezone') === $key) |
|
| 403 | 403 | echo ' selected'; |
| 404 | 404 | elseif ($session->get('user-timezone') === 'not_defined') |
| 405 | 405 | if (isset($SETTINGS['timezone']) && $SETTINGS['timezone'] === $key) |
@@ -417,10 +417,10 @@ discard block |
||
| 417 | 417 | <select class="form-control" id="profile-user-language"> |
| 418 | 418 | <?php |
| 419 | 419 | foreach ($languages as $language) { |
| 420 | - echo '<option value="' . $language['name'] . '"', |
|
| 420 | + echo '<option value="'.$language['name'].'"', |
|
| 421 | 421 | strtolower($session->get('user-language')) === strtolower($language['name']) ? |
| 422 | 422 | ' selected="selected"' : '', |
| 423 | - '>' . $language['label'] . '</option>'; |
|
| 423 | + '>'.$language['label'].'</option>'; |
|
| 424 | 424 | } |
| 425 | 425 | ?> |
| 426 | 426 | </select> |
@@ -433,11 +433,11 @@ discard block |
||
| 433 | 433 | <div class="col-sm-10"> |
| 434 | 434 | <select class="form-control" id="profile-user-treeloadstrategy"> |
| 435 | 435 | |
| 436 | - <option value="sequential" <?php echo $session->has('user-tree_load_strategy') && $session->get('user-tree_load_strategy') && null !== $session->get('user-tree_load_strategy') && $session->get('user-tree_load_strategy') === 'sequential' ? ' selected' : '';?>> |
|
| 436 | + <option value="sequential" <?php echo $session->has('user-tree_load_strategy') && $session->get('user-tree_load_strategy') && null !== $session->get('user-tree_load_strategy') && $session->get('user-tree_load_strategy') === 'sequential' ? ' selected' : ''; ?>> |
|
| 437 | 437 | <?php echo $lang->get('sequential'); ?> |
| 438 | 438 | </option> |
| 439 | 439 | |
| 440 | - <option value="full" <?php echo $session->has('user-tree_load_strategy') && $session->get('user-tree_load_strategy') && null !== $session->get('user-tree_load_strategy') && $session->get('user-tree_load_strategy') === 'full' ? ' selected' : '';?>> |
|
| 440 | + <option value="full" <?php echo $session->has('user-tree_load_strategy') && $session->get('user-tree_load_strategy') && null !== $session->get('user-tree_load_strategy') && $session->get('user-tree_load_strategy') === 'full' ? ' selected' : ''; ?>> |
|
| 441 | 441 | <?php echo $lang->get('full'); ?> |
| 442 | 442 | </option> |
| 443 | 443 | </select> |
@@ -450,11 +450,11 @@ discard block |
||
| 450 | 450 | <div class="col-sm-10"> |
| 451 | 451 | <select class="form-control" id="profile-user-split_view_mode"> |
| 452 | 452 | |
| 453 | - <option value="0" <?php echo $session->has('user-split_view_mode') && $session->get('user-split_view_mode') && null !== $session->get('user-split_view_mode') && $session->get('user-split_view_mode') === 0 ? 'selected' : '';?>> |
|
| 453 | + <option value="0" <?php echo $session->has('user-split_view_mode') && $session->get('user-split_view_mode') && null !== $session->get('user-split_view_mode') && $session->get('user-split_view_mode') === 0 ? 'selected' : ''; ?>> |
|
| 454 | 454 | <?php echo $lang->get('no'); ?> |
| 455 | 455 | </option> |
| 456 | 456 | |
| 457 | - <option value="1" <?php echo $session->has('user-split_view_mode') && $session->get('user-split_view_mode') && null !== $session->get('user-split_view_mode') && (int) $session->get('user-split_view_mode') === 1 ? 'selected' : '';?>> |
|
| 457 | + <option value="1" <?php echo $session->has('user-split_view_mode') && $session->get('user-split_view_mode') && null !== $session->get('user-split_view_mode') && (int) $session->get('user-split_view_mode') === 1 ? 'selected' : ''; ?>> |
|
| 458 | 458 | <?php echo $lang->get('yes'); ?> |
| 459 | 459 | </option> |
| 460 | 460 | </select> |
@@ -466,11 +466,11 @@ discard block |
||
| 466 | 466 | <div class="col-sm-10"> |
| 467 | 467 | <select class="form-control" id="profile-user-show_subfolders"> |
| 468 | 468 | |
| 469 | - <option value="0" <?php echo $session->has('user-show_subfolders') && $session->get('user-show_subfolders') && null !== $session->get('user-show_subfolders') && $session->get('user-show_subfolders') === 0 ? 'selected' : '';?>> |
|
| 469 | + <option value="0" <?php echo $session->has('user-show_subfolders') && $session->get('user-show_subfolders') && null !== $session->get('user-show_subfolders') && $session->get('user-show_subfolders') === 0 ? 'selected' : ''; ?>> |
|
| 470 | 470 | <?php echo $lang->get('no'); ?> |
| 471 | 471 | </option> |
| 472 | 472 | |
| 473 | - <option value="1" <?php echo $session->has('user-show_subfolders') && $session->get('user-show_subfolders') && null !== $session->get('user-show_subfolders') && (int) $session->get('user-show_subfolders') === 1 ? 'selected' : '';?>> |
|
| 473 | + <option value="1" <?php echo $session->has('user-show_subfolders') && $session->get('user-show_subfolders') && null !== $session->get('user-show_subfolders') && (int) $session->get('user-show_subfolders') === 1 ? 'selected' : ''; ?>> |
|
| 474 | 474 | <?php echo $lang->get('yes'); ?> |
| 475 | 475 | </option> |
| 476 | 476 | </select> |
@@ -488,7 +488,7 @@ discard block |
||
| 488 | 488 | <?php |
| 489 | 489 | } |
| 490 | 490 | if (isset($SETTINGS['api']) === true && (int) $SETTINGS['api'] === 1) { |
| 491 | - echo '<button type="button" class="btn btn-warning float-right" id="profile-button-api_token">' . $lang->get('generate_api_token') . '</button>'; |
|
| 491 | + echo '<button type="button" class="btn btn-warning float-right" id="profile-button-api_token">'.$lang->get('generate_api_token').'</button>'; |
|
| 492 | 492 | } |
| 493 | 493 | ?> |
| 494 | 494 | <div id="profile-avatar-file-container" class="hidden"></div> |
@@ -37,45 +37,45 @@ discard block |
||
| 37 | 37 | * @return boolean |
| 38 | 38 | */ |
| 39 | 39 | function is_jwt_valid($jwt) { |
| 40 | - try { |
|
| 41 | - $decoded = (array) JWT::decode($jwt, new Key(DB_PASSWD, 'HS256')); |
|
| 40 | + try { |
|
| 41 | + $decoded = (array) JWT::decode($jwt, new Key(DB_PASSWD, 'HS256')); |
|
| 42 | 42 | |
| 43 | - // Check if expiration is reached |
|
| 44 | - if ($decoded['exp'] - time() < 0) { |
|
| 45 | - return false; |
|
| 46 | - } |
|
| 43 | + // Check if expiration is reached |
|
| 44 | + if ($decoded['exp'] - time() < 0) { |
|
| 45 | + return false; |
|
| 46 | + } |
|
| 47 | 47 | /* |
| 48 | 48 | $decoded1 = JWT::decode($jwt, new Key(DB_PASSWD, 'HS256'), $headers = new stdClass()); |
| 49 | 49 | print_r($headers); |
| 50 | 50 | */ |
| 51 | 51 | |
| 52 | - return true; |
|
| 53 | - } catch (InvalidArgumentException $e) { |
|
| 54 | - // provided key/key-array is empty or malformed. |
|
| 55 | - return false; |
|
| 56 | - } catch (DomainException $e) { |
|
| 57 | - // provided algorithm is unsupported OR |
|
| 58 | - // provided key is invalid OR |
|
| 59 | - // unknown error thrown in openSSL or libsodium OR |
|
| 60 | - // libsodium is required but not available. |
|
| 61 | - return false; |
|
| 62 | - } catch (SignatureInvalidException $e) { |
|
| 63 | - // provided JWT signature verification failed. |
|
| 64 | - return false; |
|
| 65 | - } catch (BeforeValidException $e) { |
|
| 66 | - // provided JWT is trying to be used before "nbf" claim OR |
|
| 67 | - // provided JWT is trying to be used before "iat" claim. |
|
| 68 | - return false; |
|
| 69 | - } catch (ExpiredException $e) { |
|
| 70 | - // provided JWT is trying to be used after "exp" claim. |
|
| 71 | - return false; |
|
| 72 | - } catch (UnexpectedValueException $e) { |
|
| 73 | - // provided JWT is malformed OR |
|
| 74 | - // provided JWT is missing an algorithm / using an unsupported algorithm OR |
|
| 75 | - // provided JWT algorithm does not match provided key OR |
|
| 76 | - // provided key ID in key/key-array is empty or invalid. |
|
| 77 | - return false; |
|
| 78 | - } |
|
| 52 | + return true; |
|
| 53 | + } catch (InvalidArgumentException $e) { |
|
| 54 | + // provided key/key-array is empty or malformed. |
|
| 55 | + return false; |
|
| 56 | + } catch (DomainException $e) { |
|
| 57 | + // provided algorithm is unsupported OR |
|
| 58 | + // provided key is invalid OR |
|
| 59 | + // unknown error thrown in openSSL or libsodium OR |
|
| 60 | + // libsodium is required but not available. |
|
| 61 | + return false; |
|
| 62 | + } catch (SignatureInvalidException $e) { |
|
| 63 | + // provided JWT signature verification failed. |
|
| 64 | + return false; |
|
| 65 | + } catch (BeforeValidException $e) { |
|
| 66 | + // provided JWT is trying to be used before "nbf" claim OR |
|
| 67 | + // provided JWT is trying to be used before "iat" claim. |
|
| 68 | + return false; |
|
| 69 | + } catch (ExpiredException $e) { |
|
| 70 | + // provided JWT is trying to be used after "exp" claim. |
|
| 71 | + return false; |
|
| 72 | + } catch (UnexpectedValueException $e) { |
|
| 73 | + // provided JWT is malformed OR |
|
| 74 | + // provided JWT is missing an algorithm / using an unsupported algorithm OR |
|
| 75 | + // provided JWT algorithm does not match provided key OR |
|
| 76 | + // provided key ID in key/key-array is empty or invalid. |
|
| 77 | + return false; |
|
| 78 | + } |
|
| 79 | 79 | } |
| 80 | 80 | |
| 81 | 81 | function base64url_encode($data) { |
@@ -84,24 +84,24 @@ discard block |
||
| 84 | 84 | |
| 85 | 85 | function get_authorization_header() |
| 86 | 86 | { |
| 87 | - $request = symfonyRequest::createFromGlobals(); |
|
| 88 | - $authorizationHeader = $request->headers->get('Authorization'); |
|
| 89 | - $headers = null; |
|
| 87 | + $request = symfonyRequest::createFromGlobals(); |
|
| 88 | + $authorizationHeader = $request->headers->get('Authorization'); |
|
| 89 | + $headers = null; |
|
| 90 | 90 | |
| 91 | - // Check if the authorization header is not empty |
|
| 92 | - if (!empty($authorizationHeader)) { |
|
| 93 | - $headers = trim($authorizationHeader); |
|
| 94 | - } else if (function_exists('apache_request_headers') === true) { |
|
| 95 | - $requestHeaders = (array) apache_request_headers(); |
|
| 96 | - // Server-side fix for bug in old Android versions (a nice side-effect of this fix means we don't care about capitalization for Authorization) |
|
| 97 | - $requestHeaders = array_combine(array_map('ucwords', array_keys($requestHeaders)), array_values($requestHeaders)); |
|
| 98 | - //print_r($requestHeaders); |
|
| 99 | - if (isset($requestHeaders['Authorization']) === true) { |
|
| 100 | - $headers = trim($requestHeaders['Authorization']); |
|
| 101 | - } |
|
| 102 | - } |
|
| 91 | + // Check if the authorization header is not empty |
|
| 92 | + if (!empty($authorizationHeader)) { |
|
| 93 | + $headers = trim($authorizationHeader); |
|
| 94 | + } else if (function_exists('apache_request_headers') === true) { |
|
| 95 | + $requestHeaders = (array) apache_request_headers(); |
|
| 96 | + // Server-side fix for bug in old Android versions (a nice side-effect of this fix means we don't care about capitalization for Authorization) |
|
| 97 | + $requestHeaders = array_combine(array_map('ucwords', array_keys($requestHeaders)), array_values($requestHeaders)); |
|
| 98 | + //print_r($requestHeaders); |
|
| 99 | + if (isset($requestHeaders['Authorization']) === true) { |
|
| 100 | + $headers = trim($requestHeaders['Authorization']); |
|
| 101 | + } |
|
| 102 | + } |
|
| 103 | 103 | |
| 104 | - return $headers; |
|
| 104 | + return $headers; |
|
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | function get_bearer_token() { |
@@ -118,8 +118,8 @@ discard block |
||
| 118 | 118 | |
| 119 | 119 | function get_bearer_data($jwt) { |
| 120 | 120 | // split the jwt |
| 121 | - $tokenParts = explode('.', $jwt); |
|
| 122 | - $payload = base64_decode($tokenParts[1]); |
|
| 121 | + $tokenParts = explode('.', $jwt); |
|
| 122 | + $payload = base64_decode($tokenParts[1]); |
|
| 123 | 123 | |
| 124 | 124 | // HEADER: Get the access token from the header |
| 125 | 125 | if (empty($payload) === false) { |
@@ -148,34 +148,34 @@ discard block |
||
| 148 | 148 | */ |
| 149 | 149 | function get_user_keys(int $userId, string $keyTempo, string $sessionKey): ?array |
| 150 | 150 | { |
| 151 | - require_once API_ROOT_PATH . '/inc/encryption_utils.php'; |
|
| 151 | + require_once API_ROOT_PATH.'/inc/encryption_utils.php'; |
|
| 152 | 152 | |
| 153 | 153 | // Retrieve user's public key and encrypted private key from database |
| 154 | 154 | $userInfo = DB::queryfirstrow( |
| 155 | 155 | "SELECT u.public_key, a.encrypted_private_key, a.session_key AS key_tempo |
| 156 | - FROM " . prefixTable('users') . " AS u |
|
| 157 | - INNER JOIN " . prefixTable('api') . " AS a ON (a.user_id = u.id) |
|
| 156 | + FROM " . prefixTable('users')." AS u |
|
| 157 | + INNER JOIN " . prefixTable('api')." AS a ON (a.user_id = u.id) |
|
| 158 | 158 | WHERE u.id = %i", |
| 159 | 159 | $userId |
| 160 | 160 | ); |
| 161 | 161 | |
| 162 | 162 | if (DB::count() === 0) { |
| 163 | 163 | // User not found or no API configuration |
| 164 | - error_log('[API] get_user_keys: User not found or no API config for user ID ' . $userId); |
|
| 164 | + error_log('[API] get_user_keys: User not found or no API config for user ID '.$userId); |
|
| 165 | 165 | return null; |
| 166 | 166 | } |
| 167 | 167 | |
| 168 | 168 | // Validate key_tempo matches (security check - ensures session is still valid) |
| 169 | 169 | if (($userInfo['key_tempo']) !== $keyTempo) { |
| 170 | 170 | // Session invalid or expired |
| 171 | - error_log('[API] get_user_keys: Invalid key_tempo for user ID ' . $userId); |
|
| 171 | + error_log('[API] get_user_keys: Invalid key_tempo for user ID '.$userId); |
|
| 172 | 172 | return null; |
| 173 | 173 | } |
| 174 | 174 | |
| 175 | 175 | // Check if encrypted private key exists |
| 176 | 176 | if (empty($userInfo['encrypted_private_key'])) { |
| 177 | 177 | // No encrypted key found - user needs to re-authenticate |
| 178 | - error_log('[API] get_user_keys: No encrypted private key found for user ID ' . $userId); |
|
| 178 | + error_log('[API] get_user_keys: No encrypted private key found for user ID '.$userId); |
|
| 179 | 179 | return null; |
| 180 | 180 | } |
| 181 | 181 | |
@@ -195,7 +195,7 @@ discard block |
||
| 195 | 195 | |
| 196 | 196 | if ($privateKeyDecrypted === false) { |
| 197 | 197 | // Decryption failed - wrong key or tampered data |
| 198 | - error_log('[API] get_user_keys: Failed to decrypt private key for user ID ' . $userId); |
|
| 198 | + error_log('[API] get_user_keys: Failed to decrypt private key for user ID '.$userId); |
|
| 199 | 199 | return null; |
| 200 | 200 | } |
| 201 | 201 | |
@@ -39,13 +39,13 @@ discard block |
||
| 39 | 39 | header("Access-Control-Allow-Methods: POST, GET"); |
| 40 | 40 | header("Access-Control-Max-Age: 3600"); |
| 41 | 41 | header("Access-Control-Allow-Headers: Content-Type, Access-Control-Allow-Headers, Authorization, X-Requested-With"); |
| 42 | -require __DIR__ . "/inc/bootstrap.php"; |
|
| 42 | +require __DIR__."/inc/bootstrap.php"; |
|
| 43 | 43 | |
| 44 | 44 | // sanitize url segments |
| 45 | 45 | $base = new BaseController(); |
| 46 | 46 | $uri = $base->getUriSegments(); |
| 47 | 47 | if (!is_array($uri)) { |
| 48 | - $uri = [$uri]; // ensure $uril is table |
|
| 48 | + $uri = [$uri]; // ensure $uril is table |
|
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | // Prepare DB password |
@@ -61,9 +61,9 @@ discard block |
||
| 61 | 61 | if ($uri[0] === 'authorize') { |
| 62 | 62 | // Is API enabled in Teampass settings |
| 63 | 63 | if ($apiStatus['error'] === false) { |
| 64 | - require API_ROOT_PATH . "/Controller/Api/AuthController.php"; |
|
| 64 | + require API_ROOT_PATH."/Controller/Api/AuthController.php"; |
|
| 65 | 65 | $objFeedController = new AuthController(); |
| 66 | - $strMethodName = $uri[0] . 'Action'; |
|
| 66 | + $strMethodName = $uri[0].'Action'; |
|
| 67 | 67 | $objFeedController->{$strMethodName}(); |
| 68 | 68 | } else { |
| 69 | 69 | // Error management |
@@ -89,9 +89,9 @@ discard block |
||
| 89 | 89 | |
| 90 | 90 | // action related to USER |
| 91 | 91 | } elseif ($controller === 'user') { |
| 92 | - require API_ROOT_PATH . "/Controller/Api/UserController.php"; |
|
| 92 | + require API_ROOT_PATH."/Controller/Api/UserController.php"; |
|
| 93 | 93 | $objFeedController = new UserController(); |
| 94 | - $strMethodName = (string) $action . 'Action'; |
|
| 94 | + $strMethodName = (string) $action.'Action'; |
|
| 95 | 95 | $objFeedController->{$strMethodName}(); |
| 96 | 96 | |
| 97 | 97 | // action related to ITEM |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | ) { |
| 81 | 81 | // Not allowed page |
| 82 | 82 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 83 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 83 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 84 | 84 | exit; |
| 85 | 85 | } |
| 86 | 86 | |
@@ -154,7 +154,7 @@ discard block |
||
| 154 | 154 | $openLdapExtra = new OpenLdapExtra(); |
| 155 | 155 | break; |
| 156 | 156 | default: |
| 157 | - throw new Exception("Unsupported LDAP type: " . $SETTINGS['ldap_type']); |
|
| 157 | + throw new Exception("Unsupported LDAP type: ".$SETTINGS['ldap_type']); |
|
| 158 | 158 | } |
| 159 | 159 | } catch (Exception $e) { |
| 160 | 160 | if (defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) { |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | // 2- Get user info from AD |
| 174 | 174 | // We want to isolate attribute ldap_user_attribute or mostly samAccountName |
| 175 | 175 | $userADInfos = $ldapConnection->query() |
| 176 | - ->where((isset($SETTINGS['ldap_user_attribute']) ===true && empty($SETTINGS['ldap_user_attribute']) === false) ? $SETTINGS['ldap_user_attribute'] : 'samaccountname', '=', $post_username) |
|
| 176 | + ->where((isset($SETTINGS['ldap_user_attribute']) === true && empty($SETTINGS['ldap_user_attribute']) === false) ? $SETTINGS['ldap_user_attribute'] : 'samaccountname', '=', $post_username) |
|
| 177 | 177 | ->firstOrFail(); |
| 178 | 178 | |
| 179 | 179 | // Is user enabled? Only ActiveDirectory |
@@ -194,7 +194,7 @@ discard block |
||
| 194 | 194 | } catch (\LdapRecord\Query\ObjectNotFoundException $e) { |
| 195 | 195 | $error = $e->getDetailedError(); |
| 196 | 196 | if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) { |
| 197 | - error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage()); |
|
| 197 | + error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage()); |
|
| 198 | 198 | } |
| 199 | 199 | // deepcode ignore ServerLeak: No important data is sent and is encrypted before being sent |
| 200 | 200 | echo prepareExchangedData( |
@@ -213,7 +213,7 @@ discard block |
||
| 213 | 213 | // For OpenLDAP and others, we use attribute dn |
| 214 | 214 | $userAuthAttempt = $ldapConnection->auth()->attempt( |
| 215 | 215 | $SETTINGS['ldap_type'] === 'ActiveDirectory' ? |
| 216 | - $userADInfos['userprincipalname'][0] : // refering to https://ldaprecord.com/docs/core/v2/authentication#basic-authentication |
|
| 216 | + $userADInfos['userprincipalname'][0] : // refering to https://ldaprecord.com/docs/core/v2/authentication#basic-authentication |
|
| 217 | 217 | $userADInfos['dn'], |
| 218 | 218 | $post_password |
| 219 | 219 | ); |
@@ -232,7 +232,7 @@ discard block |
||
| 232 | 232 | } catch (\LdapRecord\Query\ObjectNotFoundException $e) { |
| 233 | 233 | $error = $e->getDetailedError(); |
| 234 | 234 | if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) { |
| 235 | - error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage()); |
|
| 235 | + error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage()); |
|
| 236 | 236 | } |
| 237 | 237 | // deepcode ignore ServerLeak: No important data is sent and is encrypted before being sent |
| 238 | 238 | echo prepareExchangedData( |
@@ -149,8 +149,7 @@ |
||
| 149 | 149 | </div> |
| 150 | 150 | <?php |
| 151 | 151 | } |
| 152 | -} |
|
| 153 | -catch (Exception $e) { |
|
| 152 | +} catch (Exception $e) { |
|
| 154 | 153 | if (defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) { |
| 155 | 154 | error_log('TEAMPASS Error - tasks page - '.$e->getMessage()); |
| 156 | 155 | } |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('tasks') === false) { |
| 65 | 65 | // Not allowed page |
| 66 | 66 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 67 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 67 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 68 | 68 | exit; |
| 69 | 69 | } |
| 70 | 70 | |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | // Get last cron execution timestamp |
| 127 | 127 | $queryResults = DB::query( |
| 128 | 128 | 'SELECT valeur |
| 129 | - FROM ' . prefixTable('misc') . ' |
|
| 129 | + FROM ' . prefixTable('misc').' |
|
| 130 | 130 | WHERE type = %s AND intitule = %s and valeur >= %d', |
| 131 | 131 | 'admin', |
| 132 | 132 | 'last_cron_exec', |
@@ -234,7 +234,7 @@ discard block |
||
| 234 | 234 | $task = isset($SETTINGS['users_personal_folder_task']) === true ? explode(";", $SETTINGS['users_personal_folder_task']) : []; |
| 235 | 235 | ?> |
| 236 | 236 | <input type='text' disabled class='form-control form-control-sm' id='users_personal_folder_task_parameter' value='<?php echo isset($task[0]) === true && empty($task[0]) === false ? $lang->get($task[0])." ".(isset($task[2]) === true ? strtolower($lang->get('day')).' '.$task[2].' ' : '').$lang->get('at')." ".(isset($task[1]) === true ? $task[1] : '') : $lang->get('not_defined') ?>'> |
| 237 | - <input type='hidden' disabled class='form-control form-control-sm' id='users_personal_folder_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".(isset($task[1]) === true ? $task[1] : '').(isset($task[2]) === true ? $task[2] : '') : '';?>'> |
|
| 237 | + <input type='hidden' disabled class='form-control form-control-sm' id='users_personal_folder_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".(isset($task[1]) === true ? $task[1] : '').(isset($task[2]) === true ? $task[2] : '') : ''; ?>'> |
|
| 238 | 238 | </div> |
| 239 | 239 | <div class='col-2'> |
| 240 | 240 | <button class="btn btn-primary task-define" data-task="users_personal_folder_task"> |
@@ -256,7 +256,7 @@ discard block |
||
| 256 | 256 | $task = isset($SETTINGS['clean_orphan_objects_task']) === true ? explode(";", $SETTINGS['clean_orphan_objects_task']) : []; |
| 257 | 257 | ?> |
| 258 | 258 | <input type='text' disabled class='form-control form-control-sm' id='clean_orphan_objects_task_parameter' value='<?php echo isset($task[0]) === true && empty($task[0]) === false ? $lang->get($task[0])." ".(isset($task[2]) === true ? strtolower($lang->get('day')).' '.$task[2].' ' : '').$lang->get('at')." ".(isset($task[1]) === true ? $task[1] : '') : $lang->get('not_defined') ?>'> |
| 259 | - <input type='hidden' disabled class='form-control form-control-sm' id='clean_orphan_objects_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".(isset($task[1]) === true ? $task[1] : '').(isset($task[2]) === true ? $task[2] : '') : '';?>'> |
|
| 259 | + <input type='hidden' disabled class='form-control form-control-sm' id='clean_orphan_objects_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".(isset($task[1]) === true ? $task[1] : '').(isset($task[2]) === true ? $task[2] : '') : ''; ?>'> |
|
| 260 | 260 | </div> |
| 261 | 261 | <div class='col-2'> |
| 262 | 262 | <button class="btn btn-primary task-define" data-task="clean_orphan_objects_task"> |
@@ -278,7 +278,7 @@ discard block |
||
| 278 | 278 | $task = isset($SETTINGS['purge_temporary_files_task']) === true ? explode(";", $SETTINGS['purge_temporary_files_task']) : []; |
| 279 | 279 | ?> |
| 280 | 280 | <input type='text' disabled class='form-control form-control-sm' id='purge_temporary_files_task_parameter' value='<?php echo isset($task[0]) === true && empty($task[0]) === false ? $lang->get($task[0])." ".(isset($task[2]) === true ? strtolower($lang->get('day')).' '.$task[2].' ' : '').$lang->get('at')." ".(isset($task[1]) === true ? $task[1] : '') : $lang->get('not_defined') ?>'> |
| 281 | - <input type='hidden' disabled class='form-control form-control-sm' id='purge_temporary_files_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".(isset($task[1]) === true ? $task[1] : '').(isset($task[2]) === true ? $task[2] : '') : '';?>'> |
|
| 281 | + <input type='hidden' disabled class='form-control form-control-sm' id='purge_temporary_files_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".(isset($task[1]) === true ? $task[1] : '').(isset($task[2]) === true ? $task[2] : '') : ''; ?>'> |
|
| 282 | 282 | </div> |
| 283 | 283 | <div class='col-2'> |
| 284 | 284 | <button class="btn btn-primary task-define" data-task="purge_temporary_files_task"> |
@@ -300,7 +300,7 @@ discard block |
||
| 300 | 300 | $task = isset($SETTINGS['reload_cache_table_task']) === true ? explode(";", $SETTINGS['reload_cache_table_task']) : []; |
| 301 | 301 | ?> |
| 302 | 302 | <input type='text' disabled class='form-control form-control-sm' id='reload_cache_table_task_parameter' value='<?php echo isset($task[0]) === true && empty($task[0]) === false ? $lang->get($task[0])." ".(isset($task[2]) === true ? strtolower($lang->get('day')).' '.$task[2].' ' : '').$lang->get('at')." ".(isset($task[1]) === true ? $task[1] : '') : $lang->get('not_defined') ?>'> |
| 303 | - <input type='hidden' disabled class='form-control form-control-sm' id='reload_cache_table_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".(isset($task[1]) === true ? $task[1] : '').(isset($task[2]) === true ? $task[2] : '') : '';?>'> |
|
| 303 | + <input type='hidden' disabled class='form-control form-control-sm' id='reload_cache_table_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".(isset($task[1]) === true ? $task[1] : '').(isset($task[2]) === true ? $task[2] : '') : ''; ?>'> |
|
| 304 | 304 | </div> |
| 305 | 305 | <div class='col-2'> |
| 306 | 306 | <button class="btn btn-primary task-define" data-task="reload_cache_table_task"> |
@@ -517,7 +517,7 @@ discard block |
||
| 517 | 517 | <h5><?php echo $lang->get('day_of_month'); ?></h5> |
| 518 | 518 | <select class='form-control form-control-sm no-save' id='task-define-modal-parameter-monthly-value' style="width:100%;"> |
| 519 | 519 | <?php |
| 520 | - for ($i=1; $i<=31; $i++) { |
|
| 520 | + for ($i = 1; $i <= 31; $i++) { |
|
| 521 | 521 | echo '<option value="'.$i.'">'.$lang->get('day').' '.$i.'</option>'; |
| 522 | 522 | } |
| 523 | 523 | ?> |
@@ -2,7 +2,7 @@ |
||
| 2 | 2 | use TeampassClasses\OAuth2Controller\OAuth2Controller; |
| 3 | 3 | use TeampassClasses\SessionManager\SessionManager; |
| 4 | 4 | |
| 5 | -require_once __DIR__. '/../includes/config/include.php'; |
|
| 5 | +require_once __DIR__.'/../includes/config/include.php'; |
|
| 6 | 6 | require_once __DIR__.'/../sources/main.functions.php'; |
| 7 | 7 | |
| 8 | 8 | // init |
@@ -830,7 +830,7 @@ |
||
| 830 | 830 | 'encode' |
| 831 | 831 | ); |
| 832 | 832 | |
| 833 | - /* |
|
| 833 | + /* |
|
| 834 | 834 | * Generate BUG report |
| 835 | 835 | */ |
| 836 | 836 | case 'generate_bug_report'://action_system |
@@ -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 | |
@@ -207,7 +207,7 @@ discard block |
||
| 207 | 207 | * @param array $SETTINGS |
| 208 | 208 | * @return string |
| 209 | 209 | */ |
| 210 | -function passwordHandler(string $post_type, array|null|string $dataReceived, array $SETTINGS): string |
|
| 210 | +function passwordHandler(string $post_type, array | null | string $dataReceived, array $SETTINGS): string |
|
| 211 | 211 | { |
| 212 | 212 | $session = SessionManager::getSession(); |
| 213 | 213 | $lang = new Language($session->get('user-language') ?? 'english'); |
@@ -275,7 +275,7 @@ discard block |
||
| 275 | 275 | |
| 276 | 276 | // Get current user hash |
| 277 | 277 | $userHash = DB::queryFirstRow( |
| 278 | - "SELECT pw FROM " . prefixtable('users') . " WHERE id = %d;", |
|
| 278 | + "SELECT pw FROM ".prefixtable('users')." WHERE id = %d;", |
|
| 279 | 279 | $session->get('user-id') |
| 280 | 280 | )['pw']; |
| 281 | 281 | |
@@ -330,7 +330,7 @@ discard block |
||
| 330 | 330 | * @param string $post_key |
| 331 | 331 | * @return string |
| 332 | 332 | */ |
| 333 | -function userHandler(string $post_type, array|null|string $dataReceived, array $SETTINGS, string $post_key): string |
|
| 333 | +function userHandler(string $post_type, array | null | string $dataReceived, array $SETTINGS, string $post_key): string |
|
| 334 | 334 | { |
| 335 | 335 | $session = SessionManager::getSession(); |
| 336 | 336 | |
@@ -365,7 +365,7 @@ discard block |
||
| 365 | 365 | if (isset($dataReceived['user_id'])) { |
| 366 | 366 | // Get info about user to modify |
| 367 | 367 | $targetUserInfos = DB::queryFirstRow( |
| 368 | - 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 368 | + 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 369 | 369 | WHERE id = %i', |
| 370 | 370 | $dataReceived['user_id'] |
| 371 | 371 | ); |
@@ -514,7 +514,7 @@ discard block |
||
| 514 | 514 | case 'mail_me'://action_mail |
| 515 | 515 | // Get info about user to send email |
| 516 | 516 | $data_user = DB::queryFirstRow( |
| 517 | - 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 517 | + 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 518 | 518 | WHERE email = %s', |
| 519 | 519 | filter_var($dataReceived['receipt'], FILTER_SANITIZE_FULL_SPECIAL_CHARS) |
| 520 | 520 | ); |
@@ -634,7 +634,7 @@ discard block |
||
| 634 | 634 | if (isset($dataReceived['user_id'])) { |
| 635 | 635 | // Get info about user to modify |
| 636 | 636 | $targetUserInfos = DB::queryFirstRow( |
| 637 | - 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 637 | + 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 638 | 638 | WHERE id = %i', |
| 639 | 639 | $dataReceived['user_id'] |
| 640 | 640 | ); |
@@ -718,7 +718,7 @@ discard block |
||
| 718 | 718 | |
| 719 | 719 | // Get current user hash |
| 720 | 720 | $userHash = DB::queryFirstRow( |
| 721 | - "SELECT pw FROM " . prefixtable('users') . " WHERE id = %d;", |
|
| 721 | + "SELECT pw FROM ".prefixtable('users')." WHERE id = %d;", |
|
| 722 | 722 | $session->get('user-id') |
| 723 | 723 | )['pw']; |
| 724 | 724 | |
@@ -756,7 +756,7 @@ discard block |
||
| 756 | 756 | |
| 757 | 757 | // Get current user hash |
| 758 | 758 | $userHash = DB::queryFirstRow( |
| 759 | - "SELECT pw FROM " . prefixtable('users') . " WHERE id = %d;", |
|
| 759 | + "SELECT pw FROM ".prefixtable('users')." WHERE id = %d;", |
|
| 760 | 760 | $session->get('user-id') |
| 761 | 761 | )['pw']; |
| 762 | 762 | |
@@ -801,7 +801,7 @@ discard block |
||
| 801 | 801 | |
| 802 | 802 | // Get current user hash |
| 803 | 803 | $userHash = DB::queryFirstRow( |
| 804 | - "SELECT pw FROM " . prefixtable('users') . " WHERE id = %i;", |
|
| 804 | + "SELECT pw FROM ".prefixtable('users')." WHERE id = %i;", |
|
| 805 | 805 | $session->get('user-id') |
| 806 | 806 | )['pw']; |
| 807 | 807 | |
@@ -853,7 +853,7 @@ discard block |
||
| 853 | 853 | * @param array $SETTINGS |
| 854 | 854 | * @return string |
| 855 | 855 | */ |
| 856 | -function systemHandler(string $post_type, array|null|string $dataReceived, array $SETTINGS): string |
|
| 856 | +function systemHandler(string $post_type, array | null | string $dataReceived, array $SETTINGS): string |
|
| 857 | 857 | { |
| 858 | 858 | $session = SessionManager::getSession(); |
| 859 | 859 | switch ($post_type) { |
@@ -954,7 +954,7 @@ discard block |
||
| 954 | 954 | ) |
| 955 | 955 | ); |
| 956 | 956 | |
| 957 | - return '[{"token" : "' . $token . '"}]'; |
|
| 957 | + return '[{"token" : "'.$token.'"}]'; |
|
| 958 | 958 | |
| 959 | 959 | /* |
| 960 | 960 | * Default case |
@@ -970,7 +970,7 @@ discard block |
||
| 970 | 970 | } |
| 971 | 971 | |
| 972 | 972 | |
| 973 | -function utilsHandler(string $post_type, array|null|string $dataReceived, array $SETTINGS): string |
|
| 973 | +function utilsHandler(string $post_type, array | null | string $dataReceived, array $SETTINGS): string |
|
| 974 | 974 | { |
| 975 | 975 | switch ($post_type) { |
| 976 | 976 | /* |
@@ -1039,7 +1039,7 @@ discard block |
||
| 1039 | 1039 | array( |
| 1040 | 1040 | 'error' => false, |
| 1041 | 1041 | 'timestamp' => $session->get('user-session_duration'), |
| 1042 | - 'max_time_to_add' => intdiv((($maximum_session_expiration_time*60) - ((int) $session->get('user-session_duration') - time())), 60), |
|
| 1042 | + 'max_time_to_add' => intdiv((($maximum_session_expiration_time * 60) - ((int) $session->get('user-session_duration') - time())), 60), |
|
| 1043 | 1043 | 'max_session_duration' => $maximum_session_expiration_time, |
| 1044 | 1044 | ), |
| 1045 | 1045 | 'encode' |
@@ -1091,7 +1091,7 @@ discard block |
||
| 1091 | 1091 | // get number of items |
| 1092 | 1092 | DB::queryFirstRow( |
| 1093 | 1093 | 'SELECT increment_id |
| 1094 | - FROM ' . prefixTable('sharekeys_items') . |
|
| 1094 | + FROM ' . prefixTable('sharekeys_items'). |
|
| 1095 | 1095 | ' WHERE user_id = %i', |
| 1096 | 1096 | $userId |
| 1097 | 1097 | ); |
@@ -1146,7 +1146,7 @@ discard block |
||
| 1146 | 1146 | // check if expected security level is reached |
| 1147 | 1147 | $dataUser = DB::queryFirstRow( |
| 1148 | 1148 | 'SELECT * |
| 1149 | - FROM ' . prefixTable('users') . ' WHERE id = %i', |
|
| 1149 | + FROM ' . prefixTable('users').' WHERE id = %i', |
|
| 1150 | 1150 | $post_user_id |
| 1151 | 1151 | ); |
| 1152 | 1152 | |
@@ -1167,8 +1167,8 @@ discard block |
||
| 1167 | 1167 | if (empty($dataUser['fonction_id']) === false) { |
| 1168 | 1168 | $data = DB::queryFirstRow( |
| 1169 | 1169 | 'SELECT complexity |
| 1170 | - FROM ' . prefixTable('roles_title') . ' |
|
| 1171 | - WHERE id IN (' . $dataUser['fonction_id'] . ') |
|
| 1170 | + FROM ' . prefixTable('roles_title').' |
|
| 1171 | + WHERE id IN (' . $dataUser['fonction_id'].') |
|
| 1172 | 1172 | ORDER BY complexity DESC' |
| 1173 | 1173 | ); |
| 1174 | 1174 | } else { |
@@ -1181,8 +1181,8 @@ discard block |
||
| 1181 | 1181 | return prepareExchangedData( |
| 1182 | 1182 | array( |
| 1183 | 1183 | 'error' => true, |
| 1184 | - 'message' => '<div style="margin:10px 0 10px 15px;">' . $lang->get('complexity_level_not_reached') . '.<br>' . |
|
| 1185 | - $lang->get('expected_complexity_level') . ': <b>' . TP_PW_COMPLEXITY[$data['complexity']][1] . '</b></div>', |
|
| 1184 | + 'message' => '<div style="margin:10px 0 10px 15px;">'.$lang->get('complexity_level_not_reached').'.<br>'. |
|
| 1185 | + $lang->get('expected_complexity_level').': <b>'.TP_PW_COMPLEXITY[$data['complexity']][1].'</b></div>', |
|
| 1186 | 1186 | ), |
| 1187 | 1187 | 'encode' |
| 1188 | 1188 | ); |
@@ -1286,14 +1286,14 @@ discard block |
||
| 1286 | 1286 | // Get data about user |
| 1287 | 1287 | $dataUser = DB::queryFirstRow( |
| 1288 | 1288 | 'SELECT id, email, pw |
| 1289 | - FROM ' . prefixTable('users') . ' |
|
| 1289 | + FROM ' . prefixTable('users').' |
|
| 1290 | 1290 | WHERE login = %s', |
| 1291 | 1291 | $post_login |
| 1292 | 1292 | ); |
| 1293 | 1293 | } else { |
| 1294 | 1294 | $dataUser = DB::queryFirstRow( |
| 1295 | 1295 | 'SELECT id, login, email, pw |
| 1296 | - FROM ' . prefixTable('users') . ' |
|
| 1296 | + FROM ' . prefixTable('users').' |
|
| 1297 | 1297 | WHERE id = %i', |
| 1298 | 1298 | $post_id |
| 1299 | 1299 | ); |
@@ -1347,7 +1347,7 @@ discard block |
||
| 1347 | 1347 | // Check if token already used |
| 1348 | 1348 | $dataToken = DB::queryFirstRow( |
| 1349 | 1349 | 'SELECT end_timestamp, reason |
| 1350 | - FROM ' . prefixTable('tokens') . ' |
|
| 1350 | + FROM ' . prefixTable('tokens').' |
|
| 1351 | 1351 | WHERE token = %s AND user_id = %i', |
| 1352 | 1352 | $post_token, |
| 1353 | 1353 | $dataUser['id'] |
@@ -1358,11 +1358,11 @@ discard block |
||
| 1358 | 1358 | return prepareExchangedData( |
| 1359 | 1359 | array( |
| 1360 | 1360 | 'error' => true, |
| 1361 | - 'message' => 'TOKEN already used',//$lang->get('no_email_set'), |
|
| 1361 | + 'message' => 'TOKEN already used', //$lang->get('no_email_set'), |
|
| 1362 | 1362 | ), |
| 1363 | 1363 | 'encode' |
| 1364 | 1364 | ); |
| 1365 | - } elseif(DB::count() === 0) { |
|
| 1365 | + } elseif (DB::count() === 0) { |
|
| 1366 | 1366 | // Store token for this action |
| 1367 | 1367 | DB::insert( |
| 1368 | 1368 | prefixTable('tokens'), |
@@ -1424,7 +1424,7 @@ discard block |
||
| 1424 | 1424 | 'email' => $dataUser['email'], |
| 1425 | 1425 | 'email_result' => str_replace( |
| 1426 | 1426 | '#email#', |
| 1427 | - '<b>' . obfuscateEmail($dataUser['email']) . '</b>', |
|
| 1427 | + '<b>'.obfuscateEmail($dataUser['email']).'</b>', |
|
| 1428 | 1428 | addslashes($lang->get('admin_email_result_ok')) |
| 1429 | 1429 | ), |
| 1430 | 1430 | ), |
@@ -1440,7 +1440,7 @@ discard block |
||
| 1440 | 1440 | 'email' => $dataUser['email'], |
| 1441 | 1441 | 'email_result' => str_replace( |
| 1442 | 1442 | '#email#', |
| 1443 | - '<b>' . obfuscateEmail($dataUser['email']) . '</b>', |
|
| 1443 | + '<b>'.obfuscateEmail($dataUser['email']).'</b>', |
|
| 1444 | 1444 | addslashes($lang->get('admin_email_result_ok')) |
| 1445 | 1445 | ), |
| 1446 | 1446 | ), |
@@ -1457,7 +1457,7 @@ discard block |
||
| 1457 | 1457 | |
| 1458 | 1458 | if (isKeyExistingAndEqual('enable_send_email_on_user_login', 1, $SETTINGS) === true) { |
| 1459 | 1459 | $row = DB::queryFirstRow( |
| 1460 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', |
|
| 1460 | + 'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', |
|
| 1461 | 1461 | 'cron', |
| 1462 | 1462 | 'sending_emails' |
| 1463 | 1463 | ); |
@@ -1465,7 +1465,7 @@ discard block |
||
| 1465 | 1465 | if ((int) (time() - $row['valeur']) >= 300 || (int) $row['valeur'] === 0) { |
| 1466 | 1466 | $rows = DB::query( |
| 1467 | 1467 | 'SELECT * |
| 1468 | - FROM ' . prefixTable('emails') . |
|
| 1468 | + FROM ' . prefixTable('emails'). |
|
| 1469 | 1469 | ' WHERE status != %s', |
| 1470 | 1470 | 'sent' |
| 1471 | 1471 | ); |
@@ -1517,8 +1517,8 @@ discard block |
||
| 1517 | 1517 | $arr_html = array(); |
| 1518 | 1518 | $rows = DB::query( |
| 1519 | 1519 | 'SELECT i.id AS id, i.label AS label, i.id_tree AS id_tree, l.date, i.perso AS perso, i.restricted_to AS restricted |
| 1520 | - FROM ' . prefixTable('log_items') . ' AS l |
|
| 1521 | - RIGHT JOIN ' . prefixTable('items') . ' AS i ON (l.id_item = i.id) |
|
| 1520 | + FROM ' . prefixTable('log_items').' AS l |
|
| 1521 | + RIGHT JOIN ' . prefixTable('items').' AS i ON (l.id_item = i.id) |
|
| 1522 | 1522 | WHERE l.action = %s AND l.id_user = %i |
| 1523 | 1523 | ORDER BY l.date DESC |
| 1524 | 1524 | LIMIT 0, 100', |
@@ -1550,7 +1550,7 @@ discard block |
||
| 1550 | 1550 | if (isKeyExistingAndEqual('enable_suggestion', 1, $SETTINGS) === true |
| 1551 | 1551 | && ((int) $session->get('user-admin') === 1 || (int) $session->get('user-manager') === 1) |
| 1552 | 1552 | ) { |
| 1553 | - DB::query('SELECT * FROM ' . prefixTable('suggestion')); |
|
| 1553 | + DB::query('SELECT * FROM '.prefixTable('suggestion')); |
|
| 1554 | 1554 | $nb_suggestions_waiting = DB::count(); |
| 1555 | 1555 | } |
| 1556 | 1556 | |
@@ -1585,13 +1585,13 @@ discard block |
||
| 1585 | 1585 | if ($data === 'stat_languages') { |
| 1586 | 1586 | $tmp = ''; |
| 1587 | 1587 | foreach ($stats_data[$data] as $key => $value) { |
| 1588 | - $tmp .= $tmp === '' ? $key . '-' . $value : ',' . $key . '-' . $value; |
|
| 1588 | + $tmp .= $tmp === '' ? $key.'-'.$value : ','.$key.'-'.$value; |
|
| 1589 | 1589 | } |
| 1590 | 1590 | $statsToSend[$data] = $tmp; |
| 1591 | 1591 | } elseif ($data === 'stat_country') { |
| 1592 | 1592 | $tmp = ''; |
| 1593 | 1593 | foreach ($stats_data[$data] as $key => $value) { |
| 1594 | - $tmp .= $tmp === '' ? $key . '-' . $value : ',' . $key . '-' . $value; |
|
| 1594 | + $tmp .= $tmp === '' ? $key.'-'.$value : ','.$key.'-'.$value; |
|
| 1595 | 1595 | } |
| 1596 | 1596 | $statsToSend[$data] = $tmp; |
| 1597 | 1597 | } else { |
@@ -1678,7 +1678,7 @@ discard block |
||
| 1678 | 1678 | $url_found = $value; |
| 1679 | 1679 | if (empty($url_found) === false) { |
| 1680 | 1680 | $tmp = parse_url($url_found); |
| 1681 | - $anonym_url = $tmp['scheme'] . '://<anonym_url>' . (isset($tmp['path']) === true ? $tmp['path'] : ''); |
|
| 1681 | + $anonym_url = $tmp['scheme'].'://<anonym_url>'.(isset($tmp['path']) === true ? $tmp['path'] : ''); |
|
| 1682 | 1682 | $value = $anonym_url; |
| 1683 | 1683 | } else { |
| 1684 | 1684 | $value = ''; |
@@ -1708,7 +1708,7 @@ discard block |
||
| 1708 | 1708 | $teampass_errors = ''; |
| 1709 | 1709 | $rows = DB::query( |
| 1710 | 1710 | 'SELECT label, date AS error_date |
| 1711 | - FROM ' . prefixTable('log_system') . " |
|
| 1711 | + FROM ' . prefixTable('log_system')." |
|
| 1712 | 1712 | WHERE `type` LIKE 'error' |
| 1713 | 1713 | ORDER BY `date` DESC |
| 1714 | 1714 | LIMIT 0, 10" |
@@ -1716,9 +1716,9 @@ discard block |
||
| 1716 | 1716 | if (DB::count() > 0) { |
| 1717 | 1717 | foreach ($rows as $record) { |
| 1718 | 1718 | if (empty($teampass_errors) === true) { |
| 1719 | - $teampass_errors = ' * ' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['error_date']) . ' - ' . $record['label']; |
|
| 1719 | + $teampass_errors = ' * '.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['error_date']).' - '.$record['label']; |
|
| 1720 | 1720 | } else { |
| 1721 | - $teampass_errors .= ' * ' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['error_date']) . ' - ' . $record['label']; |
|
| 1721 | + $teampass_errors .= ' * '.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['error_date']).' - '.$record['label']; |
|
| 1722 | 1722 | } |
| 1723 | 1723 | } |
| 1724 | 1724 | } |
@@ -1730,7 +1730,7 @@ discard block |
||
| 1730 | 1730 | |
| 1731 | 1731 | // Now prepare text |
| 1732 | 1732 | $txt = '### Page on which it happened |
| 1733 | -' . $data['current_page'] . ' |
|
| 1733 | +' . $data['current_page'].' |
|
| 1734 | 1734 | |
| 1735 | 1735 | ### Steps to reproduce |
| 1736 | 1736 | 1. |
@@ -1745,39 +1745,39 @@ discard block |
||
| 1745 | 1745 | Tell us what happens instead |
| 1746 | 1746 | |
| 1747 | 1747 | ### Server configuration |
| 1748 | -**Operating system**: ' . php_uname() . ' |
|
| 1748 | +**Operating system**: ' . php_uname().' |
|
| 1749 | 1749 | |
| 1750 | -**Web server:** ' . $_SERVER['SERVER_SOFTWARE'] . ' |
|
| 1750 | +**Web server:** ' . $_SERVER['SERVER_SOFTWARE'].' |
|
| 1751 | 1751 | |
| 1752 | -**Database:** ' . ($link === false ? $lang->get('undefined') : mysqli_get_server_info($link)) . ' |
|
| 1752 | +**Database:** ' . ($link === false ? $lang->get('undefined') : mysqli_get_server_info($link)).' |
|
| 1753 | 1753 | |
| 1754 | -**PHP version:** ' . PHP_VERSION . ' |
|
| 1754 | +**PHP version:** ' . PHP_VERSION.' |
|
| 1755 | 1755 | |
| 1756 | -**Teampass version:** ' . TP_VERSION . '.' . TP_VERSION_MINOR . ' |
|
| 1756 | +**Teampass version:** ' . TP_VERSION.'.'.TP_VERSION_MINOR.' |
|
| 1757 | 1757 | |
| 1758 | 1758 | **Teampass configuration variables:** |
| 1759 | 1759 | ``` |
| 1760 | -' . $list_of_options . ' |
|
| 1760 | +' . $list_of_options.' |
|
| 1761 | 1761 | ``` |
| 1762 | 1762 | |
| 1763 | 1763 | **Updated from an older Teampass or fresh install:** |
| 1764 | 1764 | |
| 1765 | 1765 | ### Client configuration |
| 1766 | 1766 | |
| 1767 | -**Browser:** ' . $data['browser_name'] . ' - ' . $data['browser_version'] . ' |
|
| 1767 | +**Browser:** ' . $data['browser_name'].' - '.$data['browser_version'].' |
|
| 1768 | 1768 | |
| 1769 | -**Operating system:** ' . $data['os'] . ' - ' . $data['os_archi'] . 'bits |
|
| 1769 | +**Operating system:** ' . $data['os'].' - '.$data['os_archi'].'bits |
|
| 1770 | 1770 | |
| 1771 | 1771 | ### Logs |
| 1772 | 1772 | |
| 1773 | 1773 | #### Web server error log |
| 1774 | 1774 | ``` |
| 1775 | -' . $err['message'] . ' - ' . $err['file'] . ' (' . $err['line'] . ') |
|
| 1775 | +' . $err['message'].' - '.$err['file'].' ('.$err['line'].') |
|
| 1776 | 1776 | ``` |
| 1777 | 1777 | |
| 1778 | 1778 | #### Teampass 10 last system errors |
| 1779 | 1779 | ``` |
| 1780 | -' . $teampass_errors . ' |
|
| 1780 | +' . $teampass_errors.' |
|
| 1781 | 1781 | ``` |
| 1782 | 1782 | |
| 1783 | 1783 | #### Log from the web-browser developer console (CTRL + SHIFT + i) |
@@ -1819,7 +1819,7 @@ discard block |
||
| 1819 | 1819 | // Check if user exists |
| 1820 | 1820 | $userInfo = DB::queryFirstRow( |
| 1821 | 1821 | 'SELECT public_key, private_key, pw, auth_type |
| 1822 | - FROM ' . prefixTable('users') . ' |
|
| 1822 | + FROM ' . prefixTable('users').' |
|
| 1823 | 1823 | WHERE id = %i', |
| 1824 | 1824 | $post_user_id |
| 1825 | 1825 | ); |
@@ -1828,9 +1828,9 @@ discard block |
||
| 1828 | 1828 | // Get one item |
| 1829 | 1829 | $currentUserKey = DB::queryFirstRow( |
| 1830 | 1830 | 'SELECT object_id, share_key, increment_id |
| 1831 | - FROM ' . prefixTable('sharekeys_items') . ' AS si |
|
| 1832 | - INNER JOIN ' . prefixTable('items') . ' AS i ON (i.id = si.object_id) |
|
| 1833 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS nt ON (i.id_tree = nt.id) |
|
| 1831 | + FROM ' . prefixTable('sharekeys_items').' AS si |
|
| 1832 | + INNER JOIN ' . prefixTable('items').' AS i ON (i.id = si.object_id) |
|
| 1833 | + INNER JOIN ' . prefixTable('nested_tree').' AS nt ON (i.id_tree = nt.id) |
|
| 1834 | 1834 | WHERE user_id = %i AND nt.personal_folder = %i', |
| 1835 | 1835 | $post_user_id, |
| 1836 | 1836 | 0 |
@@ -1949,7 +1949,7 @@ discard block |
||
| 1949 | 1949 | // Get user info |
| 1950 | 1950 | $userData = DB::queryFirstRow( |
| 1951 | 1951 | 'SELECT private_key |
| 1952 | - FROM ' . prefixTable('users') . ' |
|
| 1952 | + FROM ' . prefixTable('users').' |
|
| 1953 | 1953 | WHERE id = %i', |
| 1954 | 1954 | $post_user_id |
| 1955 | 1955 | ); |
@@ -2041,7 +2041,7 @@ discard block |
||
| 2041 | 2041 | // Get user info |
| 2042 | 2042 | $userData = DB::queryFirstRow( |
| 2043 | 2043 | 'SELECT email, auth_type, login |
| 2044 | - FROM ' . prefixTable('users') . ' |
|
| 2044 | + FROM ' . prefixTable('users').' |
|
| 2045 | 2045 | WHERE id = %i', |
| 2046 | 2046 | $post_user_id |
| 2047 | 2047 | ); |
@@ -2139,7 +2139,7 @@ discard block |
||
| 2139 | 2139 | // Get user info |
| 2140 | 2140 | $userData = DB::queryFirstRow( |
| 2141 | 2141 | 'SELECT email, auth_type, login |
| 2142 | - FROM ' . prefixTable('users') . ' |
|
| 2142 | + FROM ' . prefixTable('users').' |
|
| 2143 | 2143 | WHERE id = %i', |
| 2144 | 2144 | $userId |
| 2145 | 2145 | ); |
@@ -2198,7 +2198,7 @@ discard block |
||
| 2198 | 2198 | // Check if user exists |
| 2199 | 2199 | DB::queryFirstRow( |
| 2200 | 2200 | 'SELECT * |
| 2201 | - FROM ' . prefixTable('users') . ' |
|
| 2201 | + FROM ' . prefixTable('users').' |
|
| 2202 | 2202 | WHERE id = %i', |
| 2203 | 2203 | $post_user_id |
| 2204 | 2204 | ); |
@@ -2268,7 +2268,7 @@ discard block |
||
| 2268 | 2268 | // Check if user exists |
| 2269 | 2269 | $userInfo = DB::queryFirstRow( |
| 2270 | 2270 | 'SELECT public_key |
| 2271 | - FROM ' . prefixTable('users') . ' |
|
| 2271 | + FROM ' . prefixTable('users').' |
|
| 2272 | 2272 | WHERE id = %i', |
| 2273 | 2273 | $post_user_id |
| 2274 | 2274 | ); |
@@ -2416,15 +2416,15 @@ discard block |
||
| 2416 | 2416 | // Loop on items |
| 2417 | 2417 | $rows = DB::query( |
| 2418 | 2418 | 'SELECT id, pw |
| 2419 | - FROM ' . prefixTable('items') . ' |
|
| 2419 | + FROM ' . prefixTable('items').' |
|
| 2420 | 2420 | WHERE perso = 0 |
| 2421 | - LIMIT ' . $post_start . ', ' . $post_length |
|
| 2421 | + LIMIT ' . $post_start.', '.$post_length |
|
| 2422 | 2422 | ); |
| 2423 | 2423 | foreach ($rows as $record) { |
| 2424 | 2424 | // Get itemKey from current user |
| 2425 | 2425 | $currentUserKey = DB::queryFirstRow( |
| 2426 | 2426 | 'SELECT share_key, increment_id |
| 2427 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2427 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2428 | 2428 | WHERE object_id = %i AND user_id = %i', |
| 2429 | 2429 | $record['id'], |
| 2430 | 2430 | $session->get('user-id') |
@@ -2454,7 +2454,7 @@ discard block |
||
| 2454 | 2454 | if ((int) $post_user_id !== (int) $session->get('user-id')) { |
| 2455 | 2455 | $currentUserKey = DB::queryFirstRow( |
| 2456 | 2456 | 'SELECT increment_id |
| 2457 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2457 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2458 | 2458 | WHERE object_id = %i AND user_id = %i', |
| 2459 | 2459 | $record['id'], |
| 2460 | 2460 | $post_user_id |
@@ -2485,7 +2485,7 @@ discard block |
||
| 2485 | 2485 | // SHould we change step? |
| 2486 | 2486 | DB::query( |
| 2487 | 2487 | 'SELECT * |
| 2488 | - FROM ' . prefixTable('items') . ' |
|
| 2488 | + FROM ' . prefixTable('items').' |
|
| 2489 | 2489 | WHERE perso = 0' |
| 2490 | 2490 | ); |
| 2491 | 2491 | |
@@ -2510,15 +2510,15 @@ discard block |
||
| 2510 | 2510 | // Loop on logs |
| 2511 | 2511 | $rows = DB::query( |
| 2512 | 2512 | 'SELECT increment_id |
| 2513 | - FROM ' . prefixTable('log_items') . ' |
|
| 2513 | + FROM ' . prefixTable('log_items').' |
|
| 2514 | 2514 | WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes" |
| 2515 | - LIMIT ' . $post_start . ', ' . $post_length |
|
| 2515 | + LIMIT ' . $post_start.', '.$post_length |
|
| 2516 | 2516 | ); |
| 2517 | 2517 | foreach ($rows as $record) { |
| 2518 | 2518 | // Get itemKey from current user |
| 2519 | 2519 | $currentUserKey = DB::queryFirstRow( |
| 2520 | 2520 | 'SELECT share_key |
| 2521 | - FROM ' . prefixTable('sharekeys_logs') . ' |
|
| 2521 | + FROM ' . prefixTable('sharekeys_logs').' |
|
| 2522 | 2522 | WHERE object_id = %i AND user_id = %i', |
| 2523 | 2523 | $record['increment_id'], |
| 2524 | 2524 | $session->get('user-id') |
@@ -2548,7 +2548,7 @@ discard block |
||
| 2548 | 2548 | if ((int) $post_user_id !== (int) $session->get('user-id')) { |
| 2549 | 2549 | $currentUserKey = DB::queryFirstRow( |
| 2550 | 2550 | 'SELECT increment_id |
| 2551 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2551 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2552 | 2552 | WHERE object_id = %i AND user_id = %i', |
| 2553 | 2553 | $record['id'], |
| 2554 | 2554 | $post_user_id |
@@ -2570,7 +2570,7 @@ discard block |
||
| 2570 | 2570 | // SHould we change step? |
| 2571 | 2571 | DB::query( |
| 2572 | 2572 | 'SELECT increment_id |
| 2573 | - FROM ' . prefixTable('log_items') . ' |
|
| 2573 | + FROM ' . prefixTable('log_items').' |
|
| 2574 | 2574 | WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"' |
| 2575 | 2575 | ); |
| 2576 | 2576 | |
@@ -2595,15 +2595,15 @@ discard block |
||
| 2595 | 2595 | // Loop on fields |
| 2596 | 2596 | $rows = DB::query( |
| 2597 | 2597 | 'SELECT id |
| 2598 | - FROM ' . prefixTable('categories_items') . ' |
|
| 2598 | + FROM ' . prefixTable('categories_items').' |
|
| 2599 | 2599 | WHERE encryption_type = "teampass_aes" |
| 2600 | - LIMIT ' . $post_start . ', ' . $post_length |
|
| 2600 | + LIMIT ' . $post_start.', '.$post_length |
|
| 2601 | 2601 | ); |
| 2602 | 2602 | foreach ($rows as $record) { |
| 2603 | 2603 | // Get itemKey from current user |
| 2604 | 2604 | $currentUserKey = DB::queryFirstRow( |
| 2605 | 2605 | 'SELECT share_key |
| 2606 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 2606 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 2607 | 2607 | WHERE object_id = %i AND user_id = %i', |
| 2608 | 2608 | $record['id'], |
| 2609 | 2609 | $session->get('user-id') |
@@ -2633,7 +2633,7 @@ discard block |
||
| 2633 | 2633 | if ((int) $post_user_id !== (int) $session->get('user-id')) { |
| 2634 | 2634 | $currentUserKey = DB::queryFirstRow( |
| 2635 | 2635 | 'SELECT increment_id |
| 2636 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2636 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2637 | 2637 | WHERE object_id = %i AND user_id = %i', |
| 2638 | 2638 | $record['id'], |
| 2639 | 2639 | $post_user_id |
@@ -2655,7 +2655,7 @@ discard block |
||
| 2655 | 2655 | // SHould we change step? |
| 2656 | 2656 | DB::query( |
| 2657 | 2657 | 'SELECT * |
| 2658 | - FROM ' . prefixTable('categories_items') . ' |
|
| 2658 | + FROM ' . prefixTable('categories_items').' |
|
| 2659 | 2659 | WHERE encryption_type = "teampass_aes"' |
| 2660 | 2660 | ); |
| 2661 | 2661 | |
@@ -2680,14 +2680,14 @@ discard block |
||
| 2680 | 2680 | // Loop on suggestions |
| 2681 | 2681 | $rows = DB::query( |
| 2682 | 2682 | 'SELECT id |
| 2683 | - FROM ' . prefixTable('suggestion') . ' |
|
| 2684 | - LIMIT ' . $post_start . ', ' . $post_length |
|
| 2683 | + FROM ' . prefixTable('suggestion').' |
|
| 2684 | + LIMIT ' . $post_start.', '.$post_length |
|
| 2685 | 2685 | ); |
| 2686 | 2686 | foreach ($rows as $record) { |
| 2687 | 2687 | // Get itemKey from current user |
| 2688 | 2688 | $currentUserKey = DB::queryFirstRow( |
| 2689 | 2689 | 'SELECT share_key |
| 2690 | - FROM ' . prefixTable('sharekeys_suggestions') . ' |
|
| 2690 | + FROM ' . prefixTable('sharekeys_suggestions').' |
|
| 2691 | 2691 | WHERE object_id = %i AND user_id = %i', |
| 2692 | 2692 | $record['id'], |
| 2693 | 2693 | $session->get('user-id') |
@@ -2717,7 +2717,7 @@ discard block |
||
| 2717 | 2717 | if ((int) $post_user_id !== (int) $session->get('user-id')) { |
| 2718 | 2718 | $currentUserKey = DB::queryFirstRow( |
| 2719 | 2719 | 'SELECT increment_id |
| 2720 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2720 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2721 | 2721 | WHERE object_id = %i AND user_id = %i', |
| 2722 | 2722 | $record['id'], |
| 2723 | 2723 | $post_user_id |
@@ -2763,15 +2763,15 @@ discard block |
||
| 2763 | 2763 | // Loop on files |
| 2764 | 2764 | $rows = DB::query( |
| 2765 | 2765 | 'SELECT id |
| 2766 | - FROM ' . prefixTable('files') . ' |
|
| 2767 | - WHERE status = "' . TP_ENCRYPTION_NAME . '" |
|
| 2768 | - LIMIT ' . $post_start . ', ' . $post_length |
|
| 2766 | + FROM ' . prefixTable('files').' |
|
| 2767 | + WHERE status = "' . TP_ENCRYPTION_NAME.'" |
|
| 2768 | + LIMIT ' . $post_start.', '.$post_length |
|
| 2769 | 2769 | ); //aes_encryption |
| 2770 | 2770 | foreach ($rows as $record) { |
| 2771 | 2771 | // Get itemKey from current user |
| 2772 | 2772 | $currentUserKey = DB::queryFirstRow( |
| 2773 | 2773 | 'SELECT share_key |
| 2774 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
| 2774 | + FROM ' . prefixTable('sharekeys_files').' |
|
| 2775 | 2775 | WHERE object_id = %i AND user_id = %i', |
| 2776 | 2776 | $record['id'], |
| 2777 | 2777 | $session->get('user-id') |
@@ -2801,7 +2801,7 @@ discard block |
||
| 2801 | 2801 | if ((int) $post_user_id !== (int) $session->get('user-id')) { |
| 2802 | 2802 | $currentUserKey = DB::queryFirstRow( |
| 2803 | 2803 | 'SELECT increment_id |
| 2804 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2804 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2805 | 2805 | WHERE object_id = %i AND user_id = %i', |
| 2806 | 2806 | $record['id'], |
| 2807 | 2807 | $post_user_id |
@@ -2823,8 +2823,8 @@ discard block |
||
| 2823 | 2823 | // SHould we change step? |
| 2824 | 2824 | DB::query( |
| 2825 | 2825 | 'SELECT * |
| 2826 | - FROM ' . prefixTable('files') . ' |
|
| 2827 | - WHERE status = "' . TP_ENCRYPTION_NAME . '"' |
|
| 2826 | + FROM ' . prefixTable('files').' |
|
| 2827 | + WHERE status = "' . TP_ENCRYPTION_NAME.'"' |
|
| 2828 | 2828 | ); |
| 2829 | 2829 | |
| 2830 | 2830 | $next_start = (int) $post_start + (int) $post_length; |
@@ -2857,9 +2857,9 @@ discard block |
||
| 2857 | 2857 | if (count($session->get('user-personal_folders')) > 0) { |
| 2858 | 2858 | $rows = DB::query( |
| 2859 | 2859 | 'SELECT id, pw |
| 2860 | - FROM ' . prefixTable('items') . ' |
|
| 2860 | + FROM ' . prefixTable('items').' |
|
| 2861 | 2861 | WHERE perso = 1 AND id_tree IN %ls AND encryption_type = %s |
| 2862 | - LIMIT ' . $post_start . ', ' . $post_length, |
|
| 2862 | + LIMIT ' . $post_start.', '.$post_length, |
|
| 2863 | 2863 | $session->get('user-personal_folders'), |
| 2864 | 2864 | "defuse" |
| 2865 | 2865 | ); |
@@ -2867,7 +2867,7 @@ discard block |
||
| 2867 | 2867 | // Get itemKey from current user |
| 2868 | 2868 | $currentUserKey = DB::queryFirstRow( |
| 2869 | 2869 | 'SELECT share_key, increment_id |
| 2870 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2870 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2871 | 2871 | WHERE object_id = %i AND user_id = %i', |
| 2872 | 2872 | $record['id'], |
| 2873 | 2873 | $session->get('user-id') |
@@ -2892,7 +2892,7 @@ discard block |
||
| 2892 | 2892 | if ((int) $post_user_id !== (int) $session->get('user-id')) { |
| 2893 | 2893 | $currentUserKey = DB::queryFirstRow( |
| 2894 | 2894 | 'SELECT increment_id |
| 2895 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2895 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2896 | 2896 | WHERE object_id = %i AND user_id = %i', |
| 2897 | 2897 | $record['id'], |
| 2898 | 2898 | $post_user_id |
@@ -2915,7 +2915,7 @@ discard block |
||
| 2915 | 2915 | // SHould we change step? |
| 2916 | 2916 | DB::query( |
| 2917 | 2917 | 'SELECT * |
| 2918 | - FROM ' . prefixTable('items') . ' |
|
| 2918 | + FROM ' . prefixTable('items').' |
|
| 2919 | 2919 | WHERE perso = 0' |
| 2920 | 2920 | ); |
| 2921 | 2921 | |
@@ -2943,7 +2943,7 @@ discard block |
||
| 2943 | 2943 | // Check if user exists |
| 2944 | 2944 | $userInfo = DB::queryFirstRow( |
| 2945 | 2945 | 'SELECT public_key, encrypted_psk |
| 2946 | - FROM ' . prefixTable('users') . ' |
|
| 2946 | + FROM ' . prefixTable('users').' |
|
| 2947 | 2947 | WHERE id = %i', |
| 2948 | 2948 | $post_user_id |
| 2949 | 2949 | ); |
@@ -2969,7 +2969,7 @@ discard block |
||
| 2969 | 2969 | if ($post_counterItemsToTreat === -1) { |
| 2970 | 2970 | DB::query( |
| 2971 | 2971 | 'SELECT id |
| 2972 | - FROM ' . prefixTable('items') . ' |
|
| 2972 | + FROM ' . prefixTable('items').' |
|
| 2973 | 2973 | WHERE perso = 1 AND id_tree IN %ls AND encryption_type != %s', |
| 2974 | 2974 | $session->get('user-personal_folders'), |
| 2975 | 2975 | 'teampass_aes' |
@@ -2982,7 +2982,7 @@ discard block |
||
| 2982 | 2982 | // Loop on persoanl items |
| 2983 | 2983 | $rows = DB::query( |
| 2984 | 2984 | 'SELECT id, pw |
| 2985 | - FROM ' . prefixTable('items') . ' |
|
| 2985 | + FROM ' . prefixTable('items').' |
|
| 2986 | 2986 | WHERE perso = 1 AND id_tree IN %ls AND encryption_type != %s |
| 2987 | 2987 | LIMIT ' . $post_length, |
| 2988 | 2988 | $session->get('user-personal_folders'), |
@@ -3024,7 +3024,7 @@ discard block |
||
| 3024 | 3024 | // Loop on files |
| 3025 | 3025 | $rows = DB::query( |
| 3026 | 3026 | 'SELECT id, file |
| 3027 | - FROM ' . prefixTable('files') . ' |
|
| 3027 | + FROM ' . prefixTable('files').' |
|
| 3028 | 3028 | WHERE status != %s |
| 3029 | 3029 | AND id_item = %i', |
| 3030 | 3030 | TP_ENCRYPTION_NAME, |
@@ -3035,13 +3035,13 @@ discard block |
||
| 3035 | 3035 | // Now decrypt the file |
| 3036 | 3036 | prepareFileWithDefuse( |
| 3037 | 3037 | 'decrypt', |
| 3038 | - $SETTINGS['path_to_upload_folder'] . '/' . $record2['file'], |
|
| 3039 | - $SETTINGS['path_to_upload_folder'] . '/' . $record2['file'] . '.delete', |
|
| 3038 | + $SETTINGS['path_to_upload_folder'].'/'.$record2['file'], |
|
| 3039 | + $SETTINGS['path_to_upload_folder'].'/'.$record2['file'].'.delete', |
|
| 3040 | 3040 | $post_user_psk |
| 3041 | 3041 | ); |
| 3042 | 3042 | |
| 3043 | 3043 | // Encrypt the file |
| 3044 | - $encryptedFile = encryptFile($record2['file'] . '.delete', $SETTINGS['path_to_upload_folder']); |
|
| 3044 | + $encryptedFile = encryptFile($record2['file'].'.delete', $SETTINGS['path_to_upload_folder']); |
|
| 3045 | 3045 | |
| 3046 | 3046 | DB::update( |
| 3047 | 3047 | prefixTable('files'), |
@@ -3062,7 +3062,7 @@ discard block |
||
| 3062 | 3062 | ); |
| 3063 | 3063 | |
| 3064 | 3064 | // Unlink original file |
| 3065 | - unlink($SETTINGS['path_to_upload_folder'] . '/' . $record2['file']); |
|
| 3065 | + unlink($SETTINGS['path_to_upload_folder'].'/'.$record2['file']); |
|
| 3066 | 3066 | } |
| 3067 | 3067 | } |
| 3068 | 3068 | |
@@ -3070,7 +3070,7 @@ discard block |
||
| 3070 | 3070 | $next_start = (int) $post_start + (int) $post_length; |
| 3071 | 3071 | DB::query( |
| 3072 | 3072 | 'SELECT id |
| 3073 | - FROM ' . prefixTable('items') . ' |
|
| 3073 | + FROM ' . prefixTable('items').' |
|
| 3074 | 3074 | WHERE perso = 1 AND id_tree IN %ls AND encryption_type != %s', |
| 3075 | 3075 | $session->get('user-personal_folders'), |
| 3076 | 3076 | 'teampass_aes' |
@@ -3140,7 +3140,7 @@ discard block |
||
| 3140 | 3140 | // Get user info |
| 3141 | 3141 | $userData = DB::queryFirstRow( |
| 3142 | 3142 | 'SELECT special, auth_type, is_ready_for_usage, ongoing_process_id, otp_provided, personal_items_migrated |
| 3143 | - FROM ' . prefixTable('users') . ' |
|
| 3143 | + FROM ' . prefixTable('users').' |
|
| 3144 | 3144 | WHERE id = %i', |
| 3145 | 3145 | $post_user_id |
| 3146 | 3146 | ); |
@@ -3187,7 +3187,7 @@ discard block |
||
| 3187 | 3187 | // Get user info |
| 3188 | 3188 | $userData = DB::queryFirstRow( |
| 3189 | 3189 | 'SELECT auth_type, login, private_key |
| 3190 | - FROM ' . prefixTable('users') . ' |
|
| 3190 | + FROM ' . prefixTable('users').' |
|
| 3191 | 3191 | WHERE id = %i', |
| 3192 | 3192 | $post_user_id |
| 3193 | 3193 | ); |
@@ -3237,7 +3237,7 @@ discard block |
||
| 3237 | 3237 | return prepareExchangedData( |
| 3238 | 3238 | array( |
| 3239 | 3239 | 'error' => false, |
| 3240 | - 'message' => $lang->get('done'),'', |
|
| 3240 | + 'message' => $lang->get('done'), '', |
|
| 3241 | 3241 | ), |
| 3242 | 3242 | 'encode' |
| 3243 | 3243 | ); |
@@ -3286,7 +3286,7 @@ discard block |
||
| 3286 | 3286 | // Get user info |
| 3287 | 3287 | $userData = DB::queryFirstRow( |
| 3288 | 3288 | 'SELECT u.auth_type, u.login, u.private_key, u.special |
| 3289 | - FROM ' . prefixTable('users') . ' AS u |
|
| 3289 | + FROM ' . prefixTable('users').' AS u |
|
| 3290 | 3290 | WHERE u.id = %i', |
| 3291 | 3291 | $post_user_id |
| 3292 | 3292 | ); |
@@ -3322,7 +3322,7 @@ discard block |
||
| 3322 | 3322 | return prepareExchangedData( |
| 3323 | 3323 | array( |
| 3324 | 3324 | 'error' => false, |
| 3325 | - 'message' => $lang->get('done'),'', |
|
| 3325 | + 'message' => $lang->get('done'), '', |
|
| 3326 | 3326 | ), |
| 3327 | 3327 | 'encode' |
| 3328 | 3328 | ); |
@@ -3343,8 +3343,8 @@ discard block |
||
| 3343 | 3343 | // Get one itemKey from current user |
| 3344 | 3344 | $currentUserKey = DB::queryFirstRow( |
| 3345 | 3345 | 'SELECT ski.share_key, ski.increment_id, l.id_user |
| 3346 | - FROM ' . prefixTable('sharekeys_items') . ' AS ski |
|
| 3347 | - INNER JOIN ' . prefixTable('log_items') . ' AS l ON ski.object_id = l.id_item |
|
| 3346 | + FROM ' . prefixTable('sharekeys_items').' AS ski |
|
| 3347 | + INNER JOIN ' . prefixTable('log_items').' AS l ON ski.object_id = l.id_item |
|
| 3348 | 3348 | WHERE ski.user_id = %i |
| 3349 | 3349 | ORDER BY RAND() |
| 3350 | 3350 | LIMIT 1', |
@@ -3411,8 +3411,8 @@ discard block |
||
| 3411 | 3411 | 'process_type' => 'create_user_keys', |
| 3412 | 3412 | 'arguments' => json_encode([ |
| 3413 | 3413 | 'new_user_id' => (int) $post_user_id, |
| 3414 | - 'new_user_pwd' => cryption($post_previous_pwd, '','encrypt')['string'], |
|
| 3415 | - 'new_user_private_key' => cryption($validPreviousKey['private_key'], '','encrypt')['string'], |
|
| 3414 | + 'new_user_pwd' => cryption($post_previous_pwd, '', 'encrypt')['string'], |
|
| 3415 | + 'new_user_private_key' => cryption($validPreviousKey['private_key'], '', 'encrypt')['string'], |
|
| 3416 | 3416 | 'send_email' => 0, |
| 3417 | 3417 | 'otp_provided_new_value' => 0, |
| 3418 | 3418 | 'user_self_change' => 1, |
@@ -3481,7 +3481,7 @@ discard block |
||
| 3481 | 3481 | id, |
| 3482 | 3482 | private_key, |
| 3483 | 3483 | created_at |
| 3484 | - FROM " . prefixTable('user_private_keys') . " |
|
| 3484 | + FROM " . prefixTable('user_private_keys')." |
|
| 3485 | 3485 | WHERE user_id = %i |
| 3486 | 3486 | ORDER BY created_at DESC, id DESC", |
| 3487 | 3487 | $userId |
@@ -3503,9 +3503,9 @@ discard block |
||
| 3503 | 3503 | // Select one personal item share_key to test decryption |
| 3504 | 3504 | $currentUserItemKey = DB::queryFirstRow( |
| 3505 | 3505 | 'SELECT si.share_key, si.increment_id, l.id_user, i.perso |
| 3506 | - FROM ' . prefixTable('sharekeys_items') . ' AS si |
|
| 3507 | - INNER JOIN ' . prefixTable('log_items') . ' AS l ON si.object_id = l.id_item |
|
| 3508 | - INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = l.id_item |
|
| 3506 | + FROM ' . prefixTable('sharekeys_items').' AS si |
|
| 3507 | + INNER JOIN ' . prefixTable('log_items').' AS l ON si.object_id = l.id_item |
|
| 3508 | + INNER JOIN ' . prefixTable('items').' AS i ON i.id = l.id_item |
|
| 3509 | 3509 | WHERE si.user_id = %i AND i.perso = 1 AND si.share_key != "" |
| 3510 | 3510 | ORDER BY RAND() |
| 3511 | 3511 | LIMIT 1', |
@@ -3556,7 +3556,7 @@ discard block |
||
| 3556 | 3556 | $session->get('user-id') |
| 3557 | 3557 | ); |
| 3558 | 3558 | // Return data |
| 3559 | - return '[{"new_value":"' . $session->get('user-session_duration') . '"}]'; |
|
| 3559 | + return '[{"new_value":"'.$session->get('user-session_duration').'"}]'; |
|
| 3560 | 3560 | } |
| 3561 | 3561 | |
| 3562 | 3562 | return '[{"new_value":"expired"}]'; |
@@ -3606,8 +3606,8 @@ discard block |
||
| 3606 | 3606 | { |
| 3607 | 3607 | $personalItems = DB::query( |
| 3608 | 3608 | 'SELECT i.id, i.pw, s.share_key, s.increment_id |
| 3609 | - FROM ' . prefixTable('items') . ' i |
|
| 3610 | - INNER JOIN ' . prefixTable('sharekeys_items') . ' s ON i.id = s.object_id |
|
| 3609 | + FROM ' . prefixTable('items').' i |
|
| 3610 | + INNER JOIN ' . prefixTable('sharekeys_items').' s ON i.id = s.object_id |
|
| 3611 | 3611 | WHERE i.perso = %i |
| 3612 | 3612 | AND s.user_id = %i', |
| 3613 | 3613 | 1, |
@@ -3662,8 +3662,8 @@ discard block |
||
| 3662 | 3662 | if ($skipPasswordChange === true) { |
| 3663 | 3663 | // Remove all sharekeys for personal items |
| 3664 | 3664 | DB::query( |
| 3665 | - 'UPDATE ' . prefixTable('sharekeys_items') . ' AS ski |
|
| 3666 | - INNER JOIN ' . prefixTable('items') . ' AS i ON ski.object_id = i.id |
|
| 3665 | + 'UPDATE '.prefixTable('sharekeys_items').' AS ski |
|
| 3666 | + INNER JOIN ' . prefixTable('items').' AS i ON ski.object_id = i.id |
|
| 3667 | 3667 | SET ski.share_key = "" |
| 3668 | 3668 | WHERE i.perso = 1 |
| 3669 | 3669 | AND ski.user_id = %i', |
@@ -3672,8 +3672,8 @@ discard block |
||
| 3672 | 3672 | |
| 3673 | 3673 | // Remove all sharekeys for personal files |
| 3674 | 3674 | DB::query( |
| 3675 | - 'UPDATE ' . prefixTable('sharekeys_files') . ' AS skf |
|
| 3676 | - INNER JOIN ' . prefixTable('items') . ' AS i ON skf.object_id = i.id |
|
| 3675 | + 'UPDATE '.prefixTable('sharekeys_files').' AS skf |
|
| 3676 | + INNER JOIN ' . prefixTable('items').' AS i ON skf.object_id = i.id |
|
| 3677 | 3677 | SET skf.share_key = "" |
| 3678 | 3678 | WHERE i.perso = 1 |
| 3679 | 3679 | AND skf.user_id = %i', |
@@ -3682,8 +3682,8 @@ discard block |
||
| 3682 | 3682 | |
| 3683 | 3683 | // Remove all sharekeys for personal fields |
| 3684 | 3684 | DB::query( |
| 3685 | - 'UPDATE ' . prefixTable('sharekeys_fields') . ' AS skf |
|
| 3686 | - INNER JOIN ' . prefixTable('items') . ' AS i ON skf.object_id = i.id |
|
| 3685 | + 'UPDATE '.prefixTable('sharekeys_fields').' AS skf |
|
| 3686 | + INNER JOIN ' . prefixTable('items').' AS i ON skf.object_id = i.id |
|
| 3687 | 3687 | SET skf.share_key = "" |
| 3688 | 3688 | WHERE i.perso = 1 |
| 3689 | 3689 | AND skf.user_id = %i', |
@@ -3727,8 +3727,8 @@ discard block |
||
| 3727 | 3727 | 'process_type' => 'create_user_keys', |
| 3728 | 3728 | 'arguments' => json_encode([ |
| 3729 | 3729 | 'new_user_id' => (int) $userId, |
| 3730 | - 'new_user_pwd' => cryption($userCurrentPwd, '','encrypt')['string'], |
|
| 3731 | - 'new_user_private_key' => cryption($validPreviousKey['private_key'], '','encrypt')['string'], |
|
| 3730 | + 'new_user_pwd' => cryption($userCurrentPwd, '', 'encrypt')['string'], |
|
| 3731 | + 'new_user_private_key' => cryption($validPreviousKey['private_key'], '', 'encrypt')['string'], |
|
| 3732 | 3732 | 'send_email' => 0, |
| 3733 | 3733 | 'otp_provided_new_value' => 0, |
| 3734 | 3734 | 'user_self_change' => 1, |
