nilsteampassnet / TeamPass

pages/profile.php

Spacing +34 added lines, -36 removed lines

@@ -36,15 +36,15 @@ 
 }
 
 /* do checks */
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 if (checkUser($_SESSION['user_id'], $_SESSION['key'], curPage($SETTINGS), $SETTINGS) === false) {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit();
 }
 
 // Load template
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
 // user type
 if ($_SESSION['user_admin'] === '1') {
@@ -64,31 +64,31 @@ 
 
 
 // prepare list of languages
-$languages = DB::query('SELECT label FROM ' . prefixTable('languages') . ' ORDER BY label ASC');
+$languages = DB::query('SELECT label FROM '.prefixTable('languages').' ORDER BY label ASC');
 
 
 // Do some stats
-DB::query('SELECT id_item FROM ' . prefixTable('log_items') . ' WHERE action = "at_creation" AND  id_user = "' . $_SESSION['user_id'] . '"');
+DB::query('SELECT id_item FROM '.prefixTable('log_items').' WHERE action = "at_creation" AND  id_user = "'.$_SESSION['user_id'].'"');
 $userItemsNumber = DB::count();
 
-DB::query('SELECT id_item FROM ' . prefixTable('log_items') . ' WHERE action = "at_modification" AND  id_user = "' . $_SESSION['user_id'] . '"');
+DB::query('SELECT id_item FROM '.prefixTable('log_items').' WHERE action = "at_modification" AND  id_user = "'.$_SESSION['user_id'].'"');
 $userModificationNumber = DB::count();
 
-DB::query('SELECT id_item FROM ' . prefixTable('log_items') . ' WHERE action = "at_shown" AND  id_user = "' . $_SESSION['user_id'] . '"');
+DB::query('SELECT id_item FROM '.prefixTable('log_items').' WHERE action = "at_shown" AND  id_user = "'.$_SESSION['user_id'].'"');
 $userSeenItemsNumber = DB::count();
 
-DB::query('SELECT id_item FROM ' . prefixTable('log_items') . ' WHERE action = "at_password_shown" AND  id_user = "' . $_SESSION['user_id'] . '"');
+DB::query('SELECT id_item FROM '.prefixTable('log_items').' WHERE action = "at_password_shown" AND  id_user = "'.$_SESSION['user_id'].'"');
 $userSeenPasswordsNumber = DB::count();
 
 $userInfo = DB::queryFirstRow(
     'SELECT avatar 
-    FROM ' . prefixTable('users') . ' 
-    WHERE id = "' . $_SESSION['user_id'] . '"'
+    FROM ' . prefixTable('users').' 
+    WHERE id = "' . $_SESSION['user_id'].'"'
 );
 if (empty($userInfo['avatar']) === true) {
-    $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg';
+    $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg';
 } else {
-    $avatar = $SETTINGS['cpassman_url'] . '/includes/avatars/' . $userInfo['avatar'];
+    $avatar = $SETTINGS['cpassman_url'].'/includes/avatars/'.$userInfo['avatar'];
 }
 
 // Get Groups name
@@ -96,8 +96,8 @@ 
 foreach ($_SESSION['user_roles'] as $role) {
     $tmp = DB::queryFirstRow(
         'SELECT title 
-        FROM ' . prefixTable('roles_title') . ' 
-        WHERE id = "' . $role . '"'
+        FROM ' . prefixTable('roles_title').' 
+        WHERE id = "' . $role.'"'
     );
     if ($tmp !== null) {
         array_push($userParOfGroups, $tmp['title']);
@@ -141,7 +141,7 @@ 
                         <h3 id="profile-username" class="text-center">
                             <?php
                             if (isset($_SESSION['name']) === true && empty($_SESSION['name']) === false) {
-                                echo $_SESSION['name'] . ' ' . $_SESSION['lastname'];
+                                echo $_SESSION['name'].' '.$_SESSION['lastname'];
                             } else {
                                 echo $_SESSION['login'];
                             }
@@ -208,7 +208,7 @@ 
                                             } else {
                                                 echo date('d/m/Y', $_SESSION['last_connection']);
                                             }
-                                            echo ' ' . langHdl('at') . ' ';
+                                            echo ' '.langHdl('at').' ';
                                             if (isset($SETTINGS['time_format']) === true) {
                                                 echo date($SETTINGS['time_format'], $_SESSION['last_connection']);
                                             } else {
@@ -238,12 +238,12 @@ 
                                         ) {
                                             $numDaysBeforePwExpiration = '';
                                         } else {
-                                            $numDaysBeforePwExpiration = $LANG['index_pw_expiration'] . ' ' . $_SESSION['numDaysBeforePwExpiration'] . ' ' . $LANG['days'] . '.';
+                                            $numDaysBeforePwExpiration = $LANG['index_pw_expiration'].' '.$_SESSION['numDaysBeforePwExpiration'].' '.$LANG['days'].'.';
                                         }
                                         echo '
                                     <li class="list-group-item">
-                                        <b><i class="fas fa-calendar-alt fa-fw fa-lg mr-2"></i>' . langHdl('index_last_pw_change') . '</b>
-                                        <a class="float-right">' . $last_pw_change . ' ' . $numDaysBeforePwExpiration . '</a>
+                                        <b><i class="fas fa-calendar-alt fa-fw fa-lg mr-2"></i>' . langHdl('index_last_pw_change').'</b>
+                                        <a class="float-right">' . $last_pw_change.' '.$numDaysBeforePwExpiration.'</a>
                                     </li>';
                                     }
                                     ?>
@@ -263,7 +263,7 @@ 
                                     if (isset($SETTINGS['api']) === true && (int) $SETTINGS['api'] === 1) {
                                         echo '
                                     <li class="list-group-item">
-                                        <b><i class="fas fa-paper-plane fa-fw fa-lg mr-2"></i>' . langHdl('user_profile_api_key') . '</b>
+                                        <b><i class="fas fa-paper-plane fa-fw fa-lg mr-2"></i>' . langHdl('user_profile_api_key').'</b>
                                         <a class="float-right" id="profile-user-api-token">',
                                             isset($_SESSION['user']['api-key']) === true ? $_SESSION['user']['api-key'] : '',
                                             '</a>
@@ -275,7 +275,7 @@ 
                                     ) {
                                         echo '
                                     <li class="list-group-item">
-                                        <b><i class="fas fa-id-card-o fa-fw fa-lg mr-2"></i>' . langHdl('user_profile_agses_card_id') . '</b>
+                                        <b><i class="fas fa-id-card-o fa-fw fa-lg mr-2"></i>' . langHdl('user_profile_agses_card_id').'</b>
                                         <a class="float-right">',
                                             isset($_SESSION['user']['agses-usercardid']) ? $_SESSION['user']['agses-usercardid'] : '',
                                             '</a>
@@ -299,7 +299,7 @@ 
                                         <ul class="">
                                             <?php
                                                 foreach ($_SESSION['user']['unsuccessfull_login_attempts_list'] as $entry) {
-                                                    echo '<li class="">' . $entry . '</li>';
+                                                    echo '<li class="">'.$entry.'</li>';
                                                 } ?>
                                         </ul>
                                     </div>
@@ -312,12 +312,12 @@ 
                                         <?php
                                         $rows = DB::query(
                                             'SELECT label AS labelAction, date, null
-                                            FROM ' . prefixTable('log_system') . '
+                                            FROM ' . prefixTable('log_system').'
                                             WHERE qui = %i
                                             UNION
                                             SELECT l.action, l.date, i.label AS itemLabel
-                                            FROM ' . prefixTable('log_items') . ' AS l
-                                            INNER JOIN ' . prefixTable('items') . ' AS i ON (l.id_item = i.id)
+                                            FROM ' . prefixTable('log_items').' AS l
+                                            INNER JOIN ' . prefixTable('items').' AS i ON (l.id_item = i.id)
                                             WHERE l.id_user = %i AND l.action IN ("at_access")
                                             ORDER BY date DESC
                                             LIMIT 0, 40',
@@ -331,9 +331,9 @@ 
                                                 $text = langHdl($record['labelAction']);
                                             }
                                             if (empty($record['NULL']) === false) {
-                                                $text .= ' ' . langHdl('for') . ' <span class="font-weight-light">' . addslashes($record['NULL']) . '</span>';
+                                                $text .= ' '.langHdl('for').' <span class="font-weight-light">'.addslashes($record['NULL']).'</span>';
                                             }
-                                            echo '<li class="list-group-item">' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $record['date']) . ' - ' . $text . '</li>';
+                                            echo '<li class="list-group-item">'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $record['date']).' - '.$text.'</li>';
                                         }
                                         ?>
                                     </ul>
@@ -374,11 +374,10 @@ 
                                                 <?php
                                                 foreach ($zones as $key => $zone) {
                                                     echo '
-                                                <option value="' . $key . '"',
+                                                <option value="' . $key.'"',
                                                     isset($_SESSION['user']['usertimezone']) === true && $_SESSION['user']['usertimezone'] === $key ?
-                                                    ' selected' :
-                                                    (isset($SETTINGS['timezone']) === true && $SETTINGS['timezone'] === $key ? ' selected' : ''),
-                                                '>' . $zone . '</option>';
+                                                    ' selected' : (isset($SETTINGS['timezone']) === true && $SETTINGS['timezone'] === $key ? ' selected' : ''),
+                                                '>'.$zone.'</option>';
                                                 }
                                                 ?>
                                             </select>
@@ -391,11 +390,10 @@ 
                                                 <?php
                                                 foreach ($languages as $language) {
                                                     echo 
-                                                '<option value="' . $language['label'] . '"',
+                                                '<option value="'.$language['label'].'"',
                                                     $_SESSION['user']['user_language'] === strtolower($language['label']) ?
-                                                    ' selected="selected"' :
-                                                    ($SETTINGS['default_language'] === strtolower($language['label']) ? ' selected="selected"' : ''),
-                                                '>' . $language['label'] . '</option>';
+                                                    ' selected="selected"' : ($SETTINGS['default_language'] === strtolower($language['label']) ? ' selected="selected"' : ''),
+                                                '>'.$language['label'].'</option>';
                                                 }
                                                 ?>
                                             </select>
@@ -446,7 +444,7 @@ 
                                                 <button type="button" class="btn btn-warning float-right ml-2" id="profile-avatar-file"><?php echo langHdl('upload_new_avatar'); ?></button>
                                                 <?php
                                                 if (isset($SETTINGS['api']) === true && (int) $SETTINGS['api'] === 1) {
-                                                    echo '<button type="button" class="btn btn-warning float-right" id="profile-button-api_token">' . langHdl('generate_api_token') . '</button>';
+                                                    echo '<button type="button" class="btn btn-warning float-right" id="profile-button-api_token">'.langHdl('generate_api_token').'</button>';
                                                 }
                                                 ?>
                                                 <div id="profile-avatar-file-container" class="hidden"></div>

pages/options.php

Spacing +8 added lines, -8 removed lines

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

pages/2fa.php

Spacing +4 added lines, -4 removed lines

@@ -36,15 +36,15 @@ 
 }
 
 /* do checks */
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 if (checkUser($_SESSION['user_id'], $_SESSION['key'], '2fa', $SETTINGS) === false) {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit();
 }
 
 // Load template
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
 ?>
 
@@ -108,7 +108,7 @@ 
                                     );
                                     foreach ($roles as $role) {
                                         echo '
-                                <option value="' . $role['id'] . '"', in_array($role['id'], $arrRolesMFA) === true ? ' selected' : '', '>' . addslashes($role['title']) . '</option>';
+                                <option value="' . $role['id'].'"', in_array($role['id'], $arrRolesMFA) === true ? ' selected' : '', '>'.addslashes($role['title']).'</option>';
                                     }
                                     ?>
                                 </select>

sources/main.functions.php

Spacing +205 added lines, -205 removed lines

