Passed
Push — teampass_3.0 ( ad0650...a80954 )
by Nils
05:29
created
sources/backups.queries.php 1 patch
Spacing   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -37,23 +37,23 @@  discard block
 block discarded – undo
37 37
 }
38 38
 
39 39
 // Do checks
40
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
41
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
40
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
41
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
42 42
 if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'options', $SETTINGS) === false) {
43 43
     // Not allowed page
44 44
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
45
-    include $SETTINGS['cpassman_dir'] . '/error.php';
45
+    include $SETTINGS['cpassman_dir'].'/error.php';
46 46
     exit();
47 47
 }
48 48
 
49
-require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
50
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
49
+require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
50
+require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
51 51
 header('Content-type: text/html; charset=utf-8');
52 52
 header('Cache-Control: no-cache, must-revalidate');
53 53
 require_once 'main.functions.php';
54 54
 
55 55
 // Connect to mysql server
56
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
56
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
57 57
 DB::$host = DB_HOST;
58 58
 DB::$user = DB_USER;
59 59
 DB::$password = DB_PASSWD_CLEAR;
@@ -101,26 +101,26 @@  discard block
 block discarded – undo
101 101
 
102 102
             // Decrypt and retrieve data in JSON format
103 103
             $dataReceived = prepareExchangedData(
104
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
104
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
105 105
 
106 106
             // Prepare variables
107 107
             $post_key = filter_var($dataReceived['encryptionKey'], FILTER_SANITIZE_STRING);
108 108
 
109
-            require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
109
+            require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
110 110
             $return = '';
111 111
 
112 112
             //Get all tables
113 113
             $tables = array();
114 114
             $result = DB::query('SHOW TABLES');
115 115
             foreach ($result as $row) {
116
-                $tables[] = $row['Tables_in_' . DB_NAME];
116
+                $tables[] = $row['Tables_in_'.DB_NAME];
117 117
             }
118 118
 
119 119
             //cycle through
120 120
             foreach ($tables as $table) {
121 121
                 if (empty($pre) || substr_count($table, $pre) > 0) {
122 122
                     // Do query
123
-                    $result = DB::queryRaw('SELECT * FROM ' . $table);
123
+                    $result = DB::queryRaw('SELECT * FROM '.$table);
124 124
                     DB::queryRaw(
125 125
                         'SELECT *
126 126
                         FROM INFORMATION_SCHEMA.COLUMNS
@@ -132,19 +132,19 @@  discard block
 block discarded – undo
132 132
                     $numFields = DB::count();
133 133
 
134 134
                     // prepare a drop table
135
-                    $return .= 'DROP TABLE ' . $table . ';';
136
-                    $row2 = DB::queryfirstrow('SHOW CREATE TABLE ' . $table);
137
-                    $return .= "\n\n" . $row2['Create Table'] . ";\n\n";
135
+                    $return .= 'DROP TABLE '.$table.';';
136
+                    $row2 = DB::queryfirstrow('SHOW CREATE TABLE '.$table);
137
+                    $return .= "\n\n".$row2['Create Table'].";\n\n";
138 138
 
139 139
                     //prepare all fields and datas
140 140
                     for ($i = 0; $i < $numFields; ++$i) {
141 141
                         while ($row = $result->fetch_row()) {
142
-                            $return .= 'INSERT INTO ' . $table . ' VALUES(';
142
+                            $return .= 'INSERT INTO '.$table.' VALUES(';
143 143
                             for ($j = 0; $j < $numFields; ++$j) {
144 144
                                 $row[$j] = addslashes($row[$j]);
145 145
                                 $row[$j] = preg_replace("/\n/", '\\n', $row[$j]);
146 146
                                 if (isset($row[$j])) {
147
-                                    $return .= '"' . $row[$j] . '"';
147
+                                    $return .= '"'.$row[$j].'"';
148 148
                                 } else {
149 149
                                     $return .= 'NULL';
150 150
                                 }
@@ -164,8 +164,8 @@  discard block
 block discarded – undo
164 164
                 $token = GenerateCryptKey(20, false, true, true, false, true, $SETTINGS);
165 165
 
166 166
                 //save file
167
-                $filename = time() . '-' . $token . '.sql';
168
-                $handle = fopen($SETTINGS['path_to_files_folder'] . '/' . $filename, 'w+');
167
+                $filename = time().'-'.$token.'.sql';
168
+                $handle = fopen($SETTINGS['path_to_files_folder'].'/'.$filename, 'w+');
169 169
                 if ($handle !== false) {
170 170
                     //write file
171 171
                     fwrite($handle, $return);
@@ -177,17 +177,17 @@  discard block
 block discarded – undo
177 177
                     // Encrypt the file
178 178
                     prepareFileWithDefuse(
179 179
                         'encrypt',
180
-                        $SETTINGS['path_to_files_folder'] . '/' . $filename,
181
-                        $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $filename,
180
+                        $SETTINGS['path_to_files_folder'].'/'.$filename,
181
+                        $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$filename,
182 182
                         $SETTINGS,
183 183
                         $post_key
184 184
                     );
185 185
 
186 186
                     // Do clean
187
-                    unlink($SETTINGS['path_to_files_folder'] . '/' . $filename);
187
+                    unlink($SETTINGS['path_to_files_folder'].'/'.$filename);
188 188
                     rename(
189
-                        $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $filename,
190
-                        $SETTINGS['path_to_files_folder'] . '/' . $filename
189
+                        $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$filename,
190
+                        $SETTINGS['path_to_files_folder'].'/'.$filename
191 191
                     );
192 192
                 }
193 193
 
@@ -208,9 +208,9 @@  discard block
 block discarded – undo
208 208
                     array(
209 209
                         'error' => false,
210 210
                         'message' => '',
211
-                        'download' => 'sources/downloadFile.php?name=' . urlencode($filename) .
212
-                            '&sub=files&file=' . $filename . '&type=sql&key=' . $_SESSION['key'] . '&key_tmp=' .
213
-                            $_SESSION['key_tmp'] . '&pathIsFiles=1',
211
+                        'download' => 'sources/downloadFile.php?name='.urlencode($filename).
212
+                            '&sub=files&file='.$filename.'&type=sql&key='.$_SESSION['key'].'&key_tmp='.
213
+                            $_SESSION['key_tmp'].'&pathIsFiles=1',
214 214
                     ),
215 215
                     'encode'
216 216
                 );
@@ -254,18 +254,18 @@  discard block
 block discarded – undo
254 254
 
255 255
             // Decrypt and retrieve data in JSON format
256 256
             $dataReceived = prepareExchangedData(
257
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
257
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
258 258
 
259 259
             // Prepare variables
260 260
             $post_key = filter_var($dataReceived['encryptionKey'], FILTER_SANITIZE_STRING);
261 261
             $post_backupFile = filter_var($dataReceived['backupFile'], FILTER_SANITIZE_STRING);
262 262
 
263
-            include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
263
+            include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
264 264
 
265 265
             // Get filename from database
266 266
             $data = DB::queryFirstRow(
267 267
                 'SELECT valeur
268
-                FROM ' . prefixTable('misc') . '
268
+                FROM ' . prefixTable('misc').'
269 269
                 WHERE increment_id = %i',
270 270
                 $post_backupFile
271 271
             );
@@ -284,22 +284,22 @@  discard block
 block discarded – undo
284 284
                 // Decrypt the file
285 285
                 $ret = prepareFileWithDefuse(
286 286
                     'decrypt',
287
-                    $SETTINGS['path_to_files_folder'] . '/' . $post_backupFile,
288
-                    $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $post_backupFile,
287
+                    $SETTINGS['path_to_files_folder'].'/'.$post_backupFile,
288
+                    $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$post_backupFile,
289 289
                     $SETTINGS,
290 290
                     $post_key
291 291
                 );
292 292
 
293 293
                 if (empty($ret) === false) {
294
-                    echo '[{"result":"db_restore" , "message":"' . $ret . '"}]';
294
+                    echo '[{"result":"db_restore" , "message":"'.$ret.'"}]';
295 295
                     break;
296 296
                 }
297 297
 
298 298
                 // Do clean
299
-                fileDelete($SETTINGS['path_to_files_folder'] . '/' . $post_backupFile, $SETTINGS);
300
-                $post_backupFile = $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $post_backupFile;
299
+                fileDelete($SETTINGS['path_to_files_folder'].'/'.$post_backupFile, $SETTINGS);
300
+                $post_backupFile = $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$post_backupFile;
301 301
             } else {
302
-                $post_backupFile = $SETTINGS['path_to_files_folder'] . '/' . $post_backupFile;
302
+                $post_backupFile = $SETTINGS['path_to_files_folder'].'/'.$post_backupFile;
303 303
             }
304 304
 
305 305
             //read sql file
Please login to merge, or discard this patch.
sources/identify.php 1 patch
Spacing   +89 added lines, -89 removed lines patch added patch discarded remove patch
@@ -44,23 +44,23 @@  discard block
 block discarded – undo
44 44
     throw new Exception("Error file '/includes/config/tp.config.php' not exists", 1);
45 45
 }
46 46
 
47
-if (! isset($SETTINGS['cpassman_dir']) || empty($SETTINGS['cpassman_dir']) === true || $SETTINGS['cpassman_dir'] === '.') {
47
+if (!isset($SETTINGS['cpassman_dir']) || empty($SETTINGS['cpassman_dir']) === true || $SETTINGS['cpassman_dir'] === '.') {
48 48
     $SETTINGS = [];
49 49
     $SETTINGS['cpassman_dir'] = '..';
50 50
 }
51 51
 
52
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
53
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
54
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
52
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
53
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
54
+require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
55 55
 
56 56
 // If Debug then clean the files
57 57
 if (DEBUGLDAP === true) {
58
-    define('DEBUGLDAPFILE', $SETTINGS['path_to_files_folder'] . '/ldap.debug.txt');
58
+    define('DEBUGLDAPFILE', $SETTINGS['path_to_files_folder'].'/ldap.debug.txt');
59 59
     $fp = fopen(DEBUGLDAPFILE, 'w');
60 60
     fclose($fp);
61 61
 }
62 62
 if (DEBUGDUO === true) {
63
-    define('DEBUGDUOFILE', $SETTINGS['path_to_files_folder'] . '/duo.debug.txt');
63
+    define('DEBUGDUOFILE', $SETTINGS['path_to_files_folder'].'/duo.debug.txt');
64 64
     $fp = fopen(DEBUGDUOFILE, 'w');
65 65
     fclose($fp);
66 66
 }
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 if (defined('DB_PASSWD_CLEAR') === false) {
77 77
     define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
78 78
 }
79
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
79
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
80 80
 if (defined('DB_PASSWD_CLEAR') === false) {
81 81
     define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
82 82
 }
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
     // This step creates the DUO request encrypted key
94 94
 
95 95
     // load library
96
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/DuoSecurity/Duo.php';
96
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/DuoSecurity/Duo.php';
97 97
     $sig_request = Duo::signRequest(
98 98
         $SETTINGS['IKEY'],
99 99
         $SETTINGS['SKEY'],
@@ -104,16 +104,16 @@  discard block
 block discarded – undo
104 104
         debugIdentify(
105 105
             DEBUGDUO,
106 106
             DEBUGDUOFILE,
107
-            "\n\n-----\n\n" .
108
-                'sig request : ' . $post_login . "\n" .
109
-                'resp : ' . $sig_request . "\n"
107
+            "\n\n-----\n\n".
108
+                'sig request : '.$post_login."\n".
109
+                'resp : '.$sig_request."\n"
110 110
         );
111 111
     }
112 112
 
113 113
     // load csrfprotector
114
-    $csrfp_config = include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/csrfp/libs/csrfp.config.php';
114
+    $csrfp_config = include_once $SETTINGS['cpassman_dir'].'/includes/libraries/csrfp/libs/csrfp.config.php';
115 115
     // return result
116
-    echo '[{"sig_request" : "' . $sig_request . '" , "csrfp_token" : "' . $csrfp_config['CSRFP_TOKEN'] . '" , "csrfp_key" : "' . filter_var($_COOKIE[$csrfp_config['CSRFP_TOKEN']], FILTER_SANITIZE_STRING) . '"}]';
116
+    echo '[{"sig_request" : "'.$sig_request.'" , "csrfp_token" : "'.$csrfp_config['CSRFP_TOKEN'].'" , "csrfp_key" : "'.filter_var($_COOKIE[$csrfp_config['CSRFP_TOKEN']], FILTER_SANITIZE_STRING).'"}]';
117 117
 // ---
118 118
     // ---
119 119
 } elseif ($post_type === 'identify_duo_user_check') {
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
     //--------
124 124
 
125 125
     // load library
126
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/DuoSecurity/Duo.php';
126
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/DuoSecurity/Duo.php';
127 127
     $authenticated_username = Duo::verifyResponse(
128 128
         $SETTINGS['duo_ikey'],
129 129
         $SETTINGS['duo_skey'],
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
             // is user in Teampass?
139 139
             DB::queryfirstrow(
140 140
                 'SELECT id
141
-                FROM ' . prefixTable('users') . '
141
+                FROM ' . prefixTable('users').'
142 142
                 WHERE login = %s',
143 143
                 $post_login
144 144
             );
@@ -148,9 +148,9 @@  discard block
 block discarded – undo
148 148
             }
149 149
         }
150 150
 
151
-        echo '[{"authenticated_username" : "' . $authenticated_username . '"}]';
151
+        echo '[{"authenticated_username" : "'.$authenticated_username.'"}]';
152 152
     } else {
153
-        echo '[{"authenticated_username" : "' . $authenticated_username . '"}]';
153
+        echo '[{"authenticated_username" : "'.$authenticated_username.'"}]';
154 154
     }
155 155
     // ---
156 156
     // ---
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
176 176
     }
177 177
 
178 178
     // Load superGlobals
179
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
179
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
180 180
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
181 181
     // Prepare GET variables
182 182
     $sessionPwdAttempts = $superGlobal->get('pwd_attempts', 'SESSION');
@@ -266,19 +266,19 @@  discard block
 block discarded – undo
266 266
     } else {
267 267
         throw new Exception("Error file '/includes/config/tp.config.php' not exists", 1);
268 268
     }
269
-    include_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
270
-    include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
271
-    include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
269
+    include_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
270
+    include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
271
+    include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
272 272
     
273 273
     header('Content-type: text/html; charset=utf-8');
274 274
     error_reporting(E_ERROR);
275 275
 
276 276
     // Load AntiXSS
277
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/voku/helper/AntiXSS.php';
277
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/voku/helper/AntiXSS.php';
278 278
     $antiXss = new voku\helper\AntiXSS();
279 279
 
280 280
     // Load superGlobals
281
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
281
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
282 282
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
283 283
 
284 284
     // Prepare GET variables
@@ -292,7 +292,7 @@  discard block
 block discarded – undo
292 292
     $server['PHP_AUTH_PW'] = $superGlobal->get('PHP_AUTH_PW', 'SERVER');
293 293
 
294 294
     // connect to the server
295
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
295
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
296 296
     DB::$host = DB_HOST;
297 297
     DB::$user = DB_USER;
298 298
     DB::$password = defined('DB_PASSWD_CLEAR') === false ? defuseReturnDecrypted(DB_PASSWD, $SETTINGS) : DB_PASSWD_CLEAR;
@@ -300,14 +300,14 @@  discard block
 block discarded – undo
300 300
     DB::$port = DB_PORT;
301 301
     DB::$encoding = DB_ENCODING;
302 302
     // User's language loading
303
-    include_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $sessionUserLanguage . '.php';
303
+    include_once $SETTINGS['cpassman_dir'].'/includes/language/'.$sessionUserLanguage.'.php';
304 304
     
305 305
     // decrypt and retreive data in JSON format
306 306
     if (empty($sessionKey) === true) {
307 307
         $dataReceived = $sentData;
308 308
     } else {
309 309
         $dataReceived = prepareExchangedData(
310
-    $SETTINGS['cpassman_dir'],$sentData, 'decode', $sessionKey);
310
+    $SETTINGS['cpassman_dir'], $sentData, 'decode', $sessionKey);
311 311
         $superGlobal->put('key', $sessionKey, 'SESSION');
312 312
     }
313 313
 
@@ -456,7 +456,7 @@  discard block
 block discarded – undo
456 456
         // Check if any unsuccessfull login tries exist
457 457
         $rows = DB::query(
458 458
             'SELECT date
459
-            FROM ' . prefixTable('log_system') . "
459
+            FROM ' . prefixTable('log_system')."
460 460
             WHERE field_1 = %s
461 461
             AND type = 'failed_auth'
462 462
             AND label = 'password_is_not_correct'
@@ -470,7 +470,7 @@  discard block
 block discarded – undo
470 470
             foreach ($rows as $record) {
471 471
                 array_push(
472 472
                     $arrAttempts,
473
-                    date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date'])
473
+                    date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date'])
474 474
                 );
475 475
             }
476 476
         }
@@ -585,7 +585,7 @@  discard block
 block discarded – undo
585 585
         foreach ($superGlobal->get('user_roles', 'SESSION') as $role) {
586 586
             $resRoles = DB::queryFirstRow(
587 587
                 'SELECT title, complexity
588
-                FROM ' . prefixTable('roles_title') . '
588
+                FROM ' . prefixTable('roles_title').'
589 589
                 WHERE id=%i',
590 590
                 $role
591 591
             );
@@ -606,7 +606,7 @@  discard block
 block discarded – undo
606 606
 
607 607
         // build complete array of roles
608 608
         $superGlobal->put('arr_roles_full', [], 'SESSION');
609
-        $rows = DB::query('SELECT id, title FROM ' . prefixTable('roles_title') . ' ORDER BY title ASC');
609
+        $rows = DB::query('SELECT id, title FROM '.prefixTable('roles_title').' ORDER BY title ASC');
610 610
         foreach ($rows as $record) {
611 611
             $superGlobal->put(
612 612
                 $record['id'],
@@ -684,10 +684,10 @@  discard block
 block discarded – undo
684 684
         $superGlobal->put('latest_items_tab', [], 'SESSION');
685 685
         $superGlobal->put('nb_roles', 0, 'SESSION');
686 686
         foreach ($superGlobal->get('latest_items', 'SESSION') as $item) {
687
-            if (! empty($item)) {
687
+            if (!empty($item)) {
688 688
                 $dataLastItems = DB::queryFirstRow(
689 689
                     'SELECT id,label,id_tree
690
-                    FROM ' . prefixTable('items') . '
690
+                    FROM ' . prefixTable('items').'
691 691
                     WHERE id=%i',
692 692
                     $item
693 693
                 );
@@ -696,7 +696,7 @@  discard block
 block discarded – undo
696 696
                     [
697 697
                         'id' => $item,
698 698
                         'label' => $dataLastItems['label'],
699
-                        'url' => 'index.php?page=items&amp;group=' . $dataLastItems['id_tree'] . '&amp;id=' . $item,
699
+                        'url' => 'index.php?page=items&amp;group='.$dataLastItems['id_tree'].'&amp;id='.$item,
700 700
                     ],
701 701
                     'SESSION',
702 702
                     'latest_items_tab'
@@ -713,12 +713,12 @@  discard block
 block discarded – undo
713 713
         ) {
714 714
             // get all Admin users
715 715
             $receivers = '';
716
-            $rows = DB::query('SELECT email FROM ' . prefixTable('users') . " WHERE admin = %i and email != ''", 1);
716
+            $rows = DB::query('SELECT email FROM '.prefixTable('users')." WHERE admin = %i and email != ''", 1);
717 717
             foreach ($rows as $record) {
718 718
                 if (empty($receivers)) {
719 719
                     $receivers = $record['email'];
720 720
                 } else {
721
-                    $receivers = ',' . $record['email'];
721
+                    $receivers = ','.$record['email'];
722 722
                 }
723 723
             }
724 724
             // Add email to table
@@ -734,7 +734,7 @@  discard block
 block discarded – undo
734 734
                             '#tp_time#',
735 735
                         ],
736 736
                         [
737
-                            ' ' . $superGlobal->get('login', 'SESSION') . ' (IP: ' . getClientIpServer() . ')',
737
+                            ' '.$superGlobal->get('login', 'SESSION').' (IP: '.getClientIpServer().')',
738 738
                             date($SETTINGS['date_format'], (int) $superGlobal->get('last_connection', 'SESSION')),
739 739
                             date($SETTINGS['time_format'], (int) $superGlobal->get('last_connection', 'SESSION')),
740 740
                         ],
@@ -1059,45 +1059,45 @@  discard block
 block discarded – undo
1059 1059
     }
1060 1060
 
1061 1061
     // Load expected libraries
1062
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Illuminate/Contracts/Auth/Authenticatable.php';
1063
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Traits/EnumeratesValues.php';
1064
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php';
1065
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/helpers.php';
1066
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Arr.php';
1067
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Contracts/Support/Jsonable.php';
1068
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Contracts/Support/Arrayable.php';
1069
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Enumerable.php';
1070
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Collection.php';
1071
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonTimeZone.php';
1072
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Units.php';
1073
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Week.php';
1074
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Timestamp.php';
1075
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Test.php';
1076
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/ObjectInitialisation.php';
1077
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Serialization.php';
1078
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/IntervalRounding.php';
1079
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Rounding.php';
1080
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Localization.php';
1081
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Options.php';
1082
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Cast.php';
1083
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mutability.php';
1084
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Modifiers.php';
1085
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mixin.php';
1086
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Macro.php';
1087
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Difference.php';
1088
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Creator.php';
1089
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Converter.php';
1090
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Comparison.php';
1091
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Boundaries.php';
1092
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Date.php';
1093
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonInterface.php';
1094
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Carbon.php';
1095
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/DetectsErrors.php';
1096
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Connection.php';
1097
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapInterface.php';
1098
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapBase.php';
1099
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/HandlesConnection.php';
1100
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Ldap.php';
1062
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Illuminate/Contracts/Auth/Authenticatable.php';
1063
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Traits/EnumeratesValues.php';
1064
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php';
1065
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/helpers.php';
1066
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Arr.php';
1067
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Contracts/Support/Jsonable.php';
1068
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Contracts/Support/Arrayable.php';
1069
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Enumerable.php';
1070
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Collection.php';
1071
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonTimeZone.php';
1072
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Units.php';
1073
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Week.php';
1074
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Timestamp.php';
1075
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Test.php';
1076
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/ObjectInitialisation.php';
1077
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Serialization.php';
1078
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/IntervalRounding.php';
1079
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Rounding.php';
1080
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Localization.php';
1081
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Options.php';
1082
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Cast.php';
1083
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mutability.php';
1084
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Modifiers.php';
1085
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mixin.php';
1086
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Macro.php';
1087
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Difference.php';
1088
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Creator.php';
1089
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Converter.php';
1090
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Comparison.php';
1091
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Boundaries.php';
1092
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Date.php';
1093
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonInterface.php';
1094
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Carbon.php';
1095
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/DetectsErrors.php';
1096
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Connection.php';
1097
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapInterface.php';
1098
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapBase.php';
1099
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/HandlesConnection.php';
1100
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Ldap.php';
1101 1101
     $ad = new SplClassLoader('LdapRecord', '../includes/libraries');
1102 1102
     $ad->register();
1103 1103
     $connection = new Connection($config);
@@ -1109,7 +1109,7 @@  discard block
 block discarded – undo
1109 1109
         $error = $e->getDetailedError();
1110 1110
         return [
1111 1111
             'error' => true,
1112
-            'message' => langHdl('error').' : '.$error->getErrorCode().' - '.$error->getErrorMessage(). '<br>'.$error->getDiagnosticMessage().' '.$config['username'],
1112
+            'message' => langHdl('error').' : '.$error->getErrorCode().' - '.$error->getErrorMessage().'<br>'.$error->getDiagnosticMessage().' '.$config['username'],
1113 1113
 
1114 1114
         ];
1115 1115
     }
@@ -1137,7 +1137,7 @@  discard block
 block discarded – undo
1137 1137
     }
1138 1138
 
1139 1139
     // load passwordLib library
1140
-    $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'] . '/includes/libraries');
1140
+    $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'].'/includes/libraries');
1141 1141
     $pwdlib->register();
1142 1142
     $pwdlib = new PasswordLib\PasswordLib();
1143 1143
     $hashedPassword = $pwdlib->createPasswordHash($passwordClear);
@@ -1196,7 +1196,7 @@  discard block
 block discarded – undo
1196 1196
 function yubicoMFACheck($dataReceived, string $userInfo, array $SETTINGS): array
1197 1197
 {
1198 1198
     // Load superGlobals
1199
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
1199
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
1200 1200
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
1201 1201
     $sessionAdmin = $superGlobal->get('user_admin', 'SESSION');
1202 1202
     $sessionUrl = $superGlobal->get('initial_url', 'SESSION');
@@ -1235,7 +1235,7 @@  discard block
 block discarded – undo
1235 1235
     }
1236 1236
 
1237 1237
     // Now check yubico validity
1238
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/Yubico/Yubico.php';
1238
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/Yubico/Yubico.php';
1239 1239
     $yubi = new Auth_Yubico($yubico_user_id, $yubico_user_key);
1240 1240
     $auth = $yubi->verify($yubico_key);
1241 1241
     //, null, null, null, 60
@@ -1287,7 +1287,7 @@  discard block
 block discarded – undo
1287 1287
             'gestionnaire' => '0',
1288 1288
             'can_manage_all_users' => '0',
1289 1289
             'personal_folder' => $SETTINGS['enable_pf_feature'] === '1' ? '1' : '0',
1290
-            'fonction_id' => (empty($retLDAP['user_info_from_ad'][0]['commonGroupsLdapVsTeampass']) === false ? $retLDAP['user_info_from_ad'][0]['commonGroupsLdapVsTeampass'] . ';' : '') . (isset($SETTINGS['ldap_new_user_role']) === true ? $SETTINGS['ldap_new_user_role'] : '0'),
1290
+            'fonction_id' => (empty($retLDAP['user_info_from_ad'][0]['commonGroupsLdapVsTeampass']) === false ? $retLDAP['user_info_from_ad'][0]['commonGroupsLdapVsTeampass'].';' : '').(isset($SETTINGS['ldap_new_user_role']) === true ? $SETTINGS['ldap_new_user_role'] : '0'),
1291 1291
             'groupes_interdits' => '',
1292 1292
             'groupes_visibles' => '',
1293 1293
             'last_pw_change' => (int) time(),
@@ -1312,7 +1312,7 @@  discard block
 block discarded – undo
1312 1312
             ]
1313 1313
         );
1314 1314
         // Rebuild tree
1315
-        $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries');
1315
+        $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries');
1316 1316
         $tree->register();
1317 1317
         $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
1318 1318
         $tree->rebuild();
@@ -1343,13 +1343,13 @@  discard block
 block discarded – undo
1343 1343
         && empty($dataReceived['GACode']) === false
1344 1344
     ) {
1345 1345
         // Load superGlobals
1346
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
1346
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
1347 1347
         $superGlobal = new protect\SuperGlobal\SuperGlobal();
1348 1348
         $sessionAdmin = $superGlobal->get('user_admin', 'SESSION');
1349 1349
         $sessionUrl = $superGlobal->get('initial_url', 'SESSION');
1350 1350
         $sessionPwdAttempts = $superGlobal->get('pwd_attempts', 'SESSION');
1351 1351
         // load library
1352
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php';
1352
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php';
1353 1353
         // create new instance
1354 1354
         $tfa = new Authentication\TwoFactorAuth\TwoFactorAuth($SETTINGS['ga_website_name']);
1355 1355
         // Init
@@ -1371,7 +1371,7 @@  discard block
 block discarded – undo
1371 1371
             $mfaMessage = langHdl('ga_flash_qr_and_login');
1372 1372
             // generate new QR
1373 1373
             $new_2fa_qr = $tfa->getQRCodeImageAsDataUri(
1374
-                'Teampass - ' . $username,
1374
+                'Teampass - '.$username,
1375 1375
                 $userInfo['ga']
1376 1376
             );
1377 1377
             // clear temporary code from DB
@@ -1384,7 +1384,7 @@  discard block
 block discarded – undo
1384 1384
                 $userInfo['id']
1385 1385
             );
