nilsteampassnet / TeamPass

sources/folders.queries.php

Spacing +51 added lines, -51 removed lines

@@ -37,12 +37,12 @@ 
 }
 
 // Do checks
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'folders', $SETTINGS) === false) {
     // Not allowed page
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit();
 }
 
@@ -55,14 +55,14 @@ 
     date_default_timezone_set('UTC');
 }
 
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
 header('Content-type: text/html; charset=utf-8');
-require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
 
 // Connect to mysql server
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
 if (defined('DB_PASSWD_CLEAR') === false) {
     define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
 }
@@ -134,14 +134,14 @@ 
                     && $t->personal_folder == 0
                 ) {
                     // get $t->parent_id
-                    $data = DB::queryFirstRow('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', $t->parent_id);
+                    $data = DB::queryFirstRow('SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i', $t->parent_id);
                     if ($t->nlevel == 1) {
                         $data['title'] = langHdl('root');
                     }
 
                     // get rights on this folder
                     $arrayRights = array();
-                    $rows = DB::query('SELECT fonction_id  FROM ' . prefixTable('rights') . ' WHERE authorized=%i AND tree_id = %i', 1, $t->id);
+                    $rows = DB::query('SELECT fonction_id  FROM '.prefixTable('rights').' WHERE authorized=%i AND tree_id = %i', 1, $t->id);
                     foreach ($rows as $record) {
                         array_push($arrayRights, $record['fonction_id']);
                     }
@@ -158,8 +158,8 @@ 
                     $node_data = DB::queryFirstRow(
                         'SELECT m.valeur AS valeur, n.renewal_period AS renewal_period,
                         n.bloquer_creation AS bloquer_creation, n.bloquer_modification AS bloquer_modification
-                        FROM ' . prefixTable('misc') . ' AS m,
-                        ' . prefixTable('nested_tree') . ' AS n
+                        FROM ' . prefixTable('misc').' AS m,
+                        ' . prefixTable('nested_tree').' AS n
                         WHERE m.type=%s AND m.intitule = n.id AND m.intitule = %i',
                         'complex',
                         $t->id
@@ -192,7 +192,7 @@ 
                     //col7
                     $data7 = DB::queryFirstRow(
                         'SELECT bloquer_creation,bloquer_modification
-                        FROM ' . prefixTable('nested_tree') . '
+                        FROM ' . prefixTable('nested_tree').'
                         WHERE id = %i',
                         intval($t->id)
                     );
@@ -304,7 +304,7 @@ 
 
             // decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // prepare variables
             $post_title = filter_var($dataReceived['title'], FILTER_SANITIZE_STRING);
@@ -335,7 +335,7 @@ 
             // Get info about this folder
             $dataFolder = DB::queryfirstrow(
                 'SELECT *
-                FROM ' . prefixTable('nested_tree') . '
+                FROM ' . prefixTable('nested_tree').'
                 WHERE id = %i',
                 $post_folder_id
             );
@@ -372,7 +372,7 @@ 
             //check if parent folder is personal
             $dataParent = DB::queryfirstrow(
                 'SELECT personal_folder, bloquer_creation, bloquer_modification
-                FROM ' . prefixTable('nested_tree') . '
+                FROM ' . prefixTable('nested_tree').'
                 WHERE id = %i',
                 $post_parent_id
             );
@@ -401,7 +401,7 @@ 
                     // get complexity level for this folder
                     $data = DB::queryfirstrow(
                         'SELECT valeur
-                        FROM ' . prefixTable('misc') . '
+                        FROM ' . prefixTable('misc').'
                         WHERE intitule = %i AND type = %s',
                         $post_parent_id,
                         'complex'
@@ -413,7 +413,7 @@ 
                             array(
                                 'error' => true,
                                 'message' => langHdl('error_folder_complexity_lower_than_top_folder')
-                                    . ' [<b>' . TP_PW_COMPLEXITY[$data['valeur']][1] . '</b>]',
+                                    . ' [<b>'.TP_PW_COMPLEXITY[$data['valeur']][1].'</b>]',
                             ),
                             'encode'
                         );
@@ -508,7 +508,7 @@ 
 
             // decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // prepare variables
             $post_title = filter_var($dataReceived['title'], FILTER_SANITIZE_STRING);
@@ -572,7 +572,7 @@ 
             ) {
                 DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('nested_tree') . '
+                    FROM ' . prefixTable('nested_tree').'
                     WHERE title = %s',
                     $post_title
                 );
@@ -593,7 +593,7 @@ 
             //check if parent folder is personal
             $data = DB::queryfirstrow(
                 'SELECT personal_folder, bloquer_creation, bloquer_modification
-                FROM ' . prefixTable('nested_tree') . '
+                FROM ' . prefixTable('nested_tree').'
                 WHERE id = %i',
                 $post_parent_id
             );
@@ -622,7 +622,7 @@ 
                     // get complexity level for this folder
                     $data = DB::queryfirstrow(
                         'SELECT valeur
-                        FROM ' . prefixTable('misc') . '
+                        FROM ' . prefixTable('misc').'
                         WHERE intitule = %i AND type = %s',
                         $post_parent_id,
                         'complex'
@@ -633,7 +633,7 @@ 
                             array(
                                 'error' => true,
                                 'message' => langHdl('error_folder_complexity_lower_than_top_folder')
-                                    . ' [<b>' . TP_PW_COMPLEXITY[$data['valeur']][1] . '</b>]',
+                                    . ' [<b>'.TP_PW_COMPLEXITY[$data['valeur']][1].'</b>]',
                             ),
                             'encode'
                         );
@@ -707,7 +707,7 @@ 
                     && (int) $SETTINGS['subfolder_rights_as_parent'] === 1
                 ) {
                     //If it is a subfolder, then give access to it for all roles that allows the parent folder
-                    $rows = DB::query('SELECT role_id, type FROM ' . prefixTable('roles_values') . ' WHERE folder_id = %i', $post_parent_id);
+                    $rows = DB::query('SELECT role_id, type FROM '.prefixTable('roles_values').' WHERE folder_id = %i', $post_parent_id);
                     foreach ($rows as $record) {
                         //add access to this subfolder
                         DB::insert(
@@ -722,7 +722,7 @@ 
                 }
 
                 // if parent folder has Custom Fields Categories then add to this child one too
-                $rows = DB::query('SELECT id_category FROM ' . prefixTable('categories_folders') . ' WHERE id_folder = %i', $post_parent_id);
+                $rows = DB::query('SELECT id_category FROM '.prefixTable('categories_folders').' WHERE id_folder = %i', $post_parent_id);
                 foreach ($rows as $record) {
                     //add CF Category to this subfolder
                     DB::insert(
@@ -777,7 +777,7 @@ 
 
             // decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // prepare variables
             $post_folders = filter_var_array(
@@ -803,17 +803,17 @@ 
                                 prefixTable('misc'),
                                 array(
                                     'type' => 'folder_deleted',
-                                    'intitule' => 'f' . $folder->id,
-                                    'valeur' => $folder->id . ', ' . $folder->parent_id . ', ' .
-                                        $folder->title . ', ' . $folder->nleft . ', ' . $folder->nright . ', ' .
-                                        $folder->nlevel . ', 0, 0, 0, 0',
+                                    'intitule' => 'f'.$folder->id,
+                                    'valeur' => $folder->id.', '.$folder->parent_id.', '.
+                                        $folder->title.', '.$folder->nleft.', '.$folder->nright.', '.
+                                        $folder->nlevel.', 0, 0, 0, 0',
                                 )
                             );
                             //array for delete folder
                             $folderForDel[] = $folder->id;
 
                             //delete items & logs
-                            $items = DB::query('SELECT id FROM ' . prefixTable('items') . ' WHERE id_tree=%i', $folder->id);
+                            $items = DB::query('SELECT id FROM '.prefixTable('items').' WHERE id_tree=%i', $folder->id);
                             foreach ($items as $item) {
                                 DB::update(
                                     prefixTable('items'),
@@ -870,7 +870,7 @@ 
             $tree->rebuild();
 
             // reload cache table
-            include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+            include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
             updateCacheTable('reload', $SETTINGS, null);
 
             echo prepareExchangedData(
@@ -910,7 +910,7 @@ 
 
             // decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // Init post variables
             $post_source_folder_id = filter_var($dataReceived['source_folder_id'], FILTER_SANITIZE_NUMBER_INT);
@@ -961,7 +961,7 @@ 
                 // get complexity of current node
                 $nodeComplexity = DB::queryfirstrow(
                     'SELECT valeur
-                    FROM ' . prefixTable('misc') . '
+                    FROM ' . prefixTable('misc').'
                     WHERE intitule = %i AND type= %s',
                     $nodeInfo->id,
                     'complex'
@@ -1036,7 +1036,7 @@ 
                 // If it is a subfolder, then give access to it for all roles that allows the parent folder
                 $rows = DB::query(
                     'SELECT role_id, type
-                    FROM ' . prefixTable('roles_values') . '
+                    FROM ' . prefixTable('roles_values').'
                     WHERE folder_id = %i',
                     $parentId
                 );
@@ -1044,7 +1044,7 @@ 
                     // Add access to this subfolder after checking that it is not already set
                     DB::query(
                         'SELECT *
-                        FROM ' . prefixTable('roles_values') . '
+                        FROM ' . prefixTable('roles_values').'
                         WHERE folder_id = %i AND role_id = %i',
                         $newFolderId,
                         $record['role_id']
@@ -1064,7 +1064,7 @@ 
                 // if parent folder has Custom Fields Categories then add to this child one too
                 $rows = DB::query(
                     'SELECT id_category
-                    FROM ' . prefixTable('categories_folders') . '
+                    FROM ' . prefixTable('categories_folders').'
                     WHERE id_folder = %i',
                     $nodeInfo->id
                 );
@@ -1083,7 +1083,7 @@ 
 
                 $rows = DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE id_tree = %i',
                     $nodeInfo->id
                 );
@@ -1092,7 +1092,7 @@ 
                     // if it is then don't copy it
                     $item_deleted = DB::queryFirstRow(
                         'SELECT *
-                        FROM ' . prefixTable('log_items') . '
+                        FROM ' . prefixTable('log_items').'
                         WHERE id_item = %i AND action = %s
                         ORDER BY date DESC
                         LIMIT 0, 1',
@@ -1103,7 +1103,7 @@ 
 
                     $item_restored = DB::queryFirstRow(
                         'SELECT *
-                        FROM ' . prefixTable('log_items') . '
+                        FROM ' . prefixTable('log_items').'
                         WHERE id_item = %i AND action = %s
                         ORDER BY date DESC
                         LIMIT 0, 1',
@@ -1118,7 +1118,7 @@ 
                         // Get the ITEM object key for the user
                         $userKey = DB::queryFirstRow(
                             'SELECT share_key
-                            FROM ' . prefixTable('sharekeys_items') . '
+                            FROM ' . prefixTable('sharekeys_items').'
                             WHERE user_id = %i AND object_id = %i',
                             $_SESSION['user_id'],
                             $record['id']
@@ -1193,7 +1193,7 @@ 
                         // Manage Custom Fields
                         $categories = DB::query(
                             'SELECT *
-                            FROM ' . prefixTable('categories_items') . '
+                            FROM ' . prefixTable('categories_items').'
                             WHERE item_id = %i',
                             $record['id']
                         );
@@ -1241,15 +1241,15 @@ 
                         $files = DB::query(
                             'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, f.extension AS extension,
                             f.size AS size, f.type AS type, s.share_key AS share_key
-                            FROM ' . prefixTable('files') . ' AS f
-                            INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id)
+                            FROM ' . prefixTable('files').' AS f
+                            INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id)
                             WHERE s.user_id = %i AND f.id_item = %i',
                             $_SESSION['user_id'],
                             $record['id']
                         );
                         foreach ($files as $file) {
                             // Check if file still exists
-                            if (file_exists($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . TP_FILE_PREFIX . base64_decode($file['file'])) === true) {
+                            if (file_exists($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.TP_FILE_PREFIX.base64_decode($file['file'])) === true) {
                                 // Step1 - decrypt the file
                                 $fileContent = decryptFile(
                                     $file['file'],
@@ -1258,9 +1258,9 @@ 
                                 );
 
                                 // Step2 - create file
-                                $newFileName = md5(time() . '_' . $file['id']) . '.' . $file['extension'];
+                                $newFileName = md5(time().'_'.$file['id']).'.'.$file['extension'];
 
-                                $outstream = fopen($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . $newFileName, 'ab');
+                                $outstream = fopen($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.$newFileName, 'ab');
                                 if ($outstream === false) {
                                     echo prepareExchangedData(
     $SETTINGS['cpassman_dir'],
@@ -1336,7 +1336,7 @@ 
             $tree->rebuild();
 
             // reload cache table
-            include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+            include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
             updateCacheTable('reload', $SETTINGS, NULL);
 
             $data = array(
@@ -1345,7 +1345,7 @@ 
 
             // send data
             echo prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$data, 'encode');
+    $SETTINGS['cpassman_dir'], $data, 'encode');
 
             break;
 
@@ -1401,7 +1401,7 @@ 
                     // Get path
                     $text = '';
                     foreach ($tree->getPath($folder->id, false) as $fld) {
-                        $text .= empty($text) === true ? '     [<i>' . $fld->title : ' > ' . $fld->title;
+                        $text .= empty($text) === true ? '     [<i>'.$fld->title : ' > '.$fld->title;
                     }
 
                     // Save array
@@ -1411,7 +1411,7 @@ 
                             'id' => (int) $folder->id,
                             'label' => $folder->title,
                             'level' => $folder->nlevel,
-                            'path' => empty($text) === true ? '' : $text . '</i>]'
+                            'path' => empty($text) === true ? '' : $text.'</i>]'
                         )
                     );
                 }

sources/admin.queries.php

Spacing +193 added lines, -193 removed lines

@@ -46,25 +46,25 @@ 
 }
 
 /* do checks */
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 if (!checkUser($_SESSION['user_id'], $_SESSION['key'], 'options', $SETTINGS)) {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
-require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/tp.config.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/tp.config.php';
 
 header('Content-type: text/html; charset=utf-8');
 header('Cache-Control: no-cache, no-store, must-revalidate');
 
-require_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
 
 // connect to the server
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
 if (defined('DB_PASSWD_CLEAR') === false) {
     define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
 }
@@ -117,7 +117,7 @@ 
                         array(
                             'http' => array(
                                 'ignore_errors' => true,
-                                'proxy' => $SETTINGS['proxy_ip'] . ':' . $SETTINGS['proxy_port'],
+                                'proxy' => $SETTINGS['proxy_ip'].':'.$SETTINGS['proxy_port'],
                             ),
                         )
                     );
@@ -136,16 +136,16 @@ 
                     $json_array = json_decode($json, true);
 
                     // About version
-                    $text .= '<li><u>' . $LANG['your_version'] . '</u> : ' . TP_VERSION_FULL;
+                    $text .= '<li><u>'.$LANG['your_version'].'</u> : '.TP_VERSION_FULL;
                     if (floatval(TP_VERSION_FULL) < floatval($json_array['info']['version'])) {
-                        $text .= '&nbsp;&nbsp;<b>' . $LANG['please_update'] . '</b>';
+                        $text .= '&nbsp;&nbsp;<b>'.$LANG['please_update'].'</b>';
                     }
                     $text .= '</li>';
 
                     // Libraries
                     $text .= '<li><u>Libraries</u> :</li>';
                     foreach ($json_array['libraries'] as $key => $val) {
-                        $text .= "<li>&nbsp;<span class='fa fa-caret-right'></span>&nbsp;" . $key . " (<a href='" . $val . "' target='_blank'>" . $val . '</a>)</li>';
+                        $text .= "<li>&nbsp;<span class='fa fa-caret-right'></span>&nbsp;".$key." (<a href='".$val."' target='_blank'>".$val.'</a>)</li>';
                     }
                 }
             } else {
@@ -156,7 +156,7 @@ 
         }
         $text .= '</ul>';
 
-        echo '[{"error":"' . $error . '" , "output":"' . str_replace(array("\n", "\t", "\r"), '', $text) . '"}]';
+        echo '[{"error":"'.$error.'" , "output":"'.str_replace(array("\n", "\t", "\r"), '', $text).'"}]';
         break;
 
         //##########################################################
@@ -190,7 +190,7 @@ 
         //get through all users
         $rows = DB::query(
             'SELECT id, login, email
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             ORDER BY login ASC'
         );
         foreach ($rows as $record) {
@@ -207,7 +207,7 @@ 
             //if folder doesn't exist then create it
             $data = DB::queryfirstrow(
                 'SELECT id
-                FROM ' . prefixTable('nested_tree') . '
+                FROM ' . prefixTable('nested_tree').'
                 WHERE title = %s AND parent_id = %i',
                 $record['id'],
                 0
@@ -270,8 +270,8 @@ 
     $SETTINGS['cpassman_dir'],
             array(
                 'error' => false,
-                'message' => langHdl('last_execution') . ' ' .
-                    date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) time()) .
+                'message' => langHdl('last_execution').' '.
+                    date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) time()).
                     '<i class="fas fa-check text-success ml-2"></i>',
             ),
             'encode'
@@ -307,7 +307,7 @@ 
         }
 
         //Libraries call
-        require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
         //init
         $foldersIds = array();
@@ -321,7 +321,7 @@ 
             }
         }
 
-        $items = DB::query('SELECT id,label FROM ' . prefixTable('items') . ' WHERE id_tree NOT IN %li', $foldersIds);
+        $items = DB::query('SELECT id,label FROM '.prefixTable('items').' WHERE id_tree NOT IN %li', $foldersIds);
         foreach ($items as $item) {
             //Delete item
             DB::DELETE(prefixTable('items'), 'id = %i', $item['id']);
@@ -342,12 +342,12 @@ 
         // delete orphan items
         $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'
             );
@@ -378,11 +378,11 @@ 
     $SETTINGS['cpassman_dir'],
             array(
                 'error' => false,
-                'message' => langHdl('last_execution') . ' ' .
-                    date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) time()) .
+                'message' => langHdl('last_execution').' '.
+                    date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) time()).
                     '<i class="fas fa-check text-success ml-2 mr-3"></i>
                     <i class="fas fa-chevron-right mr-2"></i>' .
