nilsteampassnet / TeamPass

sources/admin.queries.php

Spacing +193 added lines, -193 removed lines

@@ -46,25 +46,25 @@ 
 }
 
 /* do checks */
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 if (!checkUser($_SESSION['user_id'], $_SESSION['key'], 'options', $SETTINGS)) {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
-require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/tp.config.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/tp.config.php';
 
 header('Content-type: text/html; charset=utf-8');
 header('Cache-Control: no-cache, no-store, must-revalidate');
 
-require_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
 
 // connect to the server
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
 if (defined('DB_PASSWD_CLEAR') === false) {
     define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
 }
@@ -117,7 +117,7 @@ 
                         array(
                             'http' => array(
                                 'ignore_errors' => true,
-                                'proxy' => $SETTINGS['proxy_ip'] . ':' . $SETTINGS['proxy_port'],
+                                'proxy' => $SETTINGS['proxy_ip'].':'.$SETTINGS['proxy_port'],
                             ),
                         )
                     );
@@ -136,16 +136,16 @@ 
                     $json_array = json_decode($json, true);
 
                     // About version
-                    $text .= '<li><u>' . $LANG['your_version'] . '</u> : ' . TP_VERSION_FULL;
+                    $text .= '<li><u>'.$LANG['your_version'].'</u> : '.TP_VERSION_FULL;
                     if (floatval(TP_VERSION_FULL) < floatval($json_array['info']['version'])) {
-                        $text .= '&nbsp;&nbsp;<b>' . $LANG['please_update'] . '</b>';
+                        $text .= '&nbsp;&nbsp;<b>'.$LANG['please_update'].'</b>';
                     }
                     $text .= '</li>';
 
                     // Libraries
                     $text .= '<li><u>Libraries</u> :</li>';
                     foreach ($json_array['libraries'] as $key => $val) {
-                        $text .= "<li>&nbsp;<span class='fa fa-caret-right'></span>&nbsp;" . $key . " (<a href='" . $val . "' target='_blank'>" . $val . '</a>)</li>';
+                        $text .= "<li>&nbsp;<span class='fa fa-caret-right'></span>&nbsp;".$key." (<a href='".$val."' target='_blank'>".$val.'</a>)</li>';
                     }
                 }
             } else {
@@ -156,7 +156,7 @@ 
         }
         $text .= '</ul>';
 
-        echo '[{"error":"' . $error . '" , "output":"' . str_replace(array("\n", "\t", "\r"), '', $text) . '"}]';
+        echo '[{"error":"'.$error.'" , "output":"'.str_replace(array("\n", "\t", "\r"), '', $text).'"}]';
         break;
 
         //##########################################################
@@ -190,7 +190,7 @@ 
         //get through all users
         $rows = DB::query(
             'SELECT id, login, email
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             ORDER BY login ASC'
         );
         foreach ($rows as $record) {
@@ -207,7 +207,7 @@ 
             //if folder doesn't exist then create it
             $data = DB::queryfirstrow(
                 'SELECT id
-                FROM ' . prefixTable('nested_tree') . '
+                FROM ' . prefixTable('nested_tree').'
                 WHERE title = %s AND parent_id = %i',
                 $record['id'],
                 0
@@ -270,8 +270,8 @@ 
     $SETTINGS['cpassman_dir'],
             array(
                 'error' => false,
-                'message' => langHdl('last_execution') . ' ' .
-                    date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) time()) .
+                'message' => langHdl('last_execution').' '.
+                    date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) time()).
                     '<i class="fas fa-check text-success ml-2"></i>',
             ),
             'encode'
@@ -307,7 +307,7 @@ 
         }
 
         //Libraries call
-        require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
         //init
         $foldersIds = array();
@@ -321,7 +321,7 @@ 
             }
         }
 
-        $items = DB::query('SELECT id,label FROM ' . prefixTable('items') . ' WHERE id_tree NOT IN %li', $foldersIds);
+        $items = DB::query('SELECT id,label FROM '.prefixTable('items').' WHERE id_tree NOT IN %li', $foldersIds);
         foreach ($items as $item) {
             //Delete item
             DB::DELETE(prefixTable('items'), 'id = %i', $item['id']);
@@ -342,12 +342,12 @@ 
         // delete orphan items
         $rows = DB::query(
             'SELECT id
-            FROM ' . prefixTable('items') . '
+            FROM ' . prefixTable('items').'
             ORDER BY id ASC'
         );
         foreach ($rows as $item) {
             DB::query(
-                'SELECT * FROM ' . prefixTable('log_items') . ' WHERE id_item = %i AND action = %s',
+                'SELECT * FROM '.prefixTable('log_items').' WHERE id_item = %i AND action = %s',
                 $item['id'],
                 'at_creation'
             );
@@ -378,11 +378,11 @@ 
     $SETTINGS['cpassman_dir'],
             array(
                 'error' => false,
-                'message' => langHdl('last_execution') . ' ' .
-                    date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) time()) .
+                'message' => langHdl('last_execution').' '.
+                    date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) time()).
                     '<i class="fas fa-check text-success ml-2 mr-3"></i>
                     <i class="fas fa-chevron-right mr-2"></i>' .
-                    $nbItemsDeleted . ' ' . langHdl('deleted_items'),
+                    $nbItemsDeleted.' '.langHdl('deleted_items'),
             ),
             'encode'
         );
@@ -416,21 +416,21 @@ 
             break;
         }
 
-        require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
         $return = '';
 
         //Get all tables
         $tables = array();
         $result = DB::query('SHOW TABLES');
         foreach ($result as $row) {
-            $tables[] = $row['Tables_in_' . $database];
+            $tables[] = $row['Tables_in_'.$database];
         }
 
         //cycle through
         foreach ($tables as $table) {
             if (defined('DB_PREFIX') || substr_count($table, DB_PREFIX) > 0) {
                 // Do query
-                $result = DB::queryRaw('SELECT * FROM ' . $table);
+                $result = DB::queryRaw('SELECT * FROM '.$table);
                 DB::queryRaw(
                     'SELECT *
                     FROM INFORMATION_SCHEMA.COLUMNS
@@ -442,19 +442,19 @@ 
                 $numFields = DB::count();
 
                 // prepare a drop table
-                $return .= 'DROP TABLE ' . $table . ';';
-                $row2 = DB::queryfirstrow('SHOW CREATE TABLE ' . $table);
-                $return .= "\n\n" . $row2['Create Table'] . ";\n\n";
+                $return .= 'DROP TABLE '.$table.';';
+                $row2 = DB::queryfirstrow('SHOW CREATE TABLE '.$table);
+                $return .= "\n\n".$row2['Create Table'].";\n\n";
 
                 //prepare all fields and datas
                 for ($i = 0; $i < $numFields; ++$i) {
                     while ($row = $result->fetch_row()) {
-                        $return .= 'INSERT INTO ' . $table . ' VALUES(';
+                        $return .= 'INSERT INTO '.$table.' VALUES(';
                         for ($j = 0; $j < $numFields; ++$j) {
                             $row[$j] = addslashes($row[$j]);
                             $row[$j] = preg_replace("/\n/", '\\n', $row[$j]);
                             if (isset($row[$j])) {
-                                $return .= '"' . $row[$j] . '"';
+                                $return .= '"'.$row[$j].'"';
                             } else {
                                 $return .= 'NULL';
                             }
@@ -474,8 +474,8 @@ 
             $token = GenerateCryptKey(20, false, true, true, false, true, $SETTINGS);
 
             //save file
-            $filename = time() . '-' . $token . '.sql';
-            $handle = fopen($SETTINGS['path_to_files_folder'] . '/' . $filename, 'w+');
+            $filename = time().'-'.$token.'.sql';
+            $handle = fopen($SETTINGS['path_to_files_folder'].'/'.$filename, 'w+');
             if ($handle !== false) {
                 //write file
                 fwrite($handle, $return);
@@ -487,17 +487,17 @@ 
                 // Encrypt the file
                 prepareFileWithDefuse(
                     'encrypt',
-                    $SETTINGS['path_to_files_folder'] . '/' . $filename,
-                    $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $filename,
+                    $SETTINGS['path_to_files_folder'].'/'.$filename,
+                    $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$filename,
                     $SETTINGS,
                     $post_option
                 );
 
                 // Do clean
-                unlink($SETTINGS['path_to_files_folder'] . '/' . $filename);
+                unlink($SETTINGS['path_to_files_folder'].'/'.$filename);
                 rename(
-                    $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $filename,
-                    $SETTINGS['path_to_files_folder'] . '/' . $filename
+                    $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$filename,
+                    $SETTINGS['path_to_files_folder'].'/'.$filename
                 );
             }
 
@@ -507,7 +507,7 @@ 
             //update LOG
             logEvents($SETTINGS, 'admin_action', 'dataBase backup', (string) $_SESSION['user_id'], $_SESSION['login']);
 
-            echo '[{"result":"db_backup" , "href":"sources/downloadFile.php?name=' . urlencode($filename) . '&sub=files&file=' . $filename . '&type=sql&key=' . $_SESSION['key'] . '&key_tmp=' . $_SESSION['key_tmp'] . '&pathIsFiles=1"}]';
+            echo '[{"result":"db_backup" , "href":"sources/downloadFile.php?name='.urlencode($filename).'&sub=files&file='.$filename.'&type=sql&key='.$_SESSION['key'].'&key_tmp='.$_SESSION['key_tmp'].'&pathIsFiles=1"}]';
         }
         break;
 
@@ -538,7 +538,7 @@ 
             );
             break;
         }
-        include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
         $dataPost = explode('&', $post_option);
         $file = htmlspecialchars($dataPost[0]);
@@ -547,7 +547,7 @@ 
         // Get filename from database
         $data = DB::queryFirstRow(
             'SELECT valeur
-            FROM ' . prefixTable('misc') . '
+            FROM ' . prefixTable('misc').'
             WHERE increment_id = %i',
             $file
         );
@@ -566,22 +566,22 @@ 
             // Decrypt the file
             $ret = prepareFileWithDefuse(
                 'decrypt',
-                $SETTINGS['path_to_files_folder'] . '/' . $file,
-                $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $file,
+                $SETTINGS['path_to_files_folder'].'/'.$file,
+                $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$file,
                 $SETTINGS,
                 $key
             );
 
             if (empty($ret) === false) {
-                echo '[{"result":"db_restore" , "message":"' . $ret . '"}]';
+                echo '[{"result":"db_restore" , "message":"'.$ret.'"}]';
                 break;
             }
 
             // Do clean
-            fileDelete($SETTINGS['path_to_files_folder'] . '/' . $file, $SETTINGS);
-            $file = $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $file;
+            fileDelete($SETTINGS['path_to_files_folder'].'/'.$file, $SETTINGS);
+            $file = $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$file;
         } else {
-            $file = $SETTINGS['path_to_files_folder'] . '/' . $file;
+            $file = $SETTINGS['path_to_files_folder'].'/'.$file;
         }
 
         //read sql file
@@ -598,7 +598,7 @@ 
         fclose($handle);
 
         //delete file
-        unlink($SETTINGS['path_to_files_folder'] . '/' . $file);
+        unlink($SETTINGS['path_to_files_folder'].'/'.$file);
 
         //Show done
         echo '[{"result":"db_restore" , "message":""}]';
@@ -638,8 +638,8 @@ 
             foreach ($table as $i => $tablename) {
                 if (substr_count($tablename, DB_PREFIX) > 0) {
                     // launch optimization quieries
-                    DB::query('ANALYZE TABLE `' . $tablename . '`');
-                    DB::query('OPTIMIZE TABLE `' . $tablename . '`');
+                    DB::query('ANALYZE TABLE `'.$tablename.'`');
+                    DB::query('OPTIMIZE TABLE `'.$tablename.'`');
                 }
             }
         }
@@ -647,12 +647,12 @@ 
         //Clean up LOG_ITEMS table
         $rows = DB::query(
             'SELECT id
-            FROM ' . prefixTable('items') . '
+            FROM ' . prefixTable('items').'
             ORDER BY id ASC'
         );
         foreach ($rows as $item) {
             DB::query(
-                'SELECT * FROM ' . prefixTable('log_items') . ' WHERE id_item = %i AND action = %s',
+                'SELECT * FROM '.prefixTable('log_items').' WHERE id_item = %i AND action = %s',
                 $item['id'],
                 'at_creation'
             );
@@ -660,7 +660,7 @@ 
             if ($counter === 0) {
                 //Create new at_creation entry
                 $rowTmp = DB::queryFirstRow(
-                    'SELECT date, id_user FROM ' . prefixTable('log_items') . ' WHERE id_item=%i ORDER BY date ASC',
+                    'SELECT date, id_user FROM '.prefixTable('log_items').' WHERE id_item=%i ORDER BY date ASC',
                     $item['id']
                 );
                 DB::insert(
@@ -691,8 +691,8 @@ 
     $SETTINGS['cpassman_dir'],
             array(
                 'error' => false,
-                'message' => langHdl('last_execution') . ' ' .
-                    date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) time()) .
+                'message' => langHdl('last_execution').' '.
+                    date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) time()).
                     '<i class="fas fa-check text-success ml-2"></i>',
             ),
             'encode'
@@ -727,7 +727,7 @@ 
             break;
         }
 
-        require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
         //read folder
         if (is_dir($SETTINGS['path_to_files_folder']) === false) {
@@ -735,7 +735,7 @@ 
     $SETTINGS['cpassman_dir'],
                 array(
                     'error' => true,
-                    'message' => langHdl('file_folder_not_accessible') . ": " . $SETTINGS['path_to_files_folder'],
+                    'message' => langHdl('file_folder_not_accessible').": ".$SETTINGS['path_to_files_folder'],
                 ),
                 'encode'
             );
@@ -747,8 +747,8 @@ 
             //delete file FILES
             while (false !== ($f = readdir($dir))) {
                 if ($f !== '.' && $f !== '..' && $f !== '.htaccess') {
-                    if (file_exists($dir . $f) && ((time() - filectime($dir . $f)) > 604800)) {
-                        fileDelete($dir . '/' . $f, $SETTINGS);
+                    if (file_exists($dir.$f) && ((time() - filectime($dir.$f)) > 604800)) {
+                        fileDelete($dir.'/'.$f, $SETTINGS);
                     }
                 }
             }
@@ -763,7 +763,7 @@ 
     $SETTINGS['cpassman_dir'],
                 array(
                     'error' => true,
-                    'message' => langHdl('file_folder_not_accessible') . ": " . $SETTINGS['path_to_upload_folder'],
+                    'message' => langHdl('file_folder_not_accessible').": ".$SETTINGS['path_to_upload_folder'],
                 ),
                 'encode'
             );
@@ -777,7 +777,7 @@ 
             while (false !== ($f = readdir($dir))) {
                 if ($f !== '.' && $f !== '..') {
                     if (strpos($f, '_delete.') > 0) {
-                        fileDelete($SETTINGS['path_to_upload_folder'] . '/' . $f, $SETTINGS);
+                        fileDelete($SETTINGS['path_to_upload_folder'].'/'.$f, $SETTINGS);
                     }
                 }
             }
@@ -800,11 +800,11 @@ 
     $SETTINGS['cpassman_dir'],
             array(
                 'error' => false,
-                'message' => langHdl('last_execution') . ' ' .
-                    date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) time()) .
+                'message' => langHdl('last_execution').' '.
+                    date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) time()).
                     '<i class="fas fa-check text-success ml-2 mr-3"></i>
                     <i class="fas fa-chevron-right mr-2"></i>' .
-                    $nbItemsDeleted . ' ' . langHdl('deleted_items'),
+                    $nbItemsDeleted.' '.langHdl('deleted_items'),
             ),
             'encode'
         );
@@ -839,7 +839,7 @@ 
             break;
         }
 
-        require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
         updateCacheTable('reload', $SETTINGS, NULL);
 
         // Log
@@ -856,8 +856,8 @@ 
     $SETTINGS['cpassman_dir'],
             [
                 'error' => false,
-                'message' => langHdl('last_execution') . ' ' .
-                    date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) time()) .
+                'message' => langHdl('last_execution').' '.
+                    date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) time()).
                     '<i class="fas fa-check text-success mr-2"></i>',
             ],
             'encode'
@@ -894,7 +894,7 @@ 
         }
 
         // Perform
-        include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
         $ret = handleConfigFile('rebuild', $SETTINGS);
 
         // Log
@@ -923,8 +923,8 @@ 
     $SETTINGS['cpassman_dir'],
             array(
                 'error' => false,
-                'message' => langHdl('last_execution') . ' ' .
-                    date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) time()) .
+                'message' => langHdl('last_execution').' '.
+                    date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) time()).
                     '<i class="fas fa-check text-success ml-2"></i>',
             ),
             'encode'
@@ -966,33 +966,33 @@ 
         $filename = $post_option;
         $tp_settings = [];
         //get backups infos
-        $rows = DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s', 'admin');
+        $rows = DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s', 'admin');
         foreach ($rows as $record) {
             $tp_settings[$record['intitule']] = $record['valeur'];
         }
 
         // check if backup file is in DB.
         // If YES then it is encrypted with DEFUSE