1386 1386
             $firstTime = [
1387
-                'value' => '<img src="' . $new_2fa_qr . '">',
1387
+                'value' => '<img src="'.$new_2fa_qr.'">',
1388 1388
                 'user_admin' => isset($sessionAdmin) ? (int) $sessionAdmin : '',
1389 1389
                 'initial_url' => isset($sessionUrl) === true ? $sessionUrl : '',
1390 1390
                 'pwd_attempts' => (int) $sessionPwdAttempts,
@@ -1435,8 +1435,8 @@  discard block
 block discarded – undo
1435 1435
     // Set to false
1436 1436
     $userPasswordVerified = false;
1437 1437
     // load passwordLib library
1438
-    include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
1439
-    $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'] . '/includes/libraries');
1438
+    include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
1439
+    $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'].'/includes/libraries');
1440 1440
     $pwdlib->register();
1441 1441
     $pwdlib = new PasswordLib\PasswordLib();
1442 1442
     // Check if old encryption used
@@ -1567,7 +1567,7 @@  discard block
 block discarded – undo
1567 1567
     // Brute force management
1568 1568
     if ($sessionPwdAttempts > 3) {
1569 1569
         // Load superGlobals
1570
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
1570
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
1571 1571
         $superGlobal = new protect\SuperGlobal\SuperGlobal();
1572 1572
         $superGlobal->put('next_possible_pwd_attempts', time() + 10, 'SESSION');
1573 1573
         $superGlobal->put('pwd_attempts', 0, 'SESSION');
@@ -1609,7 +1609,7 @@  discard block
 block discarded – undo
1609 1609
     // Check if user exists
1610 1610
     $userInfo = DB::queryFirstRow(
1611 1611
         'SELECT *
1612
-        FROM ' . prefixTable('users') . ' WHERE login=%s',
1612
+        FROM ' . prefixTable('users').' WHERE login=%s',
1613 1613
         $username
1614 1614
     );
1615 1615
     
Please login to merge, or discard this patch.
sources/ldap.queries.php 1 patch
Spacing   +45 added lines, -45 removed lines patch added patch discarded remove patch
@@ -45,26 +45,26 @@  discard block
 block discarded – undo
45 45
 }
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
 if (!checkUser($_SESSION['user_id'], $_SESSION['key'], 'ldap', $SETTINGS)) {
51 51
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page
52
-    include $SETTINGS['cpassman_dir'] . '/error.php';
52
+    include $SETTINGS['cpassman_dir'].'/error.php';
53 53
     exit();
54 54
 }
55 55
 
56
-require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
57
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
58
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/tp.config.php';
56
+require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
57
+require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
58
+require_once $SETTINGS['cpassman_dir'].'/includes/config/tp.config.php';
59 59
 
60 60
 header('Content-type: text/html; charset=utf-8');
61 61
 header('Cache-Control: no-cache, no-store, must-revalidate');
62 62
 
63
-require_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
64
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
63
+require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
64
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
65 65
 
66 66
 // connect to the server
67
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
67
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
68 68
 if (defined('DB_PASSWD_CLEAR') === false) {
69 69
     define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
70 70
 }
@@ -129,39 +129,39 @@  discard block
 block discarded – undo
129 129
         ];
130 130
 
131 131
         // Load expected libraries
132
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/helpers.php';
133
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php';
134
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Arr.php';
135
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Symfony/contracts/Translation/TranslatorInterface.php';
136
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonTimeZone.php';
137
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Units.php';
138
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Week.php';
139
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Timestamp.php';
140
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Test.php';
141
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/ObjectInitialisation.php';
142
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Serialization.php';
143
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/IntervalRounding.php';
144
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Rounding.php';
145
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Localization.php';
146
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Options.php';
147
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Cast.php';
148
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mutability.php';
149
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Modifiers.php';
150
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mixin.php';
151
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Macro.php';
152
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Difference.php';
153
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Creator.php';
154
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Converter.php';
155
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Comparison.php';
156
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Boundaries.php';
157
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Date.php';
158
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonInterface.php';
159
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Carbon.php';
160
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/DetectsErrors.php';
161
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Connection.php';
162
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapInterface.php';
163
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/HandlesConnection.php';
164
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapBase.php';
132
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/helpers.php';
133
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php';
134
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Arr.php';
135
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Symfony/contracts/Translation/TranslatorInterface.php';
136
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonTimeZone.php';
137
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Units.php';
138
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Week.php';
139
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Timestamp.php';
140
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Test.php';
141
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/ObjectInitialisation.php';
142
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Serialization.php';
143
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/IntervalRounding.php';
144
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Rounding.php';
145
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Localization.php';
146
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Options.php';
147
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Cast.php';
148
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mutability.php';
149
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Modifiers.php';
150
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mixin.php';
151
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Macro.php';
152
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Difference.php';
153
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Creator.php';
154
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Converter.php';
155
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Comparison.php';
156
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Boundaries.php';
157
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Date.php';
158
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonInterface.php';
159
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Carbon.php';
160
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/DetectsErrors.php';
161
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Connection.php';
162
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapInterface.php';
163
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/HandlesConnection.php';
164
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapBase.php';
165 165
 
166 166
         $ad = new SplClassLoader('LdapRecord', '../includes/libraries');
167 167
         $ad->register();
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
177 177
                 $SETTINGS['cpassman_dir'],
178 178
                 array(
179 179
                     'error' => true,
180
-                    'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage(). "<br>".$error->getDiagnosticMessage(),
180
+                    'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage()."<br>".$error->getDiagnosticMessage(),
181 181
                 ),
182 182
                 'encode'
183 183
             );
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
196 196
                 $SETTINGS['cpassman_dir'],
197 197
                 array(
198 198
                     'error' => true,
199
-                    'message' => "Error : ".$e->withDetailedError($e),//->detailedError(),
199
+                    'message' => "Error : ".$e->withDetailedError($e), //->detailedError(),
200 200
                 ),
201 201
                 'encode'
202 202
             );
@@ -216,7 +216,7 @@  discard block
 block discarded – undo
216 216
                 $SETTINGS['cpassman_dir'],
217 217
                 array(
218 218
                     'error' => true,
219
-                    'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage(). "<br>".$error->getDiagnosticMessage(),
219
+                    'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage()."<br>".$error->getDiagnosticMessage(),
220 220
                 ),
221 221
                 'encode'
222 222
             );
Please login to merge, or discard this patch.
sources/users.queries.php 1 patch
Spacing   +176 added lines, -176 removed lines patch added patch discarded remove patch
@@ -47,8 +47,8 @@  discard block
 block discarded – undo
47 47
 }
48 48
 
49 49
 /* do checks */
50
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
51
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
50
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
51
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
52 52
 $isprofileupdate = filter_input(INPUT_POST, 'isprofileupdate', FILTER_SANITIZE_STRING);
53 53
 if (
54 54
     checkUser($_SESSION['user_id'], $_SESSION['key'], 'profile', $SETTINGS) === false
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
         || $isprofileupdate === false
60 60
     ) {
61 61
         $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page
62
-        include $SETTINGS['cpassman_dir'] . '/error.php';
62
+        include $SETTINGS['cpassman_dir'].'/error.php';
63 63
         exit();
64 64
     } else {
65 65
         // Do special check to allow user to change attributes of his profile
@@ -68,20 +68,20 @@  discard block
 block discarded – undo
68 68
             || checkUser($_SESSION['user_id'], $_SESSION['key'], 'profile', $SETTINGS) === false
69 69
         ) {
70 70
             $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page
71
-            include $SETTINGS['cpassman_dir'] . '/error.php';
71
+            include $SETTINGS['cpassman_dir'].'/error.php';
72 72
             exit();
73 73
         }
74 74
     }
75 75
 }
76 76
 
77
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
77
+require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
78 78
 header('Content-type: text/html; charset=utf-8');
79
-require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
80
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
81
-require_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
79
+require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
80
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
81
+require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
82 82
 
83 83
 // Connect to mysql server
84
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
84
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
85 85
 if (defined('DB_PASSWD_CLEAR') === false) {
86 86
     define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
87 87
 }
@@ -128,12 +128,12 @@  discard block
 block discarded – undo
128 128
 
129 129
             // decrypt and retrieve data in JSON format
130 130
             $dataReceived = prepareExchangedData(
131
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
131
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
132 132
 
133 133
             // Prepare variables
134 134
             $login = filter_var($dataReceived['login'], FILTER_SANITIZE_STRING);
135 135
             $email = filter_var($dataReceived['email'], FILTER_SANITIZE_EMAIL);
136
-            $password = '';//filter_var($dataReceived['pw'], FILTER_SANITIZE_STRING);
136
+            $password = ''; //filter_var($dataReceived['pw'], FILTER_SANITIZE_STRING);
137 137
             $lastname = filter_var($dataReceived['lastname'], FILTER_SANITIZE_STRING);
138 138
             $name = filter_var($dataReceived['name'], FILTER_SANITIZE_STRING);
139 139
             $is_admin = filter_var($dataReceived['admin'], FILTER_SANITIZE_NUMBER_INT);
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
             // Check if user already exists
164 164
             $data = DB::query(
165 165
                 'SELECT id, fonction_id, groupes_interdits, groupes_visibles
166
-                FROM ' . prefixTable('users') . '
166
+                FROM ' . prefixTable('users').'
167 167
                 WHERE login = %s',
168 168
                 $login
169 169
             );
@@ -379,14 +379,14 @@  discard block
 block discarded – undo
379 379
 
380 380
             // decrypt and retrieve data in JSON format
381 381
             $dataReceived = prepareExchangedData(
382
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
382
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
383 383
 
384 384
             // Prepare variables
385 385
             $post_id = filter_var($dataReceived['user_id'], FILTER_SANITIZE_NUMBER_INT);
386 386
 
387 387
             // Get info about user to delete
388 388
             $data_user = DB::queryfirstrow(
389
-                'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
389
+                'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
390 390
                 WHERE id = %i',
391 391
                 $post_id
392 392
             );
@@ -405,7 +405,7 @@  discard block
 block discarded – undo
405 405
                 );
406 406
                 // delete personal folder and subfolders
407 407
                 $data = DB::queryfirstrow(
408
-                    'SELECT id FROM ' . prefixTable('nested_tree') . '
408
+                    'SELECT id FROM '.prefixTable('nested_tree').'
409 409
                     WHERE title = %s AND personal_folder = %i',
410 410
                     $post_id,
411 411
                     '1'
@@ -418,7 +418,7 @@  discard block
 block discarded – undo
418 418
                         DB::delete(prefixTable('nested_tree'), 'id = %i AND personal_folder = %i', $folder->id, '1');
419 419
                         // delete items & logs
420 420
                         $items = DB::query(
421
-                            'SELECT id FROM ' . prefixTable('items') . '
421
+                            'SELECT id FROM '.prefixTable('items').'
422 422
                             WHERE id_tree=%i AND perso = %i',
423 423
                             $folder->id,
424 424
                             '1'
@@ -470,7 +470,7 @@  discard block
 block discarded – undo
470 470
             // Check KEY
471 471
             if (filter_input(INPUT_POST, 'key', FILTER_SANITIZE_STRING) !== filter_var($_SESSION['key'], FILTER_SANITIZE_STRING)) {
472 472
                 echo prepareExchangedData(
473
-    $SETTINGS['cpassman_dir'],array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode');
473
+    $SETTINGS['cpassman_dir'], array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode');
474 474
                 break;
475 475
             }
476 476
 
@@ -478,7 +478,7 @@  discard block
 block discarded – undo
478 478
 
479 479
             // Get info about user to delete
480 480
             $data_user = DB::queryfirstrow(
481
-                'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
481
+                'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
482 482
                 WHERE id = %i',
483 483
                 $post_id
484 484
             );
@@ -498,10 +498,10 @@  discard block
 block discarded – undo
498 498
                     $post_id
499 499
                 );
500 500
                 echo prepareExchangedData(
501
-    $SETTINGS['cpassman_dir'],array('error' => ''), 'encode');
501
+    $SETTINGS['cpassman_dir'], array('error' => ''), 'encode');
502 502
             } else {
503 503
                 echo prepareExchangedData(
504
-    $SETTINGS['cpassman_dir'],array('error' => 'not_allowed'), 'encode');
504
+    $SETTINGS['cpassman_dir'], array('error' => 'not_allowed'), 'encode');
505 505
             }
506 506
             break;
