nilsteampassnet / TeamPass

pages/options.php

Spacing +8 added lines, -8 removed lines

@@ -43,15 +43,15 @@ 
 }
 
 /* do checks */
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'admin', $SETTINGS) === false) {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
 // Load template
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 // Generates zones
 $zones = timezone_list();
 ?>
@@ -260,7 +260,7 @@ 
                                     // get list of all timezones
                                     foreach ($zones as $key => $zone) {
                                         echo '
-                                <option value="' . $key . '"', isset($SETTINGS['timezone']) === true && $SETTINGS['timezone'] === $key ? ' selected' : '', '>' . $zone . '</option>';
+                                <option value="' . $key.'"', isset($SETTINGS['timezone']) === true && $SETTINGS['timezone'] === $key ? ' selected' : '', '>'.$zone.'</option>';
                                     }
                                     ?>
                                 </select>
@@ -311,7 +311,7 @@ 
                                     <?php
                                     foreach ($languagesList as $lang) {
                                         echo '
-                                <option value="' . $lang . '"', isset($SETTINGS['default_language']) === true && $SETTINGS['default_language'] === $lang ? ' selected' : '', '>' . $lang . '</option>';
+                                <option value="' . $lang.'"', isset($SETTINGS['default_language']) === true && $SETTINGS['default_language'] === $lang ? ' selected' : '', '>'.$lang.'</option>';
                                     }
                                     ?>
                                 </select>
@@ -408,7 +408,7 @@ 
                                 <?php
                                 foreach (TP_PW_COMPLEXITY as $complex) {
                                     echo '
-                                <option value="' . $complex[0] . '"', isset($SETTINGS['personal_saltkey_security_level']) === true && $SETTINGS['personal_saltkey_security_level'] === $complex[0] ? ' selected' : '', '>' . $complex[1] . '</option>';
+                                <option value="' . $complex[0].'"', isset($SETTINGS['personal_saltkey_security_level']) === true && $SETTINGS['personal_saltkey_security_level'] === $complex[0] ? ' selected' : '', '>'.$complex[1].'</option>';
                                 }
                                 ?>
                             </select>
@@ -721,7 +721,7 @@ 
                                     );
 foreach ($roles as $role) {
     echo '
-                                <option value="' . $role['id'] . '"', in_array($role['id'], $arrRolesToPrint) === true ? ' selected' : '', '>' . addslashes($role['title']) . '</option>';
+                                <option value="' . $role['id'].'"', in_array($role['id'], $arrRolesToPrint) === true ? ' selected' : '', '>'.addslashes($role['title']).'</option>';
 }
                                     }
                                     ?>
@@ -894,7 +894,7 @@ 
                                     <?php
                                     foreach (TP_PW_COMPLEXITY as $complex) {
                                         echo '
-                                <option value="' . $complex[0] . '"', isset($SETTINGS['offline_key_level']) === true && $SETTINGS['offline_key_level'] === $complex[0] ? ' selected' : '', '>' . $complex[1] . '</option>';
+                                <option value="' . $complex[0].'"', isset($SETTINGS['offline_key_level']) === true && $SETTINGS['offline_key_level'] === $complex[0] ? ' selected' : '', '>'.$complex[1].'</option>';
                                     }
                                     ?>
                                 </select>

sources/tree.php

Spacing +46 added lines, -51 removed lines

@@ -42,11 +42,11 @@ 
 }
 
 // includes
-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/language/' . $_SESSION['user_language'] . '.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';
+require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
 
 // header
 header('Content-type: text/html; charset=utf-8');
@@ -60,7 +60,7 @@ 
 }
 
 // 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));
 }
@@ -72,7 +72,7 @@ 
 DB::$encoding = DB_ENCODING;
 
 // Superglobal load
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
 $superGlobal = new protect\SuperGlobal\SuperGlobal();
 $get = [];
 $get['user_tree_structure'] = $superGlobal->get('user_tree_structure', 'GET');
@@ -92,7 +92,7 @@ 
 $session['personal_visible_groups'] = $superGlobal->get('personal_visible_groups', 'SESSION');
 
 $lastFolderChange = DB::query(
-    'SELECT * FROM ' . prefixTable('misc') . '
+    'SELECT * FROM '.prefixTable('misc').'
     WHERE type = %s AND intitule = %s',
     'timestamp',
     'last_folder_change'
@@ -103,7 +103,7 @@ 
     || (isset($get['force_refresh']) === true && (int) $get['force_refresh'] === 1)
 ) {
     // 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');
 
@@ -213,7 +213,7 @@ 
     $SETTINGS
 ) {
     // Load library
-    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 superGlobal variables
@@ -262,7 +262,7 @@ 
                 // get count of Items in this folder
                 DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE inactif=%i AND id_tree = %i',
                     0,
                     $node->id
@@ -272,7 +272,7 @@ 
                 // get info about current folder
                 DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('nested_tree') . '
+                    FROM ' . prefixTable('nested_tree').'
                     WHERE parent_id = %i',
                     $node->id
                 );
@@ -280,11 +280,10 @@ 
 
                 // If personal Folder, convert id into user name
                 $node->title = $node->title === $session_user_id && (int) $node->nlevel === 1 ?
-                    $session_login :
-                    ($node->title === null ? '' : htmlspecialchars_decode($node->title, ENT_QUOTES));
+                    $session_login : ($node->title === null ? '' : htmlspecialchars_decode($node->title, ENT_QUOTES));
 
                 // prepare json return for current node
-                $parent = $node->parent_id === 0 ? '#' : 'li_' . $node->parent_id;
+                $parent = $node->parent_id === 0 ? '#' : 'li_'.$node->parent_id;
 
                 // special case for READ-ONLY folder
                 $title = $session_user_read_only === true && in_array($node->id, $session_personal_folders) === false ? langHdl('read_only_account') : $title;
@@ -294,33 +293,30 @@ 
 
                 if (in_array($node->id, $session_groupes_visibles)) {
                     if (in_array($node->id, $session_read_only_folders)) {
-                        $text = "<i class='far fa-eye fa-xs mr-1'></i>" . $text;
+                        $text = "<i class='far fa-eye fa-xs mr-1'></i>".$text;
                         $title = langHdl('read_only_account');
                         $restricted = 1;
                         $folderClass = 'folder_not_droppable';
                     } elseif ($session_user_read_only === true && !in_array($node->id, $session_personal_visible_groups)) {
-                        $text = "<i class='far fa-eye fa-xs mr-1'></i>" . $text;
+                        $text = "<i class='far fa-eye fa-xs mr-1'></i>".$text;
                     }
                     $text .=
-                        ' <span class=\'badge badge-danger ml-2 items_count\' id=\'itcount_' . $node->id . '\'>' . $itemsNb . '</span>'
+                        ' <span class=\'badge badge-danger ml-2 items_count\' id=\'itcount_'.$node->id.'\'>'.$itemsNb.'</span>'
                         .(isset($SETTINGS['tree_counters']) && (int) $SETTINGS['tree_counters'] === 1 ?
-                            '/'.$nbChildrenItems .'/'.(count($nodeDescendants) - 1)  :
-                            '')
+                            '/'.$nbChildrenItems.'/'.(count($nodeDescendants) - 1) : '')
                         .'</span>';
                 } elseif (in_array($node->id, $listFoldersLimitedKeys)) {
                     $restricted = 1;
                     $text .= 
                         $session_user_read_only === true ?
-                            "<i class='far fa-eye fa-xs mr-1'></i>" :
-                            '<span class="badge badge-danger ml-2 items_count" id="itcount_' . $node->id . '">' . count($session_list_folders_limited[$node->id]) . '</span>';
+                            "<i class='far fa-eye fa-xs mr-1'></i>" : '<span class="badge badge-danger ml-2 items_count" id="itcount_'.$node->id.'">'.count($session_list_folders_limited[$node->id]).'</span>';
                 } elseif (in_array($node->id, $listRestrictedFoldersForItemsKeys)) {
                     $restricted = 1;
                     if ($session_user_read_only === true) {
-                        $text = "<i class='far fa-eye fa-xs mr-1'></i>" . $text;
+                        $text = "<i class='far fa-eye fa-xs mr-1'></i>".$text;
                     }
                     $text .= $session_user_read_only === true ? 
-                        "<i class='far fa-eye fa-xs mr-1'></i>" :
-                        '<span class="badge badge-danger ml-2 items_count" id="itcount_' . $node->id . '">' . count($session_list_restricted_folders_for_items[$node->id]) . '</span>';
+                        "<i class='far fa-eye fa-xs mr-1'></i>" : '<span class="badge badge-danger ml-2 items_count" id="itcount_'.$node->id.'">'.count($session_list_restricted_folders_for_items[$node->id]).'</span>';
                 } else {
                     $restricted = 1;
                     $folderClass = 'folder_not_droppable';
@@ -342,22 +338,21 @@ 
                 }
 
                 // json