-        $bck = DB::queryFirstRow('SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'backup', 'filename');
+        $bck = DB::queryFirstRow('SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'backup', 'filename');
 
         //read file
         $return = '';
-        $Fnm = $tp_settings['bck_script_path'] . '/' . $filename . '.sql';
+        $Fnm = $tp_settings['bck_script_path'].'/'.$filename.'.sql';
         if (file_exists($Fnm)) {
             if (!empty($bck) && $bck['valeur'] === $filename) {
                 $err = '';
 
                 // it means that file is DEFUSE encrypted
-                include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/Encryption/Crypto.php';
-                include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/Encryption/DerivedKeys.php';
-                include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/Encryption/KeyOrPassword.php';
-                include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/Encryption/File.php';
-                include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/Encryption/Core.php';
+                include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/Encryption/Crypto.php';
+                include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/Encryption/DerivedKeys.php';
+                include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/Encryption/KeyOrPassword.php';
+                include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/Encryption/File.php';
+                include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/Encryption/Core.php';
 
                 try {
                     \Defuse\Crypto\File::decryptFileWithPassword(
-                        $SETTINGS['bck_script_path'] . '/' . $post_option . '.sql',
-                        $SETTINGS['bck_script_path'] . '/' . str_replace('encrypted', 'clear', $filename) . '.sql',
+                        $SETTINGS['bck_script_path'].'/'.$post_option.'.sql',
+                        $SETTINGS['bck_script_path'].'/'.str_replace('encrypted', 'clear', $filename).'.sql',
                         base64_decode($SETTINGS['bck_script_key'])
                     );
                 } catch (Defuse\Crypto\Exception\WrongKeyOrModifiedCiphertextException $ex) {
@@ -1000,7 +1000,7 @@ 
                 }
 
                 if (!empty($err)) {
-                    echo '[{ "result":"backup_decrypt_fails" , "msg":"' . $err . '"}]';
+                    echo '[{ "result":"backup_decrypt_fails" , "msg":"'.$err.'"}]';
                     break;
                 }
             } else {
@@ -1022,19 +1022,19 @@ 
                 );
 
                 //save the file
-                $handle = fopen($tp_settings['bck_script_path'] . '/' . $filename . '.clear.sql', 'w+');
+                $handle = fopen($tp_settings['bck_script_path'].'/'.$filename.'.clear.sql', 'w+');
                 if ($handle !== false) {
                     fwrite($handle, $return);
                     fclose($handle);
                 }
             }
             $result = 'backup_decrypt_success';
-            $msg = $tp_settings['bck_script_path'] . '/' . $filename . '.clear.sql';
+            $msg = $tp_settings['bck_script_path'].'/'.$filename.'.clear.sql';
         } else {
             $result = 'backup_decrypt_fails';
-            $msg = 'File not found: ' . $Fnm;
+            $msg = 'File not found: '.$Fnm;
         }
-        echo '[{ "result":"' . $result . '" , "msg":"' . $msg . '"}]';
+        echo '[{ "result":"'.$result.'" , "msg":"'.$msg.'"}]';
         break;
 
         /*
@@ -1070,22 +1070,22 @@ 
         require_once 'main.functions.php';
 
         // store old sk
-        $_SESSION['reencrypt_old_salt'] = file_get_contents(SECUREPATH . '/teampass-seckey.txt');
+        $_SESSION['reencrypt_old_salt'] = file_get_contents(SECUREPATH.'/teampass-seckey.txt');
 
         // generate new saltkey
-        $old_sk_filename = SECUREPATH . '/teampass-seckey.txt.' . date('Y_m_d', mktime(0, 0, 0, (int) date('m'), (int) date('d'), (int) date('y'))) . '.' . time();
+        $old_sk_filename = SECUREPATH.'/teampass-seckey.txt.'.date('Y_m_d', mktime(0, 0, 0, (int) date('m'), (int) date('d'), (int) date('y'))).'.'.time();
         copy(
-            SECUREPATH . '/teampass-seckey.txt',
+            SECUREPATH.'/teampass-seckey.txt',
             $old_sk_filename
         );
         $new_key = defuse_generate_key();
         file_put_contents(
-            SECUREPATH . '/teampass-seckey.txt',
+            SECUREPATH.'/teampass-seckey.txt',
             $new_key
         );
 
         // store new sk
-        $_SESSION['reencrypt_new_salt'] = file_get_contents(SECUREPATH . '/teampass-seckey.txt');
+        $_SESSION['reencrypt_new_salt'] = file_get_contents(SECUREPATH.'/teampass-seckey.txt');
 
         //put tool in maintenance.
         DB::update(
@@ -1101,13 +1101,13 @@ 
         logEvents($SETTINGS, 'system', 'change_salt_key', (string) $_SESSION['user_id'], $_SESSION['login']);
 
         // get number of items to change
-        DB::query('SELECT id FROM ' . prefixTable('items') . ' WHERE perso = %i', 0);
+        DB::query('SELECT id FROM '.prefixTable('items').' WHERE perso = %i', 0);
         $nb_of_items = DB::count();
 
         // create backup table
-        DB::query('DROP TABLE IF EXISTS ' . prefixTable('sk_reencrypt_backup'));
+        DB::query('DROP TABLE IF EXISTS '.prefixTable('sk_reencrypt_backup'));
         DB::query(
-            'CREATE TABLE `' . prefixTable('sk_reencrypt_backup') . '` (
+            'CREATE TABLE `'.prefixTable('sk_reencrypt_backup').'` (
             `id` int(12) NOT null AUTO_INCREMENT,
             `current_table` varchar(100) NOT NULL,
             `current_field` varchar(500) NOT NULL,
@@ -1135,7 +1135,7 @@ 
         );
 
         // delete previous backup files
-        $files = glob($SETTINGS['path_to_upload_folder'] . '/*'); // get all file names
+        $files = glob($SETTINGS['path_to_upload_folder'].'/*'); // get all file names
         foreach ($files as $file) { // iterate files
             if (is_file($file)) {
                 $file_parts = pathinfo($file);
@@ -1222,7 +1222,7 @@ 
     $SETTINGS['cpassman_dir'],
                     array(
                         'error' => true,
-                        'message' => 'Input `' . $objects[0] . '` is not allowed',
+                        'message' => 'Input `'.$objects[0].'` is not allowed',
                         'nbOfItems' => '',
                         'nextAction' => '',
                     ),
@@ -1235,9 +1235,9 @@ 
                 //change all encrypted data in Items (passwords)
                 $rows = DB::query(
                     'SELECT id, pw, pw_iv
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE perso = %s
-                    LIMIT ' . $post_start . ', ' . $post_length,
+                    LIMIT ' . $post_start.', '.$post_length,
                     '0'
                 );
                 foreach ($rows as $record) {
@@ -1249,7 +1249,7 @@ 
                             'current_field' => 'pw',
                             'value_id' => $record['id'],
                             'value' => $record['pw'],
-                            'current_sql' => 'UPDATE ' . prefixTable('items') . " SET pw = '" . $record['pw'] . "' WHERE id = '" . $record['id'] . "';",
+                            'current_sql' => 'UPDATE '.prefixTable('items')." SET pw = '".$record['pw']."' WHERE id = '".$record['id']."';",
                             'value2' => 'none',
                             'result' => 'none',
                         )
@@ -1298,9 +1298,9 @@ 
                 //change all encrypted data in Logs (passwords)
                 $rows = DB::query(
                     'SELECT raison, increment_id
-                    FROM ' . prefixTable('log_items') . "
+                    FROM ' . prefixTable('log_items')."
                     WHERE action = %s AND raison LIKE 'at_pw :%'
-                    LIMIT " . $post_start . ', ' . $post_length,
+                    LIMIT " . $post_start.', '.$post_length,
                     'at_modification'
                 );
                 foreach ($rows as $record) {
@@ -1312,7 +1312,7 @@ 
                             'current_field' => 'raison',
                             'value_id' => $record['increment_id'],
                             'value' => $record['raison'],
-                            'current_sql' => 'UPDATE ' . prefixTable('log_items') . " SET raison = '" . $record['raison'] . "' WHERE increment_id = '" . $record['increment_id'] . "';",
+                            'current_sql' => 'UPDATE '.prefixTable('log_items')." SET raison = '".$record['raison']."' WHERE increment_id = '".$record['increment_id']."';",
                             'value2' => 'none',
                             'result' => 'none',
                         )
@@ -1340,7 +1340,7 @@ 
                         DB::update(
                             prefixTable('log_items'),
                             array(
-                                'raison' => 'at_pw :' . $encrypt['string'],
+                                'raison' => 'at_pw :'.$encrypt['string'],
                                 'encryption_type' => 'defuse',
                             ),
                             'increment_id = %i',
@@ -1365,8 +1365,8 @@ 
                 //change all encrypted data in CATEGORIES (passwords)
                 $rows = DB::query(
                     'SELECT id, data
-                    FROM ' . prefixTable('categories_items') . '
-                    LIMIT ' . $post_start . ', ' . $post_length
+                    FROM ' . prefixTable('categories_items').'
+                    LIMIT ' . $post_start.', '.$post_length
                 );
                 foreach ($rows as $record) {
                     // backup data
@@ -1377,7 +1377,7 @@ 
                             'current_field' => 'data',
                             'value_id' => $record['id'],
                             'value' => $record['data'],
-                            'current_sql' => 'UPDATE ' . prefixTable('categories_items') . " SET data = '" . $record['data'] . "' WHERE id = '" . $record['id'] . "';",
+                            'current_sql' => 'UPDATE '.prefixTable('categories_items')." SET data = '".$record['data']."' WHERE id = '".$record['id']."';",
                             'value2' => 'none',
                             'result' => 'none',
                         )
@@ -1425,9 +1425,9 @@ 
                 // Change all encrypted data in FILES (passwords)
                 $rows = DB::query(
                     'SELECT id, file, status
-                    FROM ' . prefixTable('files') . "
+                    FROM ' . prefixTable('files')."
                     WHERE status = 'encrypted'
-                    LIMIT " . $post_start . ', ' . $post_length
+                    LIMIT " . $post_start.', '.$post_length
                 );
                 foreach ($rows as $record) {
                     // backup data
@@ -1445,20 +1445,20 @@ 
                     );
                     $newID = DB::insertId();
 
-                    if (file_exists($SETTINGS['path_to_upload_folder'] . '/' . $record['file'])) {
+                    if (file_exists($SETTINGS['path_to_upload_folder'].'/'.$record['file'])) {
                         // make a copy of file
                         if (!copy(
-                            $SETTINGS['path_to_upload_folder'] . '/' . $record['file'],
-                            $SETTINGS['path_to_upload_folder'] . '/' . $record['file'] . '.copy'
+                            $SETTINGS['path_to_upload_folder'].'/'.$record['file'],
+                            $SETTINGS['path_to_upload_folder'].'/'.$record['file'].'.copy'
                         )) {
                             $error = 'Copy not possible';
                             exit;
                         } else {
                             // prepare a bck of file (that will not be deleted)
-                            $backup_filename = $record['file'] . '.bck-change-sk.' . time();
+                            $backup_filename = $record['file'].'.bck-change-sk.'.time();
                             copy(
-                                $SETTINGS['path_to_upload_folder'] . '/' . $record['file'],
-                                $SETTINGS['path_to_upload_folder'] . '/' . $backup_filename
+                                $SETTINGS['path_to_upload_folder'].'/'.$record['file'],
+                                $SETTINGS['path_to_upload_folder'].'/'.$backup_filename
                             );
                         }
 
@@ -1466,24 +1466,24 @@ 
                         // STEP1 - Do decryption
                         prepareFileWithDefuse(
                             'decrypt',
-                            $SETTINGS['path_to_upload_folder'] . '/' . $record['file'],
-                            $SETTINGS['path_to_upload_folder'] . '/' . $record['file'] . '_encrypted',
+                            $SETTINGS['path_to_upload_folder'].'/'.$record['file'],
+                            $SETTINGS['path_to_upload_folder'].'/'.$record['file'].'_encrypted',
                             $SETTINGS
                         );
 
                         // Do cleanup of files
-                        unlink($SETTINGS['path_to_upload_folder'] . '/' . $record['file']);
+                        unlink($SETTINGS['path_to_upload_folder'].'/'.$record['file']);
 
                         // STEP2 - Do encryption
                         prepareFileWithDefuse(
                             'encryp',
-                            $SETTINGS['path_to_upload_folder'] . '/' . $record['file'] . '_encrypted',
-                            $SETTINGS['path_to_upload_folder'] . '/' . $record['file'],
+                            $SETTINGS['path_to_upload_folder'].'/'.$record['file'].'_encrypted',
+                            $SETTINGS['path_to_upload_folder'].'/'.$record['file'],
                             $SETTINGS
                         );
 
                         // Do cleanup of files
-                        unlink($SETTINGS['path_to_upload_folder'] . '/' . $record['file'] . '_encrypted');
+                        unlink($SETTINGS['path_to_upload_folder'].'/'.$record['file'].'_encrypted');
 
                         // Update backup table
                         DB::update(
@@ -1509,13 +1509,13 @@ 
                 // do some things for new object
                 if (isset($objects[0])) {
                     if ($objects[0] === 'logs') {
-                        DB::query('SELECT increment_id FROM ' . prefixTable('log_items') . " WHERE action = %s AND raison LIKE 'at_pw :%'", 'at_modification');
+                        DB::query('SELECT increment_id FROM '.prefixTable('log_items')." WHERE action = %s AND raison LIKE 'at_pw :%'", 'at_modification');
                     } elseif ($objects[0] === 'files') {
-                        DB::query('SELECT id FROM ' . prefixTable('files'));
+                        DB::query('SELECT id FROM '.prefixTable('files'));
                     } elseif ($objects[0] === 'categories') {
-                        DB::query('SELECT id FROM ' . prefixTable('categories_items'));
+                        DB::query('SELECT id FROM '.prefixTable('categories_items'));
                     } elseif ($objects[0] === 'custfields') {
-                        DB::query('SELECT raison FROM ' . prefixTable('log_items') . " WHERE action = %s AND raison LIKE 'at_pw :%'", 'at_modification');
+                        DB::query('SELECT raison FROM '.prefixTable('log_items')." WHERE action = %s AND raison LIKE 'at_pw :%'", 'at_modification');
                     }
                     $nb_of_items = DB::count();
                 } else {
@@ -1640,12 +1640,12 @@ 
                 );
             } elseif ($record['current_table'] === 'files') {
                 // restore backup file
-                if (file_exists($SETTINGS['path_to_upload_folder'] . '/' . $record['value'])) {
-                    unlink($SETTINGS['path_to_upload_folder'] . '/' . $record['value']);
-                    if (file_exists($SETTINGS['path_to_upload_folder'] . '/' . $record['value2'])) {
+                if (file_exists($SETTINGS['path_to_upload_folder'].'/'.$record['value'])) {
+                    unlink($SETTINGS['path_to_upload_folder'].'/'.$record['value']);
+                    if (file_exists($SETTINGS['path_to_upload_folder'].'/'.$record['value2'])) {
                         rename(
-                            $SETTINGS['path_to_upload_folder'] . '/' . $record['value2'],
-                            $SETTINGS['path_to_upload_folder'] . '/' . $record['value']
+                            $SETTINGS['path_to_upload_folder'].'/'.$record['value2'],
+                            $SETTINGS['path_to_upload_folder'].'/'.$record['value']
                         );
                     }
                 }
@@ -1656,15 +1656,15 @@ 
 
         // restore saltkey file
         if (file_exists($previous_saltkey_filename)) {
-            unlink(SECUREPATH . '/teampass-seckey.txt');
+            unlink(SECUREPATH.'/teampass-seckey.txt');
             rename(
                 $previous_saltkey_filename,
-                SECUREPATH . '/teampass-seckey.txt'
+                SECUREPATH.'/teampass-seckey.txt'
             );
         }
 
         // drop table
-        DB::query('DROP TABLE IF EXISTS ' . prefixTable('sk_reencrypt_backup'));
+        DB::query('DROP TABLE IF EXISTS '.prefixTable('sk_reencrypt_backup'));
 
         // Send back
         echo prepareExchangedData(
@@ -1710,17 +1710,17 @@ 
         // delete files
         $rows = DB::query(
             'SELECT value, value2
-            FROM ' . prefixTable('sk_reencrypt_backup') . "
+            FROM ' . prefixTable('sk_reencrypt_backup')."
             WHERE current_table = 'files'"
         );
         foreach ($rows as $record) {
-            if (file_exists($SETTINGS['path_to_upload_folder'] . '/' . $record['value2'])) {
-                unlink($SETTINGS['path_to_upload_folder'] . '/' . $record['value2']);
+            if (file_exists($SETTINGS['path_to_upload_folder'].'/'.$record['value2'])) {
+                unlink($SETTINGS['path_to_upload_folder'].'/'.$record['value2']);
             }
         }
 
         // drop table
-        DB::query('DROP TABLE IF EXISTS ' . prefixTable('sk_reencrypt_backup'));
+        DB::query('DROP TABLE IF EXISTS '.prefixTable('sk_reencrypt_backup'));
 
         echo '[{"status":"done"}]';
         break;
@@ -1754,7 +1754,7 @@ 
             );
             break;
         } else {
-            require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+            require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
             //send email
             sendEmail(
@@ -1792,11 +1792,11 @@ 
             break;
         }
 
-        include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
         $rows = DB::query(
             'SELECT *
-            FROM ' . prefixTable('emails') . '
+            FROM ' . prefixTable('emails').'
             WHERE status = %s OR status = %s',
             'not_sent',
             ''
@@ -1883,9 +1883,9 @@ 
             break;
         }
 
-        include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
-        $rows = DB::query('SELECT * FROM ' . prefixTable('emails') . ' WHERE status = %s OR status = %s', 'not_sent', '');
+        $rows = DB::query('SELECT * FROM '.prefixTable('emails').' WHERE status = %s OR status = %s', 'not_sent', '');
         foreach ($rows as $record) {
             //send email
             $ret = json_decode(
@@ -1956,7 +1956,7 @@ 
             break;
         }
 
-        require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
         // init
         $filesList = array();
@@ -1969,7 +1969,7 @@ 
                 FROM ' . prefixTable('files')
             );
             foreach ($rows as $record) {
-                if (is_file($SETTINGS['path_to_upload_folder'] . '/' . $record['file'])) {
+                if (is_file($SETTINGS['path_to_upload_folder'].'/'.$record['file'])) {
                     $addFile = false;
                     if (($post_option === 'attachments-decrypt' && $record['status'] === 'encrypted')
                         || ($post_option === 'attachments-encrypt' && $record['status'] === 'clear')
@@ -2038,8 +2038,8 @@ 
         $post_list = filter_var_array($post_list, FILTER_SANITIZE_STRING);
         $post_counter = filter_var($post_counter, FILTER_SANITIZE_NUMBER_INT);
 
-        include $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
-        include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        include $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
+        include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
         $cpt = 0;
         $continu = true;
@@ -2047,15 +2047,15 @@ 
         $message = '';
 
         // load PhpEncryption library
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/Encryption/Crypto.php';
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/Encryption/Encoding.php';
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/Encryption/DerivedKeys.php';
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/Encryption/Key.php';
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/Encryption/KeyOrPassword.php';
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/Encryption/File.php';
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/Encryption/RuntimeTests.php';
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/Encryption/KeyProtectedByPassword.php';
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/Encryption/Core.php';
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/Encryption/Crypto.php';
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/Encryption/Encoding.php';
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/Encryption/DerivedKeys.php';
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/Encryption/Key.php';
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/Encryption/KeyOrPassword.php';
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/Encryption/File.php';
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/Encryption/RuntimeTests.php';
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/Encryption/KeyProtectedByPassword.php';
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/Encryption/Core.php';
 
         // treat 10 files
         foreach ($post_list as $file) {
@@ -2063,35 +2063,35 @@ 
                 // Get file name
                 $file_info = DB::queryfirstrow(
                     'SELECT file
-                    FROM ' . prefixTable('files') . '
+                    FROM ' . prefixTable('files').'
                     WHERE id = %i',
                     $file
                 );
 
                 // skip file is Coherancey not respected
-                if (is_file($SETTINGS['path_to_upload_folder'] . '/' . $file_info['file'])) {
+                if (is_file($SETTINGS['path_to_upload_folder'].'/'.$file_info['file'])) {
                     // Case where we want to decrypt
                     if ($post_option === 'decrypt') {
                         prepareFileWithDefuse(
                             'decrypt',
-                            $SETTINGS['path_to_upload_folder'] . '/' . $file_info['file'],
-                            $SETTINGS['path_to_upload_folder'] . '/defuse_temp_' . $file_info['file'],
+                            $SETTINGS['path_to_upload_folder'].'/'.$file_info['file'],
+                            $SETTINGS['path_to_upload_folder'].'/defuse_temp_'.$file_info['file'],
                             $SETTINGS
                         );
                         // Case where we want to encrypt
                     } elseif ($post_option === 'encrypt') {
                         prepareFileWithDefuse(
                             'encrypt',
-                            $SETTINGS['path_to_upload_folder'] . '/' . $file_info['file'],
-                            $SETTINGS['path_to_upload_folder'] . '/defuse_temp_' . $file_info['file'],
+                            $SETTINGS['path_to_upload_folder'].'/'.$file_info['file'],
+                            $SETTINGS['path_to_upload_folder'].'/defuse_temp_'.$file_info['file'],
                             $SETTINGS
                         );
                     }
                     // Do file cleanup
-                    fileDelete($SETTINGS['path_to_upload_folder'] . '/' . $file_info['file'], $SETTINGS);
+                    fileDelete($SETTINGS['path_to_upload_folder'].'/'.$file_info['file'], $SETTINGS);
                     rename(
-                        $SETTINGS['path_to_upload_folder'] . '/defuse_temp_' . $file_info['file'],
-                        $SETTINGS['path_to_upload_folder'] . '/' . $file_info['file']
+                        $SETTINGS['path_to_upload_folder'].'/defuse_temp_'.$file_info['file'],
+                        $SETTINGS['path_to_upload_folder'].'/'.$file_info['file']
                     );
 
                     // store in DB
@@ -2126,8 +2126,8 @@ 
                 $post_option === 'attachments-decrypt' ? 'clear' : 'encrypted'
             );
 
-            $message = langHdl('last_execution') . ' ' .
-                date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) time()) .
+            $message = langHdl('last_execution').' '.
+                date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) time()).
                 '<i class="fas fa-check text-success ml-2 mr-3"></i>';
         }
 
@@ -2175,7 +2175,7 @@ 
 
         // decrypt and retrieve data in JSON format
         $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
         $post_label = isset($dataReceived['label']) === true ? filter_var($dataReceived['label'], FILTER_SANITIZE_STRING) : '';
         $post_action = filter_var($dataReceived['action'], FILTER_SANITIZE_STRING);
@@ -2217,7 +2217,7 @@ 
             $post_id = filter_var($dataReceived['id'], FILTER_SANITIZE_STRING);
 
             DB::query(
-                'DELETE FROM ' . prefixTable('api') . ' WHERE id = %i',
+                'DELETE FROM '.prefixTable('api').' WHERE id = %i',
                 $post_id
             );
         }
@@ -2266,7 +2266,7 @@ 
 
         // decrypt and retrieve data in JSON format
         $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
         $post_action = filter_var($dataReceived['action'], FILTER_SANITIZE_STRING);
 
@@ -2313,7 +2313,7 @@ 
             // Delete existing key
         } elseif (null !== $post_action && $post_action === 'delete') {
             $post_id = filter_var($dataReceived['id'], FILTER_SANITIZE_STRING);
-            DB::query('DELETE FROM ' . prefixTable('api') . ' WHERE id=%i', $post_id);
+            DB::query('DELETE FROM '.prefixTable('api').' WHERE id=%i', $post_id);
         }
 
         echo prepareExchangedData(
@@ -2329,7 +2329,7 @@ 
 
     case 'save_api_status':
         // Do query
-        DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'api');
+        DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'api');
         $counter = DB::count();
         if ($counter === 0) {
             DB::insert(
@@ -2355,7 +2355,7 @@ 
         break;
 
     case 'save_duo_status':
-        DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'duo');
+        DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'duo');
         $counter = DB::count();
         if ($counter === 0) {
             DB::insert(
@@ -2395,12 +2395,12 @@ 
 
         // decrypt and retrieve data in JSON format
         $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+    $SETTINGS['cpassman_dir'], $post_data, 'decode');
         // Store in DB
         foreach ($dataReceived as $key => $value) {
             DB::query(
                 'SELECT * 
-                FROM ' . prefixTable('misc') . '
+                FROM ' . prefixTable('misc').'
                 WHERE type = %s AND intitule = %s',
                 'admin',
                 $key
@@ -2471,7 +2471,7 @@ 
         } else {
             $tmp = 1;
         }
-        DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'google_authentication');
+        DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'google_authentication');
         $counter = DB::count();
         if ($counter === 0) {
             DB::insert(
@@ -2497,7 +2497,7 @@ 
 
         // ga_website_name
         if (is_null($dataReceived['ga_website_name']) === false) {
-            DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'ga_website_name');
+            DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'ga_website_name');
             $counter = DB::count();
             if ($counter === 0) {
                 DB::insert(
@@ -2528,7 +2528,7 @@ 
         }
 
         // send data
-        echo '[{"result" : "' . addslashes($LANG['done']) . '" , "error" : ""}]';
+        echo '[{"result" : "'.addslashes($LANG['done']).'" , "error" : ""}]';
         break;
 
     case 'save_agses_options':
@@ -2553,7 +2553,7 @@ 
 
         // agses_hosted_url
         if (!is_null($dataReceived['agses_hosted_url'])) {
-            DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'agses_hosted_url');
+            DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'agses_hosted_url');
             $counter = DB::count();
             if ($counter === 0) {
                 DB::insert(
@@ -2582,7 +2582,7 @@ 
 
         // agses_hosted_id
         if (!is_null($dataReceived['agses_hosted_id'])) {
-            DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'agses_hosted_id');
+            DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'agses_hosted_id');
             $counter = DB::count();
             if ($counter === 0) {
                 DB::insert(
@@ -2611,7 +2611,7 @@ 
 
         // agses_hosted_apikey
         if (!is_null($dataReceived['agses_hosted_apikey'])) {
-            DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'agses_hosted_apikey');
+            DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'agses_hosted_apikey');
             $counter = DB::count();
             if ($counter === 0) {
                 DB::insert(
@@ -2639,7 +2639,7 @@ 
         }
 
         // send data
-        echo '[{"result" : "' . addslashes($LANG['done']) . '" , "error" : ""}]';
+        echo '[{"result" : "'.addslashes($LANG['done']).'" , "error" : ""}]';
         break;
 
     case 'save_option_change':
@@ -2677,7 +2677,7 @@ 
 
         // Check if setting is already in DB. If NO then insert, if YES then update.
         $data = DB::query(
-            'SELECT * FROM ' . prefixTable('misc') . '
+            'SELECT * FROM '.prefixTable('misc').'
             WHERE type = %s AND intitule = %s',
             $type,
             $dataReceived['field']
@@ -2699,7 +2699,7 @@ 
                     array(
                         'valeur' => time(),
                         'type' => $type,
-                        'intitule' => $dataReceived['field'] . '_time',
+                        'intitule' => $dataReceived['field'].'_time',
                     )
                 );
             }
@@ -2717,10 +2717,10 @@ 
             if ($dataReceived['field'] === 'send_stats') {
                 // Check if previous time exists, if not them insert this value in DB
                 DB::query(
-                    'SELECT * FROM ' . prefixTable('misc') . '
+                    'SELECT * FROM '.prefixTable('misc').'
                     WHERE type = %s AND intitule = %s',
                     $type,
-                    $dataReceived['field'] . '_time'
+                    $dataReceived['field'].'_time'
                 );
                 $counter = DB::count();
                 if ($counter === 0) {
@@ -2729,7 +2729,7 @@ 
                         array(
                             'valeur' => 0,
                             'type' => $type,
-                            'intitule' => $dataReceived['field'] . '_time',
+                            'intitule' => $dataReceived['field'].'_time',
                         )
                     );
                 } else {
@@ -2749,13 +2749,13 @@ 
         // special Cases
         if ($dataReceived['field'] === 'cpassman_url') {
             // update also jsUrl for CSFP protection
-            $jsUrl = $dataReceived['value'] . '/includes/libraries/csrfp/js/csrfprotector.js';
+            $jsUrl = $dataReceived['value'].'/includes/libraries/csrfp/js/csrfprotector.js';
             $csrfp_file = '../includes/libraries/csrfp/libs/csrfp.config.php';
             $data = file_get_contents($csrfp_file);
             $posJsUrl = strpos($data, '"jsUrl" => "');
             $posEndLine = strpos($data, '",', $posJsUrl);
             $line = substr($data, $posJsUrl, ($posEndLine - $posJsUrl + 2));
-            $newdata = str_replace($line, '"jsUrl" => "' . filter_var($jsUrl, FILTER_SANITIZE_STRING) . '",', $data);
+            $newdata = str_replace($line, '"jsUrl" => "'.filter_var($jsUrl, FILTER_SANITIZE_STRING).'",', $data);
             file_put_contents($csrfp_file, $newdata);
         } elseif ($dataReceived['field'] === 'restricted_to_input' && $dataReceived['value'] === '0') {
             DB::update(
@@ -2780,7 +2780,7 @@ 
     $SETTINGS['cpassman_dir'],
             array(
                 'error' => false,
-                'misc' => $counter . ' ; ' . $SETTINGS[$dataReceived['field']],
+                'misc' => $counter.' ; '.$SETTINGS[$dataReceived['field']],
             ),
             'encode'
         );
@@ -2825,7 +2825,7 @@ 
 
         // send statistics
         if (null !== $post_status) {
-            DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'send_stats');
+            DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'send_stats');
             $counter = DB::count();
             if ($counter === 0) {
                 DB::insert(
@@ -2857,7 +2857,7 @@ 
 
         // send statistics items
         if (null !== $post_list) {
-            DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', 'admin', 'send_statistics_items');
+            DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', 'admin', 'send_statistics_items');
             $counter = DB::count();
             if ($counter === 0) {
                 DB::insert(
@@ -2905,7 +2905,7 @@ 
             break;
         }
 
-        if (DB::query("SHOW TABLES LIKE '" . prefixTable('sk_reencrypt_backup') . "'")) {
+        if (DB::query("SHOW TABLES LIKE '".prefixTable('sk_reencrypt_backup')."'")) {
             if (DB::count() === 1) {
                 echo 1;
             } else {
@@ -2944,7 +2944,7 @@ 
 
         $rows = DB::query(
             'SELECT id, title
-                FROM ' . prefixTable('roles_title') . '
+                FROM ' . prefixTable('roles_title').'
                 ORDER BY title ASC'
         );
         foreach ($rows as $record) {
@@ -2960,7 +2960,7 @@ 
         }
 
         echo prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$json, 'encode');
+    $SETTINGS['cpassman_dir'], $json, 'encode');
 
         break;
 }

sources/roles.queries.php

Spacing +1 added lines, -1 removed lines

@@ -505,7 +505,7 @@
 
             // decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-                $SETTINGS['cpassman_dir'],$post_data, 'decode');
+                $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // Prepare variables
             $post_roleId = filter_var($dataReceived['roleId'], FILTER_SANITIZE_NUMBER_INT);

sources/ldap.queries.php

Spacing +44 added lines, -44 removed lines

@@ -45,26 +45,26 @@ 
 }
 
 /* do checks */
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 if (!checkUser($_SESSION['user_id'], $_SESSION['key'], 'ldap', $SETTINGS)) {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit();
 }
 
-require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/tp.config.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/tp.config.php';
 
 header('Content-type: text/html; charset=utf-8');
 header('Cache-Control: no-cache, no-store, must-revalidate');
 
-require_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
 // connect to the server
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
 if (defined('DB_PASSWD_CLEAR') === false) {
     define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
 }
@@ -129,38 +129,38 @@ 
         ];
 
         // Load expected libraries
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/helpers.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Arr.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Symfony/contracts/Translation/TranslatorInterface.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonTimeZone.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Units.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Week.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Timestamp.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Test.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/ObjectInitialisation.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Serialization.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/IntervalRounding.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Rounding.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Localization.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Options.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Cast.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mutability.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Modifiers.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mixin.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Macro.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Difference.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Creator.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Converter.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Comparison.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Boundaries.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Date.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonInterface.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Carbon.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/DetectsErrors.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Connection.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapInterface.php';
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/HandlesConnection.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/helpers.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Arr.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Symfony/contracts/Translation/TranslatorInterface.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonTimeZone.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Units.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Week.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Timestamp.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Test.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/ObjectInitialisation.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Serialization.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/IntervalRounding.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Rounding.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Localization.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Options.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Cast.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mutability.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Modifiers.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mixin.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Macro.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Difference.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Creator.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Converter.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Comparison.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Boundaries.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Date.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonInterface.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Carbon.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/DetectsErrors.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Connection.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapInterface.php';
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/HandlesConnection.php';
 
         $ad = new SplClassLoader('LdapRecord', '../includes/libraries');
         $ad->register();