@@ -107,7 +107,7 @@ 
     $var_dk = ''; // Derived key
 
     for ($block = 1; $block <= $var_kb; ++$block) { // Create key
-        $var_ib = $var_h = hash_hmac($var_a, $var_s . pack('N', $block), $var_p, true); // Initial hash for this block
+        $var_ib = $var_h = hash_hmac($var_a, $var_s.pack('N', $block), $var_p, true); // Initial hash for this block
         for ($var_i = 1; $var_i < $var_c; ++$var_i) { // Perform block iterations
             $var_ib ^= ($var_h = hash_hmac($var_a, $var_h, $var_p, true)); // XOR each iterate
         }
@@ -341,25 +341,25 @@ 
  */
 function cryption($message, $ascii_key, $type, $SETTINGS)
 {
-    $ascii_key = (empty($ascii_key) === true) ? file_get_contents(SECUREPATH . '/teampass-seckey.txt') : $ascii_key;
+    $ascii_key = (empty($ascii_key) === true) ? file_get_contents(SECUREPATH.'/teampass-seckey.txt') : $ascii_key;
     $err = false;
 
     // load PhpEncryption library
     if (isset($SETTINGS['cpassman_dir']) === false || empty($SETTINGS['cpassman_dir']) === true) {
         $path = '../includes/libraries/Encryption/Encryption/';
     } else {
-        $path = $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/Encryption/';
+        $path = $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/Encryption/';
     }
 
-    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.'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);
@@ -405,15 +405,15 @@ 
         $path = '../includes/libraries/Encryption/Encryption/';
     }
 
-    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.'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();
@@ -439,15 +439,15 @@ 
         $path = '../includes/libraries/Encryption/Encryption/';
     }
 
-    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.'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);
     $protected_key_encoded = $protected_key->saveToAsciiSafeString();
@@ -474,15 +474,15 @@ 
         $path = '../includes/libraries/Encryption/Encryption/';
     }
 
-    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.'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 = \Defuse\Crypto\KeyProtectedByPassword::loadFromAsciiSafeString($protected_key_encoded);
@@ -569,8 +569,8 @@ 
  */
 function db_error_handler($params)
 {
-    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);
 }
 
@@ -592,14 +592,14 @@ 
     $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));
     }
@@ -611,7 +611,7 @@ 
     DB::$encoding = DB_ENCODING;
 
     //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');
 
@@ -653,7 +653,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
@@ -675,7 +675,7 @@ 
     $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']);
     }
@@ -694,7 +694,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) {
@@ -715,7 +715,7 @@ 
     // 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) {
@@ -727,9 +727,9 @@ 
     $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');
 }
 
@@ -773,7 +773,7 @@ 
     $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
@@ -806,7 +806,7 @@ 
     // Get list of folders depending on Roles
     $rows = DB::query(
         'SELECT *
-        FROM ' . prefixTable('roles_values') . '
+        FROM ' . prefixTable('roles_values').'
         WHERE role_id IN %li AND type IN %ls',
         $userRoles,
         array('W', 'ND', 'NE', 'NDNE', 'R')
@@ -831,9 +831,9 @@ 
     // 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',
-        $globalsUserId . ';',
+        $globalsUserId.';',
         '0'
     );
     foreach ($rows as $record) {
@@ -847,8 +847,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 r.role_id IN %li
         ORDER BY i.id_tree ASC',
         $userRoles
@@ -869,7 +869,7 @@ 
     ) {
         $persoFld = DB::queryfirstrow(
             'SELECT id
-            FROM ' . prefixTable('nested_tree') . '
+            FROM ' . prefixTable('nested_tree').'
             WHERE title = %s AND personal_folder = %i',
             $globalsUserId,
             1
@@ -903,7 +903,7 @@ 
     }
     $persoFlds = DB::query(
         'SELECT id
-        FROM ' . prefixTable('nested_tree') . '
+        FROM ' . prefixTable('nested_tree').'
         WHERE %l',
         $where
     );
@@ -946,17 +946,17 @@ 
     );
 
     // 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) {
         DB::query(
             'SELECT *
-            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
@@ -1000,10 +1000,10 @@ 
  */
 function cacheTableRefresh($SETTINGS)
 {
-    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));
     }
@@ -1020,13 +1020,13 @@ 
     $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',
@@ -1038,18 +1038,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']
             );
@@ -1063,7 +1063,7 @@ 
                     // Is this a User id?
                     $user = DB::queryfirstrow(
                         'SELECT id, login
-                        FROM ' . prefixTable('users') . '
+                        FROM ' . prefixTable('users').'
                         WHERE id = %i',
                         $elem->title
                     );
@@ -1105,14 +1105,14 @@ 
  */
 function cacheTableUpdate($SETTINGS, $ident = null)
 {
-    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));
     }
@@ -1131,7 +1131,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
     );
@@ -1139,12 +1139,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 = array();
@@ -1155,7 +1155,7 @@ 
             // Is this a User id?
             $user = DB::queryfirstrow(
                 'SELECT id, login
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $elem->title
             );
@@ -1194,17 +1194,17 @@ 
  */
 function cacheTableAdd($SETTINGS, $ident = null)
 {
-    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));
     }
@@ -1223,8 +1223,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,
@@ -1234,12 +1234,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 = array();
@@ -1250,7 +1250,7 @@ 
             // Is this a User id?
             $user = DB::queryfirstrow(
                 'SELECT id, login
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $elem->title
             );
@@ -1291,48 +1291,48 @@ 
 function getStatisticsData($SETTINGS)
 {
     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();
@@ -1340,11 +1340,11 @@ 
     // 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);
@@ -1353,7 +1353,7 @@ 
     // 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)) {
@@ -1415,21 +1415,21 @@ 
 ) {
     // CAse where email not defined
     if ($email === 'none' || empty($email) === true) {
-        return '"error":"" , "message":"' . langHdl('forgot_my_pw_email_sent') . '"';
+        return '"error":"" , "message":"'.langHdl('forgot_my_pw_email_sent').'"';
     }
 
     // Load settings
-    include_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
+    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/' . $superGlobal->get('user_language', 'SESSION') . '.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/language/'.$superGlobal->get('user_language', 'SESSION').'.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', '../includes/libraries');
@@ -1437,7 +1437,7 @@ 
     $mail = new PHPMailer\PHPMailer\PHPMailer(true);
     try {
         // 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 = 0; //value 1 can be used to debug - 4 for debuging connections
         $mail->Port = $SETTINGS['email_port']; //COULD BE USED
         $mail->CharSet = 'utf-8';
@@ -1523,7 +1523,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>';
@@ -1536,7 +1536,7 @@ 
  */
 function generateKey()
 {
-    return substr(md5(rand() . rand()), 0, 15);
+    return substr(md5(rand().rand()), 0, 15);
 }
 
 /**
@@ -1606,7 +1606,7 @@ 
 {
     array_walk_recursive(
         $array,
-        function (&$item) {
+        function(&$item) {
             if (mb_detect_encoding($item, 'utf-8', true) === false) {
                 $item = utf8_encode($item);
             }
@@ -1642,7 +1642,7 @@ 
     }
 
     // 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
@@ -1654,9 +1654,9 @@ 
     }
 
     //load ClassLoader
-    include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
+    include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
     //Load AES
-    $aes = new SplClassLoader('Encryption\Crypt', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+    $aes = new SplClassLoader('Encryption\Crypt', $SETTINGS['cpassman_dir'].'/includes/libraries');
     $aes->register();
 
     if ($type === 'encode' && is_array($data) === true) {
@@ -1711,7 +1711,7 @@ 
 function makeThumbnail($src, $dest, $desired_width)
 {
     /* read the source image */
-    if(is_file($src) === true && mime_content_type($src) === 'image/png'){
+    if (is_file($src) === true && mime_content_type($src) === 'image/png') {
         $source_image = imagecreatefrompng($src);
         if ($source_image === false) {
             return "Error: Not a valid PNG file! It's type is ".mime_content_type($src);
@@ -1748,7 +1748,7 @@ 
  */
 function prefixTable($table)
 {
-    $safeTable = htmlspecialchars(DB_PREFIX . $table);
+    $safeTable = htmlspecialchars(DB_PREFIX.$table);
     if (!empty($safeTable)) {
         // sanitize string
         return $safeTable;
@@ -1780,14 +1780,14 @@ 
     $lowercase = false,
     $SETTINGS
 ) {
-    include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
-    $generator = new SplClassLoader('PasswordGenerator\Generator', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+    include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
+    $generator = new SplClassLoader('PasswordGenerator\Generator', $SETTINGS['cpassman_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', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+        $php7generator = new SplClassLoader('PasswordGenerator\RandomGenerator', $SETTINGS['cpassman_dir'].'/includes/libraries');
         $php7generator->register();
         $generator->setRandomGenerator(new PasswordGenerator\RandomGenerator\Php7RandomGenerator());
     }
@@ -1818,7 +1818,7 @@ 
 function send_syslog($message, $host, $port, $component = 'teampass')
 {
     $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, $syslog_message, strlen($syslog_message), 0, $host, $port);
     socket_close($sock);
 }
@@ -1842,7 +1842,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));
     }
@@ -1868,14 +1868,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'
@@ -1907,7 +1907,7 @@ 
     $encryption_type = null
 ) {
     // 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));
     }
@@ -1953,7 +1953,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
             );
@@ -1962,7 +1962,7 @@ 
         }
 
         send_syslog(
-            'action=' . str_replace('at_', '', $action) . ' attribute=' . str_replace('at_', '', $attribute[0]) . ' itemno=' . $item_id . ' user=' . addslashes($login) . ' itemname="' . addslashes($item_label) . '"',
+            'action='.str_replace('at_', '', $action).' attribute='.str_replace('at_', '', $attribute[0]).' itemno='.$item_id.' user='.addslashes($login).' itemname="'.addslashes($item_label).'"',
             $SETTINGS['syslog_host'],
             $SETTINGS['syslog_port'],
             'teampass'
@@ -1988,7 +1988,7 @@ 
         && $action === 'at_shown'
     ) {
         // 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
@@ -1999,7 +1999,7 @@ 
         // Get info about item
         $dataItem = DB::queryfirstrow(
             'SELECT id, id_tree, label
-            FROM ' . prefixTable('items') . '
+            FROM ' . prefixTable('items').'
             WHERE id = %i',
             $item_id
         );
@@ -2014,9 +2014,9 @@ 
                 'body' => str_replace(
                     array('#tp_user#', '#tp_item#', '#tp_link#'),
                     array(
-                        addslashes($globalsName . ' ' . $globalsLastname),
+                        addslashes($globalsName.' '.$globalsLastname),
                         addslashes($item_label),
-                        $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $item_id,
+                        $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$item_id,
                     ),
                     langHdl('email_on_open_notification_mail')
                 ),
@@ -2038,7 +2038,7 @@ 
 function notifyChangesToSubscribers($item_id, $label, $changes, $SETTINGS)
 {
     // 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
@@ -2050,8 +2050,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
@@ -2064,7 +2064,7 @@ 
         // Get list of changes
         $htmlChanges = '<ul>';
         foreach ($changes as $change) {
-            $htmlChanges .= '<li>' . $change . '</li>';
+            $htmlChanges .= '<li>'.$change.'</li>';
         }
         $htmlChanges .= '</ul>';
 
@@ -2098,7 +2098,7 @@ 
 function geItemReadablePath($id_tree, $label, $SETTINGS)
 {
     // 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');
@@ -2109,15 +2109,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.')';
     } else {
         return empty($path) === true ? '' : $path;
     }
@@ -2176,10 +2176,10 @@ 
  */
 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));
     }
@@ -2193,8 +2193,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."'";
             }
         }
 
@@ -2205,11 +2205,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'] . "' => '" . $record['valeur'] . "',\n");
+            array_push($data, "    '".$record['intitule']."' => '".$record['valeur']."',\n");
         }
         array_push($data, ");\n");
         $data = array_unique($data);
@@ -2223,15 +2223,15 @@ 
                 break;
             }
 
-            if (stristr($line, "'" . $field . "' => '")) {
-                $data[$inc] = "    '" . $field . "' => '" . filter_var($value, FILTER_SANITIZE_STRING) . "',\n";
+            if (stristr($line, "'".$field."' => '")) {
+                $data[$inc] = "    '".$field."' => '".filter_var($value, FILTER_SANITIZE_STRING)."',\n";
                 $bFound = true;
                 break;
             }
             ++$inc;
         }
         if ($bFound === false) {
-            $data[($inc)] = "    '" . $field . "' => '" . filter_var($value, FILTER_SANITIZE_STRING) . "',\n);\n";
+            $data[($inc)] = "    '".$field."' => '".filter_var($value, FILTER_SANITIZE_STRING)."',\n);\n";
         }
     }
 
