Passed
Push — wip_sessions ( 2e0cc8...014f47 )
by Nils
05:41
created
sources/users.datatable.php 1 patch
Spacing   +12 added lines, -14 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->set('system-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
 
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
     if (isset($order['column']) && preg_match('#^(asc|desc)$#i', $order['dir'])) {
120 120
         $columnIndex = filter_var($order['column'], FILTER_SANITIZE_NUMBER_INT);
121 121
         $dir = filter_var($order['dir'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
122
-        $sOrder .= $aColumns[$columnIndex] . ' ' . $dir . ', ';
122
+        $sOrder .= $aColumns[$columnIndex].' '.$dir.', ';
123 123
     }
124 124
 
125 125
     $sOrder = substr_replace($sOrder, '', -2);
@@ -143,15 +143,15 @@  discard block
 block discarded – undo
143 143
 
144 144
 if ($letter !== '' && $letter !== 'None') {
145 145
     $sWhere .= ' AND (';
146
-    $sWhere .= $aColumns[1] . " LIKE '" . $letter . "%' OR ";
147
-    $sWhere .= $aColumns[2] . " LIKE '" . $letter . "%' OR ";
148
-    $sWhere .= $aColumns[3] . " LIKE '" . $letter . "%' ";
146
+    $sWhere .= $aColumns[1]." LIKE '".$letter."%' OR ";
147
+    $sWhere .= $aColumns[2]." LIKE '".$letter."%' OR ";
148
+    $sWhere .= $aColumns[3]." LIKE '".$letter."%' ";
149 149
     $sWhere .= ')';
150 150
 } elseif ($searchValue !== '') {
151 151
     $sWhere .= ' AND (';
152
-    $sWhere .= $aColumns[1] . " LIKE '" . $searchValue . "%' OR ";
153
-    $sWhere .= $aColumns[2] . " LIKE '" . $searchValue . "%' OR ";
154
-    $sWhere .= $aColumns[3] . " LIKE '" . $searchValue . "%' ";
152
+    $sWhere .= $aColumns[1]." LIKE '".$searchValue."%' OR ";
153
+    $sWhere .= $aColumns[2]." LIKE '".$searchValue."%' OR ";
154
+    $sWhere .= $aColumns[3]." LIKE '".$searchValue."%' ";
155 155
     $sWhere .= ')';
156 156
 }
157 157
 
@@ -239,22 +239,20 @@  discard block
 block discarded – undo
239 239
 
240 240
         // Get some infos about user
241 241
         $userDisplayInfos = 
242
-            (isset($userDate['date']) ? '<i class=\"fas fa-calendar-day infotip text-info ml-2\" title=\"'.$lang->get('creation_date').': '.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $userDate['date']).'\"></i>' : '')
242
+            (isset($userDate['date']) ? '<i class=\"fas fa-calendar-day infotip text-info ml-2\" title=\"'.$lang->get('creation_date').': '.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $userDate['date']).'\"></i>' : '')
243 243
             .
244 244
             ((int) $record['last_connexion'] > 0 ? '<i class=\"far fa-clock infotip text-info ml-2\" title=\"'.$lang->get('index_last_seen').": ".
245
-            date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['last_connexion']).'\"></i>' : '')
245
+            date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['last_connexion']).'\"></i>' : '')
246 246
             .
247 247
             ((int) $record['user_ip'] > 0 ? '<i class=\"fas fa-street-view infotip text-info ml-1\" title=\"'.$lang->get('ip').": ".($record['user_ip']).'\"></i>' : '')
248 248
             .
249 249
             ($record['auth_type'] === 'ldap' ? '<i class=\"far fa-address-book infotip text-warning ml-1\" title=\"'.$lang->get('managed_through_ad').'\"></i>' : '')
250 250
             .
251 251
             ((in_array($record['id'], [OTV_USER_ID, TP_USER_ID, SSH_USER_ID, API_USER_ID]) === false && (int) $record['admin'] !== 1 && ((int) $SETTINGS['duo'] === 1 || (int) $SETTINGS['google_authentication'] === 1)) ?
252
-                ((int) $record['mfa_enabled'] === 1 ? '' : '<i class=\"fa-solid fa-fingerprint infotip ml-1\" style=\"color:Tomato\" title=\"'.$lang->get('mfa_disabled_for_user').'\"></i>') :
253
-                ''
252
+                ((int) $record['mfa_enabled'] === 1 ? '' : '<i class=\"fa-solid fa-fingerprint infotip ml-1\" style=\"color:Tomato\" title=\"'.$lang->get('mfa_disabled_for_user').'\"></i>') : ''
254 253
             ).