-                $hide_node === true ? '' :
-                    array_push(
+                $hide_node === true ? '' : array_push(
                         $ret_json,
                         array(
-                            'id' => 'li_' . $node->id,
+                            'id' => 'li_'.$node->id,
                             'parent' => $parent,
-                            'text' => ($show_but_block === true ? '<i class="fas fa-times fa-xs text-danger mr-1"></i>' : '') . $text,
+                            'text' => ($show_but_block === true ? '<i class="fas fa-times fa-xs text-danger mr-1"></i>' : '').$text,
                             'children' => ($childrenNb === 0 ? false : true),
                             'li_attr' => array(
                                 'class' => ($show_but_block === true ? '' : 'jstreeopen'),
-                                'title' => 'ID [' . $node->id . '] ' . ($show_but_block === true ? langHdl('no_access') : $title),
+                                'title' => 'ID ['.$node->id.'] '.($show_but_block === true ? langHdl('no_access') : $title),
                             ),
                             'a_attr' => $show_but_block === true ? (array(
-                                'id' => 'fld_' . $node->id,
+                                'id' => 'fld_'.$node->id,
                                 'class' => $folderClass,
-                                'onclick' => 'ListerItems(' . $node->id . ', ' . $restricted . ', 0, 1)',
+                                'onclick' => 'ListerItems('.$node->id.', '.$restricted.', 0, 1)',
                                 'data-title' => $node->title,
                             )) : '',
                         )
@@ -450,7 +445,7 @@ 
                 ) === true
             ) {
                 DB::query(
-                    'SELECT * FROM ' . prefixTable('items') . '
+                    'SELECT * FROM '.prefixTable('items').'
                     WHERE inactif=%i AND id_tree = %i',
                     0,
                     $node
@@ -537,7 +532,7 @@ 
 {
     // get info about current folder
     DB::query(
-        'SELECT * FROM ' . prefixTable('items') . '
+        'SELECT * FROM '.prefixTable('items').'
         WHERE inactif=%i AND id_tree = %i',
         0,
         $completTree[$nodeId]->id
@@ -638,7 +633,7 @@ 
     */
 
     // prepare json return for current node
-    $parent = $completTree[$nodeId]->parent_id === '0' ? '#' : 'li_' . $completTree[$nodeId]->parent_id;
+    $parent = $completTree[$nodeId]->parent_id === '0' ? '#' : 'li_'.$completTree[$nodeId]->parent_id;
 
     // handle displaying
     if (
@@ -658,17 +653,17 @@ 
         array_push(
             $ret_json,
             array(
-                'id' => 'li_' . $completTree[$nodeId]->id,
+                'id' => 'li_'.$completTree[$nodeId]->id,
                 'parent' => $last_visible_parent === -1 ? $parent : $last_visible_parent,
                 'text' => $text.$completTree[$nodeId]->title.$nodeData['html'],
                 'li_attr' => array(
                     'class' => 'jstreeopen',
-                    'title' => 'ID [' . $completTree[$nodeId]->id . '] ' . $nodeData['title'],
+                    'title' => 'ID ['.$completTree[$nodeId]->id.'] '.$nodeData['title'],
                 ),
                 'a_attr' => array(
-                    'id' => 'fld_' . $completTree[$nodeId]->id,
+                    'id' => 'fld_'.$completTree[$nodeId]->id,
                     'class' => $nodeData['folderClass'],
-                    'onclick' => 'ListerItems(' . $completTree[$nodeId]->id . ', ' . $nodeData['restricted'] . ', 0, 1)',
+                    'onclick' => 'ListerItems('.$completTree[$nodeId]->id.', '.$nodeData['restricted'].', 0, 1)',
                     'data-title' => $completTree[$nodeId]->title,
                 ),
             )
@@ -677,12 +672,12 @@ 
         array_push(
             $ret_json,
             array(
-                'id' => 'li_' . $completTree[$nodeId]->id,
+                'id' => 'li_'.$completTree[$nodeId]->id,
                 'parent' => $last_visible_parent === -1 ? $parent : $last_visible_parent,
                 'text' => '<i class="fas fa-times fa-xs text-danger mr-1"></i>'.$text.$completTree[$nodeId]->title.$nodeData['html'],
                 'li_attr' => array(
                     'class' => '',
-                    'title' => 'ID [' . $completTree[$nodeId]->id . '] ' . langHdl('no_access'),
+                    'title' => 'ID ['.$completTree[$nodeId]->id.'] '.langHdl('no_access'),
                 ),
             )
         );
@@ -745,8 +740,8 @@ 
     if (in_array($nodeId, $session_groupes_visibles) === true) {
         if (in_array($nodeId, $session_read_only_folders) === true) {
             return [
-                'html' => '<i class="far fa-eye fa-xs mr-1"></i><span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . $itemsNb .
-                    ($tree_counters === 1 ? '/'.$nbChildrenItems .'/'.(count($nodeDescendants) - 1)  : '') . '</span>',
+                'html' => '<i class="far fa-eye fa-xs mr-1"></i><span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.$itemsNb.
+                    ($tree_counters === 1 ? '/'.$nbChildrenItems.'/'.(count($nodeDescendants) - 1) : '').'</span>',
                 'title' => langHdl('read_only_account'),
                 'restricted' => 1,
                 'folderClass' => 'folder_not_droppable',
@@ -760,8 +755,8 @@ 
             && in_array($nodeId, $session_personal_visible_groups) === false
         ) {
             return [
-                'html' => '<i class="far fa-eye fa-xs mr-1"></i><span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . $itemsNb .
-                    ($tree_counters === 1 ? '/'.$nbChildrenItems .'/'.(count($nodeDescendants) - 1)  : '') . '</span>',
+                'html' => '<i class="far fa-eye fa-xs mr-1"></i><span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.$itemsNb.
+                    ($tree_counters === 1 ? '/'.$nbChildrenItems.'/'.(count($nodeDescendants) - 1) : '').'</span>',
                 'title' => $title,
                 'restricted' => 0,
                 'folderClass' => 'folder',
@@ -771,8 +766,8 @@ 
         }
         
         return [
-            'html' => '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . $itemsNb .
-                ($tree_counters === 1 ? '/'.$nbChildrenItems .'/'.(count($nodeDescendants) - 1)  : '') . '</span>',
+            'html' => '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.$itemsNb.
+                ($tree_counters === 1 ? '/'.$nbChildrenItems.'/'.(count($nodeDescendants) - 1) : '').'</span>',
             'title' => $title,
             'restricted' => 0,
             'folderClass' => 'folder',
@@ -783,8 +778,8 @@ 
     
     if (in_array($nodeId, $listFoldersLimitedKeys) === true) {
         return [
-            'html' => ($session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : '') .
-                '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . count($session_list_folders_limited[$nodeId]) . '</span>',
+            'html' => ($session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : '').
+                '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.count($session_list_folders_limited[$nodeId]).'</span>',
             'title' => $title,
             'restricted' => 1,
             'folderClass' => 'folder',
@@ -795,8 +790,8 @@ 
     
     if (in_array($nodeId, $listRestrictedFoldersForItemsKeys) === true) {
         return [
-            'html' => $session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : '' .
-                '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . count($session_list_restricted_folders_for_items[$nodeId]) . '</span>',
+            'html' => $session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : ''.
+                '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.count($session_list_restricted_folders_for_items[$nodeId]).'</span>',
             'title' => $title,
             'restricted' => 1,
             'folderClass' => 'folder',

sources/backups.queries.php

Spacing +34 added lines, -34 removed lines

@@ -37,23 +37,23 @@ 
 }
 
 // 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) === 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';
 
 // 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';
 DB::$host = DB_HOST;
 DB::$user = DB_USER;
 DB::$password = DB_PASSWD_CLEAR;
@@ -101,26 +101,26 @@ 
 
             // Decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // Prepare variables
             $post_key = filter_var($dataReceived['encryptionKey'], FILTER_SANITIZE_STRING);
 
-            require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+            require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
             $return = '';
 
             //Get all tables
             $tables = array();
             $result = DB::query('SHOW TABLES');
             foreach ($result as $row) {
-                $tables[] = $row['Tables_in_' . DB_NAME];
+                $tables[] = $row['Tables_in_'.DB_NAME];
             }
 
             //cycle through
             foreach ($tables as $table) {
                 if (empty($pre) || substr_count($table, $pre) > 0) {
                     // Do query
-                    $result = DB::queryRaw('SELECT * FROM ' . $table);
+                    $result = DB::queryRaw('SELECT * FROM '.$table);
                     DB::queryRaw(
                         'SELECT *
                         FROM INFORMATION_SCHEMA.COLUMNS
@@ -132,19 +132,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';
                                 }
@@ -164,8 +164,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);
@@ -177,17 +177,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_key
                     );
 
                     // 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
                     );
                 }
 
@@ -208,9 +208,9 @@ 
                     array(
                         'error' => false,
                         'message' => '',
-                        'download' => 'sources/downloadFile.php?name=' . urlencode($filename) .
-                            '&sub=files&file=' . $filename . '&type=sql&key=' . $_SESSION['key'] . '&key_tmp=' .
-                            $_SESSION['key_tmp'] . '&pathIsFiles=1',
+                        'download' => 'sources/downloadFile.php?name='.urlencode($filename).
+                            '&sub=files&file='.$filename.'&type=sql&key='.$_SESSION['key'].'&key_tmp='.
+                            $_SESSION['key_tmp'].'&pathIsFiles=1',
                     ),
                     'encode'
                 );
@@ -254,18 +254,18 @@ 
 
             // Decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // Prepare variables
             $post_key = filter_var($dataReceived['encryptionKey'], FILTER_SANITIZE_STRING);
             $post_backupFile = filter_var($dataReceived['backupFile'], FILTER_SANITIZE_STRING);
 
-            include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+            include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
             // Get filename from database
             $data = DB::queryFirstRow(
                 'SELECT valeur
-                FROM ' . prefixTable('misc') . '
+                FROM ' . prefixTable('misc').'
                 WHERE increment_id = %i',
                 $post_backupFile
             );
@@ -284,22 +284,22 @@ 
                 // Decrypt the file
                 $ret = prepareFileWithDefuse(
                     'decrypt',
-                    $SETTINGS['path_to_files_folder'] . '/' . $post_backupFile,
-                    $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $post_backupFile,
+                    $SETTINGS['path_to_files_folder'].'/'.$post_backupFile,
+                    $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$post_backupFile,
                     $SETTINGS,
                     $post_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'] . '/' . $post_backupFile, $SETTINGS);
-                $post_backupFile = $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $post_backupFile;
+                fileDelete($SETTINGS['path_to_files_folder'].'/'.$post_backupFile, $SETTINGS);
+                $post_backupFile = $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$post_backupFile;
             } else {
-                $post_backupFile = $SETTINGS['path_to_files_folder'] . '/' . $post_backupFile;
+                $post_backupFile = $SETTINGS['path_to_files_folder'].'/'.$post_backupFile;
             }
 
             //read sql file

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($record['label']) . '</span>", ';
+        $sOutputItem .= '"<span id=\"item_label-'.$record['id'].'\">'.stripslashes($record['label']).'</span>", ';
         //col3
-        $sOutputItem .= '"' . str_replace('&amp;', '&', htmlspecialchars(stripslashes($record['login']), ENT_QUOTES)) . '", ';
+        $sOutputItem .= '"'.str_replace('&amp;', '&', htmlspecialchars(stripslashes($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($record['tags']), ENT_QUOTES) . '", ';
+        $sOutputItem .= '"'.htmlspecialchars(stripslashes($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($record['folder']), ENT_QUOTES) . '"';
+        $sOutputItem .= '"'.htmlspecialchars(stripslashes($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');
 }

sources/fields.queries.php

Spacing +7 added lines, -8 removed lines

@@ -256,7 +256,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_label = filter_var($dataReceived['label'], FILTER_SANITIZE_STRING);
@@ -334,7 +334,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_label = filter_var($dataReceived['label'], FILTER_SANITIZE_STRING);
@@ -409,7 +409,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_idToRemove = filter_var($dataReceived['idToRemove'], FILTER_SANITIZE_NUMBER_INT);
@@ -506,7 +506,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_label = filter_var($dataReceived['label'], FILTER_SANITIZE_STRING);
@@ -517,8 +517,7 @@ 
             $post_masked = filter_var($dataReceived['masked'], FILTER_SANITIZE_STRING);
             $post_encrypted = filter_var($dataReceived['encrypted'], FILTER_SANITIZE_STRING);
             $post_roles = filter_var_array($dataReceived['roles'], FILTER_SANITIZE_STRING);
-            $post_fieldId = isset($dataReceived['fieldId']) === false ? '' :
-                filter_var($dataReceived['fieldId'], FILTER_SANITIZE_NUMBER_INT);
+            $post_fieldId = isset($dataReceived['fieldId']) === false ? '' : filter_var($dataReceived['fieldId'], FILTER_SANITIZE_NUMBER_INT);
 
             if (empty($post_fieldId) === false) {
                 // UPDATE FIELD
@@ -533,7 +532,7 @@ 
                         'encrypted_data' => $post_encrypted,
                         'is_mandatory' => $post_mandatory,
                         'masked' => $post_masked,
-                        'role_visibility' => is_null($post_roles) === true || count($post_roles) ===0 ? '' : implode(',', $post_roles),
+                        'role_visibility' => is_null($post_roles) === true || count($post_roles) === 0 ? '' : implode(',', $post_roles),
                         'order' => calculateOrder($post_fieldId, $post_order),
                     ),
                     'id = %i',
@@ -632,7 +631,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_label = filter_var($dataReceived['label'], FILTER_SANITIZE_STRING);

sources/main.queries.php

Spacing +110 added lines, -110 removed lines

@@ -45,8 +45,8 @@ 
 date_default_timezone_set(isset($SETTINGS['timezone']) === true ? $SETTINGS['timezone'] : 'UTC');
 
 // 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';
 $post_type = filter_input(INPUT_POST, 'type', FILTER_SANITIZE_STRING);
 if (
     isset($post_type) === true
@@ -62,7 +62,7 @@ 
     && checkUser($_SESSION['user_id'], $_SESSION['key'], 'home', $SETTINGS) === false
 ) {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit();
 } elseif ((isset($_SESSION['user_id']) === true
         && isset($_SESSION['key'])) === true
@@ -74,7 +74,7 @@ 
     mainQuery($SETTINGS);
 } else {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit();
 }
 
@@ -89,13 +89,13 @@ 
 
 
     // Includes
-    include_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.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';
+    include_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.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';
 
     // Connect to mysql 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;
@@ -105,7 +105,7 @@ 
     DB::$encoding = DB_ENCODING;
 
     // User's language loading
-    include_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
 
     // Prepare post variables
     $post_key = filter_input(INPUT_POST, 'key', FILTER_SANITIZE_STRING);
@@ -225,7 +225,7 @@ 
             $pwdlib = new PasswordLib\PasswordLib();
             // generate key
             $key = $pwdlib->getRandomToken(filter_input(INPUT_POST, 'size', FILTER_SANITIZE_NUMBER_INT));
-            echo '[{"key" : "' . htmlentities($key, ENT_QUOTES) . '"}]';
+            echo '[{"key" : "'.htmlentities($key, ENT_QUOTES).'"}]';
             break;
 
         /*
@@ -254,7 +254,7 @@ 
                 )
             );
 
-            echo '[{"token" : "' . $token . '"}]';
+            echo '[{"token" : "'.$token.'"}]';
             break;
 
 
@@ -319,7 +319,7 @@ 
         case 'get_teampass_settings':
             // Encrypt data to return
             echo prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$SETTINGS, 'encode');
+    $SETTINGS['cpassman_dir'], $SETTINGS, 'encode');
 
             break;
 
@@ -504,7 +504,7 @@ 
     // get number of items
     DB::queryFirstRow(
         'SELECT increment_id
-        FROM ' . prefixTable('sharekeys_items') .
+        FROM ' . prefixTable('sharekeys_items').
         ' WHERE user_id = %i',
         $userId
     );
@@ -560,7 +560,7 @@ 
         // check if expected security level is reached
         $dataUser = DB::queryfirstrow(
             'SELECT *
-            FROM ' . prefixTable('users') . ' WHERE id = %i',
+            FROM ' . prefixTable('users').' WHERE id = %i',
             $post_user_id
         );
 
@@ -581,8 +581,8 @@ 
         if (empty($dataUser['fonction_id']) === false) {
             $data = DB::queryFirstRow(
                 'SELECT complexity
-                FROM ' . prefixTable('roles_title') . '
-                WHERE id IN (' . $dataUser['fonction_id'] . ')
+                FROM ' . prefixTable('roles_title').'
+                WHERE id IN (' . $dataUser['fonction_id'].')
                 ORDER BY complexity DESC'
             );
         } else {
@@ -596,8 +596,8 @@ 
     $SETTINGS['cpassman_dir'],
                 array(
                     'error' => true,
-                    'message' => '<div style="margin:10px 0 10px 15px;">' . langHdl('complexity_level_not_reached') . '.<br>' .
-                        langHdl('expected_complexity_level') . ': <b>' . TP_PW_COMPLEXITY[$data['complexity']][1] . '</b></div>',
+                    'message' => '<div style="margin:10px 0 10px 15px;">'.langHdl('complexity_level_not_reached').'.<br>'.
+                        langHdl('expected_complexity_level').': <b>'.TP_PW_COMPLEXITY[$data['complexity']][1].'</b></div>',
                 ),
                 'encode'
             );
@@ -703,14 +703,14 @@ 
         // Get data about user
         $data = DB::queryfirstrow(
             'SELECT id, email, pw
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE login = %s',
             $post_login
         );
     } else {
         $data = DB::queryfirstrow(
             'SELECT id, login, email, pw
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_id
         );
@@ -720,7 +720,7 @@ 
     $counter = DB::count();
 
     // 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();
 
@@ -770,7 +770,7 @@ 
     }
     
     // generate new GA user code
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php';
     $tfa = new Authentication\TwoFactorAuth\TwoFactorAuth($SETTINGS['ga_website_name']);
     $gaSecretKey = $tfa->createSecret();
     $gaTemporaryCode = GenerateCryptKey(12, false, true, true, false, true, $SETTINGS);
@@ -810,7 +810,7 @@ 
                 'email' => $data['email'],
                 'email_result' => str_replace(
                     '#email#',
-                    '<b>' . obfuscateEmail($data['email']) . '</b>',
+                    '<b>'.obfuscateEmail($data['email']).'</b>',
                     addslashes(langHdl('admin_email_result_ok'))
                 ),
             ),
@@ -827,7 +827,7 @@ 
             'email' => $data['email'],
             'email_result' => str_replace(
                 '#email#',
-                '<b>' . obfuscateEmail($data['email']) . '</b>',
+                '<b>'.obfuscateEmail($data['email']).'</b>',
                 addslashes(langHdl('admin_email_result_ok'))
             ),
         ),
@@ -843,7 +843,7 @@ 
         && (int) $SETTINGS['enable_send_email_on_user_login'] === 1
     ) {
         $row = DB::queryFirstRow(
-            'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s',
+            'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s',
             'cron',
             'sending_emails'
         );
@@ -851,7 +851,7 @@ 
         if ((int) (time() - $row['valeur']) >= 300 || (int) $row['valeur'] === 0) {
             $rows = DB::query(
                 'SELECT *
-                FROM ' . prefixTable('emails') .
+                FROM ' . prefixTable('emails').
                 ' WHERE status != %s',
                 'sent'
             );
@@ -957,8 +957,8 @@ 
     $arr_html = array();
     $rows = DB::query(
         'SELECT i.id AS id, i.label AS label, i.id_tree AS id_tree, l.date, i.perso AS perso, i.restricted_to AS restricted
-        FROM ' . prefixTable('log_items') . ' AS l
-        RIGHT JOIN ' . prefixTable('items') . ' AS i ON (l.id_item = i.id)
+        FROM ' . prefixTable('log_items').' AS l
+        RIGHT JOIN ' . prefixTable('items').' AS i ON (l.id_item = i.id)
         WHERE l.action = %s AND l.id_user = %i
         ORDER BY l.date DESC
         LIMIT 0, 100',
@@ -991,7 +991,7 @@ 
         isset($SETTINGS['enable_suggestion']) === true && (int) $SETTINGS['enable_suggestion'] === 1
         && ((int) $_SESSION['user_admin'] === 1 || (int) $_SESSION['user_manager'] === 1)
     ) {
-        DB::query('SELECT * FROM ' . prefixTable('suggestion'));
+        DB::query('SELECT * FROM '.prefixTable('suggestion'));
         $nb_suggestions_waiting = DB::count();
     }
 
@@ -1027,13 +1027,13 @@ 
             if ($data === 'stat_languages') {
                 $tmp = '';
                 foreach ($stats_data[$data] as $key => $value) {
-                    $tmp .= $tmp === '' ? $key . '-' . $value : ',' . $key . '-' . $value;
+                    $tmp .= $tmp === '' ? $key.'-'.$value : ','.$key.'-'.$value;
                 }
                 $statsToSend[$data] = $tmp;
             } elseif ($data === 'stat_country') {
                 $tmp = '';
                 foreach ($stats_data[$data] as $key => $value) {
-                    $tmp .= $tmp === '' ? $key . '-' . $value : ',' . $key . '-' . $value;
+                    $tmp .= $tmp === '' ? $key.'-'.$value : ','.$key.'-'.$value;
                 }
                 $statsToSend[$data] = $tmp;
             } else {
@@ -1107,8 +1107,8 @@ 
             if (strpos($line, 'cpassman_url') > 0 && empty($url_found) === true) {
                 $url_found = substr($line, 19, strlen($line) - 22);
                 $tmp = parse_url($url_found);
-                $anonym_url = $tmp['scheme'] . '://<anonym_url>' . $tmp['path'];
-                $line = "'cpassman_url' => '" . $anonym_url . "\n";
+                $anonym_url = $tmp['scheme'].'://<anonym_url>'.$tmp['path'];
+                $line = "'cpassman_url' => '".$anonym_url."\n";
             }
 
             // Anonymize all urls
@@ -1135,7 +1135,7 @@ 
     $teampass_errors = '';
     $rows = DB::query(
         'SELECT label, date AS error_date
-        FROM ' . prefixTable('log_system') . "
+        FROM ' . prefixTable('log_system')."
         WHERE `type` LIKE 'error'
         ORDER BY `date` DESC
         LIMIT 0, 10"
@@ -1143,9 +1143,9 @@ 
     if (DB::count() > 0) {
         foreach ($rows as $record) {
             if (empty($teampass_errors) === true) {
-                $teampass_errors = ' * ' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['error_date']) . ' - ' . $record['label'];
+                $teampass_errors = ' * '.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['error_date']).' - '.$record['label'];
             } else {
-                $teampass_errors .= ' * ' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['error_date']) . ' - ' . $record['label'];
+                $teampass_errors .= ' * '.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['error_date']).' - '.$record['label'];
             }
         }
     }
@@ -1154,7 +1154,7 @@ 
 
     // Now prepare text
     $txt = '### Page on which it happened
-' . $post_data['current_page'] . '
+' . $post_data['current_page'].'
 
 ### Steps to reproduce
 1.
@@ -1169,39 +1169,39 @@ 
 Tell us what happens instead
 
 ### Server configuration
-**Operating system**: ' . php_uname() . '
+**Operating system**: ' . php_uname().'
 
-**Web server:** ' . $_SERVER['SERVER_SOFTWARE'] . '
+**Web server:** ' . $_SERVER['SERVER_SOFTWARE'].'
 
-**Database:** ' . ($link === false ? langHdl('undefined') : mysqli_get_server_info($link)) . '
+**Database:** ' . ($link === false ? langHdl('undefined') : mysqli_get_server_info($link)).'
 
-**PHP version:** ' . PHP_VERSION . '
+**PHP version:** ' . PHP_VERSION.'
 
-**Teampass version:** ' . TP_VERSION_FULL . '
+**Teampass version:** ' . TP_VERSION_FULL.'
 
 **Teampass configuration file:**
 ```
-' . $list_of_options . '
+' . $list_of_options.'
 ```
 
 **Updated from an older Teampass or fresh install:**
 
 ### Client configuration
 
-**Browser:** ' . $post_data['browser_name'] . ' - ' . $post_data['browser_version'] . '
+**Browser:** ' . $post_data['browser_name'].' - '.$post_data['browser_version'].'
 
-**Operating system:** ' . $post_data['os'] . ' - ' . $post_data['os_archi'] . 'bits
+**Operating system:** ' . $post_data['os'].' - '.$post_data['os_archi'].'bits
 
 ### Logs
 
 #### Web server error log
 ```
-' . $err['message'] . ' - ' . $err['file'] . ' (' . $err['line'] . ')
+' . $err['message'].' - '.$err['file'].' ('.$err['line'].')
 ```
 
 #### Teampass 10 last system errors
 ```
-' . $teampass_errors . '
+' . $teampass_errors.'
 ```
 
 #### Log from the web-browser developer console (CTRL + SHIFT + i)
@@ -1230,7 +1230,7 @@ 
         // Check if user exists
         $userInfo = DB::queryFirstRow(
             'SELECT public_key, private_key, pw, auth_type
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -1238,7 +1238,7 @@ 
             // Get one item
             $record = DB::queryFirstRow(
                 'SELECT object_id
-                FROM ' . prefixTable('sharekeys_items') . '
+                FROM ' . prefixTable('sharekeys_items').'
                 WHERE user_id = %i',
                 $post_user_id
             );
@@ -1246,7 +1246,7 @@ 
             // Get itemKey from current user
             $currentUserKey = DB::queryFirstRow(
                 'SELECT share_key, increment_id
-                FROM ' . prefixTable('sharekeys_items') . '
+                FROM ' . prefixTable('sharekeys_items').'
                 WHERE object_id = %i AND user_id = %i',
                 $record['object_id'],
                 $post_user_id
@@ -1274,7 +1274,7 @@ 
             
             // Use the password check
             // 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();
             
@@ -1333,7 +1333,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT private_key
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -1360,7 +1360,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();
 
             $superGlobal->put('private_key', $privateKey, 'SESSION', 'user');
@@ -1400,7 +1400,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT email, auth_type, login
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -1540,7 +1540,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT email, auth_type, login
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -1606,13 +1606,13 @@ 
         // Check if user exists
         DB::queryFirstRow(
             'SELECT *
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
         if (DB::count() > 0) {
             // Include libraries
-            include_once $SETTINGS['cpassman_dir'] . '/sources/aes.functions.php';
+            include_once $SETTINGS['cpassman_dir'].'/sources/aes.functions.php';
 
             // CLear old sharekeys
             if ($post_self_change === false) {
@@ -1667,7 +1667,7 @@ 
         // Check if user exists
         $userInfo = DB::queryFirstRow(
             'SELECT public_key
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -1677,7 +1677,7 @@ 
             $next_action = '';
 
             // Include libraries
-            include_once $SETTINGS['cpassman_dir'] . '/sources/aes.functions.php';
+            include_once $SETTINGS['cpassman_dir'].'/sources/aes.functions.php';
 
             // WHAT STEP TO PERFORM?
             if ($post_action === 'step0') {
@@ -1840,15 +1840,15 @@ 
     // Loop on items
     $rows = DB::query(
         'SELECT id, pw
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE perso = 0
-        LIMIT ' . $post_start . ', ' . $post_length
+        LIMIT ' . $post_start.', '.$post_length
     );
     foreach ($rows as $record) {
         // Get itemKey from current user
         $currentUserKey = DB::queryFirstRow(
             'SELECT share_key, increment_id
-            FROM ' . prefixTable('sharekeys_items') . '
+            FROM ' . prefixTable('sharekeys_items').'
             WHERE object_id = %i AND user_id = %i',
             $record['id'],
             $_SESSION['user_id']
@@ -1876,7 +1876,7 @@ 
             if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
                 $currentUserKey = DB::queryFirstRow(
                     'SELECT increment_id
-                    FROM ' . prefixTable('sharekeys_items') . '
+                    FROM ' . prefixTable('sharekeys_items').'
                     WHERE object_id = %i AND user_id = %i',
                     $record['id'],
                     $post_user_id
@@ -1909,7 +1909,7 @@ 
     // SHould we change step?
     DB::query(
         'SELECT *
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE perso = 0'
     );
 
@@ -1933,15 +1933,15 @@ 
     // Loop on logs
     $rows = DB::query(
         'SELECT increment_id
-        FROM ' . prefixTable('log_items') . '
+        FROM ' . prefixTable('log_items').'
         WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"
-        LIMIT ' . $post_start . ', ' . $post_length
+        LIMIT ' . $post_start.', '.$post_length
     );
     foreach ($rows as $record) {
         // Get itemKey from current user
         $currentUserKey = DB::queryFirstRow(
             'SELECT share_key
-            FROM ' . prefixTable('sharekeys_logs') . '
+            FROM ' . prefixTable('sharekeys_logs').'
             WHERE object_id = %i AND user_id = %i',
             $record['increment_id'],
             $_SESSION['user_id']
@@ -1968,7 +1968,7 @@ 
             if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
                 $currentUserKey = DB::queryFirstRow(
                     'SELECT increment_id
-                    FROM ' . prefixTable('sharekeys_items') . '
+                    FROM ' . prefixTable('sharekeys_items').'
                     WHERE object_id = %i AND user_id = %i',
                     $record['id'],
                     $post_user_id
@@ -1990,7 +1990,7 @@ 
     // SHould we change step?
     DB::query(
         'SELECT increment_id
-        FROM ' . prefixTable('log_items') . '
+        FROM ' . prefixTable('log_items').'
         WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"'
     );
 
@@ -2014,15 +2014,15 @@ 
     // Loop on fields
     $rows = DB::query(
         'SELECT id
-        FROM ' . prefixTable('categories_items') . '
+        FROM ' . prefixTable('categories_items').'
         WHERE encryption_type = "teampass_aes"
-        LIMIT ' . $post_start . ', ' . $post_length
+        LIMIT ' . $post_start.', '.$post_length
     );
     foreach ($rows as $record) {
         // Get itemKey from current user
         $currentUserKey = DB::queryFirstRow(
             'SELECT share_key
-            FROM ' . prefixTable('sharekeys_fields') . '
+            FROM ' . prefixTable('sharekeys_fields').'
             WHERE object_id = %i AND user_id = %i',
             $record['id'],
             $_SESSION['user_id']
@@ -2049,7 +2049,7 @@ 
             if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
                 $currentUserKey = DB::queryFirstRow(
                     'SELECT increment_id
-                    FROM ' . prefixTable('sharekeys_items') . '
+                    FROM ' . prefixTable('sharekeys_items').'
                     WHERE object_id = %i AND user_id = %i',
                     $record['id'],
                     $post_user_id
@@ -2071,7 +2071,7 @@ 
     // SHould we change step?
     DB::query(
         'SELECT *
-        FROM ' . prefixTable('categories_items') . '
+        FROM ' . prefixTable('categories_items').'
         WHERE encryption_type = "teampass_aes"'
     );
 
@@ -2095,14 +2095,14 @@ 
     // Loop on suggestions
     $rows = DB::query(
         'SELECT id
-        FROM ' . prefixTable('suggestion') . '
-        LIMIT ' . $post_start . ', ' . $post_length
+        FROM ' . prefixTable('suggestion').'
+        LIMIT ' . $post_start.', '.$post_length
     );
     foreach ($rows as $record) {
         // Get itemKey from current user
         $currentUserKey = DB::queryFirstRow(
             'SELECT share_key
-            FROM ' . prefixTable('sharekeys_suggestions') . '
+            FROM ' . prefixTable('sharekeys_suggestions').'
             WHERE object_id = %i AND user_id = %i',
             $record['id'],
             $_SESSION['user_id']
@@ -2129,7 +2129,7 @@ 
             if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
                 $currentUserKey = DB::queryFirstRow(
                     'SELECT increment_id
-                    FROM ' . prefixTable('sharekeys_items') . '
+                    FROM ' . prefixTable('sharekeys_items').'
                     WHERE object_id = %i AND user_id = %i',
                     $record['id'],
                     $post_user_id
@@ -2174,15 +2174,15 @@ 
     // Loop on files
     $rows = DB::query(
         'SELECT id
-        FROM ' . prefixTable('files') . '
-        WHERE status = "' . TP_ENCRYPTION_NAME . '"
-        LIMIT ' . $post_start . ', ' . $post_length
+        FROM ' . prefixTable('files').'
+        WHERE status = "' . TP_ENCRYPTION_NAME.'"
+        LIMIT ' . $post_start.', '.$post_length
     ); //aes_encryption
     foreach ($rows as $record) {
         // Get itemKey from current user
         $currentUserKey = DB::queryFirstRow(
             'SELECT share_key
-            FROM ' . prefixTable('sharekeys_files') . '
+            FROM ' . prefixTable('sharekeys_files').'
             WHERE object_id = %i AND user_id = %i',
             $record['id'],
             $_SESSION['user_id']
@@ -2209,7 +2209,7 @@ 
             if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
                 $currentUserKey = DB::queryFirstRow(
                     'SELECT increment_id
-                    FROM ' . prefixTable('sharekeys_items') . '
+                    FROM ' . prefixTable('sharekeys_items').'
                     WHERE object_id = %i AND user_id = %i',
                     $record['id'],
                     $post_user_id
@@ -2231,8 +2231,8 @@ 
     // SHould we change step?
     DB::query(
         'SELECT *
-        FROM ' . prefixTable('files') . '
-        WHERE status = "' . TP_ENCRYPTION_NAME . '"'
+        FROM ' . prefixTable('files').'
+        WHERE status = "' . TP_ENCRYPTION_NAME.'"'
     );
 
     $next_start = (int) $post_start + (int) $post_length;
@@ -2264,16 +2264,16 @@ 
     if (count($_SESSION['personal_folders']) > 0) {
         $rows = DB::query(
             'SELECT id, pw
-            FROM ' . prefixTable('items') . '
+            FROM ' . prefixTable('items').'
             WHERE perso = 1 AND id_tree IN %ls
-            LIMIT ' . $post_start . ', ' . $post_length,
+            LIMIT ' . $post_start.', '.$post_length,
             $_SESSION['personal_folders']
         );
         foreach ($rows as $record) {
             // Get itemKey from current user
             $currentUserKey = DB::queryFirstRow(
                 'SELECT share_key, increment_id
-                FROM ' . prefixTable('sharekeys_items') . '
+                FROM ' . prefixTable('sharekeys_items').'
                 WHERE object_id = %i AND user_id = %i',
                 $record['id'],
                 $_SESSION['user_id']
@@ -2300,7 +2300,7 @@ 
                 if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
                     $currentUserKey = DB::queryFirstRow(
                         'SELECT increment_id
-                        FROM ' . prefixTable('sharekeys_items') . '
+                        FROM ' . prefixTable('sharekeys_items').'
                         WHERE object_id = %i AND user_id = %i',
                         $record['id'],
                         $post_user_id
@@ -2323,7 +2323,7 @@ 
     // SHould we change step?
     DB::query(
         'SELECT *
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE perso = 0'
     );
 
@@ -2347,7 +2347,7 @@ 
         // Check if user exists
         $userInfo = DB::queryFirstRow(
             'SELECT public_key, encrypted_psk
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -2373,9 +2373,9 @@ 
                 // Loop on persoanl items
                 $rows = DB::query(
                     'SELECT id, pw
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE perso = 1 AND id_tree IN %ls
-                    LIMIT ' . $post_start . ', ' . $post_length,
+                    LIMIT ' . $post_start.', '.$post_length,
                     $_SESSION['personal_folders']
                 );
                 $countUserPersonalItems = DB::count();
@@ -2418,7 +2418,7 @@ 
                         // Loop on files
                         $rows = DB::query(
                             'SELECT id, file
-                            FROM ' . prefixTable('files') . '
+                            FROM ' . prefixTable('files').'
                             WHERE status != %s
                             AND id_item = %i',
                             TP_ENCRYPTION_NAME,
@@ -2429,14 +2429,14 @@ 
                             // Now decrypt the file
                             prepareFileWithDefuse(
                                 'decrypt',
-                                $SETTINGS['path_to_upload_folder'] . '/' . $record2['file'],
-                                $SETTINGS['path_to_upload_folder'] . '/' . $record2['file'] . '.delete',
+                                $SETTINGS['path_to_upload_folder'].'/'.$record2['file'],
+                                $SETTINGS['path_to_upload_folder'].'/'.$record2['file'].'.delete',
                                 $SETTINGS,
                                 $post_user_psk
                             );
 
                             // Encrypt the file
-                            $encryptedFile = encryptFile($record2['file'] . '.delete', $SETTINGS['path_to_upload_folder']);
+                            $encryptedFile = encryptFile($record2['file'].'.delete', $SETTINGS['path_to_upload_folder']);
 
                             DB::update(
                                 prefixTable('files'),
@@ -2459,7 +2459,7 @@ 
                             );
 
                             // Unlink original file
-                            unlink($SETTINGS['path_to_upload_folder'] . '/' . $record2['file']);
+                            unlink($SETTINGS['path_to_upload_folder'].'/'.$record2['file']);
                         }
                     }
                 }
@@ -2531,7 +2531,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT '.$post_fields.'
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -2568,7 +2568,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT auth_type, login, private_key
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -2579,7 +2579,7 @@ 
             $privateKey = decryptPrivateKey($post_current_pwd, $userData['private_key']);
 
             // 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();
 
             if ($superGlobal->get('private_key', 'SESSION', 'user') === $privateKey) {
@@ -2613,7 +2613,7 @@ 
     $SETTINGS['cpassman_dir'],
                     array(
                         'error' => false,
-                        'message' => langHdl('done'),'',
+                        'message' => langHdl('done'), '',
                     ),
                     'encode'
                 );
@@ -2653,7 +2653,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT auth_type, login, private_key, special
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -2683,7 +2683,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();
                 $superGlobal->put('private_key', $privateKey, 'SESSION', 'user');
 
@@ -2691,7 +2691,7 @@ 
     $SETTINGS['cpassman_dir'],
                     array(
                         'error' => false,
-                        'message' => langHdl('done'),'',
+                        'message' => langHdl('done'), '',
                     ),
                     'encode'
                 );
@@ -2716,14 +2716,14 @@ 
             // Get one item
             $record = DB::queryFirstRow(
                 'SELECT id, pw
-                FROM ' . prefixTable('items') . '
+                FROM ' . prefixTable('items').'
                 WHERE perso = 0'
             );
 
             // Get itemKey from current user
             $currentUserKey = DB::queryFirstRow(
                 'SELECT share_key, increment_id
-                FROM ' . prefixTable('sharekeys_items') . '
+                FROM ' . prefixTable('sharekeys_items').'
                 WHERE object_id = %i AND user_id = %i',
                 $record['id'],
                 $post_user_id
@@ -2751,7 +2751,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();
                     $superGlobal->put('private_key', $privateKey, 'SESSION', 'user');
 
@@ -2808,7 +2808,7 @@ 
             $_SESSION['user_id']
         );
         // Return data
-        return '[{"new_value":"' . $_SESSION['sessionDuration'] . '"}]';
+        return '[{"new_value":"'.$_SESSION['sessionDuration'].'"}]';
     }
     
     return '[{"new_value":"expired"}]';

sources/utilities.queries.php

Spacing +30 added lines, -30 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'], 'utilities.database', $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/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';
 
 //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));
 }
@@ -104,7 +104,7 @@ 
             $arrFolders = array();
             $rows = DB::query(
                 'SELECT valeur, intitule
-                FROM ' . prefixTable('misc') . '
+                FROM ' . prefixTable('misc').'
                 WHERE type  = %s',
                 'folder_deleted'
             );
@@ -125,10 +125,10 @@ 
                 'SELECT u.login as login, u.name as name, u.lastname as lastname,
                 i.id as id, i.label as label,
                 i.id_tree as id_tree, l.date as date, n.title as folder_title
-                FROM ' . prefixTable('log_items') . ' as l
-                INNER JOIN ' . prefixTable('items') . ' as i ON (l.id_item=i.id)
-                INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id)
-                INNER JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree=n.id)
+                FROM ' . prefixTable('log_items').' as l
+                INNER JOIN ' . prefixTable('items').' as i ON (l.id_item=i.id)
+                INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id)
+                INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree=n.id)
                 WHERE i.inactif = %i
                 AND l.action = %s',
                 1,
@@ -150,7 +150,7 @@ 
                             'label' => $record['label'],
                             'date' => date($SETTINGS['date_format'], (int) $record['date']),
                             'login' => $record['login'],
-                            'name' => $record['name'] . ' ' . $record['lastname'],
+                            'name' => $record['name'].' '.$record['lastname'],
                             'folder_label' => $record['folder_title'],
                             'folder_deleted' => $thisFolder,
                         )
@@ -199,7 +199,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($dataReceived['folders'], FILTER_SANITIZE_STRING);
@@ -209,10 +209,10 @@ 
             foreach ($post_folders as $folderId) {
                 $data = DB::queryfirstrow(
                     'SELECT valeur
-                    FROM ' . prefixTable('misc') . "
+                    FROM ' . prefixTable('misc')."
                     WHERE type = 'folder_deleted'
                     AND intitule = %s",
-                    'f' . $folderId
+                    'f'.$folderId
                 );
                 if ((int) $data['valeur'] !== 0) {
                     $folderData = explode(', ', $data['valeur']);
@@ -238,7 +238,7 @@ 
                         prefixTable('misc'),
                         'type = %s AND intitule = %s',
                         'folder_deleted',
-                        'f' . $folderId
+                        'f'.$folderId
                     );
 
                     // Restore all items in this folder
@@ -254,7 +254,7 @@ 
                     // Get list of all items in thos folder
                     $items = DB::query(
                         'SELECT id
-                        FROM ' . prefixTable('items') . '
+                        FROM ' . prefixTable('items').'
                         WHERE id_tree = %i',
                         $folderId
                     );
@@ -333,7 +333,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($dataReceived['folders'], FILTER_SANITIZE_STRING);
@@ -343,10 +343,10 @@ 
             foreach ($post_folders as $folderId) {
                 $data = DB::queryfirstrow(
                     'SELECT valeur
-                    FROM ' . prefixTable('misc') . "
+                    FROM ' . prefixTable('misc')."
                     WHERE type = 'folder_deleted'
                     AND intitule = %s",
-                    'f' . $folderId
+                    'f'.$folderId
                 );
                 if ((int) $data['valeur'] !== 0) {
                     $folderData = explode(', ', $data['valeur']);
@@ -378,7 +378,7 @@ 
                         prefixTable('misc'),
                         'type = %s AND intitule = %s',
                         'folder_deleted',
-                        'f' . $folderData[0]
+                        'f'.$folderData[0]
                     );
 
                     // Delete all items in this folder
@@ -392,7 +392,7 @@ 
                     // Get list of all items in thos folder
                     $items = DB::query(
                         'SELECT id
-                        FROM ' . prefixTable('items') . '
+                        FROM ' . prefixTable('items').'
                         WHERE id_tree = %i',
                         $folderData[0]
                     );
@@ -464,7 +464,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_log_type = filter_var($dataReceived['dataType'], FILTER_SANITIZE_STRING);
@@ -492,7 +492,7 @@ 
             ) {
                 if ($post_log_type === 'items') {
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_items') . '
+                        'SELECT * FROM '.prefixTable('log_items').'
                         WHERE (date BETWEEN %i AND %i)'
                         . ($post_filter_action === 'all' ? '' : ' AND action = "'.$post_filter_action.'"')
                         . ((int) $post_filter_user === -1 ? '' : ' AND id_user = '.(int) $post_filter_user),
@@ -512,7 +512,7 @@ 
                 } elseif ($post_log_type === 'connections') {
                     //db::debugmode(true);
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_system') . '
+                        'SELECT * FROM '.prefixTable('log_system').'
                         WHERE type=%s '
                         . 'AND (date BETWEEN %i AND %i)'
                         . ($post_filter_action === 'all' ? '' : ' AND action = '.$post_filter_action)
@@ -535,12 +535,12 @@ 
                     );
                 } elseif ($post_log_type === 'errors') {
                     //db::debugmode(true);
-                    echo 'SELECT * FROM ' . prefixTable('log_items') . '
+                    echo 'SELECT * FROM '.prefixTable('log_items').'
                     WHERE (date BETWEEN '.$post_date_from.' AND '.$post_date_to.')'
                     . ($post_filter_action === 'all' ? '' : ' AND action = '.$post_filter_action)
                     . ((int) $post_filter_user === -1 ? '' : ' AND id_user = '.(int) $post_filter_user);
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' .
+                        'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '.
                             'AND (date BETWEEN %i AND %i)',
                         'error',
                         $post_date_from,
@@ -557,7 +557,7 @@ 
                     );
                 } elseif ($post_log_type === 'copy') {
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_items') . ' WHERE action=%s ' .
+                        'SELECT * FROM '.prefixTable('log_items').' WHERE action=%s '.
                             'AND (date BETWEEN %i AND %i)',
                         'at_copy',
                         $post_date_from,
@@ -574,7 +574,7 @@ 
                     );
                 } elseif ($post_log_type === 'admin') {
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' .
+                        'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '.
                             'AND (date BETWEEN %i AND %i)',
                         'admin_action',
                         $post_date_from,
@@ -591,7 +591,7 @@ 
                     );
                 } elseif ($post_log_type === 'failed') {
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' .
+                        'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '.
                             'AND (date BETWEEN %i AND %i)',
                         'failed_auth',
                         $post_date_from,

sources/items.queries.php

Spacing +315 added lines, -315 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'], '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;
 }
 
@@ -55,8 +55,8 @@ 
     date_default_timezone_set('UTC');
 }
 
-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';
@@ -78,7 +78,7 @@ 
 }
 
 // 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));
 }
@@ -90,7 +90,7 @@ 
 DB::$encoding = DB_ENCODING;
 
 // Class loader
-require_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
 
 // Load Tree
 $tree = new SplClassLoader('Tree\NestedTree', '../includes/libraries');
@@ -98,7 +98,7 @@ 
 $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
 
 // Superglobal library
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
 $superGlobal = new protect\SuperGlobal\SuperGlobal();
 
 // Prepare POST variables
@@ -316,7 +316,7 @@ 
                 // About special settings
                 $dataFolderSettings = DB::queryFirstRow(
                     'SELECT bloquer_creation, bloquer_modification, personal_folder
-                    FROM ' . prefixTable('nested_tree') . ' 
+                    FROM ' . prefixTable('nested_tree').' 
                     WHERE id = %i',
                     $post_folder_id
                 );
@@ -333,7 +333,7 @@ 
                 // Get folder complexity
                 $folderComplexity = DB::queryfirstrow(
                     'SELECT valeur
-                    FROM ' . prefixTable('misc') . '
+                    FROM ' . prefixTable('misc').'
                     WHERE type = %s AND intitule = %i',
                     'complex',
                     $post_folder_id
@@ -359,7 +359,7 @@ 
                 $itemExists = 0;
                 $newID = '';
                 $data = DB::queryfirstrow(
-                    'SELECT * FROM ' . prefixTable('items') . '
+                    'SELECT * FROM '.prefixTable('items').'
                     WHERE label = %s AND inactif = %i',
                     $post_label,
                     0
@@ -485,7 +485,7 @@ 
                                 // should we encrypt the data
                                 $dataTmp = DB::queryFirstRow(
                                     'SELECT encrypted_data
-                                    FROM ' . prefixTable('categories') . '
+                                    FROM ' . prefixTable('categories').'
                                     WHERE id = %i',
                                     $field_data[0]
                                 );
@@ -541,7 +541,7 @@ 
                     ) {
                         DB::queryFirstRow(
                             'SELECT *
-                            FROM ' . prefixTable('templates') . '
+                            FROM ' . prefixTable('templates').'
                             WHERE item_id = %i',
                             $newID
                         );
@@ -610,11 +610,11 @@ 
                     ) {
                         foreach ($post_restricted_to as $userRest) {
                             if (empty($userRest) === false) {
-                                $dataTmp = DB::queryfirstrow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= %i', $userRest);
+                                $dataTmp = DB::queryfirstrow('SELECT login FROM '.prefixTable('users').' WHERE id= %i', $userRest);
                                 if (empty($listOfRestricted)) {
                                     $listOfRestricted = $dataTmp['login'];
                                 } else {
-                                    $listOfRestricted .= ';' . $dataTmp['login'];
+                                    $listOfRestricted .= ';'.$dataTmp['login'];
                                 }
                             }
                         }
@@ -628,11 +628,11 @@ 
                         if (empty($data['restricted_to']) === false) {
                             foreach (explode(';', $data['restricted_to']) as $userRest) {
                                 if (empty($userRest) === false) {
-                                    $dataTmp = DB::queryfirstrow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= ' . $userRest);
+                                    $dataTmp = DB::queryfirstrow('SELECT login FROM '.prefixTable('users').' WHERE id= '.$userRest);
                                     if (empty($oldRestrictionList) === true) {
                                         $oldRestrictionList = $dataTmp['login'];
                                     } else {
-                                        $oldRestrictionList .= ';' . $dataTmp['login'];
+                                        $oldRestrictionList .= ';'.$dataTmp['login'];
                                     }
                                 }
                             }
@@ -695,7 +695,7 @@ 
                     if (empty($post_uploaded_file_id) === false) {
                         $rows = DB::query(
                             'SELECT id
-                            FROM ' . prefixTable('files') . '
+                            FROM ' . prefixTable('files').'
                             WHERE id_item = %s',
                             $post_uploaded_file_id
                         );
@@ -735,14 +735,14 @@ 
                                     langHdl('email_subject'),
                                     str_replace(
                                         array('#label', '#link'),
-                                        array($path, $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $post_folder_id . '&id=' . $newID . $txt['email_body3']),
+                                        array($path, $SETTINGS['email_server_url'].'/index.php?page=items&group='.$post_folder_id.'&id='.$newID.$txt['email_body3']),
                                         langHdl('new_item_email_body')
                                     ),
                                     $emailAddress,
                                     $SETTINGS,
                                     str_replace(
                                         array('#label', '#link'),
-                                        array($path, $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $post_folder_id . '&id=' . $newID . $txt['email_body3']),
+                                        array($path, $SETTINGS['email_server_url'].'/index.php?page=items&group='.$post_folder_id.'&id='.$newID.$txt['email_body3']),
                                         langHdl('new_item_email_body')
                                     )
                                 );
@@ -792,7 +792,7 @@ 
 
             // Encrypt data to return
             echo (string) prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$arrData, 'encode');
+    $SETTINGS['cpassman_dir'], $arrData, 'encode');
             break;
 
             /*
@@ -913,7 +913,7 @@ 
                 // About special settings
                 $dataFolderSettings = DB::queryFirstRow(
                     'SELECT bloquer_creation, bloquer_modification, personal_folder
-                    FROM ' . prefixTable('nested_tree') . ' 
+                    FROM ' . prefixTable('nested_tree').' 
                     WHERE id = %i',
                     $post_folder_id
                 );
@@ -929,7 +929,7 @@ 
                 // Get folder complexity
                 $folderComplexity = DB::queryfirstrow(
                     'SELECT valeur
-                    FROM ' . prefixTable('misc') . '
+                    FROM ' . prefixTable('misc').'
                     WHERE type = %s AND intitule = %i',
                     'complex',
                     $post_folder_id
@@ -970,8 +970,8 @@ 
                 // Get all informations for this item
                 $dataItem = DB::queryfirstrow(
                     'SELECT *
-                    FROM ' . prefixTable('items') . ' as i
-                    INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id)
+                    FROM ' . prefixTable('items').' as i
+                    INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id)
                     WHERE i.id=%i AND l.action = %s',
                     $post_item_id,
                     'at_creation'
@@ -981,7 +981,7 @@ 
 				//db::debugmode(true);
                 DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('sharekeys_items') . '
+                    FROM ' . prefixTable('sharekeys_items').'
                     WHERE object_id = %i AND user_id = %s',
                     $post_item_id,
                     $_SESSION['user_id']
@@ -1030,9 +1030,9 @@ 
                         'SELECT i.id as id, i.label as label, i.description as description, i.pw as pw, i.url as url, i.id_tree as id_tree, i.perso as perso, i.login as login, 
                         i.inactif as inactif, i.restricted_to as restricted_to, i.anyone_can_modify as anyone_can_modify, i.email as email, i.notification as notification,
                         u.login as user_login, u.email as user_email
-                        FROM ' . prefixTable('items') . ' as i
-                        INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id=l.id_item)
-                        INNER JOIN ' . prefixTable('users') . ' as u ON (u.id=l.id_user)
+                        FROM ' . prefixTable('items').' as i
+                        INNER JOIN ' . prefixTable('log_items').' as l ON (i.id=l.id_item)
+                        INNER JOIN ' . prefixTable('users').' as u ON (u.id=l.id_user)
                         WHERE i.id=%i',
                         $post_item_id
                     );
@@ -1040,7 +1040,7 @@ 
                     // Should we log a password change?
                     $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'],
                         $post_item_id
@@ -1099,7 +1099,7 @@ 
                     // Get list of tags
                     $itemTags = DB::queryFirstColumn(
                         'SELECT tag
-                        FROM ' . prefixTable('tags') . '
+                        FROM ' . prefixTable('tags').'
                         WHERE item_id = %i',
                         $post_item_id
                     );
@@ -1142,7 +1142,7 @@ 
                             $_SESSION['user_id'],
                             'at_modification',
                             $_SESSION['login'],
-                            'at_tag : ' . implode(' ', $itemTags) . ' => ' . $post_tags
+                            'at_tag : '.implode(' ', $itemTags).' => '.$post_tags
                         );
                     }
 
@@ -1179,8 +1179,8 @@ 
                                     'SELECT c.id AS id, c.title AS title, i.data AS data, i.data_iv AS data_iv,
                                     i.encryption_type AS encryption_type, c.encrypted_data AS encrypted_data,
                                     c.masked AS masked, i.id AS field_item_id
-                                    FROM ' . prefixTable('categories_items') . ' AS i
-                                    INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id)
+                                    FROM ' . prefixTable('categories_items').' AS i
+                                    INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id)
                                     WHERE i.field_id = %i AND i.item_id = %i',
                                     $field['id'],
                                     $post_item_id
@@ -1194,7 +1194,7 @@ 
                                     // Perform new query
                                     $dataTmpCat = DB::queryFirstRow(
                                         'SELECT id, title, encrypted_data, masked
-                                        FROM ' . prefixTable('categories') . '
+                                        FROM ' . prefixTable('categories').'
                                         WHERE id = %i',
                                         $field['id']
                                     );
@@ -1266,7 +1266,7 @@ 
                                         $_SESSION['user_id'],
                                         'at_modification',
                                         $_SESSION['login'],
-                                        'at_field : ' . $dataTmpCat['title'] . ' : ' . $field['value']
+                                        'at_field : '.$dataTmpCat['title'].' : '.$field['value']
                                     );
                                 } else {
                                     // compare the old and new value
@@ -1274,7 +1274,7 @@ 
                                         // Get user sharekey for this field
                                         $userKey = DB::queryFirstRow(
                                             'SELECT share_key
-                                            FROM ' . prefixTable('sharekeys_fields') . '
+                                            FROM ' . prefixTable('sharekeys_fields').'
                                             WHERE user_id = %i AND object_id = %i',
                                             $_SESSION['user_id'],
                                             $dataTmpCat['field_item_id']
@@ -1344,7 +1344,7 @@ 
                                             $_SESSION['user_id'],
                                             'at_modification',
                                             $_SESSION['login'],
-                                            'at_field : ' . $dataTmpCat['title'] . ' => ' . $oldVal
+                                            'at_field : '.$dataTmpCat['title'].' => '.$oldVal
                                         );
                                     }
                                 }
@@ -1369,7 +1369,7 @@ 
                     ) {
                         DB::queryFirstRow(
                             'SELECT *
-                            FROM ' . prefixTable('templates') . '
+                            FROM ' . prefixTable('templates').'
                             WHERE item_id = %i',
                             $post_item_id
                         );
@@ -1412,7 +1412,7 @@ 
                         // check if elem exists in Table. If not add it or update it.
                         DB::query(
                             'SELECT *
-                            FROM ' . prefixTable('automatic_del') . '
+                            FROM ' . prefixTable('automatic_del').'
                             WHERE item_id = %i',
                             $post_item_id
                         );
@@ -1439,7 +1439,7 @@ 
                                 // Store updates performed
                                 array_push(
                                     $arrayOfChanges,
-                                    langHdl('automatic_deletion_engaged') . ': ' . langHdl('enabled')
+                                    langHdl('automatic_deletion_engaged').': '.langHdl('enabled')
                                 );
 
                                 // update LOG
@@ -1482,7 +1482,7 @@ 
                                 // Store updates performed
                                 array_push(
                                     $arrayOfChanges,
-                                    langHdl('automatic_deletion_engaged') . ': ' . langHdl('disabled')
+                                    langHdl('automatic_deletion_engaged').': '.langHdl('disabled')
                                 );
 
                                 // update LOG
@@ -1515,7 +1515,7 @@ 
                             if (empty($userId) === false) {
                                 $dataTmp = DB::queryfirstrow(
                                     'SELECT id, name, lastname
-                                    FROM ' . prefixTable('users') . '
+                                    FROM ' . prefixTable('users').'
                                     WHERE id= %i',
                                     $userId
                                 );
@@ -1523,7 +1523,7 @@ 
                                 // Add to array
                                 array_push(
                                     $arrayOfUsersRestriction,
-                                    $dataTmp['name'] . ' ' . $dataTmp['lastname']
+                                    $dataTmp['name'].' '.$dataTmp['lastname']
                                 );
                                 array_push(
                                     $arrayOfUsersIdRestriction,
@@ -1554,8 +1554,8 @@ 
                         // get values before deleting them
                         $rows = DB::query(
                             'SELECT t.title, t.id AS id
-                            FROM ' . prefixTable('roles_title') . ' as t
-                            INNER JOIN ' . prefixTable('restriction_to_roles') . ' as r ON (t.id=r.role_id)
+                            FROM ' . prefixTable('roles_title').' as t
+                            INNER JOIN ' . prefixTable('restriction_to_roles').' as r ON (t.id=r.role_id)
                             WHERE r.item_id = %i
                             ORDER BY t.title ASC',
                             $post_item_id
@@ -1589,7 +1589,7 @@ 
                                 );
                                 $dataTmp = DB::queryfirstrow(
                                     'SELECT title
-                                    FROM ' . prefixTable('roles_title') . '
+                                    FROM ' . prefixTable('roles_title').'
                                     WHERE id = %i',
                                     $role
                                 );
@@ -1630,8 +1630,8 @@ 
                             $_SESSION['user_id'],
                             'at_modification',
                             $_SESSION['login'],
-                            'at_restriction : ' . (count($diffUsersRestiction) > 0 ?
-                                implode(', ', $arrayOfUsersRestriction) . (count($diffRolesRestiction) > 0 ? ', ' : '') : '') . (count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '')
+                            'at_restriction : '.(count($diffUsersRestiction) > 0 ?
+                                implode(', ', $arrayOfUsersRestriction).(count($diffRolesRestiction) > 0 ? ', ' : '') : '').(count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '')
                         );
                     }
 
@@ -1651,7 +1651,7 @@ 
                             $_SESSION['user_id'],
                             'at_modification',
                             $_SESSION['login'],
-                            'at_label : ' . $data['label'] . ' => ' . $post_label
+                            'at_label : '.$data['label'].' => '.$post_label
                         );
                     }
                     // LOGIN
@@ -1670,7 +1670,7 @@ 
                             $_SESSION['user_id'],
                             'at_modification',
                             $_SESSION['login'],
-                            'at_login : ' . $data['login'] . ' => ' . $post_login
+                            'at_login : '.$data['login'].' => '.$post_login
                         );
                     }
                     // EMAIL
@@ -1689,7 +1689,7 @@ 
                             $_SESSION['user_id'],
                             'at_modification',
                             $_SESSION['login'],
-                            'at_email : ' . $data['email'] . ' => ' . $post_email
+                            'at_email : '.$data['email'].' => '.$post_email
                         );
                     }
                     // URL
@@ -1708,7 +1708,7 @@ 
                             $_SESSION['user_id'],
                             'at_modification',
                             $_SESSION['login'],
-                            'at_url : ' . $data['url'] . ' => ' . $post_url
+                            'at_url : '.$data['url'].' => '.$post_url
                         );
                     }
                     // DESCRIPTION
@@ -1733,7 +1733,7 @@ 
                     // FOLDER
                     if ((int) $data['id_tree'] !== (int) $post_folder_id) {
                         // Get name of folders
-                        $dataTmp = DB::query('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id IN %li', array($data['id_tree'], $post_folder_id));
+                        $dataTmp = DB::query('SELECT title FROM '.prefixTable('nested_tree').' WHERE id IN %li', array($data['id_tree'], $post_folder_id));
 
                         // Store updates performed
                         array_push(
@@ -1749,7 +1749,7 @@ 
                             $_SESSION['user_id'],
                             'at_modification',
                             $_SESSION['login'],
-                            'at_category : ' . $dataTmp[0]['title'] . ' => ' . $dataTmp[1]['title']
+                            'at_category : '.$dataTmp[0]['title'].' => '.$dataTmp[1]['title']
                         );
                     }
                     // ANYONE_CAN_MODIFY
@@ -1757,7 +1757,7 @@ 
                         // Store updates performed
                         array_push(
                             $arrayOfChanges,
-                            langHdl('at_anyoneconmodify') . ': ' . ((int) $post_anyone_can_modify === 0 ? langHdl('disabled') : langHdl('enabled'))
+                            langHdl('at_anyoneconmodify').': '.((int) $post_anyone_can_modify === 0 ? langHdl('disabled') : langHdl('enabled'))
                         );
 
                         // Log
@@ -1768,15 +1768,15 @@ 
                             $_SESSION['user_id'],
                             'at_modification',
                             $_SESSION['login'],
-                            'at_anyoneconmodify : ' . ((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled')
+                            'at_anyoneconmodify : '.((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled')
                         );
                     }
 
                     // Reload new values
                     $dataItem = DB::queryfirstrow(
                         'SELECT *
-                        FROM ' . prefixTable('items') . ' as i
-                        INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id)
+                        FROM ' . prefixTable('items').' as i
+                        INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id)
                         WHERE i.id = %i AND l.action = %s',
                         $post_item_id,
                         'at_creation'
@@ -1785,8 +1785,8 @@ 
                     $history = '';
                     $rows = DB::query(
                         'SELECT l.date as date, l.action as action, l.raison as raison, u.login as login
-                        FROM ' . prefixTable('log_items') . ' as l
-                        LEFT JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id)
+                        FROM ' . prefixTable('log_items').' as l
+                        LEFT JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id)
                         WHERE l.action <> %s AND id_item=%s',
                         'at_shown',
                         $post_item_id
@@ -1795,14 +1795,14 @@ 
                         if ($record['raison'] === NULL) continue;
                         $reason = explode(':', $record['raison']);
                         if (count($reason) > 0) {
-                            $sentence = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - '
-                                . $record['login'] . ' - ' . langHdl($record['action']) . ' - '
-                                . (empty($record['raison']) === false ? (count($reason) > 1 ? langHdl(trim($reason[0])) . ' : ' . $reason[1]
+                            $sentence = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).' - '
+                                . $record['login'].' - '.langHdl($record['action']).' - '
+                                . (empty($record['raison']) === false ? (count($reason) > 1 ? langHdl(trim($reason[0])).' : '.$reason[1]
                                     : langHdl(trim($reason[0]))) : '');
                             if (empty($history)) {
                                 $history = $sentence;
                             } else {
-                                $history .= '<br />' . $sentence;
+                                $history .= '<br />'.$sentence;
                             }
                         }
                     }
@@ -1857,7 +1857,7 @@ 
             }
             // return data
             echo (string) prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$arrData, 'encode');
+    $SETTINGS['cpassman_dir'], $arrData, 'encode');
             break;
 
             /*
@@ -1930,7 +1930,7 @@ 
             ) {
                 // load the original record into an array
                 $originalRecord = DB::queryfirstrow(
-                    'SELECT * FROM ' . prefixTable('items') . '
+                    'SELECT * FROM '.prefixTable('items').'
                     WHERE id = %i',
                     $post_item_id
                 );
@@ -1950,7 +1950,7 @@ 
 
                 // Load the destination folder record into an array
                 $dataDestination = DB::queryfirstrow(
-                    'SELECT personal_folder FROM ' . prefixTable('nested_tree') . '
+                    'SELECT personal_folder FROM '.prefixTable('nested_tree').'
                     WHERE id = %i',
                     $post_dest_id
                 );
@@ -1958,7 +1958,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'],
                     $post_item_id
@@ -2031,7 +2031,7 @@ 
                 // Manage Custom Fields
                 $rows = DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('categories_items') . '
+                    FROM ' . prefixTable('categories_items').'
                     WHERE item_id = %i',
                     $post_item_id
                 );
@@ -2079,15 +2079,15 @@ 
                 $rows = 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'],
                     $post_item_id
                 );
                 foreach ($rows as $record) {
                     // Check if file still exists
-                    if (file_exists($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . TP_FILE_PREFIX . base64_decode($record['file'])) === true) {
+                    if (file_exists($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.TP_FILE_PREFIX.base64_decode($record['file'])) === true) {
                         // Step1 - decrypt the file
                         $fileContent = decryptFile(
                             $record['file'],
@@ -2096,8 +2096,8 @@ 
                         );
 
                         // Step2 - create file
-                        $newFileName = md5(time() . '_' . $record['id']) . '.' . $record['extension'];
-                        $outstream = fopen($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . $newFileName, 'ab');
+                        $newFileName = md5(time().'_'.$record['id']).'.'.$record['extension'];
+                        $outstream = fopen($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.$newFileName, 'ab');
                         if ($outstream === false) {
                             echo prepareExchangedData(
     $SETTINGS['cpassman_dir'],
@@ -2148,7 +2148,7 @@ 
 
                 // -------------------------
                 // Add specific restrictions
-                $rows = DB::query('SELECT * FROM ' . prefixTable('restriction_to_roles') . ' WHERE item_id = %i', $post_item_id);
+                $rows = DB::query('SELECT * FROM '.prefixTable('restriction_to_roles').' WHERE item_id = %i', $post_item_id);
                 foreach ($rows as $record) {
                     DB::insert(
                         prefixTable('restriction_to_roles'),
@@ -2160,7 +2160,7 @@ 
                 }
 
                 // Add Tags
-                $rows = DB::query('SELECT * FROM ' . prefixTable('tags') . ' WHERE item_id = %i', $post_item_id);
+                $rows = DB::query('SELECT * FROM '.prefixTable('tags').' WHERE item_id = %i', $post_item_id);
                 foreach ($rows as $record) {
                     DB::insert(
                         prefixTable('tags'),
@@ -2190,7 +2190,7 @@ 
                     $_SESSION['login']
                 );
                 // 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 (string) prepareExchangedData(
@@ -2238,7 +2238,7 @@ 
 
             // Decrypt and retreive data in JSON format
             $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // Init post variables
             $post_id = filter_var(($dataReceived['id']), FILTER_SANITIZE_NUMBER_INT);
@@ -2262,7 +2262,7 @@ 
             // then we can show 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',
@@ -2273,7 +2273,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',
@@ -2298,8 +2298,8 @@ 
             // Get all informations for this item
             $dataItem = DB::queryfirstrow(
                 'SELECT *
-                FROM ' . prefixTable('items') . ' as i
-                INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id)
+                FROM ' . prefixTable('items').' as i
+                INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id)
                 WHERE i.id = %i AND l.action = %s',
                 $post_id,
                 'at_creation'
@@ -2308,7 +2308,7 @@ 
             // Notification
             DB::queryfirstrow(
                 'SELECT *
-                FROM ' . prefixTable('notification') . '
+                FROM ' . prefixTable('notification').'
                 WHERE item_id = %i AND user_id = %i',
                 $post_id,
                 $_SESSION['user_id']
@@ -2355,13 +2355,13 @@ 
                     && (int) $SETTINGS['enable_email_notification_on_item_shown'] === 1
                     && (int) $user['admin'] === 1
                 ) {
-                    $_SESSION['listNotificationEmails'] .= $user['email'] . ',';
+                    $_SESSION['listNotificationEmails'] .= $user['email'].',';
                 }
             }
 
             // manage case of API user
             if ($dataItem['id_user'] === API_USER_ID) {
-                $arrData['author'] = 'API [' . $dataItem['description'] . ']';
+                $arrData['author'] = 'API ['.$dataItem['description'].']';
                 $arrData['id_user'] = API_USER_ID;
                 $arrData['author_email'] = '';
                 $arrData['notification_status'] = false;
@@ -2371,7 +2371,7 @@ 
             $tags = array();
             $rows = DB::query(
                 'SELECT tag
-                FROM ' . prefixTable('tags') . '
+                FROM ' . prefixTable('tags').'
                 WHERE item_id = %i',
                 $post_id
             );
@@ -2396,7 +2396,7 @@ 
             // Check if user has a role that is accepted
             $rows_tmp = DB::query(
                 'SELECT role_id
-                FROM ' . prefixTable('restriction_to_roles') . '
+                FROM ' . prefixTable('restriction_to_roles').'
                 WHERE item_id=%i',
                 $post_id
             );
@@ -2410,7 +2410,7 @@ 
             // Get the 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'],
                 $post_id
@@ -2493,8 +2493,8 @@ 
                     // Add restriction if item is restricted to roles
                     $rows = DB::query(
                         'SELECT t.title, t.id
-                        FROM ' . prefixTable('roles_title') . ' AS t
-                        INNER JOIN ' . prefixTable('restriction_to_roles') . ' AS r ON (t.id=r.role_id)
+                        FROM ' . prefixTable('roles_title').' AS t
+                        INNER JOIN ' . prefixTable('restriction_to_roles').' AS r ON (t.id=r.role_id)
                         WHERE r.item_id = %i
                         ORDER BY t.title ASC',
                         $post_id
@@ -2510,8 +2510,8 @@ 
                     $tmp = array();
                     $rows = DB::query(
                         'SELECT k.label, k.id
-                        FROM ' . prefixTable('kb_items') . ' as i
-                        INNER JOIN ' . prefixTable('kb') . ' as k ON (i.kb_id=k.id)
+                        FROM ' . prefixTable('kb_items').' as i
+                        INNER JOIN ' . prefixTable('kb').' as k ON (i.kb_id=k.id)
                         WHERE i.item_id = %i
                         ORDER BY k.label ASC',
                         $post_id
@@ -2591,7 +2591,7 @@ 
                     $arrCatList = array();
                     $rows_tmp = DB::query(
                         'SELECT id_category
-                        FROM ' . prefixTable('categories_folders') . '
+                        FROM ' . prefixTable('categories_folders').'
                         WHERE id_folder=%i',
                         $post_folder_id
                     );
@@ -2606,8 +2606,8 @@ 
                             'SELECT i.id AS id, i.field_id AS field_id, i.data AS data, i.item_id AS item_id,
                             i.encryption_type AS encryption_type, c.encrypted_data, c.parent_id AS parent_id,
                             c.type as field_type, c.masked AS field_masked, c.role_visibility AS role_visibility
-                            FROM ' . prefixTable('categories_items') . ' AS i
-                            INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id)
+                            FROM ' . prefixTable('categories_items').' AS i
+                            INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id)
                             WHERE i.item_id=%i AND c.parent_id IN %ls',
                             $post_id,
                             $arrCatList
@@ -2618,11 +2618,11 @@ 
 							//db::debugmode(true);
                             $userKey = DB::queryFirstRow(
                                 'SELECT share_key
-                                FROM ' . prefixTable('sharekeys_fields') . '
+                                FROM ' . prefixTable('sharekeys_fields').'
                                 WHERE user_id = %i AND object_id = %i',
                                 $_SESSION['user_id'],
                                 $row['id']
-                            );//db::debugmode(false);
+                            ); //db::debugmode(false);
                             $fieldText = [];
                             if (DB::count() === 0) {
                                 // Not encrypted
@@ -2664,7 +2664,7 @@ 
                 if (isset($SETTINGS['item_creation_templates']) && (int) $SETTINGS['item_creation_templates'] === 1) {
                     $rows_tmp = DB::queryfirstrow(
                         'SELECT category_id
-                        FROM ' . prefixTable('templates') . '
+                        FROM ' . prefixTable('templates').'
                         WHERE item_id = %i',
                         $post_id
                     );
@@ -2689,7 +2689,7 @@ 
                     // Is the Item to be deleted?
                     $dataDelete = DB::queryfirstrow(
                         'SELECT * 
-                        FROM ' . prefixTable('automatic_del') . '
+                        FROM ' . prefixTable('automatic_del').'
                         WHERE item_id = %i',
                         $post_id
                     );
@@ -2771,11 +2771,11 @@ 
                 if (empty($dataItem['restricted_to']) === false) {
                     foreach (explode(';', $dataItem['restricted_to']) as $userRest) {
                         if (empty($userRest) === false) {
-                            $dataTmp = DB::queryfirstrow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= ' . $userRest);
+                            $dataTmp = DB::queryfirstrow('SELECT login FROM '.prefixTable('users').' WHERE id= '.$userRest);
                             if (empty($listOfRestricted)) {
                                 $listOfRestricted = $dataTmp['login'];
                             } else {
-                                $listOfRestricted .= ';' . $dataTmp['login'];
+                                $listOfRestricted .= ';'.$dataTmp['login'];
                             }
                         }
                     }
@@ -2796,7 +2796,7 @@ 
 
             // Encrypt data to return
             echo (string) prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$arrData, 'encode');
+    $SETTINGS['cpassman_dir'], $arrData, 'encode');
             break;
 
             /*
@@ -2835,8 +2835,8 @@ 
             // Load item data
             $dataItem = DB::queryFirstRow(
                 'SELECT i.*, n.title AS folder_title
-                FROM ' . prefixTable('items') . ' AS i
-                INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id)
+                FROM ' . prefixTable('items').' AS i
+                INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id)
                 WHERE i.id = %i',
                 $post_id
             );
@@ -2858,7 +2858,7 @@ 
             // Check if user has a role that is accepted
             $rows_tmp = DB::query(
                 'SELECT role_id
-                FROM ' . prefixTable('restriction_to_roles') . '
+                FROM ' . prefixTable('restriction_to_roles').'
                 WHERE item_id=%i',
                 $post_id
             );
@@ -2905,7 +2905,7 @@ 
                 // launch query
                 $rows = DB::query(
                     'SELECT id, name, file, extension, size
-                    FROM ' . prefixTable('files') . '
+                    FROM ' . prefixTable('files').'
                     WHERE id_item = %i AND confirmed = 1',
                     $post_id
                 );
@@ -2914,7 +2914,7 @@ 
                         $attachments,
                         array(
                             'icon' => fileFormatImage(strtolower($record['extension'])),
-                            'filename' => basename($record['name'], '.' . $record['extension']),
+                            'filename' => basename($record['name'], '.'.$record['extension']),
                             'extension' => $record['extension'],
                             'size' => formatSizeUnits((int) $record['size']),
                             'is_image' => in_array(strtolower($record['extension']), TP_IMAGE_FILE_EXT) === true ? 1 : 0,
@@ -2940,7 +2940,7 @@ 
                         array(
                             'latest_items' => implode(';', $_SESSION['latest_items']),
                         ),
-                        'id=' . $_SESSION['user_id']
+                        'id='.$_SESSION['user_id']
                     );
                 }
 
@@ -2949,8 +2949,8 @@ 
                 $listOptionsForRoles = array();
                 $rows = DB::query(
                     'SELECT r.role_id AS role_id, t.title AS title
-                    FROM ' . prefixTable('roles_values') . ' AS r
-                    INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id)
+                    FROM ' . prefixTable('roles_values').' AS r
+                    INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id)
                     WHERE r.folder_id = %i',
                     $dataItem['id_tree']
                 );
@@ -2964,9 +2964,9 @@ 
                     );
                     $rows2 = DB::query(
                         'SELECT id, login, fonction_id, email, name, lastname
-                        FROM ' . prefixTable('users') . '
+                        FROM ' . prefixTable('users').'
                         WHERE fonction_id LIKE %s',
-                        '%' . $record['role_id'] . '%'
+                        '%'.$record['role_id'].'%'
                     );
                     foreach ($rows2 as $record2) {
                         foreach (explode(';', $record2['fonction_id']) as $role) {
@@ -2979,7 +2979,7 @@ 
                                     array(
                                         'id' => (int) $record2['id'],
                                         'login' => $record2['login'],
-                                        'name' => $record2['name'] . ' ' . $record2['lastname'],
+                                        'name' => $record2['name'].' '.$record2['lastname'],
                                         'email' => $record2['email'],
                                     )
                                 );
@@ -2998,16 +2998,16 @@ 
                     $path = '';
                     foreach ($arbo as $elem) {
                         if (empty($path) === true) {
-                            $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES) . ' ';
+                            $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES).' ';
                         } else {
-                            $path .= '&#8594; ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
+                            $path .= '&#8594; '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
                         }
                     }
                     // Build text to show user
                     if (empty($path) === true) {
                         $path = addslashes($dataItem['label']);
                     } else {
-                        $path = addslashes($dataItem['label']) . ' (' . $path . ')';
+                        $path = addslashes($dataItem['label']).' ('.$path.')';
                     }
 
                     // send back infos
@@ -3021,7 +3021,7 @@ 
                                 array(
                                     addslashes($_SESSION['login']),
                                     $path,
-                                    $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $dataItem['id'],
+                                    $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$dataItem['id'],
                                 ),
                                 langHdl('email_on_open_notification_mail')
                             ),
@@ -3032,7 +3032,7 @@ 
                 }
 
                 // has this item a change proposal
-                DB::query('SELECT * FROM ' . prefixTable('items_change') . ' WHERE item_id = %i', $post_id);
+                DB::query('SELECT * FROM '.prefixTable('items_change').' WHERE item_id = %i', $post_id);
                 $returnArray['has_change_proposal'] = DB::count();
 
                 // Setting
@@ -3130,7 +3130,7 @@ 
             // Load item data
             $data = DB::queryFirstRow(
                 'SELECT id_tree
-                FROM ' . prefixTable('items') . '
+                FROM ' . prefixTable('items').'
                 WHERE id = %i',
                 $post_item_id
             );
@@ -3196,7 +3196,7 @@ 
             }
             // decrypt and retreive data in JSON format
             $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // Prepare variables
             $title = filter_var(htmlspecialchars_decode($dataReceived['title'], ENT_QUOTES), FILTER_SANITIZE_STRING);
@@ -3204,13 +3204,13 @@ 
 
             // Check if user is allowed to access this folder
             if (!in_array($post_folder_id, $_SESSION['groupes_visibles'])) {
-                echo '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]';
+                echo '[{"error" : "'.langHdl('error_not_allowed_to').'"}]';
                 break;
             }
 
             // Check if title doesn't contains html codes
             if (preg_match_all('|<[^>]+>(.*)</[^>]+>|U', $title, $out)) {
-                echo '[ { "error" : "' . langHdl('error_html_codes') . '" } ]';
+                echo '[ { "error" : "'.langHdl('error_html_codes').'" } ]';
                 break;
             }
             // check that title is not numeric
@@ -3221,9 +3221,9 @@ 
 
             // Check if duplicate folders name are allowed
             if (isset($SETTINGS['duplicate_folder']) && $SETTINGS['duplicate_folder'] === '0') {
-                $data = DB::queryFirstRow('SELECT id, title FROM ' . prefixTable('nested_tree') . ' WHERE title = %s', $title);
+                $data = DB::queryFirstRow('SELECT id, title FROM '.prefixTable('nested_tree').' WHERE title = %s', $title);
                 if (empty($data['id']) === false && $dataReceived['folder'] !== $data['id']) {
-                    echo '[ { "error" : "' . langHdl('error_group_exist') . '" } ]';
+                    echo '[ { "error" : "'.langHdl('error_group_exist').'" } ]';
                     break;
                 }
             }
@@ -3231,7 +3231,7 @@ 
             // query on folder
             $data = DB::queryfirstrow(
                 'SELECT parent_id, personal_folder
-                FROM ' . prefixTable('nested_tree') . '
+                FROM ' . prefixTable('nested_tree').'
                 WHERE id = %i',
                 $post_folder_id
             );
@@ -3241,20 +3241,20 @@ 
             if ($_SESSION['is_admin'] !== 1 && $_SESSION['user_manager'] !== 1 && $data['personal_folder'] === '0') {
                 $data = DB::queryfirstrow(
                     'SELECT valeur
-                    FROM ' . prefixTable('misc') . '
+                    FROM ' . prefixTable('misc').'
                     WHERE intitule = %i AND type = %s',
                     $data['parent_id'],
                     'complex'
                 );
                 if (intval($dataReceived['complexity']) < intval($data['valeur'])) {
-                    echo '[ { "error" : "' . langHdl('error_folder_complexity_lower_than_top_folder') . ' [<b>' . TP_PW_COMPLEXITY[$data['valeur']][1] . '</b>]"} ]';
+                    echo '[ { "error" : "'.langHdl('error_folder_complexity_lower_than_top_folder').' [<b>'.TP_PW_COMPLEXITY[$data['valeur']][1].'</b>]"} ]';
                     break;
                 }
             }
 
             // update Folders table
             $tmp = DB::queryFirstRow(
-                'SELECT title, parent_id, personal_folder FROM ' . prefixTable('nested_tree') . ' WHERE id = %i',
+                'SELECT title, parent_id, personal_folder FROM '.prefixTable('nested_tree').' WHERE id = %i',
                 $dataReceived['folder']
             );
             if ($tmp['parent_id'] !== 0 || $tmp['title'] !== $_SESSION['user_id'] || $tmp['personal_folder'] !== 1) {
@@ -3313,7 +3313,7 @@ 
             }
             // decrypt and retreive data in JSON format
             $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
             $post_source_folder_id = filter_var(htmlspecialchars_decode($dataReceived['source_folder_id']), FILTER_SANITIZE_NUMBER_INT);
             $post_target_folder_id = filter_var(htmlspecialchars_decode($dataReceived['target_folder_id']), FILTER_SANITIZE_NUMBER_INT);
 
@@ -3322,42 +3322,42 @@ 
                     in_array($post_target_folder_id, $_SESSION['groupes_visibles']) === false) && ($post_target_folder_id === '0' &&
                     isset($SETTINGS['can_create_root_folder']) === true && (int) $SETTINGS['can_create_root_folder'] === 1)
             ) {
-                $returnValues = '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]';
+                $returnValues = '[{"error" : "'.langHdl('error_not_allowed_to').'"}]';
                 echo $returnValues;
                 break;
             }
 
             $tmp_source = DB::queryFirstRow(
                 'SELECT title, parent_id, personal_folder
-                FROM ' . prefixTable('nested_tree') . '
+                FROM ' . prefixTable('nested_tree').'
                 WHERE id = %i',
                 $post_source_folder_id
             );
 
             $tmp_target = DB::queryFirstRow(
                 'SELECT title, parent_id, personal_folder
-                FROM ' . prefixTable('nested_tree') . '
+                FROM ' . prefixTable('nested_tree').'
                 WHERE id = %i',
                 $post_target_folder_id
             );
 
             // check if target is not a child of source
             if ($tree->isChildOf($post_target_folder_id, $post_source_folder_id) === true) {
-                $returnValues = '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]';
+                $returnValues = '[{"error" : "'.langHdl('error_not_allowed_to').'"}]';
                 echo $returnValues;
                 break;
             }
 
             // check if source or target folder is PF. If Yes, then cancel operation
             if ((int) $tmp_source['personal_folder'] === 1 || (int) $tmp_target['personal_folder'] === 1) {
-                $returnValues = '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]';
+                $returnValues = '[{"error" : "'.langHdl('error_not_allowed_to').'"}]';
                 echo $returnValues;
                 break;
             }
 
             // check if source or target folder is PF. If Yes, then cancel operation
             if ($tmp_source['title'] === $_SESSION['user_id'] || $tmp_target['title'] === $_SESSION['user_id']) {
-                $returnValues = '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]';
+                $returnValues = '[{"error" : "'.langHdl('error_not_allowed_to').'"}]';
                 echo $returnValues;
                 break;
             }
@@ -3494,7 +3494,7 @@ 
                 foreach ($_SESSION['user_roles'] as $role) {
                     $roleQ = DB::queryfirstrow(
                         'SELECT allow_pw_change
-                        FROM ' . prefixTable('roles_title') . '
+                        FROM ' . prefixTable('roles_title').'
                         WHERE id = %i',
                         $role
                     );
@@ -3519,11 +3519,11 @@ 
                     
                     foreach ($_SESSION['user_roles'] as $role) {
                         $access = DB::queryFirstRow(
-                            'SELECT type FROM ' . prefixTable('roles_values') . ' WHERE role_id = %i AND folder_id = %i',
+                            'SELECT type FROM '.prefixTable('roles_values').' WHERE role_id = %i AND folder_id = %i',
                             $role,
                             $post_id
                         );
-                        if (DB::count()>0) {
+                        if (DB::count() > 0) {
                             if ($access['type'] === 'R') {
                                 array_push($arrTmp, 10);
                             } elseif ($access['type'] === 'W') {
@@ -3588,7 +3588,7 @@ 
                 } else {
                     DB::query(
                         'SELECT *
-                        FROM ' . prefixTable('items') . '
+                        FROM ' . prefixTable('items').'
                         WHERE inactif = %i',
                         0
                     );
@@ -3598,7 +3598,7 @@ 
 
                 // Get folder complexity
                 $folderComplexity = DB::queryFirstRow(
-                    'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %i',
+                    'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %i',
                     'complex',
                     $post_id
                 );
@@ -3610,7 +3610,7 @@ 
                 if (isset($SETTINGS['item_extra_fields']) && (int) $SETTINGS['item_extra_fields'] === 1) {
                     $folderRow = DB::query(
                         'SELECT id_category
-                        FROM ' . prefixTable('categories_folders') . '
+                        FROM ' . prefixTable('categories_folders').'
                         WHERE id_folder = %i',
                         $post_id
                     );
@@ -3724,13 +3724,13 @@ 
                 // List all ITEMS
                 if ($folderIsPf === false) {
                     $where->add('i.inactif=%i', 0);
-                    $where->add('l.date=%l', '(SELECT date FROM ' . prefixTable('log_items') . " WHERE action IN ('at_creation', 'at_modification') AND id_item=i.id ORDER BY date DESC LIMIT 1)");
+                    $where->add('l.date=%l', '(SELECT date FROM '.prefixTable('log_items')." WHERE action IN ('at_creation', 'at_modification') AND id_item=i.id ORDER BY date DESC LIMIT 1)");
                     if (empty($limited_to_items) === false) {
                         $where->add('i.id IN %ls', explode(',', $limited_to_items));
                     }
 
-                    $query_limit = ' LIMIT ' .
-                        $start . ',' .
+                    $query_limit = ' LIMIT '.
+                        $start.','.
                         $post_nb_items_to_display_once;
                     //db::debugmode(true);
                     $rows = DB::query(
@@ -3741,9 +3741,9 @@ 
                         MIN(l.action) AS log_action,
                         l.id_user AS log_user,
                         i.url AS link
-                        FROM ' . prefixTable('items') . ' AS i
-                        INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id)
-                        INNER JOIN ' . prefixTable('log_items') . ' AS l ON (i.id = l.id_item)
+                        FROM ' . prefixTable('items').' AS i
+                        INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id)
+                        INNER JOIN ' . prefixTable('log_items').' AS l ON (i.id = l.id_item)
                         WHERE %l
                         GROUP BY i.id, l.date, l.id_user, l.action
                         ORDER BY i.label ASC, l.date DESC' . $query_limit,
@@ -3762,9 +3762,9 @@ 
                         MIN(l.action) AS log_action,
                         l.id_user AS log_user,
                         i.url AS link
-                        FROM ' . prefixTable('items') . ' AS i
-                        INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id)
-                        INNER JOIN ' . prefixTable('log_items') . ' AS l ON (i.id = l.id_item)
+                        FROM ' . prefixTable('items').' AS i
+                        INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id)
+                        INNER JOIN ' . prefixTable('log_items').' AS l ON (i.id = l.id_item)
                         WHERE %l
                         GROUP BY i.id, l.date, l.id_user, l.action
                         ORDER BY i.label ASC, l.date DESC',
@@ -3794,7 +3794,7 @@ 
                         $item_is_restricted_to_role = false;
                         DB::queryfirstrow(
                             'SELECT role_id
-                            FROM ' . prefixTable('restriction_to_roles') . '
+                            FROM ' . prefixTable('restriction_to_roles').'
                             WHERE item_id = %i',
                             $record['id']
                         );
@@ -3806,7 +3806,7 @@ 
                         $user_is_included_in_role = false;
                         DB::query(
                             'SELECT role_id
-                            FROM ' . prefixTable('restriction_to_roles') . '
+                            FROM ' . prefixTable('restriction_to_roles').'
                             WHERE item_id = %i AND role_id IN %ls',
                             $record['id'],
                             $_SESSION['user_roles']
@@ -4010,9 +4010,9 @@ 
             if ((int) $start === 0) {
                 DB::query(
                     'SELECT i.id
-                    FROM ' . prefixTable('items') . ' as i
-                    INNER JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree = n.id)
-                    INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id = l.id_item)
+                    FROM ' . prefixTable('items').' as i
+                    INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree = n.id)
+                    INNER JOIN ' . prefixTable('log_items').' as l ON (i.id = l.id_item)
                     WHERE %l
                     ORDER BY i.label ASC, l.date DESC',
                     $where
@@ -4054,7 +4054,7 @@ 
 
             // Encrypt data to return
             echo (string) prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$returnValues, 'encode');
+    $SETTINGS['cpassman_dir'], $returnValues, 'encode');
 
             break;
 
@@ -4078,8 +4078,8 @@ 
             // Run query
             $dataItem = 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 user_id = %i AND i.id = %i',
                 $_SESSION['user_id'],
                 $post_item_id
@@ -4107,7 +4107,7 @@ 
 
             // Encrypt data to return
             echo (string) prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$returnValues, 'encode');
+    $SETTINGS['cpassman_dir'], $returnValues, 'encode');
             break;
 
             /*
@@ -4123,7 +4123,7 @@ 
             if (null !== $post_item_id && empty($post_item_id) === false) {
                 $dataItem = DB::queryfirstrow(
                     'SELECT perso, anyone_can_modify
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE id=%i',
                     $post_item_id
                 );
@@ -4162,7 +4162,7 @@ 
                 */
 
                 // Lock Item (if already locked), go back and warn
-                $dataTmp = DB::queryFirstRow('SELECT timestamp, user_id FROM ' . prefixTable('items_edition') . ' WHERE item_id = %i', $post_item_id);
+                $dataTmp = DB::queryFirstRow('SELECT timestamp, user_id FROM '.prefixTable('items_edition').' WHERE item_id = %i', $post_item_id);
 
                 // If token is taken for this Item and delay is passed then delete it.
                 if (
@@ -4173,7 +4173,7 @@ 
                     DB::delete(prefixTable('items_edition'), 'item_id = %i', $post_item_id);
                     //reload the previous data
                     $dataTmp = DB::queryFirstRow(
-                        'SELECT timestamp, user_id FROM ' . prefixTable('items_edition') . ' WHERE item_id = %i',
+                        'SELECT timestamp, user_id FROM '.prefixTable('items_edition').' WHERE item_id = %i',
                         $post_item_id
                     );
                 }
@@ -4206,7 +4206,7 @@ 
                         'message' => langHdl('error_no_edition_possible_locked'),
                     );
                     echo (string) prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$returnValues, 'encode');
+    $SETTINGS['cpassman_dir'], $returnValues, 'encode');
                     break;
                 }
             }
@@ -4214,7 +4214,7 @@ 
             // do query on this folder
             $data_this_folder = DB::queryFirstRow(
                 'SELECT id, personal_folder, title
-                FROM ' . prefixTable('nested_tree') . '
+                FROM ' . prefixTable('nested_tree').'
                 WHERE id = %s',
                 $post_groupe
             );
@@ -4242,7 +4242,7 @@ 
                             'message' => langHdl('error_not_allowed_to'),
                         );
                         echo (string) prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$returnValues, 'encode');
+    $SETTINGS['cpassman_dir'], $returnValues, 'encode');
                         break;
                     }
                 }
@@ -4252,8 +4252,8 @@ 
             $visibilite = '';
             $data = DB::queryFirstRow(
                 'SELECT m.valeur, n.personal_folder
-                FROM ' . prefixTable('misc') . ' AS m
-                INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (m.intitule = n.id)
+                FROM ' . prefixTable('misc').' AS m
+                INNER JOIN ' . prefixTable('nested_tree').' AS n ON (m.intitule = n.id)
                 WHERE type=%s AND intitule = %s',
                 'complex',
                 $post_groupe
@@ -4266,8 +4266,8 @@ 
                 // Prepare Item actual visibility (what Users/Roles can see it)
                 $rows = DB::query(
                     'SELECT t.title
-                    FROM ' . prefixTable('roles_values') . ' as v
-                    INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id)
+                    FROM ' . prefixTable('roles_values').' as v
+                    INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id)
                     WHERE v.folder_id = %i
                     GROUP BY title',
                     $post_groupe
@@ -4276,7 +4276,7 @@ 
                     if (empty($visibilite)) {
                         $visibilite = $record['title'];
                     } else {
-                        $visibilite .= ' - ' . $record['title'];
+                        $visibilite .= ' - '.$record['title'];
                     }
                 }
             } else {
@@ -4286,14 +4286,14 @@ 
                 // do new query to know if current folder is pf
                 $data_pf = DB::queryFirstRow(
                     'SELECT personal_folder
-                    FROM ' . prefixTable('nested_tree') . '
+                    FROM ' . prefixTable('nested_tree').'
                     WHERE id = %s',
                     $post_groupe
                 );
                 
                 $folder_is_personal = $data_pf !== null ? (int) $data_pf['personal_folder'] : 0;
                 
-                $visibilite = $_SESSION['name'] . ' ' . $_SESSION['lastname'] . ' (' . $_SESSION['login'] . ')';
+                $visibilite = $_SESSION['name'].' '.$_SESSION['lastname'].' ('.$_SESSION['login'].')';
             }
 
             recupDroitCreationSansComplexite($post_groupe);
@@ -4303,8 +4303,8 @@ 
             $listOptionsForRoles = array();
             $rows = DB::query(
                 'SELECT r.role_id AS role_id, t.title AS title
-                FROM ' . prefixTable('roles_values') . ' AS r
-                INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id)
+                FROM ' . prefixTable('roles_values').' AS r
+                INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id)
                 WHERE r.folder_id = %i',
                 $post_groupe
             );