@@ -2269,7 +2269,7 @@ 
         $settings = array();
 
         $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',
             array(
                 'type' => 'admin',
                 'type2' => 'settings',
@@ -2296,7 +2296,7 @@ 
     $source_cf = array();
     $rows = DB::QUERY(
         'SELECT id_category
-        FROM ' . prefixTable('categories_folders') . '
+        FROM ' . prefixTable('categories_folders').'
         WHERE id_folder = %i',
         $source_id
     );
@@ -2307,7 +2307,7 @@ 
     $target_cf = array();
     $rows = DB::QUERY(
         'SELECT id_category
-        FROM ' . prefixTable('categories_folders') . '
+        FROM ' . prefixTable('categories_folders').'
         WHERE id_folder = %i',
         $target_id
     );
@@ -2342,9 +2342,9 @@ 
     $password = null
 ) {
     // Load AntiXSS
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/voku/helper/AntiXSS.php';
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/voku/helper/ASCII.php';
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/voku/helper/UTF8.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/voku/helper/AntiXSS.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/voku/helper/ASCII.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/voku/helper/UTF8.php';
     $antiXss = new voku\helper\AntiXSS();
 
     // Protect against bad inputs
@@ -2358,7 +2358,7 @@ 
 
     if (empty($password) === true || is_null($password) === true) {
         // get KEY to define password
-        $ascii_key = file_get_contents(SECUREPATH . '/teampass-seckey.txt');
+        $ascii_key = file_get_contents(SECUREPATH.'/teampass-seckey.txt');
         $password = \Defuse\Crypto\Key::loadFromAsciiSafeString($ascii_key);
     }
 
@@ -2404,15 +2404,15 @@ 
 ) {
     // load PhpEncryption library
     $path_to_encryption = '/includes/libraries/Encryption/Encryption/';
-    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.'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(
@@ -2450,15 +2450,15 @@ 
 ) {
     // load PhpEncryption library
     $path_to_encryption = '/includes/libraries/Encryption/Encryption/';
-    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.'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(
@@ -2504,9 +2504,9 @@ 
 function fileDelete($file, $SETTINGS)
 {
     // Load AntiXSS
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/voku/helper/ASCII.php';
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/voku/helper/UTF8.php';
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/voku/helper/AntiXSS.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/voku/helper/ASCII.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/voku/helper/UTF8.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/voku/helper/AntiXSS.php';
     $antiXss = new voku\helper\AntiXSS();
 
     $file = $antiXss->xss_clean($file);
@@ -2552,7 +2552,7 @@ 
             continue;
         }
 
-        $fullPath = $dir . '/' . $file;
+        $fullPath = $dir.'/'.$file;
 
         if (is_dir($fullPath)) {
             if ($res = @chmod($fullPath, $dirPermissions)) {
@@ -2582,7 +2582,7 @@ 
  */
 function accessToItemIsGranted($item_id, $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
@@ -2592,7 +2592,7 @@ 
     // Load item data
     $data = DB::queryFirstRow(
         'SELECT id_tree
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE id = %i',
         $item_id
     );
@@ -2674,8 +2674,8 @@ 
 function performDBQuery($SETTINGS, $fields, $table)
 {
     // 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));
     }
@@ -2688,7 +2688,7 @@ 
 
     // Insert log in DB
     return DB::query(
-        'SELECT ' . $fields . '
+        'SELECT '.$fields.'
         FROM ' . prefixTable($table)
     );
 }
@@ -2703,15 +2703,15 @@ 
 function formatSizeUnits($bytes)
 {
     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 . ' bytes';
+        $bytes = $bytes.' bytes';
     } elseif ($bytes == 1) {
-        $bytes = $bytes . ' byte';
+        $bytes = $bytes.' byte';
     } else {
         $bytes = '0 bytes';
     }
@@ -2891,7 +2891,7 @@ 
     // Decrypt
     try {
         $ret = base64_encode($rsa->decrypt(base64_decode($key)));
-    } catch(Exception $e) {
+    } catch (Exception $e) {
         return $e;
     }
 
@@ -2933,16 +2933,16 @@ 
 
     // 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 array(
         'fileHash' => base64_encode($hash),
@@ -2985,7 +2985,7 @@ 
     $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));
@@ -3041,8 +3041,8 @@ 
     $SETTINGS
 ) {
     // 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));
     }
@@ -3061,7 +3061,7 @@ 
     );
 
     // Superglobals
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
 
     // Prepare superGlobal variables
@@ -3088,8 +3088,8 @@ 
         // Create sharekey for each user
         $users = DB::query(
             'SELECT id, public_key
-            FROM ' . prefixTable('users') . '
-            WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '")
+            FROM ' . prefixTable('users').'
+            WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'")
             AND public_key != ""'
         );
         foreach ($users as $user) {
@@ -3190,13 +3190,13 @@ 
     ];
 
     // 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/LdapBase.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/LdapBase.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Ldap.php';
 
     $ad = new SplClassLoader('LdapRecord', '../includes/libraries');
     $ad->register();
@@ -3209,7 +3209,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;
     }
 
@@ -3220,7 +3220,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;
     }
 
@@ -3241,8 +3241,8 @@ 
 function deleteUserObjetsKeys($userId, $SETTINGS)
 {
     // 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));
     }
@@ -3303,7 +3303,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);
@@ -3315,7 +3315,7 @@ 
 function format_GMT_offset($offset) {
     $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) : '');
 }
 
 function format_timezone_name($name) {

sources/tree.php

Spacing +51 added lines, -56 removed lines

@@ -40,11 +40,11 @@ 
 }
 
 // includes
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
-require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
 
 // header
 header('Content-type: text/html; charset=utf-8');
@@ -58,7 +58,7 @@ 
 }
 
 // Connect to mysql server
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
 if (defined('DB_PASSWD_CLEAR') === false) {
     define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
 }
@@ -70,7 +70,7 @@ 
 DB::$encoding = DB_ENCODING;
 
 // Superglobal load
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
 $superGlobal = new protect\SuperGlobal\SuperGlobal();
 
 $session_user_admin = $superGlobal->get('user_admin', 'GET');
@@ -79,7 +79,7 @@ 
 
 
 $lastFolderChange = DB::query(
-    'SELECT * FROM ' . prefixTable('misc') . '
+    'SELECT * FROM '.prefixTable('misc').'
     WHERE type = %s AND intitule = %s',
     'timestamp',
     'last_folder_change'
@@ -90,7 +90,7 @@ 
     || (isset($_GET['force_refresh']) === true && (int) $_GET['force_refresh'] === 1)
 ) {
     // Build tree
-    $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+    $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries');
     $tree->register();
     $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
 
@@ -189,7 +189,7 @@ 
     $SETTINGS
 ) {
     // Load library
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
 
     // Prepare superGlobal variables
@@ -243,7 +243,7 @@ 
                 // get count of Items in this folder
                 DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE inactif=%i AND id_tree = %i',
                     0,
                     $node->id
@@ -253,7 +253,7 @@ 
                 // get info about current folder
                 DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('nested_tree') . '
+                    FROM ' . prefixTable('nested_tree').'
                     WHERE parent_id = %i',
                     $node->id
                 );
@@ -261,11 +261,10 @@ 
 
                 // If personal Folder, convert id into user name
                 $node->title = ($node->title === $session_user_id && (int) $node->nlevel === 1) ?
-                    $session_login : 
-                    ($node->title === null ? '' : htmlspecialchars_decode($node->title, ENT_QUOTES));
+                    $session_login : ($node->title === null ? '' : htmlspecialchars_decode($node->title, ENT_QUOTES));
 
                 // prepare json return for current node
-                $parent = ($node->parent_id == 0) ? '#' : 'li_' . $node->parent_id;
+                $parent = ($node->parent_id == 0) ? '#' : 'li_'.$node->parent_id;
 
                 // special case for READ-ONLY folder
                 $title = ($session_user_read_only === true && !in_array($node->id, $session_personal_folders)) ? langHdl('read_only_account') : $title;
