nilsteampassnet / TeamPass

sources/users.datatable.php

Spacing +12 added lines, -14 removed lines

@@ -72,7 +72,7 @@ 
 ) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -119,7 +119,7 @@ 
     if (isset($order['column']) && preg_match('#^(asc|desc)$#i', $order['dir'])) {
         $columnIndex = filter_var($order['column'], FILTER_SANITIZE_NUMBER_INT);
         $dir = filter_var($order['dir'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
-        $sOrder .= $aColumns[$columnIndex] . ' ' . $dir . ', ';
+        $sOrder .= $aColumns[$columnIndex].' '.$dir.', ';
     }
 
     $sOrder = substr_replace($sOrder, '', -2);
@@ -143,15 +143,15 @@ 
 
 if ($letter !== '' && $letter !== 'None') {
     $sWhere .= ' AND (';
-    $sWhere .= $aColumns[1] . " LIKE '" . $letter . "%' OR ";
-    $sWhere .= $aColumns[2] . " LIKE '" . $letter . "%' OR ";
-    $sWhere .= $aColumns[3] . " LIKE '" . $letter . "%' ";
+    $sWhere .= $aColumns[1]." LIKE '".$letter."%' OR ";
+    $sWhere .= $aColumns[2]." LIKE '".$letter."%' OR ";
+    $sWhere .= $aColumns[3]." LIKE '".$letter."%' ";
     $sWhere .= ')';
 } elseif ($searchValue !== '') {
     $sWhere .= ' AND (';
-    $sWhere .= $aColumns[1] . " LIKE '" . $searchValue . "%' OR ";
-    $sWhere .= $aColumns[2] . " LIKE '" . $searchValue . "%' OR ";
-    $sWhere .= $aColumns[3] . " LIKE '" . $searchValue . "%' ";
+    $sWhere .= $aColumns[1]." LIKE '".$searchValue."%' OR ";
+    $sWhere .= $aColumns[2]." LIKE '".$searchValue."%' OR ";
+    $sWhere .= $aColumns[3]." LIKE '".$searchValue."%' ";
     $sWhere .= ')';
 }
 
@@ -239,22 +239,20 @@ 
 
         // Get some infos about user
         $userDisplayInfos = 
-            (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>' : '')
+            (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>' : '')
             .
             ((int) $record['last_connexion'] > 0 ? '<i class=\"far fa-clock infotip text-info ml-2\" title=\"'.$lang->get('index_last_seen').": ".
-            date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['last_connexion']).'\"></i>' : '')
+            date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['last_connexion']).'\"></i>' : '')
             .
             ((int) $record['user_ip'] > 0 ? '<i class=\"fas fa-street-view infotip text-info ml-1\" title=\"'.$lang->get('ip').": ".($record['user_ip']).'\"></i>' : '')
             .
             ($record['auth_type'] === 'ldap' ? '<i class=\"far fa-address-book infotip text-warning ml-1\" title=\"'.$lang->get('managed_through_ad').'\"></i>' : '')
             .
             ((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)) ?
-                ((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>') :
-                ''
+                ((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>') : ''
             ).
             ((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) ? 
-                '<i class=\"fa-solid fa-download infotip ml-1\" style=\"color:Tomato\" title=\"'.$lang->get('recovery_keys_not_downloaded').'\"></i>' :
-                ''
+                '<i class=\"fa-solid fa-download infotip ml-1\" style=\"color:Tomato\" title=\"'.$lang->get('recovery_keys_not_downloaded').'\"></i>' : ''
             );
         
         $sOutput .= '["<span data-id=\"'.$record['id'].'\" data-fullname=\"'.

sources/expired.datatables.php

Spacing +20 added lines, -20 removed lines

@@ -73,7 +73,7 @@ 
 ) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -98,7 +98,7 @@ 
 // Is a date sent?
 $dateCriteria = $request->query->get('dateCriteria');
 if ($dateCriteria !== null && !empty($dateCriteria)) {
-    $sWhere .= ' AND a.del_value < ' . round(filter_var($dateCriteria, FILTER_SANITIZE_NUMBER_INT) / 1000, 0);
+    $sWhere .= ' AND a.del_value < '.round(filter_var($dateCriteria, FILTER_SANITIZE_NUMBER_INT) / 1000, 0);
 }
 //echo $sWhere;
 /* BUILD QUERY */
@@ -107,7 +107,7 @@ 
 $start = $request->query->getInt('start', 0);
 $length = $request->query->getInt('length', -1);
 if ($length !== -1) {
-    $sLimit = ' LIMIT ' . $start . ', ' . $length;
+    $sLimit = ' LIMIT '.$start.', '.$length;
 }
 
 //Ordering
@@ -120,7 +120,7 @@ 
         $columnIndex = filter_var($order[0]['column'], FILTER_SANITIZE_NUMBER_INT);
 
         if (array_key_exists($columnIndex, $aColumns)) {
-            $sOrder .= $aColumns[$columnIndex] . ' ' . $order[0]['dir'];
+            $sOrder .= $aColumns[$columnIndex].' '.$order[0]['dir'];
         }
 
         // Supprimez la virgule finale si elle existe
@@ -145,9 +145,9 @@ 
 
     if ($letter !== '' && $letter !== 'None') {
         $sWhere .= ' AND ';
-        $sWhere .= $aColumns[1] . " LIKE '" . $letter . "%' OR ";
-        $sWhere .= $aColumns[2] . " LIKE '" . $letter . "%' OR ";
-        $sWhere .= $aColumns[3] . " LIKE '" . $letter . "%' ";
+        $sWhere .= $aColumns[1]." LIKE '".$letter."%' OR ";
+        $sWhere .= $aColumns[2]." LIKE '".$letter."%' OR ";
+        $sWhere .= $aColumns[3]." LIKE '".$letter."%' ";
     }
 }
 
@@ -159,26 +159,26 @@ 
 
         if ($searchValue !== '') {
             $sWhere = ' AND ';
-            $sWhere .= $aColumns[1] . " LIKE '" . $searchValue . "%' OR ";
-            $sWhere .= $aColumns[2] . " LIKE '" . $searchValue . "%' OR ";
-            $sWhere .= $aColumns[3] . " LIKE '" . $searchValue . "%' ";
+            $sWhere .= $aColumns[1]." LIKE '".$searchValue."%' OR ";
+            $sWhere .= $aColumns[2]." LIKE '".$searchValue."%' OR ";
+            $sWhere .= $aColumns[3]." LIKE '".$searchValue."%' ";
         }
     }
 }
 
 $rows = DB::query(
     'SELECT a.item_id, i.label, a.del_value, i.id_tree
-    FROM ' . prefixTable('automatic_del') . ' AS a
-    INNER JOIN ' . prefixTable('items') . ' AS i ON (i.id = a.item_id)' .
+    FROM ' . prefixTable('automatic_del').' AS a
+    INNER JOIN ' . prefixTable('items').' AS i ON (i.id = a.item_id)'.
     $sWhere.
     (string) $sOrder
 );
 $iTotal = DB::count();
 $rows = DB::query(
     'SELECT a.item_id, i.label, a.del_value, i.id_tree
-    FROM ' . prefixTable('automatic_del') . ' AS a
-    INNER JOIN ' . prefixTable('items') . ' AS i ON (i.id = a.item_id)' .
-        $sWhere .
+    FROM ' . prefixTable('automatic_del').' AS a
+    INNER JOIN ' . prefixTable('items').' AS i ON (i.id = a.item_id)'.
+        $sWhere.
         $sLimit
 );
 $iFilteredTotal = DB::count();