@@ -4318,7 +4318,7 @@ 
                 );
                 $rows2 = DB::query(
                     'SELECT id, login, fonction_id, email, name, lastname
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE admin = 0'
                 );
                 foreach ($rows2 as $record2) {
@@ -4332,7 +4332,7 @@ 
                                 array(
                                     'id' => $record2['id'],
                                     'login' => $record2['login'],
-                                    'name' => $record2['name'] . ' ' . $record2['lastname'],
+                                    'name' => $record2['name'].' '.$record2['lastname'],
                                     'email' => $record2['email'],
                                 )
                             );
@@ -4349,13 +4349,13 @@ 
 					//db::debugmode(true);
 					$access = DB::queryFirstRow(
 						'SELECT type
-						FROM ' . prefixTable('roles_values') . '
+						FROM ' . prefixTable('roles_values').'
 						WHERE role_id = %i AND folder_id = %i',
 						$role,
 						$post_groupe
 					);
 					//db::debugmode(false);
-                    if (DB::count()>0) {
+                    if (DB::count() > 0) {
                         if ($access['type'] === 'R') {
                             array_push($arrTmp, 10);
                         } elseif ($access['type'] === 'W') {
@@ -4396,7 +4396,7 @@ 
                 'itemAccessRight' => isset($accessLevel) === true ? $accessLevel : '',
             );
             echo (string) prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$returnValues, 'encode');
+    $SETTINGS['cpassman_dir'], $returnValues, 'encode');
             break;
 
             /*
@@ -4428,7 +4428,7 @@ 
             // Get some info before deleting
             $data = DB::queryFirstRow(
                 'SELECT name, id_item, file
-                FROM ' . prefixTable('files') . '
+                FROM ' . prefixTable('files').'
                 WHERE id = %i',
                 $fileId
             );
@@ -4436,7 +4436,7 @@ 
             // Load item data
             $data_item = DB::queryFirstRow(
                 'SELECT id_tree
-                FROM ' . prefixTable('items') . '
+                FROM ' . prefixTable('items').'
                 WHERE id = %i',
                 $data['id_item']
             );
@@ -4444,7 +4444,7 @@ 
             // Check that user can access this folder
             if (in_array($data_item['id_tree'], $_SESSION['groupes_visibles']) === false) {
                 echo (string) prepareExchangedData(
-    $SETTINGS['cpassman_dir'],array('error' => 'ERR_FOLDER_NOT_ALLOWED'), 'encode');
+    $SETTINGS['cpassman_dir'], array('error' => 'ERR_FOLDER_NOT_ALLOWED'), 'encode');
                 break;
             }
 
@@ -4464,7 +4464,7 @@ 
                     $_SESSION['user_id'],
                     'at_modification',
                     $_SESSION['login'],
-                    'at_del_file : ' . $data['name']
+                    'at_del_file : '.$data['name']
                 );
 
                 // DElete sharekeys
@@ -4475,7 +4475,7 @@ 
                 );
 
                 // Delete file from server
-                fileDelete($SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($data['file']), $SETTINGS);
+                fileDelete($SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($data['file']), $SETTINGS);
             }
 
             echo (string) prepareExchangedData(
@@ -4495,7 +4495,7 @@ 
         case 'clear_html_tags':
             // Get information for this item
             $dataItem = DB::queryfirstrow(
-                'SELECT description FROM ' . prefixTable('items') . ' WHERE id=%i',
+                'SELECT description FROM '.prefixTable('items').' WHERE id=%i',
                 filter_input(INPUT_POST, 'id_item', FILTER_SANITIZE_NUMBER_INT)
             );
             // Clean up the string
@@ -4533,12 +4533,12 @@ 
                 // Update SESSION with this new favourite
                 $data = DB::queryfirstrow(
                     'SELECT label,id_tree
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE id = ' . mysqli_real_escape_string($link, $post_item_id)
                 );
                 $_SESSION['favourites_tab'][$post_item_id] = array(
                     'label' => $data['label'],
-                    'url' => 'index.php?page=items&amp;group=' . $data['id_tree'] . '&amp;id=' . $post_item_id,
+                    'url' => 'index.php?page=items&amp;group='.$data['id_tree'].'&amp;id='.$post_item_id,
                 );
             } elseif ((int) filter_input(INPUT_POST, 'action', FILTER_SANITIZE_NUMBER_INT) === 1) {
                 // delete from session
@@ -4610,8 +4610,8 @@ 
             // get data about item
             $dataSource = DB::queryfirstrow(
                 'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label
-                FROM ' . prefixTable('items') . ' as i
-                INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id)
+                FROM ' . prefixTable('items').' as i
+                INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id)
                 WHERE i.id=%i',
                 $post_item_id
             );
@@ -4619,7 +4619,7 @@ 
             // get data about new folder
             $dataDestination = DB::queryfirstrow(
                 'SELECT personal_folder, title
-                FROM ' . prefixTable('nested_tree') . '
+                FROM ' . prefixTable('nested_tree').'
                 WHERE id = %i',
                 $post_folder_id
             );
@@ -4672,7 +4672,7 @@ 
                 // Get fields for this Item
                 $rows = DB::query(
                     'SELECT id
-                    FROM ' . prefixTable('categories_items') . '
+                    FROM ' . prefixTable('categories_items').'
                     WHERE item_id = %i',
                     $post_item_id
                 );
@@ -4689,7 +4689,7 @@ 
                 // Get FILES for this Item
                 $rows = DB::query(
                     'SELECT id
-                    FROM ' . prefixTable('files') . '
+                    FROM ' . prefixTable('files').'
                     WHERE id_item = %i',
                     $post_item_id
                 );
@@ -4734,7 +4734,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'],
                     $post_item_id
@@ -4745,8 +4745,8 @@ 
                     // This is a public object
                     $users = DB::query(
                         'SELECT id, public_key
-                        FROM ' . prefixTable('users') . '
-                        WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '")
+                        FROM ' . prefixTable('users').'
+                        WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'")
                         AND public_key != ""'
                     );
                     foreach ($users as $user) {
@@ -4766,14 +4766,14 @@ 
                 // Get fields for this Item
                 $rows = DB::query(
                     'SELECT id
-                    FROM ' . prefixTable('categories_items') . '
+                    FROM ' . prefixTable('categories_items').'
                     WHERE item_id = %i',
                     $post_item_id
                 );
                 foreach ($rows as $field) {
                     $userKey = DB::queryFirstRow(
                         'SELECT share_key
-                        FROM ' . prefixTable('sharekeys_fields') . '
+                        FROM ' . prefixTable('sharekeys_fields').'
                         WHERE user_id = %i AND object_id = %i',
                         $_SESSION['user_id'],
                         $field['id']
@@ -4784,8 +4784,8 @@ 
                         // This is a public object
                         $users = DB::query(
                             'SELECT id, public_key
-                            FROM ' . prefixTable('users') . '
-                            WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '")
+                            FROM ' . prefixTable('users').'
+                            WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'")
                             AND public_key != ""'
                         );
                         foreach ($users as $user) {
@@ -4806,14 +4806,14 @@ 
                 // Get FILES for this Item
                 $rows = DB::query(
                     'SELECT id
-                    FROM ' . prefixTable('files') . '
+                    FROM ' . prefixTable('files').'
                     WHERE id_item = %i',
                     $post_item_id
                 );
                 foreach ($rows as $attachment) {
                     $userKey = DB::queryFirstRow(
                         'SELECT share_key
-                        FROM ' . prefixTable('sharekeys_files') . '
+                        FROM ' . prefixTable('sharekeys_files').'
                         WHERE user_id = %i AND object_id = %i',
                         $_SESSION['user_id'],
                         $attachment['id']
@@ -4824,8 +4824,8 @@ 
                         // This is a public object
                         $users = DB::query(
                             'SELECT id, public_key
-                            FROM ' . prefixTable('users') . '
-                            WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '")
+                            FROM ' . prefixTable('users').'
+                            WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'")
                             AND public_key != ""'
                         );
                         foreach ($users as $user) {
@@ -4862,7 +4862,7 @@ 
                 $_SESSION['user_id'],
                 'at_modification',
                 $_SESSION['login'],
-                'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title']
+                'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title']
             );
 
             $returnValues = array(
@@ -4872,7 +4872,7 @@ 
                 'to_folder' => $post_folder_id,
             );
             echo (string) prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$returnValues, 'encode');
+    $SETTINGS['cpassman_dir'], $returnValues, 'encode');
             break;
 
             /*
@@ -4919,8 +4919,8 @@ 
                     // get data about item
                     $dataSource = DB::queryfirstrow(
                         'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label
-                        FROM ' . prefixTable('items') . ' as i
-                        INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id)
+                        FROM ' . prefixTable('items').' as i
+                        INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id)
                         WHERE i.id=%i',
                         $item_id
                     );
@@ -4943,7 +4943,7 @@ 
 
                     // get data about new folder
                     $dataDestination = DB::queryfirstrow(
-                        'SELECT personal_folder, title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i',
+                        'SELECT personal_folder, title FROM '.prefixTable('nested_tree').' WHERE id = %i',
                         $post_folder_id
                     );
 
@@ -4984,7 +4984,7 @@ 
                         // Get fields for this Item
                         $rows = DB::query(
                             'SELECT id
-                            FROM ' . prefixTable('categories_items') . '
+                            FROM ' . prefixTable('categories_items').'
                             WHERE item_id = %i',
                             $item_id
                         );
@@ -5001,7 +5001,7 @@ 
                         // Get FILES for this Item
                         $rows = DB::query(
                             'SELECT id
-                            FROM ' . prefixTable('files') . '
+                            FROM ' . prefixTable('files').'
                             WHERE id_item = %i',
                             $item_id
                         );
@@ -5054,7 +5054,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'],
                             $item_id
@@ -5065,8 +5065,8 @@ 
                             // This is a public object
                             $users = DB::query(
                                 'SELECT id, public_key
-                                FROM ' . prefixTable('users') . '
-                                WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '")
+                                FROM ' . prefixTable('users').'
+                                WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'")
                                 AND public_key != ""'
                             );
                             foreach ($users as $user) {
@@ -5086,14 +5086,14 @@ 
                         // Get fields for this Item
                         $rows = DB::query(
                             'SELECT id
-                            FROM ' . prefixTable('categories_items') . '
+                            FROM ' . prefixTable('categories_items').'
                             WHERE item_id = %i',
                             $item_id
                         );
                         foreach ($rows as $field) {
                             $userKey = DB::queryFirstRow(
                                 'SELECT share_key
-                                FROM ' . prefixTable('sharekeys_fields') . '
+                                FROM ' . prefixTable('sharekeys_fields').'
                                 WHERE user_id = %i AND object_id = %i',
                                 $_SESSION['user_id'],
                                 $field['id']
@@ -5104,8 +5104,8 @@ 
                                 // This is a public object
                                 $users = DB::query(
                                     'SELECT id, public_key
-                                    FROM ' . prefixTable('users') . '
-                                    WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '")
+                                    FROM ' . prefixTable('users').'
+                                    WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'")
                                     AND public_key != ""'
                                 );
                                 foreach ($users as $user) {
@@ -5126,14 +5126,14 @@ 
                         // Get FILES for this Item
                         $rows = DB::query(
                             'SELECT id
-                            FROM ' . prefixTable('files') . '
+                            FROM ' . prefixTable('files').'
                             WHERE id_item = %i',
                             $item_id
                         );
                         foreach ($rows as $attachment) {
                             $userKey = DB::queryFirstRow(
                                 'SELECT share_key
-                                FROM ' . prefixTable('sharekeys_files') . '
+                                FROM ' . prefixTable('sharekeys_files').'
                                 WHERE user_id = %i AND object_id = %i',
                                 $_SESSION['user_id'],
                                 $attachment['id']
@@ -5144,8 +5144,8 @@ 
                                 // This is a public object
                                 $users = DB::query(
                                     'SELECT id, public_key
-                                    FROM ' . prefixTable('users') . '
-                                    WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '")
+                                    FROM ' . prefixTable('users').'
+                                    WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'")
                                     AND public_key != ""'
                                 );
                                 foreach ($users as $user) {
@@ -5181,13 +5181,13 @@ 
                         $_SESSION['user_id'],
                         'at_modification',
                         $_SESSION['login'],
-                        'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title']
+                        'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title']
                     );
                 }
             }
 
             // reload cache table
-            require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+            require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
             updateCacheTable('reload', $SETTINGS, null);
 
             echo (string) prepareExchangedData(
@@ -5256,7 +5256,7 @@ 
                     // get info
                     $dataSource = DB::queryfirstrow(
                         'SELECT label, id_tree
-                        FROM ' . prefixTable('items') . '
+                        FROM ' . prefixTable('items').'
                         WHERE id=%i',
                         $item_id
                     );
@@ -5344,7 +5344,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_id = filter_var($dataReceived['id'], FILTER_SANITIZE_NUMBER_INT);
@@ -5361,8 +5361,8 @@ 
                     $content = explode(',', filter_input(INPUT_POST, 'content', FILTER_SANITIZE_STRING));
                 }
                 // Variables
-                $dataAuthor = DB::queryfirstrow('SELECT email,login FROM ' . prefixTable('users') . ' WHERE id= ' . $content[1]);
-                $dataItem = DB::queryfirstrow('SELECT label, id_tree FROM ' . prefixTable('items') . ' WHERE id= ' . $content[0]);
+                $dataAuthor = DB::queryfirstrow('SELECT email,login FROM '.prefixTable('users').' WHERE id= '.$content[1]);
+                $dataItem = DB::queryfirstrow('SELECT label, id_tree FROM '.prefixTable('items').' WHERE id= '.$content[0]);
 
                 // Get path
                 $path = geItemReadablePath(
@@ -5376,7 +5376,7 @@ 
                         langHdl('email_request_access_subject'),
                         str_replace(
                             array('#tp_item_author#', '#tp_user#', '#tp_item#'),
-                            array(' ' . addslashes($dataAuthor['login']), addslashes($_SESSION['login']), $path),
+                            array(' '.addslashes($dataAuthor['login']), addslashes($_SESSION['login']), $path),
                             langHdl('email_request_access_mail')
                         ),
                         $dataAuthor['email'],
@@ -5387,7 +5387,7 @@ 
             } elseif ($post_cat === 'share_this_item') {
                 $dataItem = DB::queryfirstrow(
                     'SELECT label,id_tree
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE id= %i',
                     $post_id
                 );
@@ -5411,7 +5411,7 @@ 
                             ),
                             array(
                                 empty($SETTINGS['email_server_url']) === false ?
-                                    $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $post_id : $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $post_id,
+                                    $SETTINGS['email_server_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$post_id : $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$post_id,
                                 addslashes($_SESSION['login']),
                                 addslashes($path),
                             ),
@@ -5447,7 +5447,7 @@ 
             if (filter_input(INPUT_POST, 'notify_type', FILTER_SANITIZE_STRING) === 'on_show') {
                 // Check if values already exist
                 $data = DB::queryfirstrow(
-                    'SELECT notification FROM ' . prefixTable('items') . ' WHERE id = %i',
+                    'SELECT notification FROM '.prefixTable('items').' WHERE id = %i',
                     $post_item_id
                 );
                 $notifiedUsers = explode(';', $data['notification']);
@@ -5458,8 +5458,8 @@ 
                         prefixTable('items'),
                         array(
                             'notification' => empty($data['notification']) ?
-                                filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT) . ';'
-                                : $data['notification'] . filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT),
+                                filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT).';'
+                                : $data['notification'].filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT),
                         ),
                         'id=%i',
                         $post_item_id
@@ -5475,7 +5475,7 @@ 
                         array(
                             'notification' => empty($data['notification']) ?
                                 filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT)
-                                : $data['notification'] . ';' . filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT),
+                                : $data['notification'].';'.filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT),
                         ),
                         'id=%i',
                         $post_item_id
@@ -5492,18 +5492,18 @@ 
             if ($post_key !== $_SESSION['key']) {
                 $data = array('error' => 'key_is_wrong');
                 echo (string) prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$data, 'encode');
+    $SETTINGS['cpassman_dir'], $data, 'encode');
                 break;
             }
 
             // decrypt and retreive data in JSON format
             $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
             // Get all informations for this item
             $dataItem = DB::queryfirstrow(
                 'SELECT *
-                FROM ' . prefixTable('items') . ' as i
-                INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id)
+                FROM ' . prefixTable('items').' as i
+                INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id)
                 WHERE i.id=%i AND l.action = %s',
                 $dataReceived['item_id'],
                 'at_creation'
@@ -5534,21 +5534,21 @@ 
                 );
                 // Prepare new line
                 $data = DB::queryfirstrow(
-                    'SELECT * FROM ' . prefixTable('log_items') . ' WHERE id_item = %i ORDER BY date DESC',
+                    'SELECT * FROM '.prefixTable('log_items').' WHERE id_item = %i ORDER BY date DESC',
                     $dataReceived['item_id']
                 );
-                $historic = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $data['date']) . ' - ' . $_SESSION['login'] . ' - ' . langHdl($data['action']) . ' - ' . $data['raison'];
+                $historic = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $data['date']).' - '.$_SESSION['login'].' - '.langHdl($data['action']).' - '.$data['raison'];
                 // send back
                 $data = array(
                     'error' => '',
-                    'new_line' => '<br>' . addslashes($historic),
+                    'new_line' => '<br>'.addslashes($historic),
                 );
                 echo (string) prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$data, 'encode');
+    $SETTINGS['cpassman_dir'], $data, 'encode');
             } else {
                 $data = array('error' => 'something_wrong');
                 echo (string) prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$data, 'encode');
+    $SETTINGS['cpassman_dir'], $data, 'encode');
                 break;
             }
             break;
@@ -5577,7 +5577,7 @@ 
         */
         case 'is_item_changed':
             $data = DB::queryFirstRow(
-                'SELECT date FROM ' . prefixTable('log_items') . ' WHERE action = %s AND id_item = %i ORDER BY date DESC',
+                'SELECT date FROM '.prefixTable('log_items').' WHERE action = %s AND id_item = %i ORDER BY date DESC',
                 'at_modification',
                 $post_item_id
             );
