nilsteampassnet / TeamPass

scripts/install-cli.php

Spacing +15 added lines, -15 removed lines

@@ -74,7 +74,7 @@ 
     ]);
     echo "      ✅ Database connection successful\n\n";
 } catch (PDOException $e) {
-    echo "      ❌ Database connection failed: " . $e->getMessage() . "\n";
+    echo "      ❌ Database connection failed: ".$e->getMessage()."\n";
     exit(1);
 }
 
@@ -85,15 +85,15 @@ 
     $pdo->exec("USE `{$dbName}`");
     echo "      ✅ Database created/selected\n\n";
 } catch (PDOException $e) {
-    echo "      ❌ Database creation failed: " . $e->getMessage() . "\n";
+    echo "      ❌ Database creation failed: ".$e->getMessage()."\n";
     exit(1);
 }
 
 // Step 3: Create settings.php file
 echo "[3/6] Creating settings.php configuration file...\n";
 try {
-    $settingsTemplate = BASE_PATH . '/includes/config/settings.sample.php';
-    $settingsPath = BASE_PATH . '/includes/config/settings.php';
+    $settingsTemplate = BASE_PATH.'/includes/config/settings.sample.php';
+    $settingsPath = BASE_PATH.'/includes/config/settings.php';
 
     if (!file_exists($settingsTemplate)) {
         throw new Exception("Template file not found: {$settingsTemplate}");
@@ -130,17 +130,17 @@ 
 
     echo "      ✅ Settings file created\n\n";
 } catch (Exception $e) {
-    echo "      ❌ Settings creation failed: " . $e->getMessage() . "\n";
+    echo "      ❌ Settings creation failed: ".$e->getMessage()."\n";
     exit(1);
 }
 
 // Step 4: Import database schema
 echo "[4/6] Importing database schema...\n";
 try {
-    $installDir = BASE_PATH . '/install';
+    $installDir = BASE_PATH.'/install';
     $schemaFiles = [
-        $installDir . '/database/tables.sql',
-        $installDir . '/database/initial-data.sql',
+        $installDir.'/database/tables.sql',
+        $installDir.'/database/initial-data.sql',
     ];
 
     foreach ($schemaFiles as $schemaFile) {
@@ -159,33 +159,33 @@ 
                 }
             }
 
-            echo "      ✅ Imported: " . basename($schemaFile) . "\n";
+            echo "      ✅ Imported: ".basename($schemaFile)."\n";
         } else {
-            echo "      ⚠️  Schema file not found: " . basename($schemaFile) . " (continuing...)\n";
+            echo "      ⚠️  Schema file not found: ".basename($schemaFile)." (continuing...)\n";
         }
     }
 
     echo "      ✅ Database schema imported\n\n";
 } catch (PDOException $e) {
     echo "      ⚠️  Note: This is a simplified installer. Full schema import should be done via web installer.\n";
-    echo "      Error details: " . $e->getMessage() . "\n\n";
+    echo "      Error details: ".$e->getMessage()."\n\n";
 }
 
 // Step 5: Create saltkey
 echo "[5/6] Generating encryption saltkey...\n";
 try {
-    $skDir = BASE_PATH . '/sk';
+    $skDir = BASE_PATH.'/sk';
     if (!is_dir($skDir)) {
         mkdir($skDir, 0700, true);
     }
 
     $saltkey = bin2hex(random_bytes(32));
-    file_put_contents($skDir . '/sk.txt', $saltkey);
-    chmod($skDir . '/sk.txt', 0400);
+    file_put_contents($skDir.'/sk.txt', $saltkey);
+    chmod($skDir.'/sk.txt', 0400);
 
     echo "      ✅ Saltkey generated\n\n";
 } catch (Exception $e) {
-    echo "      ❌ Saltkey generation failed: " . $e->getMessage() . "\n";
+    echo "      ❌ Saltkey generation failed: ".$e->getMessage()."\n";
     exit(1);
 }
 

sources/admin.queries.php

Spacing +193 added lines, -193 removed lines

@@ -72,7 +72,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('admin') === false) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -133,14 +133,14 @@ 
             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_' . DB_NAME];
+            $tables[] = $row['Tables_in_'.DB_NAME];
         }
 
         //cycle through
@@ -148,7 +148,7 @@ 
             if (defined('DB_PREFIX') || substr_count($table, DB_PREFIX) > 0) {
                 $table = (is_string($table) ? $table : strval($table));
                 // Do query
-                $result = DB::query('SELECT * FROM ' . $table);
+                $result = DB::query('SELECT * FROM '.$table);
                 DB::query(
                     'SELECT *
                     FROM INFORMATION_SCHEMA.COLUMNS
@@ -160,20 +160,20 @@ 
                 $numFields = DB::count();
 
                 // prepare a drop table
-                $return .= 'DROP TABLE ' . $table . ';';
-                $row2 = DB::queryFirstRow('SHOW CREATE TABLE ' . $table);
-                $return .= "\n\n" . strval($row2['Create Table']) . ";\n\n";
+                $return .= 'DROP TABLE '.$table.';';
+                $row2 = DB::queryFirstRow('SHOW CREATE TABLE '.$table);
+                $return .= "\n\n".strval($row2['Create Table']).";\n\n";
 
                 //prepare all fields and datas
                 for ($i = 0; $i < $numFields; ++$i) {
                     if (is_object($result)) {
                         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';
                                 }
@@ -194,8 +194,8 @@ 
             $token = GenerateCryptKey(20, false, true, true, false, true);
 
             //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);
@@ -207,16 +207,16 @@ 
                 // 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,
                     $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
                 );
             }
 
@@ -226,7 +226,7 @@ 
             //update LOG
             logEvents($SETTINGS, 'admin_action', 'dataBase backup', (string) $session->get('user-id'), $session->get('user-login'));
 
-            echo '[{"result":"db_backup" , "href":"sources/downloadFile.php?name=' . urlencode($filename) . '&sub=files&file=' . $filename . '&type=sql&key=' . $session->get('key') . '&key_tmp=' . $session->get('user-key_tmp') . '&pathIsFiles=1"}]';
+            echo '[{"result":"db_backup" , "href":"sources/downloadFile.php?name='.urlencode($filename).'&sub=files&file='.$filename.'&type=sql&key='.$session->get('key').'&key_tmp='.$session->get('user-key_tmp').'&pathIsFiles=1"}]';
         }
         break;
 
@@ -255,7 +255,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]);
@@ -264,7 +264,7 @@ 
         // Get filename from database
         $data = DB::queryFirstRow(
             'SELECT valeur
-            FROM ' . prefixTable('misc') . '
+            FROM ' . prefixTable('misc').'
             WHERE increment_id = %i',
             $file
         );
@@ -283,8 +283,8 @@ 
             // 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,
                 $key
             );
 
@@ -295,10 +295,10 @@ 
             }
 
             // 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
@@ -315,7 +315,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":""}]';
@@ -354,8 +354,8 @@ 
                 $tablename = (is_string($tablename) ? $tablename : strval($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.'`');
                 }
             }
         }
@@ -363,12 +363,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'
             );
@@ -376,7 +376,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(
@@ -406,8 +406,8 @@ 
         echo prepareExchangedData(
             array(
                 'error' => false,
-                'message' => $lang->get('last_execution') . ' ' .
-                    date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) time()) .
+                'message' => $lang->get('last_execution').' '.
+                    date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) time()).
                     '<i class="fas fa-check text-success ml-2"></i>',
             ),
             'encode'
@@ -443,7 +443,7 @@ 
             break;
         }
 
-        require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
         updateCacheTable('reload', NULL);
 
         // Log
@@ -459,8 +459,8 @@ 
         echo prepareExchangedData(
             [
                 'error' => false,
-                'message' => $lang->get('last_execution') . ' ' .
-                    date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) time()) .
+                'message' => $lang->get('last_execution').' '.
+                    date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) time()).
                     '<i class="fas fa-check text-success mr-2"></i>',
             ],
             'encode'
@@ -502,7 +502,7 @@ 
         $session->set('user-reencrypt_old_salt', file_get_contents(SECUREPATH.'/'.SECUREFILE));
 
         // generate new saltkey
-        $old_sk_filename = SECUREPATH.'/'.SECUREFILE . date('Y_m_d', mktime(0, 0, 0, (int) date('m'), (int) date('d'), (int) date('y'))) . '.' . time();
+        $old_sk_filename = SECUREPATH.'/'.SECUREFILE.date('Y_m_d', mktime(0, 0, 0, (int) date('m'), (int) date('d'), (int) date('y'))).'.'.time();
         copy(
             SECUREPATH.'/'.SECUREFILE,
             $old_sk_filename
@@ -531,13 +531,13 @@ 
         logEvents($SETTINGS, 'system', 'change_salt_key', (string) $session->get('user-id'), $session->get('user-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,
@@ -565,7 +565,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);
@@ -652,7 +652,7 @@ 
                 echo prepareExchangedData(
                     array(
                         'error' => true,
-                        'message' => 'Input `' . $objects[0] . '` is not allowed',
+                        'message' => 'Input `'.$objects[0].'` is not allowed',
                         'nbOfItems' => '',
                         'nextAction' => '',
                     ),
@@ -665,9 +665,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) {
@@ -679,7 +679,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',
                         )
@@ -728,9 +728,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) {
@@ -742,7 +742,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',
                         )
@@ -770,7 +770,7 @@ 
                         DB::update(
                             prefixTable('log_items'),
                             array(
-                                'raison' => 'at_pw :' . $encrypt['string'],
+                                'raison' => 'at_pw :'.$encrypt['string'],
                                 'encryption_type' => 'defuse',
                             ),
                             'increment_id = %i',
@@ -795,8 +795,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
@@ -807,7 +807,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',
                         )
@@ -855,9 +855,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
@@ -875,20 +875,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
                             );
                         }
 
@@ -896,22 +896,22 @@ 
                         // 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'
                         );
 
                         // 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']
                         );
 
                         // 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(
@@ -937,13 +937,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 {
@@ -1063,12 +1063,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']
                         );
                     }
                 }
@@ -1087,7 +1087,7 @@ 
         }
 
         // 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(