@@ -275,36 +274,33 @@ 
 
                 if (in_array($node->id, $session_groupes_visibles)) {
                     if (in_array($node->id, $session_read_only_folders)) {
-                        $text = "<i class='far fa-eye fa-xs mr-1'></i>" . $text;
+                        $text = "<i class='far fa-eye fa-xs mr-1'></i>".$text;
                         $title = langHdl('read_only_account');
                         $restricted = 1;
                         $folderClass = 'folder_not_droppable';
                     } elseif ($session_user_read_only === true && !in_array($node->id, $session_personal_visible_groups)) {
-                        $text = "<i class='far fa-eye fa-xs mr-1'></i>" . $text;
+                        $text = "<i class='far fa-eye fa-xs mr-1'></i>".$text;
                     }
                     $text .= 
-                        ' <span class=\'badge badge-danger ml-2 items_count\' id=\'itcount_' . $node->id . '\'>' . $itemsNb . '</span>'
+                        ' <span class=\'badge badge-danger ml-2 items_count\' id=\'itcount_'.$node->id.'\'>'.$itemsNb.'</span>'
                         .((isset($SETTINGS['tree_counters']) && $SETTINGS['tree_counters'] == 1) ?
-                            '/'.$nbChildrenItems .
-                            '/'.(count($nodeDescendants) - 1)  :
-                            '')
+                            '/'.$nbChildrenItems.
+                            '/'.(count($nodeDescendants) - 1) : '')
                         .'</span>';
                 } elseif (in_array($node->id, $listFoldersLimitedKeys)) {
                     $restricted = '1';
                     $text .= 
                         $session_user_read_only === true ? 
-                            "<i class='far fa-eye fa-xs mr-1'></i>" :
-                            ''
-                        .'<span class=\'badge badge-danger ml-2 items_count\' id=\'itcount_' . $node->id . '\'>' . count($session_list_folders_limited[$node->id]) . '</span>';
+                            "<i class='far fa-eye fa-xs mr-1'></i>" : ''
+                        .'<span class=\'badge badge-danger ml-2 items_count\' id=\'itcount_'.$node->id.'\'>'.count($session_list_folders_limited[$node->id]).'</span>';
                 } elseif (in_array($node->id, $listRestrictedFoldersForItemsKeys)) {
                     $restricted = '1';
                     if ($session_user_read_only === true) {
-                        $text = "<i class='far fa-eye fa-xs mr-1'></i>" . $text;
+                        $text = "<i class='far fa-eye fa-xs mr-1'></i>".$text;
                     }
                     $text .= $session_user_read_only === true ? 
-                        "<i class='far fa-eye fa-xs mr-1'></i>" :
-                        ''
-                        . '<span class=\'badge badge-danger ml-2 items_count\' id=\'itcount_' . $node->id . '\'>' . count($session_list_restricted_folders_for_items[$node->id]) . '</span>';
+                        "<i class='far fa-eye fa-xs mr-1'></i>" : ''
+                        . '<span class=\'badge badge-danger ml-2 items_count\' id=\'itcount_'.$node->id.'\'>'.count($session_list_restricted_folders_for_items[$node->id]).'</span>';
                 } else {
                     $restricted = '1';
                     $folderClass = 'folder_not_droppable';
@@ -330,18 +326,18 @@ 
                     array_push(
                         $ret_json,
                         array(
-                            'id' => 'li_' . $node->id,
+                            'id' => 'li_'.$node->id,
                             'parent' => $parent,
                             'text' => $text,
                             'children' => $childrenNb == 0 ? false : true,
                             'li_attr' => array(
                                 'class' => 'jstreeopen',
-                                'title' => 'ID [' . $node->id . '] ' . $title,
+                                'title' => 'ID ['.$node->id.'] '.$title,
                             ),
                             'a_attr' => array(
-                                'id' => 'fld_' . $node->id,
+                                'id' => 'fld_'.$node->id,
                                 'class' => $folderClass,
-                                'onclick' => 'ListerItems(' . $node->id . ', ' . $restricted . ', 0, 1)',
+                                'onclick' => 'ListerItems('.$node->id.', '.$restricted.', 0, 1)',
                                 'data-title' => $node->title,
                             ),
                         )
@@ -350,13 +346,13 @@ 
                     array_push(
                         $ret_json,
                         array(
-                            'id' => 'li_' . $node->id,
+                            'id' => 'li_'.$node->id,
                             'parent' =>  $parent,
                             'children' => $childrenNb == 0 ? false : true,
-                            'text' => '<i class="fas fa-times fa-xs text-danger mr-1"></i>' . $text,
+                            'text' => '<i class="fas fa-times fa-xs text-danger mr-1"></i>'.$text,
                             'li_attr' => array(
                                 'class' => '',
-                                'title' => 'ID [' . $node->id . '] ' . langHdl('no_access'),
+                                'title' => 'ID ['.$node->id.'] '.langHdl('no_access'),
                             ),
                         )
                     );
@@ -408,7 +404,7 @@ 
     }
 
     // Load library
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
 
     // Prepare superGlobal variables
@@ -445,7 +441,7 @@ 
                 ) === true
             ) {
                 DB::query(
-                    'SELECT * FROM ' . prefixTable('items') . '
+                    'SELECT * FROM '.prefixTable('items').'
                     WHERE inactif=%i AND id_tree = %i',
                     0,
                     $node
@@ -475,7 +471,7 @@ 
         if ($displayThisNode === true) {
             // get info about current folder
             DB::query(
-                'SELECT * FROM ' . prefixTable('items') . '
+                'SELECT * FROM '.prefixTable('items').'
                 WHERE inactif=%i AND id_tree = %i',
                 0,
                 $completTree[$nodeId]->id
@@ -503,7 +499,7 @@ 
 
             if (in_array($completTree[$nodeId]->id, $session_groupes_visibles) === true) {
                 if (in_array($completTree[$nodeId]->id, $session_read_only_folders) === true) {
-                    $text = "<i class='far fa-eye fa-xs mr-1'></i>" . $text;
+                    $text = "<i class='far fa-eye fa-xs mr-1'></i>".$text;
                     $title = langHdl('read_only_account');
                     $restricted = 1;
                     $folderClass = 'folder_not_droppable';
@@ -511,27 +507,26 @@ 
                     $session_user_read_only === true
                     && in_array($completTree[$nodeId]->id, $session_personal_visible_groups) === false
                 ) {
-                    $text = "<i class='far fa-eye fa-xs mr-1'></i>" . $text;
+                    $text = "<i class='far fa-eye fa-xs mr-1'></i>".$text;
                 }
                 $text .= 
-                    '<span class=\'badge badge-pill badge-light ml-2 items_count\' id=\'itcount_' . $completTree[$nodeId]->id . '\'>' . $itemsNb .
+                    '<span class=\'badge badge-pill badge-light ml-2 items_count\' id=\'itcount_'.$completTree[$nodeId]->id.'\'>'.$itemsNb.
                     ((isset($SETTINGS['tree_counters']) === true && (int) $SETTINGS['tree_counters'] === 1) ?
-                        '/'.$nbChildrenItems .
-                        '/'.(count($nodeDescendants) - 1)  :
-                        '')
+                        '/'.$nbChildrenItems.
+                        '/'.(count($nodeDescendants) - 1) : '')
                     . '</span>';
             } elseif (in_array($completTree[$nodeId]->id, $listFoldersLimitedKeys) === true) {
                 $restricted = '1';
                 if ($session_user_read_only === true) {
-                    $text = "<i class='far fa-eye fa-xs mr-1'></i>" . $text;
+                    $text = "<i class='far fa-eye fa-xs mr-1'></i>".$text;
                 }
-                $text .= '<span class=\'badge badge-pill badge-light ml-2 items_count\' id=\'itcount_' . $completTree[$nodeId]->id . '\'>' . count($session_list_folders_limited[$completTree[$nodeId]->id]);
+                $text .= '<span class=\'badge badge-pill badge-light ml-2 items_count\' id=\'itcount_'.$completTree[$nodeId]->id.'\'>'.count($session_list_folders_limited[$completTree[$nodeId]->id]);
             } elseif (in_array($completTree[$nodeId]->id, $listRestrictedFoldersForItemsKeys) === true) {
                 $restricted = '1';
                 if ($session_user_read_only === true) {
-                    $text = "<i class='far fa-eye fa-xs mr-1'></i>" . $text;
+                    $text = "<i class='far fa-eye fa-xs mr-1'></i>".$text;
                 }
-                $text .= '<span class=\'badge badge-pill badge-light ml-2 items_count\' id=\'itcount_' . $completTree[$nodeId]->id . '\'>' . count($session_list_restricted_folders_for_items[$completTree[$nodeId]->id]) . '</span>';
+                $text .= '<span class=\'badge badge-pill badge-light ml-2 items_count\' id=\'itcount_'.$completTree[$nodeId]->id.'\'>'.count($session_list_restricted_folders_for_items[$completTree[$nodeId]->id]).'</span>';
             } else {
                 $restricted = '1';
                 $folderClass = 'folder_not_droppable';
@@ -568,7 +563,7 @@ 
             }
 
             // prepare json return for current node
-            $parent = ($completTree[$nodeId]->parent_id === '0') ? '#' : 'li_' . $completTree[$nodeId]->parent_id;
+            $parent = ($completTree[$nodeId]->parent_id === '0') ? '#' : 'li_'.$completTree[$nodeId]->parent_id;
 
             // handle displaying
             if (
@@ -588,17 +583,17 @@ 
                 array_push(
                     $ret_json,
                     array(
-                        'id' => 'li_' . $completTree[$nodeId]->id,
+                        'id' => 'li_'.$completTree[$nodeId]->id,
                         'parent' => $last_visible_parent === -1 ? $parent : $last_visible_parent,
                         'text' => $text,
                         'li_attr' => array(
                             'class' => 'jstreeopen',
-                            'title' => 'ID [' . $completTree[$nodeId]->id . '] ' . $title,
+                            'title' => 'ID ['.$completTree[$nodeId]->id.'] '.$title,
                         ),
                         'a_attr' => array(
-                            'id' => 'fld_' . $completTree[$nodeId]->id,
+                            'id' => 'fld_'.$completTree[$nodeId]->id,
                             'class' => $folderClass,
-                            'onclick' => 'ListerItems(' . $completTree[$nodeId]->id . ', ' . $restricted . ', 0, 1)',
+                            'onclick' => 'ListerItems('.$completTree[$nodeId]->id.', '.$restricted.', 0, 1)',
                             'data-title' => $completTree[$nodeId]->title,
                         ),
                     )
@@ -607,12 +602,12 @@ 
                 array_push(
                     $ret_json,
                     array(
-                        'id' => 'li_' . $completTree[$nodeId]->id,
+                        'id' => 'li_'.$completTree[$nodeId]->id,
                         'parent' => $last_visible_parent === -1 ? $parent : $last_visible_parent,
-                        'text' => '<i class="fas fa-times fa-xs text-danger mr-1"></i>' . $text,
+                        'text' => '<i class="fas fa-times fa-xs text-danger mr-1"></i>'.$text,
                         'li_attr' => array(
                             'class' => '',
-                            'title' => 'ID [' . $completTree[$nodeId]->id . '] ' . langHdl('no_access'),
+                            'title' => 'ID ['.$completTree[$nodeId]->id.'] '.langHdl('no_access'),
                         ),
                     )
                 );

sources/export.queries.php

Spacing +78 added lines, -78 removed lines

@@ -47,26 +47,26 @@ 
 }
 
 // Do checks
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'items', $SETTINGS) === false) {
     // Not allowed page
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit();
 }
 
 // No time limit
 set_time_limit(0);
 
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
 header('Content-type: text/html; charset=utf-8');
 error_reporting(E_ERROR);
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
 
 // Connect to mysql server
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
 if (defined('DB_PASSWD_CLEAR') === false) {
     define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
 }
@@ -78,12 +78,12 @@ 
 DB::$encoding = DB_ENCODING;
 
 // 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($pre . 'nested_tree', 'id', 'parent_id', 'title');
+$tree = new Tree\NestedTree\NestedTree($pre.'nested_tree', 'id', 'parent_id', 'title');
 
 // User's language loading
-require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
 
 // Prepare POST variables
 $id = filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT);
@@ -134,9 +134,9 @@ 
                         'SELECT i.id as id, i.id_tree as id_tree, i.restricted_to as restricted_to, i.perso as perso,
                             i.label as label, i.description as description, i.pw as pw, i.login as login, i.url as url,
                             i.email as email,l.date as date, i.pw_iv as pw_iv,n.renewal_period as renewal_period
-                        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 i.inactif = %i
                         AND i.id_tree= %i
                         AND (l.action = %s OR (l.action = %s AND l.raison LIKE %s))
@@ -159,8 +159,8 @@ 
                                 // Run query
                                 $dataItem = DB::queryfirstrow(
                                     'SELECT i.pw AS pw, s.share_key AS share_key
-                                    FROM ' . prefixTable('items') . ' AS i
-                                    INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (s.object_id = i.id)
+                                    FROM ' . prefixTable('items').' AS i
+                                    INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (s.object_id = i.id)
                                     WHERE user_id = %i AND i.id = %i',
                                     $_SESSION['user_id'],
                                     $record['id']
@@ -184,8 +184,8 @@ 
                                 $arr_kbs = [];
                                 $rows_kb = DB::query(
                                     'SELECT b.label, b.id
-                                    FROM ' . prefixTable('kb_items') . ' AS a
-                                    INNER JOIN ' . prefixTable('kb') . ' AS b ON (a.kb_id = b.id)
+                                    FROM ' . prefixTable('kb_items').' AS a
+                                    INNER JOIN ' . prefixTable('kb').' AS b ON (a.kb_id = b.id)
                                     WHERE a.item_id = %i',
                                     $record['id']
                                 );
@@ -197,7 +197,7 @@ 
                                 $arr_tags = [];
                                 $rows_tag = DB::query(
                                     'SELECT tag
-                                    FROM ' . prefixTable('tags') . '
+                                    FROM ' . prefixTable('tags').'
                                     WHERE item_id = %i',
                                     $record['id']
                                 );
@@ -244,14 +244,14 @@ 
                 $tmp .= array2csv($value);
             }
 
-            echo '[{"content":"' . base64_encode($tmp) . '"}]';
+            echo '[{"content":"'.base64_encode($tmp).'"}]';
             break;
 
             /*
          * PDF - step 1 - Prepare database
          */
         case 'initialize_export_table':
-            DB::query('TRUNCATE TABLE ' . prefixTable('export'));
+            DB::query('TRUNCATE TABLE '.prefixTable('export'));
             break;
 
             /*
@@ -295,9 +295,9 @@ 
                     'SELECT i.id as id, i.restricted_to as restricted_to, i.perso as perso, i.label as label, i.description as description, i.pw as pw, i.login as login, i.url as url, i.email as email,
                         l.date as date, i.pw_iv as pw_iv,
                         n.renewal_period as renewal_period
-                        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 i.inactif = %i
                         AND i.id_tree= %i
                         AND (l.action = %s OR (l.action = %s AND l.raison LIKE %s))
@@ -324,8 +324,8 @@ 
                             // Run query
                             $dataItem = DB::queryfirstrow(
                                 'SELECT i.pw AS pw, s.share_key AS share_key
-                                FROM ' . prefixTable('items') . ' AS i
-                                INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (s.object_id = i.id)
+                                FROM ' . prefixTable('items').' AS i
+                                INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (s.object_id = i.id)
                                 WHERE user_id = %i AND i.id = %i',
                                 $_SESSION['user_id'],
                                 $record['id']
@@ -349,8 +349,8 @@ 
                             $arr_kbs = '';
                             $rows_kb = DB::query(
                                 'SELECT b.label, b.id
-                                FROM ' . prefixTable('kb_items') . ' AS a
-                                INNER JOIN ' . prefixTable('kb') . ' AS b ON (a.kb_id = b.id)
+                                FROM ' . prefixTable('kb_items').' AS a
+                                INNER JOIN ' . prefixTable('kb').' AS b ON (a.kb_id = b.id)
                                 WHERE a.item_id = %i',
                                 $record['id']
                             );
@@ -358,7 +358,7 @@ 
                                 if (empty($arr_kbs)) {
                                     $arr_kbs = $rec_kb['label'];
                                 } else {
-                                    $arr_kbs .= ' | ' . $rec_kb['label'];
+                                    $arr_kbs .= ' | '.$rec_kb['label'];
                                 }
                             }
 
@@ -366,7 +366,7 @@ 
                             $arr_tags = '';
                             $rows_tag = DB::query(
                                 'SELECT tag
-                                FROM ' . prefixTable('tags') . '
+                                FROM ' . prefixTable('tags').'
                                 WHERE item_id = %i',
                                 $record['id']
                             );
@@ -374,7 +374,7 @@ 
                                 if (empty($arr_tags)) {
                                     $arr_tags = $rec_tag['tag'];
                                 } else {
-                                    $arr_tags .= ' ' . $rec_tag['tag'];
+                                    $arr_tags .= ' '.$rec_tag['tag'];
                                 }
                             }
 
@@ -443,7 +443,7 @@ 
             header('Content-type: application/pdf');
 
             // query
-            $rows = DB::query('SELECT * FROM ' . prefixTable('export'));
+            $rows = DB::query('SELECT * FROM '.prefixTable('export'));
             $counter = DB::count();
             if ($counter > 0) {
                 // print
@@ -453,8 +453,8 @@ 
                 $prev_path = '';
 
                 //Prepare the PDF file
-                require_once($SETTINGS['cpassman_dir'] . '/includes/libraries/Pdf/tcpdf/config/tcpdf_config.php');
-                include $SETTINGS['cpassman_dir'] . '/includes/libraries/Pdf/tcpdf/tcpdf.php';
+                require_once($SETTINGS['cpassman_dir'].'/includes/libraries/Pdf/tcpdf/config/tcpdf_config.php');
+                include $SETTINGS['cpassman_dir'].'/includes/libraries/Pdf/tcpdf/tcpdf.php';
 
                 $pdf = new TCPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, 'UTF-8', false);
                 $pdf->SetProtection(array('print'), $dataReceived['pdf_password'], null);
@@ -466,7 +466,7 @@ 
 
                 // set default header data
                 $pdf->SetHeaderData(
-                    $SETTINGS['cpassman_dir'] . '/includes/images/teampass-logo2-home.png',
+                    $SETTINGS['cpassman_dir'].'/includes/images/teampass-logo2-home.png',
                     PDF_HEADER_LOGO_WIDTH,
                     'Teampass export',
                     $_SESSION['lastname']." ".$_SESSION['name'].' @ '.date($SETTINGS['date_format']." ".$SETTINGS['time_format'], time())
@@ -570,7 +570,7 @@ 
                 logEvents($SETTINGS, 'pdf_export', '', $_SESSION['user_id'], $_SESSION['login']);
 
                 //clean table
-                DB::query('TRUNCATE TABLE ' . prefixTable('export'));
+                DB::query('TRUNCATE TABLE '.prefixTable('export'));
 
                 // Send back the file in Blob
                 echo $pdf->Output(null, 'I');
@@ -582,8 +582,8 @@ 
             // step 1:
             // - prepare export file
             // - get full list of objects id to export
-            include $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
-            include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/GibberishAES/GibberishAES.php';
+            include $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+            include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/GibberishAES/GibberishAES.php';
             $idsList = array();
             $objNumber = 0;
 
@@ -596,9 +596,9 @@ 
                     // count elements to display
                     $result = DB::query(
                         'SELECT i.id AS id, i.label AS label, i.restricted_to AS restricted_to, i.perso AS perso
-                    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 i.inactif = %i
                     AND i.id_tree= %i
                     AND (l.action = %s OR (l.action = %s AND l.raison LIKE %s))
@@ -627,9 +627,9 @@ 
 
             // prepare export file
             //save the file
-            $html_file = '/teampass_export_' . time() . '_' . generateKey() . '.html';
+            $html_file = '/teampass_export_'.time().'_'.generateKey().'.html';
             //print_r($full_listing);
-            $outstream = fopen($SETTINGS['path_to_files_folder'] . $html_file, 'w');
+            $outstream = fopen($SETTINGS['path_to_files_folder'].$html_file, 'w');
             if ($outstream === false) {
                 echo '[{"error":"true"}]';
                 break;
@@ -653,12 +653,12 @@ 
     </style>
     </head>
     <body>
-    <input type="hidden" id="generation_date" value="' . GibberishAES::enc(/** @scrutinizer ignore-type */ (string) time(), $post_pdf_password) . '" />
+    <input type="hidden" id="generation_date" value="' . GibberishAES::enc(/** @scrutinizer ignore-type */ (string) time(), $post_pdf_password).'" />
     <div id="header">
