@@ -71,7 +71,7 @@ |
||
| 71 | 71 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('utilities.logs') === 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 | ?> |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | ) { |
| 68 | 68 | // Not allowed page |
| 69 | 69 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 70 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 70 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 71 | 71 | exit; |
| 72 | 72 | } |
| 73 | 73 | |
@@ -538,8 +538,7 @@ discard block |
||
| 538 | 538 | $post_masked = filter_var($dataReceived['masked'], FILTER_SANITIZE_FULL_SPECIAL_CHARS); |
| 539 | 539 | $post_encrypted = filter_var($dataReceived['encrypted'], FILTER_SANITIZE_FULL_SPECIAL_CHARS); |
| 540 | 540 | $post_roles = filter_var_array($dataReceived['roles'], FILTER_SANITIZE_FULL_SPECIAL_CHARS); |
| 541 | - $post_fieldId = isset($dataReceived['fieldId']) === false ? '' : |
|
| 542 | - filter_var($dataReceived['fieldId'], FILTER_SANITIZE_NUMBER_INT); |
|
| 541 | + $post_fieldId = isset($dataReceived['fieldId']) === false ? '' : filter_var($dataReceived['fieldId'], FILTER_SANITIZE_NUMBER_INT); |
|
| 543 | 542 | |
| 544 | 543 | if (empty($post_fieldId) === false) { |
| 545 | 544 | // UPDATE FIELD |
@@ -555,7 +554,7 @@ discard block |
||
| 555 | 554 | 'encrypted_data' => $post_encrypted, |
| 556 | 555 | 'is_mandatory' => $post_mandatory, |
| 557 | 556 | 'masked' => $post_masked, |
| 558 | - 'role_visibility' => is_null($post_roles) === true || count($post_roles) ===0 ? '' : implode(',', $post_roles), |
|
| 557 | + 'role_visibility' => is_null($post_roles) === true || count($post_roles) === 0 ? '' : implode(',', $post_roles), |
|
| 559 | 558 | 'order' => calculateOrder($post_fieldId, $post_order), |
| 560 | 559 | ), |
| 561 | 560 | 'id = %i', |
@@ -69,7 +69,7 @@ |
||
| 69 | 69 | ) { |
| 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 | |
@@ -69,7 +69,7 @@ |
||
| 69 | 69 | ) { |
| 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 | |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('backups') === 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 | ?> |
@@ -137,7 +137,7 @@ discard block |
||
| 137 | 137 | // ERROR |
| 138 | 138 | toastr.remove(); |
| 139 | 139 | toastr.error( |
| 140 | - '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error, |
|
| 140 | + '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error, |
|
| 141 | 141 | '<?php echo $lang->get('error'); ?>', { |
| 142 | 142 | timeOut: 5000, |
| 143 | 143 | progressBar: true |
@@ -164,7 +164,7 @@ discard block |
||
| 164 | 164 | // error |
| 165 | 165 | toastr.remove(); |
| 166 | 166 | toastr.error( |
| 167 | - '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error, |
|
| 167 | + '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error, |
|
| 168 | 168 | '<?php echo $lang->get('error'); ?>', { |
| 169 | 169 | timeOut: 5000, |
| 170 | 170 | progressBar: true |
@@ -235,7 +235,7 @@ discard block |
||
| 235 | 235 | // ERROR |
| 236 | 236 | toastr.remove(); |
| 237 | 237 | toastr.error( |
| 238 | - '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error, |
|
| 238 | + '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error, |
|
| 239 | 239 | '<?php echo $lang->get('error'); ?>', { |
| 240 | 240 | timeOut: 5000, |
| 241 | 241 | progressBar: true |
@@ -271,7 +271,7 @@ discard block |
||
| 271 | 271 | // PREPARE UPLOADER with plupload |
| 272 | 272 | <?php |
| 273 | 273 | $maxFileSize = (strrpos($SETTINGS['upload_maxfilesize'], 'mb') === false) |
| 274 | - ? $SETTINGS['upload_maxfilesize'] . 'mb' |
|
| 274 | + ? $SETTINGS['upload_maxfilesize'].'mb' |
|
| 275 | 275 | : $SETTINGS['upload_maxfilesize']; |
| 276 | 276 | ?> |
| 277 | 277 | |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('utilities.logs') === false) { |
| 67 | 67 | // Not allowed page |
| 68 | 68 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 69 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 69 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 70 | 70 | exit; |
| 71 | 71 | } |
| 72 | 72 | |
@@ -203,7 +203,7 @@ discard block |
||
| 203 | 203 | echo $session->has('user-admin') && (int) $session->get('user-admin') && null !== $session->get('user-admin') && (int) $session->get('user-admin') === 1 ? '' : ' hidden'; |
| 204 | 204 | ?>"> |
| 205 | 205 | <div class="form-group"> |
| 206 | - <h5><i class="fas fa-broom mr-2"></i><?php echo $lang->get('purge') . ' ' . $lang->get('date_range'); ?></h5> |
|
| 206 | + <h5><i class="fas fa-broom mr-2"></i><?php echo $lang->get('purge').' '.$lang->get('date_range'); ?></h5> |
|
| 207 | 207 | <div class="input-group"> |
| 208 | 208 | <div class="input-group-prepend"> |
| 209 | 209 | <span class="input-group-text"> |
@@ -226,7 +226,7 @@ discard block |
||
| 226 | 226 | <select class="form-control" id="purge-filter-user"> |
| 227 | 227 | <option value="-1"><?php echo $lang->get('all'); ?></option> |
| 228 | 228 | <?php |
| 229 | - $rows = DB::query('SELECT id, name, lastname FROM ' . prefixTable('users') . ' WHERE admin = 0'); |
|
| 229 | + $rows = DB::query('SELECT id, name, lastname FROM '.prefixTable('users').' WHERE admin = 0'); |
|
| 230 | 230 | foreach ($rows as $record) { |
| 231 | 231 | echo ' |
| 232 | 232 | <option value="'.$record['id'].'">'.$record['name'].' '.$record['lastname'].'</option>'; |
@@ -60,7 +60,7 @@ |
||
| 60 | 60 | // Update table by deleting ID |
| 61 | 61 | if ($session->has('user-id') && null !== $session->get('user-id')) { |
| 62 | 62 | DB::update( |
| 63 | - DB_PREFIX . 'users', |
|
| 63 | + DB_PREFIX.'users', |
|
| 64 | 64 | [ |
| 65 | 65 | 'key_tempo' => '', |
| 66 | 66 | ], |
@@ -2225,7 +2225,7 @@ discard block |
||
| 2225 | 2225 | * <tt>exec("find ".$path." -type d -exec chmod 755 {} \;");</tt> |
| 2226 | 2226 | * |
| 2227 | 2227 | * @author Jeppe Toustrup (tenzer at tenzer dot dk) |
| 2228 | - * |
|
| 2228 | + * |
|
| 2229 | 2229 | * @param string $path An either relative or absolute path to a file or directory which should be processed. |
| 2230 | 2230 | * @param int $filePerm The permissions any found files should get. |
| 2231 | 2231 | * @param int $dirPerm The permissions any found folder should get. |
@@ -3848,7 +3848,6 @@ discard block |
||
| 3848 | 3848 | * @param integer $processId |
| 3849 | 3849 | * @param integer $nbItemsToTreat |
| 3850 | 3850 | * @return void |
| 3851 | - |
|
| 3852 | 3851 | */ |
| 3853 | 3852 | function createUserTasks($processId, $nbItemsToTreat): void |
| 3854 | 3853 | { |
@@ -2366,7 +2366,9 @@ discard block |
||
| 2366 | 2366 | function encryptUserObjectKey(string $key, string $publicKey): string |
| 2367 | 2367 | { |
| 2368 | 2368 | // Empty password |
| 2369 | - if (empty($key)) return ''; |
|
| 2369 | + if (empty($key)) { |
|
| 2370 | + return ''; |
|
| 2371 | + } |
|
| 2370 | 2372 | |
| 2371 | 2373 | // Sanitize |
| 2372 | 2374 | $antiXss = new AntiXSS(); |
@@ -2515,7 +2517,9 @@ discard block |
||
| 2515 | 2517 | ]; |
| 2516 | 2518 | } |
| 2517 | 2519 | |
| 2518 | - if (WIP) error_log('DEBUG: File image url -> '.filter_var($safeFilePath, FILTER_SANITIZE_URL)); |
|
| 2520 | + if (WIP) { |
|
| 2521 | + error_log('DEBUG: File image url -> '.filter_var($safeFilePath, FILTER_SANITIZE_URL)); |
|
| 2522 | + } |
|
| 2519 | 2523 | |
| 2520 | 2524 | // Decrypt file content and return |
| 2521 | 2525 | return base64_encode($cipher->decrypt($ciphertext)); |
@@ -2650,7 +2654,9 @@ discard block |
||
| 2650 | 2654 | foreach ($users as $user) { |
| 2651 | 2655 | // Insert in DB the new object key for this item by user |
| 2652 | 2656 | if (count($objectKeyArray) === 0) { |
| 2653 | - if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case1 - ' . $object_name . ' - ' . $post_object_id . ' - ' . $user['id'] . ' - ' . $objectKey); |
|
| 2657 | + if (WIP === true) { |
|
| 2658 | + error_log('TEAMPASS Debug - storeUsersShareKey case1 - ' . $object_name . ' - ' . $post_object_id . ' - ' . $user['id'] . ' - ' . $objectKey); |
|
| 2659 | + } |
|
| 2654 | 2660 | DB::insert( |
| 2655 | 2661 | $object_name, |
| 2656 | 2662 | [ |
@@ -2664,7 +2670,9 @@ discard block |
||
| 2664 | 2670 | ); |
| 2665 | 2671 | } else { |
| 2666 | 2672 | foreach ($objectKeyArray as $object) { |
| 2667 | - if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case2 - ' . $object_name . ' - ' . $object['objectId'] . ' - ' . $user['id'] . ' - ' . $object['objectKey']); |
|
| 2673 | + if (WIP === true) { |
|
| 2674 | + error_log('TEAMPASS Debug - storeUsersShareKey case2 - ' . $object_name . ' - ' . $object['objectId'] . ' - ' . $user['id'] . ' - ' . $object['objectKey']); |
|
| 2675 | + } |
|
| 2668 | 2676 | DB::insert( |
| 2669 | 2677 | $object_name, |
| 2670 | 2678 | [ |
@@ -3990,7 +3998,9 @@ discard block |
||
| 3990 | 3998 | $taskName = [$taskName]; |
| 3991 | 3999 | } |
| 3992 | 4000 | foreach($taskName as $task) { |
| 3993 | - if (WIP === true) error_log('createTaskForItem - task: '.$task); |
|
| 4001 | + if (WIP === true) { |
|
| 4002 | + error_log('createTaskForItem - task: '.$task); |
|
| 4003 | + } |
|
| 3994 | 4004 | switch ($task) { |
| 3995 | 4005 | case 'item_password': |
| 3996 | 4006 | |
@@ -4421,19 +4431,22 @@ discard block |
||
| 4421 | 4431 | |
| 4422 | 4432 | // Organisation name (removed username@ and .tld) |
| 4423 | 4433 | $domain = explode('.', $emailParts[1]); |
| 4424 | - if (count($domain) > 1) |
|
| 4425 | - $forbiddenWords[] = $domain[0]; |
|
| 4434 | + if (count($domain) > 1) { |
|
| 4435 | + $forbiddenWords[] = $domain[0]; |
|
| 4436 | + } |
|
| 4426 | 4437 | } |
| 4427 | 4438 | } |
| 4428 | 4439 | |
| 4429 | 4440 | // Search forbidden words in password |
| 4430 | 4441 | foreach ($forbiddenWords as $word) { |
| 4431 | - if (empty($word)) |
|
| 4432 | - continue; |
|
| 4442 | + if (empty($word)) { |
|
| 4443 | + continue; |
|
| 4444 | + } |
|
| 4433 | 4445 | |
| 4434 | 4446 | // Stop if forbidden word found in password |
| 4435 | - if (stripos($password, $word) !== false) |
|
| 4436 | - return false; |
|
| 4447 | + if (stripos($password, $word) !== false) { |
|
| 4448 | + return false; |
|
| 4449 | + } |
|
| 4437 | 4450 | } |
| 4438 | 4451 | |
| 4439 | 4452 | // Get password complexity |
@@ -99,19 +99,19 @@ discard block |
||
| 99 | 99 | $text = Crypto::decrypt($message, $key); |
| 100 | 100 | } |
| 101 | 101 | } catch (CryptoException\WrongKeyOrModifiedCiphertextException $ex) { |
| 102 | - error_log('TEAMPASS-Error-Wrong key or modified ciphertext: ' . $ex->getMessage()); |
|
| 102 | + error_log('TEAMPASS-Error-Wrong key or modified ciphertext: '.$ex->getMessage()); |
|
| 103 | 103 | $err = 'wrong_key_or_modified_ciphertext'; |
| 104 | 104 | } catch (CryptoException\BadFormatException $ex) { |
| 105 | - error_log('TEAMPASS-Error-Bad format exception: ' . $ex->getMessage()); |
|
| 105 | + error_log('TEAMPASS-Error-Bad format exception: '.$ex->getMessage()); |
|
| 106 | 106 | $err = 'bad_format'; |
| 107 | 107 | } catch (CryptoException\EnvironmentIsBrokenException $ex) { |
| 108 | - error_log('TEAMPASS-Error-Environment: ' . $ex->getMessage()); |
|
| 108 | + error_log('TEAMPASS-Error-Environment: '.$ex->getMessage()); |
|
| 109 | 109 | $err = 'environment_error'; |
| 110 | 110 | } catch (CryptoException\IOException $ex) { |
| 111 | - error_log('TEAMPASS-Error-IO: ' . $ex->getMessage()); |
|
| 111 | + error_log('TEAMPASS-Error-IO: '.$ex->getMessage()); |
|
| 112 | 112 | $err = 'io_error'; |
| 113 | 113 | } catch (Exception $ex) { |
| 114 | - error_log('TEAMPASS-Error-Unexpected exception: ' . $ex->getMessage()); |
|
| 114 | + error_log('TEAMPASS-Error-Unexpected exception: '.$ex->getMessage()); |
|
| 115 | 115 | $err = 'unexpected_error'; |
| 116 | 116 | } |
| 117 | 117 | |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | */ |
| 197 | 197 | function trimElement($chaine, string $element): string |
| 198 | 198 | { |
| 199 | - if (! empty($chaine)) { |
|
| 199 | + if (!empty($chaine)) { |
|
| 200 | 200 | if (is_array($chaine) === true) { |
| 201 | 201 | $chaine = implode(';', $chaine); |
| 202 | 202 | } |
@@ -244,8 +244,8 @@ discard block |
||
| 244 | 244 | */ |
| 245 | 245 | function db_error_handler(array $params): void |
| 246 | 246 | { |
| 247 | - echo 'Error: ' . $params['error'] . "<br>\n"; |
|
| 248 | - echo 'Query: ' . $params['query'] . "<br>\n"; |
|
| 247 | + echo 'Error: '.$params['error']."<br>\n"; |
|
| 248 | + echo 'Query: '.$params['query']."<br>\n"; |
|
| 249 | 249 | throw new Exception('Error - Query', 1); |
| 250 | 250 | } |
| 251 | 251 | |
@@ -323,7 +323,7 @@ discard block |
||
| 323 | 323 | $session->set('user-forbiden_personal_folders', []); |
| 324 | 324 | |
| 325 | 325 | // Get list of Folders |
| 326 | - $rows = DB::query('SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', 0); |
|
| 326 | + $rows = DB::query('SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', 0); |
|
| 327 | 327 | foreach ($rows as $record) { |
| 328 | 328 | array_push($groupesVisibles, $record['id']); |
| 329 | 329 | } |
@@ -332,20 +332,20 @@ discard block |
||
| 332 | 332 | // get complete list of ROLES |
| 333 | 333 | $tmp = explode(';', $idFonctions); |
| 334 | 334 | $rows = DB::query( |
| 335 | - 'SELECT * FROM ' . prefixTable('roles_title') . ' |
|
| 335 | + 'SELECT * FROM '.prefixTable('roles_title').' |
|
| 336 | 336 | ORDER BY title ASC' |
| 337 | 337 | ); |
| 338 | 338 | foreach ($rows as $record) { |
| 339 | - if (! empty($record['id']) && ! in_array($record['id'], $tmp)) { |
|
| 339 | + if (!empty($record['id']) && !in_array($record['id'], $tmp)) { |
|
| 340 | 340 | array_push($tmp, $record['id']); |
| 341 | 341 | } |
| 342 | 342 | } |
| 343 | 343 | $session->set('user-roles', implode(';', $tmp)); |
| 344 | 344 | $session->set('user-admin', 1); |
| 345 | 345 | // Check if admin has created Folders and Roles |
| 346 | - DB::query('SELECT * FROM ' . prefixTable('nested_tree') . ''); |
|
| 346 | + DB::query('SELECT * FROM '.prefixTable('nested_tree').''); |
|
| 347 | 347 | $session->set('user-nb_folders', DB::count()); |
| 348 | - DB::query('SELECT * FROM ' . prefixTable('roles_title')); |
|
| 348 | + DB::query('SELECT * FROM '.prefixTable('roles_title')); |
|
| 349 | 349 | $session->set('user-nb_roles', DB::count()); |
| 350 | 350 | |
| 351 | 351 | return true; |
@@ -428,7 +428,7 @@ discard block |
||
| 428 | 428 | // Does this user is allowed to see other items |
| 429 | 429 | $inc = 0; |
| 430 | 430 | $rows = DB::query( |
| 431 | - 'SELECT id, id_tree FROM ' . prefixTable('items') . ' |
|
| 431 | + 'SELECT id, id_tree FROM '.prefixTable('items').' |
|
| 432 | 432 | WHERE restricted_to LIKE %ss AND inactif = %s'. |
| 433 | 433 | (count($allowedFolders) > 0 ? ' AND id_tree NOT IN ('.implode(',', $allowedFolders).')' : ''), |
| 434 | 434 | $globalsUserId, |
@@ -445,8 +445,8 @@ discard block |
||
| 445 | 445 | // Check for the users roles if some specific rights exist on items |
| 446 | 446 | $rows = DB::query( |
| 447 | 447 | 'SELECT i.id_tree, r.item_id |
| 448 | - FROM ' . prefixTable('items') . ' as i |
|
| 449 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' as r ON (r.item_id=i.id) |
|
| 448 | + FROM ' . prefixTable('items').' as i |
|
| 449 | + INNER JOIN ' . prefixTable('restriction_to_roles').' as r ON (r.item_id=i.id) |
|
| 450 | 450 | WHERE i.id_tree <> "" '. |
| 451 | 451 | (count($userRoles) > 0 ? 'AND r.role_id IN %li ' : ''). |
| 452 | 452 | 'ORDER BY i.id_tree ASC', |
@@ -490,18 +490,18 @@ discard block |
||
| 490 | 490 | $session->set('system-list_restricted_folders_for_items', $restrictedFoldersForItems); |
| 491 | 491 | $session->set('user-forbiden_personal_folders', $noAccessPersonalFolders); |
| 492 | 492 | // Folders and Roles numbers |
| 493 | - DB::queryFirstRow('SELECT id FROM ' . prefixTable('nested_tree') . ''); |
|
| 494 | - DB::queryFirstRow('SELECT id FROM ' . prefixTable('nested_tree') . ''); |
|
| 493 | + DB::queryFirstRow('SELECT id FROM '.prefixTable('nested_tree').''); |
|
| 494 | + DB::queryFirstRow('SELECT id FROM '.prefixTable('nested_tree').''); |
|
| 495 | 495 | $session->set('user-nb_folders', DB::count()); |
| 496 | - DB::queryFirstRow('SELECT id FROM ' . prefixTable('roles_title')); |
|
| 497 | - DB::queryFirstRow('SELECT id FROM ' . prefixTable('roles_title')); |
|
| 496 | + DB::queryFirstRow('SELECT id FROM '.prefixTable('roles_title')); |
|
| 497 | + DB::queryFirstRow('SELECT id FROM '.prefixTable('roles_title')); |
|
| 498 | 498 | $session->set('user-nb_roles', DB::count()); |
| 499 | 499 | // check if change proposals on User's items |
| 500 | 500 | if (isset($SETTINGS['enable_suggestion']) === true && (int) $SETTINGS['enable_suggestion'] === 1) { |
| 501 | 501 | $countNewItems = DB::query( |
| 502 | 502 | 'SELECT COUNT(*) |
| 503 | - FROM ' . prefixTable('items_change') . ' AS c |
|
| 504 | - LEFT JOIN ' . prefixTable('log_items') . ' AS i ON (c.item_id = i.id_item) |
|
| 503 | + FROM ' . prefixTable('items_change').' AS c |
|
| 504 | + LEFT JOIN ' . prefixTable('log_items').' AS i ON (c.item_id = i.id_item) |
|
| 505 | 505 | WHERE i.action = %s AND i.id_user = %i', |
| 506 | 506 | 'at_creation', |
| 507 | 507 | $globalsUserId |
@@ -528,7 +528,7 @@ discard block |
||
| 528 | 528 | { |
| 529 | 529 | $rows = DB::query( |
| 530 | 530 | 'SELECT * |
| 531 | - FROM ' . prefixTable('roles_values') . ' |
|
| 531 | + FROM ' . prefixTable('roles_values').' |
|
| 532 | 532 | WHERE type IN %ls'.(count($userRoles) > 0 ? ' AND role_id IN %li' : ''), |
| 533 | 533 | ['W', 'ND', 'NE', 'NDNE', 'R'], |
| 534 | 534 | $userRoles, |
@@ -595,7 +595,7 @@ discard block |
||
| 595 | 595 | ) { |
| 596 | 596 | $persoFld = DB::queryFirstRow( |
| 597 | 597 | 'SELECT id |
| 598 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 598 | + FROM ' . prefixTable('nested_tree').' |
|
| 599 | 599 | WHERE title = %s AND personal_folder = %i'. |
| 600 | 600 | (count($allowedFolders) > 0 ? ' AND id NOT IN ('.implode(',', $allowedFolders).')' : ''), |
| 601 | 601 | $globalsUserId, |
@@ -628,7 +628,7 @@ discard block |
||
| 628 | 628 | } |
| 629 | 629 | $persoFlds = DB::query( |
| 630 | 630 | 'SELECT id |
| 631 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 631 | + FROM ' . prefixTable('nested_tree').' |
|
| 632 | 632 | WHERE %l', |
| 633 | 633 | $where |
| 634 | 634 | ); |
@@ -696,12 +696,12 @@ discard block |
||
| 696 | 696 | //Load Tree |
| 697 | 697 | $tree = new NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title'); |
| 698 | 698 | // truncate table |
| 699 | - DB::query('TRUNCATE TABLE ' . prefixTable('cache')); |
|
| 699 | + DB::query('TRUNCATE TABLE '.prefixTable('cache')); |
|
| 700 | 700 | // reload date |
| 701 | 701 | $rows = DB::query( |
| 702 | 702 | 'SELECT * |
| 703 | - FROM ' . prefixTable('items') . ' as i |
|
| 704 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 703 | + FROM ' . prefixTable('items').' as i |
|
| 704 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 705 | 705 | AND l.action = %s |
| 706 | 706 | AND i.inactif = %i', |
| 707 | 707 | 'at_creation', |
@@ -713,18 +713,18 @@ discard block |
||
| 713 | 713 | $tags = ''; |
| 714 | 714 | $itemTags = DB::query( |
| 715 | 715 | 'SELECT tag |
| 716 | - FROM ' . prefixTable('tags') . ' |
|
| 716 | + FROM ' . prefixTable('tags').' |
|
| 717 | 717 | WHERE item_id = %i AND tag != ""', |
| 718 | 718 | $record['id'] |
| 719 | 719 | ); |
| 720 | 720 | foreach ($itemTags as $itemTag) { |
| 721 | - $tags .= $itemTag['tag'] . ' '; |
|
| 721 | + $tags .= $itemTag['tag'].' '; |
|
| 722 | 722 | } |
| 723 | 723 | |
| 724 | 724 | // Get renewal period |
| 725 | 725 | $resNT = DB::queryFirstRow( |
| 726 | 726 | 'SELECT renewal_period |
| 727 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 727 | + FROM ' . prefixTable('nested_tree').' |
|
| 728 | 728 | WHERE id = %i', |
| 729 | 729 | $record['id_tree'] |
| 730 | 730 | ); |
@@ -737,7 +737,7 @@ discard block |
||
| 737 | 737 | // Is this a User id? |
| 738 | 738 | $user = DB::queryFirstRow( |
| 739 | 739 | 'SELECT id, login |
| 740 | - FROM ' . prefixTable('users') . ' |
|
| 740 | + FROM ' . prefixTable('users').' |
|
| 741 | 741 | WHERE id = %i', |
| 742 | 742 | $elem->title |
| 743 | 743 | ); |
@@ -755,11 +755,11 @@ discard block |
||
| 755 | 755 | 'id' => $record['id'], |
| 756 | 756 | 'label' => $record['label'], |
| 757 | 757 | 'description' => $record['description'] ?? '', |
| 758 | - 'url' => isset($record['url']) && ! empty($record['url']) ? $record['url'] : '0', |
|
| 758 | + 'url' => isset($record['url']) && !empty($record['url']) ? $record['url'] : '0', |
|
| 759 | 759 | 'tags' => $tags, |
| 760 | 760 | 'id_tree' => $record['id_tree'], |
| 761 | 761 | 'perso' => $record['perso'], |
| 762 | - 'restricted_to' => isset($record['restricted_to']) && ! empty($record['restricted_to']) ? $record['restricted_to'] : '0', |
|
| 762 | + 'restricted_to' => isset($record['restricted_to']) && !empty($record['restricted_to']) ? $record['restricted_to'] : '0', |
|
| 763 | 763 | 'login' => $record['login'] ?? '', |
| 764 | 764 | 'folder' => implode(' » ', $folder), |
| 765 | 765 | 'author' => $record['id_user'], |
@@ -788,7 +788,7 @@ discard block |
||
| 788 | 788 | // get new value from db |
| 789 | 789 | $data = DB::queryFirstRow( |
| 790 | 790 | 'SELECT label, description, id_tree, perso, restricted_to, login, url |
| 791 | - FROM ' . prefixTable('items') . ' |
|
| 791 | + FROM ' . prefixTable('items').' |
|
| 792 | 792 | WHERE id=%i', |
| 793 | 793 | $ident |
| 794 | 794 | ); |
@@ -796,12 +796,12 @@ discard block |
||
| 796 | 796 | $tags = ''; |
| 797 | 797 | $itemTags = DB::query( |
| 798 | 798 | 'SELECT tag |
| 799 | - FROM ' . prefixTable('tags') . ' |
|
| 799 | + FROM ' . prefixTable('tags').' |
|
| 800 | 800 | WHERE item_id = %i AND tag != ""', |
| 801 | 801 | $ident |
| 802 | 802 | ); |
| 803 | 803 | foreach ($itemTags as $itemTag) { |
| 804 | - $tags .= $itemTag['tag'] . ' '; |
|
| 804 | + $tags .= $itemTag['tag'].' '; |
|
| 805 | 805 | } |
| 806 | 806 | // form id_tree to full foldername |
| 807 | 807 | $folder = []; |
@@ -812,7 +812,7 @@ discard block |
||
| 812 | 812 | // Is this a User id? |
| 813 | 813 | $user = DB::queryFirstRow( |
| 814 | 814 | 'SELECT id, login |
| 815 | - FROM ' . prefixTable('users') . ' |
|
| 815 | + FROM ' . prefixTable('users').' |
|
| 816 | 816 | WHERE id = %i', |
| 817 | 817 | $elem->title |
| 818 | 818 | ); |
@@ -830,10 +830,10 @@ discard block |
||
| 830 | 830 | 'label' => $data['label'], |
| 831 | 831 | 'description' => $data['description'], |
| 832 | 832 | 'tags' => $tags, |
| 833 | - 'url' => isset($data['url']) && ! empty($data['url']) ? $data['url'] : '0', |
|
| 833 | + 'url' => isset($data['url']) && !empty($data['url']) ? $data['url'] : '0', |
|
| 834 | 834 | 'id_tree' => $data['id_tree'], |
| 835 | 835 | 'perso' => $data['perso'], |
| 836 | - 'restricted_to' => isset($data['restricted_to']) && ! empty($data['restricted_to']) ? $data['restricted_to'] : '0', |
|
| 836 | + 'restricted_to' => isset($data['restricted_to']) && !empty($data['restricted_to']) ? $data['restricted_to'] : '0', |
|
| 837 | 837 | 'login' => $data['login'] ?? '', |
| 838 | 838 | 'folder' => implode(' » ', $folder), |
| 839 | 839 | 'author' => $session->get('user-id'), |
@@ -863,8 +863,8 @@ discard block |
||
| 863 | 863 | // get new value from db |
| 864 | 864 | $data = DB::queryFirstRow( |
| 865 | 865 | 'SELECT i.label, i.description, i.id_tree as id_tree, i.perso, i.restricted_to, i.id, i.login, i.url, l.date |
| 866 | - FROM ' . prefixTable('items') . ' as i |
|
| 867 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 866 | + FROM ' . prefixTable('items').' as i |
|
| 867 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 868 | 868 | WHERE i.id = %i |
| 869 | 869 | AND l.action = %s', |
| 870 | 870 | $ident, |
@@ -874,12 +874,12 @@ discard block |
||
| 874 | 874 | $tags = ''; |
| 875 | 875 | $itemTags = DB::query( |
| 876 | 876 | 'SELECT tag |
| 877 | - FROM ' . prefixTable('tags') . ' |
|
| 877 | + FROM ' . prefixTable('tags').' |
|
| 878 | 878 | WHERE item_id = %i AND tag != ""', |
| 879 | 879 | $ident |
| 880 | 880 | ); |
| 881 | 881 | foreach ($itemTags as $itemTag) { |
| 882 | - $tags .= $itemTag['tag'] . ' '; |
|
| 882 | + $tags .= $itemTag['tag'].' '; |
|
| 883 | 883 | } |
| 884 | 884 | // form id_tree to full foldername |
| 885 | 885 | $folder = []; |
@@ -890,7 +890,7 @@ discard block |
||
| 890 | 890 | // Is this a User id? |
| 891 | 891 | $user = DB::queryFirstRow( |
| 892 | 892 | 'SELECT id, login |
| 893 | - FROM ' . prefixTable('users') . ' |
|
| 893 | + FROM ' . prefixTable('users').' |
|
| 894 | 894 | WHERE id = %i', |
| 895 | 895 | $elem->title |
| 896 | 896 | ); |
@@ -909,7 +909,7 @@ discard block |
||
| 909 | 909 | 'label' => $data['label'], |
| 910 | 910 | 'description' => $data['description'], |
| 911 | 911 | 'tags' => empty($tags) === false ? $tags : 'None', |
| 912 | - 'url' => isset($data['url']) && ! empty($data['url']) ? $data['url'] : '0', |
|
| 912 | + 'url' => isset($data['url']) && !empty($data['url']) ? $data['url'] : '0', |
|
| 913 | 913 | 'id_tree' => $data['id_tree'], |
| 914 | 914 | 'perso' => isset($data['perso']) && empty($data['perso']) === false && $data['perso'] !== 'None' ? $data['perso'] : '0', |
| 915 | 915 | 'restricted_to' => isset($data['restricted_to']) && empty($data['restricted_to']) === false ? $data['restricted_to'] : '0', |
@@ -931,53 +931,53 @@ discard block |
||
| 931 | 931 | function getStatisticsData(array $SETTINGS): array |
| 932 | 932 | { |
| 933 | 933 | DB::query( |
| 934 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', |
|
| 934 | + 'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', |
|
| 935 | 935 | 0 |
| 936 | 936 | ); |
| 937 | 937 | $counter_folders = DB::count(); |
| 938 | 938 | DB::query( |
| 939 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', |
|
| 939 | + 'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', |
|
| 940 | 940 | 1 |
| 941 | 941 | ); |
| 942 | 942 | $counter_folders_perso = DB::count(); |
| 943 | 943 | DB::query( |
| 944 | - 'SELECT id FROM ' . prefixTable('items') . ' WHERE perso = %i', |
|
| 944 | + 'SELECT id FROM '.prefixTable('items').' WHERE perso = %i', |
|
| 945 | 945 | 0 |
| 946 | 946 | ); |
| 947 | 947 | $counter_items = DB::count(); |
| 948 | 948 | DB::query( |
| 949 | - 'SELECT id FROM ' . prefixTable('items') . ' WHERE perso = %i', |
|
| 949 | + 'SELECT id FROM '.prefixTable('items').' WHERE perso = %i', |
|
| 950 | 950 | 1 |
| 951 | 951 | ); |
| 952 | 952 | $counter_items_perso = DB::count(); |
| 953 | 953 | DB::query( |
| 954 | - 'SELECT id FROM ' . prefixTable('users') . ' WHERE login NOT IN (%s, %s, %s)', |
|
| 954 | + 'SELECT id FROM '.prefixTable('users').' WHERE login NOT IN (%s, %s, %s)', |
|
| 955 | 955 | 'OTV', 'TP', 'API' |
| 956 | 956 | ); |
| 957 | 957 | $counter_users = DB::count(); |
| 958 | 958 | DB::query( |
| 959 | - 'SELECT id FROM ' . prefixTable('users') . ' WHERE admin = %i', |
|
| 959 | + 'SELECT id FROM '.prefixTable('users').' WHERE admin = %i', |
|
| 960 | 960 | 1 |
| 961 | 961 | ); |
| 962 | 962 | $admins = DB::count(); |
| 963 | 963 | DB::query( |
| 964 | - 'SELECT id FROM ' . prefixTable('users') . ' WHERE gestionnaire = %i', |
|
| 964 | + 'SELECT id FROM '.prefixTable('users').' WHERE gestionnaire = %i', |
|
| 965 | 965 | 1 |
| 966 | 966 | ); |
| 967 | 967 | $managers = DB::count(); |
| 968 | 968 | DB::query( |
| 969 | - 'SELECT id FROM ' . prefixTable('users') . ' WHERE read_only = %i', |
|
| 969 | + 'SELECT id FROM '.prefixTable('users').' WHERE read_only = %i', |
|
| 970 | 970 | 1 |
| 971 | 971 | ); |
| 972 | 972 | $readOnly = DB::count(); |
| 973 | 973 | // list the languages |
| 974 | 974 | $usedLang = []; |
| 975 | 975 | $tp_languages = DB::query( |
| 976 | - 'SELECT name FROM ' . prefixTable('languages') |
|
| 976 | + 'SELECT name FROM '.prefixTable('languages') |
|
| 977 | 977 | ); |
| 978 | 978 | foreach ($tp_languages as $tp_language) { |
| 979 | 979 | DB::query( |
| 980 | - 'SELECT * FROM ' . prefixTable('users') . ' WHERE user_language = %s', |
|
| 980 | + 'SELECT * FROM '.prefixTable('users').' WHERE user_language = %s', |
|
| 981 | 981 | $tp_language['name'] |
| 982 | 982 | ); |
| 983 | 983 | $usedLang[$tp_language['name']] = round((DB::count() * 100 / $counter_users), 0); |
@@ -986,12 +986,12 @@ discard block |
||
| 986 | 986 | // get list of ips |
| 987 | 987 | $usedIp = []; |
| 988 | 988 | $tp_ips = DB::query( |
| 989 | - 'SELECT user_ip FROM ' . prefixTable('users') |
|
| 989 | + 'SELECT user_ip FROM '.prefixTable('users') |
|
| 990 | 990 | ); |
| 991 | 991 | foreach ($tp_ips as $ip) { |
| 992 | 992 | if (array_key_exists($ip['user_ip'], $usedIp)) { |
| 993 | 993 | $usedIp[$ip['user_ip']] += $usedIp[$ip['user_ip']]; |
| 994 | - } elseif (! empty($ip['user_ip']) && $ip['user_ip'] !== 'none') { |
|
| 994 | + } elseif (!empty($ip['user_ip']) && $ip['user_ip'] !== 'none') { |
|
| 995 | 995 | $usedIp[$ip['user_ip']] = 1; |
| 996 | 996 | } |
| 997 | 997 | } |
@@ -1086,7 +1086,7 @@ discard block |
||
| 1086 | 1086 | <table width="600" cellpadding="0" cellspacing="0" border="0" class="container" bgcolor="#ffffff" style="border-spacing: 0; border-bottom: 1px solid #e0e0e0; box-shadow: 0 0 3px #ddd; color: #434343; font-family: Helvetica, Verdana, sans-serif;"> |
| 1087 | 1087 | <tr><td class="container-padding" bgcolor="#ffffff" style="border-collapse: collapse; border-left: 1px solid #e0e0e0; background-color: #ffffff; padding-left: 30px; padding-right: 30px;"> |
| 1088 | 1088 | <br><div style="float:right;">' . |
| 1089 | - $textMail . |
|
| 1089 | + $textMail. |
|
| 1090 | 1090 | '<br><br></td></tr></table> |
| 1091 | 1091 | </td></tr></table> |
| 1092 | 1092 | <br></body></html>'; |
@@ -1167,7 +1167,7 @@ discard block |
||
| 1167 | 1167 | { |
| 1168 | 1168 | array_walk_recursive( |
| 1169 | 1169 | $array, |
| 1170 | - static function (&$item): void { |
|
| 1170 | + static function(&$item): void { |
|
| 1171 | 1171 | if (mb_detect_encoding((string) $item, 'utf-8', true) === false) { |
| 1172 | 1172 | $item = mb_convert_encoding($item, 'ISO-8859-1', 'UTF-8'); |
| 1173 | 1173 | } |
@@ -1278,7 +1278,7 @@ discard block |
||
| 1278 | 1278 | */ |
| 1279 | 1279 | function prefixTable(string $table): string |
| 1280 | 1280 | { |
| 1281 | - $safeTable = htmlspecialchars(DB_PREFIX . $table); |
|
| 1281 | + $safeTable = htmlspecialchars(DB_PREFIX.$table); |
|
| 1282 | 1282 | return $safeTable; |
| 1283 | 1283 | } |
| 1284 | 1284 | |
@@ -1395,7 +1395,7 @@ discard block |
||
| 1395 | 1395 | function send_syslog($message, $host, $port, $component = 'teampass'): void |
| 1396 | 1396 | { |
| 1397 | 1397 | $sock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP); |
| 1398 | - $syslog_message = '<123>' . date('M d H:i:s ') . $component . ': ' . $message; |
|
| 1398 | + $syslog_message = '<123>'.date('M d H:i:s ').$component.': '.$message; |
|
| 1399 | 1399 | socket_sendto($sock, (string) $syslog_message, strlen($syslog_message), 0, (string) $host, (int) $port); |
| 1400 | 1400 | socket_close($sock); |
| 1401 | 1401 | } |
@@ -1442,14 +1442,14 @@ discard block |
||
| 1442 | 1442 | if (isset($SETTINGS['syslog_enable']) === true && (int) $SETTINGS['syslog_enable'] === 1) { |
| 1443 | 1443 | if ($type === 'user_mngt') { |
| 1444 | 1444 | send_syslog( |
| 1445 | - 'action=' . str_replace('at_', '', $label) . ' attribute=user user=' . $who . ' userid="' . $login . '" change="' . $field_1 . '" ', |
|
| 1445 | + 'action='.str_replace('at_', '', $label).' attribute=user user='.$who.' userid="'.$login.'" change="'.$field_1.'" ', |
|
| 1446 | 1446 | $SETTINGS['syslog_host'], |
| 1447 | 1447 | $SETTINGS['syslog_port'], |
| 1448 | 1448 | 'teampass' |
| 1449 | 1449 | ); |
| 1450 | 1450 | } else { |
| 1451 | 1451 | send_syslog( |
| 1452 | - 'action=' . $type . ' attribute=' . $label . ' user=' . $who . ' userid="' . $login . '" ', |
|
| 1452 | + 'action='.$type.' attribute='.$label.' user='.$who.' userid="'.$login.'" ', |
|
| 1453 | 1453 | $SETTINGS['syslog_host'], |
| 1454 | 1454 | $SETTINGS['syslog_port'], |
| 1455 | 1455 | 'teampass' |
@@ -1524,7 +1524,7 @@ discard block |
||
| 1524 | 1524 | if (empty($item_label) === true) { |
| 1525 | 1525 | $dataItem = DB::queryFirstRow( |
| 1526 | 1526 | 'SELECT id, id_tree, label |
| 1527 | - FROM ' . prefixTable('items') . ' |
|
| 1527 | + FROM ' . prefixTable('items').' |
|
| 1528 | 1528 | WHERE id = %i', |
| 1529 | 1529 | $item_id |
| 1530 | 1530 | ); |
@@ -1532,11 +1532,11 @@ discard block |
||
| 1532 | 1532 | } |
| 1533 | 1533 | |
| 1534 | 1534 | send_syslog( |
| 1535 | - 'action=' . str_replace('at_', '', $action) . |
|
| 1536 | - ' attribute=' . str_replace('at_', '', $attribute[0]) . |
|
| 1537 | - ' itemno=' . $item_id . |
|
| 1538 | - ' user=' . (is_null($login) === true ? '' : addslashes((string) $login)) . |
|
| 1539 | - ' itemname="' . addslashes($item_label) . '"', |
|
| 1535 | + 'action='.str_replace('at_', '', $action). |
|
| 1536 | + ' attribute='.str_replace('at_', '', $attribute[0]). |
|
| 1537 | + ' itemno='.$item_id. |
|
| 1538 | + ' user='.(is_null($login) === true ? '' : addslashes((string) $login)). |
|
| 1539 | + ' itemname="'.addslashes($item_label).'"', |
|
| 1540 | 1540 | $SETTINGS['syslog_host'], |
| 1541 | 1541 | $SETTINGS['syslog_port'], |
| 1542 | 1542 | 'teampass' |
@@ -1567,8 +1567,8 @@ discard block |
||
| 1567 | 1567 | // send email to user that what to be notified |
| 1568 | 1568 | $notification = DB::queryFirstField( |
| 1569 | 1569 | 'SELECT email |
| 1570 | - FROM ' . prefixTable('notification') . ' AS n |
|
| 1571 | - INNER JOIN ' . prefixTable('users') . ' AS u ON (n.user_id = u.id) |
|
| 1570 | + FROM ' . prefixTable('notification').' AS n |
|
| 1571 | + INNER JOIN ' . prefixTable('users').' AS u ON (n.user_id = u.id) |
|
| 1572 | 1572 | WHERE n.item_id = %i AND n.user_id != %i', |
| 1573 | 1573 | $item_id, |
| 1574 | 1574 | $globalsUserId |
@@ -1579,7 +1579,7 @@ discard block |
||
| 1579 | 1579 | // Get list of changes |
| 1580 | 1580 | $htmlChanges = '<ul>'; |
| 1581 | 1581 | foreach ($changes as $change) { |
| 1582 | - $htmlChanges .= '<li>' . $change . '</li>'; |
|
| 1582 | + $htmlChanges .= '<li>'.$change.'</li>'; |
|
| 1583 | 1583 | } |
| 1584 | 1584 | $htmlChanges .= '</ul>'; |
| 1585 | 1585 | // send email |
@@ -1616,15 +1616,15 @@ discard block |
||
| 1616 | 1616 | $path = ''; |
| 1617 | 1617 | foreach ($arbo as $elem) { |
| 1618 | 1618 | if (empty($path) === true) { |
| 1619 | - $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES) . ' '; |
|
| 1619 | + $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES).' '; |
|
| 1620 | 1620 | } else { |
| 1621 | - $path .= '→ ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 1621 | + $path .= '→ '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 1622 | 1622 | } |
| 1623 | 1623 | } |
| 1624 | 1624 | |
| 1625 | 1625 | // Build text to show user |
| 1626 | 1626 | if (empty($label) === false) { |
| 1627 | - return empty($path) === true ? addslashes($label) : addslashes($label) . ' (' . $path . ')'; |
|
| 1627 | + return empty($path) === true ? addslashes($label) : addslashes($label).' ('.$path.')'; |
|
| 1628 | 1628 | } |
| 1629 | 1629 | return empty($path) === true ? '' : $path; |
| 1630 | 1630 | } |
@@ -1680,7 +1680,7 @@ discard block |
||
| 1680 | 1680 | { |
| 1681 | 1681 | // Perform a copy if the file exists |
| 1682 | 1682 | if (file_exists($configFilePath)) { |
| 1683 | - $backupFilePath = $configFilePath . '.' . date('Y_m_d_His', time()); |
|
| 1683 | + $backupFilePath = $configFilePath.'.'.date('Y_m_d_His', time()); |
|
| 1684 | 1684 | if (!copy($configFilePath, $backupFilePath)) { |
| 1685 | 1685 | return "ERROR: Could not copy file '$configFilePath'"; |
| 1686 | 1686 | } |
@@ -1688,10 +1688,10 @@ discard block |
||
| 1688 | 1688 | |
| 1689 | 1689 | // Regenerate the config file |
| 1690 | 1690 | $data = ["<?php\n", "global \$SETTINGS;\n", "\$SETTINGS = array (\n"]; |
| 1691 | - $rows = DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type=%s', 'admin'); |
|
| 1691 | + $rows = DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type=%s', 'admin'); |
|
| 1692 | 1692 | foreach ($rows as $record) { |
| 1693 | 1693 | $value = getEncryptedValue($record['valeur'], $record['is_encrypted']); |
| 1694 | - $data[] = " '{$record['intitule']}' => '". htmlspecialchars_decode($value, ENT_COMPAT) . "',\n"; |
|
| 1694 | + $data[] = " '{$record['intitule']}' => '".htmlspecialchars_decode($value, ENT_COMPAT)."',\n"; |
|
| 1695 | 1695 | } |
| 1696 | 1696 | $data[] = ");\n"; |
| 1697 | 1697 | $data = array_unique($data); |
@@ -1736,7 +1736,7 @@ discard block |
||
| 1736 | 1736 | { |
| 1737 | 1737 | global $SETTINGS; |
| 1738 | 1738 | /* LOAD CPASSMAN SETTINGS */ |
| 1739 | - if (! isset($SETTINGS['loaded']) || $SETTINGS['loaded'] !== 1) { |
|
| 1739 | + if (!isset($SETTINGS['loaded']) || $SETTINGS['loaded'] !== 1) { |
|
| 1740 | 1740 | $SETTINGS = []; |
| 1741 | 1741 | $SETTINGS['duplicate_folder'] = 0; |
| 1742 | 1742 | //by default, this is set to 0; |
@@ -1746,7 +1746,7 @@ discard block |
||
| 1746 | 1746 | //by default, this value is set to 5; |
| 1747 | 1747 | $settings = []; |
| 1748 | 1748 | $rows = DB::query( |
| 1749 | - 'SELECT * FROM ' . prefixTable('misc') . ' WHERE type=%s_type OR type=%s_type2', |
|
| 1749 | + 'SELECT * FROM '.prefixTable('misc').' WHERE type=%s_type OR type=%s_type2', |
|
| 1750 | 1750 | [ |
| 1751 | 1751 | 'type' => 'admin', |
| 1752 | 1752 | 'type2' => 'settings', |
@@ -1778,7 +1778,7 @@ discard block |
||
| 1778 | 1778 | $source_cf = []; |
| 1779 | 1779 | $rows = DB::query( |
| 1780 | 1780 | 'SELECT id_category |
| 1781 | - FROM ' . prefixTable('categories_folders') . ' |
|
| 1781 | + FROM ' . prefixTable('categories_folders').' |
|
| 1782 | 1782 | WHERE id_folder = %i', |
| 1783 | 1783 | $source_id |
| 1784 | 1784 | ); |
@@ -1789,7 +1789,7 @@ discard block |
||
| 1789 | 1789 | $target_cf = []; |
| 1790 | 1790 | $rows = DB::query( |
| 1791 | 1791 | 'SELECT id_category |
| 1792 | - FROM ' . prefixTable('categories_folders') . ' |
|
| 1792 | + FROM ' . prefixTable('categories_folders').' |
|
| 1793 | 1793 | WHERE id_folder = %i', |
| 1794 | 1794 | $target_id |
| 1795 | 1795 | ); |
@@ -1884,10 +1884,10 @@ discard block |
||
| 1884 | 1884 | } catch (CryptoException\WrongKeyOrModifiedCiphertextException $ex) { |
| 1885 | 1885 | $err = 'wrong_key'; |
| 1886 | 1886 | } catch (CryptoException\EnvironmentIsBrokenException $ex) { |
| 1887 | - error_log('TEAMPASS-Error-Environment: ' . $ex->getMessage()); |
|
| 1887 | + error_log('TEAMPASS-Error-Environment: '.$ex->getMessage()); |
|
| 1888 | 1888 | $err = 'environment_error'; |
| 1889 | 1889 | } catch (CryptoException\IOException $ex) { |
| 1890 | - error_log('TEAMPASS-Error-General: ' . $ex->getMessage()); |
|
| 1890 | + error_log('TEAMPASS-Error-General: '.$ex->getMessage()); |
|
| 1891 | 1891 | $err = 'general_error'; |
| 1892 | 1892 | } |
| 1893 | 1893 | |
@@ -1919,10 +1919,10 @@ discard block |
||
| 1919 | 1919 | } catch (CryptoException\WrongKeyOrModifiedCiphertextException $ex) { |
| 1920 | 1920 | $err = 'wrong_key'; |
| 1921 | 1921 | } catch (CryptoException\EnvironmentIsBrokenException $ex) { |
| 1922 | - error_log('TEAMPASS-Error-Environment: ' . $ex->getMessage()); |
|
| 1922 | + error_log('TEAMPASS-Error-Environment: '.$ex->getMessage()); |
|
| 1923 | 1923 | $err = 'environment_error'; |
| 1924 | 1924 | } catch (CryptoException\IOException $ex) { |
| 1925 | - error_log('TEAMPASS-Error-General: ' . $ex->getMessage()); |
|
| 1925 | + error_log('TEAMPASS-Error-General: '.$ex->getMessage()); |
|
| 1926 | 1926 | $err = 'general_error'; |
| 1927 | 1927 | } |
| 1928 | 1928 | |
@@ -2008,7 +2008,7 @@ discard block |
||
| 2008 | 2008 | ) { |
| 2009 | 2009 | // Check if the path exists |
| 2010 | 2010 | $path = basename($path); |
| 2011 | - if (! file_exists($path)) { |
|
| 2011 | + if (!file_exists($path)) { |
|
| 2012 | 2012 | return false; |
| 2013 | 2013 | } |
| 2014 | 2014 | |
@@ -2061,7 +2061,7 @@ discard block |
||
| 2061 | 2061 | // Load item data |
| 2062 | 2062 | $data = DB::queryFirstRow( |
| 2063 | 2063 | 'SELECT id_tree |
| 2064 | - FROM ' . prefixTable('items') . ' |
|
| 2064 | + FROM ' . prefixTable('items').' |
|
| 2065 | 2065 | WHERE id = %i', |
| 2066 | 2066 | $item_id |
| 2067 | 2067 | ); |
@@ -2124,7 +2124,7 @@ discard block |
||
| 2124 | 2124 | } |
| 2125 | 2125 | $host .= substr(explode(".", $email[1])[0], -1, 1); |
| 2126 | 2126 | } |
| 2127 | - $email = $name . "@" . $host . "." . explode(".", $email[1])[1]; |
|
| 2127 | + $email = $name."@".$host.".".explode(".", $email[1])[1]; |
|
| 2128 | 2128 | return $email; |
| 2129 | 2129 | } |
| 2130 | 2130 | |
@@ -2155,11 +2155,11 @@ discard block |
||
| 2155 | 2155 | function formatSizeUnits(int $bytes): string |
| 2156 | 2156 | { |
| 2157 | 2157 | if ($bytes >= 1073741824) { |
| 2158 | - $bytes = number_format($bytes / 1073741824, 2) . ' GB'; |
|
| 2158 | + $bytes = number_format($bytes / 1073741824, 2).' GB'; |
|
| 2159 | 2159 | } elseif ($bytes >= 1048576) { |
| 2160 | - $bytes = number_format($bytes / 1048576, 2) . ' MB'; |
|
| 2160 | + $bytes = number_format($bytes / 1048576, 2).' MB'; |
|
| 2161 | 2161 | } elseif ($bytes >= 1024) { |
| 2162 | - $bytes = number_format($bytes / 1024, 2) . ' KB'; |
|
| 2162 | + $bytes = number_format($bytes / 1024, 2).' KB'; |
|
| 2163 | 2163 | } elseif ($bytes > 1) { |
| 2164 | 2164 | $bytes .= ' bytes'; |
| 2165 | 2165 | } elseif ($bytes === 1) { |
@@ -2329,7 +2329,7 @@ discard block |
||
| 2329 | 2329 | */ |
| 2330 | 2330 | function generateKeyIntegrityHash(string $userSeed, string $publicKey, string $serverSecret): string |
| 2331 | 2331 | { |
| 2332 | - return hash_hmac('sha256', $userSeed . $publicKey, $serverSecret); |
|
| 2332 | + return hash_hmac('sha256', $userSeed.$publicKey, $serverSecret); |
|
| 2333 | 2333 | } |
| 2334 | 2334 | |
| 2335 | 2335 | /** |
@@ -2404,7 +2404,7 @@ discard block |
||
| 2404 | 2404 | 'security_alert', |
| 2405 | 2405 | 'key_integrity_check_failed', |
| 2406 | 2406 | (string) $userInfo['id'], |
| 2407 | - 'User: ' . $userInfo['login'] |
|
| 2407 | + 'User: '.$userInfo['login'] |
|
| 2408 | 2408 | ); |
| 2409 | 2409 | return [ |
| 2410 | 2410 | 'success' => false, |
@@ -2451,7 +2451,7 @@ discard block |
||
| 2451 | 2451 | 'user_connection', |
| 2452 | 2452 | 'auto_reencryption_success', |
| 2453 | 2453 | (string) $userInfo['id'], |
| 2454 | - 'User: ' . $userInfo['login'] |
|
| 2454 | + 'User: '.$userInfo['login'] |
|
| 2455 | 2455 | ); |
| 2456 | 2456 | |
| 2457 | 2457 | // Store in session for immediate use |
@@ -2470,12 +2470,12 @@ discard block |
||
| 2470 | 2470 | 'security_alert', |
| 2471 | 2471 | 'auto_reencryption_failed', |
| 2472 | 2472 | (string) $userInfo['id'], |
| 2473 | - 'User: ' . $userInfo['login'] . ' - Error: ' . $e->getMessage() |
|
| 2473 | + 'User: '.$userInfo['login'].' - Error: '.$e->getMessage() |
|
| 2474 | 2474 | ); |
| 2475 | 2475 | |
| 2476 | 2476 | return [ |
| 2477 | 2477 | 'success' => false, |
| 2478 | - 'error' => 'decryption_failed: ' . $e->getMessage(), |
|
| 2478 | + 'error' => 'decryption_failed: '.$e->getMessage(), |
|
| 2479 | 2479 | 'private_key_clear' => '', |
| 2480 | 2480 | ]; |
| 2481 | 2481 | } |
@@ -2542,7 +2542,7 @@ discard block |
||
| 2542 | 2542 | 'security_alert', |
| 2543 | 2543 | 'auto_reencryption_critical_failure', |
| 2544 | 2544 | (string) $userId, |
| 2545 | - 'User: ' . $userInfo['login'] . ' - disabled due to key recovery failure' |
|
| 2545 | + 'User: '.$userInfo['login'].' - disabled due to key recovery failure' |
|
| 2546 | 2546 | ); |
| 2547 | 2547 | |
| 2548 | 2548 | return false; |
@@ -2700,7 +2700,7 @@ discard block |
||
| 2700 | 2700 | $cipher->enableContinuousBuffer(); |
| 2701 | 2701 | |
| 2702 | 2702 | // Encrypt the file content |
| 2703 | - $filePath = filter_var($fileInPath . '/' . $fileInName, FILTER_SANITIZE_URL); |
|
| 2703 | + $filePath = filter_var($fileInPath.'/'.$fileInName, FILTER_SANITIZE_URL); |
|
| 2704 | 2704 | $fileContent = file_get_contents($filePath); |
| 2705 | 2705 | $plaintext = $fileContent; |
| 2706 | 2706 | $ciphertext = $cipher->encrypt($plaintext); |
@@ -2708,9 +2708,9 @@ discard block |
||
| 2708 | 2708 | // Save new file |
| 2709 | 2709 | // deepcode ignore InsecureHash: is simply used to get a unique name |
| 2710 | 2710 | $hash = uniqid('', true); |
| 2711 | - $fileOut = $fileInPath . '/' . TP_FILE_PREFIX . $hash; |
|
| 2711 | + $fileOut = $fileInPath.'/'.TP_FILE_PREFIX.$hash; |
|
| 2712 | 2712 | file_put_contents($fileOut, $ciphertext); |
| 2713 | - unlink($fileInPath . '/' . $fileInName); |
|
| 2713 | + unlink($fileInPath.'/'.$fileInName); |
|
| 2714 | 2714 | return [ |
| 2715 | 2715 | 'fileHash' => base64_encode($hash), |
| 2716 | 2716 | 'objectKey' => base64_encode($objectKey), |
@@ -2726,9 +2726,9 @@ discard block |
||
| 2726 | 2726 | * |
| 2727 | 2727 | * @return string|array |
| 2728 | 2728 | */ |
| 2729 | -function decryptFile(string $fileName, string $filePath, string $key): string|array |
|
| 2729 | +function decryptFile(string $fileName, string $filePath, string $key): string | array |
|
| 2730 | 2730 | { |
| 2731 | - if (! defined('FILE_BUFFER_SIZE')) { |
|
| 2731 | + if (!defined('FILE_BUFFER_SIZE')) { |
|
| 2732 | 2732 | define('FILE_BUFFER_SIZE', 128 * 1024); |
| 2733 | 2733 | } |
| 2734 | 2734 | |
@@ -2745,7 +2745,7 @@ discard block |
||
| 2745 | 2745 | $cipher->enableContinuousBuffer(); |
| 2746 | 2746 | $cipher->disablePadding(); |
| 2747 | 2747 | // Get file content |
| 2748 | - $safeFilePath = realpath($filePath . '/' . TP_FILE_PREFIX . $safeFileName); |
|
| 2748 | + $safeFilePath = realpath($filePath.'/'.TP_FILE_PREFIX.$safeFileName); |
|
| 2749 | 2749 | if ($safeFilePath !== false && file_exists($safeFilePath)) { |
| 2750 | 2750 | $ciphertext = file_get_contents(filter_var($safeFilePath, FILTER_SANITIZE_URL)); |
| 2751 | 2751 | } else { |
@@ -2841,7 +2841,7 @@ discard block |
||
| 2841 | 2841 | // Only create the sharekey for a user |
| 2842 | 2842 | $user = DB::queryFirstRow( |
| 2843 | 2843 | 'SELECT public_key |
| 2844 | - FROM ' . prefixTable('users') . ' |
|
| 2844 | + FROM ' . prefixTable('users').' |
|
| 2845 | 2845 | WHERE id = %i |
| 2846 | 2846 | AND public_key != ""', |
| 2847 | 2847 | $userId |
@@ -2882,7 +2882,7 @@ discard block |
||
| 2882 | 2882 | } |
| 2883 | 2883 | $users = DB::query( |
| 2884 | 2884 | 'SELECT id, public_key |
| 2885 | - FROM ' . prefixTable('users') . ' |
|
| 2885 | + FROM ' . prefixTable('users').' |
|
| 2886 | 2886 | WHERE id NOT IN %li |
| 2887 | 2887 | AND public_key != ""', |
| 2888 | 2888 | $user_ids |
@@ -2891,7 +2891,7 @@ discard block |
||
| 2891 | 2891 | foreach ($users as $user) { |
| 2892 | 2892 | // Insert in DB the new object key for this item by user |
| 2893 | 2893 | if (count($objectKeyArray) === 0) { |
| 2894 | - if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case1 - ' . $object_name . ' - ' . $post_object_id . ' - ' . $user['id'] . ' - ' . $objectKey); |
|
| 2894 | + if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case1 - '.$object_name.' - '.$post_object_id.' - '.$user['id'].' - '.$objectKey); |
|
| 2895 | 2895 | DB::insert( |
| 2896 | 2896 | $object_name, |
| 2897 | 2897 | [ |
@@ -2905,7 +2905,7 @@ discard block |
||
| 2905 | 2905 | ); |
| 2906 | 2906 | } else { |
| 2907 | 2907 | foreach ($objectKeyArray as $object) { |
| 2908 | - if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case2 - ' . $object_name . ' - ' . $object['objectId'] . ' - ' . $user['id'] . ' - ' . $object['objectKey']); |
|
| 2908 | + if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case2 - '.$object_name.' - '.$object['objectId'].' - '.$user['id'].' - '.$object['objectKey']); |
|
| 2909 | 2909 | DB::insert( |
| 2910 | 2910 | $object_name, |
| 2911 | 2911 | [ |
@@ -2933,7 +2933,7 @@ discard block |
||
| 2933 | 2933 | function isBase64(string $str): bool |
| 2934 | 2934 | { |
| 2935 | 2935 | $str = (string) trim($str); |
| 2936 | - if (! isset($str[0])) { |
|
| 2936 | + if (!isset($str[0])) { |
|
| 2937 | 2937 | return false; |
| 2938 | 2938 | } |
| 2939 | 2939 | |
@@ -3007,7 +3007,7 @@ discard block |
||
| 3007 | 3007 | } catch (\LdapRecord\Auth\BindException $e) { |
| 3008 | 3008 | $error = $e->getDetailedError(); |
| 3009 | 3009 | if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) { |
| 3010 | - error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage()); |
|
| 3010 | + error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage()); |
|
| 3011 | 3011 | } |
| 3012 | 3012 | // deepcode ignore ServerLeak: No important data is sent |
| 3013 | 3013 | echo 'An error occurred.'; |
@@ -3024,7 +3024,7 @@ discard block |
||
| 3024 | 3024 | } catch (\LdapRecord\Auth\BindException $e) { |
| 3025 | 3025 | $error = $e->getDetailedError(); |
| 3026 | 3026 | if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) { |
| 3027 | - error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage()); |
|
| 3027 | + error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage()); |
|
| 3028 | 3028 | } |
| 3029 | 3029 | // deepcode ignore ServerLeak: No important data is sent |
| 3030 | 3030 | echo 'An error occurred.'; |
@@ -3060,7 +3060,7 @@ discard block |
||
| 3060 | 3060 | // expect if personal item |
| 3061 | 3061 | DB::delete( |
| 3062 | 3062 | prefixTable('sharekeys_items'), |
| 3063 | - 'user_id = %i AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)', |
|
| 3063 | + 'user_id = %i AND object_id NOT IN (SELECT i.id FROM '.prefixTable('items').' AS i WHERE i.perso = 1)', |
|
| 3064 | 3064 | $userId |
| 3065 | 3065 | ); |
| 3066 | 3066 | // Remove all item sharekeys files |
@@ -3068,8 +3068,8 @@ discard block |
||
| 3068 | 3068 | prefixTable('sharekeys_files'), |
| 3069 | 3069 | 'user_id = %i AND object_id NOT IN ( |
| 3070 | 3070 | SELECT f.id |
| 3071 | - FROM ' . prefixTable('items') . ' AS i |
|
| 3072 | - INNER JOIN ' . prefixTable('files') . ' AS f ON f.id_item = i.id |
|
| 3071 | + FROM ' . prefixTable('items').' AS i |
|
| 3072 | + INNER JOIN ' . prefixTable('files').' AS f ON f.id_item = i.id |
|
| 3073 | 3073 | WHERE i.perso = 1 |
| 3074 | 3074 | )', |
| 3075 | 3075 | $userId |
@@ -3079,8 +3079,8 @@ discard block |
||
| 3079 | 3079 | prefixTable('sharekeys_fields'), |
| 3080 | 3080 | 'user_id = %i AND object_id NOT IN ( |
| 3081 | 3081 | SELECT c.id |
| 3082 | - FROM ' . prefixTable('items') . ' AS i |
|
| 3083 | - INNER JOIN ' . prefixTable('categories_items') . ' AS c ON c.item_id = i.id |
|
| 3082 | + FROM ' . prefixTable('items').' AS i |
|
| 3083 | + INNER JOIN ' . prefixTable('categories_items').' AS c ON c.item_id = i.id |
|
| 3084 | 3084 | WHERE i.perso = 1 |
| 3085 | 3085 | )', |
| 3086 | 3086 | $userId |
@@ -3088,13 +3088,13 @@ discard block |
||
| 3088 | 3088 | // Remove all item sharekeys logs |
| 3089 | 3089 | DB::delete( |
| 3090 | 3090 | prefixTable('sharekeys_logs'), |
| 3091 | - 'user_id = %i AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)', |
|
| 3091 | + 'user_id = %i AND object_id NOT IN (SELECT i.id FROM '.prefixTable('items').' AS i WHERE i.perso = 1)', |
|
| 3092 | 3092 | $userId |
| 3093 | 3093 | ); |
| 3094 | 3094 | // Remove all item sharekeys suggestions |
| 3095 | 3095 | DB::delete( |
| 3096 | 3096 | prefixTable('sharekeys_suggestions'), |
| 3097 | - 'user_id = %i AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)', |
|
| 3097 | + 'user_id = %i AND object_id NOT IN (SELECT i.id FROM '.prefixTable('items').' AS i WHERE i.perso = 1)', |
|
| 3098 | 3098 | $userId |
| 3099 | 3099 | ); |
| 3100 | 3100 | return false; |
@@ -3115,7 +3115,7 @@ discard block |
||
| 3115 | 3115 | foreach (DateTimeZone::listIdentifiers() as $timezone) { |
| 3116 | 3116 | $now->setTimezone(new DateTimeZone($timezone)); |
| 3117 | 3117 | $offsets[] = $offset = $now->getOffset(); |
| 3118 | - $timezones[$timezone] = '(' . format_GMT_offset($offset) . ') ' . format_timezone_name($timezone); |
|
| 3118 | + $timezones[$timezone] = '('.format_GMT_offset($offset).') '.format_timezone_name($timezone); |
|
| 3119 | 3119 | } |
| 3120 | 3120 | |
| 3121 | 3121 | array_multisort($offsets, $timezones); |
@@ -3135,7 +3135,7 @@ discard block |
||
| 3135 | 3135 | { |
| 3136 | 3136 | $hours = intval($offset / 3600); |
| 3137 | 3137 | $minutes = abs(intval($offset % 3600 / 60)); |
| 3138 | - return 'GMT' . ($offset ? sprintf('%+03d:%02d', $hours, $minutes) : ''); |
|
| 3138 | + return 'GMT'.($offset ? sprintf('%+03d:%02d', $hours, $minutes) : ''); |
|
| 3139 | 3139 | } |
| 3140 | 3140 | |
| 3141 | 3141 | /** |
@@ -3234,8 +3234,7 @@ discard block |
||
| 3234 | 3234 | { |
| 3235 | 3235 | if (isset($array[$key]) === true |
| 3236 | 3236 | && (is_int($value) === true ? |
| 3237 | - (int) $array[$key] === $value : |
|
| 3238 | - (string) $array[$key] === $value) |
|
| 3237 | + (int) $array[$key] === $value : (string) $array[$key] === $value) |
|
| 3239 | 3238 | ) { |
| 3240 | 3239 | return true; |
| 3241 | 3240 | } |
@@ -3257,8 +3256,7 @@ discard block |
||
| 3257 | 3256 | { |
| 3258 | 3257 | if (isset($var) === false |
| 3259 | 3258 | || (is_int($value) === true ? |
| 3260 | - (int) $var === $value : |
|
| 3261 | - (string) $var === $value) |
|
| 3259 | + (int) $var === $value : (string) $var === $value) |
|
| 3262 | 3260 | ) { |
| 3263 | 3261 | return true; |
| 3264 | 3262 | } |
@@ -3309,7 +3307,7 @@ discard block |
||
| 3309 | 3307 | */ |
| 3310 | 3308 | function isSetArrayOfValues(array $arrayOfValues): bool |
| 3311 | 3309 | { |
| 3312 | - foreach($arrayOfValues as $value) { |
|
| 3310 | + foreach ($arrayOfValues as $value) { |
|
| 3313 | 3311 | if (isset($value) === false) { |
| 3314 | 3312 | return false; |
| 3315 | 3313 | } |
@@ -3331,7 +3329,7 @@ discard block |
||
| 3331 | 3329 | /*PHP8 - integer|string*/$value |
| 3332 | 3330 | ) : bool |
| 3333 | 3331 | { |
| 3334 | - foreach($arrayOfVars as $variable) { |
|
| 3332 | + foreach ($arrayOfVars as $variable) { |
|
| 3335 | 3333 | if ($variable !== $value) { |
| 3336 | 3334 | return false; |
| 3337 | 3335 | } |
@@ -3351,7 +3349,7 @@ discard block |
||
| 3351 | 3349 | /*PHP8 - integer|string*/$value |
| 3352 | 3350 | ) : bool |
| 3353 | 3351 | { |
| 3354 | - foreach($arrayOfVars as $variable) { |
|
| 3352 | + foreach ($arrayOfVars as $variable) { |
|
| 3355 | 3353 | if ($variable === $value) { |
| 3356 | 3354 | return true; |
| 3357 | 3355 | } |
@@ -3365,7 +3363,7 @@ discard block |
||
| 3365 | 3363 | * @param string|int|null $value |
| 3366 | 3364 | * @return boolean |
| 3367 | 3365 | */ |
| 3368 | -function isValueSetNullEmpty(string|int|null $value) : bool |
|
| 3366 | +function isValueSetNullEmpty(string | int | null $value) : bool |
|
| 3369 | 3367 | { |
| 3370 | 3368 | if (is_null($value) === true || empty($value) === true) { |
| 3371 | 3369 | return true; |
@@ -3420,7 +3418,7 @@ discard block |
||
| 3420 | 3418 | * @param array $filters |
| 3421 | 3419 | * @return array|string |
| 3422 | 3420 | */ |
| 3423 | -function dataSanitizer(array $data, array $filters): array|string |
|
| 3421 | +function dataSanitizer(array $data, array $filters): array | string |
|
| 3424 | 3422 | { |
| 3425 | 3423 | // Load Sanitizer library |
| 3426 | 3424 | $sanitizer = new Sanitizer($data, $filters); |
@@ -3449,7 +3447,7 @@ discard block |
||
| 3449 | 3447 | // Exists ? |
| 3450 | 3448 | $userCacheId = DB::queryFirstRow( |
| 3451 | 3449 | 'SELECT increment_id |
| 3452 | - FROM ' . prefixTable('cache_tree') . ' |
|
| 3450 | + FROM ' . prefixTable('cache_tree').' |
|
| 3453 | 3451 | WHERE user_id = %i', |
| 3454 | 3452 | $user_id |
| 3455 | 3453 | ); |
@@ -3500,7 +3498,7 @@ discard block |
||
| 3500 | 3498 | */ |
| 3501 | 3499 | function pourcentage(float $nombre, float $total, float $pourcentage): float |
| 3502 | 3500 | { |
| 3503 | - $resultat = ($nombre/$total) * $pourcentage; |
|
| 3501 | + $resultat = ($nombre / $total) * $pourcentage; |
|
| 3504 | 3502 | return round($resultat); |
| 3505 | 3503 | } |
| 3506 | 3504 | |
@@ -3530,7 +3528,7 @@ discard block |
||
| 3530 | 3528 | |
| 3531 | 3529 | // Get last folder update |
| 3532 | 3530 | $lastFolderChange = DB::queryFirstRow( |
| 3533 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' |
|
| 3531 | + 'SELECT valeur FROM '.prefixTable('misc').' |
|
| 3534 | 3532 | WHERE type = %s AND intitule = %s', |
| 3535 | 3533 | 'timestamp', |
| 3536 | 3534 | 'last_folder_change' |
@@ -3551,7 +3549,7 @@ discard block |
||
| 3551 | 3549 | // Does this user has a tree cache |
| 3552 | 3550 | $userCacheTree = DB::queryFirstRow( |
| 3553 | 3551 | 'SELECT '.$fieldName.' |
| 3554 | - FROM ' . prefixTable('cache_tree') . ' |
|
| 3552 | + FROM ' . prefixTable('cache_tree').' |
|
| 3555 | 3553 | WHERE user_id = %i', |
| 3556 | 3554 | $session->get('user-id') |
| 3557 | 3555 | ); |
@@ -3589,7 +3587,7 @@ discard block |
||
| 3589 | 3587 | if (count($folderIds) === 0) { |
| 3590 | 3588 | $folderIds = DB::queryFirstColumn( |
| 3591 | 3589 | 'SELECT id |
| 3592 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 3590 | + FROM ' . prefixTable('nested_tree').' |
|
| 3593 | 3591 | WHERE personal_folder=%i', |
| 3594 | 3592 | 0 |
| 3595 | 3593 | ); |
@@ -3606,8 +3604,8 @@ discard block |
||
| 3606 | 3604 | $rows_tmp = DB::query( |
| 3607 | 3605 | 'SELECT c.id, c.title, c.level, c.type, c.masked, c.order, c.encrypted_data, c.role_visibility, c.is_mandatory, |
| 3608 | 3606 | f.id_category AS category_id |
| 3609 | - FROM ' . prefixTable('categories_folders') . ' AS f |
|
| 3610 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (f.id_category = c.parent_id) |
|
| 3607 | + FROM ' . prefixTable('categories_folders').' AS f |
|
| 3608 | + INNER JOIN ' . prefixTable('categories').' AS c ON (f.id_category = c.parent_id) |
|
| 3611 | 3609 | WHERE id_folder=%i', |
| 3612 | 3610 | $folder |
| 3613 | 3611 | ); |
@@ -3633,7 +3631,7 @@ discard block |
||
| 3633 | 3631 | $valTemp = ''; |
| 3634 | 3632 | $data = DB::queryFirstRow( |
| 3635 | 3633 | 'SELECT valeur |
| 3636 | - FROM ' . prefixTable('misc') . ' |
|
| 3634 | + FROM ' . prefixTable('misc').' |
|
| 3637 | 3635 | WHERE type = %s AND intitule=%i', |
| 3638 | 3636 | 'complex', |
| 3639 | 3637 | $folder |
@@ -3650,14 +3648,14 @@ discard block |
||
| 3650 | 3648 | $valTemp = ''; |
| 3651 | 3649 | $rows_tmp = DB::query( |
| 3652 | 3650 | 'SELECT t.title |
| 3653 | - FROM ' . prefixTable('roles_values') . ' as v |
|
| 3654 | - INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id) |
|
| 3651 | + FROM ' . prefixTable('roles_values').' as v |
|
| 3652 | + INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id) |
|
| 3655 | 3653 | WHERE v.folder_id = %i |
| 3656 | 3654 | GROUP BY title', |
| 3657 | 3655 | $folder |
| 3658 | 3656 | ); |
| 3659 | 3657 | foreach ($rows_tmp as $record) { |
| 3660 | - $valTemp .= (empty($valTemp) === true ? '' : ' - ') . $record['title']; |
|
| 3658 | + $valTemp .= (empty($valTemp) === true ? '' : ' - ').$record['title']; |
|
| 3661 | 3659 | } |
| 3662 | 3660 | $arr_data['visibilityRoles'] = $valTemp; |
| 3663 | 3661 | |
@@ -3690,7 +3688,7 @@ discard block |
||
| 3690 | 3688 | // loop on users and check if user has this role |
| 3691 | 3689 | $rows = DB::query( |
| 3692 | 3690 | 'SELECT id, fonction_id |
| 3693 | - FROM ' . prefixTable('users') . ' |
|
| 3691 | + FROM ' . prefixTable('users').' |
|
| 3694 | 3692 | WHERE id != %i AND admin = 0 AND fonction_id IS NOT NULL AND fonction_id != ""', |
| 3695 | 3693 | $session->get('user-id') |
| 3696 | 3694 | ); |
@@ -3722,7 +3720,7 @@ discard block |
||
| 3722 | 3720 | |
| 3723 | 3721 | $val = DB::queryFirstRow( |
| 3724 | 3722 | 'SELECT * |
| 3725 | - FROM ' . prefixTable('users') . ' |
|
| 3723 | + FROM ' . prefixTable('users').' |
|
| 3726 | 3724 | WHERE id = %i', |
| 3727 | 3725 | $userId |
| 3728 | 3726 | ); |
@@ -3738,12 +3736,12 @@ discard block |
||
| 3738 | 3736 | function upgradeRequired(): bool |
| 3739 | 3737 | { |
| 3740 | 3738 | // Get settings.php |
| 3741 | - include_once __DIR__. '/../includes/config/settings.php'; |
|
| 3739 | + include_once __DIR__.'/../includes/config/settings.php'; |
|
| 3742 | 3740 | |
| 3743 | 3741 | // Get timestamp in DB |
| 3744 | 3742 | $val = DB::queryFirstRow( |
| 3745 | 3743 | 'SELECT valeur |
| 3746 | - FROM ' . prefixTable('misc') . ' |
|
| 3744 | + FROM ' . prefixTable('misc').' |
|
| 3747 | 3745 | WHERE type = %s AND intitule = %s', |
| 3748 | 3746 | 'admin', |
| 3749 | 3747 | 'upgrade_timestamp' |
@@ -3796,7 +3794,7 @@ discard block |
||
| 3796 | 3794 | // prepapre background tasks for item keys generation |
| 3797 | 3795 | $userTP = DB::queryFirstRow( |
| 3798 | 3796 | 'SELECT pw, public_key, private_key |
| 3799 | - FROM ' . prefixTable('users') . ' |
|
| 3797 | + FROM ' . prefixTable('users').' |
|
| 3800 | 3798 | WHERE id = %i', |
| 3801 | 3799 | TP_USER_ID |
| 3802 | 3800 | ); |
@@ -3857,7 +3855,7 @@ discard block |
||
| 3857 | 3855 | } |
| 3858 | 3856 | |
| 3859 | 3857 | // Generate new keys |
| 3860 | - if ($user_self_change === true && empty($recovery_public_key) === false && empty($recovery_private_key) === false){ |
|
| 3858 | + if ($user_self_change === true && empty($recovery_public_key) === false && empty($recovery_private_key) === false) { |
|
| 3861 | 3859 | $userKeys = [ |
| 3862 | 3860 | 'public_key' => $recovery_public_key, |
| 3863 | 3861 | 'private_key_clear' => $recovery_private_key, |
@@ -3908,8 +3906,8 @@ discard block |
||
| 3908 | 3906 | 'process_type' => 'create_user_keys', |
| 3909 | 3907 | 'arguments' => json_encode([ |
| 3910 | 3908 | 'new_user_id' => (int) $userId, |
| 3911 | - 'new_user_pwd' => cryption($passwordClear, '','encrypt')['string'], |
|
| 3912 | - 'new_user_code' => cryption(empty($encryptionKey) === true ? uniqidReal(20) : $encryptionKey, '','encrypt')['string'], |
|
| 3909 | + 'new_user_pwd' => cryption($passwordClear, '', 'encrypt')['string'], |
|
| 3910 | + 'new_user_code' => cryption(empty($encryptionKey) === true ? uniqidReal(20) : $encryptionKey, '', 'encrypt')['string'], |
|
| 3913 | 3911 | 'owner_id' => (int) TP_USER_ID, |
| 3914 | 3912 | 'creator_pwd' => $userTP['pw'], |
| 3915 | 3913 | 'send_email' => $sendEmailToUser === true ? 1 : 0, |
@@ -3981,19 +3979,19 @@ discard block |
||
| 3981 | 3979 | |
| 3982 | 3980 | // Prepare the subtask queries |
| 3983 | 3981 | $queries = [ |
| 3984 | - 'step20' => 'SELECT * FROM ' . prefixTable('items'), |
|
| 3982 | + 'step20' => 'SELECT * FROM '.prefixTable('items'), |
|
| 3985 | 3983 | |
| 3986 | - 'step30' => 'SELECT * FROM ' . prefixTable('log_items') . |
|
| 3984 | + 'step30' => 'SELECT * FROM '.prefixTable('log_items'). |
|
| 3987 | 3985 | ' WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"', |
| 3988 | 3986 | |
| 3989 | - 'step40' => 'SELECT * FROM ' . prefixTable('categories_items') . |
|
| 3987 | + 'step40' => 'SELECT * FROM '.prefixTable('categories_items'). |
|
| 3990 | 3988 | ' WHERE encryption_type = "teampass_aes"', |
| 3991 | 3989 | |
| 3992 | - 'step50' => 'SELECT * FROM ' . prefixTable('suggestion'), |
|
| 3990 | + 'step50' => 'SELECT * FROM '.prefixTable('suggestion'), |
|
| 3993 | 3991 | |
| 3994 | - 'step60' => 'SELECT * FROM ' . prefixTable('files') . ' AS f |
|
| 3995 | - INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = f.id_item |
|
| 3996 | - WHERE f.status = "' . TP_ENCRYPTION_NAME . '"' |
|
| 3992 | + 'step60' => 'SELECT * FROM '.prefixTable('files').' AS f |
|
| 3993 | + INNER JOIN ' . prefixTable('items').' AS i ON i.id = f.id_item |
|
| 3994 | + WHERE f.status = "' . TP_ENCRYPTION_NAME.'"' |
|
| 3997 | 3995 | ]; |
| 3998 | 3996 | |
| 3999 | 3997 | // Perform loop on $queries to create sub-tasks |
@@ -4183,7 +4181,7 @@ discard block |
||
| 4183 | 4181 | */ |
| 4184 | 4182 | function createTaskForItem( |
| 4185 | 4183 | string $processType, |
| 4186 | - string|array $taskName, |
|
| 4184 | + string | array $taskName, |
|
| 4187 | 4185 | int $itemId, |
| 4188 | 4186 | int $userId, |
| 4189 | 4187 | string $objectKey, |
@@ -4207,7 +4205,7 @@ discard block |
||
| 4207 | 4205 | 'object_key' => $objectKey, |
| 4208 | 4206 | 'author' => (int) $userId, |
| 4209 | 4207 | ]), |
| 4210 | - 'item_id' => (int) $parentId !== -1 ? $parentId : null, |
|
| 4208 | + 'item_id' => (int) $parentId !== -1 ? $parentId : null, |
|
| 4211 | 4209 | ) |
| 4212 | 4210 | ); |
| 4213 | 4211 | $processId = DB::insertId(); |
@@ -4217,7 +4215,7 @@ discard block |
||
| 4217 | 4215 | if (is_array($taskName) === false) { |
| 4218 | 4216 | $taskName = [$taskName]; |
| 4219 | 4217 | } |
| 4220 | - foreach($taskName as $task) { |
|
| 4218 | + foreach ($taskName as $task) { |
|
| 4221 | 4219 | if (WIP === true) error_log('createTaskForItem - task: '.$task); |
| 4222 | 4220 | switch ($task) { |
| 4223 | 4221 | case 'item_password': |
@@ -4314,7 +4312,7 @@ discard block |
||
| 4314 | 4312 | * @param integer $user_id |
| 4315 | 4313 | * @return void |
| 4316 | 4314 | */ |
| 4317 | -function purgeUnnecessaryKeys(bool $allUsers = true, int $user_id=0) |
|
| 4315 | +function purgeUnnecessaryKeys(bool $allUsers = true, int $user_id = 0) |
|
| 4318 | 4316 | { |
| 4319 | 4317 | if ($allUsers === true) { |
| 4320 | 4318 | // Load class DB |
@@ -4324,7 +4322,7 @@ discard block |
||
| 4324 | 4322 | |
| 4325 | 4323 | $users = DB::query( |
| 4326 | 4324 | 'SELECT id |
| 4327 | - FROM ' . prefixTable('users') . ' |
|
| 4325 | + FROM ' . prefixTable('users').' |
|
| 4328 | 4326 | WHERE id NOT IN ('.OTV_USER_ID.', '.TP_USER_ID.', '.SSH_USER_ID.', '.API_USER_ID.') |
| 4329 | 4327 | ORDER BY login ASC' |
| 4330 | 4328 | ); |
@@ -4342,7 +4340,7 @@ discard block |
||
| 4342 | 4340 | * @param integer $user_id |
| 4343 | 4341 | * @return void |
| 4344 | 4342 | */ |
| 4345 | -function purgeUnnecessaryKeysForUser(int $user_id=0) |
|
| 4343 | +function purgeUnnecessaryKeysForUser(int $user_id = 0) |
|
| 4346 | 4344 | { |
| 4347 | 4345 | if ($user_id === 0) { |
| 4348 | 4346 | return; |
@@ -4353,8 +4351,8 @@ discard block |
||
| 4353 | 4351 | |
| 4354 | 4352 | $personalItems = DB::queryFirstColumn( |
| 4355 | 4353 | 'SELECT id |
| 4356 | - FROM ' . prefixTable('items') . ' AS i |
|
| 4357 | - INNER JOIN ' . prefixTable('log_items') . ' AS li ON li.id_item = i.id |
|
| 4354 | + FROM ' . prefixTable('items').' AS i |
|
| 4355 | + INNER JOIN ' . prefixTable('log_items').' AS li ON li.id_item = i.id |
|
| 4358 | 4356 | WHERE i.perso = 1 AND li.action = "at_creation" AND li.id_user IN (%i, '.TP_USER_ID.')', |
| 4359 | 4357 | $user_id |
| 4360 | 4358 | ); |
@@ -4364,28 +4362,28 @@ discard block |
||
| 4364 | 4362 | prefixTable('sharekeys_items'), |
| 4365 | 4363 | 'object_id IN %li AND user_id NOT IN %ls', |
| 4366 | 4364 | $personalItems, |
| 4367 | - [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID] |
|
| 4365 | + [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID] |
|
| 4368 | 4366 | ); |
| 4369 | 4367 | // Files keys |
| 4370 | 4368 | DB::delete( |
| 4371 | 4369 | prefixTable('sharekeys_files'), |
| 4372 | 4370 | 'object_id IN %li AND user_id NOT IN %ls', |
| 4373 | 4371 | $personalItems, |
| 4374 | - [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID] |
|
| 4372 | + [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID] |
|
| 4375 | 4373 | ); |
| 4376 | 4374 | // Fields keys |
| 4377 | 4375 | DB::delete( |
| 4378 | 4376 | prefixTable('sharekeys_fields'), |
| 4379 | 4377 | 'object_id IN %li AND user_id NOT IN %ls', |
| 4380 | 4378 | $personalItems, |
| 4381 | - [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID] |
|
| 4379 | + [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID] |
|
| 4382 | 4380 | ); |
| 4383 | 4381 | // Logs keys |
| 4384 | 4382 | DB::delete( |
| 4385 | 4383 | prefixTable('sharekeys_logs'), |
| 4386 | 4384 | 'object_id IN %li AND user_id NOT IN %ls', |
| 4387 | 4385 | $personalItems, |
| 4388 | - [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID] |
|
| 4386 | + [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID] |
|
| 4389 | 4387 | ); |
| 4390 | 4388 | } |
| 4391 | 4389 | } |
@@ -4403,7 +4401,7 @@ discard block |
||
| 4403 | 4401 | // Check if user exists |
| 4404 | 4402 | $userInfo = DB::queryFirstRow( |
| 4405 | 4403 | 'SELECT login |
| 4406 | - FROM ' . prefixTable('users') . ' |
|
| 4404 | + FROM ' . prefixTable('users').' |
|
| 4407 | 4405 | WHERE id = %i', |
| 4408 | 4406 | $userId |
| 4409 | 4407 | ); |
@@ -4412,7 +4410,7 @@ discard block |
||
| 4412 | 4410 | $now = (int) time(); |
| 4413 | 4411 | // Prepare file content |
| 4414 | 4412 | $export_value = file_get_contents(__DIR__."/../includes/core/teampass_ascii.txt")."\n". |
| 4415 | - "Generation date: ".date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $now)."\n\n". |
|
| 4413 | + "Generation date: ".date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $now)."\n\n". |
|
| 4416 | 4414 | "RECOVERY KEYS - Not to be shared - To be store safely\n\n". |
| 4417 | 4415 | "Public Key:\n".$session->get('user-public_key')."\n\n". |
| 4418 | 4416 | "Private Key:\n".$session->get('user-private_key')."\n\n"; |
@@ -4435,7 +4433,7 @@ discard block |
||
| 4435 | 4433 | return prepareExchangedData( |
| 4436 | 4434 | array( |
| 4437 | 4435 | 'error' => false, |
| 4438 | - 'datetime' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $now), |
|
| 4436 | + 'datetime' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $now), |
|
| 4439 | 4437 | 'timestamp' => $now, |
| 4440 | 4438 | 'content' => base64_encode($export_value), |
| 4441 | 4439 | 'login' => $userInfo['login'], |
@@ -4461,8 +4459,8 @@ discard block |
||
| 4461 | 4459 | */ |
| 4462 | 4460 | function loadClasses(string $className = ''): void |
| 4463 | 4461 | { |
| 4464 | - require_once __DIR__. '/../includes/config/include.php'; |
|
| 4465 | - require_once __DIR__. '/../includes/config/settings.php'; |
|
| 4462 | + require_once __DIR__.'/../includes/config/include.php'; |
|
| 4463 | + require_once __DIR__.'/../includes/config/settings.php'; |
|
| 4466 | 4464 | require_once __DIR__.'/../vendor/autoload.php'; |
| 4467 | 4465 | |
| 4468 | 4466 | if (defined('DB_PASSWD_CLEAR') === false) { |
@@ -4675,7 +4673,7 @@ discard block |
||
| 4675 | 4673 | |
| 4676 | 4674 | // Get current user hash |
| 4677 | 4675 | $userHash = DB::queryFirstRow( |
| 4678 | - "SELECT pw FROM " . prefixtable('users') . " WHERE id = %d;", |
|
| 4676 | + "SELECT pw FROM ".prefixtable('users')." WHERE id = %d;", |
|
| 4679 | 4677 | $session->get('user-id') |
| 4680 | 4678 | )['pw']; |
| 4681 | 4679 | |
@@ -4723,11 +4721,11 @@ discard block |
||
| 4723 | 4721 | } |
| 4724 | 4722 | |
| 4725 | 4723 | // Alternative: serialize ou json selon le contexte |
| 4726 | - return get_class($value) . (method_exists($value, 'getId') ? '#' . $value->getId() : ''); |
|
| 4724 | + return get_class($value).(method_exists($value, 'getId') ? '#'.$value->getId() : ''); |
|
| 4727 | 4725 | } |
| 4728 | 4726 | |
| 4729 | 4727 | if (is_resource($value)) { |
| 4730 | - return 'Resource#' . get_resource_id($value) . ' of type ' . get_resource_type($value); |
|
| 4728 | + return 'Resource#'.get_resource_id($value).' of type '.get_resource_type($value); |
|
| 4731 | 4729 | } |
| 4732 | 4730 | |
| 4733 | 4731 | // Cas par défaut |
@@ -4747,7 +4745,7 @@ discard block |
||
| 4747 | 4745 | // Refuse access if user does not exist and/or is admin |
| 4748 | 4746 | $user = DB::queryFirstRow( |
| 4749 | 4747 | 'SELECT admin |
| 4750 | - FROM ' . prefixTable('users') . ' |
|
| 4748 | + FROM ' . prefixTable('users').' |
|
| 4751 | 4749 | WHERE id = %i', |
| 4752 | 4750 | $userId |
| 4753 | 4751 | ); |
@@ -4758,8 +4756,8 @@ discard block |
||
| 4758 | 4756 | // Get file info |
| 4759 | 4757 | $file = DB::queryFirstRow( |
| 4760 | 4758 | 'SELECT f.id_item, i.id_tree |
| 4761 | - FROM ' . prefixTable('files') . ' as f |
|
| 4762 | - INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = f.id_item |
|
| 4759 | + FROM ' . prefixTable('files').' as f |
|
| 4760 | + INNER JOIN ' . prefixTable('items').' AS i ON i.id = f.id_item |
|
| 4763 | 4761 | WHERE f.id = %i', |
| 4764 | 4762 | $fileId |
| 4765 | 4763 | ); |
@@ -4768,7 +4766,7 @@ discard block |
||
| 4768 | 4766 | } |
| 4769 | 4767 | |
| 4770 | 4768 | // Check if user has access to the item |
| 4771 | - include_once __DIR__. '/items.queries.php'; |
|
| 4769 | + include_once __DIR__.'/items.queries.php'; |
|
| 4772 | 4770 | $itemAccess = getCurrentAccessRights( |
| 4773 | 4771 | (int) filter_var($userId, FILTER_SANITIZE_NUMBER_INT), |
| 4774 | 4772 | (int) filter_var($file['id_item'], FILTER_SANITIZE_NUMBER_INT), |
@@ -4801,7 +4799,7 @@ discard block |
||
| 4801 | 4799 | // Refuse access if user does not exist and/or is not admin |
| 4802 | 4800 | $user = DB::queryFirstRow( |
| 4803 | 4801 | 'SELECT admin |
| 4804 | - FROM ' . prefixTable('users') . ' |
|
| 4802 | + FROM ' . prefixTable('users').' |
|
| 4805 | 4803 | WHERE id = %i', |
| 4806 | 4804 | $userId |
| 4807 | 4805 | ); |
@@ -4812,7 +4810,7 @@ discard block |
||
| 4812 | 4810 | // Ensure that user has performed the backup |
| 4813 | 4811 | DB::queryFirstRow( |
| 4814 | 4812 | 'SELECT f.id |
| 4815 | - FROM ' . prefixTable('log_system') . ' as f |
|
| 4813 | + FROM ' . prefixTable('log_system').' as f |
|
| 4816 | 4814 | WHERE f.type = %s AND f.label = %s AND f.qui = %i AND f.field_1 = %s', |
| 4817 | 4815 | 'admin_action', |
| 4818 | 4816 | 'dataBase backup', |
@@ -4839,7 +4837,7 @@ discard block |
||
| 4839 | 4837 | // Refuse access if user does not exist and/or is admin |
| 4840 | 4838 | $user = DB::queryFirstRow( |
| 4841 | 4839 | 'SELECT admin |
| 4842 | - FROM ' . prefixTable('users') . ' |
|
| 4840 | + FROM ' . prefixTable('users').' |
|
| 4843 | 4841 | WHERE id = %i', |
| 4844 | 4842 | $userId |
| 4845 | 4843 | ); |
@@ -4850,7 +4848,7 @@ discard block |
||
| 4850 | 4848 | // Get item info |
| 4851 | 4849 | $item = DB::queryFirstRow( |
| 4852 | 4850 | 'SELECT i.perso, i.id_tree |
| 4853 | - FROM ' . prefixTable('items') . ' as i |
|
| 4851 | + FROM ' . prefixTable('items').' as i |
|
| 4854 | 4852 | WHERE i.id = %i', |
| 4855 | 4853 | $itemId |
| 4856 | 4854 | ); |
@@ -4861,7 +4859,7 @@ discard block |
||
| 4861 | 4859 | // Get item owner |
| 4862 | 4860 | $itemOwner = DB::queryFirstRow( |
| 4863 | 4861 | 'SELECT li.id_user |
| 4864 | - FROM ' . prefixTable('log_items') . ' as li |
|
| 4862 | + FROM ' . prefixTable('log_items').' as li |
|
| 4865 | 4863 | WHERE li.id_item = %i AND li.action = %s', |
| 4866 | 4864 | $itemId, |
| 4867 | 4865 | 'at_creation' |
@@ -4875,25 +4873,25 @@ discard block |
||
| 4875 | 4873 | prefixTable('sharekeys_items'), |
| 4876 | 4874 | 'object_id = %i AND user_id NOT IN %ls', |
| 4877 | 4875 | $itemId, |
| 4878 | - [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID] |
|
| 4876 | + [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID] |
|
| 4879 | 4877 | ); |
| 4880 | 4878 | DB::delete( |
| 4881 | 4879 | prefixTable('sharekeys_files'), |
| 4882 | 4880 | 'object_id IN (SELECT id FROM '.prefixTable('files').' WHERE id_item = %i) AND user_id NOT IN %ls', |
| 4883 | 4881 | $itemId, |
| 4884 | - [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID] |
|
| 4882 | + [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID] |
|
| 4885 | 4883 | ); |
| 4886 | 4884 | DB::delete( |
| 4887 | 4885 | prefixTable('sharekeys_fields'), |
| 4888 | 4886 | 'object_id IN (SELECT id FROM '.prefixTable('fields').' WHERE id_item = %i) AND user_id NOT IN %ls', |
| 4889 | 4887 | $itemId, |
| 4890 | - [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID] |
|
| 4888 | + [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID] |
|
| 4891 | 4889 | ); |
| 4892 | 4890 | DB::delete( |
| 4893 | 4891 | prefixTable('sharekeys_logs'), |
| 4894 | 4892 | 'object_id IN (SELECT id FROM '.prefixTable('log_items').' WHERE id_item = %i) AND user_id NOT IN %ls', |
| 4895 | 4893 | $itemId, |
| 4896 | - [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID] |
|
| 4894 | + [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID] |
|
| 4897 | 4895 | ); |
| 4898 | 4896 | |
| 4899 | 4897 | return true; |
@@ -4949,7 +4947,7 @@ discard block |
||
| 4949 | 4947 | { |
| 4950 | 4948 | // Count auto-recoveries in last 24h |
| 4951 | 4949 | $autoRecoveriesLast24h = DB::queryFirstField( |
| 4952 | - 'SELECT COUNT(*) FROM ' . prefixTable('log_system') . ' |
|
| 4950 | + 'SELECT COUNT(*) FROM '.prefixTable('log_system').' |
|
| 4953 | 4951 | WHERE label = %s |
| 4954 | 4952 | AND date > %i', |
| 4955 | 4953 | 'auto_reencryption_success', |
@@ -4958,21 +4956,21 @@ discard block |
||
| 4958 | 4956 | |
| 4959 | 4957 | // Count failed recoveries (all time) |
| 4960 | 4958 | $failedRecoveries = DB::queryFirstField( |
| 4961 | - 'SELECT COUNT(*) FROM ' . prefixTable('log_system') . ' |
|
| 4959 | + 'SELECT COUNT(*) FROM '.prefixTable('log_system').' |
|
| 4962 | 4960 | WHERE label = %s', |
| 4963 | 4961 | 'auto_reencryption_failed' |
| 4964 | 4962 | ); |
| 4965 | 4963 | |
| 4966 | 4964 | // Count critical failures (all time) |
| 4967 | 4965 | $criticalFailures = DB::queryFirstField( |
| 4968 | - 'SELECT COUNT(*) FROM ' . prefixTable('log_system') . ' |
|
| 4966 | + 'SELECT COUNT(*) FROM '.prefixTable('log_system').' |
|
| 4969 | 4967 | WHERE label = %s', |
| 4970 | 4968 | 'auto_reencryption_critical_failure' |
| 4971 | 4969 | ); |
| 4972 | 4970 | |
| 4973 | 4971 | // Count users with transparent recovery enabled (have seed and backup) |
| 4974 | 4972 | $usersMigrated = DB::queryFirstField( |
| 4975 | - 'SELECT COUNT(*) FROM ' . prefixTable('users') . ' |
|
| 4973 | + 'SELECT COUNT(*) FROM '.prefixTable('users').' |
|
| 4976 | 4974 | WHERE user_derivation_seed IS NOT NULL |
| 4977 | 4975 | AND private_key_backup IS NOT NULL |
| 4978 | 4976 | AND disabled = 0' |
@@ -4980,7 +4978,7 @@ discard block |
||
| 4980 | 4978 | |
| 4981 | 4979 | // Count total active users |
| 4982 | 4980 | $totalUsers = DB::queryFirstField( |
| 4983 | - 'SELECT COUNT(*) FROM ' . prefixTable('users') . ' |
|
| 4981 | + 'SELECT COUNT(*) FROM '.prefixTable('users').' |
|
| 4984 | 4982 | WHERE disabled = 0 |
| 4985 | 4983 | AND private_key IS NOT NULL |
| 4986 | 4984 | AND private_key != "none"' |
@@ -4989,8 +4987,8 @@ discard block |
||
| 4989 | 4987 | // Get recent recovery events (last 10) |
| 4990 | 4988 | $recentEvents = DB::query( |
| 4991 | 4989 | 'SELECT l.date, l.label, l.qui, u.login |
| 4992 | - FROM ' . prefixTable('log_system') . ' AS l |
|
| 4993 | - INNER JOIN ' . prefixTable('users') . ' AS u ON u.id = l.qui |
|
| 4990 | + FROM ' . prefixTable('log_system').' AS l |
|
| 4991 | + INNER JOIN ' . prefixTable('users').' AS u ON u.id = l.qui |
|
| 4994 | 4992 | WHERE l.label IN %ls |
| 4995 | 4993 | ORDER BY l.date DESC |
| 4996 | 4994 | LIMIT 10', |
@@ -5002,7 +5000,7 @@ discard block |
||
| 5002 | 5000 | |
| 5003 | 5001 | // Calculate failure rate (last 30 days) |
| 5004 | 5002 | $totalAttempts30d = DB::queryFirstField( |
| 5005 | - 'SELECT COUNT(*) FROM ' . prefixTable('log_system') . ' |
|
| 5003 | + 'SELECT COUNT(*) FROM '.prefixTable('log_system').' |
|
| 5006 | 5004 | WHERE label IN %ls |
| 5007 | 5005 | AND date > %i', |
| 5008 | 5006 | ['auto_reencryption_success', 'auto_reencryption_failed'], |
@@ -5010,7 +5008,7 @@ discard block |
||
| 5010 | 5008 | ); |
| 5011 | 5009 | |
| 5012 | 5010 | $failures30d = DB::queryFirstField( |
| 5013 | - 'SELECT COUNT(*) FROM ' . prefixTable('log_system') . ' |
|
| 5011 | + 'SELECT COUNT(*) FROM '.prefixTable('log_system').' |
|
| 5014 | 5012 | WHERE label = %s |
| 5015 | 5013 | AND date > %i', |
| 5016 | 5014 | 'auto_reencryption_failed', |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('backups') === 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 | |
@@ -178,7 +178,7 @@ discard block |
||
| 178 | 178 | </div> |
| 179 | 179 | <div class="alert alert-info ml-2 mt-3 mr-2 hidden" id="onthefly-restore-progress"> |
| 180 | 180 | <h5><i class="icon fa fa-info mr-2"></i><?php echo $lang->get('in_progress'); ?></h5> |
| 181 | - <i class="mr-2 fa-solid fa-rocket fa-beat"></i><?php echo $lang->get('restore_in_progress');?> <b><span id="onthefly-restore-progress-text">0</span>%</b> |
|
| 181 | + <i class="mr-2 fa-solid fa-rocket fa-beat"></i><?php echo $lang->get('restore_in_progress'); ?> <b><span id="onthefly-restore-progress-text">0</span>%</b> |
|
| 182 | 182 | </div> |
| 183 | 183 | <div class="row mt-3 hidden" id="onthefly-restore-finished"></div> |
| 184 | 184 | <div class="row mt-3"> |