nilsteampassnet / TeamPass

scripts/background_tasks___user_task.php

Spacing +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
 DB::debugmode(false);
 $rows = DB::query(
     'SELECT *
-    FROM ' . prefixTable('background_tasks') . '
+    FROM ' . prefixTable('background_tasks').'
     WHERE is_in_progress = %i AND process_type = %s
     ORDER BY increment_id ASC LIMIT 0,10',
     0,

scripts/background_tasks___functions.php

Spacing +6 added lines, -6 removed lines

@@ -103,10 +103,10 @@ 
  */
 function provideLog(string $message, array $SETTINGS)
 {
-    error_log((string) date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], time()) . ' - '.$message);
+    error_log((string) date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], time()).' - '.$message);
 }
 
-function performVisibleFoldersHtmlUpdate (int $user_id)
+function performVisibleFoldersHtmlUpdate(int $user_id)
 {
     $html = [];
 
@@ -116,10 +116,10 @@ 
 
     // get current folders visible for user
     $cache_tree = DB::queryFirstRow(
-        'SELECT increment_id, data FROM ' . prefixTable('cache_tree') . ' WHERE user_id = %i',
+        'SELECT increment_id, data FROM '.prefixTable('cache_tree').' WHERE user_id = %i',
         $user_id
     );
-    $folders = json_decode($cache_tree['data'], true);//print_r($folders);
+    $folders = json_decode($cache_tree['data'], true); //print_r($folders);
     foreach ($folders as $folder) {
         $idFolder = (int) explode("li_", $folder['id'])[1];
 
@@ -132,7 +132,7 @@ 
 
         // get folder info
         $folder = DB::queryFirstRow(
-            'SELECT title, parent_id, personal_folder FROM ' . prefixTable('nested_tree') . ' WHERE id = %i',
+            'SELECT title, parent_id, personal_folder FROM '.prefixTable('nested_tree').' WHERE id = %i',
             $idFolder
         );
 
@@ -167,7 +167,7 @@ 
 function subTaskStatus($taskId)
 {
     $subTasks = DB::query(
-        'SELECT * FROM ' . prefixTable('background_subtasks') . ' WHERE task_id = %i',
+        'SELECT * FROM '.prefixTable('background_subtasks').' WHERE task_id = %i',
         $taskId
     );
 

sources/tasks.queries.php

Spacing +3 added lines, -3 removed lines

@@ -78,7 +78,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;
 }
 
@@ -163,7 +163,7 @@ 
     // get exec from processes table
     $rows = DB::query(
         'SELECT max(finished_at), process_type
-        FROM ' . prefixTable('background_tasks') . '
+        FROM ' . prefixTable('background_tasks').'
         GROUP BY process_type'
     );
     foreach ($rows as $row) {
@@ -179,7 +179,7 @@ 
     // get exec from background_tasks_log table
     $rows = DB::query(
         'SELECT MAX(finished_at) AS max_finished_at, job AS process_type 
-        FROM ' . prefixTable('background_tasks_logs') . '
+        FROM ' . prefixTable('background_tasks_logs').'
         WHERE finished_at >= UNIX_TIMESTAMP(DATE_SUB(NOW(), INTERVAL 7 DAY))
         GROUP BY process_type'
     );

sources/utilities.queries.php

Spacing +29 added lines, -29 removed lines

@@ -79,7 +79,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;
 }
 
@@ -130,7 +130,7 @@ 
             $arrFolders = array();
             $rows = DB::query(
                 'SELECT valeur, intitule
-                FROM ' . prefixTable('misc') . '
+                FROM ' . prefixTable('misc').'
                 WHERE type  = %s',
                 'folder_deleted'
             );
@@ -152,10 +152,10 @@ 
                 'SELECT u.login as login, u.name as name, u.lastname as lastname,
                 i.id as id, i.label as label,
                 i.id_tree as id_tree, l.date as date, n.title as folder_title
-                FROM ' . prefixTable('log_items') . ' as l
-                INNER JOIN ' . prefixTable('items') . ' as i ON (l.id_item=i.id)
-                LEFT JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id)
-                LEFT JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree=n.id)
+                FROM ' . prefixTable('log_items').' as l
+                INNER JOIN ' . prefixTable('items').' as i ON (l.id_item=i.id)
+                LEFT JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id)
+                LEFT JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree=n.id)
                 WHERE i.inactif = %i
                 AND l.action = %s',
                 1,