255 254
             ((in_array($record['id'], [OTV_USER_ID, TP_USER_ID, SSH_USER_ID, API_USER_ID]) === false && (int) $record['admin'] !== 1 && is_null($record['keys_recovery_time']) === true) ? 
256
-                '<i class=\"fa-solid fa-download infotip ml-1\" style=\"color:Tomato\" title=\"'.$lang->get('recovery_keys_not_downloaded').'\"></i>' :
257
-                ''
255
+                '<i class=\"fa-solid fa-download infotip ml-1\" style=\"color:Tomato\" title=\"'.$lang->get('recovery_keys_not_downloaded').'\"></i>' : ''
258 256
             );
259 257
         
260 258
         $sOutput .= '["<span data-id=\"'.$record['id'].'\" data-fullname=\"'.
Please login to merge, or discard this patch.
sources/expired.datatables.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 ) {
74 74
     // Not allowed page
75 75
     $session->set('system-error_code', ERR_NOT_ALLOWED);
76
-    include $SETTINGS['cpassman_dir'] . '/error.php';
76
+    include $SETTINGS['cpassman_dir'].'/error.php';
77 77
     exit;
78 78
 }
79 79
 
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
 // Is a date sent?
99 99
 $dateCriteria = $request->query->get('dateCriteria');
100 100
 if ($dateCriteria !== null && !empty($dateCriteria)) {
101
-    $sWhere .= ' AND a.del_value < ' . round(filter_var($dateCriteria, FILTER_SANITIZE_NUMBER_INT) / 1000, 0);
101
+    $sWhere .= ' AND a.del_value < '.round(filter_var($dateCriteria, FILTER_SANITIZE_NUMBER_INT) / 1000, 0);
102 102
 }
103 103
 //echo $sWhere;
104 104
 /* BUILD QUERY */
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
 $start = $request->query->getInt('start', 0);
108 108
 $length = $request->query->getInt('length', -1);
109 109
 if ($length !== -1) {
110
-    $sLimit = ' LIMIT ' . $start . ', ' . $length;
110
+    $sLimit = ' LIMIT '.$start.', '.$length;
111 111
 }
112 112
 
113 113
 //Ordering
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
         $columnIndex = filter_var($order[0]['column'], FILTER_SANITIZE_NUMBER_INT);
121 121
 
122 122
         if (array_key_exists($columnIndex, $aColumns)) {
123
-            $sOrder .= $aColumns[$columnIndex] . ' ' . $order[0]['dir'];
123
+            $sOrder .= $aColumns[$columnIndex].' '.$order[0]['dir'];
124 124
         }
125 125
 
126 126
         // Supprimez la virgule finale si elle existe
@@ -145,9 +145,9 @@  discard block
 block discarded – undo
145 145
 
146 146
     if ($letter !== '' && $letter !== 'None') {
147 147
         $sWhere .= ' AND ';
148
-        $sWhere .= $aColumns[1] . " LIKE '" . $letter . "%' OR ";
149
-        $sWhere .= $aColumns[2] . " LIKE '" . $letter . "%' OR ";
150
-        $sWhere .= $aColumns[3] . " LIKE '" . $letter . "%' ";
148
+        $sWhere .= $aColumns[1]." LIKE '".$letter."%' OR ";
149
+        $sWhere .= $aColumns[2]." LIKE '".$letter."%' OR ";
150
+        $sWhere .= $aColumns[3]." LIKE '".$letter."%' ";
151 151
     }
152 152
 }
153 153
 
@@ -159,26 +159,26 @@  discard block
 block discarded – undo
159 159
 
160 160
         if ($searchValue !== '') {
161 161
             $sWhere = ' AND ';
162
-            $sWhere .= $aColumns[1] . " LIKE '" . $searchValue . "%' OR ";
163
-            $sWhere .= $aColumns[2] . " LIKE '" . $searchValue . "%' OR ";
164
-            $sWhere .= $aColumns[3] . " LIKE '" . $searchValue . "%' ";
162
+            $sWhere .= $aColumns[1]." LIKE '".$searchValue."%' OR ";
163
+            $sWhere .= $aColumns[2]." LIKE '".$searchValue."%' OR ";
164
+            $sWhere .= $aColumns[3]." LIKE '".$searchValue."%' ";
165 165
         }
166 166
     }
167 167
 }
168 168
 
169 169
 $rows = DB::query(
170 170
     'SELECT a.item_id, i.label, a.del_value, i.id_tree
171
-    FROM ' . prefixTable('automatic_del') . ' AS a
172
-    INNER JOIN ' . prefixTable('items') . ' AS i ON (i.id = a.item_id)' .
171
+    FROM ' . prefixTable('automatic_del').' AS a
172
+    INNER JOIN ' . prefixTable('items').' AS i ON (i.id = a.item_id)'.
173 173
     $sWhere.
174 174
     (string) $sOrder
175 175
 );
