nilsteampassnet / TeamPass

pages/import.php

Spacing +4 added lines, -4 removed lines

@@ -70,7 +70,7 @@ 
     || isset($SETTINGS['allow_import']) === false || (int) $SETTINGS['allow_import'] !== 1) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -85,9 +85,9 @@ 
  
 if ((int) $session->get('user-admin') === 1) {
     $folderOptions = '';
-    $rows = DB::query('SELECT id, title FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', 0);
+    $rows = DB::query('SELECT id, title FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', 0);
     foreach ($rows as $record) {
-        $folderOptions .= '<option value="' . $record['id'] . '">' . htmlspecialchars($record['title'], ENT_QUOTES, 'UTF-8') . '</option>';
+        $folderOptions .= '<option value="'.$record['id'].'">'.htmlspecialchars($record['title'], ENT_QUOTES, 'UTF-8').'</option>';
     }
 }
 
@@ -189,7 +189,7 @@ 
                                         <?php
 $complexitySelect = '';
 foreach (TP_PW_COMPLEXITY as $level) {
-    $complexitySelect .= '<option value="' . $level[0] . '">' . $level[1] . '</option>';
+    $complexitySelect .= '<option value="'.$level[0].'">'.$level[1].'</option>';
 }
 echo $complexitySelect;
                                         ?>

pages/import.js.php

Spacing +3 added lines, -3 removed lines

@@ -72,7 +72,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('import') === false) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 ?>
@@ -511,7 +511,7 @@ 
                     const errorMessages = JSON.parse(response.message);
                     let errorHtml = '<ul>';
                     errorMessages.forEach(function(error) {
-                        errorHtml += '<li><?php echo $lang->get('import_error_folder_creation');?> "<b>'+error.errorPath+'</b>": '+error.errorMessage+'</li>';
+                        errorHtml += '<li><?php echo $lang->get('import_error_folder_creation'); ?> "<b>'+error.errorPath+'</b>": '+error.errorMessage+'</li>';
                     });
 
                     $('#import-feedback-progress-text').html(
@@ -997,7 +997,7 @@ 
                                     // Isolate first item
                                     if (itemsList.length > 0) {
                                         $('#import-feedback-progress-text')
-                                            .html('<i class="fa-solid fa-cog fa-spin ml-4 mr-2"></i><?php echo $lang->get('operation_progress');?> ('+((counter*100)/itemsNumber).toFixed(0)+'%)');
+                                            .html('<i class="fa-solid fa-cog fa-spin ml-4 mr-2"></i><?php echo $lang->get('operation_progress'); ?> ('+((counter*100)/itemsNumber).toFixed(0)+'%)');
 
                                         data = {
                                             'edit-all': $('#import-keepass-edit-all-checkbox').prop('checked') === true ? 1 : 0,

sources/expired.datatables.php

Spacing +20 added lines, -20 removed lines

@@ -76,7 +76,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;
 }
 
@@ -101,7 +101,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 */
@@ -110,7 +110,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
@@ -123,7 +123,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
@@ -147,9 +147,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."%' ";
     }
 }
 
@@ -160,26 +160,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();
@@ -187,7 +187,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": ';
@@ -201,18 +201,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 (count($rows) > 0) {

sources/utilities.queries.php

Spacing +30 added lines, -30 removed lines

@@ -77,7 +77,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;
 }
 
@@ -128,7 +128,7 @@ 
             $arrFolders = array();
             $rows = DB::query(
                 'SELECT valeur, intitule
-                FROM ' . prefixTable('misc') . '
+                FROM ' . prefixTable('misc').'
                 WHERE type  = %s',
                 'folder_deleted'
             );
@@ -151,11 +151,11 @@ 
                 i.id as id, i.label as label,
                 i.id_tree as id_tree, l.date as date, n.title as folder_title,
                 a.del_enabled as del_enabled, a.del_value as del_value, a.del_type as del_type
-                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)
-                INNER JOIN ' . prefixTable('automatic_del') . ' as a ON (l.id_item = a.item_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)
+                INNER JOIN ' . prefixTable('automatic_del').' as a ON (l.id_item = a.item_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,
                             'del_enabled' => (bool) $record['del_enabled'],
@@ -238,10 +238,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']);
@@ -268,7 +268,7 @@ 
                         prefixTable('misc'),
                         'type = %s AND intitule = %s',
                         'folder_deleted',
-                        'f' . $folderId
+                        'f'.$folderId
                     );
 
                     // Restore all items in this folder
@@ -284,7 +284,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
                     );
@@ -373,10 +373,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']);
@@ -387,7 +387,7 @@ 
                         prefixTable('misc'),
                         'type = %s AND intitule = %s',
                         'folder_deleted',
-                        'f' . $folderData[0]
+                        'f'.$folderData[0]
                     );
 
                     // Delete all items in this folder
@@ -401,7 +401,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]
                     );
@@ -418,7 +418,7 @@ 
                         // Delete all fields
                         $fields = DB::query(
                             'SELECT id
-                            FROM ' . prefixTable('categories_items') . '
+                            FROM ' . prefixTable('categories_items').'
                             WHERE item_id = %i',
                             $folderData[0]
                         );
@@ -438,7 +438,7 @@ 
                         // Delete all files
                         $files = DB::query(
                             'SELECT id
-                            FROM ' . prefixTable('files') . '
+                            FROM ' . prefixTable('files').'
                             WHERE id_item = %i',
                             $folderData[0]
                         );
@@ -495,7 +495,7 @@ 
                 // Delete sharekey fields
                 $itemFields = DB::query(
                     'SELECT id
-                    FROM ' . prefixTable('categories_items') . '
+                    FROM ' . prefixTable('categories_items').'
                     WHERE item_id = %i',
                     $itemId
                 );
@@ -510,7 +510,7 @@ 
                 // Delete sharekey files
                 $itemFiles = DB::query(
                     'SELECT id
-                    FROM ' . prefixTable('files') . '
+                    FROM ' . prefixTable('files').'
                     WHERE id_item = %i',
                     $itemId
                 );
@@ -587,7 +587,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),
@@ -607,7 +607,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)
@@ -630,7 +630,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,
@@ -647,7 +647,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,
@@ -664,7 +664,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,
@@ -681,7 +681,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,
@@ -752,19 +752,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
                 );
@@ -831,7 +831,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);

api/Controller/Api/BaseController.php

Spacing +2 added lines, -2 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)));
     }
 
