Passed
Push — teampass_3.0 ( c4785d...0b1c1e )
by Nils
04:24
created
sources/main.queries.php 1 patch
Spacing   +110 added lines, -110 removed lines patch added patch discarded remove patch
@@ -45,8 +45,8 @@  discard block
 block discarded – undo
45 45
 date_default_timezone_set(isset($SETTINGS['timezone']) === true ? $SETTINGS['timezone'] : 'UTC');
46 46
 
47 47
 // DO CHECKS
48
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
49
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
48
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
49
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
50 50
 $post_type = filter_input(INPUT_POST, 'type', FILTER_SANITIZE_STRING);
51 51
 if (
52 52
     isset($post_type) === true
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
     && checkUser($_SESSION['user_id'], $_SESSION['key'], 'home', $SETTINGS) === false
63 63
 ) {
64 64
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page
65
-    include $SETTINGS['cpassman_dir'] . '/error.php';
65
+    include $SETTINGS['cpassman_dir'].'/error.php';
66 66
     exit();
67 67
 } elseif ((isset($_SESSION['user_id']) === true
68 68
         && isset($_SESSION['key'])) === true
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
     mainQuery($SETTINGS);
75 75
 } else {
76 76
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page
77
-    include $SETTINGS['cpassman_dir'] . '/error.php';
77
+    include $SETTINGS['cpassman_dir'].'/error.php';
78 78
     exit();
79 79
 }
80 80
 
@@ -89,13 +89,13 @@  discard block
 block discarded – undo
89 89
 
90 90
 
91 91
     // Includes
92
-    include_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
93
-    include_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
94
-    include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
95
-    include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
92
+    include_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
93
+    include_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
94
+    include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
95
+    include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
96 96
 
97 97
     // Connect to mysql server
98
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
98
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
99 99
 
100 100
     DB::$host = DB_HOST;
101 101
     DB::$user = DB_USER;
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
     DB::$encoding = DB_ENCODING;
106 106
 
107 107
     // User's language loading
108
-    include_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
108
+    include_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
109 109
 
110 110
     // Prepare post variables
111 111
     $post_key = filter_input(INPUT_POST, 'key', FILTER_SANITIZE_STRING);
@@ -249,7 +249,7 @@  discard block
 block discarded – undo
249 249
             $pwdlib = new PasswordLib\PasswordLib();
250 250
             // generate key
251 251
             $key = $pwdlib->getRandomToken(filter_input(INPUT_POST, 'size', FILTER_SANITIZE_NUMBER_INT));
252
-            echo '[{"key" : "' . htmlentities($key, ENT_QUOTES) . '"}]';
252
+            echo '[{"key" : "'.htmlentities($key, ENT_QUOTES).'"}]';
253 253
             break;
254 254
 
