nilsteampassnet / TeamPass

sources/main.functions.php

Spacing +282 added lines, -285 removed lines

@@ -33,7 +33,7 @@ 
 
 // Load config if $SETTINGS not defined
 if (isset($SETTINGS['cpassman_dir']) === false || empty($SETTINGS['cpassman_dir']) === true) {
-    include_once __DIR__ . '/../includes/config/tp.config.php';
+    include_once __DIR__.'/../includes/config/tp.config.php';
 }
 
 header('Content-type: text/html; charset=utf-8');
@@ -63,7 +63,7 @@ 
             and improve performance by avoiding to include the file for every missing strings.
         */
         if (isset($_SESSION['teampass']) === false || isset($_SESSION['teampass']['en_lang'][trim($string)]) === false) {
-            $_SESSION['teampass']['en_lang'] = include_once __DIR__. '/../includes/language/english.php';
+            $_SESSION['teampass']['en_lang'] = include_once __DIR__.'/../includes/language/english.php';
             $session_language = isset($_SESSION['teampass']['en_lang'][trim($string)]) === false ? '' : $_SESSION['teampass']['en_lang'][trim($string)];
         } else {
             $session_language = $_SESSION['teampass']['en_lang'][trim($string)];
@@ -122,20 +122,20 @@ 
     
     $path = __DIR__.'/../includes/libraries/Encryption/Encryption/';
 
-    include_once $path . 'Exception/CryptoException.php';
-    include_once $path . 'Exception/BadFormatException.php';
-    include_once $path . 'Exception/EnvironmentIsBrokenException.php';
-    include_once $path . 'Exception/IOException.php';
-    include_once $path . 'Exception/WrongKeyOrModifiedCiphertextException.php';
-    include_once $path . 'Crypto.php';
-    include_once $path . 'Encoding.php';
-    include_once $path . 'DerivedKeys.php';
-    include_once $path . 'Key.php';
-    include_once $path . 'KeyOrPassword.php';
-    include_once $path . 'File.php';
-    include_once $path . 'RuntimeTests.php';
-    include_once $path . 'KeyProtectedByPassword.php';
-    include_once $path . 'Core.php';
+    include_once $path.'Exception/CryptoException.php';
+    include_once $path.'Exception/BadFormatException.php';
+    include_once $path.'Exception/EnvironmentIsBrokenException.php';
+    include_once $path.'Exception/IOException.php';
+    include_once $path.'Exception/WrongKeyOrModifiedCiphertextException.php';
+    include_once $path.'Crypto.php';
+    include_once $path.'Encoding.php';
+    include_once $path.'DerivedKeys.php';
+    include_once $path.'Key.php';
+    include_once $path.'KeyOrPassword.php';
+    include_once $path.'File.php';
+    include_once $path.'RuntimeTests.php';
+    include_once $path.'KeyProtectedByPassword.php';
+    include_once $path.'Core.php';
     
     // convert KEY
     $key = \Defuse\Crypto\Key::loadFromAsciiSafeString($ascii_key);
@@ -180,20 +180,20 @@ 
         $path = '../includes/libraries/Encryption/Encryption/';
     }
 
-    include_once $path . 'Exception/CryptoException.php';
-    include_once $path . 'Exception/BadFormatException.php';
-    include_once $path . 'Exception/EnvironmentIsBrokenException.php';
-    include_once $path . 'Exception/IOException.php';
-    include_once $path . 'Exception/WrongKeyOrModifiedCiphertextException.php';
-    include_once $path . 'Crypto.php';
-    include_once $path . 'Encoding.php';
-    include_once $path . 'DerivedKeys.php';
-    include_once $path . 'Key.php';
-    include_once $path . 'KeyOrPassword.php';
-    include_once $path . 'File.php';
-    include_once $path . 'RuntimeTests.php';
-    include_once $path . 'KeyProtectedByPassword.php';
-    include_once $path . 'Core.php';
+    include_once $path.'Exception/CryptoException.php';
+    include_once $path.'Exception/BadFormatException.php';
+    include_once $path.'Exception/EnvironmentIsBrokenException.php';
+    include_once $path.'Exception/IOException.php';
+    include_once $path.'Exception/WrongKeyOrModifiedCiphertextException.php';
+    include_once $path.'Crypto.php';
+    include_once $path.'Encoding.php';
+    include_once $path.'DerivedKeys.php';
+    include_once $path.'Key.php';
+    include_once $path.'KeyOrPassword.php';
+    include_once $path.'File.php';
+    include_once $path.'RuntimeTests.php';
+    include_once $path.'KeyProtectedByPassword.php';
+    include_once $path.'Core.php';
 
     $key = \Defuse\Crypto\Key::createNewRandomKey();
     $key = $key->saveToAsciiSafeString();
@@ -218,20 +218,20 @@ 
         $path = '../includes/libraries/Encryption/Encryption/';
     }
 
-    include_once $path . 'Exception/CryptoException.php';
-    include_once $path . 'Exception/BadFormatException.php';
-    include_once $path . 'Exception/EnvironmentIsBrokenException.php';
-    include_once $path . 'Exception/IOException.php';
-    include_once $path . 'Exception/WrongKeyOrModifiedCiphertextException.php';
-    include_once $path . 'Crypto.php';
-    include_once $path . 'Encoding.php';
-    include_once $path . 'DerivedKeys.php';
-    include_once $path . 'Key.php';
-    include_once $path . 'KeyOrPassword.php';
-    include_once $path . 'File.php';
-    include_once $path . 'RuntimeTests.php';
-    include_once $path . 'KeyProtectedByPassword.php';
-    include_once $path . 'Core.php';
+    include_once $path.'Exception/CryptoException.php';
+    include_once $path.'Exception/BadFormatException.php';
+    include_once $path.'Exception/EnvironmentIsBrokenException.php';
+    include_once $path.'Exception/IOException.php';
+    include_once $path.'Exception/WrongKeyOrModifiedCiphertextException.php';
+    include_once $path.'Crypto.php';
+    include_once $path.'Encoding.php';
+    include_once $path.'DerivedKeys.php';
+    include_once $path.'Key.php';
+    include_once $path.'KeyOrPassword.php';
+    include_once $path.'File.php';
+    include_once $path.'RuntimeTests.php';
+    include_once $path.'KeyProtectedByPassword.php';
+    include_once $path.'Core.php';
     
     $protected_key = \Defuse\Crypto\KeyProtectedByPassword::createRandomPasswordProtectedKey($psk);
     return $protected_key->saveToAsciiSafeString(); // save this in user table
@@ -256,20 +256,20 @@ 
         $path = '../includes/libraries/Encryption/Encryption/';
     }
 