@@ -1130,17 +1130,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;
@@ -1171,7 +1171,7 @@ 
                 'encode'
             );
         } else {
-            require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+            require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
             //send email
             $emailSettings = new EmailSettings($SETTINGS);
@@ -1209,13 +1209,13 @@ 
             break;
         }
 
-        include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
         $emailSettings = new EmailSettings($SETTINGS);
         $emailService = new EmailService();
 
         $rows = DB::query(
             'SELECT *
-            FROM ' . prefixTable('emails') . '
+            FROM ' . prefixTable('emails').'
             WHERE status = %s OR status = %s',
             'not_sent',
             ''
@@ -1301,13 +1301,13 @@ 
             break;
         }
 
-        include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
         // Instatiate email settings and service
         $emailSettings = new EmailSettings($SETTINGS);
         $emailService = new EmailService();
 
-        $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
             $email = $emailService->sendMail(
@@ -1376,7 +1376,7 @@ 
             break;
         }
 
-        require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
         // init
         $filesList = array();
@@ -1389,7 +1389,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')
@@ -1454,8 +1454,8 @@ 
         $post_list = filter_var_array($post_list, FILTER_SANITIZE_FULL_SPECIAL_CHARS);
         $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;
@@ -1468,33 +1468,33 @@ 
                 // 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'],
                         );
                         // 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'],
                         );
                     }
                     // 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
@@ -1529,8 +1529,8 @@ 
                 $post_option === 'attachments-decrypt' ? 'clear' : 'encrypted'
             );
 
-            $message = $lang->get('last_execution') . ' ' .
-                date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) time()) .
+            $message = $lang->get('last_execution').' '.
+                date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) time()).
                 '<i class="fas fa-check text-success ml-2 mr-3"></i>';
         }
 
@@ -1620,7 +1620,7 @@ 
             $post_id = filter_var($dataReceived['id'], FILTER_SANITIZE_NUMBER_INT);
 
             DB::query(
-                'DELETE FROM ' . prefixTable('api') . ' WHERE increment_id = %i',
+                'DELETE FROM '.prefixTable('api').' WHERE increment_id = %i',
                 $post_id
             );
         }