@@ -177,7 +177,7 @@ 
                             'label' => $record['label'],
                             'date' => date($SETTINGS['date_format'], (int) $record['date']),
                             'login' => $record['login'],
-                            'name' => $record['name'] . ' ' . $record['lastname'],
+                            'name' => $record['name'].' '.$record['lastname'],
                             'folder_label' => $record['folder_title'],
                             'folder_deleted' => $thisFolder,
                         )
@@ -235,10 +235,10 @@ 
             foreach ($post_folders as $folderId) {
                 $data = DB::queryfirstrow(
                     'SELECT valeur
-                    FROM ' . prefixTable('misc') . "
+                    FROM ' . prefixTable('misc')."
                     WHERE type = 'folder_deleted'
                     AND intitule = %s",
-                    'f' . $folderId
+                    'f'.$folderId
                 );
                 if ((int) $data['valeur'] !== 0) {
                     $folderData = explode(', ', $data['valeur']);
@@ -265,7 +265,7 @@ 
                         prefixTable('misc'),
                         'type = %s AND intitule = %s',
                         'folder_deleted',
-                        'f' . $folderId
+                        'f'.$folderId
                     );
 
                     // Restore all items in this folder
@@ -281,7 +281,7 @@ 
                     // Get list of all items in thos folder
                     $items = DB::query(
                         'SELECT id
-                        FROM ' . prefixTable('items') . '
+                        FROM ' . prefixTable('items').'
                         WHERE id_tree = %i',
                         $folderId
                     );
@@ -370,10 +370,10 @@ 
             foreach ($post_folders as $folderId) {
                 $data = DB::queryfirstrow(
                     'SELECT valeur
-                    FROM ' . prefixTable('misc') . "
+                    FROM ' . prefixTable('misc')."
                     WHERE type = 'folder_deleted'
                     AND intitule = %s",
-                    'f' . $folderId
+                    'f'.$folderId
                 );
                 if ((int) $data['valeur'] !== 0) {
                     $exploded = explode(',', $data['valeur']);
@@ -384,7 +384,7 @@ 
                         prefixTable('misc'),
                         'type = %s AND intitule = %s',
                         'folder_deleted',
-                        'f' . $folderData[0]
+                        'f'.$folderData[0]
                     );
 
                     // Delete all items in this folder
@@ -398,7 +398,7 @@ 
                     // Get list of all items in thos folder
                     $items = DB::query(
                         'SELECT id
-                        FROM ' . prefixTable('items') . '
+                        FROM ' . prefixTable('items').'
                         WHERE id_tree = %i',
                         $folderData[0]
                     );
@@ -415,7 +415,7 @@ 
                         // Delete all fields
                         $fields = DB::query(
                             'SELECT id
-                            FROM ' . prefixTable('categories_items') . '
+                            FROM ' . prefixTable('categories_items').'
                             WHERE item_id = %i',
                             $folderData[0]
                         );
@@ -435,7 +435,7 @@ 
                         // Delete all files
                         $files = DB::query(
                             'SELECT id
-                            FROM ' . prefixTable('files') . '
+                            FROM ' . prefixTable('files').'
                             WHERE id_item = %i',
                             $folderData[0]
                         );
@@ -492,7 +492,7 @@ 
                 // Delete sharekey fields
                 $itemFields = DB::query(
                     'SELECT id
-                    FROM ' . prefixTable('categories_items') . '
+                    FROM ' . prefixTable('categories_items').'
                     WHERE item_id = %i',
                     $itemId
                 );
@@ -507,7 +507,7 @@ 
                 // Delete sharekey files
                 $itemFiles = DB::query(
                     'SELECT id
-                    FROM ' . prefixTable('files') . '
+                    FROM ' . prefixTable('files').'
                     WHERE id_item = %i',
                     $itemId
                 );
@@ -584,7 +584,7 @@ 
             ) {
                 if ($post_log_type === 'items') {
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_items') . '
+                        'SELECT * FROM '.prefixTable('log_items').'
                         WHERE (date BETWEEN %i AND %i)'
                         . ($post_filter_action === 'all' ? '' : ' AND action = "'.$post_filter_action.'"')
                         . ((int) $post_filter_user === -1 ? '' : ' AND id_user = '.(int) $post_filter_user),
@@ -604,7 +604,7 @@ 
                 } elseif ($post_log_type === 'connections') {
                     //db::debugmode(true);
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_system') . '
+                        'SELECT * FROM '.prefixTable('log_system').'
                         WHERE type=%s '
                         . 'AND (date BETWEEN %i AND %i)'
                         . ($post_filter_action === 'all' ? '' : ' AND action = '.$post_filter_action)
@@ -627,7 +627,7 @@ 
                     );
                 } elseif ($post_log_type === 'errors') {
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' .
+                        'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '.
                             'AND (date BETWEEN %i AND %i)',
                         'error',
                         $post_date_from,
@@ -644,7 +644,7 @@ 
                     );
                 } elseif ($post_log_type === 'copy') {
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_items') . ' WHERE action=%s ' .
+                        'SELECT * FROM '.prefixTable('log_items').' WHERE action=%s '.
                             'AND (date BETWEEN %i AND %i)',
                         'at_copy',
                         $post_date_from,
@@ -661,7 +661,7 @@ 
                     );
                 } elseif ($post_log_type === 'admin') {
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' .
+                        'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '.
                             'AND (date BETWEEN %i AND %i)',
                         'admin_action',
                         $post_date_from,
@@ -678,7 +678,7 @@ 
                     );
                 } elseif ($post_log_type === 'failed') {
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' .
+                        'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '.
                             'AND (date BETWEEN %i AND %i)',
                         'failed_auth',
                         $post_date_from,
@@ -749,19 +749,19 @@ 
             // Get info about task
             $taskInfo = DB::queryfirstrow(
                 'SELECT p.process_type as process_type
-                FROM ' . prefixTable('background_tasks') . ' as p
+                FROM ' . prefixTable('background_tasks').' as p
                 WHERE p.increment_id = %i',
                 $post_id
             );
             if ($taskInfo !== null) {
                 // delete task
                 DB::query(
-                    'DELETE FROM ' . prefixTable('background_subtasks') . '
+                    'DELETE FROM '.prefixTable('background_subtasks').'
                     WHERE task_id = %i',
                     $post_id
                 );
                 DB::query(
-                    'DELETE FROM ' . prefixTable('background_tasks') . '
+                    'DELETE FROM '.prefixTable('background_tasks').'
                     WHERE increment_id = %i',
                     $post_id
                 );
@@ -828,7 +828,7 @@ 
                         ->setDayOfMonth('*')
                         ->setMonths('*')
                         ->setDayOfWeek('*')
-                        ->setTaskCommandLine($phpBinaryPath . ' ' . $SETTINGS['cpassman_dir'] . '/sources/scheduler.php')
+                        ->setTaskCommandLine($phpBinaryPath.' '.$SETTINGS['cpassman_dir'].'/sources/scheduler.php')
                         ->setComments('Teampass scheduler');
                     
                     $crontabRepository->addJob($crontabJob);

sources/logs.datatables.php

Spacing +66 added lines, -67 removed lines

@@ -78,7 +78,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;
 }
 
@@ -127,9 +127,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';
         }
     }
 
@@ -140,9 +140,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).')';
         }
     }
 
@@ -167,7 +167,7 @@ 
            * Output
         */
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.$request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -206,9 +206,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
@@ -217,9 +217,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(
@@ -242,7 +242,7 @@ 
     $iFilteredTotal = DB::count();
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.$request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -281,9 +281,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
@@ -292,9 +292,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(
@@ -317,7 +317,7 @@ 
     $iFilteredTotal = DB::count();
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -356,9 +356,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
@@ -367,9 +367,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(
@@ -391,7 +391,7 @@ 
          * Output
         */
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": [ ';
@@ -459,9 +459,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
@@ -471,12 +471,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).') ';
         }
     }
     
@@ -505,7 +505,7 @@ 
     $iFilteredTotal = DB::count();
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": [ ';
@@ -554,9 +554,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
@@ -565,9 +565,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(
@@ -588,7 +588,7 @@ 
         $iTotal = 0;
     }
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -630,9 +630,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
@@ -641,9 +641,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(
@@ -665,7 +665,7 @@ 
     $iFilteredTotal = DB::count();
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -702,9 +702,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
@@ -713,9 +713,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(
@@ -738,7 +738,7 @@ 
     $iFilteredTotal = DB::count();
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -780,9 +780,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
@@ -791,9 +791,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(
@@ -811,7 +811,7 @@ 
     $iFilteredTotal = DB::count();
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -860,9 +860,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
@@ -871,9 +871,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);
@@ -894,7 +894,7 @@ 
     $iFilteredTotal = DB::count();
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -909,7 +909,7 @@ 
         //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 .= '"<div class=\"progress mt-2\"><div class=\"progress-bar\" style=\"width: '.$subtaskProgress.'\">'.$subtaskProgress.'</div></div>", ';
@@ -919,7 +919,7 @@ 
         // 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']
             );
@@ -951,9 +951,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
@@ -962,9 +962,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 .= ') ';
     
@@ -987,7 +987,7 @@ 
     $iFilteredTotal = DB::count();
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -1003,13 +1003,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
@@ -1028,7 +1027,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
             );
