nilsteampassnet /
TeamPass
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | |
| 69 | 69 | $processToPerform = DB::queryFirstRow( |
| 70 | 70 | 'SELECT * |
| 71 | - FROM ' . prefixTable('background_tasks') . ' |
|
| 71 | + FROM ' . prefixTable('background_tasks').' |
|
| 72 | 72 | WHERE (finished_at IS NULL OR finished_at = "") AND process_type = %s |
| 73 | 73 | ORDER BY increment_id ASC', |
| 74 | 74 | 'create_user_keys' |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | // Check if subtasks are still running |
| 95 | 95 | // This in order to prevent the script from running multiple times on same objects |
| 96 | 96 | while (DB::queryFirstField( |
| 97 | - 'SELECT COUNT(*) FROM ' . prefixTable('background_subtasks') . ' |
|
| 97 | + 'SELECT COUNT(*) FROM '.prefixTable('background_subtasks').' |
|
| 98 | 98 | WHERE is_in_progress = 1' |
| 99 | 99 | ) > 0) { |
| 100 | 100 | sleep(10); // Wait 10 seconds before continuing |
@@ -127,7 +127,7 @@ discard block |
||
| 127 | 127 | $subTaskParams = json_decode($subTask['task'], true); |
| 128 | 128 | |
| 129 | 129 | if (WIP === true) { |
| 130 | - error_log('Subtask in progress: '.$subTask['increment_id']." (".$taskId.") - "./** @scrutinizer ignore-type */ print_r($subTaskParams,true)); |
|
| 130 | + error_log('Subtask in progress: '.$subTask['increment_id']." (".$taskId.") - "./** @scrutinizer ignore-type */ print_r($subTaskParams, true)); |
|
| 131 | 131 | } |
| 132 | 132 | |
| 133 | 133 | // Build all subtasks if first one |
@@ -136,7 +136,7 @@ discard block |
||
| 136 | 136 | // Get total number of items |
| 137 | 137 | DB::query( |
| 138 | 138 | 'SELECT * |
| 139 | - FROM ' . prefixTable('items') . ' |
|
| 139 | + FROM ' . prefixTable('items').' |
|
| 140 | 140 | '.(isset($taskArgumentsArray['only_personal_items']) === true && $taskArgumentsArray['only_personal_items'] === 1 ? 'WHERE perso = 1' : '') |
| 141 | 141 | ); |
| 142 | 142 | createAllSubTasks($subTaskParams['step'], DB::count(), $subTaskParams['nb'], $taskId); |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | // Get total number of items |
| 146 | 146 | DB::query( |
| 147 | 147 | 'SELECT * |
| 148 | - FROM ' . prefixTable('log_items') . ' |
|
| 148 | + FROM ' . prefixTable('log_items').' |
|
| 149 | 149 | WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"' |
| 150 | 150 | ); |
| 151 | 151 | createAllSubTasks($subTaskParams['step'], DB::count(), $subTaskParams['nb'], $taskId); |
@@ -154,7 +154,7 @@ discard block |
||
| 154 | 154 | // Get total number of items |
| 155 | 155 | DB::query( |
| 156 | 156 | 'SELECT * |
| 157 | - FROM ' . prefixTable('categories_items') . ' |
|
| 157 | + FROM ' . prefixTable('categories_items').' |
|
| 158 | 158 | WHERE encryption_type = "teampass_aes"' |
| 159 | 159 | ); |
| 160 | 160 | createAllSubTasks($subTaskParams['step'], DB::count(), $subTaskParams['nb'], $taskId); |
@@ -171,9 +171,9 @@ discard block |
||
| 171 | 171 | // Get total number of items |
| 172 | 172 | DB::query( |
| 173 | 173 | 'SELECT * |
| 174 | - FROM ' . prefixTable('files') . ' AS f |
|
| 175 | - INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = f.id_item |
|
| 176 | - WHERE f.status = "' . TP_ENCRYPTION_NAME . '"' |
|
| 174 | + FROM ' . prefixTable('files').' AS f |
|
| 175 | + INNER JOIN ' . prefixTable('items').' AS i ON i.id = f.id_item |
|
| 176 | + WHERE f.status = "' . TP_ENCRYPTION_NAME.'"' |
|
| 177 | 177 | ); |
| 178 | 178 | createAllSubTasks($subTaskParams['step'], DB::count(), $subTaskParams['nb'], $taskId); |
| 179 | 179 | } |
@@ -200,7 +200,7 @@ discard block |
||
| 200 | 200 | // Check if subtasks have to be created |
| 201 | 201 | DB::query( |
| 202 | 202 | 'SELECT * |
| 203 | - FROM ' . prefixTable('background_subtasks') . ' |
|
| 203 | + FROM ' . prefixTable('background_subtasks').' |
|
| 204 | 204 | WHERE task_id = %i AND task LIKE %ss', |
| 205 | 205 | $taskId, |
| 206 | 206 | $action |
@@ -228,7 +228,7 @@ discard block |
||
| 228 | 228 | function countActiveSymfonyProcesses() { |
| 229 | 229 | // Count the number of active processes |
| 230 | 230 | return DB::queryFirstField( |
| 231 | - 'SELECT COUNT(*) FROM ' . prefixTable('background_subtasks') . |
|
| 231 | + 'SELECT COUNT(*) FROM '.prefixTable('background_subtasks'). |
|
| 232 | 232 | ' WHERE process_id IS NOT NULL AND finished_at IS NULL' |
| 233 | 233 | ); |
| 234 | 234 | } |
@@ -239,7 +239,7 @@ discard block |
||
| 239 | 239 | function getSubTasks($taskId) { |
| 240 | 240 | $task_to_perform = DB::query( |
| 241 | 241 | 'SELECT * |
| 242 | - FROM ' . prefixTable('background_subtasks') . ' |
|
| 242 | + FROM ' . prefixTable('background_subtasks').' |
|
| 243 | 243 | WHERE task_id = %i AND finished_at IS NULL |
| 244 | 244 | ORDER BY increment_id ASC', |
| 245 | 245 | $taskId |
@@ -288,7 +288,7 @@ discard block |
||
| 288 | 288 | function reloadSubTask($subTaskId) { |
| 289 | 289 | // Retrieve subtask information from the database |
| 290 | 290 | $subTask = DB::queryFirstRow( |
| 291 | - 'SELECT * FROM ' . prefixTable('background_subtasks') . ' WHERE increment_id = %i', |
|
| 291 | + 'SELECT * FROM '.prefixTable('background_subtasks').' WHERE increment_id = %i', |
|
| 292 | 292 | $subTaskId |
| 293 | 293 | ); |
| 294 | 294 | |
@@ -333,7 +333,7 @@ discard block |
||
| 333 | 333 | // Get all processes |
| 334 | 334 | $subtasks = DB::query( |
| 335 | 335 | 'SELECT * |
| 336 | - FROM ' . prefixTable('background_subtasks') . ' |
|
| 336 | + FROM ' . prefixTable('background_subtasks').' |
|
| 337 | 337 | WHERE process_id IS NOT NULL AND finished_at IS NULL' |
| 338 | 338 | ); |
| 339 | 339 | |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | { |
| 73 | 73 | global $SETTINGS; |
| 74 | 74 | // Load expected files |
| 75 | - require_once __DIR__. '/../sources/main.functions.php'; |
|
| 75 | + require_once __DIR__.'/../sources/main.functions.php'; |
|
| 76 | 76 | |
| 77 | 77 | // $SETTINGS is set then read folder |
| 78 | 78 | if (is_dir($SETTINGS['path_to_files_folder']) === true) { |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | //delete file FILES |
| 82 | 82 | while (false !== ($f = readdir($dir))) { |
| 83 | 83 | if ($f !== '.' && $f !== '..' && $f !== '.htaccess') { |
| 84 | - $filePath = $SETTINGS['path_to_files_folder'] . '/' . $f; |
|
| 84 | + $filePath = $SETTINGS['path_to_files_folder'].'/'.$f; |
|
| 85 | 85 | if (file_exists($filePath) && ((time() - filectime($filePath)) > 604800)) { |
| 86 | 86 | fileDelete($filePath, $SETTINGS); |
| 87 | 87 | } |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | while (false !== ($f = readdir($dir))) { |
| 103 | 103 | if ($f !== '.' && $f !== '..') { |
| 104 | 104 | if (strpos($f, '_delete.') > 0) { |
| 105 | - fileDelete($SETTINGS['path_to_upload_folder'] . '/' . $f, $SETTINGS); |
|
| 105 | + fileDelete($SETTINGS['path_to_upload_folder'].'/'.$f, $SETTINGS); |
|
| 106 | 106 | } |
| 107 | 107 | } |
| 108 | 108 | } |
@@ -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> |
@@ -472,7 +472,7 @@ discard block |
||
| 472 | 472 | <?php |
| 473 | 473 | } |
| 474 | 474 | if (isset($SETTINGS['api']) === true && (int) $SETTINGS['api'] === 1) { |
| 475 | - echo '<button type="button" class="btn btn-warning float-right" id="profile-button-api_token">' . $lang->get('generate_api_token') . '</button>'; |
|
| 475 | + echo '<button type="button" class="btn btn-warning float-right" id="profile-button-api_token">'.$lang->get('generate_api_token').'</button>'; |
|
| 476 | 476 | } |
| 477 | 477 | ?> |
| 478 | 478 | <div id="profile-avatar-file-container" class="hidden"></div> |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('options') === 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 | |
@@ -322,7 +322,7 @@ discard block |
||
| 322 | 322 | // get list of all timezones |
| 323 | 323 | foreach ($zones as $key => $zone) { |
| 324 | 324 | echo ' |
| 325 | - <option value="' . $key . '"', isset($SETTINGS['timezone']) === true && $SETTINGS['timezone'] === $key ? ' selected' : '', '>' . $zone . '</option>'; |
|
| 325 | + <option value="' . $key.'"', isset($SETTINGS['timezone']) === true && $SETTINGS['timezone'] === $key ? ' selected' : '', '>'.$zone.'</option>'; |
|
| 326 | 326 | } |
| 327 | 327 | ?> |
| 328 | 328 | </select> |
@@ -374,7 +374,7 @@ discard block |
||
| 374 | 374 | $languagesList = $languagesList ?? []; |
| 375 | 375 | foreach ($languagesList as $teampassLang) { |
| 376 | 376 | echo ' |
| 377 | - <option value="' . $teampassLang . '"', isset($SETTINGS['default_language']) === true && $SETTINGS['default_language'] === $teampassLang ? ' selected' : '', '>' . $teampassLang . '</option>'; |
|
| 377 | + <option value="' . $teampassLang.'"', isset($SETTINGS['default_language']) === true && $SETTINGS['default_language'] === $teampassLang ? ' selected' : '', '>'.$teampassLang.'</option>'; |
|
| 378 | 378 | } |
| 379 | 379 | ?> |
| 380 | 380 | </select> |
@@ -471,7 +471,7 @@ discard block |
||
| 471 | 471 | <?php |
| 472 | 472 | foreach (TP_PW_COMPLEXITY as $complex) { |
| 473 | 473 | echo ' |
| 474 | - <option value="' . $complex[0] . '"', isset($SETTINGS['personal_saltkey_security_level']) === true && $SETTINGS['personal_saltkey_security_level'] === $complex[0] ? ' selected' : '', '>' . $complex[1] . '</option>'; |
|
| 474 | + <option value="' . $complex[0].'"', isset($SETTINGS['personal_saltkey_security_level']) === true && $SETTINGS['personal_saltkey_security_level'] === $complex[0] ? ' selected' : '', '>'.$complex[1].'</option>'; |
|
| 475 | 475 | } |
| 476 | 476 | ?> |
| 477 | 477 | </select> |
@@ -848,7 +848,7 @@ discard block |
||
| 848 | 848 | $roles = getRolesTitles(); |
| 849 | 849 | foreach ($roles as $role) { |
| 850 | 850 | echo ' |
| 851 | - <option value="' . htmlspecialchars($role['id']) . '"', in_array($role['id'], $arrRolesToPrint) === true ? ' selected' : '', '>' . htmlspecialchars(addslashes($role['title'])) . '</option>'; |
|
| 851 | + <option value="' . htmlspecialchars($role['id']).'"', in_array($role['id'], $arrRolesToPrint) === true ? ' selected' : '', '>'.htmlspecialchars(addslashes($role['title'])).'</option>'; |
|
| 852 | 852 | } |
| 853 | 853 | } |
| 854 | 854 | ?> |
@@ -1075,7 +1075,7 @@ discard block |
||
| 1075 | 1075 | <?php |
| 1076 | 1076 | foreach (TP_PW_COMPLEXITY as $complex) { |
| 1077 | 1077 | echo ' |
| 1078 | - <option value="' . $complex[0] . '"', isset($SETTINGS['offline_key_level']) === true && $SETTINGS['offline_key_level'] === $complex[0] ? ' selected' : '', '>' . $complex[1] . '</option>'; |
|
| 1078 | + <option value="' . $complex[0].'"', isset($SETTINGS['offline_key_level']) === true && $SETTINGS['offline_key_level'] === $complex[0] ? ' selected' : '', '>'.$complex[1].'</option>'; |
|
| 1079 | 1079 | } |
| 1080 | 1080 | ?> |
| 1081 | 1081 | </select> |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | || (isset($session_user_admin) && (int) $session_user_admin === 1)) { |
| 73 | 73 | // Not allowed page |
| 74 | 74 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 75 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 75 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 76 | 76 | exit; |
| 77 | 77 | } |
| 78 | 78 | |
@@ -125,12 +125,12 @@ discard block |
||
| 125 | 125 | if (empty($fav) === false) { |
| 126 | 126 | $data = DB::queryFirstRow( |
| 127 | 127 | 'SELECT i.label, i.description, i.id, i.id_tree, t.title |
| 128 | - FROM ' . prefixTable('items') . ' as i |
|
| 129 | - INNER JOIN ' . prefixTable('nested_tree') . ' as t ON (t.id = i.id_tree) |
|
| 128 | + FROM ' . prefixTable('items').' as i |
|
| 129 | + INNER JOIN ' . prefixTable('nested_tree').' as t ON (t.id = i.id_tree) |
|
| 130 | 130 | WHERE i.id = %i', |
| 131 | 131 | $fav |
| 132 | 132 | ); |
| 133 | - if (! empty($data['label'])) { |
|
| 133 | + if (!empty($data['label'])) { |
|
| 134 | 134 | ?> |
| 135 | 135 | <tr> |
| 136 | 136 | <td> |
@@ -33,7 +33,7 @@ |
||
| 33 | 33 | use TeampassClasses\SessionManager\SessionManager; |
| 34 | 34 | use TeampassClasses\ConfigManager\ConfigManager; |
| 35 | 35 | |
| 36 | -require_once __DIR__. '/../../includes/config/include.php'; |
|
| 36 | +require_once __DIR__.'/../../includes/config/include.php'; |
|
| 37 | 37 | require_once __DIR__.'/../../sources/main.functions.php'; |
| 38 | 38 | |
| 39 | 39 | // init |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | ) { |
| 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 | |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | $post_isNewItem = $request->request->filter('isNewItem', null, FILTER_SANITIZE_NUMBER_INT); |
| 108 | 108 | $post_randomId = $request->request->filter('randomId', null, FILTER_SANITIZE_NUMBER_INT); |
| 109 | 109 | $post_isPersonal = $request->request->filter('isPersonal', null, FILTER_SANITIZE_NUMBER_INT); |
| 110 | -$post_fileSize= $request->request->filter('file_size', null, FILTER_SANITIZE_NUMBER_INT); |
|
| 110 | +$post_fileSize = $request->request->filter('file_size', null, FILTER_SANITIZE_NUMBER_INT); |
|
| 111 | 111 | $chunk = $request->request->filter('chunk', 0, FILTER_SANITIZE_NUMBER_INT); |
| 112 | 112 | $chunks = $request->request->filter('chunks', 0, FILTER_SANITIZE_NUMBER_INT); |
| 113 | 113 | $fileName = $request->request->filter('name', '', FILTER_SANITIZE_FULL_SPECIAL_CHARS); |
@@ -122,10 +122,10 @@ discard block |
||
| 122 | 122 | $unit = strtoupper(substr(trim($POST_MAX_SIZE), -1)); // Assurez-vous de bien gérer les espaces éventuels |
| 123 | 123 | $units = ['G' => 1073741824, 'M' => 1048576, 'K' => 1024]; |
| 124 | 124 | $multiplier = $units[$unit] ?? 1; // Vérifie si l'unité est dans le tableau, sinon 1 |
| 125 | - $maxSize = (int)$POST_MAX_SIZE * $multiplier; |
|
| 125 | + $maxSize = (int) $POST_MAX_SIZE * $multiplier; |
|
| 126 | 126 | |
| 127 | 127 | // CHeck if the POST is too big |
| 128 | - if (!empty($_SERVER['CONTENT_LENGTH']) && (int)$_SERVER['CONTENT_LENGTH'] > $maxSize && $maxSize > 0) { |
|
| 128 | + if (!empty($_SERVER['CONTENT_LENGTH']) && (int) $_SERVER['CONTENT_LENGTH'] > $maxSize && $maxSize > 0) { |
|
| 129 | 129 | handleAttachmentError('POST exceeded maximum allowed size.', 111, 413); |
| 130 | 130 | } |
| 131 | 131 | |
@@ -134,7 +134,7 @@ discard block |
||
| 134 | 134 | handleAttachmentError('File exceeds the maximum allowed size', 120, 413); |
| 135 | 135 | die(); |
| 136 | 136 | } |
| 137 | - if (WIP === true) error_log('POST_MAX_SIZE: ' . $POST_MAX_SIZE." - CONTENT_LENGTH: ".$_SERVER['CONTENT_LENGTH']." - UNIT: ".$unit." - MAX: ".$maxSize." - MULTIPLIER: ".$multiplier." - FILE_SIZE: ".$post_fileSize); |
|
| 137 | + if (WIP === true) error_log('POST_MAX_SIZE: '.$POST_MAX_SIZE." - CONTENT_LENGTH: ".$_SERVER['CONTENT_LENGTH']." - UNIT: ".$unit." - MAX: ".$maxSize." - MULTIPLIER: ".$multiplier." - FILE_SIZE: ".$post_fileSize); |
|
| 138 | 138 | |
| 139 | 139 | // delete expired tokens |
| 140 | 140 | DB::delete(prefixTable('tokens'), 'end_timestamp < %i', time()); |
@@ -185,7 +185,7 @@ discard block |
||
| 185 | 185 | // check if token is expired |
| 186 | 186 | $data = DB::queryFirstRow( |
| 187 | 187 | 'SELECT end_timestamp |
| 188 | - FROM ' . prefixTable('tokens') . ' |
|
| 188 | + FROM ' . prefixTable('tokens').' |
|
| 189 | 189 | WHERE user_id = %i AND token = %s', |
| 190 | 190 | $session->get('user-id'), |
| 191 | 191 | $post_user_token |
@@ -218,7 +218,7 @@ discard block |
||
| 218 | 218 | |
| 219 | 219 | // HTTP headers for no cache etc |
| 220 | 220 | header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); |
| 221 | -header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); |
|
| 221 | +header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); |
|
| 222 | 222 | header('Cache-Control: no-store, no-cache, must-revalidate'); |
| 223 | 223 | header('Cache-Control: post-check=0, pre-check=0', false); |
| 224 | 224 | |
@@ -256,7 +256,7 @@ discard block |
||
| 256 | 256 | // Validate file name (for our purposes we'll just remove invalid characters) |
| 257 | 257 | $file_name = preg_replace('[^A-Za-z0-9]', '', strtolower(basename($_FILES['file']['name']))); |
| 258 | 258 | if (strlen($file_name) == 0 || strlen($file_name) > $MAX_FILENAME_LENGTH) { |
| 259 | - handleAttachmentError('Invalid file name: ' . $file_name . '.', 114); |
|
| 259 | + handleAttachmentError('Invalid file name: '.$file_name.'.', 114); |
|
| 260 | 260 | } |
| 261 | 261 | |
| 262 | 262 | // Validate file extension |
@@ -266,8 +266,8 @@ discard block |
||
| 266 | 266 | $ext, |
| 267 | 267 | explode( |
| 268 | 268 | ',', |
| 269 | - $SETTINGS['upload_docext'] . ',' . $SETTINGS['upload_imagesext'] . |
|
| 270 | - ',' . $SETTINGS['upload_pkgext'] . ',' . $SETTINGS['upload_otherext'] |
|
| 269 | + $SETTINGS['upload_docext'].','.$SETTINGS['upload_imagesext']. |
|
| 270 | + ','.$SETTINGS['upload_pkgext'].','.$SETTINGS['upload_otherext'] |
|
| 271 | 271 | ) |
| 272 | 272 | ) === false |
| 273 | 273 | ) { |
@@ -279,24 +279,24 @@ discard block |
||
| 279 | 279 | |
| 280 | 280 | // Clean the fileName for security reasons |
| 281 | 281 | $fileInfo = pathinfo($fileName); |
| 282 | -$fileName = base64_encode($fileInfo['filename']) . '.' . $fileInfo['extension']; |
|
| 282 | +$fileName = base64_encode($fileInfo['filename']).'.'.$fileInfo['extension']; |
|
| 283 | 283 | $fileFullSize = 0; |
| 284 | 284 | |
| 285 | 285 | // Make sure the fileName is unique but only if chunking is disabled |
| 286 | -if ($chunks < 2 && file_exists($targetDir . DIRECTORY_SEPARATOR . $fileName)) { |
|
| 286 | +if ($chunks < 2 && file_exists($targetDir.DIRECTORY_SEPARATOR.$fileName)) { |
|
| 287 | 287 | $ext = strrpos($fileName, '.'); |
| 288 | 288 | $fileNameA = substr($fileName, 0, $ext); |
| 289 | 289 | $fileNameB = substr($fileName, $ext); |
| 290 | 290 | |
| 291 | 291 | $count = 1; |
| 292 | - while (file_exists($targetDir . DIRECTORY_SEPARATOR . $fileNameA . '_' . $count . $fileNameB)) { |
|
| 292 | + while (file_exists($targetDir.DIRECTORY_SEPARATOR.$fileNameA.'_'.$count.$fileNameB)) { |
|
| 293 | 293 | ++$count; |
| 294 | 294 | } |
| 295 | 295 | |
| 296 | - $fileName = $fileNameA . '_' . $count . $fileNameB; |
|
| 296 | + $fileName = $fileNameA.'_'.$count.$fileNameB; |
|
| 297 | 297 | } |
| 298 | 298 | |
| 299 | -$filePath = $targetDir . DIRECTORY_SEPARATOR . $fileName; |
|
| 299 | +$filePath = $targetDir.DIRECTORY_SEPARATOR.$fileName; |
|
| 300 | 300 | |
| 301 | 301 | // Create target dir |
| 302 | 302 | if (file_exists($targetDir) === false) { |
@@ -310,7 +310,7 @@ discard block |
||
| 310 | 310 | // Remove old temp files |
| 311 | 311 | if ($cleanupTargetDir && is_dir($targetDir) && ($dir = opendir($targetDir))) { |
| 312 | 312 | while (($file = readdir($dir)) !== false) { |
| 313 | - $tmpfilePath = $targetDir . DIRECTORY_SEPARATOR . $file; |
|
| 313 | + $tmpfilePath = $targetDir.DIRECTORY_SEPARATOR.$file; |
|
| 314 | 314 | |
| 315 | 315 | // Remove temp file if it is older than the max age and is not the current file |
| 316 | 316 | if ( |
@@ -429,8 +429,8 @@ discard block |
||
| 429 | 429 | // This is a public object |
| 430 | 430 | $users = DB::query( |
| 431 | 431 | 'SELECT id, public_key |
| 432 | - FROM ' . prefixTable('users') . ' |
|
| 433 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '") |
|
| 432 | + FROM ' . prefixTable('users').' |
|
| 433 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'") |
|
| 434 | 434 | AND public_key != ""' |
| 435 | 435 | ); |
| 436 | 436 | foreach ($users as $user) { |
@@ -464,14 +464,14 @@ discard block |
||
| 464 | 464 | 'date' => time(), |
| 465 | 465 | 'id_user' => $session->get('user-id'), |
| 466 | 466 | 'action' => 'at_modification', |
| 467 | - 'raison' => 'at_add_file : ' . $fileName . ':' . $newID, |
|
| 467 | + 'raison' => 'at_add_file : '.$fileName.':'.$newID, |
|
| 468 | 468 | ) |
| 469 | 469 | ); |
| 470 | 470 | } |
| 471 | 471 | } |
| 472 | 472 | |
| 473 | 473 | // Return JSON-RPC response |
| 474 | -die('{"jsonrpc" : "2.0", "result" : null, "id" : "' . $newID . '"}'); |
|
| 474 | +die('{"jsonrpc" : "2.0", "result" : null, "id" : "'.$newID.'"}'); |
|
| 475 | 475 | |
| 476 | 476 | /** |
| 477 | 477 | * Handle errors and kill script. |
@@ -134,7 +134,9 @@ |
||
| 134 | 134 | handleAttachmentError('File exceeds the maximum allowed size', 120, 413); |
| 135 | 135 | die(); |
| 136 | 136 | } |
| 137 | - if (WIP === true) error_log('POST_MAX_SIZE: ' . $POST_MAX_SIZE." - CONTENT_LENGTH: ".$_SERVER['CONTENT_LENGTH']." - UNIT: ".$unit." - MAX: ".$maxSize." - MULTIPLIER: ".$multiplier." - FILE_SIZE: ".$post_fileSize); |
|
| 137 | + if (WIP === true) { |
|
| 138 | + error_log('POST_MAX_SIZE: ' . $POST_MAX_SIZE." - CONTENT_LENGTH: ".$_SERVER['CONTENT_LENGTH']." - UNIT: ".$unit." - MAX: ".$maxSize." - MULTIPLIER: ".$multiplier." - FILE_SIZE: ".$post_fileSize); |
|
| 139 | + } |
|
| 138 | 140 | |
| 139 | 141 | // delete expired tokens |
| 140 | 142 | DB::delete(prefixTable('tokens'), 'end_timestamp < %i', time()); |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('profile') === false) { |
| 74 | 74 | // Not allowed page |
| 75 | 75 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 76 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 76 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 77 | 77 | exit; |
| 78 | 78 | } |
| 79 | 79 | |
@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | |
| 145 | 145 | // Get info about user to modify |
| 146 | 146 | $targetUserInfos = DB::queryFirstRow( |
| 147 | - 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 147 | + 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 148 | 148 | WHERE id = %i', |
| 149 | 149 | (int) $dataReceived['user_id'] |
| 150 | 150 | ); |
@@ -276,7 +276,7 @@ discard block |
||
| 276 | 276 | // Check if user already exists |
| 277 | 277 | $data = DB::query( |
| 278 | 278 | 'SELECT id, fonction_id, groupes_interdits, groupes_visibles |
| 279 | - FROM ' . prefixTable('users') . ' |
|
| 279 | + FROM ' . prefixTable('users').' |
|
| 280 | 280 | WHERE login = %s |
| 281 | 281 | AND deleted_at IS NULL', |
| 282 | 282 | $login |
@@ -495,7 +495,7 @@ discard block |
||
| 495 | 495 | |
| 496 | 496 | // Get info about user to delete |
| 497 | 497 | $data_user = DB::queryFirstRow( |
| 498 | - 'SELECT login, admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 498 | + 'SELECT login, admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 499 | 499 | WHERE id = %i', |
| 500 | 500 | $post_id |
| 501 | 501 | ); |
@@ -529,7 +529,7 @@ discard block |
||
| 529 | 529 | ); |
| 530 | 530 | // delete personal folder and subfolders |
| 531 | 531 | $data = DB::queryFirstRow( |
| 532 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' |
|
| 532 | + 'SELECT id FROM '.prefixTable('nested_tree').' |
|
| 533 | 533 | WHERE title = %s AND personal_folder = %i', |
| 534 | 534 | $post_id, |
| 535 | 535 | '1' |
@@ -542,7 +542,7 @@ discard block |
||
| 542 | 542 | DB::delete(prefixTable('nested_tree'), 'id = %i AND personal_folder = %i', $folder->id, '1'); |
| 543 | 543 | // delete items & logs |
| 544 | 544 | $items = DB::query( |
| 545 | - 'SELECT id FROM ' . prefixTable('items') . ' |
|
| 545 | + 'SELECT id FROM '.prefixTable('items').' |
|
| 546 | 546 | WHERE id_tree=%i AND perso = %i', |
| 547 | 547 | $folder->id, |
| 548 | 548 | '1' |
@@ -566,7 +566,7 @@ discard block |
||
| 566 | 566 | // Delete any process related to user |
| 567 | 567 | $processes = DB::query( |
| 568 | 568 | 'SELECT increment_id |
| 569 | - FROM ' . prefixTable('background_tasks') . ' |
|
| 569 | + FROM ' . prefixTable('background_tasks').' |
|
| 570 | 570 | WHERE JSON_EXTRACT(arguments, "$.new_user_id") = %i', |
| 571 | 571 | $post_id |
| 572 | 572 | ); |
@@ -619,7 +619,7 @@ discard block |
||
| 619 | 619 | $return = array(); |
| 620 | 620 | // Check if folder exists |
| 621 | 621 | $data = DB::query( |
| 622 | - 'SELECT * FROM ' . prefixTable('nested_tree') . ' |
|
| 622 | + 'SELECT * FROM '.prefixTable('nested_tree').' |
|
| 623 | 623 | WHERE title = %s AND parent_id = %i', |
| 624 | 624 | filter_input(INPUT_POST, 'domain', FILTER_SANITIZE_FULL_SPECIAL_CHARS), |
| 625 | 625 | '0' |
@@ -632,7 +632,7 @@ discard block |
||
| 632 | 632 | } |
| 633 | 633 | // Check if role exists |
| 634 | 634 | $data = DB::query( |
| 635 | - 'SELECT * FROM ' . prefixTable('roles_title') . ' |
|
| 635 | + 'SELECT * FROM '.prefixTable('roles_title').' |
|
| 636 | 636 | WHERE title = %s', |
| 637 | 637 | filter_input(INPUT_POST, 'domain', FILTER_SANITIZE_FULL_SPECIAL_CHARS) |
| 638 | 638 | ); |
@@ -661,7 +661,7 @@ discard block |
||
| 661 | 661 | // Get info about user to delete |
| 662 | 662 | $data_user = DB::queryFirstRow( |
| 663 | 663 | 'SELECT admin, isAdministratedByRole, gestionnaire |
| 664 | - FROM ' . prefixTable('users') . ' |
|
| 664 | + FROM ' . prefixTable('users').' |
|
| 665 | 665 | WHERE id = %i', |
| 666 | 666 | $post_user_id |
| 667 | 667 | ); |
@@ -717,7 +717,7 @@ discard block |
||
| 717 | 717 | // Get info about user |
| 718 | 718 | $rowUser = DB::queryFirstRow( |
| 719 | 719 | 'SELECT * |
| 720 | - FROM ' . prefixTable('users') . ' |
|
| 720 | + FROM ' . prefixTable('users').' |
|
| 721 | 721 | WHERE id = %i', |
| 722 | 722 | $post_id |
| 723 | 723 | ); |
@@ -742,7 +742,7 @@ discard block |
||
| 742 | 742 | $selected = ''; |
| 743 | 743 | $users_functions = array_filter(array_unique(explode(';', empty($rowUser['fonction_id'].';'.$rowUser['roles_from_ad_groups']) === true ? '' : $rowUser['fonction_id'].';'.$rowUser['roles_from_ad_groups']))); |
| 744 | 744 | |
| 745 | - $rows = DB::query('SELECT id,title,creator_id FROM ' . prefixTable('roles_title')); |
|
| 745 | + $rows = DB::query('SELECT id,title,creator_id FROM '.prefixTable('roles_title')); |
|
| 746 | 746 | foreach ($rows as $record) { |
| 747 | 747 | if ( |
| 748 | 748 | (int) $session->get('user-admin') === 1 |
@@ -777,7 +777,7 @@ discard block |
||
| 777 | 777 | $rolesList = array(); |
| 778 | 778 | $managedBy = array(); |
| 779 | 779 | $selected = ''; |
| 780 | - $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title') . ' ORDER BY title ASC'); |
|
| 780 | + $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title').' ORDER BY title ASC'); |
|
| 781 | 781 | foreach ($rows as $reccord) { |
| 782 | 782 | $rolesList[$reccord['id']] = array('id' => $reccord['id'], 'title' => $reccord['title']); |
| 783 | 783 | } |
@@ -808,7 +808,7 @@ discard block |
||
| 808 | 808 | array_push( |
| 809 | 809 | $managedBy, |
| 810 | 810 | array( |
| 811 | - 'title' => $lang->get('managers_of') . ' ' . $fonction['title'], |
|
| 811 | + 'title' => $lang->get('managers_of').' '.$fonction['title'], |
|
| 812 | 812 | 'id' => $fonction['id'], |
| 813 | 813 | 'selected' => $selected, |
| 814 | 814 | ) |
@@ -890,9 +890,9 @@ discard block |
||
| 890 | 890 | |
| 891 | 891 | // get USER STATUS |
| 892 | 892 | if ($rowUser['disabled'] == 1) { |
| 893 | - $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>'; |
|
| 893 | + $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>'; |
|
| 894 | 894 | } else { |
| 895 | - $arrData['info'] = $lang->get('user_info_active') . '<br><input type="checkbox" value="lock" class="chk"> ' . $lang->get('user_info_lock_question'); |
|
| 895 | + $arrData['info'] = $lang->get('user_info_active').'<br><input type="checkbox" value="lock" class="chk"> '.$lang->get('user_info_lock_question'); |
|
| 896 | 896 | } |
| 897 | 897 | |
| 898 | 898 | $arrData['error'] = false; |
@@ -979,7 +979,7 @@ discard block |
||
| 979 | 979 | |
| 980 | 980 | // Get info about user to modify |
| 981 | 981 | $data_user = DB::queryFirstRow( |
| 982 | - 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 982 | + 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 983 | 983 | WHERE id = %i', |
| 984 | 984 | $post_id |
| 985 | 985 | ); |
@@ -990,7 +990,7 @@ discard block |
||
| 990 | 990 | // count number of admins |
| 991 | 991 | $users = DB::query( |
| 992 | 992 | 'SELECT id |
| 993 | - FROM ' . prefixTable('users') . ' |
|
| 993 | + FROM ' . prefixTable('users').' |
|
| 994 | 994 | WHERE admin = 1 AND email != "" AND pw != "" AND id != %i', |
| 995 | 995 | $post_id |
| 996 | 996 | ); |
@@ -1013,7 +1013,7 @@ discard block |
||
| 1013 | 1013 | // Exclude roles from AD - PR #3635 |
| 1014 | 1014 | $adRoles = DB::query( |
| 1015 | 1015 | 'SELECT roles_from_ad_groups |
| 1016 | - FROM ' . prefixTable('users') . ' |
|
| 1016 | + FROM ' . prefixTable('users').' |
|
| 1017 | 1017 | WHERE id = %i', |
| 1018 | 1018 | $post_id |
| 1019 | 1019 | )[0]['roles_from_ad_groups']; |
@@ -1117,7 +1117,7 @@ discard block |
||
| 1117 | 1117 | ); |
| 1118 | 1118 | // delete personal folder and subfolders |
| 1119 | 1119 | $data = DB::queryFirstRow( |
| 1120 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' |
|
| 1120 | + 'SELECT id FROM '.prefixTable('nested_tree').' |
|
| 1121 | 1121 | WHERE title = %s AND personal_folder = %i', |
| 1122 | 1122 | $post_id, |
| 1123 | 1123 | '1' |
@@ -1130,7 +1130,7 @@ discard block |
||
| 1130 | 1130 | DB::delete(prefixTable('nested_tree'), 'id = %i AND personal_folder = %i', $folder->id, '1'); |
| 1131 | 1131 | // delete items & logs |
| 1132 | 1132 | $items = DB::query( |
| 1133 | - 'SELECT id FROM ' . prefixTable('items') . ' |
|
| 1133 | + 'SELECT id FROM '.prefixTable('items').' |
|
| 1134 | 1134 | WHERE id_tree=%i AND perso = %i', |
| 1135 | 1135 | $folder->id, |
| 1136 | 1136 | '1' |
@@ -1151,7 +1151,7 @@ discard block |
||
| 1151 | 1151 | } else { |
| 1152 | 1152 | // Get old data about user |
| 1153 | 1153 | $oldData = DB::queryFirstRow( |
| 1154 | - 'SELECT * FROM ' . prefixTable('users') . ' |
|
| 1154 | + 'SELECT * FROM '.prefixTable('users').' |
|
| 1155 | 1155 | WHERE id = %i', |
| 1156 | 1156 | $post_id |
| 1157 | 1157 | ); |
@@ -1188,7 +1188,7 @@ discard block |
||
| 1188 | 1188 | |
| 1189 | 1189 | // update LOG |
| 1190 | 1190 | if ($oldData['email'] !== $post_email) { |
| 1191 | - logEvents($SETTINGS, 'user_mngt', 'at_user_email_changed:' . $oldData['email'], (string) $session->get('user-id'), $session->get('user-login'), $post_id); |
|
| 1191 | + logEvents($SETTINGS, 'user_mngt', 'at_user_email_changed:'.$oldData['email'], (string) $session->get('user-id'), $session->get('user-login'), $post_id); |
|
| 1192 | 1192 | } |
| 1193 | 1193 | } |
| 1194 | 1194 | echo prepareExchangedData( |
@@ -1236,7 +1236,7 @@ discard block |
||
| 1236 | 1236 | } |
| 1237 | 1237 | |
| 1238 | 1238 | DB::queryFirstRow( |
| 1239 | - 'SELECT * FROM ' . prefixTable('users') . ' |
|
| 1239 | + 'SELECT * FROM '.prefixTable('users').' |
|
| 1240 | 1240 | WHERE login = %s |
| 1241 | 1241 | AND deleted_at IS NULL', |
| 1242 | 1242 | filter_input(INPUT_POST, 'login', FILTER_SANITIZE_FULL_SPECIAL_CHARS) |
@@ -1288,7 +1288,7 @@ discard block |
||
| 1288 | 1288 | // get User info |
| 1289 | 1289 | $rowUser = DB::queryFirstRow( |
| 1290 | 1290 | 'SELECT login, name, lastname, email, disabled, fonction_id, groupes_interdits, groupes_visibles, isAdministratedByRole, avatar_thumb, roles_from_ad_groups |
| 1291 | - FROM ' . prefixTable('users') . ' |
|
| 1291 | + FROM ' . prefixTable('users').' |
|
| 1292 | 1292 | WHERE id = %i', |
| 1293 | 1293 | $post_id |
| 1294 | 1294 | ); |
@@ -1298,7 +1298,7 @@ discard block |
||
| 1298 | 1298 | $html = ''; |
| 1299 | 1299 | |
| 1300 | 1300 | 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) { |
| 1301 | - $rowUser['fonction_id'] = empty($rowUser['fonction_id']) === true ? $rowUser['roles_from_ad_groups'] : $rowUser['fonction_id']. ';' . $rowUser['roles_from_ad_groups']; |
|
| 1301 | + $rowUser['fonction_id'] = empty($rowUser['fonction_id']) === true ? $rowUser['roles_from_ad_groups'] : $rowUser['fonction_id'].';'.$rowUser['roles_from_ad_groups']; |
|
| 1302 | 1302 | } |
| 1303 | 1303 | $arrData['functions'] = array_filter(explode(';', $rowUser['fonction_id'])); |
| 1304 | 1304 | $arrData['allowed_folders'] = array_filter(explode(';', $rowUser['groupes_visibles'])); |
@@ -1309,7 +1309,7 @@ discard block |
||
| 1309 | 1309 | // refine folders based upon roles |
| 1310 | 1310 | $rows = DB::query( |
| 1311 | 1311 | 'SELECT folder_id, type |
| 1312 | - FROM ' . prefixTable('roles_values') . ' |
|
| 1312 | + FROM ' . prefixTable('roles_values').' |
|
| 1313 | 1313 | WHERE role_id IN %ls |
| 1314 | 1314 | ORDER BY folder_id ASC', |
| 1315 | 1315 | $arrData['functions'] |
@@ -1332,7 +1332,7 @@ discard block |
||
| 1332 | 1332 | } |
| 1333 | 1333 | |
| 1334 | 1334 | // add allowed folders |
| 1335 | - foreach($arrData['allowed_folders'] as $Fld) { |
|
| 1335 | + foreach ($arrData['allowed_folders'] as $Fld) { |
|
| 1336 | 1336 | array_push($arrFolders, array('id' => $Fld, 'type' => 'W', 'special' => true)); |
| 1337 | 1337 | } |
| 1338 | 1338 | |
@@ -1343,7 +1343,7 @@ discard block |
||
| 1343 | 1343 | // get folder name |
| 1344 | 1344 | $row = DB::queryFirstRow( |
| 1345 | 1345 | 'SELECT title, nlevel, id |
| 1346 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 1346 | + FROM ' . prefixTable('nested_tree').' |
|
| 1347 | 1347 | WHERE id = %i', |
| 1348 | 1348 | $fld['id'] |
| 1349 | 1349 | ); |
@@ -1356,38 +1356,38 @@ discard block |
||
| 1356 | 1356 | |
| 1357 | 1357 | // manage right icon |
| 1358 | 1358 | if ($fld['type'] == 'W') { |
| 1359 | - $label = '<i class="fas fa-indent infotip text-success mr-2" title="' . $lang->get('write') . '"></i>' . |
|
| 1360 | - '<i class="fas fa-edit infotip text-success mr-2" title="' . $lang->get('edit') . '"></i>' . |
|
| 1361 | - '<i class="fas fa-eraser infotip text-success" title="' . $lang->get('delete') . '"></i>'; |
|
| 1359 | + $label = '<i class="fas fa-indent infotip text-success mr-2" title="'.$lang->get('write').'"></i>'. |
|
| 1360 | + '<i class="fas fa-edit infotip text-success mr-2" title="'.$lang->get('edit').'"></i>'. |
|
| 1361 | + '<i class="fas fa-eraser infotip text-success" title="'.$lang->get('delete').'"></i>'; |
|
| 1362 | 1362 | } elseif ($fld['type'] == 'ND') { |
| 1363 | - $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . $lang->get('write') . '"></i>' . |
|
| 1364 | - '<i class="fas fa-edit infotip text-success mr-2" title="' . $lang->get('edit') . '"></i>' . |
|
| 1365 | - '<i class="fas fa-eraser infotip text-danger" title="' . $lang->get('no_delete') . '"></i>'; |
|
| 1363 | + $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.$lang->get('write').'"></i>'. |
|
| 1364 | + '<i class="fas fa-edit infotip text-success mr-2" title="'.$lang->get('edit').'"></i>'. |
|
| 1365 | + '<i class="fas fa-eraser infotip text-danger" title="'.$lang->get('no_delete').'"></i>'; |
|
| 1366 | 1366 | } elseif ($fld['type'] == 'NE') { |
| 1367 | - $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . $lang->get('write') . '"></i>' . |
|
| 1368 | - '<i class="fas fa-edit infotip text-danger mr-2" title="' . $lang->get('no_edit') . '"></i>' . |
|
| 1369 | - '<i class="fas fa-eraser infotip text-success" title="' . $lang->get('delete') . '"></i>'; |
|
| 1367 | + $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.$lang->get('write').'"></i>'. |
|
| 1368 | + '<i class="fas fa-edit infotip text-danger mr-2" title="'.$lang->get('no_edit').'"></i>'. |
|
| 1369 | + '<i class="fas fa-eraser infotip text-success" title="'.$lang->get('delete').'"></i>'; |
|
| 1370 | 1370 | } elseif ($fld['type'] == 'NDNE') { |
| 1371 | - $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . $lang->get('write') . '"></i>' . |
|
| 1372 | - '<i class="fas fa-edit infotip text-danger mr-2" title="' . $lang->get('no_edit') . '"></i>' . |
|
| 1373 | - '<i class="fas fa-eraser infotip text-danger" title="' . $lang->get('no_delete') . '"></i>'; |
|
| 1371 | + $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.$lang->get('write').'"></i>'. |
|
| 1372 | + '<i class="fas fa-edit infotip text-danger mr-2" title="'.$lang->get('no_edit').'"></i>'. |
|
| 1373 | + '<i class="fas fa-eraser infotip text-danger" title="'.$lang->get('no_delete').'"></i>'; |
|
| 1374 | 1374 | } elseif ($fld['type'] == '') { |
| 1375 | - $label = '<i class="fas fa-eye-slash infotip text-danger mr-2" title="' . $lang->get('no_access') . '"></i>'; |
|
| 1375 | + $label = '<i class="fas fa-eye-slash infotip text-danger mr-2" title="'.$lang->get('no_access').'"></i>'; |
|
| 1376 | 1376 | } else { |
| 1377 | - $label = '<i class="fas fa-eye infotip text-info mr-2" title="' . $lang->get('read') . '"></i>'; |
|
| 1377 | + $label = '<i class="fas fa-eye infotip text-info mr-2" title="'.$lang->get('read').'"></i>'; |
|
| 1378 | 1378 | } |
| 1379 | 1379 | |
| 1380 | - $html .= '<tr><td>' . $ident . $row['title'] . |
|
| 1381 | - ' <small class="text-info">[' . $row['id'] . ']</small>'. |
|
| 1382 | - ($fld['special'] === true ? '<i class="fas fa-user-tag infotip text-primary ml-5" title="' . $lang->get('user_specific_right') . '"></i>' : ''). |
|
| 1383 | - '</td><td>' . $label . '</td></tr>'; |
|
| 1380 | + $html .= '<tr><td>'.$ident.$row['title']. |
|
| 1381 | + ' <small class="text-info">['.$row['id'].']</small>'. |
|
| 1382 | + ($fld['special'] === true ? '<i class="fas fa-user-tag infotip text-primary ml-5" title="'.$lang->get('user_specific_right').'"></i>' : ''). |
|
| 1383 | + '</td><td>'.$label.'</td></tr>'; |
|
| 1384 | 1384 | break; |
| 1385 | 1385 | } |
| 1386 | 1386 | } |
| 1387 | 1387 | } |
| 1388 | 1388 | |
| 1389 | - $html_full = '<table id="table-folders" class="table table-bordered table-striped dt-responsive nowrap" style="width:100%"><tbody>' . |
|
| 1390 | - $html . '</tbody></table>'; |
|
| 1389 | + $html_full = '<table id="table-folders" class="table table-bordered table-striped dt-responsive nowrap" style="width:100%"><tbody>'. |
|
| 1390 | + $html.'</tbody></table>'; |
|
| 1391 | 1391 | } else { |
| 1392 | 1392 | $html_full = ''; |
| 1393 | 1393 | } |
@@ -1433,7 +1433,7 @@ discard block |
||
| 1433 | 1433 | if ((int) $session->get('user-admin') === 0 && (int) $session->get('user-can_manage_all_users') === 0) { |
| 1434 | 1434 | $rows = DB::query( |
| 1435 | 1435 | 'SELECT * |
| 1436 | - FROM ' . prefixTable('users') . ' |
|
| 1436 | + FROM ' . prefixTable('users').' |
|
| 1437 | 1437 | WHERE admin = %i AND isAdministratedByRole IN %ls', |
| 1438 | 1438 | '0', |
| 1439 | 1439 | array_filter($session->get('user-roles_array')) |
@@ -1441,7 +1441,7 @@ discard block |
||
| 1441 | 1441 | } else { |
| 1442 | 1442 | $rows = DB::query( |
| 1443 | 1443 | 'SELECT * |
| 1444 | - FROM ' . prefixTable('users') . ' |
|
| 1444 | + FROM ' . prefixTable('users').' |
|
| 1445 | 1445 | WHERE admin = %i', |
| 1446 | 1446 | '0' |
| 1447 | 1447 | ); |
@@ -1453,7 +1453,7 @@ discard block |
||
| 1453 | 1453 | $groupIds = []; |
| 1454 | 1454 | foreach (explode(';', $record['fonction_id']) as $group) { |
| 1455 | 1455 | $tmp = DB::queryFirstRow( |
| 1456 | - 'SELECT id, title FROM ' . prefixTable('roles_title') . ' |
|
| 1456 | + 'SELECT id, title FROM '.prefixTable('roles_title').' |
|
| 1457 | 1457 | WHERE id = %i', |
| 1458 | 1458 | $group |
| 1459 | 1459 | ); |
@@ -1465,7 +1465,7 @@ discard block |
||
| 1465 | 1465 | |
| 1466 | 1466 | // Get managed_by |
| 1467 | 1467 | $managedBy = DB::queryFirstRow( |
| 1468 | - 'SELECT id, title FROM ' . prefixTable('roles_title') . ' |
|
| 1468 | + 'SELECT id, title FROM '.prefixTable('roles_title').' |
|
| 1469 | 1469 | WHERE id = %i', |
| 1470 | 1470 | $record['isAdministratedByRole'] |
| 1471 | 1471 | ); |
@@ -1475,7 +1475,7 @@ discard block |
||
| 1475 | 1475 | $foldersAllowedIds = []; |
| 1476 | 1476 | foreach (explode(';', $record['groupes_visibles']) as $role) { |
| 1477 | 1477 | $tmp = DB::queryFirstRow( |
| 1478 | - 'SELECT id, title FROM ' . prefixTable('nested_tree') . ' |
|
| 1478 | + 'SELECT id, title FROM '.prefixTable('nested_tree').' |
|
| 1479 | 1479 | WHERE id = %i', |
| 1480 | 1480 | $role |
| 1481 | 1481 | ); |
@@ -1488,7 +1488,7 @@ discard block |
||
| 1488 | 1488 | $foldersForbiddenIds = []; |
| 1489 | 1489 | foreach (explode(';', $record['groupes_interdits']) as $role) { |
| 1490 | 1490 | $tmp = DB::queryFirstRow( |
| 1491 | - 'SELECT id, title FROM ' . prefixTable('nested_tree') . ' |
|
| 1491 | + 'SELECT id, title FROM '.prefixTable('nested_tree').' |
|
| 1492 | 1492 | WHERE id = %i', |
| 1493 | 1493 | $role |
| 1494 | 1494 | ); |
@@ -1506,7 +1506,7 @@ discard block |
||
| 1506 | 1506 | 'login' => $record['login'], |
| 1507 | 1507 | 'groups' => implode(', ', $groups), |
| 1508 | 1508 | 'groupIds' => $groupIds, |
| 1509 | - 'managedBy' => $managedBy=== null ? $lang->get('administrator') : $managedBy['title'], |
|
| 1509 | + 'managedBy' => $managedBy === null ? $lang->get('administrator') : $managedBy['title'], |
|
| 1510 | 1510 | 'managedById' => $managedBy === null ? 0 : $managedBy['id'], |
| 1511 | 1511 | 'foldersAllowed' => implode(', ', $foldersAllowed), |
| 1512 | 1512 | 'foldersAllowedIds' => $foldersAllowedIds, |
@@ -1607,7 +1607,7 @@ discard block |
||
| 1607 | 1607 | |
| 1608 | 1608 | // Get info about user |
| 1609 | 1609 | $data_user = DB::queryFirstRow( |
| 1610 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 1610 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 1611 | 1611 | WHERE id = %i', |
| 1612 | 1612 | $inputData['source_id'] |
| 1613 | 1613 | ); |
@@ -1834,14 +1834,14 @@ discard block |
||
| 1834 | 1834 | if (empty($post_context) === false && $post_context === 'add_one_role_to_user') { |
| 1835 | 1835 | $data_user = DB::queryFirstRow( |
| 1836 | 1836 | 'SELECT fonction_id, public_key |
| 1837 | - FROM ' . prefixTable('users') . ' |
|
| 1837 | + FROM ' . prefixTable('users').' |
|
| 1838 | 1838 | WHERE id = %i', |
| 1839 | 1839 | $post_user_id |
| 1840 | 1840 | ); |
| 1841 | 1841 | |
| 1842 | 1842 | if ($data_user) { |
| 1843 | 1843 | // Ensure array is unique |
| 1844 | - $post_new_value = str_replace(',', ';', $data_user['fonction_id']) . ';' . $post_new_value; |
|
| 1844 | + $post_new_value = str_replace(',', ';', $data_user['fonction_id']).';'.$post_new_value; |
|
| 1845 | 1845 | $post_new_value = implode(';', array_unique(explode(';', $post_new_value))); |
| 1846 | 1846 | } else { |
| 1847 | 1847 | // User not found |
@@ -1857,14 +1857,14 @@ discard block |
||
| 1857 | 1857 | } |
| 1858 | 1858 | |
| 1859 | 1859 | // Manage specific case of api key |
| 1860 | - if($post_field === 'user_api_key') { |
|
| 1860 | + if ($post_field === 'user_api_key') { |
|
| 1861 | 1861 | $encrypted_key = encryptUserObjectKey(base64_encode($post_new_value), $session->get('user-public_key')); |
| 1862 | 1862 | $session->set('user-api_key', $post_new_value); |
| 1863 | 1863 | |
| 1864 | 1864 | // test if user has an api key |
| 1865 | 1865 | $data_user = DB::queryFirstRow( |
| 1866 | 1866 | 'SELECT value |
| 1867 | - FROM ' . prefixTable('api') . ' |
|
| 1867 | + FROM ' . prefixTable('api').' |
|
| 1868 | 1868 | WHERE user_id = %i', |
| 1869 | 1869 | $post_user_id |
| 1870 | 1870 | ); |
@@ -1984,7 +1984,7 @@ discard block |
||
| 1984 | 1984 | } catch (\LdapRecord\Auth\BindException $e) { |
| 1985 | 1985 | $error = $e->getDetailedError(); |
| 1986 | 1986 | if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) { |
| 1987 | - error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage()); |
|
| 1987 | + error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage()); |
|
| 1988 | 1988 | } |
| 1989 | 1989 | // deepcode ignore ServerLeak: No important data is sent and it is encrypted before sending |
| 1990 | 1990 | echo prepareExchangedData( |
@@ -2014,7 +2014,7 @@ discard block |
||
| 2014 | 2014 | } catch (\LdapRecord\Auth\BindException $e) { |
| 2015 | 2015 | $error = $e->getDetailedError(); |
| 2016 | 2016 | if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) { |
| 2017 | - error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage()); |
|
| 2017 | + error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage()); |
|
| 2018 | 2018 | } |
| 2019 | 2019 | // deepcode ignore ServerLeak: No important data is sent and it is encrypted before sending |
| 2020 | 2020 | echo prepareExchangedData( |
@@ -2031,7 +2031,7 @@ discard block |
||
| 2031 | 2031 | if (isset($adUser[$SETTINGS['ldap_user_attribute']][0]) === false) continue; |
| 2032 | 2032 | // Build the list of all groups in AD |
| 2033 | 2033 | if (isset($adUser['memberof']) === true) { |
| 2034 | - foreach($adUser['memberof'] as $j => $adUserGroup) { |
|
| 2034 | + foreach ($adUser['memberof'] as $j => $adUserGroup) { |
|
| 2035 | 2035 | if (empty($adUserGroup) === false && $j !== "count") { |
| 2036 | 2036 | $adGroup = substr($adUserGroup, 3, strpos($adUserGroup, ',') - 3); |
| 2037 | 2037 | if (in_array($adGroup, $adRoles) === false && empty($adGroup) === false) { |
@@ -2047,7 +2047,7 @@ discard block |
||
| 2047 | 2047 | // Get his ID |
| 2048 | 2048 | $userInfo = DB::queryFirstRow( |
| 2049 | 2049 | 'SELECT id, login, fonction_id, auth_type |
| 2050 | - FROM ' . prefixTable('users') . ' |
|
| 2050 | + FROM ' . prefixTable('users').' |
|
| 2051 | 2051 | WHERE login = %s', |
| 2052 | 2052 | $userLogin |
| 2053 | 2053 | ); |
@@ -2083,7 +2083,7 @@ discard block |
||
| 2083 | 2083 | |
| 2084 | 2084 | // Get all groups in Teampass |
| 2085 | 2085 | $teampassRoles = array(); |
| 2086 | - $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title')); |
|
| 2086 | + $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title')); |
|
| 2087 | 2087 | foreach ($rows as $record) { |
| 2088 | 2088 | array_push( |
| 2089 | 2089 | $teampassRoles, |
@@ -2147,7 +2147,7 @@ discard block |
||
| 2147 | 2147 | // Check if user already exists |
| 2148 | 2148 | $data = DB::query( |
| 2149 | 2149 | 'SELECT id, fonction_id, groupes_interdits, groupes_visibles |
| 2150 | - FROM ' . prefixTable('users') . ' |
|
| 2150 | + FROM ' . prefixTable('users').' |
|
| 2151 | 2151 | WHERE login = %s', |
| 2152 | 2152 | $post_login |
| 2153 | 2153 | ); |
@@ -2324,7 +2324,7 @@ discard block |
||
| 2324 | 2324 | // Check if user already exists |
| 2325 | 2325 | DB::query( |
| 2326 | 2326 | 'SELECT id |
| 2327 | - FROM ' . prefixTable('users') . ' |
|
| 2327 | + FROM ' . prefixTable('users').' |
|
| 2328 | 2328 | WHERE id = %i', |
| 2329 | 2329 | $post_id |
| 2330 | 2330 | ); |
@@ -2410,7 +2410,7 @@ discard block |
||
| 2410 | 2410 | // Check if user already exists |
| 2411 | 2411 | DB::query( |
| 2412 | 2412 | 'SELECT id |
| 2413 | - FROM ' . prefixTable('users') . ' |
|
| 2413 | + FROM ' . prefixTable('users').' |
|
| 2414 | 2414 | WHERE id = %i', |
| 2415 | 2415 | $post_id |
| 2416 | 2416 | ); |
@@ -2477,7 +2477,7 @@ discard block |
||
| 2477 | 2477 | // Search TP_USER in db |
| 2478 | 2478 | $userTP = DB::queryFirstRow( |
| 2479 | 2479 | 'SELECT pw |
| 2480 | - FROM ' . prefixTable('users') . ' |
|
| 2480 | + FROM ' . prefixTable('users').' |
|
| 2481 | 2481 | WHERE id = %i', |
| 2482 | 2482 | TP_USER_ID |
| 2483 | 2483 | ); |
@@ -2499,8 +2499,8 @@ discard block |
||
| 2499 | 2499 | 'process_type' => 'create_user_keys', |
| 2500 | 2500 | 'arguments' => json_encode([ |
| 2501 | 2501 | 'new_user_id' => (int) $post_user_id, |
| 2502 | - 'new_user_pwd' => empty($post_user_pwd) === true ? '' : cryption($post_user_pwd, '','encrypt', $SETTINGS)['string'], |
|
| 2503 | - 'new_user_code' => cryption($post_user_code, '','encrypt', $SETTINGS)['string'], |
|
| 2502 | + 'new_user_pwd' => empty($post_user_pwd) === true ? '' : cryption($post_user_pwd, '', 'encrypt', $SETTINGS)['string'], |
|
| 2503 | + 'new_user_code' => cryption($post_user_code, '', 'encrypt', $SETTINGS)['string'], |
|
| 2504 | 2504 | 'owner_id' => (int) TP_USER_ID, |
| 2505 | 2505 | 'creator_pwd' => $userTP['pw'], |
| 2506 | 2506 | 'email_body' => $lang->get('email_body_user_config_5'), |
@@ -2675,8 +2675,8 @@ discard block |
||
| 2675 | 2675 | // get user info |
| 2676 | 2676 | $processesProgress = DB::query( |
| 2677 | 2677 | 'SELECT u.ongoing_process_id, pt.task, pt.updated_at, pt.finished_at, pt.is_in_progress |
| 2678 | - FROM ' . prefixTable('users') . ' AS u |
|
| 2679 | - INNER JOIN ' . prefixTable('background_subtasks') . ' AS pt ON (pt.task_id = u.ongoing_process_id) |
|
| 2678 | + FROM ' . prefixTable('users').' AS u |
|
| 2679 | + INNER JOIN ' . prefixTable('background_subtasks').' AS pt ON (pt.task_id = u.ongoing_process_id) |
|
| 2680 | 2680 | WHERE u.id = %i', |
| 2681 | 2681 | $user_id |
| 2682 | 2682 | ); |
@@ -2684,9 +2684,9 @@ discard block |
||
| 2684 | 2684 | //print_r($processesProgress); |
| 2685 | 2685 | $finished_steps = 0; |
| 2686 | 2686 | $nb_steps = count($processesProgress); |
| 2687 | - foreach($processesProgress as $process) { |
|
| 2687 | + foreach ($processesProgress as $process) { |
|
| 2688 | 2688 | if ((int) $process['is_in_progress'] === -1) { |
| 2689 | - $finished_steps ++; |
|
| 2689 | + $finished_steps++; |
|
| 2690 | 2690 | } |
| 2691 | 2691 | } |
| 2692 | 2692 | |
@@ -2695,7 +2695,7 @@ discard block |
||
| 2695 | 2695 | 'error' => false, |
| 2696 | 2696 | 'message' => '', |
| 2697 | 2697 | 'user_id' => $user_id, |
| 2698 | - 'status' => $finished_steps === $nb_steps ? 'finished' : number_format($finished_steps/$nb_steps*100, 0).'%', |
|
| 2698 | + 'status' => $finished_steps === $nb_steps ? 'finished' : number_format($finished_steps / $nb_steps * 100, 0).'%', |
|
| 2699 | 2699 | 'debug' => $finished_steps.",".$nb_steps, |
| 2700 | 2700 | ), |
| 2701 | 2701 | 'encode' |
@@ -2785,7 +2785,7 @@ discard block |
||
| 2785 | 2785 | |
| 2786 | 2786 | // Get info about user |
| 2787 | 2787 | $data_user = DB::queryFirstRow( |
| 2788 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 2788 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 2789 | 2789 | WHERE id = %i', |
| 2790 | 2790 | $value[1] |
| 2791 | 2791 | ); |
@@ -2819,7 +2819,7 @@ discard block |
||
| 2819 | 2819 | logEvents( |
| 2820 | 2820 | $SETTINGS, |
| 2821 | 2821 | 'user_mngt', |
| 2822 | - 'at_user_new_' . $value[0] . ':' . $value[1], |
|
| 2822 | + 'at_user_new_'.$value[0].':'.$value[1], |
|
| 2823 | 2823 | (string) $session->get('user-id'), |
| 2824 | 2824 | $session->get('user-login'), |
| 2825 | 2825 | filter_input(INPUT_POST, 'id', FILTER_SANITIZE_FULL_SPECIAL_CHARS) |
@@ -2853,7 +2853,7 @@ discard block |
||
| 2853 | 2853 | |
| 2854 | 2854 | // Get info about user |
| 2855 | 2855 | $data_user = DB::queryFirstRow( |
| 2856 | - 'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 2856 | + 'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 2857 | 2857 | WHERE id = %i', |
| 2858 | 2858 | $id[1] |
| 2859 | 2859 | ); |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | ) { |
| 77 | 77 | // Not allowed page |
| 78 | 78 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 79 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 79 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 80 | 80 | exit; |
| 81 | 81 | } |
| 82 | 82 | |
@@ -461,7 +461,7 @@ discard block |
||
| 461 | 461 | ); |
| 462 | 462 | |
| 463 | 463 | // add new role to user |
| 464 | - $tmp = $data_tmp['fonction_id'] . (substr($data_tmp['fonction_id'], -1) == ';' ? $role_id : ';' . $role_id); |
|
| 464 | + $tmp = $data_tmp['fonction_id'].(substr($data_tmp['fonction_id'], -1) == ';' ? $role_id : ';'.$role_id); |
|
| 465 | 465 | $session->set('user-roles', str_replace(';;', ';', $tmp)); |
| 466 | 466 | |
| 467 | 467 | // store in DB |
@@ -649,7 +649,7 @@ discard block |
||
| 649 | 649 | $groupsData = $openLdapExtra->getADGroups($ldapConnection, $SETTINGS); |
| 650 | 650 | break; |
| 651 | 651 | default: |
| 652 | - throw new Exception("Unsupported LDAP type: " . $SETTINGS['ldap_type']); |
|
| 652 | + throw new Exception("Unsupported LDAP type: ".$SETTINGS['ldap_type']); |
|
| 653 | 653 | } |
| 654 | 654 | } catch (Exception $e) { |
| 655 | 655 | if (defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) { |
@@ -669,7 +669,7 @@ discard block |
||
| 669 | 669 | } else { |
| 670 | 670 | // Handle successful retrieval of groups |
| 671 | 671 | // exists in Teampass |
| 672 | - foreach($groupsData['userGroups'] as $key => $group) { |
|
| 672 | + foreach ($groupsData['userGroups'] as $key => $group) { |
|
| 673 | 673 | $role_detail = DB::queryFirstRow( |
| 674 | 674 | 'SELECT a.increment_id as increment_id, a.role_id as role_id, r.title as title |
| 675 | 675 | FROM '.prefixTable('ldap_groups_roles').' AS a |
@@ -694,7 +694,7 @@ discard block |
||
| 694 | 694 | |
| 695 | 695 | // Get all groups in Teampass |
| 696 | 696 | $teampassRoles = array(); |
| 697 | - $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title')); |
|
| 697 | + $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title')); |
|
| 698 | 698 | foreach ($rows as $record) { |
| 699 | 699 | array_push( |
| 700 | 700 | $teampassRoles, |