@@ -196,18 +196,18 @@ 
     // start the line
     $sOutput .= '[';
     // Column 1
-    $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>", ';
+    $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>", ';
     // Column 2
-    $sOutput .= '"' . $record['label'] . '", ';
+    $sOutput .= '"'.$record['label'].'", ';
     // Column 3
-    $sOutput .= '"' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['del_value']) . '", ';
+    $sOutput .= '"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['del_value']).'", ';
     // Column 4
     $path = [];
     $treeDesc = $tree->getPath($record['id_tree'], true);
     foreach ($treeDesc as $t) {
         array_push($path, $t->title);
     }
-    $sOutput .= '"' . implode('<i class=\"fas fa-angle-right ml-1 mr-1\"></i>', $path) . '"],';
+    $sOutput .= '"'.implode('<i class=\"fas fa-angle-right ml-1 mr-1\"></i>', $path).'"],';
 }
 
 if ($iTotal > 0) {
@@ -220,4 +220,4 @@ 
 }
 
 // finalize output
-echo '{"recordsTotal": ' . $iTotal . ', "recordsFiltered": ' . $iFilteredTotal . ', "data": ' . $sOutput;
+echo '{"recordsTotal": '.$iTotal.', "recordsFiltered": '.$iFilteredTotal.', "data": '.$sOutput;