-    ' . TP_TOOL_NAME . ' - Off Line mode
+    ' . TP_TOOL_NAME.' - Off Line mode
     </div>
     <div style="margin:10px; font-size:9px;">
-    <i>This page was generated by <b>' . $_SESSION['name'] . ' ' . $_SESSION['lastname'] . '</b>, the ' . date('Y/m/d H:i:s') . '.</i>
+    <i>This page was generated by <b>' . $_SESSION['name'].' '.$_SESSION['lastname'].'</b>, the '.date('Y/m/d H:i:s').'.</i>
     <span id="info_page" style="margin-left:20px; font-weight:bold; font-size: 14px; color:red;"></span>
     </div>
     <div id="information"></div>
@@ -669,11 +669,11 @@ 
     <div>
     <table id="itemsTable">
         <thead><tr>
-            <th style="width:15%;">' . $LANG['label'] . '</th>
-            <th style="width:10%;">' . $LANG['pw'] . '</th>
-            <th style="width:30%;">' . $LANG['description'] . '</th>
-            <th style="width:5%;">' . $LANG['user_login'] . '</th>
-            <th style="width:20%;">' . $LANG['url'] . '</th>
+            <th style="width:15%;">' . $LANG['label'].'</th>
+            <th style="width:10%;">' . $LANG['pw'].'</th>
+            <th style="width:30%;">' . $LANG['description'].'</th>
+            <th style="width:5%;">' . $LANG['user_login'].'</th>
+            <th style="width:20%;">' . $LANG['url'].'</th>
         </tr></thead>
         <tbody id="itemsTable_tbody">'
             );
@@ -698,22 +698,22 @@ 
                 || in_array($post_idTree, $_SESSION['groupes_visibles']) === false
                 || (in_array($post_idTree, $_SESSION['no_access_folders']) === true)
             ) {
-                echo '[{"loop":"true", "number":"' . $post_number . '", "cpt":"' . $post_cpt . '", "file":"' . $post_file . '", "idsList":"' . $post_idsList . '" , "file_link":"' . $post_file_link . '"}]';
+                echo '[{"loop":"true", "number":"'.$post_number.'", "cpt":"'.$post_cpt.'", "file":"'.$post_file.'", "idsList":"'.$post_idsList.'" , "file_link":"'.$post_file_link.'"}]';
                 break;
             }
 
             $full_listing = array();
             $items_id_list = array();
-            include $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
-            include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/GibberishAES/GibberishAES.php';
+            include $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+            include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/GibberishAES/GibberishAES.php';
 
             $rows = DB::query(
                 'SELECT i.id as id, i.url as url, i.perso as perso, i.label as label, i.description as description, i.pw as pw, i.login as login, i.id_tree as id_tree,
                 l.date as date, i.pw_iv as pw_iv,
                 n.renewal_period as renewal_period
-            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 i.inactif = %i
             AND i.id_tree= %i
             AND (l.action = %s OR (l.action = %s AND l.raison LIKE %s))
@@ -774,7 +774,7 @@ 
             }
 
             //save in export file
-            $outstream = fopen($post_file . '.txt', 'a');
+            $outstream = fopen($post_file.'.txt', 'a');
             if ($outstream === false) {
                 echo '[{"error":"true"}]';
                 break;
@@ -812,13 +812,13 @@ 
                         if (empty($arboHtml)) {
                             $arboHtml = $arboHtml_tmp;
                         } else {
-                            $arboHtml .= ' » ' . $arboHtml_tmp;
+                            $arboHtml .= ' » '.$arboHtml_tmp;
                         }
                     }
                     fputs(
                         $outstream,
                         '
-        <tr class="path"><td colspan="5">' . $arboHtml . '</td></tr>'
+        <tr class="path"><td colspan="5">' . $arboHtml.'</td></tr>'
                     );
                     $idTree = $elem['id_tree'];
                 }
@@ -827,12 +827,12 @@ 
                 fputs(
                     $outstream,
                     '
-        <tr class="' . $lineType . '">
-            <td>' . addslashes($elem['label']) . '</td>
-            <td align="center"><span class="span_pw" id="span_' . $elem['id'] . '"><a href="#" onclick="decryptme(' . $elem['id'] . ', \'' . $encPw . '\');return false;">Decrypt </a></span><input type="hidden" id="hide_' . $elem['id'] . '" value="' . $encPw . '" /></td>
-            <td>' . $desc . '</td>
-            <td align="center">' . $login . '</td>
-            <td align="center">' . $url . '</td>
+        <tr class="' . $lineType.'">
+            <td>' . addslashes($elem['label']).'</td>
+            <td align="center"><span class="span_pw" id="span_' . $elem['id'].'"><a href="#" onclick="decryptme('.$elem['id'].', \''.$encPw.'\');return false;">Decrypt </a></span><input type="hidden" id="hide_'.$elem['id'].'" value="'.$encPw.'" /></td>
+            <td>' . $desc.'</td>
+            <td align="center">' . $login.'</td>
+            <td align="center">' . $url.'</td>
             </tr>'
                 );
             }
@@ -840,29 +840,29 @@ 
             fclose($outstream);
 
             // send back and continue
-            echo '[{"loop":"true", "number":"' . $post_number . '", "cpt":"' . $post_cpt . '", "file":"' . $post_file . '", "idsList":"' . $post_idsList . '" , "file_link":"' . $post_file_link . '"}]';
+            echo '[{"loop":"true", "number":"'.$post_number.'", "cpt":"'.$post_cpt.'", "file":"'.$post_file.'", "idsList":"'.$post_idsList.'" , "file_link":"'.$post_file_link.'"}]';
             break;
 
             //CASE export in HTML format - Iteration loop
         case 'export_to_html_format_finalize':
             // Load includes
-            include $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/GibberishAES/GibberishAES.php';
+            include $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/GibberishAES/GibberishAES.php';
 
             // read the content of the temporary file
-            $handle = fopen($post_file . '.txt', 'r');
+            $handle = fopen($post_file.'.txt', 'r');
             if ($handle === false) {
                 echo '[{"error":"true"}]';
                 break;
             }
-            $contents = fread($handle, filesize($post_file . '.txt'));
+            $contents = fread($handle, filesize($post_file.'.txt'));
             if ($contents === false) {
                 echo '[{"error":"true"}]';
                 break;
             }
             fclose($handle);
-            if (is_file($post_file . '.txt')) {
-                unlink($post_file . '.txt');
+            if (is_file($post_file.'.txt')) {
+                unlink($post_file.'.txt');
             }
 
             // Encrypt its content
@@ -873,7 +873,7 @@ 
                 if (empty($encrypted_text) === true) {
                     $encrypted_text = GibberishAES::enc(/** @scrutinizer ignore-type */ $chunk, $post_pdf_password);
                 } else {
-                    $encrypted_text .= '|#|#|' . GibberishAES::enc(/** @scrutinizer ignore-type */ $chunk, $post_pdf_password);
+                    $encrypted_text .= '|#|#|'.GibberishAES::enc(/** @scrutinizer ignore-type */ $chunk, $post_pdf_password);
                 }
             }
 
@@ -890,9 +890,9 @@ 
         </table></div>
         <input type="button" value="Hide all" onclick="hideAll()" />
         <div id="footer" style="text-align:center;">
-            <a href="https://teampass.net/about/" target="_blank" style="">' . TP_TOOL_NAME . '&nbsp;' . TP_VERSION_FULL . '&nbsp;' . TP_COPYRIGHT . '</a>
+            <a href="https://teampass.net/about/" target="_blank" style="">' . TP_TOOL_NAME.'&nbsp;'.TP_VERSION_FULL.'&nbsp;'.TP_COPYRIGHT.'</a>
         </div>
-        <div id="enc_html" style="display:none;">' . $encrypted_text . '</div>
+        <div id="enc_html" style="display:none;">' . $encrypted_text.'</div>
         </body>
     </html>
     <script type="text/javascript">
@@ -998,9 +998,9 @@ 
 
             fclose($outstream);
 
-            echo '[{"text":"<a href=\'' .
-                $post_file_link .
-                '\' target=\'_blank\'>' . $LANG['pdf_download'] . '</a>"}]';
+            echo '[{"text":"<a href=\''.
+                $post_file_link.
+                '\' target=\'_blank\'>'.$LANG['pdf_download'].'</a>"}]';
             break;
     }
 }

sources/main.queries.php

Spacing +142 added lines, -142 removed lines

@@ -43,8 +43,8 @@ 
 }
 
 // DO CHECKS
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 $post_type = filter_input(INPUT_POST, 'type', FILTER_SANITIZE_STRING);
 if (
     isset($post_type) === true
@@ -60,7 +60,7 @@ 
     && checkUser($_SESSION['user_id'], $_SESSION['key'], 'home', $SETTINGS) === false
 ) {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit();
 } elseif ((isset($_SESSION['user_id']) === true
         && isset($_SESSION['key'])) === true
@@ -71,7 +71,7 @@ 
     mainQuery($SETTINGS);
 } else {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit();
 }
 
@@ -102,15 +102,15 @@ 
         date_default_timezone_set('UTC');
     }
 
-    include_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
-    include_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
 
     // Includes
-    include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
-    include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
+    include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
+    include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
 
     // Connect to mysql server
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
     if (defined('DB_PASSWD_CLEAR') === false) {
         define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
     }
@@ -122,7 +122,7 @@ 
     DB::$encoding = DB_ENCODING;
 
     // User's language loading
-    include_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
 
     // Prepare post variables
     $post_key = filter_input(INPUT_POST, 'key', FILTER_SANITIZE_STRING);