-    include_once $path . 'Exception/CryptoException.php';
-    include_once $path . 'Exception/BadFormatException.php';
-    include_once $path . 'Exception/EnvironmentIsBrokenException.php';
-    include_once $path . 'Exception/IOException.php';
-    include_once $path . 'Exception/WrongKeyOrModifiedCiphertextException.php';
-    include_once $path . 'Crypto.php';
-    include_once $path . 'Encoding.php';
-    include_once $path . 'DerivedKeys.php';
-    include_once $path . 'Key.php';
-    include_once $path . 'KeyOrPassword.php';
-    include_once $path . 'File.php';
-    include_once $path . 'RuntimeTests.php';
-    include_once $path . 'KeyProtectedByPassword.php';
-    include_once $path . 'Core.php';
+    include_once $path.'Exception/CryptoException.php';
+    include_once $path.'Exception/BadFormatException.php';
+    include_once $path.'Exception/EnvironmentIsBrokenException.php';
+    include_once $path.'Exception/IOException.php';
+    include_once $path.'Exception/WrongKeyOrModifiedCiphertextException.php';
+    include_once $path.'Crypto.php';
+    include_once $path.'Encoding.php';
+    include_once $path.'DerivedKeys.php';
+    include_once $path.'Key.php';
+    include_once $path.'KeyOrPassword.php';
+    include_once $path.'File.php';
+    include_once $path.'RuntimeTests.php';
+    include_once $path.'KeyProtectedByPassword.php';
+    include_once $path.'Core.php';
 
     try {
         $protected_key_encoded = \Defuse\Crypto\KeyProtectedByPassword::loadFromAsciiSafeString($protected_key_encoded);
@@ -311,7 +311,7 @@ 
  */
 function trimElement($chaine, string $element): string
 {
-    if (! empty($chaine)) {
+    if (!empty($chaine)) {
         if (is_array($chaine) === true) {
             $chaine = implode(';', $chaine);
         }
@@ -359,8 +359,8 @@ 
  */
 function db_error_handler(array $params): void
 {
-    echo 'Error: ' . $params['error'] . "<br>\n";
-    echo 'Query: ' . $params['query'] . "<br>\n";
+    echo 'Error: '.$params['error']."<br>\n";
+    echo 'Query: '.$params['query']."<br>\n";
     throw new Exception('Error - Query', 1);
 }
 
@@ -382,12 +382,12 @@ 
     $SETTINGS
 ) {
     //load ClassLoader
-    include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
+    include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
     // Load superglobal
-    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();
     //Connect to DB
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+    include_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));
     }
@@ -400,7 +400,7 @@ 
     DB::$ssl = DB_SSL;
     DB::$connect_options = DB_CONNECT_OPTIONS;
     //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');
 
@@ -445,7 +445,7 @@ 
 function identAdmin($idFonctions, $SETTINGS, $tree)
 {
     // Load superglobal
-    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();
     // Init
     $groupesVisibles = [];
@@ -464,7 +464,7 @@ 
     $globalsVisibleFolders = $superGlobal->get('groupes_visibles', 'SESSION');
     $globalsPersonalVisibleFolders = $superGlobal->get('personal_visible_groups', 'SESSION');
     // Get list of Folders
-    $rows = DB::query('SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', 0);
+    $rows = DB::query('SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', 0);
     foreach ($rows as $record) {
         array_push($groupesVisibles, $record['id']);
     }
@@ -483,7 +483,7 @@ 
     }
     // Get ID of personal folder
     $persfld = DB::queryfirstrow(
-        'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE title = %s',
+        'SELECT id FROM '.prefixTable('nested_tree').' WHERE title = %s',
         $globalsUserId
     );
     if (empty($persfld['id']) === false) {
@@ -504,20 +504,20 @@ 
     // get complete list of ROLES
     $tmp = explode(';', $idFonctions);
     $rows = DB::query(
-        'SELECT * FROM ' . prefixTable('roles_title') . '
+        'SELECT * FROM '.prefixTable('roles_title').'
         ORDER BY title ASC'
     );
     foreach ($rows as $record) {
-        if (! empty($record['id']) && ! in_array($record['id'], $tmp)) {
+        if (!empty($record['id']) && !in_array($record['id'], $tmp)) {
             array_push($tmp, $record['id']);
         }
     }
     $superGlobal->put('fonction_id', implode(';', $tmp), 'SESSION');
     $superGlobal->put('is_admin', 1, 'SESSION');
     // Check if admin has created Folders and Roles
-    DB::query('SELECT * FROM ' . prefixTable('nested_tree') . '');
+    DB::query('SELECT * FROM '.prefixTable('nested_tree').'');
     $superGlobal->put('nb_folders', DB::count(), 'SESSION');
-    DB::query('SELECT * FROM ' . prefixTable('roles_title'));
+    DB::query('SELECT * FROM '.prefixTable('roles_title'));
     $superGlobal->put('nb_roles', DB::count(), 'SESSION');
 
     return true;
@@ -563,7 +563,7 @@ 
     object $tree
 ) {
     // Load superglobal
-    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();
     // Init
     $superGlobal->put('groupes_visibles', [], 'SESSION');
@@ -602,7 +602,7 @@ 
     // Does this user is allowed to see other items
     $inc = 0;
     $rows = DB::query(
-        'SELECT id, id_tree FROM ' . prefixTable('items') . '
+        'SELECT id, id_tree FROM '.prefixTable('items').'
             WHERE restricted_to LIKE %ss AND inactif = %s'.
             (count($allowedFolders) > 0 ? ' AND id_tree NOT IN ('.implode(',', $allowedFolders).')' : ''),
         $globalsUserId,
@@ -619,8 +619,8 @@ 
     // Check for the users roles if some specific rights exist on items
     $rows = DB::query(
         'SELECT i.id_tree, r.item_id
-        FROM ' . prefixTable('items') . ' as i
-        INNER JOIN ' . prefixTable('restriction_to_roles') . ' as r ON (r.item_id=i.id)
+        FROM ' . prefixTable('items').' as i
+        INNER JOIN ' . prefixTable('restriction_to_roles').' as r ON (r.item_id=i.id)
         WHERE i.id_tree <> "" '.
         (count($userRoles) > 0 ? 'AND r.role_id IN %li ' : '').
         'ORDER BY i.id_tree ASC',
@@ -675,16 +675,16 @@ 
         'SESSION'
     );
     // Folders and Roles numbers
-    DB::queryfirstrow('SELECT id FROM ' . prefixTable('nested_tree') . '');
+    DB::queryfirstrow('SELECT id FROM '.prefixTable('nested_tree').'');
     $superGlobal->put('nb_folders', DB::count(), 'SESSION');
-    DB::queryfirstrow('SELECT id FROM ' . prefixTable('roles_title'));
+    DB::queryfirstrow('SELECT id FROM '.prefixTable('roles_title'));
     $superGlobal->put('nb_roles', DB::count(), 'SESSION');
     // check if change proposals on User's items
     if (isset($SETTINGS['enable_suggestion']) === true && (int) $SETTINGS['enable_suggestion'] === 1) {
         $countNewItems = DB::query(
             'SELECT COUNT(*)
-            FROM ' . prefixTable('items_change') . ' AS c
-            LEFT JOIN ' . prefixTable('log_items') . ' AS i ON (c.item_id = i.id_item)
+            FROM ' . prefixTable('items_change').' AS c
+            LEFT JOIN ' . prefixTable('log_items').' AS i ON (c.item_id = i.id_item)
             WHERE i.action = %s AND i.id_user = %i',
             'at_creation',
             $globalsUserId
@@ -711,7 +711,7 @@ 
 {
     $rows = DB::query(
         'SELECT *
-        FROM ' . prefixTable('roles_values') . '
+        FROM ' . prefixTable('roles_values').'
         WHERE type IN %ls'.(count($userRoles) > 0 ? ' AND role_id IN %li' : ''),
         ['W', 'ND', 'NE', 'NDNE', 'R'],
         $userRoles,
@@ -778,7 +778,7 @@ 
     ) {
         $persoFld = DB::queryfirstrow(
             'SELECT id
-            FROM ' . prefixTable('nested_tree') . '
+            FROM ' . prefixTable('nested_tree').'
             WHERE title = %s AND personal_folder = %i'.
             (count($allowedFolders) > 0 ? ' AND id NOT IN ('.implode(',', $allowedFolders).')' : ''),
             $globalsUserId,
@@ -811,7 +811,7 @@ 
     }
     $persoFlds = DB::query(
         'SELECT id
-        FROM ' . prefixTable('nested_tree') . '
+        FROM ' . prefixTable('nested_tree').'
         WHERE %l',
         $where
     );
@@ -875,9 +875,9 @@ 
  */
 function cacheTableRefresh(array $SETTINGS): void
 {
-    include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
+    include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
     //Connect to DB
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+    include_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));
     }
@@ -890,16 +890,16 @@ 
     DB::$ssl = DB_SSL;
     DB::$connect_options = DB_CONNECT_OPTIONS;
     //Load 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');
     // truncate table
-    DB::query('TRUNCATE TABLE ' . prefixTable('cache'));
+    DB::query('TRUNCATE TABLE '.prefixTable('cache'));
     // reload date
     $rows = DB::query(
         '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)
         AND l.action = %s
         AND i.inactif = %i',
         'at_creation',
@@ -911,18 +911,18 @@ 
             $tags = '';
             $itemTags = DB::query(
                 'SELECT tag
-                FROM ' . prefixTable('tags') . '
+                FROM ' . prefixTable('tags').'
                 WHERE item_id = %i AND tag != ""',
                 $record['id']
             );
             foreach ($itemTags as $itemTag) {
-                $tags .= $itemTag['tag'] . ' ';
+                $tags .= $itemTag['tag'].' ';
             }
 
             // Get renewal period
             $resNT = DB::queryfirstrow(
                 'SELECT renewal_period
-                FROM ' . prefixTable('nested_tree') . '
+                FROM ' . prefixTable('nested_tree').'
                 WHERE id = %i',
                 $record['id_tree']
             );
@@ -935,7 +935,7 @@ 
                     // Is this a User id?
                     $user = DB::queryfirstrow(
                         'SELECT id, login
-                        FROM ' . prefixTable('users') . '
+                        FROM ' . prefixTable('users').'
                         WHERE id = %i',
                         $elem->title
                     );
@@ -953,11 +953,11 @@ 
                     'id' => $record['id'],
                     'label' => $record['label'],
                     'description' => $record['description'] ?? '',
-                    'url' => isset($record['url']) && ! empty($record['url']) ? $record['url'] : '0',
+                    'url' => isset($record['url']) && !empty($record['url']) ? $record['url'] : '0',
                     'tags' => $tags,
                     'id_tree' => $record['id_tree'],
                     'perso' => $record['perso'],
-                    'restricted_to' => isset($record['restricted_to']) && ! empty($record['restricted_to']) ? $record['restricted_to'] : '0',
+                    'restricted_to' => isset($record['restricted_to']) && !empty($record['restricted_to']) ? $record['restricted_to'] : '0',
                     'login' => $record['login'] ?? '',
                     'folder' => implode(' > ', $folder),
                     'author' => $record['id_user'],
@@ -979,12 +979,12 @@ 
  */
 function cacheTableUpdate(array $SETTINGS, ?int $ident = null): void
 {
-    include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
+    include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
     // Load superglobal
-    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();
     //Connect to DB
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+    include_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));
     }
@@ -1003,7 +1003,7 @@ 
     // get new value from db
     $data = DB::queryfirstrow(
         'SELECT label, description, id_tree, perso, restricted_to, login, url
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE id=%i',
         $ident
     );
@@ -1011,12 +1011,12 @@ 
     $tags = '';
     $itemTags = DB::query(
         'SELECT tag
-            FROM ' . prefixTable('tags') . '
+            FROM ' . prefixTable('tags').'
             WHERE item_id = %i AND tag != ""',
         $ident
     );
     foreach ($itemTags as $itemTag) {
-        $tags .= $itemTag['tag'] . ' ';
+        $tags .= $itemTag['tag'].' ';
     }
     // form id_tree to full foldername
     $folder = [];
@@ -1027,7 +1027,7 @@ 
             // Is this a User id?
             $user = DB::queryfirstrow(
                 'SELECT id, login
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $elem->title
             );
@@ -1045,10 +1045,10 @@ 
             'label' => $data['label'],
             'description' => $data['description'],
             'tags' => $tags,
-            'url' => isset($data['url']) && ! empty($data['url']) ? $data['url'] : '0',
+            'url' => isset($data['url']) && !empty($data['url']) ? $data['url'] : '0',
             'id_tree' => $data['id_tree'],
             'perso' => $data['perso'],
-            'restricted_to' => isset($data['restricted_to']) && ! empty($data['restricted_to']) ? $data['restricted_to'] : '0',
+            'restricted_to' => isset($data['restricted_to']) && !empty($data['restricted_to']) ? $data['restricted_to'] : '0',
             'login' => $data['login'] ?? '',
             'folder' => implode(' » ', $folder),
             'author' => $superGlobal->get('user_id', 'SESSION'),
@@ -1068,14 +1068,14 @@ 
  */
 function cacheTableAdd(array $SETTINGS, ?int $ident = null): void
 {
-    include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
+    include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
     // Load superglobal
-    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();
     // Get superglobals
     $globalsUserId = $superGlobal->get('user_id', 'SESSION');
     //Connect to DB
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+    include_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));
     }
@@ -1094,8 +1094,8 @@ 
     // get new value from db
     $data = DB::queryFirstRow(
         'SELECT i.label, i.description, i.id_tree as id_tree, i.perso, i.restricted_to, i.id, i.login, i.url, l.date
-        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',
         $ident,
@@ -1105,12 +1105,12 @@ 
     $tags = '';
     $itemTags = DB::query(
         'SELECT tag
-            FROM ' . prefixTable('tags') . '
+            FROM ' . prefixTable('tags').'
             WHERE item_id = %i AND tag != ""',
         $ident
     );
     foreach ($itemTags as $itemTag) {
-        $tags .= $itemTag['tag'] . ' ';
+        $tags .= $itemTag['tag'].' ';
     }
     // form id_tree to full foldername
     $folder = [];
@@ -1121,7 +1121,7 @@ 
             // Is this a User id?
             $user = DB::queryfirstrow(
                 'SELECT id, login
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $elem->title
             );
@@ -1140,7 +1140,7 @@ 
             'label' => $data['label'],
             'description' => $data['description'],
             'tags' => isset($tags) && empty($tags) === false ? $tags : 'None',
-            'url' => isset($data['url']) && ! empty($data['url']) ? $data['url'] : '0',
+            'url' => isset($data['url']) && !empty($data['url']) ? $data['url'] : '0',
             'id_tree' => $data['id_tree'],
             'perso' => isset($data['perso']) && empty($data['perso']) === false && $data['perso'] !== 'None' ? $data['perso'] : '0',
             'restricted_to' => isset($data['restricted_to']) && empty($data['restricted_to']) === false ? $data['restricted_to'] : '0',
@@ -1162,52 +1162,52 @@ 
 function getStatisticsData(array $SETTINGS): array
 {
     DB::query(
-        'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i',
+        'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i',
         0
     );
     $counter_folders = DB::count();
     DB::query(
-        'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i',
+        'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i',
         1
     );
     $counter_folders_perso = DB::count();
     DB::query(
-        'SELECT id FROM ' . prefixTable('items') . ' WHERE perso = %i',
+        'SELECT id FROM '.prefixTable('items').' WHERE perso = %i',
         0
     );
     $counter_items = DB::count();
         DB::query(
-        'SELECT id FROM ' . prefixTable('items') . ' WHERE perso = %i',
+        'SELECT id FROM '.prefixTable('items').' WHERE perso = %i',
         1
     );
     $counter_items_perso = DB::count();
         DB::query(
-        'SELECT id FROM ' . prefixTable('users') . ''
+        'SELECT id FROM '.prefixTable('users').''
     );
     $counter_users = DB::count();
         DB::query(
-        'SELECT id FROM ' . prefixTable('users') . ' WHERE admin = %i',
+        'SELECT id FROM '.prefixTable('users').' WHERE admin = %i',
         1
     );
     $admins = DB::count();
     DB::query(
-        'SELECT id FROM ' . prefixTable('users') . ' WHERE gestionnaire = %i',
+        'SELECT id FROM '.prefixTable('users').' WHERE gestionnaire = %i',
         1
     );
     $managers = DB::count();
     DB::query(
-        'SELECT id FROM ' . prefixTable('users') . ' WHERE read_only = %i',
+        'SELECT id FROM '.prefixTable('users').' WHERE read_only = %i',
         1
     );
     $readOnly = DB::count();
     // list the languages
     $usedLang = [];
     $tp_languages = DB::query(
-        'SELECT name FROM ' . prefixTable('languages')
+        'SELECT name FROM '.prefixTable('languages')
     );
     foreach ($tp_languages as $tp_language) {
         DB::query(
-            'SELECT * FROM ' . prefixTable('users') . ' WHERE user_language = %s',
+            'SELECT * FROM '.prefixTable('users').' WHERE user_language = %s',
             $tp_language['name']
         );
         $usedLang[$tp_language['name']] = round((DB::count() * 100 / $counter_users), 0);
@@ -1216,12 +1216,12 @@ 
     // get list of ips
     $usedIp = [];
     $tp_ips = DB::query(
-        'SELECT user_ip FROM ' . prefixTable('users')
+        'SELECT user_ip FROM '.prefixTable('users')
     );
     foreach ($tp_ips as $ip) {
         if (array_key_exists($ip['user_ip'], $usedIp)) {
             $usedIp[$ip['user_ip']] += $usedIp[$ip['user_ip']];
-        } elseif (! empty($ip['user_ip']) && $ip['user_ip'] !== 'none') {
+        } elseif (!empty($ip['user_ip']) && $ip['user_ip'] !== 'none') {
             $usedIp[$ip['user_ip']] = 1;
         }
     }
@@ -1374,19 +1374,19 @@ 
     // Load settings
     //include_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
     // Load superglobal
-    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();
     // Get user language
-    include_once $SETTINGS['cpassman_dir'] . '/includes/language/' . (null !== $superGlobal->get('user_language', 'SESSION', 'user') ? $superGlobal->get('user_language', 'SESSION', 'user') : 'english') . '.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/language/'.(null !== $superGlobal->get('user_language', 'SESSION', 'user') ? $superGlobal->get('user_language', 'SESSION', 'user') : 'english').'.php';
     // Load library
-    include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
+    include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
     // load PHPMailer
-    $mail = new SplClassLoader('PHPMailer\PHPMailer', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+    $mail = new SplClassLoader('PHPMailer\PHPMailer', $SETTINGS['cpassman_dir'].'/includes/libraries');
     $mail->register();
     $mail = new PHPMailer\PHPMailer\PHPMailer(true);
 
     // send to user
-    $mail->setLanguage('en', $SETTINGS['cpassman_dir'] . '/includes/libraries/PHPMailer/PHPMailer/language/');
+    $mail->setLanguage('en', $SETTINGS['cpassman_dir'].'/includes/libraries/PHPMailer/PHPMailer/language/');
     $mail->SMTPDebug = isset($SETTINGS['email_debug_level']) === true && $cron === false && $silent === false ? $SETTINGS['email_debug_level'] : 0;
     $mail->Port = (int) $SETTINGS['email_port'];
     //COULD BE USED
@@ -1476,7 +1476,7 @@ 
         <table width="600" cellpadding="0" cellspacing="0" border="0" class="container" bgcolor="#ffffff" style="border-spacing: 0; border-bottom: 1px solid #e0e0e0; box-shadow: 0 0 3px #ddd; color: #434343; font-family: Helvetica, Verdana, sans-serif;">
         <tr><td class="container-padding" bgcolor="#ffffff" style="border-collapse: collapse; border-left: 1px solid #e0e0e0; background-color: #ffffff; padding-left: 30px; padding-right: 30px;">
         <br><div style="float:right;">' .
-        $textMail .
+        $textMail.
         '<br><br></td></tr></table>
     </td></tr></table>
     <br></body></html>';
@@ -1489,7 +1489,7 @@ 
  */
 function generateKey(): string
 {
-    return substr(md5(rand() . rand()), 0, 15);
+    return substr(md5(rand().rand()), 0, 15);
 }
 
 /**
@@ -1567,7 +1567,7 @@ 
 {
     array_walk_recursive(
         $array,
-        static function (&$item): void {
+        static function(&$item): void {
             if (mb_detect_encoding((string) $item, 'utf-8', true) === false) {
                 $item = utf8_encode($item);
             }
@@ -1588,9 +1588,9 @@ 
  */
 function prepareExchangedData($teampassDir, $data, string $type, ?string $key = null)
 {
-    $teampassDir = __DIR__ . '/..';
+    $teampassDir = __DIR__.'/..';
     // Load superglobal
-    include_once $teampassDir . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+    include_once $teampassDir.'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
     // Get superglobals
     if ($key !== null) {
@@ -1601,10 +1601,10 @@ 
     }
 
     //load Encoding
-    include_once $teampassDir . '/includes/libraries/ForceUTF8/Encoding.php';
+    include_once $teampassDir.'/includes/libraries/ForceUTF8/Encoding.php';
     
     //Load CRYPTOJS
-    include_once $teampassDir . '/includes/libraries/Encryption/CryptoJs/Encryption.php';
+    include_once $teampassDir.'/includes/libraries/Encryption/CryptoJs/Encryption.php';
 
     // Perform
     if ($type === 'encode' && is_array($data) === true) {
@@ -1676,8 +1676,8 @@ 
  */
 function prefixTable(string $table): string
 {
-    $safeTable = htmlspecialchars(DB_PREFIX . $table);
-    if (! empty($safeTable)) {
+    $safeTable = htmlspecialchars(DB_PREFIX.$table);
+    if (!empty($safeTable)) {
         // sanitize string
         return $safeTable;
     }
@@ -1707,13 +1707,13 @@ 
     bool $lowercase = false,
     array $SETTINGS = []
 ): string {
-    include_once __DIR__ . '/../sources/SplClassLoader.php';
-    $generator = new SplClassLoader('PasswordGenerator\Generator', __DIR__. '/../includes/libraries');
+    include_once __DIR__.'/../sources/SplClassLoader.php';
+    $generator = new SplClassLoader('PasswordGenerator\Generator', __DIR__.'/../includes/libraries');
     $generator->register();
     $generator = new PasswordGenerator\Generator\ComputerPasswordGenerator();
     // Is PHP7 being used?
     if (version_compare(PHP_VERSION, '7.0.0', '>=')) {
-        $php7generator = new SplClassLoader('PasswordGenerator\RandomGenerator', __DIR__ . '/../includes/libraries');
+        $php7generator = new SplClassLoader('PasswordGenerator\RandomGenerator', __DIR__.'/../includes/libraries');
         $php7generator->register();
         $generator->setRandomGenerator(new PasswordGenerator\RandomGenerator\Php7RandomGenerator());
     }
@@ -1748,7 +1748,7 @@ 
 function send_syslog($message, $host, $port, $component = 'teampass'): void
 {
     $sock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
-    $syslog_message = '<123>' . date('M d H:i:s ') . $component . ': ' . $message;
+    $syslog_message = '<123>'.date('M d H:i:s ').$component.': '.$message;
     socket_sendto($sock, (string) $syslog_message, strlen($syslog_message), 0, (string) $host, (int) $port);
     socket_close($sock);
 }
@@ -1779,7 +1779,7 @@ 
     }
 
     // include librairies & connect to DB
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+    include_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));
     }
@@ -1805,14 +1805,14 @@ 
     if (isset($SETTINGS['syslog_enable']) === true && (int) $SETTINGS['syslog_enable'] === 1) {
         if ($type === 'user_mngt') {
             send_syslog(
-                'action=' . str_replace('at_', '', $label) . ' attribute=user user=' . $who . ' userid="' . $login . '" change="' . $field_1 . '" ',
+                'action='.str_replace('at_', '', $label).' attribute=user user='.$who.' userid="'.$login.'" change="'.$field_1.'" ',
                 $SETTINGS['syslog_host'],
                 $SETTINGS['syslog_port'],
                 'teampass'
             );
         } else {
             send_syslog(
-                'action=' . $type . ' attribute=' . $label . ' user=' . $who . ' userid="' . $login . '" ',
+                'action='.$type.' attribute='.$label.' user='.$who.' userid="'.$login.'" ',
                 $SETTINGS['syslog_host'],
                 $SETTINGS['syslog_port'],
                 'teampass'
@@ -1850,7 +1850,7 @@ 
     ?string $old_value = null
 ): void {
     // include librairies & connect to DB
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+    include_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));
     }
@@ -1896,7 +1896,7 @@ 
         if (empty($item_label) === true) {
             $dataItem = DB::queryfirstrow(
                 'SELECT id, id_tree, label
-                FROM ' . prefixTable('items') . '
+                FROM ' . prefixTable('items').'
                 WHERE id = %i',
                 $item_id
             );
@@ -1904,11 +1904,11 @@ 
         }
 
         send_syslog(
-            'action=' . str_replace('at_', '', $action) .
-                ' attribute=' . str_replace('at_', '', $attribute[0]) .
-                ' itemno=' . $item_id .
-                ' user=' . is_null($login) === true ? '' : addslashes((string) $login) .
-                ' itemname="' . addslashes($item_label) . '"',
+            'action='.str_replace('at_', '', $action).
+                ' attribute='.str_replace('at_', '', $attribute[0]).
+                ' itemno='.$item_id.
+                ' user='.is_null($login) === true ? '' : addslashes((string) $login).
+                ' itemname="'.addslashes($item_label).'"',
             $SETTINGS['syslog_host'],
             $SETTINGS['syslog_port'],
             'teampass'
@@ -1987,7 +1987,7 @@ 
 function notifyChangesToSubscribers(int $item_id, string $label, array $changes, array $SETTINGS): void
 {
     // Load superglobal
-    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();
     // Get superglobals
     $globalsUserId = $superGlobal->get('user_id', 'SESSION');
@@ -1997,8 +1997,8 @@ 
     $notification = DB::queryOneColumn(
         'email',
         'SELECT *
-        FROM ' . prefixTable('notification') . ' AS n
-        INNER JOIN ' . prefixTable('users') . ' AS u ON (n.user_id = u.id)
+        FROM ' . prefixTable('notification').' AS n
+        INNER JOIN ' . prefixTable('users').' AS u ON (n.user_id = u.id)
         WHERE n.item_id = %i AND n.user_id != %i',
         $item_id,
         $globalsUserId
@@ -2009,7 +2009,7 @@ 
         // Get list of changes
         $htmlChanges = '<ul>';
         foreach ($changes as $change) {
-            $htmlChanges .= '<li>' . $change . '</li>';
+            $htmlChanges .= '<li>'.$change.'</li>';
         }
         $htmlChanges .= '</ul>';
         // send email
@@ -2042,7 +2042,7 @@ 
 function geItemReadablePath(int $id_tree, string $label, array $SETTINGS): string
 {
     // Class loader
-    include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
+    include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
     //Load Tree
     $tree = new SplClassLoader('Tree\NestedTree', '../includes/libraries');
     $tree->register();
@@ -2051,15 +2051,15 @@ 
     $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($label) === false) {
-        return empty($path) === true ? addslashes($label) : addslashes($label) . ' (' . $path . ')';
+        return empty($path) === true ? addslashes($label) : addslashes($label).' ('.$path.')';
     }
     return empty($path) === true ? '' : $path;
 }
@@ -2116,9 +2116,9 @@ 
  */
 function handleConfigFile($action, $SETTINGS, $field = null, $value = null)
 {
-    $tp_config_file = $SETTINGS['cpassman_dir'] . '/includes/config/tp.config.php';
+    $tp_config_file = $SETTINGS['cpassman_dir'].'/includes/config/tp.config.php';
     // include librairies & connect to DB
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+    include_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));
     }
@@ -2133,8 +2133,8 @@ 
     if (file_exists($tp_config_file) === false || $action === 'rebuild') {
         // perform a copy
         if (file_exists($tp_config_file)) {
-            if (! copy($tp_config_file, $tp_config_file . '.' . date('Y_m_d_His', time()))) {
-                return "ERROR: Could not copy file '" . $tp_config_file . "'";
+            if (!copy($tp_config_file, $tp_config_file.'.'.date('Y_m_d_His', time()))) {
+                return "ERROR: Could not copy file '".$tp_config_file."'";
             }
         }
 
@@ -2144,11 +2144,11 @@ 
         $data[1] = "global \$SETTINGS;\n";
         $data[2] = "\$SETTINGS = array (\n";
         $rows = DB::query(
-            'SELECT * FROM ' . prefixTable('misc') . ' WHERE type=%s',
+            'SELECT * FROM '.prefixTable('misc').' WHERE type=%s',
             'admin'
         );
         foreach ($rows as $record) {
-            array_push($data, "    '" . $record['intitule'] . "' => '" . htmlspecialchars_decode($record['valeur'], ENT_COMPAT) . "',\n");
+            array_push($data, "    '".$record['intitule']."' => '".htmlspecialchars_decode($record['valeur'], ENT_COMPAT)."',\n");
         }
         array_push($data, ");\n");
         $data = array_unique($data);
@@ -2162,15 +2162,15 @@ 
                 break;
             }
 
-            if (stristr($line, "'" . $field . "' => '")) {
-                $data[$inc] = "    '" . $field . "' => '" . htmlspecialchars_decode($value, ENT_COMPAT) . "',\n";
+            if (stristr($line, "'".$field."' => '")) {
+                $data[$inc] = "    '".$field."' => '".htmlspecialchars_decode($value, ENT_COMPAT)."',\n";
                 $bFound = true;
                 break;
             }
             ++$inc;
         }
         if ($bFound === false) {
-            $data[$inc] = "    '" . $field . "' => '" . htmlspecialchars_decode($value, ENT_COMPAT). "',\n);\n";
+            $data[$inc] = "    '".$field."' => '".htmlspecialchars_decode($value, ENT_COMPAT)."',\n);\n";
         }
     }
 
@@ -2200,7 +2200,7 @@ 
 {
     global $SETTINGS;
     /* LOAD CPASSMAN SETTINGS */
-    if (! isset($SETTINGS['loaded']) || $SETTINGS['loaded'] !== 1) {
+    if (!isset($SETTINGS['loaded']) || $SETTINGS['loaded'] !== 1) {
         $SETTINGS = [];
         $SETTINGS['duplicate_folder'] = 0;
         //by default, this is set to 0;
@@ -2210,7 +2210,7 @@ 
         //by default, this value is set to 5;
         $settings = [];
         $rows = DB::query(
-            'SELECT * FROM ' . prefixTable('misc') . ' WHERE type=%s_type OR type=%s_type2',
+            'SELECT * FROM '.prefixTable('misc').' WHERE type=%s_type OR type=%s_type2',
             [
                 'type' => 'admin',
                 'type2' => 'settings',
@@ -2242,7 +2242,7 @@ 
     $source_cf = [];
     $rows = DB::QUERY(
         'SELECT id_category
-            FROM ' . prefixTable('categories_folders') . '
+            FROM ' . prefixTable('categories_folders').'
             WHERE id_folder = %i',
         $source_id
     );
@@ -2253,7 +2253,7 @@ 
     $target_cf = [];
     $rows = DB::QUERY(
         'SELECT id_category
-            FROM ' . prefixTable('categories_folders') . '
+            FROM ' . prefixTable('categories_folders').'
             WHERE id_folder = %i',
         $target_id
     );
@@ -2288,9 +2288,9 @@ 
     string $password = null
 ) {
     // Load AntiXSS
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/portable-ascii-master/src/voku/helper/ASCII.php';
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/portable-utf8-master/src/voku/helper/UTF8.php';
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/anti-xss-master/src/voku/helper/AntiXSS.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/portable-ascii-master/src/voku/helper/ASCII.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/portable-utf8-master/src/voku/helper/UTF8.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/anti-xss-master/src/voku/helper/AntiXSS.php';
     $antiXss = new voku\helper\AntiXSS();
     // Protect against bad inputs
     if (is_array($source_file) === true || is_array($target_file) === true) {
@@ -2347,20 +2347,20 @@ 
 ) {
     // load PhpEncryption library
     $path_to_encryption = '/includes/libraries/Encryption/Encryption/';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Exception/CryptoException.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Exception/BadFormatException.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Exception/IOException.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Exception/EnvironmentIsBrokenException.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Exception/WrongKeyOrModifiedCiphertextException.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Crypto.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Encoding.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'DerivedKeys.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Key.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'KeyOrPassword.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'File.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'RuntimeTests.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'KeyProtectedByPassword.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Core.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Exception/CryptoException.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Exception/BadFormatException.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Exception/IOException.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Exception/EnvironmentIsBrokenException.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Exception/WrongKeyOrModifiedCiphertextException.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Crypto.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Encoding.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'DerivedKeys.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Key.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'KeyOrPassword.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'File.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'RuntimeTests.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'KeyProtectedByPassword.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Core.php';
     try {
         \Defuse\Crypto\File::encryptFileWithPassword(
             $source_file,
@@ -2397,20 +2397,20 @@ 
 ) {
     // load PhpEncryption library
     $path_to_encryption = '/includes/libraries/Encryption/Encryption/';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Exception/CryptoException.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Exception/BadFormatException.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Exception/IOException.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Exception/EnvironmentIsBrokenException.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Exception/WrongKeyOrModifiedCiphertextException.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Crypto.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Encoding.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'DerivedKeys.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Key.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'KeyOrPassword.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'File.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'RuntimeTests.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'KeyProtectedByPassword.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Core.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Exception/CryptoException.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Exception/BadFormatException.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Exception/IOException.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Exception/EnvironmentIsBrokenException.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Exception/WrongKeyOrModifiedCiphertextException.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Crypto.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Encoding.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'DerivedKeys.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Key.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'KeyOrPassword.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'File.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'RuntimeTests.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'KeyProtectedByPassword.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Core.php';
     try {
         \Defuse\Crypto\File::decryptFileWithPassword(
             $source_file,
@@ -2457,9 +2457,9 @@ 
 function fileDelete(string $file, array $SETTINGS): void
 {
     // Load AntiXSS
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/portable-ascii-master/src/voku/helper/ASCII.php';
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/portable-utf8-master/src/voku/helper/UTF8.php';
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/anti-xss-master/src/voku/helper/AntiXSS.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/portable-ascii-master/src/voku/helper/ASCII.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/portable-utf8-master/src/voku/helper/UTF8.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/anti-xss-master/src/voku/helper/AntiXSS.php';
     $antiXss = new voku\helper\AntiXSS();
     $file = $antiXss->xss_clean($file);
     if (is_file($file)) {
@@ -2509,7 +2509,7 @@ 
     int  $dirPerm = 0755
 ) {
     // Check if the path exists
-    if (! file_exists($path)) {
+    if (!file_exists($path)) {
         return false;
     }
 
@@ -2547,7 +2547,7 @@ 
  */
 function accessToItemIsGranted(int $item_id, array $SETTINGS)
 {
-    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
     $session_groupes_visibles = $superGlobal->get('groupes_visibles', 'SESSION');
@@ -2555,7 +2555,7 @@ 
     // Load item data
     $data = DB::queryFirstRow(
         'SELECT id_tree
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE id = %i',
         $item_id
     );
@@ -2618,7 +2618,7 @@ 
         }
         $host .= substr(explode(".", $email[1])[0], -1, 1);
     }
-    $email = $name . "@" . $host . "." . explode(".", $email[1])[1];
+    $email = $name."@".$host.".".explode(".", $email[1])[1];
     return $email;
 }
 
@@ -2634,8 +2634,8 @@ 
 function performDBQuery(array $SETTINGS, string $fields, string $table): array
 {
     // include librairies & connect to DB
-    include_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
+    include_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));
     }
@@ -2649,7 +2649,7 @@ 
     DB::$connect_options = DB_CONNECT_OPTIONS;
     // Insert log in DB
     return DB::query(
-        'SELECT ' . $fields . '
+        'SELECT '.$fields.'
         FROM ' . prefixTable($table)
     );
 }
@@ -2664,11 +2664,11 @@ 
 function formatSizeUnits(int $bytes): string
 {
     if ($bytes >= 1073741824) {
-        $bytes = number_format($bytes / 1073741824, 2) . ' GB';
+        $bytes = number_format($bytes / 1073741824, 2).' GB';
     } elseif ($bytes >= 1048576) {
-        $bytes = number_format($bytes / 1048576, 2) . ' MB';
+        $bytes = number_format($bytes / 1048576, 2).' MB';
     } elseif ($bytes >= 1024) {
-        $bytes = number_format($bytes / 1024, 2) . ' KB';
+        $bytes = number_format($bytes / 1024, 2).' KB';
     } elseif ($bytes > 1) {
         $bytes .= ' bytes';
     } elseif ($bytes === 1) {
@@ -2883,14 +2883,14 @@ 
 
     // Encrypt the file content
     $plaintext = file_get_contents(
-        filter_var($fileInPath . '/' . $fileInName, FILTER_SANITIZE_URL)
+        filter_var($fileInPath.'/'.$fileInName, FILTER_SANITIZE_URL)
     );
     $ciphertext = $cipher->encrypt($plaintext);
     // Save new file
     $hash = md5($plaintext);
-    $fileOut = $fileInPath . '/' . TP_FILE_PREFIX . $hash;
+    $fileOut = $fileInPath.'/'.TP_FILE_PREFIX.$hash;
     file_put_contents($fileOut, $ciphertext);
-    unlink($fileInPath . '/' . $fileInName);
+    unlink($fileInPath.'/'.$fileInName);
     return [
         'fileHash' => base64_encode($hash),
         'objectKey' => base64_encode($objectKey),
@@ -2908,7 +2908,7 @@ 
  */
 function decryptFile(string $fileName, string $filePath, string $key): string
 {
-    if (! defined('FILE_BUFFER_SIZE')) {
+    if (!defined('FILE_BUFFER_SIZE')) {
         define('FILE_BUFFER_SIZE', 128 * 1024);
     }
 
@@ -2927,7 +2927,7 @@ 
     $cipher->enableContinuousBuffer();
     $cipher->disablePadding();
     // Get file content
-    $ciphertext = file_get_contents($filePath . '/' . TP_FILE_PREFIX . $fileName);
+    $ciphertext = file_get_contents($filePath.'/'.TP_FILE_PREFIX.$fileName);
     // Decrypt file content and return
     return base64_encode($cipher->decrypt($ciphertext));
 }
@@ -2988,9 +2988,9 @@ 
     array $objectKeyArray = []
 ): void {
     // include librairies
-    include_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
 
     // connect to DB
@@ -3054,10 +3054,9 @@ 
         //DB::debugmode(true);
         $users = DB::query(
             'SELECT id, public_key
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE ' . ($onlyForUser === true ? 
-                'id IN ("' . TP_USER_ID . '","' . $superGlobal->get('user_id', 'SESSION') . '") ' : 
-                'id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '") ') . '
+                'id IN ("'.TP_USER_ID.'","'.$superGlobal->get('user_id', 'SESSION').'") ' : 'id NOT IN ("'.OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'") ').'
             AND public_key != ""'
         );
         //DB::debugmode(false);
@@ -3104,7 +3103,7 @@ 
 function isBase64(string $str): bool
 {
     $str = (string) trim($str);
-    if (! isset($str[0])) {
+    if (!isset($str[0])) {
         return false;
     }
 
@@ -3172,12 +3171,12 @@ 
         ],
     ];
     // Load expected libraries
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Arr.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/DetectsErrors.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Connection.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapInterface.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Ldap.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Arr.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/DetectsErrors.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Connection.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapInterface.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Ldap.php';
     $ad = new SplClassLoader('LdapRecord', '../includes/libraries');
     $ad->register();
     $connection = new Connection($config);
@@ -3186,7 +3185,7 @@ 
         $connection->connect();
     } catch (\LdapRecord\Auth\BindException $e) {
         $error = $e->getDetailedError();
-        echo 'Error : '.$error->getErrorCode().' - '.$error->getErrorMessage(). '<br>'.$error->getDiagnosticMessage();
+        echo 'Error : '.$error->getErrorCode().' - '.$error->getErrorMessage().'<br>'.$error->getDiagnosticMessage();
         return false;
     }
 
@@ -3199,7 +3198,7 @@ 
         }
     } catch (\LdapRecord\Auth\BindException $e) {
         $error = $e->getDetailedError();
-        echo 'Error : '.$error->getErrorCode().' - '.$error->getErrorMessage(). '<br>'.$error->getDiagnosticMessage();
+        echo 'Error : '.$error->getErrorCode().' - '.$error->getErrorMessage().'<br>'.$error->getDiagnosticMessage();
         return false;
     }
 
@@ -3217,8 +3216,8 @@ 
 function deleteUserObjetsKeys(int $userId, array $SETTINGS = []): bool
 {
     // include librairies & connect to DB
-    include_once __DIR__. '/../includes/config/settings.php';
-    include_once __DIR__. '/../includes/libraries/Database/Meekrodb/db.class.php';
+    include_once __DIR__.'/../includes/config/settings.php';
+    include_once __DIR__.'/../includes/libraries/Database/Meekrodb/db.class.php';
     if (defined('DB_PASSWD_CLEAR') === false) {
         define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
     }
@@ -3278,7 +3277,7 @@ 
         foreach (DateTimeZone::listIdentifiers() as $timezone) {
             $now->setTimezone(new DateTimeZone($timezone));
             $offsets[] = $offset = $now->getOffset();
-            $timezones[$timezone] = '(' . format_GMT_offset($offset) . ') ' . format_timezone_name($timezone);
+            $timezones[$timezone] = '('.format_GMT_offset($offset).') '.format_timezone_name($timezone);
         }
 
         array_multisort($offsets, $timezones);
@@ -3298,7 +3297,7 @@ 
 {
     $hours = intval($offset / 3600);
     $minutes = abs(intval($offset % 3600 / 60));
-    return 'GMT' . ($offset ? sprintf('%+03d:%02d', $hours, $minutes) : '');
+    return 'GMT'.($offset ? sprintf('%+03d:%02d', $hours, $minutes) : '');
 }
 
 /**
@@ -3398,8 +3397,7 @@ 
 {
     if (isset($array[$key]) === true
         && (is_int($value) === true ?
-            (int) $array[$key] === $value :
-            (string) $array[$key] === $value)
+            (int) $array[$key] === $value : (string) $array[$key] === $value)
     ) {
         return true;
     }
@@ -3421,8 +3419,7 @@ 
 {
     if (isset($var) === false
         || (is_int($value) === true ?
-            (int) $var === $value :
-            (string) $var === $value)
+            (int) $var === $value : (string) $var === $value)
     ) {
         return true;
     }
@@ -3473,7 +3470,7 @@ 
  */
 function isSetArrayOfValues(array $arrayOfValues): bool
 {
-    foreach($arrayOfValues as $value) {
+    foreach ($arrayOfValues as $value) {
         if (isset($value) === false) {
             return false;
         }
@@ -3495,7 +3492,7 @@ 
     /*PHP8 - integer|string*/$value
 ) : bool
 {
-    foreach($arrayOfVars as $variable) {
+    foreach ($arrayOfVars as $variable) {
         if ($variable !== $value) {
             return false;
         }
@@ -3515,7 +3512,7 @@ 
     /*PHP8 - integer|string*/$value
 ) : bool
 {
-    foreach($arrayOfVars as $variable) {
+    foreach ($arrayOfVars as $variable) {
         if ($variable === $value) {
             return true;
         }
@@ -3584,26 +3581,26 @@ 
 function dataSanitizer(
     array $data,
     array $filters,
-    string $path = __DIR__. '/..' // Path to Teampass root
+    string $path = __DIR__.'/..' // Path to Teampass root
 )
 {
     // Load Sanitizer library
-    require_once $path . '/includes/libraries/Illuminate/Support/Traits/Macroable.php';
-    require_once $path . '/includes/libraries/Illuminate/Support/Str.php';
-    require_once $path . '/includes/libraries/Illuminate/Validation/ValidationRuleParser.php';
-    require_once $path . '/includes/libraries/Illuminate/Support/Arr.php';
-    require_once $path . '/includes/libraries/Elegant/sanitizer/Contracts/Filter.php';
-    require_once $path . '/includes/libraries/Elegant/sanitizer/Filters/Trim.php';
-    require_once $path . '/includes/libraries/Elegant/sanitizer/Filters/Cast.php';
-    require_once $path . '/includes/libraries/Elegant/sanitizer/Filters/EscapeHTML.php';
-    require_once $path . '/includes/libraries/Elegant/sanitizer/Filters/EmptyStringToNull.php';
-    require_once $path . '/includes/libraries/Elegant/sanitizer/Sanitizer.php';
+    require_once $path.'/includes/libraries/Illuminate/Support/Traits/Macroable.php';
+    require_once $path.'/includes/libraries/Illuminate/Support/Str.php';
+    require_once $path.'/includes/libraries/Illuminate/Validation/ValidationRuleParser.php';
+    require_once $path.'/includes/libraries/Illuminate/Support/Arr.php';
+    require_once $path.'/includes/libraries/Elegant/sanitizer/Contracts/Filter.php';
+    require_once $path.'/includes/libraries/Elegant/sanitizer/Filters/Trim.php';
+    require_once $path.'/includes/libraries/Elegant/sanitizer/Filters/Cast.php';
+    require_once $path.'/includes/libraries/Elegant/sanitizer/Filters/EscapeHTML.php';
+    require_once $path.'/includes/libraries/Elegant/sanitizer/Filters/EmptyStringToNull.php';
+    require_once $path.'/includes/libraries/Elegant/sanitizer/Sanitizer.php';
     $sanitizer = new Elegant\sanitizer\Sanitizer($data, $filters);
 
     // Load AntiXSS
-    include_once $path. '/includes/libraries/portable-ascii-master/src/voku/helper/ASCII.php';
-    include_once $path . '/includes/libraries/portable-utf8-master/src/voku/helper/UTF8.php';
-    include_once $path . '/includes/libraries/anti-xss-master/src/voku/helper/AntiXSS.php';
+    include_once $path.'/includes/libraries/portable-ascii-master/src/voku/helper/ASCII.php';
+    include_once $path.'/includes/libraries/portable-utf8-master/src/voku/helper/UTF8.php';
+    include_once $path.'/includes/libraries/anti-xss-master/src/voku/helper/AntiXSS.php';
     $antiXss = new voku\helper\AntiXSS();
 
     // Sanitize post and get variables
@@ -3621,9 +3618,9 @@ 
  */
 function cacheTreeUserHandler(int $user_id, string $data, array $SETTINGS, string $field_update = '')
 {
-    include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
+    include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
     //Connect to DB
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+    include_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));
     }
@@ -3639,7 +3636,7 @@ 
     // Exists ?
     $userCacheId = DB::queryfirstrow(
         'SELECT increment_id
-        FROM ' . prefixTable('cache_tree') . '
+        FROM ' . prefixTable('cache_tree').'
         WHERE user_id = %i',
         $user_id
     );
@@ -3688,7 +3685,7 @@ 
  */
 function pourcentage(float $nombre, float $total, float $pourcentage): float
 { 
-    $resultat = ($nombre/$total) * $pourcentage;
+    $resultat = ($nombre / $total) * $pourcentage;
     return round($resultat);
 }
 
@@ -3716,7 +3713,7 @@ 
 
     // Get last folder update
     $lastFolderChange = DB::queryfirstrow(
-        'SELECT valeur FROM ' . prefixTable('misc') . '
+        'SELECT valeur FROM '.prefixTable('misc').'
         WHERE type = %s AND intitule = %s',
         'timestamp',
         'last_folder_change'
@@ -3746,7 +3743,7 @@ 
     // Does this user has a tree cache
     $userCacheTree = DB::queryfirstrow(
         'SELECT '.$fieldName.'
-        FROM ' . prefixTable('cache_tree') . '
+        FROM ' . prefixTable('cache_tree').'
         WHERE user_id = %i',
         $_SESSION['user_id']
     );
@@ -3775,10 +3772,10 @@ 
 )
 {
     //load ClassLoader
-    include_once __DIR__. '/../sources/SplClassLoader.php';
+    include_once __DIR__.'/../sources/SplClassLoader.php';
     
     //Connect to DB
-    include_once __DIR__. '/../includes/libraries/Database/Meekrodb/db.class.php';
+    include_once __DIR__.'/../includes/libraries/Database/Meekrodb/db.class.php';
     if (defined('DB_PASSWD_CLEAR') === false) {
         define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, []));
     }
@@ -3797,7 +3794,7 @@ 
     if (count($folderIds) === 0) {
         $folderIds = DB::queryFirstColumn(
             'SELECT id
-            FROM ' . prefixTable('nested_tree') . '
+            FROM ' . prefixTable('nested_tree').'
             WHERE personal_folder=%i',
             0
         );
@@ -3814,8 +3811,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
         );
@@ -3841,7 +3838,7 @@ 
         $valTemp = '';
         $data = DB::queryFirstRow(
             'SELECT valeur
-            FROM ' . prefixTable('misc') . '
+            FROM ' . prefixTable('misc').'
             WHERE type = %s AND intitule=%i',
             'complex',
             $folder
@@ -3858,14 +3855,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['visibilityRoles'] = $valTemp;
 
@@ -3897,7 +3894,7 @@ 
         // loop on users and check if user has this role
         $rows = DB::query(
             'SELECT id, fonction_id
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id != %i AND admin = 0 AND fonction_id IS NOT NULL AND fonction_id != ""',
             $_SESSION['user_id']
         );
@@ -3936,7 +3933,7 @@ 
 
     $val = DB::queryfirstrow(
         'SELECT *
-        FROM ' . prefixTable('users') . '
+        FROM ' . prefixTable('users').'
         WHERE id = %i',
         $userId
     );
@@ -3952,12 +3949,12 @@ 
 function upgradeRequired(): bool
 {
     // Get settings.php
-    include_once __DIR__. '/../includes/config/settings.php';
+    include_once __DIR__.'/../includes/config/settings.php';
 
     // Get timestamp in DB
     $val = DB::queryfirstrow(
         'SELECT valeur
-        FROM ' . prefixTable('misc') . '
+        FROM ' . prefixTable('misc').'
         WHERE type = %s AND intitule = %s',
         'admin',
         'upgrade_timestamp'
@@ -4004,7 +4001,7 @@ 
     // prepapre background tasks for item keys generation        
     $userTP = DB::queryFirstRow(
         'SELECT pw, public_key, private_key
-        FROM ' . prefixTable('users') . '
+        FROM ' . prefixTable('users').'
         WHERE id = %i',
         TP_USER_ID
     );
@@ -4064,8 +4061,8 @@ 
                 'process_type' => 'create_user_keys',
                 'arguments' => json_encode([
                     'new_user_id' => (int) $userId,
-                    'new_user_pwd' => cryption($passwordClear, '','encrypt')['string'],
-                    'new_user_code' => cryption(empty($encryptionKey) === true ? uniqidReal(20) : $encryptionKey, '','encrypt')['string'],
+                    'new_user_pwd' => cryption($passwordClear, '', 'encrypt')['string'],
+                    'new_user_code' => cryption(empty($encryptionKey) === true ? uniqidReal(20) : $encryptionKey, '', 'encrypt')['string'],
                     'owner_id' => (int) TP_USER_ID,
                     'creator_pwd' => $userTP['pw'],
                     'send_email' => $sendEmailToUser === true ? 1 : 0,

sources/items.queries.php

Spacing +278 added lines, -279 removed lines

@@ -37,14 +37,14 @@ 
 }
 
 // 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
     echo "> ".$_SESSION['user_id']." < - > ".$_SESSION['key']." <";
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -57,8 +57,8 @@ 
     date_default_timezone_set('UTC');
 }
 
-require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user']['user_language'] . '.php';
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user']['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,13 +78,13 @@ 
 }
 
 // Load AntiXSS
-include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/portable-ascii-master/src/voku/helper/ASCII.php';
-include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/portable-utf8-master/src/voku/helper/UTF8.php';
-include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/anti-xss-master/src/voku/helper/AntiXSS.php';
+include_once $SETTINGS['cpassman_dir'].'/includes/libraries/portable-ascii-master/src/voku/helper/ASCII.php';
+include_once $SETTINGS['cpassman_dir'].'/includes/libraries/portable-utf8-master/src/voku/helper/UTF8.php';
+include_once $SETTINGS['cpassman_dir'].'/includes/libraries/anti-xss-master/src/voku/helper/AntiXSS.php';
 $antiXss = new voku\helper\AntiXSS();
 
 // 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));
 }
@@ -98,7 +98,7 @@ 
 DB::$connect_options = DB_CONNECT_OPTIONS;
 
 // Load Tree
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tree/NestedTree/NestedTree.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tree/NestedTree/NestedTree.php';
 $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
 
 
@@ -338,7 +338,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',
                 $inputData['folderId']
             );
@@ -355,7 +355,7 @@ 
             // Get folder complexity
             $folderComplexity = DB::queryfirstrow(
                 'SELECT valeur
-                FROM ' . prefixTable('misc') . '
+                FROM ' . prefixTable('misc').'
                 WHERE type = %s AND intitule = %i',
                 'complex',
                 $inputData['folderId']
@@ -381,7 +381,7 @@ 
             $itemExists = 0;
             $newID = '';
             $data = DB::queryfirstrow(
-                'SELECT * FROM ' . prefixTable('items') . '
+                'SELECT * FROM '.prefixTable('items').'
                 WHERE label = %s AND inactif = %i',
                 $inputData['label'],
                 0
@@ -484,7 +484,7 @@ 
                             // should we encrypt the data
                             $dataTmp = DB::queryFirstRow(
                                 'SELECT encrypted_data
-                                FROM ' . prefixTable('categories') . '
+                                FROM ' . prefixTable('categories').'
                                 WHERE id = %i',
                                 $field['id']
                             );
@@ -553,7 +553,7 @@ 
                 ) {
                     DB::queryFirstRow(
                         'SELECT *
-                        FROM ' . prefixTable('templates') . '
+                        FROM ' . prefixTable('templates').'
                         WHERE item_id = %i',
                         $newID
                     );
@@ -622,11 +622,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'];
                             }
                         }
                     }
@@ -640,11 +640,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'];
                                 }
                             }
                         }
@@ -707,7 +707,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
                     );
@@ -761,7 +761,7 @@ 
                                     langHdl('email_subject_item_updated'),
                                     str_replace(
                                         array('#label', '#link'),
-                                            array($path, $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $inputData['folderId'] . '&id=' . $newID . $txt['email_body3']),
+                                            array($path, $SETTINGS['email_server_url'].'/index.php?page=items&group='.$inputData['folderId'].'&id='.$newID.$txt['email_body3']),
                                             langHdl('new_item_email_body')
                                     ),
                                     $emailAddress,
@@ -899,8 +899,7 @@ 
             $post_to_be_deleted_after_date = isset($dataReceived['to_be_deleted_after_date']) === true ? filter_var(
                     $dataReceived['to_be_deleted_after_date'],
                     FILTER_SANITIZE_FULL_SPECIAL_CHARS
-                ) :
-                '';
+                ) : '';
             $post_fields = (filter_var_array(
                 $dataReceived['fields'],
                 FILTER_SANITIZE_FULL_SPECIAL_CHARS
@@ -960,7 +959,7 @@ 
             // About special settings
             $dataFolderSettings = DB::queryFirstRow(
                 'SELECT bloquer_creation, bloquer_modification, personal_folder, title
-                FROM ' . prefixTable('nested_tree') . ' 
+                FROM ' . prefixTable('nested_tree').' 
                 WHERE id = %i',
                 $inputData['folderId']
             );
@@ -976,7 +975,7 @@ 
             // Get folder complexity
             $folderComplexity = DB::queryfirstrow(
                 'SELECT valeur
-                FROM ' . prefixTable('misc') . '
+                FROM ' . prefixTable('misc').'
                 WHERE type = %s AND intitule = %i',
                 'complex',
                 $inputData['folderId']
@@ -1016,8 +1015,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',
                 $inputData['itemId'],
                 'at_creation'
@@ -1027,7 +1026,7 @@ 
             //db::debugmode(true);
             DB::query(
                 'SELECT *
-                FROM ' . prefixTable('sharekeys_items') . '
+                FROM ' . prefixTable('sharekeys_items').'
                 WHERE object_id = %i AND user_id = %s',
                 $inputData['itemId'],
                 $_SESSION['user_id']
@@ -1076,9 +1075,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',
                     $inputData['itemId']
                 );
@@ -1086,7 +1085,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'],
                     $inputData['itemId']
@@ -1155,7 +1154,7 @@ 
                 // Get list of tags
                 $itemTags = DB::queryFirstColumn(
                     'SELECT tag
-                    FROM ' . prefixTable('tags') . '
+                    FROM ' . prefixTable('tags').'
                     WHERE item_id = %i',
                     $inputData['itemId']
                 );
@@ -1201,7 +1200,7 @@ 
                         $_SESSION['user_id'],
                         'at_modification',
                         $_SESSION['login'],
-                        'at_tag : ' . implode(' ', $itemTags) . ' => ' . $post_tags
+                        'at_tag : '.implode(' ', $itemTags).' => '.$post_tags
                     );
                 }
 
@@ -1240,8 +1239,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'],
                                 $inputData['itemId']
@@ -1255,7 +1254,7 @@ 
                                 // Perform new query
                                 $dataTmpCat = DB::queryFirstRow(
                                     'SELECT id, title, encrypted_data, masked
-                                    FROM ' . prefixTable('categories') . '
+                                    FROM ' . prefixTable('categories').'
                                     WHERE id = %i',
                                     $field['id']
                                 );
@@ -1327,7 +1326,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
@@ -1335,7 +1334,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']
@@ -1405,7 +1404,7 @@ 
                                         $_SESSION['user_id'],
                                         'at_modification',
                                         $_SESSION['login'],
-                                        'at_field : ' . $dataTmpCat['title'] . ' => ' . $oldVal
+                                        'at_field : '.$dataTmpCat['title'].' => '.$oldVal
                                     );
                                 }
                             }
@@ -1430,7 +1429,7 @@ 
                 ) {
                     DB::queryFirstRow(
                         'SELECT *
-                        FROM ' . prefixTable('templates') . '
+                        FROM ' . prefixTable('templates').'
                         WHERE item_id = %i',
                         $inputData['itemId']
                     );
@@ -1473,7 +1472,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',
                         $inputData['itemId']
                     );
@@ -1500,7 +1499,7 @@ 
                             // Store updates performed
                             array_push(
                                 $arrayOfChanges,
-                                langHdl('automatic_deletion_engaged') . ': ' . langHdl('enabled')
+                                langHdl('automatic_deletion_engaged').': '.langHdl('enabled')
                             );
 
                             // update LOG
@@ -1543,7 +1542,7 @@ 
                             // Store updates performed
                             array_push(
                                 $arrayOfChanges,
-                                langHdl('automatic_deletion_engaged') . ': ' . langHdl('disabled')
+                                langHdl('automatic_deletion_engaged').': '.langHdl('disabled')
                             );
 
                             // update LOG
@@ -1576,7 +1575,7 @@ 
                         if (empty($userId) === false) {
                             $dataTmp = DB::queryfirstrow(
                                 'SELECT id, name, lastname
-                                FROM ' . prefixTable('users') . '
+                                FROM ' . prefixTable('users').'
                                 WHERE id= %i',
                                 $userId
                             );
@@ -1584,7 +1583,7 @@ 
                             // Add to array
                             array_push(
                                 $arrayOfUsersRestriction,
-                                $dataTmp['name'] . ' ' . $dataTmp['lastname']
+                                $dataTmp['name'].' '.$dataTmp['lastname']
                             );
                             array_push(
                                 $arrayOfUsersIdRestriction,
@@ -1615,8 +1614,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',
                         $inputData['itemId']
@@ -1650,7 +1649,7 @@ 
                             );
                             $dataTmp = DB::queryfirstrow(
                                 'SELECT title
-                                FROM ' . prefixTable('roles_title') . '
+                                FROM ' . prefixTable('roles_title').'
                                 WHERE id = %i',
                                 $role
                             );
@@ -1691,8 +1690,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) : '')
                     );
                 }
 
@@ -1712,7 +1711,7 @@ 
                         $_SESSION['user_id'],
                         'at_modification',
                         $_SESSION['login'],
-                        'at_label : ' . $data['label'] . ' => ' . $inputData['label']
+                        'at_label : '.$data['label'].' => '.$inputData['label']
                     );
                 }
                 // LOGIN
@@ -1731,7 +1730,7 @@ 
                         $_SESSION['user_id'],
                         'at_modification',
                         $_SESSION['login'],
-                        'at_login : ' . $data['login'] . ' => ' . $post_login
+                        'at_login : '.$data['login'].' => '.$post_login
                     );
                 }
                 // EMAIL
@@ -1750,7 +1749,7 @@ 
                         $_SESSION['user_id'],
                         'at_modification',
                         $_SESSION['login'],
-                        'at_email : ' . $data['email'] . ' => ' . $post_email
+                        'at_email : '.$data['email'].' => '.$post_email
                     );
                 }
                 // URL
@@ -1769,7 +1768,7 @@ 
                         $_SESSION['user_id'],
                         'at_modification',
                         $_SESSION['login'],
-                        'at_url : ' . $data['url'] . ' => ' . $post_url
+                        'at_url : '.$data['url'].' => '.$post_url
                     );
                 }
                 // DESCRIPTION
@@ -1794,7 +1793,7 @@ 
                 // FOLDER
                 if ((int) $data['id_tree'] !== (int) $inputData['folderId']) {
                     // Get name of folders
-                    $dataTmp = DB::query('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id IN %li', array($data['id_tree'], $inputData['folderId']));
+                    $dataTmp = DB::query('SELECT title FROM '.prefixTable('nested_tree').' WHERE id IN %li', array($data['id_tree'], $inputData['folderId']));
 
                     // Store updates performed
                     array_push(
@@ -1810,7 +1809,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
@@ -1818,7 +1817,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
@@ -1829,15 +1828,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',
                     $inputData['itemId'],
                     'at_creation'
@@ -1846,8 +1845,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',
                     $inputData['itemId']
@@ -1856,14 +1855,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;
                         }
                     }
                 }