@@ -1715,7 +1715,7 @@ 
             // Delete existing key
         } elseif (null !== $post_action && $post_action === 'delete') {
             $post_id = filter_var($dataReceived['id'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
-            DB::query('DELETE FROM ' . prefixTable('api') . ' WHERE increment_id=%i', $post_id);
+            DB::query('DELETE FROM '.prefixTable('api').' WHERE increment_id=%i', $post_id);
         }
 
         echo prepareExchangedData(
@@ -1730,7 +1730,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(
@@ -1759,7 +1759,7 @@ 
 
     case 'run_duo_config_check':
         //Libraries call
-        require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
         // Check KEY
         if ($post_key !== $session->get('key')) {
             echo prepareExchangedData(
@@ -1865,7 +1865,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(
@@ -1893,7 +1893,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(
@@ -1923,7 +1923,7 @@ 
         }
 
         // send data
-        echo '[{"result" : "' . addslashes($lang['done']) . '" , "error" : ""}]';
+        echo '[{"result" : "'.addslashes($lang['done']).'" , "error" : ""}]';
         break;
 
     case 'save_agses_options':
@@ -1946,7 +1946,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(
@@ -1977,7 +1977,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(
@@ -2008,7 +2008,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(
@@ -2038,7 +2038,7 @@ 
         }
 
         // send data
-        echo '[{"result" : "' . addslashes($lang['done']) . '" , "error" : ""}]';
+        echo '[{"result" : "'.addslashes($lang['done']).'" , "error" : ""}]';
         break;
 
     case 'save_option_change':
@@ -2079,7 +2079,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',
             'admin',
             $post_field
@@ -2102,7 +2102,7 @@ 
                     array(
                         'valeur' => time(),
                         'type' => 'admin',
-                        'intitule' => $post_field . '_time',
+                        'intitule' => $post_field.'_time',
                         'updated_at' => time(),
                     )
                 );
@@ -2124,10 +2124,10 @@ 
             if ($post_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',
                     'admin',
-                    $post_field . '_time'
+                    $post_field.'_time'
                 );
                 $counter = DB::count();
                 if ($counter === 0) {
@@ -2136,7 +2136,7 @@ 
                         array(
                             'valeur' => 0,
                             'type' => 'admin',
-                            'intitule' => $post_field . '_time',
+                            'intitule' => $post_field.'_time',
                             'created_at' => time(),
                         )
                     );
@@ -2158,13 +2158,13 @@ 
         // special Cases
         if ($post_field === 'cpassman_url') {
             // update also jsUrl for CSFP protection
-            $jsUrl = $post_value . '/includes/libraries/csrfp/js/csrfprotector.js';
+            $jsUrl = $post_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_FULL_SPECIAL_CHARS) . '",', $data);
+            $newdata = str_replace($line, '"jsUrl" => "'.filter_var($jsUrl, FILTER_SANITIZE_FULL_SPECIAL_CHARS).'",', $data);
             file_put_contents($csrfp_file, $newdata);
         } elseif ($post_field === 'restricted_to_input' && (int) $post_value === 0) {
             DB::update(
@@ -2183,7 +2183,7 @@ 
         echo prepareExchangedData(
             array(
                 'error' => false,
-                'misc' => $counter . ' ; ' . $SETTINGS[$post_field],
+                'misc' => $counter.' ; '.$SETTINGS[$post_field],
                 'message' => empty($post_translate) === false ? $lang->get($post_translate) : '',
             ),
             'encode'
@@ -2226,7 +2226,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(
@@ -2257,7 +2257,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(
@@ -2303,7 +2303,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 {
@@ -2364,7 +2364,7 @@ 
 
         $rows = DB::query(
             'SELECT id, title
-                FROM ' . prefixTable('roles_title') . '
+                FROM ' . prefixTable('roles_title').'
                 ORDER BY title ASC'
         );
         foreach ($rows as $record) {
@@ -2496,7 +2496,7 @@ 
 
         $ignoredFiles = DB::queryFirstField(
             'SELECT valeur 
-            FROM ' . prefixTable('misc') . ' 
+            FROM ' . prefixTable('misc').' 
             WHERE type = %s AND intitule = %s',
             'admin',
             'ignored_unknown_files'
@@ -2539,7 +2539,7 @@ 
         // Get ignored unknown files
         $existingData = DB::queryFirstRow(
             'SELECT valeur 
-            FROM ' . prefixTable('misc') . ' 
+            FROM ' . prefixTable('misc').' 
             WHERE type = %s AND intitule = %s',
             'admin',
             'ignored_unknown_files'
@@ -2596,7 +2596,7 @@ 
         // Get the list of files to delete
         $filesToDelete = DB::queryFirstField(
             'SELECT valeur 
-            FROM ' . prefixTable('misc') . ' 
+            FROM ' . prefixTable('misc').' 
             WHERE type = %s AND intitule = %s',
             'admin',
             'unknown_files'
@@ -2642,7 +2642,7 @@ 
         // Get some TP USER info
         $userInfo = DB::queryFirstRow(
             'SELECT id, public_key, private_key, pw
-            FROM ' . prefixTable('users') . ' 
+            FROM ' . prefixTable('users').' 
             WHERE id = %i',
             TP_USER_ID,
         );
@@ -2688,8 +2688,8 @@ 
 
         $users = DB::query(
             'SELECT u.id, u.public_key, a.increment_id
-            FROM ' . prefixTable('users') . ' AS u
-            LEFT JOIN ' . prefixTable('api') . ' AS a 
+            FROM ' . prefixTable('users').' AS u
+            LEFT JOIN ' . prefixTable('api').' AS a 
                 ON a.user_id = u.id AND a.type = %s
             WHERE u.disabled = %i AND u.deleted_at IS NULL AND u.public_key IS NOT NULL AND u.admin = %i
             ORDER BY u.login ASC',
@@ -2793,40 +2793,40 @@ 
     
     // Users statistics
     $usersActive = DB::queryFirstField(
-        'SELECT COUNT(*) FROM ' . prefixTable('users') . ' 
+        'SELECT COUNT(*) FROM '.prefixTable('users').' 
         WHERE disabled = %i AND deleted_at IS NULL',
         0
     );
     
     $usersOnline = DB::queryFirstField(
-        'SELECT COUNT(*) FROM ' . prefixTable('users') . ' 
+        'SELECT COUNT(*) FROM '.prefixTable('users').' 
         WHERE session_end > %i AND disabled = %i',
         time(),
         0
     );
     
     $usersBlocked = DB::queryFirstField(
-        'SELECT COUNT(*) FROM ' . prefixTable('users') . ' 
+        'SELECT COUNT(*) FROM '.prefixTable('users').' 
         WHERE disabled = %i AND deleted_at IS NULL',
         1
     );
     
     // Items statistics
     $itemsTotal = DB::queryFirstField(
-        'SELECT COUNT(*) FROM ' . prefixTable('items') . ' 
+        'SELECT COUNT(*) FROM '.prefixTable('items').' 
         WHERE inactif = %i AND deleted_at IS NULL',
         0
     );
     
     $itemsShared = DB::queryFirstField(
-        'SELECT COUNT(*) FROM ' . prefixTable('items') . ' 
+        'SELECT COUNT(*) FROM '.prefixTable('items').' 
         WHERE inactif = %i AND perso = %i AND deleted_at IS NULL',
         0,
         0
     );
     
     $itemsPersonal = DB::queryFirstField(
-        'SELECT COUNT(*) FROM ' . prefixTable('items') . ' 
+        'SELECT COUNT(*) FROM '.prefixTable('items').' 
         WHERE inactif = %i AND perso = %i AND deleted_at IS NULL',
         0,
         1
@@ -2834,17 +2834,17 @@ 
     
     // Folders statistics
     $foldersTotal = DB::queryFirstField(
-        'SELECT COUNT(*) FROM ' . prefixTable('nested_tree')
+        'SELECT COUNT(*) FROM '.prefixTable('nested_tree')
     );
     
     $foldersPublic = DB::queryFirstField(
-        'SELECT COUNT(*) FROM ' . prefixTable('nested_tree') . ' 
+        'SELECT COUNT(*) FROM '.prefixTable('nested_tree').' 
         WHERE personal_folder = %i',
         0
     );
     
     $foldersPersonal = DB::queryFirstField(
-        'SELECT COUNT(*) FROM ' . prefixTable('nested_tree') . ' 
+        'SELECT COUNT(*) FROM '.prefixTable('nested_tree').' 
         WHERE personal_folder = %i',
         1
     );
@@ -2853,20 +2853,20 @@ 
     $timestamp24h = time() - 86400;
     
     $logsActions = DB::queryFirstField(
-        'SELECT COUNT(*) FROM ' . prefixTable('log_items') . ' 
+        'SELECT COUNT(*) FROM '.prefixTable('log_items').' 
         WHERE date > %i',
         $timestamp24h
     );
     
     $logsAccesses = DB::queryFirstField(
-        'SELECT COUNT(*) FROM ' . prefixTable('log_items') . ' 
+        'SELECT COUNT(*) FROM '.prefixTable('log_items').' 
         WHERE date > %i AND action = %s',
         $timestamp24h,
         'at_shown'
     );
     
     $logsErrors = DB::queryFirstField(
-        'SELECT COUNT(*) FROM ' . prefixTable('log_system') . ' 
+        'SELECT COUNT(*) FROM '.prefixTable('log_system').' 
         WHERE date > %i AND type = %s',
         $timestamp24h,
         'error'
@@ -2923,9 +2923,9 @@ 
     
     $activities = DB::query(
         'SELECT l.date, l.id_user, u.login, l.action, l.raison, l.id_item, i.label 
-        FROM ' . prefixTable('log_items') . ' AS l
-        LEFT JOIN ' . prefixTable('users') . ' AS u ON l.id_user = u.id
-        LEFT JOIN ' . prefixTable('items') . ' AS i ON l.id_item = i.id
+        FROM ' . prefixTable('log_items').' AS l
+        LEFT JOIN ' . prefixTable('users').' AS u ON l.id_user = u.id
+        LEFT JOIN ' . prefixTable('items').' AS i ON l.id_item = i.id
         WHERE l.date > %i
         ORDER BY l.date DESC
         LIMIT 10',
@@ -2999,13 +2999,13 @@ 
         
     // Tasks queue count
     $tasksQueue = DB::queryFirstField(
-        'SELECT COUNT(*) FROM ' . prefixTable('background_tasks') . ' 
+        'SELECT COUNT(*) FROM '.prefixTable('background_tasks').' 
         WHERE finished_at IS NULL OR finished_at = 0'
     );
     
     // Last cron execution
     $lastCronLog = DB::queryFirstRow(
-        'SELECT created_at FROM ' . prefixTable('background_tasks_logs') . ' 
+        'SELECT created_at FROM '.prefixTable('background_tasks_logs').' 
         ORDER BY created_at DESC 
         LIMIT 1'
     );
@@ -3014,13 +3014,13 @@ 
     if ($lastCronLog && isset($lastCronLog['created_at'])) {
         $timeDiff = time() - (int) $lastCronLog['created_at'];
         if ($timeDiff < 60) {
-            $lastCronText = $timeDiff . 's ' . $lang->get('ago');
+            $lastCronText = $timeDiff.'s '.$lang->get('ago');
         } elseif ($timeDiff < 3600) {
-            $lastCronText = floor($timeDiff / 60) . 'm ' . $lang->get('ago');
+            $lastCronText = floor($timeDiff / 60).'m '.$lang->get('ago');
         } elseif ($timeDiff < 86400) {
-            $lastCronText = floor($timeDiff / 3600) . 'h ' . $lang->get('ago');
+            $lastCronText = floor($timeDiff / 3600).'h '.$lang->get('ago');
         } else {
-            $lastCronText = floor($timeDiff / 86400) . 'd ' . $lang->get('ago');
+            $lastCronText = floor($timeDiff / 86400).'d '.$lang->get('ago');
         }
     }
     
@@ -3056,14 +3056,14 @@ 
     $encryptionText = $lang->get('health_status_ok');
     
     // Check if secure file exists
-    if (isset($SETTINGS['securepath']) && isset($SETTINGS['securefile']) && !file_exists($SETTINGS['securepath'] . DIRECTORY_SEPARATOR . $SETTINGS['securefile'])) {
+    if (isset($SETTINGS['securepath']) && isset($SETTINGS['securefile']) && !file_exists($SETTINGS['securepath'].DIRECTORY_SEPARATOR.$SETTINGS['securefile'])) {
         $encryptionStatus = 'danger';
         $encryptionText = $lang->get('health_secure_file_missing');
     }
     
     // Active sessions count
     $sessionsCount = DB::queryFirstField(
-        'SELECT COUNT(*) FROM ' . prefixTable('users') . ' 
+        'SELECT COUNT(*) FROM '.prefixTable('users').' 
         WHERE session_end > %i',
         time()
     );
@@ -3071,7 +3071,7 @@ 
     // Is cron installed
     DB::query(
         'SELECT valeur
-        FROM ' . prefixTable('misc') . '
+        FROM ' . prefixTable('misc').'
         WHERE type = %s AND intitule = %s and valeur >= %d',
         'admin',
         'last_cron_exec',
@@ -3084,7 +3084,7 @@ 
     } else {
         // Cron check (last execution should be < 2 minutes ago)
         $lastCron = DB::queryFirstField(
-            'SELECT created_at FROM ' . prefixTable('background_tasks_logs') . ' 
+            'SELECT created_at FROM '.prefixTable('background_tasks_logs').' 
             ORDER BY created_at DESC 
             LIMIT 1'
         );
@@ -3100,7 +3100,7 @@ 
     
     // Unknown files count
     $unknownFilesData = DB::queryFirstField(
-        'SELECT valeur FROM ' . prefixTable('misc') . ' 
+        'SELECT valeur FROM '.prefixTable('misc').' 
         WHERE type = %s AND intitule = %s',
         'admin',
         'unknown_files'
@@ -3180,7 +3180,7 @@ 
         'clean_old_logs',
         (string) $session->get('user-id'),
         $session->get('user-login'),
-        'Cleaned ' . $totalDeleted . ' old log entries'
+        'Cleaned '.$totalDeleted.' old log entries'
     );
     
     echo prepareExchangedData(
@@ -3209,21 +3209,21 @@ 
     
     try {
         // Test string
-        $testString = 'TeamPass Encryption Test ' . time();
+        $testString = 'TeamPass Encryption Test '.time();
         
         // Get encryption key
-        $key = file_get_contents($SETTINGS['securepath'] . DIRECTORY_SEPARATOR . $SETTINGS['securefile']);
+        $key = file_get_contents($SETTINGS['securepath'].DIRECTORY_SEPARATOR.$SETTINGS['securefile']);
         
         if ($key === false) {
             throw new Exception($lang->get('admin_encryption_key_not_found'));
         }
         
         // Use Defuse encryption (TeamPass's current encryption method)
-        require_once $SETTINGS['cpassman_dir'] . '/vendor/defuse/php-encryption/src/Exception/EnvironmentIsBrokenException.php';
-        require_once $SETTINGS['cpassman_dir'] . '/vendor/defuse/php-encryption/src/Exception/BadFormatException.php';
-        require_once $SETTINGS['cpassman_dir'] . '/vendor/defuse/php-encryption/src/Exception/WrongKeyOrModifiedCiphertextException.php';
-        require_once $SETTINGS['cpassman_dir'] . '/vendor/defuse/php-encryption/src/Crypto.php';
-        require_once $SETTINGS['cpassman_dir'] . '/vendor/defuse/php-encryption/src/Key.php';
+        require_once $SETTINGS['cpassman_dir'].'/vendor/defuse/php-encryption/src/Exception/EnvironmentIsBrokenException.php';
+        require_once $SETTINGS['cpassman_dir'].'/vendor/defuse/php-encryption/src/Exception/BadFormatException.php';
+        require_once $SETTINGS['cpassman_dir'].'/vendor/defuse/php-encryption/src/Exception/WrongKeyOrModifiedCiphertextException.php';
+        require_once $SETTINGS['cpassman_dir'].'/vendor/defuse/php-encryption/src/Crypto.php';
+        require_once $SETTINGS['cpassman_dir'].'/vendor/defuse/php-encryption/src/Key.php';
         
         $encryptionKey = \Defuse\Crypto\Key::loadFromAsciiSafeString($key);
         
@@ -3280,7 +3280,7 @@ 
     
     // Set headers for CSV download
     header('Content-Type: text/csv; charset=utf-8');
-    header('Content-Disposition: attachment; filename="teampass_statistics_' . date('Y-m-d_H-i-s') . '.csv"');
+    header('Content-Disposition: attachment; filename="teampass_statistics_'.date('Y-m-d_H-i-s').'.csv"');
     
     // Create output stream
     $output = fopen('php://output', 'w');
@@ -3293,10 +3293,10 @@ 
     
     // Gather statistics
     $stats = array(
-        $lang->get('active_users') => DB::queryFirstField('SELECT COUNT(*) FROM ' . prefixTable('users') . ' WHERE disabled = 0'),
-        $lang->get('total_items') => DB::queryFirstField('SELECT COUNT(*) FROM ' . prefixTable('items') . ' WHERE inactif = 0'),
-        $lang->get('total_folders') => DB::queryFirstField('SELECT COUNT(*) FROM ' . prefixTable('nested_tree')),
-        $lang->get('logs_24h') => DB::queryFirstField('SELECT COUNT(*) FROM ' . prefixTable('log_items') . ' WHERE date > ' . (time() - 86400)),
+        $lang->get('active_users') => DB::queryFirstField('SELECT COUNT(*) FROM '.prefixTable('users').' WHERE disabled = 0'),
+        $lang->get('total_items') => DB::queryFirstField('SELECT COUNT(*) FROM '.prefixTable('items').' WHERE inactif = 0'),
+        $lang->get('total_folders') => DB::queryFirstField('SELECT COUNT(*) FROM '.prefixTable('nested_tree')),
+        $lang->get('logs_24h') => DB::queryFirstField('SELECT COUNT(*) FROM '.prefixTable('log_items').' WHERE date > '.(time() - 86400)),
     );
     
     // Write statistics
@@ -3336,9 +3336,9 @@ 
             COUNT(*) as total_users,
             SUM(CASE WHEN personal_items_migrated = 1 THEN 1 ELSE 0 END) as migrated_users,
             SUM(CASE WHEN personal_items_migrated = 0 THEN 1 ELSE 0 END) as pending_users
-        FROM " . prefixTable('users') . "
+        FROM " . prefixTable('users')."
         WHERE disabled = 0 AND deleted_at IS NULL AND id NOT IN %li",
-        [TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID]
+        [TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID]
     );
 
     $progressPercent = ($stats[0]['migrated_users'] / $stats[0]['total_users']) * 100;
@@ -3350,7 +3350,7 @@ 
         WHERE personal_items_migrated = 0
         AND disabled = 0 AND deleted_at IS NULL AND id NOT IN %li
         ORDER BY last_connexion DESC",
-        [TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID]
+        [TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID]
     );
 
     // Get users ready
@@ -3360,7 +3360,7 @@ 
         WHERE personal_items_migrated = 1
         AND disabled = 0 AND deleted_at IS NULL AND id NOT IN %li
         ORDER BY last_connexion DESC",
-        [TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID]
+        [TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID]
     );
 
     return [
@@ -3384,7 +3384,7 @@ 
 {
     // Count auto-recoveries in last 24h
     $autoRecoveriesLast24h = DB::queryFirstField(
-        'SELECT COUNT(*) FROM ' . prefixTable('log_system') . '
+        'SELECT COUNT(*) FROM '.prefixTable('log_system').'
          WHERE label = %s
          AND date > %i',
         'auto_reencryption_success',
@@ -3393,21 +3393,21 @@ 
 
     // Count failed recoveries (all time)
     $failedRecoveries = DB::queryFirstField(
-        'SELECT COUNT(*) FROM ' . prefixTable('log_system') . '
+        'SELECT COUNT(*) FROM '.prefixTable('log_system').'
          WHERE label = %s',
         'auto_reencryption_failed'
     );
 
     // Count critical failures (all time)
     $criticalFailures = DB::queryFirstField(
-        'SELECT COUNT(*) FROM ' . prefixTable('log_system') . '
+        'SELECT COUNT(*) FROM '.prefixTable('log_system').'
          WHERE label = %s',
         'auto_reencryption_critical_failure'
     );
 
     // Count users with transparent recovery enabled (have seed and backup)
     $usersMigrated = DB::queryFirstField(
-        'SELECT COUNT(*) FROM ' . prefixTable('users') . '
+        'SELECT COUNT(*) FROM '.prefixTable('users').'
          WHERE user_derivation_seed IS NOT NULL
          AND private_key_backup IS NOT NULL
          AND disabled = 0'
@@ -3415,7 +3415,7 @@ 
 
     // Count total active users
     $totalUsers = DB::queryFirstField(
-        'SELECT COUNT(*) FROM ' . prefixTable('users') . '
+        'SELECT COUNT(*) FROM '.prefixTable('users').'
          WHERE disabled = 0
          AND private_key IS NOT NULL
          AND private_key != "none"'
@@ -3424,8 +3424,8 @@ 
     // Get recent recovery events (last 10)
     $recentEvents = DB::query(
         'SELECT l.date, l.label, l.qui, u.login
-         FROM ' . prefixTable('log_system') . ' AS l
-         INNER JOIN ' . prefixTable('users') . ' AS u ON u.id = l.qui
+         FROM ' . prefixTable('log_system').' AS l
+         INNER JOIN ' . prefixTable('users').' AS u ON u.id = l.qui
          WHERE l.label IN %ls
          ORDER BY l.date DESC
          LIMIT 10',
@@ -3437,7 +3437,7 @@ 
 
     // Calculate failure rate (last 30 days)
     $totalAttempts30d = DB::queryFirstField(
-        'SELECT COUNT(*) FROM ' . prefixTable('log_system') . '
+        'SELECT COUNT(*) FROM '.prefixTable('log_system').'
          WHERE label IN %ls
          AND date > %i',
         ['auto_reencryption_success', 'auto_reencryption_failed'],
@@ -3445,7 +3445,7 @@ 
     );
 
     $failures30d = DB::queryFirstField(
-        'SELECT COUNT(*) FROM ' . prefixTable('log_system') . '
+        'SELECT COUNT(*) FROM '.prefixTable('log_system').'
          WHERE label = %s
          AND date > %i',
         'auto_reencryption_failed',
@@ -3482,7 +3482,7 @@ 
     $lang = new Language($session->get('user-language') ?? 'english');
 
     $results = [];
-    $fullPath = __DIR__ . '/../';
+    $fullPath = __DIR__.'/../';
     
     foreach ($files as $file) {
         // Normalize path separators for cross-platform compatibility
@@ -3531,7 +3531,7 @@ 
         }
         
         // Try to delete the file
-        $deleteResult = '';//@unlink($normalizedPath);
+        $deleteResult = ''; //@unlink($normalizedPath);
         
         if ($deleteResult) {
             $results[$normalizedPath] = [
@@ -3561,7 +3561,7 @@ 
  */
 function filesIntegrityCheck($baseDir): array
 {
-    $referenceFile = __DIR__ . '/../files_reference.txt';
+    $referenceFile = __DIR__.'/../files_reference.txt';
 
     $unknownFiles = findUnknownFiles($baseDir, $referenceFile);
 
@@ -3599,7 +3599,7 @@ 
                 $dir,
                 FilesystemIterator::SKIP_DOTS
             ),
-            function ($current, $key, $iterator) {
+            function($current, $key, $iterator) {
                 // Ignore hidden files and folders
                 if ($current->getFilename()[0] === '.') {
                     return false;
@@ -3613,7 +3613,7 @@ 
     foreach ($iterator as $file) {
         try {
             if ($file->isFile()) {
-                $relativePath = str_replace($dir . DIRECTORY_SEPARATOR, '', $file->getPathname());
+                $relativePath = str_replace($dir.DIRECTORY_SEPARATOR, '', $file->getPathname());
                 $relativePath = str_replace('\\', '/', $relativePath); // Normalisation Windows/Linux
 
                 // Split relatif path into parts
@@ -3679,7 +3679,7 @@ 
     // Get ignored files
     $ignoredFiles = DB::queryFirstField(
         'SELECT valeur 
-        FROM ' . prefixTable('misc') . ' 
+        FROM ' . prefixTable('misc').' 
         WHERE type = %s AND intitule = %s',
         'admin',
         'ignored_unknown_files'
@@ -3698,7 +3698,7 @@ 
 function tablesIntegrityCheck(): array
 {
     // Get integrity tables file
-    $integrityTablesFile = TEAMPASS_ROOT_PATH . '/includes/tables_integrity.json';
+    $integrityTablesFile = TEAMPASS_ROOT_PATH.'/includes/tables_integrity.json';
     if (file_exists($integrityTablesFile) === false) {
         return [
             'error' => true,
@@ -3716,7 +3716,7 @@ 
     // Get all tables
     $tables = [];
     foreach (DB::queryFirstColumn("SHOW TABLES") as $table) {
-        $tables[] = str_replace(DB_PREFIX, "", $table);;
+        $tables[] = str_replace(DB_PREFIX, "", $table); ;
     }
     // Prepare the integrity check
     $tablesInError = [];
@@ -3782,7 +3782,7 @@ 
 
         // Compare hashes
         $expectedHash = $referenceData[$file];
-        $actualHash = md5_file($baseDir . '/' . $file);
+        $actualHash = md5_file($baseDir.'/'.$file);
 
         if ($expectedHash !== $actualHash) {
             $issues[] = "$file (expected: <i>$expectedHash</i>, actual: <i>$actualHash</i>)";
@@ -3835,7 +3835,7 @@ 
     foreach ($iterator as $file) {
         if ($file->isFile()) {
             // Build relative path
-            $relativePath = str_replace($dir . DIRECTORY_SEPARATOR, '', $file->getPathname());
+            $relativePath = str_replace($dir.DIRECTORY_SEPARATOR, '', $file->getPathname());
             $relativePath = str_replace('\\', '/', $relativePath); // Normalize for Windows
             // Calculate hash
             $files[$relativePath] = md5_file($file->getPathname());
@@ -3865,8 +3865,8 @@ 
     // Loop on items
     $item = DB::queryFirstRow(
         'SELECT i.id, i.pw, s.share_key, s.increment_id
-        FROM ' . prefixTable('items') . ' i
-        INNER JOIN ' . prefixTable('sharekeys_items') . ' s ON i.id = s.object_id
+        FROM ' . prefixTable('items').' i
+        INNER JOIN ' . prefixTable('sharekeys_items').' s ON i.id = s.object_id
         WHERE i.perso = %i
             AND s.user_id = %i
         ORDER BY RAND()
@@ -3895,7 +3895,7 @@ 
         // Get all items in database
         $rows = DB::queryFirstRow(
             'SELECT count(*) as counter
-            FROM ' . prefixTable('sharekeys_items') . ' s
+            FROM ' . prefixTable('sharekeys_items').' s
             WHERE s.user_id = %i',
             TP_USER_ID
         );

Switch Indentation +246 added lines, -246 removed lines

@@ -2904,8 +2904,8 @@ 
 // LIVE ACTIVITY ENDPOINT
 // ========================================
 
-case 'get_live_activity':
-    /**
+    case 'get_live_activity':
+        /**
      * Get recent activity (last 5 minutes, max 10 entries)
      * 
      * @return array [{
@@ -2919,25 +2919,25 @@ 
      * }]
      */
     
-    $timestamp5min = time() - 300; // 5 minutes ago
+        $timestamp5min = time() - 300; // 5 minutes ago
     
-    $activities = DB::query(
-        'SELECT l.date, l.id_user, u.login, l.action, l.raison, l.id_item, i.label 
+        $activities = DB::query(
+            'SELECT l.date, l.id_user, u.login, l.action, l.raison, l.id_item, i.label 
         FROM ' . prefixTable('log_items') . ' AS l
         LEFT JOIN ' . prefixTable('users') . ' AS u ON l.id_user = u.id
         LEFT JOIN ' . prefixTable('items') . ' AS i ON l.id_item = i.id
         WHERE l.date > %i
         ORDER BY l.date DESC
         LIMIT 10',
-        $timestamp5min
-    );
+            $timestamp5min
+        );
     
-    $activityList = array();
+        $activityList = array();
     
-    foreach ($activities as $activity) {
-        // Translate action to readable text
-        $actionText = '';
-        switch ($activity['action']) {
+        foreach ($activities as $activity) {
+            // Translate action to readable text
+            $actionText = '';
+            switch ($activity['action']) {
             case 'at_shown':
                 $actionText = $lang->get('action_accessed');
                 break;
@@ -2961,7 +2961,7 @@ 
                 break;
             default:
                 $actionText = $activity['action'];
-        }
+            }
         
         $activityList[] = array(
             'timestamp' => (int) $activity['date'],
@@ -2987,8 +2987,8 @@ 
 // SYSTEM STATUS ENDPOINT
 // ========================================
 
-case 'get_system_status':
-    /**
+    case 'get_system_status':
+        /**
      * Get system status (tasks queue)
      * 
      * @return array {
@@ -2997,49 +2997,49 @@ 
      * }
      */
         
-    // Tasks queue count
-    $tasksQueue = DB::queryFirstField(
-        'SELECT COUNT(*) FROM ' . prefixTable('background_tasks') . ' 
+        // Tasks queue count
+        $tasksQueue = DB::queryFirstField(
+            'SELECT COUNT(*) FROM ' . prefixTable('background_tasks') . ' 
         WHERE finished_at IS NULL OR finished_at = 0'
-    );
+        );
     
-    // Last cron execution
-    $lastCronLog = DB::queryFirstRow(
-        'SELECT created_at FROM ' . prefixTable('background_tasks_logs') . ' 
+        // Last cron execution
+        $lastCronLog = DB::queryFirstRow(
+            'SELECT created_at FROM ' . prefixTable('background_tasks_logs') . ' 
         ORDER BY created_at DESC 
         LIMIT 1'
-    );
+        );
     
-    $lastCronText = $lang->get('never');
-    if ($lastCronLog && isset($lastCronLog['created_at'])) {
-        $timeDiff = time() - (int) $lastCronLog['created_at'];
-        if ($timeDiff < 60) {
-            $lastCronText = $timeDiff . 's ' . $lang->get('ago');
-        } elseif ($timeDiff < 3600) {
-            $lastCronText = floor($timeDiff / 60) . 'm ' . $lang->get('ago');
-        } elseif ($timeDiff < 86400) {
-            $lastCronText = floor($timeDiff / 3600) . 'h ' . $lang->get('ago');
-        } else {
-            $lastCronText = floor($timeDiff / 86400) . 'd ' . $lang->get('ago');
+        $lastCronText = $lang->get('never');
+        if ($lastCronLog && isset($lastCronLog['created_at'])) {
+            $timeDiff = time() - (int) $lastCronLog['created_at'];
+            if ($timeDiff < 60) {
+                $lastCronText = $timeDiff . 's ' . $lang->get('ago');
+            } elseif ($timeDiff < 3600) {
+                $lastCronText = floor($timeDiff / 60) . 'm ' . $lang->get('ago');
+            } elseif ($timeDiff < 86400) {
+                $lastCronText = floor($timeDiff / 3600) . 'h ' . $lang->get('ago');
+            } else {
+                $lastCronText = floor($timeDiff / 86400) . 'd ' . $lang->get('ago');
+            }
         }
-    }
     
-    echo prepareExchangedData(
-        array(
-            'error' => false,
-            'tasks_queue' => (int) $tasksQueue,
-            'last_cron' => $lastCronText,
-        ),
-        'encode'
-    );
-    break;
+        echo prepareExchangedData(
+            array(
+                'error' => false,
+                'tasks_queue' => (int) $tasksQueue,
+                'last_cron' => $lastCronText,
+            ),
+            'encode'
+        );
+        break;
 
-// ========================================
-// SYSTEM HEALTH ENDPOINT
-// ========================================
+    // ========================================
+    // SYSTEM HEALTH ENDPOINT
+    // ========================================
 
-case 'get_system_health':
-    /**
+    case 'get_system_health':
+        /**
      * Get system health checks
      * 
      * @return array {
@@ -3051,97 +3051,97 @@ 
      * }
      */
     
-    // Encryption check
-    $encryptionStatus = 'success';
-    $encryptionText = $lang->get('health_status_ok');
+        // Encryption check
+        $encryptionStatus = 'success';
+        $encryptionText = $lang->get('health_status_ok');
     
-    // Check if secure file exists
-    if (isset($SETTINGS['securepath']) && isset($SETTINGS['securefile']) && !file_exists($SETTINGS['securepath'] . DIRECTORY_SEPARATOR . $SETTINGS['securefile'])) {
-        $encryptionStatus = 'danger';
-        $encryptionText = $lang->get('health_secure_file_missing');
-    }
+        // Check if secure file exists
+        if (isset($SETTINGS['securepath']) && isset($SETTINGS['securefile']) && !file_exists($SETTINGS['securepath'] . DIRECTORY_SEPARATOR . $SETTINGS['securefile'])) {
+            $encryptionStatus = 'danger';
+            $encryptionText = $lang->get('health_secure_file_missing');
+        }
     
-    // Active sessions count
-    $sessionsCount = DB::queryFirstField(
-        'SELECT COUNT(*) FROM ' . prefixTable('users') . ' 
+        // Active sessions count
+        $sessionsCount = DB::queryFirstField(
+            'SELECT COUNT(*) FROM ' . prefixTable('users') . ' 
         WHERE session_end > %i',
-        time()
-    );
+            time()
+        );
     
-    // Is cron installed
-    DB::query(
-        'SELECT valeur
+        // Is cron installed
+        DB::query(
+            'SELECT valeur
         FROM ' . prefixTable('misc') . '
         WHERE type = %s AND intitule = %s and valeur >= %d',
-        'admin',
-        'last_cron_exec',
-        time() - 600 // max 10 minutes
-    );
+            'admin',
+            'last_cron_exec',
+            time() - 600 // max 10 minutes
+        );
 
-    if (DB::count() === 0) {
-        $cronStatus = 'danger';
-        $cronText = $lang->get('error');
-    } else {
-        // Cron check (last execution should be < 2 minutes ago)
-        $lastCron = DB::queryFirstField(
-            'SELECT created_at FROM ' . prefixTable('background_tasks_logs') . ' 
+        if (DB::count() === 0) {
+            $cronStatus = 'danger';
+            $cronText = $lang->get('error');
+        } else {
+            // Cron check (last execution should be < 2 minutes ago)
+            $lastCron = DB::queryFirstField(
+                'SELECT created_at FROM ' . prefixTable('background_tasks_logs') . ' 
             ORDER BY created_at DESC 
             LIMIT 1'
-        );
+            );
         
-        $cronStatus = 'success';
-        $cronText = $lang->get('health_status_ok');
+            $cronStatus = 'success';
+            $cronText = $lang->get('health_status_ok');
         
-        if (!$lastCron || (time() - (int) $lastCron) > 120) {
-            $cronStatus = 'warning';
-            $cronText = $lang->get('health_cron_delayed');
+            if (!$lastCron || (time() - (int) $lastCron) > 120) {
+                $cronStatus = 'warning';
+                $cronText = $lang->get('health_cron_delayed');
+            }
         }
-    }
     
-    // Unknown files count
-    $unknownFilesData = DB::queryFirstField(
-        'SELECT valeur FROM ' . prefixTable('misc') . ' 
+        // Unknown files count
+        $unknownFilesData = DB::queryFirstField(
+            'SELECT valeur FROM ' . prefixTable('misc') . ' 
         WHERE type = %s AND intitule = %s',
-        'admin',
-        'unknown_files'
-    );
+            'admin',
+            'unknown_files'
+        );
     
-    $unknownFilesCount = 0;
-    if ($unknownFilesData) {
-        $unknownFiles = json_decode($unknownFilesData, true);
-        if (is_array($unknownFiles)) {
-            $unknownFilesCount = count($unknownFiles);
+        $unknownFilesCount = 0;
+        if ($unknownFilesData) {
+            $unknownFiles = json_decode($unknownFilesData, true);
+            if (is_array($unknownFiles)) {
+                $unknownFilesCount = count($unknownFiles);
+            }
         }
-    }
     
-    echo prepareExchangedData(
-        array(
-            'error' => false,
-            'encryption' => array(
-                'status' => $encryptionStatus,
-                'text' => $encryptionText,
-            ),
-            'sessions' => array(
-                'count' => (int) $sessionsCount,
-            ),
-            'cron' => array(
-                'status' => $cronStatus,
-                'text' => $cronText,
-            ),
-            'unknown_files' => array(
-                'count' => $unknownFilesCount,
+        echo prepareExchangedData(
+            array(
+                'error' => false,
+                'encryption' => array(
+                    'status' => $encryptionStatus,
+                    'text' => $encryptionText,
+                ),
+                'sessions' => array(
+                    'count' => (int) $sessionsCount,
+                ),
+                'cron' => array(
+                    'status' => $cronStatus,
+                    'text' => $cronText,
+                ),
+                'unknown_files' => array(
+                    'count' => $unknownFilesCount,
+                ),
             ),
-        ),
-        'encode'
-    );
-    break;
+            'encode'
+        );
+        break;
 
-// ========================================
-// QUICK ACTIONS - CLEAN OLD LOGS
-// ========================================
+    // ========================================
+    // QUICK ACTIONS - CLEAN OLD LOGS
+    // ========================================
 
-case 'clean_old_logs':
-    /**
+    case 'clean_old_logs':
+        /**
      * Clean logs older than 90 days
      * 
      * @return array {
@@ -3151,54 +3151,54 @@ 
      * }
      */
     
-    $threshold = time() - (90 * 86400); // 90 days ago
+        $threshold = time() - (90 * 86400); // 90 days ago
     
-    // Delete old log_items entries
-    DB::delete(
-        prefixTable('log_items'),
-        'date < %i',
-        $threshold
-    );
+        // Delete old log_items entries
+        DB::delete(
+            prefixTable('log_items'),
+            'date < %i',
+            $threshold
+        );
     
-    $deletedItems = DB::affectedRows();
+        $deletedItems = DB::affectedRows();
     
-    // Delete old log_system entries
-    DB::delete(
-        prefixTable('log_system'),
-        'date < %i',
-        $threshold
-    );
+        // Delete old log_system entries
+        DB::delete(
+            prefixTable('log_system'),
+            'date < %i',
+            $threshold
+        );
     
-    $deletedSystem = DB::affectedRows();
+        $deletedSystem = DB::affectedRows();
     
-    $totalDeleted = $deletedItems + $deletedSystem;
+        $totalDeleted = $deletedItems + $deletedSystem;
     
-    // Log the action
-    logEvents(
-        $SETTINGS,
-        'admin_action',
-        'clean_old_logs',
-        (string) $session->get('user-id'),
-        $session->get('user-login'),
-        'Cleaned ' . $totalDeleted . ' old log entries'
-    );
+        // Log the action
+        logEvents(
+            $SETTINGS,
+            'admin_action',
+            'clean_old_logs',
+            (string) $session->get('user-id'),
+            $session->get('user-login'),
+            'Cleaned ' . $totalDeleted . ' old log entries'
+        );
     
-    echo prepareExchangedData(
-        array(
-            'error' => false,
-            'message' => $lang->get('admin_logs_cleaned_success'),
-            'deleted_count' => $totalDeleted,
-        ),
-        'encode'
-    );
-    break;
+        echo prepareExchangedData(
+            array(
+                'error' => false,
+                'message' => $lang->get('admin_logs_cleaned_success'),
+                'deleted_count' => $totalDeleted,
+            ),
+            'encode'
+        );
+        break;
 
-// ========================================
-// QUICK ACTIONS - TEST ENCRYPTION (KEPT FOR COMPATIBILITY)
-// ========================================
+    // ========================================
+    // QUICK ACTIONS - TEST ENCRYPTION (KEPT FOR COMPATIBILITY)
+    // ========================================
 
-case 'test_encryption':
-    /**
+    case 'test_encryption':
+        /**
      * Test encryption system integrity
      * 
      * @return array {
@@ -3207,117 +3207,117 @@ 
      * }
      */
     
-    try {
-        // Test string
-        $testString = 'TeamPass Encryption Test ' . time();
+        try {
+            // Test string
+            $testString = 'TeamPass Encryption Test ' . time();
         
-        // Get encryption key
-        $key = file_get_contents($SETTINGS['securepath'] . DIRECTORY_SEPARATOR . $SETTINGS['securefile']);
+            // Get encryption key
+            $key = file_get_contents($SETTINGS['securepath'] . DIRECTORY_SEPARATOR . $SETTINGS['securefile']);
         
-        if ($key === false) {
-            throw new Exception($lang->get('admin_encryption_key_not_found'));
-        }
+            if ($key === false) {
+                throw new Exception($lang->get('admin_encryption_key_not_found'));
+            }
         
-        // Use Defuse encryption (TeamPass's current encryption method)
-        require_once $SETTINGS['cpassman_dir'] . '/vendor/defuse/php-encryption/src/Exception/EnvironmentIsBrokenException.php';
-        require_once $SETTINGS['cpassman_dir'] . '/vendor/defuse/php-encryption/src/Exception/BadFormatException.php';
-        require_once $SETTINGS['cpassman_dir'] . '/vendor/defuse/php-encryption/src/Exception/WrongKeyOrModifiedCiphertextException.php';
-        require_once $SETTINGS['cpassman_dir'] . '/vendor/defuse/php-encryption/src/Crypto.php';
-        require_once $SETTINGS['cpassman_dir'] . '/vendor/defuse/php-encryption/src/Key.php';
+            // Use Defuse encryption (TeamPass's current encryption method)
+            require_once $SETTINGS['cpassman_dir'] . '/vendor/defuse/php-encryption/src/Exception/EnvironmentIsBrokenException.php';
+            require_once $SETTINGS['cpassman_dir'] . '/vendor/defuse/php-encryption/src/Exception/BadFormatException.php';
+            require_once $SETTINGS['cpassman_dir'] . '/vendor/defuse/php-encryption/src/Exception/WrongKeyOrModifiedCiphertextException.php';
+            require_once $SETTINGS['cpassman_dir'] . '/vendor/defuse/php-encryption/src/Crypto.php';
+            require_once $SETTINGS['cpassman_dir'] . '/vendor/defuse/php-encryption/src/Key.php';
         
-        $encryptionKey = \Defuse\Crypto\Key::loadFromAsciiSafeString($key);
+            $encryptionKey = \Defuse\Crypto\Key::loadFromAsciiSafeString($key);
         
-        // Encrypt test string
-        $encrypted = \Defuse\Crypto\Crypto::encrypt($testString, $encryptionKey);
+            // Encrypt test string
+            $encrypted = \Defuse\Crypto\Crypto::encrypt($testString, $encryptionKey);
         
-        // Decrypt test string
-        $decrypted = \Defuse\Crypto\Crypto::decrypt($encrypted, $encryptionKey);
+            // Decrypt test string
+            $decrypted = \Defuse\Crypto\Crypto::decrypt($encrypted, $encryptionKey);
         
-        // Verify
-        if ($decrypted !== $testString) {
-            throw new Exception($lang->get('admin_encryption_test_failed'));
-        }
+            // Verify
+            if ($decrypted !== $testString) {
+                throw new Exception($lang->get('admin_encryption_test_failed'));
+            }
         
-        // Log the test
-        logEvents(
-            $SETTINGS,
-            'admin_action',
-            'test_encryption',
-            (string) $session->get('user-id'),
-            $session->get('user-login'),
-            'Encryption test successful'
-        );
+            // Log the test
+            logEvents(
+                $SETTINGS,
+                'admin_action',
+                'test_encryption',
+                (string) $session->get('user-id'),
+                $session->get('user-login'),
+                'Encryption test successful'
+            );
         
-        echo prepareExchangedData(
-            array(
-                'error' => false,
-                'message' => $lang->get('admin_encryption_test_success'),
-            ),
-            'encode'
-        );
+            echo prepareExchangedData(
+                array(
+                    'error' => false,
+                    'message' => $lang->get('admin_encryption_test_success'),
+                ),
+                'encode'
+            );
         
-    } catch (Exception $e) {
-        echo prepareExchangedData(
-            array(
-                'error' => true,
-                'message' => $e->getMessage(),
-            ),
-            'encode'
-        );
-    }
-    break;
+        } catch (Exception $e) {
+            echo prepareExchangedData(
+                array(
+                    'error' => true,
+                    'message' => $e->getMessage(),
+                ),
+                'encode'
+            );
+        }
+        break;
 
-// ========================================
-// QUICK ACTIONS - EXPORT STATISTICS
-// ========================================
+    // ========================================
+    // QUICK ACTIONS - EXPORT STATISTICS
+    // ========================================
 
-case 'export_statistics':
-    /**
+    case 'export_statistics':
+        /**
      * Export statistics as CSV file
      * 
      * @return void (file download)
      */
     
-    // Set headers for CSV download
-    header('Content-Type: text/csv; charset=utf-8');
-    header('Content-Disposition: attachment; filename="teampass_statistics_' . date('Y-m-d_H-i-s') . '.csv"');
+        // Set headers for CSV download
+        header('Content-Type: text/csv; charset=utf-8');
+        header('Content-Disposition: attachment; filename="teampass_statistics_' . date('Y-m-d_H-i-s') . '.csv"');
     
-    // Create output stream
-    $output = fopen('php://output', 'w');
+        // Create output stream
+        $output = fopen('php://output', 'w');
     
-    // Write CSV headers
-    fputcsv($output, array(
-        $lang->get('admin_export_metric'),
-        $lang->get('admin_export_value'),
-    ));
+        // Write CSV headers
+        fputcsv($output, array(
+            $lang->get('admin_export_metric'),
+            $lang->get('admin_export_value'),
+        ));
     
-    // Gather statistics
-    $stats = array(
-        $lang->get('active_users') => DB::queryFirstField('SELECT COUNT(*) FROM ' . prefixTable('users') . ' WHERE disabled = 0'),
-        $lang->get('total_items') => DB::queryFirstField('SELECT COUNT(*) FROM ' . prefixTable('items') . ' WHERE inactif = 0'),
-        $lang->get('total_folders') => DB::queryFirstField('SELECT COUNT(*) FROM ' . prefixTable('nested_tree')),
-        $lang->get('logs_24h') => DB::queryFirstField('SELECT COUNT(*) FROM ' . prefixTable('log_items') . ' WHERE date > ' . (time() - 86400)),
-    );
+        // Gather statistics
+        $stats = array(
+            $lang->get('active_users') => DB::queryFirstField('SELECT COUNT(*) FROM ' . prefixTable('users') . ' WHERE disabled = 0'),
+            $lang->get('total_items') => DB::queryFirstField('SELECT COUNT(*) FROM ' . prefixTable('items') . ' WHERE inactif = 0'),
+            $lang->get('total_folders') => DB::queryFirstField('SELECT COUNT(*) FROM ' . prefixTable('nested_tree')),
+            $lang->get('logs_24h') => DB::queryFirstField('SELECT COUNT(*) FROM ' . prefixTable('log_items') . ' WHERE date > ' . (time() - 86400)),
+        );
     
-    // Write statistics
-    foreach ($stats as $metric => $value) {
-        fputcsv($output, array($metric, $value));
-    }
+        // Write statistics
+        foreach ($stats as $metric => $value) {
+            fputcsv($output, array($metric, $value));
+        }
     
-    fclose($output);
+        fclose($output);
     
-    // Log the export
-    logEvents(
-        $SETTINGS,
-        'admin_action',
-        'export_statistics',
-        (string) $session->get('user-id'),
-        $session->get('user-login'),
-        'Statistics exported'
-    );
+        // Log the export
+        logEvents(
+            $SETTINGS,
+            'admin_action',
+            'export_statistics',
+            (string) $session->get('user-id'),
+            $session->get('user-login'),
+            'Statistics exported'
+        );
     
-    exit;
-    break;
+        exit;
+        break;
     
 }
 

licences/compliance-checker.php

Spacing +7 added lines, -7 removed lines

@@ -32,7 +32,7 @@ 
         echo "=== Teampass License Compliance Checker ===\n\n";
         
         // Open report file for streaming write
-        $this->reportFile = fopen(__DIR__ . '/LICENSE_COMPLIANCE_REPORT.md', 'w');
+        $this->reportFile = fopen(__DIR__.'/LICENSE_COMPLIANCE_REPORT.md', 'w');
         
         $this->writeHeader();
         $this->processPhpDependencies();
@@ -61,7 +61,7 @@ 
     private function writeHeader(): void
     {
         $header = "# Teampass License Compliance Report\n\n";
-        $header .= "**Generated:** " . date('Y-m-d H:i:s') . "\n";
+        $header .= "**Generated:** ".date('Y-m-d H:i:s')."\n";
         $header .= "**Project License:** GNU General Public License v3.0\n\n";
         
         fwrite($this->reportFile, $header);
@@ -74,7 +74,7 @@ 
      */
     private function processPhpDependencies(): void
     {
-        $lockFile = __DIR__ . '/../composer.lock';
+        $lockFile = __DIR__.'/../composer.lock';
         
         if (!file_exists($lockFile)) {
             $this->errorCount++;
@@ -139,7 +139,7 @@ 
      */
     private function processJsDependencies(): void
     {
-        $jsFile = __DIR__ . '/javascript-dependencies.json';
+        $jsFile = __DIR__.'/javascript-dependencies.json';
         
         fwrite($this->reportFile, "## JavaScript/CSS Dependencies\n\n");
         
@@ -233,7 +233,7 @@ 
     private function writeFooter(): void
     {
         $footer = "## Summary\n\n";
-        $footer .= "- **Total Dependencies:** " . ($this->phpCount + $this->jsCount) . "\n";
+        $footer .= "- **Total Dependencies:** ".($this->phpCount + $this->jsCount)."\n";
         $footer .= "- **PHP Dependencies:** {$this->phpCount}\n";
         $footer .= "- **JavaScript Dependencies:** {$this->jsCount}\n";
         $footer .= "- **Errors:** {$this->errorCount}\n";
@@ -262,7 +262,7 @@ 
         $footer .= "```\n\n";
         
         $footer .= "---\n\n";
-        $footer .= "*Auto-generated report - Last updated: " . date('Y-m-d H:i:s') . "*\n";
+        $footer .= "*Auto-generated report - Last updated: ".date('Y-m-d H:i:s')."*\n";
         
         fwrite($this->reportFile, $footer);
     }
@@ -296,7 +296,7 @@ 
         ];
         
         file_put_contents(
-            __DIR__ . '/javascript-dependencies.json',
+            __DIR__.'/javascript-dependencies.json',
             json_encode($template, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)
         );
     }

pages/admin.php

Spacing +11 added lines, -11 removed lines

@@ -69,7 +69,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('admin') === false) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -317,7 +317,7 @@ 
 
                                         // Has the transparent recovery migration been done?
                                         DB::query(
-                                            "SELECT id FROM " . prefixTable('users') . "
+                                            "SELECT id FROM ".prefixTable('users')."
                                             WHERE (user_derivation_seed IS NULL
                                             OR private_key_backup IS NULL)
                                             AND disabled = 0"
@@ -341,7 +341,7 @@ 
                                                 COUNT(*) as total_users,
                                                 SUM(CASE WHEN personal_items_migrated = 1 THEN 1 ELSE 0 END) as migrated_users,
                                                 SUM(CASE WHEN personal_items_migrated = 0 THEN 1 ELSE 0 END) as pending_users
-                                            FROM " . prefixTable('users') . "
+                                            FROM " . prefixTable('users')."
                                             WHERE disabled = 0 AND deleted_at IS NULL"
                                         );
                                         $progressPercent = ($stats[0]['migrated_users'] / $stats[0]['total_users']) * 100;
@@ -377,11 +377,11 @@ 
                                             ?>
                                         <li class="list-group-item d-flex justify-content-between align-items-center">
                                             <span><i class="fa-solid fa-hand text-warning"></i>
-                                            Password Encryption Migration Required <span class="badge badge-warning"><?php echo DB::count();?> remaing users</span>
+                                            Password Encryption Migration Required <span class="badge badge-warning"><?php echo DB::count(); ?> remaing users</span>
                                             </span>
                                             <span>
-                                            <i class="fa-solid fa-info-circle text-primary open-info" data-info="<?php echo DB::count();?> user accounts still use the legacy encryption library and must be migrated before upgrading to version 3.2.0.<br>
-                                            To migrate: Users must either log in once or have their password updated via the Users management page.<p class='mt-2'>List of remaining users: <?php echo $logins_list;?></p>" data-size="lg" data-title="Importante notice"></i>
+                                            <i class="fa-solid fa-info-circle text-primary open-info" data-info="<?php echo DB::count(); ?> user accounts still use the legacy encryption library and must be migrated before upgrading to version 3.2.0.<br>
+                                            To migrate: Users must either log in once or have their password updated via the Users management page.<p class='mt-2'>List of remaining users: <?php echo $logins_list; ?></p>" data-size="lg" data-title="Importante notice"></i>
                                             </span>
                                         </li>
                                             <?php
@@ -468,7 +468,7 @@ 
     // Get last cron execution timestamp
     DB::query(
         'SELECT valeur
-        FROM ' . prefixTable('misc') . '
+        FROM ' . prefixTable('misc').'
         WHERE type = %s AND intitule = %s and valeur >= %d',
         'admin',
         'last_cron_exec',
@@ -524,17 +524,17 @@ 
     FROM information_schema.TABLES 
     WHERE table_schema = DATABASE()"
 );
-$dbSizeFormatted = $dbSize . ' MB';
+$dbSizeFormatted = $dbSize.' MB';
 
 // Get other PHP info
 $phpVersion = phpversion();
 $memoryLimit = ini_get('memory_limit');
-$memoryUsage = round(memory_get_usage() / 1024, 2) . ' KB';
-$maxExecutionTime = ini_get('max_execution_time') . 's';
+$memoryUsage = round(memory_get_usage() / 1024, 2).' KB';
+$maxExecutionTime = ini_get('max_execution_time').'s';
 $maxUploadSize = ini_get('upload_max_filesize');
 
 // Get OS info
-$osInfo = php_uname('s') . ' ' . php_uname('r');
+$osInfo = php_uname('s').' '.php_uname('r');
 
 // Get timezone
 $timezone = date_default_timezone_get();

Braces +1 added lines, -2 removed lines

@@ -490,8 +490,7 @@
                                         </div>
         <?php
     }
-}
-catch (Exception $e) {
+} catch (Exception $e) {
     if (defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) {
         error_log('TEAMPASS Error - admin page - '.$e->getMessage());
     }

scripts/traits/ItemHandlerTrait.php

Spacing +6 added lines, -6 removed lines

@@ -29,7 +29,7 @@ 
 trait ItemHandlerTrait {    
 
     private function generateUserPasswordKeys($arguments) {
-        if (LOG_TASKS=== true) $this->logger->log('Processing generateUserPasswordKeys : '.print_r($arguments, true), 'DEBUG');
+        if (LOG_TASKS === true) $this->logger->log('Processing generateUserPasswordKeys : '.print_r($arguments, true), 'DEBUG');
         // Generate keys for user passwords   
         storeUsersShareKey(
             'sharekeys_items',
@@ -49,8 +49,8 @@ 
      * @param array $taskData
      */
     private function generateUserFileKeys($taskData) {    
-        if (LOG_TASKS=== true) $this->logger->log('Processing generateUserFileKeys : '.print_r($taskData, true), 'DEBUG');
-        foreach($taskData['files_keys'] as $file) {
+        if (LOG_TASKS === true) $this->logger->log('Processing generateUserFileKeys : '.print_r($taskData, true), 'DEBUG');
+        foreach ($taskData['files_keys'] as $file) {
             storeUsersShareKey(
                 'sharekeys_files',
                 0,
@@ -70,9 +70,9 @@ 
      * @param array $arguments
      */
     private function generateUserFieldKeys($arguments) {
-        if (LOG_TASKS=== true) $this->logger->log('Processing generateUserFieldKeys : '.print_r($arguments, true), 'DEBUG');
-        foreach($arguments['fields_keys'] as $field) {
-            $this->logger->log('Processing generateUserFieldKeys for: ' . $field['object_id'], 'DEBUG');
+        if (LOG_TASKS === true) $this->logger->log('Processing generateUserFieldKeys : '.print_r($arguments, true), 'DEBUG');
+        foreach ($arguments['fields_keys'] as $field) {
+            $this->logger->log('Processing generateUserFieldKeys for: '.$field['object_id'], 'DEBUG');
             storeUsersShareKey(
                 'sharekeys_fields',
                 0,

Braces +9 added lines, -3 removed lines

@@ -29,7 +29,9 @@ 
 trait ItemHandlerTrait {    
 
     private function generateUserPasswordKeys($arguments) {
-        if (LOG_TASKS=== true) $this->logger->log('Processing generateUserPasswordKeys : '.print_r($arguments, true), 'DEBUG');
+        if (LOG_TASKS=== true) {
+            $this->logger->log('Processing generateUserPasswordKeys : '.print_r($arguments, true), 'DEBUG');
+        }
         // Generate keys for user passwords   
         storeUsersShareKey(
             'sharekeys_items',
@@ -49,7 +51,9 @@ 
      * @param array $taskData
      */
     private function generateUserFileKeys($taskData) {    
-        if (LOG_TASKS=== true) $this->logger->log('Processing generateUserFileKeys : '.print_r($taskData, true), 'DEBUG');
+        if (LOG_TASKS=== true) {
+            $this->logger->log('Processing generateUserFileKeys : '.print_r($taskData, true), 'DEBUG');
+        }
         foreach($taskData['files_keys'] as $file) {
             storeUsersShareKey(
                 'sharekeys_files',
@@ -70,7 +74,9 @@ 
      * @param array $arguments
      */
     private function generateUserFieldKeys($arguments) {
-        if (LOG_TASKS=== true) $this->logger->log('Processing generateUserFieldKeys : '.print_r($arguments, true), 'DEBUG');
+        if (LOG_TASKS=== true) {
+            $this->logger->log('Processing generateUserFieldKeys : '.print_r($arguments, true), 'DEBUG');
+        }
         foreach($arguments['fields_keys'] as $field) {
             $this->logger->log('Processing generateUserFieldKeys for: ' . $field['object_id'], 'DEBUG');
             storeUsersShareKey(

pages/admin.js.php

Spacing +14 added lines, -14 removed lines

@@ -69,7 +69,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('admin') === false) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -155,7 +155,7 @@ 
                 // error
                 toastr.remove();
                 toastr.error(
-                    '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error,
+                    '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error,
                     '', {
                         closeButton: true,
                         positionClass: 'toast-bottom-right'
@@ -277,7 +277,7 @@ 
                 // error
                 toastr.remove();
                 toastr.error(
-                    '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error,
+                    '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error,
                     '', {
                         closeButton: true,
                         positionClass: 'toast-bottom-right'
@@ -475,7 +475,7 @@ 
                 // error
                 toastr.remove();
                 toastr.error(
-                    '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error,
+                    '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error,
                     '', {
                         closeButton: true,
                         positionClass: 'toast-bottom-right'
@@ -536,7 +536,7 @@ 
                 // error
                 toastr.remove();
                 toastr.error(
-                    '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error,
+                    '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error,
                     '', {
                         closeButton: true,
                         positionClass: 'toast-bottom-right'
@@ -605,7 +605,7 @@ 
                 // error
                 toastr.remove();
                 toastr.error(
-                    '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error,
+                    '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error,
                     '', {
                         closeButton: true,
                         positionClass: 'toast-bottom-right'
@@ -643,7 +643,7 @@ 
                 // error
                 toastr.remove();
                 toastr.error(
-                    '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error,
+                    '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error,
                     '', {
                         closeButton: true,
                         positionClass: 'toast-bottom-right'
@@ -937,7 +937,7 @@ 
                 // error
                 toastr.remove();
                 toastr.error(
-                    '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error,
+                    '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error,
                     '', {
                         closeButton: true,
                         positionClass: 'toast-bottom-right'
@@ -998,7 +998,7 @@ 
                 // error
                 toastr.remove();
                 toastr.error(
-                    '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error,
+                    '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error,
                     '', {
                         closeButton: true,
                         positionClass: 'toast-bottom-right'
@@ -1057,7 +1057,7 @@ 
                 // error
                 toastr.remove();
                 toastr.error(
-                    '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error,
+                    '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error,
                     '', {
                         closeButton: true,
                         positionClass: 'toast-bottom-right'
@@ -1156,7 +1156,7 @@ 
                 // error
                 toastr.remove();
                 toastr.error(
-                    '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error,
+                    '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error,
                     '', {
                         closeButton: true,
                         positionClass: 'toast-bottom-right'
@@ -1185,7 +1185,7 @@ 
                 
                 //const className = result.success ? 'success' : 'error';
                 const icon = result.success ? '<i class="fa-solid fa-check text-success mr-1"></i>' : '<i class="fa-solid fa-xmark text-danger mr-1"></i>';
-                const message = result.success ? '<?php echo $lang->get('server_returned_data');?>' : 'Error: ' + result.error;
+                const message = result.success ? '<?php echo $lang->get('server_returned_data'); ?>' : 'Error: ' + result.error;
                 
                 output += '<li>' + icon + '<b>' + file + '</b><br/>' + message + '</li>';
             });
@@ -1227,7 +1227,7 @@ 
                 // error
                 toastr.remove();
                 toastr.error(
-                    '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error,
+                    '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error,
                     '', {
                         closeButton: true,
                         positionClass: 'toast-bottom-right'
@@ -1436,7 +1436,7 @@ 
                 // error
                 toastr.remove();
                 toastr.error(
-                    '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error,
+                    '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error,
                     '', {
                         closeButton: true,
                         positionClass: 'toast-bottom-right'

pages/users.php

Spacing +15 added lines, -15 removed lines

@@ -69,7 +69,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('users') === false) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -92,24 +92,24 @@ 
 // If administrator then all roles are shown
 // else only the Roles the users is associated to.
 if ((int) $session->get('user-admin') === 1) {
-    $optionsManagedBy .= '<option value="0">' . $lang->get('administrators_only') . '</option>';
+    $optionsManagedBy .= '<option value="0">'.$lang->get('administrators_only').'</option>';
 }
 
 $rows = DB::query(
     'SELECT id, title, creator_id
-    FROM ' . prefixTable('roles_title') . '
+    FROM ' . prefixTable('roles_title').'
     ORDER BY title ASC'
 );
 foreach ($rows as $record) {
     if ((int) $session->get('user-admin') === 1 || in_array($record['id'], $session->get('user-roles_array')) === true) {
-        $optionsManagedBy .= '<option value="' . $record['id'] . '">' . $lang->get('managers_of') . ' ' . addslashes($record['title']) . '</option>';
+        $optionsManagedBy .= '<option value="'.$record['id'].'">'.$lang->get('managers_of').' '.addslashes($record['title']).'</option>';
     }
     if (
         (int) $session->get('user-admin') === 1
         || (((int) $session->get('user-manager') === 1 || (int) $session->get('user-can_manage_all_users') === 1)
             && (in_array($record['id'], $userRoles) === true) || (int) $record['creator_id'] === (int) $session->get('user-id'))
     ) {
-        $optionsRoles .= '<option value="' . $record['id'] . '">' . addslashes($record['title']) . '</option>';
+        $optionsRoles .= '<option value="'.$record['id'].'">'.addslashes($record['title']).'</option>';
     }
 }
 
@@ -124,7 +124,7 @@ 
         for ($y = 1; $y < $t->nlevel; ++$y) {
             $ident .= '&nbsp;&nbsp;';
         }
-        $foldersList .= '<option value="' . $t->id . '">' . $ident . htmlspecialchars($t->title, ENT_COMPAT, 'UTF-8') . '</option>';
+        $foldersList .= '<option value="'.$t->id.'">'.$ident.htmlspecialchars($t->title, ENT_COMPAT, 'UTF-8').'</option>';
     }
 }
 
@@ -145,7 +145,7 @@ 
 {
     // Table is teampass_users with the prefix {teampass_users} in MeekroDB context.
     // 'disabled = 1' indicates a deleted/disabled user account.
-    return (int)DB::queryFirstField("SELECT COUNT(id) FROM " . prefixTable('users') . " WHERE deleted_at IS NOT NULL");
+    return (int) DB::queryFirstField("SELECT COUNT(id) FROM ".prefixTable('users')." WHERE deleted_at IS NOT NULL");
 }
 
 $deleted_users_count = count_deleted_users();
@@ -159,7 +159,7 @@ 
     $blink_class = 'blink_me';
 
     // Create the badge HTML with the count
-    $count_badge_html = ' <span class="badge badge-danger ml-1">' . $deleted_users_count . '</span>';
+    $count_badge_html = ' <span class="badge badge-danger ml-1">'.$deleted_users_count.'</span>';
 }
 ?>
 
@@ -194,13 +194,13 @@ 
                         </button><?php
                                     echo isset($SETTINGS['ldap_mode']) === true && (int) $SETTINGS['ldap_mode'] === 1 && (int) $session->get('user-admin') === 1 ?
                                         '<button type="button" class="btn btn-primary btn-sm tp-action mr-2" data-action="ldap-sync">
-                            <i class="fa-solid fa-address-card mr-2"></i>' . $lang->get('ldap_synchronization') . '
+                            <i class="fa-solid fa-address-card mr-2"></i>' . $lang->get('ldap_synchronization').'
                         </button>' : '';
                                     ?>
                         </button><?php
                                     echo isset($SETTINGS['oauth2_enabled']) === true && (int) $SETTINGS['oauth2_enabled'] === 1 && (int) $session->get('user-admin') === 1 ?
                                         '<button type="button" class="btn btn-primary btn-sm tp-action mr-2" data-action="oauth2-sync">
-                            <i class="fa-solid fa-plug mr-2"></i>' . $lang->get('oauth2_synchronization') . '
+                            <i class="fa-solid fa-plug mr-2"></i>' . $lang->get('oauth2_synchronization').'
                         </button>' : '';
                                     ?>
                         <button type="button" class="btn btn-primary btn-sm tp-action mr-2 <?php echo $blink_class; ?>" data-action="deleted-users">
@@ -210,8 +210,8 @@ 
                 </div>
 
                 <!-- /.card-header -->
-                <div class="card-body form user-content with-header-menu <?php echo $showNewUser ? 'hidden' : '';?>" id="users-list" data-content="refresh">
-                    <label><input type="checkbox" id="warnings_display" class="tp-action pointer" data-action="refresh"><span class="ml-2 pointer"><?php echo $lang->get('display_warning_icons');?></span></label>
+                <div class="card-body form user-content with-header-menu <?php echo $showNewUser ? 'hidden' : ''; ?>" id="users-list" data-content="refresh">
+                    <label><input type="checkbox" id="warnings_display" class="tp-action pointer" data-action="refresh"><span class="ml-2 pointer"><?php echo $lang->get('display_warning_icons'); ?></span></label>
                     <table id="table-users" class="table table-striped nowrap table-responsive-sm">
                         <thead>
                             <tr>
@@ -275,7 +275,7 @@ 
                                             <?php
                                             foreach (TP_PW_COMPLEXITY as $entry) {
                                                 echo '
-                                            <option value="' . $entry[0] . '">' . addslashes($entry[1]) . '</option>';
+                                            <option value="' . $entry[0].'">'.addslashes($entry[1]).'</option>';
                                             }
                                             ?>
                                         </select>
@@ -352,7 +352,7 @@ 
                                             <?php
                                             foreach (TP_PW_COMPLEXITY as $entry) {
                                                 echo '
-                                            <option value="' . $entry[0] . '">' . addslashes($entry[1]) . '</option>';
+                                            <option value="' . $entry[0].'">'.addslashes($entry[1]).'</option>';
                                             }
                                             ?>
                                         </select>
@@ -390,7 +390,7 @@ 
     </div>
 
     <!-- USER FORM -->
-    <div class="row <?php echo $showNewUser ? '' : 'hidden';?> extra-form user-content" id="row-form" data-content="new" data-content-alternative="edit">
+    <div class="row <?php echo $showNewUser ? '' : 'hidden'; ?> extra-form user-content" id="row-form" data-content="new" data-content-alternative="edit">
         <div class="col-12">
             <div class="card card-primary">
                 <div class="card-header">