Passed
Pull Request — master (#4920)
by Nils
05:39
created
pages/utilities.logs.js.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@
 block discarded – undo
71 71
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('utilities.logs') === false) {
72 72
     // Not allowed page
73 73
     $session->set('system-error_code', ERR_NOT_ALLOWED);
74
-    include $SETTINGS['cpassman_dir'] . '/error.php';
74
+    include $SETTINGS['cpassman_dir'].'/error.php';
75 75
     exit;
76 76
 }
77 77
 ?>
Please login to merge, or discard this patch.
sources/fields.queries.php 1 patch
Spacing   +3 added lines, -4 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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',
Please login to merge, or discard this patch.
sources/utils.queries.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@
 block discarded – undo
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
 
Please login to merge, or discard this patch.
sources/favourites.queries.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@
 block discarded – undo
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
 
Please login to merge, or discard this patch.
pages/backups.js.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 
Please login to merge, or discard this patch.
pages/utilities.logs.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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>';
Please login to merge, or discard this patch.
error.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@
 block discarded – undo
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
             ],
Please login to merge, or discard this patch.
sources/main.functions.php 3 patches
Indentation   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -2225,7 +2225,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 {
Please login to merge, or discard this patch.
Braces   +24 added lines, -11 removed lines patch added patch discarded remove patch
@@ -2366,7 +2366,9 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
Please login to merge, or discard this patch.
Spacing   +197 added lines, -199 removed lines patch added patch discarded remove patch
@@ -99,19 +99,19 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
244 244
  */
245 245
 function db_error_handler(array $params): void
246 246
 {
247
-    echo 'Error: ' . $params['error'] . "<br>\n";
248
-    echo 'Query: ' . $params['query'] . "<br>\n";
247
+    echo 'Error: '.$params['error']."<br>\n";
248
+    echo 'Query: '.$params['query']."<br>\n";
249 249
     throw new Exception('Error - Query', 1);
250 250
 }
251 251
 
@@ -323,7 +323,7 @@  discard block
 block discarded – undo
323 323
     $session->set('user-forbiden_personal_folders', []);
324 324
     
325 325
     // Get list of Folders
326
-    $rows = DB::query('SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', 0);
326
+    $rows = DB::query('SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', 0);
327 327
     foreach ($rows as $record) {
328 328
         array_push($groupesVisibles, $record['id']);
329 329
     }
@@ -332,20 +332,20 @@  discard block
 block discarded – undo
332 332
     // get complete list of ROLES
333 333
     $tmp = explode(';', $idFonctions);
334 334
     $rows = DB::query(
335
-        'SELECT * FROM ' . prefixTable('roles_title') . '
335
+        'SELECT * FROM '.prefixTable('roles_title').'
336 336
         ORDER BY title ASC'
337 337
     );
338 338
     foreach ($rows as $record) {
339
-        if (! empty($record['id']) && ! in_array($record['id'], $tmp)) {
339
+        if (!empty($record['id']) && !in_array($record['id'], $tmp)) {
340 340
             array_push($tmp, $record['id']);
341 341
         }
342 342
     }
343 343
     $session->set('user-roles', implode(';', $tmp));
344 344
     $session->set('user-admin', 1);
345 345
     // Check if admin has created Folders and Roles
346
-    DB::query('SELECT * FROM ' . prefixTable('nested_tree') . '');
346
+    DB::query('SELECT * FROM '.prefixTable('nested_tree').'');
347 347
     $session->set('user-nb_folders', DB::count());
348
-    DB::query('SELECT * FROM ' . prefixTable('roles_title'));
348
+    DB::query('SELECT * FROM '.prefixTable('roles_title'));
349 349
     $session->set('user-nb_roles', DB::count());
350 350
 
351 351
     return true;
@@ -428,7 +428,7 @@  discard block
 block discarded – undo
428 428
     // Does this user is allowed to see other items
429 429
     $inc = 0;
430 430
     $rows = DB::query(
431
-        'SELECT id, id_tree FROM ' . prefixTable('items') . '
431
+        'SELECT id, id_tree FROM '.prefixTable('items').'
432 432
             WHERE restricted_to LIKE %ss AND inactif = %s'.
433 433
             (count($allowedFolders) > 0 ? ' AND id_tree NOT IN ('.implode(',', $allowedFolders).')' : ''),
434 434
         $globalsUserId,
@@ -445,8 +445,8 @@  discard block
 block discarded – undo
445 445
     // Check for the users roles if some specific rights exist on items
446 446
     $rows = DB::query(
447 447
         'SELECT i.id_tree, r.item_id
448
-        FROM ' . prefixTable('items') . ' as i
449
-        INNER JOIN ' . prefixTable('restriction_to_roles') . ' as r ON (r.item_id=i.id)
448
+        FROM ' . prefixTable('items').' as i
449
+        INNER JOIN ' . prefixTable('restriction_to_roles').' as r ON (r.item_id=i.id)
450 450
         WHERE i.id_tree <> "" '.
451 451
         (count($userRoles) > 0 ? 'AND r.role_id IN %li ' : '').
452 452
         'ORDER BY i.id_tree ASC',
@@ -490,18 +490,18 @@  discard block
 block discarded – undo
490 490
     $session->set('system-list_restricted_folders_for_items', $restrictedFoldersForItems);
491 491
     $session->set('user-forbiden_personal_folders', $noAccessPersonalFolders);
492 492
     // Folders and Roles numbers
493
-    DB::queryFirstRow('SELECT id FROM ' . prefixTable('nested_tree') . '');
494
-    DB::queryFirstRow('SELECT id FROM ' . prefixTable('nested_tree') . '');
493
+    DB::queryFirstRow('SELECT id FROM '.prefixTable('nested_tree').'');
494
+    DB::queryFirstRow('SELECT id FROM '.prefixTable('nested_tree').'');
495 495
     $session->set('user-nb_folders', DB::count());
496
-    DB::queryFirstRow('SELECT id FROM ' . prefixTable('roles_title'));
497
-    DB::queryFirstRow('SELECT id FROM ' . prefixTable('roles_title'));
496
+    DB::queryFirstRow('SELECT id FROM '.prefixTable('roles_title'));
497
+    DB::queryFirstRow('SELECT id FROM '.prefixTable('roles_title'));
498 498
     $session->set('user-nb_roles', DB::count());
499 499
     // check if change proposals on User's items
500 500
     if (isset($SETTINGS['enable_suggestion']) === true && (int) $SETTINGS['enable_suggestion'] === 1) {
501 501
         $countNewItems = DB::query(
502 502
             'SELECT COUNT(*)
503
-            FROM ' . prefixTable('items_change') . ' AS c
504
-            LEFT JOIN ' . prefixTable('log_items') . ' AS i ON (c.item_id = i.id_item)
503
+            FROM ' . prefixTable('items_change').' AS c
504
+            LEFT JOIN ' . prefixTable('log_items').' AS i ON (c.item_id = i.id_item)
505 505
             WHERE i.action = %s AND i.id_user = %i',
506 506
             'at_creation',
507 507
             $globalsUserId
@@ -528,7 +528,7 @@  discard block
 block discarded – undo
528 528
 {
529 529
     $rows = DB::query(
530 530
         'SELECT *
531
-        FROM ' . prefixTable('roles_values') . '
531
+        FROM ' . prefixTable('roles_values').'
532 532
         WHERE type IN %ls'.(count($userRoles) > 0 ? ' AND role_id IN %li' : ''),
533 533
         ['W', 'ND', 'NE', 'NDNE', 'R'],
534 534
         $userRoles,
@@ -595,7 +595,7 @@  discard block
 block discarded – undo
595 595
     ) {
596 596
         $persoFld = DB::queryFirstRow(
597 597
             'SELECT id
598
-            FROM ' . prefixTable('nested_tree') . '
598
+            FROM ' . prefixTable('nested_tree').'
599 599
             WHERE title = %s AND personal_folder = %i'.
600 600
             (count($allowedFolders) > 0 ? ' AND id NOT IN ('.implode(',', $allowedFolders).')' : ''),
601 601
             $globalsUserId,
@@ -628,7 +628,7 @@  discard block
 block discarded – undo
628 628
     }
629 629
     $persoFlds = DB::query(
630 630
         'SELECT id
631
-        FROM ' . prefixTable('nested_tree') . '
631
+        FROM ' . prefixTable('nested_tree').'
632 632
         WHERE %l',
633 633
         $where
634 634
     );
@@ -696,12 +696,12 @@  discard block
 block discarded – undo
696 696
     //Load Tree
697 697
     $tree = new NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
698 698
     // truncate table
699
-    DB::query('TRUNCATE TABLE ' . prefixTable('cache'));
699
+    DB::query('TRUNCATE TABLE '.prefixTable('cache'));
700 700
     // reload date
701 701
     $rows = DB::query(
702 702
         'SELECT *
703
-        FROM ' . prefixTable('items') . ' as i
704
-        INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id)
703
+        FROM ' . prefixTable('items').' as i
704
+        INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id)
705 705
         AND l.action = %s
706 706
         AND i.inactif = %i',
707 707
         'at_creation',
@@ -713,18 +713,18 @@  discard block
 block discarded – undo
713 713
             $tags = '';
714 714
             $itemTags = DB::query(
715 715
                 'SELECT tag
716
-                FROM ' . prefixTable('tags') . '
716
+                FROM ' . prefixTable('tags').'
717 717
                 WHERE item_id = %i AND tag != ""',
718 718
                 $record['id']
719 719
             );
720 720
             foreach ($itemTags as $itemTag) {
721
-                $tags .= $itemTag['tag'] . ' ';
721
+                $tags .= $itemTag['tag'].' ';
722 722
             }
723 723
 
724 724
             // Get renewal period
725 725
             $resNT = DB::queryFirstRow(
726 726
                 'SELECT renewal_period
727
-                FROM ' . prefixTable('nested_tree') . '
727
+                FROM ' . prefixTable('nested_tree').'
728 728
                 WHERE id = %i',
729 729
                 $record['id_tree']
730 730
             );
@@ -737,7 +737,7 @@  discard block
 block discarded – undo
737 737
                     // Is this a User id?
738 738
                     $user = DB::queryFirstRow(
739 739
                         'SELECT id, login
740
-                        FROM ' . prefixTable('users') . '
740
+                        FROM ' . prefixTable('users').'
741 741
                         WHERE id = %i',
742 742
                         $elem->title
743 743
                     );
@@ -755,11 +755,11 @@  discard block
 block discarded – undo
755 755
                     'id' => $record['id'],
756 756
                     'label' => $record['label'],
757 757
                     'description' => $record['description'] ?? '',
758
-                    'url' => isset($record['url']) && ! empty($record['url']) ? $record['url'] : '0',
758
+                    'url' => isset($record['url']) && !empty($record['url']) ? $record['url'] : '0',
759 759
                     'tags' => $tags,
760 760
                     'id_tree' => $record['id_tree'],
761 761
                     'perso' => $record['perso'],
762
-                    'restricted_to' => isset($record['restricted_to']) && ! empty($record['restricted_to']) ? $record['restricted_to'] : '0',
762
+                    'restricted_to' => isset($record['restricted_to']) && !empty($record['restricted_to']) ? $record['restricted_to'] : '0',
763 763
                     'login' => $record['login'] ?? '',
764 764
                     'folder' => implode(' » ', $folder),
765 765
                     'author' => $record['id_user'],
@@ -788,7 +788,7 @@  discard block
 block discarded – undo
788 788
     // get new value from db
789 789
     $data = DB::queryFirstRow(
790 790
         'SELECT label, description, id_tree, perso, restricted_to, login, url
791
-        FROM ' . prefixTable('items') . '
791
+        FROM ' . prefixTable('items').'
792 792
         WHERE id=%i',
793 793
         $ident
794 794
     );
@@ -796,12 +796,12 @@  discard block
 block discarded – undo
796 796
     $tags = '';
797 797
     $itemTags = DB::query(
798 798
         'SELECT tag
799
-            FROM ' . prefixTable('tags') . '
799
+            FROM ' . prefixTable('tags').'
800 800
             WHERE item_id = %i AND tag != ""',
801 801
         $ident
802 802
     );
803 803
     foreach ($itemTags as $itemTag) {
804
-        $tags .= $itemTag['tag'] . ' ';
804
+        $tags .= $itemTag['tag'].' ';
805 805
     }
806 806
     // form id_tree to full foldername
807 807
     $folder = [];
@@ -812,7 +812,7 @@  discard block
 block discarded – undo
812 812
             // Is this a User id?
813 813
             $user = DB::queryFirstRow(
814 814
                 'SELECT id, login
815
-                FROM ' . prefixTable('users') . '
815
+                FROM ' . prefixTable('users').'
816 816
                 WHERE id = %i',
817 817
                 $elem->title
818 818
             );
@@ -830,10 +830,10 @@  discard block
 block discarded – undo
830 830
             'label' => $data['label'],
831 831
             'description' => $data['description'],
832 832
             'tags' => $tags,
833
-            'url' => isset($data['url']) && ! empty($data['url']) ? $data['url'] : '0',
833
+            'url' => isset($data['url']) && !empty($data['url']) ? $data['url'] : '0',
834 834
             'id_tree' => $data['id_tree'],
835 835
             'perso' => $data['perso'],
836
-            'restricted_to' => isset($data['restricted_to']) && ! empty($data['restricted_to']) ? $data['restricted_to'] : '0',
836
+            'restricted_to' => isset($data['restricted_to']) && !empty($data['restricted_to']) ? $data['restricted_to'] : '0',
837 837
             'login' => $data['login'] ?? '',
838 838
             'folder' => implode(' » ', $folder),
839 839
             'author' => $session->get('user-id'),
@@ -863,8 +863,8 @@  discard block
 block discarded – undo
863 863
     // get new value from db
864 864
     $data = DB::queryFirstRow(
865 865
         'SELECT i.label, i.description, i.id_tree as id_tree, i.perso, i.restricted_to, i.id, i.login, i.url, l.date
866
-        FROM ' . prefixTable('items') . ' as i
867
-        INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id)
866
+        FROM ' . prefixTable('items').' as i
867
+        INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id)
868 868
         WHERE i.id = %i
869 869
         AND l.action = %s',
870 870
         $ident,
@@ -874,12 +874,12 @@  discard block
 block discarded – undo
874 874
     $tags = '';
875 875
     $itemTags = DB::query(
876 876
         'SELECT tag
877
-            FROM ' . prefixTable('tags') . '
877
+            FROM ' . prefixTable('tags').'
878 878
             WHERE item_id = %i AND tag != ""',
879 879
         $ident
880 880
     );
881 881
     foreach ($itemTags as $itemTag) {
882
-        $tags .= $itemTag['tag'] . ' ';
882
+        $tags .= $itemTag['tag'].' ';
883 883
     }
884 884
     // form id_tree to full foldername
885 885
     $folder = [];
@@ -890,7 +890,7 @@  discard block
 block discarded – undo
890 890
             // Is this a User id?
891 891
             $user = DB::queryFirstRow(
892 892
                 'SELECT id, login
893
-                FROM ' . prefixTable('users') . '
893
+                FROM ' . prefixTable('users').'
894 894
                 WHERE id = %i',
895 895
                 $elem->title
896 896
             );
@@ -909,7 +909,7 @@  discard block
 block discarded – undo
909 909
             'label' => $data['label'],
910 910
             'description' => $data['description'],
911 911
             'tags' => empty($tags) === false ? $tags : 'None',
912
-            'url' => isset($data['url']) && ! empty($data['url']) ? $data['url'] : '0',
912
+            'url' => isset($data['url']) && !empty($data['url']) ? $data['url'] : '0',
913 913
             'id_tree' => $data['id_tree'],
914 914
             'perso' => isset($data['perso']) && empty($data['perso']) === false && $data['perso'] !== 'None' ? $data['perso'] : '0',
915 915
             'restricted_to' => isset($data['restricted_to']) && empty($data['restricted_to']) === false ? $data['restricted_to'] : '0',
@@ -931,53 +931,53 @@  discard block
 block discarded – undo
931 931
 function getStatisticsData(array $SETTINGS): array
932 932
 {
933 933
     DB::query(
934
-        'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i',
934
+        'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i',
935 935
         0
936 936
     );
937 937
     $counter_folders = DB::count();
938 938
     DB::query(
939
-        'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i',
939
+        'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i',
940 940
         1
941 941
     );
942 942
     $counter_folders_perso = DB::count();
943 943
     DB::query(
944
-        'SELECT id FROM ' . prefixTable('items') . ' WHERE perso = %i',
944
+        'SELECT id FROM '.prefixTable('items').' WHERE perso = %i',
945 945
         0
946 946
     );
947 947
     $counter_items = DB::count();
948 948
         DB::query(
949
-        'SELECT id FROM ' . prefixTable('items') . ' WHERE perso = %i',
949
+        'SELECT id FROM '.prefixTable('items').' WHERE perso = %i',
950 950
         1
951 951
     );
952 952
     $counter_items_perso = DB::count();
953 953
         DB::query(
954
-        'SELECT id FROM ' . prefixTable('users') . ' WHERE login NOT IN (%s, %s, %s)',
954
+        'SELECT id FROM '.prefixTable('users').' WHERE login NOT IN (%s, %s, %s)',
955 955
         'OTV', 'TP', 'API'
956 956
     );
957 957
     $counter_users = DB::count();
958 958
         DB::query(
959
-        'SELECT id FROM ' . prefixTable('users') . ' WHERE admin = %i',
959
+        'SELECT id FROM '.prefixTable('users').' WHERE admin = %i',
960 960
         1
961 961
     );
962 962
     $admins = DB::count();
963 963
     DB::query(
964
-        'SELECT id FROM ' . prefixTable('users') . ' WHERE gestionnaire = %i',
964
+        'SELECT id FROM '.prefixTable('users').' WHERE gestionnaire = %i',
965 965
         1
966 966
     );
967 967
     $managers = DB::count();
968 968
     DB::query(
969
-        'SELECT id FROM ' . prefixTable('users') . ' WHERE read_only = %i',
969
+        'SELECT id FROM '.prefixTable('users').' WHERE read_only = %i',
970 970
         1
971 971
     );
972 972
     $readOnly = DB::count();
973 973
     // list the languages
974 974
     $usedLang = [];
975 975
     $tp_languages = DB::query(
976
-        'SELECT name FROM ' . prefixTable('languages')
976
+        'SELECT name FROM '.prefixTable('languages')
977 977
     );
978 978
     foreach ($tp_languages as $tp_language) {
979 979
         DB::query(
980
-            'SELECT * FROM ' . prefixTable('users') . ' WHERE user_language = %s',
980
+            'SELECT * FROM '.prefixTable('users').' WHERE user_language = %s',
981 981
             $tp_language['name']
982 982
         );
983 983
         $usedLang[$tp_language['name']] = round((DB::count() * 100 / $counter_users), 0);
@@ -986,12 +986,12 @@  discard block
 block discarded – undo
986 986
     // get list of ips
987 987
     $usedIp = [];
988 988
     $tp_ips = DB::query(
989
-        'SELECT user_ip FROM ' . prefixTable('users')
989
+        'SELECT user_ip FROM '.prefixTable('users')
990 990
     );
991 991
     foreach ($tp_ips as $ip) {
992 992
         if (array_key_exists($ip['user_ip'], $usedIp)) {
993 993
             $usedIp[$ip['user_ip']] += $usedIp[$ip['user_ip']];
994
-        } elseif (! empty($ip['user_ip']) && $ip['user_ip'] !== 'none') {
994
+        } elseif (!empty($ip['user_ip']) && $ip['user_ip'] !== 'none') {
995 995
             $usedIp[$ip['user_ip']] = 1;
996 996
         }
997 997
     }
@@ -1086,7 +1086,7 @@  discard block
 block discarded – undo
1086 1086
         <table width="600" cellpadding="0" cellspacing="0" border="0" class="container" bgcolor="#ffffff" style="border-spacing: 0; border-bottom: 1px solid #e0e0e0; box-shadow: 0 0 3px #ddd; color: #434343; font-family: Helvetica, Verdana, sans-serif;">
1087 1087
         <tr><td class="container-padding" bgcolor="#ffffff" style="border-collapse: collapse; border-left: 1px solid #e0e0e0; background-color: #ffffff; padding-left: 30px; padding-right: 30px;">
1088 1088
         <br><div style="float:right;">' .
1089
-        $textMail .
1089
+        $textMail.
1090 1090
         '<br><br></td></tr></table>
1091 1091
     </td></tr></table>
1092 1092
     <br></body></html>';
@@ -1167,7 +1167,7 @@  discard block
 block discarded – undo
1167 1167
 {
1168 1168
     array_walk_recursive(
1169 1169
         $array,
1170
-        static function (&$item): void {
1170
+        static function(&$item): void {
1171 1171
             if (mb_detect_encoding((string) $item, 'utf-8', true) === false) {
1172 1172
                 $item = mb_convert_encoding($item, 'ISO-8859-1', 'UTF-8');
1173 1173
             }
@@ -1278,7 +1278,7 @@  discard block
 block discarded – undo
1278 1278
  */
1279 1279
 function prefixTable(string $table): string
1280 1280
 {
1281
-    $safeTable = htmlspecialchars(DB_PREFIX . $table);
1281
+    $safeTable = htmlspecialchars(DB_PREFIX.$table);
1282 1282
     return $safeTable;
1283 1283
 }
1284 1284
 
@@ -1395,7 +1395,7 @@  discard block
 block discarded – undo
1395 1395
 function send_syslog($message, $host, $port, $component = 'teampass'): void
1396 1396
 {
1397 1397
     $sock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
1398
-    $syslog_message = '<123>' . date('M d H:i:s ') . $component . ': ' . $message;
1398
+    $syslog_message = '<123>'.date('M d H:i:s ').$component.': '.$message;
1399 1399
     socket_sendto($sock, (string) $syslog_message, strlen($syslog_message), 0, (string) $host, (int) $port);
1400 1400
     socket_close($sock);
1401 1401
 }
@@ -1442,14 +1442,14 @@  discard block
 block discarded – undo
1442 1442
     if (isset($SETTINGS['syslog_enable']) === true && (int) $SETTINGS['syslog_enable'] === 1) {
1443 1443
         if ($type === 'user_mngt') {
1444 1444
             send_syslog(
1445
-                'action=' . str_replace('at_', '', $label) . ' attribute=user user=' . $who . ' userid="' . $login . '" change="' . $field_1 . '" ',
1445
+                'action='.str_replace('at_', '', $label).' attribute=user user='.$who.' userid="'.$login.'" change="'.$field_1.'" ',
1446 1446
                 $SETTINGS['syslog_host'],
1447 1447
                 $SETTINGS['syslog_port'],
1448 1448
                 'teampass'
1449 1449
             );
1450 1450
         } else {
1451 1451
             send_syslog(
1452
-                'action=' . $type . ' attribute=' . $label . ' user=' . $who . ' userid="' . $login . '" ',
1452
+                'action='.$type.' attribute='.$label.' user='.$who.' userid="'.$login.'" ',
1453 1453
                 $SETTINGS['syslog_host'],
1454 1454
                 $SETTINGS['syslog_port'],
1455 1455
                 'teampass'
@@ -1524,7 +1524,7 @@  discard block
 block discarded – undo
1524 1524
         if (empty($item_label) === true) {
1525 1525
             $dataItem = DB::queryFirstRow(
1526 1526
                 'SELECT id, id_tree, label
1527
-                FROM ' . prefixTable('items') . '
1527
+                FROM ' . prefixTable('items').'
1528 1528
                 WHERE id = %i',
1529 1529
                 $item_id
1530 1530
             );
@@ -1532,11 +1532,11 @@  discard block
 block discarded – undo
1532 1532
         }
1533 1533
 
1534 1534
         send_syslog(
1535
-            'action=' . str_replace('at_', '', $action) .
1536
-                ' attribute=' . str_replace('at_', '', $attribute[0]) .
1537
-                ' itemno=' . $item_id .
1538
-                ' user=' . (is_null($login) === true ? '' : addslashes((string) $login)) .
1539
-                ' itemname="' . addslashes($item_label) . '"',
1535
+            'action='.str_replace('at_', '', $action).
1536
+                ' attribute='.str_replace('at_', '', $attribute[0]).
1537
+                ' itemno='.$item_id.
1538
+                ' user='.(is_null($login) === true ? '' : addslashes((string) $login)).
1539
+                ' itemname="'.addslashes($item_label).'"',
1540 1540
             $SETTINGS['syslog_host'],
1541 1541
             $SETTINGS['syslog_port'],
1542 1542
             'teampass'
@@ -1567,8 +1567,8 @@  discard block
 block discarded – undo
1567 1567
     // send email to user that what to be notified
1568 1568
     $notification = DB::queryFirstField(
1569 1569
         'SELECT email
1570
-        FROM ' . prefixTable('notification') . ' AS n
1571
-        INNER JOIN ' . prefixTable('users') . ' AS u ON (n.user_id = u.id)
1570
+        FROM ' . prefixTable('notification').' AS n
1571
+        INNER JOIN ' . prefixTable('users').' AS u ON (n.user_id = u.id)
1572 1572
         WHERE n.item_id = %i AND n.user_id != %i',
1573 1573
         $item_id,
1574 1574
         $globalsUserId
@@ -1579,7 +1579,7 @@  discard block
 block discarded – undo
1579 1579
         // Get list of changes
1580 1580
         $htmlChanges = '<ul>';
1581 1581
         foreach ($changes as $change) {
1582
-            $htmlChanges .= '<li>' . $change . '</li>';
1582
+            $htmlChanges .= '<li>'.$change.'</li>';
1583 1583
         }
1584 1584
         $htmlChanges .= '</ul>';
1585 1585
         // send email
@@ -1616,15 +1616,15 @@  discard block
 block discarded – undo
1616 1616
     $path = '';
1617 1617
     foreach ($arbo as $elem) {
1618 1618
         if (empty($path) === true) {
1619
-            $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES) . ' ';
1619
+            $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES).' ';
1620 1620
         } else {
1621
-            $path .= '&#8594; ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
1621
+            $path .= '&#8594; '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
1622 1622
         }
1623 1623
     }
1624 1624
 
1625 1625
     // Build text to show user
1626 1626
     if (empty($label) === false) {
1627
-        return empty($path) === true ? addslashes($label) : addslashes($label) . ' (' . $path . ')';
1627
+        return empty($path) === true ? addslashes($label) : addslashes($label).' ('.$path.')';
1628 1628
     }
1629 1629
     return empty($path) === true ? '' : $path;
1630 1630
 }
@@ -1680,7 +1680,7 @@  discard block
 block discarded – undo
1680 1680
 {
1681 1681
     // Perform a copy if the file exists
1682 1682
     if (file_exists($configFilePath)) {
1683
-        $backupFilePath = $configFilePath . '.' . date('Y_m_d_His', time());
1683
+        $backupFilePath = $configFilePath.'.'.date('Y_m_d_His', time());
1684 1684
         if (!copy($configFilePath, $backupFilePath)) {
1685 1685
             return "ERROR: Could not copy file '$configFilePath'";
1686 1686
         }
@@ -1688,10 +1688,10 @@  discard block
 block discarded – undo
1688 1688
 
1689 1689
     // Regenerate the config file
1690 1690
     $data = ["<?php\n", "global \$SETTINGS;\n", "\$SETTINGS = array (\n"];
1691
-    $rows = DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type=%s', 'admin');
1691
+    $rows = DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type=%s', 'admin');
1692 1692
     foreach ($rows as $record) {
1693 1693
         $value = getEncryptedValue($record['valeur'], $record['is_encrypted']);
1694
-        $data[] = "    '{$record['intitule']}' => '". htmlspecialchars_decode($value, ENT_COMPAT) . "',\n";
1694
+        $data[] = "    '{$record['intitule']}' => '".htmlspecialchars_decode($value, ENT_COMPAT)."',\n";
1695 1695
     }
1696 1696
     $data[] = ");\n";
1697 1697
     $data = array_unique($data);
@@ -1736,7 +1736,7 @@  discard block
 block discarded – undo
1736 1736
 {
1737 1737
     global $SETTINGS;
1738 1738
     /* LOAD CPASSMAN SETTINGS */
1739
-    if (! isset($SETTINGS['loaded']) || $SETTINGS['loaded'] !== 1) {
1739
+    if (!isset($SETTINGS['loaded']) || $SETTINGS['loaded'] !== 1) {
1740 1740
         $SETTINGS = [];
1741 1741
         $SETTINGS['duplicate_folder'] = 0;
1742 1742
         //by default, this is set to 0;
@@ -1746,7 +1746,7 @@  discard block
 block discarded – undo
1746 1746
         //by default, this value is set to 5;
1747 1747
         $settings = [];
1748 1748
         $rows = DB::query(
1749
-            'SELECT * FROM ' . prefixTable('misc') . ' WHERE type=%s_type OR type=%s_type2',
1749
+            'SELECT * FROM '.prefixTable('misc').' WHERE type=%s_type OR type=%s_type2',
1750 1750
             [
1751 1751
                 'type' => 'admin',
1752 1752
                 'type2' => 'settings',
@@ -1778,7 +1778,7 @@  discard block
 block discarded – undo
1778 1778
     $source_cf = [];
1779 1779
     $rows = DB::query(
1780 1780
         'SELECT id_category
1781
-            FROM ' . prefixTable('categories_folders') . '
1781
+            FROM ' . prefixTable('categories_folders').'
1782 1782
             WHERE id_folder = %i',
1783 1783
         $source_id
1784 1784
     );
@@ -1789,7 +1789,7 @@  discard block
 block discarded – undo
1789 1789
     $target_cf = [];
1790 1790
     $rows = DB::query(
1791 1791
         'SELECT id_category
1792
-            FROM ' . prefixTable('categories_folders') . '
1792
+            FROM ' . prefixTable('categories_folders').'
1793 1793
             WHERE id_folder = %i',
1794 1794
         $target_id
1795 1795
     );
@@ -1884,10 +1884,10 @@  discard block
 block discarded – undo
1884 1884
     } catch (CryptoException\WrongKeyOrModifiedCiphertextException $ex) {
1885 1885
         $err = 'wrong_key';
1886 1886
     } catch (CryptoException\EnvironmentIsBrokenException $ex) {
1887
-        error_log('TEAMPASS-Error-Environment: ' . $ex->getMessage());
1887
+        error_log('TEAMPASS-Error-Environment: '.$ex->getMessage());
1888 1888
         $err = 'environment_error';
1889 1889
     } catch (CryptoException\IOException $ex) {
1890
-        error_log('TEAMPASS-Error-General: ' . $ex->getMessage());
1890
+        error_log('TEAMPASS-Error-General: '.$ex->getMessage());
1891 1891
         $err = 'general_error';
1892 1892
     }
1893 1893
 
@@ -1919,10 +1919,10 @@  discard block
 block discarded – undo
1919 1919
     } catch (CryptoException\WrongKeyOrModifiedCiphertextException $ex) {
1920 1920
         $err = 'wrong_key';
1921 1921
     } catch (CryptoException\EnvironmentIsBrokenException $ex) {
1922
-        error_log('TEAMPASS-Error-Environment: ' . $ex->getMessage());
1922
+        error_log('TEAMPASS-Error-Environment: '.$ex->getMessage());
1923 1923
         $err = 'environment_error';
1924 1924
     } catch (CryptoException\IOException $ex) {
1925
-        error_log('TEAMPASS-Error-General: ' . $ex->getMessage());
1925
+        error_log('TEAMPASS-Error-General: '.$ex->getMessage());
1926 1926
         $err = 'general_error';
1927 1927
     }
1928 1928
 
@@ -2008,7 +2008,7 @@  discard block
 block discarded – undo
2008 2008
 ) {
2009 2009
     // Check if the path exists
2010 2010
     $path = basename($path);
2011
-    if (! file_exists($path)) {
2011
+    if (!file_exists($path)) {
2012 2012
         return false;
2013 2013
     }
2014 2014
 
@@ -2061,7 +2061,7 @@  discard block
 block discarded – undo
2061 2061
     // Load item data
2062 2062
     $data = DB::queryFirstRow(
2063 2063
         'SELECT id_tree
2064
-        FROM ' . prefixTable('items') . '
2064
+        FROM ' . prefixTable('items').'
2065 2065
         WHERE id = %i',
2066 2066
         $item_id
2067 2067
     );
@@ -2124,7 +2124,7 @@  discard block
 block discarded – undo
2124 2124
         }
2125 2125
         $host .= substr(explode(".", $email[1])[0], -1, 1);
2126 2126
     }
2127
-    $email = $name . "@" . $host . "." . explode(".", $email[1])[1];
2127
+    $email = $name."@".$host.".".explode(".", $email[1])[1];
2128 2128
     return $email;
2129 2129
 }
2130 2130
 
@@ -2155,11 +2155,11 @@  discard block
 block discarded – undo
2155 2155
 function formatSizeUnits(int $bytes): string
2156 2156
 {
2157 2157
     if ($bytes >= 1073741824) {
2158
-        $bytes = number_format($bytes / 1073741824, 2) . ' GB';
2158
+        $bytes = number_format($bytes / 1073741824, 2).' GB';
2159 2159
     } elseif ($bytes >= 1048576) {
2160
-        $bytes = number_format($bytes / 1048576, 2) . ' MB';
2160
+        $bytes = number_format($bytes / 1048576, 2).' MB';
2161 2161
     } elseif ($bytes >= 1024) {
2162
-        $bytes = number_format($bytes / 1024, 2) . ' KB';
2162
+        $bytes = number_format($bytes / 1024, 2).' KB';
2163 2163
     } elseif ($bytes > 1) {
2164 2164
         $bytes .= ' bytes';
2165 2165
     } elseif ($bytes === 1) {
@@ -2329,7 +2329,7 @@  discard block
 block discarded – undo
2329 2329
  */
2330 2330
 function generateKeyIntegrityHash(string $userSeed, string $publicKey, string $serverSecret): string
2331 2331
 {
2332
-    return hash_hmac('sha256', $userSeed . $publicKey, $serverSecret);
2332
+    return hash_hmac('sha256', $userSeed.$publicKey, $serverSecret);
2333 2333
 }
2334 2334
 
2335 2335
 /**
@@ -2404,7 +2404,7 @@  discard block
 block discarded – undo
2404 2404
                 'security_alert',
2405 2405
                 'key_integrity_check_failed',
2406 2406
                 (string) $userInfo['id'],
2407
-                'User: ' . $userInfo['login']
2407
+                'User: '.$userInfo['login']
2408 2408
             );
2409 2409
             return [
2410 2410
                 'success' => false,
@@ -2451,7 +2451,7 @@  discard block
 block discarded – undo
2451 2451
             'user_connection',
2452 2452
             'auto_reencryption_success',
2453 2453
             (string) $userInfo['id'],
2454
-            'User: ' . $userInfo['login']
2454
+            'User: '.$userInfo['login']
2455 2455
         );
2456 2456
 
2457 2457
         // Store in session for immediate use
@@ -2470,12 +2470,12 @@  discard block
 block discarded – undo
2470 2470
             'security_alert',
2471 2471
             'auto_reencryption_failed',
2472 2472
             (string) $userInfo['id'],
2473
-            'User: ' . $userInfo['login'] . ' - Error: ' . $e->getMessage()
2473
+            'User: '.$userInfo['login'].' - Error: '.$e->getMessage()
2474 2474
         );
2475 2475
 
2476 2476
         return [
2477 2477
             'success' => false,
2478
-            'error' => 'decryption_failed: ' . $e->getMessage(),
2478
+            'error' => 'decryption_failed: '.$e->getMessage(),
2479 2479
             'private_key_clear' => '',
2480 2480
         ];
2481 2481
     }
@@ -2542,7 +2542,7 @@  discard block
 block discarded – undo
2542 2542
         'security_alert',
2543 2543
         'auto_reencryption_critical_failure',
2544 2544
         (string) $userId,
2545
-        'User: ' . $userInfo['login'] . ' - disabled due to key recovery failure'
2545
+        'User: '.$userInfo['login'].' - disabled due to key recovery failure'
2546 2546
     );
2547 2547
 
2548 2548
     return false;
@@ -2700,7 +2700,7 @@  discard block
 block discarded – undo
2700 2700
     $cipher->enableContinuousBuffer();
2701 2701
 
2702 2702
     // Encrypt the file content
2703
-    $filePath = filter_var($fileInPath . '/' . $fileInName, FILTER_SANITIZE_URL);
2703
+    $filePath = filter_var($fileInPath.'/'.$fileInName, FILTER_SANITIZE_URL);
2704 2704
     $fileContent = file_get_contents($filePath);
2705 2705
     $plaintext = $fileContent;
2706 2706
     $ciphertext = $cipher->encrypt($plaintext);
@@ -2708,9 +2708,9 @@  discard block
 block discarded – undo
2708 2708
     // Save new file
2709 2709
     // deepcode ignore InsecureHash: is simply used to get a unique name
2710 2710
     $hash = uniqid('', true);
2711
-    $fileOut = $fileInPath . '/' . TP_FILE_PREFIX . $hash;
2711
+    $fileOut = $fileInPath.'/'.TP_FILE_PREFIX.$hash;
2712 2712
     file_put_contents($fileOut, $ciphertext);
2713
-    unlink($fileInPath . '/' . $fileInName);
2713
+    unlink($fileInPath.'/'.$fileInName);
2714 2714
     return [
2715 2715
         'fileHash' => base64_encode($hash),
2716 2716
         'objectKey' => base64_encode($objectKey),
@@ -2726,9 +2726,9 @@  discard block
 block discarded – undo
2726 2726
  *
2727 2727
  * @return string|array
2728 2728
  */
2729
-function decryptFile(string $fileName, string $filePath, string $key): string|array
2729
+function decryptFile(string $fileName, string $filePath, string $key): string | array
2730 2730
 {
2731
-    if (! defined('FILE_BUFFER_SIZE')) {
2731
+    if (!defined('FILE_BUFFER_SIZE')) {
2732 2732
         define('FILE_BUFFER_SIZE', 128 * 1024);
2733 2733
     }
2734 2734
     
@@ -2745,7 +2745,7 @@  discard block
 block discarded – undo
2745 2745
     $cipher->enableContinuousBuffer();
2746 2746
     $cipher->disablePadding();
2747 2747
     // Get file content
2748
-    $safeFilePath = realpath($filePath . '/' . TP_FILE_PREFIX . $safeFileName);
2748
+    $safeFilePath = realpath($filePath.'/'.TP_FILE_PREFIX.$safeFileName);
2749 2749
     if ($safeFilePath !== false && file_exists($safeFilePath)) {
2750 2750
         $ciphertext = file_get_contents(filter_var($safeFilePath, FILTER_SANITIZE_URL));
2751 2751
     } else {
@@ -2842,7 +2842,7 @@  discard block
 block discarded – undo
2842 2842
         // Get public keys for all target users
2843 2843
         $users = DB::query(
2844 2844
             'SELECT id, public_key
2845
-            FROM ' . prefixTable('users') . '
2845
+            FROM ' . prefixTable('users').'
2846 2846
             WHERE id IN %li
2847 2847
             AND public_key != ""',
2848 2848
             $userIds
@@ -2891,7 +2891,7 @@  discard block
 block discarded – undo
2891 2891
         }
2892 2892
         $users = DB::query(
2893 2893
             'SELECT id, public_key
2894
-            FROM ' . prefixTable('users') . '
2894
+            FROM ' . prefixTable('users').'
2895 2895
             WHERE id NOT IN %li
2896 2896
             AND public_key != ""',
2897 2897
             $user_ids
@@ -2900,7 +2900,7 @@  discard block
 block discarded – undo
2900 2900
         foreach ($users as $user) {
2901 2901
             // Insert in DB the new object key for this item by user
2902 2902
             if (count($objectKeyArray) === 0) {
2903
-                if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case1 - ' . $object_name . ' - ' . $post_object_id . ' - ' . $user['id'] . ' - ' . $objectKey);
2903
+                if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case1 - '.$object_name.' - '.$post_object_id.' - '.$user['id'].' - '.$objectKey);
2904 2904
                 DB::insert(
2905 2905
                     $object_name,
2906 2906
                     [
@@ -2914,7 +2914,7 @@  discard block
 block discarded – undo
2914 2914
                 );
2915 2915
             } else {
2916 2916
                 foreach ($objectKeyArray as $object) {
2917
-                    if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case2 - ' . $object_name . ' - ' . $object['objectId'] . ' - ' . $user['id'] . ' - ' . $object['objectKey']);
2917
+                    if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case2 - '.$object_name.' - '.$object['objectId'].' - '.$user['id'].' - '.$object['objectKey']);
2918 2918
                     DB::insert(
2919 2919
                         $object_name,
2920 2920
                         [
@@ -2942,7 +2942,7 @@  discard block
 block discarded – undo
2942 2942
 function isBase64(string $str): bool
2943 2943
 {
2944 2944
     $str = (string) trim($str);
2945
-    if (! isset($str[0])) {
2945
+    if (!isset($str[0])) {
2946 2946
         return false;
2947 2947
     }
2948 2948
 
@@ -3016,7 +3016,7 @@  discard block
 block discarded – undo
3016 3016
     } catch (\LdapRecord\Auth\BindException $e) {
3017 3017
         $error = $e->getDetailedError();
3018 3018
         if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) {
3019
-            error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage());
3019
+            error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage());
3020 3020
         }
3021 3021
         // deepcode ignore ServerLeak: No important data is sent
3022 3022
         echo 'An error occurred.';
@@ -3033,7 +3033,7 @@  discard block
 block discarded – undo
3033 3033
     } catch (\LdapRecord\Auth\BindException $e) {
3034 3034
         $error = $e->getDetailedError();
3035 3035
         if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) {
3036
-            error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage());
3036
+            error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage());
3037 3037
         }
3038 3038
         // deepcode ignore ServerLeak: No important data is sent
3039 3039
         echo 'An error occurred.';
@@ -3069,7 +3069,7 @@  discard block
 block discarded – undo
3069 3069
     // expect if personal item
3070 3070
     DB::delete(
3071 3071
         prefixTable('sharekeys_items'),
3072
-        'user_id = %i AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)',
3072
+        'user_id = %i AND object_id NOT IN (SELECT i.id FROM '.prefixTable('items').' AS i WHERE i.perso = 1)',
3073 3073
         $userId
3074 3074
     );
3075 3075
     // Remove all item sharekeys files
@@ -3077,8 +3077,8 @@  discard block
 block discarded – undo
3077 3077
         prefixTable('sharekeys_files'),
3078 3078
         'user_id = %i AND object_id NOT IN (
3079 3079
             SELECT f.id 
3080
-            FROM ' . prefixTable('items') . ' AS i 
3081
-            INNER JOIN ' . prefixTable('files') . ' AS f ON f.id_item = i.id
3080
+            FROM ' . prefixTable('items').' AS i 
3081
+            INNER JOIN ' . prefixTable('files').' AS f ON f.id_item = i.id
3082 3082
             WHERE i.perso = 1
3083 3083
         )',
3084 3084
         $userId
@@ -3088,8 +3088,8 @@  discard block
 block discarded – undo
3088 3088
         prefixTable('sharekeys_fields'),
3089 3089
         'user_id = %i AND object_id NOT IN (
3090 3090
             SELECT c.id 
3091
-            FROM ' . prefixTable('items') . ' AS i 
3092
-            INNER JOIN ' . prefixTable('categories_items') . ' AS c ON c.item_id = i.id
3091
+            FROM ' . prefixTable('items').' AS i 
3092
+            INNER JOIN ' . prefixTable('categories_items').' AS c ON c.item_id = i.id
3093 3093
             WHERE i.perso = 1
3094 3094
         )',
3095 3095
         $userId
@@ -3097,13 +3097,13 @@  discard block
 block discarded – undo
3097 3097
     // Remove all item sharekeys logs
3098 3098
     DB::delete(
3099 3099
         prefixTable('sharekeys_logs'),
3100
-        'user_id = %i AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)',
3100
+        'user_id = %i AND object_id NOT IN (SELECT i.id FROM '.prefixTable('items').' AS i WHERE i.perso = 1)',
3101 3101
         $userId
3102 3102
     );
3103 3103
     // Remove all item sharekeys suggestions
3104 3104
     DB::delete(
3105 3105
         prefixTable('sharekeys_suggestions'),
3106
-        'user_id = %i AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)',
3106
+        'user_id = %i AND object_id NOT IN (SELECT i.id FROM '.prefixTable('items').' AS i WHERE i.perso = 1)',
3107 3107
         $userId
3108 3108
     );
3109 3109
     return false;
@@ -3124,7 +3124,7 @@  discard block
 block discarded – undo
3124 3124
         foreach (DateTimeZone::listIdentifiers() as $timezone) {
3125 3125
             $now->setTimezone(new DateTimeZone($timezone));
3126 3126
             $offsets[] = $offset = $now->getOffset();
3127
-            $timezones[$timezone] = '(' . format_GMT_offset($offset) . ') ' . format_timezone_name($timezone);
3127
+            $timezones[$timezone] = '('.format_GMT_offset($offset).') '.format_timezone_name($timezone);
3128 3128
         }
3129 3129
 
3130 3130
         array_multisort($offsets, $timezones);
@@ -3144,7 +3144,7 @@  discard block
 block discarded – undo
3144 3144
 {
3145 3145
     $hours = intval($offset / 3600);
3146 3146
     $minutes = abs(intval($offset % 3600 / 60));
3147
-    return 'GMT' . ($offset ? sprintf('%+03d:%02d', $hours, $minutes) : '');
3147
+    return 'GMT'.($offset ? sprintf('%+03d:%02d', $hours, $minutes) : '');
3148 3148
 }
3149 3149
 
3150 3150
 /**
@@ -3243,8 +3243,7 @@  discard block
 block discarded – undo
3243 3243
 {
3244 3244
     if (isset($array[$key]) === true
3245 3245
         && (is_int($value) === true ?
3246
-            (int) $array[$key] === $value :
3247
-            (string) $array[$key] === $value)
3246
+            (int) $array[$key] === $value : (string) $array[$key] === $value)
3248 3247
     ) {
3249 3248
         return true;
3250 3249
     }
@@ -3266,8 +3265,7 @@  discard block
 block discarded – undo
3266 3265
 {
3267 3266
     if (isset($var) === false
3268 3267
         || (is_int($value) === true ?
3269
-            (int) $var === $value :
3270
-            (string) $var === $value)
3268
+            (int) $var === $value : (string) $var === $value)
3271 3269
     ) {
3272 3270
         return true;
3273 3271
     }
@@ -3318,7 +3316,7 @@  discard block
 block discarded – undo
3318 3316
  */
3319 3317
 function isSetArrayOfValues(array $arrayOfValues): bool
3320 3318
 {
3321
-    foreach($arrayOfValues as $value) {
3319
+    foreach ($arrayOfValues as $value) {
3322 3320
         if (isset($value) === false) {
3323 3321
             return false;
3324 3322
         }
@@ -3340,7 +3338,7 @@  discard block
 block discarded – undo
3340 3338
     /*PHP8 - integer|string*/$value
3341 3339
 ) : bool
3342 3340
 {
3343
-    foreach($arrayOfVars as $variable) {
3341
+    foreach ($arrayOfVars as $variable) {
3344 3342
         if ($variable !== $value) {
3345 3343
             return false;
3346 3344
         }
@@ -3360,7 +3358,7 @@  discard block
 block discarded – undo
3360 3358
     /*PHP8 - integer|string*/$value
3361 3359
 ) : bool
3362 3360
 {
3363
-    foreach($arrayOfVars as $variable) {
3361
+    foreach ($arrayOfVars as $variable) {
3364 3362
         if ($variable === $value) {
3365 3363
             return true;
3366 3364
         }
@@ -3374,7 +3372,7 @@  discard block
 block discarded – undo
3374 3372
  * @param string|int|null $value
3375 3373
  * @return boolean
3376 3374
  */
3377
-function isValueSetNullEmpty(string|int|null $value) : bool
3375
+function isValueSetNullEmpty(string | int | null $value) : bool
3378 3376
 {
3379 3377
     if (is_null($value) === true || empty($value) === true) {
3380 3378
         return true;
@@ -3429,7 +3427,7 @@  discard block
 block discarded – undo
3429 3427
  * @param array     $filters
3430 3428
  * @return array|string
3431 3429
  */
3432
-function dataSanitizer(array $data, array $filters): array|string
3430
+function dataSanitizer(array $data, array $filters): array | string
3433 3431
 {
3434 3432
     // Load Sanitizer library
3435 3433
     $sanitizer = new Sanitizer($data, $filters);
@@ -3458,7 +3456,7 @@  discard block
 block discarded – undo
3458 3456
     // Exists ?
3459 3457
     $userCacheId = DB::queryFirstRow(
3460 3458
         'SELECT increment_id
3461
-        FROM ' . prefixTable('cache_tree') . '
3459
+        FROM ' . prefixTable('cache_tree').'
3462 3460
         WHERE user_id = %i',
3463 3461
         $user_id
3464 3462
     );
@@ -3509,7 +3507,7 @@  discard block
 block discarded – undo
3509 3507
  */
3510 3508
 function pourcentage(float $nombre, float $total, float $pourcentage): float
3511 3509
 { 
3512
-    $resultat = ($nombre/$total) * $pourcentage;
3510
+    $resultat = ($nombre / $total) * $pourcentage;
3513 3511
     return round($resultat);
3514 3512
 }
3515 3513
 
@@ -3539,7 +3537,7 @@  discard block
 block discarded – undo
3539 3537
 
3540 3538
     // Get last folder update
3541 3539
     $lastFolderChange = DB::queryFirstRow(
3542
-        'SELECT valeur FROM ' . prefixTable('misc') . '
3540
+        'SELECT valeur FROM '.prefixTable('misc').'
3543 3541
         WHERE type = %s AND intitule = %s',
3544 3542
         'timestamp',
3545 3543
         'last_folder_change'
@@ -3560,7 +3558,7 @@  discard block
 block discarded – undo
3560 3558
     // Does this user has a tree cache
3561 3559
     $userCacheTree = DB::queryFirstRow(
3562 3560
         'SELECT '.$fieldName.'
3563
-        FROM ' . prefixTable('cache_tree') . '
3561
+        FROM ' . prefixTable('cache_tree').'
3564 3562
         WHERE user_id = %i',
3565 3563
         $session->get('user-id')
3566 3564
     );
@@ -3598,7 +3596,7 @@  discard block
 block discarded – undo
3598 3596
     if (count($folderIds) === 0) {
3599 3597
         $folderIds = DB::queryFirstColumn(
3600 3598
             'SELECT id
3601
-            FROM ' . prefixTable('nested_tree') . '
3599
+            FROM ' . prefixTable('nested_tree').'
3602 3600
             WHERE personal_folder=%i',
3603 3601
             0
3604 3602
         );
@@ -3615,8 +3613,8 @@  discard block
 block discarded – undo
3615 3613
         $rows_tmp = DB::query(
3616 3614
             'SELECT c.id, c.title, c.level, c.type, c.masked, c.order, c.encrypted_data, c.role_visibility, c.is_mandatory,
3617 3615
             f.id_category AS category_id
3618
-            FROM ' . prefixTable('categories_folders') . ' AS f
3619
-            INNER JOIN ' . prefixTable('categories') . ' AS c ON (f.id_category = c.parent_id)
3616
+            FROM ' . prefixTable('categories_folders').' AS f
3617
+            INNER JOIN ' . prefixTable('categories').' AS c ON (f.id_category = c.parent_id)
3620 3618
             WHERE id_folder=%i',
3621 3619
             $folder
3622 3620
         );
@@ -3642,7 +3640,7 @@  discard block
 block discarded – undo
3642 3640
         $valTemp = '';
3643 3641
         $data = DB::queryFirstRow(
3644 3642
             'SELECT valeur
3645
-            FROM ' . prefixTable('misc') . '
3643
+            FROM ' . prefixTable('misc').'
3646 3644
             WHERE type = %s AND intitule=%i',
3647 3645
             'complex',
3648 3646
             $folder
@@ -3659,14 +3657,14 @@  discard block
 block discarded – undo
3659 3657
         $valTemp = '';
3660 3658
         $rows_tmp = DB::query(
3661 3659
             'SELECT t.title
3662
-            FROM ' . prefixTable('roles_values') . ' as v
3663
-            INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id)
3660
+            FROM ' . prefixTable('roles_values').' as v
3661
+            INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id)
3664 3662
             WHERE v.folder_id = %i
3665 3663
             GROUP BY title',
3666 3664
             $folder
3667 3665
         );
3668 3666
         foreach ($rows_tmp as $record) {
3669
-            $valTemp .= (empty($valTemp) === true ? '' : ' - ') . $record['title'];
3667
+            $valTemp .= (empty($valTemp) === true ? '' : ' - ').$record['title'];
3670 3668
         }
3671 3669
         $arr_data['visibilityRoles'] = $valTemp;
3672 3670
 
@@ -3699,7 +3697,7 @@  discard block
 block discarded – undo
3699 3697
         // loop on users and check if user has this role
3700 3698
         $rows = DB::query(
3701 3699
             'SELECT id, fonction_id
3702
-            FROM ' . prefixTable('users') . '
3700
+            FROM ' . prefixTable('users').'
3703 3701
             WHERE id != %i AND admin = 0 AND fonction_id IS NOT NULL AND fonction_id != ""',
3704 3702
             $session->get('user-id')
3705 3703
         );
@@ -3731,7 +3729,7 @@  discard block
 block discarded – undo
3731 3729
 
3732 3730
     $val = DB::queryFirstRow(
3733 3731
         'SELECT *
3734
-        FROM ' . prefixTable('users') . '
3732
+        FROM ' . prefixTable('users').'
3735 3733
         WHERE id = %i',
3736 3734
         $userId
3737 3735
     );
@@ -3747,12 +3745,12 @@  discard block
 block discarded – undo
3747 3745
 function upgradeRequired(): bool
3748 3746
 {
3749 3747
     // Get settings.php
3750
-    include_once __DIR__. '/../includes/config/settings.php';
3748
+    include_once __DIR__.'/../includes/config/settings.php';
3751 3749
 
3752 3750
     // Get timestamp in DB
3753 3751
     $val = DB::queryFirstRow(
3754 3752
         'SELECT valeur
3755
-        FROM ' . prefixTable('misc') . '
3753
+        FROM ' . prefixTable('misc').'
3756 3754
         WHERE type = %s AND intitule = %s',
3757 3755
         'admin',
3758 3756
         'upgrade_timestamp'
@@ -3805,7 +3803,7 @@  discard block
 block discarded – undo
3805 3803
     // prepapre background tasks for item keys generation        
3806 3804
     $userTP = DB::queryFirstRow(
3807 3805
         'SELECT pw, public_key, private_key
3808
-        FROM ' . prefixTable('users') . '
3806
+        FROM ' . prefixTable('users').'
3809 3807
         WHERE id = %i',
3810 3808
         TP_USER_ID
3811 3809
     );
@@ -3866,7 +3864,7 @@  discard block
 block discarded – undo
3866 3864
     }
3867 3865
 
3868 3866
     // Generate new keys
3869
-    if ($user_self_change === true && empty($recovery_public_key) === false && empty($recovery_private_key) === false){
3867
+    if ($user_self_change === true && empty($recovery_public_key) === false && empty($recovery_private_key) === false) {
3870 3868
         $userKeys = [
3871 3869
             'public_key' => $recovery_public_key,
3872 3870
             'private_key_clear' => $recovery_private_key,
@@ -3917,8 +3915,8 @@  discard block
 block discarded – undo
3917 3915
             'process_type' => 'create_user_keys',
3918 3916
             'arguments' => json_encode([
3919 3917
                 'new_user_id' => (int) $userId,
3920
-                'new_user_pwd' => cryption($passwordClear, '','encrypt')['string'],
3921
-                'new_user_code' => cryption(empty($encryptionKey) === true ? uniqidReal(20) : $encryptionKey, '','encrypt')['string'],
3918
+                'new_user_pwd' => cryption($passwordClear, '', 'encrypt')['string'],
3919
+                'new_user_code' => cryption(empty($encryptionKey) === true ? uniqidReal(20) : $encryptionKey, '', 'encrypt')['string'],
3922 3920
                 'owner_id' => (int) TP_USER_ID,
3923 3921
                 'creator_pwd' => $userTP['pw'],
3924 3922
                 'send_email' => $sendEmailToUser === true ? 1 : 0,
@@ -3990,19 +3988,19 @@  discard block
 block discarded – undo
3990 3988
 
3991 3989
     // Prepare the subtask queries
3992 3990
     $queries = [
3993
-        'step20' => 'SELECT * FROM ' . prefixTable('items'),
3991
+        'step20' => 'SELECT * FROM '.prefixTable('items'),
3994 3992
 
3995
-        'step30' => 'SELECT * FROM ' . prefixTable('log_items') . 
3993
+        'step30' => 'SELECT * FROM '.prefixTable('log_items'). 
3996 3994
                     ' WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"',
3997 3995
 
3998
-        'step40' => 'SELECT * FROM ' . prefixTable('categories_items') . 
3996
+        'step40' => 'SELECT * FROM '.prefixTable('categories_items'). 
3999 3997
                     ' WHERE encryption_type = "teampass_aes"',
4000 3998
 
4001
-        'step50' => 'SELECT * FROM ' . prefixTable('suggestion'),
3999
+        'step50' => 'SELECT * FROM '.prefixTable('suggestion'),
4002 4000
 
4003
-        'step60' => 'SELECT * FROM ' . prefixTable('files') . ' AS f
4004
-                        INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = f.id_item
4005
-                        WHERE f.status = "' . TP_ENCRYPTION_NAME . '"'
4001
+        'step60' => 'SELECT * FROM '.prefixTable('files').' AS f
4002
+                        INNER JOIN ' . prefixTable('items').' AS i ON i.id = f.id_item
4003
+                        WHERE f.status = "' . TP_ENCRYPTION_NAME.'"'
4006 4004
     ];
4007 4005
 
4008 4006
     // Perform loop on $queries to create sub-tasks
@@ -4192,7 +4190,7 @@  discard block
 block discarded – undo
4192 4190
  */
4193 4191
 function createTaskForItem(
4194 4192
     string $processType,
4195
-    string|array $taskName,
4193
+    string | array $taskName,
4196 4194
     int $itemId,
4197 4195
     int $userId,
4198 4196
     string $objectKey,
@@ -4216,7 +4214,7 @@  discard block
 block discarded – undo
4216 4214
                 'object_key' => $objectKey,
4217 4215
                 'author' => (int) $userId,
4218 4216
             ]),
4219
-            'item_id' => (int) $parentId !== -1 ?  $parentId : null,
4217
+            'item_id' => (int) $parentId !== -1 ? $parentId : null,
4220 4218
         )
4221 4219
     );
4222 4220
     $processId = DB::insertId();
@@ -4226,7 +4224,7 @@  discard block
 block discarded – undo
4226 4224
     if (is_array($taskName) === false) {
4227 4225
         $taskName = [$taskName];
4228 4226
     }
4229
-    foreach($taskName as $task) {
4227
+    foreach ($taskName as $task) {
4230 4228
         if (WIP === true) error_log('createTaskForItem - task: '.$task);
4231 4229
         switch ($task) {
4232 4230
             case 'item_password':
@@ -4323,7 +4321,7 @@  discard block
 block discarded – undo
4323 4321
  * @param integer $user_id
4324 4322
  * @return void
4325 4323
  */
4326
-function purgeUnnecessaryKeys(bool $allUsers = true, int $user_id=0)
4324
+function purgeUnnecessaryKeys(bool $allUsers = true, int $user_id = 0)
4327 4325
 {
4328 4326
     if ($allUsers === true) {
4329 4327
         // Load class DB
@@ -4333,7 +4331,7 @@  discard block
 block discarded – undo
4333 4331
 
4334 4332
         $users = DB::query(
4335 4333
             'SELECT id
4336
-            FROM ' . prefixTable('users') . '
4334
+            FROM ' . prefixTable('users').'
4337 4335
             WHERE id NOT IN ('.OTV_USER_ID.', '.TP_USER_ID.', '.SSH_USER_ID.', '.API_USER_ID.')
4338 4336
             ORDER BY login ASC'
4339 4337
         );
@@ -4351,7 +4349,7 @@  discard block
 block discarded – undo
4351 4349
  * @param integer $user_id
4352 4350
  * @return void
4353 4351
  */
4354
-function purgeUnnecessaryKeysForUser(int $user_id=0)
4352
+function purgeUnnecessaryKeysForUser(int $user_id = 0)
4355 4353
 {
4356 4354
     if ($user_id === 0) {
4357 4355
         return;
@@ -4362,8 +4360,8 @@  discard block
 block discarded – undo
4362 4360
 
4363 4361
     $personalItems = DB::queryFirstColumn(
4364 4362
         'SELECT id
4365
-        FROM ' . prefixTable('items') . ' AS i
4366
-        INNER JOIN ' . prefixTable('log_items') . ' AS li ON li.id_item = i.id
4363
+        FROM ' . prefixTable('items').' AS i
4364
+        INNER JOIN ' . prefixTable('log_items').' AS li ON li.id_item = i.id
4367 4365
         WHERE i.perso = 1 AND li.action = "at_creation" AND li.id_user IN (%i, '.TP_USER_ID.')',
4368 4366
         $user_id
4369 4367
     );
@@ -4373,28 +4371,28 @@  discard block
 block discarded – undo
4373 4371
             prefixTable('sharekeys_items'),
4374 4372
             'object_id IN %li AND user_id NOT IN %ls',
4375 4373
             $personalItems,
4376
-            [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID]
4374
+            [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID]
4377 4375
         );
4378 4376
         // Files keys
4379 4377
         DB::delete(
4380 4378
             prefixTable('sharekeys_files'),
4381 4379
             'object_id IN %li AND user_id NOT IN %ls',
4382 4380
             $personalItems,
4383
-            [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID]
4381
+            [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID]
4384 4382
         );
4385 4383
         // Fields keys
4386 4384
         DB::delete(
4387 4385
             prefixTable('sharekeys_fields'),
4388 4386
             'object_id IN %li AND user_id NOT IN %ls',
4389 4387
             $personalItems,
4390
-            [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID]
4388
+            [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID]
4391 4389
         );
4392 4390
         // Logs keys
4393 4391
         DB::delete(
4394 4392
             prefixTable('sharekeys_logs'),
4395 4393
             'object_id IN %li AND user_id NOT IN %ls',
4396 4394
             $personalItems,
4397
-            [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID]
4395
+            [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID]
4398 4396
         );
4399 4397
     }
4400 4398
 }
@@ -4412,7 +4410,7 @@  discard block
 block discarded – undo
4412 4410
     // Check if user exists
4413 4411
     $userInfo = DB::queryFirstRow(
4414 4412
         'SELECT login
4415
-        FROM ' . prefixTable('users') . '
4413
+        FROM ' . prefixTable('users').'
4416 4414
         WHERE id = %i',
4417 4415
         $userId
4418 4416
     );
@@ -4421,7 +4419,7 @@  discard block
 block discarded – undo
4421 4419
         $now = (int) time();
4422 4420
         // Prepare file content
4423 4421
         $export_value = file_get_contents(__DIR__."/../includes/core/teampass_ascii.txt")."\n".
4424
-            "Generation date: ".date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $now)."\n\n".
4422
+            "Generation date: ".date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $now)."\n\n".
4425 4423
             "RECOVERY KEYS - Not to be shared - To be store safely\n\n".
4426 4424
             "Public Key:\n".$session->get('user-public_key')."\n\n".
4427 4425
             "Private Key:\n".$session->get('user-private_key')."\n\n";
@@ -4444,7 +4442,7 @@  discard block
 block discarded – undo
4444 4442
         return prepareExchangedData(
4445 4443
             array(
4446 4444
                 'error' => false,
4447
-                'datetime' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $now),
4445
+                'datetime' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $now),
4448 4446
                 'timestamp' => $now,
4449 4447
                 'content' => base64_encode($export_value),
4450 4448
                 'login' => $userInfo['login'],
@@ -4470,8 +4468,8 @@  discard block
 block discarded – undo
4470 4468
  */
4471 4469
 function loadClasses(string $className = ''): void
4472 4470
 {
4473
-    require_once __DIR__. '/../includes/config/include.php';
4474
-    require_once __DIR__. '/../includes/config/settings.php';
4471
+    require_once __DIR__.'/../includes/config/include.php';
4472
+    require_once __DIR__.'/../includes/config/settings.php';
4475 4473
     require_once __DIR__.'/../vendor/autoload.php';
4476 4474
 
4477 4475
     if (defined('DB_PASSWD_CLEAR') === false) {
@@ -4684,7 +4682,7 @@  discard block
 block discarded – undo
4684 4682
 
4685 4683
     // Get current user hash
4686 4684
     $userHash = DB::queryFirstRow(
4687
-        "SELECT pw FROM " . prefixtable('users') . " WHERE id = %d;",
4685
+        "SELECT pw FROM ".prefixtable('users')." WHERE id = %d;",
4688 4686
         $session->get('user-id')
4689 4687
     )['pw'];
4690 4688
 
@@ -4732,11 +4730,11 @@  discard block
 block discarded – undo
4732 4730
         }
4733 4731
         
4734 4732
         // Alternative: serialize ou json selon le contexte
4735
-        return get_class($value) . (method_exists($value, 'getId') ? '#' . $value->getId() : '');
4733
+        return get_class($value).(method_exists($value, 'getId') ? '#'.$value->getId() : '');
4736 4734
     }
4737 4735
     
4738 4736
     if (is_resource($value)) {
4739
-        return 'Resource#' . get_resource_id($value) . ' of type ' . get_resource_type($value);
4737
+        return 'Resource#'.get_resource_id($value).' of type '.get_resource_type($value);
4740 4738
     }
4741 4739
     
4742 4740
     // Cas par défaut
@@ -4756,7 +4754,7 @@  discard block
 block discarded – undo
4756 4754
     // Refuse access if user does not exist and/or is admin
4757 4755
     $user = DB::queryFirstRow(
4758 4756
         'SELECT admin
4759
-        FROM ' . prefixTable('users') . '
4757
+        FROM ' . prefixTable('users').'
4760 4758
         WHERE id = %i',
4761 4759
         $userId
4762 4760
     );
@@ -4767,8 +4765,8 @@  discard block
 block discarded – undo
4767 4765
     // Get file info
4768 4766
     $file = DB::queryFirstRow(
4769 4767
         'SELECT f.id_item, i.id_tree
4770
-        FROM ' . prefixTable('files') . ' as f
4771
-        INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = f.id_item
4768
+        FROM ' . prefixTable('files').' as f
4769
+        INNER JOIN ' . prefixTable('items').' AS i ON i.id = f.id_item
4772 4770
         WHERE f.id = %i',
4773 4771
         $fileId
4774 4772
     );
@@ -4777,7 +4775,7 @@  discard block
 block discarded – undo
4777 4775
     }
4778 4776
 
4779 4777
     // Check if user has access to the item
4780
-    include_once __DIR__. '/items.queries.php';
4778
+    include_once __DIR__.'/items.queries.php';
4781 4779
     $itemAccess = getCurrentAccessRights(
4782 4780
         (int) filter_var($userId, FILTER_SANITIZE_NUMBER_INT),
4783 4781
         (int) filter_var($file['id_item'], FILTER_SANITIZE_NUMBER_INT),
@@ -4810,7 +4808,7 @@  discard block
 block discarded – undo
4810 4808
     // Refuse access if user does not exist and/or is not admin
4811 4809
     $user = DB::queryFirstRow(
4812 4810
         'SELECT admin
4813
-        FROM ' . prefixTable('users') . '
4811
+        FROM ' . prefixTable('users').'
4814 4812
         WHERE id = %i',
4815 4813
         $userId
4816 4814
     );
@@ -4821,7 +4819,7 @@  discard block
 block discarded – undo
4821 4819
     // Ensure that user has performed the backup
4822 4820
     DB::queryFirstRow(
4823 4821
         'SELECT f.id
4824
-        FROM ' . prefixTable('log_system') . ' as f
4822
+        FROM ' . prefixTable('log_system').' as f
4825 4823
         WHERE f.type = %s AND f.label = %s AND f.qui = %i AND f.field_1 = %s',
4826 4824
         'admin_action',
4827 4825
         'dataBase backup',
@@ -4848,7 +4846,7 @@  discard block
 block discarded – undo
4848 4846
     // Refuse access if user does not exist and/or is admin
4849 4847
     $user = DB::queryFirstRow(
4850 4848
         'SELECT admin
4851
-        FROM ' . prefixTable('users') . '
4849
+        FROM ' . prefixTable('users').'
4852 4850
         WHERE id = %i',
4853 4851
         $userId
4854 4852
     );
@@ -4859,7 +4857,7 @@  discard block
 block discarded – undo
4859 4857
     // Get item info
4860 4858
     $item = DB::queryFirstRow(
4861 4859
         'SELECT i.perso, i.id_tree
4862
-        FROM ' . prefixTable('items') . ' as i
4860
+        FROM ' . prefixTable('items').' as i
4863 4861
         WHERE i.id = %i',
4864 4862
         $itemId
4865 4863
     );
@@ -4870,7 +4868,7 @@  discard block
 block discarded – undo
4870 4868
     // Get item owner
4871 4869
     $itemOwner = DB::queryFirstRow(
4872 4870
         'SELECT li.id_user
4873
-        FROM ' . prefixTable('log_items') . ' as li
4871
+        FROM ' . prefixTable('log_items').' as li
4874 4872
         WHERE li.id_item = %i AND li.action = %s',
4875 4873
         $itemId,
4876 4874
         'at_creation'
@@ -4884,25 +4882,25 @@  discard block
 block discarded – undo
4884 4882
         prefixTable('sharekeys_items'),
4885 4883
         'object_id = %i AND user_id NOT IN %ls',
4886 4884
         $itemId,
4887
-        [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID]
4885
+        [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID]
4888 4886
     );
4889 4887
     DB::delete(
4890 4888
         prefixTable('sharekeys_files'),
4891 4889
         'object_id IN (SELECT id FROM '.prefixTable('files').' WHERE id_item = %i) AND user_id NOT IN %ls',
4892 4890
         $itemId,
4893
-        [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID]
4891
+        [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID]
4894 4892
     );
4895 4893
     DB::delete(
4896 4894
         prefixTable('sharekeys_fields'),
4897 4895
         'object_id IN (SELECT id FROM '.prefixTable('fields').' WHERE id_item = %i) AND user_id NOT IN %ls',
4898 4896
         $itemId,
4899
-        [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID]
4897
+        [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID]
4900 4898
     );
4901 4899
     DB::delete(
4902 4900
         prefixTable('sharekeys_logs'),
4903 4901
         'object_id IN (SELECT id FROM '.prefixTable('log_items').' WHERE id_item = %i) AND user_id NOT IN %ls',
4904 4902
         $itemId,
4905
-        [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID]
4903
+        [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID]
4906 4904
     );
4907 4905
 
4908 4906
     return true;
@@ -4974,7 +4972,7 @@  discard block
 block discarded – undo
4974 4972
     
4975 4973
     // 2. Check if user actually has personal items to migrate
4976 4974
     $personalFolderId = DB::queryFirstField(
4977
-        "SELECT id FROM ".prefixTable('nested_tree') ."
4975
+        "SELECT id FROM ".prefixTable('nested_tree')."
4978 4976
          WHERE personal_folder = 1 
4979 4977
          AND title = %s",
4980 4978
         $userId
@@ -5054,8 +5052,8 @@  discard block
 block discarded – undo
5054 5052
             'process_type' => 'migrate_user_personal_items',
5055 5053
             'arguments' => json_encode([
5056 5054
                 'user_id' => (int) $userId,
5057
-                'user_pwd' => cryption($passwordClear, '','encrypt')['string'],
5058
-                'user_private_key' => cryption($privateKeyDecrypted, '','encrypt')['string'],
5055
+                'user_pwd' => cryption($passwordClear, '', 'encrypt')['string'],
5056
+                'user_private_key' => cryption($privateKeyDecrypted, '', 'encrypt')['string'],
5059 5057
                 'personal_folders_ids' => $personalFolderIds,
5060 5058
             ]),
5061 5059
             'is_in_progress' => 0,
@@ -5084,19 +5082,19 @@  discard block
 block discarded – undo
5084 5082
 {
5085 5083
     // Prepare the subtask queries
5086 5084
     $queries = [
5087
-        'user-personal-items-migration-step10' => 'SELECT * FROM ' . prefixTable('items'),
5085
+        'user-personal-items-migration-step10' => 'SELECT * FROM '.prefixTable('items'),
5088 5086
 
5089
-        'user-personal-items-migration-step20' => 'SELECT * FROM ' . prefixTable('log_items') . 
5087
+        'user-personal-items-migration-step20' => 'SELECT * FROM '.prefixTable('log_items'). 
5090 5088
                     ' WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"',
5091 5089
 
5092
-        'user-personal-items-migration-step30' => 'SELECT * FROM ' . prefixTable('categories_items') . 
5090
+        'user-personal-items-migration-step30' => 'SELECT * FROM '.prefixTable('categories_items'). 
5093 5091
                     ' WHERE encryption_type = "teampass_aes"',
5094 5092
 
5095
-        'user-personal-items-migration-step40' => 'SELECT * FROM ' . prefixTable('suggestion'),
5093
+        'user-personal-items-migration-step40' => 'SELECT * FROM '.prefixTable('suggestion'),
5096 5094
 
5097
-        'user-personal-items-migration-step50' => 'SELECT * FROM ' . prefixTable('files') . ' AS f
5098
-                        INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = f.id_item
5099
-                        WHERE f.status = "' . TP_ENCRYPTION_NAME . '"'
5095
+        'user-personal-items-migration-step50' => 'SELECT * FROM '.prefixTable('files').' AS f
5096
+                        INNER JOIN ' . prefixTable('items').' AS i ON i.id = f.id_item
5097
+                        WHERE f.status = "' . TP_ENCRYPTION_NAME.'"'
5100 5098
     ];
5101 5099
 
5102 5100
     // Perform loop on $queries to create sub-tasks
Please login to merge, or discard this patch.
pages/backups.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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">
Please login to merge, or discard this patch.