@@ -1044,7 +1043,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
             );
@@ -1078,7 +1077,7 @@ 
 {
     $subtasks = DB::query(
         'SELECT *
-        FROM ' . prefixTable('background_subtasks') . '
+        FROM ' . prefixTable('background_subtasks').'
         WHERE task_id = %i',
         $id
     );
@@ -1094,5 +1093,5 @@ 
         $i++;
     }
 
-    return ($finished_nb !== 0 ? pourcentage($finished_nb, $nb, 100) : 0) .'%';
+    return ($finished_nb !== 0 ? pourcentage($finished_nb, $nb, 100) : 0).'%';
 }
\ No newline at end of file

api/Model/Database.php

Spacing +6 added lines, -6 removed lines

@@ -31,7 +31,7 @@ 
         try {
             $this->connection = new \mysqli(DB_HOST, DB_USER, DB_PASSWD_CLEAR, DB_NAME);
 
-            if ( mysqli_connect_errno()) {
+            if (mysqli_connect_errno()) {
                 throw new Exception("Could not connect to database.");   
             }
         } catch (Exception $e) {
@@ -39,16 +39,16 @@ 
         }           
     }
 
-    public function select($query = "" , $params = [])
+    public function select($query = "", $params = [])
     {
         try {
-            $stmt = $this->executeStatement( $query , $params );
+            $stmt = $this->executeStatement($query, $params);
             $result = $stmt->get_result()->fetch_all(MYSQLI_ASSOC);               
             $stmt->close();
 
             return $result;
-        } catch(Exception $e) {
-            throw New Exception( $e->getMessage() );
+        } catch (Exception $e) {
+            throw New Exception($e->getMessage());
         }
     }
 