-                    $nbItemsDeleted . ' ' . langHdl('deleted_items'),
+                    $nbItemsDeleted.' '.langHdl('deleted_items'),
             ),
             'encode'
         );
@@ -416,21 +416,21 @@ 
             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_' . $database];
+            $tables[] = $row['Tables_in_'.$database];
         }
 
         //cycle through
         foreach ($tables as $table) {
             if (defined('DB_PREFIX') || substr_count($table, DB_PREFIX) > 0) {
                 // Do query
-                $result = DB::queryRaw('SELECT * FROM ' . $table);
+                $result = DB::queryRaw('SELECT * FROM '.$table);
                 DB::queryRaw(
                     'SELECT *
                     FROM INFORMATION_SCHEMA.COLUMNS
@@ -442,19 +442,19 @@ 
                 $numFields = DB::count();
 
                 // prepare a drop table
-                $return .= 'DROP TABLE ' . $table . ';';
-                $row2 = DB::queryfirstrow('SHOW CREATE TABLE ' . $table);
-                $return .= "\n\n" . $row2['Create Table'] . ";\n\n";
+                $return .= 'DROP TABLE '.$table.';';
+                $row2 = DB::queryfirstrow('SHOW CREATE TABLE '.$table);
+                $return .= "\n\n".$row2['Create Table'].";\n\n";
 
                 //prepare all fields and datas
                 for ($i = 0; $i < $numFields; ++$i) {
                     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';
                             }
@@ -474,8 +474,8 @@ 
             $token = GenerateCryptKey(20, false, true, true, false, true, $SETTINGS);
 
             //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);
@@ -487,17 +487,17 @@ 
                 // 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,
                     $SETTINGS,
                     $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
                 );
             }
 
@@ -507,7 +507,7 @@ 
             //update LOG
             logEvents($SETTINGS, 'admin_action', 'dataBase backup', (string) $_SESSION['user_id'], $_SESSION['login']);
 
-            echo '[{"result":"db_backup" , "href":"sources/downloadFile.php?name=' . urlencode($filename) . '&sub=files&file=' . $filename . '&type=sql&key=' . $_SESSION['key'] . '&key_tmp=' . $_SESSION['key_tmp'] . '&pathIsFiles=1"}]';
+            echo '[{"result":"db_backup" , "href":"sources/downloadFile.php?name='.urlencode($filename).'&sub=files&file='.$filename.'&type=sql&key='.$_SESSION['key'].'&key_tmp='.$_SESSION['key_tmp'].'&pathIsFiles=1"}]';
         }
         break;
 