@@ -5601,7 +5601,7 @@ 
             }
 
             // delete all existing old otv codes
-            $rows = DB::query('SELECT id FROM ' . prefixTable('otv') . ' WHERE timestamp < ' . (time() - $SETTINGS['otv_expiration_period'] * 86400));
+            $rows = DB::query('SELECT id FROM '.prefixTable('otv').' WHERE timestamp < '.(time() - $SETTINGS['otv_expiration_period'] * 86400));
             foreach ($rows as $record) {
                 DB::delete(prefixTable('otv'), 'id=%i', $record['id']);
             }
@@ -5623,8 +5623,8 @@ 
             // Should we log a password change?
             $itemQ = DB::queryFirstRow(
                 'SELECT s.share_key, i.pw
-                FROM ' . prefixTable('items') . ' AS i
-                INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (i.id = s.object_id)
+                FROM ' . prefixTable('items').' AS i
+                INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (i.id = s.object_id)
                 WHERE s.user_id = %i AND s.object_id = %i',
                 $_SESSION['user_id'],
                 $post_id
@@ -5674,7 +5674,7 @@ 
             if (isset($SETTINGS['otv_expiration_period']) === false) {
                 $SETTINGS['otv_expiration_period'] = 7;
             }
-            $url = $SETTINGS['cpassman_url'] . '/index.php?otv=true&' . http_build_query($otv_session);
+            $url = $SETTINGS['cpassman_url'].'/index.php?otv=true&'.http_build_query($otv_session);
             //$exp_date = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], time() + (intval($SETTINGS['otv_expiration_period']) * 86400));
 
             echo json_encode(
@@ -5713,8 +5713,8 @@ 
                 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status,
                 f.extension AS extension, 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 s.object_id = %i',
                 $_SESSION['user_id'],
                 $post_id
@@ -5736,7 +5736,7 @@ 
             //$fileName = basename($file_info['name'], '.'.$file_info['extension']);
 
             // prepare image info
-            $post_title = basename($file_info['name'], '.' . $file_info['extension']);
+            $post_title = basename($file_info['name'], '.'.$file_info['extension']);
             $post_title = isBase64($post_title) === true ?
                 base64_decode($post_title) : $post_title;
             $image_code = $file_info['file'];
@@ -5754,7 +5754,7 @@ 
     $SETTINGS['cpassman_dir'],
                 array(
                     'error' => false,
-                    'filename' => $post_title . '.' . $file_info['extension'],
+                    'filename' => $post_title.'.'.$file_info['extension'],
                     'file_type' => $file_info['type'],
                     'file_content' => $fileContent,
                 ),
@@ -5775,11 +5775,11 @@ 
 
             // get file info
             $result = DB::queryfirstrow(
-                'SELECT file FROM ' . prefixTable('files') . ' WHERE id=%i',
+                'SELECT file FROM '.prefixTable('files').' WHERE id=%i',
                 intval(substr(filter_input(INPUT_POST, 'uri', FILTER_SANITIZE_STRING), 1))
             );
 
-            fileDelete($SETTINGS['path_to_upload_folder'] . '/' . $result['file'] . filter_input(INPUT_POST, 'file_suffix', FILTER_SANITIZE_STRING), $SETTINGS);
+            fileDelete($SETTINGS['path_to_upload_folder'].'/'.$result['file'].filter_input(INPUT_POST, 'file_suffix', FILTER_SANITIZE_STRING), $SETTINGS);
 
             break;
 
@@ -5797,22 +5797,22 @@ 
 
             // decrypt and retreive data in JSON format
             $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
             // Prepare variables
             $label = htmlspecialchars_decode($dataReceived['label']);
             $idFolder = $dataReceived['idFolder'];
 
             // don't check if Personal Folder
-            $data = DB::queryFirstRow('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', $idFolder);
+            $data = DB::queryFirstRow('SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i', $idFolder);
             if ($data['title'] === $_SESSION['user_id']) {
                 // send data
-                echo '[{"duplicate" : "' . $duplicate . '" , error" : ""}]';
+                echo '[{"duplicate" : "'.$duplicate.'" , error" : ""}]';
             } else {
                 if (filter_input(INPUT_POST, 'option', FILTER_SANITIZE_STRING) === 'same_folder') {
                     // case unique folder
                     DB::query(
                         'SELECT label
-                        FROM ' . prefixTable('items') . '
+                        FROM ' . prefixTable('items').'
                         WHERE id_tree = %i AND label = %s',
                         $idFolder,
                         $label
@@ -5824,7 +5824,7 @@ 
                     $arrayPf = array();
                     if (empty($row['id']) === false) {
                         $rows = DB::query(
-                            'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i',
+                            'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i',
                             '1'
                         );
                         foreach ($rows as $record) {
@@ -5839,12 +5839,12 @@ 
                     $where->add('id_tree = %i', $idFolder);
                     $where->add('label = %s', $label);
                     if (empty($arrayPf) === false) {
-                        $where->add('id_tree NOT IN (' . implode(',', $arrayPf) . ')');
+                        $where->add('id_tree NOT IN ('.implode(',', $arrayPf).')');
                     }
 
                     DB::query(
                         'SELECT label
-                        FROM ' . prefixTable('items') . '
+                        FROM ' . prefixTable('items').'
                         WHERE %l',
                         $where
                     );
@@ -5856,7 +5856,7 @@ 
                 }
 
                 // send data
-                echo '[{"duplicate" : "' . $duplicate . '" , "error" : ""}]';
+                echo '[{"duplicate" : "'.$duplicate.'" , "error" : ""}]';
             }
             break;
 
@@ -5912,7 +5912,7 @@ 
             }
 
             //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');
             $tree->rebuild();
@@ -5963,7 +5963,7 @@ 
                             if (empty($arr_data['folders'][$inc]['path']) === true) {
                                 $arr_data['folders'][$inc]['path'] = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
                             } else {
-                                $arr_data['folders'][$inc]['path'] .= ' / ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
+                                $arr_data['folders'][$inc]['path'] .= ' / '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
                             }
                         }
 
@@ -5996,7 +5996,7 @@ 
             );
             // send data
             echo (string) prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$data, 'encode');
+    $SETTINGS['cpassman_dir'], $data, 'encode');
 
             break;
 