@@ -60,7 +60,7 @@ 
     {
         $request = symfonyRequest::createFromGlobals();
         $queryString = $request->getQueryString();
-<<<<<<< HEAD
+<< << <<< HEAD
         if ($request->getContentTypeFormat() !== 'json') {
 =======
         if ($request->getContentTypeFormat() != 'application/json') {

sources/admin.queries.php

Spacing +139 added lines, -139 removed lines

@@ -72,7 +72,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('admin') === false) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -133,14 +133,14 @@ 
             break;
         }
 
-        require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
         $return = '';
 
         //Get all tables
         $tables = array();
         $result = DB::query('SHOW TABLES');
         foreach ($result as $row) {
-            $tables[] = $row['Tables_in_' . DB_NAME];
+            $tables[] = $row['Tables_in_'.DB_NAME];
         }
 
         //cycle through
@@ -148,7 +148,7 @@ 
             if (defined('DB_PREFIX') || substr_count($table, DB_PREFIX) > 0) {
                 $table = (is_string($table) ? $table : strval($table));
                 // Do query
-                $result = DB::query('SELECT * FROM ' . $table);
+                $result = DB::query('SELECT * FROM '.$table);
                 DB::query(
                     'SELECT *
                     FROM INFORMATION_SCHEMA.COLUMNS
@@ -160,20 +160,20 @@ 
                 $numFields = DB::count();
 
                 // prepare a drop table
-                $return .= 'DROP TABLE ' . $table . ';';
-                $row2 = DB::queryFirstRow('SHOW CREATE TABLE ' . $table);
-                $return .= "\n\n" . strval($row2['Create Table']) . ";\n\n";
+                $return .= 'DROP TABLE '.$table.';';
+                $row2 = DB::queryFirstRow('SHOW CREATE TABLE '.$table);
+                $return .= "\n\n".strval($row2['Create Table']).";\n\n";
 
                 //prepare all fields and datas
                 for ($i = 0; $i < $numFields; ++$i) {
                     if (is_object($result)) {
                         while ($row = $result->fetch_row()) {
-                            $return .= 'INSERT INTO ' . $table . ' VALUES(';
+                            $return .= 'INSERT INTO '.$table.' VALUES(';
                             for ($j = 0; $j < $numFields; ++$j) {
                                 $row[$j] = addslashes($row[$j]);
                                 $row[$j] = preg_replace("/\n/", '\\n', $row[$j]);
                                 if (isset($row[$j])) {
-                                    $return .= '"' . $row[$j] . '"';
+                                    $return .= '"'.$row[$j].'"';
                                 } else {
                                     $return .= 'NULL';
                                 }
@@ -194,8 +194,8 @@ 
             $token = GenerateCryptKey(20, false, true, true, false, true);
 
             //save file
-            $filename = time() . '-' . $token . '.sql';
-            $handle = fopen($SETTINGS['path_to_files_folder'] . '/' . $filename, 'w+');
+            $filename = time().'-'.$token.'.sql';
+            $handle = fopen($SETTINGS['path_to_files_folder'].'/'.$filename, 'w+');
             if ($handle !== false) {
                 //write file
                 fwrite($handle, $return);
@@ -207,16 +207,16 @@ 
                 // Encrypt the file
                 prepareFileWithDefuse(
                     'encrypt',
-                    $SETTINGS['path_to_files_folder'] . '/' . $filename,
-                    $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $filename,
+                    $SETTINGS['path_to_files_folder'].'/'.$filename,
+                    $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$filename,
                     $post_option
                 );
 
                 // Do clean
-                unlink($SETTINGS['path_to_files_folder'] . '/' . $filename);
+                unlink($SETTINGS['path_to_files_folder'].'/'.$filename);
                 rename(
-                    $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $filename,
-                    $SETTINGS['path_to_files_folder'] . '/' . $filename
+                    $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$filename,
+                    $SETTINGS['path_to_files_folder'].'/'.$filename
                 );
             }
 
@@ -226,7 +226,7 @@ 
             //update LOG
             logEvents($SETTINGS, 'admin_action', 'dataBase backup', (string) $session->get('user-id'), $session->get('user-login'));
 
-            echo '[{"result":"db_backup" , "href":"sources/downloadFile.php?name=' . urlencode($filename) . '&sub=files&file=' . $filename . '&type=sql&key=' . $session->get('key') . '&key_tmp=' . $session->get('user-key_tmp') . '&pathIsFiles=1"}]';
+            echo '[{"result":"db_backup" , "href":"sources/downloadFile.php?name='.urlencode($filename).'&sub=files&file='.$filename.'&type=sql&key='.$session->get('key').'&key_tmp='.$session->get('user-key_tmp').'&pathIsFiles=1"}]';
         }
         break;
 
@@ -255,7 +255,7 @@ 
             );
             break;
         }
-        include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
         $dataPost = explode('&', $post_option);
         $file = htmlspecialchars($dataPost[0]);
@@ -264,7 +264,7 @@ 
         // Get filename from database
         $data = DB::queryFirstRow(
             'SELECT valeur
-            FROM ' . prefixTable('misc') . '
+            FROM ' . prefixTable('misc').'
             WHERE increment_id = %i',
             $file
         );
@@ -283,8 +283,8 @@ 
             // Decrypt the file
             $ret = prepareFileWithDefuse(
                 'decrypt',
-                $SETTINGS['path_to_files_folder'] . '/' . $file,
-                $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $file,
+                $SETTINGS['path_to_files_folder'].'/'.$file,
+                $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$file,
                 $key
             );
 
@@ -295,10 +295,10 @@ 
             }
 
             // Do clean
-            fileDelete($SETTINGS['path_to_files_folder'] . '/' . $file, $SETTINGS);
-            $file = $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $file;
+            fileDelete($SETTINGS['path_to_files_folder'].'/'.$file, $SETTINGS);
+            $file = $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$file;
         } else {
-            $file = $SETTINGS['path_to_files_folder'] . '/' . $file;
+            $file = $SETTINGS['path_to_files_folder'].'/'.$file;
         }
 
         //read sql file
@@ -315,7 +315,7 @@ 
         fclose($handle);
 
         //delete file
-        unlink($SETTINGS['path_to_files_folder'] . '/' . $file);
+        unlink($SETTINGS['path_to_files_folder'].'/'.$file);
 
         //Show done
         echo '[{"result":"db_restore" , "message":""}]';
@@ -354,8 +354,8 @@ 
                 $tablename = (is_string($tablename) ? $tablename : strval($tablename));
                 if (substr_count($tablename, DB_PREFIX) > 0) {
                     // launch optimization quieries
-                    DB::query('ANALYZE TABLE `' . $tablename . '`');
-                    DB::query('OPTIMIZE TABLE `' . $tablename . '`');
+                    DB::query('ANALYZE TABLE `'.$tablename.'`');
+                    DB::query('OPTIMIZE TABLE `'.$tablename.'`');
                 }
             }
         }
@@ -363,12 +363,12 @@ 
         //Clean up LOG_ITEMS table
         $rows = DB::query(
             'SELECT id
-            FROM ' . prefixTable('items') . '
+            FROM ' . prefixTable('items').'
             ORDER BY id ASC'
         );
         foreach ($rows as $item) {
             DB::query(
-                'SELECT * FROM ' . prefixTable('log_items') . ' WHERE id_item = %i AND action = %s',
+                'SELECT * FROM '.prefixTable('log_items').' WHERE id_item = %i AND action = %s',
                 $item['id'],
                 'at_creation'
             );
@@ -376,7 +376,7 @@ 
             if ($counter === 0) {
                 //Create new at_creation entry
                 $rowTmp = DB::queryFirstRow(
-                    'SELECT date, id_user FROM ' . prefixTable('log_items') . ' WHERE id_item=%i ORDER BY date ASC',
+                    'SELECT date, id_user FROM '.prefixTable('log_items').' WHERE id_item=%i ORDER BY date ASC',
                     $item['id']
                 );
                 DB::insert(
@@ -406,8 +406,8 @@ 
         echo prepareExchangedData(
             array(
                 'error' => false,
-                'message' => $lang->get('last_execution') . ' ' .
-                    date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) time()) .
+                'message' => $lang->get('last_execution').' '.
+                    date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) time()).
                     '<i class="fas fa-check text-success ml-2"></i>',
             ),
             'encode'
@@ -443,7 +443,7 @@ 
             break;
         }
 
-        require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
         updateCacheTable('reload', NULL);
 
         // Log
@@ -459,8 +459,8 @@ 
         echo prepareExchangedData(
             [
                 'error' => false,
-                'message' => $lang->get('last_execution') . ' ' .
-                    date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) time()) .
+                'message' => $lang->get('last_execution').' '.
+                    date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) time()).
                     '<i class="fas fa-check text-success mr-2"></i>',
             ],
             'encode'
@@ -502,7 +502,7 @@ 
         $session->set('user-reencrypt_old_salt', file_get_contents(SECUREPATH.'/'.SECUREFILE));
 
         // generate new saltkey