@@ -538,7 +538,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]);
@@ -547,7 +547,7 @@ 
         // Get filename from database
         $data = DB::queryFirstRow(
             'SELECT valeur
-            FROM ' . prefixTable('misc') . '
+            FROM ' . prefixTable('misc').'
             WHERE increment_id = %i',
             $file
         );
@@ -566,22 +566,22 @@ 
             // 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,
                 $SETTINGS,
                 $key
             );
 
             if (empty($ret) === false) {
-                echo '[{"result":"db_restore" , "message":"' . $ret . '"}]';
+                echo '[{"result":"db_restore" , "message":"'.$ret.'"}]';
                 break;
             }
 
             // 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
@@ -598,7 +598,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":""}]';
@@ -638,8 +638,8 @@ 
             foreach ($table as $i => $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.'`');
                 }
             }
         }
@@ -647,12 +647,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'
             );
@@ -660,7 +660,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(
@@ -691,8 +691,8 @@ 
     $SETTINGS['cpassman_dir'],
             array(
                 'error' => false,
-                'message' => langHdl('last_execution') . ' ' .
-                    date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) time()) .
+                'message' => langHdl('last_execution').' '.
+                    date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) time()).
                     '<i class="fas fa-check text-success ml-2"></i>',
             ),
             'encode'
@@ -727,7 +727,7 @@ 
             break;
         }
 
-        require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
         //read folder
         if (is_dir($SETTINGS['path_to_files_folder']) === false) {
@@ -735,7 +735,7 @@ 
     $SETTINGS['cpassman_dir'],
                 array(
                     'error' => true,
-                    'message' => langHdl('file_folder_not_accessible') . ": " . $SETTINGS['path_to_files_folder'],
+                    'message' => langHdl('file_folder_not_accessible').": ".$SETTINGS['path_to_files_folder'],
                 ),
                 'encode'
             );
@@ -747,8 +747,8 @@ 
             //delete file FILES
             while (false !== ($f = readdir($dir))) {
                 if ($f !== '.' && $f !== '..' && $f !== '.htaccess') {
-                    if (file_exists($dir . $f) && ((time() - filectime($dir . $f)) > 604800)) {
-                        fileDelete($dir . '/' . $f, $SETTINGS);
+                    if (file_exists($dir.$f) && ((time() - filectime($dir.$f)) > 604800)) {
+                        fileDelete($dir.'/'.$f, $SETTINGS);
                     }
                 }
             }
@@ -763,7 +763,7 @@ 
     $SETTINGS['cpassman_dir'],
                 array(
                     'error' => true,
-                    'message' => langHdl('file_folder_not_accessible') . ": " . $SETTINGS['path_to_upload_folder'],
+                    'message' => langHdl('file_folder_not_accessible').": ".$SETTINGS['path_to_upload_folder'],
                 ),
                 'encode'
             );
@@ -777,7 +777,7 @@ 
             while (false !== ($f = readdir($dir))) {
                 if ($f !== '.' && $f !== '..') {
                     if (strpos($f, '_delete.') > 0) {
-                        fileDelete($SETTINGS['path_to_upload_folder'] . '/' . $f, $SETTINGS);
+                        fileDelete($SETTINGS['path_to_upload_folder'].'/'.$f, $SETTINGS);
                     }
                 }
             }
@@ -800,11 +800,11 @@ 
     $SETTINGS['cpassman_dir'],
             array(
                 'error' => false,
-                'message' => langHdl('last_execution') . ' ' .
-                    date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) time()) .
+                'message' => langHdl('last_execution').' '.
+                    date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) time()).
                     '<i class="fas fa-check text-success ml-2 mr-3"></i>
                     <i class="fas fa-chevron-right mr-2"></i>' .
-                    $nbItemsDeleted . ' ' . langHdl('deleted_items'),
+                    $nbItemsDeleted.' '.langHdl('deleted_items'),
             ),
             'encode'
         );
@@ -839,7 +839,7 @@ 
             break;
         }
 
-        require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
         updateCacheTable('reload', $SETTINGS, NULL);
 
         // Log
@@ -856,8 +856,8 @@ 
     $SETTINGS['cpassman_dir'],
             [
                 'error' => false,
-                'message' => langHdl('last_execution') . ' ' .
-                    date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) time()) .
+                'message' => langHdl('last_execution').' '.
+                    date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) time()).
                     '<i class="fas fa-check text-success mr-2"></i>',
             ],
             'encode'
@@ -894,7 +894,7 @@ 
         }
 
         // Perform
-        include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
         $ret = handleConfigFile('rebuild', $SETTINGS);
 
         // Log
@@ -923,8 +923,8 @@ 
     $SETTINGS['cpassman_dir'],
             array(
                 'error' => false,
-                'message' => langHdl('last_execution') . ' ' .
-                    date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) time()) .
+                'message' => langHdl('last_execution').' '.
+                    date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) time()).
                     '<i class="fas fa-check text-success ml-2"></i>',
             ),
             'encode'
@@ -966,33 +966,33 @@ 
         $filename = $post_option;
         $tp_settings = [];
         //get backups infos
-        $rows = DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s', 'admin');
+        $rows = DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s', 'admin');
         foreach ($rows as $record) {
             $tp_settings[$record['intitule']] = $record['valeur'];
         }
 
         // check if backup file is in DB.
         // If YES then it is encrypted with DEFUSE