@@ -6031,8 +6031,8 @@ 
                     $rows_tmp = DB::query(
                         'SELECT c.id, c.title, c.level, c.type, c.masked, c.order, c.encrypted_data, c.role_visibility, c.is_mandatory,
                         f.id_category AS category_id
-                        FROM ' . prefixTable('categories_folders') . ' AS f
-                        INNER JOIN ' . prefixTable('categories') . ' AS c ON (f.id_category = c.parent_id)
+                        FROM ' . prefixTable('categories_folders').' AS f
+                        INNER JOIN ' . prefixTable('categories').' AS c ON (f.id_category = c.parent_id)
                         WHERE id_folder=%i',
                         $folder
                     );
@@ -6059,7 +6059,7 @@ 
                 $valTemp = '';
                 $data = DB::queryFirstRow(
                     'SELECT valeur
-                    FROM ' . prefixTable('misc') . '
+                    FROM ' . prefixTable('misc').'
                     WHERE type = %s AND intitule=%i',
                     'complex',
                     $folder
@@ -6076,14 +6076,14 @@ 
                 $valTemp = '';
                 $rows_tmp = DB::query(
                     'SELECT t.title
-                    FROM ' . prefixTable('roles_values') . ' as v
-                    INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id)
+                    FROM ' . prefixTable('roles_values').' as v
+                    INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id)
                     WHERE v.folder_id = %i
                     GROUP BY title',
                     $folder
                 );
                 foreach ($rows_tmp as $record) {
-                    $valTemp .= (empty($valTemp) === true ? '' : ' - ') . $record['title'];
+                    $valTemp .= (empty($valTemp) === true ? '' : ' - ').$record['title'];
                 }
                 $arr_data[$folder]['visibilityRoles'] = $valTemp;
             }