sources/logs.datatables.php

Spacing +65 added lines, -66 removed lines

@@ -71,7 +71,7 @@ 
 ) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -115,9 +115,9 @@ 
 
             $columnIndex = filter_var($order['column'], FILTER_SANITIZE_NUMBER_INT);
             $dir = filter_var($order['dir'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
-            $sOrder = 'ORDER BY ' . $aColumns[$columnIndex] . ' ' . $dir . ' ';
+            $sOrder = 'ORDER BY '.$aColumns[$columnIndex].' '.$dir.' ';
         } else {
-            $sOrder = 'ORDER BY ' . $aColumns[0] . ' DESC';
+            $sOrder = 'ORDER BY '.$aColumns[0].' DESC';
         }
     }
 
@@ -128,9 +128,9 @@ 
         if ($searchValue !== '') {
             $sWhere .= ' AND (';
             foreach ($aColumns as $column) {
-                $sWhere .= $column . " LIKE '%" . $searchValue . "%' OR ";
+                $sWhere .= $column." LIKE '%".$searchValue."%' OR ";
             }
-            $sWhere = substr_replace($sWhere, '', -3) . ')';
+            $sWhere = substr_replace($sWhere, '', -3).')';
         }
     }
 
@@ -155,7 +155,7 @@ 
            * Output
         */
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->get('draw') . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->get('draw').', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -194,9 +194,9 @@ 
 
         $columnIndex = filter_var($order['column'], FILTER_SANITIZE_NUMBER_INT);
         $dir = filter_var($order['dir'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
-        $sOrder = 'ORDER BY ' . $aColumns[$columnIndex] . ' ' . $dir . ' ';
+        $sOrder = 'ORDER BY '.$aColumns[$columnIndex].' '.$dir.' ';
     } else {
-        $sOrder = 'ORDER BY ' . $aColumns[0] . ' DESC';
+        $sOrder = 'ORDER BY '.$aColumns[0].' DESC';
     }
 
     // Filtering
@@ -205,9 +205,9 @@ 
     if ($sSearch !== '') {
         $sWhere .= ' AND (';
         foreach ($aColumns as $i => $column) {
-            $sWhere .= $column . " LIKE '%". filter_var($sSearch, FILTER_SANITIZE_FULL_SPECIAL_CHARS) . "%' OR ";
+            $sWhere .= $column." LIKE '%".filter_var($sSearch, FILTER_SANITIZE_FULL_SPECIAL_CHARS)."%' OR ";
         }
-        $sWhere = substr_replace($sWhere, '', -3) . ')';
+        $sWhere = substr_replace($sWhere, '', -3).')';
     }
 
     $iTotal = DB::queryFirstField(
@@ -230,7 +230,7 @@ 
     $iFilteredTotal = DB::count();
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->get('draw') . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->get('draw').', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -269,9 +269,9 @@ 
 
         $columnIndex = filter_var($order['column'], FILTER_SANITIZE_NUMBER_INT);
         $dir = filter_var($order['dir'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
-        $sOrder = 'ORDER BY ' . $aColumns[$columnIndex] . ' ' . $dir . ' ';
+        $sOrder = 'ORDER BY '.$aColumns[$columnIndex].' '.$dir.' ';
     } else {
-        $sOrder = 'ORDER BY ' . $aColumns[0] . ' DESC';
+        $sOrder = 'ORDER BY '.$aColumns[0].' DESC';
     }
 
     // Filtering
@@ -280,9 +280,9 @@ 
     if ($searchValue !== '') {
         $sWhere .= ' AND (';
         foreach ($aColumns as $column) {
-            $sWhere .= $column . " LIKE '%" . filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS) . "%' OR ";
+            $sWhere .= $column." LIKE '%".filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS)."%' OR ";
         }
-        $sWhere = substr_replace($sWhere, '', -3) . ')';
+        $sWhere = substr_replace($sWhere, '', -3).')';
     }
 
     $iTotal = DB::queryFirstField(
@@ -305,7 +305,7 @@ 
     $iFilteredTotal = DB::count();
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->get('draw') . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->get('draw').', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -344,9 +344,9 @@ 
         
         $columnIndex = filter_var($order['column'], FILTER_SANITIZE_NUMBER_INT);
         $dir = filter_var($order['dir'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
-        $sOrder = 'ORDER BY ' . $aColumns[$columnIndex] . ' ' . $dir . ' ';
+        $sOrder = 'ORDER BY '.$aColumns[$columnIndex].' '.$dir.' ';
     } else {
-        $sOrder = 'ORDER BY ' . $aColumns[0] . ' DESC';
+        $sOrder = 'ORDER BY '.$aColumns[0].' DESC';
     }
 
     // Filtering
@@ -355,9 +355,9 @@ 
     if ($searchValue !== '') {
         $sWhere .= ' AND (';
         foreach ($aColumns as $column) {
-            $sWhere .= $column . " LIKE '%" . filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS) . "%' OR ";
+            $sWhere .= $column." LIKE '%".filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS)."%' OR ";
         }
-        $sWhere = substr_replace($sWhere, '', -3) . ')';
+        $sWhere = substr_replace($sWhere, '', -3).')';
     }
 
     $iTotal = DB::queryFirstField(
@@ -379,7 +379,7 @@ 
          * Output
         */
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->get('draw') . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->get('draw').', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": [ ';
@@ -447,9 +447,9 @@ 
 
         $columnIndex = filter_var($order['column'], FILTER_SANITIZE_NUMBER_INT);
         $dir = filter_var($order['dir'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
-        $sOrder = 'ORDER BY ' . $aColumns[$columnIndex] . ' ' . $dir . ' ';
+        $sOrder = 'ORDER BY '.$aColumns[$columnIndex].' '.$dir.' ';
     } else {
-        $sOrder = 'ORDER BY ' . $aColumns[0] . ' DESC';
+        $sOrder = 'ORDER BY '.$aColumns[0].' DESC';
     }
 
     // Filtering
@@ -459,12 +459,12 @@ 
     if ($searchValue !== '') {
         $sWhere .= ' WHERE (';
         if (isset($search['column']) && $search['column'] !== 'all') {
-            $sWhere .= $search['column'] . " LIKE '%" . filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS) . "%') ";
+            $sWhere .= $search['column']." LIKE '%".filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS)."%') ";
         } else {
             foreach ($aColumns as $column) {
-                $sWhere .= $column . " LIKE '%" . filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS) . "%' OR ";
+                $sWhere .= $column." LIKE '%".filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS)."%' OR ";
             }
-            $sWhere = substr($sWhere, 0, -3) . ') ';
+            $sWhere = substr($sWhere, 0, -3).') ';
         }
     }
     