-        $bck = DB::queryFirstRow('SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'backup', 'filename');
+        $bck = DB::queryFirstRow('SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'backup', 'filename');
 
         //read file
         $return = '';
-        $Fnm = $tp_settings['bck_script_path'] . '/' . $filename . '.sql';
+        $Fnm = $tp_settings['bck_script_path'].'/'.$filename.'.sql';
         if (file_exists($Fnm)) {
             if (!empty($bck) && $bck['valeur'] === $filename) {
                 $err = '';
 
                 // it means that file is DEFUSE encrypted
-                include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/Encryption/Crypto.php';
-                include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/Encryption/DerivedKeys.php';
-                include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/Encryption/KeyOrPassword.php';
-                include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/Encryption/File.php';
-                include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/Encryption/Core.php';
+                include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/Encryption/Crypto.php';
+                include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/Encryption/DerivedKeys.php';
+                include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/Encryption/KeyOrPassword.php';
+                include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/Encryption/File.php';
+                include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/Encryption/Core.php';
 
                 try {
                     \Defuse\Crypto\File::decryptFileWithPassword(
-                        $SETTINGS['bck_script_path'] . '/' . $post_option . '.sql',
-                        $SETTINGS['bck_script_path'] . '/' . str_replace('encrypted', 'clear', $filename) . '.sql',
+                        $SETTINGS['bck_script_path'].'/'.$post_option.'.sql',
+                        $SETTINGS['bck_script_path'].'/'.str_replace('encrypted', 'clear', $filename).'.sql',
                         base64_decode($SETTINGS['bck_script_key'])
                     );
                 } catch (Defuse\Crypto\Exception\WrongKeyOrModifiedCiphertextException $ex) {
@@ -1000,7 +1000,7 @@ 
                 }
 
                 if (!empty($err)) {
-                    echo '[{ "result":"backup_decrypt_fails" , "msg":"' . $err . '"}]';
+                    echo '[{ "result":"backup_decrypt_fails" , "msg":"'.$err.'"}]';
                     break;
                 }
             } else {
@@ -1022,19 +1022,19 @@ 
                 );
 
                 //save the file
-                $handle = fopen($tp_settings['bck_script_path'] . '/' . $filename . '.clear.sql', 'w+');
+                $handle = fopen($tp_settings['bck_script_path'].'/'.$filename.'.clear.sql', 'w+');
                 if ($handle !== false) {
                     fwrite($handle, $return);
                     fclose($handle);
                 }
             }
             $result = 'backup_decrypt_success';
-            $msg = $tp_settings['bck_script_path'] . '/' . $filename . '.clear.sql';
+            $msg = $tp_settings['bck_script_path'].'/'.$filename.'.clear.sql';
         } else {
             $result = 'backup_decrypt_fails';
-            $msg = 'File not found: ' . $Fnm;
+            $msg = 'File not found: '.$Fnm;
         }
-        echo '[{ "result":"' . $result . '" , "msg":"' . $msg . '"}]';
+        echo '[{ "result":"'.$result.'" , "msg":"'.$msg.'"}]';
         break;
 
         /*
@@ -1070,22 +1070,22 @@ 
         require_once 'main.functions.php';
 
         // store old sk
-        $_SESSION['reencrypt_old_salt'] = file_get_contents(SECUREPATH . '/teampass-seckey.txt');
+        $_SESSION['reencrypt_old_salt'] = file_get_contents(SECUREPATH.'/teampass-seckey.txt');
 
         // generate new saltkey
-        $old_sk_filename = SECUREPATH . '/teampass-seckey.txt.' . date('Y_m_d', mktime(0, 0, 0, (int) date('m'), (int) date('d'), (int) date('y'))) . '.' . time();
+        $old_sk_filename = SECUREPATH.'/teampass-seckey.txt.'.date('Y_m_d', mktime(0, 0, 0, (int) date('m'), (int) date('d'), (int) date('y'))).'.'.time();
         copy(
-            SECUREPATH . '/teampass-seckey.txt',
+            SECUREPATH.'/teampass-seckey.txt',
             $old_sk_filename
         );
         $new_key = defuse_generate_key();
         file_put_contents(
-            SECUREPATH . '/teampass-seckey.txt',
+            SECUREPATH.'/teampass-seckey.txt',
             $new_key
         );
 
         // store new sk
-        $_SESSION['reencrypt_new_salt'] = file_get_contents(SECUREPATH . '/teampass-seckey.txt');
+        $_SESSION['reencrypt_new_salt'] = file_get_contents(SECUREPATH.'/teampass-seckey.txt');
 
         //put tool in maintenance.
         DB::update(
@@ -1101,13 +1101,13 @@ 
         logEvents($SETTINGS, 'system', 'change_salt_key', (string) $_SESSION['user_id'], $_SESSION['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,
@@ -1135,7 +1135,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);
@@ -1222,7 +1222,7 @@ 
     $SETTINGS['cpassman_dir'],
                     array(
                         'error' => true,
-                        'message' => 'Input `' . $objects[0] . '` is not allowed',
+                        'message' => 'Input `'.$objects[0].'` is not allowed',
                         'nbOfItems' => '',
                         'nextAction' => '',
                     ),
@@ -1235,9 +1235,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) {
@@ -1249,7 +1249,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',
                         )
@@ -1298,9 +1298,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) {
@@ -1312,7 +1312,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',
                         )
@@ -1340,7 +1340,7 @@ 
                         DB::update(
                             prefixTable('log_items'),
                             array(
-                                'raison' => 'at_pw :' . $encrypt['string'],
+                                'raison' => 'at_pw :'.$encrypt['string'],
                                 'encryption_type' => 'defuse',
                             ),
                             'increment_id = %i',
@@ -1365,8 +1365,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
@@ -1377,7 +1377,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',
                         )
@@ -1425,9 +1425,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
@@ -1445,20 +1445,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
                             );
                         }
 
@@ -1466,24 +1466,24 @@ 
                         // 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',
                             $SETTINGS
                         );
 
                         // 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'],
                             $SETTINGS
                         );
 
                         // 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(
@@ -1509,13 +1509,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 {
@@ -1640,12 +1640,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']
                         );
                     }
                 }
@@ -1656,15 +1656,15 @@ 
 
         // restore saltkey file
         if (file_exists($previous_saltkey_filename)) {
-            unlink(SECUREPATH . '/teampass-seckey.txt');
+            unlink(SECUREPATH.'/teampass-seckey.txt');
             rename(
                 $previous_saltkey_filename,
-                SECUREPATH . '/teampass-seckey.txt'
+                SECUREPATH.'/teampass-seckey.txt'
             );
         }
 
         // 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(
@@ -1710,17 +1710,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;
@@ -1754,7 +1754,7 @@ 
             );
             break;
         } else {
-            require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+            require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
             //send email
             sendEmail(
@@ -1792,11 +1792,11 @@ 
             break;
         }
 
-        include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
         $rows = DB::query(
             'SELECT *
-            FROM ' . prefixTable('emails') . '
+            FROM ' . prefixTable('emails').'
             WHERE status = %s OR status = %s',
             'not_sent',
             ''
@@ -1883,9 +1883,9 @@ 
             break;
         }
 
-        include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
-        $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
             $ret = json_decode(
@@ -1956,7 +1956,7 @@ 
             break;
         }
 
-        require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
         // init
         $filesList = array();
@@ -1969,7 +1969,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')
@@ -2038,8 +2038,8 @@ 
         $post_list = filter_var_array($post_list, FILTER_SANITIZE_STRING);
         $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;
@@ -2047,15 +2047,15 @@ 
         $message = '';
 
         // load PhpEncryption library
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/Encryption/Crypto.php';
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/Encryption/Encoding.php';
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/Encryption/DerivedKeys.php';
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/Encryption/Key.php';
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/Encryption/KeyOrPassword.php';
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/Encryption/File.php';
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/Encryption/RuntimeTests.php';
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/Encryption/KeyProtectedByPassword.php';
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/Encryption/Core.php';
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/Encryption/Crypto.php';
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/Encryption/Encoding.php';
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/Encryption/DerivedKeys.php';
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/Encryption/Key.php';
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/Encryption/KeyOrPassword.php';
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/Encryption/File.php';
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/Encryption/RuntimeTests.php';
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/Encryption/KeyProtectedByPassword.php';
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/Encryption/Core.php';
 
         // treat 10 files
         foreach ($post_list as $file) {
@@ -2063,35 +2063,35 @@ 
                 // 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'],
                             $SETTINGS
                         );
                         // 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'],
                             $SETTINGS
                         );
                     }
                     // 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
@@ -2126,8 +2126,8 @@ 
                 $post_option === 'attachments-decrypt' ? 'clear' : 'encrypted'
             );
 
-            $message = langHdl('last_execution') . ' ' .
-                date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) time()) .
+            $message = langHdl('last_execution').' '.
+                date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) time()).
                 '<i class="fas fa-check text-success ml-2 mr-3"></i>';
         }
 
@@ -2175,7 +2175,7 @@ 
 
         // decrypt and retrieve data in JSON format
         $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
         $post_label = isset($dataReceived['label']) === true ? filter_var($dataReceived['label'], FILTER_SANITIZE_STRING) : '';
         $post_action = filter_var($dataReceived['action'], FILTER_SANITIZE_STRING);
@@ -2217,7 +2217,7 @@ 
             $post_id = filter_var($dataReceived['id'], FILTER_SANITIZE_STRING);
 
             DB::query(
-                'DELETE FROM ' . prefixTable('api') . ' WHERE id = %i',
+                'DELETE FROM '.prefixTable('api').' WHERE id = %i',
                 $post_id
             );
         }
@@ -2266,7 +2266,7 @@ 
 
         // decrypt and retrieve data in JSON format
         $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
         $post_action = filter_var($dataReceived['action'], FILTER_SANITIZE_STRING);
 
@@ -2313,7 +2313,7 @@ 
             // Delete existing key
         } elseif (null !== $post_action && $post_action === 'delete') {
             $post_id = filter_var($dataReceived['id'], FILTER_SANITIZE_STRING);
-            DB::query('DELETE FROM ' . prefixTable('api') . ' WHERE id=%i', $post_id);
+            DB::query('DELETE FROM '.prefixTable('api').' WHERE id=%i', $post_id);
         }
 
         echo prepareExchangedData(
@@ -2329,7 +2329,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(
@@ -2355,7 +2355,7 @@ 
         break;
 
     case 'save_duo_status':
-        DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'duo');
+        DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'duo');
         $counter = DB::count();
         if ($counter === 0) {
             DB::insert(
@@ -2395,12 +2395,12 @@ 
 
         // decrypt and retrieve data in JSON format
         $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
         // Store in DB
         foreach ($dataReceived as $key => $value) {
             DB::query(
                 'SELECT * 
-                FROM ' . prefixTable('misc') . '
+                FROM ' . prefixTable('misc').'
                 WHERE type = %s AND intitule = %s',
                 'admin',
                 $key
@@ -2471,7 +2471,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(
@@ -2497,7 +2497,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(
@@ -2528,7 +2528,7 @@ 
         }
 
         // send data
-        echo '[{"result" : "' . addslashes($LANG['done']) . '" , "error" : ""}]';
+        echo '[{"result" : "'.addslashes($LANG['done']).'" , "error" : ""}]';
         break;
 
     case 'save_agses_options':
@@ -2553,7 +2553,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(
@@ -2582,7 +2582,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(
@@ -2611,7 +2611,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(
@@ -2639,7 +2639,7 @@ 
         }
 
         // send data
-        echo '[{"result" : "' . addslashes($LANG['done']) . '" , "error" : ""}]';
+        echo '[{"result" : "'.addslashes($LANG['done']).'" , "error" : ""}]';
         break;
 
     case 'save_option_change':
@@ -2677,7 +2677,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',
             $type,
             $dataReceived['field']
@@ -2699,7 +2699,7 @@ 
                     array(
                         'valeur' => time(),
                         'type' => $type,
-                        'intitule' => $dataReceived['field'] . '_time',
+                        'intitule' => $dataReceived['field'].'_time',
                     )
                 );
             }
@@ -2717,10 +2717,10 @@ 
             if ($dataReceived['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',
                     $type,
-                    $dataReceived['field'] . '_time'
+                    $dataReceived['field'].'_time'
                 );
                 $counter = DB::count();
                 if ($counter === 0) {
@@ -2729,7 +2729,7 @@ 
                         array(
                             'valeur' => 0,
                             'type' => $type,
-                            'intitule' => $dataReceived['field'] . '_time',
+                            'intitule' => $dataReceived['field'].'_time',
                         )
                     );
                 } else {
@@ -2749,13 +2749,13 @@ 
         // special Cases
         if ($dataReceived['field'] === 'cpassman_url') {
             // update also jsUrl for CSFP protection
-            $jsUrl = $dataReceived['value'] . '/includes/libraries/csrfp/js/csrfprotector.js';
+            $jsUrl = $dataReceived['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_STRING) . '",', $data);
+            $newdata = str_replace($line, '"jsUrl" => "'.filter_var($jsUrl, FILTER_SANITIZE_STRING).'",', $data);
             file_put_contents($csrfp_file, $newdata);
         } elseif ($dataReceived['field'] === 'restricted_to_input' && $dataReceived['value'] === '0') {
             DB::update(
@@ -2780,7 +2780,7 @@ 
     $SETTINGS['cpassman_dir'],
             array(
                 'error' => false,
-                'misc' => $counter . ' ; ' . $SETTINGS[$dataReceived['field']],
+                'misc' => $counter.' ; '.$SETTINGS[$dataReceived['field']],
             ),
             'encode'
         );
@@ -2825,7 +2825,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(
@@ -2857,7 +2857,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(
@@ -2905,7 +2905,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 {
@@ -2944,7 +2944,7 @@ 
 
         $rows = DB::query(
             'SELECT id, title
-                FROM ' . prefixTable('roles_title') . '
+                FROM ' . prefixTable('roles_title').'
                 ORDER BY title ASC'
         );
         foreach ($rows as $record) {
@@ -2960,7 +2960,7 @@ 
         }
 
         echo prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$json, 'encode');
+    $SETTINGS['cpassman_dir'], $json, 'encode');
 
         break;
 }

sources/roles.queries.php

Spacing +1 added lines, -1 removed lines

@@ -505,7 +505,7 @@
 
             // decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-                $SETTINGS['cpassman_dir'],$post_data, 'decode');
+                $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // Prepare variables
             $post_roleId = filter_var($dataReceived['roleId'], FILTER_SANITIZE_NUMBER_INT);

sources/ldap.queries.php

Spacing +44 added lines, -44 removed lines

@@ -45,26 +45,26 @@ 
 }
 
 /* do checks */
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 if (!checkUser($_SESSION['user_id'], $_SESSION['key'], 'ldap', $SETTINGS)) {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit();
 }
 
-require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/tp.config.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/tp.config.php';
 
 header('Content-type: text/html; charset=utf-8');
 header('Cache-Control: no-cache, no-store, must-revalidate');
 
-require_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
 // connect to the server
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
 if (defined('DB_PASSWD_CLEAR') === false) {
     define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
 }
@@ -129,38 +129,38 @@ 
         ];
 
         // Load expected libraries
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/helpers.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Arr.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Symfony/contracts/Translation/TranslatorInterface.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonTimeZone.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Units.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Week.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Timestamp.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Test.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/ObjectInitialisation.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Serialization.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/IntervalRounding.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Rounding.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Localization.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Options.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Cast.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mutability.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Modifiers.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mixin.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Macro.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Difference.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Creator.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Converter.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Comparison.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Boundaries.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Date.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonInterface.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Carbon.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/DetectsErrors.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Connection.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapInterface.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/HandlesConnection.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/helpers.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Arr.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Symfony/contracts/Translation/TranslatorInterface.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonTimeZone.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Units.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Week.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Timestamp.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Test.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/ObjectInitialisation.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Serialization.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/IntervalRounding.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Rounding.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Localization.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Options.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Cast.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mutability.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Modifiers.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mixin.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Macro.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Difference.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Creator.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Converter.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Comparison.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Boundaries.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Date.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonInterface.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Carbon.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/DetectsErrors.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Connection.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapInterface.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/HandlesConnection.php';
 
         $ad = new SplClassLoader('LdapRecord', '../includes/libraries');
         $ad->register();