@@ -176,7 +176,7 @@ 
                 $SETTINGS['cpassman_dir'],
                 array(
                     'error' => true,
-                    'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage(). "<br>".$error->getDiagnosticMessage(),
+                    'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage()."<br>".$error->getDiagnosticMessage(),
                 ),
                 'encode'
             );
@@ -195,7 +195,7 @@ 
                 $SETTINGS['cpassman_dir'],
                 array(
                     'error' => true,
-                    'message' => "Error : ".$e->withDetailedError($e),//->detailedError(),
+                    'message' => "Error : ".$e->withDetailedError($e), //->detailedError(),
                 ),
                 'encode'
             );
@@ -215,7 +215,7 @@ 
                 $SETTINGS['cpassman_dir'],
                 array(
                     'error' => true,
-                    'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage(). "<br>".$error->getDiagnosticMessage(),
+                    'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage()."<br>".$error->getDiagnosticMessage(),
                 ),
                 'encode'
             );

sources/users.queries.php

Spacing +174 added lines, -174 removed lines

@@ -47,8 +47,8 @@ 
 }
 
 /* do checks */
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 $isprofileupdate = filter_input(INPUT_POST, 'isprofileupdate', FILTER_SANITIZE_STRING);
 if (
     checkUser($_SESSION['user_id'], $_SESSION['key'], 'profile', $SETTINGS) === false
@@ -59,7 +59,7 @@ 
         || $isprofileupdate === false
     ) {
         $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page
-        include $SETTINGS['cpassman_dir'] . '/error.php';
+        include $SETTINGS['cpassman_dir'].'/error.php';
         exit();
     } else {
         // Do special check to allow user to change attributes of his profile
@@ -68,20 +68,20 @@ 
             || checkUser($_SESSION['user_id'], $_SESSION['key'], 'profile', $SETTINGS) === false
         ) {
             $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page
-            include $SETTINGS['cpassman_dir'] . '/error.php';
+            include $SETTINGS['cpassman_dir'].'/error.php';
             exit();
         }
     }
 }
 
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
 header('Content-type: text/html; charset=utf-8');
-require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
 
 // Connect to mysql server
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
 if (defined('DB_PASSWD_CLEAR') === false) {
     define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
 }
@@ -128,12 +128,12 @@ 
 
             // decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-                    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+                    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // Prepare variables
             $login = filter_var($dataReceived['login'], FILTER_SANITIZE_STRING);
             $email = filter_var($dataReceived['email'], FILTER_SANITIZE_EMAIL);
-            $password = '';//filter_var($dataReceived['pw'], FILTER_SANITIZE_STRING);
+            $password = ''; //filter_var($dataReceived['pw'], FILTER_SANITIZE_STRING);
             $lastname = filter_var($dataReceived['lastname'], FILTER_SANITIZE_STRING);
             $name = filter_var($dataReceived['name'], FILTER_SANITIZE_STRING);
             $is_admin = filter_var($dataReceived['admin'], FILTER_SANITIZE_NUMBER_INT);
@@ -163,7 +163,7 @@ 
             // Check if user already exists
             $data = DB::query(
                 'SELECT id, fonction_id, groupes_interdits, groupes_visibles
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE login = %s',
                 $login
             );