@@ -72,7 +72,7 @@ 
             $stmt = $this->connection->prepare($query);
 
             if ($stmt === false) {
-                throw new Exception("Unable to do prepared statement: " . $query);
+                throw new Exception("Unable to do prepared statement: ".$query);
             }
 
             if ($params) {

api/index.php

Spacing +6 added lines, -6 removed lines

@@ -28,13 +28,13 @@ 
 header("Access-Control-Allow-Methods: POST, GET");
 header("Access-Control-Max-Age: 3600");
 header("Access-Control-Allow-Headers: Content-Type, Access-Control-Allow-Headers, Authorization, X-Requested-With");
-require __DIR__ . "/inc/bootstrap.php";
+require __DIR__."/inc/bootstrap.php";
 
 // sanitize url segments
 $base = new BaseController();
 $uri = $base->getUriSegments();
 if (is_array($uri) === false || is_string($uri) === true) {
-    $uri = [$uri];  // ensure $uril is table
+    $uri = [$uri]; // ensure $uril is table
 }
 
 // Prepare DB password
@@ -50,9 +50,9 @@ 
 if ($uri[0] === 'authorize') {
     // Is API enabled in Teampass settings
     if ($apiStatus['error'] === false) {
-        require API_ROOT_PATH . "/Controller/Api/AuthController.php";
+        require API_ROOT_PATH."/Controller/Api/AuthController.php";
         $objFeedController = new AuthController();
-        $strMethodName = $uri[0] . 'Action';
+        $strMethodName = $uri[0].'Action';
         $objFeedController->{$strMethodName}();
     } else {
         // Error management
@@ -78,9 +78,9 @@ 
 
     // action related to USER
     } elseif ($controller === 'user') {
-        require API_ROOT_PATH . "/Controller/Api/UserController.php";
+        require API_ROOT_PATH."/Controller/Api/UserController.php";
         $objFeedController = new UserController();
-        $strMethodName = (string) $action . 'Action';
+        $strMethodName = (string) $action.'Action';
         $objFeedController->{$strMethodName}();
 
     // action related to ITEM

api/Controller/Api/BaseController.php

Spacing +3 added lines, -3 removed lines

@@ -47,7 +47,7 @@ 
         $requestUri = $request->getRequestUri();
 
         $uri = parse_url($requestUri, PHP_URL_PATH);
-        $uri = explode( '/', $uri );
+        $uri = explode('/', $uri);
         return $this->sanitizeUrl(array_slice($uri, ((int) array_search('index.php', $uri) + 1)));
     }
 
@@ -74,7 +74,7 @@ 
     {
         $filters = [];
         $array_size = count($array);
-        for ($i=0; $i < $array_size; $i++) {
+        for ($i = 0; $i < $array_size; $i++) {
             array_push($filters, 'trim|escape');
         }
         
@@ -92,7 +92,7 @@ 
      * @param mixed  $data
      * @param string $httpHeader
      */
-    protected function sendOutput($data, $httpHeaders=array()): void
+    protected function sendOutput($data, $httpHeaders = array()): void
     {
         header_remove('Set-Cookie');
 

api/inc/jwt_utils.php

Indentation +50 added lines, -50 removed lines

@@ -37,45 +37,45 @@ 
  * @return boolean
  */
 function is_jwt_valid($jwt) {
-	try {
-		$decoded = (array) JWT::decode($jwt, new Key(DB_PASSWD, 'HS256'));
+    try {
+        $decoded = (array) JWT::decode($jwt, new Key(DB_PASSWD, 'HS256'));
 
-		// Check if expiration is reached
-		if ($decoded['exp'] - time() < 0) {
-			return false;
-		}
+        // Check if expiration is reached
+        if ($decoded['exp'] - time() < 0) {
+            return false;
+        }
 /*
 		$decoded1 = JWT::decode($jwt, new Key(DB_PASSWD, 'HS256'), $headers = new stdClass());
 		print_r($headers);
 */
 
-		return true;
-	} catch (InvalidArgumentException $e) {
-		// provided key/key-array is empty or malformed.
-		return false;
-	} catch (DomainException $e) {
-		// provided algorithm is unsupported OR
-		// provided key is invalid OR
-		// unknown error thrown in openSSL or libsodium OR
-		// libsodium is required but not available.
-		return false;
-	} catch (SignatureInvalidException $e) {
-		// provided JWT signature verification failed.
-		return false;
-	} catch (BeforeValidException $e) {
-		// provided JWT is trying to be used before "nbf" claim OR
-		// provided JWT is trying to be used before "iat" claim.
-		return false;
-	} catch (ExpiredException $e) {
-		// provided JWT is trying to be used after "exp" claim.
-		return false;
-	} catch (UnexpectedValueException $e) {
-		// provided JWT is malformed OR
-		// provided JWT is missing an algorithm / using an unsupported algorithm OR
-		// provided JWT algorithm does not match provided key OR
-		// provided key ID in key/key-array is empty or invalid.
-		return false;
-	}
+        return true;
+    } catch (InvalidArgumentException $e) {
+        // provided key/key-array is empty or malformed.
+        return false;
+    } catch (DomainException $e) {
+        // provided algorithm is unsupported OR
+        // provided key is invalid OR
+        // unknown error thrown in openSSL or libsodium OR
+        // libsodium is required but not available.
+        return false;
+    } catch (SignatureInvalidException $e) {
+        // provided JWT signature verification failed.
+        return false;
+    } catch (BeforeValidException $e) {
+        // provided JWT is trying to be used before "nbf" claim OR
+        // provided JWT is trying to be used before "iat" claim.
+        return false;
+    } catch (ExpiredException $e) {
+        // provided JWT is trying to be used after "exp" claim.
+        return false;
+    } catch (UnexpectedValueException $e) {
+        // provided JWT is malformed OR
+        // provided JWT is missing an algorithm / using an unsupported algorithm OR
+        // provided JWT algorithm does not match provided key OR
+        // provided key ID in key/key-array is empty or invalid.
+        return false;
+    }
 }
 
 function base64url_encode($data) {
@@ -84,23 +84,23 @@ 
 
 function get_authorization_header()
 {
-	$request = symfonyRequest::createFromGlobals();
-	$authorizationHeader = $request->headers->get('Authorization');
-	$headers = null;
+    $request = symfonyRequest::createFromGlobals();
+    $authorizationHeader = $request->headers->get('Authorization');
+    $headers = null;
 	
-	if (null !== $authorizationHeader) {
-		$headers = trim($authorizationHeader);
-	} else if (function_exists('apache_request_headers') === true) {
-		$requestHeaders = (array) apache_request_headers();
-		// Server-side fix for bug in old Android versions (a nice side-effect of this fix means we don't care about capitalization for Authorization)
-		$requestHeaders = array_combine(array_map('ucwords', array_keys($requestHeaders)), array_values($requestHeaders));
-		//print_r($requestHeaders);
-		if (isset($requestHeaders['Authorization']) === true) {
-			$headers = trim($requestHeaders['Authorization']);
-		}
-	}
+    if (null !== $authorizationHeader) {
+        $headers = trim($authorizationHeader);
+    } else if (function_exists('apache_request_headers') === true) {
+        $requestHeaders = (array) apache_request_headers();
+        // Server-side fix for bug in old Android versions (a nice side-effect of this fix means we don't care about capitalization for Authorization)
+        $requestHeaders = array_combine(array_map('ucwords', array_keys($requestHeaders)), array_values($requestHeaders));
+        //print_r($requestHeaders);
+        if (isset($requestHeaders['Authorization']) === true) {
+            $headers = trim($requestHeaders['Authorization']);
+        }
+    }
 	
-	return $headers;
+    return $headers;
 }
 
 function get_bearer_token() {
@@ -117,8 +117,8 @@ 
 
 function get_bearer_data($jwt) {
     // split the jwt
-	$tokenParts = explode('.', $jwt);
-	$payload = base64_decode($tokenParts[1]);
+    $tokenParts = explode('.', $jwt);
+    $payload = base64_decode($tokenParts[1]);
 	
     // HEADER: Get the access token from the header
     if (empty($payload) === false) {