@@ -176,7 +176,7 @@ 
                 $SETTINGS['cpassman_dir'],
                 array(
                     'error' => true,
-                    'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage(). "<br>".$error->getDiagnosticMessage(),
+                    'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage()."<br>".$error->getDiagnosticMessage(),
                 ),
                 'encode'
             );
@@ -195,7 +195,7 @@ 
                 $SETTINGS['cpassman_dir'],
                 array(
                     'error' => true,
-                    'message' => "Error : ".$e->withDetailedError($e),//->detailedError(),
+                    'message' => "Error : ".$e->withDetailedError($e), //->detailedError(),
                 ),
                 'encode'
             );
@@ -215,7 +215,7 @@ 
                 $SETTINGS['cpassman_dir'],
                 array(
                     'error' => true,
-                    'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage(). "<br>".$error->getDiagnosticMessage(),
+                    'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage()."<br>".$error->getDiagnosticMessage(),
                 ),
                 'encode'
             );

sources/identify.php

Spacing +88 added lines, -88 removed lines

@@ -44,23 +44,23 @@ 
     throw new Exception("Error file '/includes/config/tp.config.php' not exists", 1);
 }
 
-if (! isset($SETTINGS['cpassman_dir']) || empty($SETTINGS['cpassman_dir']) === true || $SETTINGS['cpassman_dir'] === '.') {
+if (!isset($SETTINGS['cpassman_dir']) || empty($SETTINGS['cpassman_dir']) === true || $SETTINGS['cpassman_dir'] === '.') {
     $SETTINGS = [];
     $SETTINGS['cpassman_dir'] = '..';
 }
 
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
 
 // If Debug then clean the files
 if (DEBUGLDAP === true) {
-    define('DEBUGLDAPFILE', $SETTINGS['path_to_files_folder'] . '/ldap.debug.txt');
+    define('DEBUGLDAPFILE', $SETTINGS['path_to_files_folder'].'/ldap.debug.txt');
     $fp = fopen(DEBUGLDAPFILE, 'w');
     fclose($fp);
 }
 if (DEBUGDUO === true) {
-    define('DEBUGDUOFILE', $SETTINGS['path_to_files_folder'] . '/duo.debug.txt');
+    define('DEBUGDUOFILE', $SETTINGS['path_to_files_folder'].'/duo.debug.txt');
     $fp = fopen(DEBUGDUOFILE, 'w');
     fclose($fp);
 }
@@ -76,7 +76,7 @@ 
 if (defined('DB_PASSWD_CLEAR') === false) {
     define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
 }
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
 if (defined('DB_PASSWD_CLEAR') === false) {
     define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
 }
@@ -93,7 +93,7 @@ 
     // This step creates the DUO request encrypted key
 
     // load library
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/DuoSecurity/Duo.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/DuoSecurity/Duo.php';
     $sig_request = Duo::signRequest(
         $SETTINGS['IKEY'],
         $SETTINGS['SKEY'],
@@ -104,16 +104,16 @@ 
         debugIdentify(
             DEBUGDUO,
             DEBUGDUOFILE,
-            "\n\n-----\n\n" .
-                'sig request : ' . $post_login . "\n" .
-                'resp : ' . $sig_request . "\n"
+            "\n\n-----\n\n".
+                'sig request : '.$post_login."\n".
+                'resp : '.$sig_request."\n"
         );
     }
 
     // load csrfprotector
-    $csrfp_config = include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/csrfp/libs/csrfp.config.php';
+    $csrfp_config = include_once $SETTINGS['cpassman_dir'].'/includes/libraries/csrfp/libs/csrfp.config.php';
     // return result
-    echo '[{"sig_request" : "' . $sig_request . '" , "csrfp_token" : "' . $csrfp_config['CSRFP_TOKEN'] . '" , "csrfp_key" : "' . filter_var($_COOKIE[$csrfp_config['CSRFP_TOKEN']], FILTER_SANITIZE_STRING) . '"}]';
+    echo '[{"sig_request" : "'.$sig_request.'" , "csrfp_token" : "'.$csrfp_config['CSRFP_TOKEN'].'" , "csrfp_key" : "'.filter_var($_COOKIE[$csrfp_config['CSRFP_TOKEN']], FILTER_SANITIZE_STRING).'"}]';
 // ---
     // ---
 } elseif ($post_type === 'identify_duo_user_check') {
@@ -123,7 +123,7 @@ 
     //--------
 
     // load library
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/DuoSecurity/Duo.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/DuoSecurity/Duo.php';
     $authenticated_username = Duo::verifyResponse(
         $SETTINGS['duo_ikey'],
         $SETTINGS['duo_skey'],
@@ -138,7 +138,7 @@ 
             // is user in Teampass?
             DB::queryfirstrow(
                 'SELECT id
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE login = %s',
                 $post_login
             );
@@ -148,9 +148,9 @@ 
             }
         }
 