@@ -1996,7 +1995,7 @@ 
         ) {
             // load the original record into an array
             $originalRecord = DB::queryfirstrow(
-                'SELECT * FROM ' . prefixTable('items') . '
+                'SELECT * FROM '.prefixTable('items').'
                 WHERE id = %i',
                 $inputData['itemId']
             );
@@ -2016,7 +2015,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
             );
@@ -2024,7 +2023,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'],
                 $inputData['itemId']
@@ -2106,7 +2105,7 @@ 
             // Manage Custom Fields
             $rows = DB::query(
                 'SELECT *
-                FROM ' . prefixTable('categories_items') . '
+                FROM ' . prefixTable('categories_items').'
                 WHERE item_id = %i',
                 $inputData['itemId']
             );
@@ -2164,15 +2163,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'],
                 $inputData['itemId']
             );
             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'],
@@ -2181,8 +2180,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'],
@@ -2256,7 +2255,7 @@ 
 
             // -------------------------
             // Add specific restrictions
-            $rows = DB::query('SELECT * FROM ' . prefixTable('restriction_to_roles') . ' WHERE item_id = %i', $inputData['itemId']);
+            $rows = DB::query('SELECT * FROM '.prefixTable('restriction_to_roles').' WHERE item_id = %i', $inputData['itemId']);
             foreach ($rows as $record) {
                 DB::insert(
                     prefixTable('restriction_to_roles'),
@@ -2268,7 +2267,7 @@ 
             }
 
             // Add Tags
-            $rows = DB::query('SELECT * FROM ' . prefixTable('tags') . ' WHERE item_id = %i', $inputData['itemId']);
+            $rows = DB::query('SELECT * FROM '.prefixTable('tags').' WHERE item_id = %i', $inputData['itemId']);
             foreach ($rows as $record) {
                 DB::insert(
                     prefixTable('tags'),
@@ -2298,7 +2297,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(
@@ -2346,7 +2345,7 @@ 
 
         // Decrypt and retreive data in JSON format
         $dataReceived = prepareExchangedData(
-            $SETTINGS['cpassman_dir'],$inputData['data'],
+            $SETTINGS['cpassman_dir'], $inputData['data'],
             'decode'
         );
 
@@ -2372,7 +2371,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',
@@ -2383,7 +2382,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',
@@ -2408,8 +2407,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',
             $inputData['id'],
             'at_creation'
@@ -2418,7 +2417,7 @@ 
         // Notification
         DB::queryfirstrow(
             'SELECT *
-            FROM ' . prefixTable('notification') . '
+            FROM ' . prefixTable('notification').'
             WHERE item_id = %i AND user_id = %i',
             $inputData['id'],
             $_SESSION['user_id']
@@ -2461,7 +2460,7 @@ 
 
         // 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;
@@ -2471,7 +2470,7 @@ 
         $tags = array();
         $rows = DB::query(
             'SELECT tag
-            FROM ' . prefixTable('tags') . '
+            FROM ' . prefixTable('tags').'
             WHERE item_id = %i',
             $inputData['id']
         );
@@ -2496,7 +2495,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',
             $inputData['id']
         );
@@ -2510,7 +2509,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'],
             $inputData['id']
@@ -2626,8 +2625,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',
                     $inputData['id']
@@ -2643,8 +2642,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',
                     $inputData['id']
@@ -2727,7 +2726,7 @@ 
                 $arrCatList = array();
                 $rows_tmp = DB::query(
                     'SELECT id_category
-                    FROM ' . prefixTable('categories_folders') . '
+                    FROM ' . prefixTable('categories_folders').'
                     WHERE id_folder=%i',
                     $inputData['folderId']
                 );
@@ -2742,8 +2741,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 AS 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',
                         $inputData['id'],
                         $arrCatList
@@ -2754,7 +2753,7 @@ 
                         //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']
@@ -2814,7 +2813,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',
                     $inputData['id']
                 );
@@ -2840,7 +2839,7 @@ 
                 // Is the Item to be deleted?
                 $dataDelete = DB::queryfirstrow(
                     'SELECT * 
-                    FROM ' . prefixTable('automatic_del') . '
+                    FROM ' . prefixTable('automatic_del').'
                     WHERE item_id = %i',
                     $inputData['id']
                 );
@@ -2923,11 +2922,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'];
                         }
                     }
                 }