255 255
         /*
@@ -278,7 +278,7 @@  discard block
 block discarded – undo
278 278
                 )
279 279
             );
280 280
 
281
-            echo '[{"token" : "' . $token . '"}]';
281
+            echo '[{"token" : "'.$token.'"}]';
282 282
             break;
283 283
 
284 284
 
@@ -570,7 +570,7 @@  discard block
 block discarded – undo
570 570
             return prepareExchangedData(
571 571
                 array(
572 572
                     'error' => true,
573
-                    'message' => '<div style="margin:10px 0 10px 15px;">' . langHdl('error_not_allowed_to') . '</div>',
573
+                    'message' => '<div style="margin:10px 0 10px 15px;">'.langHdl('error_not_allowed_to').'</div>',
574 574
                 ),
575 575
                 'encode'
576 576
             );
@@ -579,7 +579,7 @@  discard block
 block discarded – undo
579 579
         // check if expected security level is reached
580 580
         $dataUser = DB::queryfirstrow(
581 581
             'SELECT *
582
-            FROM ' . prefixTable('users') . '
582
+            FROM ' . prefixTable('users').'
583 583
             WHERE id = %i',
584 584
             $post_user_id
585 585
         );
@@ -601,8 +601,8 @@  discard block
 block discarded – undo
601 601
         if (empty($dataUser['fonction_id']) === false) {
602 602
             $data = DB::queryFirstRow(
603 603
                 'SELECT complexity
604
-                FROM ' . prefixTable('roles_title') . '
605
-                WHERE id IN (' . $dataUser['fonction_id'] . ')
604
+                FROM ' . prefixTable('roles_title').'
605
+                WHERE id IN (' . $dataUser['fonction_id'].')
606 606
                 ORDER BY complexity DESC'
607 607
             );
608 608
         } else {
@@ -615,8 +615,8 @@  discard block
 block discarded – undo
615 615
             return prepareExchangedData(
616 616
                 array(
617 617
                     'error' => true,
618
-                    'message' => '<div style="margin:10px 0 10px 15px;">' . langHdl('complexity_level_not_reached') . '.<br>' .
619
-                        langHdl('expected_complexity_level') . ': <b>' . TP_PW_COMPLEXITY[$data['complexity']][1] . '</b></div>',
618
+                    'message' => '<div style="margin:10px 0 10px 15px;">'.langHdl('complexity_level_not_reached').'.<br>'.
619
+                        langHdl('expected_complexity_level').': <b>'.TP_PW_COMPLEXITY[$data['complexity']][1].'</b></div>',
620 620
                 ),
621 621
                 'encode'
622 622
             );
@@ -710,14 +710,14 @@  discard block
 block discarded – undo
710 710
         // Get data about user
711 711
         $data = DB::queryfirstrow(
712 712
             'SELECT id, email, pw
713
-            FROM ' . prefixTable('users') . '
713
+            FROM ' . prefixTable('users').'
714 714
             WHERE login = %s',
715 715
             $post_login
716 716
         );
717 717
     } else {
718 718
         $data = DB::queryfirstrow(
719 719
             'SELECT id, login, email, pw
720
-            FROM ' . prefixTable('users') . '
720
+            FROM ' . prefixTable('users').'
721 721
             WHERE id = %i',
722 722
             $post_id
723 723
         );
@@ -727,7 +727,7 @@  discard block
 block discarded – undo
727 727
     $counter = DB::count();
728 728
 
729 729
     // load passwordLib library
730
-    $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'] . '/includes/libraries');
730
+    $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'].'/includes/libraries');
731 731
     $pwdlib->register();
732 732
     $pwdlib = new PasswordLib\PasswordLib();
733 733
 
@@ -774,7 +774,7 @@  discard block
 block discarded – undo
774 774
     }
775 775
     
776 776
     // generate new GA user code
777
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php';
777
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php';
778 778
     $tfa = new Authentication\TwoFactorAuth\TwoFactorAuth($SETTINGS['ga_website_name']);
779 779
     $gaSecretKey = $tfa->createSecret();
780 780
     $gaTemporaryCode = GenerateCryptKey(12, false, true, true, false, true, $SETTINGS);
@@ -816,7 +816,7 @@  discard block
 block discarded – undo
816 816
                 'email' => $data['email'],
817 817
                 'email_result' => str_replace(
818 818
                     '#email#',
819
-                    '<b>' . obfuscateEmail($data['email']) . '</b>',
819
+                    '<b>'.obfuscateEmail($data['email']).'</b>',
820 820
                     addslashes(langHdl('admin_email_result_ok'))
821 821
                 ),
822 822
             ),
@@ -832,7 +832,7 @@  discard block
 block discarded – undo
832 832
             'email' => $data['email'],
833 833
             'email_result' => str_replace(
834 834
                 '#email#',
835
-                '<b>' . obfuscateEmail($data['email']) . '</b>',
835
+                '<b>'.obfuscateEmail($data['email']).'</b>',
836 836
                 addslashes(langHdl('admin_email_result_ok'))
837 837
             ),
838 838
         ),
@@ -848,7 +848,7 @@  discard block
 block discarded – undo
848 848
         && (int) $SETTINGS['enable_send_email_on_user_login'] === 1
849 849
     ) {
850 850
         $row = DB::queryFirstRow(
851
-            'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s',
851
+            'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s',
852 852
             'cron',
853 853
             'sending_emails'
854 854
         );
@@ -856,12 +856,12 @@  discard block
 block discarded – undo
856 856
         if ((int) (time() - $row['valeur']) >= 300 || (int) $row['valeur'] === 0) {
857 857
             $rows = DB::query(
858 858
                 'SELECT *
859
-                FROM ' . prefixTable('emails') .
859
+                FROM ' . prefixTable('emails').
860 860
                 ' WHERE status != %s',
861 861
                 'sent'
862 862
             );
863 863
             foreach ($rows as $record) {
864
-                echo $record['increment_id'] . " >> ";
864
+                echo $record['increment_id']." >> ";
865 865
                 // Send email
866 866
                 $ret = json_decode(
867 867
                     sendEmail(
@@ -960,8 +960,8 @@  discard block
 block discarded – undo
960 960
     $arr_html = array();
961 961
     $rows = DB::query(
962 962
         '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
963
-        FROM ' . prefixTable('log_items') . ' AS l
964
-        RIGHT JOIN ' . prefixTable('items') . ' AS i ON (l.id_item = i.id)
963
+        FROM ' . prefixTable('log_items').' AS l
964
+        RIGHT JOIN ' . prefixTable('items').' AS i ON (l.id_item = i.id)
965 965
         WHERE l.action = %s AND l.id_user = %i
966 966
         ORDER BY l.date DESC
967 967
         LIMIT 0, 100',
@@ -994,7 +994,7 @@  discard block
 block discarded – undo
994 994
         isset($SETTINGS['enable_suggestion']) === true && (int) $SETTINGS['enable_suggestion'] === 1
995 995
         && ((int) $_SESSION['user_admin'] === 1 || (int) $_SESSION['user_manager'] === 1)
996 996
     ) {
997
-        DB::query('SELECT * FROM ' . prefixTable('suggestion'));
997
+        DB::query('SELECT * FROM '.prefixTable('suggestion'));
998 998
         $nb_suggestions_waiting = DB::count();
999 999
     }
1000 1000
 
@@ -1030,13 +1030,13 @@  discard block
 block discarded – undo
1030 1030
             if ($data === 'stat_languages') {
1031 1031
                 $tmp = '';
1032 1032
                 foreach ($stats_data[$data] as $key => $value) {
1033
-                    $tmp .= $tmp === '' ? $key . '-' . $value : ',' . $key . '-' . $value;
1033
+                    $tmp .= $tmp === '' ? $key.'-'.$value : ','.$key.'-'.$value;
1034 1034
                 }
1035 1035
                 $statsToSend[$data] = $tmp;
1036 1036
             } elseif ($data === 'stat_country') {
1037 1037
                 $tmp = '';
1038 1038
                 foreach ($stats_data[$data] as $key => $value) {
1039
-                    $tmp .= $tmp === '' ? $key . '-' . $value : ',' . $key . '-' . $value;
1039
+                    $tmp .= $tmp === '' ? $key.'-'.$value : ','.$key.'-'.$value;
1040 1040
                 }
1041 1041
                 $statsToSend[$data] = $tmp;
1042 1042
             } else {
@@ -1110,8 +1110,8 @@  discard block
 block discarded – undo
1110 1110
             if (strpos($line, 'cpassman_url') > 0 && empty($url_found) === true) {
1111 1111
                 $url_found = substr($line, 19, strlen($line) - 22);
1112 1112
                 $tmp = parse_url($url_found);
1113
-                $anonym_url = $tmp['scheme'] . '://<anonym_url>' . $tmp['path'];
1114
-                $line = "'cpassman_url' => '" . $anonym_url . "\n";
1113
+                $anonym_url = $tmp['scheme'].'://<anonym_url>'.$tmp['path'];
1114
+                $line = "'cpassman_url' => '".$anonym_url."\n";
1115 1115
             }
1116 1116
 
1117 1117
             // Anonymize all urls
@@ -1138,7 +1138,7 @@  discard block
 block discarded – undo
1138 1138
     $teampass_errors = '';
1139 1139
     $rows = DB::query(
1140 1140
         'SELECT label, date AS error_date
1141
-        FROM ' . prefixTable('log_system') . "
1141
+        FROM ' . prefixTable('log_system')."
1142 1142
         WHERE `type` LIKE 'error'
1143 1143
         ORDER BY `date` DESC
1144 1144
         LIMIT 0, 10"
@@ -1146,9 +1146,9 @@  discard block
 block discarded – undo
1146 1146
     if (DB::count() > 0) {
1147 1147
         foreach ($rows as $record) {
1148 1148
             if (empty($teampass_errors) === true) {
1149
-                $teampass_errors = ' * ' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['error_date']) . ' - ' . $record['label'];
1149
+                $teampass_errors = ' * '.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['error_date']).' - '.$record['label'];
1150 1150
             } else {
1151
-                $teampass_errors .= ' * ' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['error_date']) . ' - ' . $record['label'];
1151
+                $teampass_errors .= ' * '.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['error_date']).' - '.$record['label'];
1152 1152
             }
1153 1153
         }
1154 1154
     }
@@ -1157,7 +1157,7 @@  discard block
 block discarded – undo
1157 1157
 
1158 1158
     // Now prepare text
1159 1159
     $txt = '### Page on which it happened
1160
-' . $post_data['current_page'] . '
1160
+' . $post_data['current_page'].'
1161 1161
 
1162 1162
 ### Steps to reproduce
1163 1163
 1.
@@ -1172,39 +1172,39 @@  discard block
 block discarded – undo
1172 1172
 Tell us what happens instead
1173 1173
 
1174 1174
 ### Server configuration
1175
-**Operating system**: ' . php_uname() . '
1175
+**Operating system**: ' . php_uname().'
1176 1176
 
1177
-**Web server:** ' . $_SERVER['SERVER_SOFTWARE'] . '
1177
+**Web server:** ' . $_SERVER['SERVER_SOFTWARE'].'
1178 1178
 
1179
-**Database:** ' . ($link === false ? langHdl('undefined') : mysqli_get_server_info($link)) . '
1179
+**Database:** ' . ($link === false ? langHdl('undefined') : mysqli_get_server_info($link)).'
1180 1180
 
1181
-**PHP version:** ' . PHP_VERSION . '
1181
+**PHP version:** ' . PHP_VERSION.'
1182 1182
 
1183
-**Teampass version:** ' . TP_VERSION_FULL . '
1183
+**Teampass version:** ' . TP_VERSION_FULL.'
1184 1184
 
1185 1185
 **Teampass configuration file:**
1186 1186
 ```
1187
-' . $list_of_options . '
1187
+' . $list_of_options.'
1188 1188
 ```
1189 1189
 
1190 1190
 **Updated from an older Teampass or fresh install:**
1191 1191
 
1192 1192
 ### Client configuration
1193 1193
 
1194
-**Browser:** ' . $post_data['browser_name'] . ' - ' . $post_data['browser_version'] . '
1194
+**Browser:** ' . $post_data['browser_name'].' - '.$post_data['browser_version'].'
1195 1195
 
1196
-**Operating system:** ' . $post_data['os'] . ' - ' . $post_data['os_archi'] . 'bits
1196
+**Operating system:** ' . $post_data['os'].' - '.$post_data['os_archi'].'bits
1197 1197
 
1198 1198
 ### Logs
1199 1199
 
1200 1200
 #### Web server error log
1201 1201
 ```
1202
-' . $err['message'] . ' - ' . $err['file'] . ' (' . $err['line'] . ')
1202
+' . $err['message'].' - '.$err['file'].' ('.$err['line'].')
1203 1203
 ```
1204 1204
 
1205 1205
 #### Teampass 10 last system errors
1206 1206
 ```
1207
-' . $teampass_errors . '
1207
+' . $teampass_errors.'
1208 1208
 ```
1209 1209
 
1210 1210
 #### Log from the web-browser developer console (CTRL + SHIFT + i)
@@ -1232,7 +1232,7 @@  discard block
 block discarded – undo
1232 1232
         // Check if user exists
1233 1233
         $userInfo = DB::queryFirstRow(
1234 1234
             'SELECT public_key, private_key, pw
1235
-            FROM ' . prefixTable('users') . '
1235
+            FROM ' . prefixTable('users').'
1236 1236
             WHERE id = %i',
1237 1237
             $post_user_id
1238 1238
         );
@@ -1240,14 +1240,14 @@  discard block
 block discarded – undo
1240 1240
             // Get one item
1241 1241
             $record = DB::queryFirstRow(
1242 1242
                 'SELECT id, pw
1243
-                FROM ' . prefixTable('items') . '
1243
+                FROM ' . prefixTable('items').'
1244 1244
                 WHERE perso = 0'
1245 1245
             );
1246 1246
 
1247 1247
             // Get itemKey from current user
1248 1248
             $currentUserKey = DB::queryFirstRow(
1249 1249
                 'SELECT share_key, increment_id
1250
-                FROM ' . prefixTable('sharekeys_items') . '
1250
+                FROM ' . prefixTable('sharekeys_items').'
1251 1251
                 WHERE object_id = %i AND user_id = %i',
1252 1252
                 $record['id'],
1253 1253
                 $post_user_id
@@ -1275,7 +1275,7 @@  discard block
 block discarded – undo
1275 1275
             
1276 1276
             // Use the password check
1277 1277
             // load passwordLib library
1278
-            $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'] . '/includes/libraries');
1278
+            $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'].'/includes/libraries');
1279 1279
             $pwdlib->register();
1280 1280
             $pwdlib = new PasswordLib\PasswordLib();
1281 1281
             
@@ -1319,7 +1319,7 @@  discard block
 block discarded – undo
1319 1319
         // Get user info
1320 1320
         $userData = DB::queryFirstRow(
1321 1321
             'SELECT private_key
1322
-            FROM ' . prefixTable('users') . '
1322
+            FROM ' . prefixTable('users').'
1323 1323
             WHERE id = %i',
1324 1324
             $post_user_id
1325 1325
         );
@@ -1346,7 +1346,7 @@  discard block
 block discarded – undo
1346 1346
             );
1347 1347
 
1348 1348
             // Load superGlobals
1349
-            include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
1349
+            include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
1350 1350
             $superGlobal = new protect\SuperGlobal\SuperGlobal();
1351 1351
 
1352 1352
             $superGlobal->put('private_key', $privateKey, 'SESSION', 'user');
@@ -1384,7 +1384,7 @@  discard block
 block discarded – undo
1384 1384
         // Get user info
1385 1385
         $userData = DB::queryFirstRow(
1386 1386
             'SELECT email, auth_type, login
1387
-            FROM ' . prefixTable('users') . '
1387
+            FROM ' . prefixTable('users').'
1388 1388
             WHERE id = %i',
1389 1389
             $post_user_id
1390 1390
         );
@@ -1518,7 +1518,7 @@  discard block
 block discarded – undo
1518 1518
         // Get user info
1519 1519
         $userData = DB::queryFirstRow(
1520 1520
             'SELECT email, auth_type, login
1521
-            FROM ' . prefixTable('users') . '
1521
+            FROM ' . prefixTable('users').'
1522 1522
             WHERE id = %i',
1523 1523
             $post_user_id
1524 1524
         );
@@ -1581,13 +1581,13 @@  discard block
 block discarded – undo
1581 1581
         // Check if user exists
1582 1582
         DB::queryFirstRow(
1583 1583
             'SELECT *
1584
-            FROM ' . prefixTable('users') . '
1584
+            FROM ' . prefixTable('users').'
1585 1585
             WHERE id = %i',
1586 1586
             $post_user_id
1587 1587
         );
1588 1588
         if (DB::count() > 0) {
1589 1589
             // Include libraries
1590
-            include_once $SETTINGS['cpassman_dir'] . '/sources/aes.functions.php';
1590
+            include_once $SETTINGS['cpassman_dir'].'/sources/aes.functions.php';
1591 1591
 
1592 1592
             // CLear old sharekeys
1593 1593
             if ($post_self_change === false) {
@@ -1639,13 +1639,13 @@  discard block
 block discarded – undo
1639 1639
         // Check if user exists
1640 1640
         $userInfo = DB::queryFirstRow(
1641 1641
             'SELECT public_key
1642
-            FROM ' . prefixTable('users') . '
1642
+            FROM ' . prefixTable('users').'
1643 1643
             WHERE id = %i',
1644 1644
             $post_user_id
1645 1645
         );
1646 1646
         if (DB::count() > 0) {
1647 1647
             // Include libraries
1648
-            include_once $SETTINGS['cpassman_dir'] . '/sources/aes.functions.php';
1648
+            include_once $SETTINGS['cpassman_dir'].'/sources/aes.functions.php';
1649 1649
 
1650 1650
             // WHAT STEP TO PERFORM?
1651 1651
             if ($post_action === 'step0') {
@@ -1804,15 +1804,15 @@  discard block
 block discarded – undo
1804 1804
     // Loop on items
1805 1805
     $rows = DB::query(
1806 1806
         'SELECT id, pw
1807
-        FROM ' . prefixTable('items') . '
1807
+        FROM ' . prefixTable('items').'
1808 1808
         WHERE perso = 0
1809
-        LIMIT ' . $post_start . ', ' . $post_length
1809
+        LIMIT ' . $post_start.', '.$post_length
1810 1810
     );
1811 1811
     foreach ($rows as $record) {
1812 1812
         // Get itemKey from current user
1813 1813
         $currentUserKey = DB::queryFirstRow(
1814 1814
             'SELECT share_key, increment_id
1815
-            FROM ' . prefixTable('sharekeys_items') . '
1815
+            FROM ' . prefixTable('sharekeys_items').'
1816 1816
             WHERE object_id = %i AND user_id = %i',
1817 1817
             $record['id'],
1818 1818
             $_SESSION['user_id']
@@ -1840,7 +1840,7 @@  discard block
 block discarded – undo
1840 1840
             if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
1841 1841
                 $currentUserKey = DB::queryFirstRow(
1842 1842
                     'SELECT increment_id
1843
-                    FROM ' . prefixTable('sharekeys_items') . '
1843
+                    FROM ' . prefixTable('sharekeys_items').'
1844 1844
                     WHERE object_id = %i AND user_id = %i',
1845 1845
                     $record['id'],
1846 1846
                     $post_user_id
@@ -1873,7 +1873,7 @@  discard block
 block discarded – undo
1873 1873
     // SHould we change step?
1874 1874
     DB::query(
1875 1875
         'SELECT *
1876
-        FROM ' . prefixTable('items') . '
1876
+        FROM ' . prefixTable('items').'
1877 1877
         WHERE perso = 0'
1878 1878
     );
1879 1879
 
@@ -1897,15 +1897,15 @@  discard block
 block discarded – undo
1897 1897
     // Loop on logs
1898 1898
     $rows = DB::query(
1899 1899
         'SELECT increment_id
1900
-        FROM ' . prefixTable('log_items') . '
1900
+        FROM ' . prefixTable('log_items').'
1901 1901
         WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"
1902
-        LIMIT ' . $post_start . ', ' . $post_length
1902
+        LIMIT ' . $post_start.', '.$post_length
1903 1903
     );
1904 1904
     foreach ($rows as $record) {
1905 1905
         // Get itemKey from current user
1906 1906
         $currentUserKey = DB::queryFirstRow(
1907 1907
             'SELECT share_key
1908
-            FROM ' . prefixTable('sharekeys_logs') . '
1908
+            FROM ' . prefixTable('sharekeys_logs').'
1909 1909
             WHERE object_id = %i AND user_id = %i',
1910 1910
             $record['increment_id'],
1911 1911
             $_SESSION['user_id']
@@ -1932,7 +1932,7 @@  discard block
 block discarded – undo
1932 1932
             if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
1933 1933
                 $currentUserKey = DB::queryFirstRow(
1934 1934
                     'SELECT increment_id
1935
-                    FROM ' . prefixTable('sharekeys_items') . '
1935
+                    FROM ' . prefixTable('sharekeys_items').'
1936 1936
                     WHERE object_id = %i AND user_id = %i',
1937 1937
                     $record['id'],
1938 1938
                     $post_user_id
@@ -1954,7 +1954,7 @@  discard block
 block discarded – undo
1954 1954
     // SHould we change step?
1955 1955
     DB::query(
1956 1956
         'SELECT increment_id
1957
-        FROM ' . prefixTable('log_items') . '
1957
+        FROM ' . prefixTable('log_items').'
1958 1958
         WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"'
1959 1959
     );
1960 1960
 
@@ -1978,15 +1978,15 @@  discard block
 block discarded – undo
1978 1978
     // Loop on fields
1979 1979
     $rows = DB::query(
1980 1980
         'SELECT id
1981
-        FROM ' . prefixTable('categories_items') . '
1981
+        FROM ' . prefixTable('categories_items').'
1982 1982
         WHERE encryption_type = "teampass_aes"
1983
-        LIMIT ' . $post_start . ', ' . $post_length
1983
+        LIMIT ' . $post_start.', '.$post_length
1984 1984
     );
1985 1985
     foreach ($rows as $record) {
1986 1986
         // Get itemKey from current user
1987 1987
         $currentUserKey = DB::queryFirstRow(
1988 1988
             'SELECT share_key
1989
-            FROM ' . prefixTable('sharekeys_fields') . '
1989
+            FROM ' . prefixTable('sharekeys_fields').'
1990 1990
             WHERE object_id = %i AND user_id = %i',
1991 1991
             $record['id'],
1992 1992
             $_SESSION['user_id']
@@ -2013,7 +2013,7 @@  discard block
 block discarded – undo
2013 2013
             if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
2014 2014
                 $currentUserKey = DB::queryFirstRow(
2015 2015
                     'SELECT increment_id
2016
-                    FROM ' . prefixTable('sharekeys_items') . '
2016
+                    FROM ' . prefixTable('sharekeys_items').'
2017 2017
                     WHERE object_id = %i AND user_id = %i',
2018 2018
                     $record['id'],
2019 2019
                     $post_user_id
@@ -2035,7 +2035,7 @@  discard block
 block discarded – undo
2035 2035
     // SHould we change step?
2036 2036
     DB::query(
2037 2037
         'SELECT *
2038
-        FROM ' . prefixTable('categories_items') . '
2038
+        FROM ' . prefixTable('categories_items').'
2039 2039
         WHERE encryption_type = "teampass_aes"'
2040 2040
     );
2041 2041
 
@@ -2059,14 +2059,14 @@  discard block
 block discarded – undo
2059 2059
     // Loop on suggestions
2060 2060
     $rows = DB::query(
2061 2061
         'SELECT id
2062
-        FROM ' . prefixTable('suggestion') . '
2063
-        LIMIT ' . $post_start . ', ' . $post_length
2062
+        FROM ' . prefixTable('suggestion').'
2063
+        LIMIT ' . $post_start.', '.$post_length
2064 2064
     );
2065 2065
     foreach ($rows as $record) {
2066 2066
         // Get itemKey from current user
2067 2067
         $currentUserKey = DB::queryFirstRow(
2068 2068
             'SELECT share_key
2069
-            FROM ' . prefixTable('sharekeys_suggestions') . '
2069
+            FROM ' . prefixTable('sharekeys_suggestions').'
2070 2070
             WHERE object_id = %i AND user_id = %i',
2071 2071
             $record['id'],
2072 2072
             $_SESSION['user_id']
@@ -2093,7 +2093,7 @@  discard block
 block discarded – undo
2093 2093
             if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
2094 2094
                 $currentUserKey = DB::queryFirstRow(
2095 2095
                     'SELECT increment_id
2096
-                    FROM ' . prefixTable('sharekeys_items') . '
2096
+                    FROM ' . prefixTable('sharekeys_items').'
2097 2097
                     WHERE object_id = %i AND user_id = %i',
2098 2098
                     $record['id'],
2099 2099
                     $post_user_id
@@ -2138,15 +2138,15 @@  discard block
 block discarded – undo
2138 2138
     // Loop on files
2139 2139
     $rows = DB::query(
2140 2140
         'SELECT id
2141
-        FROM ' . prefixTable('files') . '
2142
-        WHERE status = "' . TP_ENCRYPTION_NAME . '"
2143
-        LIMIT ' . $post_start . ', ' . $post_length
2141
+        FROM ' . prefixTable('files').'
2142
+        WHERE status = "' . TP_ENCRYPTION_NAME.'"
2143
+        LIMIT ' . $post_start.', '.$post_length
2144 2144
     ); //aes_encryption
2145 2145
     foreach ($rows as $record) {
2146 2146
         // Get itemKey from current user
2147 2147
         $currentUserKey = DB::queryFirstRow(
2148 2148
             'SELECT share_key
2149
-            FROM ' . prefixTable('sharekeys_files') . '
2149
+            FROM ' . prefixTable('sharekeys_files').'
2150 2150
             WHERE object_id = %i AND user_id = %i',
2151 2151
             $record['id'],
2152 2152
             $_SESSION['user_id']
@@ -2173,7 +2173,7 @@  discard block
 block discarded – undo
2173 2173
             if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
2174 2174
                 $currentUserKey = DB::queryFirstRow(
2175 2175
                     'SELECT increment_id
2176
-                    FROM ' . prefixTable('sharekeys_items') . '
2176
+                    FROM ' . prefixTable('sharekeys_items').'
2177 2177
                     WHERE object_id = %i AND user_id = %i',
2178 2178
                     $record['id'],
2179 2179
                     $post_user_id
@@ -2195,8 +2195,8 @@  discard block
 block discarded – undo
2195 2195
     // SHould we change step?
2196 2196
     DB::query(
2197 2197
         'SELECT *
2198
-        FROM ' . prefixTable('files') . '
2199
-        WHERE status = "' . TP_ENCRYPTION_NAME . '"'
2198
+        FROM ' . prefixTable('files').'
2199
+        WHERE status = "' . TP_ENCRYPTION_NAME.'"'
2200 2200
     );
2201 2201
 
2202 2202
     $next_start = (int) $post_start + (int) $post_length;
@@ -2228,16 +2228,16 @@  discard block
 block discarded – undo
2228 2228
     if (count($_SESSION['personal_folders']) > 0) {
2229 2229
         $rows = DB::query(
2230 2230
             'SELECT id, pw
2231
-            FROM ' . prefixTable('items') . '
2231
+            FROM ' . prefixTable('items').'
2232 2232
             WHERE perso = 1 AND id_tree IN %ls
2233
-            LIMIT ' . $post_start . ', ' . $post_length,
2233
+            LIMIT ' . $post_start.', '.$post_length,
2234 2234
             $_SESSION['personal_folders']
2235 2235
         );
2236 2236
         foreach ($rows as $record) {
2237 2237
             // Get itemKey from current user
2238 2238
             $currentUserKey = DB::queryFirstRow(
2239 2239
                 'SELECT share_key, increment_id
2240
-                FROM ' . prefixTable('sharekeys_items') . '
2240
+                FROM ' . prefixTable('sharekeys_items').'
2241 2241
                 WHERE object_id = %i AND user_id = %i',
2242 2242
                 $record['id'],
2243 2243
                 $_SESSION['user_id']
@@ -2264,7 +2264,7 @@  discard block
 block discarded – undo
2264 2264
                 if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
2265 2265
                     $currentUserKey = DB::queryFirstRow(
2266 2266
                         'SELECT increment_id
2267
-                        FROM ' . prefixTable('sharekeys_items') . '
2267
+                        FROM ' . prefixTable('sharekeys_items').'
2268 2268
                         WHERE object_id = %i AND user_id = %i',
2269 2269
                         $record['id'],
2270 2270
                         $post_user_id
@@ -2287,7 +2287,7 @@  discard block
 block discarded – undo
2287 2287
     // SHould we change step?
2288 2288
     DB::query(
2289 2289
         'SELECT *
2290
-        FROM ' . prefixTable('items') . '
2290
+        FROM ' . prefixTable('items').'
2291 2291
         WHERE perso = 0'
2292 2292
     );
2293 2293
 
@@ -2311,7 +2311,7 @@  discard block
 block discarded – undo
2311 2311
         // Check if user exists
2312 2312
         $userInfo = DB::queryFirstRow(
2313 2313
             'SELECT public_key, encrypted_psk
2314
-            FROM ' . prefixTable('users') . '
2314
+            FROM ' . prefixTable('users').'
2315 2315
             WHERE id = %i',
2316 2316
             $post_user_id
2317 2317
         );
@@ -2336,9 +2336,9 @@  discard block
 block discarded – undo
2336 2336
                 // Loop on persoanl items
2337 2337
                 $rows = DB::query(
2338 2338
                     'SELECT id, pw
2339
-                    FROM ' . prefixTable('items') . '
2339
+                    FROM ' . prefixTable('items').'
2340 2340
                     WHERE perso = 1 AND id_tree IN %ls
2341
-                    LIMIT ' . $post_start . ', ' . $post_length,
2341
+                    LIMIT ' . $post_start.', '.$post_length,
2342 2342
                     $_SESSION['personal_folders']
2343 2343
                 );
2344 2344
                 $countUserPersonalItems = DB::count();
@@ -2381,7 +2381,7 @@  discard block
 block discarded – undo
2381 2381
                         // Loop on files
2382 2382
                         $rows = DB::query(
2383 2383
                             'SELECT id, file
2384
-                            FROM ' . prefixTable('files') . '
2384
+                            FROM ' . prefixTable('files').'
2385 2385
                             WHERE status != %s
2386 2386
                             AND id_item = %i',
2387 2387
                             TP_ENCRYPTION_NAME,
@@ -2392,14 +2392,14 @@  discard block
 block discarded – undo
2392 2392
                             // Now decrypt the file
2393 2393
                             prepareFileWithDefuse(
2394 2394
                                 'decrypt',
2395
-                                $SETTINGS['path_to_upload_folder'] . '/' . $record2['file'],
2396
-                                $SETTINGS['path_to_upload_folder'] . '/' . $record2['file'] . '.delete',
2395
+                                $SETTINGS['path_to_upload_folder'].'/'.$record2['file'],
2396
+                                $SETTINGS['path_to_upload_folder'].'/'.$record2['file'].'.delete',
2397 2397
                                 $SETTINGS,
2398 2398
                                 $post_user_psk
2399 2399
                             );
2400 2400
 
2401 2401
                             // Encrypt the file
2402
-                            $encryptedFile = encryptFile($record2['file'] . '.delete', $SETTINGS['path_to_upload_folder']);
2402
+                            $encryptedFile = encryptFile($record2['file'].'.delete', $SETTINGS['path_to_upload_folder']);
2403 2403
 
2404 2404
                             DB::update(
2405 2405
                                 prefixTable('files'),
@@ -2422,7 +2422,7 @@  discard block
 block discarded – undo
2422 2422
                             );
2423 2423
 
2424 2424
                             // Unlink original file
2425
-                            unlink($SETTINGS['path_to_upload_folder'] . '/' . $record2['file']);
2425
+                            unlink($SETTINGS['path_to_upload_folder'].'/'.$record2['file']);
2426 2426
                         }
2427 2427
                     }
2428 2428
                 }
@@ -2491,7 +2491,7 @@  discard block
 block discarded – undo
2491 2491
         // Get user info
2492 2492
         $userData = DB::queryFirstRow(
2493 2493
             'SELECT '.$post_fields.'
2494
-            FROM ' . prefixTable('users') . '
2494
+            FROM ' . prefixTable('users').'
2495 2495
             WHERE id = %i',
2496 2496
             $post_user_id
2497 2497
         );
@@ -2526,7 +2526,7 @@  discard block
 block discarded – undo
2526 2526
         // Get user info
2527 2527
         $userData = DB::queryFirstRow(
2528 2528
             'SELECT auth_type, login, private_key
2529
-            FROM ' . prefixTable('users') . '
2529
+            FROM ' . prefixTable('users').'
2530 2530
             WHERE id = %i',
2531 2531
             $post_user_id
2532 2532
         );
@@ -2537,7 +2537,7 @@  discard block
 block discarded – undo
2537 2537
             $privateKey = decryptPrivateKey($post_current_pwd, $userData['private_key']);
2538 2538
 
2539 2539
             // Load superGlobals
2540
-            include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
2540
+            include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
2541 2541
             $superGlobal = new protect\SuperGlobal\SuperGlobal();
2542 2542
 
2543 2543
             if ($superGlobal->get('private_key', 'SESSION', 'user') === $privateKey) {
@@ -2570,7 +2570,7 @@  discard block
 block discarded – undo
2570 2570
                 return prepareExchangedData(
2571 2571
                     array(
2572 2572
                         'error' => false,
2573
-                        'message' => langHdl('done'),'',
2573
+                        'message' => langHdl('done'), '',
2574 2574
                     ),
2575 2575
                     'encode'
2576 2576
                 );
@@ -2608,7 +2608,7 @@  discard block
 block discarded – undo
2608 2608
         // Get user info
2609 2609
         $userData = DB::queryFirstRow(
2610 2610
             'SELECT auth_type, login, private_key, special
2611
-            FROM ' . prefixTable('users') . '
2611
+            FROM ' . prefixTable('users').'
2612 2612
             WHERE id = %i',
2613 2613
             $post_user_id
2614 2614
         );
@@ -2638,14 +2638,14 @@  discard block
 block discarded – undo
2638 2638
                 );
2639 2639
 
2640 2640
                 // Load superGlobals
2641
-                include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
2641
+                include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
2642 2642
                 $superGlobal = new protect\SuperGlobal\SuperGlobal();
2643 2643
                 $superGlobal->put('private_key', $privateKey, 'SESSION', 'user');
2644 2644
 
2645 2645
                 return prepareExchangedData(
2646 2646
                     array(
2647 2647
                         'error' => false,
2648
-                        'message' => langHdl('done'),'',
2648
+                        'message' => langHdl('done'), '',
2649 2649
                     ),
2650 2650
                     'encode'
2651 2651
                 );
@@ -2669,14 +2669,14 @@  discard block
 block discarded – undo
2669 2669
             // Get one item
2670 2670
             $record = DB::queryFirstRow(
2671 2671
                 'SELECT id, pw
2672
-                FROM ' . prefixTable('items') . '
2672
+                FROM ' . prefixTable('items').'
2673 2673
                 WHERE perso = 0'
2674 2674
             );
2675 2675
 
2676 2676
             // Get itemKey from current user
2677 2677
             $currentUserKey = DB::queryFirstRow(
2678 2678
                 'SELECT share_key, increment_id
2679
-                FROM ' . prefixTable('sharekeys_items') . '
2679
+                FROM ' . prefixTable('sharekeys_items').'
2680 2680
                 WHERE object_id = %i AND user_id = %i',
2681 2681
                 $record['id'],
2682 2682
                 $post_user_id
@@ -2704,7 +2704,7 @@  discard block
 block discarded – undo
2704 2704
                     );
2705 2705
                     
2706 2706
                     // Load superGlobals
2707
-                    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
2707
+                    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
2708 2708
                     $superGlobal = new protect\SuperGlobal\SuperGlobal();
2709 2709
                     $superGlobal->put('private_key', $privateKey, 'SESSION', 'user');
2710 2710
 
@@ -2758,7 +2758,7 @@  discard block
 block discarded – undo
2758 2758
             $_SESSION['user_id']
2759 2759
         );
2760 2760
         // Return data
2761
-        return '[{"new_value":"' . $_SESSION['sessionDuration'] . '"}]';
2761
+        return '[{"new_value":"'.$_SESSION['sessionDuration'].'"}]';
2762 2762
     }
2763 2763
     
2764 2764
     return '[{"new_value":"expired"}]';
Please login to merge, or discard this patch.