@@ -493,7 +493,7 @@ 
     $iFilteredTotal = DB::count();
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->get('draw') . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->get('draw').', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": [ ';
@@ -542,9 +542,9 @@ 
 
         $columnIndex = filter_var($order['column'], FILTER_SANITIZE_NUMBER_INT);
         $dir = filter_var($order['dir'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
-        $sOrder = 'ORDER BY ' . $aColumns[$columnIndex] . ' ' . $dir . ' ';
+        $sOrder = 'ORDER BY '.$aColumns[$columnIndex].' '.$dir.' ';
     } else {
-        $sOrder = 'ORDER BY ' . $aColumns[0] . ' DESC';
+        $sOrder = 'ORDER BY '.$aColumns[0].' DESC';
     }
 
     // Filtering
@@ -553,9 +553,9 @@ 
     if ($searchValue !== '') {
         $sWhere .= ' AND (';
         foreach ($aColumns as $column) {
-            $sWhere .= $column . " LIKE '%" . filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS) . "%' OR ";
+            $sWhere .= $column." LIKE '%".filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS)."%' OR ";
         }
-        $sWhere = substr_replace($sWhere, '', -3) . ')';
+        $sWhere = substr_replace($sWhere, '', -3).')';
     }
 
     $iTotal = DB::queryFirstField(
@@ -576,7 +576,7 @@ 
         $iTotal = 0;
     }
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->get('draw') . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->get('draw').', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -618,9 +618,9 @@ 
 
         $columnIndex = filter_var($order['column'], FILTER_SANITIZE_NUMBER_INT);
         $dir = filter_var($order['dir'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
-        $sOrder = 'ORDER BY ' . $aColumns[$columnIndex] . ' ' . $dir . ' ';
+        $sOrder = 'ORDER BY '.$aColumns[$columnIndex].' '.$dir.' ';
     } else {
-        $sOrder = 'ORDER BY ' . $aColumns[0] . ' DESC';
+        $sOrder = 'ORDER BY '.$aColumns[0].' DESC';
     }
 
     // Filtering
@@ -629,9 +629,9 @@ 
     if ($searchValue !== '') {
         $sWhere .= ' AND (';
         foreach ($aColumns as $column) {
-            $sWhere .= $column . " LIKE '%" . filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS) . "%' OR ";
+            $sWhere .= $column." LIKE '%".filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS)."%' OR ";
         }