176 176
 $iTotal = DB::count();
177 177
 $rows = DB::query(
178 178
     'SELECT a.item_id, i.label, a.del_value, i.id_tree
179
-    FROM ' . prefixTable('automatic_del') . ' AS a
180
-    INNER JOIN ' . prefixTable('items') . ' AS i ON (i.id = a.item_id)' .
181
-        $sWhere .
179
+    FROM ' . prefixTable('automatic_del').' AS a
180
+    INNER JOIN ' . prefixTable('items').' AS i ON (i.id = a.item_id)'.
181
+        $sWhere.
182 182
         $sLimit
183 183
 );
184 184
 $iFilteredTotal = DB::count();
@@ -196,18 +196,18 @@  discard block
 block discarded – undo
196 196
     // start the line
197 197
     $sOutput .= '[';
198 198
     // Column 1
199
-    $sOutput .= '"<i class=\"fas fa-external-link-alt pointer text-primary mr-2\" onclick=\"showItemCard($(this))\" data-item-id=\"' . $record['item_id'] . '\"  data-item-tree-id=\"' . $record['id_tree'] . '\"></i>", ';
199
+    $sOutput .= '"<i class=\"fas fa-external-link-alt pointer text-primary mr-2\" onclick=\"showItemCard($(this))\" data-item-id=\"'.$record['item_id'].'\"  data-item-tree-id=\"'.$record['id_tree'].'\"></i>", ';
200 200
     // Column 2
201
-    $sOutput .= '"' . $record['label'] . '", ';
201
+    $sOutput .= '"'.$record['label'].'", ';
202 202
     // Column 3
203
-    $sOutput .= '"' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['del_value']) . '", ';
203
+    $sOutput .= '"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['del_value']).'", ';
204 204
     // Column 4
205 205
     $path = [];
206 206
     $treeDesc = $tree->getPath($record['id_tree'], true);
207 207
     foreach ($treeDesc as $t) {
208 208
         array_push($path, $t->title);
209 209
     }
210
-    $sOutput .= '"' . implode('<i class=\"fas fa-angle-right ml-1 mr-1\"></i>', $path) . '"],';
210
+    $sOutput .= '"'.implode('<i class=\"fas fa-angle-right ml-1 mr-1\"></i>', $path).'"],';
211 211
 }
212 212
 
213 213
 if ($iTotal > 0) {
@@ -220,4 +220,4 @@  discard block
 block discarded – undo
220 220
 }
221 221
 
222 222
 // finalize output
223
-echo '{"recordsTotal": ' . $iTotal . ', "recordsFiltered": ' . $iFilteredTotal . ', "data": ' . $sOutput;
223
+echo '{"recordsTotal": '.$iTotal.', "recordsFiltered": '.$iFilteredTotal.', "data": '.$sOutput;
Please login to merge, or discard this patch.
sources/logs.datatables.php 1 patch
Spacing   +65 added lines, -66 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 ) {
72 72
     // Not allowed page
73 73
     $session->set('system-error_code', ERR_NOT_ALLOWED);
74
-    include $SETTINGS['cpassman_dir'] . '/error.php';
74
+    include $SETTINGS['cpassman_dir'].'/error.php';
75 75
     exit;
76 76
 }
77 77
 
@@ -115,9 +115,9 @@  discard block
 block discarded – undo
115 115
 
116 116
             $columnIndex = filter_var($order['column'], FILTER_SANITIZE_NUMBER_INT);
117 117
             $dir = filter_var($order['dir'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
118
-            $sOrder = 'ORDER BY ' . $aColumns[$columnIndex] . ' ' . $dir . ' ';
118
+            $sOrder = 'ORDER BY '.$aColumns[$columnIndex].' '.$dir.' ';
119 119
         } else {
120
-            $sOrder = 'ORDER BY ' . $aColumns[0] . ' DESC';
120
+            $sOrder = 'ORDER BY '.$aColumns[0].' DESC';
121 121
         }
122 122
     }
123 123
 
@@ -128,9 +128,9 @@  discard block
 block discarded – undo
128 128
         if ($searchValue !== '') {
129 129
             $sWhere .= ' AND (';
130 130
             foreach ($aColumns as $column) {
131
-                $sWhere .= $column . " LIKE '%" . $searchValue . "%' OR ";
131
+                $sWhere .= $column." LIKE '%".$searchValue."%' OR ";
132 132
             }
133
-            $sWhere = substr_replace($sWhere, '', -3) . ')';
133
+            $sWhere = substr_replace($sWhere, '', -3).')';
134 134
         }