@@ -2990,8 +2989,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',
             $inputData['id']
         );
@@ -3013,7 +3012,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',
             $inputData['id']
         );
@@ -3060,7 +3059,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',
                 $inputData['id']
             );
@@ -3069,7 +3068,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,
@@ -3095,7 +3094,7 @@ 
                     array(
                         'latest_items' => implode(';', $_SESSION['latest_items']),
                     ),
-                    'id=' . $_SESSION['user_id']
+                    'id='.$_SESSION['user_id']
                 );
             }
 
@@ -3104,8 +3103,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']
             );
@@ -3119,9 +3118,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) {
@@ -3134,7 +3133,7 @@ 
                                 array(
                                     'id' => (int) $record2['id'],
                                     'login' => $record2['login'],
-                                    'name' => $record2['name'] . ' ' . $record2['lastname'],
+                                    'name' => $record2['name'].' '.$record2['lastname'],
                                     'email' => $record2['email'],
                                 )
                             );
@@ -3153,16 +3152,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.')';
                 }
 
                 // Add Admins to notification list if expected
@@ -3185,7 +3184,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')
                     ),
@@ -3196,7 +3195,7 @@ 
             }
 
             // has this item a change proposal
-            DB::query('SELECT * FROM ' . prefixTable('items_change') . ' WHERE item_id = %i', $inputData['id']);
+            DB::query('SELECT * FROM '.prefixTable('items_change').' WHERE item_id = %i', $inputData['id']);
             $returnArray['has_change_proposal'] = DB::count();
 
             // Setting