-        echo '[{"authenticated_username" : "' . $authenticated_username . '"}]';
+        echo '[{"authenticated_username" : "'.$authenticated_username.'"}]';
     } else {
-        echo '[{"authenticated_username" : "' . $authenticated_username . '"}]';
+        echo '[{"authenticated_username" : "'.$authenticated_username.'"}]';
     }
     // ---
     // ---
@@ -176,7 +176,7 @@ 
     }
 
     // Load superGlobals
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
     // Prepare GET variables
     $sessionPwdAttempts = $superGlobal->get('pwd_attempts', 'SESSION');
@@ -266,19 +266,19 @@ 
     } else {
         throw new Exception("Error file '/includes/config/tp.config.php' not exists", 1);
     }
-    include_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
-    include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
-    include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
+    include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
+    include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
     
     header('Content-type: text/html; charset=utf-8');
     error_reporting(E_ERROR);
 
     // Load AntiXSS
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/voku/helper/AntiXSS.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/voku/helper/AntiXSS.php';
     $antiXss = new voku\helper\AntiXSS();
 
     // Load superGlobals
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
 
     // Prepare GET variables
@@ -292,7 +292,7 @@ 
     $server['PHP_AUTH_PW'] = $superGlobal->get('PHP_AUTH_PW', 'SERVER');
 
     // connect to the server
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
     DB::$host = DB_HOST;
     DB::$user = DB_USER;
     DB::$password = defined('DB_PASSWD_CLEAR') === false ? defuseReturnDecrypted(DB_PASSWD, $SETTINGS) : DB_PASSWD_CLEAR;
@@ -300,14 +300,14 @@ 
     DB::$port = DB_PORT;
     DB::$encoding = DB_ENCODING;
     // User's language loading
-    include_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $sessionUserLanguage . '.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/language/'.$sessionUserLanguage.'.php';
     
     // decrypt and retreive data in JSON format
     if (empty($sessionKey) === true) {
         $dataReceived = $sentData;
     } else {
         $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$sentData, 'decode', $sessionKey);
+    $SETTINGS['cpassman_dir'], $sentData, 'decode', $sessionKey);
         $superGlobal->put('key', $sessionKey, 'SESSION');
     }
 
@@ -456,7 +456,7 @@ 
         // Check if any unsuccessfull login tries exist
         $rows = DB::query(
             'SELECT date
-            FROM ' . prefixTable('log_system') . "
+            FROM ' . prefixTable('log_system')."
             WHERE field_1 = %s
             AND type = 'failed_auth'
             AND label = 'password_is_not_correct'
@@ -470,7 +470,7 @@ 
             foreach ($rows as $record) {
                 array_push(
                     $arrAttempts,
-                    date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date'])
+                    date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date'])
                 );
             }
         }