135 135
     }
136 136
 
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
            * Output
156 156
         */
157 157
     $sOutput = '{';
158
-    $sOutput .= '"sEcho": '. (int) $request->query->get('draw') . ', ';
158
+    $sOutput .= '"sEcho": '.(int) $request->query->get('draw').', ';
159 159
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
160 160
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
161 161
     $sOutput .= '"aaData": ';
@@ -194,9 +194,9 @@  discard block
 block discarded – undo
194 194
 
195 195
         $columnIndex = filter_var($order['column'], FILTER_SANITIZE_NUMBER_INT);
196 196
         $dir = filter_var($order['dir'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
197
-        $sOrder = 'ORDER BY ' . $aColumns[$columnIndex] . ' ' . $dir . ' ';
197
+        $sOrder = 'ORDER BY '.$aColumns[$columnIndex].' '.$dir.' ';
198 198
     } else {
199
-        $sOrder = 'ORDER BY ' . $aColumns[0] . ' DESC';
199
+        $sOrder = 'ORDER BY '.$aColumns[0].' DESC';
200 200
     }
201 201
 
202 202
     // Filtering
@@ -205,9 +205,9 @@  discard block
 block discarded – undo
205 205
     if ($sSearch !== '') {
206 206
         $sWhere .= ' AND (';
207 207
         foreach ($aColumns as $i => $column) {
208
-            $sWhere .= $column . " LIKE '%". filter_var($sSearch, FILTER_SANITIZE_FULL_SPECIAL_CHARS) . "%' OR ";
208
+            $sWhere .= $column." LIKE '%".filter_var($sSearch, FILTER_SANITIZE_FULL_SPECIAL_CHARS)."%' OR ";
209 209
         }
210
-        $sWhere = substr_replace($sWhere, '', -3) . ')';
210
+        $sWhere = substr_replace($sWhere, '', -3).')';
211 211
     }
212 212
 
213 213
     $iTotal = DB::queryFirstField(
@@ -230,7 +230,7 @@  discard block
 block discarded – undo
230 230
     $iFilteredTotal = DB::count();
231 231
     // Output
232 232
     $sOutput = '{';
233
-    $sOutput .= '"sEcho": '. (int) $request->query->get('draw') . ', ';
233
+    $sOutput .= '"sEcho": '.(int) $request->query->get('draw').', ';
234 234
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
235 235
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
236 236
     $sOutput .= '"aaData": ';
@@ -269,9 +269,9 @@  discard block
 block discarded – undo
269 269
 
270 270
         $columnIndex = filter_var($order['column'], FILTER_SANITIZE_NUMBER_INT);
271 271
         $dir = filter_var($order['dir'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
272
-        $sOrder = 'ORDER BY ' . $aColumns[$columnIndex] . ' ' . $dir . ' ';
272
+        $sOrder = 'ORDER BY '.$aColumns[$columnIndex].' '.$dir.' ';
273 273
     } else {
274
-        $sOrder = 'ORDER BY ' . $aColumns[0] . ' DESC';
274
+        $sOrder = 'ORDER BY '.$aColumns[0].' DESC';
275 275
     }
276 276
 
277 277
     // Filtering
@@ -280,9 +280,9 @@  discard block
 block discarded – undo
280 280
     if ($searchValue !== '') {
281 281
         $sWhere .= ' AND (';
282 282
         foreach ($aColumns as $column) {
283
-            $sWhere .= $column . " LIKE '%" . filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS) . "%' OR ";
283
+            $sWhere .= $column." LIKE '%".filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS)."%' OR ";
284 284
         }
285
-        $sWhere = substr_replace($sWhere, '', -3) . ')';
285
+        $sWhere = substr_replace($sWhere, '', -3).')';
286 286
     }
287 287
 
288 288
     $iTotal = DB::queryFirstField(
@@ -305,7 +305,7 @@  discard block
 block discarded – undo
305 305
     $iFilteredTotal = DB::count();
306 306
     // Output
307 307
     $sOutput = '{';
308
-    $sOutput .= '"sEcho": '. (int) $request->query->get('draw') . ', ';
308
+    $sOutput .= '"sEcho": '.(int) $request->query->get('draw').', ';
309 309
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
310 310
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
311 311
     $sOutput .= '"aaData": ';
@@ -344,9 +344,9 @@  discard block
 block discarded – undo
344 344
         
345 345
         $columnIndex = filter_var($order['column'], FILTER_SANITIZE_NUMBER_INT);
346 346
         $dir = filter_var($order['dir'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
347
-        $sOrder = 'ORDER BY ' . $aColumns[$columnIndex] . ' ' . $dir . ' ';
347
+        $sOrder = 'ORDER BY '.$aColumns[$columnIndex].' '.$dir.' ';
348 348
     } else {
349
-        $sOrder = 'ORDER BY ' . $aColumns[0] . ' DESC';
349
+        $sOrder = 'ORDER BY '.$aColumns[0].' DESC';
350 350
     }
351 351
 
352 352
     // Filtering
@@ -355,9 +355,9 @@  discard block
 block discarded – undo
355 355
     if ($searchValue !== '') {
356 356
         $sWhere .= ' AND (';
357 357
         foreach ($aColumns as $column) {
358
-            $sWhere .= $column . " LIKE '%" . filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS) . "%' OR ";
358
+            $sWhere .= $column." LIKE '%".filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS)."%' OR ";
359 359
         }
360
-        $sWhere = substr_replace($sWhere, '', -3) . ')';
360
+        $sWhere = substr_replace($sWhere, '', -3).')';
361 361
     }
362 362
 
363 363
     $iTotal = DB::queryFirstField(
@@ -379,7 +379,7 @@  discard block
 block discarded – undo
379 379
          * Output
380 380
         */
381 381
     $sOutput = '{';
382
-    $sOutput .= '"sEcho": '. (int) $request->query->get('draw') . ', ';
382
+    $sOutput .= '"sEcho": '.(int) $request->query->get('draw').', ';
383 383
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
384 384
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
385 385
     $sOutput .= '"aaData": [ ';
@@ -447,9 +447,9 @@  discard block
 block discarded – undo
447 447
 
448 448
         $columnIndex = filter_var($order['column'], FILTER_SANITIZE_NUMBER_INT);
449 449
         $dir = filter_var($order['dir'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
450
-        $sOrder = 'ORDER BY ' . $aColumns[$columnIndex] . ' ' . $dir . ' ';
450
+        $sOrder = 'ORDER BY '.$aColumns[$columnIndex].' '.$dir.' ';
451 451
     } else {
452
-        $sOrder = 'ORDER BY ' . $aColumns[0] . ' DESC';
452
+        $sOrder = 'ORDER BY '.$aColumns[0].' DESC';
453 453
     }
454 454
 
455 455
     // Filtering
@@ -459,12 +459,12 @@  discard block
 block discarded – undo
459 459
     if ($searchValue !== '') {
460 460
         $sWhere .= ' WHERE (';
461 461
         if (isset($search['column']) && $search['column'] !== 'all') {
462
-            $sWhere .= $search['column'] . " LIKE '%" . filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS) . "%') ";
462
+            $sWhere .= $search['column']." LIKE '%".filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS)."%') ";
463 463
         } else {
464 464
             foreach ($aColumns as $column) {
465
-                $sWhere .= $column . " LIKE '%" . filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS) . "%' OR ";
465
+                $sWhere .= $column." LIKE '%".filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS)."%' OR ";
466 466
             }
467
-            $sWhere = substr($sWhere, 0, -3) . ') ';
467
+            $sWhere = substr($sWhere, 0, -3).') ';
468 468
         }