@@ -3277,7 +3276,7 @@ 
         // Load item data
         $data = DB::queryFirstRow(
             'SELECT id_tree
-            FROM ' . prefixTable('items') . '
+            FROM ' . prefixTable('items').'
             WHERE id = %i',
             $inputData['itemId']
         );
@@ -3345,7 +3344,7 @@ 
         }
         // decrypt and retreive data in JSON format
         $dataReceived = prepareExchangedData(
-$SETTINGS['cpassman_dir'],$inputData['data'], 'decode');
+$SETTINGS['cpassman_dir'], $inputData['data'], 'decode');
 
         // Prepare variables
         $title = filter_var(htmlspecialchars_decode($dataReceived['title'], ENT_QUOTES), FILTER_SANITIZE_FULL_SPECIAL_CHARS);
@@ -3353,13 +3352,13 @@ 
 
         // Check if user is allowed to access this folder
         if (!in_array($inputData['folderId'], $_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
@@ -3370,9 +3369,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;
             }
         }
@@ -3380,7 +3379,7 @@ 
         // query on folder
         $data = DB::queryfirstrow(
             'SELECT parent_id, personal_folder
-            FROM ' . prefixTable('nested_tree') . '
+            FROM ' . prefixTable('nested_tree').'
             WHERE id = %i',
             $inputData['folderId']
         );