@@ -585,7 +585,7 @@ 
         foreach ($superGlobal->get('user_roles', 'SESSION') as $role) {
             $resRoles = DB::queryFirstRow(
                 'SELECT title, complexity
-                FROM ' . prefixTable('roles_title') . '
+                FROM ' . prefixTable('roles_title').'
                 WHERE id=%i',
                 $role
             );
@@ -606,7 +606,7 @@ 
 
         // build complete array of roles
         $superGlobal->put('arr_roles_full', [], 'SESSION');
-        $rows = DB::query('SELECT id, title FROM ' . prefixTable('roles_title') . ' ORDER BY title ASC');
+        $rows = DB::query('SELECT id, title FROM '.prefixTable('roles_title').' ORDER BY title ASC');
         foreach ($rows as $record) {
             $superGlobal->put(
                 $record['id'],
@@ -684,10 +684,10 @@ 
         $superGlobal->put('latest_items_tab', [], 'SESSION');
         $superGlobal->put('nb_roles', 0, 'SESSION');
         foreach ($superGlobal->get('latest_items', 'SESSION') as $item) {
-            if (! empty($item)) {
+            if (!empty($item)) {
                 $dataLastItems = DB::queryFirstRow(
                     'SELECT id,label,id_tree
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE id=%i',
                     $item
                 );
@@ -696,7 +696,7 @@ 
                     [
                         'id' => $item,
                         'label' => $dataLastItems['label'],
-                        'url' => 'index.php?page=items&group=' . $dataLastItems['id_tree'] . '&id=' . $item,
+                        'url' => 'index.php?page=items&group='.$dataLastItems['id_tree'].'&id='.$item,
                     ],
                     'SESSION',
                     'latest_items_tab'
@@ -713,12 +713,12 @@ 
         ) {
             // get all Admin users
             $receivers = '';
-            $rows = DB::query('SELECT email FROM ' . prefixTable('users') . " WHERE admin = %i and email != ''", 1);
+            $rows = DB::query('SELECT email FROM '.prefixTable('users')." WHERE admin = %i and email != ''", 1);
             foreach ($rows as $record) {
                 if (empty($receivers)) {
                     $receivers = $record['email'];
                 } else {
-                    $receivers = ',' . $record['email'];
+                    $receivers = ','.$record['email'];
                 }
             }
             // Add email to table
@@ -734,7 +734,7 @@ 
                             '#tp_time#',
                         ],
                         [
-                            ' ' . $superGlobal->get('login', 'SESSION') . ' (IP: ' . getClientIpServer() . ')',
+                            ' '.$superGlobal->get('login', 'SESSION').' (IP: '.getClientIpServer().')',
                             date($SETTINGS['date_format'], (int) $superGlobal->get('last_connection', 'SESSION')),
                             date($SETTINGS['time_format'], (int) $superGlobal->get('last_connection', 'SESSION')),
                         ],
@@ -1059,44 +1059,44 @@ 
     }
 
     // Load expected libraries
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Illuminate/Contracts/Auth/Authenticatable.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Traits/EnumeratesValues.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/helpers.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Arr.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Contracts/Support/Jsonable.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Contracts/Support/Arrayable.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Enumerable.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Collection.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonTimeZone.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Units.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Week.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Timestamp.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Test.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/ObjectInitialisation.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Serialization.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/IntervalRounding.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Rounding.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Localization.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Options.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Cast.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mutability.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Modifiers.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mixin.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Macro.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Difference.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Creator.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Converter.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Comparison.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Boundaries.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Date.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonInterface.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Carbon.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/DetectsErrors.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Connection.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapInterface.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/HandlesConnection.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Ldap.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Illuminate/Contracts/Auth/Authenticatable.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Traits/EnumeratesValues.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/helpers.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Arr.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Contracts/Support/Jsonable.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Contracts/Support/Arrayable.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Enumerable.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Collection.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonTimeZone.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Units.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Week.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Timestamp.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Test.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/ObjectInitialisation.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Serialization.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/IntervalRounding.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Rounding.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Localization.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Options.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Cast.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mutability.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Modifiers.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mixin.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Macro.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Difference.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Creator.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Converter.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Comparison.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Boundaries.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Date.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonInterface.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Carbon.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/DetectsErrors.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Connection.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapInterface.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/HandlesConnection.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Ldap.php';
     $ad = new SplClassLoader('LdapRecord', '../includes/libraries');
     $ad->register();
     $connection = new Connection($config);
@@ -1108,7 +1108,7 @@ 
         $error = $e->getDetailedError();
         return [
             'error' => true,
-            'message' => langHdl('error').' : '.$error->getErrorCode().' - '.$error->getErrorMessage(). '<br>'.$error->getDiagnosticMessage().' '.$config['username'],
+            'message' => langHdl('error').' : '.$error->getErrorCode().' - '.$error->getErrorMessage().'<br>'.$error->getDiagnosticMessage().' '.$config['username'],
 
         ];
     }
@@ -1136,7 +1136,7 @@ 
     }
 
     // load passwordLib library
-    $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+    $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'].'/includes/libraries');
     $pwdlib->register();
     $pwdlib = new PasswordLib\PasswordLib();
     $hashedPassword = $pwdlib->createPasswordHash($passwordClear);
@@ -1195,7 +1195,7 @@ 
 function yubicoMFACheck($dataReceived, string $userInfo, array $SETTINGS): array
 {
     // Load superGlobals
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
     $sessionAdmin = $superGlobal->get('user_admin', 'SESSION');
     $sessionUrl = $superGlobal->get('initial_url', 'SESSION');
@@ -1234,7 +1234,7 @@ 
     }
 
     // Now check yubico validity
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/Yubico/Yubico.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/Yubico/Yubico.php';
     $yubi = new Auth_Yubico($yubico_user_id, $yubico_user_key);
     $auth = $yubi->verify($yubico_key);
     //, null, null, null, 60
@@ -1286,7 +1286,7 @@ 
             'gestionnaire' => '0',
             'can_manage_all_users' => '0',
             'personal_folder' => $SETTINGS['enable_pf_feature'] === '1' ? '1' : '0',
-            'fonction_id' => (empty($retLDAP['user_info_from_ad'][0]['commonGroupsLdapVsTeampass']) === false ? $retLDAP['user_info_from_ad'][0]['commonGroupsLdapVsTeampass'] . ';' : '') . (isset($SETTINGS['ldap_new_user_role']) === true ? $SETTINGS['ldap_new_user_role'] : '0'),
+            'fonction_id' => (empty($retLDAP['user_info_from_ad'][0]['commonGroupsLdapVsTeampass']) === false ? $retLDAP['user_info_from_ad'][0]['commonGroupsLdapVsTeampass'].';' : '').(isset($SETTINGS['ldap_new_user_role']) === true ? $SETTINGS['ldap_new_user_role'] : '0'),
             'groupes_interdits' => '',
             'groupes_visibles' => '',
             'last_pw_change' => (int) time(),
@@ -1311,7 +1311,7 @@ 
             ]
         );
         // Rebuild tree
-        $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+        $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries');
         $tree->register();
         $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
         $tree->rebuild();
@@ -1342,13 +1342,13 @@ 
         && empty($dataReceived['GACode']) === false
     ) {
         // Load superGlobals
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
         $superGlobal = new protect\SuperGlobal\SuperGlobal();
         $sessionAdmin = $superGlobal->get('user_admin', 'SESSION');
         $sessionUrl = $superGlobal->get('initial_url', 'SESSION');
         $sessionPwdAttempts = $superGlobal->get('pwd_attempts', 'SESSION');
         // load library
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php';
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php';
         // create new instance
         $tfa = new Authentication\TwoFactorAuth\TwoFactorAuth($SETTINGS['ga_website_name']);
         // Init
@@ -1370,7 +1370,7 @@ 
             $mfaMessage = langHdl('ga_flash_qr_and_login');
             // generate new QR
             $new_2fa_qr = $tfa->getQRCodeImageAsDataUri(
-                'Teampass - ' . $username,
+                'Teampass - '.$username,
                 $userInfo['ga']
             );
             // clear temporary code from DB
@@ -1383,7 +1383,7 @@ 
                 $userInfo['id']
             );
             $firstTime = [
-                'value' => '<img src="' . $new_2fa_qr . '">',
+                'value' => '<img src="'.$new_2fa_qr.'">',
                 'user_admin' => isset($sessionAdmin) ? (int) $sessionAdmin : '',
                 'initial_url' => isset($sessionUrl) === true ? $sessionUrl : '',
                 'pwd_attempts' => (int) $sessionPwdAttempts,
@@ -1434,8 +1434,8 @@ 
     // Set to false
     $userPasswordVerified = false;
     // load passwordLib library
-    include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
-    $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+    include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
+    $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'].'/includes/libraries');
     $pwdlib->register();
     $pwdlib = new PasswordLib\PasswordLib();
     // Check if old encryption used
@@ -1566,7 +1566,7 @@ 
     // Brute force management
     if ($sessionPwdAttempts > 3) {
         // Load superGlobals
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
         $superGlobal = new protect\SuperGlobal\SuperGlobal();
         $superGlobal->put('next_possible_pwd_attempts', time() + 10, 'SESSION');
         $superGlobal->put('pwd_attempts', 0, 'SESSION');
@@ -1608,7 +1608,7 @@ 
     // Check if user exists
     $userInfo = DB::queryFirstRow(
         'SELECT *
-        FROM ' . prefixTable('users') . ' WHERE login=%s',
+        FROM ' . prefixTable('users').' WHERE login=%s',
         $username
     );
     

error.php

Spacing +7 added lines, -7 removed lines

@@ -54,12 +54,12 @@ 
     && filter_input(INPUT_POST, 'session', FILTER_SANITIZE_STRING) === 'expired'
 ) {
     //Include files
-    require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
-    require_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
-    require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+    require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
+    require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
     // connect to DB
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
     if (defined('DB_PASSWD_CLEAR') === false) {
         define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
     }
@@ -69,7 +69,7 @@ 
     // Update table by deleting ID
     if (isset($_SESSION['user_id'])) {
         DB::update(
-            DB_PREFIX . 'users',
+            DB_PREFIX.'users',
             [
                 'key_tempo' => '',
             ],
@@ -83,7 +83,7 @@ 
         logEvents($SETTINGS, 'user_connection', 'disconnect', (string) $_SESSION['user_id'], $_SESSION['login']);
     }
 } else {
-    require_once $SETTINGS['cpassman_dir'] . '/sources/main.queries.php';
+    require_once $SETTINGS['cpassman_dir'].'/sources/main.queries.php';
     $errorCode = '';
     if (@$_SESSION['error']['code'] === ERR_NOT_ALLOWED) {
         $errorCode = 'ERROR NOT ALLOWED';

sources/find.queries.php

Spacing +47 added lines, -47 removed lines

@@ -28,7 +28,7 @@ 
 require_once 'SecureHandler.php';
 session_name('teampass_session');
 session_start();
-if (! isset($_SESSION['CPM']) || $_SESSION['CPM'] === false || ! isset($_SESSION['key']) || empty($_SESSION['key'])) {
+if (!isset($_SESSION['CPM']) || $_SESSION['CPM'] === false || !isset($_SESSION['key']) || empty($_SESSION['key'])) {
     die('Hacking attempt...');
 }
 
@@ -42,17 +42,17 @@ 
 }
 
 // Do checks
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'items', $SETTINGS) === false) {
     // Not allowed page
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
-require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
 header('Content-type: text/html; charset=utf-8');
 header('Cache-Control: no-cache, must-revalidate');
 require_once 'main.functions.php';
@@ -60,12 +60,12 @@ 
 if (isset($_SESSION['groupes_visibles']) === false
     || empty($_SESSION['groupes_visibles']) === true
 ) {
-    echo '{"sEcho": ' . intval($_GET['sEcho']) . ' ,"iTotalRecords": "0", "iTotalDisplayRecords": "0", "aaData": [] }';
+    echo '{"sEcho": '.intval($_GET['sEcho']).' ,"iTotalRecords": "0", "iTotalDisplayRecords": "0", "aaData": [] }';
     exit;
 }
 
 //Connect to DB
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
 if (defined('DB_PASSWD_CLEAR') === false) {
     define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
 }
@@ -89,7 +89,7 @@ 
     $folders = $_SESSION['groupes_visibles'];
 } else {
     // Build tree
-    $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+    $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries');
     $tree->register();
     $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
     $folders = $tree->getDescendants(filter_var($_GET['limited'], FILTER_SANITIZE_NUMBER_INT), true);
@@ -98,7 +98,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['user_id'])
 );
 //get list of personal folders
@@ -107,20 +107,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['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'];
             }
         }
     }