@@ -379,14 +379,14 @@ 
 
             // decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-                    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+                    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // Prepare variables
             $post_id = filter_var($dataReceived['user_id'], FILTER_SANITIZE_NUMBER_INT);
 
             // Get info about user to delete
             $data_user = DB::queryfirstrow(
-                'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
+                'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -405,7 +405,7 @@ 
                 );
                 // delete personal folder and subfolders
                 $data = DB::queryfirstrow(
-                    'SELECT id FROM ' . prefixTable('nested_tree') . '
+                    'SELECT id FROM '.prefixTable('nested_tree').'
                     WHERE title = %s AND personal_folder = %i',
                     $post_id,
                     '1'
@@ -418,7 +418,7 @@ 
                         DB::delete(prefixTable('nested_tree'), 'id = %i AND personal_folder = %i', $folder->id, '1');
                         // delete items & logs
                         $items = DB::query(
-                            'SELECT id FROM ' . prefixTable('items') . '
+                            'SELECT id FROM '.prefixTable('items').'
                             WHERE id_tree=%i AND perso = %i',
                             $folder->id,
                             '1'
@@ -470,7 +470,7 @@ 
             // Check KEY
             if (filter_input(INPUT_POST, 'key', FILTER_SANITIZE_STRING) !== filter_var($_SESSION['key'], FILTER_SANITIZE_STRING)) {
                 echo prepareExchangedData(
-                    $SETTINGS['cpassman_dir'],array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode');
+                    $SETTINGS['cpassman_dir'], array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode');
                 break;
             }
 
@@ -478,7 +478,7 @@ 
 
             // Get info about user to delete
             $data_user = DB::queryfirstrow(
-                'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
+                'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -498,10 +498,10 @@ 
                     $post_id
                 );
                 echo prepareExchangedData(
-                    $SETTINGS['cpassman_dir'],array('error' => ''), 'encode');
+                    $SETTINGS['cpassman_dir'], array('error' => ''), 'encode');
             } else {
                 echo prepareExchangedData(
-                    $SETTINGS['cpassman_dir'],array('error' => 'not_allowed'), 'encode');
+                    $SETTINGS['cpassman_dir'], array('error' => 'not_allowed'), 'encode');
             }
             break;
             /*
@@ -514,7 +514,7 @@ 
                 || $_SESSION['is_admin'] !== '1'
             ) {
                 echo prepareExchangedData(
-                    $SETTINGS['cpassman_dir'],array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode');
+                    $SETTINGS['cpassman_dir'], array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode');
                 exit();
             }
 
@@ -523,7 +523,7 @@ 
 
             // Get info about user to delete
             $data_user = DB::queryfirstrow(
-                'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
+                'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -546,10 +546,10 @@ 
                 );
 
                 echo prepareExchangedData(
-                    $SETTINGS['cpassman_dir'],array('error' => ''), 'encode');
+                    $SETTINGS['cpassman_dir'], array('error' => ''), 'encode');
             } else {
                 echo prepareExchangedData(
-                    $SETTINGS['cpassman_dir'],array('error' => 'not_allowed'), 'encode');
+                    $SETTINGS['cpassman_dir'], array('error' => 'not_allowed'), 'encode');
             }
             break;
             /*
@@ -559,7 +559,7 @@ 
             // Check KEY
             if (filter_input(INPUT_POST, 'key', FILTER_SANITIZE_STRING) !== filter_var($_SESSION['key'], FILTER_SANITIZE_STRING)) {
                 echo prepareExchangedData(
-                    $SETTINGS['cpassman_dir'],array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode');
+                    $SETTINGS['cpassman_dir'], array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode');
                 break;
             }
 
@@ -569,7 +569,7 @@ 
             // Get info about user to delete
             $data_user = DB::queryfirstrow(
                 'SELECT admin, isAdministratedByRole, can_manage_all_users, gestionnaire
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -594,10 +594,10 @@ 
                     $post_id
                 );
                 echo prepareExchangedData(
-                    $SETTINGS['cpassman_dir'],array('error' => ''), 'encode');
+                    $SETTINGS['cpassman_dir'], array('error' => ''), 'encode');
             } else {
                 echo prepareExchangedData(
-                    $SETTINGS['cpassman_dir'],array('error' => 'not_allowed'), 'encode');
+                    $SETTINGS['cpassman_dir'], array('error' => 'not_allowed'), 'encode');
             }
             break;
             /*
@@ -607,7 +607,7 @@ 
             // Check KEY
             if (filter_input(INPUT_POST, 'key', FILTER_SANITIZE_STRING) !== filter_var($_SESSION['key'], FILTER_SANITIZE_STRING)) {
                 echo prepareExchangedData(
-                    $SETTINGS['cpassman_dir'],array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode');
+                    $SETTINGS['cpassman_dir'], array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode');
                 break;
             }
 
@@ -616,7 +616,7 @@ 
 
             // Get info about user to delete
             $data_user = DB::queryfirstrow(
-                'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
+                'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -638,10 +638,10 @@ 
                     $post_id
                 );
                 echo prepareExchangedData(
-                    $SETTINGS['cpassman_dir'],array('error' => ''), 'encode');
+                    $SETTINGS['cpassman_dir'], array('error' => ''), 'encode');
             } else {
                 echo prepareExchangedData(
-                    $SETTINGS['cpassman_dir'],array('error' => 'not_allowed'), 'encode');
+                    $SETTINGS['cpassman_dir'], array('error' => 'not_allowed'), 'encode');
             }
             break;
             /*
@@ -652,7 +652,7 @@ 
             // Check KEY
             if (filter_input(INPUT_POST, 'key', FILTER_SANITIZE_STRING) !== filter_var($_SESSION['key'], FILTER_SANITIZE_STRING)) {
                 echo prepareExchangedData(
-                    $SETTINGS['cpassman_dir'],array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode');
+                    $SETTINGS['cpassman_dir'], array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode');
                 break;
             }
 
@@ -662,7 +662,7 @@ 
             // Get info about user to delete
             $data_user = DB::queryfirstrow(
                 'SELECT admin, isAdministratedByRole, gestionnaire
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -685,10 +685,10 @@ 
                     $post_id
                 );
                 echo prepareExchangedData(
-                    $SETTINGS['cpassman_dir'],array('error' => ''), 'encode');
+                    $SETTINGS['cpassman_dir'], array('error' => ''), 'encode');
             } else {
                 echo prepareExchangedData(
-                    $SETTINGS['cpassman_dir'],array('error' => 'not_allowed'), 'encode');
+                    $SETTINGS['cpassman_dir'], array('error' => 'not_allowed'), 'encode');
             }
             break;
             /*
@@ -698,7 +698,7 @@ 
             // Check KEY
             if (filter_input(INPUT_POST, 'key', FILTER_SANITIZE_STRING) !== filter_var($_SESSION['key'], FILTER_SANITIZE_STRING)) {
                 echo prepareExchangedData(
-                    $SETTINGS['cpassman_dir'],array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode');
+                    $SETTINGS['cpassman_dir'], array('error' => 'not_allowed', 'error_text' => langHdl('error_not_allowed_to')), 'encode');
                 break;
             }
 
@@ -708,7 +708,7 @@ 
             // Get info about user to delete
             $data_user = DB::queryfirstrow(
                 'SELECT admin, isAdministratedByRole, gestionnaire
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -728,10 +728,10 @@ 
                     $post_id
                 );
                 echo prepareExchangedData(
-                    $SETTINGS['cpassman_dir'],array('error' => ''), 'encode');
+                    $SETTINGS['cpassman_dir'], array('error' => ''), 'encode');
             } else {
                 echo prepareExchangedData(
-                    $SETTINGS['cpassman_dir'],array('error' => 'not_allowed'), 'encode');
+                    $SETTINGS['cpassman_dir'], array('error' => 'not_allowed'), 'encode');
             }
             break;
 
@@ -750,7 +750,7 @@ 
             // Get info about user to delete
             $data_user = DB::queryfirstrow(
                 'SELECT admin, isAdministratedByRole, gestionnaire
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -789,7 +789,7 @@ 
             $return = array();
             // Check if folder exists
             $data = DB::query(
-                'SELECT * FROM ' . prefixTable('nested_tree') . '
+                'SELECT * FROM '.prefixTable('nested_tree').'
                 WHERE title = %s AND parent_id = %i',
                 filter_input(INPUT_POST, 'domain', FILTER_SANITIZE_STRING),
                 '0'
@@ -802,7 +802,7 @@ 
             }
             // Check if role exists
             $data = DB::query(
-                'SELECT * FROM ' . prefixTable('roles_title') . '
+                'SELECT * FROM '.prefixTable('roles_title').'
                 WHERE title = %s',
                 filter_input(INPUT_POST, 'domain', FILTER_SANITIZE_STRING)
             );
@@ -822,7 +822,7 @@ 
         case 'user_log_items':
             $nb_pages = 1;
             $logs = $sql_filter = '';
-            $pages = '<table style=\'border-top:1px solid #969696;\'><tr><td>' . langHdl('pages') . '&nbsp;:&nbsp;</td>';
+            $pages = '<table style=\'border-top:1px solid #969696;\'><tr><td>'.langHdl('pages').'&nbsp;:&nbsp;</td>';
 
             // Prepare POST variables
             $post_nb_items_by_page = filter_input(INPUT_POST, 'nb_items_by_page', FILTER_SANITIZE_NUMBER_INT);
@@ -834,14 +834,14 @@ 
                     && !empty(filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_STRING))
                     && filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_STRING) !== 'all'
                 ) {
-                    $sql_filter = " AND l.action = '" . filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_STRING) . "'";
+                    $sql_filter = " AND l.action = '".filter_input(INPUT_POST, 'filter', FILTER_SANITIZE_STRING)."'";
                 }
                 // get number of pages
                 DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('log_items') . ' as l
-                    INNER JOIN ' . prefixTable('items') . ' as i ON (l.id_item=i.id)
-                    INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id)
+                    FROM ' . prefixTable('log_items').' as l
+                    INNER JOIN ' . prefixTable('items').' as i ON (l.id_item=i.id)
+                    INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id)
                     WHERE l.id_user = %i ' . $sql_filter,
                     filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT)
                 );
@@ -859,19 +859,19 @@ 
                 // launch query
                 $rows = DB::query(
                     'SELECT l.date as date, u.login as login, i.label as label, l.action as action
-                    FROM ' . prefixTable('log_items') . ' as l
-                    INNER JOIN ' . prefixTable('items') . ' as i ON (l.id_item=i.id)
-                    INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id)
-                    WHERE l.id_user = %i ' . $sql_filter . '
+                    FROM ' . prefixTable('log_items').' as l
+                    INNER JOIN ' . prefixTable('items').' as i ON (l.id_item=i.id)
+                    INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id)
+                    WHERE l.id_user = %i ' . $sql_filter.'
                     ORDER BY date DESC
-                    LIMIT ' . intval($start) . ',' . intval($post_nb_items_by_page),
+                    LIMIT ' . intval($start).','.intval($post_nb_items_by_page),
                     filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT)
                 );
             } else {
                 // get number of pages
                 DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('log_system') . '
+                    FROM ' . prefixTable('log_system').'
                     WHERE type = %s AND field_1=%i',
                     'user_mngt',
                     filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT)
@@ -890,7 +890,7 @@ 
                 // launch query
                 $rows = DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('log_system') . '
+                    FROM ' . prefixTable('log_system').'
                     WHERE type = %s AND field_1 = %i
                     ORDER BY date DESC
                     LIMIT %i, %i',
@@ -904,7 +904,7 @@ 
             if (isset($counter) && $counter != 0) {
                 $nb_pages = ceil($counter / intval($post_nb_items_by_page));
                 for ($i = 1; $i <= $nb_pages; ++$i) {
-                    $pages .= '<td onclick=\'displayLogs(' . $i . ',\"' . $post_scope . '\")\'><span style=\'cursor:pointer;' . (filter_input(INPUT_POST, 'page', FILTER_SANITIZE_NUMBER_INT) === $i ? 'font-weight:bold;font-size:18px;\'>' . $i : '\'>' . $i) . '</span></td>';
+                    $pages .= '<td onclick=\'displayLogs('.$i.',\"'.$post_scope.'\")\'><span style=\'cursor:pointer;'.(filter_input(INPUT_POST, 'page', FILTER_SANITIZE_NUMBER_INT) === $i ? 'font-weight:bold;font-size:18px;\'>'.$i : '\'>'.$i).'</span></td>';
                 }
             }
             $pages .= '</tr></table>';
@@ -913,7 +913,7 @@ 
                     if ($post_scope === 'user_mngt') {
                         $user = DB::queryfirstrow(
                             'SELECT login
-                            from ' . prefixTable('users') . '
+                            from ' . prefixTable('users').'
                             WHERE id=%i',
                             $record['qui']
                         );
@@ -923,7 +923,7 @@ 
                         if ($tmp[0] == 'at_user_initial_pwd_changed') {
                             $label = langHdl('log_user_initial_pwd_changed');
                         } elseif ($tmp[0] == 'at_user_email_changed') {
-                            $label = langHdl('log_user_email_changed') . $tmp[1];
+                            $label = langHdl('log_user_email_changed').$tmp[1];
                         } elseif ($tmp[0] == 'at_user_added') {
                             $label = langHdl('log_user_created');
                         } elseif ($tmp[0] == 'at_user_locked') {
@@ -934,14 +934,14 @@ 
                             $label = langHdl('log_user_pwd_changed');
                         }
                         // prepare log
-                        $logs .= '<tr><td>' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . '</td><td align=\"center\">' . $label . '</td><td align=\"center\">' . $user['login'] . '</td><td align=\"center\"></td></tr>';
+                        $logs .= '<tr><td>'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).'</td><td align=\"center\">'.$label.'</td><td align=\"center\">'.$user['login'].'</td><td align=\"center\"></td></tr>';
                     } else {
-                        $logs .= '<tr><td>' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . '</td><td align=\"center\">' . str_replace('"', '\"', $record['label']) . '</td><td align=\"center\">' . $record['login'] . '</td><td align=\"center\">' . langHdl($record['action']) . '</td></tr>';
+                        $logs .= '<tr><td>'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).'</td><td align=\"center\">'.str_replace('"', '\"', $record['label']).'</td><td align=\"center\">'.$record['login'].'</td><td align=\"center\">'.langHdl($record['action']).'</td></tr>';
                     }
                 }
             }
 
-            echo '[ { "table_logs": "' . ($logs) . '", "pages": "' . ($pages) . '", "error" : "no" } ]';
+            echo '[ { "table_logs": "'.($logs).'", "pages": "'.($pages).'", "error" : "no" } ]';
             break;
 
             /*
@@ -967,7 +967,7 @@ 
             } else {
                 // Get folder id for Admin
                 $admin_folder = DB::queryFirstRow(
-                    'SELECT id FROM ' . prefixTable('nested_tree') . '
+                    'SELECT id FROM '.prefixTable('nested_tree').'
                     WHERE title = %i AND personal_folder = %i',
                     intval($_SESSION['user_id']),
                     '1'
@@ -978,15 +978,15 @@ 
                     // Get each Items in PF
                     $rows = DB::query(
                         'SELECT i.pw, i.label, l.id_user
-                        FROM ' . prefixTable('items') . ' as i
-                        LEFT JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item=i.id)
+                        FROM ' . prefixTable('items').' as i
+                        LEFT JOIN ' . prefixTable('log_items').' as l ON (l.id_item=i.id)
                         WHERE l.action = %s AND i.perso=%i AND i.id_tree=%i',
                         'at_creation',
                         '1',
                         intval($folder->id)
                     );
                     foreach ($rows as $record) {
-                        echo $record['label'] . ' - ';
+                        echo $record['label'].' - ';
                         // Change user
                         DB::update(
                             prefixTable('log_items'),
@@ -1021,7 +1021,7 @@ 
             // Get info about user to delete
             $data_user = DB::queryfirstrow(
                 'SELECT admin, isAdministratedByRole, gestionnaire
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_user_id
             );
@@ -1058,7 +1058,7 @@ 
 
             // Do
             $rows = DB::query(
-                'SELECT id FROM ' . prefixTable('users') . '
+                'SELECT id FROM '.prefixTable('users').'
                 WHERE timestamp != %s AND admin != %i',
                 '',
                 '1'
@@ -1067,7 +1067,7 @@ 
                 // Get info about user to delete
                 $data_user = DB::queryfirstrow(
                     'SELECT admin, isAdministratedByRole, gestionnaire
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE id = %i',
                     $record['id']
                 );
@@ -1120,7 +1120,7 @@ 
 
             // decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-                    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+                    $SETTINGS['cpassman_dir'], $post_data, 'decode');
             
             // Prepare variables
             $post_id = filter_var($dataReceived['user_id'], FILTER_SANITIZE_NUMBER_INT);
@@ -1128,7 +1128,7 @@ 
             // Get info about user
             $rowUser = DB::queryfirstrow(
                 'SELECT *
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -1146,7 +1146,7 @@ 
                 $arrFldAllowed = array();
 
                 //Build tree
-                $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+                $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries');
                 $tree->register();
                 $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
 
@@ -1157,7 +1157,7 @@ 
                 // array of roles for actual user
                 $my_functions = explode(';', $_SESSION['fonction_id']);
 
-                $rows = DB::query('SELECT id,title,creator_id FROM ' . prefixTable('roles_title'));
+                $rows = DB::query('SELECT id,title,creator_id FROM '.prefixTable('roles_title'));
                 foreach ($rows as $record) {
                     if (
                         (int) $_SESSION['is_admin'] === 1
@@ -1193,7 +1193,7 @@ 
                 $rolesList = array();
                 $managedBy = array();
                 $selected = '';
-                $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title') . ' ORDER BY title ASC');
+                $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title').' ORDER BY title ASC');
                 foreach ($rows as $reccord) {
                     $rolesList[$reccord['id']] = array('id' => $reccord['id'], 'title' => $reccord['title']);
                 }
@@ -1224,7 +1224,7 @@ 
                         array_push(
                             $managedBy,
                             array(
-                                'title' => langHdl('managers_of') . ' ' . $fonction['title'],
+                                'title' => langHdl('managers_of').' '.$fonction['title'],
                                 'id' => $fonction['id'],
                                 'selected' => $selected,
                             )
@@ -1306,9 +1306,9 @@ 
 
                 // get USER STATUS
                 if ($rowUser['disabled'] == 1) {
-                    $arrData['info'] = langHdl('user_info_locked') . '<br><input type="checkbox" value="unlock" name="1" class="chk">&nbsp;<label for="1">' . langHdl('user_info_unlock_question') . '</label><br><input type="checkbox"  value="delete" id="account_delete" class="chk mr-2" name="2" onclick="confirmDeletion()">label for="2">' . langHdl('user_info_delete_question') . '</label>';
+                    $arrData['info'] = langHdl('user_info_locked').'<br><input type="checkbox" value="unlock" name="1" class="chk">&nbsp;<label for="1">'.langHdl('user_info_unlock_question').'</label><br><input type="checkbox"  value="delete" id="account_delete" class="chk mr-2" name="2" onclick="confirmDeletion()">label for="2">'.langHdl('user_info_delete_question').'</label>';
                 } else {
-                    $arrData['info'] = langHdl('user_info_active') . '<br><input type="checkbox" value="lock" class="chk">&nbsp;' . langHdl('user_info_lock_question');
+                    $arrData['info'] = langHdl('user_info_active').'<br><input type="checkbox" value="lock" class="chk">&nbsp;'.langHdl('user_info_lock_question');
                 }
 
                 $arrData['error'] = false;
@@ -1380,7 +1380,7 @@ 
 
             // decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-                    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+                    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // Prepare variables
             $post_id = filter_var($dataReceived['user_id'], FILTER_SANITIZE_STRING);
@@ -1405,7 +1405,7 @@ 
                 // count number of admins
                 $users = DB::query(
                     'SELECT id
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE admin = 1 AND email != "" AND pw != ""'
                 );
                 if (DB::count() === 1) {
@@ -1494,7 +1494,7 @@ 
 
             // Get info about user to delete
             $data_user = DB::queryfirstrow(
-                'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
+                'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -1515,7 +1515,7 @@ 
                     );
                     // delete personal folder and subfolders
                     $data = DB::queryfirstrow(
-                        'SELECT id FROM ' . prefixTable('nested_tree') . '
+                        'SELECT id FROM '.prefixTable('nested_tree').'
                         WHERE title = %s AND personal_folder = %i',
                         $post_id,
                         '1'
@@ -1528,7 +1528,7 @@ 
                             DB::delete(prefixTable('nested_tree'), 'id = %i AND personal_folder = %i', $folder->id, '1');
                             // delete items & logs
                             $items = DB::query(
-                                'SELECT id FROM ' . prefixTable('items') . '
+                                'SELECT id FROM '.prefixTable('items').'
                                 WHERE id_tree=%i AND perso = %i',
                                 $folder->id,
                                 '1'
@@ -1549,7 +1549,7 @@ 
                 } else {
                     // Get old data about user
                     $oldData = DB::queryfirstrow(
-                        'SELECT * FROM ' . prefixTable('users') . '
+                        'SELECT * FROM '.prefixTable('users').'
                         WHERE id = %i',
                         $post_id
                     );
@@ -1579,7 +1579,7 @@ 
 
                     // update LOG
                     if ($oldData['email'] !== $post_email) {
-                        logEvents($SETTINGS, 'user_mngt', 'at_user_email_changed:' . $oldData['email'], (string) $_SESSION['user_id'], $_SESSION['login'], $post_id);
+                        logEvents($SETTINGS, 'user_mngt', 'at_user_email_changed:'.$oldData['email'], (string) $_SESSION['user_id'], $_SESSION['login'], $post_id);
                     }
                 }
                 echo prepareExchangedData(
@@ -1632,14 +1632,14 @@ 
 
             // decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-                    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+                    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // Prepare variables
             $post_id = filter_var($dataReceived['user_id'], FILTER_SANITIZE_NUMBER_INT);
 
             // Get info about user to delete
             $data_user = DB::queryfirstrow(
-                'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
+                'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -1691,7 +1691,7 @@ 
             }
 
             DB::queryfirstrow(
-                'SELECT * FROM ' . prefixTable('users') . '
+                'SELECT * FROM '.prefixTable('users').'
                 WHERE login = %s',
                 filter_input(INPUT_POST, 'login', FILTER_SANITIZE_STRING)
             );
@@ -1736,7 +1736,7 @@ 
 
             // decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-                    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+                    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // Prepare variables
             $post_id = filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT);
@@ -1744,14 +1744,14 @@ 
             $arrData = array();
 
             //Build tree
-            $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+            $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries');
             $tree->register();
             $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
 
             // get User info
             $rowUser = DB::queryFirstRow(
                 'SELECT login, name, lastname, email, disabled, fonction_id, groupes_interdits, groupes_visibles, isAdministratedByRole, avatar_thumb
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -1769,7 +1769,7 @@ 
                 // refine folders based upon roles
                 $rows = DB::query(
                     'SELECT folder_id, type
-                    FROM ' . prefixTable('roles_values') . '
+                    FROM ' . prefixTable('roles_values').'
                     WHERE role_id IN %ls
                     ORDER BY folder_id ASC',
                     $arrData['functions']
@@ -1792,7 +1792,7 @@ 
                 }
 
                 // add allowed folders
-                foreach($arrData['allowed_folders'] as $Fld) {
+                foreach ($arrData['allowed_folders'] as $Fld) {
                     array_push($arrFolders, array('id' => $Fld, 'type' => 'W', 'special' => true));
                 }
 
@@ -1803,7 +1803,7 @@ 
                             // get folder name
                             $row = DB::queryFirstRow(
                                 'SELECT title, nlevel, id
-                                FROM ' . prefixTable('nested_tree') . '
+                                FROM ' . prefixTable('nested_tree').'
                                 WHERE id = %i',
                                 $fld['id']
                             );
@@ -1816,36 +1816,36 @@ 
 
                             // manage right icon
                             if ($fld['type'] == 'W') {
-                                $label = '<i class="fas fa-indent infotip text-success mr-2" title="' . langHdl('write') . '"></i>' .
-                                    '<i class="fas fa-edit infotip text-success mr-2" title="' . langHdl('edit') . '"></i>' .
-                                    '<i class="fas fa-eraser infotip text-success" title="' . langHdl('delete') . '"></i>';
+                                $label = '<i class="fas fa-indent infotip text-success mr-2" title="'.langHdl('write').'"></i>'.
+                                    '<i class="fas fa-edit infotip text-success mr-2" title="'.langHdl('edit').'"></i>'.
+                                    '<i class="fas fa-eraser infotip text-success" title="'.langHdl('delete').'"></i>';
                             } elseif ($fld['type'] == 'ND') {
-                                $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . langHdl('write') . '"></i>' .
-                                    '<i class="fas fa-edit infotip text-success mr-2" title="' . langHdl('edit') . '"></i>' .
-                                    '<i class="fas fa-eraser infotip text-danger" title="' . langHdl('no_delete') . '"></i>';
+                                $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.langHdl('write').'"></i>'.
+                                    '<i class="fas fa-edit infotip text-success mr-2" title="'.langHdl('edit').'"></i>'.
+                                    '<i class="fas fa-eraser infotip text-danger" title="'.langHdl('no_delete').'"></i>';
                             } elseif ($fld['type'] == 'NE') {
-                                $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . langHdl('write') . '"></i>' .
-                                    '<i class="fas fa-edit infotip text-danger mr-2" title="' . langHdl('no_edit') . '"></i>' .
-                                    '<i class="fas fa-eraser infotip text-success" title="' . langHdl('delete') . '"></i>';
+                                $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.langHdl('write').'"></i>'.
+                                    '<i class="fas fa-edit infotip text-danger mr-2" title="'.langHdl('no_edit').'"></i>'.
+                                    '<i class="fas fa-eraser infotip text-success" title="'.langHdl('delete').'"></i>';
                             } elseif ($fld['type'] == 'NDNE') {
-                                $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . langHdl('write') . '"></i>' .
-                                    '<i class="fas fa-edit infotip text-danger mr-2" title="' . langHdl('no_edit') . '"></i>' .
-                                    '<i class="fas fa-eraser infotip text-danger" title="' . langHdl('no_delete') . '"></i>';
+                                $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.langHdl('write').'"></i>'.
+                                    '<i class="fas fa-edit infotip text-danger mr-2" title="'.langHdl('no_edit').'"></i>'.
+                                    '<i class="fas fa-eraser infotip text-danger" title="'.langHdl('no_delete').'"></i>';
                             } else {
-                                $label = '<i class="fas fa-eye infotip text-info mr-2" title="' . langHdl('read') . '"></i>';
+                                $label = '<i class="fas fa-eye infotip text-info mr-2" title="'.langHdl('read').'"></i>';
                             }
 
-                            $html .= '<tr><td>' . $ident . $row['title'] .
-                                ' <small class="text-info">[' . $row['id'] . ']</small>'.
-                                ($fld['special'] === true ? '<i class="fas fa-user-tag infotip text-primary ml-5" title="' . langHdl('user_specific_right') . '"></i>' : '').
-                                '</td><td>' . $label . '</td></tr>';
+                            $html .= '<tr><td>'.$ident.$row['title'].
+                                ' <small class="text-info">['.$row['id'].']</small>'.
+                                ($fld['special'] === true ? '<i class="fas fa-user-tag infotip text-primary ml-5" title="'.langHdl('user_specific_right').'"></i>' : '').
+                                '</td><td>'.$label.'</td></tr>';
                             break;
                         }
                     }
                 }
 
-                $html_full = '<table id="table-folders" class="table table-bordered table-striped dt-responsive nowrap" style="width:100%"><tbody>' .
-                    $html . '</tbody></table>';
+                $html_full = '<table id="table-folders" class="table table-bordered table-striped dt-responsive nowrap" style="width:100%"><tbody>'.
+                    $html.'</tbody></table>';
             } else {
                 $html_full = '';
             }
@@ -1894,7 +1894,7 @@ 
             if ((int) $_SESSION['is_admin'] === 0 && (int) $_SESSION['user_can_manage_all_users'] === 0) {
                 $rows = DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE admin = %i AND isAdministratedByRole IN %ls',
                     '0',
                     array_filter($_SESSION['user_roles'])
@@ -1902,7 +1902,7 @@ 
             } else {
                 $rows = DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE admin = %i',
                     '0'
                 );
@@ -1914,7 +1914,7 @@ 
                 $groupIds = [];
                 foreach (explode(';', $record['fonction_id']) as $group) {
                     $tmp = DB::queryfirstrow(
-                        'SELECT id, title FROM ' . prefixTable('roles_title') . '
+                        'SELECT id, title FROM '.prefixTable('roles_title').'
                         WHERE id = %i',
                         $group
                     );
@@ -1926,7 +1926,7 @@ 
 
                 // Get managed_by
                 $managedBy = DB::queryfirstrow(
-                    'SELECT id, title FROM ' . prefixTable('roles_title') . '
+                    'SELECT id, title FROM '.prefixTable('roles_title').'
                     WHERE id = %i',
                     $record['isAdministratedByRole']
                 );
@@ -1936,7 +1936,7 @@ 
                 $foldersAllowedIds = [];
                 foreach (explode(';', $record['groupes_visibles']) as $role) {
                     $tmp = DB::queryfirstrow(
-                        'SELECT id, title FROM ' . prefixTable('nested_tree') . '
+                        'SELECT id, title FROM '.prefixTable('nested_tree').'
                         WHERE id = %i',
                         $role
                     );
@@ -1949,7 +1949,7 @@ 
                 $foldersForbiddenIds = [];
                 foreach (explode(';', $record['groupes_interdits']) as $role) {
                     $tmp = DB::queryfirstrow(
-                        'SELECT id, title FROM ' . prefixTable('nested_tree') . '
+                        'SELECT id, title FROM '.prefixTable('nested_tree').'
                         WHERE id = %i',
                         $role
                     );
@@ -1967,7 +1967,7 @@ 
                         'login' => $record['login'],
                         'groups' => implode(', ', $groups),
                         'groupIds' => $groupIds,
-                        'managedBy' => $managedBy=== null ? langHdl('administrator') : $managedBy['title'],
+                        'managedBy' => $managedBy === null ? langHdl('administrator') : $managedBy['title'],
                         'managedById' => $managedBy === null ? 0 : $managedBy['id'],
                         'foldersAllowed' => implode(', ', $foldersAllowed),
                         'foldersAllowedIds' => $foldersAllowedIds,
@@ -2023,7 +2023,7 @@ 
 
             // decrypt and retreive data in JSON format
             $dataReceived = prepareExchangedData(
-                    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+                    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             $post_source_id = filter_var(htmlspecialchars_decode($dataReceived['source_id']), FILTER_SANITIZE_NUMBER_INT);
             $post_destination_ids = filter_var_array($dataReceived['destination_ids'], FILTER_SANITIZE_NUMBER_INT);
@@ -2049,7 +2049,7 @@ 
 
             // Get info about user
             $data_user = DB::queryfirstrow(
-                'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
+                'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
                 WHERE id = %i',
                 $post_source_id
             );
@@ -2205,7 +2205,7 @@ 
 
             // decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-                    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+                    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // prepare variables
             $post_user_id = filter_var($dataReceived['user_id'], FILTER_SANITIZE_NUMBER_INT);
@@ -2217,14 +2217,14 @@ 
             if (empty($post_context) === false && $post_context === 'add_one_role_to_user') {
                 $data_user = DB::queryfirstrow(
                     'SELECT fonction_id
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE id = %i',
                     $post_user_id
                 );
 
                 if ($data_user) {
                     // Ensure array is unique
-                    $post_new_value = str_replace(',', ';', $data_user['fonction_id']) . ';' . $post_new_value;
+                    $post_new_value = str_replace(',', ';', $data_user['fonction_id']).';'.$post_new_value;
                     $post_new_value = implode(';', array_unique(explode(';', $post_new_value)));
                 } else {
                     // User not found
@@ -2282,7 +2282,7 @@ 
             if (filter_input(INPUT_POST, 'step', FILTER_SANITIZE_STRING) === 'refresh') {
                 $record = DB::queryFirstRow(
                     'SELECT user_ip_lastdate
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE id = %i',
                     $_SESSION['user_id']
                 );
@@ -2378,38 +2378,38 @@ 
             ];
 
             // Load expected libraries
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Arr.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Symfony/contracts/Translation/TranslatorInterface.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonTimeZone.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Units.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Week.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Timestamp.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Test.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/ObjectInitialisation.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Serialization.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/IntervalRounding.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Rounding.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Localization.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Options.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Cast.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mutability.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Modifiers.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mixin.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Macro.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Difference.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Creator.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Converter.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Comparison.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Boundaries.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Date.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonInterface.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Carbon.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/DetectsErrors.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Connection.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapInterface.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/HandlesConnection.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Ldap.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Arr.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Symfony/contracts/Translation/TranslatorInterface.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonTimeZone.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Units.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Week.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Timestamp.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Test.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/ObjectInitialisation.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Serialization.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/IntervalRounding.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Rounding.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Localization.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Options.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Cast.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mutability.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Modifiers.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mixin.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Macro.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Difference.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Creator.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Converter.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Comparison.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Boundaries.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Date.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonInterface.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Carbon.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/DetectsErrors.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Connection.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapInterface.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/HandlesConnection.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Ldap.php';
 
             $ad = new SplClassLoader('LdapRecord', '../includes/libraries');
             $ad->register();
@@ -2426,7 +2426,7 @@ 
                     $SETTINGS['cpassman_dir'],
                     array(
                         'error' => true,
-                        'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage(). "<br>".$error->getDiagnosticMessage(),
+                        'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage()."<br>".$error->getDiagnosticMessage(),
                     ),
                     'encode'
                 );
@@ -2457,12 +2457,12 @@ 
                 ['objectclass', '=', 'posixaccount'],
             ], null, null, 'or')->get();
             
-            foreach($users as $i => $adUser) {
+            foreach ($users as $i => $adUser) {
                 if (isset($adUser[$SETTINGS['ldap_user_attribute']]) === false) continue;
                 
                 // Build the list of all groups in AD
                 if (isset($adUser['memberof']) === true) {
-                    foreach($adUser['memberof'] as $j => $adUserGroup) {
+                    foreach ($adUser['memberof'] as $j => $adUserGroup) {
                         if (empty($adUserGroup) === false && $j !== "count") {
                             $adGroup = substr($adUserGroup, 3, strpos($adUserGroup, ',') - 3);
                             if (in_array($adGroup, $adRoles) === false && empty($adGroup) === false) {
@@ -2478,7 +2478,7 @@ 
                     // Get his ID
                     DB::queryfirstrow(
                         'SELECT id, fonction_id, auth_type
-                        FROM ' . prefixTable('users') . '
+                        FROM ' . prefixTable('users').'
                         WHERE login = %s',
                         $userLogin
                     );
@@ -2513,7 +2513,7 @@ 
             }
 
             // Get all groups in Teampass
-            $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title'));
+            $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title'));
             foreach ($rows as $record) {
                 array_push(
                     $teampassRoles,
@@ -2556,7 +2556,7 @@ 
 
             // decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-                    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+                    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // Prepare variables
             $post_login = filter_var($dataReceived['login'], FILTER_SANITIZE_STRING);
@@ -2583,7 +2583,7 @@ 
             // Check if user already exists
             $data = DB::query(
                 'SELECT id, fonction_id, groupes_interdits, groupes_visibles
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE login = %s',
                 $post_login
             );
@@ -2690,7 +2690,7 @@ 
                 );
 
                 // Rebuild tree
-                $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+                $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries');
                 $tree->register();
                 $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
                 $tree->rebuild();
@@ -2767,7 +2767,7 @@ 
             // Check if user already exists
             DB::query(
                 'SELECT id
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -2824,7 +2824,7 @@ 
 
             // decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-                    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+                    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // Prepare variables
             $post_userid = filter_var($dataReceived['user_id'], FILTER_SANITIZE_NUMBER_INT);
@@ -2848,7 +2848,7 @@ 
             // Check if user already exists
             $userInfo = DB::queryfirstrow(
                 'SELECT id, private_key, public_key
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_userid
             );
@@ -2897,7 +2897,7 @@ 
             if (count($_SESSION['personal_folders']) > 0) {
                 DB::query(
                     'SELECT id
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE id_tree IN %ls',
                     $_SESSION['personal_folders']
                 );
@@ -2957,7 +2957,7 @@ 
 
             // decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-                    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+                    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // Prepare variables
             $post_id = filter_var($dataReceived['user_id'], FILTER_SANITIZE_NUMBER_INT);
@@ -2979,7 +2979,7 @@ 
             // Check if user already exists
             DB::query(
                 'SELECT id
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -3046,7 +3046,7 @@ 
 
             // decrypt and retrieve data in JSON format
             $dataReceived = prepareExchangedData(
-                    $SETTINGS['cpassman_dir'],$post_data, 'decode');
+                    $SETTINGS['cpassman_dir'], $post_data, 'decode');
 
             // Prepare variables
             $post_user_id = filter_var($dataReceived['user_id'], FILTER_SANITIZE_NUMBER_INT);
@@ -3077,7 +3077,7 @@ 
 
     // Get info about user
     $data_user = DB::queryfirstrow(
-        'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
+        'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
         WHERE id = %i',
         $value[1]
     );
@@ -3110,7 +3110,7 @@ 
             logEvents(
                 $SETTINGS,
                 'user_mngt',
-                'at_user_new_' . $value[0] . ':' . $value[1],
+                'at_user_new_'.$value[0].':'.$value[1],
                 (string) $_SESSION['user_id'],
                 $_SESSION['login'],
                 filter_input(INPUT_POST, 'id', FILTER_SANITIZE_STRING)
@@ -3142,7 +3142,7 @@ 
 
     // Get info about user
     $data_user = DB::queryfirstrow(
-        'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
+        'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
         WHERE id = %i',
         $value[1]
     );

sources/main.functions.php

Spacing +237 added lines, -237 removed lines

@@ -122,29 +122,29 @@ 
  */
 function cryption(string $message, string $ascii_key, string $type, array $SETTINGS): array
 {
-    $ascii_key = empty($ascii_key) === true ? file_get_contents(SECUREPATH . '/teampass-seckey.txt') : $ascii_key;
+    $ascii_key = empty($ascii_key) === true ? file_get_contents(SECUREPATH.'/teampass-seckey.txt') : $ascii_key;
     $err = false;
     // load PhpEncryption library
     if (isset($SETTINGS['cpassman_dir']) === false || empty($SETTINGS['cpassman_dir']) === true) {
         $path = '../includes/libraries/Encryption/Encryption/';
     } else {
-        $path = $SETTINGS['cpassman_dir'] . '/includes/libraries/Encryption/Encryption/';
-    }
-
-    include_once $path . 'Exception/CryptoException.php';
-    include_once $path . 'Exception/BadFormatException.php';
-    include_once $path . 'Exception/EnvironmentIsBrokenException.php';
-    include_once $path . 'Exception/IOException.php';
-    include_once $path . 'Exception/WrongKeyOrModifiedCiphertextException.php';
-    include_once $path . 'Crypto.php';
-    include_once $path . 'Encoding.php';
-    include_once $path . 'DerivedKeys.php';
-    include_once $path . 'Key.php';
-    include_once $path . 'KeyOrPassword.php';
-    include_once $path . 'File.php';
-    include_once $path . 'RuntimeTests.php';
-    include_once $path . 'KeyProtectedByPassword.php';
-    include_once $path . 'Core.php';
+        $path = $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/Encryption/';
+    }
+
+    include_once $path.'Exception/CryptoException.php';
+    include_once $path.'Exception/BadFormatException.php';
+    include_once $path.'Exception/EnvironmentIsBrokenException.php';
+    include_once $path.'Exception/IOException.php';
+    include_once $path.'Exception/WrongKeyOrModifiedCiphertextException.php';
+    include_once $path.'Crypto.php';
+    include_once $path.'Encoding.php';
+    include_once $path.'DerivedKeys.php';
+    include_once $path.'Key.php';
+    include_once $path.'KeyOrPassword.php';
+    include_once $path.'File.php';
+    include_once $path.'RuntimeTests.php';
+    include_once $path.'KeyProtectedByPassword.php';
+    include_once $path.'Core.php';
     
     // convert KEY
     $key = \Defuse\Crypto\Key::loadFromAsciiSafeString($ascii_key);