@@ -3390,20 +3389,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) {
@@ -3462,7 +3461,7 @@ 
         }
         // decrypt and retreive data in JSON format
         $dataReceived = prepareExchangedData(
-$SETTINGS['cpassman_dir'],$inputData['data'], 'decode');
+$SETTINGS['cpassman_dir'], $inputData['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);
 
@@ -3471,42 +3470,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;
         }
@@ -3631,7 +3630,7 @@ 
             $uniqueLoadData['path'] = $arr_arbo;
 
             // store last folder accessed in cookie
-            $arr_cookie_options = array (
+            $arr_cookie_options = array(
                 'expires' => time() + TP_ONE_DAY_SECONDS * 5,
                 'path' => '/', 
                 'secure' => true,
@@ -3649,7 +3648,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
                 );
@@ -3674,11 +3673,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,
                         $inputData['id']
                     );
-                    if (DB::count()>0) {
+                    if (DB::count() > 0) {
                         if ($access['type'] === 'R') {
                             array_push($arrTmp, 10);
                         } elseif ($access['type'] === 'W') {
@@ -3743,7 +3742,7 @@ 
             } else {
                 DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE inactif = %i',
                     0
                 );
@@ -3753,7 +3752,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',
                 $inputData['id']
             );
@@ -3765,7 +3764,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',
                     $inputData['id']
                 );