@@ -191,7 +191,7 @@ 
                     echo prepareExchangedData(
                         array(
                             'error' => true,
-                            'message' => '<div style="margin:10px 0 10px 15px;">' . langHdl('error_not_allowed_to') . '</div>',
+                            'message' => '<div style="margin:10px 0 10px 15px;">'.langHdl('error_not_allowed_to').'</div>',
                         ),
                         'encode'
                     );
@@ -201,7 +201,7 @@ 
                 // check if expected security level is reached
                 $dataUser = DB::queryfirstrow(
                     'SELECT *
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE id = %i',
                     $post_user_id
                 );
@@ -223,8 +223,8 @@ 
                 if (empty($dataUser['fonction_id']) === false) {
                     $data = DB::queryFirstRow(
                         'SELECT complexity
-                        FROM ' . prefixTable('roles_title') . '
-                        WHERE id IN (' . $dataUser['fonction_id'] . ')
+                        FROM ' . prefixTable('roles_title').'
+                        WHERE id IN (' . $dataUser['fonction_id'].')
                         ORDER BY complexity DESC'
                     );
                 } else {
@@ -237,8 +237,8 @@ 
                     echo prepareExchangedData(
                         array(
                             'error' => true,
-                            'message' => '<div style="margin:10px 0 10px 15px;">' . langHdl('complexity_level_not_reached') . '.<br>' .
-                                langHdl('expected_complexity_level') . ': <b>' . TP_PW_COMPLEXITY[$data['complexity']][1] . '</b></div>',
+                            'message' => '<div style="margin:10px 0 10px 15px;">'.langHdl('complexity_level_not_reached').'.<br>'.
+                                langHdl('expected_complexity_level').': <b>'.TP_PW_COMPLEXITY[$data['complexity']][1].'</b></div>',
                         ),
                         'encode'
                     );
@@ -439,14 +439,14 @@ 
                 // Get data about user
                 $data = DB::queryfirstrow(
                     'SELECT id, email, pw
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE login = %s',
                     $post_login
                 );
             } else {
                 $data = DB::queryfirstrow(
                     'SELECT id, login, email, pw
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE id = %i',
                     $post_id
                 );
@@ -457,7 +457,7 @@ 
             $counter = DB::count();
 
             // load passwordLib library
-            $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+            $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'].'/includes/libraries');
             $pwdlib->register();
             $pwdlib = new PasswordLib\PasswordLib();
 
@@ -503,7 +503,7 @@ 
                     );
                 } else {
                     // generate new GA user code
-                    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php';
+                    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php';
                     $tfa = new Authentication\TwoFactorAuth\TwoFactorAuth($SETTINGS['ga_website_name']);
                     $gaSecretKey = $tfa->createSecret();
                     $gaTemporaryCode = GenerateCryptKey(12, false, true, true, false, true, $SETTINGS);
@@ -598,7 +598,7 @@ 
                                 'email' => $data['email'],
                                 'email_result' => str_replace(
                                     '#email#',
-                                    '<b>' . obfuscateEmail($data['email']) . '</b>',
+                                    '<b>'.obfuscateEmail($data['email']).'</b>',
                                     addslashes(langHdl('admin_email_result_ok'))
                                 ),
                             ),
@@ -613,7 +613,7 @@ 
                                 'email' => $data['email'],
                                 'email_result' => str_replace(
                                     '#email#',
-                                    '<b>' . obfuscateEmail($data['email']) . '</b>',
+                                    '<b>'.obfuscateEmail($data['email']).'</b>',
                                     addslashes(langHdl('admin_email_result_ok'))
                                 ),
                             ),
@@ -641,7 +641,7 @@ 
                     $_SESSION['user_id']
                 );
                 // Return data
-                echo '[{"new_value":"' . $_SESSION['sessionDuration'] . '"}]';
+                echo '[{"new_value":"'.$_SESSION['sessionDuration'].'"}]';
             } else {
                 echo '[{"new_value":"expired"}]';
             }
@@ -666,26 +666,26 @@ 
             // Get account and pw associated to email
             DB::query(
                 'SELECT *
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE login = %s',
                 $post_login
             );
             $counter = DB::count();
             if ($counter != 0) {
                 $data = DB::queryFirstRow(
-                    'SELECT login, pw, email FROM ' . prefixTable('users') . ' WHERE login = %s',
+                    'SELECT login, pw, email FROM '.prefixTable('users').' WHERE login = %s',
                     $post_login
                 );
-                $textMail = langHdl('forgot_pw_email_body_1') . ' <a href="' .
-                    $SETTINGS['cpassman_url'] . '/index.php?action=password_recovery&key=' . $key .
-                    '&login=' . $post_login . '">' . $SETTINGS['cpassman_url'] .
-                    '/index.php?action=password_recovery&key=' . $key . '&login=' . $post_login . '</a>.<br><br>' . langHdl('thku');
-                $textMailAlt = langHdl('forgot_pw_email_altbody_1') . ' ' . langHdl('at_login') . ' : ' . $post_login . ' - ' .
-                    langHdl('index_password') . ' : ' . md5($data['pw']);
+                $textMail = langHdl('forgot_pw_email_body_1').' <a href="'.
+                    $SETTINGS['cpassman_url'].'/index.php?action=password_recovery&key='.$key.
+                    '&login='.$post_login.'">'.$SETTINGS['cpassman_url'].
+                    '/index.php?action=password_recovery&key='.$key.'&login='.$post_login.'</a>.<br><br>'.langHdl('thku');
+                $textMailAlt = langHdl('forgot_pw_email_altbody_1').' '.langHdl('at_login').' : '.$post_login.' - '.
+                    langHdl('index_password').' : '.md5($data['pw']);
 
                 // Check if email has already a key in DB
                 DB::query(
-                    'SELECT * FROM ' . prefixTable('misc') . ' WHERE intitule = %s AND type = %s',
+                    'SELECT * FROM '.prefixTable('misc').' WHERE intitule = %s AND type = %s',
                     $post_login,
                     'password_recovery'
                 );
@@ -723,10 +723,10 @@ 
                     true
                 );
 
-                echo '[{"error":"' . $ret['error'] . '" , "message":"' . $ret['message'] . '"}]';
+                echo '[{"error":"'.$ret['error'].'" , "message":"'.$ret['message'].'"}]';
             } else {
                 // no one has this email ... alert
-                echo '[{"error":"error_email" , "message":"' . langHdl('forgot_my_pw_error_email_not_exist') . '"}]';
+                echo '[{"error":"error_email" , "message":"'.langHdl('forgot_my_pw_error_email_not_exist').'"}]';
             }
             break;
 
@@ -745,7 +745,7 @@ 
             // check if key is okay
             $data = DB::queryFirstRow(
                 'SELECT valeur
-                FROM ' . prefixTable('misc') . '
+                FROM ' . prefixTable('misc').'
                 WHERE intitule = %s AND type = %s',
                 $login,
                 'password_recovery'
@@ -781,7 +781,7 @@ 
                 );
                 // Get email
                 $dataUser = DB::queryFirstRow(
-                    'SELECT email FROM ' . prefixTable('users') . ' WHERE login = %s',
+                    'SELECT email FROM '.prefixTable('users').' WHERE login = %s',
                     $login
                 );
 
@@ -790,10 +790,10 @@ 
                 $ret = json_decode(
                     sendEmail(
                         langHdl('forgot_pw_email_subject_confirm'),
-                        langHdl('forgot_pw_email_body') . ' ' . $newPwNotCrypted,
+                        langHdl('forgot_pw_email_body').' '.$newPwNotCrypted,
                         $dataUser['email'],
                         $SETTINGS,
-                        strip_tags(langHdl('forgot_pw_email_body')) . ' ' . $newPwNotCrypted
+                        strip_tags(langHdl('forgot_pw_email_body')).' '.$newPwNotCrypted
                     ),
                     true
                 );