@@ -6094,7 +6094,7 @@ 
             );
             // send data
             echo (string) prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$data, 'encode');
+    $SETTINGS['cpassman_dir'], $data, 'encode');
 
             break;
 
@@ -6106,14 +6106,14 @@ 
             // Check KEY
             if ($post_key !== $_SESSION['key']) {
                 echo (string) prepareExchangedData(
-    $SETTINGS['cpassman_dir'],array('error' => 'ERR_KEY_NOT_CORRECT'), 'encode');
+    $SETTINGS['cpassman_dir'], array('error' => 'ERR_KEY_NOT_CORRECT'), 'encode');
                 break;
             }
 
             // get item info
             $dataItem = DB::queryFirstRow(
                 'SELECT *
-                FROM ' . prefixTable('items') . '
+                FROM ' . prefixTable('items').'
                 WHERE id=%i',
                 $post_item_id
             );
@@ -6123,8 +6123,8 @@ 
             $rows = DB::query(
                 'SELECT l.date as date, l.action as action, l.raison as raison,
                 u.login as login, u.avatar_thumb as avatar_thumb, u.name as name, u.lastname as lastname
-                FROM ' . prefixTable('log_items') . ' as l
-                LEFT JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id)
+                FROM ' . prefixTable('log_items').' as l
+                LEFT JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id)
                 WHERE id_item=%i AND action <> %s
                 ORDER BY date DESC',
                 $post_item_id,
