nilsteampassnet / TeamPass

install--ASUPPRIMER/upgrade.php

Spacing +2 added lines, -2 removed lines

@@ -275,7 +275,7 @@ 
     echo '
         <div class="row">
             <div class="col-12">
-                <div class="card card-',$dbSettings === true ? 'primary' : 'warning','">
+                <div class="card card-',$dbSettings === true ? 'primary' : 'warning', '">
                     <div class="card-header">
                         <h5>DataBase Informations</h5>
                     </div>
@@ -802,7 +802,7 @@ 
     console.log("> "+step+" - Number: "+number + " - Previous step: "+previousStep);
     console.log(usersList);
     var d = new Date(),
-        count_in_loop = <?php echo (int) NUMBER_ITEMS_IN_BATCH;?>,
+        count_in_loop = <?php echo (int) NUMBER_ITEMS_IN_BATCH; ?>,
         userSteps = {};
 
 

install--ASUPPRIMER/tp.functions.php

Spacing +16 added lines, -16 removed lines

@@ -34,13 +34,13 @@ 
         
         $settingsTxt = '<?php
 // DATABASE connexion parameters
-define("DB_HOST", "' . DB_HOST . '");
-define("DB_USER", "' . DB_USER . '");
-define("DB_PASSWD", "' . DB_PASSWD . '");
-define("DB_NAME", "' . DB_NAME . '");
-define("DB_PREFIX", "' . DB_PREFIX . '");
-define("DB_PORT", "' . DB_PORT . '");
-define("DB_ENCODING", "' . DB_ENCODING . '");';
+define("DB_HOST", "' . DB_HOST.'");
+define("DB_USER", "' . DB_USER.'");
+define("DB_PASSWD", "' . DB_PASSWD.'");
+define("DB_NAME", "' . DB_NAME.'");
+define("DB_PREFIX", "' . DB_PREFIX.'");
+define("DB_PORT", "' . DB_PORT.'");
+define("DB_ENCODING", "' . DB_ENCODING.'");';
 
 if (isset(DB_SSL['key']) === true && empty(DB_SSL['key']) === false) {
     $settingsTxt .= '
@@ -70,19 +70,19 @@ 
 define("DB_CONNECT_OPTIONS", array(
     MYSQLI_OPT_CONNECT_TIMEOUT => 10
 ));
-define("SECUREPATH", "' . str_replace('\\', '\\\\', SECUREPATH) . '");
-define("SECUREFILE", "' . SECUREFILE. '");';
+define("SECUREPATH", "' . str_replace('\\', '\\\\', SECUREPATH).'");
+define("SECUREFILE", "' . SECUREFILE.'");';
 
         if (defined('IKEY') === true) $settingsTxt .= '
-define("IKEY", "' . IKEY . '");';
+define("IKEY", "' . IKEY.'");';
         else $settingsTxt .= '
 define("IKEY", "");';
         if (defined('SKEY') === true) $settingsTxt .= '
-define("SKEY", "' . SKEY . '");';
+define("SKEY", "' . SKEY.'");';
         else $settingsTxt .= '
 define("SKEY", "");';
         if (defined('HOST') === true) $settingsTxt .= '
-define("HOST", "' . HOST . '");';
+define("HOST", "' . HOST.'");';
         else $settingsTxt .= '
 define("HOST", "");';
 
@@ -407,7 +407,7 @@ 
     global $db_link;
 
     // check if column already exists
-    $columns = mysqli_query($db_link, "show columns from `" . $table . "`");
+    $columns = mysqli_query($db_link, "show columns from `".$table."`");
     while ($col = mysqli_fetch_assoc($columns)) {
         if ((string) $col['Field'] === $oldName) {
             // change column name
@@ -432,7 +432,7 @@ 
     // Essayer de trouver le fichier binaire de PHP dans les chemins de recherche standards
     $paths = explode(PATH_SEPARATOR, getenv('PATH'));
     foreach ($paths as $path) {
-        $phpBinary = $path . DIRECTORY_SEPARATOR . 'php';
+        $phpBinary = $path.DIRECTORY_SEPARATOR.'php';
         if (is_executable($phpBinary)) {
         $phpPath = $phpBinary;
         break;
@@ -467,7 +467,7 @@ 
 function deleteAll(array $folders)
 {
 
-    foreach($folders as $folder) {
+    foreach ($folders as $folder) {
         deleteAllFolder($folder);
     }
 }
@@ -493,7 +493,7 @@ 
         $scan = glob(rtrim($str, '/').'/*'); 
 
         // Loop through the list of files 
-        foreach($scan as $index=>$path) { 
+        foreach ($scan as $index=>$path) { 
 
             // Call recursive function 
             deleteAllFolder($path); 

Braces +15 added lines, -6 removed lines

@@ -73,18 +73,27 @@
 define("SECUREPATH", "' . str_replace('\\', '\\\\', SECUREPATH) . '");
 define("SECUREFILE", "' . SECUREFILE. '");';
 
-        if (defined('IKEY') === true) $settingsTxt .= '
+        if (defined('IKEY') === true) {
+            $settingsTxt .= '
 define("IKEY", "' . IKEY . '");';
-        else $settingsTxt .= '
+        } else {
+            $settingsTxt .= '
 define("IKEY", "");';
-        if (defined('SKEY') === true) $settingsTxt .= '
+        }
+        if (defined('SKEY') === true) {
+            $settingsTxt .= '
 define("SKEY", "' . SKEY . '");';
-        else $settingsTxt .= '
+        } else {
+            $settingsTxt .= '
 define("SKEY", "");';
-        if (defined('HOST') === true) $settingsTxt .= '
+        }
+        if (defined('HOST') === true) {
+            $settingsTxt .= '
 define("HOST", "' . HOST . '");';
-        else $settingsTxt .= '
+        } else {
+            $settingsTxt .= '
 define("HOST", "");';
+        }
 
 
         $settingsTxt .= '

install--ASUPPRIMER/upgrade_run_3.0.0.php

Spacing +288 added lines, -288 removed lines

@@ -56,7 +56,7 @@ 
 
 //Build tree
 $tree = new NestedTree(
-    $pre . 'nested_tree',
+    $pre.'nested_tree',
     'id',
     'parent_id',
     'title'
@@ -86,8 +86,8 @@ 
         $port
     );
 } else {
-    $res = 'Impossible to get connected to server. Error is: ' . addslashes(mysqli_connect_error());
-    echo '[{"finish":"1", "msg":"", "error":"Impossible to get connected to server. Error is: ' . addslashes(mysqli_connect_error()) . '!"}]';
+    $res = 'Impossible to get connected to server. Error is: '.addslashes(mysqli_connect_error());
+    echo '[{"finish":"1", "msg":"", "error":"Impossible to get connected to server. Error is: '.addslashes(mysqli_connect_error()).'!"}]';
     mysqli_close($db_link);
     exit();
 }
@@ -102,7 +102,7 @@ 
 $superGlobal->put('abspath', $abspath, 'SESSION');
 
 // Get POST with user info
-$post_user_info = json_decode(base64_decode(filter_input(INPUT_POST, 'info', FILTER_SANITIZE_FULL_SPECIAL_CHARS)));//print_r($post_user_info);
+$post_user_info = json_decode(base64_decode(filter_input(INPUT_POST, 'info', FILTER_SANITIZE_FULL_SPECIAL_CHARS))); //print_r($post_user_info);
 $userLogin = $post_user_info[0];
 $userPassword = aesctr::decrypt(base64_decode($post_user_info[1]), 'cpm', 128);
 $userId = $post_user_info[2];
@@ -175,60 +175,60 @@ 
 
 // Add field public_key to USERS table
 $res = addColumnIfNotExist(
-    $pre . 'users',
+    $pre.'users',
     'public_key',
     "TEXT DEFAULT NULL"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field public_key to table USERS! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field public_key to table USERS! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
 
 // Add field private_key to USERS table
 $res = addColumnIfNotExist(
-    $pre . 'users',
+    $pre.'users',
     'private_key',
     "TEXT DEFAULT NULL"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field private_key to table USERS! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field private_key to table USERS! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
 
 // Add field special to USERS table
 $res = addColumnIfNotExist(
-    $pre . 'users',
+    $pre.'users',
     'special',
     "VARCHAR(250) NOT NULL DEFAULT 'none'"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field special to table USERS! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field special to table USERS! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
 
 // Add field auth_type to USERS table
 $res = addColumnIfNotExist(
-    $pre . 'users',
+    $pre.'users',
     'auth_type',
     "VARCHAR(200) NOT NULL DEFAULT 'local'"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field auth_type to table USERS! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field auth_type to table USERS! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
 
 // Add field encryption_type to SUGGESTION table
 $res = addColumnIfNotExist(
-    $pre . 'suggestion',
+    $pre.'suggestion',
     'encryption_type',
     "VARCHAR(20) NOT NULL DEFAULT 'not_set'"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field encryption_type to table SUGGESTION! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field encryption_type to table SUGGESTION! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
@@ -236,7 +236,7 @@ 
 // Add new table SHAREKEYS ITEMS
 mysqli_query(
     $db_link,
-    'CREATE TABLE IF NOT EXISTS `' . $pre . 'sharekeys_items` (
+    'CREATE TABLE IF NOT EXISTS `'.$pre.'sharekeys_items` (
         `increment_id` int(12) NOT NULL AUTO_INCREMENT,
         `object_id` int(12) NOT NULL,
         `user_id` int(12) NOT NULL,
@@ -248,7 +248,7 @@ 
 // Add new table SHAREKEYS LOGS
 mysqli_query(
     $db_link,
-    'CREATE TABLE IF NOT EXISTS `' . $pre . 'sharekeys_logs` (
+    'CREATE TABLE IF NOT EXISTS `'.$pre.'sharekeys_logs` (
         `increment_id` int(12) NOT NULL AUTO_INCREMENT,
         `object_id` int(12) NOT NULL,
         `user_id` int(12) NOT NULL,
@@ -260,7 +260,7 @@ 
 // Add new table SHAREKEYS FIELDS
 mysqli_query(
     $db_link,
-    'CREATE TABLE IF NOT EXISTS `' . $pre . 'sharekeys_fields` (
+    'CREATE TABLE IF NOT EXISTS `'.$pre.'sharekeys_fields` (
         `increment_id` int(12) NOT NULL AUTO_INCREMENT,
         `object_id` int(12) NOT NULL,
         `user_id` int(12) NOT NULL,
@@ -272,7 +272,7 @@ 
 // Add new table SHAREKEYS SUGGESTIONS
 mysqli_query(
     $db_link,
-    'CREATE TABLE IF NOT EXISTS `' . $pre . 'sharekeys_suggestions` (
+    'CREATE TABLE IF NOT EXISTS `'.$pre.'sharekeys_suggestions` (
         `increment_id` int(12) NOT NULL AUTO_INCREMENT,
         `object_id` int(12) NOT NULL,
         `user_id` int(12) NOT NULL,
@@ -284,7 +284,7 @@ 
 // Add new table SHAREKEYS FILES
 mysqli_query(
     $db_link,
-    'CREATE TABLE IF NOT EXISTS `' . $pre . 'sharekeys_files` (
+    'CREATE TABLE IF NOT EXISTS `'.$pre.'sharekeys_files` (
         `increment_id` int(12) NOT NULL AUTO_INCREMENT,
         `object_id` int(12) NOT NULL,
         `user_id` int(12) NOT NULL,
@@ -296,7 +296,7 @@ 
 // Add new table defuse_passwords
 mysqli_query(
     $db_link,
-    'CREATE TABLE IF NOT EXISTS `' . $pre . 'defuse_passwords` (
+    'CREATE TABLE IF NOT EXISTS `'.$pre.'defuse_passwords` (
         `increment_id` int(12) NOT NULL AUTO_INCREMENT,
         `type` varchar(100) NOT NULL,
         `object_id` int(12) NOT NULL,
@@ -308,7 +308,7 @@ 
 // Add new table Notifications
 mysqli_query(
     $db_link,
-    'CREATE TABLE IF NOT EXISTS `' . $pre . 'notification` (
+    'CREATE TABLE IF NOT EXISTS `'.$pre.'notification` (
         `increment_id` INT(12) NOT NULL AUTO_INCREMENT,
         `item_id` INT(12) NOT NULL,
         `user_id` INT(12) NOT NULL,
@@ -319,42 +319,42 @@ 
 // Alter table FILES
 mysqli_query(
     $db_link,
-    'ALTER TABLE `' . $pre . 'files` CHANGE `name` `name` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;'
+    'ALTER TABLE `'.$pre.'files` CHANGE `name` `name` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;'
 );
 
 // Alter table CACHE
 mysqli_query(
     $db_link,
-    'ALTER TABLE `' . $pre . 'cache` CHANGE `folder` `folder` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;'
+    'ALTER TABLE `'.$pre.'cache` CHANGE `folder` `folder` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;'
 );
 
 // Add field confirmed to FILES table
 $res = addColumnIfNotExist(
-    $pre . 'files',
+    $pre.'files',
     'confirmed',
     "INT(1) NOT NULL DEFAULT '0'"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field Confirmed to table FILES! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field Confirmed to table FILES! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 } else {
     // Update all existing entries
     mysqli_query(
         $db_link,
-        'UPDATE ' . $pre . "files
+        'UPDATE '.$pre."files
         SET confirmed = '1'"
     );
 }
 
 // Add field encrypted to OTV table
 $res = addColumnIfNotExist(
-    $pre . 'otv',
+    $pre.'otv',
     'encrypted',
     "text NOT NULL"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field Encrypted to table OTV! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field Encrypted to table OTV! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
@@ -363,89 +363,89 @@ 
 // Force attachment encryption 'enable_attachment_encryption'
 mysqli_query(
     $db_link,
-    'UPDATE ' . $pre . "misc
+    'UPDATE '.$pre."misc
     SET valeur = '1'
     WHERE type = 'admin' AND intitule = 'enable_attachment_encryption'"
 );
 
 // Add new setting 'password_overview_delay'
-$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `" . $pre . "misc` WHERE type = 'admin' AND intitule = 'password_overview_delay'"));
+$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `".$pre."misc` WHERE type = 'admin' AND intitule = 'password_overview_delay'"));
 if (intval($tmp) === 0) {
     mysqli_query(
         $db_link,
-        "INSERT INTO `" . $pre . "misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'password_overview_delay', '4')"
+        "INSERT INTO `".$pre."misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'password_overview_delay', '4')"
     );
 }
 
 // Add new setting 'roles_allowed_to_print_select'
-$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `" . $pre . "misc` WHERE type = 'admin' AND intitule = 'roles_allowed_to_print_select'"));
+$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `".$pre."misc` WHERE type = 'admin' AND intitule = 'roles_allowed_to_print_select'"));
 if (intval($tmp) === 0) {
     mysqli_query(
         $db_link,
-        "INSERT INTO `" . $pre . "misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'roles_allowed_to_print_select', '')"
+        "INSERT INTO `".$pre."misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'roles_allowed_to_print_select', '')"
     );
 }
 
 // Add new setting 'clipboard_life_duration'
-$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `" . $pre . "misc` WHERE type = 'admin' AND intitule = 'clipboard_life_duration'"));
+$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `".$pre."misc` WHERE type = 'admin' AND intitule = 'clipboard_life_duration'"));
 if (intval($tmp) === 0) {
     mysqli_query(
         $db_link,
-        "INSERT INTO `" . $pre . "misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'clipboard_life_duration', '30')"
+        "INSERT INTO `".$pre."misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'clipboard_life_duration', '30')"
     );
 }
 
 // Add new setting 'mfa_for_roles'
-$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `" . $pre . "misc` WHERE type = 'admin' AND intitule = 'mfa_for_roles'"));
+$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `".$pre."misc` WHERE type = 'admin' AND intitule = 'mfa_for_roles'"));
 if (intval($tmp) === 0) {
     mysqli_query(
         $db_link,
-        "INSERT INTO `" . $pre . "misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'mfa_for_roles', '')"
+        "INSERT INTO `".$pre."misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'mfa_for_roles', '')"
     );
 }
 
 // Add new setting 'tree_counters'
-$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `" . $pre . "misc` WHERE type = 'admin' AND intitule = 'tree_counters'"));
+$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `".$pre."misc` WHERE type = 'admin' AND intitule = 'tree_counters'"));
 if (intval($tmp) === 0) {
     mysqli_query(
         $db_link,
-        "INSERT INTO `" . $pre . "misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'tree_counters', '0')"
+        "INSERT INTO `".$pre."misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'tree_counters', '0')"
     );
 }
 
 // Add new setting 'settings_offline_mode'
-$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `" . $pre . "misc` WHERE type = 'admin' AND intitule = 'settings_offline_mode'"));
+$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `".$pre."misc` WHERE type = 'admin' AND intitule = 'settings_offline_mode'"));
 if (intval($tmp) === 0) {
     mysqli_query(
         $db_link,
-        "INSERT INTO `" . $pre . "misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'settings_offline_mode', '0')"
+        "INSERT INTO `".$pre."misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'settings_offline_mode', '0')"
     );
 }
 
 // Add new setting 'settings_tree_counters'
-$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `" . $pre . "misc` WHERE type = 'admin' AND intitule = 'settings_tree_counters'"));
+$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `".$pre."misc` WHERE type = 'admin' AND intitule = 'settings_tree_counters'"));
 if (intval($tmp) === 0) {
     mysqli_query(
         $db_link,
-        "INSERT INTO `" . $pre . "misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'settings_tree_counters', '0')"
+        "INSERT INTO `".$pre."misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'settings_tree_counters', '0')"
     );
 }
 
 // Add new setting 'copy_to_clipboard_small_icons'
-$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `" . $pre . "misc` WHERE type = 'admin' AND intitule = 'copy_to_clipboard_small_icons'"));
+$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `".$pre."misc` WHERE type = 'admin' AND intitule = 'copy_to_clipboard_small_icons'"));
 if (intval($tmp) === 0) {
     mysqli_query(
         $db_link,
-        "INSERT INTO `" . $pre . "misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'copy_to_clipboard_small_icons', '0')"
+        "INSERT INTO `".$pre."misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'copy_to_clipboard_small_icons', '0')"
     );
 }
 
 // Add new setting 'enable_massive_move_delete'
-$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `" . $pre . "misc` WHERE type = 'admin' AND intitule = 'enable_massive_move_delete'"));
+$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `".$pre."misc` WHERE type = 'admin' AND intitule = 'enable_massive_move_delete'"));
 if (intval($tmp) === 0) {
     mysqli_query(
         $db_link,
-        "INSERT INTO `" . $pre . "misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'enable_massive_move_delete', '0')"
+        "INSERT INTO `".$pre."misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'enable_massive_move_delete', '0')"
     );
 }
 
@@ -453,14 +453,14 @@ 
 $roles_allowed_to_print = mysqli_fetch_row(mysqli_query(
     $db_link,
     'SELECT valeur
-    FROM ' . $pre . 'misc
+    FROM ' . $pre.'misc
     WHERE type = "admin" AND intitule = "roles_allowed_to_print"'
 ));
 if ($roles_allowed_to_print[0] !== null && empty($roles_allowed_to_print[0]) === false) {
     mysqli_query(
         $db_link,
-        'UPDATE ' . $pre . "misc
-        SET valeur = '" . json_encode(explode(';', $roles_allowed_to_print[0])) . "'
+        'UPDATE '.$pre."misc
+        SET valeur = '" . json_encode(explode(';', $roles_allowed_to_print[0]))."'
         WHERE type = 'admin' AND intitule = 'roles_allowed_to_print'"
     );
 }
@@ -469,7 +469,7 @@ 
 $db_count = mysqli_fetch_row(
     mysqli_query(
         $db_link,
-        'SELECT count(*) FROM ' . $pre . 'defuse_passwords'
+        'SELECT count(*) FROM '.$pre.'defuse_passwords'
     )
 );
 if ((int) $db_count[0] === 0) {
@@ -477,19 +477,19 @@ 
     $rows = mysqli_query(
         $db_link,
         'SELECT id, pw, encryption_type
-        FROM ' . $pre . 'items
+        FROM ' . $pre.'items
         WHERE perso = 0'
     );
     if (!$rows) {
-        echo '[{"finish":"1" , "error":"' . mysqli_error($db_link) . '"}]';
+        echo '[{"finish":"1" , "error":"'.mysqli_error($db_link).'"}]';
         exit();
     }
     while ($data = mysqli_fetch_array($rows)) {
         if ($data['encryption_type'] !== 'teampass_aes') {
             mysqli_query(
                 $db_link,
-                "INSERT INTO `" . $pre . "defuse_passwords` (`increment_id`, `type`, `object_id`, `password`) 
-                VALUES (NULL, 'item', '" . $data['id'] . "', '" . $data['pw'] . "');"
+                "INSERT INTO `".$pre."defuse_passwords` (`increment_id`, `type`, `object_id`, `password`) 
+                VALUES (NULL, 'item', '" . $data['id']."', '".$data['pw']."');"
             );
         }
     }
@@ -498,10 +498,10 @@ 
     $rows = mysqli_query(
         $db_link,
         'SELECT id, data, encryption_type
-        FROM ' . $pre . 'categories_items'
+        FROM ' . $pre.'categories_items'
     );
     if (!$rows) {
-        echo '[{"finish":"1" , "error":"' . mysqli_error($db_link) . '"}]';
+        echo '[{"finish":"1" , "error":"'.mysqli_error($db_link).'"}]';
         exit();
     }
 
@@ -509,8 +509,8 @@ 
         if ($data['encryption_type'] !== 'teampass_aes') {
             mysqli_query(
                 $db_link,
-                "INSERT INTO `" . $pre . "defuse_passwords` (`increment_id`, `type`, `object_id`, `password`) 
-                VALUES (NULL, 'field', '" . $data['id'] . "', '" . $data['data'] . "');"
+                "INSERT INTO `".$pre."defuse_passwords` (`increment_id`, `type`, `object_id`, `password`) 
+                VALUES (NULL, 'field', '" . $data['id']."', '".$data['data']."');"
             );
         }
     }
@@ -519,11 +519,11 @@ 
     $rows = mysqli_query(
         $db_link,
         'SELECT increment_id, raison, encryption_type
-        FROM ' . $pre . "log_items
+        FROM ' . $pre."log_items
         WHERE raison LIKE 'at_pw :def%'"
     );
     if (!$rows) {
-        echo '[{"finish":"1" , "error":"' . mysqli_error($db_link) . '"}]';
+        echo '[{"finish":"1" , "error":"'.mysqli_error($db_link).'"}]';
         exit();
     }
 
@@ -531,8 +531,8 @@ 
         if ($data['encryption_type'] !== 'teampass_aes') {
             mysqli_query(
                 $db_link,
-                "INSERT INTO `" . $pre . "defuse_passwords` (`increment_id`, `type`, `object_id`, `password`) 
-                VALUES (NULL, 'log', '" . $data['increment_id'] . "', '" . explode('pw :', $data['raison'])[1] . "');"
+                "INSERT INTO `".$pre."defuse_passwords` (`increment_id`, `type`, `object_id`, `password`) 
+                VALUES (NULL, 'log', '" . $data['increment_id']."', '".explode('pw :', $data['raison'])[1]."');"
             );
         }
     }
@@ -541,10 +541,10 @@ 
     $rows = mysqli_query(
         $db_link,
         'SELECT id, pw
-        FROM ' . $pre . 'suggestion'
+        FROM ' . $pre.'suggestion'
     );
     if (!$rows) {
-        echo '[{"finish":"1" , "error":"' . mysqli_error($db_link) . '"}]';
+        echo '[{"finish":"1" , "error":"'.mysqli_error($db_link).'"}]';
         exit();
     }
 
@@ -552,21 +552,21 @@ 
         if ($data['encryption_type'] !== 'teampass_aes') {
             mysqli_query(
                 $db_link,
-                "INSERT INTO `" . $pre . "defuse_passwords` (`increment_id`, `type`, `object_id`, `password`) 
-                VALUES (NULL, 'suggestion', '" . $data['id'] . "', '" . $data['pw'] . "');"
+                "INSERT INTO `".$pre."defuse_passwords` (`increment_id`, `type`, `object_id`, `password`) 
+                VALUES (NULL, 'suggestion', '" . $data['id']."', '".$data['pw']."');"
             );
         }
     }
 
     // Copy all files to "defuse' folder
-    $mydir = $SETTINGS['path_to_upload_folder'] . '/';
-    if (!is_dir($mydir . 'defuse')) {
-        mkdir($mydir . 'defuse');
+    $mydir = $SETTINGS['path_to_upload_folder'].'/';
+    if (!is_dir($mydir.'defuse')) {
+        mkdir($mydir.'defuse');
     }
     // Move all images files
-    $files = glob($mydir . '*');
+    $files = glob($mydir.'*');
     foreach ($files as $file) {
-        $file_to_go = str_replace($mydir, $mydir . 'defuse/', $file);
+        $file_to_go = str_replace($mydir, $mydir.'defuse/', $file);
         copy($file, $file_to_go);
     }
 }
@@ -584,8 +584,8 @@ 
         mysqli_query(
             $db_link,
             'SELECT id, public_key, private_key
-            FROM ' . $pre . "users
-            WHERE login='" . $userLogin . "'"
+            FROM ' . $pre."users
+            WHERE login='" . $userLogin."'"
         )
     );
     if (
@@ -597,8 +597,8 @@ 
         // Store in DB
         mysqli_query(
             $db_link,
-            'UPDATE ' . $pre . "users
-            SET public_key = '" . $userKeys['public_key'] . "', private_key = '" . $userKeys['private_key'] . "'
+            'UPDATE '.$pre."users
+            SET public_key = '" . $userKeys['public_key']."', private_key = '".$userKeys['private_key']."'
             WHERE id = " . $user['id']
         );
 
@@ -621,69 +621,69 @@ 
 
 //---> 3.0.0.11
 $res = addColumnIfNotExist(
-    $pre . 'nested_tree',
+    $pre.'nested_tree',
     'fa_icon',
     "VARCHAR(100) NOT NULL DEFAULT 'fas fa-folder'"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field fa_icon to table NESTED_TREE! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field fa_icon to table NESTED_TREE! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
 
 $res = addColumnIfNotExist(
-    $pre . 'nested_tree',
+    $pre.'nested_tree',
     'fa_icon_selected',
     "VARCHAR(100) NOT NULL DEFAULT 'fas fa-folder-open'"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field fa_icon_selected to table NESTED_TREE! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field fa_icon_selected to table NESTED_TREE! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
 
 $res = addColumnIfNotExist(
-    $pre . 'items',
+    $pre.'items',
     'fa_icon',
     "VARCHAR(100) DEFAULT NULL"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field fa_icon to table ITEMS! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field fa_icon to table ITEMS! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
 
 // Add new setting 'email_debug_level'
-$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `" . $pre . "misc` WHERE type = 'admin' AND intitule = 'email_debug_level'"));
+$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `".$pre."misc` WHERE type = 'admin' AND intitule = 'email_debug_level'"));
 if (intval($tmp) === 0) {
     mysqli_query(
         $db_link,
-        "INSERT INTO `" . $pre . "misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'email_debug_level', '0')"
+        "INSERT INTO `".$pre."misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'email_debug_level', '0')"
     );
 }
 //---<
 
 
 //---> 3.0.0.13
-mysqli_query($db_link, "UPDATE `" . $pre . "nested_tree` SET `fa_icon` = 'fas fa-folder'  WHERE fa_icon = 'fa-folder'");
-mysqli_query($db_link, "UPDATE `" . $pre . "nested_tree` SET `fa_icon_selected` = 'fas fa-folder-open'  WHERE fa_icon_selected = 'fa-folder-open'");
+mysqli_query($db_link, "UPDATE `".$pre."nested_tree` SET `fa_icon` = 'fas fa-folder'  WHERE fa_icon = 'fa-folder'");
+mysqli_query($db_link, "UPDATE `".$pre."nested_tree` SET `fa_icon_selected` = 'fas fa-folder-open'  WHERE fa_icon_selected = 'fa-folder-open'");
 
 // Alter table nested_tree
 mysqli_query(
     $db_link,
-    "ALTER TABLE `" . $pre . "nested_tree` CHANGE `fa_icon` `fa_icon` VARCHAR(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'fas fa-folder';"
+    "ALTER TABLE `".$pre."nested_tree` CHANGE `fa_icon` `fa_icon` VARCHAR(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'fas fa-folder';"
 );
 mysqli_query(
     $db_link,
-    "ALTER TABLE `" . $pre . "nested_tree` CHANGE `fa_icon_selected` `fa_icon_selected` VARCHAR(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'fas fa-folder-open';"
+    "ALTER TABLE `".$pre."nested_tree` CHANGE `fa_icon_selected` `fa_icon_selected` VARCHAR(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'fas fa-folder-open';"
 );
 //---<
 
 
 //---> 3.0.0.14
-mysqli_query($db_link, "UPDATE `" . $pre . "misc` SET `intitule` = 'ldap_user_dn_attribute'  WHERE intitule = 'settings_ldap_user_dn_attribute'");
-mysqli_query($db_link, "DELETE FROM `" . $pre . "misc` WHERE `intitule` = 'ldap-test-config-username' AND type = 'admin'");
-mysqli_query($db_link, "DELETE FROM `" . $pre . "misc` WHERE `intitule` = 'ldap-test-config-pwd' AND type = 'admin'");
+mysqli_query($db_link, "UPDATE `".$pre."misc` SET `intitule` = 'ldap_user_dn_attribute'  WHERE intitule = 'settings_ldap_user_dn_attribute'");
+mysqli_query($db_link, "DELETE FROM `".$pre."misc` WHERE `intitule` = 'ldap-test-config-username' AND type = 'admin'");
+mysqli_query($db_link, "DELETE FROM `".$pre."misc` WHERE `intitule` = 'ldap-test-config-pwd' AND type = 'admin'");
 
 // Manage folder complexity values
 $rows = mysqli_query(
@@ -770,94 +770,94 @@ 
 //---<
 
 //---> 3.0.0.17
-mysqli_query($db_link, "UPDATE `" . $pre . "misc` SET `valeur` = '0'  WHERE intitule = 'enable_server_password_change'");
+mysqli_query($db_link, "UPDATE `".$pre."misc` SET `valeur` = '0'  WHERE intitule = 'enable_server_password_change'");
 
 // Add new setting 'ga_reset_by_user'
-$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `" . $pre . "misc` WHERE type = 'admin' AND intitule = 'ga_reset_by_user'"));
+$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `".$pre."misc` WHERE type = 'admin' AND intitule = 'ga_reset_by_user'"));
 if (intval($tmp) === 0) {
     mysqli_query(
         $db_link,
-        "INSERT INTO `" . $pre . "misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'ga_reset_by_user', '')"
+        "INSERT INTO `".$pre."misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'ga_reset_by_user', '')"
     );
 }
 // Add new setting 'onthefly-backup-key'
-$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `" . $pre . "misc` WHERE type = 'admin' AND intitule = 'onthefly-backup-key'"));
+$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `".$pre."misc` WHERE type = 'admin' AND intitule = 'onthefly-backup-key'"));
 if (intval($tmp) === 0) {
     mysqli_query(
         $db_link,
-        "INSERT INTO `" . $pre . "misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'onthefly-backup-key', '')"
+        "INSERT INTO `".$pre."misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'onthefly-backup-key', '')"
     );
 }
 // Add new setting 'onthefly-restore-key'
-$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `" . $pre . "misc` WHERE type = 'admin' AND intitule = 'onthefly-restore-key'"));
+$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `".$pre."misc` WHERE type = 'admin' AND intitule = 'onthefly-restore-key'"));
 if (intval($tmp) === 0) {
     mysqli_query(
         $db_link,
-        "INSERT INTO `" . $pre . "misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'onthefly-restore-key', '')"
+        "INSERT INTO `".$pre."misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'onthefly-restore-key', '')"
     );
 }
 // Add new setting 'ldap_user_dn_attribute'
-$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `" . $pre . "misc` WHERE type = 'admin' AND intitule = 'ldap_user_dn_attribute'"));
+$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `".$pre."misc` WHERE type = 'admin' AND intitule = 'ldap_user_dn_attribute'"));
 if (intval($tmp) === 0) {
     mysqli_query(
         $db_link,
-        "INSERT INTO `" . $pre . "misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'ldap_user_dn_attribute', '')"
+        "INSERT INTO `".$pre."misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'ldap_user_dn_attribute', '')"
     );
 }
 // Add new setting 'ldap_dn_additional_user_dn'
-$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `" . $pre . "misc` WHERE type = 'admin' AND intitule = 'ldap_dn_additional_user_dn'"));
+$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `".$pre."misc` WHERE type = 'admin' AND intitule = 'ldap_dn_additional_user_dn'"));
 if (intval($tmp) === 0) {
     mysqli_query(
         $db_link,
-        "INSERT INTO `" . $pre . "misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'ldap_dn_additional_user_dn', '')"
+        "INSERT INTO `".$pre."misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'ldap_dn_additional_user_dn', '')"
     );
 }
 // Add new setting 'ldap_user_object_filter'
-$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `" . $pre . "misc` WHERE type = 'admin' AND intitule = 'ldap_user_object_filter'"));
+$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `".$pre."misc` WHERE type = 'admin' AND intitule = 'ldap_user_object_filter'"));
 if (intval($tmp) === 0) {
     mysqli_query(
         $db_link,
-        "INSERT INTO `" . $pre . "misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'ldap_user_object_filter', '')"
+        "INSERT INTO `".$pre."misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'ldap_user_object_filter', '')"
     );
 }
 // Add new setting 'ldap_bdn'
-$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `" . $pre . "misc` WHERE type = 'admin' AND intitule = 'ldap_bdn'"));
+$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `".$pre."misc` WHERE type = 'admin' AND intitule = 'ldap_bdn'"));
 if (intval($tmp) === 0) {
     mysqli_query(
         $db_link,
-        "INSERT INTO `" . $pre . "misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'ldap_bdn', '')"
+        "INSERT INTO `".$pre."misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'ldap_bdn', '')"
     );
 }
 // Add new setting 'ldap_hosts'
-$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `" . $pre . "misc` WHERE type = 'admin' AND intitule = 'ldap_hosts'"));
+$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `".$pre."misc` WHERE type = 'admin' AND intitule = 'ldap_hosts'"));
 if (intval($tmp) === 0) {
     mysqli_query(
         $db_link,
-        "INSERT INTO `" . $pre . "misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'ldap_hosts', '')"
+        "INSERT INTO `".$pre."misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'ldap_hosts', '')"
     );
 }
 // Add new setting 'ldap_password'
-$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `" . $pre . "misc` WHERE type = 'admin' AND intitule = 'ldap_password'"));
+$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `".$pre."misc` WHERE type = 'admin' AND intitule = 'ldap_password'"));
 if (intval($tmp) === 0) {
     mysqli_query(
         $db_link,
-        "INSERT INTO `" . $pre . "misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'ldap_password', '')"
+        "INSERT INTO `".$pre."misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'ldap_password', '')"
     );
 }
 // Add new setting 'ldap_username'
-$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `" . $pre . "misc` WHERE type = 'admin' AND intitule = 'ldap_username'"));
+$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `".$pre."misc` WHERE type = 'admin' AND intitule = 'ldap_username'"));
 if (intval($tmp) === 0) {
     mysqli_query(
         $db_link,
-        "INSERT INTO `" . $pre . "misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'ldap_username', '')"
+        "INSERT INTO `".$pre."misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'ldap_username', '')"
     );
 }
 // Add new setting 'api_token_duration'
-$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `" . $pre . "misc` WHERE type = 'admin' AND intitule = 'api_token_duration'"));
+$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `".$pre."misc` WHERE type = 'admin' AND intitule = 'api_token_duration'"));
 if (intval($tmp) === 0) {
     mysqli_query(
         $db_link,
-        "INSERT INTO `" . $pre . "misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'api_token_duration', '60')"
+        "INSERT INTO `".$pre."misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'api_token_duration', '60')"
     );
 }
 
@@ -866,18 +866,18 @@ 
 
 //---> 3.0.0.18
 // Add new value 'last_folder_change' in table misc
-$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `" . $pre . "misc` WHERE type = 'timestamp' AND intitule = 'last_folder_change'"));
+$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `".$pre."misc` WHERE type = 'timestamp' AND intitule = 'last_folder_change'"));
 if (intval($tmp) === 0) {
     mysqli_query(
         $db_link,
-        "INSERT INTO `" . $pre . "misc` (`type`, `intitule`, `valeur`) VALUES ('timestamp', 'last_folder_change', '')"
+        "INSERT INTO `".$pre."misc` (`type`, `intitule`, `valeur`) VALUES ('timestamp', 'last_folder_change', '')"
     );
 }
 
 // Add new table CACHE_TREE
 mysqli_query(
     $db_link,
-    'CREATE TABLE IF NOT EXISTS `' . $pre . 'cache_tree` (
+    'CREATE TABLE IF NOT EXISTS `'.$pre.'cache_tree` (
         `increment_id` smallint(32) NOT NULL AUTO_INCREMENT,
         `data` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL CHECK (json_valid(`data`)),
         `visible_folders` longtext NOT NULL,
@@ -889,24 +889,24 @@ 
 
 // Add the Primary INDEX CACHE to the cache_tree table
 $res = checkIndexExist(
-    $pre . 'cache_tree',
+    $pre.'cache_tree',
     'CACHE',
     "ADD KEY `CACHE` (`increment_id`, `user_id`)"
 );
 if (!$res) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding the INDEX CACHE to the cache_tree table! ' . addslashes(mysqli_error($db_link)) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding the INDEX CACHE to the cache_tree table! '.addslashes(mysqli_error($db_link)).'!"}]';
     mysqli_close($db_link);
     exit();
 }
 
 mysqli_query(
     $db_link,
-    'ALTER TABLE `' . $pre . 'cache_tree` MODIFY `increment_id` smallint(32) NOT NULL AUTO_INCREMENT'
+    'ALTER TABLE `'.$pre.'cache_tree` MODIFY `increment_id` smallint(32) NOT NULL AUTO_INCREMENT'
 );
 
 // Add field status to CACHE_TREE table
 $res = addColumnIfNotExist(
-    $pre . 'cache_tree',
+    $pre.'cache_tree',
     'visible_folders',
     "longtext NOT NULL"
 );
@@ -914,85 +914,85 @@ 
 
 // Add field status to FILES table
 $res = addColumnIfNotExist(
-    $pre . 'files',
+    $pre.'files',
     'status',
     "varchar(50) NOT NULL DEFAULT '0'"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field status to table FILES! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field status to table FILES! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
 
 // Add field content to FILES table
 $res = addColumnIfNotExist(
-    $pre . 'files',
+    $pre.'files',
     'content',
     "longblob DEFAULT NULL;"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field content to table FILES! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field content to table FILES! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
 
 // Add new setting 'enable_tasks_manager'
-$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `" . $pre . "misc` WHERE type = 'admin' AND intitule = 'enable_tasks_manager'"));
+$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `".$pre."misc` WHERE type = 'admin' AND intitule = 'enable_tasks_manager'"));
 if (intval($tmp) === 0) {
     mysqli_query(
         $db_link,
-        "INSERT INTO `" . $pre . "misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'enable_tasks_manager', '0')"
+        "INSERT INTO `".$pre."misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'enable_tasks_manager', '0')"
     );
 }
 
 // Add new setting 'task_maximum_run_time'
-$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `" . $pre . "misc` WHERE type = 'admin' AND intitule = 'task_maximum_run_time'"));
+$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `".$pre."misc` WHERE type = 'admin' AND intitule = 'task_maximum_run_time'"));
 if (intval($tmp) === 0) {
     mysqli_query(
         $db_link,
-        "INSERT INTO `" . $pre . "misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'task_maximum_run_time', '300')"
+        "INSERT INTO `".$pre."misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'task_maximum_run_time', '300')"
     );
 }
 
 // Add new setting 'maximum_number_of_items_to_treat'
-$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `" . $pre . "misc` WHERE type = 'admin' AND intitule = 'maximum_number_of_items_to_treat'"));
+$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `".$pre."misc` WHERE type = 'admin' AND intitule = 'maximum_number_of_items_to_treat'"));
 if (intval($tmp) === 0) {
     mysqli_query(
         $db_link,
-        "INSERT INTO `" . $pre . "misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'maximum_number_of_items_to_treat', '300')"
+        "INSERT INTO `".$pre."misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'maximum_number_of_items_to_treat', '300')"
     );
 }
 
 // Add new setting 'tasks_manager_refreshing_period'
-$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `" . $pre . "misc` WHERE type = 'admin' AND intitule = 'tasks_manager_refreshing_period'"));
+$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `".$pre."misc` WHERE type = 'admin' AND intitule = 'tasks_manager_refreshing_period'"));
 if (intval($tmp) === 0) {
     mysqli_query(
         $db_link,
-        "INSERT INTO `" . $pre . "misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'tasks_manager_refreshing_period', '".NUMBER_ITEMS_IN_BATCH."')"
+        "INSERT INTO `".$pre."misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'tasks_manager_refreshing_period', '".NUMBER_ITEMS_IN_BATCH."')"
     );
 }
 
 // Add field is_ready_for_usage to USERS table
 $res = addColumnIfNotExist(
-    $pre . 'users',
+    $pre.'users',
     'is_ready_for_usage',
     "BOOLEAN NOT NULL DEFAULT FALSE;"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field is_ready_for_usage to table USERS! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field is_ready_for_usage to table USERS! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
 
 mysqli_query(
     $db_link,
-    'UPDATE `' . $pre . 'users` SET is_ready_for_usage = 1 WHERE is_ready_for_usage = 0;'
+    'UPDATE `'.$pre.'users` SET is_ready_for_usage = 1 WHERE is_ready_for_usage = 0;'
 );
 
 // Add new table PROCESSES_TASKS
 mysqli_query(
     $db_link,
-    'CREATE TABLE IF NOT EXISTS `' . $pre . 'processes_tasks` (
+    'CREATE TABLE IF NOT EXISTS `'.$pre.'processes_tasks` (
         `increment_id` int(12) NOT NULL AUTO_INCREMENT,
         `process_id` int(12) NOT NULL,
         `created_at` varchar(50) NOT NULL,
@@ -1009,7 +1009,7 @@ 
 // Add new table PROCESSES
 mysqli_query(
     $db_link,
-    'CREATE TABLE IF NOT EXISTS `' . $pre . 'processes` (
+    'CREATE TABLE IF NOT EXISTS `'.$pre.'processes` (
         `increment_id` int(12) NOT NULL AUTO_INCREMENT,
         `created_at` varchar(50) NOT NULL,
         `updated_at` varchar(50) DEFAULT NULL,
@@ -1025,43 +1025,43 @@ 
 
 // Add field masked to CATEGORIES table
 $res = addColumnIfNotExist(
-    $pre . 'categories',
+    $pre.'categories',
     'masked',
     "tinyint(1) NOT NULL default '0';"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field masked to table CATEGORIES! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field masked to table CATEGORIES! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
 
 // Add field role_visibility to CATEGORIES table
 $res = addColumnIfNotExist(
-    $pre . 'categories',
+    $pre.'categories',
     'role_visibility',
     "varchar(255) NOT NULL DEFAULT 'all';"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field role_visibility to table CATEGORIES! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field role_visibility to table CATEGORIES! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
 
 // Add field is_mandatory to CATEGORIES table
 $res = addColumnIfNotExist(
-    $pre . 'categories',
+    $pre.'categories',
     'is_mandatory',
     "tinyint(1) NOT NULL default '0';"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field is_mandatory to table CATEGORIES! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field is_mandatory to table CATEGORIES! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
 
 // Add field categories to NESTED_TREE table
 $res = addColumnIfNotExist(
-    $pre . 'nested_tree',
+    $pre.'nested_tree',
     'categories',
     "longtext NOT NULL"
 );
@@ -1069,36 +1069,36 @@ 
 // Alter field subject in EMAILS table
 mysqli_query(
     $db_link,
-    'ALTER TABLE `' . $pre . 'emails` MODIFY `subject` text NOT NULL'
+    'ALTER TABLE `'.$pre.'emails` MODIFY `subject` text NOT NULL'
 );
 
 // Alter field receivers in EMAILS table
 mysqli_query(
     $db_link,
-    'ALTER TABLE `' . $pre . 'emails` MODIFY `receivers` text NOT NULL'
+    'ALTER TABLE `'.$pre.'emails` MODIFY `receivers` text NOT NULL'
 );
 
 // Add the Primary INDEX item_id to the automatic_del table
 $res = checkIndexExist(
-    $pre . 'automatic_del',
+    $pre.'automatic_del',
     'PRIMARY',
     "ADD PRIMARY KEY (`item_id`)"
 );
 if (!$res) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding the INDEX item_id to the automatic_del table! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding the INDEX item_id to the automatic_del table! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
 
 // Add column increment_id to cache table
 $res = addColumnIfNotExist(
-    $pre . 'cache',
+    $pre.'cache',
     'increment_id',
     "INT(12) NOT NULL AUTO_INCREMENT FIRST,
     ADD PRIMARY KEY (increment_id)"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field increment_id to table cache! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field increment_id to table cache! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
@@ -1106,7 +1106,7 @@ 
 // Alter table cache
 mysqli_query(
     $db_link,
-    "ALTER TABLE `" . $pre . "cache`
+    "ALTER TABLE `".$pre."cache`
         MODIFY COLUMN `id` INT(12) NOT NULL,
         MODIFY COLUMN `label` VARCHAR(500) NOT NULL,
         MODIFY COLUMN `tags` text DEFAULT NULL,
@@ -1120,7 +1120,7 @@ 
 // Alter table categories
 mysqli_query(
     $db_link,
-    "ALTER TABLE `" . $pre . "categories`
+    "ALTER TABLE `".$pre."categories`
         MODIFY COLUMN `id` INT(12) NOT NULL AUTO_INCREMENT,
         MODIFY COLUMN `parent_id` INT(12) NOT NULL,
         MODIFY COLUMN `level` INT(2) NOT NULL,
@@ -1130,13 +1130,13 @@ 
 
 // Add column increment_id to categories_folders table
 $res = addColumnIfNotExist(
-    $pre . 'categories_folders',
+    $pre.'categories_folders',
     'increment_id',
     "INT(12) NOT NULL AUTO_INCREMENT FIRST,
     ADD PRIMARY KEY (increment_id)"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field increment_id to table categories_folders! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field increment_id to table categories_folders! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
@@ -1144,19 +1144,19 @@ 
 // Alter table categories_folders
 mysqli_query(
     $db_link,
-    "ALTER TABLE `" . $pre . "categories_folders` 
+    "ALTER TABLE `".$pre."categories_folders` 
         MODIFY COLUMN `id_category` INT(12) NOT NULL,
         MODIFY COLUMN `id_folder` INT(12) NOT NULL;"
 );
 
 // Add column is_mandatory to categories_items table
 $res = addColumnIfNotExist(
-    $pre . 'categories_items',
+    $pre.'categories_items',
     'is_mandatory',
     "TINYINT(1) NOT NULL DEFAULT 0 AFTER `encryption_type`"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field increment_id to table categories_items! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field increment_id to table categories_items! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
@@ -1164,19 +1164,19 @@ 
 // Alter table categories_items
 mysqli_query(
     $db_link,
-    "ALTER TABLE `" . $pre . "categories_items`
+    "ALTER TABLE `".$pre."categories_items`
         MODIFY COLUMN `id` INT(12) NOT NULL AUTO_INCREMENT;"
 );
 
 // Add column increment_id to emails table
 $res = addColumnIfNotExist(
-    $pre . 'emails',
+    $pre.'emails',
     'increment_id',
     "INT(12) NOT NULL AUTO_INCREMENT FIRST,
     ADD PRIMARY KEY (increment_id)"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field increment_id to table emails! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field increment_id to table emails! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
@@ -1184,26 +1184,26 @@ 
 // Alter table emails
 mysqli_query(
     $db_link,
-    "ALTER TABLE `" . $pre . "emails`
+    "ALTER TABLE `".$pre."emails`
         MODIFY COLUMN `timestamp` INT(30) NOT NULL;"
 );
 
 // Add column increment_id to export table
 $res = addColumnIfNotExist(
-    $pre . 'export',
+    $pre.'export',
     'increment_id',
     "INT(12) NOT NULL AUTO_INCREMENT FIRST,
     ADD PRIMARY KEY (increment_id)"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field increment_id to table export! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field increment_id to table export! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
 // Alter table export
 mysqli_query(
     $db_link,
-    "ALTER TABLE `" . $pre . "export`
+    "ALTER TABLE `".$pre."export`
         MODIFY COLUMN `label` VARCHAR(500) NOT NULL,
         MODIFY COLUMN `path` VARCHAR(500) NOT NULL;"
 );
@@ -1211,7 +1211,7 @@ 
 // Alter table files
 mysqli_query(
     $db_link,
-    "ALTER TABLE `" . $pre . "files`
+    "ALTER TABLE `".$pre."files`
         MODIFY COLUMN `size` INT(10) NOT NULL,
         MODIFY COLUMN `type` VARCHAR(255) NOT NULL,
         MODIFY COLUMN `content` longblob DEFAULT NULL AFTER `status`;"
@@ -1220,13 +1220,13 @@ 
 // Alter table items
 mysqli_query(
     $db_link,
-    "UPDATE `" . $pre . "items` SET `auto_update_pwd_next_date` = '0' WHERE `auto_update_pwd_next_date` IS NULL;"
+    "UPDATE `".$pre."items` SET `auto_update_pwd_next_date` = '0' WHERE `auto_update_pwd_next_date` IS NULL;"
 );
 
 // Alter table items
 mysqli_query(
     $db_link,
-    "ALTER TABLE `" . $pre . "items`
+    "ALTER TABLE `".$pre."items`
         MODIFY COLUMN `id` INT(12) NOT NULL AUTO_INCREMENT,
         MODIFY COLUMN `label` VARCHAR(500) NOT NULL,
         MODIFY COLUMN `pw_len` INT(5) NOT NULL DEFAULT 0,
@@ -1241,7 +1241,7 @@ 
 // Alter table items_change
 mysqli_query(
     $db_link,
-    "ALTER TABLE `" . $pre . "items_change`
+    "ALTER TABLE `".$pre."items_change`
         MODIFY COLUMN `id` INT(12) NOT NULL AUTO_INCREMENT,
         MODIFY COLUMN `item_id` INT(12) NOT NULL,
         MODIFY COLUMN `folder_id` tinyint(12) NOT NULL,
@@ -1250,25 +1250,25 @@ 
 
 // Add column increment_id to items_edition table
 $res = addColumnIfNotExist(
-    $pre . 'items_edition',
+    $pre.'items_edition',
     'increment_id',
     "INT(12) NOT NULL AUTO_INCREMENT FIRST,
     ADD PRIMARY KEY (increment_id)"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field increment_id to table items_edition! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field increment_id to table items_edition! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
 
 // Add the INDEX item_id_idx to the items_edition table
 $res = checkIndexExist(
-    $pre . 'items_edition',
+    $pre.'items_edition',
     'item_id_idx',
     "ADD KEY `item_id_idx` (`item_id`)"
 );
 if (!$res) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding the INDEX role_id_idx to the items_edition table! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding the INDEX role_id_idx to the items_edition table! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
@@ -1276,14 +1276,14 @@ 
 // Alter table items_edition
 mysqli_query(
     $db_link,
-    "ALTER TABLE `" . $pre . "items_edition`
+    "ALTER TABLE `".$pre."items_edition`
         MODIFY COLUMN `user_id` INT(12) NOT NULL;"
 );
 
 // Alter table kb
 mysqli_query(
     $db_link,
-    "ALTER TABLE `" . $pre . "kb`
+    "ALTER TABLE `".$pre."kb`
         MODIFY COLUMN `id` INT(12) NOT NULL AUTO_INCREMENT,
         MODIFY COLUMN `category_id` INT(12) NOT NULL,
         MODIFY COLUMN `author_id` INT(12) NOT NULL;"
@@ -1292,18 +1292,18 @@ 
 // Alter table kb_categories
 mysqli_query(
     $db_link,
-    "ALTER TABLE `" . $pre . "kb_categories` MODIFY COLUMN `id` INT(12) NOT NULL AUTO_INCREMENT;"
+    "ALTER TABLE `".$pre."kb_categories` MODIFY COLUMN `id` INT(12) NOT NULL AUTO_INCREMENT;"
 );
 
 // Add column increment_id to kb_items table
 $res = addColumnIfNotExist(
-    $pre . 'kb_items',
+    $pre.'kb_items',
     'increment_id',
     "INT(12) NOT NULL AUTO_INCREMENT FIRST,
     ADD PRIMARY KEY (increment_id)"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field increment_id to table kb_items! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field increment_id to table kb_items! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
@@ -1311,7 +1311,7 @@ 
 // Alter table kb_items
 mysqli_query(
     $db_link,
-    "ALTER TABLE `" . $pre . "kb_items`
+    "ALTER TABLE `".$pre."kb_items`
         MODIFY COLUMN `kb_id` INT(12) NOT NULL,
         MODIFY COLUMN `item_id` INT(12) NOT NULL;"
 );
@@ -1319,13 +1319,13 @@ 
 // Alter table languages
 mysqli_query(
     $db_link,
-    "ALTER TABLE `" . $pre . "languages` MODIFY COLUMN `id` INT(10) NOT NULL AUTO_INCREMENT;"
+    "ALTER TABLE `".$pre."languages` MODIFY COLUMN `id` INT(10) NOT NULL AUTO_INCREMENT;"
 );
 
 // Alter table log_items
 mysqli_query(
     $db_link,
-    "ALTER TABLE `" . $pre . "log_items`
+    "ALTER TABLE `".$pre."log_items`
         MODIFY COLUMN `increment_id` INT(12) NOT NULL AUTO_INCREMENT,
         MODIFY COLUMN `id_item` INT(8) NOT NULL,
         MODIFY COLUMN `id_user` INT(8) NOT NULL;"
@@ -1334,42 +1334,42 @@ 
 // Alter table log_system
 mysqli_query(
     $db_link,
-    "ALTER TABLE `" . $pre . "log_system`
+    "ALTER TABLE `".$pre."log_system`
         MODIFY COLUMN `id` INT(12) NOT NULL AUTO_INCREMENT,
         MODIFY COLUMN `qui` VARCHAR(255) NOT NULL;"
 );
 
 // Alter table misc column name if necessary
 $exists = false;
-$columns = mysqli_query($db_link, "show columns from `" . $pre . "misc`");
+$columns = mysqli_query($db_link, "show columns from `".$pre."misc`");
 while ($col = mysqli_fetch_assoc($columns)) {
     if ($col['Field'] == 'increment_id') {
         $exists = true;
     }
 }
 if (!$exists) {
-    mysqli_query($db_link, "ALTER TABLE `" . $pre . "misc` CHANGE COLUMN `id` `increment_id` INT(12) NOT NULL AUTO_INCREMENT");
+    mysqli_query($db_link, "ALTER TABLE `".$pre."misc` CHANGE COLUMN `id` `increment_id` INT(12) NOT NULL AUTO_INCREMENT");
 }
 
 // Alter table misc
 mysqli_query(
     $db_link,
-    "ALTER TABLE `" . $pre . "misc`
+    "ALTER TABLE `".$pre."misc`
         MODIFY COLUMN `valeur` varchar(500) NOT NULL;"
 );
 
 // Alter table nested_tree
 mysqli_query(
     $db_link,
-    "ALTER TABLE `" . $pre . "nested_tree` MODIFY COLUMN `renewal_period` int(5) NOT NULL DEFAULT 0;"
+    "ALTER TABLE `".$pre."nested_tree` MODIFY COLUMN `renewal_period` int(5) NOT NULL DEFAULT 0;"
 );
 
 // Remove the INDEX id from the nested_tree table
-$mysqli_result = mysqli_query($db_link, "SHOW INDEX FROM `" . $pre . "nested_tree` WHERE key_name LIKE \"id\"");
-if (mysqli_fetch_row($mysqli_result)){
-    $res = mysqli_query($db_link, "ALTER TABLE `" . $pre . "nested_tree` DROP INDEX `id`");
+$mysqli_result = mysqli_query($db_link, "SHOW INDEX FROM `".$pre."nested_tree` WHERE key_name LIKE \"id\"");
+if (mysqli_fetch_row($mysqli_result)) {
+    $res = mysqli_query($db_link, "ALTER TABLE `".$pre."nested_tree` DROP INDEX `id`");
     if (!$res) {
-        echo '[{"finish":"1", "msg":"", "error":"An error appears when removing the INDEX id from the nested_tree table! ' . mysqli_error($db_link) . '!"}]';
+        echo '[{"finish":"1", "msg":"", "error":"An error appears when removing the INDEX id from the nested_tree table! '.mysqli_error($db_link).'!"}]';
         mysqli_close($db_link);
         exit();
     }
@@ -1378,7 +1378,7 @@ 
 // Alter table otv
 mysqli_query(
     $db_link,
-    "ALTER TABLE `" . $pre . "otv`
+    "ALTER TABLE `".$pre."otv`
         MODIFY COLUMN `id` INT(10) NOT NULL AUTO_INCREMENT,
         MODIFY COLUMN `item_id` INT(12) NOT NULL,
         MODIFY COLUMN `originator` INT(12) NOT NULL;"
@@ -1386,13 +1386,13 @@ 
 
 // Add column increment_id to restriction_to_roles table
 $res = addColumnIfNotExist(
-    $pre . 'restriction_to_roles',
+    $pre.'restriction_to_roles',
     'increment_id',
     "INT(12) NOT NULL AUTO_INCREMENT FIRST,
     ADD PRIMARY KEY (increment_id)"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field increment_id to table restriction_to_roles! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field increment_id to table restriction_to_roles! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
@@ -1400,17 +1400,17 @@ 
 // Alter table restriction_to_roles
 mysqli_query(
     $db_link,
-    "ALTER TABLE `" . $pre . "restriction_to_roles`
+    "ALTER TABLE `".$pre."restriction_to_roles`
         MODIFY COLUMN `role_id` INT(12) NOT NULL,
         MODIFY COLUMN `item_id` INT(12) NOT NULL;"
 );
 
 // Remove the INDEX role_id_idx from the restriction_to_roles table
-$mysqli_result = mysqli_query($db_link, "SHOW INDEX FROM `" . $pre . "restriction_to_roles` WHERE key_name LIKE \"role_id_idx\"");
-if (mysqli_fetch_row($mysqli_result)){
-    $res = mysqli_query($db_link, "ALTER TABLE `" . $pre . "restriction_to_roles` DROP INDEX `role_id_idx`");
+$mysqli_result = mysqli_query($db_link, "SHOW INDEX FROM `".$pre."restriction_to_roles` WHERE key_name LIKE \"role_id_idx\"");
+if (mysqli_fetch_row($mysqli_result)) {
+    $res = mysqli_query($db_link, "ALTER TABLE `".$pre."restriction_to_roles` DROP INDEX `role_id_idx`");
     if (!$res) {
-        echo '[{"finish":"1", "msg":"", "error":"An error appears when removing the INDEX role_id_idx from the restriction_to_roles table! ' . mysqli_error($db_link) . '!"}]';
+        echo '[{"finish":"1", "msg":"", "error":"An error appears when removing the INDEX role_id_idx from the restriction_to_roles table! '.mysqli_error($db_link).'!"}]';
         mysqli_close($db_link);
         exit();
     }
@@ -1419,7 +1419,7 @@ 
 // Alter table rights
 mysqli_query(
     $db_link,
-    "ALTER TABLE `" . $pre . "rights`
+    "ALTER TABLE `".$pre."rights`
         MODIFY COLUMN `id` INT(12) NOT NULL AUTO_INCREMENT,
         MODIFY COLUMN `tree_id` INT(12) NOT NULL,
         MODIFY COLUMN `fonction_id` INT(12) NOT NULL;"
@@ -1428,20 +1428,20 @@ 
 // Alter table roles_title
 mysqli_query(
     $db_link,
-    "ALTER TABLE `" . $pre . "roles_title`
+    "ALTER TABLE `".$pre."roles_title`
         MODIFY COLUMN `id` INT(12) NOT NULL AUTO_INCREMENT,
         MODIFY COLUMN `complexity` INT(5) NOT NULL DEFAULT 0;"
 );
 
 // Add column increment_id to roles_values table
 $res = addColumnIfNotExist(
-    $pre . 'roles_values',
+    $pre.'roles_values',
     'increment_id',
     "INT(12) NOT NULL AUTO_INCREMENT FIRST,
     ADD PRIMARY KEY (increment_id)"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field increment_id to table roles_values! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field increment_id to table roles_values! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
@@ -1449,19 +1449,19 @@ 
 // Alter table roles_values
 mysqli_query(
     $db_link,
-    "ALTER TABLE `" . $pre . "roles_values`
+    "ALTER TABLE `".$pre."roles_values`
         MODIFY COLUMN `role_id` INT(12) NOT NULL,
         MODIFY COLUMN `folder_id` INT(12) NOT NULL;"
 );
 
 // Add column suggestion_type to suggestion table (fresh install create this column)
 $res = addColumnIfNotExist(
-    $pre . 'suggestion',
+    $pre.'suggestion',
     'suggestion_type',
     "VARCHAR(10) NOT NULL DEFAULT 'new'"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field suggestion_type to table suggestion! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field suggestion_type to table suggestion! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
@@ -1469,7 +1469,7 @@ 
 // Alter table suggestion
 mysqli_query(
     $db_link,
-    "ALTER TABLE `" . $pre . "suggestion`
+    "ALTER TABLE `".$pre."suggestion`
         MODIFY COLUMN `id` tinyint(12) NOT NULL AUTO_INCREMENT,
         MODIFY COLUMN `pw_len` INT(5) NOT NULL,
         MODIFY COLUMN `author_id` INT(12) NOT NULL,
@@ -1479,17 +1479,17 @@ 
 // Alter table tags
 mysqli_query(
     $db_link,
-    "ALTER TABLE `" . $pre . "tags`
+    "ALTER TABLE `".$pre."tags`
         MODIFY COLUMN `id` INT(12) NOT NULL AUTO_INCREMENT,
         MODIFY COLUMN `item_id` INT(12) NOT NULL;"
 );
 
 // Remove the INDEX id from the tags table
-$mysqli_result = mysqli_query($db_link, "SHOW INDEX FROM `" . $pre . "tags` WHERE key_name LIKE \"id\"");
-if (mysqli_fetch_row($mysqli_result)){
-    $res = mysqli_query($db_link, "ALTER TABLE `" . $pre . "tags` DROP INDEX `id`");
+$mysqli_result = mysqli_query($db_link, "SHOW INDEX FROM `".$pre."tags` WHERE key_name LIKE \"id\"");
+if (mysqli_fetch_row($mysqli_result)) {
+    $res = mysqli_query($db_link, "ALTER TABLE `".$pre."tags` DROP INDEX `id`");
     if (!$res) {
-        echo '[{"finish":"1", "msg":"", "error":"An error appears when removing the INDEX id from the tags table! ' . mysqli_error($db_link) . '!"}]';
+        echo '[{"finish":"1", "msg":"", "error":"An error appears when removing the INDEX id from the tags table! '.mysqli_error($db_link).'!"}]';
         mysqli_close($db_link);
         exit();
     }
@@ -1498,7 +1498,7 @@ 
 // Alter table templates
 mysqli_query(
     $db_link,
-    'CREATE TABLE IF NOT EXISTS `' . $pre . 'templates` (
+    'CREATE TABLE IF NOT EXISTS `'.$pre.'templates` (
     `increment_id` int(12) NOT NULL AUTO_INCREMENT,
     `item_id` int(12) NOT NULL,
     `category_id` int(12) NOT NULL,
@@ -1507,7 +1507,7 @@ 
 );
 mysqli_query(
     $db_link,
-    "ALTER TABLE `" . $pre . "templates`
+    "ALTER TABLE `".$pre."templates`
         MODIFY COLUMN `increment_id` INT(12) NOT NULL AUTO_INCREMENT,
         MODIFY COLUMN `item_id` INT(12) NOT NULL,
         MODIFY COLUMN `category_id` INT(12) NOT NULL;"
@@ -1516,43 +1516,43 @@ 
 // Alter table tokens
 mysqli_query(
     $db_link,
-    "ALTER TABLE `" . $pre . "tokens`
+    "ALTER TABLE `".$pre."tokens`
         MODIFY COLUMN `id` INT(12) NOT NULL AUTO_INCREMENT,
         MODIFY COLUMN `user_id` INT(12) NOT NULL;"
 );
 
 // Add column user_ip_lastdate to USERS table
 $res = addColumnIfNotExist(
-    $pre . 'users',
+    $pre.'users',
     'user_ip_lastdate',
     "VARCHAR(50) NULL DEFAULT NULL AFTER `user_ip`"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field user_ip_lastdate to table USERS! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field user_ip_lastdate to table USERS! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
 
 // Add column yubico_user_key to USERS table
 $res = addColumnIfNotExist(
-    $pre . 'users',
+    $pre.'users',
     'yubico_user_key',
     "VARCHAR(100) NOT NULL DEFAULT 'none' AFTER `user_ip_lastdate`"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field yubico_user_key to table USERS! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field yubico_user_key to table USERS! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
 
 // Add column yubico_user_id to USERS table
 $res = addColumnIfNotExist(
-    $pre . 'users',
+    $pre.'users',
     'yubico_user_id',
     "VARCHAR(100) NOT NULL DEFAULT 'none' AFTER `yubico_user_key`"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field yubico_user_id to table USERS! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field yubico_user_id to table USERS! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
@@ -1560,7 +1560,7 @@ 
 // Alter USERS table
 mysqli_query(
     $db_link,
-    "ALTER TABLE `" . $pre . "users`
+    "ALTER TABLE `".$pre."users`
         MODIFY COLUMN `id` INT(12) NOT NULL AUTO_INCREMENT,
         MODIFY COLUMN `pw` VARCHAR(400) NOT NULL,
         MODIFY COLUMN `groupes_visibles` VARCHAR(1000) NOT NULL,
@@ -1581,7 +1581,7 @@ 
 
 // Add field otp_provided to USERS table
 $res = addColumnIfNotExist(
-    $pre . 'users',
+    $pre.'users',
     'otp_provided',
     "BOOLEAN NOT NULL DEFAULT FALSE"
 );
@@ -1589,7 +1589,7 @@ 
 // Update this new field
 mysqli_query(
     $db_link,
-    'UPDATE `' . $pre . 'users` SET otp_provided = 1 WHERE `last_connexion` != "";'
+    'UPDATE `'.$pre.'users` SET otp_provided = 1 WHERE `last_connexion` != "";'
 );
 
 //---<END 3.0.0.18
@@ -1598,11 +1598,11 @@ 
 //--->BEGIN 3.0.0.20
 
 // Add new setting 'ldap_tls_certifacte_check'
-$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `" . $pre . "misc` WHERE type = 'admin' AND intitule = 'ldap_tls_certifacte_check'"));
+$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `".$pre."misc` WHERE type = 'admin' AND intitule = 'ldap_tls_certifacte_check'"));
 if (intval($tmp) === 0) {
     mysqli_query(
         $db_link,
-        "INSERT INTO `" . $pre . "misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'ldap_tls_certifacte_check', 'LDAP_OPT_X_TLS_NEVER')"
+        "INSERT INTO `".$pre."misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'ldap_tls_certifacte_check', 'LDAP_OPT_X_TLS_NEVER')"
     );
 }
 
@@ -1610,39 +1610,39 @@ 
 try {
     mysqli_query(
         $db_link,
-        'ALTER TABLE `' . $pre . 'languages` ADD `code_poeditor` VARCHAR(50) NOT NULL AFTER `flag`'
+        'ALTER TABLE `'.$pre.'languages` ADD `code_poeditor` VARCHAR(50) NOT NULL AFTER `flag`'
     );
-    mysqli_query($db_link, 'UPDATE `' . $pre . 'languages` SET `code_poeditor`=`bg` WHERE `name`=`bulgarian`;');
-    mysqli_query($db_link, 'UPDATE `' . $pre . 'languages` SET `code_poeditor`=`ca` WHERE `name`=`catalan`;');
-    mysqli_query($db_link, 'UPDATE `' . $pre . 'languages` SET `code_poeditor`=`zh-Hans` WHERE `name`=`chinese`;');
-    mysqli_query($db_link, 'UPDATE `' . $pre . 'languages` SET `code_poeditor`=`cs` WHERE `name`=`czech`;');
-    mysqli_query($db_link, 'UPDATE `' . $pre . 'languages` SET `code_poeditor`=`nl` WHERE `name`=`dutch`;');
-    mysqli_query($db_link, 'UPDATE `' . $pre . 'languages` SET `code_poeditor`=`en` WHERE `name`=`english`;');
-    mysqli_query($db_link, 'UPDATE `' . $pre . 'languages` SET `code_poeditor`=`et` WHERE `name`=`estonian`;');
-    mysqli_query($db_link, 'UPDATE `' . $pre . 'languages` SET `code_poeditor`=`fr` WHERE `name`=`french`;');
-    mysqli_query($db_link, 'UPDATE `' . $pre . 'languages` SET `code_poeditor`=`de` WHERE `name`=`german`;');
-    mysqli_query($db_link, 'UPDATE `' . $pre . 'languages` SET `code_poeditor`=`el` WHERE `name`=`greek`;');
-    mysqli_query($db_link, 'UPDATE `' . $pre . 'languages` SET `code_poeditor`=`hu` WHERE `name`=`hungarian`;');
-    mysqli_query($db_link, 'UPDATE `' . $pre . 'languages` SET `code_poeditor`=`it` WHERE `name`=`italian`;');
-    mysqli_query($db_link, 'UPDATE `' . $pre . 'languages` SET `code_poeditor`=`ja` WHERE `name`=`japanese`;');
-    mysqli_query($db_link, 'UPDATE `' . $pre . 'languages` SET `code_poeditor`=`no` WHERE `name`=`norwegian`;');
-    mysqli_query($db_link, 'UPDATE `' . $pre . 'languages` SET `code_poeditor`=`pl` WHERE `name`=`polish`;');
-    mysqli_query($db_link, 'UPDATE `' . $pre . 'languages` SET `code_poeditor`=`pt` WHERE `name`=`portuguese`;');
-    mysqli_query($db_link, 'UPDATE `' . $pre . 'languages` SET `code_poeditor`=`pt-br` WHERE `name`=`portuguese_br`;');
-    mysqli_query($db_link, 'UPDATE `' . $pre . 'languages` SET `code_poeditor`=`ro` WHERE `name`=`romanian`;');
-    mysqli_query($db_link, 'UPDATE `' . $pre . 'languages` SET `code_poeditor`=`ru` WHERE `name`=`russian`;');
-    mysqli_query($db_link, 'UPDATE `' . $pre . 'languages` SET `code_poeditor`=`es` WHERE `name`=`spanish`;');
-    mysqli_query($db_link, 'UPDATE `' . $pre . 'languages` SET `code_poeditor`=`sv` WHERE `name`=`swedish`;');
-    mysqli_query($db_link, 'UPDATE `' . $pre . 'languages` SET `code_poeditor`=`tr` WHERE `name`=`turkish`;');
-    mysqli_query($db_link, 'UPDATE `' . $pre . 'languages` SET `code_poeditor`=`uk` WHERE `name`=`ukrainian`;');
-    mysqli_query($db_link, 'UPDATE `' . $pre . 'languages` SET `code_poeditor`=`vi` WHERE `name`=`vietnamese`;');
+    mysqli_query($db_link, 'UPDATE `'.$pre.'languages` SET `code_poeditor`=`bg` WHERE `name`=`bulgarian`;');
+    mysqli_query($db_link, 'UPDATE `'.$pre.'languages` SET `code_poeditor`=`ca` WHERE `name`=`catalan`;');
+    mysqli_query($db_link, 'UPDATE `'.$pre.'languages` SET `code_poeditor`=`zh-Hans` WHERE `name`=`chinese`;');
+    mysqli_query($db_link, 'UPDATE `'.$pre.'languages` SET `code_poeditor`=`cs` WHERE `name`=`czech`;');
+    mysqli_query($db_link, 'UPDATE `'.$pre.'languages` SET `code_poeditor`=`nl` WHERE `name`=`dutch`;');
+    mysqli_query($db_link, 'UPDATE `'.$pre.'languages` SET `code_poeditor`=`en` WHERE `name`=`english`;');
+    mysqli_query($db_link, 'UPDATE `'.$pre.'languages` SET `code_poeditor`=`et` WHERE `name`=`estonian`;');
+    mysqli_query($db_link, 'UPDATE `'.$pre.'languages` SET `code_poeditor`=`fr` WHERE `name`=`french`;');
+    mysqli_query($db_link, 'UPDATE `'.$pre.'languages` SET `code_poeditor`=`de` WHERE `name`=`german`;');
+    mysqli_query($db_link, 'UPDATE `'.$pre.'languages` SET `code_poeditor`=`el` WHERE `name`=`greek`;');
+    mysqli_query($db_link, 'UPDATE `'.$pre.'languages` SET `code_poeditor`=`hu` WHERE `name`=`hungarian`;');
+    mysqli_query($db_link, 'UPDATE `'.$pre.'languages` SET `code_poeditor`=`it` WHERE `name`=`italian`;');
+    mysqli_query($db_link, 'UPDATE `'.$pre.'languages` SET `code_poeditor`=`ja` WHERE `name`=`japanese`;');
+    mysqli_query($db_link, 'UPDATE `'.$pre.'languages` SET `code_poeditor`=`no` WHERE `name`=`norwegian`;');
+    mysqli_query($db_link, 'UPDATE `'.$pre.'languages` SET `code_poeditor`=`pl` WHERE `name`=`polish`;');
+    mysqli_query($db_link, 'UPDATE `'.$pre.'languages` SET `code_poeditor`=`pt` WHERE `name`=`portuguese`;');
+    mysqli_query($db_link, 'UPDATE `'.$pre.'languages` SET `code_poeditor`=`pt-br` WHERE `name`=`portuguese_br`;');
+    mysqli_query($db_link, 'UPDATE `'.$pre.'languages` SET `code_poeditor`=`ro` WHERE `name`=`romanian`;');
+    mysqli_query($db_link, 'UPDATE `'.$pre.'languages` SET `code_poeditor`=`ru` WHERE `name`=`russian`;');
+    mysqli_query($db_link, 'UPDATE `'.$pre.'languages` SET `code_poeditor`=`es` WHERE `name`=`spanish`;');
+    mysqli_query($db_link, 'UPDATE `'.$pre.'languages` SET `code_poeditor`=`sv` WHERE `name`=`swedish`;');
+    mysqli_query($db_link, 'UPDATE `'.$pre.'languages` SET `code_poeditor`=`tr` WHERE `name`=`turkish`;');
+    mysqli_query($db_link, 'UPDATE `'.$pre.'languages` SET `code_poeditor`=`uk` WHERE `name`=`ukrainian`;');
+    mysqli_query($db_link, 'UPDATE `'.$pre.'languages` SET `code_poeditor`=`vi` WHERE `name`=`vietnamese`;');
 } catch (Exception $e) {
     // Do nothing
 }
 
 // Fix a potential issue in table log_items
 try {
-    mysqli_query($db_link, 'UPDATE `' . $pre . 'log_items` SET `action` = `at_modification` WHERE `action` = `at_modification2`;');
+    mysqli_query($db_link, 'UPDATE `'.$pre.'log_items` SET `action` = `at_modification` WHERE `action` = `at_modification2`;');
 } catch (Exception $e) {
     // Do nothing
 }
@@ -1656,7 +1656,7 @@ 
 // Change column increment_id to auto increment in cache_tree table
 $columns = mysqli_query($db_link, "SELECT count(*) FROM INFORMATION_SCHEMA.COLUMNS
     WHERE TABLE_SCHEMA = '".$database."'
-    AND TABLE_NAME = '" . $pre . "cache_tree'
+    AND TABLE_NAME = '" . $pre."cache_tree'
     AND COLUMN_NAME = 'increment_id'
     AND EXTRA like '%auto_increment%'");
 
@@ -1665,19 +1665,19 @@ 
         // Drop primary key
         mysqli_query(
             $db_link,
-            'ALTER TABLE `' . $pre . 'cache_tree` DROP PRIMARY KEY;'
+            'ALTER TABLE `'.$pre.'cache_tree` DROP PRIMARY KEY;'
         );
 
         // Add auto increment
         mysqli_query(
             $db_link,
-            'ALTER TABLE `' . $pre . 'cache_tree` MODIFY column `increment_id` SMALLINT AUTO_INCREMENT;'
+            'ALTER TABLE `'.$pre.'cache_tree` MODIFY column `increment_id` SMALLINT AUTO_INCREMENT;'
         );
 
         // Add primary keys
         mysqli_query(
             $db_link,
-            'ALTER TABLE `' . $pre . 'cache_tree` ADD CONSTRAINT PRIMARY KEY (increment_id);'
+            'ALTER TABLE `'.$pre.'cache_tree` ADD CONSTRAINT PRIMARY KEY (increment_id);'
         );
     } catch (Exception $e) {
         // Do nothing
@@ -1688,74 +1688,74 @@ 
 // Add indexes
 // Add the Primary INDEX OBJECT to the sharekeys_items table
 $res = checkIndexExist(
-    $pre . 'sharekeys_items',
+    $pre.'sharekeys_items',
     'OBJECT',
     "ADD KEY `OBJECT` (`object_id`)"
 );
 if (!$res) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding the INDEX OBJECT to the sharekeys_items table! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding the INDEX OBJECT to the sharekeys_items table! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
 
 // Add the Primary INDEX USER to the sharekeys_items table
 $res = checkIndexExist(
-    $pre . 'sharekeys_items',
+    $pre.'sharekeys_items',
     'USER',
     "ADD KEY `USER` (`user_id`)"
 );
 if (!$res) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding the INDEX USER to the sharekeys_items table! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding the INDEX USER to the sharekeys_items table! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
 
 // Add the Primary INDEX OBJECT to the sharekeys_logs table
 $res = checkIndexExist(
-    $pre . 'sharekeys_logs',
+    $pre.'sharekeys_logs',
     'OBJECT',
     "ADD KEY `OBJECT` (`object_id`)"
 );
 if (!$res) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding the INDEX OBJECT to the sharekeys_logs table! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding the INDEX OBJECT to the sharekeys_logs table! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
 
 // Add the Primary INDEX USER to the sharekeys_logs table
 $res = checkIndexExist(
-    $pre . 'sharekeys_logs',
+    $pre.'sharekeys_logs',
     'USER',
     "ADD KEY `USER` (`user_id`)"
 );
 if (!$res) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding the INDEX USER to the sharekeys_logs table! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding the INDEX USER to the sharekeys_logs table! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
 
 // Add field nb_items_in_folder to NESTED_TREE table
 $res = addColumnIfNotExist(
-    $pre . 'nested_tree',
+    $pre.'nested_tree',
     'nb_items_in_folder',
     "int(10) NOT NULL DEFAULT '0'"
 );
 // Add field nb_subfolders to NESTED_TREE table
 $res = addColumnIfNotExist(
-    $pre . 'nested_tree',
+    $pre.'nested_tree',
     'nb_subfolders',
     "int(10) NOT NULL DEFAULT '0'"
 );
 // Add field nb_items_in_subfolders to NESTED_TREE table
 $res = addColumnIfNotExist(
-    $pre . 'nested_tree',
+    $pre.'nested_tree',
     'nb_items_in_subfolders',
     "int(10) NOT NULL DEFAULT '0'"
 );
 
 // Add new setting enable_tasks_log
 addNewSetting(
-    $pre . 'misc',
+    $pre.'misc',
     'admin',
     'enable_tasks_log',
     '0'
@@ -1763,7 +1763,7 @@ 
 
 // remove setting ldap_elusers
 removeSetting(
-    $pre . 'misc',
+    $pre.'misc',
     'admin',
     'ldap_elusers'
 );
@@ -1771,7 +1771,7 @@ 
 // Add new table PROCESSES_LOGS
 mysqli_query(
     $db_link,
-    'CREATE TABLE IF NOT EXISTS `' . $pre . 'processes_logs` (
+    'CREATE TABLE IF NOT EXISTS `'.$pre.'processes_logs` (
         `increment_id` int(12) NOT NULL AUTO_INCREMENT,
         `created_at` varchar(20) NOT NULL,
         `job` varchar(50) NOT NULL,
@@ -1788,7 +1788,7 @@ 
 
 // Add field folders to cache_tree table
 $res = addColumnIfNotExist(
-    $pre . 'cache_tree',
+    $pre.'cache_tree',
     'folders',
     "longtext DEFAULT NULL"
 );
@@ -1796,7 +1796,7 @@ 
 try {
     mysqli_query(
         $db_link,
-        'ALTER TABLE `' . $pre . 'cache_tree` MODIFY column `folders` longtext DEFAULT NULL;'
+        'ALTER TABLE `'.$pre.'cache_tree` MODIFY column `folders` longtext DEFAULT NULL;'
     );
 } catch (Exception $e) {
     // Do nothing
@@ -1804,19 +1804,19 @@ 
 
 // Add field folders to nested_tree table
 $res = addColumnIfNotExist(
-    $pre . 'api',
+    $pre.'api',
     'user_id',
     "INT(12) DEFAULT NULL"
 );
 
 // Add the Primary INDEX USER to the api table
 $res = checkIndexExist(
-    $pre . 'api',
+    $pre.'api',
     'USER',
     "ADD KEY `USER` (`user_id`)"
 );
 if (!$res) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding the INDEX USER to the api table! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding the INDEX USER to the api table! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
@@ -1824,7 +1824,7 @@ 
 try {
     mysqli_query(
         $db_link,
-        'ALTER TABLE `' . $pre . 'api` MODIFY column `value` text DEFAULT NULL;'
+        'ALTER TABLE `'.$pre.'api` MODIFY column `value` text DEFAULT NULL;'
     );
 } catch (Exception $e) {
     // Do nothing
@@ -1833,7 +1833,7 @@ 
 try {
     mysqli_query(
         $db_link,
-        'ALTER TABLE `' . $pre . 'api` MODIFY column `label` VARCHAR(255) DEFAULT NULL;'
+        'ALTER TABLE `'.$pre.'api` MODIFY column `label` VARCHAR(255) DEFAULT NULL;'
     );
 } catch (Exception $e) {
     // Do nothing
@@ -1841,7 +1841,7 @@ 
 
 // Alter table api column name if necessary
 changeColumnName(
-    $pre . 'api',
+    $pre.'api',
     'id',
     'increment_id',
     "INT(20) NOT NULL AUTO_INCREMENT"
@@ -1947,7 +1947,7 @@ 
 // Add new table ldap_groups_roles
 mysqli_query(
     $db_link,
-    "CREATE TABLE IF NOT EXISTS `" . $pre . "ldap_groups_roles` (
+    "CREATE TABLE IF NOT EXISTS `".$pre."ldap_groups_roles` (
         `increment_id` INT(12) NOT NULL AUTO_INCREMENT,
         `role_id` INT(12) NOT NULL,
         `ldap_group_id` INT(12) NOT NULL,
@@ -1959,28 +1959,28 @@ 
 
 // Add new setting enable_ad_users_with_ad_groups
 addNewSetting(
-    $pre . 'misc',
+    $pre.'misc',
     'admin',
     'enable_ad_users_with_ad_groups',
     '0'
 );
 // Add new setting enable_ad_user_auto_creation
 addNewSetting(
-    $pre . 'misc',
+    $pre.'misc',
     'admin',
     'enable_ad_user_auto_creation',
     '0'
 );
 // Add new setting ldap_group_object_filter
 addNewSetting(
-    $pre . 'misc',
+    $pre.'misc',
     'admin',
     'ldap_group_object_filter',
     ''
 );
 // Add new setting ldap_guid_attibute
 addNewSetting(
-    $pre . 'misc',
+    $pre.'misc',
     'admin',
     'ldap_guid_attibute',
     'objectguid'
@@ -1988,18 +1988,18 @@ 
 
 // Add field public_key to USERS table
 $res = addColumnIfNotExist(
-    $pre . 'users',
+    $pre.'users',
     'roles_from_ad_groups',
     "varchar(1000) NULL"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field roles_from_ad_groups to table USERS! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field roles_from_ad_groups to table USERS! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
 
 // Add account TP USER if not exist
-$data = mysqli_fetch_row(mysqli_query($db_link, "SELECT COUNT(*) FROM ".$pre . "users WHERE id = '" . TP_USER_ID . "'"));
+$data = mysqli_fetch_row(mysqli_query($db_link, "SELECT COUNT(*) FROM ".$pre."users WHERE id = '".TP_USER_ID."'"));
 if ((int) $data[0] === 0) {
     // generate key for password
     $pwd = GenerateCryptKey(25, true, true, true, true);
@@ -2015,14 +2015,14 @@ 
     // add setting
     mysqli_query(
         $db_link,
-        "INSERT INTO `".$pre."users` (`id`, `login`, `pw`, `groupes_visibles`, `derniers`, `key_tempo`, `last_pw_change`, `last_pw`, `admin`, `fonction_id`, `groupes_interdits`, `last_connexion`, `gestionnaire`, `email`, `favourites`, `latest_items`, `personal_folder`, `public_key`, `private_key`, `encrypted_psk`) VALUES ('" . TP_USER_ID . "', 'TP', '".$encrypted_pwd."', '', '', '', '', '', '1', '', '', '', '0', '', '', '', '0', '".$userKeys['public_key']."', '".$userKeys['private_key']."', NULL)"
+        "INSERT INTO `".$pre."users` (`id`, `login`, `pw`, `groupes_visibles`, `derniers`, `key_tempo`, `last_pw_change`, `last_pw`, `admin`, `fonction_id`, `groupes_interdits`, `last_connexion`, `gestionnaire`, `email`, `favourites`, `latest_items`, `personal_folder`, `public_key`, `private_key`, `encrypted_psk`) VALUES ('".TP_USER_ID."', 'TP', '".$encrypted_pwd."', '', '', '', '', '', '1', '', '', '', '0', '', '', '', '0', '".$userKeys['public_key']."', '".$userKeys['private_key']."', NULL)"
     );
 }
 
 // Force Tasks manager to be enabled
 mysqli_query(
     $db_link,
-    "UPDATE `" . $pre . "misc` SET `valeur` = '1' WHERE type = 'admin' AND intitule = 'enable_tasks_manager';"
+    "UPDATE `".$pre."misc` SET `valeur` = '1' WHERE type = 'admin' AND intitule = 'enable_tasks_manager';"
 );
 
 //---<END 3.0.0.23
@@ -2031,7 +2031,7 @@ 
 
 // Add field regex to CATEGORIES table
 $res = addColumnIfNotExist(
-    $pre . 'categories',
+    $pre.'categories',
     'regex',
     "varchar(255) default ''"
 );

Braces +9 added lines, -13 removed lines

@@ -130,7 +130,9 @@ 
     $TPIsBranch3 === true ? '' : array('admin', 'ldap_mode', 0, 1), // only disable if migrating from branch 2
 );
 foreach ($val as $elem) {
-    if ($elem === '') continue;
+    if ($elem === '') {
+        continue;
+    }
     //Check if exists before inserting
     $queryRes = mysqli_query(
         $db_link,
@@ -700,24 +702,21 @@ 
             SET valeur = '".TP_PW_STRENGTH_2."'
             WHERE increment_id = ".$data['increment_id']
         );
-    }
-    elseif ((int) $data['valeur'] > TP_PW_STRENGTH_2 && (int) $data['valeur'] <= TP_PW_STRENGTH_3) {
+    } elseif ((int) $data['valeur'] > TP_PW_STRENGTH_2 && (int) $data['valeur'] <= TP_PW_STRENGTH_3) {
         mysqli_query(
             $db_link,
             "UPDATE ".$pre."misc
             SET valeur = '".TP_PW_STRENGTH_3."'
             WHERE increment_id = ".$data['increment_id']
         );
-    }
-    elseif ((int) $data['valeur'] > TP_PW_STRENGTH_3 && (int) $data['valeur'] <= TP_PW_STRENGTH_4) {
+    } elseif ((int) $data['valeur'] > TP_PW_STRENGTH_3 && (int) $data['valeur'] <= TP_PW_STRENGTH_4) {
         mysqli_query(
             $db_link,
             "UPDATE ".$pre."misc
             SET valeur = '".TP_PW_STRENGTH_4."'
             WHERE increment_id = ".$data['increment_id']
         );
-    }
-    elseif ((int) $data['valeur'] > TP_PW_STRENGTH_4) {
+    } elseif ((int) $data['valeur'] > TP_PW_STRENGTH_4) {
         mysqli_query(
             $db_link,
             "UPDATE ".$pre."misc
@@ -741,24 +740,21 @@ 
             SET complexity = '".TP_PW_STRENGTH_2."'
             WHERE id = ".$data['id']
         );
-    }
-    elseif ((int) $data['complexity'] > TP_PW_STRENGTH_2 && (int) $data['complexity'] <= TP_PW_STRENGTH_3) {
+    } elseif ((int) $data['complexity'] > TP_PW_STRENGTH_2 && (int) $data['complexity'] <= TP_PW_STRENGTH_3) {
         mysqli_query(
             $db_link,
             "UPDATE ".$pre."roles_title
             SET complexity = '".TP_PW_STRENGTH_3."'
             WHERE id = ".$data['id']
         );
-    }
-    elseif ((int) $data['complexity'] > TP_PW_STRENGTH_3 && (int) $data['complexity'] <= TP_PW_STRENGTH_4) {
+    } elseif ((int) $data['complexity'] > TP_PW_STRENGTH_3 && (int) $data['complexity'] <= TP_PW_STRENGTH_4) {
         mysqli_query(
             $db_link,
             "UPDATE ".$pre."roles_title
             SET complexity = '".TP_PW_STRENGTH_4."'
             WHERE id = ".$data['id']
         );
-    }
-    elseif ((int) $data['complexity'] > TP_PW_STRENGTH_4) {
+    } elseif ((int) $data['complexity'] > TP_PW_STRENGTH_4) {
         mysqli_query(
             $db_link,
             "UPDATE ".$pre."roles_title

install--ASUPPRIMER/upgrade_run_3.0.0_suggestions.php

Indentation +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
         $database,
         $port
     );
-	$db_link->set_charset(DB_ENCODING);
+    $db_link->set_charset(DB_ENCODING);
 } else {
     $res = "Impossible to get connected to server. Error is: ".addslashes(mysqli_connect_error());
     echo '[{"finish":"1", "error":"Impossible to get connected to server. Error is: '.addslashes(mysqli_connect_error()).'!"}]';

Spacing +2 added lines, -2 removed lines

@@ -154,7 +154,7 @@ 
         mysqli_query(
             $db_link,
             "UPDATE ".$pre."suggestion
-            SET pw = '". $cryptedStuff['encrypted'] ."', encryption_type = 'teampass_aes'
+            SET pw = '". $cryptedStuff['encrypted']."', encryption_type = 'teampass_aes'
             WHERE id = ".$data['id']
         );
 
@@ -162,7 +162,7 @@ 
         mysqli_query(
             $db_link,
             "INSERT INTO `".$pre."sharekeys_suggestions` (`increment_id`, `object_id`, `user_id`, `share_key`) 
-            VALUES (NULL, '". $data['id'] ."', '". $userId ."', '". encryptUserObjectKey($cryptedStuff['objectKey'], $userPublicKey) ."');"
+            VALUES (NULL, '". $data['id']."', '".$userId."', '".encryptUserObjectKey($cryptedStuff['objectKey'], $userPublicKey)."');"
         );
     }
 }

install--ASUPPRIMER/install.queries.php

Spacing +133 added lines, -133 removed lines

@@ -32,7 +32,7 @@ 
     $settings_sample = 'includes/config/settings.sample.php';
     $settings = 'includes/config/settings.php';
     if (copy('../'.$settings_sample, '../'.$settings) === false) {
-        echo '[{"error" : "File <i>' . $settings . '</i> could not be copied from <i>'.$settings_sample.'</i>.<br>Please do it on your own or change folder rights, and click START button!", "index" : "99", "multiple" : "' . $post_multiple . '"}]';
+        echo '[{"error" : "File <i>'.$settings.'</i> could not be copied from <i>'.$settings_sample.'</i>.<br>Please do it on your own or change folder rights, and click START button!", "index" : "99", "multiple" : "'.$post_multiple.'"}]';
         exit();
     }
 }
@@ -160,47 +160,47 @@ 
             $session_url_path = $data['url_path'];
 
             if (isset($data['activity']) && $data['activity'] === 'folder') {
-                $targetPath = $abspath . '/' . $data['task'] . '/';
+                $targetPath = $abspath.'/'.$data['task'].'/';
                 if (is_writable($targetPath) === true) {
-                    echo '[{"error" : "", "index" : "' . $post_index . '", "multiple" : "' . $post_multiple . '"}]';
+                    echo '[{"error" : "", "index" : "'.$post_index.'", "multiple" : "'.$post_multiple.'"}]';
                 } else {
-                    echo '[{"error" : " Path ' . $targetPath . ' is not writable!", "index" : "' . $post_index . '", "multiple" : "' . $post_multiple . '"}]';
+                    echo '[{"error" : " Path '.$targetPath.' is not writable!", "index" : "'.$post_index.'", "multiple" : "'.$post_multiple.'"}]';
                 }
                 break;
             }
 
             if (isset($data['activity']) && $data['activity'] === 'extension') {
                 if (extension_loaded($data['task'])) {
-                    echo '[{"error" : "", "index" : "' . $post_index . '", "multiple" : "' . $post_multiple . '"}]';
+                    echo '[{"error" : "", "index" : "'.$post_index.'", "multiple" : "'.$post_multiple.'"}]';
                 } else {
-                    echo '[{"error" : " Extension ' . $data['task'] . ' is not loaded!", "index" : "' . $post_index . '", "multiple" : "' . $post_multiple . '"}]';
+                    echo '[{"error" : " Extension '.$data['task'].' is not loaded!", "index" : "'.$post_index.'", "multiple" : "'.$post_multiple.'"}]';
                 }
                 break;
             }
 
             if (isset($data['activity']) && $data['activity'] === 'function') {
                 if (function_exists($data['task'])) {
-                    echo '[{"error" : "", "index" : "' . $post_index . '", "multiple" : "' . $post_multiple . '"}]';
+                    echo '[{"error" : "", "index" : "'.$post_index.'", "multiple" : "'.$post_multiple.'"}]';
                 } else {
-                    echo '[{"error" : " Function ' . $data['task'] . ' is not available!", "index" : "' . $post_index . '", "multiple" : "' . $post_multiple . '"}]';
+                    echo '[{"error" : " Function '.$data['task'].' is not available!", "index" : "'.$post_index.'", "multiple" : "'.$post_multiple.'"}]';
                 }
                 break;
             }
 
             if (isset($data['activity']) && $data['activity'] === 'version') {
                 if (version_compare(phpversion(), MIN_PHP_VERSION, '>=')) {
-                    echo '[{"error" : "", "index" : "' . $post_index . '", "multiple" : "' . $post_multiple . '"}]';
+                    echo '[{"error" : "", "index" : "'.$post_index.'", "multiple" : "'.$post_multiple.'"}]';
                 } else {
-                    echo '[{"error" : "PHP version ' . phpversion() . ' is not OK (minimum is '.MIN_PHP_VERSION.')", "index" : "' . $post_index . '", "multiple" : "' . $post_multiple . '"}]';
+                    echo '[{"error" : "PHP version '.phpversion().' is not OK (minimum is '.MIN_PHP_VERSION.')", "index" : "'.$post_index.'", "multiple" : "'.$post_multiple.'"}]';
                 }
                 break;
             }
 
             if (isset($data['activity']) && $data['activity'] === 'ini') {
                 if (ini_get($data['task']) >= 30) {
-                    echo '[{"error" : "", "index" : "' . $post_index . '"}]';
+                    echo '[{"error" : "", "index" : "'.$post_index.'"}]';
                 } else {
-                    echo '[{"error" : "PHP \"Maximum execution time\" is set to ' . ini_get('max_execution_time') . ' seconds. Please try to set to 30s at least during installation.", "index" : "' . $post_index . '", "multiple" : "' . $post_multiple . '"}]';
+                    echo '[{"error" : "PHP \"Maximum execution time\" is set to '.ini_get('max_execution_time').' seconds. Please try to set to 30s at least during installation.", "index" : "'.$post_index.'", "multiple" : "'.$post_multiple.'"}]';
                 }
                 break;
             }
@@ -243,29 +243,29 @@ 
                 // store values
                 foreach ($data as $key => $value) {
                     $superGlobal->put($key, $value, 'SESSION');
-                    $tmp = mysqli_num_rows(mysqli_query($dbTmp, "SELECT * FROM `_install` WHERE `key` = '" . $key . "'"));
+                    $tmp = mysqli_num_rows(mysqli_query($dbTmp, "SELECT * FROM `_install` WHERE `key` = '".$key."'"));
                     if (intval($tmp) === 0) {
-                        mysqli_query($dbTmp, "INSERT INTO `_install` (`key`, `value`) VALUES ('" . $key . "', '" . $value . "');");
+                        mysqli_query($dbTmp, "INSERT INTO `_install` (`key`, `value`) VALUES ('".$key."', '".$value."');");
                     } else {
-                        mysqli_query($dbTmp, "UPDATE `_install` SET `value` = '" . $value . "' WHERE `key` = '" . $key . "';");
+                        mysqli_query($dbTmp, "UPDATE `_install` SET `value` = '".$value."' WHERE `key` = '".$key."';");
                     }
                 }
                 $tmp = mysqli_num_rows(mysqli_query($dbTmp, "SELECT * FROM `_install` WHERE `key` = 'url_path'"));
                 if (intval($tmp) === 0) {
-                    mysqli_query($dbTmp, "INSERT INTO `_install` (`key`, `value`) VALUES ('url_path', '" . empty($post_urlpath) ? $db['url_path'] : $post_urlpath . "');");
+                    mysqli_query($dbTmp, "INSERT INTO `_install` (`key`, `value`) VALUES ('url_path', '".empty($post_urlpath) ? $db['url_path'] : $post_urlpath."');");
                 }/* else {
                     mysqli_query($dbTmp, "UPDATE `_install` SET `value` = '". empty($session_url_path) ? $data['url_path'] : $session_url_path. "' WHERE `key` = 'url_path';");
                 }*/
                 $tmp = mysqli_num_rows(mysqli_query($dbTmp, "SELECT * FROM `_install` WHERE `key` = 'absolute_path'"));
                 if (intval($tmp) === 0) {
-                    mysqli_query($dbTmp, "INSERT INTO `_install` (`key`, `value`) VALUES ('absolute_path', '" . empty($post_abspath) ? $data['absolute_path'] : $post_abspath . "');");
+                    mysqli_query($dbTmp, "INSERT INTO `_install` (`key`, `value`) VALUES ('absolute_path', '".empty($post_abspath) ? $data['absolute_path'] : $post_abspath."');");
                 }/* else {
                     mysqli_query($dbTmp, "UPDATE `_install` SET `value` = '" . empty($session_abspath) ? $data['absolute_path'] : $session_abspath . "' WHERE `key` = 'absolute_path';");
                 }*/
 
                 echo '[{"error" : "", "result" : "Connection is successful", "multiple" : ""}]';
             } else {
-                echo '[{"error" : "' . addslashes(str_replace(array("'", "\n", "\r"), array('"', '', ''), mysqli_connect_error())) . '", "result" : "Failed", "multiple" : ""}]';
+                echo '[{"error" : "'.addslashes(str_replace(array("'", "\n", "\r"), array('"', '', ''), mysqli_connect_error())).'", "result" : "Failed", "multiple" : ""}]';
             }
             mysqli_close($dbTmp);
             break;
@@ -287,7 +287,7 @@ 
 
             // check skpath
             if (empty($data['sk_path'])) {
-                $data['sk_path'] = $session_abspath . '/includes';
+                $data['sk_path'] = $session_abspath.'/includes';
             } else {
                 $data['sk_path'] = str_replace('&#92;', '/', $data['sk_path']);
             }
@@ -299,11 +299,11 @@ 
                     // store all variables in SESSION
                     foreach ($data as $key => $value) {
                         $superGlobal->put($key, $value, 'SESSION');
-                        $tmp = mysqli_num_rows(mysqli_query($dbTmp, "SELECT * FROM `_install` WHERE `key` = '" . $key . "'"));
+                        $tmp = mysqli_num_rows(mysqli_query($dbTmp, "SELECT * FROM `_install` WHERE `key` = '".$key."'"));
                         if (intval($tmp) === 0) {
-                            mysqli_query($dbTmp, "INSERT INTO `_install` (`key`, `value`) VALUES ('" . $key . "', '" . $value . "');");
+                            mysqli_query($dbTmp, "INSERT INTO `_install` (`key`, `value`) VALUES ('".$key."', '".$value."');");
                         } else {
-                            mysqli_query($dbTmp, "UPDATE `_install` SET `value` = '" . $value . "' WHERE `key` = '" . $key . "';");
+                            mysqli_query($dbTmp, "UPDATE `_install` SET `value` = '".$value."' WHERE `key` = '".$key."';");
                         }
                     }
                     echo '[{"error" : "", "result" : "Information stored", "multiple" : ""}]';
@@ -311,7 +311,7 @@ 
                     echo '[{"error" : "The Directory must be writable!", "result" : "Information stored", "multiple" : ""}]';
                 }
             } else {
-                echo '[{"error" : "' . $data['sk_path'] . ' is not a Directory!", "result" : "Information stored", "multiple" : ""}]';
+                echo '[{"error" : "'.$data['sk_path'].' is not a Directory!", "result" : "Information stored", "multiple" : ""}]';
             }
             mysqli_close($dbTmp);
             break;
@@ -339,11 +339,11 @@ 
                 if ($activity === 'table') {
                     if ($task === 'utf8') {
                         //FORCE UTF8 DATABASE
-                        mysqli_query($dbTmp, 'ALTER DATABASE `' . $dbBdd . '` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci');
+                        mysqli_query($dbTmp, 'ALTER DATABASE `'.$dbBdd.'` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci');
                     } elseif ($task === 'defuse_passwords') {
                         $mysqli_result = mysqli_query(
                             $dbTmp,
-                            'CREATE TABLE IF NOT EXISTS `' . $var['tbl_prefix'] . 'defuse_passwords` (
+                            'CREATE TABLE IF NOT EXISTS `'.$var['tbl_prefix'].'defuse_passwords` (
 								`increment_id` int(12) NOT NULL AUTO_INCREMENT,
 								`type` varchar(100) NOT NULL,
 								`object_id` int(12) NOT NULL,
@@ -354,7 +354,7 @@ 
                     } elseif ($task === 'notification') {
                         $mysqli_result = mysqli_query(
                             $dbTmp,
-                            'CREATE TABLE IF NOT EXISTS `' . $var['tbl_prefix'] . 'notification` (
+                            'CREATE TABLE IF NOT EXISTS `'.$var['tbl_prefix'].'notification` (
 								`increment_id` INT(12) NOT NULL AUTO_INCREMENT,
 								`item_id` INT(12) NOT NULL,
 								`user_id` INT(12) NOT NULL,
@@ -364,7 +364,7 @@ 
                     } elseif ($task === 'sharekeys_items') {
                         $mysqli_result = mysqli_query(
                             $dbTmp,
-                            'CREATE TABLE IF NOT EXISTS `' . $var['tbl_prefix'] . 'sharekeys_items` (
+                            'CREATE TABLE IF NOT EXISTS `'.$var['tbl_prefix'].'sharekeys_items` (
 								`increment_id` int(12) NOT NULL AUTO_INCREMENT,
 								`object_id` int(12) NOT NULL,
 								`user_id` int(12) NOT NULL,
@@ -374,14 +374,14 @@ 
                         );
                         $mysqli_result = mysqli_query(
                             $dbTmp,
-                            'ALTER TABLE `' . $var['tbl_prefix'] . 'sharekeys_items`
+                            'ALTER TABLE `'.$var['tbl_prefix'].'sharekeys_items`
                                 ADD KEY `object_id_idx` (`object_id`),
                                 ADD KEY `user_id_idx` (`user_id`);'
                         );
                     } elseif ($task === 'sharekeys_logs') {
                         $mysqli_result = mysqli_query(
                             $dbTmp,
-                            'CREATE TABLE IF NOT EXISTS `' . $var['tbl_prefix'] . 'sharekeys_logs` (
+                            'CREATE TABLE IF NOT EXISTS `'.$var['tbl_prefix'].'sharekeys_logs` (
 								`increment_id` int(12) NOT NULL AUTO_INCREMENT,
 								`object_id` int(12) NOT NULL,
 								`user_id` int(12) NOT NULL,
@@ -391,14 +391,14 @@ 
                         );
                         $mysqli_result = mysqli_query(
                             $dbTmp,
-                            'ALTER TABLE `' . $var['tbl_prefix'] . 'sharekeys_logs`
+                            'ALTER TABLE `'.$var['tbl_prefix'].'sharekeys_logs`
                                 ADD KEY `object_id_idx` (`object_id`),
                                 ADD KEY `user_id_idx` (`user_id`);'
                         );
                     } elseif ($task === 'sharekeys_fields') {
                         $mysqli_result = mysqli_query(
                             $dbTmp,
-                            'CREATE TABLE IF NOT EXISTS `' . $var['tbl_prefix'] . 'sharekeys_fields` (
+                            'CREATE TABLE IF NOT EXISTS `'.$var['tbl_prefix'].'sharekeys_fields` (
 								`increment_id` int(12) NOT NULL AUTO_INCREMENT,
 								`object_id` int(12) NOT NULL,
 								`user_id` int(12) NOT NULL,
@@ -409,7 +409,7 @@ 
                     } elseif ($task === 'sharekeys_suggestions') {
                         $mysqli_result = mysqli_query(
                             $dbTmp,
-                            'CREATE TABLE IF NOT EXISTS `' . $var['tbl_prefix'] . 'sharekeys_suggestions` (
+                            'CREATE TABLE IF NOT EXISTS `'.$var['tbl_prefix'].'sharekeys_suggestions` (
 								`increment_id` int(12) NOT NULL AUTO_INCREMENT,
 								`object_id` int(12) NOT NULL,
 								`user_id` int(12) NOT NULL,
@@ -420,7 +420,7 @@ 
                     } elseif ($task === 'sharekeys_files') {
                         $mysqli_result = mysqli_query(
                             $dbTmp,
-                            'CREATE TABLE IF NOT EXISTS `' . $var['tbl_prefix'] . 'sharekeys_files` (
+                            'CREATE TABLE IF NOT EXISTS `'.$var['tbl_prefix'].'sharekeys_files` (
 								`increment_id` int(12) NOT NULL AUTO_INCREMENT,
 								`object_id` int(12) NOT NULL,
 								`user_id` int(12) NOT NULL,
@@ -431,7 +431,7 @@ 
                     } elseif ($task === 'items') {
                         $mysqli_result = mysqli_query(
                             $dbTmp,
-                            "CREATE TABLE IF NOT EXISTS `" . $var['tbl_prefix'] . "items` (
+                            "CREATE TABLE IF NOT EXISTS `".$var['tbl_prefix']."items` (
                             `id` int(12) NOT null AUTO_INCREMENT,
                             `label` varchar(500) NOT NULL,
                             `description` text DEFAULT NULL,
@@ -464,7 +464,7 @@ 
                     } elseif ($task === 'log_items') {
                         $mysqli_result = mysqli_query(
                             $dbTmp,
-                            "CREATE TABLE IF NOT EXISTS `" . $var['tbl_prefix'] . "log_items` (
+                            "CREATE TABLE IF NOT EXISTS `".$var['tbl_prefix']."log_items` (
                             `increment_id` int(12) NOT NULL AUTO_INCREMENT,
                             `id_item` int(8) NOT NULL,
                             `date` varchar(50) NOT NULL,
@@ -479,12 +479,12 @@ 
                         // create index
                         mysqli_query(
                             $dbTmp,
-                            'CREATE INDEX teampass_log_items_id_item_IDX ON ' . $var['tbl_prefix'] . 'log_items (id_item,date);'
+                            'CREATE INDEX teampass_log_items_id_item_IDX ON '.$var['tbl_prefix'].'log_items (id_item,date);'
                         );
                     } elseif ($task === 'misc') {
                         $mysqli_result = mysqli_query(
                             $dbTmp,
-                            'CREATE TABLE IF NOT EXISTS `' . $var['tbl_prefix'] . 'misc` (
+                            'CREATE TABLE IF NOT EXISTS `'.$var['tbl_prefix'].'misc` (
                             `increment_id` int(12) NOT null AUTO_INCREMENT,
                             `type` varchar(50) NOT NULL,
                             `intitule` varchar(100) NOT NULL,
@@ -499,8 +499,8 @@ 
                         // prepare config file
                         $tp_config_file = '../includes/config/tp.config.php';
                         if (file_exists($tp_config_file)) {
-                            if (!copy($tp_config_file, $tp_config_file . '.' . date('Y_m_d', mktime(0, 0, 0, (int) date('m'), (int) date('d'), (int) date('y'))))) {
-                                echo '[{"error" : "includes/config/tp.config.php file already exists and cannot be renamed. Please do it by yourself and click on button Launch.", "result":"", "index" : "' . $post_index . '", "multiple" : "' . $post_multiple . '"}]';
+                            if (!copy($tp_config_file, $tp_config_file.'.'.date('Y_m_d', mktime(0, 0, 0, (int) date('m'), (int) date('d'), (int) date('y'))))) {
+                                echo '[{"error" : "includes/config/tp.config.php file already exists and cannot be renamed. Please do it by yourself and click on button Launch.", "result":"", "index" : "'.$post_index.'", "multiple" : "'.$post_multiple.'"}]';
                                 break;
                             } else {
                                 unlink($tp_config_file);
@@ -528,10 +528,10 @@ 
                             array('admin', 'manager_edit', '1'),
                             array('admin', 'cpassman_dir', $var['absolute_path']),
                             array('admin', 'cpassman_url', $var['url_path']),
-                            array('admin', 'favicon', $var['url_path'] . '/favicon.ico'),
-                            array('admin', 'path_to_upload_folder', $var['absolute_path'] . '/upload'),
-                            array('admin', 'path_to_files_folder', $var['absolute_path'] . '/files'),
-                            array('admin', 'url_to_files_folder', $var['url_path'] . '/files'),
+                            array('admin', 'favicon', $var['url_path'].'/favicon.ico'),
+                            array('admin', 'path_to_upload_folder', $var['absolute_path'].'/upload'),
+                            array('admin', 'path_to_files_folder', $var['absolute_path'].'/files'),
+                            array('admin', 'url_to_files_folder', $var['url_path'].'/files'),
                             array('admin', 'activate_expiration', '0'),
                             array('admin', 'pw_life_duration', '0'),
                             array('admin', 'maintenance_mode', '1'),
@@ -612,7 +612,7 @@ 
                             array('admin', 'duo', '0'),
                             array('admin', 'enable_server_password_change', '0'),
                             array('admin', 'ldap_object_class', '0'),
-                            array('admin', 'bck_script_path', $var['absolute_path'] . '/backups'),
+                            array('admin', 'bck_script_path', $var['absolute_path'].'/backups'),
                             array('admin', 'bck_script_filename', 'bck_teampass'),
                             array('admin', 'syslog_enable', '0'),
                             array('admin', 'syslog_host', 'localhost'),
@@ -692,30 +692,30 @@ 
                             $tmp = mysqli_num_rows(
                                 mysqli_query(
                                     $dbTmp,
-                                    "SELECT * FROM `" . $var['tbl_prefix'] . "misc`
-                                    WHERE type='" . $elem[0] . "' AND intitule='" . $elem[1] . "'"
+                                    "SELECT * FROM `".$var['tbl_prefix']."misc`
+                                    WHERE type='" . $elem[0]."' AND intitule='".$elem[1]."'"
                                 )
                             );
                             if (intval($tmp) === 0) {
                                 $queryRes = mysqli_query(
                                     $dbTmp,
-                                    "INSERT INTO `" . $var['tbl_prefix'] . "misc`
+                                    "INSERT INTO `".$var['tbl_prefix']."misc`
                                     (`type`, `intitule`, `valeur`) VALUES
-                                    ('" . $elem[0] . "', '" . $elem[1] . "', '" .
-                                        str_replace("'", '', $elem[2]) . "');"
+                                    ('" . $elem[0]."', '".$elem[1]."', '".
+                                        str_replace("'", '', $elem[2])."');"
                                 ); // or die(mysqli_error($dbTmp))
                             }
 
                             // append new setting in config file
                             $config_text .= "
-    '" . $elem[1] . "' => '" . str_replace("'", '', $elem[2]) . "',";
+    '" . $elem[1]."' => '".str_replace("'", '', $elem[2])."',";
                         }
 
                         // write to config file
                         $result = fwrite(
                             $file_handler,
                             utf8_encode(
-                                $config_text . '
+                                $config_text.'
 );'
                             )
                         );
@@ -725,7 +725,7 @@ 
                     } elseif ($task === 'nested_tree') {
                         $mysqli_result = mysqli_query(
                             $dbTmp,
-                            "CREATE TABLE IF NOT EXISTS `" . $var['tbl_prefix'] . "nested_tree` (
+                            "CREATE TABLE IF NOT EXISTS `".$var['tbl_prefix']."nested_tree` (
                             `id` bigint(20) unsigned NOT null AUTO_INCREMENT,
                             `parent_id` int(11) NOT NULL,
                             `title` varchar(255) NOT NULL,
@@ -753,7 +753,7 @@ 
                     } elseif ($task === 'rights') {
                         $mysqli_result = mysqli_query(
                             $dbTmp,
-                            "CREATE TABLE IF NOT EXISTS `" . $var['tbl_prefix'] . "rights` (
+                            "CREATE TABLE IF NOT EXISTS `".$var['tbl_prefix']."rights` (
                             `id` int(12) NOT null AUTO_INCREMENT,
                             `tree_id` int(12) NOT NULL,
                             `fonction_id` int(12) NOT NULL,
@@ -764,7 +764,7 @@ 
                     } elseif ($task === 'users') {
                         $mysqli_result = mysqli_query(
                             $dbTmp,
-                            "CREATE TABLE IF NOT EXISTS `" . $var['tbl_prefix'] . "users` (
+                            "CREATE TABLE IF NOT EXISTS `".$var['tbl_prefix']."users` (
                             `id` int(12) NOT null AUTO_INCREMENT,
                             `login` varchar(500) NOT NULL,
                             `pw` varchar(400) NOT NULL,
@@ -828,37 +828,37 @@ 
 
                         require_once '../includes/config/include.php';
                         // check that admin accounts doesn't exist
-                        $tmp = mysqli_num_rows(mysqli_query($dbTmp, "SELECT * FROM `" . $var['tbl_prefix'] . "users` WHERE login = 'admin'"));
+                        $tmp = mysqli_num_rows(mysqli_query($dbTmp, "SELECT * FROM `".$var['tbl_prefix']."users` WHERE login = 'admin'"));
                         if ($tmp === 0) {
                             $mysqli_result = mysqli_query(
                                 $dbTmp,
-                                "INSERT INTO `" . $var['tbl_prefix'] . "users` (`id`, `login`, `pw`, `admin`, `gestionnaire`, `personal_folder`, `groupes_visibles`, `email`, `encrypted_psk`, `last_pw_change`, `name`, `lastname`, `can_create_root_folder`, `public_key`, `private_key`, `is_ready_for_usage`, `otp_provided`) VALUES ('1', 'admin', '" . bCrypt($var['admin_pwd'], '13') . "', '1', '0', '0', '0', '" . $var['admin_email'] . "', '', '" . time() . "', 'Change me', 'Change me', '1', 'none', 'none', '1', '1')"
+                                "INSERT INTO `".$var['tbl_prefix']."users` (`id`, `login`, `pw`, `admin`, `gestionnaire`, `personal_folder`, `groupes_visibles`, `email`, `encrypted_psk`, `last_pw_change`, `name`, `lastname`, `can_create_root_folder`, `public_key`, `private_key`, `is_ready_for_usage`, `otp_provided`) VALUES ('1', 'admin', '".bCrypt($var['admin_pwd'], '13')."', '1', '0', '0', '0', '".$var['admin_email']."', '', '".time()."', 'Change me', 'Change me', '1', 'none', 'none', '1', '1')"
                             );
                         } else {
-                            $mysqli_result = mysqli_query($dbTmp, 'UPDATE `' . $var['tbl_prefix'] . "users` SET `pw` = '" . bCrypt($var['admin_pwd'], '13') . "' WHERE login = 'admin' AND id = '1'");
+                            $mysqli_result = mysqli_query($dbTmp, 'UPDATE `'.$var['tbl_prefix']."users` SET `pw` = '".bCrypt($var['admin_pwd'], '13')."' WHERE login = 'admin' AND id = '1'");
                         }
 
                         // check that API doesn't exist
-                        $tmp = mysqli_num_rows(mysqli_query($dbTmp, "SELECT * FROM `" . $var['tbl_prefix'] . "users` WHERE id = '" . API_USER_ID . "'"));
+                        $tmp = mysqli_num_rows(mysqli_query($dbTmp, "SELECT * FROM `".$var['tbl_prefix']."users` WHERE id = '".API_USER_ID."'"));
                         if ($tmp === 0) {
                             $mysqli_result = mysqli_query(
                                 $dbTmp,
-                                "INSERT INTO `" . $var['tbl_prefix'] . "users` (`id`, `login`, `pw`, `groupes_visibles`, `derniers`, `key_tempo`, `last_pw_change`, `last_pw`, `admin`, `fonction_id`, `groupes_interdits`, `last_connexion`, `gestionnaire`, `email`, `favourites`, `latest_items`, `personal_folder`, `is_ready_for_usage`, `otp_provided`) VALUES ('" . API_USER_ID . "', 'API', '', '', '', '', '', '', '1', '', '', '', '0', '', '', '', '0', '0', '1')"
+                                "INSERT INTO `".$var['tbl_prefix']."users` (`id`, `login`, `pw`, `groupes_visibles`, `derniers`, `key_tempo`, `last_pw_change`, `last_pw`, `admin`, `fonction_id`, `groupes_interdits`, `last_connexion`, `gestionnaire`, `email`, `favourites`, `latest_items`, `personal_folder`, `is_ready_for_usage`, `otp_provided`) VALUES ('".API_USER_ID."', 'API', '', '', '', '', '', '', '1', '', '', '', '0', '', '', '', '0', '0', '1')"
                             );
                         }
 
                         // check that OTV doesn't exist
-                        $tmp = mysqli_num_rows(mysqli_query($dbTmp, "SELECT * FROM `" . $var['tbl_prefix'] . "users` WHERE id = '" . OTV_USER_ID . "'"));
+                        $tmp = mysqli_num_rows(mysqli_query($dbTmp, "SELECT * FROM `".$var['tbl_prefix']."users` WHERE id = '".OTV_USER_ID."'"));
                         if ($tmp === 0) {
                             $mysqli_result = mysqli_query(
                                 $dbTmp,
-                                "INSERT INTO `" . $var['tbl_prefix'] . "users` (`id`, `login`, `pw`, `groupes_visibles`, `derniers`, `key_tempo`, `last_pw_change`, `last_pw`, `admin`, `fonction_id`, `groupes_interdits`, `last_connexion`, `gestionnaire`, `email`, `favourites`, `latest_items`, `personal_folder`, `is_ready_for_usage`, `otp_provided`) VALUES ('" . OTV_USER_ID . "', 'OTV', '', '', '', '', '', '', '1', '', '', '', '0', '', '', '', '0', '0', '1')"
+                                "INSERT INTO `".$var['tbl_prefix']."users` (`id`, `login`, `pw`, `groupes_visibles`, `derniers`, `key_tempo`, `last_pw_change`, `last_pw`, `admin`, `fonction_id`, `groupes_interdits`, `last_connexion`, `gestionnaire`, `email`, `favourites`, `latest_items`, `personal_folder`, `is_ready_for_usage`, `otp_provided`) VALUES ('".OTV_USER_ID."', 'OTV', '', '', '', '', '', '', '1', '', '', '', '0', '', '', '', '0', '0', '1')"
                             );
                         }
                     } elseif ($task === 'tags') {
                         $mysqli_result = mysqli_query(
                             $dbTmp,
-                            'CREATE TABLE IF NOT EXISTS `' . $var['tbl_prefix'] . 'tags` (
+                            'CREATE TABLE IF NOT EXISTS `'.$var['tbl_prefix'].'tags` (
                             `id` int(12) NOT null AUTO_INCREMENT,
                             `tag` varchar(30) NOT NULL,
                             `item_id` int(12) NOT NULL,
@@ -868,7 +868,7 @@ 
                     } elseif ($task === 'log_system') {
                         $mysqli_result = mysqli_query(
                             $dbTmp,
-                            'CREATE TABLE IF NOT EXISTS `' . $var['tbl_prefix'] . 'log_system` (
+                            'CREATE TABLE IF NOT EXISTS `'.$var['tbl_prefix'].'log_system` (
                             `id` int(12) NOT null AUTO_INCREMENT,
                             `type` varchar(20) NOT NULL,
                             `date` varchar(30) NOT NULL,
@@ -881,7 +881,7 @@ 
                     } elseif ($task === 'files') {
                         $mysqli_result = mysqli_query(
                             $dbTmp,
-                            "CREATE TABLE IF NOT EXISTS `" . $var['tbl_prefix'] . "files` (
+                            "CREATE TABLE IF NOT EXISTS `".$var['tbl_prefix']."files` (
                             `id` int(11) NOT null AUTO_INCREMENT,
                             `id_item` int(11) NOT NULL,
                             `name` TEXT NOT NULL,
@@ -898,7 +898,7 @@ 
                     } elseif ($task === 'cache') {
                         $mysqli_result = mysqli_query(
                             $dbTmp,
-                            "CREATE TABLE IF NOT EXISTS `" . $var['tbl_prefix'] . "cache` (
+                            "CREATE TABLE IF NOT EXISTS `".$var['tbl_prefix']."cache` (
                             `increment_id`INT(12) NOT NULL AUTO_INCREMENT,
                             `id` int(12) NOT NULL,
                             `label` varchar(500) NOT NULL,
@@ -920,7 +920,7 @@ 
                     } elseif ($task === 'roles_title') {
                         $mysqli_result = mysqli_query(
                             $dbTmp,
-                            "CREATE TABLE IF NOT EXISTS `" . $var['tbl_prefix'] . "roles_title` (
+                            "CREATE TABLE IF NOT EXISTS `".$var['tbl_prefix']."roles_title` (
                             `id` int(12) NOT null AUTO_INCREMENT,
                             `title` varchar(50) NOT NULL,
                             `allow_pw_change` TINYINT(1) NOT null DEFAULT '0',
@@ -931,17 +931,17 @@ 
                         );
 
                         // create Default role
-                        $tmp = mysqli_num_rows(mysqli_query($dbTmp, "SELECT * FROM `" . $var['tbl_prefix'] . "roles_title` WHERE id = '0'"));
+                        $tmp = mysqli_num_rows(mysqli_query($dbTmp, "SELECT * FROM `".$var['tbl_prefix']."roles_title` WHERE id = '0'"));
                         if ($tmp === 0) {
                             $mysqli_result = mysqli_query(
                                 $dbTmp,
-                                "INSERT INTO `" . $var['tbl_prefix'] . "roles_title` (`id`, `title`, `allow_pw_change`, `complexity`, `creator_id`) VALUES (NULL, 'Default', '0', '48', '0')"
+                                "INSERT INTO `".$var['tbl_prefix']."roles_title` (`id`, `title`, `allow_pw_change`, `complexity`, `creator_id`) VALUES (NULL, 'Default', '0', '48', '0')"
                             );
                         }
                     } elseif ($task === 'roles_values') {
                         $mysqli_result = mysqli_query(
                             $dbTmp,
-                            "CREATE TABLE IF NOT EXISTS `" . $var['tbl_prefix'] . "roles_values` (
+                            "CREATE TABLE IF NOT EXISTS `".$var['tbl_prefix']."roles_values` (
                             `increment_id` int(12) NOT NULL AUTO_INCREMENT PRIMARY KEY,
                             `role_id` int(12) NOT NULL,
                             `folder_id` int(12) NOT NULL,
@@ -952,7 +952,7 @@ 
                     } elseif ($task === 'kb') {
                         $mysqli_result = mysqli_query(
                             $dbTmp,
-                            "CREATE TABLE IF NOT EXISTS `" . $var['tbl_prefix'] . "kb` (
+                            "CREATE TABLE IF NOT EXISTS `".$var['tbl_prefix']."kb` (
                             `id` int(12) NOT null AUTO_INCREMENT,
                             `category_id` int(12) NOT NULL,
                             `label` varchar(200) NOT NULL,
@@ -965,7 +965,7 @@ 
                     } elseif ($task === 'kb_categories') {
                         $mysqli_result = mysqli_query(
                             $dbTmp,
-                            'CREATE TABLE IF NOT EXISTS `' . $var['tbl_prefix'] . 'kb_categories` (
+                            'CREATE TABLE IF NOT EXISTS `'.$var['tbl_prefix'].'kb_categories` (
                             `id` int(12) NOT null AUTO_INCREMENT,
                             `category` varchar(50) NOT NULL,
                             PRIMARY KEY (`id`)
@@ -974,7 +974,7 @@ 
                     } elseif ($task === 'kb_items') {
                         $mysqli_result = mysqli_query(
                             $dbTmp,
-                            'CREATE TABLE IF NOT EXISTS `' . $var['tbl_prefix'] . 'kb_items` (
+                            'CREATE TABLE IF NOT EXISTS `'.$var['tbl_prefix'].'kb_items` (
                             `increment_id` int(12) NOT NULL AUTO_INCREMENT,
                             `kb_id` int(12) NOT NULL,
                             `item_id` int(12) NOT NULL,
@@ -984,7 +984,7 @@ 
                     } elseif ($task == 'restriction_to_roles') {
                         $mysqli_result = mysqli_query(
                             $dbTmp,
-                            'CREATE TABLE IF NOT EXISTS `' . $var['tbl_prefix'] . 'restriction_to_roles` (
+                            'CREATE TABLE IF NOT EXISTS `'.$var['tbl_prefix'].'restriction_to_roles` (
                             `increment_id` int(12) NOT NULL AUTO_INCREMENT,
                             `role_id` int(12) NOT NULL,
                             `item_id` int(12) NOT NULL,
@@ -994,7 +994,7 @@ 
                     } elseif ($task === 'languages') {
                         $mysqli_result = mysqli_query(
                             $dbTmp,
-                            'CREATE TABLE IF NOT EXISTS `' . $var['tbl_prefix'] . 'languages` (
+                            'CREATE TABLE IF NOT EXISTS `'.$var['tbl_prefix'].'languages` (
                             `id` INT(10) NOT null AUTO_INCREMENT,
                             `name` VARCHAR(50) NOT null ,
                             `label` VARCHAR(50) NOT null ,
@@ -1006,11 +1006,11 @@ 
                         );
 
                         // add lanaguages
-                        $tmp = mysqli_num_rows(mysqli_query($dbTmp, "SELECT * FROM `" . $var['tbl_prefix'] . "languages` WHERE name = 'french'"));
+                        $tmp = mysqli_num_rows(mysqli_query($dbTmp, "SELECT * FROM `".$var['tbl_prefix']."languages` WHERE name = 'french'"));
                         if ($tmp === 0) {
                             $mysql_result = mysqli_query(
                                 $dbTmp,
-                                "INSERT INTO `" . $var['tbl_prefix'] . "languages` (`id`, `name`, `label`, `code`, `flag`, `code_poeditor`) VALUES
+                                "INSERT INTO `".$var['tbl_prefix']."languages` (`id`, `name`, `label`, `code`, `flag`, `code_poeditor`) VALUES
                                 (1, 'french', 'French', 'fr', 'fr.png', 'fr'),
                                 (2, 'english', 'English', 'us', 'us.png', 'en'),
                                 (3, 'spanish', 'Spanish', 'es', 'es.png', 'es'),
@@ -1040,7 +1040,7 @@ 
                     } elseif ($task === 'emails') {
                         $mysqli_result = mysqli_query(
                             $dbTmp,
-                            'CREATE TABLE IF NOT EXISTS `' . $var['tbl_prefix'] . 'emails` (
+                            'CREATE TABLE IF NOT EXISTS `'.$var['tbl_prefix'].'emails` (
                             `increment_id` int(12) NOT NULL AUTO_INCREMENT,
                             `timestamp` INT(30) NOT null ,
                             `subject` TEXT NOT null ,
@@ -1053,7 +1053,7 @@ 
                     } elseif ($task === 'automatic_del') {
                         $mysqli_result = mysqli_query(
                             $dbTmp,
-                            'CREATE TABLE IF NOT EXISTS `' . $var['tbl_prefix'] . 'automatic_del` (
+                            'CREATE TABLE IF NOT EXISTS `'.$var['tbl_prefix'].'automatic_del` (
                             `item_id` int(11) NOT NULL,
                             `del_enabled` tinyint(1) NOT NULL,
                             `del_type` tinyint(1) NOT NULL,
@@ -1064,7 +1064,7 @@ 
                     } elseif ($task === 'items_edition') {
                         $mysqli_result = mysqli_query(
                             $dbTmp,
-                            'CREATE TABLE IF NOT EXISTS `' . $var['tbl_prefix'] . 'items_edition` (
+                            'CREATE TABLE IF NOT EXISTS `'.$var['tbl_prefix'].'items_edition` (
                             `increment_id` int(12) NOT NULL AUTO_INCREMENT,
                             `item_id` int(11) NOT NULL,
                             `user_id` int(12) NOT NULL,
@@ -1076,7 +1076,7 @@ 
                     } elseif ($task === 'categories') {
                         $mysqli_result = mysqli_query(
                             $dbTmp,
-                            "CREATE TABLE IF NOT EXISTS `" . $var['tbl_prefix'] . "categories` (
+                            "CREATE TABLE IF NOT EXISTS `".$var['tbl_prefix']."categories` (
                             `id` int(12) NOT NULL AUTO_INCREMENT,
                             `parent_id` int(12) NOT NULL,
                             `title` varchar(255) NOT NULL,
@@ -1095,7 +1095,7 @@ 
                     } elseif ($task === 'categories_items') {
                         $mysqli_result = mysqli_query(
                             $dbTmp,
-                            "CREATE TABLE IF NOT EXISTS `" . $var['tbl_prefix'] . "categories_items` (
+                            "CREATE TABLE IF NOT EXISTS `".$var['tbl_prefix']."categories_items` (
                             `id` int(12) NOT NULL AUTO_INCREMENT,
                             `field_id` int(11) NOT NULL,
                             `item_id` int(11) NOT NULL,
@@ -1109,7 +1109,7 @@ 
                     } elseif ($task === 'categories_folders') {
                         $mysqli_result = mysqli_query(
                             $dbTmp,
-                            'CREATE TABLE IF NOT EXISTS `' . $var['tbl_prefix'] . 'categories_folders` (
+                            'CREATE TABLE IF NOT EXISTS `'.$var['tbl_prefix'].'categories_folders` (
                             `increment_id` int(12) NOT NULL AUTO_INCREMENT,
                             `id_category` int(12) NOT NULL,
                             `id_folder` int(12) NOT NULL,
@@ -1119,7 +1119,7 @@ 
                     } elseif ($task === 'api') {
                         $mysqli_result = mysqli_query(
                             $dbTmp,
-                            'CREATE TABLE IF NOT EXISTS `' . $var['tbl_prefix'] . 'api` (
+                            'CREATE TABLE IF NOT EXISTS `'.$var['tbl_prefix'].'api` (
                             `increment_id` int(20) NOT NULL AUTO_INCREMENT,
                             `type` varchar(15) NOT NULL,
                             `label` varchar(255) DEFAULT NULL,
@@ -1133,7 +1133,7 @@ 
                     } elseif ($task === 'otv') {
                         $mysqli_result = mysqli_query(
                             $dbTmp,
-                            "CREATE TABLE IF NOT EXISTS `" . $var['tbl_prefix'] . "otv` (
+                            "CREATE TABLE IF NOT EXISTS `".$var['tbl_prefix']."otv` (
                             `id` int(10) NOT NULL AUTO_INCREMENT,
                             `timestamp` text NOT NULL,
                             `code` varchar(100) NOT NULL,
@@ -1150,7 +1150,7 @@ 
                     } elseif ($task === 'suggestion') {
                         $mysqli_result = mysqli_query(
                             $dbTmp,
-                            "CREATE TABLE IF NOT EXISTS `" . $var['tbl_prefix'] . "suggestion` (
+                            "CREATE TABLE IF NOT EXISTS `".$var['tbl_prefix']."suggestion` (
                             `id` tinyint(12) NOT NULL AUTO_INCREMENT,
                             `label` varchar(255) NOT NULL,
                             `pw` text NOT NULL,
@@ -1168,7 +1168,7 @@ 
 
                         $mysqli_result = mysqli_query(
                             $dbTmp,
-                            "CREATE TABLE IF NOT EXISTS `" . $var['tbl_prefix'] . "export` (
+                            "CREATE TABLE IF NOT EXISTS `".$var['tbl_prefix']."export` (
                             `increment_id` int(12) NOT NULL AUTO_INCREMENT,
                             `export_tag` varchar(20) NOT NULL,
                             `item_id` int(12) NOT NULL,
@@ -1190,7 +1190,7 @@ 
                     } elseif ($task === 'tokens') {
                         $mysqli_result = mysqli_query(
                             $dbTmp,
-                            'CREATE TABLE IF NOT EXISTS `' . $var['tbl_prefix'] . 'tokens` (
+                            'CREATE TABLE IF NOT EXISTS `'.$var['tbl_prefix'].'tokens` (
                             `id` int(12) NOT NULL AUTO_INCREMENT,
                             `user_id` int(12) NOT NULL,
                             `token` varchar(255) NOT NULL,
@@ -1203,7 +1203,7 @@ 
                     } elseif ($task === 'items_change') {
                         $mysqli_result = mysqli_query(
                             $dbTmp,
-                            "CREATE TABLE IF NOT EXISTS `" . $var['tbl_prefix'] . "items_change` (
+                            "CREATE TABLE IF NOT EXISTS `".$var['tbl_prefix']."items_change` (
                             `id` int(12) NOT NULL AUTO_INCREMENT,
                             `item_id` int(12) NOT NULL,
                             `label` varchar(255) NOT NULL DEFAULT 'none',
@@ -1222,7 +1222,7 @@ 
                     } elseif ($task === 'templates') {
                         $mysqli_result = mysqli_query(
                             $dbTmp,
-                            'CREATE TABLE IF NOT EXISTS `' . $var['tbl_prefix'] . 'templates` (
+                            'CREATE TABLE IF NOT EXISTS `'.$var['tbl_prefix'].'templates` (
                             `increment_id` int(12) NOT NULL AUTO_INCREMENT,
                             `item_id` int(12) NOT NULL,
                             `category_id` int(12) NOT NULL,
@@ -1232,7 +1232,7 @@ 
                     } elseif ($task === 'cache_tree') {
                         $mysqli_result = mysqli_query(
                             $dbTmp,
-                            "CREATE TABLE IF NOT EXISTS `" . $var['tbl_prefix'] . "cache_tree` (
+                            "CREATE TABLE IF NOT EXISTS `".$var['tbl_prefix']."cache_tree` (
                             `increment_id` smallint(32) NOT NULL AUTO_INCREMENT,
                             `data` longtext DEFAULT NULL CHECK (json_valid(`data`)),
                             `visible_folders` longtext NOT NULL,
@@ -1245,7 +1245,7 @@ 
                     } else if ($task === 'processes_tasks') {
                         $mysqli_result = mysqli_query(
                             $dbTmp,
-                            "CREATE TABLE IF NOT EXISTS `" . $var['tbl_prefix'] . "processes_tasks` (
+                            "CREATE TABLE IF NOT EXISTS `".$var['tbl_prefix']."processes_tasks` (
                             `increment_id` int(12) NOT NULL AUTO_INCREMENT,
                             `process_id` int(12) NOT NULL,
                             `created_at` varchar(50) NOT NULL,
@@ -1260,13 +1260,13 @@ 
                         );
                         $mysqli_result = mysqli_query(
                             $dbTmp,
-                            'ALTER TABLE `' . $var['tbl_prefix'] . 'processes_tasks`
+                            'ALTER TABLE `'.$var['tbl_prefix'].'processes_tasks`
                                 ADD KEY `process_id_idx` (`process_id`);'
                         );
                     } else if ($task === 'processes') {
                         $mysqli_result = mysqli_query(
                             $dbTmp,
-                            "CREATE TABLE IF NOT EXISTS `" . $var['tbl_prefix'] . "processes` (
+                            "CREATE TABLE IF NOT EXISTS `".$var['tbl_prefix']."processes` (
                             `increment_id` int(12) NOT NULL AUTO_INCREMENT,
                             `created_at` varchar(50) NOT NULL,
                             `started_at` varchar(50) DEFAULT NULL,
@@ -1284,7 +1284,7 @@ 
                     } else if ($task === 'processes_logs') {
                         $mysqli_result = mysqli_query(
                             $dbTmp,
-                            "CREATE TABLE IF NOT EXISTS `" . $var['tbl_prefix'] . "processes_logs` (
+                            "CREATE TABLE IF NOT EXISTS `".$var['tbl_prefix']."processes_logs` (
                             `increment_id` int(12) NOT NULL AUTO_INCREMENT,
                             `created_at` varchar(20) NOT NULL,
                             `job` varchar(50) NOT NULL,
@@ -1298,7 +1298,7 @@ 
                     } else if ($task === 'ldap_groups_roles') {
                         $mysqli_result = mysqli_query(
                             $dbTmp,
-                            "CREATE TABLE IF NOT EXISTS `" . $var['tbl_prefix'] . "ldap_groups_roles` (
+                            "CREATE TABLE IF NOT EXISTS `".$var['tbl_prefix']."ldap_groups_roles` (
                             `increment_id` INT(12) NOT NULL AUTO_INCREMENT,
                             `role_id` INT(12) NOT NULL,
                             `ldap_group_id` VARCHAR(500) NOT NULL,
@@ -1310,7 +1310,7 @@ 
                     } else if ($task === 'items_otp') {
                         $mysqli_result = mysqli_query(
                             $dbTmp,
-                            "CREATE TABLE IF NOT EXISTS `" . $var['tbl_prefix'] . "items_otp` (
+                            "CREATE TABLE IF NOT EXISTS `".$var['tbl_prefix']."items_otp` (
                             `increment_id` int(12) NOT NULL,
                             `item_id` int(12) NOT NULL,
                             `secret` text NOT NULL,
@@ -1328,12 +1328,12 @@ 
                 }
                 // answer back
                 if ($mysqli_result) {
-                    echo '[{"error" : "", "index" : "' . $post_index . '", "multiple" : "' . $post_multiple . '", "task" : "' . $task . '", "activity" : "' . $activity . '"}]';
+                    echo '[{"error" : "", "index" : "'.$post_index.'", "multiple" : "'.$post_multiple.'", "task" : "'.$task.'", "activity" : "'.$activity.'"}]';
                 } else {
-                    echo '[{"error" : "' . addslashes(str_replace(array("'", "\n", "\r"), array('"', '', ''), mysqli_error($dbTmp))) . '", "index" : "' . $post_index . '", "multiple" : "' . $post_multiple . '", "table" : "' . $task . '"}]';
+                    echo '[{"error" : "'.addslashes(str_replace(array("'", "\n", "\r"), array('"', '', ''), mysqli_error($dbTmp))).'", "index" : "'.$post_index.'", "multiple" : "'.$post_multiple.'", "table" : "'.$task.'"}]';
                 }
             } else {
-                echo '[{"error" : "' . addslashes(str_replace(array("'", "\n", "\r"), array('"', '', ''), mysqli_connect_error())) . '", "result" : "Failed", "multiple" : ""}]';
+                echo '[{"error" : "'.addslashes(str_replace(array("'", "\n", "\r"), array('"', '', ''), mysqli_connect_error())).'", "result" : "Failed", "multiple" : ""}]';
             }
 
             mysqli_close($dbTmp);
@@ -1383,11 +1383,11 @@ 
                     // 0- check if exists
                     $filesecure = generateRandomKey();
                     define('SECUREFILE', $filesecure);
-                    $filename_seckey = $securePath . '/' . $filesecure;
+                    $filename_seckey = $securePath.'/'.$filesecure;
 
                     if (file_exists($filename_seckey)) {
-                        if (!copy($filename_seckey, $filename_seckey . '.' . date('Y_m_d', mktime(0, 0, 0, (int) date('m'), (int) date('d'), (int) date('y'))))) {
-                            echo '[{"error" : "File `'.$filename_seckey.'` already exists and cannot be renamed. Please do it by yourself and click on button Launch.", "result":"", "index" : "' . $post_index . '", "multiple" : "' . $post_multiple . '"}]';
+                        if (!copy($filename_seckey, $filename_seckey.'.'.date('Y_m_d', mktime(0, 0, 0, (int) date('m'), (int) date('d'), (int) date('y'))))) {
+                            echo '[{"error" : "File `'.$filename_seckey.'` already exists and cannot be renamed. Please do it by yourself and click on button Launch.", "result":"", "index" : "'.$post_index.'", "multiple" : "'.$post_multiple.'"}]';
                             break;
                         } else {
                             unlink($filename);
@@ -1408,8 +1408,8 @@ 
                     $filename = '../includes/config/settings.php';
 
                     if (file_exists($filename)) {
-                        if (!copy($filename, $filename . '.' . date('Y_m_d', mktime(0, 0, 0, (int) date('m'), (int) date('d'), (int) date('y'))))) {
-                            echo '[{"error" : "Setting.php file already exists and cannot be renamed. Please do it by yourself and click on button Launch.", "result":"", "index" : "' . $post_index . '", "multiple" : "' . $post_multiple . '"}]';
+                        if (!copy($filename, $filename.'.'.date('Y_m_d', mktime(0, 0, 0, (int) date('m'), (int) date('d'), (int) date('y'))))) {
+                            echo '[{"error" : "Setting.php file already exists and cannot be renamed. Please do it by yourself and click on button Launch.", "result":"", "index" : "'.$post_index.'", "multiple" : "'.$post_multiple.'"}]';
                             break;
                         } else {
                             unlink($filename);
@@ -1429,13 +1429,13 @@ 
                         utf8_encode(
                             '<?php
 // DATABASE connexion parameters
-define("DB_HOST", "' . $db['db_host'] . '");
-define("DB_USER", "' . $db['db_login'] . '");
-define("DB_PASSWD", "' . str_replace('$', '\$', $encrypted_text) . '");
-define("DB_NAME", "' . $db['db_bdd'] . '");
-define("DB_PREFIX", "' . $var['tbl_prefix'] . '");
-define("DB_PORT", "' . $db['db_port'] . '");
-define("DB_ENCODING", "' . $session_db_encoding . '");
+define("DB_HOST", "' . $db['db_host'].'");
+define("DB_USER", "' . $db['db_login'].'");
+define("DB_PASSWD", "' . str_replace('$', '\$', $encrypted_text).'");
+define("DB_NAME", "' . $db['db_bdd'].'");
+define("DB_PREFIX", "' . $var['tbl_prefix'].'");
+define("DB_PORT", "' . $db['db_port'].'");
+define("DB_ENCODING", "' . $session_db_encoding.'");
 define("DB_SSL", false); // if DB over SSL then comment this line
 // if DB over SSL then uncomment the following lines
 //define("DB_SSL", array(
@@ -1448,8 +1448,8 @@ 
 define("DB_CONNECT_OPTIONS", array(
     MYSQLI_OPT_CONNECT_TIMEOUT => 10
 ));
-define("SECUREPATH", "' . $securePath . '");
-define("SECUREFILE", "' . $filesecure. '");
+define("SECUREPATH", "' . $securePath.'");
+define("SECUREFILE", "' . $filesecure.'");
 
 if (isset($_SESSION[\'settings\'][\'timezone\']) === true) {
     date_default_timezone_set($_SESSION[\'settings\'][\'timezone\']);
@@ -1461,7 +1461,7 @@ 
 
                     // Create TP USER
                     require_once '../includes/config/include.php';
-                    $tmp = mysqli_num_rows(mysqli_query($dbTmp, "SELECT * FROM `" . $var['tbl_prefix'] . "users` WHERE id = '" . TP_USER_ID . "'"));
+                    $tmp = mysqli_num_rows(mysqli_query($dbTmp, "SELECT * FROM `".$var['tbl_prefix']."users` WHERE id = '".TP_USER_ID."'"));
                     if ($tmp === 0) {
                         // generate key for password
                         $pwd = GenerateCryptKey(25, true, true, true, true);
@@ -1476,14 +1476,14 @@ 
 
                         $mysqli_result = mysqli_query(
                             $dbTmp,
-                            "INSERT INTO `" . $var['tbl_prefix'] . "users` (`id`, `login`, `pw`, `groupes_visibles`, `derniers`, `key_tempo`, `last_pw_change`, `last_pw`, `admin`, `fonction_id`, `groupes_interdits`, `last_connexion`, `gestionnaire`, `email`, `favourites`, `latest_items`, `personal_folder`, `public_key`, `private_key`, `is_ready_for_usage`, `otp_provided`) VALUES ('" . TP_USER_ID . "', 'TP', '".$encrypted_pwd."', '', '', '', '', '', '1', '', '', '', '0', '', '', '', '0', '".$userKeys['public_key']."', '".$userKeys['private_key']."', '1', '1')"
+                            "INSERT INTO `".$var['tbl_prefix']."users` (`id`, `login`, `pw`, `groupes_visibles`, `derniers`, `key_tempo`, `last_pw_change`, `last_pw`, `admin`, `fonction_id`, `groupes_interdits`, `last_connexion`, `gestionnaire`, `email`, `favourites`, `latest_items`, `personal_folder`, `public_key`, `private_key`, `is_ready_for_usage`, `otp_provided`) VALUES ('".TP_USER_ID."', 'TP', '".$encrypted_pwd."', '', '', '', '', '', '1', '', '', '', '0', '', '', '', '0', '".$userKeys['public_key']."', '".$userKeys['private_key']."', '1', '1')"
                         );
                     }
 
                     if ($result === false) {
-                        echo '[{"error" : "Setting.php file could not be created. Please check the path and the rights", "result":"", "index" : "' . $post_index . '", "multiple" : "' . $post_multiple . '"}]';
+                        echo '[{"error" : "Setting.php file could not be created. Please check the path and the rights", "result":"", "index" : "'.$post_index.'", "multiple" : "'.$post_multiple.'"}]';
                     } else {
-                        echo '[{"error" : "", "index" : "' . $post_index . '", "multiple" : "' . $post_multiple . '"}]';
+                        echo '[{"error" : "", "index" : "'.$post_index.'", "multiple" : "'.$post_multiple.'"}]';
                     }
                 } elseif ($task === 'security') {
                     // Sort out the file permissions
@@ -1494,26 +1494,26 @@ 
                         if (is_null($session_abspath) === false) {
                             $result = recursiveChmod($session_abspath, 0770, 0740);
                             if ($result) {
-                                $result = recursiveChmod($session_abspath . '/files', 0770, 0770);
+                                $result = recursiveChmod($session_abspath.'/files', 0770, 0770);
                             }
                             if ($result) {
-                                $result = recursiveChmod($session_abspath . '/upload', 0770, 0770);
+                                $result = recursiveChmod($session_abspath.'/upload', 0770, 0770);
                             }
                         }
                     }
                     $result = true;
                     if ($result === false) {
-                        echo '[{"error" : "Cannot change directory permissions - please fix manually", "result":"", "index" : "' . $post_index . '", "multiple" : "' . $post_multiple . '"}]';
+                        echo '[{"error" : "Cannot change directory permissions - please fix manually", "result":"", "index" : "'.$post_index.'", "multiple" : "'.$post_multiple.'"}]';
                     } else {
-                        echo '[{"error" : "", "index" : "' . $post_index . '", "multiple" : "' . $post_multiple . '"}]';
+                        echo '[{"error" : "", "index" : "'.$post_index.'", "multiple" : "'.$post_multiple.'"}]';
                     }
                 } elseif ($task === 'csrfp-token') {
                     // update CSRFP TOKEN
                     $csrfp_file_sample = '../includes/libraries/csrfp/libs/csrfp.config.sample.php';
                     $csrfp_file = '../includes/libraries/csrfp/libs/csrfp.config.php';
                     if (file_exists($csrfp_file)) {
-                        if (!copy($csrfp_file, $csrfp_file . '.' . date('Y_m_d', mktime(0, 0, 0, (int) date('m'), (int) date('d'), (int) date('y'))))) {
-                            echo '[{"error" : "csrfp.config.php file already exists and cannot be renamed. Please do it by yourself and click on button Launch.", "result":"", "index" : "' . $post_index . '", "multiple" : "' . $post_multiple . '"}]';
+                        if (!copy($csrfp_file, $csrfp_file.'.'.date('Y_m_d', mktime(0, 0, 0, (int) date('m'), (int) date('d'), (int) date('y'))))) {
+                            echo '[{"error" : "csrfp.config.php file already exists and cannot be renamed. Please do it by yourself and click on button Launch.", "result":"", "index" : "'.$post_index.'", "multiple" : "'.$post_multiple.'"}]';
                             break;
                         } else {
                             $events .= "The file $csrfp_file already exist. A copy has been created.<br />";
@@ -1522,21 +1522,21 @@ 
                     unlink($csrfp_file); // delete existing csrfp.config file
                     copy($csrfp_file_sample, $csrfp_file); // make a copy of csrfp.config.sample file
                     $data = file_get_contents($csrfp_file);
-                    $newdata = str_replace('"CSRFP_TOKEN" => ""', '"CSRFP_TOKEN" => "' . bin2hex(openssl_random_pseudo_bytes(25)) . '"', $data);
-                    $jsUrl = $data_sent['url_path'] . '/includes/libraries/csrfp/js/csrfprotector.js';
-                    $newdata = str_replace('"jsUrl" => ""', '"jsUrl" => "' . $jsUrl . '"', $newdata);
+                    $newdata = str_replace('"CSRFP_TOKEN" => ""', '"CSRFP_TOKEN" => "'.bin2hex(openssl_random_pseudo_bytes(25)).'"', $data);
+                    $jsUrl = $data_sent['url_path'].'/includes/libraries/csrfp/js/csrfprotector.js';
+                    $newdata = str_replace('"jsUrl" => ""', '"jsUrl" => "'.$jsUrl.'"', $newdata);
                     file_put_contents('../includes/libraries/csrfp/libs/csrfp.config.php', $newdata);
 
-                    echo '[{"error" : "", "index" : "' . $post_index . '", "multiple" : "' . $post_multiple . '"}]';
+                    echo '[{"error" : "", "index" : "'.$post_index.'", "multiple" : "'.$post_multiple.'"}]';
                 }
             } elseif ($activity === 'install') {
                 if ($task === 'cleanup') {
                     // Mark a tag to force Install stuff (folders, files and table) to be cleanup while first login
-                    mysqli_query($dbTmp, "INSERT INTO `" . $var['tbl_prefix'] . "misc` (`type`, `intitule`, `valeur`) VALUES ('install', 'clear_install_folder', 'true')");
+                    mysqli_query($dbTmp, "INSERT INTO `".$var['tbl_prefix']."misc` (`type`, `intitule`, `valeur`) VALUES ('install', 'clear_install_folder', 'true')");
 
-                    echo '[{"error" : "", "index" : "' . $post_index . '", "multiple" : "' . $post_multiple . '"}]';
+                    echo '[{"error" : "", "index" : "'.$post_index.'", "multiple" : "'.$post_multiple.'"}]';
                 } elseif ($task === 'init') {
-                    echo '[{"error" : "", "index" : "' . $post_index . '", "multiple" : "' . $post_multiple . '"}]';
+                    echo '[{"error" : "", "index" : "'.$post_index.'", "multiple" : "'.$post_multiple.'"}]';
                 } elseif ($task === 'cronJob') {
                     // Create cronjob
                     // get php location
@@ -1556,7 +1556,7 @@ 
                                     ->setDayOfMonth('*')
                                     ->setMonths('*')
                                     ->setDayOfWeek('*')
-                                    ->setTaskCommandLine($phpLocation . ' ' . $SETTINGS['cpassman_dir'] . '/sources/scheduler.php')
+                                    ->setTaskCommandLine($phpLocation.' '.$SETTINGS['cpassman_dir'].'/sources/scheduler.php')
                                     ->setComments('Teampass scheduler');
                                 
                                 $crontabRepository->addJob($crontabJob);
@@ -1566,9 +1566,9 @@ 
                             // do nothing
                         }
                     } else {
-                        echo '[{"error" : "Cannot find PHP binary location. Please add a cronjob manually (see documentation).", "result":"", "index" : "' . $post_index . '", "multiple" : "' . $post_multiple . '"}]';
+                        echo '[{"error" : "Cannot find PHP binary location. Please add a cronjob manually (see documentation).", "result":"", "index" : "'.$post_index.'", "multiple" : "'.$post_multiple.'"}]';
                     }
-                    echo '[{"error" : "", "index" : "' . $post_index . '", "multiple" : "' . $post_multiple . '"}]';
+                    echo '[{"error" : "", "index" : "'.$post_index.'", "multiple" : "'.$post_multiple.'"}]';
                 }
             }
 

sources/export.queries.php

Spacing +64 added lines, -64 removed lines

@@ -68,7 +68,7 @@ 
 ) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -90,7 +90,7 @@ 
 $antiXss = new AntiXSS();
 
 // User's language loading
-require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $session->get('user-language') . '.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$session->get('user-language').'.php';
 
 // Prepare POST variables
 $id = filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT);
@@ -141,9 +141,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))
@@ -166,8 +166,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->get('user-id'),
                                     $record['id']
@@ -191,8 +191,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']
                                 );
@@ -204,7 +204,7 @@ 
                                 $arr_tags = [];
                                 $rows_tag = DB::query(
                                     'SELECT tag
-                                    FROM ' . prefixTable('tags') . '
+                                    FROM ' . prefixTable('tags').'
                                     WHERE item_id = %i',
                                     $record['id']
                                 );
@@ -216,18 +216,18 @@ 
                                 $arr_trees = [];
                                 $rows_child_tree = DB::query(
                                     'SELECT t.id, t.title
-                                    FROM ' . prefixTable('nested_tree') . ' AS t
-                                    INNER JOIN ' . prefixTable('items') . ' AS i ON (t.id = i.id_tree)
+                                    FROM ' . prefixTable('nested_tree').' AS t
+                                    INNER JOIN ' . prefixTable('items').' AS i ON (t.id = i.id_tree)
                                     WHERE i.id = %i',
                                     $record['id']
                                 );
                                 foreach ($rows_child_tree as $rec_child_tree) {
                                     $stack = array();
                                     $parent = $rec_child_tree['id'];
-                                    while($parent != 0){
+                                    while ($parent != 0) {
                                         $rows_parent_tree = DB::query(
                                             'SELECT parent_id, title
-                                            FROM ' . prefixTable('nested_tree') . '
+                                            FROM ' . prefixTable('nested_tree').'
                                             WHERE id = %i',
                                             $parent
                                         );
@@ -314,7 +314,7 @@ 
             // Prepare variables
             $post_export_tag = filter_var($dataReceived['export_tag'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
             if (empty($post_export_tag) === false) {
-                DB::query('DELETE FROM ' . prefixTable('export') . ' WHERE export_tag = %s', $post_export_tag);
+                DB::query('DELETE FROM '.prefixTable('export').' WHERE export_tag = %s', $post_export_tag);
             }
             break;
 
@@ -364,9 +364,9 @@ 
                         l.date as date, i.pw_iv as pw_iv,
                         n.renewal_period as renewal_period,
                         i.id_tree as tree_id
-                        FROM ' . prefixTable('items') . ' as i
-                        INNER JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree = n.id)
-                        INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id = l.id_item)
+                        FROM ' . prefixTable('items').' as i
+                        INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree = n.id)
+                        INNER JOIN ' . prefixTable('log_items').' as l ON (i.id = l.id_item)
                         WHERE i.inactif = %i
                         AND i.id_tree= %i
                         AND (l.action = %s OR (l.action = %s AND l.raison LIKE %s))
@@ -392,8 +392,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->get('user-id'),
                                 $record['id']
@@ -417,8 +417,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']
                             );
@@ -426,7 +426,7 @@ 
                                 if (empty($arr_kbs)) {
                                     $arr_kbs = $rec_kb['label'];
                                 } else {
-                                    $arr_kbs .= ' | ' . $rec_kb['label'];
+                                    $arr_kbs .= ' | '.$rec_kb['label'];
                                 }
                             }
 
@@ -434,7 +434,7 @@ 
                             $arr_tags = '';
                             $rows_tag = DB::query(
                                 'SELECT tag
-                                FROM ' . prefixTable('tags') . '
+                                FROM ' . prefixTable('tags').'
                                 WHERE item_id = %i',
                                 $record['id']
                             );
@@ -442,7 +442,7 @@ 
                                 if (empty($arr_tags)) {
                                     $arr_tags = $rec_tag['tag'];
                                 } else {
-                                    $arr_tags .= ' ' . $rec_tag['tag'];
+                                    $arr_tags .= ' '.$rec_tag['tag'];
                                 }
                             }
 
@@ -520,7 +520,7 @@ 
             // query
             $rows = DB::query(
                 'SELECT * 
-                FROM ' . prefixTable('export') . ' 
+                FROM ' . prefixTable('export').' 
                 WHERE export_tag = %s',
                 $dataReceived['export_tag']
             );
@@ -532,7 +532,7 @@ 
                 $prev_path = '';
 
                 //Prepare the PDF file
-                include $SETTINGS['cpassman_dir'] . '/vendor/tecnickcom/tcpdf/tcpdf.php';
+                include $SETTINGS['cpassman_dir'].'/vendor/tecnickcom/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);
@@ -544,7 +544,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->get('user-lastname')." ".$session->get('user-name').' @ '.date($SETTINGS['date_format']." ".$SETTINGS['time_format'], (int) time())
@@ -654,7 +654,7 @@ 
                 logEvents($SETTINGS, 'pdf_export', '', (string) $session->get('user-id'), $session->get('user-login'));
 
                 //clean table
-                DB::query('TRUNCATE TABLE ' . prefixTable('export'));
+                DB::query('TRUNCATE TABLE '.prefixTable('export'));
 
                 // Clean any content of the output buffer
                 ob_end_clean();
@@ -692,13 +692,13 @@ 
             // step 1:
             // - prepare export file
             // - get full list of objects id to export
-            include $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
+            include $SETTINGS['cpassman_dir'].'/includes/config/include.php';
             $idsList = array();
 
             // query
             $rows = DB::query(
                 'SELECT * 
-                FROM ' . prefixTable('export') . ' 
+                FROM ' . prefixTable('export').' 
                 WHERE export_tag = %s',
                 $inputData['export_tag']
             );
@@ -735,13 +735,13 @@ 
             }
             // prepare export file
             //save the file
-            $outstream = fopen($SETTINGS['path_to_files_folder'] . (substr($SETTINGS['path_to_files_folder'] , -1) === '/' ? '' : '/') . $inputData['filename'], 'w');
+            $outstream = fopen($SETTINGS['path_to_files_folder'].(substr($SETTINGS['path_to_files_folder'], -1) === '/' ? '' : '/').$inputData['filename'], 'w');
             if ($outstream === false) {
                 echo (string) prepareExchangedData(
                     [
                         'error' => true,
                         'message' => $lang->get('error_while_creating_file'),
-                        'detail' => $SETTINGS['path_to_files_folder'] . $inputData['filename'],
+                        'detail' => $SETTINGS['path_to_files_folder'].$inputData['filename'],
                     ],
                     'encode'
                 );
@@ -767,12 +767,12 @@ 
     </style>
     </head>
     <body>
-    <input type="hidden" id="generation_date" value="' . GibberishAES::enc(/** @scrutinizer ignore-type */ (string) time(), $inputData['password']) . '" />
+    <input type="hidden" id="generation_date" value="' . GibberishAES::enc(/** @scrutinizer ignore-type */ (string) time(), $inputData['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->get('user-name') . ' ' . $session->get('user-lastname') . '</b>, the ' . date('Y/m/d H:i:s') . '.</i>
+    <i>This page was generated by <b>' . $session->get('user-name').' '.$session->get('user-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>
@@ -783,11 +783,11 @@ 
     <div>
     <table id="itemsTable">
         <thead><tr>
-            <th style="width:15%;">' . $lang->get('label') . '</th>
-            <th style="width:10%;">' . $lang->get('pw') . '</th>
-            <th style="width:30%;">' . $lang->get('description') . '</th>
-            <th style="width:5%;">' . $lang->get('user_login') . '</th>
-            <th style="width:20%;">' . $lang->get('url') . '</th>
+            <th style="width:15%;">' . $lang->get('label').'</th>
+            <th style="width:10%;">' . $lang->get('pw').'</th>
+            <th style="width:30%;">' . $lang->get('description').'</th>
+            <th style="width:5%;">' . $lang->get('user_login').'</th>
+            <th style="width:20%;">' . $lang->get('url').'</th>
         </tr></thead>
         <tbody id="itemsTable_tbody">'
             );
@@ -801,8 +801,8 @@ 
                     'loop' => true,
                     'ids_list' => json_encode($idsList),
                     'ids_count' => count($idsList),
-                    'file_path' => $SETTINGS['path_to_files_folder'] . (substr($SETTINGS['path_to_files_folder'] , -1) === '/' ? '' : '/') . $inputData['filename'],
-                    'file_link' => $SETTINGS['url_to_files_folder'] . (substr($SETTINGS['path_to_files_folder'] , -1) === '/' ? '' : '/') . $inputData['filename'],
+                    'file_path' => $SETTINGS['path_to_files_folder'].(substr($SETTINGS['path_to_files_folder'], -1) === '/' ? '' : '/').$inputData['filename'],
+                    'file_link' => $SETTINGS['url_to_files_folder'].(substr($SETTINGS['path_to_files_folder'], -1) === '/' ? '' : '/').$inputData['filename'],
                     'export_tag' => $inputData['export_tag'],
                 ],
                 'encode'
@@ -842,12 +842,12 @@ 
 
             $full_listing = array();
             $items_id_list = array();
-            include $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
+            include $SETTINGS['cpassman_dir'].'/includes/config/include.php';
 
             // query
             $rows = DB::query(
                 'SELECT * 
-                FROM ' . prefixTable('export') . ' 
+                FROM ' . prefixTable('export').' 
                 WHERE export_tag = %s AND item_id IN %ls',
                 $inputData['export_tag'],
                 $inputData['idsList']
@@ -861,7 +861,7 @@ 
                         [
                             'error' => true,
                             'message' => $lang->get('error_while_creating_file'),
-                            'detail' => $SETTINGS['path_to_files_folder'] . $inputData['filename'],
+                            'detail' => $SETTINGS['path_to_files_folder'].$inputData['filename'],
                         ],
                         'encode'
                     );
@@ -903,13 +903,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 = $record['folder_id'];
 
@@ -917,12 +917,12 @@ 
                     fputs(
                         $outstream,
                         '
-        <tr class="' . $lineType . '">
-            <td>' . addslashes($record['label']) . '</td>
-            <td align="center"><span class="span_pw" id="span_' . $record['item_id'] . '"><a href="#" onclick="decryptme(' . $record['item_id'] . ', \'' . $encPw . '\');return false;">Decrypt </a></span><input type="hidden" id="hide_' . $record['item_id'] . '" value="' . $encPw . '" /></td>
-            <td>' . (empty($record['description']) === true ? '&nbsp;' : addslashes(str_replace(array(';', '<br />'), array('|', "\n\r"), stripslashes(mb_convert_encoding($record['description'], 'ISO-8859-1', 'UTF-8'))))) . '</td>
-            <td align="center">' . (empty($record['login']) === true ? '&nbsp;' : addslashes($record['login'])) . '</td>
-            <td align="center">' . (empty($record['url']) === true ? '&nbsp;' : addslashes($record['url'])) . '</td>
+        <tr class="' . $lineType.'">
+            <td>' . addslashes($record['label']).'</td>
+            <td align="center"><span class="span_pw" id="span_' . $record['item_id'].'"><a href="#" onclick="decryptme('.$record['item_id'].', \''.$encPw.'\');return false;">Decrypt </a></span><input type="hidden" id="hide_'.$record['item_id'].'" value="'.$encPw.'" /></td>
+            <td>' . (empty($record['description']) === true ? '&nbsp;' : addslashes(str_replace(array(';', '<br />'), array('|', "\n\r"), stripslashes(mb_convert_encoding($record['description'], 'ISO-8859-1', 'UTF-8'))))).'</td>
+            <td align="center">' . (empty($record['login']) === true ? '&nbsp;' : addslashes($record['login'])).'</td>
+            <td align="center">' . (empty($record['url']) === true ? '&nbsp;' : addslashes($record['url'])).'</td>
         </tr>'
                     );
                 }
@@ -971,7 +971,7 @@ 
             $inputData['password'] = (string) filter_var($dataReceived['password'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
             
             // Load includes
-            include $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
+            include $SETTINGS['cpassman_dir'].'/includes/config/include.php';
 
             // read the content of the temporary file
             $handle = fopen($inputData['filename'].'.txt', 'r');
@@ -980,7 +980,7 @@ 
                     [
                         'error' => true,
                         'message' => $lang->get('error_while_creating_file'),
-                        'detail' => $SETTINGS['path_to_files_folder'] . $inputData['filename'],
+                        'detail' => $SETTINGS['path_to_files_folder'].$inputData['filename'],
                     ],
                     'encode'
                 );
@@ -992,7 +992,7 @@ 
                     [
                         'error' => true,
                         'message' => $lang->get('error_while_creating_file'),
-                        'detail' => $SETTINGS['path_to_files_folder'] . $inputData['filename'],
+                        'detail' => $SETTINGS['path_to_files_folder'].$inputData['filename'],
                     ],
                     'encode'
                 );
@@ -1008,9 +1008,9 @@ 
             $chunks = explode('|#|#|', chunk_split($contents, 10000, '|#|#|'));
             foreach ($chunks as $chunk) {
                 if (empty($encrypted_text) === true) {
-                    $encrypted_text = GibberishAES::enc(/** @scrutinizer ignore-type */ $chunk, $inputData['password'] );
+                    $encrypted_text = GibberishAES::enc(/** @scrutinizer ignore-type */ $chunk, $inputData['password']);
                 } else {
-                    $encrypted_text .= '|#|#|' . GibberishAES::enc(/** @scrutinizer ignore-type */ $chunk, $inputData['password'] );
+                    $encrypted_text .= '|#|#|'.GibberishAES::enc(/** @scrutinizer ignore-type */ $chunk, $inputData['password']);
                 }
             }
 
@@ -1021,7 +1021,7 @@ 
                     [
                         'error' => true,
                         'message' => $lang->get('error_while_creating_file'),
-                        'detail' => $SETTINGS['path_to_files_folder'] . $inputData['filename'],
+                        'detail' => $SETTINGS['path_to_files_folder'].$inputData['filename'],
                     ],
                     'encode'
                 );
@@ -1034,9 +1034,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">' . TP_TOOL_NAME . '&nbsp;' . TP_VERSION . '&nbsp;' . TP_COPYRIGHT . '</a>
+            <a href="https://teampass.net/about/" target="_blank">' . TP_TOOL_NAME.'&nbsp;'.TP_VERSION.'&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">
@@ -1139,12 +1139,12 @@ 
             fclose($outstream);
 
             //clean table
-            DB::query('TRUNCATE TABLE ' . prefixTable('export'));
+            DB::query('TRUNCATE TABLE '.prefixTable('export'));
 
             echo (string) prepareExchangedData(
                 [
                     'error' => false,
-                    'filelink' => $inputData['file_link'] ,
+                    'filelink' => $inputData['file_link'],
                 ],
                 'encode'
             );

sources/utils.queries.php

Spacing +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
 ) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 

sources/favourites.queries.php

Spacing +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
 ) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 

sources/items.logs.php

Spacing +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
 ) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }