Passed
Push — dev ( 8b84d5...475726 )
by Nils
05:50
created
includes/core/login.php 1 patch
Spacing   +35 added lines, -36 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 $superGlobal = new SuperGlobal();
39 39
 $get = [];
40 40
 $get['post_type'] = $superGlobal->get('post_type', 'GET');
41
-if (isset($SETTINGS['duo']) === true && (int) $SETTINGS['duo'] === 1 && $get['post_type'] === 'duo' ) {
41
+if (isset($SETTINGS['duo']) === true && (int) $SETTINGS['duo'] === 1 && $get['post_type'] === 'duo') {
42 42
     $get['duo_state'] = $superGlobal->get('state', 'GET');
43 43
     $get['duo_code'] = $superGlobal->get('duo_code', 'GET');
44 44
 }
@@ -48,8 +48,7 @@  discard block
 block discarded – undo
48 48
 <div class="login-box">
49 49
     <div class="login-logo"><div style="margin:30px;">',
50 50
     isset($SETTINGS['custom_logo']) === true && empty($SETTINGS['custom_logo']) === false ?
51
-        '<img src="' . (string) $SETTINGS['custom_logo'] . '" alt="" style="text-align:center; max-width:100px;" />' :
52
-        '<img src="includes/images/teampass-logo2-login.png" alt="Teampass Logo">',
51
+        '<img src="'.(string) $SETTINGS['custom_logo'].'" alt="" style="text-align:center; max-width:100px;" />' : '<img src="includes/images/teampass-logo2-login.png" alt="Teampass Logo">',
53 52
         '
54 53
         </div>
55 54
         <div style="font-weight:bold;">
@@ -69,14 +68,14 @@  discard block
 block discarded – undo
69 68
 
70 69
         <div class="card-body login-card-body1">
71 70
             <div class="input-group has-feedback mb-2">
72
-                <div class="input-group-prepend infotip" title="' . langHdl('login') . '">
71
+                <div class="input-group-prepend infotip" title="' . langHdl('login').'">
73 72
                     <span class="input-group-text"><i class="fa-solid fa-user fa-fw"></i></span>
74 73
                 </div>';
75 74
 if (
76 75
     isset($SETTINGS['enable_http_request_login']) === true
77 76
     && (int) $SETTINGS['enable_http_request_login'] === 1
78 77
     && $superGlobal->get('PHP_AUTH_USER', 'SERVER') !== null
79
-    && ! (isset($SETTINGS['maintenance_mode']) === true
78
+    && !(isset($SETTINGS['maintenance_mode']) === true
80 79
         && (int) $SETTINGS['maintenance_mode'] === 1)
81 80
 ) {
82 81
     if (strpos($superGlobal->get('PHP_AUTH_USER', 'SERVER'), '@') !== false) {
@@ -90,32 +89,32 @@  discard block
 block discarded – undo
90 89
             <input type="text" id="login" class="form-control" placeholder="', filter_var($username, FILTER_SANITIZE_FULL_SPECIAL_CHARS), '" readonly>';
91 90
 } else {
92 91
     echo '
93
-            <input type="text" id="login" class="form-control" placeholder="' . langHdl('index_login') . '" value="'.(null !== $superGlobal->get('login', 'SESSION') && empty($superGlobal->get('login', 'SESSION')) === false ? filter_var($superGlobal->get('login', 'SESSION'), FILTER_SANITIZE_FULL_SPECIAL_CHARS) : '').'">';
92
+            <input type="text" id="login" class="form-control" placeholder="' . langHdl('index_login').'" value="'.(null !== $superGlobal->get('login', 'SESSION') && empty($superGlobal->get('login', 'SESSION')) === false ? filter_var($superGlobal->get('login', 'SESSION'), FILTER_SANITIZE_FULL_SPECIAL_CHARS) : '').'">';
94 93
 }
95 94
 
96 95
 echo '
97 96
         </div>';
98
-if (! (isset($SETTINGS['enable_http_request_login']) === true
97
+if (!(isset($SETTINGS['enable_http_request_login']) === true
99 98
     && (int) $SETTINGS['enable_http_request_login'] === 1
100 99
     && $superGlobal->get('PHP_AUTH_USER', 'SERVER') !== null
101
-    && ! (isset($SETTINGS['maintenance_mode']) === true
100
+    && !(isset($SETTINGS['maintenance_mode']) === true
102 101
         && (int) $SETTINGS['maintenance_mode'] === 1))) {
103 102
     echo '
104 103
         <div class="input-group has-feedback mb-2">
105
-            <div class="input-group-prepend infotip" title="' . langHdl('password') . '">
104
+            <div class="input-group-prepend infotip" title="' . langHdl('password').'">
106 105
                 <span class="input-group-text"><i class="fa-solid fa-lock fa-fw"></i></span>
107 106
             </div>
108
-            <input type="password" id="pw" class="form-control submit-button" placeholder="' . langHdl('index_password') . '">
107
+            <input type="password" id="pw" class="form-control submit-button" placeholder="' . langHdl('index_password').'">
109 108
         </div>';
110 109
 }
111 110
 
112 111
 echo '
113 112
         <div class="input-group has-feedback mb-2">
114
-            <div class="input-group-prepend infotip" title="' . langHdl('session_expiration_in_minutes') . '">
113
+            <div class="input-group-prepend infotip" title="' . langHdl('session_expiration_in_minutes').'">
115 114
                 <span class="input-group-text"><i class="fa-solid fa-clock fa-fw"></i></span>
116 115
             </div>
117 116
             <input type="text" id="session_duration" class="form-control submit-button" 
118
-            placeholder="' . langHdl('index_session_duration') .'&nbsp;(' . langHdl('minutes') . ')" 
117
+            placeholder="' . langHdl('index_session_duration').'&nbsp;('.langHdl('minutes').')" 
119 118
             value="', isset($SETTINGS['default_session_expiration_time']) === true ? $SETTINGS['default_session_expiration_time'] : '', '">
120 119
         </div>';
121 120
 // 2FA auth selector
@@ -125,7 +124,7 @@  discard block
 block discarded – undo
125 124
         <input type="hidden" id="duo_state" value="', isset($get['duo_state']) === true && is_null($get['duo_state']) === false ? $get['duo_state'] : '', '">
126 125
         <div class="row mb-3 hidden" id="2fa_methods_selector">
127 126
             <div class="col-12">
128
-                <h8 class="login-box-msg">' . langHdl('2fa_authentication_selector') . '</h8>
127
+                <h8 class="login-box-msg">' . langHdl('2fa_authentication_selector').'</h8>
129 128
                 <div class="2fa-methods text-center mt-2">',
130 129
     isset($SETTINGS['google_authentication']) === true && (int) $SETTINGS['google_authentication'] === 1 ?
131 130
         '
@@ -159,14 +158,14 @@  discard block
 block discarded – undo
159 158
     echo '
160 159
         <div id="div-2fa-google" class="mb-3 div-2fa-method hidden">
161 160
             <div class="input-group has-feedback mb-2">
162
-                <div class="input-group-prepend infotip" title="' . langHdl('mfa_unique_code') . '">
161
+                <div class="input-group-prepend infotip" title="' . langHdl('mfa_unique_code').'">
163 162
                     <span class="input-group-text"><i class="fa-solid fa-key fa-fw"></i></span>
164 163
                 </div>
165
-                <input type="text" id="ga_code" class="form-control submit-button" placeholder="' . langHdl('ga_identification_code') . '" />
164
+                <input type="text" id="ga_code" class="form-control submit-button" placeholder="' . langHdl('ga_identification_code').'" />
166 165
                 <span class="input-group-append">
167 166
                     <button type="button" class="btn btn-info btn-flat" onclick="send_user_new_temporary_ga_code()">
168 167
                         <i class="fa-solid fa-envelope form-control-feedback pointer infotip" 
169
-                    title="' . langHdl('i_need_to_generate_new_ga_code') . '"></i>
168
+                    title="' . langHdl('i_need_to_generate_new_ga_code').'"></i>
170 169
                     </button>
171 170
                 </span>
172 171
             </div>
@@ -184,7 +183,7 @@  discard block
 block discarded – undo
184 183
 <script>
185 184
 var seconds = 1;
186 185
 function updateLogonButton(timeToGo){
187
-    document.getElementById("but_identify_user").value = "' . langHdl('duration_login_attempt') . ' " + timeToGo;
186
+    document.getElementById("but_identify_user").value = "' . langHdl('duration_login_attempt').' " + timeToGo;
188 187
 }
189 188
 $( window ).on( "load", function() {
190 189
     updateLogonButton(seconds);
@@ -193,7 +192,7 @@  discard block
 block discarded – undo
193 192
         if (seconds >= 0) {
194 193
             updateLogonButton(seconds);
195 194
         } else if(seconds === 0) {
196
-            launchIdentify("", "' . $nextUrl . '");
195
+            launchIdentify("", "' . $nextUrl.'");
197 196
         }
198 197
         updateLogonButton(seconds);
199 198
     },
@@ -214,15 +213,15 @@  discard block
 block discarded – undo
214 213
             <div class="col-8">
215 214
                 <div id="yubiko-new-key" class="alert alert-info hidden">
216 215
                     <p>
217
-                        <input type="text" size="10" id="yubico_user_id" class="form-control" placeholder="' . langHdl('yubico_user_id') . '">
216
+                        <input type="text" size="10" id="yubico_user_id" class="form-control" placeholder="' . langHdl('yubico_user_id').'">
218 217
                     </p>
219 218
                     <p>
220
-                    <input type="text" size="10" id="yubico_user_key" class="form-control" placeholder="' . langHdl('yubico_user_key') . '">
219
+                    <input type="text" size="10" id="yubico_user_key" class="form-control" placeholder="' . langHdl('yubico_user_key').'">
221 220
                     </p>
222 221
                 </div>
223
-                <input autocomplete="off" type="text" id="yubico_key" class="form-control submit-button" placeholder="' . langHdl('press_your_yubico_key') . '">
222
+                <input autocomplete="off" type="text" id="yubico_key" class="form-control submit-button" placeholder="' . langHdl('press_your_yubico_key').'">
224 223
                 <div class="row">
225
-                    <span class="ml-2 mt-1 font-weight-light small pointer" id="register-yubiko-key">' . langHdl('register_new_yubiko_key') . '</span>
224
+                    <span class="ml-2 mt-1 font-weight-light small pointer" id="register-yubiko-key">' . langHdl('register_new_yubiko_key').'</span>
226 225
                 </div>
227 226
             </div>
228 227
         </div>';
@@ -231,22 +230,22 @@  discard block
 block discarded – undo
231 230
 echo '
232 231
         <div class="row mb-3 mt-5">
233 232
             <div class="col-12">
234
-                <button id="but_identify_user" class="btn btn-primary btn-block">' . langHdl('log_in') . '</button>
233
+                <button id="but_identify_user" class="btn btn-primary btn-block">' . langHdl('log_in').'</button>
235 234
                 
236 235
                 <!-- In case of upgrade, the user has to provide his One Time Code -->
237 236
                 <div class="card-body user-one-time-code-card-body hidden">
238
-                    <h5 class="login-box-msg">' . langHdl('provide_personal_one_time_code') . '</h5>
237
+                    <h5 class="login-box-msg">' . langHdl('provide_personal_one_time_code').'</h5>
239 238
 
240 239
                     <div class="input-group has-feedback mb-2 mt-4">
241 240
                         <div class="input-group-prepend">
242 241
                             <span class="input-group-text"><i class="fa-solid fa-unlock-alt"></i></span>
243 242
                         </div>
244
-                        <input type="password" id="user-one-time-code" class="form-control" placeholder="' . langHdl('one_time_code') . '">
243
+                        <input type="password" id="user-one-time-code" class="form-control" placeholder="' . langHdl('one_time_code').'">
245 244
                     </div>
246 245
 
247 246
                     <div class="row mb-3">
248 247
                         <div class="col-12">
249
-                            <button id="but_confirm_otc" class="btn btn-primary btn-block">' . langHdl('confirm') . '</button>
248
+                            <button id="but_confirm_otc" class="btn btn-primary btn-block">' . langHdl('confirm').'</button>
250 249
                         </div>
251 250
                     </div>
252 251
                 </div>
@@ -261,10 +260,10 @@  discard block
 block discarded – undo
261 260
 // In case of password change
262 261
 echo '
263 262
     <div class="card-body confirm-password-card-body hidden">
264
-        <h5 class="login-box-msg">' . langHdl('new_password_required') . '</h5>
263
+        <h5 class="login-box-msg">' . langHdl('new_password_required').'</h5>
265 264
 
266 265
         <div class="alert alert-info">
267
-            <div class="text-center"><i class="icon fa fa-info"></i>' . langHdl('password_strength') . '
266
+            <div class="text-center"><i class="icon fa fa-info"></i>' . langHdl('password_strength').'
268 267
             <span id="confirm-password-level" class="ml-2 font-weight-bold"></span></div>
269 268
         </div>
270 269
 
@@ -274,20 +273,20 @@  discard block
 block discarded – undo
274 273
                     <div class="input-group-prepend">
275 274
                         <span class="input-group-text"><i class="fas fa-key"></i></span>
276 275
                     </div>
277
-                    <input type="password" id="current-user-password" class="form-control" placeholder="' . langHdl('current_password') . '">
276
+                    <input type="password" id="current-user-password" class="form-control" placeholder="' . langHdl('current_password').'">
278 277
                 </div>
279 278
             </div>
280 279
             <div class="input-group has-feedback mb-2 mt-4">
281 280
                 <div class="input-group-prepend">
282 281
                     <span class="input-group-text"><i class="fas fa-key"></i></span>
283 282
                 </div>
284
-                <input type="password" id="new-user-password" class="form-control" placeholder="' . langHdl('index_new_pw') . '">
283
+                <input type="password" id="new-user-password" class="form-control" placeholder="' . langHdl('index_new_pw').'">
285 284
             </div>
286 285
             <div class="input-group has-feedback mb-2">
287 286
                 <div class="input-group-prepend">
288 287
                     <span class="input-group-text"><i class="fas fa-key"></i></span>
289 288
                 </div>
290
-                <input type="password" id="new-user-password-confirm" class="form-control" placeholder="' . langHdl('index_change_pw_confirmation') . '">
289
+                <input type="password" id="new-user-password-confirm" class="form-control" placeholder="' . langHdl('index_change_pw_confirmation').'">
291 290
             </div>
292 291
             <div class="row mb-3">
293 292
                 <div class="col-md-12 offset-sm-4 text-center">
@@ -298,7 +297,7 @@  discard block
 block discarded – undo
298 297
             </div>
299 298
             <div class="row mb-3">
300 299
                 <div class="col-12">
301
-                    <button id="but_confirm_new_password" class="btn btn-primary btn-block">' . langHdl('confirm') . '</button>
300
+                    <button id="but_confirm_new_password" class="btn btn-primary btn-block">' . langHdl('confirm').'</button>
302 301
                 </div>
303 302
             </div>
304 303
         </div>
@@ -306,20 +305,20 @@  discard block
 block discarded – undo
306 305
 
307 306
     <div class="card-body hidden" id="card-user-treat-psk">
308 307
         <div class="alert alert-info">
309
-            <div class="text-center"><i class="icon fa fa-info"></i>' . langHdl('user_has_psk_info') . '</div>
308
+            <div class="text-center"><i class="icon fa fa-info"></i>' . langHdl('user_has_psk_info').'</div>
310 309
         </div>
311 310
         <div class="input-group has-feedback mb-2">
312 311
             <div class="input-group-prepend">
313 312
                 <span class="input-group-text"><i class="fas fa-key"></i></span>
314 313
             </div>
315
-            <input type="password" id="user-old-defuse-psk" class="form-control" placeholder="' . langHdl('home_personal_saltkey') . '">
314
+            <input type="password" id="user-old-defuse-psk" class="form-control" placeholder="' . langHdl('home_personal_saltkey').'">
316 315
         </div>
317 316
         <div class="row mb-3 mt-4">
318 317
             <div class="col-12">
319
-                <button id="but_confirm_defuse_psk" class="btn btn-primary btn-block">' . langHdl('launch') . '</button>
318
+                <button id="but_confirm_defuse_psk" class="btn btn-primary btn-block">' . langHdl('launch').'</button>
320 319
             </div>
321 320
             <div class="col-12 mt-3">
322
-                <button id="but_confirm_forgot_defuse_psk" class="btn btn-danger btn-block text-bold">' . langHdl('i_cannot_remember') . '</button>
321
+                <button id="but_confirm_forgot_defuse_psk" class="btn btn-danger btn-block text-bold">' . langHdl('i_cannot_remember').'</button>
323 322
             </div>
324 323
         </div>
325 324
     </div>
Please login to merge, or discard this patch.
includes/core/otv.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
         WHERE code = %s',
77 77
         filter_input(INPUT_GET, 'code', FILTER_SANITIZE_FULL_SPECIAL_CHARS)
78 78
     );
79
-    if (DB::count() > 0  && (int) $data['timestamp'] === (int) filter_input(INPUT_GET, 'stamp', FILTER_VALIDATE_INT)) {
79
+    if (DB::count() > 0 && (int) $data['timestamp'] === (int) filter_input(INPUT_GET, 'stamp', FILTER_VALIDATE_INT)) {
80 80
         // otv is too old
81 81
         if ($data['time_limit'] < time() || ($data['views'] + 1) > $data['max_views']) {
82 82
             $html = 'Link is too old!';
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
                 <tr><th>URL:</th><td>'.$url.'</td></tr>
180 180
                 </table></div>
181 181
                 <p class="mt-3 text-info"><i class="fas fa-info mr-2"></i>Copy carefully the data you need.<br>This page is visible until <b>'.
182
-                date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $dataItem['time_limit']).'</b> OR <b>'.($dataItem['max_views'] - ($dataItem['views']+1)).' more time(s)</b>.</div>
182
+                date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $dataItem['time_limit']).'</b> OR <b>'.($dataItem['max_views'] - ($dataItem['views'] + 1)).' more time(s)</b>.</div>
183 183
                 </div>';
184 184
             // log
185 185
             logItems(
Please login to merge, or discard this patch.
sources/backups.queries.php 1 patch
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
 ) {
67 67
     // Not allowed page
68 68
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
69
-    include $SETTINGS['cpassman_dir'] . '/error.php';
69
+    include $SETTINGS['cpassman_dir'].'/error.php';
70 70
     exit;
71 71
 }
72 72
 
@@ -130,21 +130,21 @@  discard block
 block discarded – undo
130 130
             // Prepare variables
131 131
             $post_key = filter_var($dataReceived['encryptionKey'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
132 132
 
133
-            require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
133
+            require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
134 134
             $return = '';
135 135
 
136 136
             //Get all tables
137 137
             $tables = array();
138 138
             $result = DB::query('SHOW TABLES');
139 139
             foreach ($result as $row) {
140
-                $tables[] = $row['Tables_in_' . DB_NAME];
140
+                $tables[] = $row['Tables_in_'.DB_NAME];
141 141
             }
142 142
 
143 143
             //cycle through
144 144
             foreach ($tables as $table) {
145 145
                 if (empty($pre) || substr_count($table, $pre) > 0) {
146 146
                     // Do query
147
-                    $result = DB::queryRaw('SELECT * FROM ' . $table);
147
+                    $result = DB::queryRaw('SELECT * FROM '.$table);
148 148
                     DB::queryRaw(
149 149
                         'SELECT *
150 150
                         FROM INFORMATION_SCHEMA.COLUMNS
@@ -156,19 +156,19 @@  discard block
 block discarded – undo
156 156
                     $numFields = DB::count();
157 157
 
158 158
                     // prepare a drop table
159
-                    $return .= 'DROP TABLE ' . $table . ';';
160
-                    $row2 = DB::queryfirstrow('SHOW CREATE TABLE ' . $table);
161
-                    $return .= "\n\n" . $row2['Create Table'] . ";\n\n";
159
+                    $return .= 'DROP TABLE '.$table.';';
160
+                    $row2 = DB::queryfirstrow('SHOW CREATE TABLE '.$table);
161
+                    $return .= "\n\n".$row2['Create Table'].";\n\n";
162 162
 
163 163
                     //prepare all fields and datas
164 164
                     for ($i = 0; $i < $numFields; ++$i) {
165 165
                         while ($row = $result->fetch_row()) {
166
-                            $return .= 'INSERT INTO ' . $table . ' VALUES(';
166
+                            $return .= 'INSERT INTO '.$table.' VALUES(';
167 167
                             for ($j = 0; $j < $numFields; ++$j) {
168 168
                                 $row[$j] = is_null($row[$j]) === false ? addslashes($row[$j]) : '';
169 169
                                 $row[$j] = preg_replace("/\n/", '\\n', $row[$j]);
170 170
                                 if (isset($row[$j])) {
171
-                                    $return .= '"' . $row[$j] . '"';
171
+                                    $return .= '"'.$row[$j].'"';
172 172
                                 } else {
173 173
                                     $return .= 'NULL';
174 174
                                 }
@@ -188,8 +188,8 @@  discard block
 block discarded – undo
188 188
                 $token = GenerateCryptKey(20, false, true, true, false, true, $SETTINGS);
189 189
 
190 190
                 //save file
191
-                $filename = time() . '-' . $token . '.sql';
192
-                $handle = fopen($SETTINGS['path_to_files_folder'] . '/' . $filename, 'w+');
191
+                $filename = time().'-'.$token.'.sql';
192
+                $handle = fopen($SETTINGS['path_to_files_folder'].'/'.$filename, 'w+');
193 193
                 if ($handle !== false) {
194 194
                     //write file
195 195
                     fwrite($handle, $return);
@@ -201,17 +201,17 @@  discard block
 block discarded – undo
201 201
                     // Encrypt the file
202 202
                     prepareFileWithDefuse(
203 203
                         'encrypt',
204
-                        $SETTINGS['path_to_files_folder'] . '/' . $filename,
205
-                        $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $filename,
204
+                        $SETTINGS['path_to_files_folder'].'/'.$filename,
205
+                        $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$filename,
206 206
                         $SETTINGS,
207 207
                         $post_key
208 208
                     );
209 209
 
210 210
                     // Do clean
211
-                    unlink($SETTINGS['path_to_files_folder'] . '/' . $filename);
211
+                    unlink($SETTINGS['path_to_files_folder'].'/'.$filename);
212 212
                     rename(
213
-                        $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $filename,
214
-                        $SETTINGS['path_to_files_folder'] . '/' . $filename
213
+                        $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$filename,
214
+                        $SETTINGS['path_to_files_folder'].'/'.$filename
215 215
                     );
216 216
                 }
217 217
 
@@ -231,9 +231,9 @@  discard block
 block discarded – undo
231 231
                     array(
232 232
                         'error' => false,
233 233
                         'message' => '',
234
-                        'download' => 'sources/downloadFile.php?name=' . urlencode($filename) .
235
-                            '&sub=files&file=' . $filename . '&type=sql&key=' . $_SESSION['key'] . '&key_tmp=' .
236
-                            $_SESSION['key_tmp'] . '&pathIsFiles=1',
234
+                        'download' => 'sources/downloadFile.php?name='.urlencode($filename).
235
+                            '&sub=files&file='.$filename.'&type=sql&key='.$_SESSION['key'].'&key_tmp='.
236
+                            $_SESSION['key_tmp'].'&pathIsFiles=1',
237 237
                     ),
238 238
                     'encode'
239 239
                 );
@@ -282,12 +282,12 @@  discard block
 block discarded – undo
282 282
             $post_key = filter_var($dataReceived['encryptionKey'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
283 283
             $post_backupFile = filter_var($dataReceived['backupFile'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
284 284
 
285
-            include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
285
+            include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
286 286
 
287 287
             // Get filename from database
288 288
             $data = DB::queryFirstRow(
289 289
                 'SELECT valeur
290
-                FROM ' . prefixTable('misc') . '
290
+                FROM ' . prefixTable('misc').'
291 291
                 WHERE increment_id = %i',
292 292
                 $post_backupFile
293 293
             );
@@ -306,8 +306,8 @@  discard block
 block discarded – undo
306 306
                 // Decrypt the file
307 307
                 $ret = prepareFileWithDefuse(
308 308
                     'decrypt',
309
-                    $SETTINGS['path_to_files_folder'] . '/' . $post_backupFile,
310
-                    $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $post_backupFile,
309
+                    $SETTINGS['path_to_files_folder'].'/'.$post_backupFile,
310
+                    $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$post_backupFile,
311 311
                     $SETTINGS,
312 312
                     $post_key
313 313
                 );
@@ -324,10 +324,10 @@  discard block
 block discarded – undo
324 324
                 }
325 325
 
326 326
                 // Do clean
327
-                fileDelete($SETTINGS['path_to_files_folder'] . '/' . $post_backupFile, $SETTINGS);
328
-                $post_backupFile = $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $post_backupFile;
327
+                fileDelete($SETTINGS['path_to_files_folder'].'/'.$post_backupFile, $SETTINGS);
328
+                $post_backupFile = $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$post_backupFile;
329 329
             } else {
330
-                $post_backupFile = $SETTINGS['path_to_files_folder'] . '/' . $post_backupFile;
330
+                $post_backupFile = $SETTINGS['path_to_files_folder'].'/'.$post_backupFile;
331 331
             }
332 332
 
333 333
             //read sql file
Please login to merge, or discard this patch.
sources/items.logs.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -66,7 +66,7 @@
 block discarded – undo
66 66
 ) {
67 67
     // Not allowed page
68 68
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
69
-    include $SETTINGS['cpassman_dir'] . '/error.php';
69
+    include $SETTINGS['cpassman_dir'].'/error.php';
70 70
     exit;
71 71
 }
72 72
 
Please login to merge, or discard this patch.
sources/tree.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
 ) {
67 67
     // Not allowed page
68 68
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
69
-    include $SETTINGS['cpassman_dir'] . '/error.php';
69
+    include $SETTINGS['cpassman_dir'].'/error.php';
70 70
     exit;
71 71
 }
72 72
 
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
 );
134 134
 
135 135
 $lastFolderChange = DB::queryfirstrow(
136
-    'SELECT valeur FROM ' . prefixTable('misc') . '
136
+    'SELECT valeur FROM '.prefixTable('misc').'
137 137
     WHERE type = %s AND intitule = %s',
138 138
     'timestamp',
139 139
     'last_folder_change'
@@ -455,7 +455,7 @@  discard block
 block discarded – undo
455 455
         foreach ($currentNode->children as $child) {
456 456
             recursiveTree(
457 457
                 (int) $child,
458
-                $tree->getNode($child),// get node info for this child
458
+                $tree->getNode($child), // get node info for this child
459 459
                 /** @scrutinizer ignore-type */ $tree,
460 460
                 $listFoldersLimitedKeys,
461 461
                 $listRestrictedFoldersForItemsKeys,
@@ -498,7 +498,7 @@  discard block
 block discarded – undo
498 498
 ): array
499 499
 {
500 500
     // prepare json return for current node
501
-    $parent = $currentNode->parent_id === '0' ? '#' : 'li_' . $currentNode->parent_id;
501
+    $parent = $currentNode->parent_id === '0' ? '#' : 'li_'.$currentNode->parent_id;
502 502
 
503 503
     // handle displaying
504 504
     if (isKeyExistingAndEqual('show_only_accessible_folders', 1, $SETTINGS) === true) {
@@ -515,17 +515,17 @@  discard block
 block discarded – undo
515 515
         array_push(
516 516
             $ret_json,
517 517
             array(
518
-                'id' => 'li_' . $nodeId,
518
+                'id' => 'li_'.$nodeId,
519 519
                 'parent' => $last_visible_parent === -1 ? $parent : $last_visible_parent,
520 520
                 'text' => '<i class="'.$currentNode->fa_icon.' tree-folder mr-2" data-folder="'.$currentNode->fa_icon.'"  data-folder-selected="'.$currentNode->fa_icon_selected.'"></i>'.$text.$currentNode->title.$nodeData['html'],
521 521
                 'li_attr' => array(
522 522
                     'class' => 'jstreeopen',
523
-                    'title' => 'ID [' . $nodeId . '] ' . $nodeData['title'],
523
+                    'title' => 'ID ['.$nodeId.'] '.$nodeData['title'],
524 524
                 ),
525 525
                 'a_attr' => array(
526
-                    'id' => 'fld_' . $nodeId,
526
+                    'id' => 'fld_'.$nodeId,
527 527
                     'class' => $nodeData['folderClass'],
528
-                    'onclick' => 'ListerItems(' . $nodeId . ', ' . $nodeData['restricted'] . ', 0, 1)',
528
+                    'onclick' => 'ListerItems('.$nodeId.', '.$nodeData['restricted'].', 0, 1)',
529 529
                     'data-title' => $currentNode->title,
530 530
                 ),
531 531
                 'is_pf' => in_array($nodeId, $inputData['personalFolders']) === true ? 1 : 0,
@@ -541,12 +541,12 @@  discard block
 block discarded – undo
541 541
         array_push(
542 542
             $ret_json,
543 543
             array(
544
-                'id' => 'li_' . $nodeId,
544
+                'id' => 'li_'.$nodeId,
545 545
                 'parent' => $last_visible_parent === -1 ? $parent : $last_visible_parent,
546 546
                 'text' => '<i class="'.$currentNode->fa_icon.' tree-folder mr-2" data-folder="'.$currentNode->fa_icon.'"  data-folder-selected="'.$currentNode->fa_icon_selected.'"></i>'.'<i class="fas fa-times fa-xs text-danger mr-1 ml-1"></i>'.$text.$currentNode->title.$nodeData['html'],
547 547
                 'li_attr' => array(
548 548
                     'class' => '',
549
-                    'title' => 'ID [' . $nodeId . '] ' . langHdl('no_access'),
549
+                    'title' => 'ID ['.$nodeId.'] '.langHdl('no_access'),
550 550
                 ),
551 551
             )
552 552
         );
@@ -604,7 +604,7 @@  discard block
 block discarded – undo
604 604
         if (in_array($nodeId, $session_read_only_folders) === true) {
605 605
             return [
606 606
                 'html' => '<i class="far fa-eye fa-xs mr-1 ml-1"></i>'.
607
-                    ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . $nbItemsInFolder .'/'.$nbItemsInSubfolders .'/'.$nbSubfolders. '</span>'  : ''),
607
+                    ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.$nbItemsInFolder.'/'.$nbItemsInSubfolders.'/'.$nbSubfolders.'</span>' : ''),
608 608
                 'title' => langHdl('read_only_account'),
609 609
                 'restricted' => 1,
610 610
                 'folderClass' => 'folder_not_droppable',
@@ -619,7 +619,7 @@  discard block
 block discarded – undo
619 619
         ) {
620 620
             return [
621 621
                 'html' => '<i class="far fa-eye fa-xs mr-1"></i>'.
622
-                    ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . $nbItemsInFolder .'/'.$nbItemsInSubfolders .'/'.$nbSubfolders. '</span>'  : ''),
622
+                    ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.$nbItemsInFolder.'/'.$nbItemsInSubfolders.'/'.$nbSubfolders.'</span>' : ''),
623 623
                 'title' => langHdl('read_only_account'),
624 624
                 'restricted' => 0,
625 625
                 'folderClass' => 'folder',
@@ -630,7 +630,7 @@  discard block
 block discarded – undo
630 630
         }
631 631
         
632 632
         return [
633
-            'html' => ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . $nbItemsInFolder .'/'.$nbItemsInSubfolders .'/'.$nbSubfolders. '</span>'  : ''),
633
+            'html' => ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.$nbItemsInFolder.'/'.$nbItemsInSubfolders.'/'.$nbSubfolders.'</span>' : ''),
634 634
             'title' => '',
635 635
             'restricted' => 0,
636 636
             'folderClass' => 'folder',
@@ -641,8 +641,8 @@  discard block
 block discarded – undo
641 641
 
642 642
     } elseif (in_array($nodeId, $listFoldersLimitedKeys) === true) {
643 643
         return [
644
-            'html' => ($session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : '') .
645
-                ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . count($session_list_folders_limited[$nodeId]) . '</span>' : ''),
644
+            'html' => ($session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : '').
645
+                ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.count($session_list_folders_limited[$nodeId]).'</span>' : ''),
646 646
             'title' => '',
647 647
             'restricted' => 1,
648 648
             'folderClass' => 'folder',
@@ -653,8 +653,8 @@  discard block
 block discarded – undo
653 653
 
654 654
     } elseif (in_array($nodeId, $listRestrictedFoldersForItemsKeys) === true) {
655 655
         return [
656
-            'html' => $session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : '' .
657
-                '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . count($session_list_restricted_folders_for_items[$nodeId]) . '</span>',
656
+            'html' => $session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : ''.
657
+                '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.count($session_list_restricted_folders_for_items[$nodeId]).'</span>',
658 658
             'title' => '',
659 659
             'restricted' => 1,
660 660
             'folderClass' => 'folder',
@@ -764,7 +764,7 @@  discard block
 block discarded – undo
764 764
     // Does this user has a tree cache
765 765
     $userCacheTree = DB::queryfirstrow(
766 766
         'SELECT data
767
-        FROM ' . prefixTable('cache_tree') . '
767
+        FROM ' . prefixTable('cache_tree').'
768 768
         WHERE user_id = %i',
769 769
         $userId
770 770
     );
Please login to merge, or discard this patch.
sources/downloadFile.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 ) {
73 73
     // Not allowed page
74 74
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
75
-    include $SETTINGS['cpassman_dir'] . '/error.php';
75
+    include $SETTINGS['cpassman_dir'].'/error.php';
76 76
     exit;
77 77
 }
78 78
 
@@ -97,19 +97,19 @@  discard block
 block discarded – undo
97 97
 $get_pathIsFiles = $superGlobal->get('pathIsFiles', 'GET');
98 98
 
99 99
 // prepare Encryption class calls
100
-header('Content-disposition: attachment; filename=' . rawurldecode(basename($get_filename)));
100
+header('Content-disposition: attachment; filename='.rawurldecode(basename($get_filename)));
101 101
 header('Content-Type: application/octet-stream');
102 102
 header('Cache-Control: must-revalidate, no-cache, no-store');
103 103
 header('Expires: 0');
104 104
 if (isset($_GET['pathIsFiles']) && (int) $get_pathIsFiles === 1) {
105
-    readfile($SETTINGS['path_to_files_folder'] . '/' . basename($get_filename));
105
+    readfile($SETTINGS['path_to_files_folder'].'/'.basename($get_filename));
106 106
 } else {
107 107
     // get file key
108 108
     $file_info = DB::queryfirstrow(
109 109
         'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, f.extension AS extension,
110 110
         s.share_key AS share_key
111
-        FROM ' . prefixTable('files') . ' AS f
112
-        INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id)
111
+        FROM ' . prefixTable('files').' AS f
112
+        INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id)
113 113
         WHERE s.user_id = %i AND s.object_id = %i',
114 114
         $_SESSION['user_id'],
115 115
         $get_fileid
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
     header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
129 129
     header('Cache-Control: private', false);
130 130
     header('Content-Type: application/octet-stream');
131
-    header('Content-Disposition: attachment; filename="' . $filename . '.' . $file_info['extension'] . '";');
131
+    header('Content-Disposition: attachment; filename="'.$filename.'.'.$file_info['extension'].'";');
132 132
     header('Content-Transfer-Encoding: binary');
133 133
     // Stream the CSV data
134 134
     exit(base64_decode($fileContent));
Please login to merge, or discard this patch.
sources/ldap.queries.php 1 patch
Spacing   +6 added lines, -7 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 ) {
70 70
     // Not allowed page
71 71
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
72
-    include $SETTINGS['cpassman_dir'] . '/error.php';
72
+    include $SETTINGS['cpassman_dir'].'/error.php';
73 73
     exit;
74 74
 }
75 75
 
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
             echo prepareExchangedData(
163 163
                 array(
164 164
                     'error' => true,
165
-                    'message' => "Error : ".(isset($error) === true ? $error->getErrorCode()." - ".$error->getErrorMessage(). "<br>".$error->getDiagnosticMessage() : $e),
165
+                    'message' => "Error : ".(isset($error) === true ? $error->getErrorCode()." - ".$error->getErrorMessage()."<br>".$error->getDiagnosticMessage() : $e),
166 166
                 ),
167 167
                 'encode'
168 168
             );
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
         // We want to isolate attribute ldap_user_attribute
174 174
         try {
175 175
             $user = $connection->query()
176
-                ->where((isset($SETTINGS['ldap_user_attribute']) ===true && empty($SETTINGS['ldap_user_attribute']) === false) ? $SETTINGS['ldap_user_attribute'] : 'samaccountname', '=', $post_username)
176
+                ->where((isset($SETTINGS['ldap_user_attribute']) === true && empty($SETTINGS['ldap_user_attribute']) === false) ? $SETTINGS['ldap_user_attribute'] : 'samaccountname', '=', $post_username)
177 177
                 ->firstOrFail();
178 178
             
179 179
         } catch (\LdapRecord\LdapRecordException $e) {
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
             echo prepareExchangedData(
183 183
                 array(
184 184
                     'error' => true,
185
-                    'message' => langHdl('error')." - ".(isset($error) === true ? $error->getErrorCode()." - ".$error->getErrorMessage(). "<br>".$error->getDiagnosticMessage() : $e),
185
+                    'message' => langHdl('error')." - ".(isset($error) === true ? $error->getErrorCode()." - ".$error->getErrorMessage()."<br>".$error->getDiagnosticMessage() : $e),
186 186
                 ),
187 187
                 'encode'
188 188
             );
@@ -192,8 +192,7 @@  discard block
 block discarded – undo
192 192
         try {
193 193
             $userAuthAttempt = $connection->auth()->attempt(
194 194
                 $SETTINGS['ldap_type'] === 'ActiveDirectory' ?
195
-                    $user['userprincipalname'][0] :
196
-                    $user['dn'],
195
+                    $user['userprincipalname'][0] : $user['dn'],
197 196
                 $post_password
198 197
             );
199 198
         } catch (\LdapRecord\LdapRecordException $e) {
@@ -202,7 +201,7 @@  discard block
 block discarded – undo
202 201
             echo prepareExchangedData(
203 202
                 array(
204 203
                     'error' => true,
205
-                    'message' => langHdl('error').' : '.(isset($error) === true ? $error->getErrorCode()." - ".$error->getErrorMessage(). "<br>".$error->getDiagnosticMessage() : $e),
204
+                    'message' => langHdl('error').' : '.(isset($error) === true ? $error->getErrorCode()." - ".$error->getErrorMessage()."<br>".$error->getDiagnosticMessage() : $e),
206 205
                 ),
207 206
                 'encode'
208 207
             );
Please login to merge, or discard this patch.
sources/core.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -57,16 +57,16 @@  discard block
 block discarded – undo
57 57
 {
58 58
     // Load AntiXSS
59 59
     $antiXss = new AntiXSS();
60
-    if (! headers_sent()) {    //If headers not sent yet... then do php redirect
61
-        header('Location: ' . $antiXss->xss_clean($url));
60
+    if (!headers_sent()) {    //If headers not sent yet... then do php redirect
61
+        header('Location: '.$antiXss->xss_clean($url));
62 62
     }
63 63
 
64 64
     //If headers are sent... do java redirect... if java disabled, do html redirect.
65 65
     echo '<script type="text/javascript">';
66
-    echo 'window.location.href="' . $antiXss->xss_clean($url) . '";';
66
+    echo 'window.location.href="'.$antiXss->xss_clean($url).'";';
67 67
     echo '</script>';
68 68
     echo '<noscript>';
69
-    echo '<meta http-equiv="refresh" content="0;url=' . $antiXss->xss_clean($url) . '" />';
69
+    echo '<meta http-equiv="refresh" content="0;url='.$antiXss->xss_clean($url).'" />';
70 70
     echo '</noscript>';
71 71
 }
72 72
 
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
     && isset($SETTINGS['enable_sts']) === true
93 93
     && (int) $SETTINGS['enable_sts'] === 1
94 94
 ) {
95
-    redirect('https://' . $server['http_host'] . $server['request_uri']);
95
+    redirect('https://'.$server['http_host'].$server['request_uri']);
96 96
 }
97 97
 
98 98
 // Load pwComplexity
@@ -115,11 +115,11 @@  discard block
 block discarded – undo
115 115
 // LOAD CPASSMAN SETTINGS
116 116
 if (
117 117
     isset($SETTINGS['cpassman_dir']) === true
118
-    && is_dir($SETTINGS['cpassman_dir'] . '/install') === true
118
+    && is_dir($SETTINGS['cpassman_dir'].'/install') === true
119 119
 ) {
120 120
     // Should we delete folder INSTALL?
121 121
     $row = DB::queryFirstRow(
122
-        'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type=%s AND intitule=%s',
122
+        'SELECT valeur FROM '.prefixTable('misc').' WHERE type=%s AND intitule=%s',
123 123
         'install',
124 124
         'clear_install_folder'
125 125
     );
@@ -137,11 +137,11 @@  discard block
 block discarded – undo
137 137
             if ($directories !== false) {
138 138
                 $files = array_diff($directories, ['.', '..']);
139 139
                 foreach ($files as $file) {
140
-                    if (is_dir($dir . '/' . $file)) {
141
-                        delTree($dir . '/' . $file);
140
+                    if (is_dir($dir.'/'.$file)) {
141
+                        delTree($dir.'/'.$file);
142 142
                     } else {
143 143
                         try {
144
-                            unlink($dir . '/' . $file);
144
+                            unlink($dir.'/'.$file);
145 145
                         } catch (Exception $e) {
146 146
                             // do nothing... php will ignore and continue
147 147
                         }
@@ -155,13 +155,13 @@  discard block
 block discarded – undo
155 155
             return false;
156 156
         }
157 157
 
158
-        if (is_dir($SETTINGS['cpassman_dir'] . '/install')) {
158
+        if (is_dir($SETTINGS['cpassman_dir'].'/install')) {
159 159
             // Set the permissions on the install directory and delete
160 160
             // is server Windows or Linux?
161 161
             if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') {
162
-                recursiveChmod($SETTINGS['cpassman_dir'] . '/install', 0755, 0440);
162
+                recursiveChmod($SETTINGS['cpassman_dir'].'/install', 0755, 0440);
163 163
             }
164
-            delTree($SETTINGS['cpassman_dir'] . '/install');
164
+            delTree($SETTINGS['cpassman_dir'].'/install');
165 165
         }
166 166
 
167 167
         // Delete temporary install table
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
 // Load Languages stuff
180 180
 if (isset($languagesList) === false) {
181 181
     $languagesList = [];
182
-    $rows = DB::query('SELECT * FROM ' . prefixTable('languages') . ' GROUP BY name, label, code, flag, id ORDER BY name ASC');
182
+    $rows = DB::query('SELECT * FROM '.prefixTable('languages').' GROUP BY name, label, code, flag, id ORDER BY name ASC');
183 183
     foreach ($rows as $record) {
184 184
         array_push($languagesList, $record['name']);
185 185
         if (isset($_SESSION['user']['user_language']) && $record['name'] === $_SESSION['user']['user_language']) {
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
237 237
 // CHECK IF SESSION EXISTS AND IF SESSION IS VALID
238 238
 if (empty($_SESSION['sessionDuration']) === false) {
239 239
     $dataSession = DB::queryFirstRow(
240
-        'SELECT key_tempo FROM ' . prefixTable('users') . ' WHERE id=%i',
240
+        'SELECT key_tempo FROM '.prefixTable('users').' WHERE id=%i',
241 241
         $_SESSION['user_id']
242 242
     );
243 243
 } else {
@@ -301,7 +301,7 @@  discard block
 block discarded – undo
301 301
     && (isset($_SESSION['user_admin']) === true && $_SESSION['user_admin'] === 1)
302 302
 ) {
303 303
     $row = DB::queryFirstRow(
304
-        'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type=%s_type AND intitule=%s_intitule',
304
+        'SELECT valeur FROM '.prefixTable('misc').' WHERE type=%s_type AND intitule=%s_intitule',
305 305
         [
306 306
             'type' => 'admin',
307 307
             'intitule' => 'teampass_version',
@@ -342,7 +342,7 @@  discard block
 block discarded – undo
342 342
 
343 343
         syslog(
344 344
             LOG_WARNING,
345
-            'Unlog user: ' . date('Y/m/d H:i:s') . " {$server['remote_addr']} ({$server['http_user_agent']})"
345
+            'Unlog user: '.date('Y/m/d H:i:s')." {$server['remote_addr']} ({$server['http_user_agent']})"
346 346
         );
347 347
         // erase session table
348 348
         $_SESSION = [];
@@ -393,7 +393,7 @@  discard block
 block discarded – undo
393 393
 if (isset($_SESSION['user_id']) === true && empty($_SESSION['user_id']) === false) {
394 394
     // query on user
395 395
     $data = DB::queryfirstrow(
396
-        'SELECT login, admin, gestionnaire, can_manage_all_users, groupes_visibles, groupes_interdits, fonction_id, last_connexion, roles_from_ad_groups FROM ' . prefixTable('users') . ' WHERE id=%i',
396
+        'SELECT login, admin, gestionnaire, can_manage_all_users, groupes_visibles, groupes_interdits, fonction_id, last_connexion, roles_from_ad_groups FROM '.prefixTable('users').' WHERE id=%i',
397 397
         $_SESSION['user_id']
398 398
     );
399 399
     //Check if user has been deleted or unlogged
@@ -439,7 +439,7 @@  discard block
 block discarded – undo
439 439
             $data['groupes_visibles'],
440 440
             $data['groupes_interdits'],
441 441
             $data['admin'],
442
-            is_null($data['roles_from_ad_groups']) === true ? $data['fonction_id'] : (empty($data['roles_from_ad_groups']) === true ? $data['fonction_id'] : $data['fonction_id'] . ';' . $data['roles_from_ad_groups']),
442
+            is_null($data['roles_from_ad_groups']) === true ? $data['fonction_id'] : (empty($data['roles_from_ad_groups']) === true ? $data['fonction_id'] : $data['fonction_id'].';'.$data['roles_from_ad_groups']),
443 443
             $SETTINGS
444 444
         );
445 445
         if (isset($_SESSION['can_create_root_folder']) === true && (int) $_SESSION['can_create_root_folder'] === 1) {
@@ -474,7 +474,7 @@  discard block
 block discarded – undo
474 474
     $_SESSION['item_fields'] = [];
475 475
     $rows = DB::query(
476 476
         'SELECT *
477
-            FROM ' . prefixTable('categories') . '
477
+            FROM ' . prefixTable('categories').'
478 478
             WHERE level=%i',
479 479
         '0'
480 480
     );
@@ -483,7 +483,7 @@  discard block
 block discarded – undo
483 483
         // get each field
484 484
         $rows2 = DB::query(
485 485
             'SELECT *
486
-            FROM ' . prefixTable('categories') . '
486
+            FROM ' . prefixTable('categories').'
487 487
             WHERE parent_id=%i
488 488
             ORDER BY `order` ASC',
489 489
             $record['id']
@@ -561,7 +561,7 @@  discard block
 block discarded – undo
561 561
 if (
562 562
     isset($SETTINGS['roles_allowed_to_print']) === true
563 563
     && isset($_SESSION['user_roles']) === true
564
-    && (! isset($_SESSION['temporary']['user_can_printout']) || empty($_SESSION['temporary']['user_can_printout']))
564
+    && (!isset($_SESSION['temporary']['user_can_printout']) || empty($_SESSION['temporary']['user_can_printout']))
565 565
 ) {
566 566
     foreach (explode(';', $SETTINGS['roles_allowed_to_print']) as $role) {
567 567
         if (in_array($role, $_SESSION['user_roles']) === true) {
@@ -571,5 +571,5 @@  discard block
 block discarded – undo
571 571
 }
572 572
 
573 573
 /* CHECK NUMBER OF USER ONLINE */
574
-DB::query('SELECT * FROM ' . prefixTable('users') . ' WHERE timestamp>=%i', time() - 600);
574
+DB::query('SELECT * FROM '.prefixTable('users').' WHERE timestamp>=%i', time() - 600);
575 575
 $_SESSION['nb_users_online'] = DB::count();
Please login to merge, or discard this patch.
sources/utilities.queries.php 1 patch
Spacing   +43 added lines, -43 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
 ) {
68 68
     // Not allowed page
69 69
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
70
-    include $SETTINGS['cpassman_dir'] . '/error.php';
70
+    include $SETTINGS['cpassman_dir'].'/error.php';
71 71
     exit;
72 72
 }
73 73
 
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
             $arrFolders = array();
122 122
             $rows = DB::query(
123 123
                 'SELECT valeur, intitule
124
-                FROM ' . prefixTable('misc') . '
124
+                FROM ' . prefixTable('misc').'
125 125
                 WHERE type  = %s',
126 126
                 'folder_deleted'
127 127
             );
@@ -143,10 +143,10 @@  discard block
 block discarded – undo
143 143
                 'SELECT u.login as login, u.name as name, u.lastname as lastname,
144 144
                 i.id as id, i.label as label,
145 145
                 i.id_tree as id_tree, l.date as date, n.title as folder_title
146
-                FROM ' . prefixTable('log_items') . ' as l
147
-                INNER JOIN ' . prefixTable('items') . ' as i ON (l.id_item=i.id)
148
-                LEFT JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id)
149
-                LEFT JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree=n.id)
146
+                FROM ' . prefixTable('log_items').' as l
147
+                INNER JOIN ' . prefixTable('items').' as i ON (l.id_item=i.id)
148
+                LEFT JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id)
149
+                LEFT JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree=n.id)
150 150
                 WHERE i.inactif = %i
151 151
                 AND l.action = %s',
152 152
                 1,
@@ -168,7 +168,7 @@  discard block
 block discarded – undo
168 168
                             'label' => $record['label'],
169 169
                             'date' => date($SETTINGS['date_format'], (int) $record['date']),
170 170
                             'login' => $record['login'],
171
-                            'name' => $record['name'] . ' ' . $record['lastname'],
171
+                            'name' => $record['name'].' '.$record['lastname'],
172 172
                             'folder_label' => $record['folder_title'],
173 173
                             'folder_deleted' => $thisFolder,
174 174
                         )
@@ -226,10 +226,10 @@  discard block
 block discarded – undo
226 226
             foreach ($post_folders as $folderId) {
227 227
                 $data = DB::queryfirstrow(
228 228
                     'SELECT valeur
229
-                    FROM ' . prefixTable('misc') . "
229
+                    FROM ' . prefixTable('misc')."
230 230
                     WHERE type = 'folder_deleted'
231 231
                     AND intitule = %s",
232
-                    'f' . $folderId
232
+                    'f'.$folderId
233 233
                 );
234 234
                 if ((int) $data['valeur'] !== 0) {
235 235
                     $folderData = explode(', ', $data['valeur']);
@@ -256,7 +256,7 @@  discard block
 block discarded – undo
256 256
                         prefixTable('misc'),
257 257
                         'type = %s AND intitule = %s',
258 258
                         'folder_deleted',
259
-                        'f' . $folderId
259
+                        'f'.$folderId
260 260
                     );
261 261
 
262 262
                     // Restore all items in this folder
@@ -272,7 +272,7 @@  discard block
 block discarded – undo
272 272
                     // Get list of all items in thos folder
273 273
                     $items = DB::query(
274 274
                         'SELECT id
275
-                        FROM ' . prefixTable('items') . '
275
+                        FROM ' . prefixTable('items').'
276 276
                         WHERE id_tree = %i',
277 277
                         $folderId
278 278
                     );
@@ -361,10 +361,10 @@  discard block
 block discarded – undo
361 361
             foreach ($post_folders as $folderId) {
362 362
                 $data = DB::queryfirstrow(
363 363
                     'SELECT valeur
364
-                    FROM ' . prefixTable('misc') . "
364
+                    FROM ' . prefixTable('misc')."
365 365
                     WHERE type = 'folder_deleted'
366 366
                     AND intitule = %s",
367
-                    'f' . $folderId
367
+                    'f'.$folderId
368 368
                 );
369 369
                 if ((int) $data['valeur'] !== 0) {
370 370
                     $folderData = explode(', ', $data['valeur']);
@@ -397,7 +397,7 @@  discard block
 block discarded – undo
397 397
                         prefixTable('misc'),
398 398
                         'type = %s AND intitule = %s',
399 399
                         'folder_deleted',
400
-                        'f' . $folderData[0]
400
+                        'f'.$folderData[0]
401 401
                     );
402 402
 
403 403
                     // Delete all items in this folder
@@ -411,7 +411,7 @@  discard block
 block discarded – undo
411 411
                     // Get list of all items in thos folder
412 412
                     $items = DB::query(
413 413
                         'SELECT id
414
-                        FROM ' . prefixTable('items') . '
414
+                        FROM ' . prefixTable('items').'
415 415
                         WHERE id_tree = %i',
416 416
                         $folderData[0]
417 417
                     );
@@ -500,7 +500,7 @@  discard block
 block discarded – undo
500 500
             ) {
501 501
                 if ($post_log_type === 'items') {
502 502
                     DB::query(
503
-                        'SELECT * FROM ' . prefixTable('log_items') . '
503
+                        'SELECT * FROM '.prefixTable('log_items').'
504 504
                         WHERE (date BETWEEN %i AND %i)'
505 505
                         . ($post_filter_action === 'all' ? '' : ' AND action = "'.$post_filter_action.'"')
506 506
                         . ((int) $post_filter_user === -1 ? '' : ' AND id_user = '.(int) $post_filter_user),
@@ -520,7 +520,7 @@  discard block
 block discarded – undo
520 520
                 } elseif ($post_log_type === 'connections') {
521 521
                     //db::debugmode(true);
522 522
                     DB::query(
523
-                        'SELECT * FROM ' . prefixTable('log_system') . '
523
+                        'SELECT * FROM '.prefixTable('log_system').'
524 524
                         WHERE type=%s '
525 525
                         . 'AND (date BETWEEN %i AND %i)'
526 526
                         . ($post_filter_action === 'all' ? '' : ' AND action = '.$post_filter_action)
@@ -543,7 +543,7 @@  discard block
 block discarded – undo
543 543
                     );
544 544
                 } elseif ($post_log_type === 'errors') {
545 545
                     DB::query(
546
-                        'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' .
546
+                        'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '.
547 547
                             'AND (date BETWEEN %i AND %i)',
548 548
                         'error',
549 549
                         $post_date_from,
@@ -560,7 +560,7 @@  discard block
 block discarded – undo
560 560
                     );
561 561
                 } elseif ($post_log_type === 'copy') {
562 562
                     DB::query(
563
-                        'SELECT * FROM ' . prefixTable('log_items') . ' WHERE action=%s ' .
563
+                        'SELECT * FROM '.prefixTable('log_items').' WHERE action=%s '.
564 564
                             'AND (date BETWEEN %i AND %i)',
565 565
                         'at_copy',
566 566
                         $post_date_from,
@@ -577,7 +577,7 @@  discard block
 block discarded – undo
577 577
                     );
578 578
                 } elseif ($post_log_type === 'admin') {
579 579
                     DB::query(
580
-                        'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' .
580
+                        'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '.
581 581
                             'AND (date BETWEEN %i AND %i)',
582 582
                         'admin_action',
583 583
                         $post_date_from,
@@ -594,7 +594,7 @@  discard block
 block discarded – undo
594 594
                     );
595 595
                 } elseif ($post_log_type === 'failed') {
596 596
                     DB::query(
597
-                        'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' .
597
+                        'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '.
598 598
                             'AND (date BETWEEN %i AND %i)',
599 599
                         'failed_auth',
600 600
                         $post_date_from,
@@ -664,7 +664,7 @@  discard block
 block discarded – undo
664 664
 
665 665
             $tasks = DB::query(
666 666
                 'SELECT *
667
-                FROM ' . prefixTable('processes_tasks') . '
667
+                FROM ' . prefixTable('processes_tasks').'
668 668
                 WHERE process_id = %i',
669 669
                 $post_id
670 670
             );
@@ -672,37 +672,37 @@  discard block
 block discarded – undo
672 672
             // Get some values
673 673
             DB::query(
674 674
                 'SELECT id
675
-                FROM ' . prefixTable('items') . '
675
+                FROM ' . prefixTable('items').'
676 676
                 WHERE perso = 0'
677 677
             );
678 678
             $items_number = DB::count();
679 679
 
680 680
             DB::query(
681 681
                 'SELECT increment_id
682
-                FROM ' . prefixTable('log_items') . '
682
+                FROM ' . prefixTable('log_items').'
683 683
                 WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"'
684 684
             );
685 685
             $logs_number = DB::count();
686 686
 
687 687
             DB::query(
688 688
                 'SELECT id
689
-                FROM ' . prefixTable('categories_items') . '
689
+                FROM ' . prefixTable('categories_items').'
690 690
                 WHERE encryption_type = "teampass_aes"'
691 691
             );
692
-            $items_categories= DB::count();
692
+            $items_categories = DB::count();
693 693
 
694 694
             DB::query(
695 695
                 'SELECT id
696 696
                 FROM ' . prefixTable('suggestion')
697 697
             );
698
-            $items_suggestions= DB::count();
698
+            $items_suggestions = DB::count();
699 699
 
700 700
             DB::query(
701 701
                 'SELECT id
702
-                FROM ' . prefixTable('files') . '
703
-                WHERE status = "' . TP_ENCRYPTION_NAME . '"'
702
+                FROM ' . prefixTable('files').'
703
+                WHERE status = "' . TP_ENCRYPTION_NAME.'"'
704 704
             );
705
-            $items_files= DB::count();
705
+            $items_files = DB::count();
706 706
 
707 707
 
708 708
             // get list
@@ -717,26 +717,26 @@  discard block
 block discarded – undo
717 717
                     if ($detail['step'] === 'step0' || (int) $detail['index'] === 0) {
718 718
                         $task_progress = '0%';
719 719
                     } elseif ($detail['step'] === 'step10') {
720
-                        $task_progress = pourcentage($detail['index'], 1, 100) .'%';
720
+                        $task_progress = pourcentage($detail['index'], 1, 100).'%';
721 721
                     } elseif ($detail['step'] === 'step20') {
722
-                        $task_progress = pourcentage($detail['index'], $items_number, 100) .'%';
722
+                        $task_progress = pourcentage($detail['index'], $items_number, 100).'%';
723 723
                     } elseif ($detail['step'] === 'step30') {
724
-                        $task_progress = pourcentage($detail['index'], $logs_number, 100) .'%';
724
+                        $task_progress = pourcentage($detail['index'], $logs_number, 100).'%';
725 725
                     } elseif ($detail['step'] === 'step40') {
726
-                        $task_progress = pourcentage($detail['index'], $items_categories, 100) .'%';
726
+                        $task_progress = pourcentage($detail['index'], $items_categories, 100).'%';
727 727
                     } elseif ($detail['step'] === 'step50') {
728
-                        $task_progress = pourcentage($detail['index'], $items_suggestions, 100) .'%';
728
+                        $task_progress = pourcentage($detail['index'], $items_suggestions, 100).'%';
729 729
                     } elseif ($detail['step'] === 'step60') {
730
-                        $task_progress = pourcentage($detail['index'], $items_files, 100) .'%';
730
+                        $task_progress = pourcentage($detail['index'], $items_files, 100).'%';
731 731
                     }
732 732
                 }
733 733
 
734 734
                 array_push(
735 735
                     $ret,
736 736
                     [
737
-                        'created_at' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $task['created_at']),
738
-                        'updated_at' => is_null($task['updated_at']) === false ? date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $task['updated_at']) : '',
739
-                        'finished_at' => is_null($task['finished_at']) === false ? date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $task['finished_at']) : '',
737
+                        'created_at' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $task['created_at']),
738
+                        'updated_at' => is_null($task['updated_at']) === false ? date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $task['updated_at']) : '',
739
+                        'finished_at' => is_null($task['finished_at']) === false ? date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $task['finished_at']) : '',
740 740
                         'progress' => $task['finished_at'] !== null ? '100%' : $task_progress,
741 741
                         'is_in_progress' => (int) $task['is_in_progress'],
742 742
                         'step' => 'step'.$i,
@@ -785,19 +785,19 @@  discard block
 block discarded – undo
785 785
             // Get info about task
786 786
             $taskInfo = DB::queryfirstrow(
787 787
                 'SELECT p.process_type as process_type
788
-                FROM ' . prefixTable('processes') . ' as p
788
+                FROM ' . prefixTable('processes').' as p
789 789
                 WHERE p.increment_id = %i',
790 790
                 $post_id
791 791
             );
792 792
             if ($taskInfo !== null) {
793 793
                 // delete task
794 794
                 DB::query(
795
-                    'DELETE FROM ' . prefixTable('processes_tasks') . '
795
+                    'DELETE FROM '.prefixTable('processes_tasks').'
796 796
                     WHERE process_id = %i',
797 797
                     $post_id
798 798
                 );
799 799
                 DB::query(
800
-                    'DELETE FROM ' . prefixTable('processes') . '
800
+                    'DELETE FROM '.prefixTable('processes').'
801 801
                     WHERE increment_id = %i',
802 802
                     $post_id
803 803
                 );
@@ -864,7 +864,7 @@  discard block
 block discarded – undo
864 864
                         ->setDayOfMonth('*')
865 865
                         ->setMonths('*')
866 866
                         ->setDayOfWeek('*')
867
-                        ->setTaskCommandLine($phpBinaryPath . ' ' . $SETTINGS['cpassman_dir'] . '/sources/scheduler.php')
867
+                        ->setTaskCommandLine($phpBinaryPath.' '.$SETTINGS['cpassman_dir'].'/sources/scheduler.php')
868 868
                         ->setComments('Teampass scheduler');
869 869
                     
870 870
                     $crontabRepository->addJob($crontabJob);
Please login to merge, or discard this patch.