@@ -6139,7 +6139,7 @@ 
                 
                 // imported via API
                 if (empty($record['login'])) {
-                    $record['login'] = langHdl('imported_via_api') . ' [' . $record['raison'] . ']';
+                    $record['login'] = langHdl('imported_via_api').' ['.$record['raison'].']';
                 }
 
                 if (
@@ -6150,13 +6150,13 @@ 
                 ) {
                     // Prepare avatar
                     if (isset($record['avatar_thumb']) && empty($record['avatar_thumb']) === false) {
-                        if (file_exists($SETTINGS['cpassman_dir'] . '/includes/avatars/' . $record['avatar_thumb'])) {
-                            $avatar = $SETTINGS['cpassman_url'] . '/includes/avatars/' . $record['avatar_thumb'];
+                        if (file_exists($SETTINGS['cpassman_dir'].'/includes/avatars/'.$record['avatar_thumb'])) {
+                            $avatar = $SETTINGS['cpassman_url'].'/includes/avatars/'.$record['avatar_thumb'];
                         } else {
-                            $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg';
+                            $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg';
                         }
                     } else {
-                        $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg';
+                        $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg';
                     }
 
                     // Prepare action
@@ -6173,19 +6173,19 @@ 
                         $action = langHdl($reason[0]);
                         if ($reason[0] === 'at_moved') {
                             $tmp = explode(' -> ', $reason[1]);
-                            $detail = langHdl('from') . ' <span class="font-weight-light">' . $tmp[0] . '</span> ' . langHdl('to') . ' <span class="font-weight-light">' . $tmp[1] . ' </span>';
+                            $detail = langHdl('from').' <span class="font-weight-light">'.$tmp[0].'</span> '.langHdl('to').' <span class="font-weight-light">'.$tmp[1].' </span>';
                         } elseif ($reason[0] === 'at_field') {
                             $tmp = explode(' => ', $reason[1]);
                             if (count($tmp) > 1) {
-                                $detail = '<b>' . trim($tmp[0]) . '</b> | ' . langHdl('previous_value') .
-                                    ': <span class="font-weight-light">' . trim($tmp[1]) . '</span>';
+                                $detail = '<b>'.trim($tmp[0]).'</b> | '.langHdl('previous_value').
+                                    ': <span class="font-weight-light">'.trim($tmp[1]).'</span>';
                             } else {
                                 $detail = trim($reason[1]);
                             }
                         } elseif (in_array($reason[0], array('at_restriction', 'at_email', 'at_login', 'at_label', 'at_url', 'at_tag')) === true) {
                             $tmp = explode(' => ', $reason[1]);
                             $detail = empty(trim($tmp[0])) === true ?
-                                langHdl('no_previous_value') : langHdl('previous_value') . ': <span class="font-weight-light">' . $tmp[0] . ' </span>';
+                                langHdl('no_previous_value') : langHdl('previous_value').': <span class="font-weight-light">'.$tmp[0].' </span>';
                         } elseif ($reason[0] === 'at_automatic_del') {
                             $detail = langHdl($reason[1]);
                         } elseif ($reason[0] === 'at_anyoneconmodify') {
@@ -6194,7 +6194,7 @@ 
                             $tmp = explode(':', $reason[1]);
                             $tmp = explode('.', $tmp[0]);
                             $detail = isBase64($tmp[0]) === true ?
-                                base64_decode($tmp[0]) . '.' . $tmp[1] : $tmp[0];
+                                base64_decode($tmp[0]).'.'.$tmp[1] : $tmp[0];
                         } elseif ($reason[0] === 'at_import') {
                             $detail = '';
                         } elseif (in_array($reason[0], array('csv', 'pdf')) === true) {
@@ -6213,8 +6213,8 @@ 
                         array(
                             'avatar' => $avatar,
                             'login' => $record['login'],
-                            'name' => $record['name'] . ' ' . $record['lastname'],
-                            'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']),
+                            'name' => $record['name'].' '.$record['lastname'],
+                            'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']),
                             'action' => $action,
                             'detail' => $detail,
                         )