@@ -189,20 +189,20 @@ 
         $path = '../includes/libraries/Encryption/Encryption/';
     }
 
-    include_once $path . 'Exception/CryptoException.php';
-    include_once $path . 'Exception/BadFormatException.php';
-    include_once $path . 'Exception/EnvironmentIsBrokenException.php';
-    include_once $path . 'Exception/IOException.php';
-    include_once $path . 'Exception/WrongKeyOrModifiedCiphertextException.php';
-    include_once $path . 'Crypto.php';
-    include_once $path . 'Encoding.php';
-    include_once $path . 'DerivedKeys.php';
-    include_once $path . 'Key.php';
-    include_once $path . 'KeyOrPassword.php';
-    include_once $path . 'File.php';
-    include_once $path . 'RuntimeTests.php';
-    include_once $path . 'KeyProtectedByPassword.php';
-    include_once $path . 'Core.php';
+    include_once $path.'Exception/CryptoException.php';
+    include_once $path.'Exception/BadFormatException.php';
+    include_once $path.'Exception/EnvironmentIsBrokenException.php';
+    include_once $path.'Exception/IOException.php';
+    include_once $path.'Exception/WrongKeyOrModifiedCiphertextException.php';
+    include_once $path.'Crypto.php';
+    include_once $path.'Encoding.php';
+    include_once $path.'DerivedKeys.php';
+    include_once $path.'Key.php';
+    include_once $path.'KeyOrPassword.php';
+    include_once $path.'File.php';
+    include_once $path.'RuntimeTests.php';
+    include_once $path.'KeyProtectedByPassword.php';
+    include_once $path.'Core.php';
 
     $key = \Defuse\Crypto\Key::createNewRandomKey();
     $key = $key->saveToAsciiSafeString();
@@ -227,20 +227,20 @@ 
         $path = '../includes/libraries/Encryption/Encryption/';
     }
 
-    include_once $path . 'Exception/CryptoException.php';
-    include_once $path . 'Exception/BadFormatException.php';
-    include_once $path . 'Exception/EnvironmentIsBrokenException.php';
-    include_once $path . 'Exception/IOException.php';
-    include_once $path . 'Exception/WrongKeyOrModifiedCiphertextException.php';
-    include_once $path . 'Crypto.php';
-    include_once $path . 'Encoding.php';
-    include_once $path . 'DerivedKeys.php';
-    include_once $path . 'Key.php';
-    include_once $path . 'KeyOrPassword.php';
-    include_once $path . 'File.php';
-    include_once $path . 'RuntimeTests.php';
-    include_once $path . 'KeyProtectedByPassword.php';
-    include_once $path . 'Core.php';
+    include_once $path.'Exception/CryptoException.php';
+    include_once $path.'Exception/BadFormatException.php';
+    include_once $path.'Exception/EnvironmentIsBrokenException.php';
+    include_once $path.'Exception/IOException.php';
+    include_once $path.'Exception/WrongKeyOrModifiedCiphertextException.php';
+    include_once $path.'Crypto.php';
+    include_once $path.'Encoding.php';
+    include_once $path.'DerivedKeys.php';
+    include_once $path.'Key.php';
+    include_once $path.'KeyOrPassword.php';
+    include_once $path.'File.php';
+    include_once $path.'RuntimeTests.php';
+    include_once $path.'KeyProtectedByPassword.php';
+    include_once $path.'Core.php';
     
     $protected_key = \Defuse\Crypto\KeyProtectedByPassword::createRandomPasswordProtectedKey($psk);
     return $protected_key->saveToAsciiSafeString(); // save this in user table