469 469
     }
470 470
     
@@ -493,7 +493,7 @@  discard block
 block discarded – undo
493 493
     $iFilteredTotal = DB::count();
494 494
     // Output
495 495
     $sOutput = '{';
496
-    $sOutput .= '"sEcho": '. (int) $request->query->get('draw') . ', ';
496
+    $sOutput .= '"sEcho": '.(int) $request->query->get('draw').', ';
497 497
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
498 498
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
499 499
     $sOutput .= '"aaData": [ ';
@@ -542,9 +542,9 @@  discard block
 block discarded – undo
542 542
 
543 543
         $columnIndex = filter_var($order['column'], FILTER_SANITIZE_NUMBER_INT);
544 544
         $dir = filter_var($order['dir'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
545
-        $sOrder = 'ORDER BY ' . $aColumns[$columnIndex] . ' ' . $dir . ' ';
545
+        $sOrder = 'ORDER BY '.$aColumns[$columnIndex].' '.$dir.' ';
546 546
     } else {
547
-        $sOrder = 'ORDER BY ' . $aColumns[0] . ' DESC';
547
+        $sOrder = 'ORDER BY '.$aColumns[0].' DESC';
548 548
     }
549 549
 
550 550
     // Filtering
@@ -553,9 +553,9 @@  discard block
 block discarded – undo
553 553
     if ($searchValue !== '') {
554 554
         $sWhere .= ' AND (';
555 555
         foreach ($aColumns as $column) {
556
-            $sWhere .= $column . " LIKE '%" . filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS) . "%' OR ";
556
+            $sWhere .= $column." LIKE '%".filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS)."%' OR ";
557 557
         }
