@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | DB::debugmode(false); |
| 76 | 76 | $process_to_perform = DB::queryfirstrow( |
| 77 | 77 | 'SELECT * |
| 78 | - FROM ' . prefixTable('background_tasks') . ' |
|
| 78 | + FROM ' . prefixTable('background_tasks').' |
|
| 79 | 79 | WHERE is_in_progress = %i AND process_type IN ("item_copy", "new_item", "update_item", "item_update_create_keys") |
| 80 | 80 | ORDER BY increment_id ASC', |
| 81 | 81 | 1 |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | // search for next process to handle |
| 94 | 94 | $process_to_perform = DB::queryfirstrow( |
| 95 | 95 | 'SELECT * |
| 96 | - FROM ' . prefixTable('background_tasks') . ' |
|
| 96 | + FROM ' . prefixTable('background_tasks').' |
|
| 97 | 97 | WHERE is_in_progress = %i AND (finished_at = "" OR finished_at IS NULL) AND process_type IN ("item_copy", "new_item", "update_item", "item_update_create_keys") |
| 98 | 98 | ORDER BY increment_id ASC', |
| 99 | 99 | 0 |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | $process_to_perform['increment_id'] |
| 112 | 112 | ); |
| 113 | 113 | |
| 114 | - provideLog('[PROCESS][#'. $process_to_perform['increment_id'].'][START]', $SETTINGS); |
|
| 114 | + provideLog('[PROCESS][#'.$process_to_perform['increment_id'].'][START]', $SETTINGS); |
|
| 115 | 115 | handleTask( |
| 116 | 116 | $process_to_perform['increment_id'], |
| 117 | 117 | json_decode($process_to_perform['arguments'], true), |
@@ -141,7 +141,7 @@ discard block |
||
| 141 | 141 | // Search if there are remaining tasks |
| 142 | 142 | $process_to_perform = DB::queryFirstField( |
| 143 | 143 | 'SELECT 1 |
| 144 | - FROM ' . prefixTable('background_tasks') . ' |
|
| 144 | + FROM ' . prefixTable('background_tasks').' |
|
| 145 | 145 | WHERE is_in_progress = %i AND process_type IN ( |
| 146 | 146 | "item_copy", |
| 147 | 147 | "new_item", |
@@ -180,10 +180,10 @@ discard block |
||
| 180 | 180 | */ |
| 181 | 181 | function handleTask(int $processId, array $ProcessArguments, array $SETTINGS, int $itemId = null): bool |
| 182 | 182 | { |
| 183 | - provideLog('[PROCESS][#'. $processId.'][START]', $SETTINGS); |
|
| 183 | + provideLog('[PROCESS][#'.$processId.'][START]', $SETTINGS); |
|
| 184 | 184 | $task_to_perform = DB::queryfirstrow( |
| 185 | 185 | 'SELECT * |
| 186 | - FROM ' . prefixTable('background_subtasks') . ' |
|
| 186 | + FROM ' . prefixTable('background_subtasks').' |
|
| 187 | 187 | WHERE task_id = %i AND finished_at IS NULL |
| 188 | 188 | ORDER BY increment_id ASC', |
| 189 | 189 | $processId |
@@ -197,13 +197,13 @@ discard block |
||
| 197 | 197 | // if sub_task_in_progress === 1 then exit |
| 198 | 198 | if ((int) $task_to_perform['sub_task_in_progress'] !== 0) { |
| 199 | 199 | // Task is currently being in progress by another server process |
| 200 | - provideLog('[TASK][#'. $task_to_perform['increment_id'].'][WARNING] Similar task already being processes', $SETTINGS); |
|
| 200 | + provideLog('[TASK][#'.$task_to_perform['increment_id'].'][WARNING] Similar task already being processes', $SETTINGS); |
|
| 201 | 201 | return false; |
| 202 | 202 | } |
| 203 | 203 | |
| 204 | 204 | // handle next task |
| 205 | 205 | $args = json_decode($task_to_perform['task'], true); |
| 206 | - provideLog('[TASK][#'. $task_to_perform['increment_id'].'][START]Task '.$args['step'], $SETTINGS); |
|
| 206 | + provideLog('[TASK][#'.$task_to_perform['increment_id'].'][START]Task '.$args['step'], $SETTINGS); |
|
| 207 | 207 | |
| 208 | 208 | // flag as in progress |
| 209 | 209 | DB::update( |
@@ -245,7 +245,7 @@ discard block |
||
| 245 | 245 | DB::update( |
| 246 | 246 | prefixTable('background_subtasks'), |
| 247 | 247 | array( |
| 248 | - 'sub_task_in_progress' => 0, // flag sub task is no more in prgoress |
|
| 248 | + 'sub_task_in_progress' => 0, // flag sub task is no more in prgoress |
|
| 249 | 249 | 'task' => json_encode(["status" => "Done"]), |
| 250 | 250 | 'is_in_progress' => -1, |
| 251 | 251 | 'finished_at' => time(), |
@@ -260,7 +260,7 @@ discard block |
||
| 260 | 260 | // are all tasks done? |
| 261 | 261 | DB::query( |
| 262 | 262 | 'SELECT * |
| 263 | - FROM ' . prefixTable('background_subtasks') . ' |
|
| 263 | + FROM ' . prefixTable('background_subtasks').' |
|
| 264 | 264 | WHERE task_id = %i AND finished_at IS NULL', |
| 265 | 265 | $processId |
| 266 | 266 | ); |
@@ -332,7 +332,7 @@ discard block |
||
| 332 | 332 | // Loop on all files for this item |
| 333 | 333 | // and encrypt them for each user |
| 334 | 334 | if (WIP === true) provideLog('[DEBUG] '.print_r($args['files_keys'], true), $SETTINGS); |
| 335 | - foreach($args['files_keys'] as $file) { |
|
| 335 | + foreach ($args['files_keys'] as $file) { |
|
| 336 | 336 | storeUsersShareKey( |
| 337 | 337 | prefixTable('sharekeys_items'), |
| 338 | 338 | 0, |
@@ -348,7 +348,7 @@ discard block |
||
| 348 | 348 | // Loop on all encrypted fields for this item |
| 349 | 349 | // and encrypt them for each user |
| 350 | 350 | if (WIP === true) provideLog('[DEBUG] '.print_r($args, true), $SETTINGS); |
| 351 | - foreach($args['fields_keys'] as $field) { |
|
| 351 | + foreach ($args['fields_keys'] as $field) { |
|
| 352 | 352 | storeUsersShareKey( |
| 353 | 353 | prefixTable('sharekeys_fields'), |
| 354 | 354 | 0, |
@@ -400,6 +400,6 @@ discard block |
||
| 400 | 400 | DB::query( |
| 401 | 401 | 'DELETE FROM '.prefixTable('items_edition').' |
| 402 | 402 | WHERE timestamp < %i', |
| 403 | - ($SETTINGS['delay_item_edition'] > 0) ? time() - ($SETTINGS['delay_item_edition']*60) : time() - EDITION_LOCK_PERIOD |
|
| 403 | + ($SETTINGS['delay_item_edition'] > 0) ? time() - ($SETTINGS['delay_item_edition'] * 60) : time() - EDITION_LOCK_PERIOD |
|
| 404 | 404 | ); |
| 405 | 405 | } |
@@ -83,7 +83,9 @@ discard block |
||
| 83 | 83 | |
| 84 | 84 | if (DB::count() > 0) { |
| 85 | 85 | // handle tasks inside this process |
| 86 | - if (WIP === true) error_log("Process in progress: ".$process_to_perform['increment_id']); |
|
| 86 | + if (WIP === true) { |
|
| 87 | + error_log("Process in progress: ".$process_to_perform['increment_id']); |
|
| 88 | + } |
|
| 87 | 89 | handleTask( |
| 88 | 90 | $process_to_perform['increment_id'], |
| 89 | 91 | json_decode($process_to_perform['arguments'], true), |
@@ -100,7 +102,9 @@ discard block |
||
| 100 | 102 | ); |
| 101 | 103 | |
| 102 | 104 | if (DB::count() > 0) { |
| 103 | - if (WIP === true) error_log("New process ta start: ".$process_to_perform['increment_id']); |
|
| 105 | + if (WIP === true) { |
|
| 106 | + error_log("New process ta start: ".$process_to_perform['increment_id']); |
|
| 107 | + } |
|
| 104 | 108 | // update DB - started_at |
| 105 | 109 | DB::update( |
| 106 | 110 | prefixTable('background_tasks'), |
@@ -153,8 +157,9 @@ discard block |
||
| 153 | 157 | ); |
| 154 | 158 | |
| 155 | 159 | // No more tasks, exit |
| 156 | - if ($process_to_perform !== 1) |
|
| 157 | - break; |
|
| 160 | + if ($process_to_perform !== 1) { |
|
| 161 | + break; |
|
| 162 | + } |
|
| 158 | 163 | |
| 159 | 164 | // Run next task |
| 160 | 165 | $process = new Symfony\Component\Process\Process([ |
@@ -331,7 +336,9 @@ discard block |
||
| 331 | 336 | if ($args['step'] === 'create_users_files_key') { |
| 332 | 337 | // Loop on all files for this item |
| 333 | 338 | // and encrypt them for each user |
| 334 | - if (WIP === true) provideLog('[DEBUG] '.print_r($args['files_keys'], true), $SETTINGS); |
|
| 339 | + if (WIP === true) { |
|
| 340 | + provideLog('[DEBUG] '.print_r($args['files_keys'], true), $SETTINGS); |
|
| 341 | + } |
|
| 335 | 342 | foreach($args['files_keys'] as $file) { |
| 336 | 343 | storeUsersShareKey( |
| 337 | 344 | prefixTable('sharekeys_items'), |
@@ -347,7 +354,9 @@ discard block |
||
| 347 | 354 | } elseif ($args['step'] === 'create_users_fields_key') { |
| 348 | 355 | // Loop on all encrypted fields for this item |
| 349 | 356 | // and encrypt them for each user |
| 350 | - if (WIP === true) provideLog('[DEBUG] '.print_r($args, true), $SETTINGS); |
|
| 357 | + if (WIP === true) { |
|
| 358 | + provideLog('[DEBUG] '.print_r($args, true), $SETTINGS); |
|
| 359 | + } |
|
| 351 | 360 | foreach($args['fields_keys'] as $field) { |
| 352 | 361 | storeUsersShareKey( |
| 353 | 362 | prefixTable('sharekeys_fields'), |
@@ -134,19 +134,19 @@ discard block |
||
| 134 | 134 | $text = Crypto::decrypt($message, $key); |
| 135 | 135 | } |
| 136 | 136 | } catch (CryptoException\WrongKeyOrModifiedCiphertextException $ex) { |
| 137 | - error_log('TEAMPASS-Error-Wrong key or modified ciphertext: ' . $ex->getMessage()); |
|
| 137 | + error_log('TEAMPASS-Error-Wrong key or modified ciphertext: '.$ex->getMessage()); |
|
| 138 | 138 | $err = 'wrong_key_or_modified_ciphertext'; |
| 139 | 139 | } catch (CryptoException\BadFormatException $ex) { |
| 140 | - error_log('TEAMPASS-Error-Bad format exception: ' . $ex->getMessage()); |
|
| 140 | + error_log('TEAMPASS-Error-Bad format exception: '.$ex->getMessage()); |
|
| 141 | 141 | $err = 'bad_format'; |
| 142 | 142 | } catch (CryptoException\EnvironmentIsBrokenException $ex) { |
| 143 | - error_log('TEAMPASS-Error-Environment: ' . $ex->getMessage()); |
|
| 143 | + error_log('TEAMPASS-Error-Environment: '.$ex->getMessage()); |
|
| 144 | 144 | $err = 'environment_error'; |
| 145 | 145 | } catch (CryptoException\IOException $ex) { |
| 146 | - error_log('TEAMPASS-Error-IO: ' . $ex->getMessage()); |
|
| 146 | + error_log('TEAMPASS-Error-IO: '.$ex->getMessage()); |
|
| 147 | 147 | $err = 'io_error'; |
| 148 | 148 | } catch (Exception $ex) { |
| 149 | - error_log('TEAMPASS-Error-Unexpected exception: ' . $ex->getMessage()); |
|
| 149 | + error_log('TEAMPASS-Error-Unexpected exception: '.$ex->getMessage()); |
|
| 150 | 150 | $err = 'unexpected_error'; |
| 151 | 151 | } |
| 152 | 152 | |
@@ -231,7 +231,7 @@ discard block |
||
| 231 | 231 | */ |
| 232 | 232 | function trimElement($chaine, string $element): string |
| 233 | 233 | { |
| 234 | - if (! empty($chaine)) { |
|
| 234 | + if (!empty($chaine)) { |
|
| 235 | 235 | if (is_array($chaine) === true) { |
| 236 | 236 | $chaine = implode(';', $chaine); |
| 237 | 237 | } |
@@ -279,8 +279,8 @@ discard block |
||
| 279 | 279 | */ |
| 280 | 280 | function db_error_handler(array $params): void |
| 281 | 281 | { |
| 282 | - echo 'Error: ' . $params['error'] . "<br>\n"; |
|
| 283 | - echo 'Query: ' . $params['query'] . "<br>\n"; |
|
| 282 | + echo 'Error: '.$params['error']."<br>\n"; |
|
| 283 | + echo 'Query: '.$params['query']."<br>\n"; |
|
| 284 | 284 | throw new Exception('Error - Query', 1); |
| 285 | 285 | } |
| 286 | 286 | |
@@ -358,7 +358,7 @@ discard block |
||
| 358 | 358 | $session->set('user-forbiden_personal_folders', []); |
| 359 | 359 | |
| 360 | 360 | // Get list of Folders |
| 361 | - $rows = DB::query('SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', 0); |
|
| 361 | + $rows = DB::query('SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', 0); |
|
| 362 | 362 | foreach ($rows as $record) { |
| 363 | 363 | array_push($groupesVisibles, $record['id']); |
| 364 | 364 | } |
@@ -368,20 +368,20 @@ discard block |
||
| 368 | 368 | // get complete list of ROLES |
| 369 | 369 | $tmp = explode(';', $idFonctions); |
| 370 | 370 | $rows = DB::query( |
| 371 | - 'SELECT * FROM ' . prefixTable('roles_title') . ' |
|
| 371 | + 'SELECT * FROM '.prefixTable('roles_title').' |
|
| 372 | 372 | ORDER BY title ASC' |
| 373 | 373 | ); |
| 374 | 374 | foreach ($rows as $record) { |
| 375 | - if (! empty($record['id']) && ! in_array($record['id'], $tmp)) { |
|
| 375 | + if (!empty($record['id']) && !in_array($record['id'], $tmp)) { |
|
| 376 | 376 | array_push($tmp, $record['id']); |
| 377 | 377 | } |
| 378 | 378 | } |
| 379 | 379 | $session->set('user-roles', implode(';', $tmp)); |
| 380 | 380 | $session->set('user-admin', 1); |
| 381 | 381 | // Check if admin has created Folders and Roles |
| 382 | - DB::query('SELECT * FROM ' . prefixTable('nested_tree') . ''); |
|
| 382 | + DB::query('SELECT * FROM '.prefixTable('nested_tree').''); |
|
| 383 | 383 | $session->set('user-nb_folders', DB::count()); |
| 384 | - DB::query('SELECT * FROM ' . prefixTable('roles_title')); |
|
| 384 | + DB::query('SELECT * FROM '.prefixTable('roles_title')); |
|
| 385 | 385 | $session->set('user-nb_roles', DB::count()); |
| 386 | 386 | |
| 387 | 387 | return true; |
@@ -464,7 +464,7 @@ discard block |
||
| 464 | 464 | // Does this user is allowed to see other items |
| 465 | 465 | $inc = 0; |
| 466 | 466 | $rows = DB::query( |
| 467 | - 'SELECT id, id_tree FROM ' . prefixTable('items') . ' |
|
| 467 | + 'SELECT id, id_tree FROM '.prefixTable('items').' |
|
| 468 | 468 | WHERE restricted_to LIKE %ss AND inactif = %s'. |
| 469 | 469 | (count($allowedFolders) > 0 ? ' AND id_tree NOT IN ('.implode(',', $allowedFolders).')' : ''), |
| 470 | 470 | $globalsUserId, |
@@ -481,8 +481,8 @@ discard block |
||
| 481 | 481 | // Check for the users roles if some specific rights exist on items |
| 482 | 482 | $rows = DB::query( |
| 483 | 483 | 'SELECT i.id_tree, r.item_id |
| 484 | - FROM ' . prefixTable('items') . ' as i |
|
| 485 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' as r ON (r.item_id=i.id) |
|
| 484 | + FROM ' . prefixTable('items').' as i |
|
| 485 | + INNER JOIN ' . prefixTable('restriction_to_roles').' as r ON (r.item_id=i.id) |
|
| 486 | 486 | WHERE i.id_tree <> "" '. |
| 487 | 487 | (count($userRoles) > 0 ? 'AND r.role_id IN %li ' : ''). |
| 488 | 488 | 'ORDER BY i.id_tree ASC', |
@@ -536,16 +536,16 @@ discard block |
||
| 536 | 536 | ), SORT_NUMERIC) |
| 537 | 537 | ); |
| 538 | 538 | // Folders and Roles numbers |
| 539 | - DB::queryfirstrow('SELECT id FROM ' . prefixTable('nested_tree') . ''); |
|
| 539 | + DB::queryfirstrow('SELECT id FROM '.prefixTable('nested_tree').''); |
|
| 540 | 540 | $session->set('user-nb_folders', DB::count()); |
| 541 | - DB::queryfirstrow('SELECT id FROM ' . prefixTable('roles_title')); |
|
| 541 | + DB::queryfirstrow('SELECT id FROM '.prefixTable('roles_title')); |
|
| 542 | 542 | $session->set('user-nb_roles', DB::count()); |
| 543 | 543 | // check if change proposals on User's items |
| 544 | 544 | if (isset($SETTINGS['enable_suggestion']) === true && (int) $SETTINGS['enable_suggestion'] === 1) { |
| 545 | 545 | $countNewItems = DB::query( |
| 546 | 546 | 'SELECT COUNT(*) |
| 547 | - FROM ' . prefixTable('items_change') . ' AS c |
|
| 548 | - LEFT JOIN ' . prefixTable('log_items') . ' AS i ON (c.item_id = i.id_item) |
|
| 547 | + FROM ' . prefixTable('items_change').' AS c |
|
| 548 | + LEFT JOIN ' . prefixTable('log_items').' AS i ON (c.item_id = i.id_item) |
|
| 549 | 549 | WHERE i.action = %s AND i.id_user = %i', |
| 550 | 550 | 'at_creation', |
| 551 | 551 | $globalsUserId |
@@ -572,7 +572,7 @@ discard block |
||
| 572 | 572 | { |
| 573 | 573 | $rows = DB::query( |
| 574 | 574 | 'SELECT * |
| 575 | - FROM ' . prefixTable('roles_values') . ' |
|
| 575 | + FROM ' . prefixTable('roles_values').' |
|
| 576 | 576 | WHERE type IN %ls'.(count($userRoles) > 0 ? ' AND role_id IN %li' : ''), |
| 577 | 577 | ['W', 'ND', 'NE', 'NDNE', 'R'], |
| 578 | 578 | $userRoles, |
@@ -639,7 +639,7 @@ discard block |
||
| 639 | 639 | ) { |
| 640 | 640 | $persoFld = DB::queryfirstrow( |
| 641 | 641 | 'SELECT id |
| 642 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 642 | + FROM ' . prefixTable('nested_tree').' |
|
| 643 | 643 | WHERE title = %s AND personal_folder = %i'. |
| 644 | 644 | (count($allowedFolders) > 0 ? ' AND id NOT IN ('.implode(',', $allowedFolders).')' : ''), |
| 645 | 645 | $globalsUserId, |
@@ -672,7 +672,7 @@ discard block |
||
| 672 | 672 | } |
| 673 | 673 | $persoFlds = DB::query( |
| 674 | 674 | 'SELECT id |
| 675 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 675 | + FROM ' . prefixTable('nested_tree').' |
|
| 676 | 676 | WHERE %l', |
| 677 | 677 | $where |
| 678 | 678 | ); |
@@ -740,12 +740,12 @@ discard block |
||
| 740 | 740 | //Load Tree |
| 741 | 741 | $tree = new NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title'); |
| 742 | 742 | // truncate table |
| 743 | - DB::query('TRUNCATE TABLE ' . prefixTable('cache')); |
|
| 743 | + DB::query('TRUNCATE TABLE '.prefixTable('cache')); |
|
| 744 | 744 | // reload date |
| 745 | 745 | $rows = DB::query( |
| 746 | 746 | 'SELECT * |
| 747 | - FROM ' . prefixTable('items') . ' as i |
|
| 748 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 747 | + FROM ' . prefixTable('items').' as i |
|
| 748 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 749 | 749 | AND l.action = %s |
| 750 | 750 | AND i.inactif = %i', |
| 751 | 751 | 'at_creation', |
@@ -757,18 +757,18 @@ discard block |
||
| 757 | 757 | $tags = ''; |
| 758 | 758 | $itemTags = DB::query( |
| 759 | 759 | 'SELECT tag |
| 760 | - FROM ' . prefixTable('tags') . ' |
|
| 760 | + FROM ' . prefixTable('tags').' |
|
| 761 | 761 | WHERE item_id = %i AND tag != ""', |
| 762 | 762 | $record['id'] |
| 763 | 763 | ); |
| 764 | 764 | foreach ($itemTags as $itemTag) { |
| 765 | - $tags .= $itemTag['tag'] . ' '; |
|
| 765 | + $tags .= $itemTag['tag'].' '; |
|
| 766 | 766 | } |
| 767 | 767 | |
| 768 | 768 | // Get renewal period |
| 769 | 769 | $resNT = DB::queryfirstrow( |
| 770 | 770 | 'SELECT renewal_period |
| 771 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 771 | + FROM ' . prefixTable('nested_tree').' |
|
| 772 | 772 | WHERE id = %i', |
| 773 | 773 | $record['id_tree'] |
| 774 | 774 | ); |
@@ -781,7 +781,7 @@ discard block |
||
| 781 | 781 | // Is this a User id? |
| 782 | 782 | $user = DB::queryfirstrow( |
| 783 | 783 | 'SELECT id, login |
| 784 | - FROM ' . prefixTable('users') . ' |
|
| 784 | + FROM ' . prefixTable('users').' |
|
| 785 | 785 | WHERE id = %i', |
| 786 | 786 | $elem->title |
| 787 | 787 | ); |
@@ -799,11 +799,11 @@ discard block |
||
| 799 | 799 | 'id' => $record['id'], |
| 800 | 800 | 'label' => $record['label'], |
| 801 | 801 | 'description' => $record['description'] ?? '', |
| 802 | - 'url' => isset($record['url']) && ! empty($record['url']) ? $record['url'] : '0', |
|
| 802 | + 'url' => isset($record['url']) && !empty($record['url']) ? $record['url'] : '0', |
|
| 803 | 803 | 'tags' => $tags, |
| 804 | 804 | 'id_tree' => $record['id_tree'], |
| 805 | 805 | 'perso' => $record['perso'], |
| 806 | - 'restricted_to' => isset($record['restricted_to']) && ! empty($record['restricted_to']) ? $record['restricted_to'] : '0', |
|
| 806 | + 'restricted_to' => isset($record['restricted_to']) && !empty($record['restricted_to']) ? $record['restricted_to'] : '0', |
|
| 807 | 807 | 'login' => $record['login'] ?? '', |
| 808 | 808 | 'folder' => implode(' > ', $folder), |
| 809 | 809 | 'author' => $record['id_user'], |
@@ -832,7 +832,7 @@ discard block |
||
| 832 | 832 | // get new value from db |
| 833 | 833 | $data = DB::queryfirstrow( |
| 834 | 834 | 'SELECT label, description, id_tree, perso, restricted_to, login, url |
| 835 | - FROM ' . prefixTable('items') . ' |
|
| 835 | + FROM ' . prefixTable('items').' |
|
| 836 | 836 | WHERE id=%i', |
| 837 | 837 | $ident |
| 838 | 838 | ); |
@@ -840,12 +840,12 @@ discard block |
||
| 840 | 840 | $tags = ''; |
| 841 | 841 | $itemTags = DB::query( |
| 842 | 842 | 'SELECT tag |
| 843 | - FROM ' . prefixTable('tags') . ' |
|
| 843 | + FROM ' . prefixTable('tags').' |
|
| 844 | 844 | WHERE item_id = %i AND tag != ""', |
| 845 | 845 | $ident |
| 846 | 846 | ); |
| 847 | 847 | foreach ($itemTags as $itemTag) { |
| 848 | - $tags .= $itemTag['tag'] . ' '; |
|
| 848 | + $tags .= $itemTag['tag'].' '; |
|
| 849 | 849 | } |
| 850 | 850 | // form id_tree to full foldername |
| 851 | 851 | $folder = []; |
@@ -856,7 +856,7 @@ discard block |
||
| 856 | 856 | // Is this a User id? |
| 857 | 857 | $user = DB::queryfirstrow( |
| 858 | 858 | 'SELECT id, login |
| 859 | - FROM ' . prefixTable('users') . ' |
|
| 859 | + FROM ' . prefixTable('users').' |
|
| 860 | 860 | WHERE id = %i', |
| 861 | 861 | $elem->title |
| 862 | 862 | ); |
@@ -874,10 +874,10 @@ discard block |
||
| 874 | 874 | 'label' => $data['label'], |
| 875 | 875 | 'description' => $data['description'], |
| 876 | 876 | 'tags' => $tags, |
| 877 | - 'url' => isset($data['url']) && ! empty($data['url']) ? $data['url'] : '0', |
|
| 877 | + 'url' => isset($data['url']) && !empty($data['url']) ? $data['url'] : '0', |
|
| 878 | 878 | 'id_tree' => $data['id_tree'], |
| 879 | 879 | 'perso' => $data['perso'], |
| 880 | - 'restricted_to' => isset($data['restricted_to']) && ! empty($data['restricted_to']) ? $data['restricted_to'] : '0', |
|
| 880 | + 'restricted_to' => isset($data['restricted_to']) && !empty($data['restricted_to']) ? $data['restricted_to'] : '0', |
|
| 881 | 881 | 'login' => $data['login'] ?? '', |
| 882 | 882 | 'folder' => implode(' » ', $folder), |
| 883 | 883 | 'author' => $session->get('user-id'), |
@@ -907,8 +907,8 @@ discard block |
||
| 907 | 907 | // get new value from db |
| 908 | 908 | $data = DB::queryFirstRow( |
| 909 | 909 | 'SELECT i.label, i.description, i.id_tree as id_tree, i.perso, i.restricted_to, i.id, i.login, i.url, l.date |
| 910 | - FROM ' . prefixTable('items') . ' as i |
|
| 911 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 910 | + FROM ' . prefixTable('items').' as i |
|
| 911 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 912 | 912 | WHERE i.id = %i |
| 913 | 913 | AND l.action = %s', |
| 914 | 914 | $ident, |
@@ -918,12 +918,12 @@ discard block |
||
| 918 | 918 | $tags = ''; |
| 919 | 919 | $itemTags = DB::query( |
| 920 | 920 | 'SELECT tag |
| 921 | - FROM ' . prefixTable('tags') . ' |
|
| 921 | + FROM ' . prefixTable('tags').' |
|
| 922 | 922 | WHERE item_id = %i AND tag != ""', |
| 923 | 923 | $ident |
| 924 | 924 | ); |
| 925 | 925 | foreach ($itemTags as $itemTag) { |
| 926 | - $tags .= $itemTag['tag'] . ' '; |
|
| 926 | + $tags .= $itemTag['tag'].' '; |
|
| 927 | 927 | } |
| 928 | 928 | // form id_tree to full foldername |
| 929 | 929 | $folder = []; |
@@ -934,7 +934,7 @@ discard block |
||
| 934 | 934 | // Is this a User id? |
| 935 | 935 | $user = DB::queryfirstrow( |
| 936 | 936 | 'SELECT id, login |
| 937 | - FROM ' . prefixTable('users') . ' |
|
| 937 | + FROM ' . prefixTable('users').' |
|
| 938 | 938 | WHERE id = %i', |
| 939 | 939 | $elem->title |
| 940 | 940 | ); |
@@ -953,7 +953,7 @@ discard block |
||
| 953 | 953 | 'label' => $data['label'], |
| 954 | 954 | 'description' => $data['description'], |
| 955 | 955 | 'tags' => isset($tags) && empty($tags) === false ? $tags : 'None', |
| 956 | - 'url' => isset($data['url']) && ! empty($data['url']) ? $data['url'] : '0', |
|
| 956 | + 'url' => isset($data['url']) && !empty($data['url']) ? $data['url'] : '0', |
|
| 957 | 957 | 'id_tree' => $data['id_tree'], |
| 958 | 958 | 'perso' => isset($data['perso']) && empty($data['perso']) === false && $data['perso'] !== 'None' ? $data['perso'] : '0', |
| 959 | 959 | 'restricted_to' => isset($data['restricted_to']) && empty($data['restricted_to']) === false ? $data['restricted_to'] : '0', |
@@ -975,53 +975,53 @@ discard block |
||
| 975 | 975 | function getStatisticsData(array $SETTINGS): array |
| 976 | 976 | { |
| 977 | 977 | DB::query( |
| 978 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', |
|
| 978 | + 'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', |
|
| 979 | 979 | 0 |
| 980 | 980 | ); |
| 981 | 981 | $counter_folders = DB::count(); |
| 982 | 982 | DB::query( |
| 983 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', |
|
| 983 | + 'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', |
|
| 984 | 984 | 1 |
| 985 | 985 | ); |
| 986 | 986 | $counter_folders_perso = DB::count(); |
| 987 | 987 | DB::query( |
| 988 | - 'SELECT id FROM ' . prefixTable('items') . ' WHERE perso = %i', |
|
| 988 | + 'SELECT id FROM '.prefixTable('items').' WHERE perso = %i', |
|
| 989 | 989 | 0 |
| 990 | 990 | ); |
| 991 | 991 | $counter_items = DB::count(); |
| 992 | 992 | DB::query( |
| 993 | - 'SELECT id FROM ' . prefixTable('items') . ' WHERE perso = %i', |
|
| 993 | + 'SELECT id FROM '.prefixTable('items').' WHERE perso = %i', |
|
| 994 | 994 | 1 |
| 995 | 995 | ); |
| 996 | 996 | $counter_items_perso = DB::count(); |
| 997 | 997 | DB::query( |
| 998 | - 'SELECT id FROM ' . prefixTable('users') . ' WHERE login NOT IN (%s, %s, %s)', |
|
| 998 | + 'SELECT id FROM '.prefixTable('users').' WHERE login NOT IN (%s, %s, %s)', |
|
| 999 | 999 | 'OTV', 'TP', 'API' |
| 1000 | 1000 | ); |
| 1001 | 1001 | $counter_users = DB::count(); |
| 1002 | 1002 | DB::query( |
| 1003 | - 'SELECT id FROM ' . prefixTable('users') . ' WHERE admin = %i', |
|
| 1003 | + 'SELECT id FROM '.prefixTable('users').' WHERE admin = %i', |
|
| 1004 | 1004 | 1 |
| 1005 | 1005 | ); |
| 1006 | 1006 | $admins = DB::count(); |
| 1007 | 1007 | DB::query( |
| 1008 | - 'SELECT id FROM ' . prefixTable('users') . ' WHERE gestionnaire = %i', |
|
| 1008 | + 'SELECT id FROM '.prefixTable('users').' WHERE gestionnaire = %i', |
|
| 1009 | 1009 | 1 |
| 1010 | 1010 | ); |
| 1011 | 1011 | $managers = DB::count(); |
| 1012 | 1012 | DB::query( |
| 1013 | - 'SELECT id FROM ' . prefixTable('users') . ' WHERE read_only = %i', |
|
| 1013 | + 'SELECT id FROM '.prefixTable('users').' WHERE read_only = %i', |
|
| 1014 | 1014 | 1 |
| 1015 | 1015 | ); |
| 1016 | 1016 | $readOnly = DB::count(); |
| 1017 | 1017 | // list the languages |
| 1018 | 1018 | $usedLang = []; |
| 1019 | 1019 | $tp_languages = DB::query( |
| 1020 | - 'SELECT name FROM ' . prefixTable('languages') |
|
| 1020 | + 'SELECT name FROM '.prefixTable('languages') |
|
| 1021 | 1021 | ); |
| 1022 | 1022 | foreach ($tp_languages as $tp_language) { |
| 1023 | 1023 | DB::query( |
| 1024 | - 'SELECT * FROM ' . prefixTable('users') . ' WHERE user_language = %s', |
|
| 1024 | + 'SELECT * FROM '.prefixTable('users').' WHERE user_language = %s', |
|
| 1025 | 1025 | $tp_language['name'] |
| 1026 | 1026 | ); |
| 1027 | 1027 | $usedLang[$tp_language['name']] = round((DB::count() * 100 / $counter_users), 0); |
@@ -1030,12 +1030,12 @@ discard block |
||
| 1030 | 1030 | // get list of ips |
| 1031 | 1031 | $usedIp = []; |
| 1032 | 1032 | $tp_ips = DB::query( |
| 1033 | - 'SELECT user_ip FROM ' . prefixTable('users') |
|
| 1033 | + 'SELECT user_ip FROM '.prefixTable('users') |
|
| 1034 | 1034 | ); |
| 1035 | 1035 | foreach ($tp_ips as $ip) { |
| 1036 | 1036 | if (array_key_exists($ip['user_ip'], $usedIp)) { |
| 1037 | 1037 | $usedIp[$ip['user_ip']] += $usedIp[$ip['user_ip']]; |
| 1038 | - } elseif (! empty($ip['user_ip']) && $ip['user_ip'] !== 'none') { |
|
| 1038 | + } elseif (!empty($ip['user_ip']) && $ip['user_ip'] !== 'none') { |
|
| 1039 | 1039 | $usedIp[$ip['user_ip']] = 1; |
| 1040 | 1040 | } |
| 1041 | 1041 | } |
@@ -1130,7 +1130,7 @@ discard block |
||
| 1130 | 1130 | <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;"> |
| 1131 | 1131 | <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;"> |
| 1132 | 1132 | <br><div style="float:right;">' . |
| 1133 | - $textMail . |
|
| 1133 | + $textMail. |
|
| 1134 | 1134 | '<br><br></td></tr></table> |
| 1135 | 1135 | </td></tr></table> |
| 1136 | 1136 | <br></body></html>'; |
@@ -1211,7 +1211,7 @@ discard block |
||
| 1211 | 1211 | { |
| 1212 | 1212 | array_walk_recursive( |
| 1213 | 1213 | $array, |
| 1214 | - static function (&$item): void { |
|
| 1214 | + static function(&$item): void { |
|
| 1215 | 1215 | if (mb_detect_encoding((string) $item, 'utf-8', true) === false) { |
| 1216 | 1216 | $item = mb_convert_encoding($item, 'ISO-8859-1', 'UTF-8'); |
| 1217 | 1217 | } |
@@ -1322,7 +1322,7 @@ discard block |
||
| 1322 | 1322 | */ |
| 1323 | 1323 | function prefixTable(string $table): string |
| 1324 | 1324 | { |
| 1325 | - $safeTable = htmlspecialchars(DB_PREFIX . $table); |
|
| 1325 | + $safeTable = htmlspecialchars(DB_PREFIX.$table); |
|
| 1326 | 1326 | if (empty($safeTable) === false) { |
| 1327 | 1327 | // sanitize string |
| 1328 | 1328 | return $safeTable; |
@@ -1444,7 +1444,7 @@ discard block |
||
| 1444 | 1444 | function send_syslog($message, $host, $port, $component = 'teampass'): void |
| 1445 | 1445 | { |
| 1446 | 1446 | $sock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP); |
| 1447 | - $syslog_message = '<123>' . date('M d H:i:s ') . $component . ': ' . $message; |
|
| 1447 | + $syslog_message = '<123>'.date('M d H:i:s ').$component.': '.$message; |
|
| 1448 | 1448 | socket_sendto($sock, (string) $syslog_message, strlen($syslog_message), 0, (string) $host, (int) $port); |
| 1449 | 1449 | socket_close($sock); |
| 1450 | 1450 | } |
@@ -1491,14 +1491,14 @@ discard block |
||
| 1491 | 1491 | if (isset($SETTINGS['syslog_enable']) === true && (int) $SETTINGS['syslog_enable'] === 1) { |
| 1492 | 1492 | if ($type === 'user_mngt') { |
| 1493 | 1493 | send_syslog( |
| 1494 | - 'action=' . str_replace('at_', '', $label) . ' attribute=user user=' . $who . ' userid="' . $login . '" change="' . $field_1 . '" ', |
|
| 1494 | + 'action='.str_replace('at_', '', $label).' attribute=user user='.$who.' userid="'.$login.'" change="'.$field_1.'" ', |
|
| 1495 | 1495 | $SETTINGS['syslog_host'], |
| 1496 | 1496 | $SETTINGS['syslog_port'], |
| 1497 | 1497 | 'teampass' |
| 1498 | 1498 | ); |
| 1499 | 1499 | } else { |
| 1500 | 1500 | send_syslog( |
| 1501 | - 'action=' . $type . ' attribute=' . $label . ' user=' . $who . ' userid="' . $login . '" ', |
|
| 1501 | + 'action='.$type.' attribute='.$label.' user='.$who.' userid="'.$login.'" ', |
|
| 1502 | 1502 | $SETTINGS['syslog_host'], |
| 1503 | 1503 | $SETTINGS['syslog_port'], |
| 1504 | 1504 | 'teampass' |
@@ -1573,7 +1573,7 @@ discard block |
||
| 1573 | 1573 | if (empty($item_label) === true) { |
| 1574 | 1574 | $dataItem = DB::queryfirstrow( |
| 1575 | 1575 | 'SELECT id, id_tree, label |
| 1576 | - FROM ' . prefixTable('items') . ' |
|
| 1576 | + FROM ' . prefixTable('items').' |
|
| 1577 | 1577 | WHERE id = %i', |
| 1578 | 1578 | $item_id |
| 1579 | 1579 | ); |
@@ -1581,11 +1581,11 @@ discard block |
||
| 1581 | 1581 | } |
| 1582 | 1582 | |
| 1583 | 1583 | send_syslog( |
| 1584 | - 'action=' . str_replace('at_', '', $action) . |
|
| 1585 | - ' attribute=' . str_replace('at_', '', $attribute[0]) . |
|
| 1586 | - ' itemno=' . $item_id . |
|
| 1587 | - ' user=' . (is_null($login) === true ? '' : addslashes((string) $login)) . |
|
| 1588 | - ' itemname="' . addslashes($item_label) . '"', |
|
| 1584 | + 'action='.str_replace('at_', '', $action). |
|
| 1585 | + ' attribute='.str_replace('at_', '', $attribute[0]). |
|
| 1586 | + ' itemno='.$item_id. |
|
| 1587 | + ' user='.(is_null($login) === true ? '' : addslashes((string) $login)). |
|
| 1588 | + ' itemname="'.addslashes($item_label).'"', |
|
| 1589 | 1589 | $SETTINGS['syslog_host'], |
| 1590 | 1590 | $SETTINGS['syslog_port'], |
| 1591 | 1591 | 'teampass' |
@@ -1617,8 +1617,8 @@ discard block |
||
| 1617 | 1617 | $notification = DB::queryOneColumn( |
| 1618 | 1618 | 'email', |
| 1619 | 1619 | 'SELECT * |
| 1620 | - FROM ' . prefixTable('notification') . ' AS n |
|
| 1621 | - INNER JOIN ' . prefixTable('users') . ' AS u ON (n.user_id = u.id) |
|
| 1620 | + FROM ' . prefixTable('notification').' AS n |
|
| 1621 | + INNER JOIN ' . prefixTable('users').' AS u ON (n.user_id = u.id) |
|
| 1622 | 1622 | WHERE n.item_id = %i AND n.user_id != %i', |
| 1623 | 1623 | $item_id, |
| 1624 | 1624 | $globalsUserId |
@@ -1629,7 +1629,7 @@ discard block |
||
| 1629 | 1629 | // Get list of changes |
| 1630 | 1630 | $htmlChanges = '<ul>'; |
| 1631 | 1631 | foreach ($changes as $change) { |
| 1632 | - $htmlChanges .= '<li>' . $change . '</li>'; |
|
| 1632 | + $htmlChanges .= '<li>'.$change.'</li>'; |
|
| 1633 | 1633 | } |
| 1634 | 1634 | $htmlChanges .= '</ul>'; |
| 1635 | 1635 | // send email |
@@ -1666,15 +1666,15 @@ discard block |
||
| 1666 | 1666 | $path = ''; |
| 1667 | 1667 | foreach ($arbo as $elem) { |
| 1668 | 1668 | if (empty($path) === true) { |
| 1669 | - $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES) . ' '; |
|
| 1669 | + $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES).' '; |
|
| 1670 | 1670 | } else { |
| 1671 | - $path .= '→ ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 1671 | + $path .= '→ '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 1672 | 1672 | } |
| 1673 | 1673 | } |
| 1674 | 1674 | |
| 1675 | 1675 | // Build text to show user |
| 1676 | 1676 | if (empty($label) === false) { |
| 1677 | - return empty($path) === true ? addslashes($label) : addslashes($label) . ' (' . $path . ')'; |
|
| 1677 | + return empty($path) === true ? addslashes($label) : addslashes($label).' ('.$path.')'; |
|
| 1678 | 1678 | } |
| 1679 | 1679 | return empty($path) === true ? '' : $path; |
| 1680 | 1680 | } |
@@ -1730,7 +1730,7 @@ discard block |
||
| 1730 | 1730 | { |
| 1731 | 1731 | // Perform a copy if the file exists |
| 1732 | 1732 | if (file_exists($configFilePath)) { |
| 1733 | - $backupFilePath = $configFilePath . '.' . date('Y_m_d_His', time()); |
|
| 1733 | + $backupFilePath = $configFilePath.'.'.date('Y_m_d_His', time()); |
|
| 1734 | 1734 | if (!copy($configFilePath, $backupFilePath)) { |
| 1735 | 1735 | return "ERROR: Could not copy file '$configFilePath'"; |
| 1736 | 1736 | } |
@@ -1738,10 +1738,10 @@ discard block |
||
| 1738 | 1738 | |
| 1739 | 1739 | // Regenerate the config file |
| 1740 | 1740 | $data = ["<?php\n", "global \$SETTINGS;\n", "\$SETTINGS = array (\n"]; |
| 1741 | - $rows = DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type=%s', 'admin'); |
|
| 1741 | + $rows = DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type=%s', 'admin'); |
|
| 1742 | 1742 | foreach ($rows as $record) { |
| 1743 | 1743 | $value = getEncryptedValue($record['valeur'], $record['is_encrypted']); |
| 1744 | - $data[] = " '{$record['intitule']}' => '". htmlspecialchars_decode($value, ENT_COMPAT) . "',\n"; |
|
| 1744 | + $data[] = " '{$record['intitule']}' => '".htmlspecialchars_decode($value, ENT_COMPAT)."',\n"; |
|
| 1745 | 1745 | } |
| 1746 | 1746 | $data[] = ");\n"; |
| 1747 | 1747 | $data = array_unique($data); |
@@ -1786,7 +1786,7 @@ discard block |
||
| 1786 | 1786 | { |
| 1787 | 1787 | global $SETTINGS; |
| 1788 | 1788 | /* LOAD CPASSMAN SETTINGS */ |
| 1789 | - if (! isset($SETTINGS['loaded']) || $SETTINGS['loaded'] !== 1) { |
|
| 1789 | + if (!isset($SETTINGS['loaded']) || $SETTINGS['loaded'] !== 1) { |
|
| 1790 | 1790 | $SETTINGS = []; |
| 1791 | 1791 | $SETTINGS['duplicate_folder'] = 0; |
| 1792 | 1792 | //by default, this is set to 0; |
@@ -1796,7 +1796,7 @@ discard block |
||
| 1796 | 1796 | //by default, this value is set to 5; |
| 1797 | 1797 | $settings = []; |
| 1798 | 1798 | $rows = DB::query( |
| 1799 | - 'SELECT * FROM ' . prefixTable('misc') . ' WHERE type=%s_type OR type=%s_type2', |
|
| 1799 | + 'SELECT * FROM '.prefixTable('misc').' WHERE type=%s_type OR type=%s_type2', |
|
| 1800 | 1800 | [ |
| 1801 | 1801 | 'type' => 'admin', |
| 1802 | 1802 | 'type2' => 'settings', |
@@ -1828,7 +1828,7 @@ discard block |
||
| 1828 | 1828 | $source_cf = []; |
| 1829 | 1829 | $rows = DB::QUERY( |
| 1830 | 1830 | 'SELECT id_category |
| 1831 | - FROM ' . prefixTable('categories_folders') . ' |
|
| 1831 | + FROM ' . prefixTable('categories_folders').' |
|
| 1832 | 1832 | WHERE id_folder = %i', |
| 1833 | 1833 | $source_id |
| 1834 | 1834 | ); |
@@ -1839,7 +1839,7 @@ discard block |
||
| 1839 | 1839 | $target_cf = []; |
| 1840 | 1840 | $rows = DB::QUERY( |
| 1841 | 1841 | 'SELECT id_category |
| 1842 | - FROM ' . prefixTable('categories_folders') . ' |
|
| 1842 | + FROM ' . prefixTable('categories_folders').' |
|
| 1843 | 1843 | WHERE id_folder = %i', |
| 1844 | 1844 | $target_id |
| 1845 | 1845 | ); |
@@ -1934,10 +1934,10 @@ discard block |
||
| 1934 | 1934 | } catch (CryptoException\WrongKeyOrModifiedCiphertextException $ex) { |
| 1935 | 1935 | $err = 'wrong_key'; |
| 1936 | 1936 | } catch (CryptoException\EnvironmentIsBrokenException $ex) { |
| 1937 | - error_log('TEAMPASS-Error-Environment: ' . $ex->getMessage()); |
|
| 1937 | + error_log('TEAMPASS-Error-Environment: '.$ex->getMessage()); |
|
| 1938 | 1938 | $err = 'environment_error'; |
| 1939 | 1939 | } catch (CryptoException\IOException $ex) { |
| 1940 | - error_log('TEAMPASS-Error-General: ' . $ex->getMessage()); |
|
| 1940 | + error_log('TEAMPASS-Error-General: '.$ex->getMessage()); |
|
| 1941 | 1941 | $err = 'general_error'; |
| 1942 | 1942 | } |
| 1943 | 1943 | |
@@ -1970,10 +1970,10 @@ discard block |
||
| 1970 | 1970 | } catch (CryptoException\WrongKeyOrModifiedCiphertextException $ex) { |
| 1971 | 1971 | $err = 'wrong_key'; |
| 1972 | 1972 | } catch (CryptoException\EnvironmentIsBrokenException $ex) { |
| 1973 | - error_log('TEAMPASS-Error-Environment: ' . $ex->getMessage()); |
|
| 1973 | + error_log('TEAMPASS-Error-Environment: '.$ex->getMessage()); |
|
| 1974 | 1974 | $err = 'environment_error'; |
| 1975 | 1975 | } catch (CryptoException\IOException $ex) { |
| 1976 | - error_log('TEAMPASS-Error-General: ' . $ex->getMessage()); |
|
| 1976 | + error_log('TEAMPASS-Error-General: '.$ex->getMessage()); |
|
| 1977 | 1977 | $err = 'general_error'; |
| 1978 | 1978 | } |
| 1979 | 1979 | |
@@ -2059,7 +2059,7 @@ discard block |
||
| 2059 | 2059 | ) { |
| 2060 | 2060 | // Check if the path exists |
| 2061 | 2061 | $path = basename($path); |
| 2062 | - if (! file_exists($path)) { |
|
| 2062 | + if (!file_exists($path)) { |
|
| 2063 | 2063 | return false; |
| 2064 | 2064 | } |
| 2065 | 2065 | |
@@ -2112,7 +2112,7 @@ discard block |
||
| 2112 | 2112 | // Load item data |
| 2113 | 2113 | $data = DB::queryFirstRow( |
| 2114 | 2114 | 'SELECT id_tree |
| 2115 | - FROM ' . prefixTable('items') . ' |
|
| 2115 | + FROM ' . prefixTable('items').' |
|
| 2116 | 2116 | WHERE id = %i', |
| 2117 | 2117 | $item_id |
| 2118 | 2118 | ); |
@@ -2175,7 +2175,7 @@ discard block |
||
| 2175 | 2175 | } |
| 2176 | 2176 | $host .= substr(explode(".", $email[1])[0], -1, 1); |
| 2177 | 2177 | } |
| 2178 | - $email = $name . "@" . $host . "." . explode(".", $email[1])[1]; |
|
| 2178 | + $email = $name."@".$host.".".explode(".", $email[1])[1]; |
|
| 2179 | 2179 | return $email; |
| 2180 | 2180 | } |
| 2181 | 2181 | |
@@ -2206,11 +2206,11 @@ discard block |
||
| 2206 | 2206 | function formatSizeUnits(int $bytes): string |
| 2207 | 2207 | { |
| 2208 | 2208 | if ($bytes >= 1073741824) { |
| 2209 | - $bytes = number_format($bytes / 1073741824, 2) . ' GB'; |
|
| 2209 | + $bytes = number_format($bytes / 1073741824, 2).' GB'; |
|
| 2210 | 2210 | } elseif ($bytes >= 1048576) { |
| 2211 | - $bytes = number_format($bytes / 1048576, 2) . ' MB'; |
|
| 2211 | + $bytes = number_format($bytes / 1048576, 2).' MB'; |
|
| 2212 | 2212 | } elseif ($bytes >= 1024) { |
| 2213 | - $bytes = number_format($bytes / 1024, 2) . ' KB'; |
|
| 2213 | + $bytes = number_format($bytes / 1024, 2).' KB'; |
|
| 2214 | 2214 | } elseif ($bytes > 1) { |
| 2215 | 2215 | $bytes .= ' bytes'; |
| 2216 | 2216 | } elseif ($bytes === 1) { |
@@ -2456,7 +2456,7 @@ discard block |
||
| 2456 | 2456 | $cipher->enableContinuousBuffer(); |
| 2457 | 2457 | |
| 2458 | 2458 | // Encrypt the file content |
| 2459 | - $filePath = filter_var($fileInPath . '/' . $fileInName, FILTER_SANITIZE_URL); |
|
| 2459 | + $filePath = filter_var($fileInPath.'/'.$fileInName, FILTER_SANITIZE_URL); |
|
| 2460 | 2460 | $fileContent = file_get_contents($filePath); |
| 2461 | 2461 | $plaintext = $fileContent; |
| 2462 | 2462 | $ciphertext = $cipher->encrypt($plaintext); |
@@ -2464,9 +2464,9 @@ discard block |
||
| 2464 | 2464 | // Save new file |
| 2465 | 2465 | // deepcode ignore InsecureHash: is simply used to get a unique name |
| 2466 | 2466 | $hash = md5($plaintext); |
| 2467 | - $fileOut = $fileInPath . '/' . TP_FILE_PREFIX . $hash; |
|
| 2467 | + $fileOut = $fileInPath.'/'.TP_FILE_PREFIX.$hash; |
|
| 2468 | 2468 | file_put_contents($fileOut, $ciphertext); |
| 2469 | - unlink($fileInPath . '/' . $fileInName); |
|
| 2469 | + unlink($fileInPath.'/'.$fileInName); |
|
| 2470 | 2470 | return [ |
| 2471 | 2471 | 'fileHash' => base64_encode($hash), |
| 2472 | 2472 | 'objectKey' => base64_encode($objectKey), |
@@ -2482,9 +2482,9 @@ discard block |
||
| 2482 | 2482 | * |
| 2483 | 2483 | * @return string|array |
| 2484 | 2484 | */ |
| 2485 | -function decryptFile(string $fileName, string $filePath, string $key): string|array |
|
| 2485 | +function decryptFile(string $fileName, string $filePath, string $key): string | array |
|
| 2486 | 2486 | { |
| 2487 | - if (! defined('FILE_BUFFER_SIZE')) { |
|
| 2487 | + if (!defined('FILE_BUFFER_SIZE')) { |
|
| 2488 | 2488 | define('FILE_BUFFER_SIZE', 128 * 1024); |
| 2489 | 2489 | } |
| 2490 | 2490 | |
@@ -2501,7 +2501,7 @@ discard block |
||
| 2501 | 2501 | $cipher->enableContinuousBuffer(); |
| 2502 | 2502 | $cipher->disablePadding(); |
| 2503 | 2503 | // Get file content |
| 2504 | - $safeFilePath = realpath($filePath . '/' . TP_FILE_PREFIX . $safeFileName); |
|
| 2504 | + $safeFilePath = realpath($filePath.'/'.TP_FILE_PREFIX.$safeFileName); |
|
| 2505 | 2505 | if ($safeFilePath !== false && file_exists($safeFilePath)) { |
| 2506 | 2506 | $ciphertext = file_get_contents(filter_var($safeFilePath, FILTER_SANITIZE_URL)); |
| 2507 | 2507 | } else { |
@@ -2597,7 +2597,7 @@ discard block |
||
| 2597 | 2597 | // Only create the sharekey for a user |
| 2598 | 2598 | $user = DB::queryFirstRow( |
| 2599 | 2599 | 'SELECT public_key |
| 2600 | - FROM ' . prefixTable('users') . ' |
|
| 2600 | + FROM ' . prefixTable('users').' |
|
| 2601 | 2601 | WHERE id = %i |
| 2602 | 2602 | AND public_key != ""', |
| 2603 | 2603 | $userId |
@@ -2638,7 +2638,7 @@ discard block |
||
| 2638 | 2638 | } |
| 2639 | 2639 | $users = DB::query( |
| 2640 | 2640 | 'SELECT id, public_key |
| 2641 | - FROM ' . prefixTable('users') . ' |
|
| 2641 | + FROM ' . prefixTable('users').' |
|
| 2642 | 2642 | WHERE id NOT IN %li |
| 2643 | 2643 | AND public_key != ""', |
| 2644 | 2644 | $user_ids |
@@ -2647,7 +2647,7 @@ discard block |
||
| 2647 | 2647 | foreach ($users as $user) { |
| 2648 | 2648 | // Insert in DB the new object key for this item by user |
| 2649 | 2649 | if (count($objectKeyArray) === 0) { |
| 2650 | - if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case1 - ' . $object_name . ' - ' . $post_object_id . ' - ' . $user['id'] . ' - ' . $objectKey); |
|
| 2650 | + if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case1 - '.$object_name.' - '.$post_object_id.' - '.$user['id'].' - '.$objectKey); |
|
| 2651 | 2651 | DB::insert( |
| 2652 | 2652 | $object_name, |
| 2653 | 2653 | [ |
@@ -2661,7 +2661,7 @@ discard block |
||
| 2661 | 2661 | ); |
| 2662 | 2662 | } else { |
| 2663 | 2663 | foreach ($objectKeyArray as $object) { |
| 2664 | - if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case2 - ' . $object_name . ' - ' . $object['objectId'] . ' - ' . $user['id'] . ' - ' . $object['objectKey']); |
|
| 2664 | + if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case2 - '.$object_name.' - '.$object['objectId'].' - '.$user['id'].' - '.$object['objectKey']); |
|
| 2665 | 2665 | DB::insert( |
| 2666 | 2666 | $object_name, |
| 2667 | 2667 | [ |
@@ -2689,7 +2689,7 @@ discard block |
||
| 2689 | 2689 | function isBase64(string $str): bool |
| 2690 | 2690 | { |
| 2691 | 2691 | $str = (string) trim($str); |
| 2692 | - if (! isset($str[0])) { |
|
| 2692 | + if (!isset($str[0])) { |
|
| 2693 | 2693 | return false; |
| 2694 | 2694 | } |
| 2695 | 2695 | |
@@ -2763,7 +2763,7 @@ discard block |
||
| 2763 | 2763 | } catch (\LdapRecord\Auth\BindException $e) { |
| 2764 | 2764 | $error = $e->getDetailedError(); |
| 2765 | 2765 | if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) { |
| 2766 | - error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage()); |
|
| 2766 | + error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage()); |
|
| 2767 | 2767 | } |
| 2768 | 2768 | // deepcode ignore ServerLeak: No important data is sent |
| 2769 | 2769 | echo 'An error occurred.'; |
@@ -2780,7 +2780,7 @@ discard block |
||
| 2780 | 2780 | } catch (\LdapRecord\Auth\BindException $e) { |
| 2781 | 2781 | $error = $e->getDetailedError(); |
| 2782 | 2782 | if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) { |
| 2783 | - error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage()); |
|
| 2783 | + error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage()); |
|
| 2784 | 2784 | } |
| 2785 | 2785 | // deepcode ignore ServerLeak: No important data is sent |
| 2786 | 2786 | echo 'An error occurred.'; |
@@ -2807,7 +2807,7 @@ discard block |
||
| 2807 | 2807 | // expect if personal item |
| 2808 | 2808 | DB::delete( |
| 2809 | 2809 | prefixTable('sharekeys_items'), |
| 2810 | - 'user_id = %i AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)', |
|
| 2810 | + 'user_id = %i AND object_id NOT IN (SELECT i.id FROM '.prefixTable('items').' AS i WHERE i.perso = 1)', |
|
| 2811 | 2811 | $userId |
| 2812 | 2812 | ); |
| 2813 | 2813 | // Remove all item sharekeys files |
@@ -2815,8 +2815,8 @@ discard block |
||
| 2815 | 2815 | prefixTable('sharekeys_files'), |
| 2816 | 2816 | 'user_id = %i AND object_id NOT IN ( |
| 2817 | 2817 | SELECT f.id |
| 2818 | - FROM ' . prefixTable('items') . ' AS i |
|
| 2819 | - INNER JOIN ' . prefixTable('files') . ' AS f ON f.id_item = i.id |
|
| 2818 | + FROM ' . prefixTable('items').' AS i |
|
| 2819 | + INNER JOIN ' . prefixTable('files').' AS f ON f.id_item = i.id |
|
| 2820 | 2820 | WHERE i.perso = 1 |
| 2821 | 2821 | )', |
| 2822 | 2822 | $userId |
@@ -2826,8 +2826,8 @@ discard block |
||
| 2826 | 2826 | prefixTable('sharekeys_fields'), |
| 2827 | 2827 | 'user_id = %i AND object_id NOT IN ( |
| 2828 | 2828 | SELECT c.id |
| 2829 | - FROM ' . prefixTable('items') . ' AS i |
|
| 2830 | - INNER JOIN ' . prefixTable('categories_items') . ' AS c ON c.item_id = i.id |
|
| 2829 | + FROM ' . prefixTable('items').' AS i |
|
| 2830 | + INNER JOIN ' . prefixTable('categories_items').' AS c ON c.item_id = i.id |
|
| 2831 | 2831 | WHERE i.perso = 1 |
| 2832 | 2832 | )', |
| 2833 | 2833 | $userId |
@@ -2835,13 +2835,13 @@ discard block |
||
| 2835 | 2835 | // Remove all item sharekeys logs |
| 2836 | 2836 | DB::delete( |
| 2837 | 2837 | prefixTable('sharekeys_logs'), |
| 2838 | - 'user_id = %i AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)', |
|
| 2838 | + 'user_id = %i AND object_id NOT IN (SELECT i.id FROM '.prefixTable('items').' AS i WHERE i.perso = 1)', |
|
| 2839 | 2839 | $userId |
| 2840 | 2840 | ); |
| 2841 | 2841 | // Remove all item sharekeys suggestions |
| 2842 | 2842 | DB::delete( |
| 2843 | 2843 | prefixTable('sharekeys_suggestions'), |
| 2844 | - 'user_id = %i AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)', |
|
| 2844 | + 'user_id = %i AND object_id NOT IN (SELECT i.id FROM '.prefixTable('items').' AS i WHERE i.perso = 1)', |
|
| 2845 | 2845 | $userId |
| 2846 | 2846 | ); |
| 2847 | 2847 | return false; |
@@ -2862,7 +2862,7 @@ discard block |
||
| 2862 | 2862 | foreach (DateTimeZone::listIdentifiers() as $timezone) { |
| 2863 | 2863 | $now->setTimezone(new DateTimeZone($timezone)); |
| 2864 | 2864 | $offsets[] = $offset = $now->getOffset(); |
| 2865 | - $timezones[$timezone] = '(' . format_GMT_offset($offset) . ') ' . format_timezone_name($timezone); |
|
| 2865 | + $timezones[$timezone] = '('.format_GMT_offset($offset).') '.format_timezone_name($timezone); |
|
| 2866 | 2866 | } |
| 2867 | 2867 | |
| 2868 | 2868 | array_multisort($offsets, $timezones); |
@@ -2882,7 +2882,7 @@ discard block |
||
| 2882 | 2882 | { |
| 2883 | 2883 | $hours = intval($offset / 3600); |
| 2884 | 2884 | $minutes = abs(intval($offset % 3600 / 60)); |
| 2885 | - return 'GMT' . ($offset ? sprintf('%+03d:%02d', $hours, $minutes) : ''); |
|
| 2885 | + return 'GMT'.($offset ? sprintf('%+03d:%02d', $hours, $minutes) : ''); |
|
| 2886 | 2886 | } |
| 2887 | 2887 | |
| 2888 | 2888 | /** |
@@ -2982,8 +2982,7 @@ discard block |
||
| 2982 | 2982 | { |
| 2983 | 2983 | if (isset($array[$key]) === true |
| 2984 | 2984 | && (is_int($value) === true ? |
| 2985 | - (int) $array[$key] === $value : |
|
| 2986 | - (string) $array[$key] === $value) |
|
| 2985 | + (int) $array[$key] === $value : (string) $array[$key] === $value) |
|
| 2987 | 2986 | ) { |
| 2988 | 2987 | return true; |
| 2989 | 2988 | } |
@@ -3005,8 +3004,7 @@ discard block |
||
| 3005 | 3004 | { |
| 3006 | 3005 | if (isset($var) === false |
| 3007 | 3006 | || (is_int($value) === true ? |
| 3008 | - (int) $var === $value : |
|
| 3009 | - (string) $var === $value) |
|
| 3007 | + (int) $var === $value : (string) $var === $value) |
|
| 3010 | 3008 | ) { |
| 3011 | 3009 | return true; |
| 3012 | 3010 | } |
@@ -3057,7 +3055,7 @@ discard block |
||
| 3057 | 3055 | */ |
| 3058 | 3056 | function isSetArrayOfValues(array $arrayOfValues): bool |
| 3059 | 3057 | { |
| 3060 | - foreach($arrayOfValues as $value) { |
|
| 3058 | + foreach ($arrayOfValues as $value) { |
|
| 3061 | 3059 | if (isset($value) === false) { |
| 3062 | 3060 | return false; |
| 3063 | 3061 | } |
@@ -3079,7 +3077,7 @@ discard block |
||
| 3079 | 3077 | /*PHP8 - integer|string*/$value |
| 3080 | 3078 | ) : bool |
| 3081 | 3079 | { |
| 3082 | - foreach($arrayOfVars as $variable) { |
|
| 3080 | + foreach ($arrayOfVars as $variable) { |
|
| 3083 | 3081 | if ($variable !== $value) { |
| 3084 | 3082 | return false; |
| 3085 | 3083 | } |
@@ -3099,7 +3097,7 @@ discard block |
||
| 3099 | 3097 | /*PHP8 - integer|string*/$value |
| 3100 | 3098 | ) : bool |
| 3101 | 3099 | { |
| 3102 | - foreach($arrayOfVars as $variable) { |
|
| 3100 | + foreach ($arrayOfVars as $variable) { |
|
| 3103 | 3101 | if ($variable === $value) { |
| 3104 | 3102 | return true; |
| 3105 | 3103 | } |
@@ -3168,7 +3166,7 @@ discard block |
||
| 3168 | 3166 | * @param array $filters |
| 3169 | 3167 | * @return array|string |
| 3170 | 3168 | */ |
| 3171 | -function dataSanitizer(array $data, array $filters): array|string |
|
| 3169 | +function dataSanitizer(array $data, array $filters): array | string |
|
| 3172 | 3170 | { |
| 3173 | 3171 | // Load Sanitizer library |
| 3174 | 3172 | $sanitizer = new Sanitizer($data, $filters); |
@@ -3197,7 +3195,7 @@ discard block |
||
| 3197 | 3195 | // Exists ? |
| 3198 | 3196 | $userCacheId = DB::queryfirstrow( |
| 3199 | 3197 | 'SELECT increment_id |
| 3200 | - FROM ' . prefixTable('cache_tree') . ' |
|
| 3198 | + FROM ' . prefixTable('cache_tree').' |
|
| 3201 | 3199 | WHERE user_id = %i', |
| 3202 | 3200 | $user_id |
| 3203 | 3201 | ); |
@@ -3248,7 +3246,7 @@ discard block |
||
| 3248 | 3246 | */ |
| 3249 | 3247 | function pourcentage(float $nombre, float $total, float $pourcentage): float |
| 3250 | 3248 | { |
| 3251 | - $resultat = ($nombre/$total) * $pourcentage; |
|
| 3249 | + $resultat = ($nombre / $total) * $pourcentage; |
|
| 3252 | 3250 | return round($resultat); |
| 3253 | 3251 | } |
| 3254 | 3252 | |
@@ -3278,7 +3276,7 @@ discard block |
||
| 3278 | 3276 | |
| 3279 | 3277 | // Get last folder update |
| 3280 | 3278 | $lastFolderChange = DB::queryfirstrow( |
| 3281 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' |
|
| 3279 | + 'SELECT valeur FROM '.prefixTable('misc').' |
|
| 3282 | 3280 | WHERE type = %s AND intitule = %s', |
| 3283 | 3281 | 'timestamp', |
| 3284 | 3282 | 'last_folder_change' |
@@ -3309,7 +3307,7 @@ discard block |
||
| 3309 | 3307 | // Does this user has a tree cache |
| 3310 | 3308 | $userCacheTree = DB::queryfirstrow( |
| 3311 | 3309 | 'SELECT '.$fieldName.' |
| 3312 | - FROM ' . prefixTable('cache_tree') . ' |
|
| 3310 | + FROM ' . prefixTable('cache_tree').' |
|
| 3313 | 3311 | WHERE user_id = %i', |
| 3314 | 3312 | $session->get('user-id') |
| 3315 | 3313 | ); |
@@ -3352,7 +3350,7 @@ discard block |
||
| 3352 | 3350 | if (count($folderIds) === 0) { |
| 3353 | 3351 | $folderIds = DB::queryFirstColumn( |
| 3354 | 3352 | 'SELECT id |
| 3355 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 3353 | + FROM ' . prefixTable('nested_tree').' |
|
| 3356 | 3354 | WHERE personal_folder=%i', |
| 3357 | 3355 | 0 |
| 3358 | 3356 | ); |
@@ -3369,8 +3367,8 @@ discard block |
||
| 3369 | 3367 | $rows_tmp = DB::query( |
| 3370 | 3368 | 'SELECT c.id, c.title, c.level, c.type, c.masked, c.order, c.encrypted_data, c.role_visibility, c.is_mandatory, |
| 3371 | 3369 | f.id_category AS category_id |
| 3372 | - FROM ' . prefixTable('categories_folders') . ' AS f |
|
| 3373 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (f.id_category = c.parent_id) |
|
| 3370 | + FROM ' . prefixTable('categories_folders').' AS f |
|
| 3371 | + INNER JOIN ' . prefixTable('categories').' AS c ON (f.id_category = c.parent_id) |
|
| 3374 | 3372 | WHERE id_folder=%i', |
| 3375 | 3373 | $folder |
| 3376 | 3374 | ); |
@@ -3396,7 +3394,7 @@ discard block |
||
| 3396 | 3394 | $valTemp = ''; |
| 3397 | 3395 | $data = DB::queryFirstRow( |
| 3398 | 3396 | 'SELECT valeur |
| 3399 | - FROM ' . prefixTable('misc') . ' |
|
| 3397 | + FROM ' . prefixTable('misc').' |
|
| 3400 | 3398 | WHERE type = %s AND intitule=%i', |
| 3401 | 3399 | 'complex', |
| 3402 | 3400 | $folder |
@@ -3413,14 +3411,14 @@ discard block |
||
| 3413 | 3411 | $valTemp = ''; |
| 3414 | 3412 | $rows_tmp = DB::query( |
| 3415 | 3413 | 'SELECT t.title |
| 3416 | - FROM ' . prefixTable('roles_values') . ' as v |
|
| 3417 | - INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id) |
|
| 3414 | + FROM ' . prefixTable('roles_values').' as v |
|
| 3415 | + INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id) |
|
| 3418 | 3416 | WHERE v.folder_id = %i |
| 3419 | 3417 | GROUP BY title', |
| 3420 | 3418 | $folder |
| 3421 | 3419 | ); |
| 3422 | 3420 | foreach ($rows_tmp as $record) { |
| 3423 | - $valTemp .= (empty($valTemp) === true ? '' : ' - ') . $record['title']; |
|
| 3421 | + $valTemp .= (empty($valTemp) === true ? '' : ' - ').$record['title']; |
|
| 3424 | 3422 | } |
| 3425 | 3423 | $arr_data['visibilityRoles'] = $valTemp; |
| 3426 | 3424 | |
@@ -3453,7 +3451,7 @@ discard block |
||
| 3453 | 3451 | // loop on users and check if user has this role |
| 3454 | 3452 | $rows = DB::query( |
| 3455 | 3453 | 'SELECT id, fonction_id |
| 3456 | - FROM ' . prefixTable('users') . ' |
|
| 3454 | + FROM ' . prefixTable('users').' |
|
| 3457 | 3455 | WHERE id != %i AND admin = 0 AND fonction_id IS NOT NULL AND fonction_id != ""', |
| 3458 | 3456 | $session->get('user-id') |
| 3459 | 3457 | ); |
@@ -3485,7 +3483,7 @@ discard block |
||
| 3485 | 3483 | |
| 3486 | 3484 | $val = DB::queryfirstrow( |
| 3487 | 3485 | 'SELECT * |
| 3488 | - FROM ' . prefixTable('users') . ' |
|
| 3486 | + FROM ' . prefixTable('users').' |
|
| 3489 | 3487 | WHERE id = %i', |
| 3490 | 3488 | $userId |
| 3491 | 3489 | ); |
@@ -3501,12 +3499,12 @@ discard block |
||
| 3501 | 3499 | function upgradeRequired(): bool |
| 3502 | 3500 | { |
| 3503 | 3501 | // Get settings.php |
| 3504 | - include_once __DIR__. '/../includes/config/settings.php'; |
|
| 3502 | + include_once __DIR__.'/../includes/config/settings.php'; |
|
| 3505 | 3503 | |
| 3506 | 3504 | // Get timestamp in DB |
| 3507 | 3505 | $val = DB::queryfirstrow( |
| 3508 | 3506 | 'SELECT valeur |
| 3509 | - FROM ' . prefixTable('misc') . ' |
|
| 3507 | + FROM ' . prefixTable('misc').' |
|
| 3510 | 3508 | WHERE type = %s AND intitule = %s', |
| 3511 | 3509 | 'admin', |
| 3512 | 3510 | 'upgrade_timestamp' |
@@ -3557,7 +3555,7 @@ discard block |
||
| 3557 | 3555 | // prepapre background tasks for item keys generation |
| 3558 | 3556 | $userTP = DB::queryFirstRow( |
| 3559 | 3557 | 'SELECT pw, public_key, private_key |
| 3560 | - FROM ' . prefixTable('users') . ' |
|
| 3558 | + FROM ' . prefixTable('users').' |
|
| 3561 | 3559 | WHERE id = %i', |
| 3562 | 3560 | TP_USER_ID |
| 3563 | 3561 | ); |
@@ -3618,7 +3616,7 @@ discard block |
||
| 3618 | 3616 | } |
| 3619 | 3617 | |
| 3620 | 3618 | // Generate new keys |
| 3621 | - if ($user_self_change === true && empty($recovery_public_key) === false && empty($recovery_private_key) === false){ |
|
| 3619 | + if ($user_self_change === true && empty($recovery_public_key) === false && empty($recovery_private_key) === false) { |
|
| 3622 | 3620 | $userKeys = [ |
| 3623 | 3621 | 'public_key' => $recovery_public_key, |
| 3624 | 3622 | 'private_key_clear' => $recovery_private_key, |
@@ -3661,8 +3659,8 @@ discard block |
||
| 3661 | 3659 | 'process_type' => 'create_user_keys', |
| 3662 | 3660 | 'arguments' => json_encode([ |
| 3663 | 3661 | 'new_user_id' => (int) $userId, |
| 3664 | - 'new_user_pwd' => cryption($passwordClear, '','encrypt')['string'], |
|
| 3665 | - 'new_user_code' => cryption(empty($encryptionKey) === true ? uniqidReal(20) : $encryptionKey, '','encrypt')['string'], |
|
| 3662 | + 'new_user_pwd' => cryption($passwordClear, '', 'encrypt')['string'], |
|
| 3663 | + 'new_user_code' => cryption(empty($encryptionKey) === true ? uniqidReal(20) : $encryptionKey, '', 'encrypt')['string'], |
|
| 3666 | 3664 | 'owner_id' => (int) TP_USER_ID, |
| 3667 | 3665 | 'creator_pwd' => $userTP['pw'], |
| 3668 | 3666 | 'send_email' => $sendEmailToUser === true ? 1 : 0, |
@@ -3952,7 +3950,7 @@ discard block |
||
| 3952 | 3950 | */ |
| 3953 | 3951 | function createTaskForItem( |
| 3954 | 3952 | string $processType, |
| 3955 | - string|array $taskName, |
|
| 3953 | + string | array $taskName, |
|
| 3956 | 3954 | int $itemId, |
| 3957 | 3955 | int $userId, |
| 3958 | 3956 | string $objectKey, |
@@ -3976,7 +3974,7 @@ discard block |
||
| 3976 | 3974 | 'object_key' => $objectKey, |
| 3977 | 3975 | 'author' => (int) $userId, |
| 3978 | 3976 | ]), |
| 3979 | - 'item_id' => (int) $parentId !== -1 ? $parentId : null, |
|
| 3977 | + 'item_id' => (int) $parentId !== -1 ? $parentId : null, |
|
| 3980 | 3978 | ) |
| 3981 | 3979 | ); |
| 3982 | 3980 | $processId = DB::insertId(); |
@@ -3986,7 +3984,7 @@ discard block |
||
| 3986 | 3984 | if (is_array($taskName) === false) { |
| 3987 | 3985 | $taskName = [$taskName]; |
| 3988 | 3986 | } |
| 3989 | - foreach($taskName as $task) { |
|
| 3987 | + foreach ($taskName as $task) { |
|
| 3990 | 3988 | if (WIP === true) error_log('createTaskForItem - task: '.$task); |
| 3991 | 3989 | switch ($task) { |
| 3992 | 3990 | case 'item_password': |
@@ -4083,7 +4081,7 @@ discard block |
||
| 4083 | 4081 | * @param integer $user_id |
| 4084 | 4082 | * @return void |
| 4085 | 4083 | */ |
| 4086 | -function purgeUnnecessaryKeys(bool $allUsers = true, int $user_id=0) |
|
| 4084 | +function purgeUnnecessaryKeys(bool $allUsers = true, int $user_id = 0) |
|
| 4087 | 4085 | { |
| 4088 | 4086 | if ($allUsers === true) { |
| 4089 | 4087 | // Load class DB |
@@ -4093,7 +4091,7 @@ discard block |
||
| 4093 | 4091 | |
| 4094 | 4092 | $users = DB::query( |
| 4095 | 4093 | 'SELECT id |
| 4096 | - FROM ' . prefixTable('users') . ' |
|
| 4094 | + FROM ' . prefixTable('users').' |
|
| 4097 | 4095 | WHERE id NOT IN ('.OTV_USER_ID.', '.TP_USER_ID.', '.SSH_USER_ID.', '.API_USER_ID.') |
| 4098 | 4096 | ORDER BY login ASC' |
| 4099 | 4097 | ); |
@@ -4111,7 +4109,7 @@ discard block |
||
| 4111 | 4109 | * @param integer $user_id |
| 4112 | 4110 | * @return void |
| 4113 | 4111 | */ |
| 4114 | -function purgeUnnecessaryKeysForUser(int $user_id=0) |
|
| 4112 | +function purgeUnnecessaryKeysForUser(int $user_id = 0) |
|
| 4115 | 4113 | { |
| 4116 | 4114 | if ($user_id === 0) { |
| 4117 | 4115 | return; |
@@ -4122,8 +4120,8 @@ discard block |
||
| 4122 | 4120 | |
| 4123 | 4121 | $personalItems = DB::queryFirstColumn( |
| 4124 | 4122 | 'SELECT id |
| 4125 | - FROM ' . prefixTable('items') . ' AS i |
|
| 4126 | - INNER JOIN ' . prefixTable('log_items') . ' AS li ON li.id_item = i.id |
|
| 4123 | + FROM ' . prefixTable('items').' AS i |
|
| 4124 | + INNER JOIN ' . prefixTable('log_items').' AS li ON li.id_item = i.id |
|
| 4127 | 4125 | WHERE i.perso = 1 AND li.action = "at_creation" AND li.id_user IN (%i, '.TP_USER_ID.')', |
| 4128 | 4126 | $user_id |
| 4129 | 4127 | ); |
@@ -4172,7 +4170,7 @@ discard block |
||
| 4172 | 4170 | // Check if user exists |
| 4173 | 4171 | $userInfo = DB::queryFirstRow( |
| 4174 | 4172 | 'SELECT login |
| 4175 | - FROM ' . prefixTable('users') . ' |
|
| 4173 | + FROM ' . prefixTable('users').' |
|
| 4176 | 4174 | WHERE id = %i', |
| 4177 | 4175 | $userId |
| 4178 | 4176 | ); |
@@ -4181,7 +4179,7 @@ discard block |
||
| 4181 | 4179 | $now = (int) time(); |
| 4182 | 4180 | // Prepare file content |
| 4183 | 4181 | $export_value = file_get_contents(__DIR__."/../includes/core/teampass_ascii.txt")."\n". |
| 4184 | - "Generation date: ".date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $now)."\n\n". |
|
| 4182 | + "Generation date: ".date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $now)."\n\n". |
|
| 4185 | 4183 | "RECOVERY KEYS - Not to be shared - To be store safely\n\n". |
| 4186 | 4184 | "Public Key:\n".$session->get('user-public_key')."\n\n". |
| 4187 | 4185 | "Private Key:\n".$session->get('user-private_key')."\n\n"; |
@@ -4204,7 +4202,7 @@ discard block |
||
| 4204 | 4202 | return prepareExchangedData( |
| 4205 | 4203 | array( |
| 4206 | 4204 | 'error' => false, |
| 4207 | - 'datetime' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $now), |
|
| 4205 | + 'datetime' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $now), |
|
| 4208 | 4206 | 'timestamp' => $now, |
| 4209 | 4207 | 'content' => base64_encode($export_value), |
| 4210 | 4208 | 'login' => $userInfo['login'], |
@@ -4230,8 +4228,8 @@ discard block |
||
| 4230 | 4228 | */ |
| 4231 | 4229 | function loadClasses(string $className = ''): void |
| 4232 | 4230 | { |
| 4233 | - require_once __DIR__. '/../includes/config/include.php'; |
|
| 4234 | - require_once __DIR__. '/../includes/config/settings.php'; |
|
| 4231 | + require_once __DIR__.'/../includes/config/include.php'; |
|
| 4232 | + require_once __DIR__.'/../includes/config/settings.php'; |
|
| 4235 | 4233 | require_once __DIR__.'/../vendor/autoload.php'; |
| 4236 | 4234 | |
| 4237 | 4235 | if (defined('DB_PASSWD_CLEAR') === false) { |
@@ -4442,7 +4440,7 @@ discard block |
||
| 4442 | 4440 | |
| 4443 | 4441 | // Get current user hash |
| 4444 | 4442 | $userHash = DB::queryFirstRow( |
| 4445 | - "SELECT pw FROM " . prefixtable('users') . " WHERE id = %d;", |
|
| 4443 | + "SELECT pw FROM ".prefixtable('users')." WHERE id = %d;", |
|
| 4446 | 4444 | $session->get('user-id') |
| 4447 | 4445 | )['pw']; |
| 4448 | 4446 | |
@@ -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 |