507 507
             /*
@@ -514,7 +514,7 @@  discard block
 block discarded – undo
514 514
                 || $_SESSION['is_admin'] !== '1'
515 515
             ) {
516 516
                 echo prepareExchangedData(
517
-    $SETTINGS['cpassman_dir'],array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode');
517
+    $SETTINGS['cpassman_dir'], array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode');
518 518
                 exit();
519 519
             }
520 520
 
@@ -523,7 +523,7 @@  discard block
 block discarded – undo
523 523
 
524 524
             // Get info about user to delete
525 525
             $data_user = DB::queryfirstrow(
526
-                'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
526
+                'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
527 527
                 WHERE id = %i',
528 528
                 $post_id
529 529
             );
@@ -546,10 +546,10 @@  discard block
 block discarded – undo
546 546
                 );
547 547
 
548 548
                 echo prepareExchangedData(
549
-    $SETTINGS['cpassman_dir'],array('error' => ''), 'encode');
549
+    $SETTINGS['cpassman_dir'], array('error' => ''), 'encode');
550 550
             } else {
551 551
                 echo prepareExchangedData(
552
-    $SETTINGS['cpassman_dir'],array('error' => 'not_allowed'), 'encode');
552
+    $SETTINGS['cpassman_dir'], array('error' => 'not_allowed'), 'encode');
553 553
             }
554 554
             break;
555 555
             /*
@@ -559,7 +559,7 @@  discard block
 block discarded – undo
559 559
             // Check KEY
560 560
             if (filter_input(INPUT_POST, 'key', FILTER_SANITIZE_STRING) !== filter_var($_SESSION['key'], FILTER_SANITIZE_STRING)) {
561 561
                 echo prepareExchangedData(
562
-    $SETTINGS['cpassman_dir'],array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode');
562
+    $SETTINGS['cpassman_dir'], array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode');
563 563
                 break;
564 564
             }
565 565
 
@@ -569,7 +569,7 @@  discard block
 block discarded – undo
569 569
             // Get info about user to delete
570 570
             $data_user = DB::queryfirstrow(
571 571
                 'SELECT admin, isAdministratedByRole, can_manage_all_users, gestionnaire
572
-                FROM ' . prefixTable('users') . '
572
+                FROM ' . prefixTable('users').'
573 573
                 WHERE id = %i',
574 574
                 $post_id
575 575
             );
@@ -594,10 +594,10 @@  discard block
 block discarded – undo
594 594
                     $post_id
595 595
                 );
596 596
                 echo prepareExchangedData(
597
-    $SETTINGS['cpassman_dir'],array('error' => ''), 'encode');
597
+    $SETTINGS['cpassman_dir'], array('error' => ''), 'encode');
598 598
             } else {
599 599
                 echo prepareExchangedData(
600
-    $SETTINGS['cpassman_dir'],array('error' => 'not_allowed'), 'encode');
600
+    $SETTINGS['cpassman_dir'], array('error' => 'not_allowed'), 'encode');
601 601
             }
602 602
             break;
603 603
             /*
@@ -607,7 +607,7 @@  discard block
 block discarded – undo
607 607
             // Check KEY
608 608
             if (filter_input(INPUT_POST, 'key', FILTER_SANITIZE_STRING) !== filter_var($_SESSION['key'], FILTER_SANITIZE_STRING)) {
609 609
                 echo prepareExchangedData(
610
-    $SETTINGS['cpassman_dir'],array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode');
610
+    $SETTINGS['cpassman_dir'], array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode');
611 611
                 break;
612 612
             }
613 613
 
@@ -616,7 +616,7 @@  discard block
 block discarded – undo
616 616
 
617 617
             // Get info about user to delete
618 618
             $data_user = DB::queryfirstrow(
619
-                'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
619
+                'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
620 620
                 WHERE id = %i',
621 621
                 $post_id
622 622
             );
@@ -638,10 +638,10 @@  discard block
 block discarded – undo
638 638
                     $post_id
639 639
                 );
640 640
                 echo prepareExchangedData(
641
-    $SETTINGS['cpassman_dir'],array('error' => ''), 'encode');
641
+    $SETTINGS['cpassman_dir'], array('error' => ''), 'encode');
642 642
             } else {
643 643
                 echo prepareExchangedData(
644
-    $SETTINGS['cpassman_dir'],array('error' => 'not_allowed'), 'encode');
644
+    $SETTINGS['cpassman_dir'], array('error' => 'not_allowed'), 'encode');
645 645
             }
646 646
             break;
647 647
             /*
@@ -652,7 +652,7 @@  discard block
 block discarded – undo
652 652
             // Check KEY
653 653
             if (filter_input(INPUT_POST, 'key', FILTER_SANITIZE_STRING) !== filter_var($_SESSION['key'], FILTER_SANITIZE_STRING)) {
654 654
                 echo prepareExchangedData(
655
-    $SETTINGS['cpassman_dir'],array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode');
655
+    $SETTINGS['cpassman_dir'], array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode');
656 656
                 break;
657 657
             }
658 658
 
@@ -662,7 +662,7 @@  discard block
 block discarded – undo
662 662
             // Get info about user to delete
663 663
             $data_user = DB::queryfirstrow(
664 664
                 'SELECT admin, isAdministratedByRole, gestionnaire
665
-                FROM ' . prefixTable('users') . '
665
+                FROM ' . prefixTable('users').'
666 666
                 WHERE id = %i',
667 667
                 $post_id
668 668
             );
@@ -685,10 +685,10 @@  discard block
 block discarded – undo
685 685
                     $post_id
686 686
                 );
687 687
                 echo prepareExchangedData(
688
-    $SETTINGS['cpassman_dir'],array('error' => ''), 'encode');
688
+    $SETTINGS['cpassman_dir'], array('error' => ''), 'encode');
689 689
             } else {
690 690
                 echo prepareExchangedData(
691
-    $SETTINGS['cpassman_dir'],array('error' => 'not_allowed'), 'encode');
691
+    $SETTINGS['cpassman_dir'], array('error' => 'not_allowed'), 'encode');
692 692
             }
693 693
             break;
694 694
             /*
@@ -698,7 +698,7 @@  discard block
 block discarded – undo
698 698
             // Check KEY
699 699
             if (filter_input(INPUT_POST, 'key', FILTER_SANITIZE_STRING) !== filter_var($_SESSION['key'], FILTER_SANITIZE_STRING)) {
700 700
                 echo prepareExchangedData(
701
-    $SETTINGS['cpassman_dir'],array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode');
701
+    $SETTINGS['cpassman_dir'], array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode');
702 702
                 break;
703 703
             }
704 704
 
@@ -708,7 +708,7 @@  discard block
 block discarded – undo
708 708
             // Get info about user to delete
709 709
             $data_user = DB::queryfirstrow(
710 710
                 'SELECT admin, isAdministratedByRole, gestionnaire
711
-                FROM ' . prefixTable('users') . '
711
+                FROM ' . prefixTable('users').'
712 712
                 WHERE id = %i',
713 713
                 $post_id
714 714
             );
@@ -728,10 +728,10 @@  discard block
 block discarded – undo
728 728
                     $post_id
729 729
                 );
730 730
                 echo prepareExchangedData(
731
-    $SETTINGS['cpassman_dir'],array('error' => ''), 'encode');
731
+    $SETTINGS['cpassman_dir'], array('error' => ''), 'encode');
732 732
             } else {
733 733
                 echo prepareExchangedData(
734
-    $SETTINGS['cpassman_dir'],array('error' => 'not_allowed'), 'encode');
734
+    $SETTINGS['cpassman_dir'], array('error' => 'not_allowed'), 'encode');
735 735
             }
736 736
             break;
737 737
 
@@ -750,7 +750,7 @@  discard block
 block discarded – undo
750 750
             // Get info about user to delete
751 751
             $data_user = DB::queryfirstrow(
752 752
                 'SELECT admin, isAdministratedByRole, gestionnaire
753
-                FROM ' . prefixTable('users') . '
753
+                FROM ' . prefixTable('users').'
754 754
                 WHERE id = %i',
755 755
                 $post_id
756 756
             );
@@ -789,7 +789,7 @@  discard block
 block discarded – undo
789 789
             $return = array();
790 790
             // Check if folder exists
791 791
             $data = DB::query(
792
-                'SELECT * FROM ' . prefixTable('nested_tree') . '
792
+                'SELECT * FROM '.prefixTable('nested_tree').'
793 793
                 WHERE title = %s AND parent_id = %i',
794 794
                 filter_input(INPUT_POST, 'domain', FILTER_SANITIZE_STRING),
795 795
                 '0'
@@ -802,7 +802,7 @@  discard block
 block discarded – undo
802 802
             }
803 803
             // Check if role exists
804 804
             $data = DB::query(
805
-                'SELECT * FROM ' . prefixTable('roles_title') . '
805
+                'SELECT * FROM '.prefixTable('roles_title').'
806 806
                 WHERE title = %s',
807 807
                 filter_input(INPUT_POST, 'domain', FILTER_SANITIZE_STRING)
808 808
             );
@@ -822,7 +822,7 @@  discard block
 block discarded – undo
822 822
         case 'user_log_items':
823 823
             $nb_pages = 1;
824 824
             $logs = $sql_filter = '';
825
-            $pages = '<table style=\'border-top:1px solid #969696;\'><tr><td>' . langHdl('pages') . '&nbsp;:&nbsp;</td>';
825
+            $pages = '<table style=\'border-top:1px solid #969696;\'><tr><td>'.langHdl('pages').'&nbsp;:&nbsp;</td>';
826 826
 
827 827
             // Prepare POST variables
828 828
             $post_nb_items_by_page = filter_input(INPUT_POST, 'nb_items_by_page', FILTER_SANITIZE_NUMBER_INT);
@@ -834,14 +834,14 @@  discard block
 block discarded – undo
834 834
                     && !empty(filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_STRING))
835 835
                     && filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_STRING) !== 'all'
836 836
                 ) {
837
-                    $sql_filter = " AND l.action = '" . filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_STRING) . "'";
837
+                    $sql_filter = " AND l.action = '".filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_STRING)."'";
838 838
                 }
839 839
                 // get number of pages
840 840
                 DB::query(
841 841
                     'SELECT *
842
-                    FROM ' . prefixTable('log_items') . ' as l
843
-                    INNER JOIN ' . prefixTable('items') . ' as i ON (l.id_item=i.id)
844
-                    INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id)
842
+                    FROM ' . prefixTable('log_items').' as l
843
+                    INNER JOIN ' . prefixTable('items').' as i ON (l.id_item=i.id)
844
+                    INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id)
845 845
                     WHERE l.id_user = %i ' . $sql_filter,
846 846
                     filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT)
847 847
                 );
@@ -859,19 +859,19 @@  discard block
 block discarded – undo
859 859
                 // launch query
860 860
                 $rows = DB::query(
861 861
                     'SELECT l.date as date, u.login as login, i.label as label, l.action as action
862
-                    FROM ' . prefixTable('log_items') . ' as l
863
-                    INNER JOIN ' . prefixTable('items') . ' as i ON (l.id_item=i.id)
864
-                    INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id)
865
-                    WHERE l.id_user = %i ' . $sql_filter . '
862
+                    FROM ' . prefixTable('log_items').' as l
863
+                    INNER JOIN ' . prefixTable('items').' as i ON (l.id_item=i.id)
864
+                    INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id)
865
+                    WHERE l.id_user = %i ' . $sql_filter.'
866 866
                     ORDER BY date DESC
867
-                    LIMIT ' . intval($start) . ',' . intval($post_nb_items_by_page),
867
+                    LIMIT ' . intval($start).','.intval($post_nb_items_by_page),
868 868
                     filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT)
869 869
                 );
870 870
             } else {
871 871
                 // get number of pages
872 872
                 DB::query(
873 873
                     'SELECT *
874
-                    FROM ' . prefixTable('log_system') . '
874
+                    FROM ' . prefixTable('log_system').'
875 875
                     WHERE type = %s AND field_1=%i',
876 876
                     'user_mngt',
877 877
                     filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT)
@@ -890,7 +890,7 @@  discard block
 block discarded – undo
890 890
                 // launch query
891 891
                 $rows = DB::query(
892 892
                     'SELECT *
893
-                    FROM ' . prefixTable('log_system') . '
893
+                    FROM ' . prefixTable('log_system').'
894 894
                     WHERE type = %s AND field_1 = %i
895 895
                     ORDER BY date DESC
896 896
                     LIMIT %i, %i',
@@ -904,7 +904,7 @@  discard block
 block discarded – undo
904 904
             if (isset($counter) && $counter != 0) {
905 905
                 $nb_pages = ceil($counter / intval($post_nb_items_by_page));
906 906
                 for ($i = 1; $i <= $nb_pages; ++$i) {
907
-                    $pages .= '<td onclick=\'displayLogs(' . $i . ',\"' . $post_scope . '\")\'><span style=\'cursor:pointer;' . (filter_input(INPUT_POST, 'page', FILTER_SANITIZE_NUMBER_INT) === $i ? 'font-weight:bold;font-size:18px;\'>' . $i : '\'>' . $i) . '</span></td>';
907
+                    $pages .= '<td onclick=\'displayLogs('.$i.',\"'.$post_scope.'\")\'><span style=\'cursor:pointer;'.(filter_input(INPUT_POST, 'page', FILTER_SANITIZE_NUMBER_INT) === $i ? 'font-weight:bold;font-size:18px;\'>'.$i : '\'>'.$i).'</span></td>';
908 908
                 }
909 909
             }
910 910
             $pages .= '</tr></table>';
@@ -913,7 +913,7 @@  discard block
 block discarded – undo
913 913
                     if ($post_scope === 'user_mngt') {
914 914
                         $user = DB::queryfirstrow(
915 915
                             'SELECT login
916
-                            from ' . prefixTable('users') . '
916
+                            from ' . prefixTable('users').'
917 917
                             WHERE id=%i',
918 918
                             $record['qui']
919 919
                         );
@@ -923,7 +923,7 @@  discard block
 block discarded – undo
923 923
                         if ($tmp[0] == 'at_user_initial_pwd_changed') {
924 924
                             $label = langHdl('log_user_initial_pwd_changed');
925 925
                         } elseif ($tmp[0] == 'at_user_email_changed') {
926
-                            $label = langHdl('log_user_email_changed') . $tmp[1];
926
+                            $label = langHdl('log_user_email_changed').$tmp[1];
927 927
                         } elseif ($tmp[0] == 'at_user_added') {
928 928
                             $label = langHdl('log_user_created');
929 929
                         } elseif ($tmp[0] == 'at_user_locked') {
@@ -934,14 +934,14 @@  discard block
 block discarded – undo
934 934
                             $label = langHdl('log_user_pwd_changed');
935 935
                         }
936 936
                         // prepare log
937
-                        $logs .= '<tr><td>' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . '</td><td align=\"center\">' . $label . '</td><td align=\"center\">' . $user['login'] . '</td><td align=\"center\"></td></tr>';
937
+                        $logs .= '<tr><td>'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).'</td><td align=\"center\">'.$label.'</td><td align=\"center\">'.$user['login'].'</td><td align=\"center\"></td></tr>';
938 938
                     } else {
939
-                        $logs .= '<tr><td>' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . '</td><td align=\"center\">' . str_replace('"', '\"', $record['label']) . '</td><td align=\"center\">' . $record['login'] . '</td><td align=\"center\">' . langHdl($record['action']) . '</td></tr>';
939
+                        $logs .= '<tr><td>'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).'</td><td align=\"center\">'.str_replace('"', '\"', $record['label']).'</td><td align=\"center\">'.$record['login'].'</td><td align=\"center\">'.langHdl($record['action']).'</td></tr>';
940 940
                     }
941 941
                 }
942 942
             }
943 943
 
944
-            echo '[ { "table_logs": "' . ($logs) . '", "pages": "' . ($pages) . '", "error" : "no" } ]';
944
+            echo '[ { "table_logs": "'.($logs).'", "pages": "'.($pages).'", "error" : "no" } ]';
945 945
             break;
946 946
 
947 947
             /*
@@ -967,7 +967,7 @@  discard block
 block discarded – undo
967 967
             } else {
968 968
                 // Get folder id for Admin
969 969
                 $admin_folder = DB::queryFirstRow(
970
-                    'SELECT id FROM ' . prefixTable('nested_tree') . '
970
+                    'SELECT id FROM '.prefixTable('nested_tree').'
971 971
                     WHERE title = %i AND personal_folder = %i',
972 972
                     intval($_SESSION['user_id']),
973 973
                     '1'
@@ -978,15 +978,15 @@  discard block
 block discarded – undo
978 978
                     // Get each Items in PF
979 979
                     $rows = DB::query(
980 980
                         'SELECT i.pw, i.label, l.id_user
981
-                        FROM ' . prefixTable('items') . ' as i
982
-                        LEFT JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item=i.id)
981
+                        FROM ' . prefixTable('items').' as i
982
+                        LEFT JOIN ' . prefixTable('log_items').' as l ON (l.id_item=i.id)
983 983
                         WHERE l.action = %s AND i.perso=%i AND i.id_tree=%i',
984 984
                         'at_creation',
985 985
                         '1',
986 986
                         intval($folder->id)
987 987
                     );
988 988
                     foreach ($rows as $record) {
989
-                        echo $record['label'] . ' - ';
989
+                        echo $record['label'].' - ';
990 990
                         // Change user
991 991
                         DB::update(
992 992
                             prefixTable('log_items'),
@@ -1021,7 +1021,7 @@  discard block
 block discarded – undo
1021 1021
             // Get info about user to delete
1022 1022
             $data_user = DB::queryfirstrow(
1023 1023
                 'SELECT admin, isAdministratedByRole, gestionnaire
1024
-                FROM ' . prefixTable('users') . '
1024
+                FROM ' . prefixTable('users').'
1025 1025
                 WHERE id = %i',
1026 1026
                 $post_user_id
1027 1027
             );
@@ -1058,7 +1058,7 @@  discard block
 block discarded – undo
1058 1058
 
1059 1059
             // Do
1060 1060
             $rows = DB::query(
1061
-                'SELECT id FROM ' . prefixTable('users') . '
1061
+                'SELECT id FROM '.prefixTable('users').'
1062 1062
                 WHERE timestamp != %s AND admin != %i',
1063 1063
                 '',
1064 1064
                 '1'
@@ -1067,7 +1067,7 @@  discard block
 block discarded – undo
1067 1067
                 // Get info about user to delete
1068 1068
                 $data_user = DB::queryfirstrow(
1069 1069
                     'SELECT admin, isAdministratedByRole, gestionnaire
1070
-                    FROM ' . prefixTable('users') . '
1070
+                    FROM ' . prefixTable('users').'
1071 1071
                     WHERE id = %i',
1072 1072
                     $record['id']
1073 1073
                 );
@@ -1120,7 +1120,7 @@  discard block
 block discarded – undo
1120 1120
 
1121 1121
             // decrypt and retrieve data in JSON format
1122 1122
             $dataReceived = prepareExchangedData(
1123
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
1123
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
1124 1124
             
1125 1125
             // Prepare variables
1126 1126
             $post_id = filter_var($dataReceived['user_id'], FILTER_SANITIZE_NUMBER_INT);
@@ -1128,7 +1128,7 @@  discard block
 block discarded – undo
1128 1128
             // Get info about user
1129 1129
             $rowUser = DB::queryfirstrow(
1130 1130
                 'SELECT *
1131
-                FROM ' . prefixTable('users') . '
1131
+                FROM ' . prefixTable('users').'
1132 1132
                 WHERE id = %i',
1133 1133
                 $post_id
1134 1134
             );
@@ -1146,7 +1146,7 @@  discard block
 block discarded – undo
1146 1146
                 $arrFldAllowed = array();
1147 1147
 
1148 1148
                 //Build tree
1149
-                $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries');
1149
+                $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries');
1150 1150
                 $tree->register();
1151 1151
                 $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
1152 1152
 
@@ -1157,7 +1157,7 @@  discard block
 block discarded – undo
1157 1157
                 // array of roles for actual user
1158 1158
                 $my_functions = explode(';', $_SESSION['fonction_id']);
1159 1159
 
1160
-                $rows = DB::query('SELECT id,title,creator_id FROM ' . prefixTable('roles_title'));
1160
+                $rows = DB::query('SELECT id,title,creator_id FROM '.prefixTable('roles_title'));
1161 1161
                 foreach ($rows as $record) {
1162 1162
                     if (
1163 1163
                         (int) $_SESSION['is_admin'] === 1
@@ -1193,7 +1193,7 @@  discard block
 block discarded – undo
1193 1193
                 $rolesList = array();
1194 1194
                 $managedBy = array();
1195 1195
                 $selected = '';
1196
-                $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title') . ' ORDER BY title ASC');
1196
+                $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title').' ORDER BY title ASC');
1197 1197
                 foreach ($rows as $reccord) {
1198 1198
                     $rolesList[$reccord['id']] = array('id' => $reccord['id'], 'title' => $reccord['title']);
1199 1199
                 }
@@ -1224,7 +1224,7 @@  discard block
 block discarded – undo
1224 1224
                         array_push(
1225 1225
                             $managedBy,
1226 1226
                             array(
1227
-                                'title' => langHdl('managers_of') . ' ' . $fonction['title'],
1227
+                                'title' => langHdl('managers_of').' '.$fonction['title'],
1228 1228
                                 'id' => $fonction['id'],
1229 1229
                                 'selected' => $selected,
1230 1230
                             )
@@ -1306,9 +1306,9 @@  discard block
 block discarded – undo
1306 1306
 
1307 1307
                 // get USER STATUS
1308 1308
                 if ($rowUser['disabled'] == 1) {
1309
-                    $arrData['info'] = langHdl('user_info_locked') . '<br><input type="checkbox" value="unlock" name="1" class="chk">&nbsp;<label for="1">' . langHdl('user_info_unlock_question') . '</label><br><input type="checkbox"  value="delete" id="account_delete" class="chk mr-2" name="2" onclick="confirmDeletion()">label for="2">' . langHdl('user_info_delete_question') . '</label>';
1309
+                    $arrData['info'] = langHdl('user_info_locked').'<br><input type="checkbox" value="unlock" name="1" class="chk">&nbsp;<label for="1">'.langHdl('user_info_unlock_question').'</label><br><input type="checkbox"  value="delete" id="account_delete" class="chk mr-2" name="2" onclick="confirmDeletion()">label for="2">'.langHdl('user_info_delete_question').'</label>';
1310 1310
                 } else {
1311
-                    $arrData['info'] = langHdl('user_info_active') . '<br><input type="checkbox" value="lock" class="chk">&nbsp;' . langHdl('user_info_lock_question');
1311
+                    $arrData['info'] = langHdl('user_info_active').'<br><input type="checkbox" value="lock" class="chk">&nbsp;'.langHdl('user_info_lock_question');
1312 1312
                 }
1313 1313
 
1314 1314
                 $arrData['error'] = false;
@@ -1380,7 +1380,7 @@  discard block
 block discarded – undo
1380 1380
 
1381 1381
             // decrypt and retrieve data in JSON format
1382 1382
             $dataReceived = prepareExchangedData(
1383
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
1383
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
1384 1384
 
1385 1385
             // Prepare variables
1386 1386
             $post_id = filter_var($dataReceived['user_id'], FILTER_SANITIZE_STRING);
@@ -1405,7 +1405,7 @@  discard block
 block discarded – undo
1405 1405
                 // count number of admins
1406 1406
                 $users = DB::query(
1407 1407
                     'SELECT id
1408
-                    FROM ' . prefixTable('users') . '
1408
+                    FROM ' . prefixTable('users').'
1409 1409
                     WHERE admin = 1 AND email != "" AND pw != ""'
1410 1410
                 );
1411 1411
                 if (DB::count() === 1) {
@@ -1494,7 +1494,7 @@  discard block
 block discarded – undo
1494 1494
 
1495 1495
             // Get info about user to delete
1496 1496
             $data_user = DB::queryfirstrow(
1497
-                'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
1497
+                'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
1498 1498
                 WHERE id = %i',
1499 1499
                 $post_id
1500 1500
             );
@@ -1515,7 +1515,7 @@  discard block
 block discarded – undo
1515 1515
                     );
1516 1516
                     // delete personal folder and subfolders
1517 1517
                     $data = DB::queryfirstrow(
1518
-                        'SELECT id FROM ' . prefixTable('nested_tree') . '
1518
+                        'SELECT id FROM '.prefixTable('nested_tree').'
1519 1519
                         WHERE title = %s AND personal_folder = %i',
1520 1520
                         $post_id,
1521 1521
                         '1'
@@ -1528,7 +1528,7 @@  discard block
 block discarded – undo
1528 1528
                             DB::delete(prefixTable('nested_tree'), 'id = %i AND personal_folder = %i', $folder->id, '1');
1529 1529
                             // delete items & logs
1530 1530
                             $items = DB::query(
1531
-                                'SELECT id FROM ' . prefixTable('items') . '
1531
+                                'SELECT id FROM '.prefixTable('items').'
1532 1532
                                 WHERE id_tree=%i AND perso = %i',
1533 1533
                                 $folder->id,
1534 1534
                                 '1'
@@ -1549,7 +1549,7 @@  discard block
 block discarded – undo
1549 1549
                 } else {
1550 1550
                     // Get old data about user
1551 1551
                     $oldData = DB::queryfirstrow(
1552
-                        'SELECT * FROM ' . prefixTable('users') . '
1552
+                        'SELECT * FROM '.prefixTable('users').'
1553 1553
                         WHERE id = %i',
1554 1554
                         $post_id
1555 1555
                     );
@@ -1579,7 +1579,7 @@  discard block
 block discarded – undo
1579 1579
 
1580 1580
                     // update LOG
1581 1581
                     if ($oldData['email'] !== $post_email) {
1582
-                        logEvents($SETTINGS, 'user_mngt', 'at_user_email_changed:' . $oldData['email'], (string) $_SESSION['user_id'], $_SESSION['login'], $post_id);
1582
+                        logEvents($SETTINGS, 'user_mngt', 'at_user_email_changed:'.$oldData['email'], (string) $_SESSION['user_id'], $_SESSION['login'], $post_id);
1583 1583
                     }
1584 1584
                 }
1585 1585
                 echo prepareExchangedData(
@@ -1632,14 +1632,14 @@  discard block
 block discarded – undo
1632 1632
 
1633 1633
             // decrypt and retrieve data in JSON format
1634 1634
             $dataReceived = prepareExchangedData(
1635
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
1635
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
1636 1636
 
1637 1637
             // Prepare variables
1638 1638
             $post_id = filter_var($dataReceived['user_id'], FILTER_SANITIZE_NUMBER_INT);
1639 1639
 
1640 1640
             // Get info about user to delete
1641 1641
             $data_user = DB::queryfirstrow(
1642
-                'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
1642
+                'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
1643 1643
                 WHERE id = %i',
1644 1644
                 $post_id
1645 1645
             );
@@ -1691,7 +1691,7 @@  discard block
 block discarded – undo
1691 1691
             }
1692 1692
 
1693 1693
             DB::queryfirstrow(
1694
-                'SELECT * FROM ' . prefixTable('users') . '
1694
+                'SELECT * FROM '.prefixTable('users').'
1695 1695
                 WHERE login = %s',
1696 1696
                 filter_input(INPUT_POST, 'login', FILTER_SANITIZE_STRING)
1697 1697
             );
@@ -1736,7 +1736,7 @@  discard block
 block discarded – undo
1736 1736
 
1737 1737
             // decrypt and retrieve data in JSON format
1738 1738
             $dataReceived = prepareExchangedData(
1739
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
1739
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
1740 1740
 
1741 1741
             // Prepare variables
1742 1742
             $post_id = filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT);
@@ -1744,14 +1744,14 @@  discard block
 block discarded – undo
1744 1744
             $arrData = array();
1745 1745
 
1746 1746
             //Build tree
1747
-            $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries');
1747
+            $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries');
1748 1748
             $tree->register();
1749 1749
             $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
1750 1750
 
1751 1751
             // get User info
1752 1752
             $rowUser = DB::queryFirstRow(
1753 1753
                 'SELECT login, name, lastname, email, disabled, fonction_id, groupes_interdits, groupes_visibles, isAdministratedByRole, avatar_thumb
1754
-                FROM ' . prefixTable('users') . '
1754
+                FROM ' . prefixTable('users').'
1755 1755
                 WHERE id = %i',
1756 1756
                 $post_id
1757 1757
             );
@@ -1769,7 +1769,7 @@  discard block
 block discarded – undo
1769 1769
                 // refine folders based upon roles
1770 1770
                 $rows = DB::query(
1771 1771
                     'SELECT folder_id, type
1772
-                    FROM ' . prefixTable('roles_values') . '
1772
+                    FROM ' . prefixTable('roles_values').'
1773 1773
                     WHERE role_id IN %ls
1774 1774
                     ORDER BY folder_id ASC',
1775 1775
                     $arrData['functions']
@@ -1792,7 +1792,7 @@  discard block
 block discarded – undo
1792 1792
                 }
1793 1793
 
1794 1794
                 // add allowed folders
1795
-                foreach($arrData['allowed_folders'] as $Fld) {
1795
+                foreach ($arrData['allowed_folders'] as $Fld) {
1796 1796
                     array_push($arrFolders, array('id' => $Fld, 'type' => 'W', 'special' => true));
1797 1797
                 }
1798 1798
 
@@ -1803,7 +1803,7 @@  discard block
 block discarded – undo
1803 1803
                             // get folder name
1804 1804
                             $row = DB::queryFirstRow(
1805 1805
                                 'SELECT title, nlevel, id
1806
-                                FROM ' . prefixTable('nested_tree') . '
1806
+                                FROM ' . prefixTable('nested_tree').'
1807 1807
                                 WHERE id = %i',
1808 1808
                                 $fld['id']
1809 1809
                             );
@@ -1816,36 +1816,36 @@  discard block
 block discarded – undo
1816 1816
 
1817 1817
                             // manage right icon
1818 1818
                             if ($fld['type'] == 'W') {
1819
-                                $label = '<i class="fas fa-indent infotip text-success mr-2" title="' . langHdl('write') . '"></i>' .
1820
-                                    '<i class="fas fa-edit infotip text-success mr-2" title="' . langHdl('edit') . '"></i>' .
1821
-                                    '<i class="fas fa-eraser infotip text-success" title="' . langHdl('delete') . '"></i>';
1819
+                                $label = '<i class="fas fa-indent infotip text-success mr-2" title="'.langHdl('write').'"></i>'.
1820
+                                    '<i class="fas fa-edit infotip text-success mr-2" title="'.langHdl('edit').'"></i>'.
1821
+                                    '<i class="fas fa-eraser infotip text-success" title="'.langHdl('delete').'"></i>';
1822 1822
                             } elseif ($fld['type'] == 'ND') {
1823
-                                $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . langHdl('write') . '"></i>' .
1824
-                                    '<i class="fas fa-edit infotip text-success mr-2" title="' . langHdl('edit') . '"></i>' .
1825
-                                    '<i class="fas fa-eraser infotip text-danger" title="' . langHdl('no_delete') . '"></i>';
1823
+                                $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.langHdl('write').'"></i>'.
1824
+                                    '<i class="fas fa-edit infotip text-success mr-2" title="'.langHdl('edit').'"></i>'.
1825
+                                    '<i class="fas fa-eraser infotip text-danger" title="'.langHdl('no_delete').'"></i>';
1826 1826
                             } elseif ($fld['type'] == 'NE') {
1827
-                                $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . langHdl('write') . '"></i>' .
1828
-                                    '<i class="fas fa-edit infotip text-danger mr-2" title="' . langHdl('no_edit') . '"></i>' .
1829
-                                    '<i class="fas fa-eraser infotip text-success" title="' . langHdl('delete') . '"></i>';
1827
+                                $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.langHdl('write').'"></i>'.
1828
+                                    '<i class="fas fa-edit infotip text-danger mr-2" title="'.langHdl('no_edit').'"></i>'.
1829
+                                    '<i class="fas fa-eraser infotip text-success" title="'.langHdl('delete').'"></i>';
1830 1830
                             } elseif ($fld['type'] == 'NDNE') {
1831
-                                $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . langHdl('write') . '"></i>' .
1832
-                                    '<i class="fas fa-edit infotip text-danger mr-2" title="' . langHdl('no_edit') . '"></i>' .
1833
-                                    '<i class="fas fa-eraser infotip text-danger" title="' . langHdl('no_delete') . '"></i>';
1831
+                                $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.langHdl('write').'"></i>'.
1832
+                                    '<i class="fas fa-edit infotip text-danger mr-2" title="'.langHdl('no_edit').'"></i>'.
1833
+                                    '<i class="fas fa-eraser infotip text-danger" title="'.langHdl('no_delete').'"></i>';
1834 1834
                             } else {
1835
-                                $label = '<i class="fas fa-eye infotip text-info mr-2" title="' . langHdl('read') . '"></i>';
1835
+                                $label = '<i class="fas fa-eye infotip text-info mr-2" title="'.langHdl('read').'"></i>';
1836 1836
                             }
1837 1837
 
1838
-                            $html .= '<tr><td>' . $ident . $row['title'] .
1839
-                                ' <small class="text-info">[' . $row['id'] . ']</small>'.
1840
-                                ($fld['special'] === true ? '<i class="fas fa-user-tag infotip text-primary ml-5" title="' . langHdl('user_specific_right') . '"></i>' : '').
1841
-                                '</td><td>' . $label . '</td></tr>';
1838
+                            $html .= '<tr><td>'.$ident.$row['title'].
1839
+                                ' <small class="text-info">['.$row['id'].']</small>'.
1840
+                                ($fld['special'] === true ? '<i class="fas fa-user-tag infotip text-primary ml-5" title="'.langHdl('user_specific_right').'"></i>' : '').
1841
+                                '</td><td>'.$label.'</td></tr>';
1842 1842
                             break;
1843 1843
                         }
1844 1844
                     }
1845 1845
                 }
1846 1846
 
1847
-                $html_full = '<table id="table-folders" class="table table-bordered table-striped dt-responsive nowrap" style="width:100%"><tbody>' .
1848
-                    $html . '</tbody></table>';
1847
+                $html_full = '<table id="table-folders" class="table table-bordered table-striped dt-responsive nowrap" style="width:100%"><tbody>'.
1848
+                    $html.'</tbody></table>';
1849 1849
             } else {
1850 1850
                 $html_full = '';
1851 1851
             }
@@ -1894,7 +1894,7 @@  discard block
 block discarded – undo
1894 1894
             if ((int) $_SESSION['is_admin'] === 0 && (int) $_SESSION['user_can_manage_all_users'] === 0) {
1895 1895
                 $rows = DB::query(
1896 1896
                     'SELECT *
1897
-                    FROM ' . prefixTable('users') . '
1897
+                    FROM ' . prefixTable('users').'
1898 1898
                     WHERE admin = %i AND isAdministratedByRole IN %ls',
1899 1899
                     '0',
1900 1900
                     array_filter($_SESSION['user_roles'])
@@ -1902,7 +1902,7 @@  discard block
 block discarded – undo
1902 1902
             } else {
1903 1903
                 $rows = DB::query(
1904 1904
                     'SELECT *
1905
-                    FROM ' . prefixTable('users') . '
1905
+                    FROM ' . prefixTable('users').'
1906 1906
                     WHERE admin = %i',
1907 1907
                     '0'
1908 1908
                 );
@@ -1914,7 +1914,7 @@  discard block
 block discarded – undo
1914 1914
                 $groupIds = [];
1915 1915
                 foreach (explode(';', $record['fonction_id']) as $group) {
1916 1916
                     $tmp = DB::queryfirstrow(
1917
-                        'SELECT id, title FROM ' . prefixTable('roles_title') . '
1917
+                        'SELECT id, title FROM '.prefixTable('roles_title').'
1918 1918
                         WHERE id = %i',
1919 1919
                         $group
1920 1920
                     );
@@ -1926,7 +1926,7 @@  discard block
 block discarded – undo
1926 1926
 
1927 1927
                 // Get managed_by
1928 1928
                 $managedBy = DB::queryfirstrow(
1929
-                    'SELECT id, title FROM ' . prefixTable('roles_title') . '
1929
+                    'SELECT id, title FROM '.prefixTable('roles_title').'
1930 1930
                     WHERE id = %i',
1931 1931
                     $record['isAdministratedByRole']
1932 1932
                 );
@@ -1936,7 +1936,7 @@  discard block
 block discarded – undo
1936 1936
                 $foldersAllowedIds = [];
1937 1937
                 foreach (explode(';', $record['groupes_visibles']) as $role) {
1938 1938
                     $tmp = DB::queryfirstrow(
1939
-                        'SELECT id, title FROM ' . prefixTable('nested_tree') . '
1939
+                        'SELECT id, title FROM '.prefixTable('nested_tree').'
1940 1940
                         WHERE id = %i',
1941 1941
                         $role
1942 1942
                     );
@@ -1949,7 +1949,7 @@  discard block
 block discarded – undo
1949 1949
                 $foldersForbiddenIds = [];
1950 1950
                 foreach (explode(';', $record['groupes_interdits']) as $role) {
1951 1951
                     $tmp = DB::queryfirstrow(
1952
-                        'SELECT id, title FROM ' . prefixTable('nested_tree') . '
1952
+                        'SELECT id, title FROM '.prefixTable('nested_tree').'
1953 1953
                         WHERE id = %i',
1954 1954
                         $role
1955 1955
                     );
@@ -1967,7 +1967,7 @@  discard block
 block discarded – undo
1967 1967
                         'login' => $record['login'],
1968 1968
                         'groups' => implode(', ', $groups),
1969 1969
                         'groupIds' => $groupIds,
1970
-                        'managedBy' => $managedBy=== null ? langHdl('administrator') : $managedBy['title'],
1970
+                        'managedBy' => $managedBy === null ? langHdl('administrator') : $managedBy['title'],
1971 1971
                         'managedById' => $managedBy === null ? 0 : $managedBy['id'],
1972 1972
                         'foldersAllowed' => implode(', ', $foldersAllowed),
1973 1973
                         'foldersAllowedIds' => $foldersAllowedIds,
@@ -2023,7 +2023,7 @@  discard block
 block discarded – undo
2023 2023
 
2024 2024
             // decrypt and retreive data in JSON format
2025 2025
             $dataReceived = prepareExchangedData(
2026
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
2026
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
2027 2027
 
2028 2028
             $post_source_id = filter_var(htmlspecialchars_decode($dataReceived['source_id']), FILTER_SANITIZE_NUMBER_INT);
2029 2029
             $post_destination_ids = filter_var_array($dataReceived['destination_ids'], FILTER_SANITIZE_NUMBER_INT);
@@ -2049,7 +2049,7 @@  discard block
 block discarded – undo
2049 2049
 
2050 2050
             // Get info about user
2051 2051
             $data_user = DB::queryfirstrow(
2052
-                'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
2052
+                'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
2053 2053
                 WHERE id = %i',
2054 2054
                 $post_source_id
2055 2055
             );
@@ -2205,7 +2205,7 @@  discard block
 block discarded – undo
2205 2205
 
2206 2206
             // decrypt and retrieve data in JSON format
2207 2207
             $dataReceived = prepareExchangedData(
2208
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
2208
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
2209 2209
 
2210 2210
             // prepare variables
2211 2211
             $post_user_id = filter_var($dataReceived['user_id'], FILTER_SANITIZE_NUMBER_INT);
@@ -2217,14 +2217,14 @@  discard block
 block discarded – undo
2217 2217
             if (empty($post_context) === false && $post_context === 'add_one_role_to_user') {
2218 2218
                 $data_user = DB::queryfirstrow(
2219 2219
                     'SELECT fonction_id
2220
-                    FROM ' . prefixTable('users') . '
2220
+                    FROM ' . prefixTable('users').'
2221 2221
                     WHERE id = %i',
2222 2222
                     $post_user_id
2223 2223
                 );
2224 2224
 
2225 2225
                 if ($data_user) {
2226 2226
                     // Ensure array is unique
2227
-                    $post_new_value = str_replace(',', ';', $data_user['fonction_id']) . ';' . $post_new_value;
2227
+                    $post_new_value = str_replace(',', ';', $data_user['fonction_id']).';'.$post_new_value;
2228 2228
                     $post_new_value = implode(';', array_unique(explode(';', $post_new_value)));
2229 2229
                 } else {
2230 2230
                     // User not found
@@ -2282,7 +2282,7 @@  discard block
 block discarded – undo
2282 2282
             if (filter_input(INPUT_POST, 'step', FILTER_SANITIZE_STRING) === 'refresh') {
2283 2283
                 $record = DB::queryFirstRow(
2284 2284
                     'SELECT user_ip_lastdate
2285
-                    FROM ' . prefixTable('users') . '
2285
+                    FROM ' . prefixTable('users').'
2286 2286
                     WHERE id = %i',
2287 2287
                     $_SESSION['user_id']
2288 2288
                 );
@@ -2378,39 +2378,39 @@  discard block
 block discarded – undo
2378 2378
             ];
2379 2379
 
2380 2380
             // Load expected libraries
2381
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php';
2382
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Arr.php';
2383
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Symfony/contracts/Translation/TranslatorInterface.php';
2384
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonTimeZone.php';
2385
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Units.php';
2386
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Week.php';
2387
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Timestamp.php';
2388
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Test.php';
2389
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/ObjectInitialisation.php';
2390
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Serialization.php';
2391
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/IntervalRounding.php';
2392
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Rounding.php';
2393
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Localization.php';
2394
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Options.php';
2395
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Cast.php';
2396
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mutability.php';
2397
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Modifiers.php';
2398
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mixin.php';
2399
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Macro.php';
2400
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Difference.php';
2401
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Creator.php';
2402
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Converter.php';
2403
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Comparison.php';
2404
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Boundaries.php';
2405
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Date.php';
2406
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonInterface.php';
2407
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Carbon.php';
2408
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/DetectsErrors.php';
2409
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Connection.php';
2410
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapInterface.php';
2411
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapBase.php';
2412
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/HandlesConnection.php';
2413
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Ldap.php';
2381
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php';
2382
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Arr.php';
2383
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Symfony/contracts/Translation/TranslatorInterface.php';
2384
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonTimeZone.php';
2385
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Units.php';
2386
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Week.php';
2387
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Timestamp.php';
2388
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Test.php';
2389
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/ObjectInitialisation.php';
2390
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Serialization.php';
2391
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/IntervalRounding.php';
2392
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Rounding.php';
2393
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Localization.php';
2394
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Options.php';
2395
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Cast.php';
2396
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mutability.php';
2397
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Modifiers.php';
2398
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mixin.php';
2399
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Macro.php';
2400
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Difference.php';
2401
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Creator.php';
2402
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Converter.php';
2403
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Comparison.php';
2404
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Boundaries.php';
2405
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Date.php';
2406
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonInterface.php';
2407
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Carbon.php';
2408
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/DetectsErrors.php';
2409
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Connection.php';
2410
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapInterface.php';
2411
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapBase.php';
2412
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/HandlesConnection.php';
2413
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Ldap.php';
2414 2414
 
2415 2415
             $ad = new SplClassLoader('LdapRecord', '../includes/libraries');
2416 2416
             $ad->register();
@@ -2427,7 +2427,7 @@  discard block
 block discarded – undo
2427 2427
     $SETTINGS['cpassman_dir'],
2428 2428
                     array(
2429 2429
                         'error' => true,
2430
-                        'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage(). "<br>".$error->getDiagnosticMessage(),
2430
+                        'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage()."<br>".$error->getDiagnosticMessage(),
2431 2431
                     ),
2432 2432
                     'encode'
2433 2433
                 );
@@ -2458,12 +2458,12 @@  discard block
 block discarded – undo
2458 2458
                 ['objectclass', '=', 'posixaccount'],
2459 2459
             ], null, null, 'or')->get();
2460 2460
             
2461
-            foreach($users as $i => $adUser) {
2461
+            foreach ($users as $i => $adUser) {
2462 2462
                 if (isset($adUser[$SETTINGS['ldap_user_attribute']]) === false) continue;
2463 2463
                 
2464 2464
                 // Build the list of all groups in AD
2465 2465
                 if (isset($adUser['memberof']) === true) {
2466
-                    foreach($adUser['memberof'] as $j => $adUserGroup) {
2466
+                    foreach ($adUser['memberof'] as $j => $adUserGroup) {
2467 2467
                         if (empty($adUserGroup) === false && $j !== "count") {
2468 2468
                             $adGroup = substr($adUserGroup, 3, strpos($adUserGroup, ',') - 3);
2469 2469
                             if (in_array($adGroup, $adRoles) === false && empty($adGroup) === false) {
@@ -2479,7 +2479,7 @@  discard block
 block discarded – undo
2479 2479
                     // Get his ID
2480 2480
                     DB::queryfirstrow(
2481 2481
                         'SELECT id, fonction_id, auth_type
2482
-                        FROM ' . prefixTable('users') . '
2482
+                        FROM ' . prefixTable('users').'
2483 2483
                         WHERE login = %s',
2484 2484
                         $userLogin
2485 2485
                     );
@@ -2514,7 +2514,7 @@  discard block
 block discarded – undo
2514 2514
             }
2515 2515
 
2516 2516
             // Get all groups in Teampass
2517
-            $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title'));
2517
+            $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title'));
2518 2518
             foreach ($rows as $record) {
2519 2519
                 array_push(
2520 2520
                     $teampassRoles,
@@ -2557,7 +2557,7 @@  discard block
 block discarded – undo
2557 2557
 
2558 2558
             // decrypt and retrieve data in JSON format
2559 2559
             $dataReceived = prepareExchangedData(
2560
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
2560
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
2561 2561
 
2562 2562
             // Prepare variables
2563 2563
             $post_login = filter_var($dataReceived['login'], FILTER_SANITIZE_STRING);
@@ -2584,7 +2584,7 @@  discard block
 block discarded – undo
2584 2584
             // Check if user already exists
2585 2585
             $data = DB::query(
2586 2586
                 'SELECT id, fonction_id, groupes_interdits, groupes_visibles
2587
-                FROM ' . prefixTable('users') . '
2587
+                FROM ' . prefixTable('users').'
2588 2588
                 WHERE login = %s',
2589 2589
                 $post_login
2590 2590
             );
@@ -2691,7 +2691,7 @@  discard block
 block discarded – undo
2691 2691
                 );
2692 2692
 
2693 2693
                 // Rebuild tree
2694
-                $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries');
2694
+                $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries');
2695 2695
                 $tree->register();
2696 2696
                 $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
2697 2697
                 $tree->rebuild();
@@ -2743,7 +2743,7 @@  discard block
 block discarded – undo
2743 2743
 
2744 2744
             // decrypt and retrieve data in JSON format
2745 2745
             $dataReceived = prepareExchangedData(
2746
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
2746
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
2747 2747
 
2748 2748
             // Prepare variables
2749 2749
             $post_id = filter_var($dataReceived['id'], FILTER_SANITIZE_NUMBER_INT);
@@ -2765,7 +2765,7 @@  discard block
 block discarded – undo
2765 2765
             // Check if user already exists
2766 2766
             DB::query(
2767 2767
                 'SELECT id
2768
-                FROM ' . prefixTable('users') . '
2768
+                FROM ' . prefixTable('users').'
2769 2769
                 WHERE id = %i',
2770 2770
                 $post_id
2771 2771
             );
@@ -2822,7 +2822,7 @@  discard block
 block discarded – undo
2822 2822
 
2823 2823
             // decrypt and retrieve data in JSON format
2824 2824
             $dataReceived = prepareExchangedData(
2825
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
2825
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
2826 2826
 
2827 2827
             // Prepare variables
2828 2828
             $post_userid = filter_var($dataReceived['user_id'], FILTER_SANITIZE_NUMBER_INT);
@@ -2846,7 +2846,7 @@  discard block
 block discarded – undo
2846 2846
             // Check if user already exists
2847 2847
             $userInfo = DB::queryfirstrow(
2848 2848
                 'SELECT id, private_key, public_key
2849
-                FROM ' . prefixTable('users') . '
2849
+                FROM ' . prefixTable('users').'
2850 2850
                 WHERE id = %i',
2851 2851
                 $post_userid
2852 2852
             );
@@ -2895,7 +2895,7 @@  discard block
 block discarded – undo
2895 2895
             if (count($_SESSION['personal_folders']) > 0) {
2896 2896
                 DB::query(
2897 2897
                     'SELECT id
2898
-                    FROM ' . prefixTable('items') . '
2898
+                    FROM ' . prefixTable('items').'
2899 2899
                     WHERE id_tree IN %ls',
2900 2900
                     $_SESSION['personal_folders']
2901 2901
                 );
@@ -2955,7 +2955,7 @@  discard block
 block discarded – undo
2955 2955
 
2956 2956
             // decrypt and retrieve data in JSON format
2957 2957
             $dataReceived = prepareExchangedData(
2958
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
2958
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
2959 2959
 
2960 2960
             // Prepare variables
2961 2961
             $post_id = filter_var($dataReceived['user_id'], FILTER_SANITIZE_NUMBER_INT);
@@ -2977,7 +2977,7 @@  discard block
 block discarded – undo
2977 2977
             // Check if user already exists
2978 2978
             DB::query(
2979 2979
                 'SELECT id
2980
-                FROM ' . prefixTable('users') . '
2980
+                FROM ' . prefixTable('users').'
2981 2981
                 WHERE id = %i',
2982 2982
                 $post_id
2983 2983
             );
@@ -3044,7 +3044,7 @@  discard block
 block discarded – undo
3044 3044
 
3045 3045
             // decrypt and retrieve data in JSON format
3046 3046
             $dataReceived = prepareExchangedData(
3047
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
3047
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
3048 3048
 
3049 3049
             // Prepare variables
3050 3050
             $post_user_id = filter_var($dataReceived['user_id'], FILTER_SANITIZE_NUMBER_INT);
@@ -3075,7 +3075,7 @@  discard block
 block discarded – undo
3075 3075
 
3076 3076
     // Get info about user
3077 3077
     $data_user = DB::queryfirstrow(
3078
-        'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
3078
+        'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
3079 3079
         WHERE id = %i',
3080 3080
         $value[1]
3081 3081
     );
@@ -3108,7 +3108,7 @@  discard block
 block discarded – undo
3108 3108
             logEvents(
3109 3109
                 $SETTINGS,
3110 3110
                 'user_mngt',
3111
-                'at_user_new_' . $value[0] . ':' . $value[1],
3111
+                'at_user_new_'.$value[0].':'.$value[1],
3112 3112
                 (string) $_SESSION['user_id'],
3113 3113
                 $_SESSION['login'],
3114 3114
                 filter_input(INPUT_POST, 'id', FILTER_SANITIZE_STRING)
@@ -3140,7 +3140,7 @@  discard block
 block discarded – undo
3140 3140
 
3141 3141
     // Get info about user
3142 3142
     $data_user = DB::queryfirstrow(
3143
-        'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
3143
+        'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
3144 3144
         WHERE id = %i',
3145 3145
         $value[1]
3146 3146
     );
Please login to merge, or discard this patch.
sources/find.queries.php 1 patch
Spacing   +47 added lines, -47 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 require_once 'SecureHandler.php';
29 29
 session_name('teampass_session');
30 30
 session_start();
31
-if (! isset($_SESSION['CPM']) || $_SESSION['CPM'] === false || ! isset($_SESSION['key']) || empty($_SESSION['key'])) {
31
+if (!isset($_SESSION['CPM']) || $_SESSION['CPM'] === false || !isset($_SESSION['key']) || empty($_SESSION['key'])) {
32 32
     die('Hacking attempt...');
33 33
 }
34 34
 
@@ -42,17 +42,17 @@  discard block
 block discarded – undo
42 42
 }
43 43
 
44 44
 // Do checks
45
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
46
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
45
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
46
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
47 47
 if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'items', $SETTINGS) === false) {
48 48
     // Not allowed page
49 49
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
50
-    include $SETTINGS['cpassman_dir'] . '/error.php';
50
+    include $SETTINGS['cpassman_dir'].'/error.php';
51 51
     exit;
52 52
 }
53 53
 
54
-require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
55
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
54
+require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
55
+require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
56 56
 header('Content-type: text/html; charset=utf-8');
57 57
 header('Cache-Control: no-cache, must-revalidate');
58 58
 require_once 'main.functions.php';
@@ -60,12 +60,12 @@  discard block
 block discarded – undo
60 60
 if (isset($_SESSION['groupes_visibles']) === false
61 61
     || empty($_SESSION['groupes_visibles']) === true
62 62
 ) {
63
-    echo '{"sEcho": ' . intval($_GET['sEcho']) . ' ,"iTotalRecords": "0", "iTotalDisplayRecords": "0", "aaData": [] }';
63
+    echo '{"sEcho": '.intval($_GET['sEcho']).' ,"iTotalRecords": "0", "iTotalDisplayRecords": "0", "aaData": [] }';
64 64
     exit;
65 65
 }
66 66
 
67 67
 //Connect to DB
68
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
68
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
69 69
 if (defined('DB_PASSWD_CLEAR') === false) {
70 70
     define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
71 71
 }
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
     $folders = $_SESSION['groupes_visibles'];
90 90
 } else {
91 91
     // Build tree
92
-    $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries');
92
+    $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries');
93 93
     $tree->register();
94 94
     $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
95 95
     $folders = $tree->getDescendants(filter_var($_GET['limited'], FILTER_SANITIZE_NUMBER_INT), true);
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
 
99 99
 //Get current user "personal folder" ID
100 100
 $row = DB::query(
101
-    'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE title = %i',
101
+    'SELECT id FROM '.prefixTable('nested_tree').' WHERE title = %i',
102 102
     intval($_SESSION['user_id'])
103 103
 );
104 104
 //get list of personal folders
@@ -107,20 +107,20 @@  discard block
 block discarded – undo
107 107
 $listPf = '';
108 108
 if (empty($row['id']) === false) {
109 109
     $rows = DB::query(
110
-        'SELECT id FROM ' . prefixTable('nested_tree') . '
110
+        'SELECT id FROM '.prefixTable('nested_tree').'
111 111
         WHERE personal_folder = 1 AND NOT parent_id = %i AND NOT title = %i',
112 112
         filter_var($row['id'], FILTER_SANITIZE_NUMBER_INT),
113 113
         filter_var($_SESSION['user_id'], FILTER_SANITIZE_NUMBER_INT)
114 114
     );
115 115
     foreach ($rows as $record) {
116
-        if (! in_array($record['id'], $arrayPf)) {
116
+        if (!in_array($record['id'], $arrayPf)) {
117 117
             //build an array of personal folders ids
118 118
             array_push($arrayPf, $record['id']);
119 119
             //build also a string with those ids
120 120
             if (empty($listPf)) {
121 121
                 $listPf = $record['id'];
122 122
             } else {
123
-                $listPf .= ', ' . $record['id'];
123
+                $listPf .= ', '.$record['id'];
124 124
             }
125 125
         }
126 126
     }
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
 //Paging
131 131
 $sLimit = '';
132 132
 if (isset($_GET['start']) === true && $_GET['length'] !== '-1') {
133
-    $sLimit = 'LIMIT ' . filter_var($_GET['start'], FILTER_SANITIZE_NUMBER_INT) . ', ' . filter_var($_GET['length'], FILTER_SANITIZE_NUMBER_INT) . '';
133
+    $sLimit = 'LIMIT '.filter_var($_GET['start'], FILTER_SANITIZE_NUMBER_INT).', '.filter_var($_GET['length'], FILTER_SANITIZE_NUMBER_INT).'';
134 134
 }
135 135
 
136 136
 //Ordering
@@ -143,8 +143,8 @@  discard block
 block discarded – undo
143 143
     }
144 144
     $sOrder = 'ORDER BY  ';
145 145
     if ($_GET['order'][0]['column'] >= 0) {
146
-        $sOrder .= '' . $aColumns[filter_var($_GET['order'][0]['column'], FILTER_SANITIZE_NUMBER_INT)] . ' '
147
-                . filter_var($_GET['order'][0]['dir'], FILTER_SANITIZE_STRING) . ', ';
146
+        $sOrder .= ''.$aColumns[filter_var($_GET['order'][0]['column'], FILTER_SANITIZE_NUMBER_INT)].' '
147
+                . filter_var($_GET['order'][0]['dir'], FILTER_SANITIZE_STRING).', ';
148 148
     }
149 149
 
150 150
     $sOrder = substr_replace($sOrder, '', -2);
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
         $sOrder = '';
153 153
     }
154 154
 } else {
155
-    $sOrder = 'ORDER BY ' . $aColumns[1] . ' ASC';
155
+    $sOrder = 'ORDER BY '.$aColumns[1].' ASC';
156 156
 }
157 157
 
158 158
 // Define criteria
@@ -174,9 +174,9 @@  discard block
 block discarded – undo
174 174
 if (empty($search_criteria) === false) {
175 175
     $sWhere .= ' AND (';
176 176
     for ($i = 0; $i < count($aColumns); ++$i) {
177
-        $sWhere .= $aColumns[$i] . ' LIKE %ss_' . $i . ' OR ';
177
+        $sWhere .= $aColumns[$i].' LIKE %ss_'.$i.' OR ';
178 178
     }
179
-    $sWhere = substr_replace((string) $sWhere, '', -3) . ') ';
179
+    $sWhere = substr_replace((string) $sWhere, '', -3).') ';
180 180
     $crit = [
181 181
         'idtree' => array_unique($folders),
182 182
         '0' => $search_criteria,
@@ -214,13 +214,13 @@  discard block
 block discarded – undo
214 214
     if (empty($sWhere) === false) {
215 215
         $sWhere .= ' AND ';
216 216
     }
217
-    $sWhere = 'WHERE ' . $sWhere . 'id_tree NOT IN %ls_pf ';
217
+    $sWhere = 'WHERE '.$sWhere.'id_tree NOT IN %ls_pf ';
218 218
 } else {
219
-    $sWhere = 'WHERE ' . $sWhere;
219
+    $sWhere = 'WHERE '.$sWhere;
220 220
 }
221 221
 
222 222
 DB::query(
223
-    'SELECT id FROM ' . prefixTable('cache') . "
223
+    'SELECT id FROM '.prefixTable('cache')."
224 224
     ${sWhere}
225 225
     ${sOrder}",
226 226
     $crit
@@ -228,7 +228,7 @@  discard block
 block discarded – undo
228 228
 $iTotal = DB::count();
229 229
 $rows = DB::query(
230 230
     'SELECT id, label, description, tags, id_tree, perso, restricted_to, login, folder, author, renewal_period, url, timestamp
231
-    FROM ' . prefixTable('cache') . "
231
+    FROM ' . prefixTable('cache')."
232 232
     ${sWhere}
233 233
     ${sOrder}
234 234
     ${sLimit}",
@@ -241,7 +241,7 @@  discard block
 block discarded – undo
241 241
 if (isset($_GET['type']) === false) {
242 242
     $sOutput = '{';
243 243
     if (isset($_GET['draw']) === true) {
244
-        $sOutput .= '"draw": ' . intval($_GET['draw']) . ', ';
244
+        $sOutput .= '"draw": '.intval($_GET['draw']).', ';
245 245
     }
246 246
     $sOutput .= '"data": [';
247 247
     $sOutputConst = '';
@@ -258,7 +258,7 @@  discard block
 block discarded – undo
258 258
             foreach (explode(';', $_SESSION['fonction_id']) as $role) {
259 259
                 //db::debugmode(true);
260 260
                 $access = DB::queryFirstRow(
261
-                    'SELECT type FROM ' . prefixTable('roles_values') . ' WHERE role_id = %i AND folder_id = %i',
261
+                    'SELECT type FROM '.prefixTable('roles_values').' WHERE role_id = %i AND folder_id = %i',
262 262
                     $role,
263 263
                     $record['id_tree']
264 264
                 );
@@ -278,7 +278,7 @@  discard block
 block discarded – undo
278 278
             }
279 279
             $accessLevel = count($arrTmp) > 0 ? min($arrTmp) : $accessLevel;
280 280
             if ($accessLevel === 0) {
281
-                $checkbox = '<input type=\"checkbox\" value=\"0\" class=\"mass_op_cb\" data-id=\"' . $record['id'] . '\">';
281
+                $checkbox = '<input type=\"checkbox\" value=\"0\" class=\"mass_op_cb\" data-id=\"'.$record['id'].'\">';
282 282
             }
283 283
 
284 284
             if ((int) $accessLevel === 0) {
@@ -318,22 +318,22 @@  discard block
 block discarded – undo
318 318
             if (empty($restrictedTo)) {
319 319
                 $restrictedTo = $_SESSION['user_id'];
320 320
             } else {
321
-                $restrictedTo .= ',' . $_SESSION['user_id'];
321
+                $restrictedTo .= ','.$_SESSION['user_id'];
322 322
             }
323 323
         }
324 324
 
325 325
         //col1
326
-        $sOutputItem .= '"<i class=\"fa fa-external-link-alt infotip mr-2\" title=\"' . langHdl('open_url_link') . '\" onClick=\"window.location.href=&#039;index.php?page=items&amp;group=' . $record['id_tree'] . '&amp;id=' . $record['id'] . '&#039;\" style=\"cursor:pointer;\"></i>' .
327
-            '<i class=\"fa fa-eye infotip mr-2 item-detail\" title=\"' . langHdl('see_item_title') . '\" data-id=\"' . $record['id'] . '\" data-perso=\"' . $record['perso'] . '\" data-tree-id=\"' . $record['id_tree'] . '\" data-expired=\"' . $expired . '\" data-restricted-to=\"' . $restrictedTo . '\" data-rights=\"' . $right . '\" style=\"cursor:pointer;\"></i>' . $checkbox . '", ';
326
+        $sOutputItem .= '"<i class=\"fa fa-external-link-alt infotip mr-2\" title=\"'.langHdl('open_url_link').'\" onClick=\"window.location.href=&#039;index.php?page=items&amp;group='.$record['id_tree'].'&amp;id='.$record['id'].'&#039;\" style=\"cursor:pointer;\"></i>'.
327
+            '<i class=\"fa fa-eye infotip mr-2 item-detail\" title=\"'.langHdl('see_item_title').'\" data-id=\"'.$record['id'].'\" data-perso=\"'.$record['perso'].'\" data-tree-id=\"'.$record['id_tree'].'\" data-expired=\"'.$expired.'\" data-restricted-to=\"'.$restrictedTo.'\" data-rights=\"'.$right.'\" style=\"cursor:pointer;\"></i>'.$checkbox.'", ';
328 328
         //col2
329
-        $sOutputItem .= '"<span id=\"item_label-' . $record['id'] . '\">' . stripslashes($record['label']) . '</span>", ';
329
+        $sOutputItem .= '"<span id=\"item_label-'.$record['id'].'\">'.stripslashes($record['label']).'</span>", ';
330 330
         //col3
331
-        $sOutputItem .= '"' . str_replace('&amp;', '&', htmlspecialchars(stripslashes($record['login']), ENT_QUOTES)) . '", ';
331
+        $sOutputItem .= '"'.str_replace('&amp;', '&', htmlspecialchars(stripslashes($record['login']), ENT_QUOTES)).'", ';
332 332
         //col4
333 333
         //get restriction from ROles
334 334
         $restrictedToRole = false;
335 335
         $rTmp = DB::queryFirstColumn(
336
-            'SELECT role_id FROM ' . prefixTable('restriction_to_roles') . ' WHERE item_id = %i',
336
+            'SELECT role_id FROM '.prefixTable('restriction_to_roles').' WHERE item_id = %i',
337 337
             $record['id']
338 338
         );
339 339
         // We considere here that if user has at least one group similar to the object ones
@@ -351,14 +351,14 @@  discard block
 block discarded – undo
351 351
         } else {
352 352
             $txt = str_replace(['\n', '<br />', '\\'], [' ', ' ', '', ' '], strip_tags($record['description']));
353 353
             if (strlen($txt) > 50) {
354
-                $sOutputItem .= '"' . substr(stripslashes(preg_replace('~/<[\/]{0,1}[^>]*>\//|[ \t]/~', '', $txt)), 0, 50) . '", ';
354
+                $sOutputItem .= '"'.substr(stripslashes(preg_replace('~/<[\/]{0,1}[^>]*>\//|[ \t]/~', '', $txt)), 0, 50).'", ';
355 355
             } else {
356
-                $sOutputItem .= '"' . stripslashes(preg_replace('~/<[^>]*>|[ \t]/~', '', $txt)) . '", ';
356
+                $sOutputItem .= '"'.stripslashes(preg_replace('~/<[^>]*>|[ \t]/~', '', $txt)).'", ';
357 357
             }
358 358
         }
359 359
 
360 360
         //col5 - TAGS
361
-        $sOutputItem .= '"' . htmlspecialchars(stripslashes($record['tags']), ENT_QUOTES) . '", ';
361
+        $sOutputItem .= '"'.htmlspecialchars(stripslashes($record['tags']), ENT_QUOTES).'", ';
362 362
         // col6 - URL
363 363
         if ($record['url'] !== '0') {
364 364
             $sOutputItem .= '"'.filter_var($record['url'], FILTER_SANITIZE_URL).'", ';
@@ -367,7 +367,7 @@  discard block
 block discarded – undo
367 367
         }
368 368
 
369 369
         //col7 - Prepare the Treegrid
370
-        $sOutputItem .= '"' . htmlspecialchars(stripslashes($record['folder']), ENT_QUOTES) . '"';
370
+        $sOutputItem .= '"'.htmlspecialchars(stripslashes($record['folder']), ENT_QUOTES).'"';
371 371
         //Finish the line
372 372
         $sOutputItem .= '], ';
373 373
         if ($getItemInList === true) {
@@ -376,16 +376,16 @@  discard block
 block discarded – undo
376 376
             --$iTotal;
377 377
         }
378 378
     }
379
-    if (! empty($sOutputConst)) {
379
+    if (!empty($sOutputConst)) {
380 380
         $sOutput .= substr_replace($sOutputConst, '', -2);
381 381
     }
382 382
     $sOutput .= '], ';
383
-    $sOutput .= '"recordsTotal": ' . $iTotal . ', ';
384
-    $sOutput .= '"recordsFiltered": ' . $iTotal . ' }';
383
+    $sOutput .= '"recordsTotal": '.$iTotal.', ';
384
+    $sOutput .= '"recordsFiltered": '.$iTotal.' }';
385 385
     echo $sOutput;
386 386
 } elseif (isset($_GET['type']) && ($_GET['type'] === 'search_for_items' || $_GET['type'] === 'search_for_items_with_tags')) {
387 387
     include_once 'main.functions.php';
388
-    include_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
388
+    include_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
389 389
     
390 390
     $arr_data = [];
391 391
     foreach ($rows as $record) {
@@ -405,7 +405,7 @@  discard block
 block discarded – undo
405 405
 
406 406
         // Anyone can modify?
407 407
         $tmp = DB::queryfirstrow(
408
-            'SELECT anyone_can_modify FROM ' . prefixTable('items') . ' WHERE id = %i',
408
+            'SELECT anyone_can_modify FROM '.prefixTable('items').' WHERE id = %i',
409 409
             $record['id']
410 410
         );
411 411
         if (count($tmp) > 0) {
@@ -436,7 +436,7 @@  discard block
 block discarded – undo
436 436
         // => récupérer un tableau contenant les roles associés à cet ID (a partir table restriction_to_roles)
437 437
         $user_is_included_in_role = 0;
438 438
         $roles = DB::query(
439
-            'SELECT role_id FROM ' . prefixTable('restriction_to_roles') . ' WHERE item_id=%i',
439
+            'SELECT role_id FROM '.prefixTable('restriction_to_roles').' WHERE item_id=%i',
440 440
             $record['id']
441 441
         );
442 442
         if (count($roles) > 0) {
@@ -459,7 +459,7 @@  discard block
 block discarded – undo
459 459
             if (empty($restrictedTo)) {
460 460
                 $restrictedTo = $_SESSION['user_id'];
461 461
             } else {
462
-                $restrictedTo .= ',' . $_SESSION['user_id'];
462
+                $restrictedTo .= ','.$_SESSION['user_id'];
463 463
             }
464 464
         }
465 465
 
@@ -557,7 +557,7 @@  discard block
 block discarded – undo
557 557
             $arrTmp = [];
558 558
             foreach (explode(';', $_SESSION['fonction_id']) as $role) {
559 559
                 $access = DB::queryFirstRow(
560
-                    'SELECT type FROM ' . prefixTable('roles_values') . ' WHERE role_id = %i AND folder_id = %i',
560
+                    'SELECT type FROM '.prefixTable('roles_values').' WHERE role_id = %i AND folder_id = %i',
561 561
                     $role,
562 562
                     $record['id_tree']
563 563
                 );
@@ -606,8 +606,8 @@  discard block
 block discarded – undo
606 606
         ) {
607 607
             $data_item = DB::queryFirstRow(
608 608
                 'SELECT i.pw AS pw, s.share_key AS share_key
609
-                FROM ' . prefixTable('items') . ' AS i
610
-                INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (s.object_id = i.id)
609
+                FROM ' . prefixTable('items').' AS i
610
+                INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (s.object_id = i.id)
611 611
                 WHERE i.id = %i AND s.user_id = %i',
612 612
                 $record['id'],
613 613
                 $_SESSION['user_id']
@@ -653,5 +653,5 @@  discard block
 block discarded – undo
653 653
         'start' => (int) (isset($_GET['start']) === true && (int) $_GET['length'] !== -1) ? (int) $_GET['start'] + (int) $_GET['length'] : -1,
654 654
     ];
655 655
     echo prepareExchangedData(
656
-    $SETTINGS['cpassman_dir'],$returnValues, 'encode');
656
+    $SETTINGS['cpassman_dir'], $returnValues, 'encode');
657 657
 }
Please login to merge, or discard this patch.
sources/fields.queries.php 1 patch
Spacing   +7 added lines, -8 removed lines patch added patch discarded remove patch
@@ -256,7 +256,7 @@  discard block
 block discarded – undo
256 256
 
257 257
             // Decrypt and retrieve data in JSON format
258 258
             $dataReceived = prepareExchangedData(
259
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
259
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
260 260
 
261 261
             // Prepare variables
262 262
             $post_label = filter_var($dataReceived['label'], FILTER_SANITIZE_STRING);
@@ -334,7 +334,7 @@  discard block
 block discarded – undo
334 334
 
335 335
             // Decrypt and retrieve data in JSON format
336 336
             $dataReceived = prepareExchangedData(
337
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
337
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
338 338
 
339 339
             // Prepare variables
340 340
             $post_label = filter_var($dataReceived['label'], FILTER_SANITIZE_STRING);
@@ -409,7 +409,7 @@  discard block
 block discarded – undo
409 409
 
410 410
             // Decrypt and retrieve data in JSON format
411 411
             $dataReceived = prepareExchangedData(
412
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
412
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
413 413
 
414 414
             // Prepare variables
415 415
             $post_idToRemove = filter_var($dataReceived['idToRemove'], FILTER_SANITIZE_NUMBER_INT);
@@ -506,7 +506,7 @@  discard block
 block discarded – undo
506 506
 
507 507
             // Decrypt and retrieve data in JSON format
508 508
             $dataReceived = prepareExchangedData(
509
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
509
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
510 510
 
511 511
             // Prepare variables
512 512
             $post_label = filter_var($dataReceived['label'], FILTER_SANITIZE_STRING);
@@ -517,8 +517,7 @@  discard block
 block discarded – undo
517 517
             $post_masked = filter_var($dataReceived['masked'], FILTER_SANITIZE_STRING);
518 518
             $post_encrypted = filter_var($dataReceived['encrypted'], FILTER_SANITIZE_STRING);
519 519
             $post_roles = filter_var_array($dataReceived['roles'], FILTER_SANITIZE_STRING);
520
-            $post_fieldId = isset($dataReceived['fieldId']) === false ? '' :
521
-                filter_var($dataReceived['fieldId'], FILTER_SANITIZE_NUMBER_INT);
520
+            $post_fieldId = isset($dataReceived['fieldId']) === false ? '' : filter_var($dataReceived['fieldId'], FILTER_SANITIZE_NUMBER_INT);
522 521
 
523 522
             if (empty($post_fieldId) === false) {
524 523
                 // UPDATE FIELD
@@ -533,7 +532,7 @@  discard block
 block discarded – undo
533 532
                         'encrypted_data' => $post_encrypted,
534 533
                         'is_mandatory' => $post_mandatory,
535 534
                         'masked' => $post_masked,
536
-                        'role_visibility' => is_null($post_roles) === true || count($post_roles) ===0 ? '' : implode(',', $post_roles),
535
+                        'role_visibility' => is_null($post_roles) === true || count($post_roles) === 0 ? '' : implode(',', $post_roles),
537 536
                         'order' => calculateOrder($post_fieldId, $post_order),
538 537
                     ),
539 538
                     'id = %i',
@@ -632,7 +631,7 @@  discard block
 block discarded – undo
632 631
 
633 632
             // Decrypt and retrieve data in JSON format
634 633
             $dataReceived = prepareExchangedData(
635
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
634
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
636 635
 
637 636
             // Prepare variables
638 637
             $post_label = filter_var($dataReceived['label'], FILTER_SANITIZE_STRING);
Please login to merge, or discard this patch.
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);
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
             $pwdlib = new PasswordLib\PasswordLib();
226 226
             // generate key
227 227
             $key = $pwdlib->getRandomToken(filter_input(INPUT_POST, 'size', FILTER_SANITIZE_NUMBER_INT));
228
-            echo '[{"key" : "' . htmlentities($key, ENT_QUOTES) . '"}]';
228
+            echo '[{"key" : "'.htmlentities($key, ENT_QUOTES).'"}]';
229 229
             break;
230 230
 
231 231
         /*
@@ -254,7 +254,7 @@  discard block
 block discarded – undo
254 254
                 )
255 255
             );
256 256
 
257
-            echo '[{"token" : "' . $token . '"}]';
257
+            echo '[{"token" : "'.$token.'"}]';
258 258
             break;
259 259
 
260 260
 
@@ -319,7 +319,7 @@  discard block
 block discarded – undo
319 319
         case 'get_teampass_settings':
320 320
             // Encrypt data to return
321 321
             echo prepareExchangedData(
322
-    $SETTINGS['cpassman_dir'],$SETTINGS, 'encode');
322
+    $SETTINGS['cpassman_dir'], $SETTINGS, 'encode');
323 323
 
324 324
             break;
325 325
 
@@ -504,7 +504,7 @@  discard block
 block discarded – undo
504 504
     // get number of items
505 505
     DB::queryFirstRow(
506 506
         'SELECT increment_id
507
-        FROM ' . prefixTable('sharekeys_items') .
507
+        FROM ' . prefixTable('sharekeys_items').
508 508
         ' WHERE user_id = %i',
509 509
         $userId
510 510
     );
@@ -560,7 +560,7 @@  discard block
 block discarded – undo
560 560
         // check if expected security level is reached
561 561
         $dataUser = DB::queryfirstrow(
562 562
             'SELECT *
563
-            FROM ' . prefixTable('users') . ' WHERE id = %i',
563
+            FROM ' . prefixTable('users').' WHERE id = %i',
564 564
             $post_user_id
565 565
         );
566 566
 
@@ -581,8 +581,8 @@  discard block
 block discarded – undo
581 581
         if (empty($dataUser['fonction_id']) === false) {
582 582
             $data = DB::queryFirstRow(
583 583
                 'SELECT complexity
584
-                FROM ' . prefixTable('roles_title') . '
585
-                WHERE id IN (' . $dataUser['fonction_id'] . ')
584
+                FROM ' . prefixTable('roles_title').'
585
+                WHERE id IN (' . $dataUser['fonction_id'].')
586 586
                 ORDER BY complexity DESC'
587 587
             );
588 588
         } else {
@@ -596,8 +596,8 @@  discard block
 block discarded – undo
596 596
     $SETTINGS['cpassman_dir'],
597 597
                 array(
598 598
                     'error' => true,
599
-                    'message' => '<div style="margin:10px 0 10px 15px;">' . langHdl('complexity_level_not_reached') . '.<br>' .
600
-                        langHdl('expected_complexity_level') . ': <b>' . TP_PW_COMPLEXITY[$data['complexity']][1] . '</b></div>',
599
+                    'message' => '<div style="margin:10px 0 10px 15px;">'.langHdl('complexity_level_not_reached').'.<br>'.
600
+                        langHdl('expected_complexity_level').': <b>'.TP_PW_COMPLEXITY[$data['complexity']][1].'</b></div>',
601 601
                 ),
602 602
                 'encode'
603 603
             );
@@ -703,14 +703,14 @@  discard block
 block discarded – undo
703 703
         // Get data about user
704 704
         $data = DB::queryfirstrow(
705 705
             'SELECT id, email, pw
706
-            FROM ' . prefixTable('users') . '
706
+            FROM ' . prefixTable('users').'
707 707
             WHERE login = %s',
708 708
             $post_login
709 709
         );
710 710
     } else {
711 711
         $data = DB::queryfirstrow(
712 712
             'SELECT id, login, email, pw
713
-            FROM ' . prefixTable('users') . '
713
+            FROM ' . prefixTable('users').'
714 714
             WHERE id = %i',
715 715
             $post_id
716 716
         );
@@ -720,7 +720,7 @@  discard block
 block discarded – undo
720 720
     $counter = DB::count();
721 721
 
722 722
     // load passwordLib library
723
-    $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'] . '/includes/libraries');
723
+    $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'].'/includes/libraries');
724 724
     $pwdlib->register();
725 725
     $pwdlib = new PasswordLib\PasswordLib();
726 726
 
@@ -770,7 +770,7 @@  discard block
 block discarded – undo
770 770
     }
771 771
     
772 772
     // generate new GA user code
773
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php';
773
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php';
774 774
     $tfa = new Authentication\TwoFactorAuth\TwoFactorAuth($SETTINGS['ga_website_name']);
775 775
     $gaSecretKey = $tfa->createSecret();
776 776
     $gaTemporaryCode = GenerateCryptKey(12, false, true, true, false, true, $SETTINGS);
@@ -810,7 +810,7 @@  discard block
 block discarded – undo
810 810
                 'email' => $data['email'],
811 811
                 'email_result' => str_replace(
812 812
                     '#email#',
813
-                    '<b>' . obfuscateEmail($data['email']) . '</b>',
813
+                    '<b>'.obfuscateEmail($data['email']).'</b>',
814 814
                     addslashes(langHdl('admin_email_result_ok'))
815 815
                 ),
816 816
             ),
@@ -827,7 +827,7 @@  discard block
 block discarded – undo
827 827
             'email' => $data['email'],
828 828
             'email_result' => str_replace(
829 829
                 '#email#',
830
-                '<b>' . obfuscateEmail($data['email']) . '</b>',
830
+                '<b>'.obfuscateEmail($data['email']).'</b>',
831 831
                 addslashes(langHdl('admin_email_result_ok'))
832 832
             ),
833 833
         ),
@@ -843,7 +843,7 @@  discard block
 block discarded – undo
843 843
         && (int) $SETTINGS['enable_send_email_on_user_login'] === 1
844 844
     ) {
845 845
         $row = DB::queryFirstRow(
846
-            'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s',
846
+            'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s',
847 847
             'cron',
848 848
             'sending_emails'
849 849
         );
@@ -851,7 +851,7 @@  discard block
 block discarded – undo
851 851
         if ((int) (time() - $row['valeur']) >= 300 || (int) $row['valeur'] === 0) {
852 852
             $rows = DB::query(
853 853
                 'SELECT *
854
-                FROM ' . prefixTable('emails') .
854
+                FROM ' . prefixTable('emails').
855 855
                 ' WHERE status != %s',
856 856
                 'sent'
857 857
             );
@@ -957,8 +957,8 @@  discard block
 block discarded – undo
957 957
     $arr_html = array();
958 958
     $rows = DB::query(
959 959
         '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
960
-        FROM ' . prefixTable('log_items') . ' AS l
961
-        RIGHT JOIN ' . prefixTable('items') . ' AS i ON (l.id_item = i.id)
960
+        FROM ' . prefixTable('log_items').' AS l
961
+        RIGHT JOIN ' . prefixTable('items').' AS i ON (l.id_item = i.id)
962 962
         WHERE l.action = %s AND l.id_user = %i
963 963
         ORDER BY l.date DESC
964 964
         LIMIT 0, 100',
@@ -991,7 +991,7 @@  discard block
 block discarded – undo
991 991
         isset($SETTINGS['enable_suggestion']) === true && (int) $SETTINGS['enable_suggestion'] === 1
992 992
         && ((int) $_SESSION['user_admin'] === 1 || (int) $_SESSION['user_manager'] === 1)
993 993
     ) {
994
-        DB::query('SELECT * FROM ' . prefixTable('suggestion'));
994
+        DB::query('SELECT * FROM '.prefixTable('suggestion'));
995 995
         $nb_suggestions_waiting = DB::count();
996 996
     }
997 997
 
@@ -1027,13 +1027,13 @@  discard block
 block discarded – undo
1027 1027
             if ($data === 'stat_languages') {
1028 1028
                 $tmp = '';
1029 1029
                 foreach ($stats_data[$data] as $key => $value) {
1030
-                    $tmp .= $tmp === '' ? $key . '-' . $value : ',' . $key . '-' . $value;
1030
+                    $tmp .= $tmp === '' ? $key.'-'.$value : ','.$key.'-'.$value;
1031 1031
                 }
1032 1032
                 $statsToSend[$data] = $tmp;
1033 1033
             } elseif ($data === 'stat_country') {
1034 1034
                 $tmp = '';
1035 1035
                 foreach ($stats_data[$data] as $key => $value) {
1036
-                    $tmp .= $tmp === '' ? $key . '-' . $value : ',' . $key . '-' . $value;
1036
+                    $tmp .= $tmp === '' ? $key.'-'.$value : ','.$key.'-'.$value;
1037 1037
                 }
1038 1038
                 $statsToSend[$data] = $tmp;
1039 1039
             } else {
@@ -1107,8 +1107,8 @@  discard block
 block discarded – undo
1107 1107
             if (strpos($line, 'cpassman_url') > 0 && empty($url_found) === true) {
1108 1108
                 $url_found = substr($line, 19, strlen($line) - 22);
1109 1109
                 $tmp = parse_url($url_found);
1110
-                $anonym_url = $tmp['scheme'] . '://<anonym_url>' . $tmp['path'];
1111
-                $line = "'cpassman_url' => '" . $anonym_url . "\n";
1110
+                $anonym_url = $tmp['scheme'].'://<anonym_url>'.$tmp['path'];
1111
+                $line = "'cpassman_url' => '".$anonym_url."\n";
1112 1112
             }
1113 1113
 
1114 1114
             // Anonymize all urls
@@ -1135,7 +1135,7 @@  discard block
 block discarded – undo
1135 1135
     $teampass_errors = '';
1136 1136
     $rows = DB::query(
1137 1137
         'SELECT label, date AS error_date
1138
-        FROM ' . prefixTable('log_system') . "
1138
+        FROM ' . prefixTable('log_system')."
1139 1139
         WHERE `type` LIKE 'error'
1140 1140
         ORDER BY `date` DESC
1141 1141
         LIMIT 0, 10"
@@ -1143,9 +1143,9 @@  discard block
 block discarded – undo
1143 1143
     if (DB::count() > 0) {
1144 1144
         foreach ($rows as $record) {
1145 1145
             if (empty($teampass_errors) === true) {
1146
-                $teampass_errors = ' * ' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['error_date']) . ' - ' . $record['label'];
1146
+                $teampass_errors = ' * '.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['error_date']).' - '.$record['label'];
1147 1147
             } else {
1148
-                $teampass_errors .= ' * ' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['error_date']) . ' - ' . $record['label'];
1148
+                $teampass_errors .= ' * '.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['error_date']).' - '.$record['label'];
1149 1149
             }
1150 1150
         }
1151 1151
     }
@@ -1154,7 +1154,7 @@  discard block
 block discarded – undo
1154 1154
 
1155 1155
     // Now prepare text
1156 1156
     $txt = '### Page on which it happened
1157
-' . $post_data['current_page'] . '
1157
+' . $post_data['current_page'].'
1158 1158
 
1159 1159
 ### Steps to reproduce
1160 1160
 1.
@@ -1169,39 +1169,39 @@  discard block
 block discarded – undo
1169 1169
 Tell us what happens instead
1170 1170
 
1171 1171
 ### Server configuration
1172
-**Operating system**: ' . php_uname() . '
1172
+**Operating system**: ' . php_uname().'
1173 1173
 
1174
-**Web server:** ' . $_SERVER['SERVER_SOFTWARE'] . '
1174
+**Web server:** ' . $_SERVER['SERVER_SOFTWARE'].'
1175 1175
 
1176
-**Database:** ' . ($link === false ? langHdl('undefined') : mysqli_get_server_info($link)) . '
1176
+**Database:** ' . ($link === false ? langHdl('undefined') : mysqli_get_server_info($link)).'
1177 1177
 
1178
-**PHP version:** ' . PHP_VERSION . '
1178
+**PHP version:** ' . PHP_VERSION.'
1179 1179
 
1180
-**Teampass version:** ' . TP_VERSION_FULL . '
1180
+**Teampass version:** ' . TP_VERSION_FULL.'
1181 1181
 
1182 1182
 **Teampass configuration file:**
1183 1183
 ```
1184
-' . $list_of_options . '
1184
+' . $list_of_options.'
1185 1185
 ```
1186 1186
 
1187 1187
 **Updated from an older Teampass or fresh install:**
1188 1188
 
1189 1189
 ### Client configuration
1190 1190
 
1191
-**Browser:** ' . $post_data['browser_name'] . ' - ' . $post_data['browser_version'] . '
1191
+**Browser:** ' . $post_data['browser_name'].' - '.$post_data['browser_version'].'
1192 1192
 
1193
-**Operating system:** ' . $post_data['os'] . ' - ' . $post_data['os_archi'] . 'bits
1193
+**Operating system:** ' . $post_data['os'].' - '.$post_data['os_archi'].'bits
1194 1194
 
1195 1195
 ### Logs
1196 1196
 
1197 1197
 #### Web server error log
1198 1198
 ```
1199
-' . $err['message'] . ' - ' . $err['file'] . ' (' . $err['line'] . ')
1199
+' . $err['message'].' - '.$err['file'].' ('.$err['line'].')
1200 1200
 ```
1201 1201
 
1202 1202
 #### Teampass 10 last system errors
1203 1203
 ```
1204
-' . $teampass_errors . '
1204
+' . $teampass_errors.'
1205 1205
 ```
1206 1206
 
1207 1207
 #### Log from the web-browser developer console (CTRL + SHIFT + i)
@@ -1230,7 +1230,7 @@  discard block
 block discarded – undo
1230 1230
         // Check if user exists
1231 1231
         $userInfo = DB::queryFirstRow(
1232 1232
             'SELECT public_key, private_key, pw, auth_type
1233
-            FROM ' . prefixTable('users') . '
1233
+            FROM ' . prefixTable('users').'
1234 1234
             WHERE id = %i',
1235 1235
             $post_user_id
1236 1236
         );
@@ -1238,7 +1238,7 @@  discard block
 block discarded – undo
1238 1238
             // Get one item
1239 1239
             $record = DB::queryFirstRow(
1240 1240
                 'SELECT object_id
1241
-                FROM ' . prefixTable('sharekeys_items') . '
1241
+                FROM ' . prefixTable('sharekeys_items').'
1242 1242
                 WHERE user_id = %i',
1243 1243
                 $post_user_id
1244 1244
             );
@@ -1246,7 +1246,7 @@  discard block
 block discarded – undo
1246 1246
             // Get itemKey from current user
1247 1247
             $currentUserKey = DB::queryFirstRow(
1248 1248
                 'SELECT share_key, increment_id
1249
-                FROM ' . prefixTable('sharekeys_items') . '
1249
+                FROM ' . prefixTable('sharekeys_items').'
1250 1250
                 WHERE object_id = %i AND user_id = %i',
1251 1251
                 $record['object_id'],
1252 1252
                 $post_user_id
@@ -1274,7 +1274,7 @@  discard block
 block discarded – undo
1274 1274
             
1275 1275
             // Use the password check
1276 1276
             // load passwordLib library
1277
-            $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'] . '/includes/libraries');
1277
+            $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'].'/includes/libraries');
1278 1278
             $pwdlib->register();
1279 1279
             $pwdlib = new PasswordLib\PasswordLib();
1280 1280
             
@@ -1333,7 +1333,7 @@  discard block
 block discarded – undo
1333 1333
         // Get user info
1334 1334
         $userData = DB::queryFirstRow(
1335 1335
             'SELECT private_key
1336
-            FROM ' . prefixTable('users') . '
1336
+            FROM ' . prefixTable('users').'
1337 1337
             WHERE id = %i',
1338 1338
             $post_user_id
1339 1339
         );
@@ -1360,7 +1360,7 @@  discard block
 block discarded – undo
1360 1360
             );
1361 1361
 
1362 1362
             // Load superGlobals
1363
-            include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
1363
+            include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
1364 1364
             $superGlobal = new protect\SuperGlobal\SuperGlobal();
1365 1365
 
1366 1366
             $superGlobal->put('private_key', $privateKey, 'SESSION', 'user');
@@ -1400,7 +1400,7 @@  discard block
 block discarded – undo
1400 1400
         // Get user info
1401 1401
         $userData = DB::queryFirstRow(
1402 1402
             'SELECT email, auth_type, login
1403
-            FROM ' . prefixTable('users') . '
1403
+            FROM ' . prefixTable('users').'
1404 1404
             WHERE id = %i',
1405 1405
             $post_user_id
1406 1406
         );
@@ -1540,7 +1540,7 @@  discard block
 block discarded – undo
1540 1540
         // Get user info
1541 1541
         $userData = DB::queryFirstRow(
1542 1542
             'SELECT email, auth_type, login
1543
-            FROM ' . prefixTable('users') . '
1543
+            FROM ' . prefixTable('users').'
1544 1544
             WHERE id = %i',
1545 1545
             $post_user_id
1546 1546
         );
@@ -1606,13 +1606,13 @@  discard block
 block discarded – undo
1606 1606
         // Check if user exists
1607 1607
         DB::queryFirstRow(
1608 1608
             'SELECT *
1609
-            FROM ' . prefixTable('users') . '
1609
+            FROM ' . prefixTable('users').'
1610 1610
             WHERE id = %i',
1611 1611
             $post_user_id
1612 1612
         );
1613 1613
         if (DB::count() > 0) {
1614 1614
             // Include libraries
1615
-            include_once $SETTINGS['cpassman_dir'] . '/sources/aes.functions.php';
1615
+            include_once $SETTINGS['cpassman_dir'].'/sources/aes.functions.php';
1616 1616
 
1617 1617
             // CLear old sharekeys
1618 1618
             if ($post_self_change === false) {
@@ -1667,7 +1667,7 @@  discard block
 block discarded – undo
1667 1667
         // Check if user exists
1668 1668
         $userInfo = DB::queryFirstRow(
1669 1669
             'SELECT public_key
1670
-            FROM ' . prefixTable('users') . '
1670
+            FROM ' . prefixTable('users').'
1671 1671
             WHERE id = %i',
1672 1672
             $post_user_id
1673 1673
         );
@@ -1677,7 +1677,7 @@  discard block
 block discarded – undo
1677 1677
             $next_action = '';
1678 1678
 
1679 1679
             // Include libraries
1680
-            include_once $SETTINGS['cpassman_dir'] . '/sources/aes.functions.php';
1680
+            include_once $SETTINGS['cpassman_dir'].'/sources/aes.functions.php';
1681 1681
 
1682 1682
             // WHAT STEP TO PERFORM?
1683 1683
             if ($post_action === 'step0') {
@@ -1840,15 +1840,15 @@  discard block
 block discarded – undo
1840 1840
     // Loop on items
1841 1841
     $rows = DB::query(
1842 1842
         'SELECT id, pw
1843
-        FROM ' . prefixTable('items') . '
1843
+        FROM ' . prefixTable('items').'
1844 1844
         WHERE perso = 0
1845
-        LIMIT ' . $post_start . ', ' . $post_length
1845
+        LIMIT ' . $post_start.', '.$post_length
1846 1846
     );
1847 1847
     foreach ($rows as $record) {
1848 1848
         // Get itemKey from current user
1849 1849
         $currentUserKey = DB::queryFirstRow(
1850 1850
             'SELECT share_key, increment_id
1851
-            FROM ' . prefixTable('sharekeys_items') . '
1851
+            FROM ' . prefixTable('sharekeys_items').'
1852 1852
             WHERE object_id = %i AND user_id = %i',
1853 1853
             $record['id'],
1854 1854
             $_SESSION['user_id']
@@ -1876,7 +1876,7 @@  discard block
 block discarded – undo
1876 1876
             if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
1877 1877
                 $currentUserKey = DB::queryFirstRow(
1878 1878
                     'SELECT increment_id
1879
-                    FROM ' . prefixTable('sharekeys_items') . '
1879
+                    FROM ' . prefixTable('sharekeys_items').'
1880 1880
                     WHERE object_id = %i AND user_id = %i',
1881 1881
                     $record['id'],
1882 1882
                     $post_user_id
@@ -1909,7 +1909,7 @@  discard block
 block discarded – undo
1909 1909
     // SHould we change step?
1910 1910
     DB::query(
1911 1911
         'SELECT *
1912
-        FROM ' . prefixTable('items') . '
1912
+        FROM ' . prefixTable('items').'
1913 1913
         WHERE perso = 0'
1914 1914
     );
1915 1915
 
@@ -1933,15 +1933,15 @@  discard block
 block discarded – undo
1933 1933
     // Loop on logs
1934 1934
     $rows = DB::query(
1935 1935
         'SELECT increment_id
1936
-        FROM ' . prefixTable('log_items') . '
1936
+        FROM ' . prefixTable('log_items').'
1937 1937
         WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"
1938
-        LIMIT ' . $post_start . ', ' . $post_length
1938
+        LIMIT ' . $post_start.', '.$post_length
1939 1939
     );
1940 1940
     foreach ($rows as $record) {
1941 1941
         // Get itemKey from current user
1942 1942
         $currentUserKey = DB::queryFirstRow(
1943 1943
             'SELECT share_key
1944
-            FROM ' . prefixTable('sharekeys_logs') . '
1944
+            FROM ' . prefixTable('sharekeys_logs').'
1945 1945
             WHERE object_id = %i AND user_id = %i',
1946 1946
             $record['increment_id'],
1947 1947
             $_SESSION['user_id']
@@ -1968,7 +1968,7 @@  discard block
 block discarded – undo
1968 1968
             if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
1969 1969
                 $currentUserKey = DB::queryFirstRow(
1970 1970
                     'SELECT increment_id
1971
-                    FROM ' . prefixTable('sharekeys_items') . '
1971
+                    FROM ' . prefixTable('sharekeys_items').'
1972 1972
                     WHERE object_id = %i AND user_id = %i',
1973 1973
                     $record['id'],
1974 1974
                     $post_user_id
@@ -1990,7 +1990,7 @@  discard block
 block discarded – undo
1990 1990
     // SHould we change step?
1991 1991
     DB::query(
1992 1992
         'SELECT increment_id
1993
-        FROM ' . prefixTable('log_items') . '
1993
+        FROM ' . prefixTable('log_items').'
1994 1994
         WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"'
1995 1995
     );
1996 1996
 
@@ -2014,15 +2014,15 @@  discard block
 block discarded – undo
2014 2014
     // Loop on fields
2015 2015
     $rows = DB::query(
2016 2016
         'SELECT id
2017
-        FROM ' . prefixTable('categories_items') . '
2017
+        FROM ' . prefixTable('categories_items').'
2018 2018
         WHERE encryption_type = "teampass_aes"
2019
-        LIMIT ' . $post_start . ', ' . $post_length
2019
+        LIMIT ' . $post_start.', '.$post_length
2020 2020
     );
2021 2021
     foreach ($rows as $record) {
2022 2022
         // Get itemKey from current user
2023 2023
         $currentUserKey = DB::queryFirstRow(
2024 2024
             'SELECT share_key
2025
-            FROM ' . prefixTable('sharekeys_fields') . '
2025
+            FROM ' . prefixTable('sharekeys_fields').'
2026 2026
             WHERE object_id = %i AND user_id = %i',
2027 2027
             $record['id'],
2028 2028
             $_SESSION['user_id']
@@ -2049,7 +2049,7 @@  discard block
 block discarded – undo
2049 2049
             if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
2050 2050
                 $currentUserKey = DB::queryFirstRow(
2051 2051
                     'SELECT increment_id
2052
-                    FROM ' . prefixTable('sharekeys_items') . '
2052
+                    FROM ' . prefixTable('sharekeys_items').'
2053 2053
                     WHERE object_id = %i AND user_id = %i',
2054 2054
                     $record['id'],
2055 2055
                     $post_user_id
@@ -2071,7 +2071,7 @@  discard block
 block discarded – undo
2071 2071
     // SHould we change step?
2072 2072
     DB::query(
2073 2073
         'SELECT *
2074
-        FROM ' . prefixTable('categories_items') . '
2074
+        FROM ' . prefixTable('categories_items').'
2075 2075
         WHERE encryption_type = "teampass_aes"'
2076 2076
     );
2077 2077
 
@@ -2095,14 +2095,14 @@  discard block
 block discarded – undo
2095 2095
     // Loop on suggestions
2096 2096
     $rows = DB::query(
2097 2097
         'SELECT id
2098
-        FROM ' . prefixTable('suggestion') . '
2099
-        LIMIT ' . $post_start . ', ' . $post_length
2098
+        FROM ' . prefixTable('suggestion').'
2099
+        LIMIT ' . $post_start.', '.$post_length
2100 2100
     );
2101 2101
     foreach ($rows as $record) {
2102 2102
         // Get itemKey from current user
2103 2103
         $currentUserKey = DB::queryFirstRow(
2104 2104
             'SELECT share_key
2105
-            FROM ' . prefixTable('sharekeys_suggestions') . '
2105
+            FROM ' . prefixTable('sharekeys_suggestions').'
2106 2106
             WHERE object_id = %i AND user_id = %i',
2107 2107
             $record['id'],
2108 2108
             $_SESSION['user_id']
@@ -2129,7 +2129,7 @@  discard block
 block discarded – undo
2129 2129
             if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
2130 2130
                 $currentUserKey = DB::queryFirstRow(
2131 2131
                     'SELECT increment_id
2132
-                    FROM ' . prefixTable('sharekeys_items') . '
2132
+                    FROM ' . prefixTable('sharekeys_items').'
2133 2133
                     WHERE object_id = %i AND user_id = %i',
2134 2134
                     $record['id'],
2135 2135
                     $post_user_id
@@ -2174,15 +2174,15 @@  discard block
 block discarded – undo
2174 2174
     // Loop on files
2175 2175
     $rows = DB::query(
2176 2176
         'SELECT id
2177
-        FROM ' . prefixTable('files') . '
2178
-        WHERE status = "' . TP_ENCRYPTION_NAME . '"
2179
-        LIMIT ' . $post_start . ', ' . $post_length
2177
+        FROM ' . prefixTable('files').'
2178
+        WHERE status = "' . TP_ENCRYPTION_NAME.'"
2179
+        LIMIT ' . $post_start.', '.$post_length
2180 2180
     ); //aes_encryption
2181 2181
     foreach ($rows as $record) {
2182 2182
         // Get itemKey from current user
2183 2183
         $currentUserKey = DB::queryFirstRow(
2184 2184
             'SELECT share_key
2185
-            FROM ' . prefixTable('sharekeys_files') . '
2185
+            FROM ' . prefixTable('sharekeys_files').'
2186 2186
             WHERE object_id = %i AND user_id = %i',
2187 2187
             $record['id'],
2188 2188
             $_SESSION['user_id']
@@ -2209,7 +2209,7 @@  discard block
 block discarded – undo
2209 2209
             if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
2210 2210
                 $currentUserKey = DB::queryFirstRow(
2211 2211
                     'SELECT increment_id
2212
-                    FROM ' . prefixTable('sharekeys_items') . '
2212
+                    FROM ' . prefixTable('sharekeys_items').'
2213 2213
                     WHERE object_id = %i AND user_id = %i',
2214 2214
                     $record['id'],
2215 2215
                     $post_user_id
@@ -2231,8 +2231,8 @@  discard block
 block discarded – undo
2231 2231
     // SHould we change step?
2232 2232
     DB::query(
2233 2233
         'SELECT *
2234
-        FROM ' . prefixTable('files') . '
2235
-        WHERE status = "' . TP_ENCRYPTION_NAME . '"'
2234
+        FROM ' . prefixTable('files').'
2235
+        WHERE status = "' . TP_ENCRYPTION_NAME.'"'
2236 2236
     );
2237 2237
 
2238 2238
     $next_start = (int) $post_start + (int) $post_length;
@@ -2264,16 +2264,16 @@  discard block
 block discarded – undo
2264 2264
     if (count($_SESSION['personal_folders']) > 0) {
2265 2265
         $rows = DB::query(
2266 2266
             'SELECT id, pw
2267
-            FROM ' . prefixTable('items') . '
2267
+            FROM ' . prefixTable('items').'
2268 2268
             WHERE perso = 1 AND id_tree IN %ls
2269
-            LIMIT ' . $post_start . ', ' . $post_length,
2269
+            LIMIT ' . $post_start.', '.$post_length,
2270 2270
             $_SESSION['personal_folders']
2271 2271
         );
2272 2272
         foreach ($rows as $record) {
2273 2273
             // Get itemKey from current user
2274 2274
             $currentUserKey = DB::queryFirstRow(
2275 2275
                 'SELECT share_key, increment_id
2276
-                FROM ' . prefixTable('sharekeys_items') . '
2276
+                FROM ' . prefixTable('sharekeys_items').'
2277 2277
                 WHERE object_id = %i AND user_id = %i',
2278 2278
                 $record['id'],
2279 2279
                 $_SESSION['user_id']
@@ -2300,7 +2300,7 @@  discard block
 block discarded – undo
2300 2300
                 if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
2301 2301
                     $currentUserKey = DB::queryFirstRow(
2302 2302
                         'SELECT increment_id
2303
-                        FROM ' . prefixTable('sharekeys_items') . '
2303
+                        FROM ' . prefixTable('sharekeys_items').'
2304 2304
                         WHERE object_id = %i AND user_id = %i',
2305 2305
                         $record['id'],
2306 2306
                         $post_user_id
@@ -2323,7 +2323,7 @@  discard block
 block discarded – undo
2323 2323
     // SHould we change step?
2324 2324
     DB::query(
2325 2325
         'SELECT *
2326
-        FROM ' . prefixTable('items') . '
2326
+        FROM ' . prefixTable('items').'
2327 2327
         WHERE perso = 0'
2328 2328
     );
2329 2329
 
@@ -2347,7 +2347,7 @@  discard block
 block discarded – undo
2347 2347
         // Check if user exists
2348 2348
         $userInfo = DB::queryFirstRow(
2349 2349
             'SELECT public_key, encrypted_psk
2350
-            FROM ' . prefixTable('users') . '
2350
+            FROM ' . prefixTable('users').'
2351 2351
             WHERE id = %i',
2352 2352
             $post_user_id
2353 2353
         );
@@ -2373,9 +2373,9 @@  discard block
 block discarded – undo
2373 2373
                 // Loop on persoanl items
2374 2374
                 $rows = DB::query(
2375 2375
                     'SELECT id, pw
2376
-                    FROM ' . prefixTable('items') . '
2376
+                    FROM ' . prefixTable('items').'
2377 2377
                     WHERE perso = 1 AND id_tree IN %ls
2378
-                    LIMIT ' . $post_start . ', ' . $post_length,
2378
+                    LIMIT ' . $post_start.', '.$post_length,
2379 2379
                     $_SESSION['personal_folders']
2380 2380
                 );
2381 2381
                 $countUserPersonalItems = DB::count();
@@ -2418,7 +2418,7 @@  discard block
 block discarded – undo
2418 2418
                         // Loop on files
2419 2419
                         $rows = DB::query(
2420 2420
                             'SELECT id, file
2421
-                            FROM ' . prefixTable('files') . '
2421
+                            FROM ' . prefixTable('files').'
2422 2422
                             WHERE status != %s
2423 2423
                             AND id_item = %i',
2424 2424
                             TP_ENCRYPTION_NAME,
@@ -2429,14 +2429,14 @@  discard block
 block discarded – undo
2429 2429
                             // Now decrypt the file
2430 2430
                             prepareFileWithDefuse(
2431 2431
                                 'decrypt',
2432
-                                $SETTINGS['path_to_upload_folder'] . '/' . $record2['file'],
2433
-                                $SETTINGS['path_to_upload_folder'] . '/' . $record2['file'] . '.delete',
2432
+                                $SETTINGS['path_to_upload_folder'].'/'.$record2['file'],
2433
+                                $SETTINGS['path_to_upload_folder'].'/'.$record2['file'].'.delete',
2434 2434
                                 $SETTINGS,
2435 2435
                                 $post_user_psk
2436 2436
                             );
2437 2437
 
2438 2438
                             // Encrypt the file
2439
-                            $encryptedFile = encryptFile($record2['file'] . '.delete', $SETTINGS['path_to_upload_folder']);
2439
+                            $encryptedFile = encryptFile($record2['file'].'.delete', $SETTINGS['path_to_upload_folder']);
2440 2440
 
2441 2441
                             DB::update(
2442 2442
                                 prefixTable('files'),
@@ -2459,7 +2459,7 @@  discard block
 block discarded – undo
2459 2459
                             );
2460 2460
 
2461 2461
                             // Unlink original file
2462
-                            unlink($SETTINGS['path_to_upload_folder'] . '/' . $record2['file']);
2462
+                            unlink($SETTINGS['path_to_upload_folder'].'/'.$record2['file']);
2463 2463
                         }
2464 2464
                     }
2465 2465
                 }
@@ -2531,7 +2531,7 @@  discard block
 block discarded – undo
2531 2531
         // Get user info
2532 2532
         $userData = DB::queryFirstRow(
2533 2533
             'SELECT '.$post_fields.'
2534
-            FROM ' . prefixTable('users') . '
2534
+            FROM ' . prefixTable('users').'
2535 2535
             WHERE id = %i',
2536 2536
             $post_user_id
2537 2537
         );
@@ -2568,7 +2568,7 @@  discard block
 block discarded – undo
2568 2568
         // Get user info
2569 2569
         $userData = DB::queryFirstRow(
2570 2570
             'SELECT auth_type, login, private_key
2571
-            FROM ' . prefixTable('users') . '
2571
+            FROM ' . prefixTable('users').'
2572 2572
             WHERE id = %i',
2573 2573
             $post_user_id
2574 2574
         );
@@ -2579,7 +2579,7 @@  discard block
 block discarded – undo
2579 2579
             $privateKey = decryptPrivateKey($post_current_pwd, $userData['private_key']);
2580 2580
 
2581 2581
             // Load superGlobals
2582
-            include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
2582
+            include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
2583 2583
             $superGlobal = new protect\SuperGlobal\SuperGlobal();
2584 2584
 
2585 2585
             if ($superGlobal->get('private_key', 'SESSION', 'user') === $privateKey) {
@@ -2613,7 +2613,7 @@  discard block
 block discarded – undo
2613 2613
     $SETTINGS['cpassman_dir'],
2614 2614
                     array(
2615 2615
                         'error' => false,
2616
-                        'message' => langHdl('done'),'',
2616
+                        'message' => langHdl('done'), '',
2617 2617
                     ),
2618 2618
                     'encode'
2619 2619
                 );
@@ -2653,7 +2653,7 @@  discard block
 block discarded – undo
2653 2653
         // Get user info
2654 2654
         $userData = DB::queryFirstRow(
2655 2655
             'SELECT auth_type, login, private_key, special
2656
-            FROM ' . prefixTable('users') . '
2656
+            FROM ' . prefixTable('users').'
2657 2657
             WHERE id = %i',
2658 2658
             $post_user_id
2659 2659
         );
@@ -2683,7 +2683,7 @@  discard block
 block discarded – undo
2683 2683
                 );
2684 2684
 
2685 2685
                 // Load superGlobals
2686
-                include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
2686
+                include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
2687 2687
                 $superGlobal = new protect\SuperGlobal\SuperGlobal();
2688 2688
                 $superGlobal->put('private_key', $privateKey, 'SESSION', 'user');
2689 2689
 
@@ -2691,7 +2691,7 @@  discard block
 block discarded – undo
2691 2691
     $SETTINGS['cpassman_dir'],
2692 2692
                     array(
2693 2693
                         'error' => false,
2694
-                        'message' => langHdl('done'),'',
2694
+                        'message' => langHdl('done'), '',
2695 2695
                     ),
2696 2696
                     'encode'
2697 2697
                 );
@@ -2716,14 +2716,14 @@  discard block
 block discarded – undo
2716 2716
             // Get one item
2717 2717
             $record = DB::queryFirstRow(
2718 2718
                 'SELECT id, pw
2719
-                FROM ' . prefixTable('items') . '
2719
+                FROM ' . prefixTable('items').'
2720 2720
                 WHERE perso = 0'
2721 2721
             );
2722 2722
 
2723 2723
             // Get itemKey from current user
2724 2724
             $currentUserKey = DB::queryFirstRow(
2725 2725
                 'SELECT share_key, increment_id
2726
-                FROM ' . prefixTable('sharekeys_items') . '
2726
+                FROM ' . prefixTable('sharekeys_items').'
2727 2727
                 WHERE object_id = %i AND user_id = %i',
2728 2728
                 $record['id'],
2729 2729
                 $post_user_id
@@ -2751,7 +2751,7 @@  discard block
 block discarded – undo
2751 2751
                     );
2752 2752
                     
2753 2753
                     // Load superGlobals
2754
-                    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
2754
+                    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
2755 2755
                     $superGlobal = new protect\SuperGlobal\SuperGlobal();
2756 2756
                     $superGlobal->put('private_key', $privateKey, 'SESSION', 'user');
2757 2757
 
@@ -2808,7 +2808,7 @@  discard block
 block discarded – undo
2808 2808
             $_SESSION['user_id']
2809 2809
         );
2810 2810
         // Return data
2811
-        return '[{"new_value":"' . $_SESSION['sessionDuration'] . '"}]';
2811
+        return '[{"new_value":"'.$_SESSION['sessionDuration'].'"}]';
2812 2812
     }
2813 2813
     
2814 2814
     return '[{"new_value":"expired"}]';
Please login to merge, or discard this patch.
sources/utilities.queries.php 1 patch
Spacing   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -37,12 +37,12 @@  discard block
 block discarded – undo
37 37
 }
38 38
 
39 39
 // Do checks
40
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
41
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
40
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
41
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
42 42
 if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'utilities.database', $SETTINGS) === false) {
43 43
     // Not allowed page
44 44
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
45
-    include $SETTINGS['cpassman_dir'] . '/error.php';
45
+    include $SETTINGS['cpassman_dir'].'/error.php';
46 46
     exit();
47 47
 }
48 48
 
@@ -55,14 +55,14 @@  discard block
 block discarded – undo
55 55
     date_default_timezone_set('UTC');
56 56
 }
57 57
 
58
-require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
59
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
58
+require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
59
+require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
60 60
 header('Content-type: text/html; charset=utf-8');
61 61
 header('Cache-Control: no-cache, must-revalidate');
62 62
 require_once 'main.functions.php';
63 63
 
64 64
 //Connect to DB
65
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
65
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
66 66
 if (defined('DB_PASSWD_CLEAR') === false) {
67 67
     define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
68 68
 }
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
             $arrFolders = array();
105 105
             $rows = DB::query(
106 106
                 'SELECT valeur, intitule
107
-                FROM ' . prefixTable('misc') . '
107
+                FROM ' . prefixTable('misc').'
108 108
                 WHERE type  = %s',
109 109
                 'folder_deleted'
110 110
             );
@@ -125,10 +125,10 @@  discard block
 block discarded – undo
125 125
                 'SELECT u.login as login, u.name as name, u.lastname as lastname,
126 126
                 i.id as id, i.label as label,
127 127
                 i.id_tree as id_tree, l.date as date, n.title as folder_title
128
-                FROM ' . prefixTable('log_items') . ' as l
129
-                INNER JOIN ' . prefixTable('items') . ' as i ON (l.id_item=i.id)
130
-                INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id)
131
-                INNER JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree=n.id)
128
+                FROM ' . prefixTable('log_items').' as l
129
+                INNER JOIN ' . prefixTable('items').' as i ON (l.id_item=i.id)
130
+                INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id)
131
+                INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree=n.id)
132 132
                 WHERE i.inactif = %i
133 133
                 AND l.action = %s',
134 134
                 1,
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
                             'label' => $record['label'],
151 151
                             'date' => date($SETTINGS['date_format'], (int) $record['date']),
152 152
                             'login' => $record['login'],
153
-                            'name' => $record['name'] . ' ' . $record['lastname'],
153
+                            'name' => $record['name'].' '.$record['lastname'],
154 154
                             'folder_label' => $record['folder_title'],
155 155
                             'folder_deleted' => $thisFolder,
156 156
                         )
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
 
200 200
             // decrypt and retrieve data in JSON format
201 201
             $dataReceived = prepareExchangedData(
202
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
202
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
203 203
 
204 204
             // Prepare variables
205 205
             $post_folders = filter_var_array($dataReceived['folders'], FILTER_SANITIZE_STRING);
@@ -209,10 +209,10 @@  discard block
 block discarded – undo
209 209
             foreach ($post_folders as $folderId) {
210 210
                 $data = DB::queryfirstrow(
211 211
                     'SELECT valeur
212
-                    FROM ' . prefixTable('misc') . "
212
+                    FROM ' . prefixTable('misc')."
213 213
                     WHERE type = 'folder_deleted'
214 214
                     AND intitule = %s",
215
-                    'f' . $folderId
215
+                    'f'.$folderId
216 216
                 );
217 217
                 if ((int) $data['valeur'] !== 0) {
218 218
                     $folderData = explode(', ', $data['valeur']);
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
238 238
                         prefixTable('misc'),
239 239
                         'type = %s AND intitule = %s',
240 240
                         'folder_deleted',
241
-                        'f' . $folderId
241
+                        'f'.$folderId
242 242
                     );
243 243
 
244 244
                     // Restore all items in this folder
@@ -254,7 +254,7 @@  discard block
 block discarded – undo
254 254
                     // Get list of all items in thos folder
255 255
                     $items = DB::query(
256 256
                         'SELECT id
257
-                        FROM ' . prefixTable('items') . '
257
+                        FROM ' . prefixTable('items').'
258 258
                         WHERE id_tree = %i',
259 259
                         $folderId
260 260
                     );
@@ -333,7 +333,7 @@  discard block
 block discarded – undo
333 333
 
334 334
             // decrypt and retrieve data in JSON format
335 335
             $dataReceived = prepareExchangedData(
336
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
336
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
337 337
 
338 338
             // Prepare variables
339 339
             $post_folders = filter_var_array($dataReceived['folders'], FILTER_SANITIZE_STRING);
@@ -343,10 +343,10 @@  discard block
 block discarded – undo
343 343
             foreach ($post_folders as $folderId) {
344 344
                 $data = DB::queryfirstrow(
345 345
                     'SELECT valeur
346
-                    FROM ' . prefixTable('misc') . "
346
+                    FROM ' . prefixTable('misc')."
347 347
                     WHERE type = 'folder_deleted'
348 348
                     AND intitule = %s",
349
-                    'f' . $folderId
349
+                    'f'.$folderId
350 350
                 );
351 351
                 if ((int) $data['valeur'] !== 0) {
352 352
                     $folderData = explode(', ', $data['valeur']);
@@ -378,7 +378,7 @@  discard block
 block discarded – undo
378 378
                         prefixTable('misc'),
379 379
                         'type = %s AND intitule = %s',
380 380
                         'folder_deleted',
381
-                        'f' . $folderData[0]
381
+                        'f'.$folderData[0]
382 382
                     );
383 383
 
384 384
                     // Delete all items in this folder
@@ -392,7 +392,7 @@  discard block
 block discarded – undo
392 392
                     // Get list of all items in thos folder
393 393
                     $items = DB::query(
394 394
                         'SELECT id
395
-                        FROM ' . prefixTable('items') . '
395
+                        FROM ' . prefixTable('items').'
396 396
                         WHERE id_tree = %i',
397 397
                         $folderData[0]
398 398
                     );
@@ -464,7 +464,7 @@  discard block
 block discarded – undo
464 464
 
465 465
             // decrypt and retrieve data in JSON format
466 466
             $dataReceived = prepareExchangedData(
467
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
467
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
468 468
 
469 469
             // Prepare variables
470 470
             $post_log_type = filter_var($dataReceived['dataType'], FILTER_SANITIZE_STRING);
@@ -492,7 +492,7 @@  discard block
 block discarded – undo
492 492
             ) {
493 493
                 if ($post_log_type === 'items') {
494 494
                     DB::query(
495
-                        'SELECT * FROM ' . prefixTable('log_items') . '
495
+                        'SELECT * FROM '.prefixTable('log_items').'
496 496
                         WHERE (date BETWEEN %i AND %i)'
497 497
                         . ($post_filter_action === 'all' ? '' : ' AND action = "'.$post_filter_action.'"')
498 498
                         . ((int) $post_filter_user === -1 ? '' : ' AND id_user = '.(int) $post_filter_user),
@@ -512,7 +512,7 @@  discard block
 block discarded – undo
512 512
                 } elseif ($post_log_type === 'connections') {
513 513
                     //db::debugmode(true);
514 514
                     DB::query(
515
-                        'SELECT * FROM ' . prefixTable('log_system') . '
515
+                        'SELECT * FROM '.prefixTable('log_system').'
516 516
                         WHERE type=%s '
517 517
                         . 'AND (date BETWEEN %i AND %i)'
518 518
                         . ($post_filter_action === 'all' ? '' : ' AND action = '.$post_filter_action)
@@ -535,12 +535,12 @@  discard block
 block discarded – undo
535 535
                     );
536 536
                 } elseif ($post_log_type === 'errors') {
537 537
                     //db::debugmode(true);
538
-                    echo 'SELECT * FROM ' . prefixTable('log_items') . '
538
+                    echo 'SELECT * FROM '.prefixTable('log_items').'
539 539
                     WHERE (date BETWEEN '.$post_date_from.' AND '.$post_date_to.')'
540 540
                     . ($post_filter_action === 'all' ? '' : ' AND action = '.$post_filter_action)
541 541
                     . ((int) $post_filter_user === -1 ? '' : ' AND id_user = '.(int) $post_filter_user);
542 542
                     DB::query(
543
-                        'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' .
543
+                        'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '.
544 544
                             'AND (date BETWEEN %i AND %i)',
545 545
                         'error',
546 546
                         $post_date_from,
@@ -557,7 +557,7 @@  discard block
 block discarded – undo
557 557
                     );
558 558
                 } elseif ($post_log_type === 'copy') {
559 559
                     DB::query(
560
-                        'SELECT * FROM ' . prefixTable('log_items') . ' WHERE action=%s ' .
560
+                        'SELECT * FROM '.prefixTable('log_items').' WHERE action=%s '.
561 561
                             'AND (date BETWEEN %i AND %i)',
562 562
                         'at_copy',
563 563
                         $post_date_from,
@@ -574,7 +574,7 @@  discard block
 block discarded – undo
574 574
                     );
575 575
                 } elseif ($post_log_type === 'admin') {
576 576
                     DB::query(
577
-                        'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' .
577
+                        'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '.
578 578
                             'AND (date BETWEEN %i AND %i)',
579 579
                         'admin_action',
580 580
                         $post_date_from,
@@ -591,7 +591,7 @@  discard block
 block discarded – undo
591 591
                     );
592 592
                 } elseif ($post_log_type === 'failed') {
593 593
                     DB::query(
594
-                        'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' .
594
+                        'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '.
595 595
                             'AND (date BETWEEN %i AND %i)',
596 596
                         'failed_auth',
597 597
                         $post_date_from,
Please login to merge, or discard this patch.
sources/roles.queries.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
191 191
 
192 192
             // decrypt and retrieve data in JSON format
193 193
             $dataReceived = prepareExchangedData(
194
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
194
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
195 195
 
196 196
             // Prepare variables
197 197
             $post_selectedFolders = filter_var_array($dataReceived['selectedFolders'], FILTER_SANITIZE_NUMBER_INT);
@@ -281,7 +281,7 @@  discard block
 block discarded – undo
281 281
 
282 282
             // decrypt and retrieve data in JSON format
283 283
             $dataReceived = prepareExchangedData(
284
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
284
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
285 285
 
286 286
             // Prepare variables
287 287
             $post_folderId = filter_var($dataReceived['folderId'], FILTER_SANITIZE_NUMBER_INT);
@@ -467,7 +467,7 @@  discard block
 block discarded – undo
467 467
 
468 468
             // send data
469 469
             echo prepareExchangedData(
470
-    $SETTINGS['cpassman_dir'],$return, 'encode');
470
+    $SETTINGS['cpassman_dir'], $return, 'encode');
471 471
             break;
472 472
 
473 473
         case 'delete_role':
@@ -496,7 +496,7 @@  discard block
 block discarded – undo
496 496
 
497 497
             // decrypt and retrieve data in JSON format
498 498
             $dataReceived = prepareExchangedData(
499
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
499
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
500 500
 
501 501
             // Prepare variables
502 502
             $post_roleId = filter_var($dataReceived['roleId'], FILTER_SANITIZE_NUMBER_INT);
Please login to merge, or discard this patch.