-        $old_sk_filename = SECUREPATH.'/'.SECUREFILE . date('Y_m_d', mktime(0, 0, 0, (int) date('m'), (int) date('d'), (int) date('y'))) . '.' . time();
+        $old_sk_filename = SECUREPATH.'/'.SECUREFILE.date('Y_m_d', mktime(0, 0, 0, (int) date('m'), (int) date('d'), (int) date('y'))).'.'.time();
         copy(
             SECUREPATH.'/'.SECUREFILE,
             $old_sk_filename
@@ -531,13 +531,13 @@ 
         logEvents($SETTINGS, 'system', 'change_salt_key', (string) $session->get('user-id'), $session->get('user-login'));
 
         // get number of items to change
-        DB::query('SELECT id FROM ' . prefixTable('items') . ' WHERE perso = %i', 0);
+        DB::query('SELECT id FROM '.prefixTable('items').' WHERE perso = %i', 0);
         $nb_of_items = DB::count();
 
         // create backup table
-        DB::query('DROP TABLE IF EXISTS ' . prefixTable('sk_reencrypt_backup'));
+        DB::query('DROP TABLE IF EXISTS '.prefixTable('sk_reencrypt_backup'));
         DB::query(
-            'CREATE TABLE `' . prefixTable('sk_reencrypt_backup') . '` (
+            'CREATE TABLE `'.prefixTable('sk_reencrypt_backup').'` (
             `id` int(12) NOT null AUTO_INCREMENT,
             `current_table` varchar(100) NOT NULL,
             `current_field` varchar(500) NOT NULL,
@@ -565,7 +565,7 @@ 
         );
 
         // delete previous backup files
-        $files = glob($SETTINGS['path_to_upload_folder'] . '/*'); // get all file names
+        $files = glob($SETTINGS['path_to_upload_folder'].'/*'); // get all file names
         foreach ($files as $file) { // iterate files
             if (is_file($file)) {
                 $file_parts = pathinfo($file);
@@ -652,7 +652,7 @@ 
                 echo prepareExchangedData(
                     array(
                         'error' => true,
-                        'message' => 'Input `' . $objects[0] . '` is not allowed',
+                        'message' => 'Input `'.$objects[0].'` is not allowed',
                         'nbOfItems' => '',
                         'nextAction' => '',
                     ),
@@ -665,9 +665,9 @@ 
                 //change all encrypted data in Items (passwords)
                 $rows = DB::query(
                     'SELECT id, pw, pw_iv
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE perso = %s
-                    LIMIT ' . $post_start . ', ' . $post_length,
+                    LIMIT ' . $post_start.', '.$post_length,
                     '0'
                 );
                 foreach ($rows as $record) {
@@ -679,7 +679,7 @@ 
                             'current_field' => 'pw',
                             'value_id' => $record['id'],
                             'value' => $record['pw'],
-                            'current_sql' => 'UPDATE ' . prefixTable('items') . " SET pw = '" . $record['pw'] . "' WHERE id = '" . $record['id'] . "';",
+                            'current_sql' => 'UPDATE '.prefixTable('items')." SET pw = '".$record['pw']."' WHERE id = '".$record['id']."';",
                             'value2' => 'none',
                             'result' => 'none',
                         )
@@ -728,9 +728,9 @@ 
                 //change all encrypted data in Logs (passwords)
                 $rows = DB::query(
                     'SELECT raison, increment_id
-                    FROM ' . prefixTable('log_items') . "
+                    FROM ' . prefixTable('log_items')."
                     WHERE action = %s AND raison LIKE 'at_pw :%'
-                    LIMIT " . $post_start . ', ' . $post_length,
+                    LIMIT " . $post_start.', '.$post_length,
                     'at_modification'
                 );
                 foreach ($rows as $record) {
@@ -742,7 +742,7 @@ 
                             'current_field' => 'raison',
                             'value_id' => $record['increment_id'],
                             'value' => $record['raison'],
-                            'current_sql' => 'UPDATE ' . prefixTable('log_items') . " SET raison = '" . $record['raison'] . "' WHERE increment_id = '" . $record['increment_id'] . "';",
+                            'current_sql' => 'UPDATE '.prefixTable('log_items')." SET raison = '".$record['raison']."' WHERE increment_id = '".$record['increment_id']."';",
                             'value2' => 'none',
                             'result' => 'none',
                         )
@@ -770,7 +770,7 @@ 
                         DB::update(
                             prefixTable('log_items'),
                             array(
-                                'raison' => 'at_pw :' . $encrypt['string'],
+                                'raison' => 'at_pw :'.$encrypt['string'],
                                 'encryption_type' => 'defuse',
                             ),
                             'increment_id = %i',
@@ -795,8 +795,8 @@ 
                 //change all encrypted data in CATEGORIES (passwords)
                 $rows = DB::query(
                     'SELECT id, data
-                    FROM ' . prefixTable('categories_items') . '
-                    LIMIT ' . $post_start . ', ' . $post_length
+                    FROM ' . prefixTable('categories_items').'
+                    LIMIT ' . $post_start.', '.$post_length
                 );
                 foreach ($rows as $record) {
                     // backup data
@@ -807,7 +807,7 @@ 
                             'current_field' => 'data',
                             'value_id' => $record['id'],
                             'value' => $record['data'],
-                            'current_sql' => 'UPDATE ' . prefixTable('categories_items') . " SET data = '" . $record['data'] . "' WHERE id = '" . $record['id'] . "';",
+                            'current_sql' => 'UPDATE '.prefixTable('categories_items')." SET data = '".$record['data']."' WHERE id = '".$record['id']."';",
                             'value2' => 'none',
                             'result' => 'none',
                         )
@@ -855,9 +855,9 @@ 
                 // Change all encrypted data in FILES (passwords)
                 $rows = DB::query(
                     'SELECT id, file, status
-                    FROM ' . prefixTable('files') . "
+                    FROM ' . prefixTable('files')."
                     WHERE status = 'encrypted'
-                    LIMIT " . $post_start . ', ' . $post_length
+                    LIMIT " . $post_start.', '.$post_length
                 );
                 foreach ($rows as $record) {
                     // backup data
@@ -875,20 +875,20 @@ 
                     );
                     $newID = DB::insertId();
 
-                    if (file_exists($SETTINGS['path_to_upload_folder'] . '/' . $record['file'])) {
+                    if (file_exists($SETTINGS['path_to_upload_folder'].'/'.$record['file'])) {
                         // make a copy of file
                         if (!copy(
-                            $SETTINGS['path_to_upload_folder'] . '/' . $record['file'],
-                            $SETTINGS['path_to_upload_folder'] . '/' . $record['file'] . '.copy'
+                            $SETTINGS['path_to_upload_folder'].'/'.$record['file'],
+                            $SETTINGS['path_to_upload_folder'].'/'.$record['file'].'.copy'
                         )) {
                             $error = 'Copy not possible';
                             exit;
                         } else {
                             // prepare a bck of file (that will not be deleted)
-                            $backup_filename = $record['file'] . '.bck-change-sk.' . time();
+                            $backup_filename = $record['file'].'.bck-change-sk.'.time();
                             copy(
-                                $SETTINGS['path_to_upload_folder'] . '/' . $record['file'],
-                                $SETTINGS['path_to_upload_folder'] . '/' . $backup_filename
+                                $SETTINGS['path_to_upload_folder'].'/'.$record['file'],
+                                $SETTINGS['path_to_upload_folder'].'/'.$backup_filename
                             );
                         }
 
@@ -896,22 +896,22 @@ 
                         // STEP1 - Do decryption
                         prepareFileWithDefuse(
                             'decrypt',
-                            $SETTINGS['path_to_upload_folder'] . '/' . $record['file'],
-                            $SETTINGS['path_to_upload_folder'] . '/' . $record['file'] . '_encrypted'
+                            $SETTINGS['path_to_upload_folder'].'/'.$record['file'],
+                            $SETTINGS['path_to_upload_folder'].'/'.$record['file'].'_encrypted'
                         );
 
                         // Do cleanup of files
-                        unlink($SETTINGS['path_to_upload_folder'] . '/' . $record['file']);
+                        unlink($SETTINGS['path_to_upload_folder'].'/'.$record['file']);
 
                         // STEP2 - Do encryption
                         prepareFileWithDefuse(
                             'encryp',
-                            $SETTINGS['path_to_upload_folder'] . '/' . $record['file'] . '_encrypted',
-                            $SETTINGS['path_to_upload_folder'] . '/' . $record['file']
+                            $SETTINGS['path_to_upload_folder'].'/'.$record['file'].'_encrypted',
+                            $SETTINGS['path_to_upload_folder'].'/'.$record['file']
                         );
 
                         // Do cleanup of files
-                        unlink($SETTINGS['path_to_upload_folder'] . '/' . $record['file'] . '_encrypted');
+                        unlink($SETTINGS['path_to_upload_folder'].'/'.$record['file'].'_encrypted');
 
                         // Update backup table
                         DB::update(
@@ -937,13 +937,13 @@ 
                 // do some things for new object
                 if (isset($objects[0])) {
                     if ($objects[0] === 'logs') {
-                        DB::query('SELECT increment_id FROM ' . prefixTable('log_items') . " WHERE action = %s AND raison LIKE 'at_pw :%'", 'at_modification');
+                        DB::query('SELECT increment_id FROM '.prefixTable('log_items')." WHERE action = %s AND raison LIKE 'at_pw :%'", 'at_modification');
                     } elseif ($objects[0] === 'files') {
-                        DB::query('SELECT id FROM ' . prefixTable('files'));
+                        DB::query('SELECT id FROM '.prefixTable('files'));
                     } elseif ($objects[0] === 'categories') {
-                        DB::query('SELECT id FROM ' . prefixTable('categories_items'));
+                        DB::query('SELECT id FROM '.prefixTable('categories_items'));
                     } elseif ($objects[0] === 'custfields') {
-                        DB::query('SELECT raison FROM ' . prefixTable('log_items') . " WHERE action = %s AND raison LIKE 'at_pw :%'", 'at_modification');
+                        DB::query('SELECT raison FROM '.prefixTable('log_items')." WHERE action = %s AND raison LIKE 'at_pw :%'", 'at_modification');
                     }
                     $nb_of_items = DB::count();
                 } else {
@@ -1063,12 +1063,12 @@ 
                 );
             } elseif ($record['current_table'] === 'files') {
                 // restore backup file
-                if (file_exists($SETTINGS['path_to_upload_folder'] . '/' . $record['value'])) {
-                    unlink($SETTINGS['path_to_upload_folder'] . '/' . $record['value']);
-                    if (file_exists($SETTINGS['path_to_upload_folder'] . '/' . $record['value2'])) {
+                if (file_exists($SETTINGS['path_to_upload_folder'].'/'.$record['value'])) {
+                    unlink($SETTINGS['path_to_upload_folder'].'/'.$record['value']);
+                    if (file_exists($SETTINGS['path_to_upload_folder'].'/'.$record['value2'])) {
                         rename(
-                            $SETTINGS['path_to_upload_folder'] . '/' . $record['value2'],
-                            $SETTINGS['path_to_upload_folder'] . '/' . $record['value']
+                            $SETTINGS['path_to_upload_folder'].'/'.$record['value2'],
+                            $SETTINGS['path_to_upload_folder'].'/'.$record['value']
                         );
                     }
                 }
@@ -1087,7 +1087,7 @@ 
         }
 
         // drop table
-        DB::query('DROP TABLE IF EXISTS ' . prefixTable('sk_reencrypt_backup'));
+        DB::query('DROP TABLE IF EXISTS '.prefixTable('sk_reencrypt_backup'));
 
         // Send back
         echo prepareExchangedData(
@@ -1130,17 +1130,17 @@ 
         // delete files
         $rows = DB::query(
             'SELECT value, value2
-            FROM ' . prefixTable('sk_reencrypt_backup') . "
+            FROM ' . prefixTable('sk_reencrypt_backup')."
             WHERE current_table = 'files'"
         );
         foreach ($rows as $record) {
-            if (file_exists($SETTINGS['path_to_upload_folder'] . '/' . $record['value2'])) {
-                unlink($SETTINGS['path_to_upload_folder'] . '/' . $record['value2']);
+            if (file_exists($SETTINGS['path_to_upload_folder'].'/'.$record['value2'])) {
+                unlink($SETTINGS['path_to_upload_folder'].'/'.$record['value2']);
             }
         }
 
         // drop table
-        DB::query('DROP TABLE IF EXISTS ' . prefixTable('sk_reencrypt_backup'));
+        DB::query('DROP TABLE IF EXISTS '.prefixTable('sk_reencrypt_backup'));
 
         echo '[{"status":"done"}]';
         break;
@@ -1171,7 +1171,7 @@ 
                 'encode'
             );
         } else {
-            require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+            require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
             //send email
             $emailSettings = new EmailSettings($SETTINGS);
@@ -1209,13 +1209,13 @@ 
             break;
         }
 
-        include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
         $emailSettings = new EmailSettings($SETTINGS);
         $emailService = new EmailService();
 
         $rows = DB::query(
             'SELECT *
-            FROM ' . prefixTable('emails') . '
+            FROM ' . prefixTable('emails').'
             WHERE status = %s OR status = %s',
             'not_sent',
             ''
@@ -1301,13 +1301,13 @@ 
             break;
         }
 
-        include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
         // Instatiate email settings and service
         $emailSettings = new EmailSettings($SETTINGS);
         $emailService = new EmailService();
 
-        $rows = DB::query('SELECT * FROM ' . prefixTable('emails') . ' WHERE status = %s OR status = %s', 'not_sent', '');
+        $rows = DB::query('SELECT * FROM '.prefixTable('emails').' WHERE status = %s OR status = %s', 'not_sent', '');
         foreach ($rows as $record) {
             //send email
             $email = $emailService->sendMail(
@@ -1376,7 +1376,7 @@ 
             break;
         }
 
-        require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
         // init
         $filesList = array();
@@ -1389,7 +1389,7 @@ 
                 FROM ' . prefixTable('files')
             );
             foreach ($rows as $record) {
-                if (is_file($SETTINGS['path_to_upload_folder'] . '/' . $record['file'])) {
+                if (is_file($SETTINGS['path_to_upload_folder'].'/'.$record['file'])) {
                     $addFile = false;
                     if (($post_option === 'attachments-decrypt' && $record['status'] === 'encrypted')
                         || ($post_option === 'attachments-encrypt' && $record['status'] === 'clear')
@@ -1454,8 +1454,8 @@ 
         $post_list = filter_var_array($post_list, FILTER_SANITIZE_FULL_SPECIAL_CHARS);
         $post_counter = filter_var($post_counter, FILTER_SANITIZE_NUMBER_INT);
 
-        include $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
-        include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        include $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
+        include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
         $cpt = 0;
         $continu = true;
@@ -1468,33 +1468,33 @@ 
                 // Get file name
                 $file_info = DB::queryFirstRow(
                     'SELECT file
-                    FROM ' . prefixTable('files') . '
+                    FROM ' . prefixTable('files').'
                     WHERE id = %i',
                     $file
                 );
 
                 // skip file is Coherancey not respected
-                if (is_file($SETTINGS['path_to_upload_folder'] . '/' . $file_info['file'])) {
+                if (is_file($SETTINGS['path_to_upload_folder'].'/'.$file_info['file'])) {
                     // Case where we want to decrypt
                     if ($post_option === 'decrypt') {
                         prepareFileWithDefuse(
                             'decrypt',
-                            $SETTINGS['path_to_upload_folder'] . '/' . $file_info['file'],
-                            $SETTINGS['path_to_upload_folder'] . '/defuse_temp_' . $file_info['file'],
+                            $SETTINGS['path_to_upload_folder'].'/'.$file_info['file'],
+                            $SETTINGS['path_to_upload_folder'].'/defuse_temp_'.$file_info['file'],
                         );
                         // Case where we want to encrypt
                     } elseif ($post_option === 'encrypt') {
                         prepareFileWithDefuse(
                             'encrypt',
-                            $SETTINGS['path_to_upload_folder'] . '/' . $file_info['file'],
-                            $SETTINGS['path_to_upload_folder'] . '/defuse_temp_' . $file_info['file'],
+                            $SETTINGS['path_to_upload_folder'].'/'.$file_info['file'],
+                            $SETTINGS['path_to_upload_folder'].'/defuse_temp_'.$file_info['file'],
                         );
                     }
                     // Do file cleanup
-                    fileDelete($SETTINGS['path_to_upload_folder'] . '/' . $file_info['file'], $SETTINGS);
+                    fileDelete($SETTINGS['path_to_upload_folder'].'/'.$file_info['file'], $SETTINGS);
                     rename(
-                        $SETTINGS['path_to_upload_folder'] . '/defuse_temp_' . $file_info['file'],
-                        $SETTINGS['path_to_upload_folder'] . '/' . $file_info['file']
+                        $SETTINGS['path_to_upload_folder'].'/defuse_temp_'.$file_info['file'],
+                        $SETTINGS['path_to_upload_folder'].'/'.$file_info['file']
                     );
 
                     // store in DB
@@ -1529,8 +1529,8 @@ 
                 $post_option === 'attachments-decrypt' ? 'clear' : 'encrypted'
             );
 
-            $message = $lang->get('last_execution') . ' ' .
-                date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) time()) .
+            $message = $lang->get('last_execution').' '.
+                date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) time()).
                 '<i class="fas fa-check text-success ml-2 mr-3"></i>';
         }
 
@@ -1624,7 +1624,7 @@ 
             $post_id = filter_var($dataReceived['id'], FILTER_SANITIZE_NUMBER_INT);
 
             DB::query(
-                'DELETE FROM ' . prefixTable('api') . ' WHERE increment_id = %i',
+                'DELETE FROM '.prefixTable('api').' WHERE increment_id = %i',
                 $post_id
             );
         }
@@ -1719,7 +1719,7 @@ 
             // Delete existing key
         } elseif (null !== $post_action && $post_action === 'delete') {
             $post_id = filter_var($dataReceived['id'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
-            DB::query('DELETE FROM ' . prefixTable('api') . ' WHERE increment_id=%i', $post_id);
+            DB::query('DELETE FROM '.prefixTable('api').' WHERE increment_id=%i', $post_id);
         }
 
         echo prepareExchangedData(
@@ -1734,7 +1734,7 @@ 
 
     case 'save_api_status':
         // Do query
-        DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'api');
+        DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'api');
         $counter = DB::count();
         if ($counter === 0) {
             DB::insert(
@@ -1763,7 +1763,7 @@ 
 
     case 'run_duo_config_check':
         //Libraries call
-        require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
         // Check KEY
         if ($post_key !== $session->get('key')) {
             echo prepareExchangedData(
@@ -1869,7 +1869,7 @@ 
         } else {
             $tmp = 1;
         }
-        DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'google_authentication');
+        DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'google_authentication');
         $counter = DB::count();
         if ($counter === 0) {
             DB::insert(
@@ -1897,7 +1897,7 @@ 
 
         // ga_website_name
         if (is_null($dataReceived['ga_website_name']) === false) {
-            DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'ga_website_name');
+            DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'ga_website_name');
             $counter = DB::count();
             if ($counter === 0) {
                 DB::insert(
@@ -1927,7 +1927,7 @@ 
         }
 
         // send data
-        echo '[{"result" : "' . addslashes($lang['done']) . '" , "error" : ""}]';
+        echo '[{"result" : "'.addslashes($lang['done']).'" , "error" : ""}]';
         break;
 
     case 'save_agses_options':
@@ -1950,7 +1950,7 @@ 
 
         // agses_hosted_url
         if (!is_null($dataReceived['agses_hosted_url'])) {
-            DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'agses_hosted_url');
+            DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'agses_hosted_url');
             $counter = DB::count();
             if ($counter === 0) {
                 DB::insert(
@@ -1981,7 +1981,7 @@ 
 
         // agses_hosted_id
         if (!is_null($dataReceived['agses_hosted_id'])) {
-            DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'agses_hosted_id');
+            DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'agses_hosted_id');
             $counter = DB::count();
             if ($counter === 0) {
                 DB::insert(
@@ -2012,7 +2012,7 @@ 
 
         // agses_hosted_apikey
         if (!is_null($dataReceived['agses_hosted_apikey'])) {
-            DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'agses_hosted_apikey');
+            DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'agses_hosted_apikey');
             $counter = DB::count();
             if ($counter === 0) {
                 DB::insert(
@@ -2042,7 +2042,7 @@ 
         }
 
         // send data
-        echo '[{"result" : "' . addslashes($lang['done']) . '" , "error" : ""}]';
+        echo '[{"result" : "'.addslashes($lang['done']).'" , "error" : ""}]';
         break;
 
     case 'save_option_change':
@@ -2083,7 +2083,7 @@ 
 
         // Check if setting is already in DB. If NO then insert, if YES then update.
         $data = DB::query(
-            'SELECT * FROM ' . prefixTable('misc') . '
+            'SELECT * FROM '.prefixTable('misc').'
             WHERE type = %s AND intitule = %s',
             'admin',
             $post_field
@@ -2106,7 +2106,7 @@ 
                     array(
                         'valeur' => time(),
                         'type' => 'admin',
-                        'intitule' => $post_field . '_time',
+                        'intitule' => $post_field.'_time',
                         'updated_at' => time(),
                     )
                 );
@@ -2128,10 +2128,10 @@ 
             if ($post_field === 'send_stats') {
                 // Check if previous time exists, if not them insert this value in DB
                 DB::query(
-                    'SELECT * FROM ' . prefixTable('misc') . '
+                    'SELECT * FROM '.prefixTable('misc').'
                     WHERE type = %s AND intitule = %s',
                     'admin',
-                    $post_field . '_time'
+                    $post_field.'_time'
                 );
                 $counter = DB::count();
                 if ($counter === 0) {
@@ -2140,7 +2140,7 @@ 
                         array(
                             'valeur' => 0,
                             'type' => 'admin',
-                            'intitule' => $post_field . '_time',
+                            'intitule' => $post_field.'_time',
                             'created_at' => time(),
                         )
                     );
@@ -2162,13 +2162,13 @@ 
         // special Cases
         if ($post_field === 'cpassman_url') {
             // update also jsUrl for CSFP protection
-            $jsUrl = $post_value . '/includes/libraries/csrfp/js/csrfprotector.js';
+            $jsUrl = $post_value.'/includes/libraries/csrfp/js/csrfprotector.js';
             $csrfp_file = '../includes/libraries/csrfp/libs/csrfp.config.php';
             $data = file_get_contents($csrfp_file);
             $posJsUrl = strpos($data, '"jsUrl" => "');
             $posEndLine = strpos($data, '",', $posJsUrl);
             $line = substr($data, $posJsUrl, ($posEndLine - $posJsUrl + 2));
-            $newdata = str_replace($line, '"jsUrl" => "' . filter_var($jsUrl, FILTER_SANITIZE_FULL_SPECIAL_CHARS) . '",', $data);
+            $newdata = str_replace($line, '"jsUrl" => "'.filter_var($jsUrl, FILTER_SANITIZE_FULL_SPECIAL_CHARS).'",', $data);
             file_put_contents($csrfp_file, $newdata);
         } elseif ($post_field === 'restricted_to_input' && (int) $post_value === 0) {
             DB::update(
@@ -2187,7 +2187,7 @@ 
         echo prepareExchangedData(
             array(
                 'error' => false,
-                'misc' => $counter . ' ; ' . $SETTINGS[$post_field],
+                'misc' => $counter.' ; '.$SETTINGS[$post_field],
                 'message' => empty($post_translate) === false ? $lang->get($post_translate) : '',
             ),
             'encode'
@@ -2230,7 +2230,7 @@ 
 
         // send statistics
         if (null !== $post_status) {
-            DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'send_stats');
+            DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'send_stats');
             $counter = DB::count();
             if ($counter === 0) {
                 DB::insert(
@@ -2261,7 +2261,7 @@ 
 
         // send statistics items
         if (null !== $post_list) {
-            DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'send_statistics_items');
+            DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'send_statistics_items');
             $counter = DB::count();
             if ($counter === 0) {
                 DB::insert(
@@ -2307,7 +2307,7 @@ 
             break;
         }
 
-        if (DB::query("SHOW TABLES LIKE '" . prefixTable('sk_reencrypt_backup') . "'")) {
+        if (DB::query("SHOW TABLES LIKE '".prefixTable('sk_reencrypt_backup')."'")) {
             if (DB::count() === 1) {
                 echo 1;
             } else {
@@ -2368,7 +2368,7 @@ 
 
         $rows = DB::query(
             'SELECT id, title
-                FROM ' . prefixTable('roles_title') . '
+                FROM ' . prefixTable('roles_title').'
                 ORDER BY title ASC'
         );
         foreach ($rows as $record) {
@@ -2500,7 +2500,7 @@ 
 
         $ignoredFiles = DB::queryFirstField(
             'SELECT valeur 
-            FROM ' . prefixTable('misc') . ' 
+            FROM ' . prefixTable('misc').' 
             WHERE type = %s AND intitule = %s',
             'admin',
             'ignored_unknown_files'
@@ -2543,7 +2543,7 @@ 
         // Get ignored unknown files
         $existingData = DB::queryFirstRow(
             'SELECT valeur 
-            FROM ' . prefixTable('misc') . ' 
+            FROM ' . prefixTable('misc').' 
             WHERE type = %s AND intitule = %s',
             'admin',
             'ignored_unknown_files'
@@ -2600,7 +2600,7 @@ 
         // Get the list of files to delete
         $filesToDelete = DB::queryFirstField(
             'SELECT valeur 
-            FROM ' . prefixTable('misc') . ' 
+            FROM ' . prefixTable('misc').' 
             WHERE type = %s AND intitule = %s',
             'admin',
             'unknown_files'
@@ -2646,7 +2646,7 @@ 
         // Get some TP USER info
         $userInfo = DB::queryFirstRow(
             'SELECT id, public_key, private_key, pw
-            FROM ' . prefixTable('users') . ' 
+            FROM ' . prefixTable('users').' 
             WHERE id = %i',
             TP_USER_ID,
         );
@@ -2695,7 +2695,7 @@ 
     $lang = new Language($session->get('user-language') ?? 'english');
 
     $results = [];
-    $fullPath = __DIR__ . '/../';
+    $fullPath = __DIR__.'/../';
     
     foreach ($files as $file) {
         // Normalize path separators for cross-platform compatibility
@@ -2744,7 +2744,7 @@ 
         }
         
         // Try to delete the file
-        $deleteResult = '';//@unlink($normalizedPath);
+        $deleteResult = ''; //@unlink($normalizedPath);
         
         if ($deleteResult) {
             $results[$normalizedPath] = [
@@ -2774,7 +2774,7 @@ 
  */
 function filesIntegrityCheck($baseDir): array
 {
-    $referenceFile = __DIR__ . '/../files_reference.txt';
+    $referenceFile = __DIR__.'/../files_reference.txt';
 
     $unknownFiles = findUnknownFiles($baseDir, $referenceFile);
 
@@ -2812,7 +2812,7 @@ 
                 $dir,
                 FilesystemIterator::SKIP_DOTS
             ),
-            function ($current, $key, $iterator) {
+            function($current, $key, $iterator) {
                 // Ignore hidden files and folders
                 if ($current->getFilename()[0] === '.') {
                     return false;
@@ -2826,7 +2826,7 @@ 
     foreach ($iterator as $file) {
         try {
             if ($file->isFile()) {
-                $relativePath = str_replace($dir . DIRECTORY_SEPARATOR, '', $file->getPathname());
+                $relativePath = str_replace($dir.DIRECTORY_SEPARATOR, '', $file->getPathname());
                 $relativePath = str_replace('\\', '/', $relativePath); // Normalisation Windows/Linux
 
                 // Split relatif path into parts
@@ -2892,7 +2892,7 @@ 
     // Get ignored files
     $ignoredFiles = DB::queryFirstField(
         'SELECT valeur 
-        FROM ' . prefixTable('misc') . ' 
+        FROM ' . prefixTable('misc').' 
         WHERE type = %s AND intitule = %s',
         'admin',
         'ignored_unknown_files'
@@ -2911,7 +2911,7 @@ 
 function tablesIntegrityCheck(): array
 {
     // Get integrity tables file
-    $integrityTablesFile = TEAMPASS_ROOT_PATH . '/includes/tables_integrity.json';
+    $integrityTablesFile = TEAMPASS_ROOT_PATH.'/includes/tables_integrity.json';
     if (file_exists($integrityTablesFile) === false) {
         return [
             'error' => true,
@@ -2929,7 +2929,7 @@ 
     // Get all tables
     $tables = [];
     foreach (DB::queryFirstColumn("SHOW TABLES") as $table) {
-        $tables[] = str_replace(DB_PREFIX, "", $table);;
+        $tables[] = str_replace(DB_PREFIX, "", $table); ;
     }
     // Prepare the integrity check
     $tablesInError = [];
@@ -2995,7 +2995,7 @@ 
 
         // Compare hashes
         $expectedHash = $referenceData[$file];
-        $actualHash = md5_file($baseDir . '/' . $file);
+        $actualHash = md5_file($baseDir.'/'.$file);
 
         if ($expectedHash !== $actualHash) {
             $issues[] = "$file (expected: <i>$expectedHash</i>, actual: <i>$actualHash</i>)";
@@ -3048,7 +3048,7 @@ 
     foreach ($iterator as $file) {
         if ($file->isFile()) {
             // Build relative path
-            $relativePath = str_replace($dir . DIRECTORY_SEPARATOR, '', $file->getPathname());
+            $relativePath = str_replace($dir.DIRECTORY_SEPARATOR, '', $file->getPathname());
             $relativePath = str_replace('\\', '/', $relativePath); // Normalize for Windows
             // Calculate hash
             $files[$relativePath] = md5_file($file->getPathname());
@@ -3078,8 +3078,8 @@ 
     // Loop on items
     $item = DB::queryFirstRow(
         'SELECT i.id, i.pw, s.share_key, s.increment_id
-        FROM ' . prefixTable('items') . ' i
-        INNER JOIN ' . prefixTable('sharekeys_items') . ' s ON i.id = s.object_id
+        FROM ' . prefixTable('items').' i
+        INNER JOIN ' . prefixTable('sharekeys_items').' s ON i.id = s.object_id
         WHERE i.perso = %i
             AND s.user_id = %i
         ORDER BY RAND()
@@ -3108,7 +3108,7 @@ 
         // Get all items in database
         $rows = DB::queryFirstRow(
             'SELECT count(*) as counter
-            FROM ' . prefixTable('sharekeys_items') . ' s
+            FROM ' . prefixTable('sharekeys_items').' s
             WHERE s.user_id = %i',
             TP_USER_ID
         );

scripts/background_tasks___worker.php

Spacing +12 added lines, -12 removed lines

@@ -32,7 +32,7 @@ 
 require_once __DIR__.'/traits/ItemHandlerTrait.php';
 require_once __DIR__.'/traits/UserHandlerTrait.php';
 require_once __DIR__.'/traits/EmailTrait.php';
-require_once __DIR__ . '/taskLogger.php';
+require_once __DIR__.'/taskLogger.php';
 
 class TaskWorker {
     use ItemHandlerTrait;
@@ -64,7 +64,7 @@ 
      */
     public function execute() {
         try {
-            if (LOG_TASKS=== true) $this->logger->log('Processing task: ' . print_r($this->taskData, true), 'DEBUG');
+            if (LOG_TASKS === true) $this->logger->log('Processing task: '.print_r($this->taskData, true), 'DEBUG');
             // Dispatch selon le type de processus
             switch ($this->processType) {
                 case 'item_copy':
@@ -136,7 +136,7 @@ 
             $arguments = '';
         }
 
-        if (LOG_TASKS=== true) $this->logger->log('Process: '.$this->processType.' -- '.print_r($arguments, true), 'DEBUG');
+        if (LOG_TASKS === true) $this->logger->log('Process: '.$this->processType.' -- '.print_r($arguments, true), 'DEBUG');
 
         // Add 'arguments' only if not empty
         if (!empty($arguments)) {
@@ -150,7 +150,7 @@ 
             'increment_id = %i',
             $this->taskId
         );
-        if (LOG_TASKS=== true) $this->logger->log('Finishing task: ' . $this->taskId, 'DEBUG');
+        if (LOG_TASKS === true) $this->logger->log('Finishing task: '.$this->taskId, 'DEBUG');
     }
 
     /**
@@ -173,7 +173,7 @@ 
             'increment_id = %i',
             $this->taskId
         );
-        $this->logger->log('Task failure: ' . $e->getMessage(), 'ERROR');
+        $this->logger->log('Task failure: '.$e->getMessage(), 'ERROR');
     }
 
     /**
@@ -185,16 +185,16 @@ 
      * @return void
      */
     private function processSubTasks($arguments) {
-        if (LOG_TASKS=== true) $this->logger->log('processSubTasks: '.print_r($arguments, true), 'DEBUG');
+        if (LOG_TASKS === true) $this->logger->log('processSubTasks: '.print_r($arguments, true), 'DEBUG');
         // Get all subtasks related to this task
         $subtasks = DB::query(
-            'SELECT * FROM ' . prefixTable('background_subtasks') . ' WHERE task_id = %i AND is_in_progress = 0 ORDER BY `task` ASC',
+            'SELECT * FROM '.prefixTable('background_subtasks').' WHERE task_id = %i AND is_in_progress = 0 ORDER BY `task` ASC',
             $this->taskId
         );
     
         // Check if there are any subtasks to process
         if (empty($subtasks)) {
-            if (LOG_TASKS=== true) $this->logger->log('No subtask was found for task: ' . $this->taskId, 'DEBUG');
+            if (LOG_TASKS === true) $this->logger->log('No subtask was found for task: '.$this->taskId, 'DEBUG');
             return;
         }
     
@@ -204,7 +204,7 @@ 
                 // Get the subtask data
                 $subtaskData = json_decode($subtask['task'], true);
 
-                if (LOG_TASKS=== true) $this->logger->log('Processing subtask: ' . $subtaskData['step'], 'DEBUG');
+                if (LOG_TASKS === true) $this->logger->log('Processing subtask: '.$subtaskData['step'], 'DEBUG');
 
                 // Mark subtask as in progress
                 DB::update(
@@ -256,13 +256,13 @@ 
                     $subtask['increment_id']
                 );
         
-                $this->logger->log('processSubTasks : ' . $e->getMessage(), 'ERROR');
+                $this->logger->log('processSubTasks : '.$e->getMessage(), 'ERROR');
             }
         }
     
         // Are all subtasks completed?
         $remainingSubtasks = DB::queryFirstField(
-            'SELECT COUNT(*) FROM ' . prefixTable('background_subtasks') . ' WHERE task_id = %i AND is_in_progress = 0',
+            'SELECT COUNT(*) FROM '.prefixTable('background_subtasks').' WHERE task_id = %i AND is_in_progress = 0',
             $this->taskId
         );
     
@@ -278,7 +278,7 @@ 
     error_log("Usage: php background_tasks___worker.php <task_id> <process_type> [<task_data>]");
     exit(1);
 }
-$taskId = (int)$argv[1];
+$taskId = (int) $argv[1];
 $processType = $argv[2];
 $taskData = $argv[3] ?? null;
 if ($taskData) {

Braces +18 added lines, -6 removed lines

@@ -64,7 +64,9 @@ 
      */
     public function execute() {
         try {
-            if (LOG_TASKS=== true) $this->logger->log('Processing task: ' . print_r($this->taskData, true), 'DEBUG');
+            if (LOG_TASKS=== true) {
+                $this->logger->log('Processing task: ' . print_r($this->taskData, true), 'DEBUG');
+            }
             // Dispatch selon le type de processus
             switch ($this->processType) {
                 case 'item_copy':
@@ -136,7 +138,9 @@ 
             $arguments = '';
         }
 
-        if (LOG_TASKS=== true) $this->logger->log('Process: '.$this->processType.' -- '.print_r($arguments, true), 'DEBUG');
+        if (LOG_TASKS=== true) {
+            $this->logger->log('Process: '.$this->processType.' -- '.print_r($arguments, true), 'DEBUG');
+        }
 
         // Add 'arguments' only if not empty
         if (!empty($arguments)) {
@@ -150,7 +154,9 @@ 
             'increment_id = %i',
             $this->taskId
         );
-        if (LOG_TASKS=== true) $this->logger->log('Finishing task: ' . $this->taskId, 'DEBUG');
+        if (LOG_TASKS=== true) {
+            $this->logger->log('Finishing task: ' . $this->taskId, 'DEBUG');
+        }
     }
 
     /**
@@ -185,7 +191,9 @@ 
      * @return void
      */
     private function processSubTasks($arguments) {
-        if (LOG_TASKS=== true) $this->logger->log('processSubTasks: '.print_r($arguments, true), 'DEBUG');
+        if (LOG_TASKS=== true) {
+            $this->logger->log('processSubTasks: '.print_r($arguments, true), 'DEBUG');
+        }
         // Get all subtasks related to this task
         $subtasks = DB::query(
             'SELECT * FROM ' . prefixTable('background_subtasks') . ' WHERE task_id = %i AND is_in_progress = 0 ORDER BY `task` ASC',
@@ -194,7 +202,9 @@ 
     
         // Check if there are any subtasks to process
         if (empty($subtasks)) {
-            if (LOG_TASKS=== true) $this->logger->log('No subtask was found for task: ' . $this->taskId, 'DEBUG');
+            if (LOG_TASKS=== true) {
+                $this->logger->log('No subtask was found for task: ' . $this->taskId, 'DEBUG');
+            }
             return;
         }
     
@@ -204,7 +214,9 @@ 
                 // Get the subtask data
                 $subtaskData = json_decode($subtask['task'], true);
 
-                if (LOG_TASKS=== true) $this->logger->log('Processing subtask: ' . $subtaskData['step'], 'DEBUG');
+                if (LOG_TASKS=== true) {
+                    $this->logger->log('Processing subtask: ' . $subtaskData['step'], 'DEBUG');
+                }
 
                 // Mark subtask as in progress
                 DB::update(

pages/admin.js.php

Spacing +8 added lines, -8 removed lines

@@ -68,7 +68,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('admin') === false) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -173,7 +173,7 @@ 
                     // error
                     toastr.remove();
                     toastr.error(
-                        '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error,
+                        '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error,
                         '', {
                             closeButton: true,
                             positionClass: 'toast-bottom-right'
@@ -255,7 +255,7 @@ 
                     // error
                     toastr.remove();
                     toastr.error(
-                        '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error,
+                        '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error,
                         '', {
                             closeButton: true,
                             positionClass: 'toast-bottom-right'
@@ -318,7 +318,7 @@ 
                     // error
                     toastr.remove();
                     toastr.error(
-                        '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error,
+                        '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error,
                         '', {
                             closeButton: true,
                             positionClass: 'toast-bottom-right'
@@ -417,7 +417,7 @@ 
                     // error
                     toastr.remove();
                     toastr.error(
-                        '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error,
+                        '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error,
                         '', {
                             closeButton: true,
                             positionClass: 'toast-bottom-right'
@@ -446,7 +446,7 @@ 
                     
                     //const className = result.success ? 'success' : 'error';
                     const icon = result.success ? '<i class="fa-solid fa-check text-success mr-1"></i>' : '<i class="fa-solid fa-xmark text-danger mr-1"></i>';
-                    const message = result.success ? '<?php echo $lang->get('server_returned_data');?>' : 'Error: ' + result.error;
+                    const message = result.success ? '<?php echo $lang->get('server_returned_data'); ?>' : 'Error: ' + result.error;
                     
                     output += '<li>' + icon + '<b>' + file + '</b><br/>' + message + '</li>';
                 });
@@ -477,7 +477,7 @@ 
                     // error
                     toastr.remove();
                     toastr.error(
-                        '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error,
+                        '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error,
                         '', {
                             closeButton: true,
                             positionClass: 'toast-bottom-right'
@@ -541,7 +541,7 @@ 
                     // error
                     toastr.remove();
                     toastr.error(
-                        '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error,
+                        '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error,
                         '', {
                             closeButton: true,
                             positionClass: 'toast-bottom-right'

sources/find.queries.php

Spacing +44 added lines, -44 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;
 }
 
@@ -92,12 +92,12 @@ 
 if (null === $session->get('user-accessible_folders')
     || empty($session->get('user-accessible_folders')) === true
 ) {
-    echo '{"sEcho": ' . $request->query->filter('sEcho', FILTER_SANITIZE_NUMBER_INT) . ' ,"iTotalRecords": "0", "iTotalDisplayRecords": "0", "aaData": [] }';
+    echo '{"sEcho": '.$request->query->filter('sEcho', FILTER_SANITIZE_NUMBER_INT).' ,"iTotalRecords": "0", "iTotalDisplayRecords": "0", "aaData": [] }';
     exit;
 }
 
 //Columns name
-$aColumns = ['c.id', 'c.label', 'c.login', 'c.description', 'c.tags', 'c.id_tree', 'c.folder', 'c.login', 'c.url', 'ci.data'];//
+$aColumns = ['c.id', 'c.label', 'c.login', 'c.description', 'c.tags', 'c.id_tree', 'c.folder', 'c.login', 'c.url', 'ci.data']; //
 $aSortTypes = ['ASC', 'DESC'];
 //init SQL variables
 $sOrder = $sLimit = $sWhere = '';
@@ -117,7 +117,7 @@ 
 
 //Get current user "personal folder" ID
 $row = DB::query(
-    'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE title = %i',
+    'SELECT id FROM '.prefixTable('nested_tree').' WHERE title = %i',
     intval($session->get('user-id'))
 );
 //get list of personal folders
@@ -126,20 +126,20 @@ 
 $listPf = '';
 if (empty($row['id']) === false) {
     $rows = DB::query(
-        'SELECT id FROM ' . prefixTable('nested_tree') . '
+        'SELECT id FROM '.prefixTable('nested_tree').'
         WHERE personal_folder = 1 AND NOT parent_id = %i AND NOT title = %i',
         filter_var($row['id'], FILTER_SANITIZE_NUMBER_INT),
         filter_var($session->get('user-id'), FILTER_SANITIZE_NUMBER_INT)
     );
     foreach ($rows as $record) {
-        if (! in_array($record['id'], $arrayPf)) {
+        if (!in_array($record['id'], $arrayPf)) {
             //build an array of personal folders ids
             array_push($arrayPf, $record['id']);
             //build also a string with those ids
             if (empty($listPf)) {
                 $listPf = $record['id'];
             } else {
-                $listPf .= ', ' . $record['id'];
+                $listPf .= ', '.$record['id'];
             }
         }
     }
@@ -149,7 +149,7 @@ 
 //Paging
 $sLimit = '';
 if (null !== $request->query->get('start') && $request->query->get('length') !== '-1') {
-    $sLimit = 'LIMIT ' . $request->query->filter('start', null, FILTER_SANITIZE_NUMBER_INT) . ', ' . $request->query->filter('length', null, FILTER_SANITIZE_NUMBER_INT) . '';
+    $sLimit = 'LIMIT '.$request->query->filter('start', null, FILTER_SANITIZE_NUMBER_INT).', '.$request->query->filter('length', null, FILTER_SANITIZE_NUMBER_INT).'';
 }
 
 //Ordering
@@ -163,8 +163,8 @@ 
     }
     $sOrder = 'ORDER BY  ';
     if ($orderParam[0]['column'] >= 0) {
-        $sOrder .= '' . $aColumns[filter_var($orderParam[0]['column'], FILTER_SANITIZE_NUMBER_INT)] . ' '
-                . filter_var($orderParam[0]['dir'], FILTER_SANITIZE_FULL_SPECIAL_CHARS) . ', ';
+        $sOrder .= ''.$aColumns[filter_var($orderParam[0]['column'], FILTER_SANITIZE_NUMBER_INT)].' '
+                . filter_var($orderParam[0]['dir'], FILTER_SANITIZE_FULL_SPECIAL_CHARS).', ';
     }
 
     $sOrder = substr_replace($sOrder, '', -2);
@@ -172,7 +172,7 @@ 
         $sOrder = '';
     }
 } else {
-    $sOrder = 'ORDER BY ' . $aColumns[1] . ' ASC';
+    $sOrder = 'ORDER BY '.$aColumns[1].' ASC';
 }
 
 // Define criteria
@@ -196,9 +196,9 @@ 
 if (empty($search_criteria) === false) {
     $sWhere .= ' AND (';
     for ($i = 0; $i < count($aColumns); ++$i) {
-        $sWhere .= $aColumns[$i] . ' LIKE %ss_' . $i . ' OR ';
+        $sWhere .= $aColumns[$i].' LIKE %ss_'.$i.' OR ';
     }
-    $sWhere = substr_replace((string) $sWhere, '', -3) . ') ';
+    $sWhere = substr_replace((string) $sWhere, '', -3).') ';
     $crit = [
         'idtree' => array_unique($folders),
         '0' => $search_criteria,
@@ -235,16 +235,16 @@ 
 
 // Do NOT show the items in PERSONAL FOLDERS
 if (empty($listPf) === false) {
-    $sWhere = 'WHERE ' . $sWhere . ' AND c.id_tree NOT IN %ls_pf ';
+    $sWhere = 'WHERE '.$sWhere.' AND c.id_tree NOT IN %ls_pf ';
 } else {
-    $sWhere = 'WHERE ' . $sWhere;
+    $sWhere = 'WHERE '.$sWhere;
 }
 
 // Do queries
 DB::query(
     "SELECT c.id
-    FROM " . prefixTable('cache') . " AS c
-    LEFT JOIN " . prefixTable('categories_items') . " AS ci ON (ci.item_id = c.id)
+    FROM " . prefixTable('cache')." AS c
+    LEFT JOIN " . prefixTable('categories_items')." AS ci ON (ci.item_id = c.id)
     {$sWhere}
     {$sOrder}",
     $crit
@@ -252,9 +252,9 @@ 
 $iTotal = DB::count();
 $rows = DB::query(
     "SELECT c.*, ci.data, i.item_key
-    FROM " . prefixTable('cache') . " AS c
-    LEFT JOIN " . prefixTable('categories_items') . " AS ci ON (ci.item_id = c.id)
-    INNER JOIN " . prefixTable('items') . " AS i ON (i.id = c.id)
+    FROM " . prefixTable('cache')." AS c
+    LEFT JOIN " . prefixTable('categories_items')." AS ci ON (ci.item_id = c.id)
+    INNER JOIN " . prefixTable('items')." AS i ON (i.id = c.id)
     {$sWhere}
     {$sOrder}
     {$sLimit}",
@@ -279,7 +279,7 @@ 
 if (null === $request->query->get('type')) {
     $sOutput = '{';
     if (null !== $request->query->get('draw')) {
-        $sOutput .= '"draw": ' . $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+        $sOutput .= '"draw": '.$request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     }
     $sOutput .= '"data": [';
     $sOutputConst = '';
@@ -296,7 +296,7 @@ 
             foreach (explode(';', $session->get('user-roles')) as $role) {
                 //db::debugmode(true);
                 $access = DB::queryFirstRow(
-                    'SELECT type FROM ' . prefixTable('roles_values') . ' WHERE role_id = %i AND folder_id = %i',
+                    'SELECT type FROM '.prefixTable('roles_values').' WHERE role_id = %i AND folder_id = %i',
                     $role,
                     $record['id_tree']
                 );
@@ -316,7 +316,7 @@ 
             }
             $accessLevel = count($arrTmp) > 0 ? min($arrTmp) : $accessLevel;
             if ($accessLevel === 0) {
-                $checkbox = '<input type=\"checkbox\" value=\"0\" class=\"mass_op_cb\" data-id=\"' . $record['id'] . '\">';
+                $checkbox = '<input type=\"checkbox\" value=\"0\" class=\"mass_op_cb\" data-id=\"'.$record['id'].'\">';
             }
 
             if ((int) $accessLevel === 0) {
@@ -356,22 +356,22 @@ 
             if (empty($restrictedTo)) {
                 $restrictedTo = $session->get('user-id');
             } else {
-                $restrictedTo .= ',' . $session->get('user-id');
+                $restrictedTo .= ','.$session->get('user-id');
             }
         }
         
         //col1
-        $sOutputItem .= '"<i class=\"fa fa-external-link-alt infotip mr-2\" title=\"' . $lang->get('open_url_link') . '\" onClick=\"window.location.href=&#039;index.php?page=items&amp;group=' . $record['id_tree'] . '&amp;id=' . $record['id'] . '&#039;\" style=\"cursor:pointer;\"></i>' .
-        '<i class=\"fa fa-eye infotip mr-2 item-detail\" title=\"' . stripslashes($lang->get('see_item_title')) . '\" data-id=\"' . $record['id'] . '\" data-perso=\"' . $record['perso'] . '\" data-tree-id=\"' . $record['id_tree'] . '\" data-expired=\"' . $expired . '\" data-restricted-to=\"' . $restrictedTo . '\" data-rights=\"' . $right . '\" style=\"cursor:pointer;\"></i>' . $checkbox . '",' ;
+        $sOutputItem .= '"<i class=\"fa fa-external-link-alt infotip mr-2\" title=\"'.$lang->get('open_url_link').'\" onClick=\"window.location.href=&#039;index.php?page=items&amp;group='.$record['id_tree'].'&amp;id='.$record['id'].'&#039;\" style=\"cursor:pointer;\"></i>'.
+        '<i class=\"fa fa-eye infotip mr-2 item-detail\" title=\"'.stripslashes($lang->get('see_item_title')).'\" data-id=\"'.$record['id'].'\" data-perso=\"'.$record['perso'].'\" data-tree-id=\"'.$record['id_tree'].'\" data-expired=\"'.$expired.'\" data-restricted-to=\"'.$restrictedTo.'\" data-rights=\"'.$right.'\" style=\"cursor:pointer;\"></i>'.$checkbox.'",';
         //col2
-        $sOutputItem .= '"'.base64_encode('<span id=\"item_label-' . $record['id'] . '\">' . (str_replace("\\", "&#92;", (string) $record['label'])) . '</span>').'", ';   // replace backslash #3015
+        $sOutputItem .= '"'.base64_encode('<span id=\"item_label-'.$record['id'].'\">'.(str_replace("\\", "&#92;", (string) $record['label'])).'</span>').'", '; // replace backslash #3015
         //col3
-        $sOutputItem .= '"' . base64_encode(str_replace('&amp;', '&', htmlspecialchars(stripslashes((string) $record['login']), ENT_QUOTES))) . '", ';
+        $sOutputItem .= '"'.base64_encode(str_replace('&amp;', '&', htmlspecialchars(stripslashes((string) $record['login']), ENT_QUOTES))).'", ';
         //col4
         //get restriction from ROles
         $restrictedToRole = false;
         $rTmp = DB::queryFirstColumn(
-            'SELECT role_id FROM ' . prefixTable('restriction_to_roles') . ' WHERE item_id = %i',
+            'SELECT role_id FROM '.prefixTable('restriction_to_roles').' WHERE item_id = %i',
             $record['id']
         );
         // We considere here that if user has at least one group similar to the object ones
@@ -389,14 +389,14 @@ 
         } else {
             $txt = str_replace(['\n', '<br />', '\\'], [' ', ' ', '', ' '], strip_tags($record['description']));
             if (strlen($txt) > 50) {
-                $sOutputItem .= '"' . base64_encode(substr(stripslashes(preg_replace('~/<[\/]{0,1}[^>]*>\//|[ \t]/~', '', $txt)), 0, 50)) . '", ';
+                $sOutputItem .= '"'.base64_encode(substr(stripslashes(preg_replace('~/<[\/]{0,1}[^>]*>\//|[ \t]/~', '', $txt)), 0, 50)).'", ';
             } else {
-                $sOutputItem .= '"' . base64_encode(stripslashes(preg_replace('~/<[^>]*>|[ \t]/~', '', $txt))) . '", ';
+                $sOutputItem .= '"'.base64_encode(stripslashes(preg_replace('~/<[^>]*>|[ \t]/~', '', $txt))).'", ';
             }
         }
 
         //col5 - TAGS
-        $sOutputItem .= '"' . base64_encode(htmlspecialchars(stripslashes((string) $record['tags']), ENT_QUOTES)) . '", ';
+        $sOutputItem .= '"'.base64_encode(htmlspecialchars(stripslashes((string) $record['tags']), ENT_QUOTES)).'", ';
         // col6 - URL
         if ($record['url'] !== '0') {
             $sOutputItem .= '"'.htmlspecialchars(filter_var($record['url'], FILTER_SANITIZE_URL)).'", ';
@@ -405,7 +405,7 @@ 
         }
 
         //col7 - Prepare the Treegrid
-        $sOutputItem .= '"' . base64_encode(stripslashes((string) $record['folder'])) . '"';
+        $sOutputItem .= '"'.base64_encode(stripslashes((string) $record['folder'])).'"';
         //Finish the line
         //$sOutputItem .= '], ';
         if ($getItemInList === true) {
@@ -414,17 +414,17 @@ 
             --$iTotal;
         }
     }
-    if (! empty($sOutputConst)) {
+    if (!empty($sOutputConst)) {
         $sOutput .= substr_replace($sOutputConst, '', -2);
     }
     $sOutput .= '], ';
-    $sOutput .= '"recordsTotal": ' . $iTotal . ', ';
-    $sOutput .= '"recordsFiltered": ' . $iTotal . ' }';
+    $sOutput .= '"recordsTotal": '.$iTotal.', ';
+    $sOutput .= '"recordsFiltered": '.$iTotal.' }';
     // file deepcode ignore XSS: data is secured
     echo ($sOutput);
 } elseif (null !== $request->query->get('type') && ($request->query->get('type') === 'search_for_items' || $request->query->get('type') === 'search_for_items_with_tags')) {
     include_once 'main.functions.php';
-    include_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $session->get('user-language') . '.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/language/'.$session->get('user-language').'.php';
 
     $totalItems = $request->query->filter('totalItems', null, FILTER_SANITIZE_NUMBER_INT);
 
@@ -435,7 +435,7 @@ 
         $arr_data[$record['id']]['tree_id'] = (int) $record['id_tree'];
         $arr_data[$record['id']]['label'] = (string) $record['label'];
         $arr_data[$record['id']]['desc'] = (string) strip_tags(explode('<br>', $record['description'])[0]);
-        $arr_data[$record['id']]['folder'] = (string)$record['folder'];
+        $arr_data[$record['id']]['folder'] = (string) $record['folder'];
         $arr_data[$record['id']]['login'] = (string) strtr($record['login'], '"', '&quot;');
         $arr_data[$record['id']]['item_key'] = (string) $record['item_key'];
         $arr_data[$record['id']]['link'] = (string) $record['url'] !== '0' && empty($record['url']) === false ? filter_var($record['url'], FILTER_SANITIZE_URL) : '';
@@ -448,7 +448,7 @@ 
 
         // Anyone can modify?
         $tmp = DB::queryFirstRow(
-            'SELECT anyone_can_modify FROM ' . prefixTable('items') . ' WHERE id = %i',
+            'SELECT anyone_can_modify FROM '.prefixTable('items').' WHERE id = %i',
             $record['id']
         );
         if (count($tmp) > 0) {
@@ -477,7 +477,7 @@ 
         $displayItem = $need_sk = $canMove = $item_is_restricted_to_role = 0;
         $user_is_included_in_role = 0;
         $roles = DB::query(
-            'SELECT role_id FROM ' . prefixTable('restriction_to_roles') . ' WHERE item_id=%i',
+            'SELECT role_id FROM '.prefixTable('restriction_to_roles').' WHERE item_id=%i',
             $record['id']
         );
         if (count($roles) > 0) {
@@ -500,7 +500,7 @@ 
             if (empty($restrictedTo)) {
                 $restrictedTo = $session->get('user-id');
             } else {
-                $restrictedTo .= ',' . $session->get('user-id');
+                $restrictedTo .= ','.$session->get('user-id');
             }
         }
 
@@ -616,7 +616,7 @@ 
             $arrTmp = [];
             foreach (explode(';', $session->get('user-roles')) as $role) {
                 $access = DB::queryFirstRow(
-                    'SELECT type FROM ' . prefixTable('roles_values') . ' WHERE role_id = %i AND folder_id = %i',
+                    'SELECT type FROM '.prefixTable('roles_values').' WHERE role_id = %i AND folder_id = %i',
                     $role,
                     $record['id_tree']
                 );
@@ -667,8 +667,8 @@ 
         ) {
             $data_item = DB::queryFirstRow(
                 'SELECT i.pw AS pw, s.share_key AS share_key
-                FROM ' . prefixTable('items') . ' AS i
-                INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (s.object_id = i.id)
+                FROM ' . prefixTable('items').' AS i
+                INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (s.object_id = i.id)
                 WHERE i.id = %i AND s.user_id = %i',
                 $record['id'],
                 $session->get('user-id')