@@ -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 | { |
@@ -2604,7 +2604,9 @@ discard block |
||
| 2604 | 2604 | function encryptUserObjectKey(string $key, string $publicKey): string |
| 2605 | 2605 | { |
| 2606 | 2606 | // Empty password |
| 2607 | - if (empty($key)) return ''; |
|
| 2607 | + if (empty($key)) { |
|
| 2608 | + return ''; |
|
| 2609 | + } |
|
| 2608 | 2610 | |
| 2609 | 2611 | // Sanitize |
| 2610 | 2612 | $antiXss = new AntiXSS(); |
@@ -2753,7 +2755,9 @@ discard block |
||
| 2753 | 2755 | ]; |
| 2754 | 2756 | } |
| 2755 | 2757 | |
| 2756 | - if (WIP) error_log('DEBUG: File image url -> '.filter_var($safeFilePath, FILTER_SANITIZE_URL)); |
|
| 2758 | + if (WIP) { |
|
| 2759 | + error_log('DEBUG: File image url -> '.filter_var($safeFilePath, FILTER_SANITIZE_URL)); |
|
| 2760 | + } |
|
| 2757 | 2761 | |
| 2758 | 2762 | // Decrypt file content and return |
| 2759 | 2763 | return base64_encode($cipher->decrypt($ciphertext)); |
@@ -4232,7 +4236,9 @@ discard block |
||
| 4232 | 4236 | $taskName = [$taskName]; |
| 4233 | 4237 | } |
| 4234 | 4238 | foreach($taskName as $task) { |
| 4235 | - if (WIP === true) error_log('createTaskForItem - task: '.$task); |
|
| 4239 | + if (WIP === true) { |
|
| 4240 | + error_log('createTaskForItem - task: '.$task); |
|
| 4241 | + } |
|
| 4236 | 4242 | switch ($task) { |
| 4237 | 4243 | case 'item_password': |
| 4238 | 4244 | |
@@ -4665,19 +4671,22 @@ discard block |
||
| 4665 | 4671 | |
| 4666 | 4672 | // Organisation name (removed username@ and .tld) |
| 4667 | 4673 | $domain = explode('.', $emailParts[1]); |
| 4668 | - if (count($domain) > 1) |
|
| 4669 | - $forbiddenWords[] = $domain[0]; |
|
| 4674 | + if (count($domain) > 1) { |
|
| 4675 | + $forbiddenWords[] = $domain[0]; |
|
| 4676 | + } |
|
| 4670 | 4677 | } |
| 4671 | 4678 | } |
| 4672 | 4679 | |
| 4673 | 4680 | // Search forbidden words in password |
| 4674 | 4681 | foreach ($forbiddenWords as $word) { |
| 4675 | - if (empty($word)) |
|
| 4676 | - continue; |
|
| 4682 | + if (empty($word)) { |
|
| 4683 | + continue; |
|
| 4684 | + } |
|
| 4677 | 4685 | |
| 4678 | 4686 | // Stop if forbidden word found in password |
| 4679 | - if (stripos($password, $word) !== false) |
|
| 4680 | - return false; |
|
| 4687 | + if (stripos($password, $word) !== false) { |
|
| 4688 | + return false; |
|
| 4689 | + } |
|
| 4681 | 4690 | } |
| 4682 | 4691 | |
| 4683 | 4692 | // 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 | |
@@ -319,7 +319,7 @@ discard block |
||
| 319 | 319 | $session->set('user-forbiden_personal_folders', []); |
| 320 | 320 | |
| 321 | 321 | // Get list of Folders |
| 322 | - $rows = DB::query('SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', 0); |
|
| 322 | + $rows = DB::query('SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', 0); |
|
| 323 | 323 | foreach ($rows as $record) { |
| 324 | 324 | array_push($groupesVisibles, $record['id']); |
| 325 | 325 | } |
@@ -328,20 +328,20 @@ discard block |
||
| 328 | 328 | // get complete list of ROLES |
| 329 | 329 | $tmp = array_filter(explode(';', $idFonctions !== null ? $idFonctions : '')); |
| 330 | 330 | $rows = DB::query( |
| 331 | - 'SELECT * FROM ' . prefixTable('roles_title') . ' |
|
| 331 | + 'SELECT * FROM '.prefixTable('roles_title').' |
|
| 332 | 332 | ORDER BY title ASC' |
| 333 | 333 | ); |
| 334 | 334 | foreach ($rows as $record) { |
| 335 | - if (! empty($record['id']) && ! in_array($record['id'], $tmp)) { |
|
| 335 | + if (!empty($record['id']) && !in_array($record['id'], $tmp)) { |
|
| 336 | 336 | array_push($tmp, $record['id']); |
| 337 | 337 | } |
| 338 | 338 | } |
| 339 | 339 | $session->set('user-roles', implode(';', $tmp)); |
| 340 | 340 | $session->set('user-admin', 1); |
| 341 | 341 | // Check if admin has created Folders and Roles |
| 342 | - DB::query('SELECT * FROM ' . prefixTable('nested_tree') . ''); |
|
| 342 | + DB::query('SELECT * FROM '.prefixTable('nested_tree').''); |
|
| 343 | 343 | $session->set('user-nb_folders', DB::count()); |
| 344 | - DB::query('SELECT * FROM ' . prefixTable('roles_title')); |
|
| 344 | + DB::query('SELECT * FROM '.prefixTable('roles_title')); |
|
| 345 | 345 | $session->set('user-nb_roles', DB::count()); |
| 346 | 346 | |
| 347 | 347 | return true; |
@@ -424,7 +424,7 @@ discard block |
||
| 424 | 424 | // Does this user is allowed to see other items |
| 425 | 425 | $inc = 0; |
| 426 | 426 | $rows = DB::query( |
| 427 | - 'SELECT id, id_tree FROM ' . prefixTable('items') . ' |
|
| 427 | + 'SELECT id, id_tree FROM '.prefixTable('items').' |
|
| 428 | 428 | WHERE restricted_to LIKE %ss AND inactif = %s'. |
| 429 | 429 | (count($allowedFolders) > 0 ? ' AND id_tree NOT IN ('.implode(',', $allowedFolders).')' : ''), |
| 430 | 430 | $globalsUserId, |
@@ -441,8 +441,8 @@ discard block |
||
| 441 | 441 | // Check for the users roles if some specific rights exist on items |
| 442 | 442 | $rows = DB::query( |
| 443 | 443 | 'SELECT i.id_tree, r.item_id |
| 444 | - FROM ' . prefixTable('items') . ' as i |
|
| 445 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' as r ON (r.item_id=i.id) |
|
| 444 | + FROM ' . prefixTable('items').' as i |
|
| 445 | + INNER JOIN ' . prefixTable('restriction_to_roles').' as r ON (r.item_id=i.id) |
|
| 446 | 446 | WHERE i.id_tree <> "" '. |
| 447 | 447 | (count($userRoles) > 0 ? 'AND r.role_id IN %li ' : ''). |
| 448 | 448 | 'ORDER BY i.id_tree ASC', |
@@ -486,18 +486,18 @@ discard block |
||
| 486 | 486 | $session->set('system-list_restricted_folders_for_items', $restrictedFoldersForItems); |
| 487 | 487 | $session->set('user-forbiden_personal_folders', $noAccessPersonalFolders); |
| 488 | 488 | // Folders and Roles numbers |
| 489 | - DB::queryFirstRow('SELECT id FROM ' . prefixTable('nested_tree') . ''); |
|
| 490 | - DB::queryFirstRow('SELECT id FROM ' . prefixTable('nested_tree') . ''); |
|
| 489 | + DB::queryFirstRow('SELECT id FROM '.prefixTable('nested_tree').''); |
|
| 490 | + DB::queryFirstRow('SELECT id FROM '.prefixTable('nested_tree').''); |
|
| 491 | 491 | $session->set('user-nb_folders', DB::count()); |
| 492 | - DB::queryFirstRow('SELECT id FROM ' . prefixTable('roles_title')); |
|
| 493 | - DB::queryFirstRow('SELECT id FROM ' . prefixTable('roles_title')); |
|
| 492 | + DB::queryFirstRow('SELECT id FROM '.prefixTable('roles_title')); |
|
| 493 | + DB::queryFirstRow('SELECT id FROM '.prefixTable('roles_title')); |
|
| 494 | 494 | $session->set('user-nb_roles', DB::count()); |
| 495 | 495 | // check if change proposals on User's items |
| 496 | 496 | if (isset($SETTINGS['enable_suggestion']) === true && (int) $SETTINGS['enable_suggestion'] === 1) { |
| 497 | 497 | $countNewItems = DB::query( |
| 498 | 498 | 'SELECT COUNT(*) |
| 499 | - FROM ' . prefixTable('items_change') . ' AS c |
|
| 500 | - LEFT JOIN ' . prefixTable('log_items') . ' AS i ON (c.item_id = i.id_item) |
|
| 499 | + FROM ' . prefixTable('items_change').' AS c |
|
| 500 | + LEFT JOIN ' . prefixTable('log_items').' AS i ON (c.item_id = i.id_item) |
|
| 501 | 501 | WHERE i.action = %s AND i.id_user = %i', |
| 502 | 502 | 'at_creation', |
| 503 | 503 | $globalsUserId |
@@ -524,7 +524,7 @@ discard block |
||
| 524 | 524 | { |
| 525 | 525 | $rows = DB::query( |
| 526 | 526 | 'SELECT * |
| 527 | - FROM ' . prefixTable('roles_values') . ' |
|
| 527 | + FROM ' . prefixTable('roles_values').' |
|
| 528 | 528 | WHERE type IN %ls'.(count($userRoles) > 0 ? ' AND role_id IN %li' : ''), |
| 529 | 529 | ['W', 'ND', 'NE', 'NDNE', 'R'], |
| 530 | 530 | $userRoles, |
@@ -591,7 +591,7 @@ discard block |
||
| 591 | 591 | ) { |
| 592 | 592 | $persoFld = DB::queryFirstRow( |
| 593 | 593 | 'SELECT id |
| 594 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 594 | + FROM ' . prefixTable('nested_tree').' |
|
| 595 | 595 | WHERE title = %s AND personal_folder = %i'. |
| 596 | 596 | (count($allowedFolders) > 0 ? ' AND id NOT IN ('.implode(',', $allowedFolders).')' : ''), |
| 597 | 597 | $globalsUserId, |
@@ -624,7 +624,7 @@ discard block |
||
| 624 | 624 | } |
| 625 | 625 | $persoFlds = DB::query( |
| 626 | 626 | 'SELECT id |
| 627 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 627 | + FROM ' . prefixTable('nested_tree').' |
|
| 628 | 628 | WHERE %l', |
| 629 | 629 | $where |
| 630 | 630 | ); |
@@ -692,12 +692,12 @@ discard block |
||
| 692 | 692 | //Load Tree |
| 693 | 693 | $tree = new NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title'); |
| 694 | 694 | // truncate table |
| 695 | - DB::query('TRUNCATE TABLE ' . prefixTable('cache')); |
|
| 695 | + DB::query('TRUNCATE TABLE '.prefixTable('cache')); |
|
| 696 | 696 | // reload date |
| 697 | 697 | $rows = DB::query( |
| 698 | 698 | 'SELECT * |
| 699 | - FROM ' . prefixTable('items') . ' as i |
|
| 700 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 699 | + FROM ' . prefixTable('items').' as i |
|
| 700 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 701 | 701 | AND l.action = %s |
| 702 | 702 | AND i.inactif = %i', |
| 703 | 703 | 'at_creation', |
@@ -709,18 +709,18 @@ discard block |
||
| 709 | 709 | $tags = ''; |
| 710 | 710 | $itemTags = DB::query( |
| 711 | 711 | 'SELECT tag |
| 712 | - FROM ' . prefixTable('tags') . ' |
|
| 712 | + FROM ' . prefixTable('tags').' |
|
| 713 | 713 | WHERE item_id = %i AND tag != ""', |
| 714 | 714 | $record['id'] |
| 715 | 715 | ); |
| 716 | 716 | foreach ($itemTags as $itemTag) { |
| 717 | - $tags .= $itemTag['tag'] . ' '; |
|
| 717 | + $tags .= $itemTag['tag'].' '; |
|
| 718 | 718 | } |
| 719 | 719 | |
| 720 | 720 | // Get renewal period |
| 721 | 721 | $resNT = DB::queryFirstRow( |
| 722 | 722 | 'SELECT renewal_period |
| 723 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 723 | + FROM ' . prefixTable('nested_tree').' |
|
| 724 | 724 | WHERE id = %i', |
| 725 | 725 | $record['id_tree'] |
| 726 | 726 | ); |
@@ -733,7 +733,7 @@ discard block |
||
| 733 | 733 | // Is this a User id? |
| 734 | 734 | $user = DB::queryFirstRow( |
| 735 | 735 | 'SELECT login |
| 736 | - FROM ' . prefixTable('users') . ' |
|
| 736 | + FROM ' . prefixTable('users').' |
|
| 737 | 737 | WHERE id = %i', |
| 738 | 738 | $elem->title |
| 739 | 739 | ); |
@@ -751,11 +751,11 @@ discard block |
||
| 751 | 751 | 'id' => $record['id'], |
| 752 | 752 | 'label' => $record['label'], |
| 753 | 753 | 'description' => $record['description'] ?? '', |
| 754 | - 'url' => isset($record['url']) && ! empty($record['url']) ? $record['url'] : '0', |
|
| 754 | + 'url' => isset($record['url']) && !empty($record['url']) ? $record['url'] : '0', |
|
| 755 | 755 | 'tags' => $tags, |
| 756 | 756 | 'id_tree' => $record['id_tree'], |
| 757 | 757 | 'perso' => $record['perso'], |
| 758 | - 'restricted_to' => isset($record['restricted_to']) && ! empty($record['restricted_to']) ? $record['restricted_to'] : '0', |
|
| 758 | + 'restricted_to' => isset($record['restricted_to']) && !empty($record['restricted_to']) ? $record['restricted_to'] : '0', |
|
| 759 | 759 | 'login' => $record['login'] ?? '', |
| 760 | 760 | 'folder' => implode(' » ', $folder), |
| 761 | 761 | 'author' => $record['id_user'], |
@@ -784,7 +784,7 @@ discard block |
||
| 784 | 784 | // get new value from db |
| 785 | 785 | $data = DB::queryFirstRow( |
| 786 | 786 | 'SELECT label, description, id_tree, perso, restricted_to, login, url |
| 787 | - FROM ' . prefixTable('items') . ' |
|
| 787 | + FROM ' . prefixTable('items').' |
|
| 788 | 788 | WHERE id=%i', |
| 789 | 789 | $ident |
| 790 | 790 | ); |
@@ -792,12 +792,12 @@ discard block |
||
| 792 | 792 | $tags = ''; |
| 793 | 793 | $itemTags = DB::query( |
| 794 | 794 | 'SELECT tag |
| 795 | - FROM ' . prefixTable('tags') . ' |
|
| 795 | + FROM ' . prefixTable('tags').' |
|
| 796 | 796 | WHERE item_id = %i AND tag != ""', |
| 797 | 797 | $ident |
| 798 | 798 | ); |
| 799 | 799 | foreach ($itemTags as $itemTag) { |
| 800 | - $tags .= $itemTag['tag'] . ' '; |
|
| 800 | + $tags .= $itemTag['tag'].' '; |
|
| 801 | 801 | } |
| 802 | 802 | // form id_tree to full foldername |
| 803 | 803 | $folder = []; |
@@ -808,7 +808,7 @@ discard block |
||
| 808 | 808 | // Is this a User id? |
| 809 | 809 | $user = DB::queryFirstRow( |
| 810 | 810 | 'SELECT id, login |
| 811 | - FROM ' . prefixTable('users') . ' |
|
| 811 | + FROM ' . prefixTable('users').' |
|
| 812 | 812 | WHERE id = %i', |
| 813 | 813 | $elem->title |
| 814 | 814 | ); |
@@ -826,10 +826,10 @@ discard block |
||
| 826 | 826 | 'label' => $data['label'], |
| 827 | 827 | 'description' => $data['description'], |
| 828 | 828 | 'tags' => $tags, |
| 829 | - 'url' => isset($data['url']) && ! empty($data['url']) ? $data['url'] : '0', |
|
| 829 | + 'url' => isset($data['url']) && !empty($data['url']) ? $data['url'] : '0', |
|
| 830 | 830 | 'id_tree' => $data['id_tree'], |
| 831 | 831 | 'perso' => $data['perso'], |
| 832 | - 'restricted_to' => isset($data['restricted_to']) && ! empty($data['restricted_to']) ? $data['restricted_to'] : '0', |
|
| 832 | + 'restricted_to' => isset($data['restricted_to']) && !empty($data['restricted_to']) ? $data['restricted_to'] : '0', |
|
| 833 | 833 | 'login' => $data['login'] ?? '', |
| 834 | 834 | 'folder' => implode(' » ', $folder), |
| 835 | 835 | 'author' => $session->get('user-id'), |
@@ -859,8 +859,8 @@ discard block |
||
| 859 | 859 | // get new value from db |
| 860 | 860 | $data = DB::queryFirstRow( |
| 861 | 861 | 'SELECT i.label, i.description, i.id_tree as id_tree, i.perso, i.restricted_to, i.id, i.login, i.url, l.date |
| 862 | - FROM ' . prefixTable('items') . ' as i |
|
| 863 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 862 | + FROM ' . prefixTable('items').' as i |
|
| 863 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 864 | 864 | WHERE i.id = %i |
| 865 | 865 | AND l.action = %s', |
| 866 | 866 | $ident, |
@@ -870,12 +870,12 @@ discard block |
||
| 870 | 870 | $tags = ''; |
| 871 | 871 | $itemTags = DB::query( |
| 872 | 872 | 'SELECT tag |
| 873 | - FROM ' . prefixTable('tags') . ' |
|
| 873 | + FROM ' . prefixTable('tags').' |
|
| 874 | 874 | WHERE item_id = %i AND tag != ""', |
| 875 | 875 | $ident |
| 876 | 876 | ); |
| 877 | 877 | foreach ($itemTags as $itemTag) { |
| 878 | - $tags .= $itemTag['tag'] . ' '; |
|
| 878 | + $tags .= $itemTag['tag'].' '; |
|
| 879 | 879 | } |
| 880 | 880 | // form id_tree to full foldername |
| 881 | 881 | $folder = []; |
@@ -886,7 +886,7 @@ discard block |
||
| 886 | 886 | // Is this a User id? |
| 887 | 887 | $user = DB::queryFirstRow( |
| 888 | 888 | 'SELECT id, login |
| 889 | - FROM ' . prefixTable('users') . ' |
|
| 889 | + FROM ' . prefixTable('users').' |
|
| 890 | 890 | WHERE id = %i', |
| 891 | 891 | $elem->title |
| 892 | 892 | ); |
@@ -905,7 +905,7 @@ discard block |
||
| 905 | 905 | 'label' => $data['label'], |
| 906 | 906 | 'description' => $data['description'], |
| 907 | 907 | 'tags' => empty($tags) === false ? $tags : 'None', |
| 908 | - 'url' => isset($data['url']) && ! empty($data['url']) ? $data['url'] : '0', |
|
| 908 | + 'url' => isset($data['url']) && !empty($data['url']) ? $data['url'] : '0', |
|
| 909 | 909 | 'id_tree' => $data['id_tree'], |
| 910 | 910 | 'perso' => isset($data['perso']) && empty($data['perso']) === false && $data['perso'] !== 'None' ? $data['perso'] : '0', |
| 911 | 911 | 'restricted_to' => isset($data['restricted_to']) && empty($data['restricted_to']) === false ? $data['restricted_to'] : '0', |
@@ -927,53 +927,53 @@ discard block |
||
| 927 | 927 | function getStatisticsData(array $SETTINGS): array |
| 928 | 928 | { |
| 929 | 929 | DB::query( |
| 930 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', |
|
| 930 | + 'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', |
|
| 931 | 931 | 0 |
| 932 | 932 | ); |
| 933 | 933 | $counter_folders = DB::count(); |
| 934 | 934 | DB::query( |
| 935 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', |
|
| 935 | + 'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', |
|
| 936 | 936 | 1 |
| 937 | 937 | ); |
| 938 | 938 | $counter_folders_perso = DB::count(); |
| 939 | 939 | DB::query( |
| 940 | - 'SELECT id FROM ' . prefixTable('items') . ' WHERE perso = %i', |
|
| 940 | + 'SELECT id FROM '.prefixTable('items').' WHERE perso = %i', |
|
| 941 | 941 | 0 |
| 942 | 942 | ); |
| 943 | 943 | $counter_items = DB::count(); |
| 944 | 944 | DB::query( |
| 945 | - 'SELECT id FROM ' . prefixTable('items') . ' WHERE perso = %i', |
|
| 945 | + 'SELECT id FROM '.prefixTable('items').' WHERE perso = %i', |
|
| 946 | 946 | 1 |
| 947 | 947 | ); |
| 948 | 948 | $counter_items_perso = DB::count(); |
| 949 | 949 | DB::query( |
| 950 | - 'SELECT id FROM ' . prefixTable('users') . ' WHERE login NOT IN (%s, %s, %s)', |
|
| 950 | + 'SELECT id FROM '.prefixTable('users').' WHERE login NOT IN (%s, %s, %s)', |
|
| 951 | 951 | 'OTV', 'TP', 'API' |
| 952 | 952 | ); |
| 953 | 953 | $counter_users = DB::count(); |
| 954 | 954 | DB::query( |
| 955 | - 'SELECT id FROM ' . prefixTable('users') . ' WHERE admin = %i', |
|
| 955 | + 'SELECT id FROM '.prefixTable('users').' WHERE admin = %i', |
|
| 956 | 956 | 1 |
| 957 | 957 | ); |
| 958 | 958 | $admins = DB::count(); |
| 959 | 959 | DB::query( |
| 960 | - 'SELECT id FROM ' . prefixTable('users') . ' WHERE gestionnaire = %i', |
|
| 960 | + 'SELECT id FROM '.prefixTable('users').' WHERE gestionnaire = %i', |
|
| 961 | 961 | 1 |
| 962 | 962 | ); |
| 963 | 963 | $managers = DB::count(); |
| 964 | 964 | DB::query( |
| 965 | - 'SELECT id FROM ' . prefixTable('users') . ' WHERE read_only = %i', |
|
| 965 | + 'SELECT id FROM '.prefixTable('users').' WHERE read_only = %i', |
|
| 966 | 966 | 1 |
| 967 | 967 | ); |
| 968 | 968 | $readOnly = DB::count(); |
| 969 | 969 | // list the languages |
| 970 | 970 | $usedLang = []; |
| 971 | 971 | $tp_languages = DB::query( |
| 972 | - 'SELECT name FROM ' . prefixTable('languages') |
|
| 972 | + 'SELECT name FROM '.prefixTable('languages') |
|
| 973 | 973 | ); |
| 974 | 974 | foreach ($tp_languages as $tp_language) { |
| 975 | 975 | DB::query( |
| 976 | - 'SELECT * FROM ' . prefixTable('users') . ' WHERE user_language = %s', |
|
| 976 | + 'SELECT * FROM '.prefixTable('users').' WHERE user_language = %s', |
|
| 977 | 977 | $tp_language['name'] |
| 978 | 978 | ); |
| 979 | 979 | $usedLang[$tp_language['name']] = round((DB::count() * 100 / $counter_users), 0); |
@@ -982,12 +982,12 @@ discard block |
||
| 982 | 982 | // get list of ips |
| 983 | 983 | $usedIp = []; |
| 984 | 984 | $tp_ips = DB::query( |
| 985 | - 'SELECT user_ip FROM ' . prefixTable('users') |
|
| 985 | + 'SELECT user_ip FROM '.prefixTable('users') |
|
| 986 | 986 | ); |
| 987 | 987 | foreach ($tp_ips as $ip) { |
| 988 | 988 | if (array_key_exists($ip['user_ip'], $usedIp)) { |
| 989 | 989 | $usedIp[$ip['user_ip']] += $usedIp[$ip['user_ip']]; |
| 990 | - } elseif (! empty($ip['user_ip']) && $ip['user_ip'] !== 'none') { |
|
| 990 | + } elseif (!empty($ip['user_ip']) && $ip['user_ip'] !== 'none') { |
|
| 991 | 991 | $usedIp[$ip['user_ip']] = 1; |
| 992 | 992 | } |
| 993 | 993 | } |
@@ -1082,7 +1082,7 @@ discard block |
||
| 1082 | 1082 | <table width="600" cellpadding="0" cellspacing="0" border="0" class="container" bgcolor="#ffffff" style="border-spacing: 0; border-bottom: 1px solid #e0e0e0; box-shadow: 0 0 3px #ddd; color: #434343; font-family: Helvetica, Verdana, sans-serif;"> |
| 1083 | 1083 | <tr><td class="container-padding" bgcolor="#ffffff" style="border-collapse: collapse; border-left: 1px solid #e0e0e0; background-color: #ffffff; padding-left: 30px; padding-right: 30px;"> |
| 1084 | 1084 | <br><div style="float:right;">' . |
| 1085 | - $textMail . |
|
| 1085 | + $textMail. |
|
| 1086 | 1086 | '<br><br></td></tr></table> |
| 1087 | 1087 | </td></tr></table> |
| 1088 | 1088 | <br></body></html>'; |
@@ -1163,7 +1163,7 @@ discard block |
||
| 1163 | 1163 | { |
| 1164 | 1164 | array_walk_recursive( |
| 1165 | 1165 | $array, |
| 1166 | - static function (&$item): void { |
|
| 1166 | + static function(&$item): void { |
|
| 1167 | 1167 | if (mb_detect_encoding((string) $item, 'utf-8', true) === false) { |
| 1168 | 1168 | $item = mb_convert_encoding($item, 'ISO-8859-1', 'UTF-8'); |
| 1169 | 1169 | } |
@@ -1274,7 +1274,7 @@ discard block |
||
| 1274 | 1274 | */ |
| 1275 | 1275 | function prefixTable(string $table): string |
| 1276 | 1276 | { |
| 1277 | - $safeTable = htmlspecialchars(DB_PREFIX . $table); |
|
| 1277 | + $safeTable = htmlspecialchars(DB_PREFIX.$table); |
|
| 1278 | 1278 | return $safeTable; |
| 1279 | 1279 | } |
| 1280 | 1280 | |
@@ -1391,7 +1391,7 @@ discard block |
||
| 1391 | 1391 | function send_syslog($message, $host, $port, $component = 'teampass'): void |
| 1392 | 1392 | { |
| 1393 | 1393 | $sock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP); |
| 1394 | - $syslog_message = '<123>' . date('M d H:i:s ') . $component . ': ' . $message; |
|
| 1394 | + $syslog_message = '<123>'.date('M d H:i:s ').$component.': '.$message; |
|
| 1395 | 1395 | socket_sendto($sock, (string) $syslog_message, strlen($syslog_message), 0, (string) $host, (int) $port); |
| 1396 | 1396 | socket_close($sock); |
| 1397 | 1397 | } |
@@ -1438,14 +1438,14 @@ discard block |
||
| 1438 | 1438 | if (isset($SETTINGS['syslog_enable']) === true && (int) $SETTINGS['syslog_enable'] === 1) { |
| 1439 | 1439 | if ($type === 'user_mngt') { |
| 1440 | 1440 | send_syslog( |
| 1441 | - 'action=' . str_replace('at_', '', $label) . ' attribute=user user=' . $who . ' userid="' . $login . '" change="' . $field_1 . '" ', |
|
| 1441 | + 'action='.str_replace('at_', '', $label).' attribute=user user='.$who.' userid="'.$login.'" change="'.$field_1.'" ', |
|
| 1442 | 1442 | $SETTINGS['syslog_host'], |
| 1443 | 1443 | $SETTINGS['syslog_port'], |
| 1444 | 1444 | 'teampass' |
| 1445 | 1445 | ); |
| 1446 | 1446 | } else { |
| 1447 | 1447 | send_syslog( |
| 1448 | - 'action=' . $type . ' attribute=' . $label . ' user=' . $who . ' userid="' . $login . '" ', |
|
| 1448 | + 'action='.$type.' attribute='.$label.' user='.$who.' userid="'.$login.'" ', |
|
| 1449 | 1449 | $SETTINGS['syslog_host'], |
| 1450 | 1450 | $SETTINGS['syslog_port'], |
| 1451 | 1451 | 'teampass' |
@@ -1520,7 +1520,7 @@ discard block |
||
| 1520 | 1520 | if (empty($item_label) === true) { |
| 1521 | 1521 | $dataItem = DB::queryFirstRow( |
| 1522 | 1522 | 'SELECT id, id_tree, label |
| 1523 | - FROM ' . prefixTable('items') . ' |
|
| 1523 | + FROM ' . prefixTable('items').' |
|
| 1524 | 1524 | WHERE id = %i', |
| 1525 | 1525 | $item_id |
| 1526 | 1526 | ); |
@@ -1528,11 +1528,11 @@ discard block |
||
| 1528 | 1528 | } |
| 1529 | 1529 | |
| 1530 | 1530 | send_syslog( |
| 1531 | - 'action=' . str_replace('at_', '', $action) . |
|
| 1532 | - ' attribute=' . str_replace('at_', '', $attribute[0]) . |
|
| 1533 | - ' itemno=' . $item_id . |
|
| 1534 | - ' user=' . (is_null($login) === true ? '' : addslashes((string) $login)) . |
|
| 1535 | - ' itemname="' . addslashes($item_label) . '"', |
|
| 1531 | + 'action='.str_replace('at_', '', $action). |
|
| 1532 | + ' attribute='.str_replace('at_', '', $attribute[0]). |
|
| 1533 | + ' itemno='.$item_id. |
|
| 1534 | + ' user='.(is_null($login) === true ? '' : addslashes((string) $login)). |
|
| 1535 | + ' itemname="'.addslashes($item_label).'"', |
|
| 1536 | 1536 | $SETTINGS['syslog_host'], |
| 1537 | 1537 | $SETTINGS['syslog_port'], |
| 1538 | 1538 | 'teampass' |
@@ -1563,8 +1563,8 @@ discard block |
||
| 1563 | 1563 | // send email to user that what to be notified |
| 1564 | 1564 | $notification = DB::queryFirstField( |
| 1565 | 1565 | 'SELECT email |
| 1566 | - FROM ' . prefixTable('notification') . ' AS n |
|
| 1567 | - INNER JOIN ' . prefixTable('users') . ' AS u ON (n.user_id = u.id) |
|
| 1566 | + FROM ' . prefixTable('notification').' AS n |
|
| 1567 | + INNER JOIN ' . prefixTable('users').' AS u ON (n.user_id = u.id) |
|
| 1568 | 1568 | WHERE n.item_id = %i AND n.user_id != %i', |
| 1569 | 1569 | $item_id, |
| 1570 | 1570 | $globalsUserId |
@@ -1575,7 +1575,7 @@ discard block |
||
| 1575 | 1575 | // Get list of changes |
| 1576 | 1576 | $htmlChanges = '<ul>'; |
| 1577 | 1577 | foreach ($changes as $change) { |
| 1578 | - $htmlChanges .= '<li>' . $change . '</li>'; |
|
| 1578 | + $htmlChanges .= '<li>'.$change.'</li>'; |
|
| 1579 | 1579 | } |
| 1580 | 1580 | $htmlChanges .= '</ul>'; |
| 1581 | 1581 | // send email |
@@ -1612,15 +1612,15 @@ discard block |
||
| 1612 | 1612 | $path = ''; |
| 1613 | 1613 | foreach ($arbo as $elem) { |
| 1614 | 1614 | if (empty($path) === true) { |
| 1615 | - $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES) . ' '; |
|
| 1615 | + $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES).' '; |
|
| 1616 | 1616 | } else { |
| 1617 | - $path .= '→ ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 1617 | + $path .= '→ '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 1618 | 1618 | } |
| 1619 | 1619 | } |
| 1620 | 1620 | |
| 1621 | 1621 | // Build text to show user |
| 1622 | 1622 | if (empty($label) === false) { |
| 1623 | - return empty($path) === true ? addslashes($label) : addslashes($label) . ' (' . $path . ')'; |
|
| 1623 | + return empty($path) === true ? addslashes($label) : addslashes($label).' ('.$path.')'; |
|
| 1624 | 1624 | } |
| 1625 | 1625 | return empty($path) === true ? '' : $path; |
| 1626 | 1626 | } |
@@ -1676,7 +1676,7 @@ discard block |
||
| 1676 | 1676 | { |
| 1677 | 1677 | // Perform a copy if the file exists |
| 1678 | 1678 | if (file_exists($configFilePath)) { |
| 1679 | - $backupFilePath = $configFilePath . '.' . date('Y_m_d_His', time()); |
|
| 1679 | + $backupFilePath = $configFilePath.'.'.date('Y_m_d_His', time()); |
|
| 1680 | 1680 | if (!copy($configFilePath, $backupFilePath)) { |
| 1681 | 1681 | return "ERROR: Could not copy file '$configFilePath'"; |
| 1682 | 1682 | } |
@@ -1684,10 +1684,10 @@ discard block |
||
| 1684 | 1684 | |
| 1685 | 1685 | // Regenerate the config file |
| 1686 | 1686 | $data = ["<?php\n", "global \$SETTINGS;\n", "\$SETTINGS = array (\n"]; |
| 1687 | - $rows = DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type=%s', 'admin'); |
|
| 1687 | + $rows = DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type=%s', 'admin'); |
|
| 1688 | 1688 | foreach ($rows as $record) { |
| 1689 | 1689 | $value = getEncryptedValue($record['valeur'], $record['is_encrypted']); |
| 1690 | - $data[] = " '{$record['intitule']}' => '". htmlspecialchars_decode($value, ENT_COMPAT) . "',\n"; |
|
| 1690 | + $data[] = " '{$record['intitule']}' => '".htmlspecialchars_decode($value, ENT_COMPAT)."',\n"; |
|
| 1691 | 1691 | } |
| 1692 | 1692 | $data[] = ");\n"; |
| 1693 | 1693 | $data = array_unique($data); |
@@ -1732,7 +1732,7 @@ discard block |
||
| 1732 | 1732 | { |
| 1733 | 1733 | global $SETTINGS; |
| 1734 | 1734 | /* LOAD CPASSMAN SETTINGS */ |
| 1735 | - if (! isset($SETTINGS['loaded']) || $SETTINGS['loaded'] !== 1) { |
|
| 1735 | + if (!isset($SETTINGS['loaded']) || $SETTINGS['loaded'] !== 1) { |
|
| 1736 | 1736 | $SETTINGS = []; |
| 1737 | 1737 | $SETTINGS['duplicate_folder'] = 0; |
| 1738 | 1738 | //by default, this is set to 0; |
@@ -1742,7 +1742,7 @@ discard block |
||
| 1742 | 1742 | //by default, this value is set to 5; |
| 1743 | 1743 | $settings = []; |
| 1744 | 1744 | $rows = DB::query( |
| 1745 | - 'SELECT * FROM ' . prefixTable('misc') . ' WHERE type=%s_type OR type=%s_type2', |
|
| 1745 | + 'SELECT * FROM '.prefixTable('misc').' WHERE type=%s_type OR type=%s_type2', |
|
| 1746 | 1746 | [ |
| 1747 | 1747 | 'type' => 'admin', |
| 1748 | 1748 | 'type2' => 'settings', |
@@ -1774,7 +1774,7 @@ discard block |
||
| 1774 | 1774 | $source_cf = []; |
| 1775 | 1775 | $rows = DB::query( |
| 1776 | 1776 | 'SELECT id_category |
| 1777 | - FROM ' . prefixTable('categories_folders') . ' |
|
| 1777 | + FROM ' . prefixTable('categories_folders').' |
|
| 1778 | 1778 | WHERE id_folder = %i', |
| 1779 | 1779 | $source_id |
| 1780 | 1780 | ); |
@@ -1785,7 +1785,7 @@ discard block |
||
| 1785 | 1785 | $target_cf = []; |
| 1786 | 1786 | $rows = DB::query( |
| 1787 | 1787 | 'SELECT id_category |
| 1788 | - FROM ' . prefixTable('categories_folders') . ' |
|
| 1788 | + FROM ' . prefixTable('categories_folders').' |
|
| 1789 | 1789 | WHERE id_folder = %i', |
| 1790 | 1790 | $target_id |
| 1791 | 1791 | ); |
@@ -1880,10 +1880,10 @@ discard block |
||
| 1880 | 1880 | } catch (CryptoException\WrongKeyOrModifiedCiphertextException $ex) { |
| 1881 | 1881 | $err = 'wrong_key'; |
| 1882 | 1882 | } catch (CryptoException\EnvironmentIsBrokenException $ex) { |
| 1883 | - error_log('TEAMPASS-Error-Environment: ' . $ex->getMessage()); |
|
| 1883 | + error_log('TEAMPASS-Error-Environment: '.$ex->getMessage()); |
|
| 1884 | 1884 | $err = 'environment_error'; |
| 1885 | 1885 | } catch (CryptoException\IOException $ex) { |
| 1886 | - error_log('TEAMPASS-Error-General: ' . $ex->getMessage()); |
|
| 1886 | + error_log('TEAMPASS-Error-General: '.$ex->getMessage()); |
|
| 1887 | 1887 | $err = 'general_error'; |
| 1888 | 1888 | } |
| 1889 | 1889 | |
@@ -1915,10 +1915,10 @@ discard block |
||
| 1915 | 1915 | } catch (CryptoException\WrongKeyOrModifiedCiphertextException $ex) { |
| 1916 | 1916 | $err = 'wrong_key'; |
| 1917 | 1917 | } catch (CryptoException\EnvironmentIsBrokenException $ex) { |
| 1918 | - error_log('TEAMPASS-Error-Environment: ' . $ex->getMessage()); |
|
| 1918 | + error_log('TEAMPASS-Error-Environment: '.$ex->getMessage()); |
|
| 1919 | 1919 | $err = 'environment_error'; |
| 1920 | 1920 | } catch (CryptoException\IOException $ex) { |
| 1921 | - error_log('TEAMPASS-Error-General: ' . $ex->getMessage()); |
|
| 1921 | + error_log('TEAMPASS-Error-General: '.$ex->getMessage()); |
|
| 1922 | 1922 | $err = 'general_error'; |
| 1923 | 1923 | } |
| 1924 | 1924 | |
@@ -2004,7 +2004,7 @@ discard block |
||
| 2004 | 2004 | ) { |
| 2005 | 2005 | // Check if the path exists |
| 2006 | 2006 | $path = basename($path); |
| 2007 | - if (! file_exists($path)) { |
|
| 2007 | + if (!file_exists($path)) { |
|
| 2008 | 2008 | return false; |
| 2009 | 2009 | } |
| 2010 | 2010 | |
@@ -2057,7 +2057,7 @@ discard block |
||
| 2057 | 2057 | // Load item data |
| 2058 | 2058 | $data = DB::queryFirstRow( |
| 2059 | 2059 | 'SELECT id_tree |
| 2060 | - FROM ' . prefixTable('items') . ' |
|
| 2060 | + FROM ' . prefixTable('items').' |
|
| 2061 | 2061 | WHERE id = %i', |
| 2062 | 2062 | $item_id |
| 2063 | 2063 | ); |
@@ -2120,7 +2120,7 @@ discard block |
||
| 2120 | 2120 | } |
| 2121 | 2121 | $host .= substr(explode(".", $email[1])[0], -1, 1); |
| 2122 | 2122 | } |
| 2123 | - $email = $name . "@" . $host . "." . explode(".", $email[1])[1]; |
|
| 2123 | + $email = $name."@".$host.".".explode(".", $email[1])[1]; |
|
| 2124 | 2124 | return $email; |
| 2125 | 2125 | } |
| 2126 | 2126 | |
@@ -2151,11 +2151,11 @@ discard block |
||
| 2151 | 2151 | function formatSizeUnits(int $bytes): string |
| 2152 | 2152 | { |
| 2153 | 2153 | if ($bytes >= 1073741824) { |
| 2154 | - $bytes = number_format($bytes / 1073741824, 2) . ' GB'; |
|
| 2154 | + $bytes = number_format($bytes / 1073741824, 2).' GB'; |
|
| 2155 | 2155 | } elseif ($bytes >= 1048576) { |
| 2156 | - $bytes = number_format($bytes / 1048576, 2) . ' MB'; |
|
| 2156 | + $bytes = number_format($bytes / 1048576, 2).' MB'; |
|
| 2157 | 2157 | } elseif ($bytes >= 1024) { |
| 2158 | - $bytes = number_format($bytes / 1024, 2) . ' KB'; |
|
| 2158 | + $bytes = number_format($bytes / 1024, 2).' KB'; |
|
| 2159 | 2159 | } elseif ($bytes > 1) { |
| 2160 | 2160 | $bytes .= ' bytes'; |
| 2161 | 2161 | } elseif ($bytes === 1) { |
@@ -2322,7 +2322,7 @@ discard block |
||
| 2322 | 2322 | */ |
| 2323 | 2323 | function generateKeyIntegrityHash(string $userSeed, string $publicKey, string $serverSecret): string |
| 2324 | 2324 | { |
| 2325 | - return hash_hmac('sha256', $userSeed . $publicKey, $serverSecret); |
|
| 2325 | + return hash_hmac('sha256', $userSeed.$publicKey, $serverSecret); |
|
| 2326 | 2326 | } |
| 2327 | 2327 | |
| 2328 | 2328 | /** |
@@ -2397,7 +2397,7 @@ discard block |
||
| 2397 | 2397 | 'security_alert', |
| 2398 | 2398 | 'key_integrity_check_failed', |
| 2399 | 2399 | (string) $userInfo['id'], |
| 2400 | - 'User: ' . $userInfo['login'] |
|
| 2400 | + 'User: '.$userInfo['login'] |
|
| 2401 | 2401 | ); |
| 2402 | 2402 | return [ |
| 2403 | 2403 | 'success' => false, |
@@ -2444,7 +2444,7 @@ discard block |
||
| 2444 | 2444 | 'user_connection', |
| 2445 | 2445 | 'auto_reencryption_success', |
| 2446 | 2446 | (string) $userInfo['id'], |
| 2447 | - 'User: ' . $userInfo['login'] |
|
| 2447 | + 'User: '.$userInfo['login'] |
|
| 2448 | 2448 | ); |
| 2449 | 2449 | |
| 2450 | 2450 | // Store in session for immediate use |
@@ -2463,12 +2463,12 @@ discard block |
||
| 2463 | 2463 | 'security_alert', |
| 2464 | 2464 | 'auto_reencryption_failed', |
| 2465 | 2465 | (string) $userInfo['id'], |
| 2466 | - 'User: ' . $userInfo['login'] . ' - Error: ' . $e->getMessage() |
|
| 2466 | + 'User: '.$userInfo['login'].' - Error: '.$e->getMessage() |
|
| 2467 | 2467 | ); |
| 2468 | 2468 | |
| 2469 | 2469 | return [ |
| 2470 | 2470 | 'success' => false, |
| 2471 | - 'error' => 'decryption_failed: ' . $e->getMessage(), |
|
| 2471 | + 'error' => 'decryption_failed: '.$e->getMessage(), |
|
| 2472 | 2472 | 'private_key_clear' => '', |
| 2473 | 2473 | ]; |
| 2474 | 2474 | } |
@@ -2539,7 +2539,7 @@ discard block |
||
| 2539 | 2539 | 'security_alert', |
| 2540 | 2540 | 'auto_reencryption_critical_failure', |
| 2541 | 2541 | (string) $userId, |
| 2542 | - 'User: ' . $userInfo['login'] . ' - disabled due to key recovery failure' |
|
| 2542 | + 'User: '.$userInfo['login'].' - disabled due to key recovery failure' |
|
| 2543 | 2543 | ); |
| 2544 | 2544 | |
| 2545 | 2545 | return false; |
@@ -2697,7 +2697,7 @@ discard block |
||
| 2697 | 2697 | $cipher->enableContinuousBuffer(); |
| 2698 | 2698 | |
| 2699 | 2699 | // Encrypt the file content |
| 2700 | - $filePath = filter_var($fileInPath . '/' . $fileInName, FILTER_SANITIZE_URL); |
|
| 2700 | + $filePath = filter_var($fileInPath.'/'.$fileInName, FILTER_SANITIZE_URL); |
|
| 2701 | 2701 | $fileContent = file_get_contents($filePath); |
| 2702 | 2702 | $plaintext = $fileContent; |
| 2703 | 2703 | $ciphertext = $cipher->encrypt($plaintext); |
@@ -2705,9 +2705,9 @@ discard block |
||
| 2705 | 2705 | // Save new file |
| 2706 | 2706 | // deepcode ignore InsecureHash: is simply used to get a unique name |
| 2707 | 2707 | $hash = uniqid('', true); |
| 2708 | - $fileOut = $fileInPath . '/' . TP_FILE_PREFIX . $hash; |
|
| 2708 | + $fileOut = $fileInPath.'/'.TP_FILE_PREFIX.$hash; |
|
| 2709 | 2709 | file_put_contents($fileOut, $ciphertext); |
| 2710 | - unlink($fileInPath . '/' . $fileInName); |
|
| 2710 | + unlink($fileInPath.'/'.$fileInName); |
|
| 2711 | 2711 | return [ |
| 2712 | 2712 | 'fileHash' => base64_encode($hash), |
| 2713 | 2713 | 'objectKey' => base64_encode($objectKey), |
@@ -2723,9 +2723,9 @@ discard block |
||
| 2723 | 2723 | * |
| 2724 | 2724 | * @return string|array |
| 2725 | 2725 | */ |
| 2726 | -function decryptFile(string $fileName, string $filePath, string $key): string|array |
|
| 2726 | +function decryptFile(string $fileName, string $filePath, string $key): string | array |
|
| 2727 | 2727 | { |
| 2728 | - if (! defined('FILE_BUFFER_SIZE')) { |
|
| 2728 | + if (!defined('FILE_BUFFER_SIZE')) { |
|
| 2729 | 2729 | define('FILE_BUFFER_SIZE', 128 * 1024); |
| 2730 | 2730 | } |
| 2731 | 2731 | |
@@ -2742,7 +2742,7 @@ discard block |
||
| 2742 | 2742 | $cipher->enableContinuousBuffer(); |
| 2743 | 2743 | $cipher->disablePadding(); |
| 2744 | 2744 | // Get file content |
| 2745 | - $safeFilePath = realpath($filePath . '/' . TP_FILE_PREFIX . $safeFileName); |
|
| 2745 | + $safeFilePath = realpath($filePath.'/'.TP_FILE_PREFIX.$safeFileName); |
|
| 2746 | 2746 | if ($safeFilePath !== false && file_exists($safeFilePath)) { |
| 2747 | 2747 | $ciphertext = file_get_contents(filter_var($safeFilePath, FILTER_SANITIZE_URL)); |
| 2748 | 2748 | } else { |
@@ -2838,7 +2838,7 @@ discard block |
||
| 2838 | 2838 | } |
| 2839 | 2839 | $users = DB::query( |
| 2840 | 2840 | 'SELECT id, public_key |
| 2841 | - FROM ' . prefixTable('users') . ' |
|
| 2841 | + FROM ' . prefixTable('users').' |
|
| 2842 | 2842 | WHERE id NOT IN %li |
| 2843 | 2843 | AND public_key != ""', |
| 2844 | 2844 | $user_ids |
@@ -2847,7 +2847,7 @@ discard block |
||
| 2847 | 2847 | // Insert in DB the new object key for this item by user |
| 2848 | 2848 | if (count($objectKeyArray) === 0) { |
| 2849 | 2849 | if (WIP === true) { |
| 2850 | - error_log('TEAMPASS Debug - storeUsersShareKey case1 - ' . $object_name . ' - ' . $post_object_id . ' - ' . $user['id']); |
|
| 2850 | + error_log('TEAMPASS Debug - storeUsersShareKey case1 - '.$object_name.' - '.$post_object_id.' - '.$user['id']); |
|
| 2851 | 2851 | } |
| 2852 | 2852 | |
| 2853 | 2853 | insertOrUpdateSharekey( |
@@ -2859,7 +2859,7 @@ discard block |
||
| 2859 | 2859 | } else { |
| 2860 | 2860 | foreach ($objectKeyArray as $object) { |
| 2861 | 2861 | if (WIP === true) { |
| 2862 | - error_log('TEAMPASS Debug - storeUsersShareKey case2 - ' . $object_name . ' - ' . $object['objectId'] . ' - ' . $user['id']); |
|
| 2862 | + error_log('TEAMPASS Debug - storeUsersShareKey case2 - '.$object_name.' - '.$object['objectId'].' - '.$user['id']); |
|
| 2863 | 2863 | } |
| 2864 | 2864 | |
| 2865 | 2865 | insertOrUpdateSharekey( |
@@ -2891,7 +2891,7 @@ discard block |
||
| 2891 | 2891 | ): bool { |
| 2892 | 2892 | try { |
| 2893 | 2893 | DB::query( |
| 2894 | - 'INSERT INTO ' . $tableName . ' |
|
| 2894 | + 'INSERT INTO '.$tableName.' |
|
| 2895 | 2895 | (object_id, user_id, share_key) |
| 2896 | 2896 | VALUES (%i, %i, %s) |
| 2897 | 2897 | ON DUPLICATE KEY UPDATE share_key = VALUES(share_key)', |
@@ -2901,7 +2901,7 @@ discard block |
||
| 2901 | 2901 | ); |
| 2902 | 2902 | return true; |
| 2903 | 2903 | } catch (Exception $e) { |
| 2904 | - error_log('TEAMPASS Error - insertOrUpdateSharekey: ' . $e->getMessage()); |
|
| 2904 | + error_log('TEAMPASS Error - insertOrUpdateSharekey: '.$e->getMessage()); |
|
| 2905 | 2905 | return false; |
| 2906 | 2906 | } |
| 2907 | 2907 | } |
@@ -2916,7 +2916,7 @@ discard block |
||
| 2916 | 2916 | function isBase64(string $str): bool |
| 2917 | 2917 | { |
| 2918 | 2918 | $str = (string) trim($str); |
| 2919 | - if (! isset($str[0])) { |
|
| 2919 | + if (!isset($str[0])) { |
|
| 2920 | 2920 | return false; |
| 2921 | 2921 | } |
| 2922 | 2922 | |
@@ -2990,7 +2990,7 @@ discard block |
||
| 2990 | 2990 | } catch (\LdapRecord\Auth\BindException $e) { |
| 2991 | 2991 | $error = $e->getDetailedError(); |
| 2992 | 2992 | if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) { |
| 2993 | - error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage()); |
|
| 2993 | + error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage()); |
|
| 2994 | 2994 | } |
| 2995 | 2995 | // deepcode ignore ServerLeak: No important data is sent |
| 2996 | 2996 | echo 'An error occurred.'; |
@@ -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.'; |
@@ -3043,7 +3043,7 @@ discard block |
||
| 3043 | 3043 | // expect if personal item |
| 3044 | 3044 | DB::delete( |
| 3045 | 3045 | prefixTable('sharekeys_items'), |
| 3046 | - 'user_id = %i',// AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)'', |
|
| 3046 | + 'user_id = %i', // AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)'', |
|
| 3047 | 3047 | $userId |
| 3048 | 3048 | ); |
| 3049 | 3049 | // Remove all item sharekeys files |
@@ -3067,7 +3067,7 @@ discard block |
||
| 3067 | 3067 | // Remove all item sharekeys suggestions |
| 3068 | 3068 | DB::delete( |
| 3069 | 3069 | prefixTable('sharekeys_suggestions'), |
| 3070 | - 'user_id = %i',// AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)', |
|
| 3070 | + 'user_id = %i', // AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)', |
|
| 3071 | 3071 | $userId |
| 3072 | 3072 | ); |
| 3073 | 3073 | return false; |
@@ -3088,7 +3088,7 @@ discard block |
||
| 3088 | 3088 | foreach (DateTimeZone::listIdentifiers() as $timezone) { |
| 3089 | 3089 | $now->setTimezone(new DateTimeZone($timezone)); |
| 3090 | 3090 | $offsets[] = $offset = $now->getOffset(); |
| 3091 | - $timezones[$timezone] = '(' . format_GMT_offset($offset) . ') ' . format_timezone_name($timezone); |
|
| 3091 | + $timezones[$timezone] = '('.format_GMT_offset($offset).') '.format_timezone_name($timezone); |
|
| 3092 | 3092 | } |
| 3093 | 3093 | |
| 3094 | 3094 | array_multisort($offsets, $timezones); |
@@ -3108,7 +3108,7 @@ discard block |
||
| 3108 | 3108 | { |
| 3109 | 3109 | $hours = intval($offset / 3600); |
| 3110 | 3110 | $minutes = abs(intval($offset % 3600 / 60)); |
| 3111 | - return 'GMT' . ($offset ? sprintf('%+03d:%02d', $hours, $minutes) : ''); |
|
| 3111 | + return 'GMT'.($offset ? sprintf('%+03d:%02d', $hours, $minutes) : ''); |
|
| 3112 | 3112 | } |
| 3113 | 3113 | |
| 3114 | 3114 | /** |
@@ -3207,8 +3207,7 @@ discard block |
||
| 3207 | 3207 | { |
| 3208 | 3208 | if (isset($array[$key]) === true |
| 3209 | 3209 | && (is_int($value) === true ? |
| 3210 | - (int) $array[$key] === $value : |
|
| 3211 | - (string) $array[$key] === $value) |
|
| 3210 | + (int) $array[$key] === $value : (string) $array[$key] === $value) |
|
| 3212 | 3211 | ) { |
| 3213 | 3212 | return true; |
| 3214 | 3213 | } |
@@ -3230,8 +3229,7 @@ discard block |
||
| 3230 | 3229 | { |
| 3231 | 3230 | if (isset($var) === false |
| 3232 | 3231 | || (is_int($value) === true ? |
| 3233 | - (int) $var === $value : |
|
| 3234 | - (string) $var === $value) |
|
| 3232 | + (int) $var === $value : (string) $var === $value) |
|
| 3235 | 3233 | ) { |
| 3236 | 3234 | return true; |
| 3237 | 3235 | } |
@@ -3282,7 +3280,7 @@ discard block |
||
| 3282 | 3280 | */ |
| 3283 | 3281 | function isSetArrayOfValues(array $arrayOfValues): bool |
| 3284 | 3282 | { |
| 3285 | - foreach($arrayOfValues as $value) { |
|
| 3283 | + foreach ($arrayOfValues as $value) { |
|
| 3286 | 3284 | if (isset($value) === false) { |
| 3287 | 3285 | return false; |
| 3288 | 3286 | } |
@@ -3304,7 +3302,7 @@ discard block |
||
| 3304 | 3302 | /*PHP8 - integer|string*/$value |
| 3305 | 3303 | ) : bool |
| 3306 | 3304 | { |
| 3307 | - foreach($arrayOfVars as $variable) { |
|
| 3305 | + foreach ($arrayOfVars as $variable) { |
|
| 3308 | 3306 | if ($variable !== $value) { |
| 3309 | 3307 | return false; |
| 3310 | 3308 | } |
@@ -3324,7 +3322,7 @@ discard block |
||
| 3324 | 3322 | /*PHP8 - integer|string*/$value |
| 3325 | 3323 | ) : bool |
| 3326 | 3324 | { |
| 3327 | - foreach($arrayOfVars as $variable) { |
|
| 3325 | + foreach ($arrayOfVars as $variable) { |
|
| 3328 | 3326 | if ($variable === $value) { |
| 3329 | 3327 | return true; |
| 3330 | 3328 | } |
@@ -3338,7 +3336,7 @@ discard block |
||
| 3338 | 3336 | * @param string|int|null $value |
| 3339 | 3337 | * @return boolean |
| 3340 | 3338 | */ |
| 3341 | -function isValueSetNullEmpty(string|int|null $value) : bool |
|
| 3339 | +function isValueSetNullEmpty(string | int | null $value) : bool |
|
| 3342 | 3340 | { |
| 3343 | 3341 | if (is_null($value) === true || empty($value) === true) { |
| 3344 | 3342 | return true; |
@@ -3393,7 +3391,7 @@ discard block |
||
| 3393 | 3391 | * @param array $filters |
| 3394 | 3392 | * @return array|string |
| 3395 | 3393 | */ |
| 3396 | -function dataSanitizer(array $data, array $filters): array|string |
|
| 3394 | +function dataSanitizer(array $data, array $filters): array | string |
|
| 3397 | 3395 | { |
| 3398 | 3396 | // Load Sanitizer library |
| 3399 | 3397 | $sanitizer = new Sanitizer($data, $filters); |
@@ -3422,7 +3420,7 @@ discard block |
||
| 3422 | 3420 | // Exists ? |
| 3423 | 3421 | $userCacheId = DB::queryFirstRow( |
| 3424 | 3422 | 'SELECT increment_id |
| 3425 | - FROM ' . prefixTable('cache_tree') . ' |
|
| 3423 | + FROM ' . prefixTable('cache_tree').' |
|
| 3426 | 3424 | WHERE user_id = %i', |
| 3427 | 3425 | $user_id |
| 3428 | 3426 | ); |
@@ -3473,7 +3471,7 @@ discard block |
||
| 3473 | 3471 | */ |
| 3474 | 3472 | function pourcentage(float $nombre, float $total, float $pourcentage): float |
| 3475 | 3473 | { |
| 3476 | - $resultat = ($nombre/$total) * $pourcentage; |
|
| 3474 | + $resultat = ($nombre / $total) * $pourcentage; |
|
| 3477 | 3475 | return round($resultat); |
| 3478 | 3476 | } |
| 3479 | 3477 | |
@@ -3503,7 +3501,7 @@ discard block |
||
| 3503 | 3501 | |
| 3504 | 3502 | // Get last folder update |
| 3505 | 3503 | $lastFolderChange = DB::queryFirstRow( |
| 3506 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' |
|
| 3504 | + 'SELECT valeur FROM '.prefixTable('misc').' |
|
| 3507 | 3505 | WHERE type = %s AND intitule = %s', |
| 3508 | 3506 | 'timestamp', |
| 3509 | 3507 | 'last_folder_change' |
@@ -3524,7 +3522,7 @@ discard block |
||
| 3524 | 3522 | // Does this user has a tree cache |
| 3525 | 3523 | $userCacheTree = DB::queryFirstRow( |
| 3526 | 3524 | 'SELECT '.$fieldName.' |
| 3527 | - FROM ' . prefixTable('cache_tree') . ' |
|
| 3525 | + FROM ' . prefixTable('cache_tree').' |
|
| 3528 | 3526 | WHERE user_id = %i', |
| 3529 | 3527 | $session->get('user-id') |
| 3530 | 3528 | ); |
@@ -3562,7 +3560,7 @@ discard block |
||
| 3562 | 3560 | if (count($folderIds) === 0) { |
| 3563 | 3561 | $folderIds = DB::queryFirstColumn( |
| 3564 | 3562 | 'SELECT id |
| 3565 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 3563 | + FROM ' . prefixTable('nested_tree').' |
|
| 3566 | 3564 | WHERE personal_folder=%i', |
| 3567 | 3565 | 0 |
| 3568 | 3566 | ); |
@@ -3579,8 +3577,8 @@ discard block |
||
| 3579 | 3577 | $rows_tmp = DB::query( |
| 3580 | 3578 | 'SELECT c.id, c.title, c.level, c.type, c.masked, c.order, c.encrypted_data, c.role_visibility, c.is_mandatory, |
| 3581 | 3579 | f.id_category AS category_id |
| 3582 | - FROM ' . prefixTable('categories_folders') . ' AS f |
|
| 3583 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (f.id_category = c.parent_id) |
|
| 3580 | + FROM ' . prefixTable('categories_folders').' AS f |
|
| 3581 | + INNER JOIN ' . prefixTable('categories').' AS c ON (f.id_category = c.parent_id) |
|
| 3584 | 3582 | WHERE id_folder=%i', |
| 3585 | 3583 | $folder |
| 3586 | 3584 | ); |
@@ -3606,7 +3604,7 @@ discard block |
||
| 3606 | 3604 | $valTemp = ''; |
| 3607 | 3605 | $data = DB::queryFirstRow( |
| 3608 | 3606 | 'SELECT valeur |
| 3609 | - FROM ' . prefixTable('misc') . ' |
|
| 3607 | + FROM ' . prefixTable('misc').' |
|
| 3610 | 3608 | WHERE type = %s AND intitule=%i', |
| 3611 | 3609 | 'complex', |
| 3612 | 3610 | $folder |
@@ -3623,14 +3621,14 @@ discard block |
||
| 3623 | 3621 | $valTemp = ''; |
| 3624 | 3622 | $rows_tmp = DB::query( |
| 3625 | 3623 | 'SELECT t.title |
| 3626 | - FROM ' . prefixTable('roles_values') . ' as v |
|
| 3627 | - INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id) |
|
| 3624 | + FROM ' . prefixTable('roles_values').' as v |
|
| 3625 | + INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id) |
|
| 3628 | 3626 | WHERE v.folder_id = %i |
| 3629 | 3627 | GROUP BY title', |
| 3630 | 3628 | $folder |
| 3631 | 3629 | ); |
| 3632 | 3630 | foreach ($rows_tmp as $record) { |
| 3633 | - $valTemp .= (empty($valTemp) === true ? '' : ' - ') . $record['title']; |
|
| 3631 | + $valTemp .= (empty($valTemp) === true ? '' : ' - ').$record['title']; |
|
| 3634 | 3632 | } |
| 3635 | 3633 | $arr_data['visibilityRoles'] = $valTemp; |
| 3636 | 3634 | |
@@ -3663,7 +3661,7 @@ discard block |
||
| 3663 | 3661 | // loop on users and check if user has this role |
| 3664 | 3662 | $rows = DB::query( |
| 3665 | 3663 | 'SELECT id, fonction_id |
| 3666 | - FROM ' . prefixTable('users') . ' |
|
| 3664 | + FROM ' . prefixTable('users').' |
|
| 3667 | 3665 | WHERE id != %i AND admin = 0 AND fonction_id IS NOT NULL AND fonction_id != ""', |
| 3668 | 3666 | $session->get('user-id') |
| 3669 | 3667 | ); |
@@ -3695,7 +3693,7 @@ discard block |
||
| 3695 | 3693 | |
| 3696 | 3694 | $val = DB::queryFirstRow( |
| 3697 | 3695 | 'SELECT * |
| 3698 | - FROM ' . prefixTable('users') . ' |
|
| 3696 | + FROM ' . prefixTable('users').' |
|
| 3699 | 3697 | WHERE id = %i', |
| 3700 | 3698 | $userId |
| 3701 | 3699 | ); |
@@ -3711,12 +3709,12 @@ discard block |
||
| 3711 | 3709 | function upgradeRequired(): bool |
| 3712 | 3710 | { |
| 3713 | 3711 | // Get settings.php |
| 3714 | - include_once __DIR__. '/../includes/config/settings.php'; |
|
| 3712 | + include_once __DIR__.'/../includes/config/settings.php'; |
|
| 3715 | 3713 | |
| 3716 | 3714 | // Get timestamp in DB |
| 3717 | 3715 | $val = DB::queryFirstRow( |
| 3718 | 3716 | 'SELECT valeur |
| 3719 | - FROM ' . prefixTable('misc') . ' |
|
| 3717 | + FROM ' . prefixTable('misc').' |
|
| 3720 | 3718 | WHERE type = %s AND intitule = %s', |
| 3721 | 3719 | 'admin', |
| 3722 | 3720 | 'upgrade_timestamp' |
@@ -3769,7 +3767,7 @@ discard block |
||
| 3769 | 3767 | // prepapre background tasks for item keys generation |
| 3770 | 3768 | $userTP = DB::queryFirstRow( |
| 3771 | 3769 | 'SELECT pw, public_key, private_key |
| 3772 | - FROM ' . prefixTable('users') . ' |
|
| 3770 | + FROM ' . prefixTable('users').' |
|
| 3773 | 3771 | WHERE id = %i', |
| 3774 | 3772 | TP_USER_ID |
| 3775 | 3773 | ); |
@@ -3830,7 +3828,7 @@ discard block |
||
| 3830 | 3828 | } |
| 3831 | 3829 | |
| 3832 | 3830 | // Generate new keys |
| 3833 | - if ($user_self_change === true && empty($recovery_public_key) === false && empty($recovery_private_key) === false){ |
|
| 3831 | + if ($user_self_change === true && empty($recovery_public_key) === false && empty($recovery_private_key) === false) { |
|
| 3834 | 3832 | $userKeys = [ |
| 3835 | 3833 | 'public_key' => $recovery_public_key, |
| 3836 | 3834 | 'private_key_clear' => $recovery_private_key, |
@@ -3881,8 +3879,8 @@ discard block |
||
| 3881 | 3879 | 'process_type' => 'create_user_keys', |
| 3882 | 3880 | 'arguments' => json_encode([ |
| 3883 | 3881 | 'new_user_id' => (int) $userId, |
| 3884 | - 'new_user_pwd' => cryption($passwordClear, '','encrypt')['string'], |
|
| 3885 | - 'new_user_code' => cryption(empty($encryptionKey) === true ? uniqidReal(20) : $encryptionKey, '','encrypt')['string'], |
|
| 3882 | + 'new_user_pwd' => cryption($passwordClear, '', 'encrypt')['string'], |
|
| 3883 | + 'new_user_code' => cryption(empty($encryptionKey) === true ? uniqidReal(20) : $encryptionKey, '', 'encrypt')['string'], |
|
| 3886 | 3884 | 'owner_id' => (int) TP_USER_ID, |
| 3887 | 3885 | 'creator_pwd' => $userTP['pw'], |
| 3888 | 3886 | 'send_email' => $sendEmailToUser === true ? 1 : 0, |
@@ -3954,19 +3952,19 @@ discard block |
||
| 3954 | 3952 | |
| 3955 | 3953 | // Prepare the subtask queries |
| 3956 | 3954 | $queries = [ |
| 3957 | - 'step20' => 'SELECT * FROM ' . prefixTable('items'), |
|
| 3955 | + 'step20' => 'SELECT * FROM '.prefixTable('items'), |
|
| 3958 | 3956 | |
| 3959 | - 'step30' => 'SELECT * FROM ' . prefixTable('log_items') . |
|
| 3957 | + 'step30' => 'SELECT * FROM '.prefixTable('log_items'). |
|
| 3960 | 3958 | ' WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"', |
| 3961 | 3959 | |
| 3962 | - 'step40' => 'SELECT * FROM ' . prefixTable('categories_items') . |
|
| 3960 | + 'step40' => 'SELECT * FROM '.prefixTable('categories_items'). |
|
| 3963 | 3961 | ' WHERE encryption_type = "teampass_aes"', |
| 3964 | 3962 | |
| 3965 | - 'step50' => 'SELECT * FROM ' . prefixTable('suggestion'), |
|
| 3963 | + 'step50' => 'SELECT * FROM '.prefixTable('suggestion'), |
|
| 3966 | 3964 | |
| 3967 | - 'step60' => 'SELECT * FROM ' . prefixTable('files') . ' AS f |
|
| 3968 | - INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = f.id_item |
|
| 3969 | - WHERE f.status = "' . TP_ENCRYPTION_NAME . '"' |
|
| 3965 | + 'step60' => 'SELECT * FROM '.prefixTable('files').' AS f |
|
| 3966 | + INNER JOIN ' . prefixTable('items').' AS i ON i.id = f.id_item |
|
| 3967 | + WHERE f.status = "' . TP_ENCRYPTION_NAME.'"' |
|
| 3970 | 3968 | ]; |
| 3971 | 3969 | |
| 3972 | 3970 | // Perform loop on $queries to create sub-tasks |
@@ -4156,7 +4154,7 @@ discard block |
||
| 4156 | 4154 | */ |
| 4157 | 4155 | function createTaskForItem( |
| 4158 | 4156 | string $processType, |
| 4159 | - string|array $taskName, |
|
| 4157 | + string | array $taskName, |
|
| 4160 | 4158 | int $itemId, |
| 4161 | 4159 | int $userId, |
| 4162 | 4160 | string $objectKey, |
@@ -4180,7 +4178,7 @@ discard block |
||
| 4180 | 4178 | 'object_key' => $objectKey, |
| 4181 | 4179 | 'author' => (int) $userId, |
| 4182 | 4180 | ]), |
| 4183 | - 'item_id' => (int) $parentId !== -1 ? $parentId : null, |
|
| 4181 | + 'item_id' => (int) $parentId !== -1 ? $parentId : null, |
|
| 4184 | 4182 | ) |
| 4185 | 4183 | ); |
| 4186 | 4184 | $processId = DB::insertId(); |
@@ -4190,7 +4188,7 @@ discard block |
||
| 4190 | 4188 | if (is_array($taskName) === false) { |
| 4191 | 4189 | $taskName = [$taskName]; |
| 4192 | 4190 | } |
| 4193 | - foreach($taskName as $task) { |
|
| 4191 | + foreach ($taskName as $task) { |
|
| 4194 | 4192 | if (WIP === true) error_log('createTaskForItem - task: '.$task); |
| 4195 | 4193 | switch ($task) { |
| 4196 | 4194 | case 'item_password': |
@@ -4287,7 +4285,7 @@ discard block |
||
| 4287 | 4285 | * @param integer $user_id |
| 4288 | 4286 | * @return void |
| 4289 | 4287 | */ |
| 4290 | -function purgeUnnecessaryKeys(bool $allUsers = true, int $user_id=0) |
|
| 4288 | +function purgeUnnecessaryKeys(bool $allUsers = true, int $user_id = 0) |
|
| 4291 | 4289 | { |
| 4292 | 4290 | if ($allUsers === true) { |
| 4293 | 4291 | // Load class DB |
@@ -4297,7 +4295,7 @@ discard block |
||
| 4297 | 4295 | |
| 4298 | 4296 | $users = DB::query( |
| 4299 | 4297 | 'SELECT id |
| 4300 | - FROM ' . prefixTable('users') . ' |
|
| 4298 | + FROM ' . prefixTable('users').' |
|
| 4301 | 4299 | WHERE id NOT IN ('.OTV_USER_ID.', '.TP_USER_ID.', '.SSH_USER_ID.', '.API_USER_ID.') |
| 4302 | 4300 | ORDER BY login ASC' |
| 4303 | 4301 | ); |
@@ -4315,7 +4313,7 @@ discard block |
||
| 4315 | 4313 | * @param integer $user_id |
| 4316 | 4314 | * @return void |
| 4317 | 4315 | */ |
| 4318 | -function purgeUnnecessaryKeysForUser(int $user_id=0) |
|
| 4316 | +function purgeUnnecessaryKeysForUser(int $user_id = 0) |
|
| 4319 | 4317 | { |
| 4320 | 4318 | if ($user_id === 0) { |
| 4321 | 4319 | return; |
@@ -4326,8 +4324,8 @@ discard block |
||
| 4326 | 4324 | |
| 4327 | 4325 | $personalItems = DB::queryFirstColumn( |
| 4328 | 4326 | 'SELECT id |
| 4329 | - FROM ' . prefixTable('items') . ' AS i |
|
| 4330 | - INNER JOIN ' . prefixTable('log_items') . ' AS li ON li.id_item = i.id |
|
| 4327 | + FROM ' . prefixTable('items').' AS i |
|
| 4328 | + INNER JOIN ' . prefixTable('log_items').' AS li ON li.id_item = i.id |
|
| 4331 | 4329 | WHERE i.perso = 1 AND li.action = "at_creation" AND li.id_user IN (%i, '.TP_USER_ID.')', |
| 4332 | 4330 | $user_id |
| 4333 | 4331 | ); |
@@ -4337,28 +4335,28 @@ discard block |
||
| 4337 | 4335 | prefixTable('sharekeys_items'), |
| 4338 | 4336 | 'object_id IN %li AND user_id NOT IN %ls', |
| 4339 | 4337 | $personalItems, |
| 4340 | - [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID] |
|
| 4338 | + [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID] |
|
| 4341 | 4339 | ); |
| 4342 | 4340 | // Files keys |
| 4343 | 4341 | DB::delete( |
| 4344 | 4342 | prefixTable('sharekeys_files'), |
| 4345 | 4343 | 'object_id IN %li AND user_id NOT IN %ls', |
| 4346 | 4344 | $personalItems, |
| 4347 | - [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID] |
|
| 4345 | + [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID] |
|
| 4348 | 4346 | ); |
| 4349 | 4347 | // Fields keys |
| 4350 | 4348 | DB::delete( |
| 4351 | 4349 | prefixTable('sharekeys_fields'), |
| 4352 | 4350 | 'object_id IN %li AND user_id NOT IN %ls', |
| 4353 | 4351 | $personalItems, |
| 4354 | - [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID] |
|
| 4352 | + [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID] |
|
| 4355 | 4353 | ); |
| 4356 | 4354 | // Logs keys |
| 4357 | 4355 | DB::delete( |
| 4358 | 4356 | prefixTable('sharekeys_logs'), |
| 4359 | 4357 | 'object_id IN %li AND user_id NOT IN %ls', |
| 4360 | 4358 | $personalItems, |
| 4361 | - [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID] |
|
| 4359 | + [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID] |
|
| 4362 | 4360 | ); |
| 4363 | 4361 | } |
| 4364 | 4362 | } |
@@ -4376,7 +4374,7 @@ discard block |
||
| 4376 | 4374 | // Check if user exists |
| 4377 | 4375 | $userInfo = DB::queryFirstRow( |
| 4378 | 4376 | 'SELECT login |
| 4379 | - FROM ' . prefixTable('users') . ' |
|
| 4377 | + FROM ' . prefixTable('users').' |
|
| 4380 | 4378 | WHERE id = %i', |
| 4381 | 4379 | $userId |
| 4382 | 4380 | ); |
@@ -4385,7 +4383,7 @@ discard block |
||
| 4385 | 4383 | $now = (int) time(); |
| 4386 | 4384 | // Prepare file content |
| 4387 | 4385 | $export_value = file_get_contents(__DIR__."/../includes/core/teampass_ascii.txt")."\n". |
| 4388 | - "Generation date: ".date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $now)."\n\n". |
|
| 4386 | + "Generation date: ".date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $now)."\n\n". |
|
| 4389 | 4387 | "RECOVERY KEYS - Not to be shared - To be store safely\n\n". |
| 4390 | 4388 | "Public Key:\n".$session->get('user-public_key')."\n\n". |
| 4391 | 4389 | "Private Key:\n".$session->get('user-private_key')."\n\n"; |
@@ -4408,7 +4406,7 @@ discard block |
||
| 4408 | 4406 | return prepareExchangedData( |
| 4409 | 4407 | array( |
| 4410 | 4408 | 'error' => false, |
| 4411 | - 'datetime' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $now), |
|
| 4409 | + 'datetime' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $now), |
|
| 4412 | 4410 | 'timestamp' => $now, |
| 4413 | 4411 | 'content' => base64_encode($export_value), |
| 4414 | 4412 | 'login' => $userInfo['login'], |
@@ -4434,8 +4432,8 @@ discard block |
||
| 4434 | 4432 | */ |
| 4435 | 4433 | function loadClasses(string $className = ''): void |
| 4436 | 4434 | { |
| 4437 | - require_once __DIR__. '/../includes/config/include.php'; |
|
| 4438 | - require_once __DIR__. '/../includes/config/settings.php'; |
|
| 4435 | + require_once __DIR__.'/../includes/config/include.php'; |
|
| 4436 | + require_once __DIR__.'/../includes/config/settings.php'; |
|
| 4439 | 4437 | require_once __DIR__.'/../vendor/autoload.php'; |
| 4440 | 4438 | |
| 4441 | 4439 | if (defined('DB_PASSWD_CLEAR') === false) { |
@@ -4648,7 +4646,7 @@ discard block |
||
| 4648 | 4646 | |
| 4649 | 4647 | // Get current user hash |
| 4650 | 4648 | $userHash = DB::queryFirstRow( |
| 4651 | - "SELECT pw FROM " . prefixtable('users') . " WHERE id = %d;", |
|
| 4649 | + "SELECT pw FROM ".prefixtable('users')." WHERE id = %d;", |
|
| 4652 | 4650 | $session->get('user-id') |
| 4653 | 4651 | )['pw']; |
| 4654 | 4652 | |
@@ -4696,11 +4694,11 @@ discard block |
||
| 4696 | 4694 | } |
| 4697 | 4695 | |
| 4698 | 4696 | // Alternative: serialize ou json selon le contexte |
| 4699 | - return get_class($value) . (method_exists($value, 'getId') ? '#' . $value->getId() : ''); |
|
| 4697 | + return get_class($value).(method_exists($value, 'getId') ? '#'.$value->getId() : ''); |
|
| 4700 | 4698 | } |
| 4701 | 4699 | |
| 4702 | 4700 | if (is_resource($value)) { |
| 4703 | - return 'Resource#' . get_resource_id($value) . ' of type ' . get_resource_type($value); |
|
| 4701 | + return 'Resource#'.get_resource_id($value).' of type '.get_resource_type($value); |
|
| 4704 | 4702 | } |
| 4705 | 4703 | |
| 4706 | 4704 | // Cas par défaut |
@@ -4720,7 +4718,7 @@ discard block |
||
| 4720 | 4718 | // Refuse access if user does not exist and/or is admin |
| 4721 | 4719 | $user = DB::queryFirstRow( |
| 4722 | 4720 | 'SELECT admin |
| 4723 | - FROM ' . prefixTable('users') . ' |
|
| 4721 | + FROM ' . prefixTable('users').' |
|
| 4724 | 4722 | WHERE id = %i', |
| 4725 | 4723 | $userId |
| 4726 | 4724 | ); |
@@ -4731,8 +4729,8 @@ discard block |
||
| 4731 | 4729 | // Get file info |
| 4732 | 4730 | $file = DB::queryFirstRow( |
| 4733 | 4731 | 'SELECT f.id_item, i.id_tree |
| 4734 | - FROM ' . prefixTable('files') . ' as f |
|
| 4735 | - INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = f.id_item |
|
| 4732 | + FROM ' . prefixTable('files').' as f |
|
| 4733 | + INNER JOIN ' . prefixTable('items').' AS i ON i.id = f.id_item |
|
| 4736 | 4734 | WHERE f.id = %i', |
| 4737 | 4735 | $fileId |
| 4738 | 4736 | ); |
@@ -4741,7 +4739,7 @@ discard block |
||
| 4741 | 4739 | } |
| 4742 | 4740 | |
| 4743 | 4741 | // Check if user has access to the item |
| 4744 | - include_once __DIR__. '/items.queries.php'; |
|
| 4742 | + include_once __DIR__.'/items.queries.php'; |
|
| 4745 | 4743 | $itemAccess = getCurrentAccessRights( |
| 4746 | 4744 | (int) filter_var($userId, FILTER_SANITIZE_NUMBER_INT), |
| 4747 | 4745 | (int) filter_var($file['id_item'], FILTER_SANITIZE_NUMBER_INT), |
@@ -4774,7 +4772,7 @@ discard block |
||
| 4774 | 4772 | // Refuse access if user does not exist and/or is not admin |
| 4775 | 4773 | $user = DB::queryFirstRow( |
| 4776 | 4774 | 'SELECT admin |
| 4777 | - FROM ' . prefixTable('users') . ' |
|
| 4775 | + FROM ' . prefixTable('users').' |
|
| 4778 | 4776 | WHERE id = %i', |
| 4779 | 4777 | $userId |
| 4780 | 4778 | ); |
@@ -4785,7 +4783,7 @@ discard block |
||
| 4785 | 4783 | // Ensure that user has performed the backup |
| 4786 | 4784 | DB::queryFirstRow( |
| 4787 | 4785 | 'SELECT f.id |
| 4788 | - FROM ' . prefixTable('log_system') . ' as f |
|
| 4786 | + FROM ' . prefixTable('log_system').' as f |
|
| 4789 | 4787 | WHERE f.type = %s AND f.label = %s AND f.qui = %i AND f.field_1 = %s', |
| 4790 | 4788 | 'admin_action', |
| 4791 | 4789 | 'dataBase backup', |
@@ -4812,7 +4810,7 @@ discard block |
||
| 4812 | 4810 | // Refuse access if user does not exist and/or is admin |
| 4813 | 4811 | $user = DB::queryFirstRow( |
| 4814 | 4812 | 'SELECT admin |
| 4815 | - FROM ' . prefixTable('users') . ' |
|
| 4813 | + FROM ' . prefixTable('users').' |
|
| 4816 | 4814 | WHERE id = %i', |
| 4817 | 4815 | $userId |
| 4818 | 4816 | ); |
@@ -4823,7 +4821,7 @@ discard block |
||
| 4823 | 4821 | // Get item info |
| 4824 | 4822 | $item = DB::queryFirstRow( |
| 4825 | 4823 | 'SELECT i.perso, i.id_tree |
| 4826 | - FROM ' . prefixTable('items') . ' as i |
|
| 4824 | + FROM ' . prefixTable('items').' as i |
|
| 4827 | 4825 | WHERE i.id = %i', |
| 4828 | 4826 | $itemId |
| 4829 | 4827 | ); |
@@ -4834,7 +4832,7 @@ discard block |
||
| 4834 | 4832 | // Get item owner |
| 4835 | 4833 | $itemOwner = DB::queryFirstRow( |
| 4836 | 4834 | 'SELECT li.id_user |
| 4837 | - FROM ' . prefixTable('log_items') . ' as li |
|
| 4835 | + FROM ' . prefixTable('log_items').' as li |
|
| 4838 | 4836 | WHERE li.id_item = %i AND li.action = %s', |
| 4839 | 4837 | $itemId, |
| 4840 | 4838 | 'at_creation' |
@@ -4848,25 +4846,25 @@ discard block |
||
| 4848 | 4846 | prefixTable('sharekeys_items'), |
| 4849 | 4847 | 'object_id = %i AND user_id NOT IN %ls', |
| 4850 | 4848 | $itemId, |
| 4851 | - [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID] |
|
| 4849 | + [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID] |
|
| 4852 | 4850 | ); |
| 4853 | 4851 | DB::delete( |
| 4854 | 4852 | prefixTable('sharekeys_files'), |
| 4855 | 4853 | 'object_id IN (SELECT id FROM '.prefixTable('files').' WHERE id_item = %i) AND user_id NOT IN %ls', |
| 4856 | 4854 | $itemId, |
| 4857 | - [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID] |
|
| 4855 | + [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID] |
|
| 4858 | 4856 | ); |
| 4859 | 4857 | DB::delete( |
| 4860 | 4858 | prefixTable('sharekeys_fields'), |
| 4861 | 4859 | 'object_id IN (SELECT id FROM '.prefixTable('fields').' WHERE id_item = %i) AND user_id NOT IN %ls', |
| 4862 | 4860 | $itemId, |
| 4863 | - [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID] |
|
| 4861 | + [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID] |
|
| 4864 | 4862 | ); |
| 4865 | 4863 | DB::delete( |
| 4866 | 4864 | prefixTable('sharekeys_logs'), |
| 4867 | 4865 | 'object_id IN (SELECT id FROM '.prefixTable('log_items').' WHERE id_item = %i) AND user_id NOT IN %ls', |
| 4868 | 4866 | $itemId, |
| 4869 | - [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID] |
|
| 4867 | + [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID] |
|
| 4870 | 4868 | ); |
| 4871 | 4869 | |
| 4872 | 4870 | return true; |
@@ -4938,7 +4936,7 @@ discard block |
||
| 4938 | 4936 | |
| 4939 | 4937 | // 2. Check if user actually has personal items to migrate |
| 4940 | 4938 | $personalFolderId = DB::queryFirstField( |
| 4941 | - "SELECT id FROM ".prefixTable('nested_tree') ." |
|
| 4939 | + "SELECT id FROM ".prefixTable('nested_tree')." |
|
| 4942 | 4940 | WHERE personal_folder = 1 |
| 4943 | 4941 | AND title = %s", |
| 4944 | 4942 | $userId |
@@ -5018,8 +5016,8 @@ discard block |
||
| 5018 | 5016 | 'process_type' => 'migrate_user_personal_items', |
| 5019 | 5017 | 'arguments' => json_encode([ |
| 5020 | 5018 | 'user_id' => (int) $userId, |
| 5021 | - 'user_pwd' => cryption($passwordClear, '','encrypt')['string'], |
|
| 5022 | - 'user_private_key' => cryption($privateKeyDecrypted, '','encrypt')['string'], |
|
| 5019 | + 'user_pwd' => cryption($passwordClear, '', 'encrypt')['string'], |
|
| 5020 | + 'user_private_key' => cryption($privateKeyDecrypted, '', 'encrypt')['string'], |
|
| 5023 | 5021 | 'personal_folders_ids' => $personalFolderIds, |
| 5024 | 5022 | ]), |
| 5025 | 5023 | 'is_in_progress' => 0, |
@@ -5048,19 +5046,19 @@ discard block |
||
| 5048 | 5046 | { |
| 5049 | 5047 | // Prepare the subtask queries |
| 5050 | 5048 | $queries = [ |
| 5051 | - 'user-personal-items-migration-step10' => 'SELECT * FROM ' . prefixTable('items'), |
|
| 5049 | + 'user-personal-items-migration-step10' => 'SELECT * FROM '.prefixTable('items'), |
|
| 5052 | 5050 | |
| 5053 | - 'user-personal-items-migration-step20' => 'SELECT * FROM ' . prefixTable('log_items') . |
|
| 5051 | + 'user-personal-items-migration-step20' => 'SELECT * FROM '.prefixTable('log_items'). |
|
| 5054 | 5052 | ' WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"', |
| 5055 | 5053 | |
| 5056 | - 'user-personal-items-migration-step30' => 'SELECT * FROM ' . prefixTable('categories_items') . |
|
| 5054 | + 'user-personal-items-migration-step30' => 'SELECT * FROM '.prefixTable('categories_items'). |
|
| 5057 | 5055 | ' WHERE encryption_type = "teampass_aes"', |
| 5058 | 5056 | |
| 5059 | - 'user-personal-items-migration-step40' => 'SELECT * FROM ' . prefixTable('suggestion'), |
|
| 5057 | + 'user-personal-items-migration-step40' => 'SELECT * FROM '.prefixTable('suggestion'), |
|
| 5060 | 5058 | |
| 5061 | - 'user-personal-items-migration-step50' => 'SELECT * FROM ' . prefixTable('files') . ' AS f |
|
| 5062 | - INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = f.id_item |
|
| 5063 | - WHERE f.status = "' . TP_ENCRYPTION_NAME . '"' |
|
| 5059 | + 'user-personal-items-migration-step50' => 'SELECT * FROM '.prefixTable('files').' AS f |
|
| 5060 | + INNER JOIN ' . prefixTable('items').' AS i ON i.id = f.id_item |
|
| 5061 | + WHERE f.status = "' . TP_ENCRYPTION_NAME.'"' |
|
| 5064 | 5062 | ]; |
| 5065 | 5063 | |
| 5066 | 5064 | // Perform loop on $queries to create sub-tasks |
@@ -5093,7 +5091,7 @@ discard block |
||
| 5093 | 5091 | { |
| 5094 | 5092 | // 1. Insert or update the item with current timestamp |
| 5095 | 5093 | DB::query( |
| 5096 | - 'INSERT INTO ' . prefixTable('users_latest_items') . ' (user_id, item_id, accessed_at) |
|
| 5094 | + 'INSERT INTO '.prefixTable('users_latest_items').' (user_id, item_id, accessed_at) |
|
| 5097 | 5095 | VALUES (%i, %i, NOW()) |
| 5098 | 5096 | ON DUPLICATE KEY UPDATE accessed_at = NOW()', |
| 5099 | 5097 | $userId, |
@@ -5102,12 +5100,12 @@ discard block |
||
| 5102 | 5100 | |
| 5103 | 5101 | // 2. Keep only the 20 most recent items (delete older ones) |
| 5104 | 5102 | DB::query( |
| 5105 | - 'DELETE FROM ' . prefixTable('users_latest_items') . ' |
|
| 5103 | + 'DELETE FROM '.prefixTable('users_latest_items').' |
|
| 5106 | 5104 | WHERE user_id = %i |
| 5107 | 5105 | AND increment_id NOT IN ( |
| 5108 | 5106 | SELECT increment_id FROM ( |
| 5109 | 5107 | SELECT increment_id |
| 5110 | - FROM ' . prefixTable('users_latest_items') . ' |
|
| 5108 | + FROM ' . prefixTable('users_latest_items').' |
|
| 5111 | 5109 | WHERE user_id = %i |
| 5112 | 5110 | ORDER BY accessed_at DESC |
| 5113 | 5111 | LIMIT 20 |
@@ -5150,14 +5148,14 @@ discard block |
||
| 5150 | 5148 | GROUP_CONCAT(DISTINCT CASE WHEN ur.source = "ad" THEN ur.role_id END ORDER BY ur.role_id SEPARATOR ";") AS roles_from_ad_groups, |
| 5151 | 5149 | GROUP_CONCAT(DISTINCT uf.item_id ORDER BY uf.created_at SEPARATOR ";") AS favourites, |
| 5152 | 5150 | GROUP_CONCAT(DISTINCT ul.item_id ORDER BY ul.accessed_at DESC SEPARATOR ";") AS latest_items |
| 5153 | - FROM ' . prefixTable('users') . ' AS u |
|
| 5154 | - LEFT JOIN ' . prefixTable('api') . ' AS a ON (u.id = a.user_id) |
|
| 5155 | - LEFT JOIN ' . prefixTable('users_groups') . ' AS ug ON (u.id = ug.user_id) |
|
| 5156 | - LEFT JOIN ' . prefixTable('users_groups_forbidden') . ' AS ugf ON (u.id = ugf.user_id) |
|
| 5157 | - LEFT JOIN ' . prefixTable('users_roles') . ' AS ur ON (u.id = ur.user_id) |
|
| 5158 | - LEFT JOIN ' . prefixTable('users_favorites') . ' AS uf ON (u.id = uf.user_id) |
|
| 5159 | - LEFT JOIN ' . prefixTable('users_latest_items') . ' AS ul ON (u.id = ul.user_id) |
|
| 5160 | - WHERE ' . $whereClause . ' |
|
| 5151 | + FROM ' . prefixTable('users').' AS u |
|
| 5152 | + LEFT JOIN ' . prefixTable('api').' AS a ON (u.id = a.user_id) |
|
| 5153 | + LEFT JOIN ' . prefixTable('users_groups').' AS ug ON (u.id = ug.user_id) |
|
| 5154 | + LEFT JOIN ' . prefixTable('users_groups_forbidden').' AS ugf ON (u.id = ugf.user_id) |
|
| 5155 | + LEFT JOIN ' . prefixTable('users_roles').' AS ur ON (u.id = ur.user_id) |
|
| 5156 | + LEFT JOIN ' . prefixTable('users_favorites').' AS uf ON (u.id = uf.user_id) |
|
| 5157 | + LEFT JOIN ' . prefixTable('users_latest_items').' AS ul ON (u.id = ul.user_id) |
|
| 5158 | + WHERE ' . $whereClause.' |
|
| 5161 | 5159 | GROUP BY u.id', |
| 5162 | 5160 | $whereParam |
| 5163 | 5161 | ); |
@@ -5187,7 +5185,7 @@ discard block |
||
| 5187 | 5185 | function addUserGroup(int $userId, int $groupId): void |
| 5188 | 5186 | { |
| 5189 | 5187 | DB::query( |
| 5190 | - 'INSERT IGNORE INTO ' . prefixTable('users_groups') . ' (user_id, group_id) |
|
| 5188 | + 'INSERT IGNORE INTO '.prefixTable('users_groups').' (user_id, group_id) |
|
| 5191 | 5189 | VALUES (%i, %i)', |
| 5192 | 5190 | $userId, |
| 5193 | 5191 | $groupId |
@@ -5200,7 +5198,7 @@ discard block |
||
| 5200 | 5198 | function removeUserGroup(int $userId, int $groupId): void |
| 5201 | 5199 | { |
| 5202 | 5200 | DB::query( |
| 5203 | - 'DELETE FROM ' . prefixTable('users_groups') . ' |
|
| 5201 | + 'DELETE FROM '.prefixTable('users_groups').' |
|
| 5204 | 5202 | WHERE user_id = %i AND group_id = %i', |
| 5205 | 5203 | $userId, |
| 5206 | 5204 | $groupId |
@@ -5217,7 +5215,7 @@ discard block |
||
| 5217 | 5215 | { |
| 5218 | 5216 | // Delete all existing groups |
| 5219 | 5217 | DB::query( |
| 5220 | - 'DELETE FROM ' . prefixTable('users_groups') . ' WHERE user_id = %i', |
|
| 5218 | + 'DELETE FROM '.prefixTable('users_groups').' WHERE user_id = %i', |
|
| 5221 | 5219 | $userId |
| 5222 | 5220 | ); |
| 5223 | 5221 | |
@@ -5237,7 +5235,7 @@ discard block |
||
| 5237 | 5235 | function getUserGroups(int $userId): array |
| 5238 | 5236 | { |
| 5239 | 5237 | $result = DB::query( |
| 5240 | - 'SELECT group_id FROM ' . prefixTable('users_groups') . ' |
|
| 5238 | + 'SELECT group_id FROM '.prefixTable('users_groups').' |
|
| 5241 | 5239 | WHERE user_id = %i ORDER BY group_id', |
| 5242 | 5240 | $userId |
| 5243 | 5241 | ); |
@@ -5254,7 +5252,7 @@ discard block |
||
| 5254 | 5252 | function addUserForbiddenGroup(int $userId, int $groupId): void |
| 5255 | 5253 | { |
| 5256 | 5254 | DB::query( |
| 5257 | - 'INSERT IGNORE INTO ' . prefixTable('users_groups_forbidden') . ' (user_id, group_id) |
|
| 5255 | + 'INSERT IGNORE INTO '.prefixTable('users_groups_forbidden').' (user_id, group_id) |
|
| 5258 | 5256 | VALUES (%i, %i)', |
| 5259 | 5257 | $userId, |
| 5260 | 5258 | $groupId |
@@ -5267,7 +5265,7 @@ discard block |
||
| 5267 | 5265 | function removeUserForbiddenGroup(int $userId, int $groupId): void |
| 5268 | 5266 | { |
| 5269 | 5267 | DB::query( |
| 5270 | - 'DELETE FROM ' . prefixTable('users_groups_forbidden') . ' |
|
| 5268 | + 'DELETE FROM '.prefixTable('users_groups_forbidden').' |
|
| 5271 | 5269 | WHERE user_id = %i AND group_id = %i', |
| 5272 | 5270 | $userId, |
| 5273 | 5271 | $groupId |
@@ -5280,7 +5278,7 @@ discard block |
||
| 5280 | 5278 | function setUserForbiddenGroups(int $userId, array $groupIds): void |
| 5281 | 5279 | { |
| 5282 | 5280 | DB::query( |
| 5283 | - 'DELETE FROM ' . prefixTable('users_groups_forbidden') . ' WHERE user_id = %i', |
|
| 5281 | + 'DELETE FROM '.prefixTable('users_groups_forbidden').' WHERE user_id = %i', |
|
| 5284 | 5282 | $userId |
| 5285 | 5283 | ); |
| 5286 | 5284 | |
@@ -5297,7 +5295,7 @@ discard block |
||
| 5297 | 5295 | function getUserForbiddenGroups(int $userId): array |
| 5298 | 5296 | { |
| 5299 | 5297 | $result = DB::query( |
| 5300 | - 'SELECT group_id FROM ' . prefixTable('users_groups_forbidden') . ' |
|
| 5298 | + 'SELECT group_id FROM '.prefixTable('users_groups_forbidden').' |
|
| 5301 | 5299 | WHERE user_id = %i ORDER BY group_id', |
| 5302 | 5300 | $userId |
| 5303 | 5301 | ); |
@@ -5316,7 +5314,7 @@ discard block |
||
| 5316 | 5314 | function addUserRole(int $userId, int $roleId, string $source = 'manual'): void |
| 5317 | 5315 | { |
| 5318 | 5316 | DB::query( |
| 5319 | - 'INSERT IGNORE INTO ' . prefixTable('users_roles') . ' (user_id, role_id, source) |
|
| 5317 | + 'INSERT IGNORE INTO '.prefixTable('users_roles').' (user_id, role_id, source) |
|
| 5320 | 5318 | VALUES (%i, %i, %s)', |
| 5321 | 5319 | $userId, |
| 5322 | 5320 | $roleId, |
@@ -5330,7 +5328,7 @@ discard block |
||
| 5330 | 5328 | function removeUserRole(int $userId, int $roleId, string $source = 'manual'): void |
| 5331 | 5329 | { |
| 5332 | 5330 | DB::query( |
| 5333 | - 'DELETE FROM ' . prefixTable('users_roles') . ' |
|
| 5331 | + 'DELETE FROM '.prefixTable('users_roles').' |
|
| 5334 | 5332 | WHERE user_id = %i AND role_id = %i AND source = %s', |
| 5335 | 5333 | $userId, |
| 5336 | 5334 | $roleId, |
@@ -5344,7 +5342,7 @@ discard block |
||
| 5344 | 5342 | function removeUserRolesBySource(int $userId, string $source): void |
| 5345 | 5343 | { |
| 5346 | 5344 | DB::query( |
| 5347 | - 'DELETE FROM ' . prefixTable('users_roles') . ' |
|
| 5345 | + 'DELETE FROM '.prefixTable('users_roles').' |
|
| 5348 | 5346 | WHERE user_id = %i AND source = %s', |
| 5349 | 5347 | $userId, |
| 5350 | 5348 | $source |
@@ -5378,14 +5376,14 @@ discard block |
||
| 5378 | 5376 | { |
| 5379 | 5377 | if ($source !== null) { |
| 5380 | 5378 | $result = DB::query( |
| 5381 | - 'SELECT role_id FROM ' . prefixTable('users_roles') . ' |
|
| 5379 | + 'SELECT role_id FROM '.prefixTable('users_roles').' |
|
| 5382 | 5380 | WHERE user_id = %i AND source = %s ORDER BY role_id', |
| 5383 | 5381 | $userId, |
| 5384 | 5382 | $source |
| 5385 | 5383 | ); |
| 5386 | 5384 | } else { |
| 5387 | 5385 | $result = DB::query( |
| 5388 | - 'SELECT role_id FROM ' . prefixTable('users_roles') . ' |
|
| 5386 | + 'SELECT role_id FROM '.prefixTable('users_roles').' |
|
| 5389 | 5387 | WHERE user_id = %i ORDER BY role_id', |
| 5390 | 5388 | $userId |
| 5391 | 5389 | ); |
@@ -5403,7 +5401,7 @@ discard block |
||
| 5403 | 5401 | function addUserFavorite(int $userId, int $itemId): void |
| 5404 | 5402 | { |
| 5405 | 5403 | DB::query( |
| 5406 | - 'INSERT IGNORE INTO ' . prefixTable('users_favorites') . ' (user_id, item_id) |
|
| 5404 | + 'INSERT IGNORE INTO '.prefixTable('users_favorites').' (user_id, item_id) |
|
| 5407 | 5405 | VALUES (%i, %i)', |
| 5408 | 5406 | $userId, |
| 5409 | 5407 | $itemId |
@@ -5416,7 +5414,7 @@ discard block |
||
| 5416 | 5414 | function removeUserFavorite(int $userId, int $itemId): void |
| 5417 | 5415 | { |
| 5418 | 5416 | DB::query( |
| 5419 | - 'DELETE FROM ' . prefixTable('users_favorites') . ' |
|
| 5417 | + 'DELETE FROM '.prefixTable('users_favorites').' |
|
| 5420 | 5418 | WHERE user_id = %i AND item_id = %i', |
| 5421 | 5419 | $userId, |
| 5422 | 5420 | $itemId |
@@ -5429,7 +5427,7 @@ discard block |
||
| 5429 | 5427 | function toggleUserFavorite(int $userId, int $itemId): bool |
| 5430 | 5428 | { |
| 5431 | 5429 | $exists = DB::queryFirstRow( |
| 5432 | - 'SELECT increment_id FROM ' . prefixTable('users_favorites') . ' |
|
| 5430 | + 'SELECT increment_id FROM '.prefixTable('users_favorites').' |
|
| 5433 | 5431 | WHERE user_id = %i AND item_id = %i', |
| 5434 | 5432 | $userId, |
| 5435 | 5433 | $itemId |
@@ -5450,7 +5448,7 @@ discard block |
||
| 5450 | 5448 | function setUserFavorites(int $userId, array $itemIds): void |
| 5451 | 5449 | { |
| 5452 | 5450 | DB::query( |
| 5453 | - 'DELETE FROM ' . prefixTable('users_favorites') . ' WHERE user_id = %i', |
|
| 5451 | + 'DELETE FROM '.prefixTable('users_favorites').' WHERE user_id = %i', |
|
| 5454 | 5452 | $userId |
| 5455 | 5453 | ); |
| 5456 | 5454 | |
@@ -5467,7 +5465,7 @@ discard block |
||
| 5467 | 5465 | function getUserFavorites(int $userId): array |
| 5468 | 5466 | { |
| 5469 | 5467 | $result = DB::query( |
| 5470 | - 'SELECT item_id FROM ' . prefixTable('users_favorites') . ' |
|
| 5468 | + 'SELECT item_id FROM '.prefixTable('users_favorites').' |
|
| 5471 | 5469 | WHERE user_id = %i ORDER BY created_at DESC', |
| 5472 | 5470 | $userId |
| 5473 | 5471 | ); |
@@ -5480,7 +5478,7 @@ discard block |
||
| 5480 | 5478 | function isUserFavorite(int $userId, int $itemId): bool |
| 5481 | 5479 | { |
| 5482 | 5480 | $result = DB::queryFirstRow( |
| 5483 | - 'SELECT increment_id FROM ' . prefixTable('users_favorites') . ' |
|
| 5481 | + 'SELECT increment_id FROM '.prefixTable('users_favorites').' |
|
| 5484 | 5482 | WHERE user_id = %i AND item_id = %i', |
| 5485 | 5483 | $userId, |
| 5486 | 5484 | $itemId |
@@ -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"> |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | filter_input(INPUT_GET, 'code', FILTER_SANITIZE_FULL_SPECIAL_CHARS) |
| 87 | 87 | ); |
| 88 | 88 | |
| 89 | - if (DB::count() > 0 && (int) $data['timestamp'] === (int) filter_input(INPUT_GET, 'stamp', FILTER_VALIDATE_INT)) { |
|
| 89 | + if (DB::count() > 0 && (int) $data['timestamp'] === (int) filter_input(INPUT_GET, 'stamp', FILTER_VALIDATE_INT)) { |
|
| 90 | 90 | // otv is too old |
| 91 | 91 | if ($data['time_limit'] < time() || ($data['views'] + 1) > $data['max_views']) { |
| 92 | 92 | $html = '<div class="text-center text-danger"> |
@@ -190,7 +190,7 @@ discard block |
||
| 190 | 190 | <tr><th>URL:</th><td>'.$url.'</td></tr> |
| 191 | 191 | </table></div> |
| 192 | 192 | <p class="mt-3 text-info"><i class="fas fa-info mr-2"></i>Copy carefully the data you need.<br>This page is visible until <b>'. |
| 193 | - date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $dataItem['time_limit']).'</b> OR <b>'.($dataItem['max_views'] - ($dataItem['views']+1)).' more time(s)</b>.</div> |
|
| 193 | + date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $dataItem['time_limit']).'</b> OR <b>'.($dataItem['max_views'] - ($dataItem['views'] + 1)).' more time(s)</b>.</div> |
|
| 194 | 194 | </div>'; |
| 195 | 195 | // log |
| 196 | 196 | logItems( |