@@ -902,7 +902,7 @@ 
                     // Store PSK
                     $_SESSION['user']['session_psk'] = $user_key_encoded;
                     setcookie(
-                        'TeamPass_PFSK_' . md5($_SESSION['user_id']),
+                        'TeamPass_PFSK_'.md5($_SESSION['user_id']),
                         $user_key_encoded,
                         (!isset($SETTINGS['personal_saltkey_cookie_duration']) || $SETTINGS['personal_saltkey_cookie_duration'] == 0) ? time() + 60 * 60 * 24 : time() + 60 * 60 * 24 * $SETTINGS['personal_saltkey_cookie_duration'],
                         '/'
@@ -950,7 +950,7 @@ 
             // Get key from user
             $userInfo = DB::queryfirstrow(
                 'SELECT encrypted_psk
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $_SESSION['user_id']
             );
@@ -1045,8 +1045,8 @@ 
             // Build list of items to be re-encrypted
             $rows = DB::query(
                 'SELECT i.id as id, i.pw as pw
-                FROM ' . prefixTable('items') . ' as i
-                INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id=l.id_item)
+                FROM ' . prefixTable('items').' as i
+                INNER JOIN ' . prefixTable('log_items').' as l ON (i.id=l.id_item)
                 WHERE i.perso = %i AND l.id_user= %i AND l.action = %s',
                 '1',
                 $_SESSION['user_id'],
@@ -1058,14 +1058,14 @@ 
                     if (empty($list)) {
                         $list = $record['id'];
                     } else {
-                        $list .= ',' . $record['id'];
+                        $list .= ','.$record['id'];
                     }
                 }
             }
 
             // change salt
             setcookie(
-                'TeamPass_PFSK_' . md5($_SESSION['user_id']),
+                'TeamPass_PFSK_'.md5($_SESSION['user_id']),
                 $_SESSION['user']['session_psk'],
                 time() + 60 * 60 * 24 * $SETTINGS['personal_saltkey_cookie_duration'],
                 '/'
@@ -1112,8 +1112,8 @@ 
                     // delete all previous items of this user
                     $rows = DB::query(
                         'SELECT i.id as id
-                        FROM ' . prefixTable('items') . ' as i
-                        INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id=l.id_item)
+                        FROM ' . prefixTable('items').' as i
+                        INNER JOIN ' . prefixTable('log_items').' as l ON (i.id=l.id_item)
                         WHERE i.perso = %i AND l.id_user= %i AND l.action = %s',
                         '1',
                         $_SESSION['user_id'],
@@ -1158,7 +1158,7 @@ 
 
                     // change salt
                     setcookie(
-                        'TeamPass_PFSK_' . md5($_SESSION['user_id']),
+                        'TeamPass_PFSK_'.md5($_SESSION['user_id']),
                         $_SESSION['user']['session_psk'],
                         time() + 60 * 60 * 24 * $SETTINGS['personal_saltkey_cookie_duration'],
                         '/'
@@ -1211,7 +1211,7 @@ 
                 && $SETTINGS['enable_send_email_on_user_login'] === '1'
             ) {
                 $row = DB::queryFirstRow(
-                    'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s',
+                    'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s',
                     'cron',
                     'sending_emails'
                 );
@@ -1219,12 +1219,12 @@ 
                 if ((int) (time() - $row['valeur']) >= 300 || (int) $row['valeur'] === 0) {
                     $rows = DB::query(
                         'SELECT *
-                        FROM ' . prefixTable('emails') .
+                        FROM ' . prefixTable('emails').
                             ' WHERE status != %s',
                         'sent'
                     );
                     foreach ($rows as $record) {
-                        echo $record['increment_id'] . " >> ";
+                        echo $record['increment_id']." >> ";
                         // Send email
                         $ret = json_decode(
                             sendEmail(
@@ -1342,7 +1342,7 @@ 
          */
         case 'check_login_exists':
             $data = DB::query(
-                'SELECT login, psk FROM ' . prefixTable('users') . '
+                'SELECT login, psk FROM '.prefixTable('users').'
                 WHERE login = %i',
                 stripslashes(filter_input(INPUT_POST, 'userId', FILTER_SANITIZE_NUMBER_INT))
             );
@@ -1352,7 +1352,7 @@ 
                 $userOk = true;
             }
 
-            echo '[{"login" : "' . $userOk . '", "psk":"0"}]';
+            echo '[{"login" : "'.$userOk.'", "psk":"0"}]';
             break;
             /*
          * Make statistics on item
@@ -1363,7 +1363,7 @@ 
                 && filter_input(INPUT_POST, 'scope', FILTER_SANITIZE_STRING) === 'item'
             ) {
                 $data = DB::queryfirstrow(
-                    'SELECT view FROM ' . prefixTable('statistics') . ' WHERE scope = %s AND item_id = %i',
+                    'SELECT view FROM '.prefixTable('statistics').' WHERE scope = %s AND item_id = %i',
                     'item',
                     filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT)
                 );
@@ -1404,8 +1404,8 @@ 
             $arr_html = array();
             $rows = DB::query(
                 'SELECT i.id AS id, i.label AS label, i.id_tree AS id_tree, l.date, i.perso AS perso, i.restricted_to AS restricted
-                FROM ' . prefixTable('log_items') . ' AS l
-                RIGHT JOIN ' . prefixTable('items') . ' AS i ON (l.id_item = i.id)
+                FROM ' . prefixTable('log_items').' AS l
+                RIGHT JOIN ' . prefixTable('items').' AS i ON (l.id_item = i.id)
                 WHERE l.action = %s AND l.id_user = %i
                 ORDER BY l.date DESC
                 LIMIT 0, 100',
@@ -1438,7 +1438,7 @@ 
                 isset($SETTINGS['enable_suggestion']) && $SETTINGS['enable_suggestion'] == 1
                 && ($_SESSION['user_admin'] == 1 || $_SESSION['user_manager'] == 1)
             ) {
-                DB::query('SELECT * FROM ' . prefixTable('suggestion'));
+                DB::query('SELECT * FROM '.prefixTable('suggestion'));
                 $nb_suggestions_waiting = DB::count();
             }
 
@@ -1462,7 +1462,7 @@ 
             $pwdlib = new PasswordLib\PasswordLib();
             // generate key
             $key = $pwdlib->getRandomToken(filter_input(INPUT_POST, 'size', FILTER_SANITIZE_NUMBER_INT));
-            echo '[{"key" : "' . htmlentities($key, ENT_QUOTES) . '"}]';
+            echo '[{"key" : "'.htmlentities($key, ENT_QUOTES).'"}]';
             break;
 
             /*
@@ -1491,7 +1491,7 @@ 
                 )
             );
 
-            echo '[{"token" : "' . $token . '"}]';
+            echo '[{"token" : "'.$token.'"}]';
             break;
 
 
@@ -1506,14 +1506,14 @@ 
 
             if ($_SESSION['user_manager'] === '1' || $_SESSION['is_admin'] === '1') {
                 $count = 0;
-                DB::query('SELECT * FROM ' . prefixTable('items_change'));
+                DB::query('SELECT * FROM '.prefixTable('items_change'));
                 $count += DB::count();
-                DB::query('SELECT * FROM ' . prefixTable('suggestion'));
+                DB::query('SELECT * FROM '.prefixTable('suggestion'));
                 $count += DB::count();
 
-                echo '[ { "error" : "" , "count" : "' . $count . '" , "show_sug_in_menu" : "0"} ]';
+                echo '[ { "error" : "" , "count" : "'.$count.'" , "show_sug_in_menu" : "0"} ]';
             } elseif (isset($_SESSION['nb_item_change_proposals']) && $_SESSION['nb_item_change_proposals'] > 0) {
-                echo '[ { "error" : "" , "count" : "' . $_SESSION['nb_item_change_proposals'] . '" , "show_sug_in_menu" : "1"} ]';
+                echo '[ { "error" : "" , "count" : "'.$_SESSION['nb_item_change_proposals'].'" , "show_sug_in_menu" : "1"} ]';
             } else {
                 echo '[ { "error" : "" , "count" : "" , "show_sug_in_menu" : "0"} ]';
             }
@@ -1548,9 +1548,9 @@ 
                         $tmp = '';
                         foreach ($stats_data[$data] as $key => $value) {
                             if (empty($tmp)) {
-                                $tmp = $key . '-' . $value;
+                                $tmp = $key.'-'.$value;
                             } else {
-                                $tmp .= ',' . $key . '-' . $value;
+                                $tmp .= ','.$key.'-'.$value;
                             }
                         }
                         $statsToSend[$data] = $tmp;
@@ -1558,9 +1558,9 @@ 
                         $tmp = '';
                         foreach ($stats_data[$data] as $key => $value) {
                             if (empty($tmp)) {
-                                $tmp = $key . '-' . $value;
+                                $tmp = $key.'-'.$value;
                             } else {
-                                $tmp .= ',' . $key . '-' . $value;
+                                $tmp .= ','.$key.'-'.$value;
                             }
                         }
                         $statsToSend[$data] = $tmp;
@@ -1657,8 +1657,8 @@ 
                     if (strpos($line, 'cpassman_url') > 0 && empty($url_found) === true) {
                         $url_found = substr($line, 19, strlen($line) - 22);
                         $tmp = parse_url($url_found);
-                        $anonym_url = $tmp['scheme'] . '://<anonym_url>' . $tmp['path'];
-                        $line = "'cpassman_url' => '" . $anonym_url . "\n";
+                        $anonym_url = $tmp['scheme'].'://<anonym_url>'.$tmp['path'];
+                        $line = "'cpassman_url' => '".$anonym_url."\n";
                     }
 
                     // Anonymize all urls
@@ -1686,7 +1686,7 @@ 
             $teampass_errors = '';
             $rows = DB::query(
                 'SELECT label, date AS error_date
-                FROM ' . prefixTable('log_system') . "
+                FROM ' . prefixTable('log_system')."
                 WHERE `type` LIKE 'error'
                 ORDER BY `date` DESC
                 LIMIT 0, 10"
@@ -1694,10 +1694,10 @@ 
             if (DB::count() > 0) {
                 foreach ($rows as $record) {
                     if (empty($teampass_errors) === true) {
-                        $teampass_errors = ' * ' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $record['error_date']) . ' - ' . $record['label'];
+                        $teampass_errors = ' * '.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $record['error_date']).' - '.$record['label'];
                     } else {
                         $teampass_errors .= '
- * ' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $record['error_date']) . ' - ' . $record['label'];
+ * ' . date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $record['error_date']).' - '.$record['label'];
                     }
                 }
             }
@@ -1706,7 +1706,7 @@ 
 
             // Now prepare text
             $txt = '### Page on which it happened
-' . $post_data['current_page'] . '
+' . $post_data['current_page'].'
 
 ### Steps to reproduce
 1.
@@ -1721,39 +1721,39 @@ 
 Tell us what happens instead
 
 ### Server configuration
-**Operating system**: ' . php_uname() . '
+**Operating system**: ' . php_uname().'
 
-**Web server:** ' . $_SERVER['SERVER_SOFTWARE'] . '
+**Web server:** ' . $_SERVER['SERVER_SOFTWARE'].'
 
-**Database:** ' . ($link === false ? langHdl('undefined') : mysqli_get_server_info($link)) . '
+**Database:** ' . ($link === false ? langHdl('undefined') : mysqli_get_server_info($link)).'
 
-**PHP version:** ' . PHP_VERSION . '
+**PHP version:** ' . PHP_VERSION.'
 
-**Teampass version:** ' . TP_VERSION_FULL . '
+**Teampass version:** ' . TP_VERSION_FULL.'
 
 **Teampass configuration file:**
 ```
-' . $list_of_options . '
+' . $list_of_options.'
 ```
 
 **Updated from an older Teampass or fresh install:**
 
 ### Client configuration
 
-**Browser:** ' . $post_data['browser_name'] . ' - ' . $post_data['browser_version'] . '
+**Browser:** ' . $post_data['browser_name'].' - '.$post_data['browser_version'].'
 
-**Operating system:** ' . $post_data['os'] . ' - ' . $post_data['os_archi'] . 'bits
+**Operating system:** ' . $post_data['os'].' - '.$post_data['os_archi'].'bits
 
 ### Logs
 
 #### Web server error log
 ```
-' . $err['message'] . ' - ' . $err['file'] . ' (' . $err['line'] . ')
+' . $err['message'].' - '.$err['file'].' ('.$err['line'].')
 ```
 
 #### Teampass 10 last system errors
 ```
-' . $teampass_errors . '
+' . $teampass_errors.'
 ```
 
 #### Log from the web-browser developer console (CTRL + SHIFT + i)
@@ -1858,7 +1858,7 @@ 
                 // Check if user exists
                 $userInfo = DB::queryFirstRow(
                     'SELECT public_key, private_key, pw
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE id = %i',
                     $post_user_id
                 );
@@ -1866,14 +1866,14 @@ 
                     // Get one item
                     $record = DB::queryFirstRow(
                         'SELECT id, pw
-                        FROM ' . prefixTable('items') . '
+                        FROM ' . prefixTable('items').'
                         WHERE perso = 0'
                     );
 
                     // Get itemKey from current user
                     $currentUserKey = DB::queryFirstRow(
                         'SELECT share_key, increment_id
-                        FROM ' . prefixTable('sharekeys_items') . '
+                        FROM ' . prefixTable('sharekeys_items').'
                         WHERE object_id = %i AND user_id = %i',
                         $record['id'],
                         $post_user_id
@@ -1902,7 +1902,7 @@ 
                     } else {
                         // Use the password check
                         // load passwordLib library
-                        $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+                        $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'].'/includes/libraries');
                         $pwdlib->register();
                         $pwdlib = new PasswordLib\PasswordLib();
                         
@@ -2083,7 +2083,7 @@ 
                 // Get user info
                 $userData = DB::queryFirstRow(
                     'SELECT private_key
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE id = %i',
                     $post_user_id
                 );
@@ -2104,7 +2104,7 @@ 
                     );
 
                     // Load superGlobals
-                    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+                    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
                     $superGlobal = new protect\SuperGlobal\SuperGlobal();
 
                     $superGlobal->put('private_key', $privateKey, 'SESSION', 'user');
@@ -2166,7 +2166,7 @@ 
                 // Get user info
                 $userData = DB::queryFirstRow(
                     'SELECT email, auth_type, login
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE id = %i',
                     $post_user_id
                 );
@@ -2234,7 +2234,7 @@ 
                             array(
                                 'error' => false,
                                 'message' => '',
-                                'debug' => $post_user_password. ' - Email was sent',
+                                'debug' => $post_user_password.' - Email was sent',
                             ),
                             'encode'
                         );
@@ -2368,7 +2368,7 @@ 
                     // Get user info
                     $userData = DB::queryFirstRow(
                         'SELECT email, auth_type, login
-                        FROM ' . prefixTable('users') . '
+                        FROM ' . prefixTable('users').'
                         WHERE id = %i',
                         $post_user_id
                     );
@@ -2437,13 +2437,13 @@ 
                 // Check if user exists
                 DB::queryFirstRow(
                     'SELECT *
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE id = %i',
                     $post_user_id
                 );
                 if (DB::count() > 0) {
                     // Include libraries
-                    include_once $SETTINGS['cpassman_dir'] . '/sources/aes.functions.php';
+                    include_once $SETTINGS['cpassman_dir'].'/sources/aes.functions.php';
 
                     // CLear old sharekeys
                     if ($post_self_change === false) {
@@ -2512,13 +2512,13 @@ 
                 // Check if user exists
                 $userInfo = DB::queryFirstRow(
                     'SELECT public_key
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE id = %i',
                     $post_user_id
                 );
                 if (DB::count() > 0) {
                     // Include libraries
-                    include_once $SETTINGS['cpassman_dir'] . '/sources/aes.functions.php';
+                    include_once $SETTINGS['cpassman_dir'].'/sources/aes.functions.php';
 
                     // WHAT STEP TO PERFORM?
                     if ($post_action === 'step0') {
@@ -2534,15 +2534,15 @@ 
                         // Loop on items
                         $rows = DB::query(
                             'SELECT id, pw
-                            FROM ' . prefixTable('items') . '
+                            FROM ' . prefixTable('items').'
                             WHERE perso = 0
-                            LIMIT ' . $post_start . ', ' . $post_length
+                            LIMIT ' . $post_start.', '.$post_length
                         );
                         foreach ($rows as $record) {
                             // Get itemKey from current user
                             $currentUserKey = DB::queryFirstRow(
                                 'SELECT share_key, increment_id
-                                FROM ' . prefixTable('sharekeys_items') . '
+                                FROM ' . prefixTable('sharekeys_items').'
                                 WHERE object_id = %i AND user_id = %i',
                                 $record['id'],
                                 $_SESSION['user_id']
@@ -2569,7 +2569,7 @@ 
                                 if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
                                     $currentUserKey = DB::queryFirstRow(
                                         'SELECT increment_id
-                                        FROM ' . prefixTable('sharekeys_items') . '
+                                        FROM ' . prefixTable('sharekeys_items').'
                                         WHERE object_id = %i AND user_id = %i',
                                         $record['id'],
                                         $post_user_id
@@ -2602,7 +2602,7 @@ 
                         // SHould we change step?
                         DB::query(
                             'SELECT *
-                            FROM ' . prefixTable('items') . '
+                            FROM ' . prefixTable('items').'
                             WHERE perso = 0'
                         );
                         $next_start = (int) $post_start + (int) $post_length;
@@ -2618,15 +2618,15 @@ 
                         // Loop on logs
                         $rows = DB::query(
                             'SELECT increment_id
-                            FROM ' . prefixTable('log_items') . '
+                            FROM ' . prefixTable('log_items').'
                             WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"
-                            LIMIT ' . $post_start . ', ' . $post_length
+                            LIMIT ' . $post_start.', '.$post_length
                         );
                         foreach ($rows as $record) {
                             // Get itemKey from current user
                             $currentUserKey = DB::queryFirstRow(
                                 'SELECT share_key
-                                FROM ' . prefixTable('sharekeys_logs') . '
+                                FROM ' . prefixTable('sharekeys_logs').'
                                 WHERE object_id = %i AND user_id = %i',
                                 $record['increment_id'],
                                 $_SESSION['user_id']
@@ -2653,7 +2653,7 @@ 
                                 if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
                                     $currentUserKey = DB::queryFirstRow(
                                         'SELECT increment_id
-                                        FROM ' . prefixTable('sharekeys_items') . '
+                                        FROM ' . prefixTable('sharekeys_items').'
                                         WHERE object_id = %i AND user_id = %i',
                                         $record['id'],
                                         $post_user_id
@@ -2675,7 +2675,7 @@ 
                         // SHould we change step?
                         DB::query(
                             'SELECT increment_id
-                            FROM ' . prefixTable('log_items') . '
+                            FROM ' . prefixTable('log_items').'
                             WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"'
                         );
                         $next_start = (int) $post_start + (int) $post_length;
@@ -2691,15 +2691,15 @@ 
                         // Loop on fields
                         $rows = DB::query(
                             'SELECT id
-                            FROM ' . prefixTable('categories_items') . '
+                            FROM ' . prefixTable('categories_items').'
                             WHERE encryption_type = "teampass_aes"
-                            LIMIT ' . $post_start . ', ' . $post_length
+                            LIMIT ' . $post_start.', '.$post_length
                         );
                         foreach ($rows as $record) {
                             // Get itemKey from current user
                             $currentUserKey = DB::queryFirstRow(
                                 'SELECT share_key
-                                FROM ' . prefixTable('sharekeys_fields') . '
+                                FROM ' . prefixTable('sharekeys_fields').'
                                 WHERE object_id = %i AND user_id = %i',
                                 $record['id'],
                                 $_SESSION['user_id']
@@ -2726,7 +2726,7 @@ 
                                 if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
                                     $currentUserKey = DB::queryFirstRow(
                                         'SELECT increment_id
-                                        FROM ' . prefixTable('sharekeys_items') . '
+                                        FROM ' . prefixTable('sharekeys_items').'
                                         WHERE object_id = %i AND user_id = %i',
                                         $record['id'],
                                         $post_user_id
@@ -2748,7 +2748,7 @@ 
                         // SHould we change step?
                         DB::query(
                             'SELECT *
-                            FROM ' . prefixTable('categories_items') . '
+                            FROM ' . prefixTable('categories_items').'
                             WHERE encryption_type = "teampass_aes"'
                         );
                         $next_start = (int) $post_start + (int) $post_length;
@@ -2764,14 +2764,14 @@ 
                         // Loop on suggestions
                         $rows = DB::query(
                             'SELECT id
-                            FROM ' . prefixTable('suggestion') . '
-                            LIMIT ' . $post_start . ', ' . $post_length
+                            FROM ' . prefixTable('suggestion').'
+                            LIMIT ' . $post_start.', '.$post_length
                         );
                         foreach ($rows as $record) {
                             // Get itemKey from current user
                             $currentUserKey = DB::queryFirstRow(
                                 'SELECT share_key
-                                FROM ' . prefixTable('sharekeys_suggestions') . '
+                                FROM ' . prefixTable('sharekeys_suggestions').'
                                 WHERE object_id = %i AND user_id = %i',
                                 $record['id'],
                                 $_SESSION['user_id']
@@ -2798,7 +2798,7 @@ 
                                 if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
                                     $currentUserKey = DB::queryFirstRow(
                                         'SELECT increment_id
-                                        FROM ' . prefixTable('sharekeys_items') . '
+                                        FROM ' . prefixTable('sharekeys_items').'
                                         WHERE object_id = %i AND user_id = %i',
                                         $record['id'],
                                         $post_user_id
@@ -2835,15 +2835,15 @@ 
                         // Loop on files
                         $rows = DB::query(
                             'SELECT id
-                            FROM ' . prefixTable('files') . '
-                            WHERE status = "' . TP_ENCRYPTION_NAME . '"
-                            LIMIT ' . $post_start . ', ' . $post_length
+                            FROM ' . prefixTable('files').'
+                            WHERE status = "' . TP_ENCRYPTION_NAME.'"
+                            LIMIT ' . $post_start.', '.$post_length
                         ); //aes_encryption
                         foreach ($rows as $record) {
                             // Get itemKey from current user
                             $currentUserKey = DB::queryFirstRow(
                                 'SELECT share_key
-                                FROM ' . prefixTable('sharekeys_files') . '
+                                FROM ' . prefixTable('sharekeys_files').'
                                 WHERE object_id = %i AND user_id = %i',
                                 $record['id'],
                                 $_SESSION['user_id']
@@ -2870,7 +2870,7 @@ 
                                 if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
                                     $currentUserKey = DB::queryFirstRow(
                                         'SELECT increment_id
-                                        FROM ' . prefixTable('sharekeys_items') . '
+                                        FROM ' . prefixTable('sharekeys_items').'
                                         WHERE object_id = %i AND user_id = %i',
                                         $record['id'],
                                         $post_user_id
@@ -2892,8 +2892,8 @@ 
                         // SHould we change step?
                         DB::query(
                             'SELECT *
-                            FROM ' . prefixTable('files') . '
-                            WHERE status = "' . TP_ENCRYPTION_NAME . '"'
+                            FROM ' . prefixTable('files').'
+                            WHERE status = "' . TP_ENCRYPTION_NAME.'"'
                         );
                         $next_start = (int) $post_start + (int) $post_length;
                         if ($next_start > DB::count()) {
@@ -2913,16 +2913,16 @@ 
                             if (count($_SESSION['personal_folders']) > 0) {
                                 $rows = DB::query(
                                     'SELECT id, pw
-                                    FROM ' . prefixTable('items') . '
+                                    FROM ' . prefixTable('items').'
                                     WHERE perso = 1 AND id_tree IN %ls
-                                    LIMIT ' . $post_start . ', ' . $post_length,
+                                    LIMIT ' . $post_start.', '.$post_length,
                                     $_SESSION['personal_folders']
                                 );
                                 foreach ($rows as $record) {
                                     // Get itemKey from current user
                                     $currentUserKey = DB::queryFirstRow(
                                         'SELECT share_key, increment_id
-                                        FROM ' . prefixTable('sharekeys_items') . '
+                                        FROM ' . prefixTable('sharekeys_items').'
                                         WHERE object_id = %i AND user_id = %i',
                                         $record['id'],
                                         $_SESSION['user_id']
@@ -2949,7 +2949,7 @@ 
                                         if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
                                             $currentUserKey = DB::queryFirstRow(
                                                 'SELECT increment_id
-                                                FROM ' . prefixTable('sharekeys_items') . '
+                                                FROM ' . prefixTable('sharekeys_items').'
                                                 WHERE object_id = %i AND user_id = %i',
                                                 $record['id'],
                                                 $post_user_id
@@ -2972,7 +2972,7 @@ 
                             // SHould we change step?
                             DB::query(
                                 'SELECT *
-                                FROM ' . prefixTable('items') . '
+                                FROM ' . prefixTable('items').'
                                 WHERE perso = 0'
                             );
                             $next_start = (int) $post_start + (int) $post_length;
@@ -3059,7 +3059,7 @@ 
                 // Check if user exists
                 $userInfo = DB::queryFirstRow(
                     'SELECT public_key, encrypted_psk
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE id = %i',
                     $post_user_id
                 );
@@ -3084,9 +3084,9 @@ 
                             // Loop on persoanl items
                             $rows = DB::query(
                                 'SELECT id, pw
-                                FROM ' . prefixTable('items') . '
+                                FROM ' . prefixTable('items').'
                                 WHERE perso = 1 AND id_tree IN %ls
-                                LIMIT ' . $post_start . ', ' . $post_length,
+                                LIMIT ' . $post_start.', '.$post_length,
                                 $_SESSION['personal_folders']
                             );
                             $countUserPersonalItems = DB::count();
@@ -3129,7 +3129,7 @@ 
                                     // Loop on files
                                     $rows = DB::query(
                                         'SELECT id, file
-                                        FROM ' . prefixTable('files') . '
+                                        FROM ' . prefixTable('files').'
                                         WHERE status != %s
                                         AND id_item = %i',
                                         TP_ENCRYPTION_NAME,
@@ -3140,13 +3140,13 @@ 
                                         // Now decrypt the file
                                         prepareFileWithDefuse(
                                             'decrypt',
-                                            $SETTINGS['path_to_upload_folder'] . '/' . $record2['file'],
-                                            $SETTINGS['path_to_upload_folder'] . '/' . $record2['file'] . '.delete',
+                                            $SETTINGS['path_to_upload_folder'].'/'.$record2['file'],
+                                            $SETTINGS['path_to_upload_folder'].'/'.$record2['file'].'.delete',
                                             $dataReceived['userPsk']
                                         );
 
                                         // Encrypt the file
-                                        $encryptedFile = encryptFile($record2['file'] . '.delete', $SETTINGS['path_to_upload_folder']);
+                                        $encryptedFile = encryptFile($record2['file'].'.delete', $SETTINGS['path_to_upload_folder']);
 
                                         DB::update(
                                             prefixTable('files'),
@@ -3169,7 +3169,7 @@ 
                                         );
 
                                         // Unlink original file
-                                        unlink($SETTINGS['path_to_upload_folder'] . '/' . $record2['file']);
+                                        unlink($SETTINGS['path_to_upload_folder'].'/'.$record2['file']);
                                     }
                                 }
                             }
@@ -3262,7 +3262,7 @@ 
                     // Get user info
                     $userData = DB::queryFirstRow(
                         'SELECT '.$post_fields.'
-                        FROM ' . prefixTable('users') . '
+                        FROM ' . prefixTable('users').'
                         WHERE id = %i',
                         $post_user_id
                     );
@@ -3322,7 +3322,7 @@ 
                         // Get user info
                         $userData = DB::queryFirstRow(
                             'SELECT auth_type, login, private_key
-                            FROM ' . prefixTable('users') . '
+                            FROM ' . prefixTable('users').'
                             WHERE id = %i',
                             $post_user_id
                         );
@@ -3333,7 +3333,7 @@ 
                             $privateKey = decryptPrivateKey($post_current_pwd, $userData['private_key']);
 
                             // Load superGlobals
-                            include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+                            include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
                             $superGlobal = new protect\SuperGlobal\SuperGlobal();
 
                             if ($superGlobal->get('private_key', 'SESSION', 'user') === $privateKey) {
@@ -3366,7 +3366,7 @@ 
                                 echo prepareExchangedData(
                                     array(
                                         'error' => false,
-                                        'message' => langHdl('done'),'',
+                                        'message' => langHdl('done'), '',
                                     ),
                                     'encode'
                                 );
@@ -3428,7 +3428,7 @@ 
                         // Get user info
                         $userData = DB::queryFirstRow(
                             'SELECT auth_type, login, private_key, special
-                            FROM ' . prefixTable('users') . '
+                            FROM ' . prefixTable('users').'
                             WHERE id = %i',
                             $post_user_id
                         );
@@ -3462,14 +3462,14 @@ 
                                 // Get one item
                                 $record = DB::queryFirstRow(
                                     'SELECT id, pw
-                                    FROM ' . prefixTable('items') . '
+                                    FROM ' . prefixTable('items').'
                                     WHERE perso = 0'
                                 );
 
                                 // Get itemKey from current user
                                 $currentUserKey = DB::queryFirstRow(
                                     'SELECT share_key, increment_id
-                                    FROM ' . prefixTable('sharekeys_items') . '
+                                    FROM ' . prefixTable('sharekeys_items').'
                                     WHERE object_id = %i AND user_id = %i',
                                     $record['id'],
                                     $post_user_id
@@ -3502,7 +3502,7 @@ 
                                         );
                                         
                                         // Load superGlobals
-                                        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+                                        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
                                         $superGlobal = new protect\SuperGlobal\SuperGlobal();
                                         $superGlobal->put('private_key', $privateKey, 'SESSION', 'user');