Passed
Pull Request — master (#4551)
by Nils
06:28
created
sources/main.functions.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2226,7 +2226,7 @@
 block discarded – undo
2226 2226
  * <tt>exec("find ".$path." -type d -exec chmod 755 {} \;");</tt>
2227 2227
  *
2228 2228
  * @author Jeppe Toustrup (tenzer at tenzer dot dk)
2229
-  *
2229
+ *
2230 2230
  * @param string $path      An either relative or absolute path to a file or directory which should be processed.
2231 2231
  * @param int    $filePerm The permissions any found files should get.
2232 2232
  * @param int    $dirPerm  The permissions any found folder should get.
Please login to merge, or discard this patch.
Spacing   +150 added lines, -152 removed lines patch added patch discarded remove patch
@@ -134,19 +134,19 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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 .= '&#8594; ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
1671
+            $path .= '&#8594; '.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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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) {
@@ -2459,7 +2459,7 @@  discard block
 block discarded – undo
2459 2459
     $cipher->enableContinuousBuffer();
2460 2460
 
2461 2461
     // Encrypt the file content
2462
-    $filePath = filter_var($fileInPath . '/' . $fileInName, FILTER_SANITIZE_URL);
2462
+    $filePath = filter_var($fileInPath.'/'.$fileInName, FILTER_SANITIZE_URL);
2463 2463
     $fileContent = file_get_contents($filePath);
2464 2464
     $plaintext = $fileContent;
2465 2465
     $ciphertext = $cipher->encrypt($plaintext);
@@ -2467,9 +2467,9 @@  discard block
 block discarded – undo
2467 2467
     // Save new file
2468 2468
     // deepcode ignore InsecureHash: is simply used to get a unique name
2469 2469
     $hash = uniqid('', true);
2470
-    $fileOut = $fileInPath . '/' . TP_FILE_PREFIX . $hash;
2470
+    $fileOut = $fileInPath.'/'.TP_FILE_PREFIX.$hash;
2471 2471
     file_put_contents($fileOut, $ciphertext);
2472
-    unlink($fileInPath . '/' . $fileInName);
2472
+    unlink($fileInPath.'/'.$fileInName);
2473 2473
     return [
2474 2474
         'fileHash' => base64_encode($hash),
2475 2475
         'objectKey' => base64_encode($objectKey),
@@ -2485,9 +2485,9 @@  discard block
 block discarded – undo
2485 2485
  *
2486 2486
  * @return string|array
2487 2487
  */
2488
-function decryptFile(string $fileName, string $filePath, string $key): string|array
2488
+function decryptFile(string $fileName, string $filePath, string $key): string | array
2489 2489
 {
2490
-    if (! defined('FILE_BUFFER_SIZE')) {
2490
+    if (!defined('FILE_BUFFER_SIZE')) {
2491 2491
         define('FILE_BUFFER_SIZE', 128 * 1024);
2492 2492
     }
2493 2493
     
@@ -2504,7 +2504,7 @@  discard block
 block discarded – undo
2504 2504
     $cipher->enableContinuousBuffer();
2505 2505
     $cipher->disablePadding();
2506 2506
     // Get file content
2507
-    $safeFilePath = realpath($filePath . '/' . TP_FILE_PREFIX . $safeFileName);
2507
+    $safeFilePath = realpath($filePath.'/'.TP_FILE_PREFIX.$safeFileName);
2508 2508
     if ($safeFilePath !== false && file_exists($safeFilePath)) {
2509 2509
         $ciphertext = file_get_contents(filter_var($safeFilePath, FILTER_SANITIZE_URL));
2510 2510
     } else {
@@ -2600,7 +2600,7 @@  discard block
 block discarded – undo
2600 2600
         // Only create the sharekey for a user
2601 2601
         $user = DB::queryFirstRow(
2602 2602
             'SELECT public_key
2603
-            FROM ' . prefixTable('users') . '
2603
+            FROM ' . prefixTable('users').'
2604 2604
             WHERE id = %i
2605 2605
             AND public_key != ""',
2606 2606
             $userId
@@ -2641,7 +2641,7 @@  discard block
 block discarded – undo
2641 2641
         }
2642 2642
         $users = DB::query(
2643 2643
             'SELECT id, public_key
2644
-            FROM ' . prefixTable('users') . '
2644
+            FROM ' . prefixTable('users').'
2645 2645
             WHERE id NOT IN %li
2646 2646
             AND public_key != ""',
2647 2647
             $user_ids
@@ -2650,7 +2650,7 @@  discard block
 block discarded – undo
2650 2650
         foreach ($users as $user) {
2651 2651
             // Insert in DB the new object key for this item by user
2652 2652
             if (count($objectKeyArray) === 0) {
2653
-                if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case1 - ' . $object_name . ' - ' . $post_object_id . ' - ' . $user['id'] . ' - ' . $objectKey);
2653
+                if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case1 - '.$object_name.' - '.$post_object_id.' - '.$user['id'].' - '.$objectKey);
2654 2654
                 DB::insert(
2655 2655
                     $object_name,
2656 2656
                     [
@@ -2664,7 +2664,7 @@  discard block
 block discarded – undo
2664 2664
                 );
2665 2665
             } else {
2666 2666
                 foreach ($objectKeyArray as $object) {
2667
-                    if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case2 - ' . $object_name . ' - ' . $object['objectId'] . ' - ' . $user['id'] . ' - ' . $object['objectKey']);
2667
+                    if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case2 - '.$object_name.' - '.$object['objectId'].' - '.$user['id'].' - '.$object['objectKey']);
2668 2668
                     DB::insert(
2669 2669
                         $object_name,
2670 2670
                         [
@@ -2692,7 +2692,7 @@  discard block
 block discarded – undo
2692 2692
 function isBase64(string $str): bool
2693 2693
 {
2694 2694
     $str = (string) trim($str);
2695
-    if (! isset($str[0])) {
2695
+    if (!isset($str[0])) {
2696 2696
         return false;
2697 2697
     }
2698 2698
 
@@ -2766,7 +2766,7 @@  discard block
 block discarded – undo
2766 2766
     } catch (\LdapRecord\Auth\BindException $e) {
2767 2767
         $error = $e->getDetailedError();
2768 2768
         if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) {
2769
-            error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage());
2769
+            error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage());
2770 2770
         }
2771 2771
         // deepcode ignore ServerLeak: No important data is sent
2772 2772
         echo 'An error occurred.';
@@ -2783,7 +2783,7 @@  discard block
 block discarded – undo
2783 2783
     } catch (\LdapRecord\Auth\BindException $e) {
2784 2784
         $error = $e->getDetailedError();
2785 2785
         if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) {
2786
-            error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage());
2786
+            error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage());
2787 2787
         }
2788 2788
         // deepcode ignore ServerLeak: No important data is sent
2789 2789
         echo 'An error occurred.';
@@ -2810,7 +2810,7 @@  discard block
 block discarded – undo
2810 2810
     // expect if personal item
2811 2811
     DB::delete(
2812 2812
         prefixTable('sharekeys_items'),
2813
-        'user_id = %i AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)',
2813
+        'user_id = %i AND object_id NOT IN (SELECT i.id FROM '.prefixTable('items').' AS i WHERE i.perso = 1)',
2814 2814
         $userId
2815 2815
     );
2816 2816
     // Remove all item sharekeys files
@@ -2818,8 +2818,8 @@  discard block
 block discarded – undo
2818 2818
         prefixTable('sharekeys_files'),
2819 2819
         'user_id = %i AND object_id NOT IN (
2820 2820
             SELECT f.id 
2821
-            FROM ' . prefixTable('items') . ' AS i 
2822
-            INNER JOIN ' . prefixTable('files') . ' AS f ON f.id_item = i.id
2821
+            FROM ' . prefixTable('items').' AS i 
2822
+            INNER JOIN ' . prefixTable('files').' AS f ON f.id_item = i.id
2823 2823
             WHERE i.perso = 1
2824 2824
         )',
2825 2825
         $userId
@@ -2829,8 +2829,8 @@  discard block
 block discarded – undo
2829 2829
         prefixTable('sharekeys_fields'),
2830 2830
         'user_id = %i AND object_id NOT IN (
2831 2831
             SELECT c.id 
2832
-            FROM ' . prefixTable('items') . ' AS i 
2833
-            INNER JOIN ' . prefixTable('categories_items') . ' AS c ON c.item_id = i.id
2832
+            FROM ' . prefixTable('items').' AS i 
2833
+            INNER JOIN ' . prefixTable('categories_items').' AS c ON c.item_id = i.id
2834 2834
             WHERE i.perso = 1
2835 2835
         )',
2836 2836
         $userId
@@ -2838,13 +2838,13 @@  discard block
 block discarded – undo
2838 2838
     // Remove all item sharekeys logs
2839 2839
     DB::delete(
2840 2840
         prefixTable('sharekeys_logs'),
2841
-        'user_id = %i AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)',
2841
+        'user_id = %i AND object_id NOT IN (SELECT i.id FROM '.prefixTable('items').' AS i WHERE i.perso = 1)',
2842 2842
         $userId
2843 2843
     );
2844 2844
     // Remove all item sharekeys suggestions
2845 2845
     DB::delete(
2846 2846
         prefixTable('sharekeys_suggestions'),
2847
-        'user_id = %i AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)',
2847
+        'user_id = %i AND object_id NOT IN (SELECT i.id FROM '.prefixTable('items').' AS i WHERE i.perso = 1)',
2848 2848
         $userId
2849 2849
     );
2850 2850
     return false;
@@ -2865,7 +2865,7 @@  discard block
 block discarded – undo
2865 2865
         foreach (DateTimeZone::listIdentifiers() as $timezone) {
2866 2866
             $now->setTimezone(new DateTimeZone($timezone));
2867 2867
             $offsets[] = $offset = $now->getOffset();
2868
-            $timezones[$timezone] = '(' . format_GMT_offset($offset) . ') ' . format_timezone_name($timezone);
2868
+            $timezones[$timezone] = '('.format_GMT_offset($offset).') '.format_timezone_name($timezone);
2869 2869
         }
2870 2870
 
2871 2871
         array_multisort($offsets, $timezones);
@@ -2885,7 +2885,7 @@  discard block
 block discarded – undo
2885 2885
 {
2886 2886
     $hours = intval($offset / 3600);
2887 2887
     $minutes = abs(intval($offset % 3600 / 60));
2888
-    return 'GMT' . ($offset ? sprintf('%+03d:%02d', $hours, $minutes) : '');
2888
+    return 'GMT'.($offset ? sprintf('%+03d:%02d', $hours, $minutes) : '');
2889 2889
 }
2890 2890
 
2891 2891
 /**
@@ -2985,8 +2985,7 @@  discard block
 block discarded – undo
2985 2985
 {
2986 2986
     if (isset($array[$key]) === true
2987 2987
         && (is_int($value) === true ?
2988
-            (int) $array[$key] === $value :
2989
-            (string) $array[$key] === $value)
2988
+            (int) $array[$key] === $value : (string) $array[$key] === $value)
2990 2989
     ) {
2991 2990
         return true;
2992 2991
     }
@@ -3008,8 +3007,7 @@  discard block
 block discarded – undo
3008 3007
 {
3009 3008
     if (isset($var) === false
3010 3009
         || (is_int($value) === true ?
3011
-            (int) $var === $value :
3012
-            (string) $var === $value)
3010
+            (int) $var === $value : (string) $var === $value)
3013 3011
     ) {
3014 3012
         return true;
3015 3013
     }
@@ -3060,7 +3058,7 @@  discard block
 block discarded – undo
3060 3058
  */
3061 3059
 function isSetArrayOfValues(array $arrayOfValues): bool
3062 3060
 {
3063
-    foreach($arrayOfValues as $value) {
3061
+    foreach ($arrayOfValues as $value) {
3064 3062
         if (isset($value) === false) {
3065 3063
             return false;
3066 3064
         }
@@ -3082,7 +3080,7 @@  discard block
 block discarded – undo
3082 3080
     /*PHP8 - integer|string*/$value
3083 3081
 ) : bool
3084 3082
 {
3085
-    foreach($arrayOfVars as $variable) {
3083
+    foreach ($arrayOfVars as $variable) {
3086 3084
         if ($variable !== $value) {
3087 3085
             return false;
3088 3086
         }
@@ -3102,7 +3100,7 @@  discard block
 block discarded – undo
3102 3100
     /*PHP8 - integer|string*/$value
3103 3101
 ) : bool
3104 3102
 {
3105
-    foreach($arrayOfVars as $variable) {
3103
+    foreach ($arrayOfVars as $variable) {
3106 3104
         if ($variable === $value) {
3107 3105
             return true;
3108 3106
         }
@@ -3171,7 +3169,7 @@  discard block
 block discarded – undo
3171 3169
  * @param array     $filters
3172 3170
  * @return array|string
3173 3171
  */
3174
-function dataSanitizer(array $data, array $filters): array|string
3172
+function dataSanitizer(array $data, array $filters): array | string
3175 3173
 {
3176 3174
     // Load Sanitizer library
3177 3175
     $sanitizer = new Sanitizer($data, $filters);
@@ -3200,7 +3198,7 @@  discard block
 block discarded – undo
3200 3198
     // Exists ?
3201 3199
     $userCacheId = DB::queryfirstrow(
3202 3200
         'SELECT increment_id
3203
-        FROM ' . prefixTable('cache_tree') . '
3201
+        FROM ' . prefixTable('cache_tree').'
3204 3202
         WHERE user_id = %i',
3205 3203
         $user_id
3206 3204
     );
@@ -3251,7 +3249,7 @@  discard block
 block discarded – undo
3251 3249
  */
3252 3250
 function pourcentage(float $nombre, float $total, float $pourcentage): float
3253 3251
 { 
3254
-    $resultat = ($nombre/$total) * $pourcentage;
3252
+    $resultat = ($nombre / $total) * $pourcentage;
3255 3253
     return round($resultat);
3256 3254
 }
3257 3255
 
@@ -3281,7 +3279,7 @@  discard block
 block discarded – undo
3281 3279
 
3282 3280
     // Get last folder update
3283 3281
     $lastFolderChange = DB::queryfirstrow(
3284
-        'SELECT valeur FROM ' . prefixTable('misc') . '
3282
+        'SELECT valeur FROM '.prefixTable('misc').'
3285 3283
         WHERE type = %s AND intitule = %s',
3286 3284
         'timestamp',
3287 3285
         'last_folder_change'
@@ -3312,7 +3310,7 @@  discard block
 block discarded – undo
3312 3310
     // Does this user has a tree cache
3313 3311
     $userCacheTree = DB::queryfirstrow(
3314 3312
         'SELECT '.$fieldName.'
3315
-        FROM ' . prefixTable('cache_tree') . '
3313
+        FROM ' . prefixTable('cache_tree').'
3316 3314
         WHERE user_id = %i',
3317 3315
         $session->get('user-id')
3318 3316
     );
@@ -3355,7 +3353,7 @@  discard block
 block discarded – undo
3355 3353
     if (count($folderIds) === 0) {
3356 3354
         $folderIds = DB::queryFirstColumn(
3357 3355
             'SELECT id
3358
-            FROM ' . prefixTable('nested_tree') . '
3356
+            FROM ' . prefixTable('nested_tree').'
3359 3357
             WHERE personal_folder=%i',
3360 3358
             0
3361 3359
         );
@@ -3372,8 +3370,8 @@  discard block
 block discarded – undo
3372 3370
         $rows_tmp = DB::query(
3373 3371
             'SELECT c.id, c.title, c.level, c.type, c.masked, c.order, c.encrypted_data, c.role_visibility, c.is_mandatory,
3374 3372
             f.id_category AS category_id
3375
-            FROM ' . prefixTable('categories_folders') . ' AS f
3376
-            INNER JOIN ' . prefixTable('categories') . ' AS c ON (f.id_category = c.parent_id)
3373
+            FROM ' . prefixTable('categories_folders').' AS f
3374
+            INNER JOIN ' . prefixTable('categories').' AS c ON (f.id_category = c.parent_id)
3377 3375
             WHERE id_folder=%i',
3378 3376
             $folder
3379 3377
         );
@@ -3399,7 +3397,7 @@  discard block
 block discarded – undo
3399 3397
         $valTemp = '';
3400 3398
         $data = DB::queryFirstRow(
3401 3399
             'SELECT valeur
3402
-            FROM ' . prefixTable('misc') . '
3400
+            FROM ' . prefixTable('misc').'
3403 3401
             WHERE type = %s AND intitule=%i',
3404 3402
             'complex',
3405 3403
             $folder
@@ -3416,14 +3414,14 @@  discard block
 block discarded – undo
3416 3414
         $valTemp = '';
3417 3415
         $rows_tmp = DB::query(
3418 3416
             'SELECT t.title
3419
-            FROM ' . prefixTable('roles_values') . ' as v
3420
-            INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id)
3417
+            FROM ' . prefixTable('roles_values').' as v
3418
+            INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id)
3421 3419
             WHERE v.folder_id = %i
3422 3420
             GROUP BY title',
3423 3421
             $folder
3424 3422
         );
3425 3423
         foreach ($rows_tmp as $record) {
3426
-            $valTemp .= (empty($valTemp) === true ? '' : ' - ') . $record['title'];
3424
+            $valTemp .= (empty($valTemp) === true ? '' : ' - ').$record['title'];
3427 3425
         }
3428 3426
         $arr_data['visibilityRoles'] = $valTemp;
3429 3427
 
@@ -3456,7 +3454,7 @@  discard block
 block discarded – undo
3456 3454
         // loop on users and check if user has this role
3457 3455
         $rows = DB::query(
3458 3456
             'SELECT id, fonction_id
3459
-            FROM ' . prefixTable('users') . '
3457
+            FROM ' . prefixTable('users').'
3460 3458
             WHERE id != %i AND admin = 0 AND fonction_id IS NOT NULL AND fonction_id != ""',
3461 3459
             $session->get('user-id')
3462 3460
         );
@@ -3488,7 +3486,7 @@  discard block
 block discarded – undo
3488 3486
 
3489 3487
     $val = DB::queryfirstrow(
3490 3488
         'SELECT *
3491
-        FROM ' . prefixTable('users') . '
3489
+        FROM ' . prefixTable('users').'
3492 3490
         WHERE id = %i',
3493 3491
         $userId
3494 3492
     );
@@ -3504,12 +3502,12 @@  discard block
 block discarded – undo
3504 3502
 function upgradeRequired(): bool
3505 3503
 {
3506 3504
     // Get settings.php
3507
-    include_once __DIR__. '/../includes/config/settings.php';
3505
+    include_once __DIR__.'/../includes/config/settings.php';
3508 3506
 
3509 3507
     // Get timestamp in DB
3510 3508
     $val = DB::queryfirstrow(
3511 3509
         'SELECT valeur
3512
-        FROM ' . prefixTable('misc') . '
3510
+        FROM ' . prefixTable('misc').'
3513 3511
         WHERE type = %s AND intitule = %s',
3514 3512
         'admin',
3515 3513
         'upgrade_timestamp'
@@ -3639,7 +3637,7 @@  discard block
 block discarded – undo
3639 3637
         return $decrypted === $random_str;
3640 3638
     } catch (Exception $e) {
3641 3639
         if (defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) {
3642
-            error_log('ERROR: ' . $e->getMessage());
3640
+            error_log('ERROR: '.$e->getMessage());
3643 3641
         }
3644 3642
         return false;
3645 3643
     }
@@ -3738,7 +3736,7 @@  discard block
 block discarded – undo
3738 3736
     $lang = new Language($session->get('user-language') ?? 'english');
3739 3737
     $userTP = DB::queryFirstRow(
3740 3738
         'SELECT pw, public_key, private_key
3741
-        FROM ' . prefixTable('users') . '
3739
+        FROM ' . prefixTable('users').'
3742 3740
         WHERE id = %i',
3743 3741
         TP_USER_ID
3744 3742
     );
@@ -4026,7 +4024,7 @@  discard block
 block discarded – undo
4026 4024
  */
4027 4025
 function createTaskForItem(
4028 4026
     string $processType,
4029
-    string|array $taskName,
4027
+    string | array $taskName,
4030 4028
     int $itemId,
4031 4029
     int $userId,
4032 4030
     string $objectKey,
@@ -4050,7 +4048,7 @@  discard block
 block discarded – undo
4050 4048
                 'object_key' => $objectKey,
4051 4049
                 'author' => (int) $userId,
4052 4050
             ]),
4053
-            'item_id' => (int) $parentId !== -1 ?  $parentId : null,
4051
+            'item_id' => (int) $parentId !== -1 ? $parentId : null,
4054 4052
         )
4055 4053
     );
4056 4054
     $processId = DB::insertId();
@@ -4060,7 +4058,7 @@  discard block
 block discarded – undo
4060 4058
     if (is_array($taskName) === false) {
4061 4059
         $taskName = [$taskName];
4062 4060
     }
4063
-    foreach($taskName as $task) {
4061
+    foreach ($taskName as $task) {
4064 4062
         if (WIP === true) error_log('createTaskForItem - task: '.$task);
4065 4063
         switch ($task) {
4066 4064
             case 'item_password':
@@ -4157,7 +4155,7 @@  discard block
 block discarded – undo
4157 4155
  * @param integer $user_id
4158 4156
  * @return void
4159 4157
  */
4160
-function purgeUnnecessaryKeys(bool $allUsers = true, int $user_id=0)
4158
+function purgeUnnecessaryKeys(bool $allUsers = true, int $user_id = 0)
4161 4159
 {
4162 4160
     if ($allUsers === true) {
4163 4161
         // Load class DB
@@ -4167,7 +4165,7 @@  discard block
 block discarded – undo
4167 4165
 
4168 4166
         $users = DB::query(
4169 4167
             'SELECT id
4170
-            FROM ' . prefixTable('users') . '
4168
+            FROM ' . prefixTable('users').'
4171 4169
             WHERE id NOT IN ('.OTV_USER_ID.', '.TP_USER_ID.', '.SSH_USER_ID.', '.API_USER_ID.')
4172 4170
             ORDER BY login ASC'
4173 4171
         );
@@ -4185,7 +4183,7 @@  discard block
 block discarded – undo
4185 4183
  * @param integer $user_id
4186 4184
  * @return void
4187 4185
  */
4188
-function purgeUnnecessaryKeysForUser(int $user_id=0)
4186
+function purgeUnnecessaryKeysForUser(int $user_id = 0)
4189 4187
 {
4190 4188
     if ($user_id === 0) {
4191 4189
         return;
@@ -4196,8 +4194,8 @@  discard block
 block discarded – undo
4196 4194
 
4197 4195
     $personalItems = DB::queryFirstColumn(
4198 4196
         'SELECT id
4199
-        FROM ' . prefixTable('items') . ' AS i
4200
-        INNER JOIN ' . prefixTable('log_items') . ' AS li ON li.id_item = i.id
4197
+        FROM ' . prefixTable('items').' AS i
4198
+        INNER JOIN ' . prefixTable('log_items').' AS li ON li.id_item = i.id
4201 4199
         WHERE i.perso = 1 AND li.action = "at_creation" AND li.id_user IN (%i, '.TP_USER_ID.')',
4202 4200
         $user_id
4203 4201
     );
@@ -4246,7 +4244,7 @@  discard block
 block discarded – undo
4246 4244
     // Check if user exists
4247 4245
     $userInfo = DB::queryFirstRow(
4248 4246
         'SELECT login
4249
-        FROM ' . prefixTable('users') . '
4247
+        FROM ' . prefixTable('users').'
4250 4248
         WHERE id = %i',
4251 4249
         $userId
4252 4250
     );
@@ -4255,7 +4253,7 @@  discard block
 block discarded – undo
4255 4253
         $now = (int) time();
4256 4254
         // Prepare file content
4257 4255
         $export_value = file_get_contents(__DIR__."/../includes/core/teampass_ascii.txt")."\n".
4258
-            "Generation date: ".date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $now)."\n\n".
4256
+            "Generation date: ".date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $now)."\n\n".
4259 4257
             "RECOVERY KEYS - Not to be shared - To be store safely\n\n".
4260 4258
             "Public Key:\n".$session->get('user-public_key')."\n\n".
4261 4259
             "Private Key:\n".$session->get('user-private_key')."\n\n";
@@ -4278,7 +4276,7 @@  discard block
 block discarded – undo
4278 4276
         return prepareExchangedData(
4279 4277
             array(
4280 4278
                 'error' => false,
4281
-                'datetime' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $now),
4279
+                'datetime' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $now),
4282 4280
                 'timestamp' => $now,
4283 4281
                 'content' => base64_encode($export_value),
4284 4282
                 'login' => $userInfo['login'],
@@ -4304,8 +4302,8 @@  discard block
 block discarded – undo
4304 4302
  */
4305 4303
 function loadClasses(string $className = ''): void
4306 4304
 {
4307
-    require_once __DIR__. '/../includes/config/include.php';
4308
-    require_once __DIR__. '/../includes/config/settings.php';
4305
+    require_once __DIR__.'/../includes/config/include.php';
4306
+    require_once __DIR__.'/../includes/config/settings.php';
4309 4307
     require_once __DIR__.'/../vendor/autoload.php';
4310 4308
 
4311 4309
     if (defined('DB_PASSWD_CLEAR') === false) {
@@ -4516,7 +4514,7 @@  discard block
 block discarded – undo
4516 4514
 
4517 4515
     // Get current user hash
4518 4516
     $userHash = DB::queryFirstRow(
4519
-        "SELECT pw FROM " . prefixtable('users') . " WHERE id = %d;",
4517
+        "SELECT pw FROM ".prefixtable('users')." WHERE id = %d;",
4520 4518
         $session->get('user-id')
4521 4519
     )['pw'];
4522 4520
 
Please login to merge, or discard this patch.
sources/upload.attachments.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
 ) {
75 75
     // Not allowed page
76 76
     $session->set('system-error_code', ERR_NOT_ALLOWED);
77
-    include $SETTINGS['cpassman_dir'] . '/error.php';
77
+    include $SETTINGS['cpassman_dir'].'/error.php';
78 78
     exit;
79 79
 }
80 80
 
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
 $post_isNewItem = $request->request->filter('isNewItem', null, FILTER_SANITIZE_NUMBER_INT);
110 110
 $post_randomId = $request->request->filter('randomId', null, FILTER_SANITIZE_NUMBER_INT);
111 111
 $post_isPersonal = $request->request->filter('isPersonal', null, FILTER_SANITIZE_NUMBER_INT);
112
-$post_fileSize= $request->request->filter('file_size', null, FILTER_SANITIZE_NUMBER_INT);
112
+$post_fileSize = $request->request->filter('file_size', null, FILTER_SANITIZE_NUMBER_INT);
113 113
 $chunk = $request->request->filter('chunk', 0, FILTER_SANITIZE_NUMBER_INT);
114 114
 $chunks = $request->request->filter('chunks', 0, FILTER_SANITIZE_NUMBER_INT);
115 115
 $fileName = $request->request->filter('name', '', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
@@ -125,10 +125,10 @@  discard block
 block discarded – undo
125 125
     $unit = strtoupper(substr(trim($POST_MAX_SIZE), -1)); // Assurez-vous de bien gérer les espaces éventuels
126 126
     $units = ['G' => 1073741824, 'M' => 1048576, 'K' => 1024];
127 127
     $multiplier = $units[$unit] ?? 1; // Vérifie si l'unité est dans le tableau, sinon 1
128
-    $maxSize = (int)$POST_MAX_SIZE * $multiplier;
128
+    $maxSize = (int) $POST_MAX_SIZE * $multiplier;
129 129
     
130 130
     // CHeck if the POST is too big
131
-    if (!empty($_SERVER['CONTENT_LENGTH']) && (int)$_SERVER['CONTENT_LENGTH'] > $maxSize && $maxSize > 0) {
131
+    if (!empty($_SERVER['CONTENT_LENGTH']) && (int) $_SERVER['CONTENT_LENGTH'] > $maxSize && $maxSize > 0) {
132 132
         $errorResponse = handleAttachmentError('POST exceeded maximum allowed size.', 111, 413);
133 133
         echo $errorResponse;
134 134
         return;
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
         return;
142 142
     }
143 143
     if (DEBUG === true) {
144
-        error_log('TEAMPASS DEBUG : POST_MAX_SIZE: ' . $POST_MAX_SIZE." - CONTENT_LENGTH: ".$_SERVER['CONTENT_LENGTH']." - UNIT: ".$unit." - MAX: ".$maxSize." - MULTIPLIER: ".$multiplier." - FILE_SIZE: ".$post_fileSize);
144
+        error_log('TEAMPASS DEBUG : POST_MAX_SIZE: '.$POST_MAX_SIZE." - CONTENT_LENGTH: ".$_SERVER['CONTENT_LENGTH']." - UNIT: ".$unit." - MAX: ".$maxSize." - MULTIPLIER: ".$multiplier." - FILE_SIZE: ".$post_fileSize);
145 145
     }
146 146
     
147 147
     // delete expired tokens
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
         // check if token is expired
195 195
         $data = DB::queryFirstRow(
196 196
             'SELECT end_timestamp
197
-            FROM ' . prefixTable('tokens') . '
197
+            FROM ' . prefixTable('tokens').'
198 198
             WHERE user_id = %i AND token = %s',
199 199
             $session->get('user-id'),
200 200
             $post_user_token
@@ -228,7 +228,7 @@  discard block
 block discarded – undo
228 228
 
229 229
 // HTTP headers for no cache etc
230 230
 header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
231
-header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
231
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
232 232
 header('Cache-Control: no-store, no-cache, must-revalidate');
233 233
 header('Cache-Control: post-check=0, pre-check=0', false);
234 234
 
@@ -258,7 +258,7 @@  discard block
 block discarded – undo
258 258
 
259 259
 // Validate the upload
260 260
 if (!isset($_FILES['file'])) {
261
-    $errorResponse =  handleAttachmentError('No upload found in $_FILES for Filedata', 121);
261
+    $errorResponse = handleAttachmentError('No upload found in $_FILES for Filedata', 121);
262 262
     echo $errorResponse;
263 263
     return;
264 264
 } elseif (isset($_FILES['file']['error']) && $_FILES['file']['error'] != 0) {
@@ -278,7 +278,7 @@  discard block
 block discarded – undo
278 278
 // Validate file name (for our purposes we'll just remove invalid characters)
279 279
 $file_name = preg_replace('[^A-Za-z0-9]', '', strtolower(basename($_FILES['file']['name'])));
280 280
 if (strlen($file_name) == 0 || strlen($file_name) > $MAX_FILENAME_LENGTH) {
281
-    $errorResponse = handleAttachmentError('Invalid file name: ' . $file_name . '.', 114);
281
+    $errorResponse = handleAttachmentError('Invalid file name: '.$file_name.'.', 114);
282 282
     echo $errorResponse;
283 283
     return;
284 284
 }
@@ -290,8 +290,8 @@  discard block
 block discarded – undo
290 290
         $ext,
291 291
         explode(
292 292
             ',',
293
-            $SETTINGS['upload_docext'] . ',' . $SETTINGS['upload_imagesext'] .
294
-                ',' . $SETTINGS['upload_pkgext'] . ',' . $SETTINGS['upload_otherext']
293
+            $SETTINGS['upload_docext'].','.$SETTINGS['upload_imagesext'].
294
+                ','.$SETTINGS['upload_pkgext'].','.$SETTINGS['upload_otherext']
295 295
         )
296 296
     ) === false
297 297
 ) {
@@ -305,24 +305,24 @@  discard block
 block discarded – undo
305 305
 
306 306
 // Clean the fileName for security reasons
307 307
 $fileInfo = pathinfo($fileName);
308
-$fileName = base64_encode($fileInfo['filename']) . '.' . $fileInfo['extension'];
308
+$fileName = base64_encode($fileInfo['filename']).'.'.$fileInfo['extension'];
309 309
 $fileFullSize = 0;
310 310
 
311 311
 // Make sure the fileName is unique but only if chunking is disabled
312
-if ($chunks < 2 && file_exists($targetDir . DIRECTORY_SEPARATOR . $fileName)) {
312
+if ($chunks < 2 && file_exists($targetDir.DIRECTORY_SEPARATOR.$fileName)) {
313 313
     $ext = strrpos($fileName, '.');
314 314
     $fileNameA = substr($fileName, 0, $ext);
315 315
     $fileNameB = substr($fileName, $ext);
316 316
 
317 317
     $count = 1;
318
-    while (file_exists($targetDir . DIRECTORY_SEPARATOR . $fileNameA . '_' . $count . $fileNameB)) {
318
+    while (file_exists($targetDir.DIRECTORY_SEPARATOR.$fileNameA.'_'.$count.$fileNameB)) {
319 319
         ++$count;
320 320
     }
321 321
 
322
-    $fileName = $fileNameA . '_' . $count . $fileNameB;
322
+    $fileName = $fileNameA.'_'.$count.$fileNameB;
323 323
 }
324 324
 
325
-$filePath = $targetDir . DIRECTORY_SEPARATOR . $fileName;
325
+$filePath = $targetDir.DIRECTORY_SEPARATOR.$fileName;
326 326
 
327 327
 // Create target dir
328 328
 if (file_exists($targetDir) === false) {
@@ -336,7 +336,7 @@  discard block
 block discarded – undo
336 336
 // Remove old temp files
337 337
 if ($cleanupTargetDir && is_dir($targetDir) && ($dir = opendir($targetDir))) {
338 338
     while (($file = readdir($dir)) !== false) {
339
-        $tmpfilePath = $targetDir . DIRECTORY_SEPARATOR . $file;
339
+        $tmpfilePath = $targetDir.DIRECTORY_SEPARATOR.$file;
340 340
 
341 341
         // Remove temp file if it is older than the max age and is not the current file
342 342
         if (
@@ -458,8 +458,8 @@  discard block
 block discarded – undo
458 458
         // This is a public object
459 459
         $users = DB::query(
460 460
             'SELECT id, public_key
461
-            FROM ' . prefixTable('users') . '
462
-            WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '")
461
+            FROM ' . prefixTable('users').'
462
+            WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'")
463 463
             AND public_key != ""'
464 464
         );
465 465
         foreach ($users as $user) {
@@ -497,14 +497,14 @@  discard block
 block discarded – undo
497 497
                 'date' => time(),
498 498
                 'id_user' => $session->get('user-id'),
499 499
                 'action' => 'at_modification',
500
-                'raison' => 'at_add_file : ' . $fileName . ':' . $newID,
500
+                'raison' => 'at_add_file : '.$fileName.':'.$newID,
501 501
             )
502 502
         );
503 503
     }
504 504
 }
505 505
 
506 506
 // Return JSON-RPC response
507
-die('{"jsonrpc" : "2.0", "result" : null, "id" : "' . $newID . '"}');
507
+die('{"jsonrpc" : "2.0", "result" : null, "id" : "'.$newID.'"}');
508 508
 
509 509
 /**
510 510
  * Handle errors and kill script.
Please login to merge, or discard this patch.
sources/items.queries.php 1 patch
Spacing   +280 added lines, -281 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 ) {
80 80
     // Not allowed page
81 81
     $session->set('system-error_code', ERR_NOT_ALLOWED);
82
-    include $SETTINGS['cpassman_dir'] . '/error.php';
82
+    include $SETTINGS['cpassman_dir'].'/error.php';
83 83
     exit;
84 84
 }
85 85
 
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
     date_default_timezone_set('UTC');
105 105
 }
106 106
 
107
-require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $session->get('user-language') . '.php';
107
+require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$session->get('user-language').'.php';
108 108
 header('Content-type: text/html; charset=utf-8');
109 109
 header('Cache-Control: no-cache, must-revalidate');
110 110
 
@@ -364,7 +364,7 @@  discard block
 block discarded – undo
364 364
             // About special settings
365 365
             $dataFolderSettings = DB::queryFirstRow(
366 366
                 'SELECT bloquer_creation, bloquer_modification, personal_folder
367
-                FROM ' . prefixTable('nested_tree') . ' 
367
+                FROM ' . prefixTable('nested_tree').' 
368 368
                 WHERE id = %i',
369 369
                 $inputData['folderId']
370 370
             );
@@ -381,7 +381,7 @@  discard block
 block discarded – undo
381 381
             // Get folder complexity
382 382
             $folderComplexity = DB::queryfirstrow(
383 383
                 'SELECT valeur
384
-                FROM ' . prefixTable('misc') . '
384
+                FROM ' . prefixTable('misc').'
385 385
                 WHERE type = %s AND intitule = %i',
386 386
                 'complex',
387 387
                 $inputData['folderId']
@@ -406,7 +406,7 @@  discard block
 block discarded – undo
406 406
             $itemExists = 0;
407 407
             $newID = '';
408 408
             $data = DB::queryfirstrow(
409
-                'SELECT * FROM ' . prefixTable('items') . '
409
+                'SELECT * FROM '.prefixTable('items').'
410 410
                 WHERE label = %s AND inactif = %i',
411 411
                 $inputData['label'],
412 412
                 0
@@ -489,8 +489,8 @@  discard block
 block discarded – undo
489 489
                     (int) $post_folder_is_personal,
490 490
                     (int) $newID,
491 491
                     $cryptedStuff['objectKey'],
492
-                    true,   // only for the item creator
493
-                    false,  // no delete all
492
+                    true, // only for the item creator
493
+                    false, // no delete all
494 494
                 );
495 495
 
496 496
                 // update fields
@@ -503,7 +503,7 @@  discard block
 block discarded – undo
503 503
                             // should we encrypt the data
504 504
                             $dataTmp = DB::queryFirstRow(
505 505
                                 'SELECT encrypted_data
506
-                                FROM ' . prefixTable('categories') . '
506
+                                FROM ' . prefixTable('categories').'
507 507
                                 WHERE id = %i',
508 508
                                 $field['id']
509 509
                             );
@@ -532,8 +532,8 @@  discard block
 block discarded – undo
532 532
                                     (int) $post_folder_is_personal,
533 533
                                     (int) $newObjectId,
534 534
                                     $cryptedStuff['objectKey'],
535
-                                    true,   // only for the item creator
536
-                                    false,  // no delete all
535
+                                    true, // only for the item creator
536
+                                    false, // no delete all
537 537
                                 );
538 538
 
539 539
                                 array_push(
@@ -570,7 +570,7 @@  discard block
 block discarded – undo
570 570
                 ) {
571 571
                     DB::queryFirstRow(
572 572
                         'SELECT *
573
-                        FROM ' . prefixTable('templates') . '
573
+                        FROM ' . prefixTable('templates').'
574 574
                         WHERE item_id = %i',
575 575
                         $newID
576 576
                     );
@@ -639,11 +639,11 @@  discard block
 block discarded – undo
639 639
                 ) {
640 640
                     foreach ($post_restricted_to as $userRest) {
641 641
                         if (!empty($userRest)) {
642
-                            $dataTmp = DB::queryfirstrow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= %i', $userRest);
642
+                            $dataTmp = DB::queryfirstrow('SELECT login FROM '.prefixTable('users').' WHERE id= %i', $userRest);
643 643
                             if (empty($listOfRestricted)) {
644 644
                                 $listOfRestricted = $dataTmp['login'];
645 645
                             } else {
646
-                                $listOfRestricted .= ';' . $dataTmp['login'];
646
+                                $listOfRestricted .= ';'.$dataTmp['login'];
647 647
                             }
648 648
                         }
649 649
                     }
@@ -659,7 +659,7 @@  discard block
 block discarded – undo
659 659
                             if (!empty($userRest)) {
660 660
                                 $dataTmp = DB::queryfirstrow(
661 661
                                     'SELECT login
662
-                                    FROM ' . prefixTable('users') . '
662
+                                    FROM ' . prefixTable('users').'
663 663
                                     WHERE id= %i',
664 664
                                     $userRest
665 665
                                 );
@@ -667,7 +667,7 @@  discard block
 block discarded – undo
667 667
                                 if (empty($oldRestrictionList)) {
668 668
                                     $oldRestrictionList = $dataTmp['login'];
669 669
                                 } else {
670
-                                    $oldRestrictionList .= ';' . $dataTmp['login'];
670
+                                    $oldRestrictionList .= ';'.$dataTmp['login'];
671 671
                                 }
672 672
                             }
673 673
                         }
@@ -730,7 +730,7 @@  discard block
 block discarded – undo
730 730
                 if (!empty($post_uploaded_file_id)) {
731 731
                     $rows = DB::query(
732 732
                         'SELECT id
733
-                        FROM ' . prefixTable('files') . '
733
+                        FROM ' . prefixTable('files').'
734 734
                         WHERE id_item = %s',
735 735
                         $post_uploaded_file_id
736 736
                     );
@@ -786,7 +786,7 @@  discard block
 block discarded – undo
786 786
                                     $lang->get('email_subject_item_updated'),
787 787
                                     str_replace(
788 788
                                         array('#label', '#link'),
789
-                                            array($path, $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $inputData['folderId'] . '&id=' . $newID . $txt['email_body3']),
789
+                                            array($path, $SETTINGS['email_server_url'].'/index.php?page=items&group='.$inputData['folderId'].'&id='.$newID.$txt['email_body3']),
790 790
                                             $lang->get('new_item_email_body')
791 791
                                     ),
792 792
                                     $emailAddress,
@@ -894,11 +894,11 @@  discard block
 block discarded – undo
894 894
         // Prepare variables
895 895
         $itemInfos = array();
896 896
         $inputData['label'] = isset($dataReceived['label']) && is_string($dataReceived['label']) ? filter_var($dataReceived['label'], FILTER_SANITIZE_FULL_SPECIAL_CHARS) : '';
897
-        $post_url = isset($dataReceived['url'])=== true ? filter_var(htmlspecialchars_decode($dataReceived['url']), FILTER_SANITIZE_URL) : '';
897
+        $post_url = isset($dataReceived['url']) === true ? filter_var(htmlspecialchars_decode($dataReceived['url']), FILTER_SANITIZE_URL) : '';
898 898
         $post_password = $original_pw = isset($dataReceived['pw']) && is_string($dataReceived['pw']) ? htmlspecialchars_decode($dataReceived['pw']) : '';
899 899
         $post_login = isset($dataReceived['login']) && is_string($dataReceived['login']) ? filter_var(htmlspecialchars_decode($dataReceived['login']), FILTER_SANITIZE_FULL_SPECIAL_CHARS) : '';
900
-        $post_tags = isset($dataReceived['tags'])=== true ? htmlspecialchars($dataReceived['tags']) : '';
901
-        $post_email = isset($dataReceived['email'])=== true ? filter_var(htmlspecialchars_decode($dataReceived['email']), FILTER_SANITIZE_EMAIL) : '';
900
+        $post_tags = isset($dataReceived['tags']) === true ? htmlspecialchars($dataReceived['tags']) : '';
901
+        $post_email = isset($dataReceived['email']) === true ? filter_var(htmlspecialchars_decode($dataReceived['email']), FILTER_SANITIZE_EMAIL) : '';
902 902
         $post_template_id = (int) filter_var($dataReceived['template_id'], FILTER_SANITIZE_NUMBER_INT);
903 903
         $inputData['itemId'] = (int) filter_var($dataReceived['id'], FILTER_SANITIZE_NUMBER_INT);
904 904
         $post_anyone_can_modify = (int) filter_var($dataReceived['anyone_can_modify'], FILTER_SANITIZE_NUMBER_INT);
@@ -929,8 +929,7 @@  discard block
 block discarded – undo
929 929
         $post_to_be_deleted_after_date = isset($dataReceived['to_be_deleted_after_date']) === true ? filter_var(
930 930
                 $dataReceived['to_be_deleted_after_date'],
931 931
                 FILTER_SANITIZE_FULL_SPECIAL_CHARS
932
-            ) :
933
-            '';
932
+            ) : '';
934 933
         $post_fields = (filter_var_array(
935 934
             $dataReceived['fields'],
936 935
             FILTER_SANITIZE_FULL_SPECIAL_CHARS
@@ -990,7 +989,7 @@  discard block
 block discarded – undo
990 989
         // About special settings
991 990
         $dataFolderSettings = DB::queryFirstRow(
992 991
             'SELECT bloquer_creation, bloquer_modification, personal_folder, title
993
-            FROM ' . prefixTable('nested_tree') . ' 
992
+            FROM ' . prefixTable('nested_tree').' 
994 993
             WHERE id = %i',
995 994
             $inputData['folderId']
996 995
         );
@@ -1006,7 +1005,7 @@  discard block
 block discarded – undo
1006 1005
         // Get folder complexity
1007 1006
         $folderComplexity = DB::queryfirstrow(
1008 1007
             'SELECT valeur
1009
-            FROM ' . prefixTable('misc') . '
1008
+            FROM ' . prefixTable('misc').'
1010 1009
             WHERE type = %s AND intitule = %i',
1011 1010
             'complex',
1012 1011
             $inputData['folderId']
@@ -1051,8 +1050,8 @@  discard block
 block discarded – undo
1051 1050
         // Get all informations for this item
1052 1051
         $dataItem = DB::queryfirstrow(
1053 1052
             'SELECT *
1054
-            FROM ' . prefixTable('items') . ' as i
1055
-            INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id)
1053
+            FROM ' . prefixTable('items').' as i
1054
+            INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id)
1056 1055
             WHERE i.id=%i AND l.action = %s',
1057 1056
             $inputData['itemId'],
1058 1057
             'at_creation'
@@ -1101,7 +1100,7 @@  discard block
 block discarded – undo
1101 1100
         //db::debugmode(true);
1102 1101
         DB::query(
1103 1102
             'SELECT *
1104
-            FROM ' . prefixTable('sharekeys_items') . '
1103
+            FROM ' . prefixTable('sharekeys_items').'
1105 1104
             WHERE object_id = %i AND user_id = %s',
1106 1105
             $inputData['itemId'],
1107 1106
             $session->get('user-id')
@@ -1153,9 +1152,9 @@  discard block
 block discarded – undo
1153 1152
                 'SELECT i.id as id, i.label as label, i.description as description, i.pw as pw, i.url as url, i.id_tree as id_tree, i.perso as perso, i.login as login, 
1154 1153
                 i.inactif as inactif, i.restricted_to as restricted_to, i.anyone_can_modify as anyone_can_modify, i.email as email, i.notification as notification,
1155 1154
                 u.login as user_login, u.email as user_email
1156
-                FROM ' . prefixTable('items') . ' as i
1157
-                INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id=l.id_item)
1158
-                INNER JOIN ' . prefixTable('users') . ' as u ON (u.id=l.id_user)
1155
+                FROM ' . prefixTable('items').' as i
1156
+                INNER JOIN ' . prefixTable('log_items').' as l ON (i.id=l.id_item)
1157
+                INNER JOIN ' . prefixTable('users').' as u ON (u.id=l.id_user)
1159 1158
                 WHERE i.id=%i',
1160 1159
                 $inputData['itemId']
1161 1160
             );
@@ -1163,7 +1162,7 @@  discard block
 block discarded – undo
1163 1162
             // Should we log a password change?
1164 1163
             $userKey = DB::queryFirstRow(
1165 1164
                 'SELECT share_key
1166
-                FROM ' . prefixTable('sharekeys_items') . '
1165
+                FROM ' . prefixTable('sharekeys_items').'
1167 1166
                 WHERE user_id = %i AND object_id = %i',
1168 1167
                 $session->get('user-id'),
1169 1168
                 $inputData['itemId']
@@ -1227,12 +1226,12 @@  discard block
 block discarded – undo
1227 1226
                     (int) $post_folder_is_personal,
1228 1227
                     (int) $inputData['itemId'],
1229 1228
                     $encrypted_password_key,
1230
-                    true,   // only for the item creator
1231
-                    true,   // delete all
1229
+                    true, // only for the item creator
1230
+                    true, // delete all
1232 1231
                 );
1233 1232
 
1234 1233
                 // Create a task to create sharekeys for users
1235
-                if (WIP=== true) error_log('createTaskForItem - new password for this item - '.$post_password ." -- ". $pw);
1234
+                if (WIP === true) error_log('createTaskForItem - new password for this item - '.$post_password." -- ".$pw);
1236 1235
                 $tasksToBePerformed = ['item_password'];
1237 1236
                 $encryptionTaskIsRequested = true;
1238 1237
             } else {
@@ -1243,7 +1242,7 @@  discard block
 block discarded – undo
1243 1242
             // Get list of tags
1244 1243
             $itemTags = DB::queryFirstColumn(
1245 1244
                 'SELECT tag
1246
-                FROM ' . prefixTable('tags') . '
1245
+                FROM ' . prefixTable('tags').'
1247 1246
                 WHERE item_id = %i',
1248 1247
                 $inputData['itemId']
1249 1248
             );
@@ -1289,7 +1288,7 @@  discard block
 block discarded – undo
1289 1288
                     $session->get('user-id'),
1290 1289
                     'at_modification',
1291 1290
                     $session->get('user-login'),
1292
-                    'at_tag : ' . implode(' ', $itemTags) . ' => ' . $post_tags
1291
+                    'at_tag : '.implode(' ', $itemTags).' => '.$post_tags
1293 1292
                 );
1294 1293
             }
1295 1294
 
@@ -1329,8 +1328,8 @@  discard block
 block discarded – undo
1329 1328
                             'SELECT c.id AS id, c.title AS title, i.data AS data, i.data_iv AS data_iv,
1330 1329
                             i.encryption_type AS encryption_type, c.encrypted_data AS encrypted_data,
1331 1330
                             c.masked AS masked, i.id AS field_item_id
1332
-                            FROM ' . prefixTable('categories_items') . ' AS i
1333
-                            INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id)
1331
+                            FROM ' . prefixTable('categories_items').' AS i
1332
+                            INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id)
1334 1333
                             WHERE i.field_id = %i AND i.item_id = %i',
1335 1334
                             $field['id'],
1336 1335
                             $inputData['itemId']
@@ -1346,7 +1345,7 @@  discard block
 block discarded – undo
1346 1345
                             // Perform new query
1347 1346
                             $dataTmpCat = DB::queryFirstRow(
1348 1347
                                 'SELECT id, title, encrypted_data, masked
1349
-                                FROM ' . prefixTable('categories') . '
1348
+                                FROM ' . prefixTable('categories').'
1350 1349
                                 WHERE id = %i',
1351 1350
                                 $field['id']
1352 1351
                             );
@@ -1376,8 +1375,8 @@  discard block
 block discarded – undo
1376 1375
                                     (int) $post_folder_is_personal,
1377 1376
                                     (int) $newId,
1378 1377
                                     $cryptedStuff['objectKey'],
1379
-                                    true,   // only for the item creator
1380
-                                    true,   // delete all
1378
+                                    true, // only for the item creator
1379
+                                    true, // delete all
1381 1380
                                 );
1382 1381
 
1383 1382
                                 // update value
@@ -1425,7 +1424,7 @@  discard block
 block discarded – undo
1425 1424
                                 $session->get('user-id'),
1426 1425
                                 'at_modification',
1427 1426
                                 $session->get('user-login'),
1428
-                                'at_field : ' . $dataTmpCat['title'] . ' : ' . $field['value']
1427
+                                'at_field : '.$dataTmpCat['title'].' : '.$field['value']
1429 1428
                             );
1430 1429
                         } else {
1431 1430
                             // Case where the field already exists
@@ -1434,7 +1433,7 @@  discard block
 block discarded – undo
1434 1433
                                 // Get user sharekey for this field
1435 1434
                                 $userKey = DB::queryFirstRow(
1436 1435
                                     'SELECT share_key
1437
-                                    FROM ' . prefixTable('sharekeys_fields') . '
1436
+                                    FROM ' . prefixTable('sharekeys_fields').'
1438 1437
                                     WHERE user_id = %i AND object_id = %i',
1439 1438
                                     $session->get('user-id'),
1440 1439
                                     $dataTmpCat['field_item_id']
@@ -1473,8 +1472,8 @@  discard block
 block discarded – undo
1473 1472
                                         (int) $post_folder_is_personal,
1474 1473
                                         (int) $dataTmpCat['field_item_id'],
1475 1474
                                         $cryptedStuff['objectKey'],
1476
-                                        true,   // only for the item creator
1477
-                                        true,   // delete all
1475
+                                        true, // only for the item creator
1476
+                                        true, // delete all
1478 1477
                                     );
1479 1478
 
1480 1479
                                     array_push(
@@ -1514,7 +1513,7 @@  discard block
 block discarded – undo
1514 1513
                                     $session->get('user-id'),
1515 1514
                                     'at_modification',
1516 1515
                                     $session->get('user-login'),
1517
-                                    'at_field : ' . $dataTmpCat['title'] . ' => ' . $oldVal
1516
+                                    'at_field : '.$dataTmpCat['title'].' => '.$oldVal
1518 1517
                                 );
1519 1518
                             }
1520 1519
                         }
@@ -1569,7 +1568,7 @@  discard block
 block discarded – undo
1569 1568
             ) {
1570 1569
                 DB::queryFirstRow(
1571 1570
                     'SELECT *
1572
-                    FROM ' . prefixTable('templates') . '
1571
+                    FROM ' . prefixTable('templates').'
1573 1572
                     WHERE item_id = %i',
1574 1573
                     $inputData['itemId']
1575 1574
                 );
@@ -1612,7 +1611,7 @@  discard block
 block discarded – undo
1612 1611
                 // check if elem exists in Table. If not add it or update it.
1613 1612
                 DB::query(
1614 1613
                     'SELECT *
1615
-                    FROM ' . prefixTable('automatic_del') . '
1614
+                    FROM ' . prefixTable('automatic_del').'
1616 1615
                     WHERE item_id = %i',
1617 1616
                     $inputData['itemId']
1618 1617
                 );
@@ -1639,7 +1638,7 @@  discard block
 block discarded – undo
1639 1638
                         // Store updates performed
1640 1639
                         array_push(
1641 1640
                             $arrayOfChanges,
1642
-                            $lang->get('automatic_deletion_engaged') . ': ' . $lang->get('enabled')
1641
+                            $lang->get('automatic_deletion_engaged').': '.$lang->get('enabled')
1643 1642
                         );
1644 1643
 
1645 1644
                         // update LOG
@@ -1682,7 +1681,7 @@  discard block
 block discarded – undo
1682 1681
                         // Store updates performed
1683 1682
                         array_push(
1684 1683
                             $arrayOfChanges,
1685
-                            $lang->get('automatic_deletion_engaged') . ': ' . $lang->get('disabled')
1684
+                            $lang->get('automatic_deletion_engaged').': '.$lang->get('disabled')
1686 1685
                         );
1687 1686
 
1688 1687
                         // update LOG
@@ -1715,7 +1714,7 @@  discard block
 block discarded – undo
1715 1714
                     if (!empty($userId)) {
1716 1715
                         $dataTmp = DB::queryfirstrow(
1717 1716
                             'SELECT id, name, lastname
1718
-                            FROM ' . prefixTable('users') . '
1717
+                            FROM ' . prefixTable('users').'
1719 1718
                             WHERE id= %i',
1720 1719
                             $userId
1721 1720
                         );
@@ -1723,7 +1722,7 @@  discard block
 block discarded – undo
1723 1722
                         // Add to array
1724 1723
                         array_push(
1725 1724
                             $arrayOfUsersRestriction,
1726
-                            $dataTmp['name'] . ' ' . $dataTmp['lastname']
1725
+                            $dataTmp['name'].' '.$dataTmp['lastname']
1727 1726
                         );
1728 1727
                         array_push(
1729 1728
                             $arrayOfUsersIdRestriction,
@@ -1754,8 +1753,8 @@  discard block
 block discarded – undo
1754 1753
                 // get values before deleting them
1755 1754
                 $rows = DB::query(
1756 1755
                     'SELECT t.title, t.id AS id
1757
-                    FROM ' . prefixTable('roles_title') . ' as t
1758
-                    INNER JOIN ' . prefixTable('restriction_to_roles') . ' as r ON (t.id=r.role_id)
1756
+                    FROM ' . prefixTable('roles_title').' as t
1757
+                    INNER JOIN ' . prefixTable('restriction_to_roles').' as r ON (t.id=r.role_id)
1759 1758
                     WHERE r.item_id = %i
1760 1759
                     ORDER BY t.title ASC',
1761 1760
                     $inputData['itemId']
@@ -1789,7 +1788,7 @@  discard block
 block discarded – undo
1789 1788
                         );
1790 1789
                         $dataTmp = DB::queryfirstrow(
1791 1790
                             'SELECT title
1792
-                            FROM ' . prefixTable('roles_title') . '
1791
+                            FROM ' . prefixTable('roles_title').'
1793 1792
                             WHERE id = %i',
1794 1793
                             $role
1795 1794
                         );
@@ -1817,7 +1816,7 @@  discard block
 block discarded – undo
1817 1816
             // Get current status
1818 1817
             $otpStatus = DB::queryFirstRow(
1819 1818
                 'SELECT enabled as otp_is_enabled
1820
-                FROM ' . prefixTable('items_otp') . '
1819
+                FROM ' . prefixTable('items_otp').'
1821 1820
                 WHERE item_id = %i',
1822 1821
                 $inputData['itemId']
1823 1822
             );
@@ -1848,7 +1847,7 @@  discard block
 block discarded – undo
1848 1847
                     $session->get('user-id'),
1849 1848
                     'at_modification',
1850 1849
                     $session->get('user-login'),
1851
-                    'at_otp_status:' . ((int) $post_otp_is_enabled === 0 ? 'disabled' : 'enabled')
1850
+                    'at_otp_status:'.((int) $post_otp_is_enabled === 0 ? 'disabled' : 'enabled')
1852 1851
                 );
1853 1852
             } elseif (DB::count() === 0 && !empty($post_otp_secret)) {
1854 1853
                 // Create the entry in items_otp table
@@ -1892,8 +1891,8 @@  discard block
 block discarded – undo
1892 1891
                     $session->get('user-id'),
1893 1892
                     'at_modification',
1894 1893
                     $session->get('user-login'),
1895
-                    'at_restriction : ' . (count($diffUsersRestiction) > 0 ?
1896
-                        implode(', ', $arrayOfUsersRestriction) . (count($diffRolesRestiction) > 0 ? ', ' : '') : '') . (count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '')
1894
+                    'at_restriction : '.(count($diffUsersRestiction) > 0 ?
1895
+                        implode(', ', $arrayOfUsersRestriction).(count($diffRolesRestiction) > 0 ? ', ' : '') : '').(count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '')
1897 1896
                 );
1898 1897
             }
1899 1898
 
@@ -1913,7 +1912,7 @@  discard block
 block discarded – undo
1913 1912
                     $session->get('user-id'),
1914 1913
                     'at_modification',
1915 1914
                     $session->get('user-login'),
1916
-                    'at_label : ' . $data['label'] . ' => ' . $inputData['label']
1915
+                    'at_label : '.$data['label'].' => '.$inputData['label']
1917 1916
                 );
1918 1917
             }
1919 1918
             // LOGIN
@@ -1932,7 +1931,7 @@  discard block
 block discarded – undo
1932 1931
                     $session->get('user-id'),
1933 1932
                     'at_modification',
1934 1933
                     $session->get('user-login'),
1935
-                    'at_login : ' . $data['login'] . ' => ' . $post_login
1934
+                    'at_login : '.$data['login'].' => '.$post_login
1936 1935
                 );
1937 1936
             }
1938 1937
             // EMAIL
@@ -1951,7 +1950,7 @@  discard block
 block discarded – undo
1951 1950
                     $session->get('user-id'),
1952 1951
                     'at_modification',
1953 1952
                     $session->get('user-login'),
1954
-                    'at_email : ' . $data['email'] . ' => ' . $post_email
1953
+                    'at_email : '.$data['email'].' => '.$post_email
1955 1954
                 );
1956 1955
             }
1957 1956
             // URL
@@ -1970,7 +1969,7 @@  discard block
 block discarded – undo
1970 1969
                     $session->get('user-id'),
1971 1970
                     'at_modification',
1972 1971
                     $session->get('user-login'),
1973
-                    'at_url : ' . $data['url'] . ' => ' . $post_url
1972
+                    'at_url : '.$data['url'].' => '.$post_url
1974 1973
                 );
1975 1974
             }
1976 1975
             // DESCRIPTION
@@ -1996,7 +1995,7 @@  discard block
 block discarded – undo
1996 1995
             // FOLDER
1997 1996
             if ((int) $data['id_tree'] !== (int) $inputData['folderId']) {
1998 1997
                 // Get name of folders
1999
-                $dataTmp = DB::query('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id IN %li', array($data['id_tree'], $inputData['folderId']));
1998
+                $dataTmp = DB::query('SELECT title FROM '.prefixTable('nested_tree').' WHERE id IN %li', array($data['id_tree'], $inputData['folderId']));
2000 1999
 
2001 2000
                 // Store updates performed
2002 2001
                 array_push(
@@ -2012,7 +2011,7 @@  discard block
 block discarded – undo
2012 2011
                     $session->get('user-id'),
2013 2012
                     'at_modification',
2014 2013
                     $session->get('user-login'),
2015
-                    'at_category : ' . $dataTmp[0]['title'] . ' => ' . $dataTmp[1]['title']
2014
+                    'at_category : '.$dataTmp[0]['title'].' => '.$dataTmp[1]['title']
2016 2015
                 );
2017 2016
             }
2018 2017
             // ANYONE_CAN_MODIFY
@@ -2020,7 +2019,7 @@  discard block
 block discarded – undo
2020 2019
                 // Store updates performed
2021 2020
                 array_push(
2022 2021
                     $arrayOfChanges,
2023
-                    $lang->get('at_anyoneconmodify') . ': ' . ((int) $post_anyone_can_modify === 0 ? $lang->get('disabled') : $lang->get('enabled'))
2022
+                    $lang->get('at_anyoneconmodify').': '.((int) $post_anyone_can_modify === 0 ? $lang->get('disabled') : $lang->get('enabled'))
2024 2023
                 );
2025 2024
 
2026 2025
                 // Log
@@ -2031,15 +2030,15 @@  discard block
 block discarded – undo
2031 2030
                     $session->get('user-id'),
2032 2031
                     'at_modification',
2033 2032
                     $session->get('user-login'),
2034
-                    'at_anyoneconmodify : ' . ((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled')
2033
+                    'at_anyoneconmodify : '.((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled')
2035 2034
                 );
2036 2035
             }
2037 2036
 
2038 2037
             // Reload new values
2039 2038
             $dataItem = DB::queryfirstrow(
2040 2039
                 'SELECT *
2041
-                FROM ' . prefixTable('items') . ' as i
2042
-                INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id)
2040
+                FROM ' . prefixTable('items').' as i
2041
+                INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id)
2043 2042
                 WHERE i.id = %i AND l.action = %s',
2044 2043
                 $inputData['itemId'],
2045 2044
                 'at_creation'
@@ -2048,8 +2047,8 @@  discard block
 block discarded – undo
2048 2047
             $history = '';
2049 2048
             $rows = DB::query(
2050 2049
                 'SELECT l.date as date, l.action as action, l.raison as raison, u.login as login
2051
-                FROM ' . prefixTable('log_items') . ' as l
2052
-                LEFT JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id)
2050
+                FROM ' . prefixTable('log_items').' as l
2051
+                LEFT JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id)
2053 2052
                 WHERE l.action <> %s AND id_item=%s',
2054 2053
                 'at_shown',
2055 2054
                 $inputData['itemId']
@@ -2058,14 +2057,14 @@  discard block
 block discarded – undo
2058 2057
                 if ($record['raison'] === NULL) continue;
2059 2058
                 $reason = explode(':', $record['raison']);
2060 2059
                 if (count($reason) > 0) {
2061
-                    $sentence = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - '
2062
-                        . $record['login'] . ' - ' . $lang->get($record['action']) . ' - '
2063
-                        . (!empty($record['raison']) ? (count($reason) > 1 ? $lang->get(trim($reason[0])) . ' : ' . $reason[1]
2060
+                    $sentence = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).' - '
2061
+                        . $record['login'].' - '.$lang->get($record['action']).' - '
2062
+                        . (!empty($record['raison']) ? (count($reason) > 1 ? $lang->get(trim($reason[0])).' : '.$reason[1]
2064 2063
                             : $lang->get(trim($reason[0]))) : '');
2065 2064
                     if (empty($history)) {
2066 2065
                         $history = $sentence;
2067 2066
                     } else {
2068
-                        $history .= '<br />' . $sentence;
2067
+                        $history .= '<br />'.$sentence;
2069 2068
                     }
2070 2069
                 }
2071 2070
             }
@@ -2203,7 +2202,7 @@  discard block
 block discarded – undo
2203 2202
         ) {
2204 2203
             // load the original record into an array
2205 2204
             $originalRecord = DB::queryfirstrow(
2206
-                'SELECT * FROM ' . prefixTable('items') . '
2205
+                'SELECT * FROM '.prefixTable('items').'
2207 2206
                 WHERE id = %i',
2208 2207
                 $inputData['itemId']
2209 2208
             );
@@ -2222,7 +2221,7 @@  discard block
 block discarded – undo
2222 2221
 
2223 2222
             // Load the destination folder record into an array
2224 2223
             $dataDestination = DB::queryfirstrow(
2225
-                'SELECT personal_folder FROM ' . prefixTable('nested_tree') . '
2224
+                'SELECT personal_folder FROM '.prefixTable('nested_tree').'
2226 2225
                 WHERE id = %i',
2227 2226
                 $post_dest_id
2228 2227
             );
@@ -2230,7 +2229,7 @@  discard block
 block discarded – undo
2230 2229
             // Get the ITEM object key for the user
2231 2230
             $userKey = DB::queryFirstRow(
2232 2231
                 'SELECT share_key
2233
-                FROM ' . prefixTable('sharekeys_items') . '
2232
+                FROM ' . prefixTable('sharekeys_items').'
2234 2233
                 WHERE user_id = %i AND object_id = %i',
2235 2234
                 $session->get('user-id'),
2236 2235
                 $inputData['itemId']
@@ -2307,8 +2306,8 @@  discard block
 block discarded – undo
2307 2306
             // Manage Custom Fields
2308 2307
             $rows = DB::query(
2309 2308
                 'SELECT ci.id AS id, ci.data AS data, ci.field_id AS field_id, c.encrypted_data AS encrypted_data
2310
-                FROM ' . prefixTable('categories_items') . ' AS ci
2311
-                INNER JOIN ' . prefixTable('categories') . ' AS c ON (c.id = ci.field_id)
2309
+                FROM ' . prefixTable('categories_items').' AS ci
2310
+                INNER JOIN ' . prefixTable('categories').' AS c ON (c.id = ci.field_id)
2312 2311
                 WHERE ci.item_id = %i',
2313 2312
                 $inputData['itemId']
2314 2313
             );
@@ -2320,7 +2319,7 @@  discard block
 block discarded – undo
2320 2319
                     // Get user key
2321 2320
                     $userKey = DB::queryFirstRow(
2322 2321
                         'SELECT share_key
2323
-                        FROM ' . prefixTable('sharekeys_fields') . '
2322
+                        FROM ' . prefixTable('sharekeys_fields').'
2324 2323
                         WHERE user_id = %i AND object_id = %i',
2325 2324
                         $session->get('user-id'),
2326 2325
                         $field['id']
@@ -2387,15 +2386,15 @@  discard block
 block discarded – undo
2387 2386
             $rows = DB::query(
2388 2387
                 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, f.extension AS extension,
2389 2388
                 f.size AS size, f.type AS type, s.share_key AS share_key
2390
-                FROM ' . prefixTable('files') . ' AS f
2391
-                INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id)
2389
+                FROM ' . prefixTable('files').' AS f
2390
+                INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id)
2392 2391
                 WHERE s.user_id = %i AND f.id_item = %i',
2393 2392
                 $session->get('user-id'),
2394 2393
                 $inputData['itemId']
2395 2394
             );
2396 2395
             foreach ($rows as $record) {
2397 2396
                 // Check if file still exists
2398
-                if (file_exists($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . TP_FILE_PREFIX . base64_decode($record['file'])) === true) {
2397
+                if (file_exists($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.TP_FILE_PREFIX.base64_decode($record['file'])) === true) {
2399 2398
                     // Step1 - decrypt the file
2400 2399
                     // deepcode ignore PT: path is sanitized inside decryptFile()
2401 2400
                     $fileContent = decryptFile(
@@ -2417,8 +2416,8 @@  discard block
 block discarded – undo
2417 2416
 
2418 2417
                     // Step2 - create file
2419 2418
                     // deepcode ignore InsecureHash: md5 is used jonly for file name in order to get a hashed value in database
2420
-                    $newFileName = md5(time() . '_' . $record['id']) . '.' . $record['extension'];
2421
-                    $outstream = fopen($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . $newFileName, 'ab');
2419
+                    $newFileName = md5(time().'_'.$record['id']).'.'.$record['extension'];
2420
+                    $outstream = fopen($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.$newFileName, 'ab');
2422 2421
                     if ($outstream === false) {
2423 2422
                         echo prepareExchangedData(
2424 2423
                             array(
@@ -2491,7 +2490,7 @@  discard block
 block discarded – undo
2491 2490
 
2492 2491
             // -------------------------
2493 2492
             // Add specific restrictions
2494
-            $rows = DB::query('SELECT * FROM ' . prefixTable('restriction_to_roles') . ' WHERE item_id = %i', $inputData['itemId']);
2493
+            $rows = DB::query('SELECT * FROM '.prefixTable('restriction_to_roles').' WHERE item_id = %i', $inputData['itemId']);
2495 2494
             foreach ($rows as $record) {
2496 2495
                 DB::insert(
2497 2496
                     prefixTable('restriction_to_roles'),
@@ -2503,7 +2502,7 @@  discard block
 block discarded – undo
2503 2502
             }
2504 2503
 
2505 2504
             // Add Tags
2506
-            $rows = DB::query('SELECT * FROM ' . prefixTable('tags') . ' WHERE item_id = %i', $inputData['itemId']);
2505
+            $rows = DB::query('SELECT * FROM '.prefixTable('tags').' WHERE item_id = %i', $inputData['itemId']);
2507 2506
             foreach ($rows as $record) {
2508 2507
                 DB::insert(
2509 2508
                     prefixTable('tags'),
@@ -2604,7 +2603,7 @@  discard block
 block discarded – undo
2604 2603
         // then we can show it
2605 2604
         $item_deleted = DB::queryFirstRow(
2606 2605
             'SELECT *
2607
-            FROM ' . prefixTable('log_items') . '
2606
+            FROM ' . prefixTable('log_items').'
2608 2607
             WHERE id_item = %i AND action = %s
2609 2608
             ORDER BY date DESC
2610 2609
             LIMIT 0, 1',
@@ -2615,7 +2614,7 @@  discard block
 block discarded – undo
2615 2614
 
2616 2615
         $item_restored = DB::queryFirstRow(
2617 2616
             'SELECT *
2618
-            FROM ' . prefixTable('log_items') . '
2617
+            FROM ' . prefixTable('log_items').'
2619 2618
             WHERE id_item = %i AND action = %s
2620 2619
             ORDER BY date DESC
2621 2620
             LIMIT 0, 1',
@@ -2639,8 +2638,8 @@  discard block
 block discarded – undo
2639 2638
         // Get all informations for this item
2640 2639
         $dataItem = DB::queryfirstrow(
2641 2640
             'SELECT *
2642
-            FROM ' . prefixTable('items') . ' as i
2643
-            INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id)
2641
+            FROM ' . prefixTable('items').' as i
2642
+            INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id)
2644 2643
             WHERE i.id = %i AND l.action = %s',
2645 2644
             $inputData['id'],
2646 2645
             'at_creation'
@@ -2649,7 +2648,7 @@  discard block
 block discarded – undo
2649 2648
         // Notification
2650 2649
         DB::queryfirstrow(
2651 2650
             'SELECT *
2652
-            FROM ' . prefixTable('notification') . '
2651
+            FROM ' . prefixTable('notification').'
2653 2652
             WHERE item_id = %i AND user_id = %i',
2654 2653
             $inputData['id'],
2655 2654
             $session->get('user-id')
@@ -2668,7 +2667,7 @@  discard block
 block discarded – undo
2668 2667
 
2669 2668
         // manage case of API user
2670 2669
         if ($dataItem['id_user'] === API_USER_ID) {
2671
-            $arrData['author'] = 'API [' . $dataItem['description'] . ']';
2670
+            $arrData['author'] = 'API ['.$dataItem['description'].']';
2672 2671
             $arrData['id_user'] = API_USER_ID;
2673 2672
             $arrData['author_email'] = '';
2674 2673
             $arrData['notification_status'] = false;
@@ -2678,7 +2677,7 @@  discard block
 block discarded – undo
2678 2677
         $tags = array();
2679 2678
         $rows = DB::query(
2680 2679
             'SELECT tag
2681
-            FROM ' . prefixTable('tags') . '
2680
+            FROM ' . prefixTable('tags').'
2682 2681
             WHERE item_id = %i',
2683 2682
             $inputData['id']
2684 2683
         );
@@ -2703,7 +2702,7 @@  discard block
 block discarded – undo
2703 2702
         // Check if user has a role that is accepted
2704 2703
         $rows_tmp = DB::query(
2705 2704
             'SELECT role_id
2706
-            FROM ' . prefixTable('restriction_to_roles') . '
2705
+            FROM ' . prefixTable('restriction_to_roles').'
2707 2706
             WHERE item_id=%i',
2708 2707
             $inputData['id']
2709 2708
         );
@@ -2717,7 +2716,7 @@  discard block
 block discarded – undo
2717 2716
         // Get the object key for the user
2718 2717
         $userKey = DB::queryFirstRow(
2719 2718
             'SELECT share_key
2720
-            FROM ' . prefixTable('sharekeys_items') . '
2719
+            FROM ' . prefixTable('sharekeys_items').'
2721 2720
             WHERE user_id = %i AND object_id = %i',
2722 2721
             $session->get('user-id'),
2723 2722
             $inputData['id']
@@ -2814,8 +2813,8 @@  discard block
 block discarded – undo
2814 2813
                 // Add restriction if item is restricted to roles
2815 2814
                 $rows = DB::query(
2816 2815
                     'SELECT t.title, t.id
2817
-                    FROM ' . prefixTable('roles_title') . ' AS t
2818
-                    INNER JOIN ' . prefixTable('restriction_to_roles') . ' AS r ON (t.id=r.role_id)
2816
+                    FROM ' . prefixTable('roles_title').' AS t
2817
+                    INNER JOIN ' . prefixTable('restriction_to_roles').' AS r ON (t.id=r.role_id)
2819 2818
                     WHERE r.item_id = %i
2820 2819
                     ORDER BY t.title ASC',
2821 2820
                     $inputData['id']
@@ -2831,8 +2830,8 @@  discard block
 block discarded – undo
2831 2830
                 $tmp = array();
2832 2831
                 $rows = DB::query(
2833 2832
                     'SELECT k.label, k.id
2834
-                    FROM ' . prefixTable('kb_items') . ' as i
2835
-                    INNER JOIN ' . prefixTable('kb') . ' as k ON (i.kb_id=k.id)
2833
+                    FROM ' . prefixTable('kb_items').' as i
2834
+                    INNER JOIN ' . prefixTable('kb').' as k ON (i.kb_id=k.id)
2836 2835
                     WHERE i.item_id = %i
2837 2836
                     ORDER BY k.label ASC',
2838 2837
                     $inputData['id']
@@ -2915,7 +2914,7 @@  discard block
 block discarded – undo
2915 2914
                 $arrCatList = array();
2916 2915
                 $rows_tmp = DB::query(
2917 2916
                     'SELECT id_category
2918
-                    FROM ' . prefixTable('categories_folders') . '
2917
+                    FROM ' . prefixTable('categories_folders').'
2919 2918
                     WHERE id_folder=%i',
2920 2919
                     $inputData['folderId']
2921 2920
                 );
@@ -2930,8 +2929,8 @@  discard block
 block discarded – undo
2930 2929
                         'SELECT i.id AS id, i.field_id AS field_id, i.data AS data, i.item_id AS item_id,
2931 2930
                         i.encryption_type AS encryption_type, c.encrypted_data AS encrypted_data, c.parent_id AS parent_id,
2932 2931
                         c.type as field_type, c.masked AS field_masked, c.role_visibility AS role_visibility
2933
-                        FROM ' . prefixTable('categories_items') . ' AS i
2934
-                        INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id)
2932
+                        FROM ' . prefixTable('categories_items').' AS i
2933
+                        INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id)
2935 2934
                         WHERE i.item_id=%i AND c.parent_id IN %ls',
2936 2935
                         $inputData['id'],
2937 2936
                         $arrCatList
@@ -2942,7 +2941,7 @@  discard block
 block discarded – undo
2942 2941
                         //db::debugmode(true);
2943 2942
                         $userKey = DB::queryFirstRow(
2944 2943
                             'SELECT share_key
2945
-                            FROM ' . prefixTable('sharekeys_fields') . '
2944
+                            FROM ' . prefixTable('sharekeys_fields').'
2946 2945
                             WHERE user_id = %i AND object_id = %i',
2947 2946
                             $session->get('user-id'),
2948 2947
                             $row['id']
@@ -2960,7 +2959,7 @@  discard block
 block discarded – undo
2960 2959
                         } else if (DB::count() === 0 && (int) $row['encrypted_data'] === 0) {
2961 2960
                             // Data is not encrypted in DB
2962 2961
                             $fieldText = [
2963
-                                'string' => $row['data'],//#3945 - isBase64($row['data']) === true ? base64_decode($row['data']) : 
2962
+                                'string' => $row['data'], //#3945 - isBase64($row['data']) === true ? base64_decode($row['data']) : 
2964 2963
                                 'encrypted' => false,
2965 2964
                                 'error' => false,
2966 2965
                             ];
@@ -3005,7 +3004,7 @@  discard block
 block discarded – undo
3005 3004
             if (isset($SETTINGS['item_creation_templates']) && (int) $SETTINGS['item_creation_templates'] === 1) {
3006 3005
                 $rows_tmp = DB::queryfirstrow(
3007 3006
                     'SELECT category_id
3008
-                    FROM ' . prefixTable('templates') . '
3007
+                    FROM ' . prefixTable('templates').'
3009 3008
                     WHERE item_id = %i',
3010 3009
                     $inputData['id']
3011 3010
                 );
@@ -3022,7 +3021,7 @@  discard block
 block discarded – undo
3022 3021
             // Evaluate if item is ready for all users
3023 3022
             $rows_tmp = DB::queryfirstrow(
3024 3023
                 'SELECT finished_at
3025
-                FROM ' . prefixTable('background_tasks') . '
3024
+                FROM ' . prefixTable('background_tasks').'
3026 3025
                 WHERE item_id = %i',
3027 3026
                 $inputData['id']
3028 3027
             );
@@ -3039,7 +3038,7 @@  discard block
 block discarded – undo
3039 3038
                 // Is the Item to be deleted?
3040 3039
                 $dataDelete = DB::queryfirstrow(
3041 3040
                     'SELECT * 
3042
-                    FROM ' . prefixTable('automatic_del') . '
3041
+                    FROM ' . prefixTable('automatic_del').'
3043 3042
                     WHERE item_id = %i',
3044 3043
                     $inputData['id']
3045 3044
                 );
@@ -3120,14 +3119,14 @@  discard block
 block discarded – undo
3120 3119
                     if (!empty($userRest)) {
3121 3120
                         $dataTmp = DB::queryfirstrow(
3122 3121
                             'SELECT login
3123
-                            FROM ' . prefixTable('users') . '
3122
+                            FROM ' . prefixTable('users').'
3124 3123
                             WHERE id= %i',
3125 3124
                             $userRest
3126 3125
                         );
3127 3126
                         if (empty($listOfRestricted)) {
3128 3127
                             $listOfRestricted = $dataTmp['login'];
3129 3128
                         } else {
3130
-                            $listOfRestricted .= ';' . $dataTmp['login'];
3129
+                            $listOfRestricted .= ';'.$dataTmp['login'];
3131 3130
                         }
3132 3131
                     }
3133 3132
                 }
@@ -3201,9 +3200,9 @@  discard block
 block discarded – undo
3201 3200
         // Load item data
3202 3201
         $dataItem = DB::queryFirstRow(
3203 3202
             'SELECT i.*, n.title AS folder_title, o.enabled AS otp_for_item_enabled, o.phone_number AS otp_phone_number, o.secret AS otp_secret
3204
-            FROM ' . prefixTable('items') . ' AS i
3205
-            INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id)
3206
-            LEFT JOIN ' . prefixTable('items_otp') . ' AS o ON (o.item_id = i.id)
3203
+            FROM ' . prefixTable('items').' AS i
3204
+            INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id)
3205
+            LEFT JOIN ' . prefixTable('items_otp').' AS o ON (o.item_id = i.id)
3207 3206
             WHERE i.id = %i',
3208 3207
             $inputData['id']
3209 3208
         );
@@ -3225,7 +3224,7 @@  discard block
 block discarded – undo
3225 3224
         // Check if user has a role that is accepted
3226 3225
         $rows_tmp = DB::query(
3227 3226
             'SELECT role_id
3228
-            FROM ' . prefixTable('restriction_to_roles') . '
3227
+            FROM ' . prefixTable('restriction_to_roles').'
3229 3228
             WHERE item_id=%i',
3230 3229
             $inputData['id']
3231 3230
         );
@@ -3257,12 +3256,12 @@  discard block
 block discarded – undo
3257 3256
             // launch query
3258 3257
             $rows = DB::query(
3259 3258
                 'SELECT id, name, file, extension, size
3260
-                FROM ' . prefixTable('files') . '
3259
+                FROM ' . prefixTable('files').'
3261 3260
                 WHERE id_item = %i AND confirmed = 1',
3262 3261
                 $inputData['id']
3263 3262
             );
3264 3263
             foreach ($rows as $record) {
3265
-                $filename = basename($record['name'], '.' . $record['extension']);
3264
+                $filename = basename($record['name'], '.'.$record['extension']);
3266 3265
                 $filename = isBase64($filename) === true ? base64_decode($filename) : $filename;
3267 3266
 
3268 3267
                 array_push(
@@ -3275,7 +3274,7 @@  discard block
 block discarded – undo
3275 3274
                         'is_image' => in_array(strtolower($record['extension']), TP_IMAGE_FILE_EXT) === true ? 1 : 0,
3276 3275
                         'id' => $record['id'],
3277 3276
                         'key' => $session->get('user-key_tmp'),
3278
-                        'internalFilename' => basename($record['name'], '.' . $record['extension']),
3277
+                        'internalFilename' => basename($record['name'], '.'.$record['extension']),
3279 3278
                     )
3280 3279
                 );
3281 3280
             }
@@ -3313,7 +3312,7 @@  discard block
 block discarded – undo
3313 3312
                     array(
3314 3313
                         'latest_items' => implode(';', $session->get('user-latest_items')),
3315 3314
                     ),
3316
-                    'id=' . $session->get('user-id')
3315
+                    'id='.$session->get('user-id')
3317 3316
                 );
3318 3317
             }
3319 3318
 
@@ -3322,8 +3321,8 @@  discard block
 block discarded – undo
3322 3321
             $listOptionsForRoles = array();
3323 3322
             $rows = DB::query(
3324 3323
                 'SELECT r.role_id AS role_id, t.title AS title
3325
-                FROM ' . prefixTable('roles_values') . ' AS r
3326
-                INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id)
3324
+                FROM ' . prefixTable('roles_values').' AS r
3325
+                INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id)
3327 3326
                 WHERE r.folder_id = %i',
3328 3327
                 $dataItem['id_tree']
3329 3328
             );
@@ -3337,9 +3336,9 @@  discard block
 block discarded – undo
3337 3336
                 );
3338 3337
                 $rows2 = DB::query(
3339 3338
                     'SELECT id, login, fonction_id, email, name, lastname
3340
-                    FROM ' . prefixTable('users') . '
3339
+                    FROM ' . prefixTable('users').'
3341 3340
                     WHERE fonction_id LIKE %s',
3342
-                    '%' . $record['role_id'] . '%'
3341
+                    '%'.$record['role_id'].'%'
3343 3342
                 );
3344 3343
                 foreach ($rows2 as $record2) {
3345 3344
                     foreach (explode(';', $record2['fonction_id']) as $role) {
@@ -3352,7 +3351,7 @@  discard block
 block discarded – undo
3352 3351
                                 array(
3353 3352
                                     'id' => (int) $record2['id'],
3354 3353
                                     'login' => $record2['login'],
3355
-                                    'name' => $record2['name'] . ' ' . $record2['lastname'],
3354
+                                    'name' => $record2['name'].' '.$record2['lastname'],
3356 3355
                                     'email' => $record2['email'],
3357 3356
                                 )
3358 3357
                             );
@@ -3371,16 +3370,16 @@  discard block
 block discarded – undo
3371 3370
                 $path = '';
3372 3371
                 foreach ($arbo as $elem) {
3373 3372
                     if (empty($path)) {
3374
-                        $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES) . ' ';
3373
+                        $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES).' ';
3375 3374
                     } else {
3376
-                        $path .= '&#8594; ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
3375
+                        $path .= '&#8594; '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
3377 3376
                     }
3378 3377
                 }
3379 3378
                 // Build text to show user
3380 3379
                 if (empty($path)) {
3381 3380
                     $path = addslashes($dataItem['label']);
3382 3381
                 } else {
3383
-                    $path = addslashes($dataItem['label']) . ' (' . $path . ')';
3382
+                    $path = addslashes($dataItem['label']).' ('.$path.')';
3384 3383
                 }
3385 3384
 
3386 3385
                 // Add Admins to notification list if expected
@@ -3403,7 +3402,7 @@  discard block
 block discarded – undo
3403 3402
                         array(
3404 3403
                             addslashes($session->get('user-login')),
3405 3404
                             $path,
3406
-                            $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $dataItem['id'],
3405
+                            $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$dataItem['id'],
3407 3406
                         ),
3408 3407
                         $lang->get('email_on_open_notification_mail')
3409 3408
                     ),
@@ -3413,7 +3412,7 @@  discard block
 block discarded – undo
3413 3412
             }
3414 3413
 
3415 3414
             // has this item a change proposal
3416
-            DB::query('SELECT * FROM ' . prefixTable('items_change') . ' WHERE item_id = %i', $inputData['id']);
3415
+            DB::query('SELECT * FROM '.prefixTable('items_change').' WHERE item_id = %i', $inputData['id']);
3417 3416
             $returnArray['has_change_proposal'] = DB::count();
3418 3417
 
3419 3418
             // Setting
@@ -3424,7 +3423,7 @@  discard block
 block discarded – undo
3424 3423
             if (isset($SETTINGS['otv_is_enabled']) === true && (int) $SETTINGS['otv_is_enabled'] === 1) {
3425 3424
                 DB::query(
3426 3425
                     'SELECT *
3427
-                    FROM ' . prefixTable('otv') . '
3426
+                    FROM ' . prefixTable('otv').'
3428 3427
                     WHERE item_id = %i
3429 3428
                     AND time_limit > %i',
3430 3429
                     $inputData['id'],
@@ -3523,7 +3522,7 @@  discard block
 block discarded – undo
3523 3522
         // Load item data
3524 3523
         $data = DB::queryFirstRow(
3525 3524
             'SELECT id_tree, id, label
3526
-            FROM ' . prefixTable('items') . '
3525
+            FROM ' . prefixTable('items').'
3527 3526
             WHERE id = %i OR item_key = %s',
3528 3527
             $inputData['itemId'],
3529 3528
             $inputData['itemKey']
@@ -3614,7 +3613,7 @@  discard block
 block discarded – undo
3614 3613
         // Load item data
3615 3614
         $dataItem = DB::queryFirstRow(
3616 3615
             'SELECT secret, enabled
3617
-            FROM ' . prefixTable('items_otp') . '
3616
+            FROM ' . prefixTable('items_otp').'
3618 3617
             WHERE item_id = %i',
3619 3618
             $inputData['id']
3620 3619
         );
@@ -3696,13 +3695,13 @@  discard block
 block discarded – undo
3696 3695
 
3697 3696
         // Check if user is allowed to access this folder
3698 3697
         if (!in_array($inputData['folderId'], $session->get('user-accessible_folders'))) {
3699
-            echo '[{"error" : "' . $lang->get('error_not_allowed_to') . '"}]';
3698
+            echo '[{"error" : "'.$lang->get('error_not_allowed_to').'"}]';
3700 3699
             break;
3701 3700
         }
3702 3701
 
3703 3702
         // Check if title doesn't contains html codes
3704 3703
         if (preg_match_all('|<[^>]+>(.*)</[^>]+>|U', $title, $out)) {
3705
-            echo '[ { "error" : "' . $lang->get('error_html_codes') . '" } ]';
3704
+            echo '[ { "error" : "'.$lang->get('error_html_codes').'" } ]';
3706 3705
             break;
3707 3706
         }
3708 3707
         // check that title is not numeric
@@ -3713,9 +3712,9 @@  discard block
 block discarded – undo
3713 3712
 
3714 3713
         // Check if duplicate folders name are allowed
3715 3714
         if (isset($SETTINGS['duplicate_folder']) && $SETTINGS['duplicate_folder'] === '0') {
3716
-            $data = DB::queryFirstRow('SELECT id, title FROM ' . prefixTable('nested_tree') . ' WHERE title = %s', $title);
3715
+            $data = DB::queryFirstRow('SELECT id, title FROM '.prefixTable('nested_tree').' WHERE title = %s', $title);
3717 3716
             if (!empty($data['id']) && $dataReceived['folder'] !== $data['id']) {
3718
-                echo '[ { "error" : "' . $lang->get('error_group_exist') . '" } ]';
3717
+                echo '[ { "error" : "'.$lang->get('error_group_exist').'" } ]';
3719 3718
                 break;
3720 3719
             }
3721 3720
         }
@@ -3723,7 +3722,7 @@  discard block
 block discarded – undo
3723 3722
         // query on folder
3724 3723
         $data = DB::queryfirstrow(
3725 3724
             'SELECT parent_id, personal_folder
3726
-            FROM ' . prefixTable('nested_tree') . '
3725
+            FROM ' . prefixTable('nested_tree').'
3727 3726
             WHERE id = %i',
3728 3727
             $inputData['folderId']
3729 3728
         );
@@ -3733,20 +3732,20 @@  discard block
 block discarded – undo
3733 3732
         if ($session->get('user-admin') !== 1 && $session->get('user-manager') !== 1 && $data['personal_folder'] === '0') {
3734 3733
             $data = DB::queryfirstrow(
3735 3734
                 'SELECT valeur
3736
-                FROM ' . prefixTable('misc') . '
3735
+                FROM ' . prefixTable('misc').'
3737 3736
                 WHERE intitule = %i AND type = %s',
3738 3737
                 $data['parent_id'],
3739 3738
                 'complex'
3740 3739
             );
3741 3740
             if (intval($dataReceived['complexity']) < intval($data['valeur'])) {
3742
-                echo '[ { "error" : "' . $lang->get('error_folder_complexity_lower_than_top_folder') . ' [<b>' . TP_PW_COMPLEXITY[$data['valeur']][1] . '</b>]"} ]';
3741
+                echo '[ { "error" : "'.$lang->get('error_folder_complexity_lower_than_top_folder').' [<b>'.TP_PW_COMPLEXITY[$data['valeur']][1].'</b>]"} ]';
3743 3742
                 break;
3744 3743
             }
3745 3744
         }
3746 3745
 
3747 3746
         // update Folders table
3748 3747
         $tmp = DB::queryFirstRow(
3749
-            'SELECT title, parent_id, personal_folder FROM ' . prefixTable('nested_tree') . ' WHERE id = %i',
3748
+            'SELECT title, parent_id, personal_folder FROM '.prefixTable('nested_tree').' WHERE id = %i',
3750 3749
             $dataReceived['folder']
3751 3750
         );
3752 3751
         if ($tmp['parent_id'] !== 0 || $tmp['title'] !== $session->get('user-id') || $tmp['personal_folder'] !== 1) {
@@ -3860,7 +3859,7 @@  discard block
 block discarded – undo
3860 3859
             $uniqueLoadData['path'] = $arr_arbo;
3861 3860
 
3862 3861
             // store last folder accessed in cookie
3863
-            $arr_cookie_options = array (
3862
+            $arr_cookie_options = array(
3864 3863
                 'expires' => time() + TP_ONE_DAY_SECONDS * 5,
3865 3864
                 'path' => '/', 
3866 3865
                 'secure' => true,
@@ -3875,7 +3874,7 @@  discard block
 block discarded – undo
3875 3874
             foreach ($session->get('user-roles_array') as $role) {
3876 3875
                 $roleQ = DB::queryfirstrow(
3877 3876
                     'SELECT allow_pw_change
3878
-                    FROM ' . prefixTable('roles_title') . '
3877
+                    FROM ' . prefixTable('roles_title').'
3879 3878
                     WHERE id = %i',
3880 3879
                     $role
3881 3880
                 );
@@ -3906,11 +3905,11 @@  discard block
 block discarded – undo
3906 3905
                 
3907 3906
                 foreach ($session->get('user-roles_array') as $role) {
3908 3907
                     $access = DB::queryFirstRow(
3909
-                        'SELECT type FROM ' . prefixTable('roles_values') . ' WHERE role_id = %i AND folder_id = %i',
3908
+                        'SELECT type FROM '.prefixTable('roles_values').' WHERE role_id = %i AND folder_id = %i',
3910 3909
                         $role,
3911 3910
                         $inputData['id']
3912 3911
                     );
3913
-                    if (DB::count()>0) {
3912
+                    if (DB::count() > 0) {
3914 3913
                         if ($access['type'] === 'R') {
3915 3914
                             array_push($arrTmp, 10);
3916 3915
                         } elseif ($access['type'] === 'W') {
@@ -3975,7 +3974,7 @@  discard block
 block discarded – undo
3975 3974
             } else {
3976 3975
                 DB::query(
3977 3976
                     'SELECT *
3978
-                    FROM ' . prefixTable('items') . '
3977
+                    FROM ' . prefixTable('items').'
3979 3978
                     WHERE inactif = %i',
3980 3979
                     0
3981 3980
                 );
@@ -3985,7 +3984,7 @@  discard block
 block discarded – undo
3985 3984
 
3986 3985
             // Get folder complexity
3987 3986
             $folderComplexity = DB::queryFirstRow(
3988
-                'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %i',
3987
+                'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %i',
3989 3988
                 'complex',
3990 3989
                 $inputData['id']
3991 3990
             );
@@ -3997,7 +3996,7 @@  discard block
 block discarded – undo
3997 3996
             if (isset($SETTINGS['item_extra_fields']) && (int) $SETTINGS['item_extra_fields'] === 1) {
3998 3997
                 $folderRow = DB::query(
3999 3998
                     'SELECT id_category
4000
-                    FROM ' . prefixTable('categories_folders') . '
3999
+                    FROM ' . prefixTable('categories_folders').'
4001 4000
                     WHERE id_folder = %i',
4002 4001
                     $inputData['id']
4003 4002
                 );
@@ -4112,9 +4111,9 @@  discard block
 block discarded – undo
4112 4111
             // List all ITEMS
4113 4112
             if ($folderIsPf === false) {
4114 4113
                 $where->add('i.inactif=%i', 0);
4115
-                $sql_e='(SELECT date FROM ' . prefixTable('log_items') 
4114
+                $sql_e = '(SELECT date FROM '.prefixTable('log_items') 
4116 4115
                     . " WHERE action = 'at_creation' AND id_item=i.id " 
4117
-                    . 'union all SELECT date FROM '. prefixTable('log_items') 
4116
+                    . 'union all SELECT date FROM '.prefixTable('log_items') 
4118 4117
                     . " WHERE action = 'at_modification' AND raison = 'at_pw'
4119 4118
                     AND id_item=i.id ORDER BY date DESC LIMIT 1)";
4120 4119
                 $where->add('l.date=%l', $sql_e);
@@ -4122,8 +4121,8 @@  discard block
 block discarded – undo
4122 4121
                     $where->add('i.id IN %ls', explode(',', $limited_to_items));
4123 4122
                 }
4124 4123
 
4125
-                $query_limit = ' LIMIT ' .
4126
-                    $start . ',' .
4124
+                $query_limit = ' LIMIT '.
4125
+                    $start.','.
4127 4126
                     $post_nb_items_to_display_once;
4128 4127
                 //db::debugmode(true);
4129 4128
                 $rows = DB::query(
@@ -4135,9 +4134,9 @@  discard block
 block discarded – undo
4135 4134
                     l.id_user AS log_user,
4136 4135
                     i.url AS link,
4137 4136
                     i.email AS email
4138
-                    FROM ' . prefixTable('items') . ' AS i
4139
-                    INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id)
4140
-                    INNER JOIN ' . prefixTable('log_items') . ' AS l ON (i.id = l.id_item)
4137
+                    FROM ' . prefixTable('items').' AS i
4138
+                    INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id)
4139
+                    INNER JOIN ' . prefixTable('log_items').' AS l ON (i.id = l.id_item)
4141 4140
                     WHERE %l
4142 4141
                     GROUP BY i.id, l.date, l.id_user, l.action
4143 4142
                     ORDER BY i.label ASC, l.date DESC' . $query_limit,
@@ -4157,9 +4156,9 @@  discard block
 block discarded – undo
4157 4156
                     l.id_user AS log_user,
4158 4157
                     i.url AS link,
4159 4158
                     i.email AS email
4160
-                    FROM ' . prefixTable('items') . ' AS i
4161
-                    INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id)
4162
-                    INNER JOIN ' . prefixTable('log_items') . ' AS l ON (i.id = l.id_item)
4159
+                    FROM ' . prefixTable('items').' AS i
4160
+                    INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id)
4161
+                    INNER JOIN ' . prefixTable('log_items').' AS l ON (i.id = l.id_item)
4163 4162
                     WHERE %l
4164 4163
                     GROUP BY i.id, l.date, l.id_user, l.action
4165 4164
                     ORDER BY i.label ASC, l.date DESC',
@@ -4190,7 +4189,7 @@  discard block
 block discarded – undo
4190 4189
                     $item_is_restricted_to_role = false;
4191 4190
                     DB::queryfirstrow(
4192 4191
                         'SELECT role_id
4193
-                        FROM ' . prefixTable('restriction_to_roles') . '
4192
+                        FROM ' . prefixTable('restriction_to_roles').'
4194 4193
                         WHERE item_id = %i',
4195 4194
                         $record['id']
4196 4195
                     );
@@ -4202,7 +4201,7 @@  discard block
 block discarded – undo
4202 4201
                     $user_is_included_in_role = false;
4203 4202
                     DB::query(
4204 4203
                         'SELECT role_id
4205
-                        FROM ' . prefixTable('restriction_to_roles') . '
4204
+                        FROM ' . prefixTable('restriction_to_roles').'
4206 4205
                         WHERE item_id = %i AND role_id IN %ls',
4207 4206
                         $record['id'],
4208 4207
                         $session->get('user-roles_array')
@@ -4412,9 +4411,9 @@  discard block
 block discarded – undo
4412 4411
         if ((int) $start === 0) {
4413 4412
             DB::query(
4414 4413
                 'SELECT i.id
4415
-                FROM ' . prefixTable('items') . ' as i
4416
-                INNER JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree = n.id)
4417
-                INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id = l.id_item)
4414
+                FROM ' . prefixTable('items').' as i
4415
+                INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree = n.id)
4416
+                INNER JOIN ' . prefixTable('log_items').' as l ON (i.id = l.id_item)
4418 4417
                 WHERE %l
4419 4418
                 ORDER BY i.label ASC, l.date DESC',
4420 4419
                 $where
@@ -4479,8 +4478,8 @@  discard block
 block discarded – undo
4479 4478
         $dataItem = DB::queryfirstrow(
4480 4479
             'SELECT i.pw AS pw, s.share_key AS share_key, i.id AS id,
4481 4480
                     i.label AS label, i.id_tree AS id_tree
4482
-            FROM ' . prefixTable('items') . ' AS i
4483
-            INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (s.object_id = i.id)
4481
+            FROM ' . prefixTable('items').' AS i
4482
+            INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (s.object_id = i.id)
4484 4483
             WHERE user_id = %i AND (i.item_key = %s OR i.id = %i)',
4485 4484
             $session->get('user-id'),
4486 4485
             $inputData['itemKey'] ?? '',
@@ -4575,7 +4574,7 @@  discard block
 block discarded – undo
4575 4574
             // get if existing edition lock
4576 4575
             $dataItemEditionLocks = DB::query(
4577 4576
                 'SELECT timestamp, user_id
4578
-                FROM ' . prefixTable('items_edition') . '
4577
+                FROM ' . prefixTable('items_edition').'
4579 4578
                 WHERE item_id = %i 
4580 4579
                 ORDER BY increment_id DESC',
4581 4580
                 $inputData['itemId']
@@ -4584,7 +4583,7 @@  discard block
 block discarded – undo
4584 4583
             if (WIP === true) error_log('Existing edition locks: '.DB::count());
4585 4584
 
4586 4585
             // Check if item has no edition lock
4587
-            if ((int) DB::count() > 0 ) {
4586
+            if ((int) DB::count() > 0) {
4588 4587
                 // get last edition lock
4589 4588
                 $dataLastItemEditionLock = $dataItemEditionLocks[0];
4590 4589
 
@@ -4594,10 +4593,10 @@  discard block
 block discarded – undo
4594 4593
                 } else {
4595 4594
                     $delay = EDITION_LOCK_PERIOD; // One day delay
4596 4595
                 }
4597
-                if (WIP === true) error_log('delay: ' . $delay);
4596
+                if (WIP === true) error_log('delay: '.$delay);
4598 4597
 
4599 4598
                 // We remove old edition locks if delay is expired meaning more than 1 day long
4600
-                if (round(abs(time() - $dataTmp['timestamp']),0) > $delay) {
4599
+                if (round(abs(time() - $dataTmp['timestamp']), 0) > $delay) {
4601 4600
                     // Case where time is expired
4602 4601
                     // In this case, delete edition lock and possible ongoing processes
4603 4602
                     // and continue editing this time
@@ -4614,7 +4613,7 @@  discard block
 block discarded – undo
4614 4613
                         // Get process Id
4615 4614
                         $processDetail = DB::queryFirstRow(
4616 4615
                             'SELECT increment_id
4617
-                            FROM ' . prefixTable('background_tasks') . '
4616
+                            FROM ' . prefixTable('background_tasks').'
4618 4617
                             WHERE item_id = %i AND finished_at = ""',
4619 4618
                             $inputData['itemId']
4620 4619
                         );
@@ -4632,7 +4631,7 @@  discard block
 block discarded – undo
4632 4631
                     // get if existing process ongoing for this item
4633 4632
                     $dataItemProcessOngoing = DB::queryFirstRow(
4634 4633
                         'SELECT JSON_EXTRACT(arguments, "$.all_users_except_id") AS all_users_except_id
4635
-                        FROM ' . prefixTable('background_tasks') . '
4634
+                        FROM ' . prefixTable('background_tasks').'
4636 4635
                         WHERE item_id = %i AND finished_at = ""
4637 4636
                         ORDER BY increment_id DESC',
4638 4637
                         $inputData['itemId']
@@ -4659,7 +4658,7 @@  discard block
 block discarded – undo
4659 4658
                         );
4660 4659
                         break;
4661 4660
                     }
4662
-                } elseif (round(abs(time() - $dataTmp['timestamp']),0) <= $delay) {
4661
+                } elseif (round(abs(time() - $dataTmp['timestamp']), 0) <= $delay) {
4663 4662
                     // Case where edition lock is already taken by another user
4664 4663
                     // Then no edition is possible
4665 4664
                     $returnValues = array(
@@ -4688,7 +4687,7 @@  discard block
 block discarded – undo
4688 4687
         // do query on this folder
4689 4688
         $data_this_folder = DB::queryFirstRow(
4690 4689
             'SELECT id, personal_folder, title
4691
-            FROM ' . prefixTable('nested_tree') . '
4690
+            FROM ' . prefixTable('nested_tree').'
4692 4691
             WHERE id = %s',
4693 4692
             $inputData['folderId']
4694 4693
         );
@@ -4728,8 +4727,8 @@  discard block
 block discarded – undo
4728 4727
         $visibilite = '';
4729 4728
         $data = DB::queryFirstRow(
4730 4729
             'SELECT m.valeur, n.personal_folder
4731
-            FROM ' . prefixTable('misc') . ' AS m
4732
-            INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (m.intitule = n.id)
4730
+            FROM ' . prefixTable('misc').' AS m
4731
+            INNER JOIN ' . prefixTable('nested_tree').' AS n ON (m.intitule = n.id)
4733 4732
             WHERE type=%s AND intitule = %s',
4734 4733
             'complex',
4735 4734
             $inputData['folderId']
@@ -4742,8 +4741,8 @@  discard block
 block discarded – undo
4742 4741
             // Prepare Item actual visibility (what Users/Roles can see it)
4743 4742
             $rows = DB::query(
4744 4743
                 'SELECT t.title
4745
-                FROM ' . prefixTable('roles_values') . ' as v
4746
-                INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id)
4744
+                FROM ' . prefixTable('roles_values').' as v
4745
+                INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id)
4747 4746
                 WHERE v.folder_id = %i
4748 4747
                 GROUP BY title',
4749 4748
                 $inputData['folderId']
@@ -4752,7 +4751,7 @@  discard block
 block discarded – undo
4752 4751
                 if (empty($visibilite)) {
4753 4752
                     $visibilite = $record['title'];
4754 4753
                 } else {
4755
-                    $visibilite .= ' - ' . $record['title'];
4754
+                    $visibilite .= ' - '.$record['title'];
4756 4755
                 }
4757 4756
             }
4758 4757
         } else {
@@ -4762,14 +4761,14 @@  discard block
 block discarded – undo
4762 4761
             // do new query to know if current folder is pf
4763 4762
             $data_pf = DB::queryFirstRow(
4764 4763
                 'SELECT personal_folder
4765
-                FROM ' . prefixTable('nested_tree') . '
4764
+                FROM ' . prefixTable('nested_tree').'
4766 4765
                 WHERE id = %s',
4767 4766
                 $inputData['folderId']
4768 4767
             );
4769 4768
             
4770 4769
             $folder_is_personal = $data_pf !== null ? (int) $data_pf['personal_folder'] : 0;
4771 4770
             
4772
-            $visibilite = $session->get('user-name') . ' ' . $session->get('user-lastname') . ' (' . $session->get('user-login') . ')';
4771
+            $visibilite = $session->get('user-name').' '.$session->get('user-lastname').' ('.$session->get('user-login').')';
4773 4772
         }
4774 4773
 
4775 4774
         recupDroitCreationSansComplexite($inputData['folderId']);
@@ -4779,8 +4778,8 @@  discard block
 block discarded – undo
4779 4778
         $listOptionsForRoles = array();
4780 4779
         $rows = DB::query(
4781 4780
             'SELECT r.role_id AS role_id, t.title AS title
4782
-            FROM ' . prefixTable('roles_values') . ' AS r
4783
-            INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id)
4781
+            FROM ' . prefixTable('roles_values').' AS r
4782
+            INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id)
4784 4783
             WHERE r.folder_id = %i',
4785 4784
             $inputData['folderId']
4786 4785
         );
@@ -4794,7 +4793,7 @@  discard block
 block discarded – undo
4794 4793
             );
4795 4794
             $rows2 = DB::query(
4796 4795
                 'SELECT id, login, fonction_id, email, name, lastname
4797
-                FROM ' . prefixTable('users') . '
4796
+                FROM ' . prefixTable('users').'
4798 4797
                 WHERE admin = 0 AND fonction_id is not null'
4799 4798
             );
4800 4799
             foreach ($rows2 as $record2) {
@@ -4808,7 +4807,7 @@  discard block
 block discarded – undo
4808 4807
                             array(
4809 4808
                                 'id' => $record2['id'],
4810 4809
                                 'login' => $record2['login'],
4811
-                                'name' => $record2['name'] . ' ' . $record2['lastname'],
4810
+                                'name' => $record2['name'].' '.$record2['lastname'],
4812 4811
                                 'email' => $record2['email'],
4813 4812
                             )
4814 4813
                         );
@@ -4825,13 +4824,13 @@  discard block
 block discarded – undo
4825 4824
                 //db::debugmode(true);
4826 4825
                 $access = DB::queryFirstRow(
4827 4826
                     'SELECT type
4828
-                    FROM ' . prefixTable('roles_values') . '
4827
+                    FROM ' . prefixTable('roles_values').'
4829 4828
                     WHERE role_id = %i AND folder_id = %i',
4830 4829
                     $role,
4831 4830
                     $inputData['folderId']
4832 4831
                 );
4833 4832
                 //db::debugmode(false);
4834
-                if (DB::count()>0) {
4833
+                if (DB::count() > 0) {
4835 4834
                     if ($access['type'] === 'R') {
4836 4835
                         array_push($arrTmp, 10);
4837 4836
                     } elseif ($access['type'] === 'W') {
@@ -4859,7 +4858,7 @@  discard block
 block discarded – undo
4859 4858
             // Check if personal folder is owned by user
4860 4859
             $folder = DB::queryFirstRow(
4861 4860
                 'SELECT id
4862
-                FROM ' . prefixTable('nested_tree') . '
4861
+                FROM ' . prefixTable('nested_tree').'
4863 4862
                 WHERE title = %s',
4864 4863
                 $session->get('user-id'),
4865 4864
             );
@@ -4964,7 +4963,7 @@  discard block
 block discarded – undo
4964 4963
         // Get some info before deleting
4965 4964
         $data = DB::queryFirstRow(
4966 4965
             'SELECT name, id_item, file
4967
-            FROM ' . prefixTable('files') . '
4966
+            FROM ' . prefixTable('files').'
4968 4967
             WHERE id = %i',
4969 4968
             $fileId
4970 4969
         );
@@ -4972,7 +4971,7 @@  discard block
 block discarded – undo
4972 4971
         // Load item data
4973 4972
         $data_item = DB::queryFirstRow(
4974 4973
             'SELECT id_tree
4975
-            FROM ' . prefixTable('items') . '
4974
+            FROM ' . prefixTable('items').'
4976 4975
             WHERE id = %i',
4977 4976
             $data['id_item']
4978 4977
         );
@@ -5002,7 +5001,7 @@  discard block
 block discarded – undo
5002 5001
                 $session->get('user-id'),
5003 5002
                 'at_modification',
5004 5003
                 $session->get('user-login'),
5005
-                'at_del_file : ' . $data['name']
5004
+                'at_del_file : '.$data['name']
5006 5005
             );
5007 5006
 
5008 5007
             // DElete sharekeys
@@ -5013,7 +5012,7 @@  discard block
 block discarded – undo
5013 5012
             );
5014 5013
 
5015 5014
             // Delete file from server
5016
-            $fileToDelete = $SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($data['file']);
5015
+            $fileToDelete = $SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($data['file']);
5017 5016
             $fileToDelete = realpath($fileToDelete);
5018 5017
             if ($fileToDelete && strpos($fileToDelete, $SETTINGS['path_to_upload_folder']) === 0) {
5019 5018
                 fileDelete($fileToDelete, $SETTINGS);
@@ -5067,7 +5066,7 @@  discard block
 block discarded – undo
5067 5066
             // Update SESSION with this new favourite
5068 5067
             $data = DB::queryfirstrow(
5069 5068
                 'SELECT label,id_tree
5070
-                FROM ' . prefixTable('items') . '
5069
+                FROM ' . prefixTable('items').'
5071 5070
                 WHERE id = %i',
5072 5071
                 $inputData['itemId']
5073 5072
             );
@@ -5076,7 +5075,7 @@  discard block
 block discarded – undo
5076 5075
                 [
5077 5076
                     $inputData['itemId'] => [
5078 5077
                         'label' => $data['label'],
5079
-                        'url' => 'index.php?page=items&amp;group=' . $data['id_tree'] . '&amp;id=' . $inputData['itemId'],
5078
+                        'url' => 'index.php?page=items&amp;group='.$data['id_tree'].'&amp;id='.$inputData['itemId'],
5080 5079
                     ],
5081 5080
                 ],
5082 5081
                 'add'
@@ -5145,8 +5144,8 @@  discard block
 block discarded – undo
5145 5144
         // get data about item
5146 5145
         $dataSource = DB::queryfirstrow(
5147 5146
             'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label
5148
-            FROM ' . prefixTable('items') . ' as i
5149
-            INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id)
5147
+            FROM ' . prefixTable('items').' as i
5148
+            INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id)
5150 5149
             WHERE i.id=%i',
5151 5150
             $inputData['itemId']
5152 5151
         );
@@ -5190,7 +5189,7 @@  discard block
 block discarded – undo
5190 5189
         // get data about new folder
5191 5190
         $dataDestination = DB::queryfirstrow(
5192 5191
             'SELECT personal_folder, title
5193
-            FROM ' . prefixTable('nested_tree') . '
5192
+            FROM ' . prefixTable('nested_tree').'
5194 5193
             WHERE id = %i',
5195 5194
             $inputData['folderId']
5196 5195
         );
@@ -5243,7 +5242,7 @@  discard block
 block discarded – undo
5243 5242
             // Get fields for this Item
5244 5243
             $rows = DB::query(
5245 5244
                 'SELECT id
5246
-                FROM ' . prefixTable('categories_items') . '
5245
+                FROM ' . prefixTable('categories_items').'
5247 5246
                 WHERE item_id = %i',
5248 5247
                 $inputData['itemId']
5249 5248
             );
@@ -5260,7 +5259,7 @@  discard block
 block discarded – undo
5260 5259
             // Get FILES for this Item
5261 5260
             $rows = DB::query(
5262 5261
                 'SELECT id
5263
-                FROM ' . prefixTable('files') . '
5262
+                FROM ' . prefixTable('files').'
5264 5263
                 WHERE id_item = %i',
5265 5264
                 $inputData['itemId']
5266 5265
             );
@@ -5307,7 +5306,7 @@  discard block
 block discarded – undo
5307 5306
             // Get the ITEM object key for the user
5308 5307
             $userKey = DB::queryFirstRow(
5309 5308
                 'SELECT share_key
5310
-                FROM ' . prefixTable('sharekeys_items') . '
5309
+                FROM ' . prefixTable('sharekeys_items').'
5311 5310
                 WHERE user_id = %i AND object_id = %i',
5312 5311
                 $session->get('user-id'),
5313 5312
                 $inputData['itemId']
@@ -5318,7 +5317,7 @@  discard block
 block discarded – undo
5318 5317
                 // This is a public object
5319 5318
                 $users = DB::query(
5320 5319
                     'SELECT id, public_key
5321
-                    FROM ' . prefixTable('users') . '
5320
+                    FROM ' . prefixTable('users').'
5322 5321
                     WHERE id NOT IN %li
5323 5322
                     AND public_key != ""',
5324 5323
                     $tpUsersIDs
@@ -5341,14 +5340,14 @@  discard block
 block discarded – undo
5341 5340
             // Get fields for this Item
5342 5341
             $rows = DB::query(
5343 5342
                 'SELECT id
5344
-                FROM ' . prefixTable('categories_items') . '
5343
+                FROM ' . prefixTable('categories_items').'
5345 5344
                 WHERE item_id = %i',
5346 5345
                 $inputData['itemId']
5347 5346
             );
5348 5347
             foreach ($rows as $field) {
5349 5348
                 $userKey = DB::queryFirstRow(
5350 5349
                     'SELECT share_key
5351
-                    FROM ' . prefixTable('sharekeys_fields') . '
5350
+                    FROM ' . prefixTable('sharekeys_fields').'
5352 5351
                     WHERE user_id = %i AND object_id = %i',
5353 5352
                     $session->get('user-id'),
5354 5353
                     $field['id']
@@ -5359,7 +5358,7 @@  discard block
 block discarded – undo
5359 5358
                     // This is a public object
5360 5359
                     $users = DB::query(
5361 5360
                         'SELECT id, public_key
5362
-                        FROM ' . prefixTable('users') . '
5361
+                        FROM ' . prefixTable('users').'
5363 5362
                         WHERE id NOT IN %li
5364 5363
                         AND public_key != ""',
5365 5364
                         $tpUsersIDs
@@ -5382,14 +5381,14 @@  discard block
 block discarded – undo
5382 5381
             // Get FILES for this Item
5383 5382
             $rows = DB::query(
5384 5383
                 'SELECT id
5385
-                FROM ' . prefixTable('files') . '
5384
+                FROM ' . prefixTable('files').'
5386 5385
                 WHERE id_item = %i',
5387 5386
                 $inputData['itemId']
5388 5387
             );
5389 5388
             foreach ($rows as $attachment) {
5390 5389
                 $userKey = DB::queryFirstRow(
5391 5390
                     'SELECT share_key
5392
-                    FROM ' . prefixTable('sharekeys_files') . '
5391
+                    FROM ' . prefixTable('sharekeys_files').'
5393 5392
                     WHERE user_id = %i AND object_id = %i',
5394 5393
                     $session->get('user-id'),
5395 5394
                     $attachment['id']
@@ -5400,7 +5399,7 @@  discard block
 block discarded – undo
5400 5399
                     // This is a public object
5401 5400
                     $users = DB::query(
5402 5401
                         'SELECT id, public_key
5403
-                        FROM ' . prefixTable('users') . '
5402
+                        FROM ' . prefixTable('users').'
5404 5403
                         WHERE id NOT IN %li
5405 5404
                         AND public_key != ""',
5406 5405
                         $tpUsersIDs
@@ -5441,7 +5440,7 @@  discard block
 block discarded – undo
5441 5440
             $session->get('user-id'),
5442 5441
             'at_modification',
5443 5442
             $session->get('user-login'),
5444
-            'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title']
5443
+            'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title']
5445 5444
         );
5446 5445
 
5447 5446
         // Update cache table
@@ -5500,8 +5499,8 @@  discard block
 block discarded – undo
5500 5499
                 // get data about item
5501 5500
                 $dataSource = DB::queryfirstrow(
5502 5501
                     'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label
5503
-                    FROM ' . prefixTable('items') . ' as i
5504
-                    INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id)
5502
+                    FROM ' . prefixTable('items').' as i
5503
+                    INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id)
5505 5504
                     WHERE i.id=%i',
5506 5505
                     $item_id
5507 5506
                 );
@@ -5523,7 +5522,7 @@  discard block
 block discarded – undo
5523 5522
 
5524 5523
                 // get data about new folder
5525 5524
                 $dataDestination = DB::queryfirstrow(
5526
-                    'SELECT personal_folder, title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i',
5525
+                    'SELECT personal_folder, title FROM '.prefixTable('nested_tree').' WHERE id = %i',
5527 5526
                     $inputData['folderId']
5528 5527
                 );
5529 5528
 
@@ -5565,7 +5564,7 @@  discard block
 block discarded – undo
5565 5564
                     // Get fields for this Item
5566 5565
                     $rows = DB::query(
5567 5566
                         'SELECT id
5568
-                        FROM ' . prefixTable('categories_items') . '
5567
+                        FROM ' . prefixTable('categories_items').'
5569 5568
                         WHERE item_id = %i',
5570 5569
                         $item_id
5571 5570
                     );
@@ -5582,7 +5581,7 @@  discard block
 block discarded – undo
5582 5581
                     // Get FILES for this Item
5583 5582
                     $rows = DB::query(
5584 5583
                         'SELECT id
5585
-                        FROM ' . prefixTable('files') . '
5584
+                        FROM ' . prefixTable('files').'
5586 5585
                         WHERE id_item = %i',
5587 5586
                         $item_id
5588 5587
                     );
@@ -5637,7 +5636,7 @@  discard block
 block discarded – undo
5637 5636
                     // Get the ITEM object key for the user
5638 5637
                     $userKey = DB::queryFirstRow(
5639 5638
                         'SELECT share_key
5640
-                        FROM ' . prefixTable('sharekeys_items') . '
5639
+                        FROM ' . prefixTable('sharekeys_items').'
5641 5640
                         WHERE user_id = %i AND object_id = %i',
5642 5641
                         $session->get('user-id'),
5643 5642
                         $item_id
@@ -5648,7 +5647,7 @@  discard block
 block discarded – undo
5648 5647
                         // This is a public object
5649 5648
                         $users = DB::query(
5650 5649
                             'SELECT id, public_key
5651
-                            FROM ' . prefixTable('users') . '
5650
+                            FROM ' . prefixTable('users').'
5652 5651
                             WHERE id NOT IN %li
5653 5652
                             AND public_key != ""',
5654 5653
                             $tpUsersIDs
@@ -5671,14 +5670,14 @@  discard block
 block discarded – undo
5671 5670
                     // Get fields for this Item
5672 5671
                     $rows = DB::query(
5673 5672
                         'SELECT id
5674
-                        FROM ' . prefixTable('categories_items') . '
5673
+                        FROM ' . prefixTable('categories_items').'
5675 5674
                         WHERE item_id = %i',
5676 5675
                         $item_id
5677 5676
                     );
5678 5677
                     foreach ($rows as $field) {
5679 5678
                         $userKey = DB::queryFirstRow(
5680 5679
                             'SELECT share_key
5681
-                            FROM ' . prefixTable('sharekeys_fields') . '
5680
+                            FROM ' . prefixTable('sharekeys_fields').'
5682 5681
                             WHERE user_id = %i AND object_id = %i',
5683 5682
                             $session->get('user-id'),
5684 5683
                             $field['id']
@@ -5689,7 +5688,7 @@  discard block
 block discarded – undo
5689 5688
                             // This is a public object
5690 5689
                             $users = DB::query(
5691 5690
                                 'SELECT id, public_key
5692
-                                FROM ' . prefixTable('users') . '
5691
+                                FROM ' . prefixTable('users').'
5693 5692
                                 WHERE id NOT IN %li
5694 5693
                                 AND public_key != ""',
5695 5694
                                 $tpUsersIDs
@@ -5713,14 +5712,14 @@  discard block
 block discarded – undo
5713 5712
                     // Get FILES for this Item
5714 5713
                     $rows = DB::query(
5715 5714
                         'SELECT id
5716
-                        FROM ' . prefixTable('files') . '
5715
+                        FROM ' . prefixTable('files').'
5717 5716
                         WHERE id_item = %i',
5718 5717
                         $item_id
5719 5718
                     );
5720 5719
                     foreach ($rows as $attachment) {
5721 5720
                         $userKey = DB::queryFirstRow(
5722 5721
                             'SELECT share_key
5723
-                            FROM ' . prefixTable('sharekeys_files') . '
5722
+                            FROM ' . prefixTable('sharekeys_files').'
5724 5723
                             WHERE user_id = %i AND object_id = %i',
5725 5724
                             $session->get('user-id'),
5726 5725
                             $attachment['id']
@@ -5731,7 +5730,7 @@  discard block
 block discarded – undo
5731 5730
                             // This is a public object
5732 5731
                             $users = DB::query(
5733 5732
                                 'SELECT id, public_key
5734
-                                FROM ' . prefixTable('users') . '
5733
+                                FROM ' . prefixTable('users').'
5735 5734
                                 WHERE id NOT IN %li
5736 5735
                                 AND public_key != ""',
5737 5736
                                 $tpUsersIDs
@@ -5771,13 +5770,13 @@  discard block
 block discarded – undo
5771 5770
                     $session->get('user-id'),
5772 5771
                     'at_modification',
5773 5772
                     $session->get('user-login'),
5774
-                    'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title']
5773
+                    'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title']
5775 5774
                 );
5776 5775
             }
5777 5776
         }
5778 5777
 
5779 5778
         // reload cache table
5780
-        require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
5779
+        require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
5781 5780
         updateCacheTable('reload', null);
5782 5781
 
5783 5782
         echo (string) prepareExchangedData(
@@ -5841,7 +5840,7 @@  discard block
 block discarded – undo
5841 5840
                 // get info
5842 5841
                 $dataSource = DB::queryfirstrow(
5843 5842
                     'SELECT label, id_tree
5844
-                    FROM ' . prefixTable('items') . '
5843
+                    FROM ' . prefixTable('items').'
5845 5844
                     WHERE id=%i',
5846 5845
                     $item_id
5847 5846
                 );
@@ -5942,14 +5941,14 @@  discard block
 block discarded – undo
5942 5941
             // Variables
5943 5942
             $dataAuthor = DB::queryfirstrow(
5944 5943
                 'SELECT email,login
5945
-                FROM ' . prefixTable('users') . '
5944
+                FROM ' . prefixTable('users').'
5946 5945
                 WHERE id = %i',
5947 5946
                 $post_content[1]
5948 5947
             );
5949 5948
 
5950 5949
             $dataItem = DB::queryfirstrow(
5951 5950
                 'SELECT label, id_tree
5952
-                FROM ' . prefixTable('items') . '
5951
+                FROM ' . prefixTable('items').'
5953 5952
                 WHERE id = %i',
5954 5953
                 $post_content[0]
5955 5954
             );
@@ -5966,7 +5965,7 @@  discard block
 block discarded – undo
5966 5965
                 $lang->get('email_request_access_subject'),
5967 5966
                 str_replace(
5968 5967
                     array('#tp_item_author#', '#tp_user#', '#tp_item#'),
5969
-                    array(' ' . addslashes($dataAuthor['login']), addslashes($session->get('user-login')), $path),
5968
+                    array(' '.addslashes($dataAuthor['login']), addslashes($session->get('user-login')), $path),
5970 5969
                     $lang->get('email_request_access_mail')
5971 5970
                 ),
5972 5971
                 $dataAuthor['email'],
@@ -5975,7 +5974,7 @@  discard block
 block discarded – undo
5975 5974
         } elseif ($inputData['cat'] === 'share_this_item') {
5976 5975
             $dataItem = DB::queryfirstrow(
5977 5976
                 'SELECT label,id_tree
5978
-                FROM ' . prefixTable('items') . '
5977
+                FROM ' . prefixTable('items').'
5979 5978
                 WHERE id= %i',
5980 5979
                 $inputData['id']
5981 5980
             );
@@ -5998,7 +5997,7 @@  discard block
 block discarded – undo
5998 5997
                     ),
5999 5998
                     array(
6000 5999
                         !empty($SETTINGS['email_server_url']) ?
6001
-                            $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $inputData['id'] : $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $inputData['id'],
6000
+                            $SETTINGS['email_server_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$inputData['id'] : $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$inputData['id'],
6002 6001
                         addslashes($session->get('user-login')),
6003 6002
                         addslashes($path),
6004 6003
                     ),
@@ -6047,8 +6046,8 @@  discard block
 block discarded – undo
6047 6046
         // Get all informations for this item
6048 6047
         $dataItem = DB::queryfirstrow(
6049 6048
             'SELECT *
6050
-            FROM ' . prefixTable('items') . ' as i
6051
-            INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id)
6049
+            FROM ' . prefixTable('items').' as i
6050
+            INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id)
6052 6051
             WHERE i.id=%i AND l.action = %s',
6053 6052
             $item_id,
6054 6053
             'at_creation'
@@ -6077,18 +6076,18 @@  discard block
 block discarded – undo
6077 6076
                 $session->get('user-login'),
6078 6077
                 htmlspecialchars_decode($label, ENT_QUOTES),
6079 6078
                 null,
6080
-                (string) dateToStamp($date.' '.$time, $SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'])
6079
+                (string) dateToStamp($date.' '.$time, $SETTINGS['date_format'].' '.$SETTINGS['time_format'])
6081 6080
             );
6082 6081
             // Prepare new line
6083 6082
             $data = DB::queryfirstrow(
6084
-                'SELECT * FROM ' . prefixTable('log_items') . ' WHERE id_item = %i ORDER BY date DESC',
6083
+                'SELECT * FROM '.prefixTable('log_items').' WHERE id_item = %i ORDER BY date DESC',
6085 6084
                 $item_id
6086 6085
             );
6087
-            $historic = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $data['date']) . ' - ' . $session->get('user-login') . ' - ' . $lang->get($data['action']) . ' - ' . $data['raison'];
6086
+            $historic = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $data['date']).' - '.$session->get('user-login').' - '.$lang->get($data['action']).' - '.$data['raison'];
6088 6087
             // send back
6089 6088
             $data = array(
6090 6089
                 'error' => '',
6091
-                'new_line' => '<br>' . addslashes($historic),
6090
+                'new_line' => '<br>'.addslashes($historic),
6092 6091
             );
6093 6092
             echo (string) prepareExchangedData(
6094 6093
                 $data,
@@ -6163,8 +6162,8 @@  discard block
 block discarded – undo
6163 6162
         // Should we log a password change?
6164 6163
         $itemQ = DB::queryFirstRow(
6165 6164
             'SELECT s.share_key, i.pw
6166
-            FROM ' . prefixTable('items') . ' AS i
6167
-            INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (i.id = s.object_id)
6165
+            FROM ' . prefixTable('items').' AS i
6166
+            INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (i.id = s.object_id)
6168 6167
             WHERE s.user_id = %i AND s.object_id = %i',
6169 6168
             $session->get('user-id'),
6170 6169
             $dataReceived['id']
@@ -6219,7 +6218,7 @@  discard block
 block discarded – undo
6219 6218
         if (isset($SETTINGS['otv_expiration_period']) === false) {
6220 6219
             $SETTINGS['otv_expiration_period'] = 7;
6221 6220
         }
6222
-        $url = $SETTINGS['cpassman_url'] . '/index.php?' . http_build_query($otv_session);
6221
+        $url = $SETTINGS['cpassman_url'].'/index.php?'.http_build_query($otv_session);
6223 6222
 
6224 6223
         echo json_encode(
6225 6224
             array(
@@ -6250,7 +6249,7 @@  discard block
 block discarded – undo
6250 6249
         // get parameters from original link
6251 6250
         $url = $dataReceived['original_link'];
6252 6251
         $parts = parse_url($url);
6253
-        if(isset($parts['query'])){
6252
+        if (isset($parts['query'])) {
6254 6253
             parse_str($parts['query'], $orignal_link_parameters);
6255 6254
         } else {
6256 6255
             $orignal_link_parameters = array();
@@ -6281,13 +6280,13 @@  discard block
 block discarded – undo
6281 6280
             $domain_scheme = parse_url($SETTINGS['cpassman_url'], PHP_URL_SCHEME);
6282 6281
             $domain_host = parse_url($SETTINGS['cpassman_url'], PHP_URL_HOST);
6283 6282
             if (str_contains($domain_host, 'www.') === true) {
6284
-                $domain_host = (string) $SETTINGS['otv_subdomain'] . '.' . substr($domain_host, 4);
6283
+                $domain_host = (string) $SETTINGS['otv_subdomain'].'.'.substr($domain_host, 4);
6285 6284
             } else {
6286
-                $domain_host = (string) $SETTINGS['otv_subdomain'] . '.' . $domain_host;
6285
+                $domain_host = (string) $SETTINGS['otv_subdomain'].'.'.$domain_host;
6287 6286
             }
6288
-            $url = $domain_scheme.'://'.$domain_host . '/index.php?'.http_build_query($otv_session);
6287
+            $url = $domain_scheme.'://'.$domain_host.'/index.php?'.http_build_query($otv_session);
6289 6288
         } else {
6290
-            $url = $SETTINGS['cpassman_url'] . '/index.php?'.http_build_query($otv_session);
6289
+            $url = $SETTINGS['cpassman_url'].'/index.php?'.http_build_query($otv_session);
6291 6290
         }
6292 6291
 
6293 6292
         echo (string) prepareExchangedData(
@@ -6322,8 +6321,8 @@  discard block
 block discarded – undo
6322 6321
             'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status,
6323 6322
             f.extension AS extension, f.type AS type,
6324 6323
             s.share_key AS share_key
6325
-            FROM ' . prefixTable('files') . ' AS f
6326
-            INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id)
6324
+            FROM ' . prefixTable('files').' AS f
6325
+            INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id)
6327 6326
             WHERE s.user_id = %i AND s.object_id = %i',
6328 6327
             $session->get('user-id'),
6329 6328
             $inputData['id']
@@ -6344,7 +6343,7 @@  discard block
 block discarded – undo
6344 6343
         //$fileName = basename($file_info['name'], '.'.$file_info['extension']);
6345 6344
 
6346 6345
         // prepare image info
6347
-        $post_title = basename($file_info['name'], '.' . $file_info['extension']);
6346
+        $post_title = basename($file_info['name'], '.'.$file_info['extension']);
6348 6347
         $post_title = isBase64($post_title) === true ? base64_decode($post_title) : $post_title;
6349 6348
         
6350 6349
         // Get image content
@@ -6371,7 +6370,7 @@  discard block
 block discarded – undo
6371 6370
         echo (string) prepareExchangedData(
6372 6371
             array(
6373 6372
                 'error' => false,
6374
-                'filename' => $post_title . '.' . $file_info['extension'],
6373
+                'filename' => $post_title.'.'.$file_info['extension'],
6375 6374
                 'file_type' => $file_info['type'],
6376 6375
                 'file_content' => $fileContent,
6377 6376
             ),
@@ -6485,7 +6484,7 @@  discard block
 block discarded – undo
6485 6484
                     $arbo = $tree->getPath($folder->id, false);
6486 6485
                     $path = '';
6487 6486
                     foreach ($arbo as $elem) {
6488
-                        $path = (empty($path) ? '' : $path . ' / ') . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
6487
+                        $path = (empty($path) ? '' : $path.' / ').htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
6489 6488
                     }
6490 6489
 
6491 6490
                     // Build array
@@ -6554,7 +6553,7 @@  discard block
 block discarded – undo
6554 6553
         if (is_array($foldersArray) === true && $inputData['data'] !== '[null]') {
6555 6554
             $rows = DB::query(
6556 6555
                 'SELECT id, categories
6557
-                FROM ' . prefixTable('nested_tree') . '
6556
+                FROM ' . prefixTable('nested_tree').'
6558 6557
                 WHERE id IN (%l)',
6559 6558
                 implode(',', $foldersArray)
6560 6559
             );
@@ -6596,7 +6595,7 @@  discard block
 block discarded – undo
6596 6595
         // get item info
6597 6596
         $dataItem = DB::queryFirstRow(
6598 6597
             'SELECT *
6599
-            FROM ' . prefixTable('items') . '
6598
+            FROM ' . prefixTable('items').'
6600 6599
             WHERE id=%i',
6601 6600
             $inputData['itemId']
6602 6601
         );
@@ -6608,8 +6607,8 @@  discard block
 block discarded – undo
6608 6607
             'SELECT l.date as date, l.action as action, l.raison as raison,
6609 6608
                 u.login as login, u.avatar_thumb as avatar_thumb, u.name as name, u.lastname as lastname,
6610 6609
                 l.old_value as old_value
6611
-            FROM ' . prefixTable('log_items') . ' as l
6612
-            INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id)
6610
+            FROM ' . prefixTable('log_items').' as l
6611
+            INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id)
6613 6612
             WHERE id_item=%i AND l.action NOT IN (%l)
6614 6613
             ORDER BY date DESC',
6615 6614
             $inputData['itemId'],
@@ -6624,18 +6623,18 @@  discard block
 block discarded – undo
6624 6623
             
6625 6624
             // imported via API
6626 6625
             if (empty($record['login'])) {
6627
-                $record['login'] = $lang->get('imported_via_api') . ' [' . $record['raison'] . ']';
6626
+                $record['login'] = $lang->get('imported_via_api').' ['.$record['raison'].']';
6628 6627
             }
6629 6628
             
6630 6629
             // Prepare avatar
6631 6630
             if (isset($record['avatar_thumb']) && !empty($record['avatar_thumb'])) {
6632
-                if (file_exists($SETTINGS['cpassman_dir'] . '/includes/avatars/' . $record['avatar_thumb'])) {
6633
-                    $avatar = $SETTINGS['cpassman_url'] . '/includes/avatars/' . $record['avatar_thumb'];
6631
+                if (file_exists($SETTINGS['cpassman_dir'].'/includes/avatars/'.$record['avatar_thumb'])) {
6632
+                    $avatar = $SETTINGS['cpassman_url'].'/includes/avatars/'.$record['avatar_thumb'];
6634 6633
                 } else {
6635
-                    $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg';
6634
+                    $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg';
6636 6635
                 }
6637 6636
             } else {
6638
-                $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg';
6637
+                $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg';
6639 6638
             }
6640 6639
 
6641 6640
             // Prepare action
@@ -6655,7 +6654,7 @@  discard block
 block discarded – undo
6655 6654
                         $previous_passwords, 
6656 6655
                         [
6657 6656
                             'password' => htmlentities($previous_pwd['string']),
6658
-                            'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']),
6657
+                            'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']),
6659 6658
                         ]
6660 6659
                     );
6661 6660
                 }
@@ -6668,19 +6667,19 @@  discard block
 block discarded – undo
6668 6667
                 $action = $lang->get($reason[0]);
6669 6668
                 if ($reason[0] === 'at_moved') {
6670 6669
                     $tmp = explode(' -> ', $reason[1]);
6671
-                    $detail = $lang->get('from') . ' <span class="font-weight-light">' . $tmp[0] . '</span> ' . $lang->get('to') . ' <span class="font-weight-light">' . $tmp[1] . ' </span>';
6670
+                    $detail = $lang->get('from').' <span class="font-weight-light">'.$tmp[0].'</span> '.$lang->get('to').' <span class="font-weight-light">'.$tmp[1].' </span>';
6672 6671
                 } elseif ($reason[0] === 'at_field') {
6673 6672
                     $tmp = explode(' => ', $reason[1]);
6674 6673
                     if (count($tmp) > 1) {
6675
-                        $detail = '<b>' . trim($tmp[0]) . '</b> | ' . $lang->get('previous_value') .
6676
-                            ': <span class="font-weight-light">' . trim($tmp[1]) . '</span>';
6674
+                        $detail = '<b>'.trim($tmp[0]).'</b> | '.$lang->get('previous_value').
6675
+                            ': <span class="font-weight-light">'.trim($tmp[1]).'</span>';
6677 6676
                     } else {
6678 6677
                         $detail = trim($reason[1]);
6679 6678
                     }
6680 6679
                 } elseif (in_array($reason[0], array('at_restriction', 'at_email', 'at_login', 'at_label', 'at_url', 'at_tag')) === true) {
6681 6680
                     $tmp = explode(' => ', $reason[1]);
6682 6681
                     $detail = empty(trim($tmp[0])) ?
6683
-                        $lang->get('no_previous_value') : $lang->get('previous_value') . ': <span class="font-weight-light">' . $tmp[0] . ' </span>';
6682
+                        $lang->get('no_previous_value') : $lang->get('previous_value').': <span class="font-weight-light">'.$tmp[0].' </span>';
6684 6683
                 } elseif ($reason[0] === 'at_automatic_del') {
6685 6684
                     $detail = $lang->get($reason[1]);
6686 6685
                 } elseif ($reason[0] === 'at_anyoneconmodify' || $reason[0] === 'at_otp_status') {
@@ -6689,7 +6688,7 @@  discard block
 block discarded – undo
6689 6688
                     $tmp = explode(':', $reason[1]);
6690 6689
                     $tmp = explode('.', $tmp[0]);
6691 6690
                     $detail = isBase64($tmp[0]) === true ?
6692
-                        base64_decode($tmp[0]) . '.' . $tmp[1] : $tmp[0];
6691
+                        base64_decode($tmp[0]).'.'.$tmp[1] : $tmp[0];
6693 6692
                 } elseif ($reason[0] === 'at_import') {
6694 6693
                     $detail = '';
6695 6694
                 } elseif (in_array($reason[0], array('csv', 'pdf')) === true) {
@@ -6708,8 +6707,8 @@  discard block
 block discarded – undo
6708 6707
                 array(
6709 6708
                     'avatar' => $avatar,
6710 6709
                     'login' => $record['login'],
6711
-                    'name' => $record['name'] . ' ' . $record['lastname'],
6712
-                    'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']),
6710
+                    'name' => $record['name'].' '.$record['lastname'],
6711
+                    'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']),
6713 6712
                     'action' => $action,
6714 6713
                     'detail' => $detail,
6715 6714
                 )
@@ -6798,11 +6797,11 @@  discard block
 block discarded – undo
6798 6797
 
6799 6798
         // get some info to add to the notification email
6800 6799
         $resp_user = DB::queryfirstrow(
6801
-            'SELECT login FROM ' . prefixTable('users') . ' WHERE id = %i',
6800
+            'SELECT login FROM '.prefixTable('users').' WHERE id = %i',
6802 6801
             $session->get('user-id')
6803 6802
         );
6804 6803
         $resp_folder = DB::queryfirstrow(
6805
-            'SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i',
6804
+            'SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i',
6806 6805
             $folder
6807 6806
         );
6808 6807
 
@@ -6811,7 +6810,7 @@  discard block
 block discarded – undo
6811 6810
         $emailService = new EmailService();
6812 6811
         $rows = DB::query(
6813 6812
             'SELECT email
6814
-            FROM ' . prefixTable('users') . '
6813
+            FROM ' . prefixTable('users').'
6815 6814
             WHERE `gestionnaire` = %i AND `email` IS NOT NULL',
6816 6815
             1
6817 6816
         );
@@ -6857,7 +6856,7 @@  discard block
 block discarded – undo
6857 6856
         // Send email
6858 6857
         $dataItem = DB::queryfirstrow(
6859 6858
             'SELECT label, id_tree
6860
-            FROM ' . prefixTable('items') . '
6859
+            FROM ' . prefixTable('items').'
6861 6860
             WHERE id = %i',
6862 6861
             $inputData['itemId']
6863 6862
         );
@@ -6911,7 +6910,7 @@  discard block
 block discarded – undo
6911 6910
 
6912 6911
         DB::query(
6913 6912
             'SELECT *
6914
-            FROM ' . prefixTable('notification') . '
6913
+            FROM ' . prefixTable('notification').'
6915 6914
             WHERE item_id = %i AND user_id = %i',
6916 6915
             $inputData['itemId'],
6917 6916
             $session->get('user-id')
@@ -6983,7 +6982,7 @@  discard block
 block discarded – undo
6983 6982
         // And related logs
6984 6983
         $rows = DB::query(
6985 6984
             'SELECT id, file AS filename
6986
-            FROM ' . prefixTable('files') . '
6985
+            FROM ' . prefixTable('files').'
6987 6986
             WHERE id_item = %i AND confirmed = %i',
6988 6987
             $inputData['itemId'],
6989 6988
             0
@@ -6997,12 +6996,12 @@  discard block
 block discarded – undo
6997 6996
             );
6998 6997
 
6999 6998
             // Delete file on server
7000
-            unlink($SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($file['filename']));
6999
+            unlink($SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($file['filename']));
7001 7000
 
7002 7001
             // Delete related logs
7003 7002
             $logFile = DB::query(
7004 7003
                 'SELECT increment_id, raison
7005
-                FROM ' . prefixTable('log_items') . '
7004
+                FROM ' . prefixTable('log_items').'
7006 7005
                 WHERE id_item = %i AND id_user = %i AND action = %s AND raison LIKE "at_add_file :%"',
7007 7006
                 $inputData['itemId'],
7008 7007
                 $session->get('user-id'),
@@ -7061,7 +7060,7 @@  discard block
 block discarded – undo
7061 7060
         // Confirm attachments
7062 7061
         $rows = DB::query(
7063 7062
             'SELECT id, file AS filename
7064
-            FROM ' . prefixTable('files') . '
7063
+            FROM ' . prefixTable('files').'
7065 7064
             WHERE id_item = %i AND confirmed = %i',
7066 7065
             $inputData['itemId'],
7067 7066
             0
@@ -7147,15 +7146,15 @@  discard block
 block discarded – undo
7147 7146
         case 'autocomplete_tags':
7148 7147
             // Get a list off all existing TAGS
7149 7148
             $listOfTags = '';
7150
-            $rows = DB::query('SELECT tag FROM ' . prefixTable('tags') . ' WHERE tag LIKE %ss GROUP BY tag', $inputData['getTerm']);
7149
+            $rows = DB::query('SELECT tag FROM '.prefixTable('tags').' WHERE tag LIKE %ss GROUP BY tag', $inputData['getTerm']);
7151 7150
             foreach ($rows as $record) {
7152 7151
                 if (empty($listOfTags)) {
7153
-                    $listOfTags = '"' . $record['tag'] . '"';
7152
+                    $listOfTags = '"'.$record['tag'].'"';
7154 7153
                 } else {
7155
-                    $listOfTags .= ', "' . $record['tag'] . '"';
7154
+                    $listOfTags .= ', "'.$record['tag'].'"';
7156 7155
                 }
7157 7156
             }
7158
-            echo '[' . $listOfTags . ']';
7157
+            echo '['.$listOfTags.']';
7159 7158
             break;
7160 7159
     }
7161 7160
 }
@@ -7171,7 +7170,7 @@  discard block
 block discarded – undo
7171 7170
 {
7172 7171
     $data = DB::queryFirstRow(
7173 7172
         'SELECT bloquer_creation, bloquer_modification, personal_folder
7174
-        FROM ' . prefixTable('nested_tree') . ' WHERE id = %i',
7173
+        FROM ' . prefixTable('nested_tree').' WHERE id = %i',
7175 7174
         $groupe
7176 7175
     );
7177 7176
     // Check if it's in a personal folder. If yes, then force complexity overhead.
@@ -7275,7 +7274,7 @@  discard block
 block discarded – undo
7275 7274
     global $SETTINGS;
7276 7275
 
7277 7276
     // Retrieve the current lock information for the item
7278
-    $itemLockInfo = DB::queryFirstRow('SELECT timestamp, user_id FROM ' . prefixTable('items_edition') . ' WHERE item_id = %i', $itemId);
7277
+    $itemLockInfo = DB::queryFirstRow('SELECT timestamp, user_id FROM '.prefixTable('items_edition').' WHERE item_id = %i', $itemId);
7279 7278
 
7280 7279
     // Check if the item is locked by another user
7281 7280
     if ($itemLockInfo && $itemLockInfo['user_id'] !== $userId) {
@@ -7294,7 +7293,7 @@  discard block
 block discarded – undo
7294 7293
     
7295 7294
     // Check if there's an ongoing background encryption process for the item
7296 7295
     $ongoingProcess = DB::queryFirstRow(
7297
-        'SELECT 1 FROM ' . prefixTable('background_tasks') . ' WHERE item_id = %i AND finished_at = "" LIMIT 1', 
7296
+        'SELECT 1 FROM '.prefixTable('background_tasks').' WHERE item_id = %i AND finished_at = "" LIMIT 1', 
7298 7297
         $itemId
7299 7298
     );
7300 7299
 
@@ -7312,7 +7311,7 @@  discard block
 block discarded – undo
7312 7311
 function getUserVisibleFolders(int $userId): array
7313 7312
 {
7314 7313
     // Query to retrieve visible folders for the user
7315
-    $data = DB::queryFirstRow('SELECT visible_folders FROM ' . prefixTable('cache_tree') . ' WHERE user_id = %i', $userId);
7314
+    $data = DB::queryFirstRow('SELECT visible_folders FROM '.prefixTable('cache_tree').' WHERE user_id = %i', $userId);
7316 7315
     
7317 7316
     // Decode JSON data into an array; return an empty array if the data is invalid
7318 7317
     return json_decode($data['visible_folders'], true) ?? [];
@@ -7336,7 +7335,7 @@  discard block
 block discarded – undo
7336 7335
 
7337 7336
     // Query the access rights for the given roles and folder
7338 7337
     $accessTypes = DB::queryFirstColumn(
7339
-        'SELECT type FROM ' . prefixTable('roles_values') . ' WHERE role_id IN %ls AND folder_id = %i', 
7338
+        'SELECT type FROM '.prefixTable('roles_values').' WHERE role_id IN %ls AND folder_id = %i', 
7340 7339
         $roles, 
7341 7340
         $treeId
7342 7341
     );
Please login to merge, or discard this patch.
sources/identify.php 1 patch
Spacing   +48 added lines, -48 removed lines patch added patch discarded remove patch
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
     $sessionPwdAttempts = $session->get('pwd_attempts');
148 148
     $sessionUrl = $session->get('user-initial_url');
149 149
     $server = [];
150
-    $server['PHP_AUTH_USER'] =  $request->getUser();
150
+    $server['PHP_AUTH_USER'] = $request->getUser();
151 151
     $server['PHP_AUTH_PW'] = $request->getPassword();
152 152
     
153 153
     // decrypt and retreive data in JSON format
@@ -162,18 +162,18 @@  discard block
 block discarded – undo
162 162
     }
163 163
 
164 164
     // Check if Duo auth is in progress and pass the pw and login back to the standard login process
165
-    if(
165
+    if (
166 166
         isKeyExistingAndEqual('duo', 1, $SETTINGS) === true
167 167
         && $dataReceived['user_2fa_selection'] === 'duo'
168 168
         && $session->get('user-duo_status') === 'IN_PROGRESS'
169 169
         && !empty($dataReceived['duo_state'])
170
-    ){
170
+    ) {
171 171
         $key = hash('sha256', $dataReceived['duo_state']);
172 172
         $iv = substr(hash('sha256', $dataReceived['duo_state']), 0, 16);
173 173
         $duo_data_dec = openssl_decrypt(base64_decode($session->get('user-duo_data')), 'AES-256-CBC', $key, 0, $iv);
174 174
         // Clear the data from the Duo process to continue clean with the standard login process
175
-        $session->set('user-duo_data','');
176
-        if($duo_data_dec === false) {
175
+        $session->set('user-duo_data', '');
176
+        if ($duo_data_dec === false) {
177 177
             // Add failed authentication log
178 178
             addFailedAuthentication($sentData['login'], getClientIpServer());
179 179
 
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
191 191
         $dataReceived['login'] = $duo_data['duo_login'];
192 192
     }
193 193
 
194
-    if(isset($dataReceived['pw']) === false || isset($dataReceived['login']) === false) {
194
+    if (isset($dataReceived['pw']) === false || isset($dataReceived['login']) === false) {
195 195
         echo json_encode([
196 196
             'data' => prepareExchangedData(
197 197
                 [
@@ -536,7 +536,7 @@  discard block
 block discarded – undo
536 536
         }
537 537
         // Append with roles from AD groups
538 538
         if (is_null($userInfo['roles_from_ad_groups']) === false) {
539
-            $userInfo['fonction_id'] = empty($userInfo['fonction_id'])  === true ? $userInfo['roles_from_ad_groups'] : $userInfo['fonction_id']. ';' . $userInfo['roles_from_ad_groups'];
539
+            $userInfo['fonction_id'] = empty($userInfo['fonction_id']) === true ? $userInfo['roles_from_ad_groups'] : $userInfo['fonction_id'].';'.$userInfo['roles_from_ad_groups'];
540 540
         }
541 541
         // store
542 542
         $session->set('user-roles', $userInfo['fonction_id']);
@@ -548,7 +548,7 @@  discard block
 block discarded – undo
548 548
         if (count($session->get('user-roles_array')) > 0) {
549 549
             $rolesList = DB::query(
550 550
                 'SELECT id, title, complexity
551
-                FROM ' . prefixTable('roles_title') . '
551
+                FROM ' . prefixTable('roles_title').'
552 552
                 WHERE id IN %li',
553 553
                 $session->get('user-roles_array')
554 554
             );
@@ -594,7 +594,7 @@  discard block
 block discarded – undo
594 594
             if ($adjustPermissions) {
595 595
                 $session->set('user-admin', (int) $userInfo['admin']);
596 596
                 $session->set('user-manager', (int) $userInfo['gestionnaire']);
597
-                $session->set('user-can_manage_all_users',(int)  $userInfo['can_manage_all_users']);
597
+                $session->set('user-can_manage_all_users', (int) $userInfo['can_manage_all_users']);
598 598
                 $session->set('user-read_only', (int) $userInfo['read_only']);
599 599
                 DB::update(
600 600
                     prefixTable('users'),
@@ -665,10 +665,10 @@  discard block
 block discarded – undo
665 665
         $session->set('user-latest_items_tab', []);
666 666
         $session->set('user-nb_roles', 0);
667 667
         foreach ($session->get('user-latest_items') as $item) {
668
-            if (! empty($item)) {
668
+            if (!empty($item)) {
669 669
                 $dataLastItems = DB::queryFirstRow(
670 670
                     'SELECT id,label,id_tree
671
-                    FROM ' . prefixTable('items') . '
671
+                    FROM ' . prefixTable('items').'
672 672
                     WHERE id=%i',
673 673
                     $item
674 674
                 );
@@ -677,7 +677,7 @@  discard block
 block discarded – undo
677 677
                     [
678 678
                         'id' => $item,
679 679
                         'label' => $dataLastItems['label'],
680
-                        'url' => 'index.php?page=items&amp;group=' . $dataLastItems['id_tree'] . '&amp;id=' . $item,
680
+                        'url' => 'index.php?page=items&amp;group='.$dataLastItems['id_tree'].'&amp;id='.$item,
681 681
                     ],
682 682
                     'add'
683 683
                 );
@@ -687,7 +687,7 @@  discard block
 block discarded – undo
687 687
         // Get cahce tree info
688 688
         $cacheTreeData = DB::queryFirstRow(
689 689
             'SELECT visible_folders
690
-            FROM ' . prefixTable('cache_tree') . '
690
+            FROM ' . prefixTable('cache_tree').'
691 691
             WHERE user_id=%i',
692 692
             (int) $session->get('user-id')
693 693
         );
@@ -719,7 +719,7 @@  discard block
 block discarded – undo
719 719
             && (int) $sessionAdmin !== 1
720 720
         ) {
721 721
             // get all Admin users
722
-            $val = DB::queryfirstrow('SELECT email FROM ' . prefixTable('users') . " WHERE admin = %i and email != ''", 1);
722
+            $val = DB::queryfirstrow('SELECT email FROM '.prefixTable('users')." WHERE admin = %i and email != ''", 1);
723 723
             if (DB::count() > 0) {
724 724
                 // Add email to table
725 725
                 prepareSendingEmail(
@@ -731,7 +731,7 @@  discard block
 block discarded – undo
731 731
                             '#tp_time#',
732 732
                         ],
733 733
                         [
734
-                            ' ' . $session->get('user-login') . ' (IP: ' . getClientIpServer() . ')',
734
+                            ' '.$session->get('user-login').' (IP: '.getClientIpServer().')',
735 735
                             date($SETTINGS['date_format'], (int) $session->get('user-last_connection')),
736 736
                             date($SETTINGS['time_format'], (int) $session->get('user-last_connection')),
737 737
                         ],
@@ -842,7 +842,7 @@  discard block
 block discarded – undo
842 842
 {
843 843
     $rows = DB::query(
844 844
         'SELECT date
845
-        FROM ' . prefixTable('log_system') . "
845
+        FROM ' . prefixTable('log_system')."
846 846
         WHERE field_1 = %s
847 847
         AND type = 'failed_auth'
848 848
         AND label = 'password_is_not_correct'
@@ -856,7 +856,7 @@  discard block
 block discarded – undo
856 856
         foreach ($rows as $record) {
857 857
             array_push(
858 858
                 $arrAttempts,
859
-                date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date'])
859
+                date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date'])
860 860
             );
861 861
         }
862 862
     }
@@ -891,7 +891,7 @@  discard block
 block discarded – undo
891 891
     $ldapConnection
892 892
 ) : bool
893 893
 {
894
-    include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
894
+    include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
895 895
 
896 896
     if ((int) $userInfoDisabled === 1) {
897 897
         return false;
@@ -1086,7 +1086,7 @@  discard block
 block discarded – undo
1086 1086
     } catch (Exception $e) {
1087 1087
         return [
1088 1088
             'error' => true,
1089
-            'message' => "Error: " . $e->getMessage(),
1089
+            'message' => "Error: ".$e->getMessage(),
1090 1090
         ];
1091 1091
     }
1092 1092
 }
@@ -1117,7 +1117,7 @@  discard block
 block discarded – undo
1117 1117
                 'type' => 'OpenLDAP'
1118 1118
             ];
1119 1119
         default:
1120
-            throw new Exception("Unsupported LDAP type: " . $SETTINGS['ldap_type']);
1120
+            throw new Exception("Unsupported LDAP type: ".$SETTINGS['ldap_type']);
1121 1121
     }
1122 1122
 }
1123 1123
 
@@ -1254,7 +1254,7 @@  discard block
 block discarded – undo
1254 1254
         );
1255 1255
     }
1256 1256
     
1257
-    throw new Exception("Unsupported LDAP type: " . $ldapHandler['type']);
1257
+    throw new Exception("Unsupported LDAP type: ".$ldapHandler['type']);
1258 1258
 }
1259 1259
 
1260 1260
 /**
@@ -1271,12 +1271,12 @@  discard block
 block discarded – undo
1271 1271
     if (isset($SETTINGS['enable_ad_users_with_ad_groups']) === true && (int) $SETTINGS['enable_ad_users_with_ad_groups'] === 1) {
1272 1272
         // Get user groups from AD
1273 1273
         $user_ad_groups = [];
1274
-        foreach($groups as $group) {
1274
+        foreach ($groups as $group) {
1275 1275
             //print_r($group);
1276 1276
             // get relation role id for AD group
1277 1277
             $role = DB::queryFirstRow(
1278 1278
                 'SELECT lgr.role_id
1279
-                FROM ' . prefixTable('ldap_groups_roles') . ' AS lgr
1279
+                FROM ' . prefixTable('ldap_groups_roles').' AS lgr
1280 1280
                 WHERE lgr.ldap_group_id = %s',
1281 1281
                 $group
1282 1282
             );
@@ -1421,7 +1421,7 @@  discard block
 block discarded – undo
1421 1421
     }
1422 1422
 
1423 1423
     // Now check yubico validity
1424
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/Yubico/Yubico.php';
1424
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/Yubico/Yubico.php';
1425 1425
     $yubi = new Auth_Yubico($yubico_user_id, $yubico_user_key);
1426 1426
     $auth = $yubi->verify($yubico_key);
1427 1427
     //, null, null, null, 60
@@ -1480,7 +1480,7 @@  discard block
 block discarded – undo
1480 1480
             // Check if exists in DB
1481 1481
             $groupData = DB::queryFirstRow(
1482 1482
                 'SELECT id
1483
-                FROM ' . prefixTable('roles_title') . '
1483
+                FROM ' . prefixTable('roles_title').'
1484 1484
                 WHERE title = %s',
1485 1485
                 $group["displayName"]
1486 1486
             );
@@ -1609,7 +1609,7 @@  discard block
 block discarded – undo
1609 1609
             
1610 1610
             // generate new QR
1611 1611
             $new_2fa_qr = $tfa->getQRCodeImageAsDataUri(
1612
-                'Teampass - ' . $username,
1612
+                'Teampass - '.$username,
1613 1613
                 $userInfo['ga']
1614 1614
             );
1615 1615
             // clear temporary code from DB
@@ -1622,7 +1622,7 @@  discard block
 block discarded – undo
1622 1622
                 $userInfo['id']
1623 1623
             );
1624 1624
             $firstTime = [
1625
-                'value' => '<img src="' . $new_2fa_qr . '">',
1625
+                'value' => '<img src="'.$new_2fa_qr.'">',
1626 1626
                 'user_admin' => isset($sessionAdmin) ? (int) $sessionAdmin : '',
1627 1627
                 'initial_url' => isset($sessionUrl) === true ? $sessionUrl : '',
1628 1628
                 'pwd_attempts' => (int) $sessionPwdAttempts,
@@ -1778,7 +1778,7 @@  discard block
 block discarded – undo
1778 1778
         }*/
1779 1779
         return [
1780 1780
             'error' => true,
1781
-            'message' => $duo_error . $lang->get('duo_error_check_config'),
1781
+            'message' => $duo_error.$lang->get('duo_error_check_config'),
1782 1782
             'pwd_attempts' => (int) $sessionPwdAttempts,
1783 1783
             'debug_message' => $e->getMessage(),
1784 1784
             'proceedIdentification' => false,
@@ -1794,7 +1794,7 @@  discard block
 block discarded – undo
1794 1794
         } catch (DuoException $e) {
1795 1795
             return [
1796 1796
                 'error' => true,
1797
-                'message' => $duo_error . $lang->get('duo_error_url'),
1797
+                'message' => $duo_error.$lang->get('duo_error_url'),
1798 1798
                 'pwd_attempts' => (int) $sessionPwdAttempts,
1799 1799
                 'debug_message' => $e->getMessage(),
1800 1800
                 'proceedIdentification' => false,
@@ -1802,7 +1802,7 @@  discard block
 block discarded – undo
1802 1802
         }
1803 1803
         
1804 1804
         // Somethimes Duo return success but fail to return a URL, double check if the URL has been created
1805
-        if (!empty($duo_redirect_url) && isset($duo_redirect_url) && filter_var($duo_redirect_url,FILTER_SANITIZE_URL)) {
1805
+        if (!empty($duo_redirect_url) && isset($duo_redirect_url) && filter_var($duo_redirect_url, FILTER_SANITIZE_URL)) {
1806 1806
             // Since Duo Universal requires a redirect, let's store some info when the user get's back after completing the Duo prompt
1807 1807
             $key = hash('sha256', $duo_state);
1808 1808
             $iv = substr(hash('sha256', $duo_state), 0, 16);
@@ -1830,7 +1830,7 @@  discard block
 block discarded – undo
1830 1830
         } else {
1831 1831
             return [
1832 1832
                 'error' => true,
1833
-                'message' => $duo_error . $lang->get('duo_error_url'),
1833
+                'message' => $duo_error.$lang->get('duo_error_url'),
1834 1834
                 'pwd_attempts' => (int) $sessionPwdAttempts,
1835 1835
                 'proceedIdentification' => false,
1836 1836
             ];
@@ -1851,8 +1851,8 @@  discard block
 block discarded – undo
1851 1851
         // return the response (which should be the user name)
1852 1852
         if ($decoded_token['preferred_username'] === $username) {
1853 1853
             $session->set('user-duo_status', 'COMPLET');
1854
-            $session->set('user-duo_state','');
1855
-            $session->set('user-duo_data','');
1854
+            $session->set('user-duo_state', '');
1855
+            $session->set('user-duo_data', '');
1856 1856
             $session->set('user-login', $username);
1857 1857
 
1858 1858
             return [
@@ -1863,9 +1863,9 @@  discard block
 block discarded – undo
1863 1863
             ];
1864 1864
         } else {
1865 1865
             // Something wrong, username from the original Duo request is different than the one received now
1866
-            $session->set('user-duo_status','');
1867
-            $session->set('user-duo_state','');
1868
-            $session->set('user-duo_data','');
1866
+            $session->set('user-duo_status', '');
1867
+            $session->set('user-duo_state', '');
1868
+            $session->set('user-duo_data', '');
1869 1869
 
1870 1870
             return [
1871 1871
                 'error' => true,
@@ -1876,9 +1876,9 @@  discard block
 block discarded – undo
1876 1876
         }
1877 1877
     }
1878 1878
     // If we are here something wrong
1879
-    $session->set('user-duo_status','');
1880
-    $session->set('user-duo_state','');
1881
-    $session->set('user-duo_data','');
1879
+    $session->set('user-duo_status', '');
1880
+    $session->set('user-duo_state', '');
1881
+    $session->set('user-duo_data', '');
1882 1882
     return [
1883 1883
         'error' => true,
1884 1884
         'message' => $lang->get('duo_login_mismatch'),
@@ -1990,7 +1990,7 @@  discard block
 block discarded – undo
1990 1990
         // Check for existing lock
1991 1991
         $unlock_at = DB::queryFirstField(
1992 1992
             'SELECT MAX(unlock_at)
1993
-             FROM ' . prefixTable('auth_failures') . '
1993
+             FROM ' . prefixTable('auth_failures').'
1994 1994
              WHERE unlock_at > %s
1995 1995
              AND ((source = %s AND value = %s) OR (source = %s AND value = %s))',
1996 1996
             date('Y-m-d H:i:s', time()),
@@ -2012,8 +2012,8 @@  discard block
 block discarded – undo
2012 2012
         // Get user info from DB
2013 2013
         $data = DB::queryFirstRow(
2014 2014
             'SELECT u.*, a.value AS api_key
2015
-            FROM ' . prefixTable('users') . ' AS u
2016
-            LEFT JOIN ' . prefixTable('api') . ' AS a ON (u.id = a.user_id)
2015
+            FROM ' . prefixTable('users').' AS u
2016
+            LEFT JOIN ' . prefixTable('api').' AS a ON (u.id = a.user_id)
2017 2017
             WHERE login = %s AND deleted_at IS NULL',
2018 2018
             $login
2019 2019
         );
@@ -2120,7 +2120,7 @@  discard block
 block discarded – undo
2120 2120
             'array' => [
2121 2121
                 'value' => 'bruteforce_wait',
2122 2122
                 'error' => true,
2123
-                'message' => $lang->get('bruteforce_wait') . (string) $e->getMessage(),
2123
+                'message' => $lang->get('bruteforce_wait').(string) $e->getMessage(),
2124 2124
             ]
2125 2125
         ];
2126 2126
     }
@@ -2552,15 +2552,15 @@  discard block
 block discarded – undo
2552 2552
 
2553 2553
             if ($ret['error'] !== false) {
2554 2554
                 logEvents($SETTINGS, 'failed_auth', 'bad_duo_mfa', '', stripslashes($username), stripslashes($username));
2555
-                $session->set('user-duo_status','');
2556
-                $session->set('user-duo_state','');
2557
-                $session->set('user-duo_data','');
2555
+                $session->set('user-duo_status', '');
2556
+                $session->set('user-duo_state', '');
2557
+                $session->set('user-duo_data', '');
2558 2558
                 return [
2559 2559
                     'error' => true,
2560 2560
                     'mfaData' => $ret,
2561 2561
                     'mfaQRCodeInfos' => false,
2562 2562
                 ];
2563
-            } else if ($ret['duo_url_ready'] === true){
2563
+            } else if ($ret['duo_url_ready'] === true) {
2564 2564
                 return [
2565 2565
                     'error' => false,
2566 2566
                     'mfaData' => $ret,
@@ -2624,7 +2624,7 @@  discard block
 block discarded – undo
2624 2624
     // Count failed attempts from this source
2625 2625
     $count = DB::queryFirstField(
2626 2626
         'SELECT COUNT(*)
2627
-        FROM ' . prefixTable('auth_failures') . '
2627
+        FROM ' . prefixTable('auth_failures').'
2628 2628
         WHERE source = %s AND value = %s',
2629 2629
         $source,
2630 2630
         $value
Please login to merge, or discard this patch.
sources/main.queries.php 1 patch
Spacing   +102 added lines, -102 removed lines patch added patch discarded remove patch
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 ) {
82 82
     // Not allowed page
83 83
     $session->set('system-error_code', ERR_NOT_ALLOWED);
84
-    include $SETTINGS['cpassman_dir'] . '/error.php';
84
+    include $SETTINGS['cpassman_dir'].'/error.php';
85 85
     exit;
86 86
 }
87 87
 
@@ -269,7 +269,7 @@  discard block
 block discarded – undo
269 269
 
270 270
             // Get current user hash
271 271
             $userHash = DB::queryFirstRow(
272
-                "SELECT pw FROM " . prefixtable('users') . " WHERE id = %d;",
272
+                "SELECT pw FROM ".prefixtable('users')." WHERE id = %d;",
273 273
                 $session->get('user-id')
274 274
             )['pw'];
275 275
 
@@ -325,7 +325,7 @@  discard block
 block discarded – undo
325 325
  * @param string $post_key        Additional key for post validation.
326 326
  * @return string
327 327
  */
328
-function userHandler(string $post_type, array|null|string $dataReceived, array $SETTINGS, string $post_key): string
328
+function userHandler(string $post_type, array | null | string $dataReceived, array $SETTINGS, string $post_key): string
329 329
 {
330 330
     $session = SessionManager::getSession();
331 331
 
@@ -584,7 +584,7 @@  discard block
 block discarded – undo
584 584
         case 'mail_me'://action_mail
585 585
             // Get info about user to send email
586 586
             $data_user = DB::queryfirstrow(
587
-                'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM ' . prefixTable('users') . '
587
+                'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM '.prefixTable('users').'
588 588
                 WHERE email = %s',
589 589
                 filter_var($dataReceived['receipt'], FILTER_SANITIZE_FULL_SPECIAL_CHARS)
590 590
             );
@@ -792,7 +792,7 @@  discard block
 block discarded – undo
792 792
 {
793 793
     $newPassword = filter_var($dataReceived['new_code'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
794 794
     $userHash = DB::queryFirstRow(
795
-        "SELECT pw FROM " . prefixtable('users') . " WHERE id = %d;",
795
+        "SELECT pw FROM ".prefixtable('users')." WHERE id = %d;",
796 796
         $session->get('user-id')
797 797
     )['pw'];
798 798
 
@@ -866,7 +866,7 @@  discard block
 block discarded – undo
866 866
 {
867 867
     $userPassword = filter_var($dataReceived['password'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
868 868
     $userHash = DB::queryFirstRow(
869
-        "SELECT pw FROM " . prefixtable('users') . " WHERE id = %i;",
869
+        "SELECT pw FROM ".prefixtable('users')." WHERE id = %i;",
870 870
         $session->get('user-id')
871 871
     )['pw'];
872 872
 
@@ -919,7 +919,7 @@  discard block
 block discarded – undo
919 919
     }
920 920
 
921 921
     $targetUserInfos = DB::queryFirstRow(
922
-        'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM ' . prefixTable('users') . ' WHERE id = %i',
922
+        'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM '.prefixTable('users').' WHERE id = %i',
923 923
         $dataReceived['user_id']
924 924
     );
925 925
 
@@ -940,7 +940,7 @@  discard block
 block discarded – undo
940 940
  * @param array $SETTINGS
941 941
  * @return string
942 942
  */
943
-function systemHandler(string $post_type, array|null|string $dataReceived, array $SETTINGS): string
943
+function systemHandler(string $post_type, array | null | string $dataReceived, array $SETTINGS): string
944 944
 {
945 945
     $session = SessionManager::getSession();
946 946
     switch ($post_type) {
@@ -1041,7 +1041,7 @@  discard block
 block discarded – undo
1041 1041
                 )
1042 1042
             );
1043 1043
 
1044
-            return '[{"token" : "' . $token . '"}]';
1044
+            return '[{"token" : "'.$token.'"}]';
1045 1045
 
1046 1046
         /*
1047 1047
         * Default case
@@ -1057,7 +1057,7 @@  discard block
 block discarded – undo
1057 1057
 }
1058 1058
 
1059 1059
 
1060
-function utilsHandler(string $post_type, array|null|string $dataReceived, array $SETTINGS): string
1060
+function utilsHandler(string $post_type, array | null | string $dataReceived, array $SETTINGS): string
1061 1061
 {
1062 1062
     switch ($post_type) {
1063 1063
         /*
@@ -1126,7 +1126,7 @@  discard block
 block discarded – undo
1126 1126
         array(
1127 1127
             'error' => false,
1128 1128
             'timestamp' => $session->get('user-session_duration'),
1129
-            'max_time_to_add' => intdiv((($maximum_session_expiration_time*60) - ((int) $session->get('user-session_duration') - time())), 60),
1129
+            'max_time_to_add' => intdiv((($maximum_session_expiration_time * 60) - ((int) $session->get('user-session_duration') - time())), 60),
1130 1130
             'max_session_duration' => $maximum_session_expiration_time,
1131 1131
         ),
1132 1132
         'encode'
@@ -1178,7 +1178,7 @@  discard block
 block discarded – undo
1178 1178
     // get number of items
1179 1179
     DB::queryFirstRow(
1180 1180
         'SELECT increment_id
1181
-        FROM ' . prefixTable('sharekeys_items') .
1181
+        FROM ' . prefixTable('sharekeys_items').
1182 1182
         ' WHERE user_id = %i',
1183 1183
         $userId
1184 1184
     );
@@ -1233,7 +1233,7 @@  discard block
 block discarded – undo
1233 1233
         // check if expected security level is reached
1234 1234
         $dataUser = DB::queryfirstrow(
1235 1235
             'SELECT *
1236
-            FROM ' . prefixTable('users') . ' WHERE id = %i',
1236
+            FROM ' . prefixTable('users').' WHERE id = %i',
1237 1237
             $post_user_id
1238 1238
         );
1239 1239
 
@@ -1254,8 +1254,8 @@  discard block
 block discarded – undo
1254 1254
         if (empty($dataUser['fonction_id']) === false) {
1255 1255
             $data = DB::queryFirstRow(
1256 1256
                 'SELECT complexity
1257
-                FROM ' . prefixTable('roles_title') . '
1258
-                WHERE id IN (' . $dataUser['fonction_id'] . ')
1257
+                FROM ' . prefixTable('roles_title').'
1258
+                WHERE id IN (' . $dataUser['fonction_id'].')
1259 1259
                 ORDER BY complexity DESC'
1260 1260
             );
1261 1261
         } else {
@@ -1268,8 +1268,8 @@  discard block
 block discarded – undo
1268 1268
             return prepareExchangedData(
1269 1269
                 array(
1270 1270
                     'error' => true,
1271
-                    'message' => '<div style="margin:10px 0 10px 15px;">' . $lang->get('complexity_level_not_reached') . '.<br>' .
1272
-                        $lang->get('expected_complexity_level') . ': <b>' . TP_PW_COMPLEXITY[$data['complexity']][1] . '</b></div>',
1271
+                    'message' => '<div style="margin:10px 0 10px 15px;">'.$lang->get('complexity_level_not_reached').'.<br>'.
1272
+                        $lang->get('expected_complexity_level').': <b>'.TP_PW_COMPLEXITY[$data['complexity']][1].'</b></div>',
1273 1273
                 ),
1274 1274
                 'encode'
1275 1275
             );
@@ -1373,14 +1373,14 @@  discard block
 block discarded – undo
1373 1373
         // Get data about user
1374 1374
         $dataUser = DB::queryfirstrow(
1375 1375
             'SELECT id, email, pw
1376
-            FROM ' . prefixTable('users') . '
1376
+            FROM ' . prefixTable('users').'
1377 1377
             WHERE login = %s',
1378 1378
             $post_login
1379 1379
         );
1380 1380
     } else {
1381 1381
         $dataUser = DB::queryfirstrow(
1382 1382
             'SELECT id, login, email, pw
1383
-            FROM ' . prefixTable('users') . '
1383
+            FROM ' . prefixTable('users').'
1384 1384
             WHERE id = %i',
1385 1385
             $post_id
1386 1386
         );
@@ -1434,7 +1434,7 @@  discard block
 block discarded – undo
1434 1434
     // Check if token already used
1435 1435
     $dataToken = DB::queryfirstrow(
1436 1436
         'SELECT end_timestamp, reason
1437
-        FROM ' . prefixTable('tokens') . '
1437
+        FROM ' . prefixTable('tokens').'
1438 1438
         WHERE token = %s AND user_id = %i',
1439 1439
         $post_token,
1440 1440
         $dataUser['id']
@@ -1445,11 +1445,11 @@  discard block
 block discarded – undo
1445 1445
         return prepareExchangedData(
1446 1446
             array(
1447 1447
                 'error' => true,
1448
-                'message' => 'TOKEN already used',//$lang->get('no_email_set'),
1448
+                'message' => 'TOKEN already used', //$lang->get('no_email_set'),
1449 1449
             ),
1450 1450
             'encode'
1451 1451
         );
1452
-    } elseif(DB::count() === 0) {
1452
+    } elseif (DB::count() === 0) {
1453 1453
         // Store token for this action
1454 1454
         DB::insert(
1455 1455
             prefixTable('tokens'),
@@ -1511,7 +1511,7 @@  discard block
 block discarded – undo
1511 1511
                 'email' => $dataUser['email'],
1512 1512
                 'email_result' => str_replace(
1513 1513
                     '#email#',
1514
-                    '<b>' . obfuscateEmail($dataUser['email']) . '</b>',
1514
+                    '<b>'.obfuscateEmail($dataUser['email']).'</b>',
1515 1515
                     addslashes($lang->get('admin_email_result_ok'))
1516 1516
                 ),
1517 1517
             ),
@@ -1527,7 +1527,7 @@  discard block
 block discarded – undo
1527 1527
             'email' => $dataUser['email'],
1528 1528
             'email_result' => str_replace(
1529 1529
                 '#email#',
1530
-                '<b>' . obfuscateEmail($dataUser['email']) . '</b>',
1530
+                '<b>'.obfuscateEmail($dataUser['email']).'</b>',
1531 1531
                 addslashes($lang->get('admin_email_result_ok'))
1532 1532
             ),
1533 1533
         ),
@@ -1544,7 +1544,7 @@  discard block
 block discarded – undo
1544 1544
 
1545 1545
     if (isKeyExistingAndEqual('enable_send_email_on_user_login', 1, $SETTINGS) === true) {
1546 1546
         $row = DB::queryFirstRow(
1547
-            'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s',
1547
+            'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s',
1548 1548
             'cron',
1549 1549
             'sending_emails'
1550 1550
         );
@@ -1552,7 +1552,7 @@  discard block
 block discarded – undo
1552 1552
         if ((int) (time() - $row['valeur']) >= 300 || (int) $row['valeur'] === 0) {
1553 1553
             $rows = DB::query(
1554 1554
                 'SELECT *
1555
-                FROM ' . prefixTable('emails') .
1555
+                FROM ' . prefixTable('emails').
1556 1556
                 ' WHERE status != %s',
1557 1557
                 'sent'
1558 1558
             );
@@ -1604,8 +1604,8 @@  discard block
 block discarded – undo
1604 1604
     $arr_html = array();
1605 1605
     $rows = DB::query(
1606 1606
         'SELECT i.id AS id, i.label AS label, i.id_tree AS id_tree, l.date, i.perso AS perso, i.restricted_to AS restricted
1607
-        FROM ' . prefixTable('log_items') . ' AS l
1608
-        RIGHT JOIN ' . prefixTable('items') . ' AS i ON (l.id_item = i.id)
1607
+        FROM ' . prefixTable('log_items').' AS l
1608
+        RIGHT JOIN ' . prefixTable('items').' AS i ON (l.id_item = i.id)
1609 1609
         WHERE l.action = %s AND l.id_user = %i
1610 1610
         ORDER BY l.date DESC
1611 1611
         LIMIT 0, 100',
@@ -1637,7 +1637,7 @@  discard block
 block discarded – undo
1637 1637
     if (isKeyExistingAndEqual('enable_suggestion', 1, $SETTINGS) === true
1638 1638
         && ((int) $session->get('user-admin') === 1 || (int) $session->get('user-manager') === 1)
1639 1639
     ) {
1640
-        DB::query('SELECT * FROM ' . prefixTable('suggestion'));
1640
+        DB::query('SELECT * FROM '.prefixTable('suggestion'));
1641 1641
         $nb_suggestions_waiting = DB::count();
1642 1642
     }
1643 1643
 
@@ -1672,13 +1672,13 @@  discard block
 block discarded – undo
1672 1672
             if ($data === 'stat_languages') {
1673 1673
                 $tmp = '';
1674 1674
                 foreach ($stats_data[$data] as $key => $value) {
1675
-                    $tmp .= $tmp === '' ? $key . '-' . $value : ',' . $key . '-' . $value;
1675
+                    $tmp .= $tmp === '' ? $key.'-'.$value : ','.$key.'-'.$value;
1676 1676
                 }
1677 1677
                 $statsToSend[$data] = $tmp;
1678 1678
             } elseif ($data === 'stat_country') {
1679 1679
                 $tmp = '';
1680 1680
                 foreach ($stats_data[$data] as $key => $value) {
1681
-                    $tmp .= $tmp === '' ? $key . '-' . $value : ',' . $key . '-' . $value;
1681
+                    $tmp .= $tmp === '' ? $key.'-'.$value : ','.$key.'-'.$value;
1682 1682
                 }
1683 1683
                 $statsToSend[$data] = $tmp;
1684 1684
             } else {
@@ -1765,7 +1765,7 @@  discard block
 block discarded – undo
1765 1765
             $url_found = $value;
1766 1766
             if (empty($url_found) === false) {
1767 1767
                 $tmp = parse_url($url_found);
1768
-                $anonym_url = $tmp['scheme'] . '://<anonym_url>' . (isset($tmp['path']) === true ? $tmp['path'] : '');
1768
+                $anonym_url = $tmp['scheme'].'://<anonym_url>'.(isset($tmp['path']) === true ? $tmp['path'] : '');
1769 1769
                 $value = $anonym_url;
1770 1770
             } else {
1771 1771
                 $value = '';
@@ -1795,7 +1795,7 @@  discard block
 block discarded – undo
1795 1795
     $teampass_errors = '';
1796 1796
     $rows = DB::query(
1797 1797
         'SELECT label, date AS error_date
1798
-        FROM ' . prefixTable('log_system') . "
1798
+        FROM ' . prefixTable('log_system')."
1799 1799
         WHERE `type` LIKE 'error'
1800 1800
         ORDER BY `date` DESC
1801 1801
         LIMIT 0, 10"
@@ -1803,9 +1803,9 @@  discard block
 block discarded – undo
1803 1803
     if (DB::count() > 0) {
1804 1804
         foreach ($rows as $record) {
1805 1805
             if (empty($teampass_errors) === true) {
1806
-                $teampass_errors = ' * ' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['error_date']) . ' - ' . $record['label'];
1806
+                $teampass_errors = ' * '.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['error_date']).' - '.$record['label'];
1807 1807
             } else {
1808
-                $teampass_errors .= ' * ' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['error_date']) . ' - ' . $record['label'];
1808
+                $teampass_errors .= ' * '.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['error_date']).' - '.$record['label'];
1809 1809
             }
1810 1810
         }
1811 1811
     }
@@ -1814,7 +1814,7 @@  discard block
 block discarded – undo
1814 1814
 
1815 1815
     // Now prepare text
1816 1816
     $txt = '### Page on which it happened
1817
-' . $data['current_page'] . '
1817
+' . $data['current_page'].'
1818 1818
 
1819 1819
 ### Steps to reproduce
1820 1820
 1.
@@ -1829,39 +1829,39 @@  discard block
 block discarded – undo
1829 1829
 Tell us what happens instead
1830 1830
 
1831 1831
 ### Server configuration
1832
-**Operating system**: ' . php_uname() . '
1832
+**Operating system**: ' . php_uname().'
1833 1833
 
1834
-**Web server:** ' . $_SERVER['SERVER_SOFTWARE'] . '
1834
+**Web server:** ' . $_SERVER['SERVER_SOFTWARE'].'
1835 1835
 
1836
-**Database:** ' . ($link === false ? $lang->get('undefined') : mysqli_get_server_info($link)) . '
1836
+**Database:** ' . ($link === false ? $lang->get('undefined') : mysqli_get_server_info($link)).'
1837 1837
 
1838
-**PHP version:** ' . PHP_VERSION . '
1838
+**PHP version:** ' . PHP_VERSION.'
1839 1839
 
1840
-**Teampass version:** ' . TP_VERSION . '.' . TP_VERSION_MINOR . '
1840
+**Teampass version:** ' . TP_VERSION.'.'.TP_VERSION_MINOR.'
1841 1841
 
1842 1842
 **Teampass configuration variables:**
1843 1843
 ```
1844
-' . $list_of_options . '
1844
+' . $list_of_options.'
1845 1845
 ```
1846 1846
 
1847 1847
 **Updated from an older Teampass or fresh install:**
1848 1848
 
1849 1849
 ### Client configuration
1850 1850
 
1851
-**Browser:** ' . $data['browser_name'] . ' - ' . $data['browser_version'] . '
1851
+**Browser:** ' . $data['browser_name'].' - '.$data['browser_version'].'
1852 1852
 
1853
-**Operating system:** ' . $data['os'] . ' - ' . $data['os_archi'] . 'bits
1853
+**Operating system:** ' . $data['os'].' - '.$data['os_archi'].'bits
1854 1854
 
1855 1855
 ### Logs
1856 1856
 
1857 1857
 #### Web server error log
1858 1858
 ```
1859
-' . $err['message'] . ' - ' . $err['file'] . ' (' . $err['line'] . ')
1859
+' . $err['message'].' - '.$err['file'].' ('.$err['line'].')
1860 1860
 ```
1861 1861
 
1862 1862
 #### Teampass 10 last system errors
1863 1863
 ```
1864
-' . $teampass_errors . '
1864
+' . $teampass_errors.'
1865 1865
 ```
1866 1866
 
1867 1867
 #### Log from the web-browser developer console (CTRL + SHIFT + i)
@@ -1901,7 +1901,7 @@  discard block
 block discarded – undo
1901 1901
         // Check if user exists
1902 1902
         $userInfo = DB::queryFirstRow(
1903 1903
             'SELECT public_key, private_key, pw, auth_type
1904
-            FROM ' . prefixTable('users') . '
1904
+            FROM ' . prefixTable('users').'
1905 1905
             WHERE id = %i',
1906 1906
             $post_user_id
1907 1907
         );
@@ -1910,9 +1910,9 @@  discard block
 block discarded – undo
1910 1910
             // Get one item
1911 1911
             $currentUserKey = DB::queryFirstRow(
1912 1912
                 'SELECT object_id, share_key, increment_id
1913
-                FROM ' . prefixTable('sharekeys_items') . ' AS si
1914
-                INNER JOIN ' . prefixTable('items') . ' AS i ON  (i.id = si.object_id)
1915
-                INNER JOIN ' . prefixTable('nested_tree') . ' AS nt ON  (i.id_tree = nt.id)
1913
+                FROM ' . prefixTable('sharekeys_items').' AS si
1914
+                INNER JOIN ' . prefixTable('items').' AS i ON  (i.id = si.object_id)
1915
+                INNER JOIN ' . prefixTable('nested_tree').' AS nt ON  (i.id_tree = nt.id)
1916 1916
                 WHERE user_id = %i AND nt.personal_folder = %i',
1917 1917
                 $post_user_id,
1918 1918
                 0
@@ -2006,7 +2006,7 @@  discard block
 block discarded – undo
2006 2006
         // Get user info
2007 2007
         $userData = DB::queryFirstRow(
2008 2008
             'SELECT private_key
2009
-            FROM ' . prefixTable('users') . '
2009
+            FROM ' . prefixTable('users').'
2010 2010
             WHERE id = %i',
2011 2011
             $post_user_id
2012 2012
         );
@@ -2087,7 +2087,7 @@  discard block
 block discarded – undo
2087 2087
         // Get user info
2088 2088
         $userData = DB::queryFirstRow(
2089 2089
             'SELECT email, auth_type, login
2090
-            FROM ' . prefixTable('users') . '
2090
+            FROM ' . prefixTable('users').'
2091 2091
             WHERE id = %i',
2092 2092
             $post_user_id
2093 2093
         );
@@ -2185,7 +2185,7 @@  discard block
 block discarded – undo
2185 2185
         // Get user info
2186 2186
         $userData = DB::queryFirstRow(
2187 2187
             'SELECT email, auth_type, login
2188
-            FROM ' . prefixTable('users') . '
2188
+            FROM ' . prefixTable('users').'
2189 2189
             WHERE id = %i',
2190 2190
             $post_user_id
2191 2191
         );
@@ -2251,7 +2251,7 @@  discard block
 block discarded – undo
2251 2251
         // Check if user exists
2252 2252
         DB::queryFirstRow(
2253 2253
             'SELECT *
2254
-            FROM ' . prefixTable('users') . '
2254
+            FROM ' . prefixTable('users').'
2255 2255
             WHERE id = %i',
2256 2256
             $post_user_id
2257 2257
         );
@@ -2321,7 +2321,7 @@  discard block
 block discarded – undo
2321 2321
         // Check if user exists
2322 2322
         $userInfo = DB::queryFirstRow(
2323 2323
             'SELECT public_key
2324
-            FROM ' . prefixTable('users') . '
2324
+            FROM ' . prefixTable('users').'
2325 2325
             WHERE id = %i',
2326 2326
             $post_user_id
2327 2327
         );
@@ -2469,15 +2469,15 @@  discard block
 block discarded – undo
2469 2469
     // Loop on items
2470 2470
     $rows = DB::query(
2471 2471
         'SELECT id, pw
2472
-        FROM ' . prefixTable('items') . '
2472
+        FROM ' . prefixTable('items').'
2473 2473
         WHERE perso = 0
2474
-        LIMIT ' . $post_start . ', ' . $post_length
2474
+        LIMIT ' . $post_start.', '.$post_length
2475 2475
     );
2476 2476
     foreach ($rows as $record) {
2477 2477
         // Get itemKey from current user
2478 2478
         $currentUserKey = DB::queryFirstRow(
2479 2479
             'SELECT share_key, increment_id
2480
-            FROM ' . prefixTable('sharekeys_items') . '
2480
+            FROM ' . prefixTable('sharekeys_items').'
2481 2481
             WHERE object_id = %i AND user_id = %i',
2482 2482
             $record['id'],
2483 2483
             $session->get('user-id')
@@ -2509,7 +2509,7 @@  discard block
 block discarded – undo
2509 2509
             if ((int) $post_user_id !== (int) $session->get('user-id')) {
2510 2510
                 $currentUserKey = DB::queryFirstRow(
2511 2511
                     'SELECT increment_id
2512
-                    FROM ' . prefixTable('sharekeys_items') . '
2512
+                    FROM ' . prefixTable('sharekeys_items').'
2513 2513
                     WHERE object_id = %i AND user_id = %i',
2514 2514
                     $record['id'],
2515 2515
                     $post_user_id
@@ -2542,7 +2542,7 @@  discard block
 block discarded – undo
2542 2542
     // SHould we change step?
2543 2543
     DB::query(
2544 2544
         'SELECT *
2545
-        FROM ' . prefixTable('items') . '
2545
+        FROM ' . prefixTable('items').'
2546 2546
         WHERE perso = 0'
2547 2547
     );
2548 2548
 
@@ -2567,15 +2567,15 @@  discard block
 block discarded – undo
2567 2567
     // Loop on logs
2568 2568
     $rows = DB::query(
2569 2569
         'SELECT increment_id
2570
-        FROM ' . prefixTable('log_items') . '
2570
+        FROM ' . prefixTable('log_items').'
2571 2571
         WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"
2572
-        LIMIT ' . $post_start . ', ' . $post_length
2572
+        LIMIT ' . $post_start.', '.$post_length
2573 2573
     );
2574 2574
     foreach ($rows as $record) {
2575 2575
         // Get itemKey from current user
2576 2576
         $currentUserKey = DB::queryFirstRow(
2577 2577
             'SELECT share_key
2578
-            FROM ' . prefixTable('sharekeys_logs') . '
2578
+            FROM ' . prefixTable('sharekeys_logs').'
2579 2579
             WHERE object_id = %i AND user_id = %i',
2580 2580
             $record['increment_id'],
2581 2581
             $session->get('user-id')
@@ -2607,7 +2607,7 @@  discard block
 block discarded – undo
2607 2607
             if ((int) $post_user_id !== (int) $session->get('user-id')) {
2608 2608
                 $currentUserKey = DB::queryFirstRow(
2609 2609
                     'SELECT increment_id
2610
-                    FROM ' . prefixTable('sharekeys_items') . '
2610
+                    FROM ' . prefixTable('sharekeys_items').'
2611 2611
                     WHERE object_id = %i AND user_id = %i',
2612 2612
                     $record['id'],
2613 2613
                     $post_user_id
@@ -2629,7 +2629,7 @@  discard block
 block discarded – undo
2629 2629
     // SHould we change step?
2630 2630
     DB::query(
2631 2631
         'SELECT increment_id
2632
-        FROM ' . prefixTable('log_items') . '
2632
+        FROM ' . prefixTable('log_items').'
2633 2633
         WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"'
2634 2634
     );
2635 2635
 
@@ -2654,15 +2654,15 @@  discard block
 block discarded – undo
2654 2654
     // Loop on fields
2655 2655
     $rows = DB::query(
2656 2656
         'SELECT id
2657
-        FROM ' . prefixTable('categories_items') . '
2657
+        FROM ' . prefixTable('categories_items').'
2658 2658
         WHERE encryption_type = "teampass_aes"
2659
-        LIMIT ' . $post_start . ', ' . $post_length
2659
+        LIMIT ' . $post_start.', '.$post_length
2660 2660
     );
2661 2661
     foreach ($rows as $record) {
2662 2662
         // Get itemKey from current user
2663 2663
         $currentUserKey = DB::queryFirstRow(
2664 2664
             'SELECT share_key
2665
-            FROM ' . prefixTable('sharekeys_fields') . '
2665
+            FROM ' . prefixTable('sharekeys_fields').'
2666 2666
             WHERE object_id = %i AND user_id = %i',
2667 2667
             $record['id'],
2668 2668
             $session->get('user-id')
@@ -2694,7 +2694,7 @@  discard block
 block discarded – undo
2694 2694
             if ((int) $post_user_id !== (int) $session->get('user-id')) {
2695 2695
                 $currentUserKey = DB::queryFirstRow(
2696 2696
                     'SELECT increment_id
2697
-                    FROM ' . prefixTable('sharekeys_items') . '
2697
+                    FROM ' . prefixTable('sharekeys_items').'
2698 2698
                     WHERE object_id = %i AND user_id = %i',
2699 2699
                     $record['id'],
2700 2700
                     $post_user_id
@@ -2716,7 +2716,7 @@  discard block
 block discarded – undo
2716 2716
     // SHould we change step?
2717 2717
     DB::query(
2718 2718
         'SELECT *
2719
-        FROM ' . prefixTable('categories_items') . '
2719
+        FROM ' . prefixTable('categories_items').'
2720 2720
         WHERE encryption_type = "teampass_aes"'
2721 2721
     );
2722 2722
 
@@ -2741,14 +2741,14 @@  discard block
 block discarded – undo
2741 2741
     // Loop on suggestions
2742 2742
     $rows = DB::query(
2743 2743
         'SELECT id
2744
-        FROM ' . prefixTable('suggestion') . '
2745
-        LIMIT ' . $post_start . ', ' . $post_length
2744
+        FROM ' . prefixTable('suggestion').'
2745
+        LIMIT ' . $post_start.', '.$post_length
2746 2746
     );
2747 2747
     foreach ($rows as $record) {
2748 2748
         // Get itemKey from current user
2749 2749
         $currentUserKey = DB::queryFirstRow(
2750 2750
             'SELECT share_key
2751
-            FROM ' . prefixTable('sharekeys_suggestions') . '
2751
+            FROM ' . prefixTable('sharekeys_suggestions').'
2752 2752
             WHERE object_id = %i AND user_id = %i',
2753 2753
             $record['id'],
2754 2754
             $session->get('user-id')
@@ -2780,7 +2780,7 @@  discard block
 block discarded – undo
2780 2780
             if ((int) $post_user_id !== (int) $session->get('user-id')) {
2781 2781
                 $currentUserKey = DB::queryFirstRow(
2782 2782
                     'SELECT increment_id
2783
-                    FROM ' . prefixTable('sharekeys_items') . '
2783
+                    FROM ' . prefixTable('sharekeys_items').'
2784 2784
                     WHERE object_id = %i AND user_id = %i',
2785 2785
                     $record['id'],
2786 2786
                     $post_user_id
@@ -2826,15 +2826,15 @@  discard block
 block discarded – undo
2826 2826
     // Loop on files
2827 2827
     $rows = DB::query(
2828 2828
         'SELECT id
2829
-        FROM ' . prefixTable('files') . '
2830
-        WHERE status = "' . TP_ENCRYPTION_NAME . '"
2831
-        LIMIT ' . $post_start . ', ' . $post_length
2829
+        FROM ' . prefixTable('files').'
2830
+        WHERE status = "' . TP_ENCRYPTION_NAME.'"
2831
+        LIMIT ' . $post_start.', '.$post_length
2832 2832
     ); //aes_encryption
2833 2833
     foreach ($rows as $record) {
2834 2834
         // Get itemKey from current user
2835 2835
         $currentUserKey = DB::queryFirstRow(
2836 2836
             'SELECT share_key
2837
-            FROM ' . prefixTable('sharekeys_files') . '
2837
+            FROM ' . prefixTable('sharekeys_files').'
2838 2838
             WHERE object_id = %i AND user_id = %i',
2839 2839
             $record['id'],
2840 2840
             $session->get('user-id')
@@ -2866,7 +2866,7 @@  discard block
 block discarded – undo
2866 2866
             if ((int) $post_user_id !== (int) $session->get('user-id')) {
2867 2867
                 $currentUserKey = DB::queryFirstRow(
2868 2868
                     'SELECT increment_id
2869
-                    FROM ' . prefixTable('sharekeys_items') . '
2869
+                    FROM ' . prefixTable('sharekeys_items').'
2870 2870
                     WHERE object_id = %i AND user_id = %i',
2871 2871
                     $record['id'],
2872 2872
                     $post_user_id
@@ -2888,8 +2888,8 @@  discard block
 block discarded – undo
2888 2888
     // SHould we change step?
2889 2889
     DB::query(
2890 2890
         'SELECT *
2891
-        FROM ' . prefixTable('files') . '
2892
-        WHERE status = "' . TP_ENCRYPTION_NAME . '"'
2891
+        FROM ' . prefixTable('files').'
2892
+        WHERE status = "' . TP_ENCRYPTION_NAME.'"'
2893 2893
     );
2894 2894
 
2895 2895
     $next_start = (int) $post_start + (int) $post_length;
@@ -2922,9 +2922,9 @@  discard block
 block discarded – undo
2922 2922
     if (count($session->get('user-personal_folders')) > 0) {
2923 2923
         $rows = DB::query(
2924 2924
             'SELECT id, pw
2925
-            FROM ' . prefixTable('items') . '
2925
+            FROM ' . prefixTable('items').'
2926 2926
             WHERE perso = 1 AND id_tree IN %ls AND encryption_type = %s
2927
-            LIMIT ' . $post_start . ', ' . $post_length,
2927
+            LIMIT ' . $post_start.', '.$post_length,
2928 2928
             $session->get('user-personal_folders'),
2929 2929
             "defuse"
2930 2930
         );
@@ -2932,7 +2932,7 @@  discard block
 block discarded – undo
2932 2932
             // Get itemKey from current user
2933 2933
             $currentUserKey = DB::queryFirstRow(
2934 2934
                 'SELECT share_key, increment_id
2935
-                FROM ' . prefixTable('sharekeys_items') . '
2935
+                FROM ' . prefixTable('sharekeys_items').'
2936 2936
                 WHERE object_id = %i AND user_id = %i',
2937 2937
                 $record['id'],
2938 2938
                 $session->get('user-id')
@@ -2959,7 +2959,7 @@  discard block
 block discarded – undo
2959 2959
                 if ((int) $post_user_id !== (int) $session->get('user-id')) {
2960 2960
                     $currentUserKey = DB::queryFirstRow(
2961 2961
                         'SELECT increment_id
2962
-                        FROM ' . prefixTable('sharekeys_items') . '
2962
+                        FROM ' . prefixTable('sharekeys_items').'
2963 2963
                         WHERE object_id = %i AND user_id = %i',
2964 2964
                         $record['id'],
2965 2965
                         $post_user_id
@@ -2982,7 +2982,7 @@  discard block
 block discarded – undo
2982 2982
     // SHould we change step?
2983 2983
     DB::query(
2984 2984
         'SELECT *
2985
-        FROM ' . prefixTable('items') . '
2985
+        FROM ' . prefixTable('items').'
2986 2986
         WHERE perso = 0'
2987 2987
     );
2988 2988
 
@@ -3010,7 +3010,7 @@  discard block
 block discarded – undo
3010 3010
         // Check if user exists
3011 3011
         $userInfo = DB::queryFirstRow(
3012 3012
             'SELECT public_key, encrypted_psk
3013
-            FROM ' . prefixTable('users') . '
3013
+            FROM ' . prefixTable('users').'
3014 3014
             WHERE id = %i',
3015 3015
             $post_user_id
3016 3016
         );
@@ -3036,7 +3036,7 @@  discard block
 block discarded – undo
3036 3036
                 if ($post_counterItemsToTreat === -1) {
3037 3037
                     DB::query(
3038 3038
                         'SELECT id
3039
-                        FROM ' . prefixTable('items') . '
3039
+                        FROM ' . prefixTable('items').'
3040 3040
                         WHERE perso = 1 AND id_tree IN %ls AND encryption_type != %s',
3041 3041
                         $session->get('user-personal_folders'),
3042 3042
                         'teampass_aes'
@@ -3049,7 +3049,7 @@  discard block
 block discarded – undo
3049 3049
                 // Loop on persoanl items
3050 3050
                 $rows = DB::query(
3051 3051
                     'SELECT id, pw
3052
-                    FROM ' . prefixTable('items') . '
3052
+                    FROM ' . prefixTable('items').'
3053 3053
                     WHERE perso = 1 AND id_tree IN %ls AND encryption_type != %s
3054 3054
                     LIMIT ' . $post_length,
3055 3055
                     $session->get('user-personal_folders'),
@@ -3093,7 +3093,7 @@  discard block
 block discarded – undo
3093 3093
                     // Loop on files
3094 3094
                     $rows = DB::query(
3095 3095
                         'SELECT id, file
3096
-                        FROM ' . prefixTable('files') . '
3096
+                        FROM ' . prefixTable('files').'
3097 3097
                         WHERE status != %s
3098 3098
                         AND id_item = %i',
3099 3099
                         TP_ENCRYPTION_NAME,
@@ -3104,13 +3104,13 @@  discard block
 block discarded – undo
3104 3104
                         // Now decrypt the file
3105 3105
                         prepareFileWithDefuse(
3106 3106
                             'decrypt',
3107
-                            $SETTINGS['path_to_upload_folder'] . '/' . $record2['file'],
3108
-                            $SETTINGS['path_to_upload_folder'] . '/' . $record2['file'] . '.delete',
3107
+                            $SETTINGS['path_to_upload_folder'].'/'.$record2['file'],
3108
+                            $SETTINGS['path_to_upload_folder'].'/'.$record2['file'].'.delete',
3109 3109
                             $post_user_psk
3110 3110
                         );
3111 3111
 
3112 3112
                         // Encrypt the file
3113
-                        $encryptedFile = encryptFile($record2['file'] . '.delete', $SETTINGS['path_to_upload_folder']);
3113
+                        $encryptedFile = encryptFile($record2['file'].'.delete', $SETTINGS['path_to_upload_folder']);
3114 3114
 
3115 3115
                         DB::update(
3116 3116
                             prefixTable('files'),
@@ -3133,7 +3133,7 @@  discard block
 block discarded – undo
3133 3133
                         );
3134 3134
 
3135 3135
                         // Unlink original file
3136
-                        unlink($SETTINGS['path_to_upload_folder'] . '/' . $record2['file']);
3136
+                        unlink($SETTINGS['path_to_upload_folder'].'/'.$record2['file']);
3137 3137
                     }
3138 3138
                 }
3139 3139
 
@@ -3141,7 +3141,7 @@  discard block
 block discarded – undo
3141 3141
                 $next_start = (int) $post_start + (int) $post_length;
3142 3142
                 DB::query(
3143 3143
                     'SELECT id
3144
-                    FROM ' . prefixTable('items') . '
3144
+                    FROM ' . prefixTable('items').'
3145 3145
                     WHERE perso = 1 AND id_tree IN %ls AND encryption_type != %s',
3146 3146
                     $session->get('user-personal_folders'),
3147 3147
                     'teampass_aes'
@@ -3211,7 +3211,7 @@  discard block
 block discarded – undo
3211 3211
         // Get user info
3212 3212
         $userData = DB::queryFirstRow(
3213 3213
             'SELECT special, auth_type, is_ready_for_usage, ongoing_process_id, otp_provided, keys_recovery_time
3214
-            FROM ' . prefixTable('users') . '
3214
+            FROM ' . prefixTable('users').'
3215 3215
             WHERE id = %i',
3216 3216
             $post_user_id
3217 3217
         );
@@ -3258,7 +3258,7 @@  discard block
 block discarded – undo
3258 3258
         // Get user info
3259 3259
         $userData = DB::queryFirstRow(
3260 3260
             'SELECT auth_type, login, private_key
3261
-            FROM ' . prefixTable('users') . '
3261
+            FROM ' . prefixTable('users').'
3262 3262
             WHERE id = %i',
3263 3263
             $post_user_id
3264 3264
         );
@@ -3308,7 +3308,7 @@  discard block
 block discarded – undo
3308 3308
                 return prepareExchangedData(
3309 3309
                     array(
3310 3310
                         'error' => false,
3311
-                        'message' => $lang->get('done'),'',
3311
+                        'message' => $lang->get('done'), '',
3312 3312
                     ),
3313 3313
                     'encode'
3314 3314
                 );
@@ -3358,7 +3358,7 @@  discard block
 block discarded – undo
3358 3358
         // Get user info
3359 3359
         $userData = DB::queryFirstRow(
3360 3360
             'SELECT auth_type, login, private_key, special
3361
-            FROM ' . prefixTable('users') . '
3361
+            FROM ' . prefixTable('users').'
3362 3362
             WHERE id = %i',
3363 3363
             $post_user_id
3364 3364
         );
@@ -3392,7 +3392,7 @@  discard block
 block discarded – undo
3392 3392
                 return prepareExchangedData(
3393 3393
                     array(
3394 3394
                         'error' => false,
3395
-                        'message' => $lang->get('done'),'',
3395
+                        'message' => $lang->get('done'), '',
3396 3396
                     ),
3397 3397
                     'encode'
3398 3398
                 );
@@ -3415,7 +3415,7 @@  discard block
 block discarded – undo
3415 3415
             // Get one itemKey from current user
3416 3416
             $currentUserKey = DB::queryFirstRow(
3417 3417
                 'SELECT share_key, increment_id
3418
-                FROM ' . prefixTable('sharekeys_items') . '
3418
+                FROM ' . prefixTable('sharekeys_items').'
3419 3419
                 WHERE user_id = %i
3420 3420
                 LIMIT 1',
3421 3421
                 $post_user_id
@@ -3504,7 +3504,7 @@  discard block
 block discarded – undo
3504 3504
             $session->get('user-id')
3505 3505
         );
3506 3506
         // Return data
3507
-        return '[{"new_value":"' . $session->get('user-session_duration') . '"}]';
3507
+        return '[{"new_value":"'.$session->get('user-session_duration').'"}]';
3508 3508
     }
3509 3509
     
3510 3510
     return '[{"new_value":"expired"}]';
Please login to merge, or discard this patch.