-        $sWhere = substr_replace($sWhere, '', -3) . ')';
+        $sWhere = substr_replace($sWhere, '', -3).')';
     }
 
     $iTotal = DB::queryFirstField(
@@ -653,7 +653,7 @@ 
     $iFilteredTotal = DB::count();
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->get('draw') . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->get('draw').', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -690,9 +690,9 @@ 
 
         $columnIndex = filter_var($order['column'], FILTER_SANITIZE_NUMBER_INT);
         $dir = filter_var($order['dir'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
-        $sOrder = 'ORDER BY ' . $aColumns[$columnIndex] . ' ' . $dir . ' ';
+        $sOrder = 'ORDER BY '.$aColumns[$columnIndex].' '.$dir.' ';
     } else {
-        $sOrder = 'ORDER BY ' . $aColumns[0] . ' DESC';
+        $sOrder = 'ORDER BY '.$aColumns[0].' DESC';
     }
 
     // Filtering
@@ -701,9 +701,9 @@ 
     if ($searchValue !== '') {
         $sWhere = ' WHERE (';
         foreach ($aColumns as $column) {
-            $sWhere .= $column . " LIKE '%" . filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS) . "%' OR ";
+            $sWhere .= $column." LIKE '%".filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS)."%' OR ";
         }
-        $sWhere = substr_replace($sWhere, '', -3) . ')';
+        $sWhere = substr_replace($sWhere, '', -3).')';
     }
 
     $iTotal = DB::queryFirstField(
@@ -726,7 +726,7 @@ 
     $iFilteredTotal = DB::count();
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->get('draw') . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->get('draw').', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -768,9 +768,9 @@ 
 
         $columnIndex = filter_var($order['column'], FILTER_SANITIZE_NUMBER_INT);
         $dir = filter_var($order['dir'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
-        $sOrder = 'ORDER BY ' . $aColumns[$columnIndex] . ' ' . $dir . ' ';
+        $sOrder = 'ORDER BY '.$aColumns[$columnIndex].' '.$dir.' ';
     } else {
-        $sOrder = 'ORDER BY ' . $aColumns[0] . ' DESC';
+        $sOrder = 'ORDER BY '.$aColumns[0].' DESC';
     }
 
     // Where clause
@@ -779,9 +779,9 @@ 
     if ($searchValue !== '') {
         $sWhere .= ' AND (';
         foreach ($aColumns as $column) {
-            $sWhere .= $column . " LIKE '%" . filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS) . "%' OR ";
+            $sWhere .= $column." LIKE '%".filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS)."%' OR ";
         }
-        $sWhere = substr_replace($sWhere, '', -3) . ') ';
+        $sWhere = substr_replace($sWhere, '', -3).') ';
     }
     $sWhere .= ') ';
     $iTotal = DB::queryFirstField(
@@ -799,7 +799,7 @@ 
     $iFilteredTotal = DB::count();
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->get('draw') . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->get('draw').', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -848,9 +848,9 @@ 
 
         $columnIndex = filter_var($order['column'], FILTER_SANITIZE_NUMBER_INT);
         $dir = filter_var($order['dir'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
-        $sOrder = 'ORDER BY ' . $aColumns[$columnIndex] . ' ' . $dir . ' ';
+        $sOrder = 'ORDER BY '.$aColumns[$columnIndex].' '.$dir.' ';
     } else {
-        $sOrder = 'ORDER BY ' . $aColumns[0] . ' DESC';
+        $sOrder = 'ORDER BY '.$aColumns[0].' DESC';
     }
 
     // Where clause
@@ -859,9 +859,9 @@ 
     if ($searchValue !== '') {
         $sWhere .= ' AND (';
         foreach ($aColumns as $column) {
-            $sWhere .= $column . " LIKE '%" . filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS) . "%' OR ";
+            $sWhere .= $column." LIKE '%".filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS)."%' OR ";
         }
-        $sWhere = substr_replace($sWhere, '', -3) . ')';
+        $sWhere = substr_replace($sWhere, '', -3).')';
     }
     $sWhere .= ') ';
     DB::debugmode(false);
