@@ -57,16 +57,16 @@ discard block |
||
| 57 | 57 | { |
| 58 | 58 | // Load AntiXSS |
| 59 | 59 | $antiXss = new AntiXSS(); |
| 60 | - if (! headers_sent()) { //If headers not sent yet... then do php redirect |
|
| 61 | - header('Location: ' . $antiXss->xss_clean($url)); |
|
| 60 | + if (!headers_sent()) { //If headers not sent yet... then do php redirect |
|
| 61 | + header('Location: '.$antiXss->xss_clean($url)); |
|
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | //If headers are sent... do java redirect... if java disabled, do html redirect. |
| 65 | 65 | echo '<script type="text/javascript">'; |
| 66 | - echo 'window.location.href="' . $antiXss->xss_clean($url) . '";'; |
|
| 66 | + echo 'window.location.href="'.$antiXss->xss_clean($url).'";'; |
|
| 67 | 67 | echo '</script>'; |
| 68 | 68 | echo '<noscript>'; |
| 69 | - echo '<meta http-equiv="refresh" content="0;url=' . $antiXss->xss_clean($url) . '" />'; |
|
| 69 | + echo '<meta http-equiv="refresh" content="0;url='.$antiXss->xss_clean($url).'" />'; |
|
| 70 | 70 | echo '</noscript>'; |
| 71 | 71 | } |
| 72 | 72 | |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | && isset($SETTINGS['enable_sts']) === true |
| 93 | 93 | && (int) $SETTINGS['enable_sts'] === 1 |
| 94 | 94 | ) { |
| 95 | - teampassRedirect('https://' . $server['http_host'] . $server['request_uri']); |
|
| 95 | + teampassRedirect('https://'.$server['http_host'].$server['request_uri']); |
|
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | // Load pwComplexity |
@@ -113,11 +113,11 @@ discard block |
||
| 113 | 113 | // LOAD CPASSMAN SETTINGS |
| 114 | 114 | if ( |
| 115 | 115 | isset($SETTINGS['cpassman_dir']) === true |
| 116 | - && is_dir($SETTINGS['cpassman_dir'] . '/install') === true |
|
| 116 | + && is_dir($SETTINGS['cpassman_dir'].'/install') === true |
|
| 117 | 117 | ) { |
| 118 | 118 | // Should we delete folder INSTALL? |
| 119 | 119 | $row = DB::queryFirstRow( |
| 120 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type=%s AND intitule=%s', |
|
| 120 | + 'SELECT valeur FROM '.prefixTable('misc').' WHERE type=%s AND intitule=%s', |
|
| 121 | 121 | 'install', |
| 122 | 122 | 'clear_install_folder' |
| 123 | 123 | ); |
@@ -135,11 +135,11 @@ discard block |
||
| 135 | 135 | if ($directories !== false) { |
| 136 | 136 | $files = array_diff($directories, ['.', '..']); |
| 137 | 137 | foreach ($files as $file) { |
| 138 | - if (is_dir($dir . '/' . $file)) { |
|
| 139 | - delTree($dir . '/' . $file); |
|
| 138 | + if (is_dir($dir.'/'.$file)) { |
|
| 139 | + delTree($dir.'/'.$file); |
|
| 140 | 140 | } else { |
| 141 | 141 | try { |
| 142 | - unlink($dir . '/' . $file); |
|
| 142 | + unlink($dir.'/'.$file); |
|
| 143 | 143 | } catch (Exception $e) { |
| 144 | 144 | // do nothing... php will ignore and continue |
| 145 | 145 | } |
@@ -153,13 +153,13 @@ discard block |
||
| 153 | 153 | return false; |
| 154 | 154 | } |
| 155 | 155 | |
| 156 | - if (is_dir($SETTINGS['cpassman_dir'] . '/install')) { |
|
| 156 | + if (is_dir($SETTINGS['cpassman_dir'].'/install')) { |
|
| 157 | 157 | // Set the permissions on the install directory and delete |
| 158 | 158 | // is server Windows or Linux? |
| 159 | 159 | if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') { |
| 160 | - recursiveChmod($SETTINGS['cpassman_dir'] . '/install', 0755, 0440); |
|
| 160 | + recursiveChmod($SETTINGS['cpassman_dir'].'/install', 0755, 0440); |
|
| 161 | 161 | } |
| 162 | - delTree($SETTINGS['cpassman_dir'] . '/install'); |
|
| 162 | + delTree($SETTINGS['cpassman_dir'].'/install'); |
|
| 163 | 163 | } |
| 164 | 164 | |
| 165 | 165 | // Delete temporary install table |
@@ -177,10 +177,10 @@ discard block |
||
| 177 | 177 | // Load Languages stuff |
| 178 | 178 | if (isset($languagesList) === false) { |
| 179 | 179 | $languagesList = []; |
| 180 | - $rows = DB::query('SELECT * FROM ' . prefixTable('languages') . ' GROUP BY name, label, code, flag, id ORDER BY name ASC'); |
|
| 180 | + $rows = DB::query('SELECT * FROM '.prefixTable('languages').' GROUP BY name, label, code, flag, id ORDER BY name ASC'); |
|
| 181 | 181 | foreach ($rows as $record) { |
| 182 | 182 | array_push($languagesList, $record['name']); |
| 183 | - if ($session->get('user-language') === $record['name'] ) { |
|
| 183 | + if ($session->get('user-language') === $record['name']) { |
|
| 184 | 184 | $session->set('user-language_flag', $record['flag']); |
| 185 | 185 | $session->set('user-language_code', $record['code']); |
| 186 | 186 | //$session->set('user-language_label', $record['label']); |
@@ -237,7 +237,7 @@ discard block |
||
| 237 | 237 | // CHECK IF SESSION EXISTS AND IF SESSION IS VALID |
| 238 | 238 | if (empty($session->get('user-session_duration')) === false) { |
| 239 | 239 | $dataSession = DB::queryFirstRow( |
| 240 | - 'SELECT key_tempo FROM ' . prefixTable('users') . ' WHERE id=%i', |
|
| 240 | + 'SELECT key_tempo FROM '.prefixTable('users').' WHERE id=%i', |
|
| 241 | 241 | $session->get('user-id') |
| 242 | 242 | ); |
| 243 | 243 | } else { |
@@ -292,7 +292,7 @@ discard block |
||
| 292 | 292 | && ($session->has('user-admin') && $session->get('user-admin') && null !== $session->get('user-admin') && $session->get('user-admin') === 1) |
| 293 | 293 | ) { |
| 294 | 294 | $row = DB::queryFirstRow( |
| 295 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type=%s_type AND intitule=%s_intitule', |
|
| 295 | + 'SELECT valeur FROM '.prefixTable('misc').' WHERE type=%s_type AND intitule=%s_intitule', |
|
| 296 | 296 | [ |
| 297 | 297 | 'type' => 'admin', |
| 298 | 298 | 'intitule' => 'teampass_version', |
@@ -333,7 +333,7 @@ discard block |
||
| 333 | 333 | |
| 334 | 334 | syslog( |
| 335 | 335 | LOG_WARNING, |
| 336 | - 'Unlog user: ' . date('Y/m/d H:i:s') . " {$server['remote_addr']} ({$server['http_user_agent']})" |
|
| 336 | + 'Unlog user: '.date('Y/m/d H:i:s')." {$server['remote_addr']} ({$server['http_user_agent']})" |
|
| 337 | 337 | ); |
| 338 | 338 | // erase session table |
| 339 | 339 | $session->invalidate(); |
@@ -389,7 +389,7 @@ discard block |
||
| 389 | 389 | if ($session->has('user-timezone') && null !== $session->get('user-id') && empty($session->get('user-id')) === false) { |
| 390 | 390 | // query on user |
| 391 | 391 | $data = DB::queryfirstrow( |
| 392 | - 'SELECT login, admin, gestionnaire, can_manage_all_users, groupes_visibles, groupes_interdits, fonction_id, last_connexion, roles_from_ad_groups, auth_type, last_pw_change FROM ' . prefixTable('users') . ' WHERE id=%i', |
|
| 392 | + 'SELECT login, admin, gestionnaire, can_manage_all_users, groupes_visibles, groupes_interdits, fonction_id, last_connexion, roles_from_ad_groups, auth_type, last_pw_change FROM '.prefixTable('users').' WHERE id=%i', |
|
| 393 | 393 | $session->get('user-id') |
| 394 | 394 | ); |
| 395 | 395 | //Check if user has been deleted or unlogged |
@@ -436,7 +436,7 @@ discard block |
||
| 436 | 436 | $data['groupes_visibles'], |
| 437 | 437 | $data['groupes_interdits'], |
| 438 | 438 | $data['admin'], |
| 439 | - is_null($data['roles_from_ad_groups']) === true ? $data['fonction_id'] : (empty($data['roles_from_ad_groups']) === true ? $data['fonction_id'] : $data['fonction_id'] . ';' . $data['roles_from_ad_groups']), |
|
| 439 | + is_null($data['roles_from_ad_groups']) === true ? $data['fonction_id'] : (empty($data['roles_from_ad_groups']) === true ? $data['fonction_id'] : $data['fonction_id'].';'.$data['roles_from_ad_groups']), |
|
| 440 | 440 | $SETTINGS |
| 441 | 441 | ); |
| 442 | 442 | if ($session->has('user-can_create_root_folder') && (int) $session->get('user-can_create_root_folder') && null !== $session->get('user-can_create_root_folder') && (int) $session->get('user-can_create_root_folder') === 1) { |
@@ -471,7 +471,7 @@ discard block |
||
| 471 | 471 | $session->set('system-item_fields', []); |
| 472 | 472 | $rows = DB::query( |
| 473 | 473 | 'SELECT * |
| 474 | - FROM ' . prefixTable('categories') . ' |
|
| 474 | + FROM ' . prefixTable('categories').' |
|
| 475 | 475 | WHERE level=%i', |
| 476 | 476 | '0' |
| 477 | 477 | ); |
@@ -480,7 +480,7 @@ discard block |
||
| 480 | 480 | // get each field |
| 481 | 481 | $rows2 = DB::query( |
| 482 | 482 | 'SELECT * |
| 483 | - FROM ' . prefixTable('categories') . ' |
|
| 483 | + FROM ' . prefixTable('categories').' |
|
| 484 | 484 | WHERE parent_id=%i |
| 485 | 485 | ORDER BY `order` ASC', |
| 486 | 486 | $record['id'] |
@@ -567,5 +567,5 @@ discard block |
||
| 567 | 567 | } |
| 568 | 568 | |
| 569 | 569 | /* CHECK NUMBER OF USER ONLINE */ |
| 570 | -DB::query('SELECT * FROM ' . prefixTable('users') . ' WHERE timestamp>=%i', time() - 600); |
|
| 570 | +DB::query('SELECT * FROM '.prefixTable('users').' WHERE timestamp>=%i', time() - 600); |
|
| 571 | 571 | $session->set('system-nb_users_online', DB::count()); |
@@ -69,7 +69,7 @@ |
||
| 69 | 69 | // launched several times. |
| 70 | 70 | $record = DB::queryFirstRow( |
| 71 | 71 | 'SELECT * |
| 72 | - FROM ' . prefixTable('background_tasks') . ' |
|
| 72 | + FROM ' . prefixTable('background_tasks').' |
|
| 73 | 73 | WHERE is_in_progress = %i AND process_type = %s |
| 74 | 74 | ORDER BY increment_id ASC LIMIT 1', |
| 75 | 75 | 0, |
@@ -77,8 +77,9 @@ |
||
| 77 | 77 | ); |
| 78 | 78 | |
| 79 | 79 | // No more pending user_build_cache_tree tasks |
| 80 | - if (DB::count() === 0) |
|
| 81 | - exit; |
|
| 80 | + if (DB::count() === 0) { |
|
| 81 | + exit; |
|
| 82 | + } |
|
| 82 | 83 | |
| 83 | 84 | // get email properties |
| 84 | 85 | $arguments = json_decode($record['arguments'], true); |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | |
| 85 | 85 | $parentComplexity = $this->checkComplexityLevel($parentFolderData, $complexity, $parent_id); |
| 86 | 86 | if (isset($parentComplexity ['error']) && $parentComplexity['error'] === true) { |
| 87 | - return $this->errorResponse($this->lang->get('error_folder_complexity_lower_than_top_folder') . " [<b>{$this->settings['TP_PW_COMPLEXITY'][$parentComplexity['valeur']][1]}</b>]"); |
|
| 87 | + return $this->errorResponse($this->lang->get('error_folder_complexity_lower_than_top_folder')." [<b>{$this->settings['TP_PW_COMPLEXITY'][$parentComplexity['valeur']][1]}</b>]"); |
|
| 88 | 88 | } |
| 89 | 89 | |
| 90 | 90 | return $this->createFolder($params, array_merge($parentFolderData, $parentComplexity)); |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | ) { |
| 134 | 134 | DB::query( |
| 135 | 135 | 'SELECT * |
| 136 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 136 | + FROM ' . prefixTable('nested_tree').' |
|
| 137 | 137 | WHERE title = %s AND personal_folder = 0', |
| 138 | 138 | $title |
| 139 | 139 | ); |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | //check if parent folder is personal |
| 158 | 158 | $data = DB::queryfirstrow( |
| 159 | 159 | 'SELECT personal_folder, bloquer_creation, bloquer_modification |
| 160 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 160 | + FROM ' . prefixTable('nested_tree').' |
|
| 161 | 161 | WHERE id = %i', |
| 162 | 162 | $parent_id |
| 163 | 163 | ); |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | // get complexity level for this folder |
| 197 | 197 | $data = DB::queryfirstrow( |
| 198 | 198 | 'SELECT valeur |
| 199 | - FROM ' . prefixTable('misc') . ' |
|
| 199 | + FROM ' . prefixTable('misc').' |
|
| 200 | 200 | WHERE intitule = %i AND type = %s', |
| 201 | 201 | $parent_id, |
| 202 | 202 | 'complex' |
@@ -247,11 +247,11 @@ discard block |
||
| 247 | 247 | */ |
| 248 | 248 | private function canCreateFolder($isPersonal, $user_is_admin, $user_is_manager, $user_can_manage_all_users, $user_can_create_root_folder) |
| 249 | 249 | { |
| 250 | - return (int)$isPersonal === 1 || |
|
| 251 | - (int)$user_is_admin === 1 || |
|
| 252 | - ((int)$user_is_manager === 1 || (int)$user_can_manage_all_users === 1) || |
|
| 250 | + return (int) $isPersonal === 1 || |
|
| 251 | + (int) $user_is_admin === 1 || |
|
| 252 | + ((int) $user_is_manager === 1 || (int) $user_can_manage_all_users === 1) || |
|
| 253 | 253 | ($this->settings['enable_user_can_create_folders'] ?? false) || |
| 254 | - ((int)$user_can_create_root_folder === 1); |
|
| 254 | + ((int) $user_can_create_root_folder === 1); |
|
| 255 | 255 | } |
| 256 | 256 | |
| 257 | 257 | /** |
@@ -331,7 +331,7 @@ discard block |
||
| 331 | 331 | $path = ''; |
| 332 | 332 | $tree_path = $tree->getPath(0, false); |
| 333 | 333 | foreach ($tree_path as $fld) { |
| 334 | - $path .= empty($path) ? $fld->title : '/' . $fld->title; |
|
| 334 | + $path .= empty($path) ? $fld->title : '/'.$fld->title; |
|
| 335 | 335 | } |
| 336 | 336 | |
| 337 | 337 | $new_json = [ |
@@ -345,7 +345,7 @@ discard block |
||
| 345 | 345 | "is_visible_active" => 0, |
| 346 | 346 | ]; |
| 347 | 347 | |
| 348 | - $cache_tree = DB::queryFirstRow('SELECT increment_id, folders, visible_folders FROM ' . prefixTable('cache_tree') . ' WHERE user_id = %i', (int)$user_id); |
|
| 348 | + $cache_tree = DB::queryFirstRow('SELECT increment_id, folders, visible_folders FROM '.prefixTable('cache_tree').' WHERE user_id = %i', (int) $user_id); |
|
| 349 | 349 | |
| 350 | 350 | if (empty($cache_tree)) { |
| 351 | 351 | DB::insert(prefixTable('cache_tree'), [ |
@@ -365,7 +365,7 @@ discard block |
||
| 365 | 365 | 'folders' => json_encode($folders), |
| 366 | 366 | 'visible_folders' => json_encode($visible_folders), |
| 367 | 367 | 'timestamp' => time(), |
| 368 | - ], 'increment_id = %i', (int)$cache_tree['increment_id']); |
|
| 368 | + ], 'increment_id = %i', (int) $cache_tree['increment_id']); |
|
| 369 | 369 | } |
| 370 | 370 | } |
| 371 | 371 | |
@@ -375,7 +375,7 @@ discard block |
||
| 375 | 375 | private function manageFolderPermissions($parent_id, $newId, $user_roles, $access_rights, $user_is_admin) |
| 376 | 376 | { |
| 377 | 377 | if ($this->settings['subfolder_rights_as_parent'] ?? false) { |
| 378 | - $rows = DB::query('SELECT role_id, type FROM ' . prefixTable('roles_values') . ' WHERE folder_id = %i', $parent_id); |
|
| 378 | + $rows = DB::query('SELECT role_id, type FROM '.prefixTable('roles_values').' WHERE folder_id = %i', $parent_id); |
|
| 379 | 379 | foreach ($rows as $record) { |
| 380 | 380 | DB::insert(prefixTable('roles_values'), [ |
| 381 | 381 | 'role_id' => $record['role_id'], |
@@ -383,7 +383,7 @@ discard block |
||
| 383 | 383 | 'type' => $record['type'], |
| 384 | 384 | ]); |
| 385 | 385 | } |
| 386 | - } elseif ((int)$user_is_admin !== 1) { |
|
| 386 | + } elseif ((int) $user_is_admin !== 1) { |
|
| 387 | 387 | foreach (array_unique(explode(';', $user_roles)) as $role) { |
| 388 | 388 | if (!empty($role)) { |
| 389 | 389 | DB::insert(prefixTable('roles_values'), [ |
@@ -401,7 +401,7 @@ discard block |
||
| 401 | 401 | */ |
| 402 | 402 | private function copyCustomFieldsCategories($parent_id, $newId) |
| 403 | 403 | { |
| 404 | - $rows = DB::query('SELECT id_category FROM ' . prefixTable('categories_folders') . ' WHERE id_folder = %i', $parent_id); |
|
| 404 | + $rows = DB::query('SELECT id_category FROM '.prefixTable('categories_folders').' WHERE id_folder = %i', $parent_id); |
|
| 405 | 405 | foreach ($rows as $record) { |
| 406 | 406 | DB::insert(prefixTable('categories_folders'), [ |
| 407 | 407 | 'id_category' => $record['id_category'], |
@@ -426,7 +426,7 @@ discard block |
||
| 426 | 426 | // Search for existing job |
| 427 | 427 | $count = DB::queryFirstRow( |
| 428 | 428 | 'SELECT COUNT(*) AS count |
| 429 | - FROM ' . prefixTable('background_tasks') . ' |
|
| 429 | + FROM ' . prefixTable('background_tasks').' |
|
| 430 | 430 | WHERE is_in_progress = %i AND process_type = %s AND arguments = %s', |
| 431 | 431 | 0, |
| 432 | 432 | 'user_build_cache_tree', |
@@ -460,7 +460,7 @@ discard block |
||
| 460 | 460 | return [ |
| 461 | 461 | 'error' => true, |
| 462 | 462 | 'message' => $message, |
| 463 | - 'newId' => '' . $newIdSuffix, |
|
| 463 | + 'newId' => ''.$newIdSuffix, |
|
| 464 | 464 | ]; |
| 465 | 465 | } |
| 466 | 466 | } |
| 467 | 467 | \ No newline at end of file |
@@ -434,8 +434,9 @@ |
||
| 434 | 434 | )['count']; |
| 435 | 435 | |
| 436 | 436 | // Don't insert duplicates |
| 437 | - if ($count > 0) |
|
| 438 | - continue; |
|
| 437 | + if ($count > 0) { |
|
| 438 | + continue; |
|
| 439 | + } |
|
| 439 | 440 | |
| 440 | 441 | // Insert new background task |
| 441 | 442 | DB::insert( |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('oauth') === false) { |
| 72 | 72 | // Not allowed page |
| 73 | 73 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 74 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 74 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 75 | 75 | exit; |
| 76 | 76 | } |
| 77 | 77 | ?> |
@@ -215,7 +215,7 @@ discard block |
||
| 215 | 215 | }).fail(function(error) { |
| 216 | 216 | toastr.remove(); |
| 217 | 217 | toastr.error( |
| 218 | - '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + error, |
|
| 218 | + '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + error, |
|
| 219 | 219 | '', { |
| 220 | 220 | closeButton: true, |
| 221 | 221 | positionClass: 'toast-bottom-right' |
@@ -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 |
@@ -32,7 +32,7 @@ |
||
| 32 | 32 | use TeampassClasses\OAuth2Controller\OAuth2Controller; |
| 33 | 33 | use TeampassClasses\SessionManager\SessionManager; |
| 34 | 34 | |
| 35 | -require_once __DIR__. '/../../includes/config/include.php'; |
|
| 35 | +require_once __DIR__.'/../../includes/config/include.php'; |
|
| 36 | 36 | require_once __DIR__.'/../../sources/main.functions.php'; |
| 37 | 37 | |
| 38 | 38 | // init |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | |
| 68 | 68 | $processToPerform = DB::queryfirstrow( |
| 69 | 69 | 'SELECT * |
| 70 | - FROM ' . prefixTable('background_tasks') . ' |
|
| 70 | + FROM ' . prefixTable('background_tasks').' |
|
| 71 | 71 | WHERE (finished_at IS NULL OR finished_at = "") AND process_type = %s |
| 72 | 72 | ORDER BY increment_id ASC', |
| 73 | 73 | 'create_user_keys' |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | $subTaskParams = json_decode($subTask['task'], true); |
| 110 | 110 | |
| 111 | 111 | if (WIP === true) { |
| 112 | - error_log('Subtask in progress: '.$subTask['increment_id']." (".$taskId.") - "./** @scrutinizer ignore-type */ print_r($subTaskParams,true)); |
|
| 112 | + error_log('Subtask in progress: '.$subTask['increment_id']." (".$taskId.") - "./** @scrutinizer ignore-type */ print_r($subTaskParams, true)); |
|
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | // Build all subtasks if first one |
@@ -118,7 +118,7 @@ discard block |
||
| 118 | 118 | // Get total number of items |
| 119 | 119 | DB::query( |
| 120 | 120 | 'SELECT * |
| 121 | - FROM ' . prefixTable('items') . ' |
|
| 121 | + FROM ' . prefixTable('items').' |
|
| 122 | 122 | '.(isset($taskArgumentsArray['only_personal_items']) === true && $taskArgumentsArray['only_personal_items'] === 1 ? 'WHERE perso = 1' : '') |
| 123 | 123 | ); |
| 124 | 124 | createAllSubTasks($subTaskParams['step'], DB::count(), $subTaskParams['nb'], $taskId); |
@@ -127,7 +127,7 @@ discard block |
||
| 127 | 127 | // Get total number of items |
| 128 | 128 | DB::query( |
| 129 | 129 | 'SELECT * |
| 130 | - FROM ' . prefixTable('log_items') . ' |
|
| 130 | + FROM ' . prefixTable('log_items').' |
|
| 131 | 131 | WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"' |
| 132 | 132 | ); |
| 133 | 133 | createAllSubTasks($subTaskParams['step'], DB::count(), $subTaskParams['nb'], $taskId); |
@@ -136,7 +136,7 @@ discard block |
||
| 136 | 136 | // Get total number of items |
| 137 | 137 | DB::query( |
| 138 | 138 | 'SELECT * |
| 139 | - FROM ' . prefixTable('categories_items') . ' |
|
| 139 | + FROM ' . prefixTable('categories_items').' |
|
| 140 | 140 | WHERE encryption_type = "teampass_aes"' |
| 141 | 141 | ); |
| 142 | 142 | createAllSubTasks($subTaskParams['step'], DB::count(), $subTaskParams['nb'], $taskId); |
@@ -153,9 +153,9 @@ discard block |
||
| 153 | 153 | // Get total number of items |
| 154 | 154 | DB::query( |
| 155 | 155 | 'SELECT * |
| 156 | - FROM ' . prefixTable('files') . ' AS f |
|
| 157 | - INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = f.id_item |
|
| 158 | - WHERE f.status = "' . TP_ENCRYPTION_NAME . '"' |
|
| 156 | + FROM ' . prefixTable('files').' AS f |
|
| 157 | + INNER JOIN ' . prefixTable('items').' AS i ON i.id = f.id_item |
|
| 158 | + WHERE f.status = "' . TP_ENCRYPTION_NAME.'"' |
|
| 159 | 159 | ); |
| 160 | 160 | createAllSubTasks($subTaskParams['step'], DB::count(), $subTaskParams['nb'], $taskId); |
| 161 | 161 | } |
@@ -182,7 +182,7 @@ discard block |
||
| 182 | 182 | // Check if subtasks have to be created |
| 183 | 183 | DB::query( |
| 184 | 184 | 'SELECT * |
| 185 | - FROM ' . prefixTable('background_subtasks') . ' |
|
| 185 | + FROM ' . prefixTable('background_subtasks').' |
|
| 186 | 186 | WHERE task_id = %i AND task LIKE %ss', |
| 187 | 187 | $taskId, |
| 188 | 188 | $action |
@@ -210,7 +210,7 @@ discard block |
||
| 210 | 210 | function countActiveSymfonyProcesses() { |
| 211 | 211 | // Count the number of active processes |
| 212 | 212 | return DB::queryFirstField( |
| 213 | - 'SELECT COUNT(*) FROM ' . prefixTable('background_subtasks') . |
|
| 213 | + 'SELECT COUNT(*) FROM '.prefixTable('background_subtasks'). |
|
| 214 | 214 | ' WHERE process_id IS NOT NULL AND finished_at IS NULL' |
| 215 | 215 | ); |
| 216 | 216 | } |
@@ -221,7 +221,7 @@ discard block |
||
| 221 | 221 | function getSubTasks($taskId) { |
| 222 | 222 | $task_to_perform = DB::query( |
| 223 | 223 | 'SELECT * |
| 224 | - FROM ' . prefixTable('background_subtasks') . ' |
|
| 224 | + FROM ' . prefixTable('background_subtasks').' |
|
| 225 | 225 | WHERE task_id = %i AND finished_at IS NULL |
| 226 | 226 | ORDER BY increment_id ASC', |
| 227 | 227 | $taskId |
@@ -270,7 +270,7 @@ discard block |
||
| 270 | 270 | function reloadSubTask($subTaskId) { |
| 271 | 271 | // Retrieve subtask information from the database |
| 272 | 272 | $subTask = DB::queryFirstRow( |
| 273 | - 'SELECT * FROM ' . prefixTable('background_subtasks') . ' WHERE increment_id = %i', |
|
| 273 | + 'SELECT * FROM '.prefixTable('background_subtasks').' WHERE increment_id = %i', |
|
| 274 | 274 | $subTaskId |
| 275 | 275 | ); |
| 276 | 276 | |
@@ -315,7 +315,7 @@ discard block |
||
| 315 | 315 | // Get all processes |
| 316 | 316 | $subtasks = DB::query( |
| 317 | 317 | 'SELECT * |
| 318 | - FROM ' . prefixTable('background_subtasks') . ' |
|
| 318 | + FROM ' . prefixTable('background_subtasks').' |
|
| 319 | 319 | WHERE process_id IS NOT NULL AND finished_at IS NULL' |
| 320 | 320 | ); |
| 321 | 321 | |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | function purgeTemporaryFiles(): void |
| 72 | 72 | { |
| 73 | 73 | // Load expected files |
| 74 | - require_once __DIR__. '/../sources/main.functions.php'; |
|
| 74 | + require_once __DIR__.'/../sources/main.functions.php'; |
|
| 75 | 75 | |
| 76 | 76 | // $SETTINGS is set then read folder |
| 77 | 77 | if (is_dir($SETTINGS['path_to_files_folder']) === true) { |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | //delete file FILES |
| 81 | 81 | while (false !== ($f = readdir($dir))) { |
| 82 | 82 | if ($f !== '.' && $f !== '..' && $f !== '.htaccess') { |
| 83 | - $filePath = $SETTINGS['path_to_files_folder'] . '/' . $f; |
|
| 83 | + $filePath = $SETTINGS['path_to_files_folder'].'/'.$f; |
|
| 84 | 84 | if (file_exists($filePath) && ((time() - filectime($filePath)) > 604800)) { |
| 85 | 85 | fileDelete($filePath, $SETTINGS); |
| 86 | 86 | } |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | while (false !== ($f = readdir($dir))) { |
| 102 | 102 | if ($f !== '.' && $f !== '..') { |
| 103 | 103 | if (strpos($f, '_delete.') > 0) { |
| 104 | - fileDelete($SETTINGS['path_to_upload_folder'] . '/' . $f, $SETTINGS); |
|
| 104 | + fileDelete($SETTINGS['path_to_upload_folder'].'/'.$f, $SETTINGS); |
|
| 105 | 105 | } |
| 106 | 106 | } |
| 107 | 107 | } |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | ) { |
| 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 | |
@@ -125,7 +125,7 @@ discard block |
||
| 125 | 125 | ); |
| 126 | 126 | |
| 127 | 127 | $lastFolderChange = DB::queryfirstrow( |
| 128 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' |
|
| 128 | + 'SELECT valeur FROM '.prefixTable('misc').' |
|
| 129 | 129 | WHERE type = %s AND intitule = %s', |
| 130 | 130 | 'timestamp', |
| 131 | 131 | 'last_folder_change' |
@@ -346,7 +346,7 @@ discard block |
||
| 346 | 346 | $nbItemsInSubfolders = (int) $node->nb_items_in_subfolders; |
| 347 | 347 | $nbItemsInFolder = (int) $node->nb_items_in_folder; |
| 348 | 348 | $nbSubfolders = (int) $node->nb_subfolders; |
| 349 | - break; // Get out as soon as we find a valid node. |
|
| 349 | + break; // Get out as soon as we find a valid node. |
|
| 350 | 350 | } |
| 351 | 351 | |
| 352 | 352 | if ($displayThisNode === true) { |
@@ -458,7 +458,7 @@ discard block |
||
| 458 | 458 | foreach ($currentNode->children as $child) { |
| 459 | 459 | recursiveTree( |
| 460 | 460 | (int) $child, |
| 461 | - $tree->getNode($child),// get node info for this child |
|
| 461 | + $tree->getNode($child), // get node info for this child |
|
| 462 | 462 | /** @scrutinizer ignore-type */ $tree, |
| 463 | 463 | $listFoldersLimitedKeys, |
| 464 | 464 | $listRestrictedFoldersForItemsKeys, |
@@ -505,7 +505,7 @@ discard block |
||
| 505 | 505 | $lang = new Language($session->get('user-language') ?? 'english'); |
| 506 | 506 | |
| 507 | 507 | // prepare json return for current node |
| 508 | - $parent = $currentNode->parent_id === '0' ? '#' : 'li_' . $currentNode->parent_id; |
|
| 508 | + $parent = $currentNode->parent_id === '0' ? '#' : 'li_'.$currentNode->parent_id; |
|
| 509 | 509 | |
| 510 | 510 | // handle displaying |
| 511 | 511 | if (isKeyExistingAndEqual('show_only_accessible_folders', 1, $SETTINGS) === true) { |
@@ -522,17 +522,17 @@ discard block |
||
| 522 | 522 | array_push( |
| 523 | 523 | $ret_json, |
| 524 | 524 | array( |
| 525 | - 'id' => 'li_' . $nodeId, |
|
| 525 | + 'id' => 'li_'.$nodeId, |
|
| 526 | 526 | 'parent' => $last_visible_parent === -1 ? $parent : $last_visible_parent, |
| 527 | 527 | 'text' => '<i class="'.$currentNode->fa_icon.' tree-folder mr-2" data-folder="'.$currentNode->fa_icon.'" data-folder-selected="'.$currentNode->fa_icon_selected.'"></i>'.$text.htmlspecialchars($currentNode->title).$nodeData['html'], |
| 528 | 528 | 'li_attr' => array( |
| 529 | 529 | 'class' => 'jstreeopen', |
| 530 | - 'title' => 'ID [' . $nodeId . '] ' . $nodeData['title'], |
|
| 530 | + 'title' => 'ID ['.$nodeId.'] '.$nodeData['title'], |
|
| 531 | 531 | ), |
| 532 | 532 | 'a_attr' => array( |
| 533 | - 'id' => 'fld_' . $nodeId, |
|
| 533 | + 'id' => 'fld_'.$nodeId, |
|
| 534 | 534 | 'class' => $nodeData['folderClass'], |
| 535 | - 'onclick' => 'ListerItems(' . $nodeId . ', ' . $nodeData['restricted'] . ', 0, 1)', |
|
| 535 | + 'onclick' => 'ListerItems('.$nodeId.', '.$nodeData['restricted'].', 0, 1)', |
|
| 536 | 536 | 'data-title' => htmlspecialchars($currentNode->title), |
| 537 | 537 | ), |
| 538 | 538 | 'is_pf' => in_array($nodeId, $inputData['personalFolders']) === true ? 1 : 0, |
@@ -548,12 +548,12 @@ discard block |
||
| 548 | 548 | array_push( |
| 549 | 549 | $ret_json, |
| 550 | 550 | array( |
| 551 | - 'id' => 'li_' . $nodeId, |
|
| 551 | + 'id' => 'li_'.$nodeId, |
|
| 552 | 552 | 'parent' => $last_visible_parent === -1 ? $parent : $last_visible_parent, |
| 553 | 553 | 'text' => '<i class="'.$currentNode->fa_icon.' tree-folder mr-2" data-folder="'.$currentNode->fa_icon.'" data-folder-selected="'.$currentNode->fa_icon_selected.'"></i>'.'<i class="fas fa-times fa-xs text-danger mr-1 ml-1"></i>'.$text.htmlspecialchars($currentNode->title).$nodeData['html'], |
| 554 | 554 | 'li_attr' => array( |
| 555 | 555 | 'class' => '', |
| 556 | - 'title' => 'ID [' . $nodeId . '] ' . $lang->get('no_access'), |
|
| 556 | + 'title' => 'ID ['.$nodeId.'] '.$lang->get('no_access'), |
|
| 557 | 557 | ), |
| 558 | 558 | ) |
| 559 | 559 | ); |
@@ -613,7 +613,7 @@ discard block |
||
| 613 | 613 | if (in_array($nodeId, $session_read_only_folders) === true) { |
| 614 | 614 | return [ |
| 615 | 615 | 'html' => '<i class="far fa-eye fa-xs mr-1 ml-1"></i>'. |
| 616 | - ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . $nbItemsInFolder .'/'.$nbItemsInSubfolders .'/'.$nbSubfolders. '</span>' : ''), |
|
| 616 | + ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.$nbItemsInFolder.'/'.$nbItemsInSubfolders.'/'.$nbSubfolders.'</span>' : ''), |
|
| 617 | 617 | 'title' => $lang->get('read_only_account'), |
| 618 | 618 | 'restricted' => 1, |
| 619 | 619 | 'folderClass' => 'folder_not_droppable', |
@@ -628,7 +628,7 @@ discard block |
||
| 628 | 628 | ) { |
| 629 | 629 | return [ |
| 630 | 630 | 'html' => '<i class="far fa-eye fa-xs mr-1"></i>'. |
| 631 | - ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . $nbItemsInFolder .'/'.$nbItemsInSubfolders .'/'.$nbSubfolders. '</span>' : ''), |
|
| 631 | + ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.$nbItemsInFolder.'/'.$nbItemsInSubfolders.'/'.$nbSubfolders.'</span>' : ''), |
|
| 632 | 632 | 'title' => $lang->get('read_only_account'), |
| 633 | 633 | 'restricted' => 0, |
| 634 | 634 | 'folderClass' => 'folder', |
@@ -639,7 +639,7 @@ discard block |
||
| 639 | 639 | } |
| 640 | 640 | |
| 641 | 641 | return [ |
| 642 | - 'html' => ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . $nbItemsInFolder .'/'.$nbItemsInSubfolders .'/'.$nbSubfolders. '</span>' : ''), |
|
| 642 | + 'html' => ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.$nbItemsInFolder.'/'.$nbItemsInSubfolders.'/'.$nbSubfolders.'</span>' : ''), |
|
| 643 | 643 | 'title' => '', |
| 644 | 644 | 'restricted' => 0, |
| 645 | 645 | 'folderClass' => 'folder', |
@@ -650,8 +650,8 @@ discard block |
||
| 650 | 650 | |
| 651 | 651 | } elseif (in_array($nodeId, $listFoldersLimitedKeys) === true) { |
| 652 | 652 | return [ |
| 653 | - 'html' => ($session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : '') . |
|
| 654 | - ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . count($session_list_folders_limited[$nodeId]) . '</span>' : ''), |
|
| 653 | + 'html' => ($session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : ''). |
|
| 654 | + ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.count($session_list_folders_limited[$nodeId]).'</span>' : ''), |
|
| 655 | 655 | 'title' => '', |
| 656 | 656 | 'restricted' => 1, |
| 657 | 657 | 'folderClass' => 'folder', |
@@ -662,8 +662,8 @@ discard block |
||
| 662 | 662 | |
| 663 | 663 | } elseif (in_array($nodeId, $listRestrictedFoldersForItemsKeys) === true) { |
| 664 | 664 | return [ |
| 665 | - 'html' => $session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : '' . |
|
| 666 | - '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . count($session_list_restricted_folders_for_items[$nodeId]) . '</span>', |
|
| 665 | + 'html' => $session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : ''. |
|
| 666 | + '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.count($session_list_restricted_folders_for_items[$nodeId]).'</span>', |
|
| 667 | 667 | 'title' => '', |
| 668 | 668 | 'restricted' => 1, |
| 669 | 669 | 'folderClass' => 'folder', |
@@ -773,7 +773,7 @@ discard block |
||
| 773 | 773 | // Does this user has a tree cache |
| 774 | 774 | $userCacheTree = DB::queryfirstrow( |
| 775 | 775 | 'SELECT data |
| 776 | - FROM ' . prefixTable('cache_tree') . ' |
|
| 776 | + FROM ' . prefixTable('cache_tree').' |
|
| 777 | 777 | WHERE user_id = %i', |
| 778 | 778 | $userId |
| 779 | 779 | ); |