@@ -3879,13 +3878,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(
@@ -3896,9 +3895,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,
@@ -3917,9 +3916,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',
@@ -3950,7 +3949,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']
                     );
@@ -3962,7 +3961,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']
@@ -4168,9 +4167,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
@@ -4236,8 +4235,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.item_key = %s',
             $_SESSION['user_id'],
             $inputData['itemKey']
@@ -4280,7 +4279,7 @@ 
         if (null !== $inputData['itemId'] && empty($inputData['itemId']) === false) {
             $dataItem = DB::queryfirstrow(
                 'SELECT perso, anyone_can_modify
-                FROM ' . prefixTable('items') . '
+                FROM ' . prefixTable('items').'
                 WHERE id=%i',
                 $inputData['itemId']
             );
@@ -4319,7 +4318,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', $inputData['itemId']);
+            $dataTmp = DB::queryFirstRow('SELECT timestamp, user_id FROM '.prefixTable('items_edition').' WHERE item_id = %i', $inputData['itemId']);
 
             // If token is taken for this Item and delay is passed then delete it.
             if (
@@ -4330,7 +4329,7 @@ 
                 DB::delete(prefixTable('items_edition'), 'item_id = %i', $inputData['itemId']);
                 //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',
                     $inputData['itemId']
                 );
             }
@@ -4374,7 +4373,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',
             $inputData['folderId']
         );
@@ -4415,8 +4414,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',
             $inputData['folderId']
@@ -4429,8 +4428,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',
                 $inputData['folderId']
@@ -4439,7 +4438,7 @@ 
                 if (empty($visibilite)) {
                     $visibilite = $record['title'];
                 } else {
-                    $visibilite .= ' - ' . $record['title'];
+                    $visibilite .= ' - '.$record['title'];
                 }
             }
         } else {
@@ -4449,14 +4448,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',
                 $inputData['folderId']
             );
             
             $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($inputData['folderId']);
@@ -4466,8 +4465,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',
             $inputData['folderId']
         );
@@ -4481,7 +4480,7 @@ 
             );
             $rows2 = DB::query(
                 'SELECT id, login, fonction_id, email, name, lastname
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE admin = 0 AND fonction_id is not null'
             );
             foreach ($rows2 as $record2) {
@@ -4495,7 +4494,7 @@ 
                             array(
                                 'id' => $record2['id'],
                                 'login' => $record2['login'],
-                                'name' => $record2['name'] . ' ' . $record2['lastname'],
+                                'name' => $record2['name'].' '.$record2['lastname'],
                                 'email' => $record2['email'],
                             )
                         );
@@ -4512,13 +4511,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,
                     $inputData['folderId']
                 );
                 //db::debugmode(false);
