nilsteampassnet / TeamPass

scripts/traits/ItemHandlerTrait.php

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(

sources/main.functions.php

Braces +18 added lines, -9 removed lines

@@ -2604,7 +2604,9 @@ 
 function encryptUserObjectKey(string $key, string $publicKey): string
 {
     // Empty password
-    if (empty($key)) return '';
+    if (empty($key)) {
+        return '';
+    }
 
     // Sanitize
     $antiXss = new AntiXSS();
@@ -2753,7 +2755,9 @@ 
         ];
     }
 
-    if (WIP) error_log('DEBUG: File image url -> '.filter_var($safeFilePath, FILTER_SANITIZE_URL));
+    if (WIP) {
+        error_log('DEBUG: File image url -> '.filter_var($safeFilePath, FILTER_SANITIZE_URL));
+    }
 
     // Decrypt file content and return
     return base64_encode($cipher->decrypt($ciphertext));
@@ -4232,7 +4236,9 @@ 
         $taskName = [$taskName];
     }
     foreach($taskName as $task) {
-        if (WIP === true) error_log('createTaskForItem - task: '.$task);
+        if (WIP === true) {
+            error_log('createTaskForItem - task: '.$task);
+        }
         switch ($task) {
             case 'item_password':
                 
@@ -4665,19 +4671,22 @@ 
 
             // Organisation name (removed username@ and .tld)
             $domain = explode('.', $emailParts[1]);
-            if (count($domain) > 1)
-                $forbiddenWords[] = $domain[0];
+            if (count($domain) > 1) {
+                            $forbiddenWords[] = $domain[0];
+            }
         }
     }
 
     // Search forbidden words in password
     foreach ($forbiddenWords as $word) {
-        if (empty($word))
-            continue;
+        if (empty($word)) {
+                    continue;
+        }
 
         // Stop if forbidden word found in password
-        if (stripos($password, $word) !== false)
-            return false;
+        if (stripos($password, $word) !== false) {
+                    return false;
+        }
     }
 
     // Get password complexity

sources/admin.queries.php

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