@@ -6229,7 +6229,7 @@ 
             
             // send data
             echo (string) prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$data, 'encode');
+    $SETTINGS['cpassman_dir'], $data, 'encode');
 
             break;
 
@@ -6248,7 +6248,7 @@ 
             }
             // decrypt and retrieve data in JSON format
             $data_received = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // prepare variables
             $label = htmlspecialchars_decode($data_received['label'], ENT_QUOTES);
@@ -6298,18 +6298,18 @@ 
 
             // get some info to add to the notification email
             $resp_user = DB::queryfirstrow(
-                'SELECT login FROM ' . prefixTable('users') . ' WHERE id = %i',
+                'SELECT login FROM '.prefixTable('users').' WHERE id = %i',
                 $_SESSION['user_id']
             );
             $resp_folder = DB::queryfirstrow(
-                'SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i',
+                'SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i',
                 $folder
             );
 
             // notify Managers
             $rows = DB::query(
                 'SELECT email
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE `gestionnaire` = %i AND `email` IS NOT NULL',
                 1
             );
@@ -6341,14 +6341,14 @@ 
             // Get list of users
             $usersList = array();
             $usersString = '';
-            $rows = DB::query('SELECT id,login,email FROM ' . prefixTable('users') . ' ORDER BY login ASC');
+            $rows = DB::query('SELECT id,login,email FROM '.prefixTable('users').' ORDER BY login ASC');
             foreach ($rows as $record) {
                 $usersList[$record['login']] = array(
                     'id' => $record['id'],
                     'login' => $record['login'],
                     'email' => $record['email'],
                 );
-                $usersString .= $record['id'] . '#' . $record['login'] . ';';
+                $usersString .= $record['id'].'#'.$record['login'].';';
             }
 
             $data = array(
@@ -6358,7 +6358,7 @@ 
 
             // send data
             echo (string) prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$data, 'encode');
+    $SETTINGS['cpassman_dir'], $data, 'encode');
             break;
 
         case 'send_request_access':
@@ -6376,7 +6376,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_email_body = filter_var($dataReceived['email'], FILTER_SANITIZE_STRING);
@@ -6385,7 +6385,7 @@ 
             // Send email
             $dataItem = DB::queryfirstrow(
                 'SELECT label, id_tree
-                FROM ' . prefixTable('items') . '
+                FROM ' . prefixTable('items').'
                 WHERE id = %i',
                 $post_item_id
             );
@@ -6474,7 +6474,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_notification_status = (int) filter_var($dataReceived['notification_status'], FILTER_SANITIZE_NUMBER_INT);
@@ -6482,7 +6482,7 @@ 
 
             DB::query(
                 'SELECT *
-                FROM ' . prefixTable('notification') . '
+                FROM ' . prefixTable('notification').'
                 WHERE item_id = %i AND user_id = %i',
                 $post_item_id,
                 $_SESSION['user_id']
@@ -6519,7 +6519,7 @@ 
 
             // send data
             echo (string) prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$data, 'encode');
+    $SETTINGS['cpassman_dir'], $data, 'encode');
 
             break;
 
@@ -6542,7 +6542,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_item_id = (int) filter_var($dataReceived['item_id'], FILTER_SANITIZE_NUMBER_INT);
@@ -6551,7 +6551,7 @@ 
             // And related logs
             $rows = DB::query(
                 'SELECT id, file AS filename
-                FROM ' . prefixTable('files') . '
+                FROM ' . prefixTable('files').'
                 WHERE id_item = %i AND confirmed = %i',
                 $post_item_id,
                 0
@@ -6565,12 +6565,12 @@ 
                 );
 
                 // Delete file on server
-                unlink($SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($file['filename']));
+                unlink($SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($file['filename']));
 
                 // Delete related logs
                 $logFile = DB::query(
                     'SELECT increment_id, raison
-                    FROM ' . prefixTable('log_items') . '
+                    FROM ' . prefixTable('log_items').'
                     WHERE id_item = %i AND id_user = %i AND action = %s AND raison LIKE "at_add_file :%"',
                     $post_item_id,
                     $_SESSION['user_id'],
@@ -6595,7 +6595,7 @@ 
 
             // send data
             echo (string) prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$data, 'encode');
+    $SETTINGS['cpassman_dir'], $data, 'encode');
 
             break;
 
@@ -6618,7 +6618,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_item_id = (int) filter_var($dataReceived['item_id'], FILTER_SANITIZE_NUMBER_INT);
@@ -6626,7 +6626,7 @@ 
             // Confirm attachments
             $rows = DB::query(
                 'SELECT id, file AS filename
-                FROM ' . prefixTable('files') . '
+                FROM ' . prefixTable('files').'
                 WHERE id_item = %i AND confirmed = %i',
                 $post_item_id,
                 0
@@ -6649,7 +6649,7 @@ 
 
             // send data
             echo (string) prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$data, 'encode');
+    $SETTINGS['cpassman_dir'], $data, 'encode');
 
             break;
     }
@@ -6664,15 +6664,15 @@ 
         case 'autocomplete_tags':
             // Get a list off all existing TAGS
             $listOfTags = '';
-            $rows = DB::query('SELECT tag FROM ' . prefixTable('tags') . ' WHERE tag LIKE %ss GROUP BY tag', $get['term']);
+            $rows = DB::query('SELECT tag FROM '.prefixTable('tags').' WHERE tag LIKE %ss GROUP BY tag', $get['term']);
             foreach ($rows as $record) {
                 if (empty($listOfTags)) {
-                    $listOfTags = '"' . $record['tag'] . '"';
+                    $listOfTags = '"'.$record['tag'].'"';
                 } else {
-                    $listOfTags .= ', "' . $record['tag'] . '"';
+                    $listOfTags .= ', "'.$record['tag'].'"';
                 }
             }
-            echo '[' . $listOfTags . ']';
+            echo '['.$listOfTags.']';
             break;
     }
 }
@@ -6688,7 +6688,7 @@ 
 {
     $data = DB::queryFirstRow(
         'SELECT bloquer_creation, bloquer_modification, personal_folder
-        FROM ' . prefixTable('nested_tree') . ' WHERE id = %i',
+        FROM ' . prefixTable('nested_tree').' WHERE id = %i',
         $groupe
     );
     // Check if it's in a personal folder. If yes, then force complexity overhead.

sources/import.queries.php

Spacing +4 added lines, -4 removed lines

@@ -165,7 +165,7 @@ 
             $config->setIgnoreHeaderLine('true');
             // extract data from CSV file
             $interpreter = new Interpreter();
-            $interpreter->addObserver(function (array $row) use (&$valuesToImport) {
+            $interpreter->addObserver(function(array $row) use (&$valuesToImport) {
                 $valuesToImport[] = array(
                     'Label' => $row[0],
                     'Login' => $row[1],
@@ -308,7 +308,7 @@ 
 
         // Decrypt and retreive data in JSON format
         $post_items = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
         // Init post variable
         $post_folder = filter_input(INPUT_POST, 'folder', FILTER_SANITIZE_NUMBER_INT);
@@ -459,7 +459,7 @@ 
 
         // Decrypt and retreive data in JSON format
         $receivedParameters = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
         $post_folder_id = filter_var($receivedParameters['folder-id'], FILTER_SANITIZE_NUMBER_INT);
         $post_operation_id = filter_var($receivedParameters['file'], FILTER_SANITIZE_STRING);
@@ -1186,7 +1186,7 @@ 
         break;
 }
 
-spl_autoload_register(function ($class) {
+spl_autoload_register(function($class) {
     $prefix = 'League\\Csv\\';
     $base_dir = __DIR__.'/src/';
     $len = strlen($prefix);