558
-        $sWhere = substr_replace($sWhere, '', -3) . ')';
558
+        $sWhere = substr_replace($sWhere, '', -3).')';
559 559
     }
560 560
 
561 561
     $iTotal = DB::queryFirstField(
@@ -576,7 +576,7 @@  discard block
 block discarded – undo
576 576
         $iTotal = 0;
577 577
     }
578 578
     $sOutput = '{';
579
-    $sOutput .= '"sEcho": '. (int) $request->query->get('draw') . ', ';
579
+    $sOutput .= '"sEcho": '.(int) $request->query->get('draw').', ';
580 580
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
581 581
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
582 582
     $sOutput .= '"aaData": ';
@@ -618,9 +618,9 @@  discard block
 block discarded – undo
618 618
 
619 619
         $columnIndex = filter_var($order['column'], FILTER_SANITIZE_NUMBER_INT);
620 620
         $dir = filter_var($order['dir'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
621
-        $sOrder = 'ORDER BY ' . $aColumns[$columnIndex] . ' ' . $dir . ' ';
621
+        $sOrder = 'ORDER BY '.$aColumns[$columnIndex].' '.$dir.' ';
622 622
     } else {
623
-        $sOrder = 'ORDER BY ' . $aColumns[0] . ' DESC';
623
+        $sOrder = 'ORDER BY '.$aColumns[0].' DESC';
624 624
     }
625 625
 
626 626
     // Filtering
@@ -629,9 +629,9 @@  discard block
 block discarded – undo
629 629
     if ($searchValue !== '') {
630 630
         $sWhere .= ' AND (';
631 631
         foreach ($aColumns as $column) {
632
-            $sWhere .= $column . " LIKE '%" . filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS) . "%' OR ";
632
+            $sWhere .= $column." LIKE '%".filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS)."%' OR ";
633 633
         }
634
-        $sWhere = substr_replace($sWhere, '', -3) . ')';
634
+        $sWhere = substr_replace($sWhere, '', -3).')';
635 635
     }
636 636
 
637 637
     $iTotal = DB::queryFirstField(
@@ -653,7 +653,7 @@  discard block
 block discarded – undo
653 653
     $iFilteredTotal = DB::count();
654 654
     // Output
655 655
     $sOutput = '{';
656
-    $sOutput .= '"sEcho": '. (int) $request->query->get('draw') . ', ';
656
+    $sOutput .= '"sEcho": '.(int) $request->query->get('draw').', ';
657 657
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
658 658
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
659 659
     $sOutput .= '"aaData": ';
@@ -690,9 +690,9 @@  discard block
 block discarded – undo
690 690
 
691 691
         $columnIndex = filter_var($order['column'], FILTER_SANITIZE_NUMBER_INT);
692 692
         $dir = filter_var($order['dir'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
693
-        $sOrder = 'ORDER BY ' . $aColumns[$columnIndex] . ' ' . $dir . ' ';
693
+        $sOrder = 'ORDER BY '.$aColumns[$columnIndex].' '.$dir.' ';
694 694
     } else {
695
-        $sOrder = 'ORDER BY ' . $aColumns[0] . ' DESC';
695
+        $sOrder = 'ORDER BY '.$aColumns[0].' DESC';
696 696
     }
697 697
 
698 698
     // Filtering
@@ -701,9 +701,9 @@  discard block
 block discarded – undo
701 701
     if ($searchValue !== '') {
702 702
         $sWhere = ' WHERE (';
703 703
         foreach ($aColumns as $column) {
704
-            $sWhere .= $column . " LIKE '%" . filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS) . "%' OR ";
704
+            $sWhere .= $column." LIKE '%".filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS)."%' OR ";
705 705
         }
706
-        $sWhere = substr_replace($sWhere, '', -3) . ')';
706
+        $sWhere = substr_replace($sWhere, '', -3).')';
707 707
     }
708 708
 