@@ -265,20 +265,20 @@ 
         $path = '../includes/libraries/Encryption/Encryption/';
     }
 
-    include_once $path . 'Exception/CryptoException.php';
-    include_once $path . 'Exception/BadFormatException.php';
-    include_once $path . 'Exception/EnvironmentIsBrokenException.php';
-    include_once $path . 'Exception/IOException.php';
-    include_once $path . 'Exception/WrongKeyOrModifiedCiphertextException.php';
-    include_once $path . 'Crypto.php';
-    include_once $path . 'Encoding.php';
-    include_once $path . 'DerivedKeys.php';
-    include_once $path . 'Key.php';
-    include_once $path . 'KeyOrPassword.php';
-    include_once $path . 'File.php';
-    include_once $path . 'RuntimeTests.php';
-    include_once $path . 'KeyProtectedByPassword.php';
-    include_once $path . 'Core.php';
+    include_once $path.'Exception/CryptoException.php';
+    include_once $path.'Exception/BadFormatException.php';
+    include_once $path.'Exception/EnvironmentIsBrokenException.php';
+    include_once $path.'Exception/IOException.php';
+    include_once $path.'Exception/WrongKeyOrModifiedCiphertextException.php';
+    include_once $path.'Crypto.php';
+    include_once $path.'Encoding.php';
+    include_once $path.'DerivedKeys.php';
+    include_once $path.'Key.php';
+    include_once $path.'KeyOrPassword.php';
+    include_once $path.'File.php';
+    include_once $path.'RuntimeTests.php';
+    include_once $path.'KeyProtectedByPassword.php';
+    include_once $path.'Core.php';
 
     try {
         $protected_key = \Defuse\Crypto\KeyProtectedByPassword::loadFromAsciiSafeString($protected_key_encoded);
@@ -320,7 +320,7 @@ 
  */
 function trimElement($chaine, string $element): string
 {
-    if (! empty($chaine)) {
+    if (!empty($chaine)) {
         if (is_array($chaine) === true) {
             $chaine = implode(';', $chaine);
         }
@@ -368,8 +368,8 @@ 
  */
 function db_error_handler(array $params): void
 {
-    echo 'Error: ' . $params['error'] . "<br>\n";
-    echo 'Query: ' . $params['query'] . "<br>\n";
+    echo 'Error: '.$params['error']."<br>\n";
+    echo 'Query: '.$params['query']."<br>\n";
     throw new Exception('Error - Query', 1);
 }
 
@@ -391,12 +391,12 @@ 
     $SETTINGS
 ) {
     //load ClassLoader
-    include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
+    include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
     // Load superglobal
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
     //Connect to DB
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
     if (defined('DB_PASSWD_CLEAR') === false) {
         define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
     }
@@ -407,7 +407,7 @@ 
     DB::$port = DB_PORT;
     DB::$encoding = DB_ENCODING;
     //Build tree
-    $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+    $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries');
     $tree->register();
     $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
 
@@ -452,7 +452,7 @@ 
 function identAdmin($idFonctions, $SETTINGS, $tree)
 {
     // Load superglobal
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
     // Init
     $groupesVisibles = [];
@@ -471,7 +471,7 @@ 
     $globalsVisibleFolders = $superGlobal->get('groupes_visibles', 'SESSION');
     $globalsPersonalVisibleFolders = $superGlobal->get('personal_visible_groups', 'SESSION');
     // Get list of Folders
-    $rows = DB::query('SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', 0);
+    $rows = DB::query('SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', 0);
     foreach ($rows as $record) {
         array_push($groupesVisibles, $record['id']);
     }
@@ -490,7 +490,7 @@ 
     }
     // Get ID of personal folder
     $persfld = DB::queryfirstrow(
-        'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE title = %s',
+        'SELECT id FROM '.prefixTable('nested_tree').' WHERE title = %s',
         $globalsUserId
     );
     if (empty($persfld['id']) === false) {
@@ -511,20 +511,20 @@ 
     // get complete list of ROLES
     $tmp = explode(';', $idFonctions);
     $rows = DB::query(
-        'SELECT * FROM ' . prefixTable('roles_title') . '
+        'SELECT * FROM '.prefixTable('roles_title').'
         ORDER BY title ASC'
     );
     foreach ($rows as $record) {
-        if (! empty($record['id']) && ! in_array($record['id'], $tmp)) {
+        if (!empty($record['id']) && !in_array($record['id'], $tmp)) {
             array_push($tmp, $record['id']);
         }
     }
     $superGlobal->put('fonction_id', implode(';', $tmp), 'SESSION');
     $superGlobal->put('is_admin', 1, 'SESSION');
     // Check if admin has created Folders and Roles
-    DB::query('SELECT * FROM ' . prefixTable('nested_tree') . '');
+    DB::query('SELECT * FROM '.prefixTable('nested_tree').'');
     $superGlobal->put('nb_folders', DB::count(), 'SESSION');
-    DB::query('SELECT * FROM ' . prefixTable('roles_title'));
+    DB::query('SELECT * FROM '.prefixTable('roles_title'));
     $superGlobal->put('nb_roles', DB::count(), 'SESSION');
 
     return true;
@@ -570,7 +570,7 @@ 
     object $tree
 ) {
     // Load superglobal
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
     // Init
     $superGlobal->put('groupes_visibles', [], 'SESSION');
@@ -609,10 +609,10 @@ 
     // Does this user is allowed to see other items
     $inc = 0;
     $rows = DB::query(
-        'SELECT id, id_tree FROM ' . prefixTable('items') . '
+        'SELECT id, id_tree FROM '.prefixTable('items').'
             WHERE restricted_to LIKE %ss AND inactif = %s'.
             (count($allowedFolders) > 0 ? ' AND id_tree NOT IN ('.implode(',', $allowedFolders).')' : ''),
-        $globalsUserId . ';',
+        $globalsUserId.';',
         '0'
     );
     foreach ($rows as $record) {
@@ -626,8 +626,8 @@ 
     // Check for the users roles if some specific rights exist on items
     $rows = DB::query(
         'SELECT i.id_tree, r.item_id
-        FROM ' . prefixTable('items') . ' as i
-        INNER JOIN ' . prefixTable('restriction_to_roles') . ' as r ON (r.item_id=i.id)
+        FROM ' . prefixTable('items').' as i
+        INNER JOIN ' . prefixTable('restriction_to_roles').' as r ON (r.item_id=i.id)
         WHERE r.role_id IN %li AND i.id_tree <> ""
         ORDER BY i.id_tree ASC',
         $userRoles
@@ -681,16 +681,16 @@ 
         'SESSION'
     );
     // Folders and Roles numbers
-    DB::queryfirstrow('SELECT id FROM ' . prefixTable('nested_tree') . '');
+    DB::queryfirstrow('SELECT id FROM '.prefixTable('nested_tree').'');
     $superGlobal->put('nb_folders', DB::count(), 'SESSION');
-    DB::queryfirstrow('SELECT id FROM ' . prefixTable('roles_title'));
+    DB::queryfirstrow('SELECT id FROM '.prefixTable('roles_title'));
     $superGlobal->put('nb_roles', DB::count(), 'SESSION');
     // check if change proposals on User's items
     if (isset($SETTINGS['enable_suggestion']) === true && (int) $SETTINGS['enable_suggestion'] === 1) {
         $countNewItems = DB::query(
             'SELECT COUNT(*)
-            FROM ' . prefixTable('items_change') . ' AS c
-            LEFT JOIN ' . prefixTable('log_items') . ' AS i ON (c.item_id = i.id_item)
+            FROM ' . prefixTable('items_change').' AS c
+            LEFT JOIN ' . prefixTable('log_items').' AS i ON (c.item_id = i.id_item)
             WHERE i.action = %s AND i.id_user = %i',
             'at_creation',
             $globalsUserId
@@ -718,7 +718,7 @@ 
     
     $rows = DB::query(
         'SELECT *
-        FROM ' . prefixTable('roles_values') . '
+        FROM ' . prefixTable('roles_values').'
         WHERE role_id IN %li AND type IN %ls',
         $userRoles,
         ['W', 'ND', 'NE', 'NDNE', 'R']
@@ -785,7 +785,7 @@ 
     ) {
         $persoFld = DB::queryfirstrow(
             'SELECT id
-            FROM ' . prefixTable('nested_tree') . '
+            FROM ' . prefixTable('nested_tree').'
             WHERE title = %s AND personal_folder = %i'.
             (count($allowedFolders) > 0 ? ' AND id NOT IN ('.implode(',', $allowedFolders).')' : ''),
             $globalsUserId,
@@ -819,7 +819,7 @@ 
     }
     $persoFlds = DB::query(
         'SELECT id
-        FROM ' . prefixTable('nested_tree') . '
+        FROM ' . prefixTable('nested_tree').'
         WHERE %l',
         $where
     );
@@ -883,9 +883,9 @@ 
  */
 function cacheTableRefresh(array $SETTINGS): void
 {
-    include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
+    include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
     //Connect to DB
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
     if (defined('DB_PASSWD_CLEAR') === false) {
         define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
     }
@@ -900,12 +900,12 @@ 
     $tree->register();
     $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
     // truncate table
-    DB::query('TRUNCATE TABLE ' . prefixTable('cache'));
+    DB::query('TRUNCATE TABLE '.prefixTable('cache'));
     // reload date
     $rows = DB::query(
         'SELECT *
-        FROM ' . prefixTable('items') . ' as i
-        INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id)
+        FROM ' . prefixTable('items').' as i
+        INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id)
         AND l.action = %s
         AND i.inactif = %i',
         'at_creation',
@@ -917,18 +917,18 @@ 
             $tags = '';
             $itemTags = DB::query(
                 'SELECT tag
-                            FROM ' . prefixTable('tags') . '
+                            FROM ' . prefixTable('tags').'
                             WHERE item_id = %i AND tag != ""',
                 $record['id']
             );
             foreach ($itemTags as $itemTag) {
-                $tags .= $itemTag['tag'] . ' ';
+                $tags .= $itemTag['tag'].' ';
             }
 
             // Get renewal period
             $resNT = DB::queryfirstrow(
                 'SELECT renewal_period
-                FROM ' . prefixTable('nested_tree') . '
+                FROM ' . prefixTable('nested_tree').'
                 WHERE id = %i',
                 $record['id_tree']
             );
@@ -941,7 +941,7 @@ 
                     // Is this a User id?
                     $user = DB::queryfirstrow(
                         'SELECT id, login
-                        FROM ' . prefixTable('users') . '
+                        FROM ' . prefixTable('users').'
                         WHERE id = %i',
                         $elem->title
                     );
@@ -959,11 +959,11 @@ 
                     'id' => $record['id'],
                     'label' => $record['label'],
                     'description' => $record['description'] ?? '',
-                    'url' => isset($record['url']) && ! empty($record['url']) ? $record['url'] : '0',
+                    'url' => isset($record['url']) && !empty($record['url']) ? $record['url'] : '0',
                     'tags' => $tags,
                     'id_tree' => $record['id_tree'],
                     'perso' => $record['perso'],
-                    'restricted_to' => isset($record['restricted_to']) && ! empty($record['restricted_to']) ? $record['restricted_to'] : '0',
+                    'restricted_to' => isset($record['restricted_to']) && !empty($record['restricted_to']) ? $record['restricted_to'] : '0',
                     'login' => $record['login'] ?? '',
                     'folder' => implode(' > ', $folder),
                     'author' => $record['id_user'],
@@ -985,12 +985,12 @@ 
  */
 function cacheTableUpdate(array $SETTINGS, ?int $ident = null): void
 {
-    include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
+    include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
     // Load superglobal
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
     //Connect to DB
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
     if (defined('DB_PASSWD_CLEAR') === false) {
         define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
     }
@@ -1007,7 +1007,7 @@ 
     // get new value from db
     $data = DB::queryfirstrow(
         'SELECT label, description, id_tree, perso, restricted_to, login, url
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE id=%i',
         $ident
     );
@@ -1015,12 +1015,12 @@ 
     $tags = '';
     $itemTags = DB::query(
         'SELECT tag
-            FROM ' . prefixTable('tags') . '
+            FROM ' . prefixTable('tags').'
             WHERE item_id = %i AND tag != ""',
         $ident
     );
     foreach ($itemTags as $itemTag) {
-        $tags .= $itemTag['tag'] . ' ';
+        $tags .= $itemTag['tag'].' ';
     }
     // form id_tree to full foldername
     $folder = [];
@@ -1031,7 +1031,7 @@ 
             // Is this a User id?
             $user = DB::queryfirstrow(
                 'SELECT id, login
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $elem->title
             );
@@ -1049,10 +1049,10 @@ 
             'label' => $data['label'],
             'description' => $data['description'],
             'tags' => $tags,
-            'url' => isset($data['url']) && ! empty($data['url']) ? $data['url'] : '0',
+            'url' => isset($data['url']) && !empty($data['url']) ? $data['url'] : '0',
             'id_tree' => $data['id_tree'],
             'perso' => $data['perso'],
-            'restricted_to' => isset($data['restricted_to']) && ! empty($data['restricted_to']) ? $data['restricted_to'] : '0',
+            'restricted_to' => isset($data['restricted_to']) && !empty($data['restricted_to']) ? $data['restricted_to'] : '0',
             'login' => $data['login'] ?? '',
             'folder' => implode(' » ', $folder),
             'author' => $superGlobal->get('user_id', 'SESSION'),
@@ -1072,14 +1072,14 @@ 
  */
 function cacheTableAdd(array $SETTINGS, ?int $ident = null): void
 {
-    include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
+    include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
     // Load superglobal
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
     // Get superglobals
     $globalsUserId = $superGlobal->get('user_id', 'SESSION');
     //Connect to DB
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
     if (defined('DB_PASSWD_CLEAR') === false) {
         define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
     }
@@ -1096,8 +1096,8 @@ 
     // get new value from db
     $data = DB::queryFirstRow(
         'SELECT i.label, i.description, i.id_tree as id_tree, i.perso, i.restricted_to, i.id, i.login, i.url, l.date
-        FROM ' . prefixTable('items') . ' as i
-        INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id)
+        FROM ' . prefixTable('items').' as i
+        INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id)
         WHERE i.id = %i
         AND l.action = %s',
         $ident,
@@ -1107,12 +1107,12 @@ 
     $tags = '';
     $itemTags = DB::query(
         'SELECT tag
-            FROM ' . prefixTable('tags') . '
+            FROM ' . prefixTable('tags').'
             WHERE item_id = %i AND tag != ""',
         $ident
     );
     foreach ($itemTags as $itemTag) {
-        $tags .= $itemTag['tag'] . ' ';
+        $tags .= $itemTag['tag'].' ';
     }
     // form id_tree to full foldername
     $folder = [];
@@ -1123,7 +1123,7 @@ 
             // Is this a User id?
             $user = DB::queryfirstrow(
                 'SELECT id, login
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $elem->title
             );
@@ -1142,7 +1142,7 @@ 
             'label' => $data['label'],
             'description' => $data['description'],
             'tags' => isset($tags) && empty($tags) === false ? $tags : 'None',
-            'url' => isset($data['url']) && ! empty($data['url']) ? $data['url'] : '0',
+            'url' => isset($data['url']) && !empty($data['url']) ? $data['url'] : '0',
             'id_tree' => $data['id_tree'],
             'perso' => isset($data['perso']) && empty($data['perso']) === false && $data['perso'] !== 'None' ? $data['perso'] : '0',
             'restricted_to' => isset($data['restricted_to']) && empty($data['restricted_to']) === false ? $data['restricted_to'] : '0',
@@ -1164,52 +1164,52 @@ 
 function getStatisticsData(array $SETTINGS): array
 {
     DB::query(
-        'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i',
+        'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i',
         0
     );
     $counter_folders = DB::count();
     DB::query(
-        'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i',
+        'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i',
         1
     );
     $counter_folders_perso = DB::count();
     DB::query(
-        'SELECT id FROM ' . prefixTable('items') . ' WHERE perso = %i',
+        'SELECT id FROM '.prefixTable('items').' WHERE perso = %i',
         0
     );
     $counter_items = DB::count();
         DB::query(
-        'SELECT id FROM ' . prefixTable('items') . ' WHERE perso = %i',
+        'SELECT id FROM '.prefixTable('items').' WHERE perso = %i',
         1
     );
     $counter_items_perso = DB::count();
         DB::query(
-        'SELECT id FROM ' . prefixTable('users') . ''
+        'SELECT id FROM '.prefixTable('users').''
     );
     $counter_users = DB::count();
         DB::query(
-        'SELECT id FROM ' . prefixTable('users') . ' WHERE admin = %i',
+        'SELECT id FROM '.prefixTable('users').' WHERE admin = %i',
         1
     );
     $admins = DB::count();
     DB::query(
-        'SELECT id FROM ' . prefixTable('users') . ' WHERE gestionnaire = %i',
+        'SELECT id FROM '.prefixTable('users').' WHERE gestionnaire = %i',
         1
     );
     $managers = DB::count();
     DB::query(
-        'SELECT id FROM ' . prefixTable('users') . ' WHERE read_only = %i',
+        'SELECT id FROM '.prefixTable('users').' WHERE read_only = %i',
         1
     );
     $readOnly = DB::count();
     // list the languages
     $usedLang = [];
     $tp_languages = DB::query(
-        'SELECT name FROM ' . prefixTable('languages')
+        'SELECT name FROM '.prefixTable('languages')
     );
     foreach ($tp_languages as $tp_language) {
         DB::query(
-            'SELECT * FROM ' . prefixTable('users') . ' WHERE user_language = %s',
+            'SELECT * FROM '.prefixTable('users').' WHERE user_language = %s',
             $tp_language['name']
         );
         $usedLang[$tp_language['name']] = round((DB::count() * 100 / $counter_users), 0);
@@ -1218,12 +1218,12 @@ 
     // get list of ips
     $usedIp = [];
     $tp_ips = DB::query(
-        'SELECT user_ip FROM ' . prefixTable('users')
+        'SELECT user_ip FROM '.prefixTable('users')
     );
     foreach ($tp_ips as $ip) {
         if (array_key_exists($ip['user_ip'], $usedIp)) {
             $usedIp[$ip['user_ip']] += $usedIp[$ip['user_ip']];
-        } elseif (! empty($ip['user_ip']) && $ip['user_ip'] !== 'none') {
+        } elseif (!empty($ip['user_ip']) && $ip['user_ip'] !== 'none') {
             $usedIp[$ip['user_ip']] = 1;
         }
     }
@@ -1289,14 +1289,14 @@ 
     }
 
     // Load settings
-    include_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
     // Load superglobal
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
     // Get user language
-    include_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $superGlobal->get('user_language', 'SESSION') . '.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/language/'.$superGlobal->get('user_language', 'SESSION').'.php';
     // Load library
-    include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
+    include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
     // load PHPMailer
     $mail = new SplClassLoader('PHPMailer\PHPMailer', '../includes/libraries');
     $mail->register();
@@ -1304,7 +1304,7 @@ 
     
     try {
         // send to user
-        $mail->setLanguage('en', $SETTINGS['cpassman_dir'] . '/includes/libraries/PHPMailer/PHPMailer/language/');
+        $mail->setLanguage('en', $SETTINGS['cpassman_dir'].'/includes/libraries/PHPMailer/PHPMailer/language/');
         $mail->SMTPDebug = isset($SETTINGS['email_debug_level']) === true ? $SETTINGS['email_debug_level'] : 0;
         $mail->Port = $SETTINGS['email_port'];
         //COULD BE USED
@@ -1404,7 +1404,7 @@ 
         <table width="600" cellpadding="0" cellspacing="0" border="0" class="container" bgcolor="#ffffff" style="border-spacing: 0; border-bottom: 1px solid #e0e0e0; box-shadow: 0 0 3px #ddd; color: #434343; font-family: Helvetica, Verdana, sans-serif;">
         <tr><td class="container-padding" bgcolor="#ffffff" style="border-collapse: collapse; border-left: 1px solid #e0e0e0; background-color: #ffffff; padding-left: 30px; padding-right: 30px;">
         <br><div style="float:right;">' .
-        $textMail .
+        $textMail.
         '<br><br></td></tr></table>
     </td></tr></table>
     <br></body></html>';
@@ -1417,7 +1417,7 @@ 
  */
 function generateKey(): string
 {
-    return substr(md5(rand() . rand()), 0, 15);
+    return substr(md5(rand().rand()), 0, 15);
 }
 
 /**
@@ -1488,7 +1488,7 @@ 
 {
     array_walk_recursive(
         $array,
-        static function (&$item): void {
+        static function(&$item): void {
             if (mb_detect_encoding((string) $item, 'utf-8', true) === false) {
                 $item = utf8_encode($item);
             }
@@ -1510,7 +1510,7 @@ 
 function prepareExchangedData($teampassDir, $data, string $type, ?string $key = null)
 {
     // Load superglobal
-    include_once $teampassDir . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+    include_once $teampassDir.'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
     // Get superglobals
     if ($key !== null) {
@@ -1521,9 +1521,9 @@ 
     }
 
     //load ClassLoader
-    include_once $teampassDir . '/sources/SplClassLoader.php';
+    include_once $teampassDir.'/sources/SplClassLoader.php';
     //Load AES
-    $aes = new SplClassLoader('Encryption\Crypt', $teampassDir . '/includes/libraries');
+    $aes = new SplClassLoader('Encryption\Crypt', $teampassDir.'/includes/libraries');
     $aes->register();
     if ($type === 'encode' && is_array($data) === true) {
         // Ensure UTF8 format
@@ -1597,8 +1597,8 @@ 
  */
 function prefixTable(string $table): string
 {
-    $safeTable = htmlspecialchars(DB_PREFIX . $table);
-    if (! empty($safeTable)) {
+    $safeTable = htmlspecialchars(DB_PREFIX.$table);
+    if (!empty($safeTable)) {
         // sanitize string
         return $safeTable;
     }
@@ -1628,13 +1628,13 @@ 
     bool $lowercase = false,
     array $SETTINGS = []
 ): string {
-    include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
-    $generator = new SplClassLoader('PasswordGenerator\Generator', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+    include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
+    $generator = new SplClassLoader('PasswordGenerator\Generator', $SETTINGS['cpassman_dir'].'/includes/libraries');
     $generator->register();
     $generator = new PasswordGenerator\Generator\ComputerPasswordGenerator();
     // Is PHP7 being used?
     if (version_compare(PHP_VERSION, '7.0.0', '>=')) {
-        $php7generator = new SplClassLoader('PasswordGenerator\RandomGenerator', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+        $php7generator = new SplClassLoader('PasswordGenerator\RandomGenerator', $SETTINGS['cpassman_dir'].'/includes/libraries');
         $php7generator->register();
         $generator->setRandomGenerator(new PasswordGenerator\RandomGenerator\Php7RandomGenerator());
     }
@@ -1669,7 +1669,7 @@ 
 function send_syslog($message, $host, $port, $component = 'teampass'): void
 {
     $sock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
-    $syslog_message = '<123>' . date('M d H:i:s ') . $component . ': ' . $message;
+    $syslog_message = '<123>'.date('M d H:i:s ').$component.': '.$message;
     socket_sendto($sock, $syslog_message, strlen($syslog_message), 0, $host, $port);
     socket_close($sock);
 }
@@ -1693,7 +1693,7 @@ 
     }
 
     // include librairies & connect to DB
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
     if (defined('DB_PASSWD_CLEAR') === false) {
         define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
     }
@@ -1717,14 +1717,14 @@ 
     if (isset($SETTINGS['syslog_enable']) === true && (int) $SETTINGS['syslog_enable'] === 1) {
         if ($type === 'user_mngt') {
             send_syslog(
-                'action=' . str_replace('at_', '', $label) . ' attribute=user user=' . $who . ' userid="' . $login . '" change="' . $field_1 . '" ',
+                'action='.str_replace('at_', '', $label).' attribute=user user='.$who.' userid="'.$login.'" change="'.$field_1.'" ',
                 $SETTINGS['syslog_host'],
                 $SETTINGS['syslog_port'],
                 'teampass'
             );
         } else {
             send_syslog(
-                'action=' . $type . ' attribute=' . $label . ' user=' . $who . ' userid="' . $login . '" ',
+                'action='.$type.' attribute='.$label.' user='.$who.' userid="'.$login.'" ',
                 $SETTINGS['syslog_host'],
                 $SETTINGS['syslog_port'],
                 'teampass'
@@ -1758,7 +1758,7 @@ 
     ?string $encryption_type = null
 ): void {
     // include librairies & connect to DB
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
     if (defined('DB_PASSWD_CLEAR') === false) {
         define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
     }
@@ -1802,7 +1802,7 @@ 
         if (empty($item_label) === true) {
             $dataItem = DB::queryfirstrow(
                 'SELECT id, id_tree, label
-                FROM ' . prefixTable('items') . '
+                FROM ' . prefixTable('items').'
                 WHERE id = %i',
                 $item_id
             );
@@ -1810,11 +1810,11 @@ 
         }
 
         send_syslog(
-            'action=' . str_replace('at_', '', $action) .
-                ' attribute=' . str_replace('at_', '', $attribute[0]) .
-                ' itemno=' . $item_id .
-                ' user=' . is_null($login) === true ? '' : addslashes((string) $login) .
-                ' itemname="' . addslashes($item_label) . '"',
+            'action='.str_replace('at_', '', $action).
+                ' attribute='.str_replace('at_', '', $attribute[0]).
+                ' itemno='.$item_id.
+                ' user='.is_null($login) === true ? '' : addslashes((string) $login).
+                ' itemname="'.addslashes($item_label).'"',
             $SETTINGS['syslog_host'],
             $SETTINGS['syslog_port'],
             'teampass'
@@ -1842,7 +1842,7 @@ 
         && $action === 'at_shown'
     ) {
         // Load superglobal
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
         $superGlobal = new protect\SuperGlobal\SuperGlobal();
         // Get superglobals
         $globalsLastname = $superGlobal->get('lastname', 'SESSION');
@@ -1851,7 +1851,7 @@ 
         // Get info about item
         $dataItem = DB::queryfirstrow(
             'SELECT id, id_tree, label
-            FROM ' . prefixTable('items') . '
+            FROM ' . prefixTable('items').'
             WHERE id = %i',
             $item_id
         );
@@ -1865,9 +1865,9 @@ 
                 'body' => str_replace(
                     ['#tp_user#', '#tp_item#', '#tp_link#'],
                     [
-                        addslashes($globalsName . ' ' . $globalsLastname),
+                        addslashes($globalsName.' '.$globalsLastname),
                         addslashes($item_label),
-                        $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $item_id,
+                        $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$item_id,
                     ],
                     langHdl('email_on_open_notification_mail')
                 ),
@@ -1891,7 +1891,7 @@ 
 function notifyChangesToSubscribers(int $item_id, string $label, array $changes, array $SETTINGS): void
 {
     // Load superglobal
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
     // Get superglobals
     $globalsUserId = $superGlobal->get('user_id', 'SESSION');
@@ -1901,8 +1901,8 @@ 
     $notification = DB::queryOneColumn(
         'email',
         'SELECT *
-        FROM ' . prefixTable('notification') . ' AS n
-        INNER JOIN ' . prefixTable('users') . ' AS u ON (n.user_id = u.id)
+        FROM ' . prefixTable('notification').' AS n
+        INNER JOIN ' . prefixTable('users').' AS u ON (n.user_id = u.id)
         WHERE n.item_id = %i AND n.user_id != %i',
         $item_id,
         $globalsUserId
@@ -1913,7 +1913,7 @@ 
         // Get list of changes
         $htmlChanges = '<ul>';
         foreach ($changes as $change) {
-            $htmlChanges .= '<li>' . $change . '</li>';
+            $htmlChanges .= '<li>'.$change.'</li>';
         }
         $htmlChanges .= '</ul>';
         // send email
@@ -1946,7 +1946,7 @@ 
 function geItemReadablePath(int $id_tree, string $label, array $SETTINGS): string
 {
     // Class loader
-    include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
+    include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
     //Load Tree
     $tree = new SplClassLoader('Tree\NestedTree', '../includes/libraries');
     $tree->register();
@@ -1955,15 +1955,15 @@ 
     $path = '';
     foreach ($arbo as $elem) {
         if (empty($path) === true) {
-            $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES) . ' ';
+            $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES).' ';
         } else {
-            $path .= '&#8594; ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
+            $path .= '&#8594; '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
         }
     }
 
     // Build text to show user
     if (empty($label) === false) {
-        return empty($path) === true ? addslashes($label) : addslashes($label) . ' (' . $path . ')';
+        return empty($path) === true ? addslashes($label) : addslashes($label).' ('.$path.')';
     }
     return empty($path) === true ? '' : $path;
 }
@@ -2020,9 +2020,9 @@ 
  */
 function handleConfigFile($action, $SETTINGS, $field = null, $value = null)
 {
-    $tp_config_file = $SETTINGS['cpassman_dir'] . '/includes/config/tp.config.php';
+    $tp_config_file = $SETTINGS['cpassman_dir'].'/includes/config/tp.config.php';
     // include librairies & connect to DB
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
     if (defined('DB_PASSWD_CLEAR') === false) {
         define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
     }
@@ -2035,8 +2035,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."'";
             }
         }
 
@@ -2046,11 +2046,11 @@ 
         $data[1] = "global \$SETTINGS;\n";
         $data[2] = "\$SETTINGS = array (\n";
         $rows = DB::query(
-            'SELECT * FROM ' . prefixTable('misc') . ' WHERE type=%s',
+            'SELECT * FROM '.prefixTable('misc').' WHERE type=%s',
             'admin'
         );
         foreach ($rows as $record) {
-            array_push($data, "    '" . $record['intitule'] . "' => '" . $record['valeur'] . "',\n");
+            array_push($data, "    '".$record['intitule']."' => '".$record['valeur']."',\n");
         }
         array_push($data, ");\n");
         $data = array_unique($data);
@@ -2064,15 +2064,15 @@ 
                 break;
             }
 
-            if (stristr($line, "'" . $field . "' => '")) {
-                $data[$inc] = "    '" . $field . "' => '" . filter_var($value, FILTER_SANITIZE_STRING) . "',\n";
+            if (stristr($line, "'".$field."' => '")) {
+                $data[$inc] = "    '".$field."' => '".filter_var($value, FILTER_SANITIZE_STRING)."',\n";
                 $bFound = true;
                 break;
             }
             ++$inc;
         }
         if ($bFound === false) {
-            $data[$inc] = "    '" . $field . "' => '" . filter_var($value, FILTER_SANITIZE_STRING) . "',\n);\n";
+            $data[$inc] = "    '".$field."' => '".filter_var($value, FILTER_SANITIZE_STRING)."',\n);\n";
         }
     }
 
@@ -2102,7 +2102,7 @@ 
 {
     global $SETTINGS;
     /* LOAD CPASSMAN SETTINGS */
-    if (! isset($SETTINGS['loaded']) || $SETTINGS['loaded'] !== 1) {
+    if (!isset($SETTINGS['loaded']) || $SETTINGS['loaded'] !== 1) {
         $SETTINGS = [];
         $SETTINGS['duplicate_folder'] = 0;
         //by default, this is set to 0;
@@ -2112,7 +2112,7 @@ 
         //by default, this value is set to 5;
         $settings = [];
         $rows = DB::query(
-            'SELECT * FROM ' . prefixTable('misc') . ' WHERE type=%s_type OR type=%s_type2',
+            'SELECT * FROM '.prefixTable('misc').' WHERE type=%s_type OR type=%s_type2',
             [
                 'type' => 'admin',
                 'type2' => 'settings',
@@ -2144,7 +2144,7 @@ 
     $source_cf = [];
     $rows = DB::QUERY(
         'SELECT id_category
-            FROM ' . prefixTable('categories_folders') . '
+            FROM ' . prefixTable('categories_folders').'
             WHERE id_folder = %i',
         $source_id
     );
@@ -2155,7 +2155,7 @@ 
     $target_cf = [];
     $rows = DB::QUERY(
         'SELECT id_category
-            FROM ' . prefixTable('categories_folders') . '
+            FROM ' . prefixTable('categories_folders').'
             WHERE id_folder = %i',
         $target_id
     );
@@ -2190,9 +2190,9 @@ 
     string $password = null
 ) {
     // Load AntiXSS
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/voku/helper/AntiXSS.php';
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/voku/helper/ASCII.php';
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/voku/helper/UTF8.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/voku/helper/AntiXSS.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/voku/helper/ASCII.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/voku/helper/UTF8.php';
     $antiXss = new voku\helper\AntiXSS();
     // Protect against bad inputs
     if (is_array($source_file) === true || is_array($target_file) === true) {
@@ -2204,7 +2204,7 @@ 
     $target_file = $antiXss->xss_clean($target_file);
     if (empty($password) === true || is_null($password) === true) {
         // get KEY to define password
-        $ascii_key = file_get_contents(SECUREPATH . '/teampass-seckey.txt');
+        $ascii_key = file_get_contents(SECUREPATH.'/teampass-seckey.txt');
         $password = \Defuse\Crypto\Key::loadFromAsciiSafeString($ascii_key);
     }
 
@@ -2249,15 +2249,15 @@ 
 ) {
     // load PhpEncryption library
     $path_to_encryption = '/includes/libraries/Encryption/Encryption/';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Crypto.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Encoding.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'DerivedKeys.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Key.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'KeyOrPassword.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'File.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'RuntimeTests.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'KeyProtectedByPassword.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Core.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Crypto.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Encoding.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'DerivedKeys.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Key.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'KeyOrPassword.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'File.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'RuntimeTests.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'KeyProtectedByPassword.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Core.php';
     try {
         \Defuse\Crypto\File::encryptFileWithPassword(
             $source_file,
@@ -2294,15 +2294,15 @@ 
 ) {
     // load PhpEncryption library
     $path_to_encryption = '/includes/libraries/Encryption/Encryption/';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Crypto.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Encoding.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'DerivedKeys.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Key.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'KeyOrPassword.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'File.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'RuntimeTests.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'KeyProtectedByPassword.php';
-    include_once $SETTINGS['cpassman_dir'] . $path_to_encryption . 'Core.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Crypto.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Encoding.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'DerivedKeys.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Key.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'KeyOrPassword.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'File.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'RuntimeTests.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'KeyProtectedByPassword.php';
+    include_once $SETTINGS['cpassman_dir'].$path_to_encryption.'Core.php';
     try {
         \Defuse\Crypto\File::decryptFileWithPassword(
             $source_file,
@@ -2349,9 +2349,9 @@ 
 function fileDelete(string $file, array $SETTINGS): void
 {
     // Load AntiXSS
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/voku/helper/ASCII.php';
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/voku/helper/UTF8.php';
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/voku/helper/AntiXSS.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/voku/helper/ASCII.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/voku/helper/UTF8.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/voku/helper/AntiXSS.php';
     $antiXss = new voku\helper\AntiXSS();
     $file = $antiXss->xss_clean($file);
     if (is_file($file)) {
@@ -2401,7 +2401,7 @@ 
     int  $dirPerm = 0755
 ) {
     // Check if the path exists
-    if (! file_exists($path)) {
+    if (!file_exists($path)) {
         return false;
     }
 
@@ -2439,7 +2439,7 @@ 
  */
 function accessToItemIsGranted(int $item_id, array $SETTINGS)
 {
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
     // Prepare superGlobal variables
     $session_groupes_visibles = $superGlobal->get('groupes_visibles', 'SESSION');
@@ -2447,7 +2447,7 @@ 
     // Load item data
     $data = DB::queryFirstRow(
         'SELECT id_tree
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE id = %i',
         $item_id
     );
@@ -2510,7 +2510,7 @@ 
         }
         $host .= substr(explode(".", $email[1])[0], -1, 1);
     }
-    $email = $name . "@" . $host . "." . explode(".", $email[1])[1];
+    $email = $name."@".$host.".".explode(".", $email[1])[1];
     return $email;
 }
 
@@ -2526,8 +2526,8 @@ 
 function performDBQuery(array $SETTINGS, string $fields, string $table): array
 {
     // include librairies & connect to DB
-    include_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
     if (defined('DB_PASSWD_CLEAR') === false) {
         define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
     }
@@ -2539,7 +2539,7 @@ 
     DB::$encoding = DB_ENCODING;
     // Insert log in DB
     return DB::query(
-        'SELECT ' . $fields . '
+        'SELECT '.$fields.'
         FROM ' . prefixTable($table)
     );
 }
@@ -2554,11 +2554,11 @@ 
 function formatSizeUnits(int $bytes): string
 {
     if ($bytes >= 1073741824) {
-        $bytes = number_format($bytes / 1073741824, 2) . ' GB';
+        $bytes = number_format($bytes / 1073741824, 2).' GB';
     } elseif ($bytes >= 1048576) {
-        $bytes = number_format($bytes / 1048576, 2) . ' MB';
+        $bytes = number_format($bytes / 1048576, 2).' MB';
     } elseif ($bytes >= 1024) {
-        $bytes = number_format($bytes / 1024, 2) . ' KB';
+        $bytes = number_format($bytes / 1024, 2).' KB';
     } elseif ($bytes > 1) {
         $bytes .= ' bytes';
     } elseif ($bytes === 1) {
@@ -2767,14 +2767,14 @@ 
 
     // Encrypt the file content
     $plaintext = file_get_contents(
-        filter_var($fileInPath . '/' . $fileInName, FILTER_SANITIZE_URL)
+        filter_var($fileInPath.'/'.$fileInName, FILTER_SANITIZE_URL)
     );
     $ciphertext = $cipher->encrypt($plaintext);
     // Save new file
     $hash = md5($plaintext);
-    $fileOut = $fileInPath . '/' . TP_FILE_PREFIX . $hash;
+    $fileOut = $fileInPath.'/'.TP_FILE_PREFIX.$hash;
     file_put_contents($fileOut, $ciphertext);
-    unlink($fileInPath . '/' . $fileInName);
+    unlink($fileInPath.'/'.$fileInName);
     return [
         'fileHash' => base64_encode($hash),
         'objectKey' => base64_encode($objectKey),
@@ -2792,7 +2792,7 @@ 
  */
 function decryptFile(string $fileName, string $filePath, string $key): string
 {
-    if (! defined('FILE_BUFFER_SIZE')) {
+    if (!defined('FILE_BUFFER_SIZE')) {
         define('FILE_BUFFER_SIZE', 128 * 1024);
     }
 
@@ -2811,7 +2811,7 @@ 
     $cipher->enableContinuousBuffer();
     $cipher->disablePadding();
     // Get file content
-    $ciphertext = file_get_contents($filePath . '/' . TP_FILE_PREFIX . $fileName);
+    $ciphertext = file_get_contents($filePath.'/'.TP_FILE_PREFIX.$fileName);
     // Decrypt file content and return
     return base64_encode($cipher->decrypt($ciphertext));
 }
@@ -2865,8 +2865,8 @@ 
     array $SETTINGS
 ): void {
     // include librairies & connect to DB
-    include_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
     if (defined('DB_PASSWD_CLEAR') === false) {
         define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
     }
@@ -2883,7 +2883,7 @@ 
         $post_object_id
     );
     // Superglobals
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
     // Prepare superGlobal variables
     $sessionPpersonaFolders = $superGlobal->get('personal_folders', 'SESSION');
@@ -2908,8 +2908,8 @@ 
         // Create sharekey for each user
         $users = DB::query(
             'SELECT id, public_key
-            FROM ' . prefixTable('users') . '
-            WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '")
+            FROM ' . prefixTable('users').'
+            WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'")
             AND public_key != ""'
         );
         foreach ($users as $user) {
@@ -2939,7 +2939,7 @@ 
 function isBase64(string $str): bool
 {
     $str = (string) trim($str);
-    if (! isset($str[0])) {
+    if (!isset($str[0])) {
         return false;
     }
 
@@ -3007,12 +3007,12 @@ 
         ],
     ];
     // Load expected libraries
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Arr.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/DetectsErrors.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Connection.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapInterface.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Ldap.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Arr.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/DetectsErrors.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Connection.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapInterface.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Ldap.php';
     $ad = new SplClassLoader('LdapRecord', '../includes/libraries');
     $ad->register();
     $connection = new Connection($config);
@@ -3021,7 +3021,7 @@ 
         $connection->connect();
     } catch (\LdapRecord\Auth\BindException $e) {
         $error = $e->getDetailedError();
-        echo 'Error : '.$error->getErrorCode().' - '.$error->getErrorMessage(). '<br>'.$error->getDiagnosticMessage();
+        echo 'Error : '.$error->getErrorCode().' - '.$error->getErrorMessage().'<br>'.$error->getDiagnosticMessage();
         return false;
     }
 
@@ -3034,7 +3034,7 @@ 
         }
     } catch (\LdapRecord\Auth\BindException $e) {
         $error = $e->getDetailedError();
-        echo 'Error : '.$error->getErrorCode().' - '.$error->getErrorMessage(). '<br>'.$error->getDiagnosticMessage();
+        echo 'Error : '.$error->getErrorCode().' - '.$error->getErrorMessage().'<br>'.$error->getDiagnosticMessage();
         return false;
     }
 
@@ -3052,8 +3052,8 @@ 
 function deleteUserObjetsKeys(int $userId, array $SETTINGS): bool
 {
     // include librairies & connect to DB
-    include_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
     if (defined('DB_PASSWD_CLEAR') === false) {
         define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
     }
@@ -3111,7 +3111,7 @@ 
         foreach (DateTimeZone::listIdentifiers() as $timezone) {
             $now->setTimezone(new DateTimeZone($timezone));
             $offsets[] = $offset = $now->getOffset();
-            $timezones[$timezone] = '(' . format_GMT_offset($offset) . ') ' . format_timezone_name($timezone);
+            $timezones[$timezone] = '('.format_GMT_offset($offset).') '.format_timezone_name($timezone);
         }
 
         array_multisort($offsets, $timezones);
@@ -3131,7 +3131,7 @@ 
 {
     $hours = intval($offset / 3600);
     $minutes = abs(intval($offset % 3600 / 60));
-    return 'GMT' . ($offset ? sprintf('%+03d:%02d', $hours, $minutes) : '');
+    return 'GMT'.($offset ? sprintf('%+03d:%02d', $hours, $minutes) : '');
 }
 
 /**

sources/identify.php

Spacing +88 added lines, -88 removed lines

@@ -44,23 +44,23 @@ 
     throw new Exception("Error file '/includes/config/tp.config.php' not exists", 1);
 }
 
-if (! isset($SETTINGS['cpassman_dir']) || empty($SETTINGS['cpassman_dir']) === true || $SETTINGS['cpassman_dir'] === '.') {
+if (!isset($SETTINGS['cpassman_dir']) || empty($SETTINGS['cpassman_dir']) === true || $SETTINGS['cpassman_dir'] === '.') {
     $SETTINGS = [];
     $SETTINGS['cpassman_dir'] = '..';
 }
 
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
 
 // If Debug then clean the files
 if (DEBUGLDAP === true) {
-    define('DEBUGLDAPFILE', $SETTINGS['path_to_files_folder'] . '/ldap.debug.txt');
+    define('DEBUGLDAPFILE', $SETTINGS['path_to_files_folder'].'/ldap.debug.txt');
     $fp = fopen(DEBUGLDAPFILE, 'w');
     fclose($fp);
 }
 if (DEBUGDUO === true) {
-    define('DEBUGDUOFILE', $SETTINGS['path_to_files_folder'] . '/duo.debug.txt');
+    define('DEBUGDUOFILE', $SETTINGS['path_to_files_folder'].'/duo.debug.txt');
     $fp = fopen(DEBUGDUOFILE, 'w');
     fclose($fp);
 }
@@ -76,7 +76,7 @@ 
 if (defined('DB_PASSWD_CLEAR') === false) {
     define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
 }
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
 if (defined('DB_PASSWD_CLEAR') === false) {
     define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
 }
@@ -93,7 +93,7 @@ 
     // This step creates the DUO request encrypted key
 
     // load library
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/DuoSecurity/Duo.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/DuoSecurity/Duo.php';
     $sig_request = Duo::signRequest(
         $SETTINGS['IKEY'],
         $SETTINGS['SKEY'],
@@ -104,16 +104,16 @@ 
         debugIdentify(
             DEBUGDUO,
             DEBUGDUOFILE,
-            "\n\n-----\n\n" .
-                'sig request : ' . $post_login . "\n" .
-                'resp : ' . $sig_request . "\n"
+            "\n\n-----\n\n".
+                'sig request : '.$post_login."\n".
+                'resp : '.$sig_request."\n"
         );
     }
 
     // load csrfprotector
-    $csrfp_config = include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/csrfp/libs/csrfp.config.php';
+    $csrfp_config = include_once $SETTINGS['cpassman_dir'].'/includes/libraries/csrfp/libs/csrfp.config.php';
     // return result
-    echo '[{"sig_request" : "' . $sig_request . '" , "csrfp_token" : "' . $csrfp_config['CSRFP_TOKEN'] . '" , "csrfp_key" : "' . filter_var($_COOKIE[$csrfp_config['CSRFP_TOKEN']], FILTER_SANITIZE_STRING) . '"}]';
+    echo '[{"sig_request" : "'.$sig_request.'" , "csrfp_token" : "'.$csrfp_config['CSRFP_TOKEN'].'" , "csrfp_key" : "'.filter_var($_COOKIE[$csrfp_config['CSRFP_TOKEN']], FILTER_SANITIZE_STRING).'"}]';
 // ---
     // ---
 } elseif ($post_type === 'identify_duo_user_check') {
@@ -123,7 +123,7 @@ 
     //--------
 
     // load library
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/DuoSecurity/Duo.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/DuoSecurity/Duo.php';
     $authenticated_username = Duo::verifyResponse(
         $SETTINGS['duo_ikey'],
         $SETTINGS['duo_skey'],
@@ -138,7 +138,7 @@ 
             // is user in Teampass?
             DB::queryfirstrow(
                 'SELECT id
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE login = %s',
                 $post_login
             );
@@ -148,9 +148,9 @@ 
             }
         }
 
-        echo '[{"authenticated_username" : "' . $authenticated_username . '"}]';
+        echo '[{"authenticated_username" : "'.$authenticated_username.'"}]';
     } else {
-        echo '[{"authenticated_username" : "' . $authenticated_username . '"}]';
+        echo '[{"authenticated_username" : "'.$authenticated_username.'"}]';
     }
     // ---
     // ---
@@ -176,7 +176,7 @@ 
     }
 
     // Load superGlobals
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
     // Prepare GET variables
     $sessionPwdAttempts = $superGlobal->get('pwd_attempts', 'SESSION');
@@ -266,19 +266,19 @@ 
     } else {
         throw new Exception("Error file '/includes/config/tp.config.php' not exists", 1);
     }
-    include_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
-    include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
-    include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
+    include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
+    include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
     
     header('Content-type: text/html; charset=utf-8');
     error_reporting(E_ERROR);
 
     // Load AntiXSS
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/voku/helper/AntiXSS.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/voku/helper/AntiXSS.php';
     $antiXss = new voku\helper\AntiXSS();
 
     // Load superGlobals
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
 
     // Prepare GET variables
@@ -292,7 +292,7 @@ 
     $server['PHP_AUTH_PW'] = $superGlobal->get('PHP_AUTH_PW', 'SERVER');
 
     // connect to the server
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
     DB::$host = DB_HOST;
     DB::$user = DB_USER;
     DB::$password = defined('DB_PASSWD_CLEAR') === false ? defuseReturnDecrypted(DB_PASSWD, $SETTINGS) : DB_PASSWD_CLEAR;
@@ -300,14 +300,14 @@ 
     DB::$port = DB_PORT;
     DB::$encoding = DB_ENCODING;
     // User's language loading
-    include_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $sessionUserLanguage . '.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/language/'.$sessionUserLanguage.'.php';
     
     // decrypt and retreive data in JSON format
     if (empty($sessionKey) === true) {
         $dataReceived = $sentData;
     } else {
         $dataReceived = prepareExchangedData(
-    $SETTINGS['cpassman_dir'],$sentData, 'decode', $sessionKey);
+    $SETTINGS['cpassman_dir'], $sentData, 'decode', $sessionKey);
         $superGlobal->put('key', $sessionKey, 'SESSION');
     }
 
@@ -456,7 +456,7 @@ 
         // Check if any unsuccessfull login tries exist
         $rows = DB::query(
             'SELECT date
-            FROM ' . prefixTable('log_system') . "
+            FROM ' . prefixTable('log_system')."
             WHERE field_1 = %s
             AND type = 'failed_auth'
             AND label = 'password_is_not_correct'
@@ -470,7 +470,7 @@ 
             foreach ($rows as $record) {
                 array_push(
                     $arrAttempts,
-                    date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date'])
+                    date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date'])
                 );
             }
         }
@@ -585,7 +585,7 @@ 
         foreach ($superGlobal->get('user_roles', 'SESSION') as $role) {
             $resRoles = DB::queryFirstRow(
                 'SELECT title, complexity
-                FROM ' . prefixTable('roles_title') . '
+                FROM ' . prefixTable('roles_title').'
                 WHERE id=%i',
                 $role
             );
@@ -606,7 +606,7 @@ 
 
         // build complete array of roles
         $superGlobal->put('arr_roles_full', [], 'SESSION');
-        $rows = DB::query('SELECT id, title FROM ' . prefixTable('roles_title') . ' ORDER BY title ASC');
+        $rows = DB::query('SELECT id, title FROM '.prefixTable('roles_title').' ORDER BY title ASC');
         foreach ($rows as $record) {
             $superGlobal->put(
                 $record['id'],
@@ -684,10 +684,10 @@ 
         $superGlobal->put('latest_items_tab', [], 'SESSION');
         $superGlobal->put('nb_roles', 0, 'SESSION');
         foreach ($superGlobal->get('latest_items', 'SESSION') as $item) {
-            if (! empty($item)) {
+            if (!empty($item)) {
                 $dataLastItems = DB::queryFirstRow(
                     'SELECT id,label,id_tree
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE id=%i',
                     $item
                 );
@@ -696,7 +696,7 @@ 
                     [
                         'id' => $item,
                         'label' => $dataLastItems['label'],
-                        'url' => 'index.php?page=items&group=' . $dataLastItems['id_tree'] . '&id=' . $item,
+                        'url' => 'index.php?page=items&group='.$dataLastItems['id_tree'].'&id='.$item,
                     ],
                     'SESSION',
                     'latest_items_tab'
@@ -713,12 +713,12 @@ 
         ) {
             // get all Admin users
             $receivers = '';
-            $rows = DB::query('SELECT email FROM ' . prefixTable('users') . " WHERE admin = %i and email != ''", 1);
+            $rows = DB::query('SELECT email FROM '.prefixTable('users')." WHERE admin = %i and email != ''", 1);
             foreach ($rows as $record) {
                 if (empty($receivers)) {
                     $receivers = $record['email'];
                 } else {
-                    $receivers = ',' . $record['email'];
+                    $receivers = ','.$record['email'];
                 }
             }
             // Add email to table
@@ -734,7 +734,7 @@ 
                             '#tp_time#',
                         ],
                         [
-                            ' ' . $superGlobal->get('login', 'SESSION') . ' (IP: ' . getClientIpServer() . ')',
+                            ' '.$superGlobal->get('login', 'SESSION').' (IP: '.getClientIpServer().')',
                             date($SETTINGS['date_format'], (int) $superGlobal->get('last_connection', 'SESSION')),
                             date($SETTINGS['time_format'], (int) $superGlobal->get('last_connection', 'SESSION')),
                         ],
@@ -1059,44 +1059,44 @@ 
     }
 
     // Load expected libraries
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Illuminate/Contracts/Auth/Authenticatable.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Traits/EnumeratesValues.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/helpers.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Arr.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Contracts/Support/Jsonable.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Contracts/Support/Arrayable.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Enumerable.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Collection.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonTimeZone.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Units.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Week.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Timestamp.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Test.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/ObjectInitialisation.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Serialization.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/IntervalRounding.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Rounding.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Localization.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Options.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Cast.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mutability.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Modifiers.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mixin.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Macro.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Difference.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Creator.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Converter.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Comparison.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Boundaries.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Date.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonInterface.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Carbon.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/DetectsErrors.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Connection.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapInterface.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/HandlesConnection.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Ldap.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Illuminate/Contracts/Auth/Authenticatable.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Traits/EnumeratesValues.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/helpers.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Arr.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Contracts/Support/Jsonable.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Contracts/Support/Arrayable.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Enumerable.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Collection.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonTimeZone.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Units.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Week.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Timestamp.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Test.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/ObjectInitialisation.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Serialization.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/IntervalRounding.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Rounding.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Localization.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Options.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Cast.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mutability.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Modifiers.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mixin.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Macro.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Difference.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Creator.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Converter.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Comparison.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Boundaries.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Date.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonInterface.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Carbon.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/DetectsErrors.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Connection.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapInterface.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/HandlesConnection.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Ldap.php';
     $ad = new SplClassLoader('LdapRecord', '../includes/libraries');
     $ad->register();
     $connection = new Connection($config);
@@ -1108,7 +1108,7 @@ 
         $error = $e->getDetailedError();
         return [
             'error' => true,
-            'message' => langHdl('error').' : '.$error->getErrorCode().' - '.$error->getErrorMessage(). '<br>'.$error->getDiagnosticMessage().' '.$config['username'],
+            'message' => langHdl('error').' : '.$error->getErrorCode().' - '.$error->getErrorMessage().'<br>'.$error->getDiagnosticMessage().' '.$config['username'],
 
         ];
     }
@@ -1136,7 +1136,7 @@ 
     }
 
     // load passwordLib library
-    $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+    $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'].'/includes/libraries');
     $pwdlib->register();
     $pwdlib = new PasswordLib\PasswordLib();
     $hashedPassword = $pwdlib->createPasswordHash($passwordClear);
@@ -1195,7 +1195,7 @@ 
 function yubicoMFACheck($dataReceived, string $userInfo, array $SETTINGS): array
 {
     // Load superGlobals
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
     $sessionAdmin = $superGlobal->get('user_admin', 'SESSION');
     $sessionUrl = $superGlobal->get('initial_url', 'SESSION');
@@ -1234,7 +1234,7 @@ 
     }
 
     // Now check yubico validity
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/Yubico/Yubico.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/Yubico/Yubico.php';
     $yubi = new Auth_Yubico($yubico_user_id, $yubico_user_key);
     $auth = $yubi->verify($yubico_key);
     //, null, null, null, 60
@@ -1286,7 +1286,7 @@ 
             'gestionnaire' => '0',
             'can_manage_all_users' => '0',
             'personal_folder' => $SETTINGS['enable_pf_feature'] === '1' ? '1' : '0',
-            'fonction_id' => (empty($retLDAP['user_info_from_ad'][0]['commonGroupsLdapVsTeampass']) === false ? $retLDAP['user_info_from_ad'][0]['commonGroupsLdapVsTeampass'] . ';' : '') . (isset($SETTINGS['ldap_new_user_role']) === true ? $SETTINGS['ldap_new_user_role'] : '0'),
+            'fonction_id' => (empty($retLDAP['user_info_from_ad'][0]['commonGroupsLdapVsTeampass']) === false ? $retLDAP['user_info_from_ad'][0]['commonGroupsLdapVsTeampass'].';' : '').(isset($SETTINGS['ldap_new_user_role']) === true ? $SETTINGS['ldap_new_user_role'] : '0'),
             'groupes_interdits' => '',
             'groupes_visibles' => '',
             'last_pw_change' => (int) time(),
@@ -1311,7 +1311,7 @@ 
             ]
         );
         // Rebuild tree
-        $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+        $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries');
         $tree->register();
         $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
         $tree->rebuild();
@@ -1342,13 +1342,13 @@ 
         && empty($dataReceived['GACode']) === false
     ) {
         // Load superGlobals
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
         $superGlobal = new protect\SuperGlobal\SuperGlobal();
         $sessionAdmin = $superGlobal->get('user_admin', 'SESSION');
         $sessionUrl = $superGlobal->get('initial_url', 'SESSION');
         $sessionPwdAttempts = $superGlobal->get('pwd_attempts', 'SESSION');
         // load library
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php';
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php';
         // create new instance
         $tfa = new Authentication\TwoFactorAuth\TwoFactorAuth($SETTINGS['ga_website_name']);
         // Init
@@ -1370,7 +1370,7 @@ 
             $mfaMessage = langHdl('ga_flash_qr_and_login');
             // generate new QR
             $new_2fa_qr = $tfa->getQRCodeImageAsDataUri(
-                'Teampass - ' . $username,
+                'Teampass - '.$username,
                 $userInfo['ga']
             );
             // clear temporary code from DB
@@ -1383,7 +1383,7 @@ 
                 $userInfo['id']
             );
             $firstTime = [
-                'value' => '<img src="' . $new_2fa_qr . '">',
+                'value' => '<img src="'.$new_2fa_qr.'">',
                 'user_admin' => isset($sessionAdmin) ? (int) $sessionAdmin : '',
                 'initial_url' => isset($sessionUrl) === true ? $sessionUrl : '',
                 'pwd_attempts' => (int) $sessionPwdAttempts,
@@ -1434,8 +1434,8 @@ 
     // Set to false
     $userPasswordVerified = false;
     // load passwordLib library
-    include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
-    $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+    include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
+    $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'].'/includes/libraries');
     $pwdlib->register();
     $pwdlib = new PasswordLib\PasswordLib();
     // Check if old encryption used
@@ -1566,7 +1566,7 @@ 
     // Brute force management
     if ($sessionPwdAttempts > 3) {
         // Load superGlobals
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
         $superGlobal = new protect\SuperGlobal\SuperGlobal();
         $superGlobal->put('next_possible_pwd_attempts', time() + 10, 'SESSION');
         $superGlobal->put('pwd_attempts', 0, 'SESSION');
@@ -1608,7 +1608,7 @@ 
     // Check if user exists
     $userInfo = DB::queryFirstRow(
         'SELECT *
-        FROM ' . prefixTable('users') . ' WHERE login=%s',
+        FROM ' . prefixTable('users').' WHERE login=%s',
         $username
     );