nilsteampassnet / TeamPass

install--ASUPPRIMER/libs/SecureHandler.php

Spacing +8 added lines, -8 removed lines

@@ -25,13 +25,13 @@ 
      */
     public function __construct()
     {
-        if (! extension_loaded('openssl')) {
+        if (!extension_loaded('openssl')) {
             throw new \RuntimeException(sprintf(
                 "You need the OpenSSL extension to use %s",
                 __CLASS__
             ));
         }
-        if (! extension_loaded('mbstring')) {
+        if (!extension_loaded('mbstring')) {
             throw new \RuntimeException(sprintf(
                 "You need the Multibytes extension to use %s",
                 __CLASS__
@@ -47,7 +47,7 @@ 
      */
     public function open($save_path, $session_name): bool
     {
-        $this->key = $this->getKey('KEY_' . $session_name);
+        $this->key = $this->getKey('KEY_'.$session_name);
         return parent::open($save_path, $session_name);
     }
 
@@ -94,11 +94,11 @@ 
         // Authentication
         $hmac = hash_hmac(
             'SHA256',
-            $iv . $ciphertext,
+            $iv.$ciphertext,
             mb_substr($key, 32, null, '8bit'),
             true
         );
-        return $hmac . $iv . $ciphertext;
+        return $hmac.$iv.$ciphertext;
     }
 
     /**
@@ -116,11 +116,11 @@ 
         // Authentication
         $hmacNew = hash_hmac(
             'SHA256',
-            $iv . $ciphertext,
+            $iv.$ciphertext,
             mb_substr($key, 32, null, '8bit'),
             true
         );
-        if (! hash_equals($hmac, $hmacNew)) {
+        if (!hash_equals($hmac, $hmacNew)) {
             throw new Exception\AuthenticationFailedException('Authentication failed');
         }
         // Decrypt
@@ -148,7 +148,7 @@ 
             // if session cookie lifetime > 0 then add to current time
             // otherwise leave it as zero, honoring zero's special meaning
             // expire at browser close.
-            $arr_cookie_options = array (
+            $arr_cookie_options = array(
                 'expires' => ($cookieParam['lifetime'] > 0) ? time() + $cookieParam['lifetime'] : 0,
                 'path' => '/',
                 'secure' => true,

install--ASUPPRIMER/upgrade_ajax.php

Spacing +143 added lines, -143 removed lines

@@ -71,7 +71,7 @@ 
         //Do a copy of the existing file
         if (!copy(
             $settingsFile,
-            $settingsFile . '.' . date(
+            $settingsFile.'.'.date(
                 'Y_m_d_H_i_s',
                 mktime((int) date('H'), (int) date('i'), (int) date('s'), (int) date('m'), (int) date('d'), (int) date('y'))
             )
@@ -88,7 +88,7 @@ 
         // CHeck if old sk.php exists.
         // If yes then get keys to database and delete it
         if (empty($post_sk_path) === false || defined('SECUREPATH') === true) {
-            $filename = (empty($post_sk_path) === false ? $post_sk_path : SECUREPATH) . '/sk.php';
+            $filename = (empty($post_sk_path) === false ? $post_sk_path : SECUREPATH).'/sk.php';
             if (file_exists($filename)) {
                 include_once $filename;
                 unlink($filename);
@@ -97,63 +97,63 @@ 
                 // SKEY
                 $tmp = mysqli_query(
                     $db_link,
-                    "SELECT INTO `" . $pre . "misc`
+                    "SELECT INTO `".$pre."misc`
                     WHERE type = 'admin' AND intitule = 'duo_skey'"
                 );
                 if ($tmp) {
                     mysqli_query(
                         $db_link,
-                        "UPDATE `" . $pre . "misc`
-                        set valeur = '" . SKEY . "', type = 'admin', intitule = 'duo_skey'"
+                        "UPDATE `".$pre."misc`
+                        set valeur = '" . SKEY."', type = 'admin', intitule = 'duo_skey'"
                     );
                 } else {
                     mysqli_query(
                         $db_link,
-                        "INSERT INTO `" . $pre . "misc`
+                        "INSERT INTO `".$pre."misc`
                         (`valeur`, `type`, `intitule`)
-                        VALUES ('" . SKEY . "', 'admin', 'duo_skey')"
+                        VALUES ('" . SKEY."', 'admin', 'duo_skey')"
                     );
                 }
 
                 // IKEY
                 $tmp = mysqli_query(
                     $db_link,
-                    "SELECT INTO `" . $pre . "misc`
+                    "SELECT INTO `".$pre."misc`
                     WHERE type = 'admin' AND intitule = 'duo_ikey'"
                 );
                 if ($tmp) {
                     mysqli_query(
                         $db_link,
-                        "UPDATE `" . $pre . "misc`
-                        set valeur = '" . IKEY . "', type = 'admin', intitule = 'duo_ikey'"
+                        "UPDATE `".$pre."misc`
+                        set valeur = '" . IKEY."', type = 'admin', intitule = 'duo_ikey'"
                     );
                 } else {
                     mysqli_query(
                         $db_link,
-                        "INSERT INTO `" . $pre . "misc`
+                        "INSERT INTO `".$pre."misc`
                         (`valeur`, `type`, `intitule`)
-                        VALUES ('" . IKEY . "', 'admin', 'duo_ikey')"
+                        VALUES ('" . IKEY."', 'admin', 'duo_ikey')"
                     );
                 }
 
                 // HOST
                 $tmp = mysqli_query(
                     $db_link,
-                    "SELECT INTO `" . $pre . "misc`
+                    "SELECT INTO `".$pre."misc`
                     WHERE type = 'admin' AND intitule = 'duo_host'"
                 );
                 if ($tmp) {
                     mysqli_query(
                         $db_link,
-                        "UPDATE `" . $pre . "misc`
-                        set valeur = '" . HOST . "', type = 'admin', intitule = 'duo_host'"
+                        "UPDATE `".$pre."misc`
+                        set valeur = '" . HOST."', type = 'admin', intitule = 'duo_host'"
                     );
                 } else {
                     mysqli_query(
                         $db_link,
-                        "INSERT INTO `" . $pre . "misc`
+                        "INSERT INTO `".$pre."misc`
                         (`valeur`, `type`, `intitule`)
-                        VALUES ('" . HOST . "', 'admin', 'duo_host')"
+                        VALUES ('" . HOST."', 'admin', 'duo_host')"
                     );
                 }
             }
@@ -169,13 +169,13 @@ 
         
         $settingsTxt = '<?php
 // DATABASE connexion parameters
-define("DB_HOST", "' . $server . '");
-define("DB_USER", "' . $user . '");
-define("DB_PASSWD", "' . $pass . '");
-define("DB_NAME", "' . $database . '");
-define("DB_PREFIX", "' . $pre . '");
-define("DB_PORT", "' . $port . '");
-define("DB_ENCODING", "' . $encoding . '");
+define("DB_HOST", "' . $server.'");
+define("DB_USER", "' . $user.'");
+define("DB_PASSWD", "' . $pass.'");
+define("DB_NAME", "' . $database.'");
+define("DB_PREFIX", "' . $pre.'");
+define("DB_PORT", "' . $port.'");
+define("DB_ENCODING", "' . $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(
@@ -188,19 +188,19 @@ 
 define("DB_CONNECT_OPTIONS", array(
     MYSQLI_OPT_CONNECT_TIMEOUT => 10
 ));
-define("SECUREPATH", "' . str_replace('\\', '\\\\', SECUREPATH) . '");';
+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", "");';
 
@@ -296,7 +296,7 @@ 
                     '}]';
                     break;
                 }
-                if (!file_exists(SECUREPATH . '/sk.php')) {
+                if (!file_exists(SECUREPATH.'/sk.php')) {
                     echo '[{'.
                         '"error" : "Error in settings.php file!<br>Check correctness of path indicated in file `includes/config/settings.php`.<br>Reload this page and retry.",'.
                         '"index" : ""'.
@@ -312,8 +312,8 @@ 
             $user_info = mysqli_fetch_array(
                 mysqli_query(
                     $db_link,
-                    'SELECT id, pw, admin FROM ' . $pre . "users
-                    WHERE login='" . mysqli_escape_string($db_link, stripslashes($post_login)) . "'"
+                    'SELECT id, pw, admin FROM '.$pre."users
+                    WHERE login='" . mysqli_escape_string($db_link, stripslashes($post_login))."'"
                 )
             );
 
@@ -332,9 +332,9 @@ 
                     echo '[{'.
                         '"error" : "",'.
                         '"index" : 1,'.
-                        '"info" : "' . base64_encode(json_encode(
+                        '"info" : "'.base64_encode(json_encode(
                             array(mysqli_escape_string($db_link, stripslashes($post_login)), $post_pwd, $user_info['id'])
-                        )) . '"'.
+                        )).'"'.
                     '}]';
                 } else {
                     $superGlobal->put('user_granted', false, 'SESSION');
@@ -367,14 +367,14 @@ 
             $txt = '';
             $var_x = 1;
             $tab = array(
-                $abspath . '/includes/config/settings.php',
-                $abspath . '/includes/libraries/csrfp/libs/',
-                $abspath . '/install/',
-                $abspath . '/includes/',
-                $abspath . '/includes/config/',
-                $abspath . '/includes/avatars/',
-                $abspath . '/files/',
-                $abspath . '/upload/',
+                $abspath.'/includes/config/settings.php',
+                $abspath.'/includes/libraries/csrfp/libs/',
+                $abspath.'/install/',
+                $abspath.'/includes/',
+                $abspath.'/includes/config/',
+                $abspath.'/includes/avatars/',
+                $abspath.'/files/',
+                $abspath.'/upload/',
             );
             foreach ($tab as $elem) {
                 // try to create it if not existing
@@ -383,11 +383,11 @@ 
                 }
                 // check if writable
                 if (is_writable($elem)) {
-                    $txt .= '<span>' .
-                        $elem . '<i class=\"fa-solid fa-circle-check text-success ml-2\"></i></span><br />';
+                    $txt .= '<span>'.
+                        $elem.'<i class=\"fa-solid fa-circle-check text-success ml-2\"></i></span><br />';
                 } else {
-                    $txt .= '<span>' .
-                        $elem . '<i class=\"fa-solid fa-circle-minus text-danger ml-2\"></i></span><br />';
+                    $txt .= '<span>'.
+                        $elem.'<i class=\"fa-solid fa-circle-minus text-danger ml-2\"></i></span><br />';
                     $okWritable = false;
                 }
                 ++$var_x;
@@ -395,105 +395,105 @@ 
 
             if (!extension_loaded('openssl')) {
                 //$okExtensions = false;
-                $txt .= '<span>PHP extension \"openssl\"' .
+                $txt .= '<span>PHP extension \"openssl\"'.
                     '<i class=\"fa-solid fa-circle-minus text-danger ml-2\"></i></span><br />';
             } else {
-                $txt .= '<span>PHP extension \"openssl\"' .
+                $txt .= '<span>PHP extension \"openssl\"'.
                     '<i class=\"fa-solid fa-circle-check text-success ml-2\"></i></span><br />';
             }
             if (!extension_loaded('gd')) {
                 //$okExtensions = false;
-                $txt .= '<span>PHP extension \"gd\"' .
+                $txt .= '<span>PHP extension \"gd\"'.
                     '<i class=\"fa-solid fa-circle-minus text-danger ml-2\"></i></span><br />';
             } else {
-                $txt .= '<span>PHP extension \"gd\"' .
+                $txt .= '<span>PHP extension \"gd\"'.
                     '<i class=\"fa-solid fa-circle-check text-success ml-2\"></i></span><br />';
             }
             if (!extension_loaded('mbstring')) {
                 //$okExtensions = false;
-                $txt .= '<span>PHP extension \"mbstring\"' .
+                $txt .= '<span>PHP extension \"mbstring\"'.
                     '<i class=\"fa-solid fa-circle-minus text-danger ml-2\"></i></span><br />';
             } else {
-                $txt .= '<span>PHP extension \"mbstring\"' .
+                $txt .= '<span>PHP extension \"mbstring\"'.
                     '<i class=\"fa-solid fa-circle-check text-success ml-2\"></i></span><br />';
             }
             if (!extension_loaded('bcmath')) {
                 //$okExtensions = false;
-                $txt .= '<span>PHP extension \"bcmath\"' .
+                $txt .= '<span>PHP extension \"bcmath\"'.
                     '<i class=\"fa-solid fa-circle-minus text-danger ml-2\"></i></span><br />';
             } else {
-                $txt .= '<span>PHP extension \"bcmath\"' .
+                $txt .= '<span>PHP extension \"bcmath\"'.
                     '<i class=\"fa-solid fa-circle-check text-success ml-2\"></i></span><br />';
             }
             if (!extension_loaded('iconv')) {
                 //$okExtensions = false;
-                $txt .= '<span>PHP extension \"iconv\"' .
+                $txt .= '<span>PHP extension \"iconv\"'.
                     '<i class=\"fa-solid fa-circle-minus text-danger ml-2\"></i></span><br />';
             } else {
-                $txt .= '<span>PHP extension \"iconv\"' .
+                $txt .= '<span>PHP extension \"iconv\"'.
                     '<i class=\"fa-solid fa-circle-check text-success ml-2\"></i></span><br />';
             }
             if (!extension_loaded('xml')) {
                 //$okExtensions = false;
-                $txt .= '<span>PHP extension \"xml\"' .
+                $txt .= '<span>PHP extension \"xml\"'.
                     '<i class=\"fa-solid fa-circle-minus text-danger ml-2\"></i></span><br />';
             } else {
-                $txt .= '<span>PHP extension \"xml\"' .
+                $txt .= '<span>PHP extension \"xml\"'.
                     '<i class=\"fa-solid fa-circle-check text-success ml-2\"></i></span><br />';
             }
             if (!extension_loaded('curl')) {
-                $txt .= '<span>PHP extension \"curl\"' .
+                $txt .= '<span>PHP extension \"curl\"'.
                     '<i class=\"fa-solid fa-circle-minus text-danger ml-2\"></i></span><br />';
             } else {
-                $txt .= '<span>PHP extension \"curl\"' .
+                $txt .= '<span>PHP extension \"curl\"'.
                     '<i class=\"fa-solid fa-circle-check text-success ml-2\"></i></span><br />';
             }
             if (!extension_loaded('gmp')) {
-                $txt .= '<span>PHP extension \"gmp\"' .
+                $txt .= '<span>PHP extension \"gmp\"'.
                     '<i class=\"fa-solid fa-circle-minus text-danger ml-2\"></i></span><br />';
             } else {
-                $txt .= '<span>PHP extension \"gmp\"' .
+                $txt .= '<span>PHP extension \"gmp\"'.
                     '<i class=\"fa-solid fa-circle-check text-success ml-2\"></i></span><br />';
             }
             if (ini_get('max_execution_time') < 30) {
-                $txt .= '<span>PHP \"Maximum ' .
-                    'execution time\" is set to ' . ini_get('max_execution_time') . ' seconds.' .
-                    ' Please try to set to 60s at least until Upgrade is finished.&nbsp;' .
+                $txt .= '<span>PHP \"Maximum '.
+                    'execution time\" is set to '.ini_get('max_execution_time').' seconds.'.
+                    ' Please try to set to 60s at least until Upgrade is finished.&nbsp;'.
                     '&nbsp;<img src=\"images/minus-circle.png\"></span> <br />';
             } else {
-                $txt .= '<span>PHP \"Maximum ' .
-                    'execution time\" is set to ' . ini_get('max_execution_time') . ' seconds' .
+                $txt .= '<span>PHP \"Maximum '.
+                    'execution time\" is set to '.ini_get('max_execution_time').' seconds'.
                     '<i class=\"fa-solid fa-circle-check text-success ml-2\"></i></span><br />';
             }
             if (version_compare(phpversion(), MIN_PHP_VERSION, '<')) {
-                $txt .= '<span>PHP version ' .
-                    phpversion() . ' is not OK (minimum is '.MIN_PHP_VERSION.') &nbsp;&nbsp;' .
+                $txt .= '<span>PHP version '.
+                    phpversion().' is not OK (minimum is '.MIN_PHP_VERSION.') &nbsp;&nbsp;'.
                     '<img src=\"images/minus-circle.png\"></span><br />';
             } else {
-                $txt .= '<span>PHP version ' .
-                    phpversion() . ' is OK<i class=\"fa-solid fa-circle-check text-success ml-2\"></i>' .
+                $txt .= '<span>PHP version '.
+                    phpversion().' is OK<i class=\"fa-solid fa-circle-check text-success ml-2\"></i>'.
                     '</span><br />';
             }
-            $mysqlVersion = version_compare($db_link -> server_version, MIN_MYSQL_VERSION, '<') ;
-            $mariadbVersion = version_compare($db_link -> server_version, MIN_MARIADB_VERSION, '<') ;
+            $mysqlVersion = version_compare($db_link -> server_version, MIN_MYSQL_VERSION, '<');
+            $mariadbVersion = version_compare($db_link -> server_version, MIN_MARIADB_VERSION, '<');
             if ($mysqlVersion && $mariadbVersion) {
                 if ($mariadbVersion === '') {
-                    $txt .= '<span>MySQL version ' .
-                        $db_link -> server_version . ' is not OK (minimum is '.MIN_MYSQL_VERSION.') &nbsp;&nbsp;' .
+                    $txt .= '<span>MySQL version '.
+                        $db_link -> server_version.' is not OK (minimum is '.MIN_MYSQL_VERSION.') &nbsp;&nbsp;'.
                         '<img src=\"images/minus-circle.png\"></span><br />';
                 } else {
-                    $txt .= '<span>MySQL version ' .
-                        $db_link -> server_version . ' is not OK (minimum is '.MIN_MARIADB_VERSION.') &nbsp;&nbsp;' .
+                    $txt .= '<span>MySQL version '.
+                        $db_link -> server_version.' is not OK (minimum is '.MIN_MARIADB_VERSION.') &nbsp;&nbsp;'.
                         '<img src=\"images/minus-circle.png\"></span><br />';
                 }
             } else {
                 if ($mariadbVersion === '') {
-                    $txt .= '<span>MySQL version ' .
-                        $db_link -> server_info . ' is OK<i class=\"fa-solid fa-circle-check text-success ml-2\"></i>' .
+                    $txt .= '<span>MySQL version '.
+                        $db_link -> server_info.' is OK<i class=\"fa-solid fa-circle-check text-success ml-2\"></i>'.
                         '</span><br />';
                 } else {
-                    $txt .= '<span>MySQL version ' .
-                        $db_link -> server_info . ' is OK<i class=\"fa-solid fa-circle-check text-success ml-2\"></i>' .
+                    $txt .= '<span>MySQL version '.
+                        $db_link -> server_info.' is OK<i class=\"fa-solid fa-circle-check text-success ml-2\"></i>'.
                         '</span><br />';
                 }
                 
@@ -503,22 +503,22 @@ 
             // check if 2.1.27 already installed
             if (defined(SECUREPATH) === true) {
                 $okEncryptKey = false;
-                $defuse_file = SECUREPATH . '/teampass-seckey.txt';
+                $defuse_file = SECUREPATH.'/teampass-seckey.txt';
                 if (file_exists($defuse_file)) {
                     $okEncryptKey = true;
                     $superGlobal->put('tp_defuse_installed', true, 'SESSION');
-                    $txt .= '<span>Defuse encryption key is defined<i class=\"fa-solid fa-circle-check text-success ml-2\"></i>' .
+                    $txt .= '<span>Defuse encryption key is defined<i class=\"fa-solid fa-circle-check text-success ml-2\"></i>'.
                         '</span><br />';
                 }
 
                 if ($okEncryptKey === false) {
                     $superGlobal->put('tp_defuse_installed', false, 'SESSION');
-                    $txt .= '<span>Encryption Key (SALT) ' .
-                        ' could not be recovered from ' . $defuse_file . '&nbsp;&nbsp;' .
+                    $txt .= '<span>Encryption Key (SALT) '.
+                        ' could not be recovered from '.$defuse_file.'&nbsp;&nbsp;'.
                         '<img src=\"images/minus-circle.png\"></span><br />';
                 } else {
                     $okEncryptKey = true;
-                    $txt .= '<span>Encryption Key (SALT) is available<i class=\"fa-solid fa-circle-check text-success ml-2\"></i>' .
+                    $txt .= '<span>Encryption Key (SALT) is available<i class=\"fa-solid fa-circle-check text-success ml-2\"></i>'.
                         '</span><br />';
                 }
             } else {
@@ -534,10 +534,10 @@ 
             }
 
             echo '[{'.
-                '"error" : "' . $error . '",'.
-                '"info" : "' . $txt . '",'.
+                '"error" : "'.$error.'",'.
+                '"info" : "'.$txt.'",'.
                 '"index" : "'.($error === "" ? "" : $nextStep).'",'.
-                '"infos" : "' . $okWritable." ; ".$okExtensions." ; ".$okEncryptKey." ; " . '"'.
+                '"infos" : "'.$okWritable." ; ".$okExtensions." ; ".$okEncryptKey." ; ".'"'.
             '}]';
             break;
 
@@ -562,14 +562,14 @@ 
             if (@mysqli_fetch_row(
                 mysqli_query(
                     $db_link,
-                    'SELECT valeur FROM ' . $pre . "misc
+                    'SELECT valeur FROM '.$pre."misc
                     WHERE type='admin' AND intitule = 'utf8_enabled'"
                 )
             )) {
                 $cpmIsUTF8 = mysqli_fetch_row(
                     mysqli_query(
                         $db_link,
-                        'SELECT valeur FROM ' . $pre . "misc
+                        'SELECT valeur FROM '.$pre."misc
                         WHERE type='admin' AND intitule = 'utf8_enabled'"
                     )
                 );
@@ -579,9 +579,9 @@ 
             // put TP in maintenance mode or not
             @mysqli_query(
                 $db_link,
-                "UPDATE `" . $pre . "misc`
+                "UPDATE `".$pre."misc`
                 SET `valeur` = 'maintenance_mode'
-                WHERE type = 'admin' AND intitule = '" . $post_no_maintenance_mode . "'"
+                WHERE type = 'admin' AND intitule = '" . $post_no_maintenance_mode."'"
             );
 
             echo '[{'.
@@ -608,9 +608,9 @@ 
             if (isset($post_prefix_before_convert) && $post_prefix_before_convert == 'true') {
                 $tables = mysqli_query($db_link, 'SHOW TABLES');
                 while ($table = mysqli_fetch_row($tables)) {
-                    if (tableExists('old_' . $table[0]) != 1 && substr($table[0], 0, 4) != 'old_') {
-                        mysqli_query($db_link, 'CREATE TABLE old_' . $table[0] . ' LIKE ' . $table[0]);
-                        mysqli_query($db_link, 'INSERT INTO old_' . $table[0] . ' SELECT * FROM ' . $table[0]);
+                    if (tableExists('old_'.$table[0]) != 1 && substr($table[0], 0, 4) != 'old_') {
+                        mysqli_query($db_link, 'CREATE TABLE old_'.$table[0].' LIKE '.$table[0]);
+                        mysqli_query($db_link, 'INSERT INTO old_'.$table[0].' SELECT * FROM '.$table[0]);
                     }
                 }
             }
@@ -618,22 +618,22 @@ 
             //convert database
             mysqli_query(
                 $db_link,
-                'ALTER DATABASE `' . $database . '`
+                'ALTER DATABASE `'.$database.'`
                 DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci'
             );
 
             //convert tables
-            $res = mysqli_query($db_link, 'SHOW TABLES FROM `' . $database . '`');
+            $res = mysqli_query($db_link, 'SHOW TABLES FROM `'.$database.'`');
             while ($table = mysqli_fetch_row($res)) {
                 if (substr($table[0], 0, 4) != 'old_') {
                     mysqli_query(
                         $db_link,
-                        'ALTER TABLE ' . $database . '.`{$table[0]}`
+                        'ALTER TABLE '.$database.'.`{$table[0]}`
                         CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci'
                     );
                     mysqli_query(
                         $db_link,
-                        'ALTER TABLE' . $database . '.`{$table[0]}`
+                        'ALTER TABLE'.$database.'.`{$table[0]}`
                         DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci'
                     );
                 }
@@ -670,7 +670,7 @@ 
                 //Do a copy of the existing file
                 if (!copy(
                     $settingsFile,
-                    $settingsFile . '.' . date(
+                    $settingsFile.'.'.date(
                         'Y_m_d_H_i_s',
                         mktime((int) date('H'), (int) date('i'), (int) date('s'), (int) date('m'), (int) date('d'), (int) date('y'))
                     )
@@ -687,7 +687,7 @@ 
                 // CHeck if old sk.php exists.
                 // If yes then get keys to database and delete it
                 if (empty($post_sk_path) === false || defined('SECUREPATH') === true) {
-                    $filename = (empty($post_sk_path) === false ? $post_sk_path : SECUREPATH) . '/sk.php';
+                    $filename = (empty($post_sk_path) === false ? $post_sk_path : SECUREPATH).'/sk.php';
                     if (file_exists($filename)) {
                         include_once $filename;
                         unlink($filename);
@@ -696,63 +696,63 @@ 
                         // SKEY
                         $tmp = mysqli_query(
                             $db_link,
-                            "SELECT INTO `" . $pre . "misc`
+                            "SELECT INTO `".$pre."misc`
                             WHERE type = 'admin' AND intitule = 'duo_skey'"
                         );
                         if ($tmp) {
                             mysqli_query(
                                 $db_link,
-                                "UPDATE `" . $pre . "misc`
-                                set valeur = '" . SKEY . "', type = 'admin', intitule = 'duo_skey'"
+                                "UPDATE `".$pre."misc`
+                                set valeur = '" . SKEY."', type = 'admin', intitule = 'duo_skey'"
                             );
                         } else {
                             mysqli_query(
                                 $db_link,
-                                "INSERT INTO `" . $pre . "misc`
+                                "INSERT INTO `".$pre."misc`
                                 (`valeur`, `type`, `intitule`)
-                                VALUES ('" . SKEY . "', 'admin', 'duo_skey')"
+                                VALUES ('" . SKEY."', 'admin', 'duo_skey')"
                             );
                         }
 
                         // IKEY
                         $tmp = mysqli_query(
                             $db_link,
-                            "SELECT INTO `" . $pre . "misc`
+                            "SELECT INTO `".$pre."misc`
                             WHERE type = 'admin' AND intitule = 'duo_ikey'"
                         );
                         if ($tmp) {
                             mysqli_query(
                                 $db_link,
-                                "UPDATE `" . $pre . "misc`
-                                set valeur = '" . IKEY . "', type = 'admin', intitule = 'duo_ikey'"
+                                "UPDATE `".$pre."misc`
+                                set valeur = '" . IKEY."', type = 'admin', intitule = 'duo_ikey'"
                             );
                         } else {
                             mysqli_query(
                                 $db_link,
-                                "INSERT INTO `" . $pre . "misc`
+                                "INSERT INTO `".$pre."misc`
                                 (`valeur`, `type`, `intitule`)
-                                VALUES ('" . IKEY . "', 'admin', 'duo_ikey')"
+                                VALUES ('" . IKEY."', 'admin', 'duo_ikey')"
                             );
                         }
 
                         // HOST
                         $tmp = mysqli_query(
                             $db_link,
-                            "SELECT INTO `" . $pre . "misc`
+                            "SELECT INTO `".$pre."misc`
                             WHERE type = 'admin' AND intitule = 'duo_host'"
                         );
                         if ($tmp) {
                             mysqli_query(
                                 $db_link,
-                                "UPDATE `" . $pre . "misc`
-                                set valeur = '" . HOST . "', type = 'admin', intitule = 'duo_host'"
+                                "UPDATE `".$pre."misc`
+                                set valeur = '" . HOST."', type = 'admin', intitule = 'duo_host'"
                             );
                         } else {
                             mysqli_query(
                                 $db_link,
-                                "INSERT INTO `" . $pre . "misc`
+                                "INSERT INTO `".$pre."misc`
                                 (`valeur`, `type`, `intitule`)
-                                VALUES ('" . HOST . "', 'admin', 'duo_host')"
+                                VALUES ('" . HOST."', 'admin', 'duo_host')"
                             );
                         }
                     }
@@ -771,13 +771,13 @@ 
                     utf8_encode(
                         '<?php
     // DATABASE connexion parameters
-    define("DB_HOST", "' . DB_HOST . '");
-    define("DB_USER", "' . DB_USER . '");
-    define("DB_PASSWD", "' . defuse_return_decrypted(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", "' . defuse_return_decrypted(DB_PASSWD).'");
+    define("DB_NAME", "' . DB_NAME.'");
+    define("DB_PREFIX", "' . DB_PREFIX.'");
+    define("DB_PORT", "' . DB_PORT.'");
+    define("DB_ENCODING", "' . 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(
@@ -790,7 +790,7 @@ 
     define("DB_CONNECT_OPTIONS", array(
         MYSQLI_OPT_CONNECT_TIMEOUT => 10
     ));
-    define("SECUREPATH", "' . SECUREPATH. '");
+    define("SECUREPATH", "' . SECUREPATH.'");
 
     if (isset($_SESSION[\'settings\'][\'timezone\']) === true) {
     date_default_timezone_set($_SESSION[\'settings\'][\'timezone\']);
@@ -885,7 +885,7 @@ 
                     if (
                         copy(
                             $csrfp_file,
-                            $csrfp_file . '.' . date(
+                            $csrfp_file.'.'.date(
                                 'Y_m_d_H_i_s',
                                 mktime((int) date('H'), (int) date('i'), (int) date('s'), (int) date('m'), (int) date('d'), (int) date('y'))
                             )
@@ -904,17 +904,17 @@ 
                 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('../includes/libraries/csrfp/libs/csrfp.config.php');
-                $newdata = str_replace('"CSRFP_TOKEN" => ""', '"CSRFP_TOKEN" => "' . bin2hex(openssl_random_pseudo_bytes(25)) . '"', $data);
+                $newdata = str_replace('"CSRFP_TOKEN" => ""', '"CSRFP_TOKEN" => "'.bin2hex(openssl_random_pseudo_bytes(25)).'"', $data);
                 $newdata = str_replace('"tokenLength" => "25"', '"tokenLength" => "50"', $newdata);
-                $jsUrl = $post_url_path . '/includes/libraries/csrfp/js/csrfprotector.js';
-                $newdata = str_replace('"jsUrl" => ""', '"jsUrl" => "' . $jsUrl . '"', $newdata);
+                $jsUrl = $post_url_path.'/includes/libraries/csrfp/js/csrfprotector.js';
+                $newdata = str_replace('"jsUrl" => ""', '"jsUrl" => "'.$jsUrl.'"', $newdata);
                 $newdata = str_replace('"verifyGetFor" => array()', '"verifyGetFor" => array("*page=items&type=duo_check*")', $newdata);
                 file_put_contents('../includes/libraries/csrfp/libs/csrfp.config.php', $newdata);
 
                 // Mark a tag to force Install stuff (folders, files and table) to be cleanup while first login
                 mysqli_query(
                     $db_link,
-                    'INSERT INTO `' . $pre . 'misc` (`type`, `intitule`, `valeur`) VALUES ("install", "clear_install_folder", "true")'
+                    'INSERT INTO `'.$pre.'misc` (`type`, `intitule`, `valeur`) VALUES ("install", "clear_install_folder", "true")'
                 );
 
                 array_push(
@@ -936,19 +936,19 @@ 
 
             // update with correct version
             // 1st - check if teampass_version exists
-            $data = mysqli_fetch_row(mysqli_query($db_link, "SELECT COUNT(*) FROM ".$pre . "misc WHERE type = 'admin' AND intitule = 'teampass_version';"));
+            $data = mysqli_fetch_row(mysqli_query($db_link, "SELECT COUNT(*) FROM ".$pre."misc WHERE type = 'admin' AND intitule = 'teampass_version';"));
             if ((int) $data[0] === 0) {
                 // change variable name and put version
                 mysqli_query(
                     $db_link,
-                    "UPDATE `" . $pre . "misc`
+                    "UPDATE `".$pre."misc`
                     SET `valeur` = '".TP_VERSION."', `intitule` = 'teampass_version'
                     WHERE intitule = 'cpassman_version' AND type = 'admin';"
                 );
             } else {
                 mysqli_query(
                     $db_link,
-                    "UPDATE `" . $pre . "misc`
+                    "UPDATE `".$pre."misc`
                     SET `valeur` = '".TP_VERSION."'
                     WHERE intitule = 'teampass_version' AND type = 'admin';"
                 );
@@ -978,7 +978,7 @@ 
                             ->setDayOfMonth('*')
                             ->setMonths('*')
                             ->setDayOfWeek('*')
-                            ->setTaskCommandLine($phpLocation['path'] . ' ' . $SETTINGS['cpassman_dir'] . '/sources/scheduler.php')
+                            ->setTaskCommandLine($phpLocation['path'].' '.$SETTINGS['cpassman_dir'].'/sources/scheduler.php')
                             ->setComments('Teampass scheduler');
                         
                         $crontabRepository->addJob($crontabJob);
@@ -1034,7 +1034,7 @@ 
 
             $mysqli = new mysqli($server, $user, $pass, $database, $port);
             if ($mysqli->connect_error) {
-                die('Error : (' . $mysqli->connect_errno . ') ' . $mysqli->connect_error);
+                die('Error : ('.$mysqli->connect_errno.') '.$mysqli->connect_error);
             }
 
             $results = $mysqli->query('SHOW TABLES');
@@ -1044,11 +1044,11 @@ 
             }
 
             // Prepare file
-            $backup_file_name = 'sql-backup-' . date('d-m-Y--h-i-s') . '.sql';
-            $fp = fopen('../files/' . $backup_file_name, 'a');
+            $backup_file_name = 'sql-backup-'.date('d-m-Y--h-i-s').'.sql';
+            $fp = fopen('../files/'.$backup_file_name, 'a');
 
             foreach ($mtables as $table) {
-                $contents = '-- Table `' . $table . "` --\n";
+                $contents = '-- Table `'.$table."` --\n";
                 if (fwrite($fp, $contents) === false) {
                     echo '[{'.
                         '"error" : "Backup fails - please do it manually",'.
@@ -1058,9 +1058,9 @@ 
                     return false;
                 }
 
-                $results = $mysqli->query('SHOW CREATE TABLE ' . $table);
+                $results = $mysqli->query('SHOW CREATE TABLE '.$table);
                 while ($row = $results->fetch_array()) {
-                    $contents = $row[1] . ";\n\n";
+                    $contents = $row[1].";\n\n";
                     if (fwrite($fp, $contents) === false) {
                         echo '[{'.
                             '"error" : "Backup fails - please do it manually",'.
@@ -1071,14 +1071,14 @@ 
                     }
                 }
 
-                $results = $mysqli->query('SELECT * FROM ' . $table);
+                $results = $mysqli->query('SELECT * FROM '.$table);
                 $row_count = $results->num_rows;
                 $fields = $results->fetch_fields();
                 $fields_count = count($fields);
 
-                $insert_head = 'INSERT INTO `' . $table . '` (';
+                $insert_head = 'INSERT INTO `'.$table.'` (';
                 for ($i = 0; $i < $fields_count; ++$i) {
-                    $insert_head .= '`' . $fields[$i]->name . '`';
+                    $insert_head .= '`'.$fields[$i]->name.'`';
                     if ($i < $fields_count - 1) {
                         $insert_head .= ', ';
                     }
@@ -1127,7 +1127,7 @@ 
                                     break;
                                 default:
                                     //$contents .= "'".$row_content."'";
-                                    if (fwrite($fp, "'" . $row_content . "'") === false) {
+                                    if (fwrite($fp, "'".$row_content."'") === false) {
                                         echo '[{'.
                                             '"error" : "Backup fails - please do it manually",'.
                                             '"index" : ""'.

install--ASUPPRIMER/upgrade_operations.php

Spacing +38 added lines, -38 removed lines

@@ -81,8 +81,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();
 }
@@ -147,7 +147,7 @@ 
             // OPERATION - 20231017_1 - remove all existing keys
             // if item is personal and user is not owner
 
-            installPurgeUnnecessaryKeys(true, 0,$pre);
+            installPurgeUnnecessaryKeys(true, 0, $pre);
     }
     // Return back
     echo '[{"finish":"'.$finish.'" , "next":"", "error":"", "total":"'.$total.'"}]';
@@ -161,8 +161,8 @@ 
     $items = mysqli_query(
         $db_link,
         "select i.id as id, ls.date as datetime
-        from `" . $pre . "items` as i
-        inner join `" . $pre . "log_items` as ls on ls.id_item = i.id
+        from `" . $pre."items` as i
+        inner join `" . $pre."log_items` as ls on ls.id_item = i.id
         WHERE ls.action = 'at_creation' AND i.created_at IS NULL
         LIMIT " . $post_nb.";"
     );
@@ -171,7 +171,7 @@ 
             // update created_at field
             mysqli_query(
                 $db_link,
-                "UPDATE `" . $pre . "items` SET created_at = '".$item['datetime']."' WHERE id = ".$item['id']
+                "UPDATE `".$pre."items` SET created_at = '".$item['datetime']."' WHERE id = ".$item['id']
             );
         }
     }
@@ -180,7 +180,7 @@ 
     $remainingItems = mysqli_num_rows(
         mysqli_query(
             $db_link,
-            "SELECT * FROM `" . $pre . "items` WHERE created_at IS NULL"
+            "SELECT * FROM `".$pre."items` WHERE created_at IS NULL"
         )
     );
     return $remainingItems > 0 ? 0 : 1;
@@ -192,15 +192,15 @@ 
     // loop on items - updated_at
     $items = mysqli_query(
         $db_link,
-        "select i.id as id, (select date from " . $pre . "log_items where action = 'at_modification' and id_item=id order by date DESC limit 1) as datetime 
-        from `" . $pre . "items` as i;"
+        "select i.id as id, (select date from ".$pre."log_items where action = 'at_modification' and id_item=id order by date DESC limit 1) as datetime 
+        from `" . $pre."items` as i;"
     );
     while ($item = mysqli_fetch_assoc($items)) {
         if (is_null($item['datetime']) === false) {
             // update updated_at field
             mysqli_query(
                 $db_link,
-                "UPDATE `" . $pre . "items` SET updated_at = '".$item['datetime']."' WHERE id = ".$item['id']
+                "UPDATE `".$pre."items` SET updated_at = '".$item['datetime']."' WHERE id = ".$item['id']
             );
         }
     }
@@ -214,15 +214,15 @@ 
     // loop on items - deleted_at
     $items = mysqli_query(
         $db_link,
-        "select i.id as id, (select date from " . $pre . "log_items where action = 'at_deleted' and id_item=id order by date DESC limit 1) as datetime
-        from `" . $pre . "items` as i;"
+        "select i.id as id, (select date from ".$pre."log_items where action = 'at_deleted' and id_item=id order by date DESC limit 1) as datetime
+        from `" . $pre."items` as i;"
     );
     while ($item = mysqli_fetch_assoc($items)) {
         if (is_null($item['datetime']) === false) {
             // update updated_at field
             mysqli_query(
                 $db_link,
-                "UPDATE `" . $pre . "items` SET deleted_at = '".$item['datetime']."' WHERE id = ".$item['id']
+                "UPDATE `".$pre."items` SET deleted_at = '".$item['datetime']."' WHERE id = ".$item['id']
             );
         }
     }
@@ -238,14 +238,14 @@ 
  * @param integer $user_id
  * @return void
  */
-function installPurgeUnnecessaryKeys(bool $allUsers = true, int $user_id=0, string $pre)
+function installPurgeUnnecessaryKeys(bool $allUsers = true, int $user_id = 0, string $pre)
 {
     global $db_link;
     if ($allUsers === true) {
         $users = mysqli_query(
             $db_link,
             'SELECT id
-            FROM ' . $pre . 'users
+            FROM ' . $pre.'users
             WHERE id NOT IN ('.OTV_USER_ID.', '.TP_USER_ID.', '.SSH_USER_ID.', '.API_USER_ID.')
             ORDER BY login ASC'
         );
@@ -263,7 +263,7 @@ 
  * @param integer $user_id
  * @return void
  */
-function installPurgeUnnecessaryKeysForUser(int $user_id=0, string $pre)
+function installPurgeUnnecessaryKeysForUser(int $user_id = 0, string $pre)
 {
     global $db_link;
     if ($user_id === 0) {
@@ -273,8 +273,8 @@ 
     $result = mysqli_query(
         $db_link,
         'SELECT id
-        FROM ' . $pre . 'items AS i
-        INNER JOIN ' . $pre . 'log_items AS li ON li.id_item = i.id
+        FROM ' . $pre.'items AS i
+        INNER JOIN ' . $pre.'log_items AS li ON li.id_item = i.id
         WHERE i.perso = 1 AND li.action = "at_creation" AND li.id_user IN ('.TP_USER_ID.', '.$user_id.')',
     );
     $rowcount = mysqli_num_rows($result);
@@ -290,25 +290,25 @@ 
         // Item keys
         mysqli_query(
             $db_link,
-            'DELETE FROM ' . $pre . 'sharekeys_items
+            'DELETE FROM '.$pre.'sharekeys_items
             WHERE object_id IN ('.$pfItemsList.') AND user_id NOT IN ('.TP_USER_ID.', '.$user_id.')'
         );
         // Files keys
         mysqli_query(
             $db_link,
-            'DELETE FROM ' . $pre . 'sharekeys_files
+            'DELETE FROM '.$pre.'sharekeys_files
             WHERE object_id IN ('.$pfItemsList.') AND user_id NOT IN ('.TP_USER_ID.', '.$user_id.')'
         );
         // Fields keys
         mysqli_query(
             $db_link,
-            'DELETE FROM ' . $pre . 'sharekeys_fields
+            'DELETE FROM '.$pre.'sharekeys_fields
             WHERE object_id IN ('.$pfItemsList.') AND user_id NOT IN ('.TP_USER_ID.', '.$user_id.')'
         );
         // Logs keys
         mysqli_query(
             $db_link,
-            'DELETE FROM ' . $pre . 'sharekeys_logs
+            'DELETE FROM '.$pre.'sharekeys_logs
             WHERE object_id IN ('.$pfItemsList.') AND user_id NOT IN ('.TP_USER_ID.', '.$user_id.')'
         );
     }
@@ -340,7 +340,7 @@ 
     // force full list of folders
     if (count($folderIds) === 0) {
         $result = $mysqli2->query('SELECT id
-            FROM ' . $pre . 'nested_tree
+            FROM ' . $pre.'nested_tree
             WHERE personal_folder = 0',
         );
         $rowcount = $result->num_rows;
@@ -361,8 +361,8 @@ 
         $arrCatList = array();
         $result = $mysqli2->query('SELECT c.id, c.title, c.level, c.type, c.masked, c.order, c.encrypted_data, c.role_visibility, c.is_mandatory,
             f.id_category AS category_id
-            FROM ' . $pre . 'categories_folders AS f
-            INNER JOIN ' . $pre . 'categories AS c ON (f.id_category = c.parent_id)
+            FROM ' . $pre.'categories_folders AS f
+            INNER JOIN ' . $pre.'categories AS c ON (f.id_category = c.parent_id)
             WHERE id_folder = '.$folder
         );
         $rowcount = $result->num_rows;
@@ -387,7 +387,7 @@ 
         // Now get complexity
         $valTemp = '';
         $result = $mysqli2->query('SELECT valeur
-            FROM ' . $pre . 'misc
+            FROM ' . $pre.'misc
             WHERE type = "complex" AND intitule = '.$folder
         );
         $rowcount = $result->num_rows;
@@ -404,21 +404,21 @@ 
         // Now get Roles
         $valTemp = '';
         $result = $mysqli2->query('SELECT t.title
-            FROM ' . $pre . 'roles_values as v
-            INNER JOIN ' . $pre . 'roles_title as t ON (v.role_id = t.id)
+            FROM ' . $pre.'roles_values as v
+            INNER JOIN ' . $pre.'roles_title as t ON (v.role_id = t.id)
             WHERE v.folder_id = '.$folder.'
             GROUP BY title'
         );
         $rowcount = $result->num_rows;
         if ($rowcount > 0) {
             while ($row = $result->fetch_assoc()) {
-                $valTemp .= (empty($valTemp) === true ? '' : ' - ') . $row['title'];
+                $valTemp .= (empty($valTemp) === true ? '' : ' - ').$row['title'];
             }
         }
         $arr_data['visibilityRoles'] = $valTemp;
 
         // now save in DB
-        $mysqli2->query("UPDATE " . $pre . "nested_tree SET categories = '".json_encode($arr_data)."' WHERE id = ".$folder);
+        $mysqli2->query("UPDATE ".$pre."nested_tree SET categories = '".json_encode($arr_data)."' WHERE id = ".$folder);
     }
     
     mysqli_close($mysqli2);
@@ -437,7 +437,7 @@ 
  */
 function installHandleConfigFile($action, $SETTINGS, $field = null, $value = null)
 {
-    $tp_config_file = $SETTINGS['cpassman_dir'] . '/includes/config/tp.config.php';
+    $tp_config_file = $SETTINGS['cpassman_dir'].'/includes/config/tp.config.php';
     $filename = '../includes/config/settings.php';
     include_once '../sources/main.functions.php';
     $pass = defuse_return_decrypted(DB_PASSWD);
@@ -452,8 +452,8 @@ 
     if (file_exists($tp_config_file) === false || $action === 'rebuild') {
         // perform a copy
         if (file_exists($tp_config_file)) {
-            if (! copy($tp_config_file, $tp_config_file . '.' . date('Y_m_d_His', time()))) {
-                return "ERROR: Could not copy file '" . $tp_config_file . "'";
+            if (!copy($tp_config_file, $tp_config_file.'.'.date('Y_m_d_His', time()))) {
+                return "ERROR: Could not copy file '".$tp_config_file."'";
             }
         }
 
@@ -464,13 +464,13 @@ 
         $data[2] = "\$SETTINGS = array (\n";
 
         $result = $mysqli2->query('SELECT *
-            FROM ' . $pre . 'misc
+            FROM ' . $pre.'misc
             WHERE type = "admin"'
         );
         $rowcount = $result->num_rows;
         if ($rowcount > 0) {
             while ($row = $result->fetch_assoc()) {
-                array_push($data, "    '" . $row['intitule'] . "' => '" . htmlspecialchars_decode($row['valeur'], ENT_COMPAT) . "',\n");
+                array_push($data, "    '".$row['intitule']."' => '".htmlspecialchars_decode($row['valeur'], ENT_COMPAT)."',\n");
             }
         }
         array_push($data, ");\n");
@@ -485,15 +485,15 @@ 
                 break;
             }
 
-            if (stristr($line, "'" . $field . "' => '")) {
-                $data[$inc] = "    '" . $field . "' => '" . htmlspecialchars_decode($value ?? '', ENT_COMPAT) . "',\n";
+            if (stristr($line, "'".$field."' => '")) {
+                $data[$inc] = "    '".$field."' => '".htmlspecialchars_decode($value ?? '', ENT_COMPAT)."',\n";
                 $bFound = true;
                 break;
             }
             ++$inc;
         }
         if ($bFound === false) {
-            $data[$inc] = "    '" . $field . "' => '" . htmlspecialchars_decode($value ?? '', ENT_COMPAT). "',\n);\n";
+            $data[$inc] = "    '".$field."' => '".htmlspecialchars_decode($value ?? '', ENT_COMPAT)."',\n);\n";
         }
     }
     mysqli_close($mysqli2);

install--ASUPPRIMER/migrate_users_to_v3.php

Spacing +1 added lines, -1 removed lines

@@ -41,4 +41,4 @@
 } else {
     $finished = 0;
 }
-echo '[{"finish":"' . $finished . '", "scriptname":"' . $scripts_list[$post_file_number][0] . '", "parameter":"' . $scripts_list[$post_file_number][1] . '"}]';
+echo '[{"finish":"'.$finished.'", "scriptname":"'.$scripts_list[$post_file_number][0].'", "parameter":"'.$scripts_list[$post_file_number][1].'"}]';

install--ASUPPRIMER/install.php

Spacing +9 added lines, -9 removed lines

@@ -43,7 +43,7 @@ 
 	$abs_path = rtrim(
 		filter_var($_SERVER['DOCUMENT_ROOT'], FILTER_SANITIZE_FULL_SPECIAL_CHARS),
 		'/'
-	) . substr(
+	).substr(
 		filter_var($_SERVER['PHP_SELF'], FILTER_SANITIZE_FULL_SPECIAL_CHARS),
 		0,
 		strlen(filter_var($_SERVER['PHP_SELF'], FILTER_SANITIZE_FULL_SPECIAL_CHARS)) - 20
@@ -104,7 +104,7 @@ 
 	<div id="top">
 		<div id="logo" class="lcol"><img src="../includes/images/teampass-logo2-home.png" /></div>
 		<div class="lcol">
-			<span class="header-title">' . strtoupper(TP_TOOL_NAME) . '</span>
+			<span class="header-title">' . strtoupper(TP_TOOL_NAME).'</span>
 		</div>
 		
         <div id="content">
@@ -139,7 +139,7 @@ 
                         <h5><i class="fas fa-info-circle text-warning mr-2"></i>Welcome to Teampass installation</h5>
     
                         <p>This seems to be the 1st time Teampass will be installed on this server.<br>
-						It will proceed with installation of release <b>' . TP_VERSION . '</b>.</p>
+						It will proceed with installation of release <b>' . TP_VERSION.'</b>.</p>
                     </div>
 
                     <div class="callout callout-info col-12 mt-3">
@@ -175,11 +175,11 @@ 
 				<div class="card-body">
 					<div class="form-group">
 						<label>Absolute path to TeamPass folder</label>
-						<input type="text" class="form-control" name="absolute_path" id="absolute_path" class="ui-widget" value="' . $abs_path . '">
+						<input type="text" class="form-control" name="absolute_path" id="absolute_path" class="ui-widget" value="' . $abs_path.'">
 					</div>
 					<div class="form-group">
 						<label>Full URL to TeamPass</label>
-						<input type="text" class="form-control" name="url_path" id="url_path" class="ui-widget" value="' . $protocol . $_SERVER['HTTP_HOST'] . substr($_SERVER['PHP_SELF'], 0, strrpos($_SERVER['PHP_SELF'], '/') - 8) . '">
+						<input type="text" class="form-control" name="url_path" id="url_path" class="ui-widget" value="' . $protocol.$_SERVER['HTTP_HOST'].substr($_SERVER['PHP_SELF'], 0, strrpos($_SERVER['PHP_SELF'], '/') - 8).'">
 					</div>
 				</div>
 			</div>
@@ -400,13 +400,13 @@ 
 	if (!isset($post_step)) {
 		echo '
             <input type="button" class="btn btn-primary" id="but_next" target_id="2" class="button" value="START" />
-            <input type="button" class="btn btn-primary" id="but_start" onclick="document.location = \'' . $protocol . $_SERVER['HTTP_HOST'] . substr($_SERVER['PHP_SELF'], 0, strrpos($_SERVER['PHP_SELF'], '/') - 8) . '\'" class="button" style="display: none;" value="Start" />';
+            <input type="button" class="btn btn-primary" id="but_start" onclick="document.location = \'' . $protocol.$_SERVER['HTTP_HOST'].substr($_SERVER['PHP_SELF'], 0, strrpos($_SERVER['PHP_SELF'], '/') - 8).'\'" class="button" style="display: none;" value="Start" />';
 	} elseif ($post_step == 7) {
 		// Nothong to do
 	} else {
 		echo '
-            <input type="button" id="but_launch" onclick="checkPage(\'step' . $post_step . '\')" class="btn btn-primary" value="START" />
-            <input type="button" id="but_next" target_id="' . (intval($post_step) + 1) . '" class="btn btn-primary" value="NEXT" disabled="disabled">
+            <input type="button" id="but_launch" onclick="checkPage(\'step' . $post_step.'\')" class="btn btn-primary" value="START" />
+            <input type="button" id="but_next" target_id="' . (intval($post_step) + 1).'" class="btn btn-primary" value="NEXT" disabled="disabled">
 			<input type="button" class="btn btn-primary" id="but_restart" onclick="document.location = \'install.php\'" class="button" value="RESTART" />';
 	}
 
@@ -419,7 +419,7 @@ 
 	echo '
     <div id="footer">
         <div style="width:500px; font-size:16px;">
-            ' . TP_TOOL_NAME . ' ' . TP_VERSION . ' <i class="far fa-copyright"></i> copyright 2009-2019
+            ' . TP_TOOL_NAME.' '.TP_VERSION.' <i class="far fa-copyright"></i> copyright 2009-2019
         </div>
         <div style="float:right;margin-top:-15px;">
         </div>

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); 

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 ''"
 );

install--ASUPPRIMER/upgrade_run_3.0.0_suggestions.php

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)."');"
         );
     }
 }