709 709
     $iTotal = DB::queryFirstField(
@@ -726,7 +726,7 @@  discard block
 block discarded – undo
726 726
     $iFilteredTotal = DB::count();
727 727
     // Output
728 728
     $sOutput = '{';
729
-    $sOutput .= '"sEcho": '. (int) $request->query->get('draw') . ', ';
729
+    $sOutput .= '"sEcho": '.(int) $request->query->get('draw').', ';
730 730
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
731 731
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
732 732
     $sOutput .= '"aaData": ';
@@ -768,9 +768,9 @@  discard block
 block discarded – undo
768 768
 
769 769
         $columnIndex = filter_var($order['column'], FILTER_SANITIZE_NUMBER_INT);
770 770
         $dir = filter_var($order['dir'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
771
-        $sOrder = 'ORDER BY ' . $aColumns[$columnIndex] . ' ' . $dir . ' ';
771
+        $sOrder = 'ORDER BY '.$aColumns[$columnIndex].' '.$dir.' ';
772 772
     } else {
773
-        $sOrder = 'ORDER BY ' . $aColumns[0] . ' DESC';
773
+        $sOrder = 'ORDER BY '.$aColumns[0].' DESC';
774 774
     }
775 775
 
776 776
     // Where clause
@@ -779,9 +779,9 @@  discard block
 block discarded – undo
779 779
     if ($searchValue !== '') {
780 780
         $sWhere .= ' AND (';
781 781
         foreach ($aColumns as $column) {
782
-            $sWhere .= $column . " LIKE '%" . filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS) . "%' OR ";
782
+            $sWhere .= $column." LIKE '%".filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS)."%' OR ";
783 783
         }
784
-        $sWhere = substr_replace($sWhere, '', -3) . ') ';
784
+        $sWhere = substr_replace($sWhere, '', -3).') ';
785 785
     }
786 786
     $sWhere .= ') ';
787 787
     $iTotal = DB::queryFirstField(
@@ -799,7 +799,7 @@  discard block
 block discarded – undo
799 799
     $iFilteredTotal = DB::count();
800 800
     // Output
801 801
     $sOutput = '{';
802
-    $sOutput .= '"sEcho": '. (int) $request->query->get('draw') . ', ';
802
+    $sOutput .= '"sEcho": '.(int) $request->query->get('draw').', ';
803 803
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
804 804
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
805 805
     $sOutput .= '"aaData": ';
@@ -848,9 +848,9 @@  discard block
 block discarded – undo
848 848
 
849 849
         $columnIndex = filter_var($order['column'], FILTER_SANITIZE_NUMBER_INT);
850 850
         $dir = filter_var($order['dir'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
851
-        $sOrder = 'ORDER BY ' . $aColumns[$columnIndex] . ' ' . $dir . ' ';
851
+        $sOrder = 'ORDER BY '.$aColumns[$columnIndex].' '.$dir.' ';
852 852
     } else {
853
-        $sOrder = 'ORDER BY ' . $aColumns[0] . ' DESC';
853
+        $sOrder = 'ORDER BY '.$aColumns[0].' DESC';
854 854
     }
855 855
 
856 856
     // Where clause
@@ -859,9 +859,9 @@  discard block
 block discarded – undo
859 859
     if ($searchValue !== '') {
860 860
         $sWhere .= ' AND (';
861 861
         foreach ($aColumns as $column) {
862
-            $sWhere .= $column . " LIKE '%" . filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS) . "%' OR ";
862
+            $sWhere .= $column." LIKE '%".filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS)."%' OR ";
863 863
         }
864
-        $sWhere = substr_replace($sWhere, '', -3) . ')';
864
+        $sWhere = substr_replace($sWhere, '', -3).')';
865 865
     }
866 866
     $sWhere .= ') ';
867 867
     DB::debugmode(false);
@@ -882,7 +882,7 @@  discard block
 block discarded – undo
882 882
     $iFilteredTotal = DB::count();
883 883
     // Output
884 884
     $sOutput = '{';
885
-    $sOutput .= '"sEcho": '. (int) $request->query->get('draw') . ', ';
885
+    $sOutput .= '"sEcho": '.(int) $request->query->get('draw').', ';
886 886
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
887 887
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
888 888
     $sOutput .= '"aaData": ';
@@ -894,15 +894,15 @@  discard block
 block discarded – undo
894 894
         //col1
895 895
         $sOutput .= '"<span data-done=\"'.$record['is_in_progress'].'\" data-type=\"'.$record['process_type'].'\" data-process-id=\"'.$record['increment_id'].'\"></span>", ';
896 896
         //col2
897
-        $sOutput .= '"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['created_at']).'", ';
897
+        $sOutput .= '"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['created_at']).'", ';
898 898
         //col3
899
-        $sOutput .= '"'.($record['updated_at'] === '' ? '-' : date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['updated_at'])).'", ';
899
+        $sOutput .= '"'.($record['updated_at'] === '' ? '-' : date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['updated_at'])).'", ';
900 900
         //col4
901 901
         $sOutput .= '"'.$record['process_type'].'", ';
902 902
         // col5
903 903
         if (in_array($record['process_type'], array('create_user_keys', 'item_copy')) === true) {
904 904
             $data_user = DB::queryfirstrow(
905
-                'SELECT name, lastname FROM ' . prefixTable('users') . '
905
+                'SELECT name, lastname FROM '.prefixTable('users').'
906 906
                 WHERE id = %i',
907 907
                 json_decode($record['arguments'], true)['new_user_id']
908 908
             );
@@ -934,9 +934,9 @@  discard block
 block discarded – undo
934 934
 
935 935
         $columnIndex = filter_var($order['column'], FILTER_SANITIZE_NUMBER_INT);
936 936
         $dir = filter_var($order['dir'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
937
-        $sOrder = 'ORDER BY ' . $aColumns[$columnIndex] . ' ' . $dir . ' ';
937
+        $sOrder = 'ORDER BY '.$aColumns[$columnIndex].' '.$dir.' ';
938 938
     } else {
939
-        $sOrder = 'ORDER BY ' . $aColumns[0] . ' DESC';
939
+        $sOrder = 'ORDER BY '.$aColumns[0].' DESC';
940 940
     }
941 941
 
942 942
     // Where clause
@@ -945,9 +945,9 @@  discard block
 block discarded – undo
945 945
     if ($searchValue !== '') {
946 946
         $sWhere .= ' AND (';
947 947
         foreach ($aColumns as $column) {
948
-            $sWhere .= $column . " LIKE '%" . filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS) . "%' OR ";
948
+            $sWhere .= $column." LIKE '%".filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS)."%' OR ";
949 949
         }
950
-        $sWhere = substr_replace($sWhere, '', -3) . ')';
950
+        $sWhere = substr_replace($sWhere, '', -3).')';
951 951
     }
952 952
     $sWhere .= ') ';
953 953
     
@@ -970,7 +970,7 @@  discard block
 block discarded – undo
970 970
     $iFilteredTotal = DB::count();
971 971
     // Output
972 972
     $sOutput = '{';
973
-    $sOutput .= '"sEcho": '. (int) $request->query->get('draw') . ', ';
973
+    $sOutput .= '"sEcho": '.(int) $request->query->get('draw').', ';
974 974
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
975 975
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
976 976
     $sOutput .= '"aaData": ';
@@ -986,13 +986,12 @@  discard block
 block discarded – undo
986 986
         //col1
987 987
         $sOutput .= '"", ';
988 988
         //col2
989
-        $sOutput .= '"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['created_at']).'", ';
989
+        $sOutput .= '"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['created_at']).'", ';
990 990
         //col3
991 991
         $sOutput .= is_null($record['started_at']) === false ?
992
-            ('"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['started_at']).'", ') :
993
-                ('"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['created_at']).'", ');
992
+            ('"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['started_at']).'", ') : ('"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['created_at']).'", ');
994 993
         //col4
995
-        $sOutput .= '"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['finished_at']).'", ';
994
+        $sOutput .= '"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['finished_at']).'", ';
996 995
         // col7
997 996
         $sOutput .= '"'.gmdate('H:i:s', (int) $record['finished_at'] - (is_null($record['started_at']) === false ? (int) $record['started_at'] : (int) $record['created_at'])).'",';
998 997
         //col5
@@ -1011,7 +1010,7 @@  discard block
 block discarded – undo
1011 1010
         $newUserId = array_key_exists('new_user_id', $arguments) ? $arguments['new_user_id'] : null;
1012 1011
         if ($record['process_type'] === 'create_user_keys' && is_null($newUserId) === false && empty($newUserId) === false) {
1013 1012
             $data_user = DB::queryfirstrow(
1014
-                'SELECT name, lastname, login FROM ' . prefixTable('users') . '
1013
+                'SELECT name, lastname, login FROM '.prefixTable('users').'
1015 1014
                 WHERE id = %i',
1016 1015
                 $newUserId
1017 1016
             );
@@ -1027,7 +1026,7 @@  discard block
 block discarded – undo
1027 1026
         } elseif ($record['process_type'] === 'user_build_cache_tree') {
1028 1027
             $user = json_decode($record['arguments'], true)['user_id'];
1029 1028
             $data_user = DB::queryfirstrow(
1030
-                'SELECT name, lastname, login FROM ' . prefixTable('users') . '
1029
+                'SELECT name, lastname, login FROM '.prefixTable('users').'
1031 1030
                 WHERE id = %i',
1032 1031
                 $user
1033 1032
             );
Please login to merge, or discard this patch.