Passed
Push — teampass_3.0 ( b28540...ba9006 )
by Nils
05:05
created
sources/main.queries.php 1 patch
Spacing   +109 added lines, -109 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);
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
233 233
             $pwdlib = new PasswordLib\PasswordLib();
234 234
             // generate key
235 235
             $key = $pwdlib->getRandomToken(filter_input(INPUT_POST, 'size', FILTER_SANITIZE_NUMBER_INT));
236
-            echo '[{"key" : "' . htmlentities($key, ENT_QUOTES) . '"}]';
236
+            echo '[{"key" : "'.htmlentities($key, ENT_QUOTES).'"}]';
237 237
             break;
238 238
 
239 239
         /*
@@ -262,7 +262,7 @@  discard block
 block discarded – undo
262 262
                 )
263 263
             );
264 264
 
265
-            echo '[{"token" : "' . $token . '"}]';
265
+            echo '[{"token" : "'.$token.'"}]';
266 266
             break;
267 267
 
268 268
 
@@ -542,7 +542,7 @@  discard block
 block discarded – undo
542 542
         // check if expected security level is reached
543 543
         $dataUser = DB::queryfirstrow(
544 544
             'SELECT *
545
-            FROM ' . prefixTable('users') . ' WHERE id = %i',
545
+            FROM ' . prefixTable('users').' WHERE id = %i',
546 546
             $post_user_id
547 547
         );
548 548
 
@@ -563,8 +563,8 @@  discard block
 block discarded – undo
563 563
         if (empty($dataUser['fonction_id']) === false) {
564 564
             $data = DB::queryFirstRow(
565 565
                 'SELECT complexity
566
-                FROM ' . prefixTable('roles_title') . '
567
-                WHERE id IN (' . $dataUser['fonction_id'] . ')
566
+                FROM ' . prefixTable('roles_title').'
567
+                WHERE id IN (' . $dataUser['fonction_id'].')
568 568
                 ORDER BY complexity DESC'
569 569
             );
570 570
         } else {
@@ -577,8 +577,8 @@  discard block
 block discarded – undo
577 577
             return prepareExchangedData(
578 578
                 array(
579 579
                     'error' => true,
580
-                    'message' => '<div style="margin:10px 0 10px 15px;">' . langHdl('complexity_level_not_reached') . '.<br>' .
581
-                        langHdl('expected_complexity_level') . ': <b>' . TP_PW_COMPLEXITY[$data['complexity']][1] . '</b></div>',
580
+                    'message' => '<div style="margin:10px 0 10px 15px;">'.langHdl('complexity_level_not_reached').'.<br>'.
581
+                        langHdl('expected_complexity_level').': <b>'.TP_PW_COMPLEXITY[$data['complexity']][1].'</b></div>',
582 582
                 ),
583 583
                 'encode'
584 584
             );
@@ -679,14 +679,14 @@  discard block
 block discarded – undo
679 679
         // Get data about user
680 680
         $data = DB::queryfirstrow(
681 681
             'SELECT id, email, pw
682
-            FROM ' . prefixTable('users') . '
682
+            FROM ' . prefixTable('users').'
683 683
             WHERE login = %s',
684 684
             $post_login
685 685
         );
686 686
     } else {
687 687
         $data = DB::queryfirstrow(
688 688
             'SELECT id, login, email, pw
689
-            FROM ' . prefixTable('users') . '
689
+            FROM ' . prefixTable('users').'
690 690
             WHERE id = %i',
691 691
             $post_id
692 692
         );
@@ -696,7 +696,7 @@  discard block
 block discarded – undo
696 696
     $counter = DB::count();
697 697
 
698 698
     // load passwordLib library
699
-    $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'] . '/includes/libraries');
699
+    $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'].'/includes/libraries');
700 700
     $pwdlib->register();
701 701
     $pwdlib = new PasswordLib\PasswordLib();
702 702
 
@@ -743,7 +743,7 @@  discard block
 block discarded – undo
743 743
     }
744 744
     
745 745
     // generate new GA user code
746
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php';
746
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php';
747 747
     $tfa = new Authentication\TwoFactorAuth\TwoFactorAuth($SETTINGS['ga_website_name']);
748 748
     $gaSecretKey = $tfa->createSecret();
749 749
     $gaTemporaryCode = GenerateCryptKey(12, false, true, true, false, true, $SETTINGS);
@@ -785,7 +785,7 @@  discard block
 block discarded – undo
785 785
                 'email' => $data['email'],
786 786
                 'email_result' => str_replace(
787 787
                     '#email#',
788
-                    '<b>' . obfuscateEmail($data['email']) . '</b>',
788
+                    '<b>'.obfuscateEmail($data['email']).'</b>',
789 789
                     addslashes(langHdl('admin_email_result_ok'))
790 790
                 ),
791 791
             ),
@@ -801,7 +801,7 @@  discard block
 block discarded – undo
801 801
             'email' => $data['email'],
802 802
             'email_result' => str_replace(
803 803
                 '#email#',
804
-                '<b>' . obfuscateEmail($data['email']) . '</b>',
804
+                '<b>'.obfuscateEmail($data['email']).'</b>',
805 805
                 addslashes(langHdl('admin_email_result_ok'))
806 806
             ),
807 807
         ),
@@ -817,7 +817,7 @@  discard block
 block discarded – undo
817 817
         && (int) $SETTINGS['enable_send_email_on_user_login'] === 1
818 818
     ) {
819 819
         $row = DB::queryFirstRow(
820
-            'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s',
820
+            'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s',
821 821
             'cron',
822 822
             'sending_emails'
823 823
         );
@@ -825,12 +825,12 @@  discard block
 block discarded – undo
825 825
         if ((int) (time() - $row['valeur']) >= 300 || (int) $row['valeur'] === 0) {
826 826
             $rows = DB::query(
827 827
                 'SELECT *
828
-                FROM ' . prefixTable('emails') .
828
+                FROM ' . prefixTable('emails').
829 829
                 ' WHERE status != %s',
830 830
                 'sent'
831 831
             );
832 832
             foreach ($rows as $record) {
833
-                echo $record['increment_id'] . " >> ";
833
+                echo $record['increment_id']." >> ";
834 834
                 // Send email
835 835
                 $ret = json_decode(
836 836
                     sendEmail(
@@ -929,8 +929,8 @@  discard block
 block discarded – undo
929 929
     $arr_html = array();
930 930
     $rows = DB::query(
931 931
         '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
932
-        FROM ' . prefixTable('log_items') . ' AS l
933
-        RIGHT JOIN ' . prefixTable('items') . ' AS i ON (l.id_item = i.id)
932
+        FROM ' . prefixTable('log_items').' AS l
933
+        RIGHT JOIN ' . prefixTable('items').' AS i ON (l.id_item = i.id)
934 934
         WHERE l.action = %s AND l.id_user = %i
935 935
         ORDER BY l.date DESC
936 936
         LIMIT 0, 100',
@@ -963,7 +963,7 @@  discard block
 block discarded – undo
963 963
         isset($SETTINGS['enable_suggestion']) === true && (int) $SETTINGS['enable_suggestion'] === 1
964 964
         && ((int) $_SESSION['user_admin'] === 1 || (int) $_SESSION['user_manager'] === 1)
965 965
     ) {
966
-        DB::query('SELECT * FROM ' . prefixTable('suggestion'));
966
+        DB::query('SELECT * FROM '.prefixTable('suggestion'));
967 967
         $nb_suggestions_waiting = DB::count();
968 968
     }
969 969
 
@@ -999,13 +999,13 @@  discard block
 block discarded – undo
999 999
             if ($data === 'stat_languages') {
1000 1000
                 $tmp = '';
1001 1001
                 foreach ($stats_data[$data] as $key => $value) {
1002
-                    $tmp .= $tmp === '' ? $key . '-' . $value : ',' . $key . '-' . $value;
1002
+                    $tmp .= $tmp === '' ? $key.'-'.$value : ','.$key.'-'.$value;
1003 1003
                 }
1004 1004
                 $statsToSend[$data] = $tmp;
1005 1005
             } elseif ($data === 'stat_country') {
1006 1006
                 $tmp = '';
1007 1007
                 foreach ($stats_data[$data] as $key => $value) {
1008
-                    $tmp .= $tmp === '' ? $key . '-' . $value : ',' . $key . '-' . $value;
1008
+                    $tmp .= $tmp === '' ? $key.'-'.$value : ','.$key.'-'.$value;
1009 1009
                 }
1010 1010
                 $statsToSend[$data] = $tmp;
1011 1011
             } else {
@@ -1079,8 +1079,8 @@  discard block
 block discarded – undo
1079 1079
             if (strpos($line, 'cpassman_url') > 0 && empty($url_found) === true) {
1080 1080
                 $url_found = substr($line, 19, strlen($line) - 22);
1081 1081
                 $tmp = parse_url($url_found);
1082
-                $anonym_url = $tmp['scheme'] . '://<anonym_url>' . $tmp['path'];
1083
-                $line = "'cpassman_url' => '" . $anonym_url . "\n";
1082
+                $anonym_url = $tmp['scheme'].'://<anonym_url>'.$tmp['path'];
1083
+                $line = "'cpassman_url' => '".$anonym_url."\n";
1084 1084
             }
1085 1085
 
1086 1086
             // Anonymize all urls
@@ -1107,7 +1107,7 @@  discard block
 block discarded – undo
1107 1107
     $teampass_errors = '';
1108 1108
     $rows = DB::query(
1109 1109
         'SELECT label, date AS error_date
1110
-        FROM ' . prefixTable('log_system') . "
1110
+        FROM ' . prefixTable('log_system')."
1111 1111
         WHERE `type` LIKE 'error'
1112 1112
         ORDER BY `date` DESC
1113 1113
         LIMIT 0, 10"
@@ -1115,9 +1115,9 @@  discard block
 block discarded – undo
1115 1115
     if (DB::count() > 0) {
1116 1116
         foreach ($rows as $record) {
1117 1117
             if (empty($teampass_errors) === true) {
1118
-                $teampass_errors = ' * ' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['error_date']) . ' - ' . $record['label'];
1118
+                $teampass_errors = ' * '.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['error_date']).' - '.$record['label'];
1119 1119
             } else {
1120
-                $teampass_errors .= ' * ' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['error_date']) . ' - ' . $record['label'];
1120
+                $teampass_errors .= ' * '.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['error_date']).' - '.$record['label'];
1121 1121
             }
1122 1122
         }
1123 1123
     }
@@ -1126,7 +1126,7 @@  discard block
 block discarded – undo
1126 1126
 
1127 1127
     // Now prepare text
1128 1128
     $txt = '### Page on which it happened
1129
-' . $post_data['current_page'] . '
1129
+' . $post_data['current_page'].'
1130 1130
 
1131 1131
 ### Steps to reproduce
1132 1132
 1.
@@ -1141,39 +1141,39 @@  discard block
 block discarded – undo
1141 1141
 Tell us what happens instead
1142 1142
 
1143 1143
 ### Server configuration
1144
-**Operating system**: ' . php_uname() . '
1144
+**Operating system**: ' . php_uname().'
1145 1145
 
1146
-**Web server:** ' . $_SERVER['SERVER_SOFTWARE'] . '
1146
+**Web server:** ' . $_SERVER['SERVER_SOFTWARE'].'
1147 1147
 
1148
-**Database:** ' . ($link === false ? langHdl('undefined') : mysqli_get_server_info($link)) . '
1148
+**Database:** ' . ($link === false ? langHdl('undefined') : mysqli_get_server_info($link)).'
1149 1149
 
1150
-**PHP version:** ' . PHP_VERSION . '
1150
+**PHP version:** ' . PHP_VERSION.'
1151 1151
 
1152
-**Teampass version:** ' . TP_VERSION_FULL . '
1152
+**Teampass version:** ' . TP_VERSION_FULL.'
1153 1153
 
1154 1154
 **Teampass configuration file:**
1155 1155
 ```
1156
-' . $list_of_options . '
1156
+' . $list_of_options.'
1157 1157
 ```
1158 1158
 
1159 1159
 **Updated from an older Teampass or fresh install:**
1160 1160
 
1161 1161
 ### Client configuration
1162 1162
 
1163
-**Browser:** ' . $post_data['browser_name'] . ' - ' . $post_data['browser_version'] . '
1163
+**Browser:** ' . $post_data['browser_name'].' - '.$post_data['browser_version'].'
1164 1164
 
1165
-**Operating system:** ' . $post_data['os'] . ' - ' . $post_data['os_archi'] . 'bits
1165
+**Operating system:** ' . $post_data['os'].' - '.$post_data['os_archi'].'bits
1166 1166
 
1167 1167
 ### Logs
1168 1168
 
1169 1169
 #### Web server error log
1170 1170
 ```
1171
-' . $err['message'] . ' - ' . $err['file'] . ' (' . $err['line'] . ')
1171
+' . $err['message'].' - '.$err['file'].' ('.$err['line'].')
1172 1172
 ```
1173 1173
 
1174 1174
 #### Teampass 10 last system errors
1175 1175
 ```
1176
-' . $teampass_errors . '
1176
+' . $teampass_errors.'
1177 1177
 ```
1178 1178
 
1179 1179
 #### Log from the web-browser developer console (CTRL + SHIFT + i)
@@ -1201,7 +1201,7 @@  discard block
 block discarded – undo
1201 1201
         // Check if user exists
1202 1202
         $userInfo = DB::queryFirstRow(
1203 1203
             'SELECT public_key, private_key, pw, auth_type
1204
-            FROM ' . prefixTable('users') . '
1204
+            FROM ' . prefixTable('users').'
1205 1205
             WHERE id = %i',
1206 1206
             $post_user_id
1207 1207
         );
@@ -1209,14 +1209,14 @@  discard block
 block discarded – undo
1209 1209
             // Get one item
1210 1210
             $record = DB::queryFirstRow(
1211 1211
                 'SELECT id, pw
1212
-                FROM ' . prefixTable('items') . '
1212
+                FROM ' . prefixTable('items').'
1213 1213
                 WHERE perso = 0'
1214 1214
             );
1215 1215
 
1216 1216
             // Get itemKey from current user
1217 1217
             $currentUserKey = DB::queryFirstRow(
1218 1218
                 'SELECT share_key, increment_id
1219
-                FROM ' . prefixTable('sharekeys_items') . '
1219
+                FROM ' . prefixTable('sharekeys_items').'
1220 1220
                 WHERE object_id = %i AND user_id = %i',
1221 1221
                 $record['id'],
1222 1222
                 $post_user_id
@@ -1244,7 +1244,7 @@  discard block
 block discarded – undo
1244 1244
             
1245 1245
             // Use the password check
1246 1246
             // load passwordLib library
1247
-            $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'] . '/includes/libraries');
1247
+            $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'].'/includes/libraries');
1248 1248
             $pwdlib->register();
1249 1249
             $pwdlib = new PasswordLib\PasswordLib();
1250 1250
             
@@ -1288,7 +1288,7 @@  discard block
 block discarded – undo
1288 1288
         // Get user info
1289 1289
         $userData = DB::queryFirstRow(
1290 1290
             'SELECT private_key
1291
-            FROM ' . prefixTable('users') . '
1291
+            FROM ' . prefixTable('users').'
1292 1292
             WHERE id = %i',
1293 1293
             $post_user_id
1294 1294
         );
@@ -1315,7 +1315,7 @@  discard block
 block discarded – undo
1315 1315
             );
1316 1316
 
1317 1317
             // Load superGlobals
1318
-            include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
1318
+            include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
1319 1319
             $superGlobal = new protect\SuperGlobal\SuperGlobal();
1320 1320
 
1321 1321
             $superGlobal->put('private_key', $privateKey, 'SESSION', 'user');
@@ -1353,7 +1353,7 @@  discard block
 block discarded – undo
1353 1353
         // Get user info
1354 1354
         $userData = DB::queryFirstRow(
1355 1355
             'SELECT email, auth_type, login
1356
-            FROM ' . prefixTable('users') . '
1356
+            FROM ' . prefixTable('users').'
1357 1357
             WHERE id = %i',
1358 1358
             $post_user_id
1359 1359
         );
@@ -1487,7 +1487,7 @@  discard block
 block discarded – undo
1487 1487
         // Get user info
1488 1488
         $userData = DB::queryFirstRow(
1489 1489
             'SELECT email, auth_type, login
1490
-            FROM ' . prefixTable('users') . '
1490
+            FROM ' . prefixTable('users').'
1491 1491
             WHERE id = %i',
1492 1492
             $post_user_id
1493 1493
         );
@@ -1550,13 +1550,13 @@  discard block
 block discarded – undo
1550 1550
         // Check if user exists
1551 1551
         DB::queryFirstRow(
1552 1552
             'SELECT *
1553
-            FROM ' . prefixTable('users') . '
1553
+            FROM ' . prefixTable('users').'
1554 1554
             WHERE id = %i',
1555 1555
             $post_user_id
1556 1556
         );
1557 1557
         if (DB::count() > 0) {
1558 1558
             // Include libraries
1559
-            include_once $SETTINGS['cpassman_dir'] . '/sources/aes.functions.php';
1559
+            include_once $SETTINGS['cpassman_dir'].'/sources/aes.functions.php';
1560 1560
 
1561 1561
             // CLear old sharekeys
1562 1562
             if ($post_self_change === false) {
@@ -1608,13 +1608,13 @@  discard block
 block discarded – undo
1608 1608
         // Check if user exists
1609 1609
         $userInfo = DB::queryFirstRow(
1610 1610
             'SELECT public_key
1611
-            FROM ' . prefixTable('users') . '
1611
+            FROM ' . prefixTable('users').'
1612 1612
             WHERE id = %i',
1613 1613
             $post_user_id
1614 1614
         );
1615 1615
         if (DB::count() > 0) {
1616 1616
             // Include libraries
1617
-            include_once $SETTINGS['cpassman_dir'] . '/sources/aes.functions.php';
1617
+            include_once $SETTINGS['cpassman_dir'].'/sources/aes.functions.php';
1618 1618
 
1619 1619
             // WHAT STEP TO PERFORM?
1620 1620
             if ($post_action === 'step0') {
@@ -1773,15 +1773,15 @@  discard block
 block discarded – undo
1773 1773
     // Loop on items
1774 1774
     $rows = DB::query(
1775 1775
         'SELECT id, pw
1776
-        FROM ' . prefixTable('items') . '
1776
+        FROM ' . prefixTable('items').'
1777 1777
         WHERE perso = 0
1778
-        LIMIT ' . $post_start . ', ' . $post_length
1778
+        LIMIT ' . $post_start.', '.$post_length
1779 1779
     );
1780 1780
     foreach ($rows as $record) {
1781 1781
         // Get itemKey from current user
1782 1782
         $currentUserKey = DB::queryFirstRow(
1783 1783
             'SELECT share_key, increment_id
1784
-            FROM ' . prefixTable('sharekeys_items') . '
1784
+            FROM ' . prefixTable('sharekeys_items').'
1785 1785
             WHERE object_id = %i AND user_id = %i',
1786 1786
             $record['id'],
1787 1787
             $_SESSION['user_id']
@@ -1809,7 +1809,7 @@  discard block
 block discarded – undo
1809 1809
             if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
1810 1810
                 $currentUserKey = DB::queryFirstRow(
1811 1811
                     'SELECT increment_id
1812
-                    FROM ' . prefixTable('sharekeys_items') . '
1812
+                    FROM ' . prefixTable('sharekeys_items').'
1813 1813
                     WHERE object_id = %i AND user_id = %i',
1814 1814
                     $record['id'],
1815 1815
                     $post_user_id
@@ -1842,7 +1842,7 @@  discard block
 block discarded – undo
1842 1842
     // SHould we change step?
1843 1843
     DB::query(
1844 1844
         'SELECT *
1845
-        FROM ' . prefixTable('items') . '
1845
+        FROM ' . prefixTable('items').'
1846 1846
         WHERE perso = 0'
1847 1847
     );
1848 1848
 
@@ -1866,15 +1866,15 @@  discard block
 block discarded – undo
1866 1866
     // Loop on logs
1867 1867
     $rows = DB::query(
1868 1868
         'SELECT increment_id
1869
-        FROM ' . prefixTable('log_items') . '
1869
+        FROM ' . prefixTable('log_items').'
1870 1870
         WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"
1871
-        LIMIT ' . $post_start . ', ' . $post_length
1871
+        LIMIT ' . $post_start.', '.$post_length
1872 1872
     );
1873 1873
     foreach ($rows as $record) {
1874 1874
         // Get itemKey from current user
1875 1875
         $currentUserKey = DB::queryFirstRow(
1876 1876
             'SELECT share_key
1877
-            FROM ' . prefixTable('sharekeys_logs') . '
1877
+            FROM ' . prefixTable('sharekeys_logs').'
1878 1878
             WHERE object_id = %i AND user_id = %i',
1879 1879
             $record['increment_id'],
1880 1880
             $_SESSION['user_id']
@@ -1901,7 +1901,7 @@  discard block
 block discarded – undo
1901 1901
             if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
1902 1902
                 $currentUserKey = DB::queryFirstRow(
1903 1903
                     'SELECT increment_id
1904
-                    FROM ' . prefixTable('sharekeys_items') . '
1904
+                    FROM ' . prefixTable('sharekeys_items').'
1905 1905
                     WHERE object_id = %i AND user_id = %i',
1906 1906
                     $record['id'],
1907 1907
                     $post_user_id
@@ -1923,7 +1923,7 @@  discard block
 block discarded – undo
1923 1923
     // SHould we change step?
1924 1924
     DB::query(
1925 1925
         'SELECT increment_id
1926
-        FROM ' . prefixTable('log_items') . '
1926
+        FROM ' . prefixTable('log_items').'
1927 1927
         WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"'
1928 1928
     );
1929 1929
 
@@ -1947,15 +1947,15 @@  discard block
 block discarded – undo
1947 1947
     // Loop on fields
1948 1948
     $rows = DB::query(
1949 1949
         'SELECT id
1950
-        FROM ' . prefixTable('categories_items') . '
1950
+        FROM ' . prefixTable('categories_items').'
1951 1951
         WHERE encryption_type = "teampass_aes"
1952
-        LIMIT ' . $post_start . ', ' . $post_length
1952
+        LIMIT ' . $post_start.', '.$post_length
1953 1953
     );
1954 1954
     foreach ($rows as $record) {
1955 1955
         // Get itemKey from current user
1956 1956
         $currentUserKey = DB::queryFirstRow(
1957 1957
             'SELECT share_key
1958
-            FROM ' . prefixTable('sharekeys_fields') . '
1958
+            FROM ' . prefixTable('sharekeys_fields').'
1959 1959
             WHERE object_id = %i AND user_id = %i',
1960 1960
             $record['id'],
1961 1961
             $_SESSION['user_id']
@@ -1982,7 +1982,7 @@  discard block
 block discarded – undo
1982 1982
             if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
1983 1983
                 $currentUserKey = DB::queryFirstRow(
1984 1984
                     'SELECT increment_id
1985
-                    FROM ' . prefixTable('sharekeys_items') . '
1985
+                    FROM ' . prefixTable('sharekeys_items').'
1986 1986
                     WHERE object_id = %i AND user_id = %i',
1987 1987
                     $record['id'],
1988 1988
                     $post_user_id
@@ -2004,7 +2004,7 @@  discard block
 block discarded – undo
2004 2004
     // SHould we change step?
2005 2005
     DB::query(
2006 2006
         'SELECT *
2007
-        FROM ' . prefixTable('categories_items') . '
2007
+        FROM ' . prefixTable('categories_items').'
2008 2008
         WHERE encryption_type = "teampass_aes"'
2009 2009
     );
2010 2010
 
@@ -2028,14 +2028,14 @@  discard block
 block discarded – undo
2028 2028
     // Loop on suggestions
2029 2029
     $rows = DB::query(
2030 2030
         'SELECT id
2031
-        FROM ' . prefixTable('suggestion') . '
2032
-        LIMIT ' . $post_start . ', ' . $post_length
2031
+        FROM ' . prefixTable('suggestion').'
2032
+        LIMIT ' . $post_start.', '.$post_length
2033 2033
     );
2034 2034
     foreach ($rows as $record) {
2035 2035
         // Get itemKey from current user
2036 2036
         $currentUserKey = DB::queryFirstRow(
2037 2037
             'SELECT share_key
2038
-            FROM ' . prefixTable('sharekeys_suggestions') . '
2038
+            FROM ' . prefixTable('sharekeys_suggestions').'
2039 2039
             WHERE object_id = %i AND user_id = %i',
2040 2040
             $record['id'],
2041 2041
             $_SESSION['user_id']
@@ -2062,7 +2062,7 @@  discard block
 block discarded – undo
2062 2062
             if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
2063 2063
                 $currentUserKey = DB::queryFirstRow(
2064 2064
                     'SELECT increment_id
2065
-                    FROM ' . prefixTable('sharekeys_items') . '
2065
+                    FROM ' . prefixTable('sharekeys_items').'
2066 2066
                     WHERE object_id = %i AND user_id = %i',
2067 2067
                     $record['id'],
2068 2068
                     $post_user_id
@@ -2107,15 +2107,15 @@  discard block
 block discarded – undo
2107 2107
     // Loop on files
2108 2108
     $rows = DB::query(
2109 2109
         'SELECT id
2110
-        FROM ' . prefixTable('files') . '
2111
-        WHERE status = "' . TP_ENCRYPTION_NAME . '"
2112
-        LIMIT ' . $post_start . ', ' . $post_length
2110
+        FROM ' . prefixTable('files').'
2111
+        WHERE status = "' . TP_ENCRYPTION_NAME.'"
2112
+        LIMIT ' . $post_start.', '.$post_length
2113 2113
     ); //aes_encryption
2114 2114
     foreach ($rows as $record) {
2115 2115
         // Get itemKey from current user
2116 2116
         $currentUserKey = DB::queryFirstRow(
2117 2117
             'SELECT share_key
2118
-            FROM ' . prefixTable('sharekeys_files') . '
2118
+            FROM ' . prefixTable('sharekeys_files').'
2119 2119
             WHERE object_id = %i AND user_id = %i',
2120 2120
             $record['id'],
2121 2121
             $_SESSION['user_id']
@@ -2142,7 +2142,7 @@  discard block
 block discarded – undo
2142 2142
             if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
2143 2143
                 $currentUserKey = DB::queryFirstRow(
2144 2144
                     'SELECT increment_id
2145
-                    FROM ' . prefixTable('sharekeys_items') . '
2145
+                    FROM ' . prefixTable('sharekeys_items').'
2146 2146
                     WHERE object_id = %i AND user_id = %i',
2147 2147
                     $record['id'],
2148 2148
                     $post_user_id
@@ -2164,8 +2164,8 @@  discard block
 block discarded – undo
2164 2164
     // SHould we change step?
2165 2165
     DB::query(
2166 2166
         'SELECT *
2167
-        FROM ' . prefixTable('files') . '
2168
-        WHERE status = "' . TP_ENCRYPTION_NAME . '"'
2167
+        FROM ' . prefixTable('files').'
2168
+        WHERE status = "' . TP_ENCRYPTION_NAME.'"'
2169 2169
     );
2170 2170
 
2171 2171
     $next_start = (int) $post_start + (int) $post_length;
@@ -2197,16 +2197,16 @@  discard block
 block discarded – undo
2197 2197
     if (count($_SESSION['personal_folders']) > 0) {
2198 2198
         $rows = DB::query(
2199 2199
             'SELECT id, pw
2200
-            FROM ' . prefixTable('items') . '
2200
+            FROM ' . prefixTable('items').'
2201 2201
             WHERE perso = 1 AND id_tree IN %ls
2202
-            LIMIT ' . $post_start . ', ' . $post_length,
2202
+            LIMIT ' . $post_start.', '.$post_length,
2203 2203
             $_SESSION['personal_folders']
2204 2204
         );
2205 2205
         foreach ($rows as $record) {
2206 2206
             // Get itemKey from current user
2207 2207
             $currentUserKey = DB::queryFirstRow(
2208 2208
                 'SELECT share_key, increment_id
2209
-                FROM ' . prefixTable('sharekeys_items') . '
2209
+                FROM ' . prefixTable('sharekeys_items').'
2210 2210
                 WHERE object_id = %i AND user_id = %i',
2211 2211
                 $record['id'],
2212 2212
                 $_SESSION['user_id']
@@ -2233,7 +2233,7 @@  discard block
 block discarded – undo
2233 2233
                 if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
2234 2234
                     $currentUserKey = DB::queryFirstRow(
2235 2235
                         'SELECT increment_id
2236
-                        FROM ' . prefixTable('sharekeys_items') . '
2236
+                        FROM ' . prefixTable('sharekeys_items').'
2237 2237
                         WHERE object_id = %i AND user_id = %i',
2238 2238
                         $record['id'],
2239 2239
                         $post_user_id
@@ -2256,7 +2256,7 @@  discard block
 block discarded – undo
2256 2256
     // SHould we change step?
2257 2257
     DB::query(
2258 2258
         'SELECT *
2259
-        FROM ' . prefixTable('items') . '
2259
+        FROM ' . prefixTable('items').'
2260 2260
         WHERE perso = 0'
2261 2261
     );
2262 2262
 
@@ -2280,7 +2280,7 @@  discard block
 block discarded – undo
2280 2280
         // Check if user exists
2281 2281
         $userInfo = DB::queryFirstRow(
2282 2282
             'SELECT public_key, encrypted_psk
2283
-            FROM ' . prefixTable('users') . '
2283
+            FROM ' . prefixTable('users').'
2284 2284
             WHERE id = %i',
2285 2285
             $post_user_id
2286 2286
         );
@@ -2305,9 +2305,9 @@  discard block
 block discarded – undo
2305 2305
                 // Loop on persoanl items
2306 2306
                 $rows = DB::query(
2307 2307
                     'SELECT id, pw
2308
-                    FROM ' . prefixTable('items') . '
2308
+                    FROM ' . prefixTable('items').'
2309 2309
                     WHERE perso = 1 AND id_tree IN %ls
2310
-                    LIMIT ' . $post_start . ', ' . $post_length,
2310
+                    LIMIT ' . $post_start.', '.$post_length,
2311 2311
                     $_SESSION['personal_folders']
2312 2312
                 );
2313 2313
                 $countUserPersonalItems = DB::count();
@@ -2350,7 +2350,7 @@  discard block
 block discarded – undo
2350 2350
                         // Loop on files
2351 2351
                         $rows = DB::query(
2352 2352
                             'SELECT id, file
2353
-                            FROM ' . prefixTable('files') . '
2353
+                            FROM ' . prefixTable('files').'
2354 2354
                             WHERE status != %s
2355 2355
                             AND id_item = %i',
2356 2356
                             TP_ENCRYPTION_NAME,
@@ -2361,14 +2361,14 @@  discard block
 block discarded – undo
2361 2361
                             // Now decrypt the file
2362 2362
                             prepareFileWithDefuse(
2363 2363
                                 'decrypt',
2364
-                                $SETTINGS['path_to_upload_folder'] . '/' . $record2['file'],
2365
-                                $SETTINGS['path_to_upload_folder'] . '/' . $record2['file'] . '.delete',
2364
+                                $SETTINGS['path_to_upload_folder'].'/'.$record2['file'],
2365
+                                $SETTINGS['path_to_upload_folder'].'/'.$record2['file'].'.delete',
2366 2366
                                 $SETTINGS,
2367 2367
                                 $post_user_psk
2368 2368
                             );
2369 2369
 
2370 2370
                             // Encrypt the file
2371
-                            $encryptedFile = encryptFile($record2['file'] . '.delete', $SETTINGS['path_to_upload_folder']);
2371
+                            $encryptedFile = encryptFile($record2['file'].'.delete', $SETTINGS['path_to_upload_folder']);
2372 2372
 
2373 2373
                             DB::update(
2374 2374
                                 prefixTable('files'),
@@ -2391,7 +2391,7 @@  discard block
 block discarded – undo
2391 2391
                             );
2392 2392
 
2393 2393
                             // Unlink original file
2394
-                            unlink($SETTINGS['path_to_upload_folder'] . '/' . $record2['file']);
2394
+                            unlink($SETTINGS['path_to_upload_folder'].'/'.$record2['file']);
2395 2395
                         }
2396 2396
                     }
2397 2397
                 }
@@ -2460,7 +2460,7 @@  discard block
 block discarded – undo
2460 2460
         // Get user info
2461 2461
         $userData = DB::queryFirstRow(
2462 2462
             'SELECT '.$post_fields.'
2463
-            FROM ' . prefixTable('users') . '
2463
+            FROM ' . prefixTable('users').'
2464 2464
             WHERE id = %i',
2465 2465
             $post_user_id
2466 2466
         );
@@ -2495,7 +2495,7 @@  discard block
 block discarded – undo
2495 2495
         // Get user info
2496 2496
         $userData = DB::queryFirstRow(
2497 2497
             'SELECT auth_type, login, private_key
2498
-            FROM ' . prefixTable('users') . '
2498
+            FROM ' . prefixTable('users').'
2499 2499
             WHERE id = %i',
2500 2500
             $post_user_id
2501 2501
         );
@@ -2506,7 +2506,7 @@  discard block
 block discarded – undo
2506 2506
             $privateKey = decryptPrivateKey($post_current_pwd, $userData['private_key']);
2507 2507
 
2508 2508
             // Load superGlobals
2509
-            include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
2509
+            include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
2510 2510
             $superGlobal = new protect\SuperGlobal\SuperGlobal();
2511 2511
 
2512 2512
             if ($superGlobal->get('private_key', 'SESSION', 'user') === $privateKey) {
@@ -2539,7 +2539,7 @@  discard block
 block discarded – undo
2539 2539
                 return prepareExchangedData(
2540 2540
                     array(
2541 2541
                         'error' => false,
2542
-                        'message' => langHdl('done'),'',
2542
+                        'message' => langHdl('done'), '',
2543 2543
                     ),
2544 2544
                     'encode'
2545 2545
                 );
@@ -2577,7 +2577,7 @@  discard block
 block discarded – undo
2577 2577
         // Get user info
2578 2578
         $userData = DB::queryFirstRow(
2579 2579
             'SELECT auth_type, login, private_key, special
2580
-            FROM ' . prefixTable('users') . '
2580
+            FROM ' . prefixTable('users').'
2581 2581
             WHERE id = %i',
2582 2582
             $post_user_id
2583 2583
         );
@@ -2607,14 +2607,14 @@  discard block
 block discarded – undo
2607 2607
                 );
2608 2608
 
2609 2609
                 // Load superGlobals
2610
-                include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
2610
+                include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
2611 2611
                 $superGlobal = new protect\SuperGlobal\SuperGlobal();
2612 2612
                 $superGlobal->put('private_key', $privateKey, 'SESSION', 'user');
2613 2613
 
2614 2614
                 return prepareExchangedData(
2615 2615
                     array(
2616 2616
                         'error' => false,
2617
-                        'message' => langHdl('done'),'',
2617
+                        'message' => langHdl('done'), '',
2618 2618
                     ),
2619 2619
                     'encode'
2620 2620
                 );
@@ -2638,14 +2638,14 @@  discard block
 block discarded – undo
2638 2638
             // Get one item
2639 2639
             $record = DB::queryFirstRow(
2640 2640
                 'SELECT id, pw
2641
-                FROM ' . prefixTable('items') . '
2641
+                FROM ' . prefixTable('items').'
2642 2642
                 WHERE perso = 0'
2643 2643
             );
2644 2644
 
2645 2645
             // Get itemKey from current user
2646 2646
             $currentUserKey = DB::queryFirstRow(
2647 2647
                 'SELECT share_key, increment_id
2648
-                FROM ' . prefixTable('sharekeys_items') . '
2648
+                FROM ' . prefixTable('sharekeys_items').'
2649 2649
                 WHERE object_id = %i AND user_id = %i',
2650 2650
                 $record['id'],
2651 2651
                 $post_user_id
@@ -2673,7 +2673,7 @@  discard block
 block discarded – undo
2673 2673
                     );
2674 2674
                     
2675 2675
                     // Load superGlobals
2676
-                    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
2676
+                    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
2677 2677
                     $superGlobal = new protect\SuperGlobal\SuperGlobal();
2678 2678
                     $superGlobal->put('private_key', $privateKey, 'SESSION', 'user');
2679 2679
 
@@ -2727,7 +2727,7 @@  discard block
 block discarded – undo
2727 2727
             $_SESSION['user_id']
2728 2728
         );
2729 2729
         // Return data
2730
-        return '[{"new_value":"' . $_SESSION['sessionDuration'] . '"}]';
2730
+        return '[{"new_value":"'.$_SESSION['sessionDuration'].'"}]';
2731 2731
     }
2732 2732
     
2733 2733
     return '[{"new_value":"expired"}]';
Please login to merge, or discard this patch.