@@ -882,7 +882,7 @@ 
     $iFilteredTotal = DB::count();
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->get('draw') . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->get('draw').', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -894,15 +894,15 @@ 
         //col1
         $sOutput .= '"<span data-done=\"'.$record['is_in_progress'].'\" data-type=\"'.$record['process_type'].'\" data-process-id=\"'.$record['increment_id'].'\"></span>", ';
         //col2
-        $sOutput .= '"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['created_at']).'", ';
+        $sOutput .= '"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['created_at']).'", ';
         //col3
-        $sOutput .= '"'.($record['updated_at'] === '' ? '-' : date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['updated_at'])).'", ';
+        $sOutput .= '"'.($record['updated_at'] === '' ? '-' : date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['updated_at'])).'", ';
         //col4
         $sOutput .= '"'.$record['process_type'].'", ';
         // col5
         if (in_array($record['process_type'], array('create_user_keys', 'item_copy')) === true) {
             $data_user = DB::queryfirstrow(
-                'SELECT name, lastname FROM ' . prefixTable('users') . '
+                'SELECT name, lastname FROM '.prefixTable('users').'
                 WHERE id = %i',
                 json_decode($record['arguments'], true)['new_user_id']
             );
@@ -934,9 +934,9 @@ 
 
         $columnIndex = filter_var($order['column'], FILTER_SANITIZE_NUMBER_INT);
         $dir = filter_var($order['dir'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
-        $sOrder = 'ORDER BY ' . $aColumns[$columnIndex] . ' ' . $dir . ' ';
+        $sOrder = 'ORDER BY '.$aColumns[$columnIndex].' '.$dir.' ';
     } else {
-        $sOrder = 'ORDER BY ' . $aColumns[0] . ' DESC';
+        $sOrder = 'ORDER BY '.$aColumns[0].' DESC';
     }
 
     // Where clause
@@ -945,9 +945,9 @@ 
     if ($searchValue !== '') {
         $sWhere .= ' AND (';
         foreach ($aColumns as $column) {
-            $sWhere .= $column . " LIKE '%" . filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS) . "%' OR ";
+            $sWhere .= $column." LIKE '%".filter_var($searchValue, FILTER_SANITIZE_FULL_SPECIAL_CHARS)."%' OR ";
         }
-        $sWhere = substr_replace($sWhere, '', -3) . ')';
+        $sWhere = substr_replace($sWhere, '', -3).')';
     }
     $sWhere .= ') ';
     
@@ -970,7 +970,7 @@ 
     $iFilteredTotal = DB::count();
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->get('draw') . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->get('draw').', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -986,13 +986,12 @@ 
         //col1
         $sOutput .= '"", ';
         //col2
-        $sOutput .= '"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['created_at']).'", ';
+        $sOutput .= '"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['created_at']).'", ';
         //col3
         $sOutput .= is_null($record['started_at']) === false ?
-            ('"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['started_at']).'", ') :
-                ('"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['created_at']).'", ');
+            ('"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['started_at']).'", ') : ('"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['created_at']).'", ');
         //col4
-        $sOutput .= '"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['finished_at']).'", ';
+        $sOutput .= '"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['finished_at']).'", ';
         // col7
         $sOutput .= '"'.gmdate('H:i:s', (int) $record['finished_at'] - (is_null($record['started_at']) === false ? (int) $record['started_at'] : (int) $record['created_at'])).'",';
         //col5
@@ -1011,7 +1010,7 @@ 
         $newUserId = array_key_exists('new_user_id', $arguments) ? $arguments['new_user_id'] : null;
         if ($record['process_type'] === 'create_user_keys' && is_null($newUserId) === false && empty($newUserId) === false) {
             $data_user = DB::queryfirstrow(
-                'SELECT name, lastname, login FROM ' . prefixTable('users') . '
+                'SELECT name, lastname, login FROM '.prefixTable('users').'
                 WHERE id = %i',
                 $newUserId
             );
@@ -1027,7 +1026,7 @@ 
         } elseif ($record['process_type'] === 'user_build_cache_tree') {
             $user = json_decode($record['arguments'], true)['user_id'];
             $data_user = DB::queryfirstrow(
-                'SELECT name, lastname, login FROM ' . prefixTable('users') . '
+                'SELECT name, lastname, login FROM '.prefixTable('users').'
                 WHERE id = %i',
                 $user
             );