-                if (DB::count()>0) {
+                if (DB::count() > 0) {
                     if ($access['type'] === 'R') {
                         array_push($arrTmp, 10);
                     } elseif ($access['type'] === 'W') {
@@ -4594,7 +4593,7 @@ 
         // Get some info before deleting
         $data = DB::queryFirstRow(
             'SELECT name, id_item, file
-            FROM ' . prefixTable('files') . '
+            FROM ' . prefixTable('files').'
             WHERE id = %i',
             $fileId
         );
@@ -4602,7 +4601,7 @@ 
         // Load item data
         $data_item = DB::queryFirstRow(
             'SELECT id_tree
-            FROM ' . prefixTable('items') . '
+            FROM ' . prefixTable('items').'
             WHERE id = %i',
             $data['id_item']
         );
@@ -4633,7 +4632,7 @@ 
                 $_SESSION['user_id'],
                 'at_modification',
                 $_SESSION['login'],
-                'at_del_file : ' . $data['name']
+                'at_del_file : '.$data['name']
             );
 
             // DElete sharekeys
@@ -4644,7 +4643,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(
@@ -4697,13 +4696,13 @@ 
             // Update SESSION with this new favourite
             $data = DB::queryfirstrow(
                 'SELECT label,id_tree
-                FROM ' . prefixTable('items') . '
+                FROM ' . prefixTable('items').'
                 WHERE id = %i',
                 $inputData['itemId']
             );
             $_SESSION['favourites_tab'][$inputData['itemId']] = array(
                 'label' => $data['label'],
-                'url' => 'index.php?page=items&amp;group=' . $data['id_tree'] . '&amp;id=' . $inputData['itemId'],
+                'url' => 'index.php?page=items&amp;group='.$data['id_tree'].'&amp;id='.$inputData['itemId'],
             );
         } elseif ((int) $inputData['action'] === 1) {
             // delete from session
@@ -4775,8 +4774,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',
             $inputData['itemId']
         );
@@ -4784,7 +4783,7 @@ 
         // get data about new folder
         $dataDestination = DB::queryfirstrow(
             'SELECT personal_folder, title
-            FROM ' . prefixTable('nested_tree') . '
+            FROM ' . prefixTable('nested_tree').'
             WHERE id = %i',
             $inputData['folderId']
         );
@@ -4838,7 +4837,7 @@ 
             // Get fields for this Item
             $rows = DB::query(
                 'SELECT id
-                FROM ' . prefixTable('categories_items') . '
+                FROM ' . prefixTable('categories_items').'
                 WHERE item_id = %i',
                 $inputData['itemId']
             );
@@ -4855,7 +4854,7 @@ 
             // Get FILES for this Item
             $rows = DB::query(
                 'SELECT id
-                FROM ' . prefixTable('files') . '
+                FROM ' . prefixTable('files').'
                 WHERE id_item = %i',
                 $inputData['itemId']
             );
@@ -4902,7 +4901,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'],
                 $inputData['itemId']
@@ -4913,8 +4912,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) {
@@ -4934,14 +4933,14 @@ 
             // Get fields for this Item
             $rows = DB::query(
                 'SELECT id
-                FROM ' . prefixTable('categories_items') . '
+                FROM ' . prefixTable('categories_items').'
                 WHERE item_id = %i',
                 $inputData['itemId']
             );
             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']
@@ -4952,8 +4951,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) {
@@ -4974,14 +4973,14 @@ 
             // Get FILES for this Item
             $rows = DB::query(
                 'SELECT id
-                FROM ' . prefixTable('files') . '
+                FROM ' . prefixTable('files').'
                 WHERE id_item = %i',
                 $inputData['itemId']
             );
             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']
@@ -4992,8 +4991,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) {
@@ -5031,7 +5030,7 @@ 
             $_SESSION['user_id'],
             'at_modification',
             $_SESSION['login'],
-            'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title']
+            'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title']
         );
 
         // Update cache table
@@ -5098,8 +5097,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
                 );
@@ -5122,7 +5121,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',
                     $inputData['folderId']
                 );
 
@@ -5164,7 +5163,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
                     );
@@ -5181,7 +5180,7 @@ 
                     // Get FILES for this Item
                     $rows = DB::query(
                         'SELECT id
-                        FROM ' . prefixTable('files') . '
+                        FROM ' . prefixTable('files').'
                         WHERE id_item = %i',
                         $item_id
                     );
@@ -5236,7 +5235,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
@@ -5247,8 +5246,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) {
@@ -5268,14 +5267,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']
@@ -5286,8 +5285,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) {
@@ -5308,14 +5307,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']
@@ -5326,8 +5325,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) {
@@ -5364,13 +5363,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(
@@ -5439,7 +5438,7 @@ 
                 // get info
                 $dataSource = DB::queryfirstrow(
                     'SELECT label, id_tree
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE id=%i',
                     $item_id
                 );
@@ -5543,8 +5542,8 @@ 
         }
         if ($inputData['cat'] === 'request_access_to_author') {
             // Variables
-            $dataAuthor = DB::queryfirstrow('SELECT email,login FROM ' . prefixTable('users') . ' WHERE id = ' . $post_content[1]);
-            $dataItem = DB::queryfirstrow('SELECT label, id_tree FROM ' . prefixTable('items') . ' WHERE id = ' . $post_content[0]);
+            $dataAuthor = DB::queryfirstrow('SELECT email,login FROM '.prefixTable('users').' WHERE id = '.$post_content[1]);
+            $dataItem = DB::queryfirstrow('SELECT label, id_tree FROM '.prefixTable('items').' WHERE id = '.$post_content[0]);
 
             // Get path
             $path = geItemReadablePath(
@@ -5558,7 +5557,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'],
@@ -5568,7 +5567,7 @@ 
         } elseif ($inputData['cat'] === 'share_this_item') {
             $dataItem = DB::queryfirstrow(
                 'SELECT label,id_tree
-                FROM ' . prefixTable('items') . '
+                FROM ' . prefixTable('items').'
                 WHERE id= %i',
                 $inputData['id']
             );
@@ -5591,7 +5590,7 @@ 
                     ),
                     array(
                         empty($SETTINGS['email_server_url']) === false ?
-                            $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $inputData['id'] : $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $inputData['id'],
+                            $SETTINGS['email_server_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$inputData['id'] : $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$inputData['id'],
                         addslashes($_SESSION['login']),
                         addslashes($path),
                     ),
@@ -5694,8 +5693,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',
             $item_id,
             'at_creation'
@@ -5724,18 +5723,18 @@ 
                 $_SESSION['login'],
                 htmlspecialchars_decode($label, ENT_QUOTES),
                 null,
-                (string) dateToStamp($date.' '.$time, $SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'])
+                (string) dateToStamp($date.' '.$time, $SETTINGS['date_format'].' '.$SETTINGS['time_format'])
             );
             // 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',
                 $item_id
             );
-            $historic = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $data['date']) . ' - ' . $_SESSION['login'] . ' - ' . langHdl($data['action']) . ' - ' . $data['raison'];
+            $historic = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $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'],
@@ -5810,7 +5809,7 @@ 
         );
 
         // delete all existing old otv codes
-        $rows = DB::query('SELECT id FROM ' . prefixTable('otv') . ' WHERE time_limit < ' . time());
+        $rows = DB::query('SELECT id FROM '.prefixTable('otv').' WHERE time_limit < '.time());
         foreach ($rows as $record) {
             DB::delete(prefixTable('otv'), 'id=%i', $record['id']);
         }
@@ -5832,8 +5831,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'],
             $dataReceived['id']
@@ -5885,7 +5884,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);
 
         echo json_encode(
             array(
@@ -5957,8 +5956,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'],
             $inputData['id']
@@ -5980,7 +5979,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'];
@@ -5998,7 +5997,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,
             ),
@@ -6052,16 +6051,16 @@ 
         $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 ($inputData['option'] === 'same_folder') {
                 // case unique folder
                 DB::query(
                     'SELECT label
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE id_tree = %i AND label = %s',
                     $idFolder,
                     $label
@@ -6073,7 +6072,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) {
@@ -6088,12 +6087,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
                 );
@@ -6105,7 +6104,7 @@ 
             }
 
             // send data
-            echo '[{"duplicate" : "' . $duplicate . '" , "error" : ""}]';
+            echo '[{"duplicate" : "'.$duplicate.'" , "error" : ""}]';
         }
         break;
 
@@ -6150,7 +6149,7 @@ 
         if (isset($dataReceived['force_refresh_cache']) === true && $dataReceived['force_refresh_cache'] === false) {
             $goCachedFolders = loadFoldersListByCache('visible_folders', 'folders');
             if ($goCachedFolders['state'] === true) {
-                $arr_data['folders'] = json_decode($goCachedFolders['data'], true);//print_r($arr_data);
+                $arr_data['folders'] = json_decode($goCachedFolders['data'], true); //print_r($arr_data);
                 // send data
                 echo (string) prepareExchangedData(
                     $SETTINGS['cpassman_dir'],
@@ -6187,7 +6186,7 @@ 
         }
 
         //Build tree
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tree/NestedTree/NestedTree.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tree/NestedTree/NestedTree.php';
         $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
         $tree->rebuild();
         $folders = $tree->getDescendants();
@@ -6237,7 +6236,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);
                         }
                     }
 
@@ -6319,7 +6318,7 @@ 
         if (is_array($foldersArray) === true && $inputData['data'] !== '[null]') {
             $rows = DB::query(
                 'SELECT id, categories
-                FROM ' . prefixTable('nested_tree') . '
+                FROM ' . prefixTable('nested_tree').'
                 WHERE id IN (%l)',
                 implode(',', $foldersArray)
             );
@@ -6363,7 +6362,7 @@ 
         // get item info
         $dataItem = DB::queryFirstRow(
             'SELECT *
-            FROM ' . prefixTable('items') . '
+            FROM ' . prefixTable('items').'
             WHERE id=%i',
             $inputData['itemId']
         );
@@ -6375,8 +6374,8 @@ 
             '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,
                 l.old_value as old_value
-            FROM ' . prefixTable('log_items') . ' as l
-            INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id)
+            FROM ' . prefixTable('log_items').' as l
+            INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id)
             WHERE id_item=%i AND l.action NOT IN (%l)
             ORDER BY date DESC',
             $inputData['itemId'],
@@ -6391,18 +6390,18 @@ 
             
             // imported via API
             if (empty($record['login']) === true) {
-                $record['login'] = langHdl('imported_via_api') . ' [' . $record['raison'] . ']';
+                $record['login'] = langHdl('imported_via_api').' ['.$record['raison'].']';
             }
             
             // 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
@@ -6422,7 +6421,7 @@ 
                         $previous_passwords, 
                         [
                             'password' => $previous_pwd['string'],
-                            'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']),
+                            'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']),
                         ]
                     );
                 }
@@ -6435,19 +6434,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') {
@@ -6456,7 +6455,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) {
@@ -6475,8 +6474,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,
                 )
@@ -6568,18 +6567,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
         );
@@ -6611,14 +6610,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(
@@ -6661,7 +6660,7 @@ 
         // Send email
         $dataItem = DB::queryfirstrow(
             'SELECT label, id_tree
-            FROM ' . prefixTable('items') . '
+            FROM ' . prefixTable('items').'
             WHERE id = %i',
             $inputData['itemId']
         );
@@ -6761,7 +6760,7 @@ 
 
         DB::query(
             'SELECT *
-            FROM ' . prefixTable('notification') . '
+            FROM ' . prefixTable('notification').'
             WHERE item_id = %i AND user_id = %i',
             $inputData['itemId'],
             $_SESSION['user_id']
@@ -6836,7 +6835,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',
             $inputData['itemId'],
             0
@@ -6850,12 +6849,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 :%"',
                 $inputData['itemId'],
                 $_SESSION['user_id'],
@@ -6917,7 +6916,7 @@ 
         // Confirm attachments
         $rows = DB::query(
             'SELECT id, file AS filename
-            FROM ' . prefixTable('files') . '
+            FROM ' . prefixTable('files').'
             WHERE id_item = %i AND confirmed = %i',
             $inputData['itemId'],
             0
@@ -6978,7 +6977,7 @@ 
 
         $data = DB::queryFirstRow(
             'SELECT visible_folders
-            FROM ' . prefixTable('cache_tree') . ' WHERE user_id = %i',
+            FROM ' . prefixTable('cache_tree').' WHERE user_id = %i',
             $inputData['userId']
         );
         // Check if tree ID is in visible folders.
@@ -7013,15 +7012,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', $inputData['getTerm']);
+            $rows = DB::query('SELECT tag FROM '.prefixTable('tags').' WHERE tag LIKE %ss GROUP BY tag', $inputData['getTerm']);
             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;
     }
 }
@@ -7037,7 +7036,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.