@@ -130,7 +130,7 @@ 
 //Paging
 $sLimit = '';
 if (isset($_GET['start']) === true && $_GET['length'] !== '-1') {
-    $sLimit = 'LIMIT ' . filter_var($_GET['start'], FILTER_SANITIZE_NUMBER_INT) . ', ' . filter_var($_GET['length'], FILTER_SANITIZE_NUMBER_INT) . '';
+    $sLimit = 'LIMIT '.filter_var($_GET['start'], FILTER_SANITIZE_NUMBER_INT).', '.filter_var($_GET['length'], FILTER_SANITIZE_NUMBER_INT).'';
 }
 
 //Ordering
@@ -143,8 +143,8 @@ 
     }
     $sOrder = 'ORDER BY  ';
     if ($_GET['order'][0]['column'] >= 0) {
-        $sOrder .= '' . $aColumns[filter_var($_GET['order'][0]['column'], FILTER_SANITIZE_NUMBER_INT)] . ' '
-                . filter_var($_GET['order'][0]['dir'], FILTER_SANITIZE_STRING) . ', ';
+        $sOrder .= ''.$aColumns[filter_var($_GET['order'][0]['column'], FILTER_SANITIZE_NUMBER_INT)].' '
+                . filter_var($_GET['order'][0]['dir'], FILTER_SANITIZE_STRING).', ';
     }
 
     $sOrder = substr_replace($sOrder, '', -2);
@@ -152,7 +152,7 @@ 
         $sOrder = '';
     }
 } else {
-    $sOrder = 'ORDER BY ' . $aColumns[1] . ' ASC';
+    $sOrder = 'ORDER BY '.$aColumns[1].' ASC';
 }
 
 // Define criteria
@@ -174,9 +174,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,
@@ -214,13 +214,13 @@ 
     if (empty($sWhere) === false) {
         $sWhere .= ' AND ';
     }
-    $sWhere = 'WHERE ' . $sWhere . 'id_tree NOT IN %ls_pf ';
+    $sWhere = 'WHERE '.$sWhere.'id_tree NOT IN %ls_pf ';
 } else {
-    $sWhere = 'WHERE ' . $sWhere;
+    $sWhere = 'WHERE '.$sWhere;
 }
 
 DB::query(
-    'SELECT id FROM ' . prefixTable('cache') . "
+    'SELECT id FROM '.prefixTable('cache')."
     ${sWhere}
     ${sOrder}",
     $crit
@@ -228,7 +228,7 @@ 
 $iTotal = DB::count();
 $rows = DB::query(
     'SELECT id, label, description, tags, id_tree, perso, restricted_to, login, folder, author, renewal_period, url, timestamp
-    FROM ' . prefixTable('cache') . "
+    FROM ' . prefixTable('cache')."
     ${sWhere}
     ${sOrder}
     ${sLimit}",
@@ -241,7 +241,7 @@ 
 if (isset($_GET['type']) === false) {
     $sOutput = '{';
     if (isset($_GET['draw']) === true) {
-        $sOutput .= '"draw": ' . intval($_GET['draw']) . ', ';
+        $sOutput .= '"draw": '.intval($_GET['draw']).', ';
     }
     $sOutput .= '"data": [';
     $sOutputConst = '';
@@ -258,7 +258,7 @@ 
             foreach (explode(';', $_SESSION['fonction_id']) 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']
                 );
@@ -278,7 +278,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) {
@@ -318,22 +318,22 @@ 
             if (empty($restrictedTo)) {
                 $restrictedTo = $_SESSION['user_id'];
             } else {
-                $restrictedTo .= ',' . $_SESSION['user_id'];
+                $restrictedTo .= ','.$_SESSION['user_id'];
             }
         }
 
         //col1
-        $sOutputItem .= '"<i class=\"fa fa-external-link-alt infotip mr-2\" title=\"' . langHdl('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=\"' . langHdl('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=\"'.langHdl('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=\"'.langHdl('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 .= '"<span id=\"item_label-' . $record['id'] . '\">' . stripslashes((string) $record['label']) . '</span>", ';
+        $sOutputItem .= '"<span id=\"item_label-'.$record['id'].'\">'.stripslashes((string) $record['label']).'</span>", ';
         //col3
-        $sOutputItem .= '"' . str_replace('&amp;', '&', htmlspecialchars(stripslashes((string) $record['login']), ENT_QUOTES)) . '", ';
+        $sOutputItem .= '"'.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
@@ -351,14 +351,14 @@ 
         } else {
             $txt = str_replace(['\n', '<br />', '\\'], [' ', ' ', '', ' '], strip_tags($record['description']));
             if (strlen($txt) > 50) {
-                $sOutputItem .= '"' . substr(stripslashes(preg_replace('~/<[\/]{0,1}[^>]*>\//|[ \t]/~', '', $txt)), 0, 50) . '", ';
+                $sOutputItem .= '"'.substr(stripslashes(preg_replace('~/<[\/]{0,1}[^>]*>\//|[ \t]/~', '', $txt)), 0, 50).'", ';
             } else {
-                $sOutputItem .= '"' . stripslashes(preg_replace('~/<[^>]*>|[ \t]/~', '', $txt)) . '", ';
+                $sOutputItem .= '"'.stripslashes(preg_replace('~/<[^>]*>|[ \t]/~', '', $txt)).'", ';
             }
         }
 
         //col5 - TAGS
-        $sOutputItem .= '"' . htmlspecialchars(stripslashes((string) $record['tags']), ENT_QUOTES) . '", ';
+        $sOutputItem .= '"'.htmlspecialchars(stripslashes((string) $record['tags']), ENT_QUOTES).'", ';
         // col6 - URL
         if ($record['url'] !== '0') {
             $sOutputItem .= '"'.filter_var($record['url'], FILTER_SANITIZE_URL).'", ';
@@ -367,7 +367,7 @@ 
         }
 
         //col7 - Prepare the Treegrid
-        $sOutputItem .= '"' . htmlspecialchars(stripslashes((string) $record['folder']), ENT_QUOTES) . '"';
+        $sOutputItem .= '"'.htmlspecialchars(stripslashes((string) $record['folder']), ENT_QUOTES).'"';
         //Finish the line
         $sOutputItem .= '], ';
         if ($getItemInList === true) {
@@ -376,16 +376,16 @@ 
             --$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.' }';
     echo $sOutput;
 } elseif (isset($_GET['type']) && ($_GET['type'] === 'search_for_items' || $_GET['type'] === 'search_for_items_with_tags')) {
     include_once 'main.functions.php';
-    include_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
     
     $arr_data = [];
     foreach ($rows as $record) {
@@ -405,7 +405,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) {
@@ -436,7 +436,7 @@ 
         // => récupérer un tableau contenant les roles associés à cet ID (a partir table restriction_to_roles)
         $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) {
@@ -459,7 +459,7 @@ 
             if (empty($restrictedTo)) {
                 $restrictedTo = $_SESSION['user_id'];
             } else {
-                $restrictedTo .= ',' . $_SESSION['user_id'];
+                $restrictedTo .= ','.$_SESSION['user_id'];
             }
         }
 
@@ -557,7 +557,7 @@ 
             $arrTmp = [];
             foreach (explode(';', $_SESSION['fonction_id']) 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']
                 );
@@ -606,8 +606,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['user_id']
@@ -653,5 +653,5 @@ 
         'start' => (int) (isset($_GET['start']) === true && (int) $_GET['length'] !== -1) ? (int) $_GET['start'] + (int) $_GET['length'] : -1,
     ];
     echo prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$returnValues, 'encode');
+    $SETTINGS['cpassman_dir'], $returnValues, 'encode');
 }