From bbccb540594221969602fba4f6593c54fe493e2a Mon Sep 17 00:00:00 2001 From: Yasen Pramatarov Date: Sun, 27 Apr 2025 19:00:58 +0300 Subject: [PATCH] Updates log calls to new syntax --- app/classes/component.php | 6 +++--- app/classes/config.php | 4 ++-- app/classes/ratelimiter.php | 22 +++++++++++----------- app/includes/csrf_middleware.php | 2 +- public_html/index.php | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app/classes/component.php b/app/classes/component.php index c724fb1..33f157c 100644 --- a/app/classes/component.php +++ b/app/classes/component.php @@ -94,11 +94,11 @@ class Component { $result = $stmt->fetchAll(PDO::FETCH_ASSOC); if (!empty($result)) { - $logObject->insertLog(0, "Retrieved " . count($result) . " Jitsi component events"); + $logObject->log('info', "Retrieved " . count($result) . " Jitsi component events", ['user_id' => $userId, 'scope' => 'system']); } return $result; } catch (PDOException $e) { - $logObject->insertLog(0, "Failed to retrieve Jitsi component events: " . $e->getMessage()); + $logObject->log('error', "Failed to retrieve Jitsi component events: " . $e->getMessage(), ['user_id' => $userId, 'scope' => 'system']); return []; } } @@ -162,7 +162,7 @@ class Component { $result = $stmt->fetch(PDO::FETCH_ASSOC); return (int)$result['total']; } catch (PDOException $e) { - $logObject->insertLog(0, "Failed to retrieve component events count: " . $e->getMessage()); + $logObject->log('error', "Failed to retrieve component events count: " . $e->getMessage(), ['user_id' => $userId, 'scope' => 'system']); return 0; } } diff --git a/app/classes/config.php b/app/classes/config.php index 6acd729..363a87d 100644 --- a/app/classes/config.php +++ b/app/classes/config.php @@ -140,7 +140,7 @@ class Config { } if (!empty($allLogs)) { - $logObject->insertLog($userId, implode("\n", $allLogs), 'system'); + $logObject->log('info', implode("\n", $allLogs), ['user_id' => $userId, 'scope' => 'system']); } return [ @@ -148,7 +148,7 @@ class Config { 'updated' => $updated ]; } catch (Exception $e) { - $logObject->insertLog($userId, "Config update error: " . $e->getMessage(), 'system'); + $logObject->log('error', "Config update error: " . $e->getMessage(), ['user_id' => $userId, 'scope' => 'system']); return [ 'success' => false, 'error' => $e->getMessage() diff --git a/app/classes/ratelimiter.php b/app/classes/ratelimiter.php index 62564ff..058f245 100644 --- a/app/classes/ratelimiter.php +++ b/app/classes/ratelimiter.php @@ -232,7 +232,7 @@ class RateLimiter { if ($this->isIpBlacklisted($ip)) { $message = "Cannot whitelist {$ip} - IP is currently blacklisted"; if ($userId) { - $this->logger->info("IP Whitelist: {$message}", ['user_id' => $userId]); + $this->logger->log('info', "IP Whitelist: {$message}", ['user_id' => $userId, 'scope' => 'system']); Feedback::flash('ERROR', 'DEFAULT', $message); } return false; @@ -256,14 +256,14 @@ class RateLimiter { $createdBy, $description ); - $this->logger->info($logMessage, ['user_id' => $userId ?? null]); + $this->logger->log('info', $logMessage, ['user_id' => $userId ?? null, 'scope' => 'system']); } return $result; } catch (Exception $e) { if ($userId) { - $this->logger->error("IP Whitelist: Failed to add {$ip}: " . $e->getMessage(), ['user_id' => $userId]); + $this->logger->log('error', "IP Whitelist: Failed to add {$ip}: " . $e->getMessage(), ['user_id' => $userId, 'scope' => 'system']); Feedback::flash('ERROR', 'DEFAULT', "IP Whitelist: Failed to add {$ip}: " . $e->getMessage()); } return false; @@ -291,14 +291,14 @@ class RateLimiter { $removedBy, $ipDetails['created_by'] ); - $this->logger->info($logMessage, ['user_id' => $userId ?? null]); + $this->logger->log('info', $logMessage, ['user_id' => $userId ?? null, 'scope' => 'system']); } return $result; } catch (Exception $e) { if ($userId) { - $this->logger->error("IP Whitelist: Failed to remove {$ip}: " . $e->getMessage(), ['user_id' => $userId]); + $this->logger->log('error', "IP Whitelist: Failed to remove {$ip}: " . $e->getMessage(), ['user_id' => $userId, 'scope' => 'system']); Feedback::flash('ERROR', 'DEFAULT', "IP Whitelist: Failed to remove {$ip}: " . $e->getMessage()); } return false; @@ -311,7 +311,7 @@ class RateLimiter { if ($this->isIpWhitelisted($ip)) { $message = "Cannot blacklist {$ip} - IP is currently whitelisted"; if ($userId) { - $this->logger->info("IP Blacklist: {$message}", ['user_id' => $userId]); + $this->logger->log('info', "IP Blacklist: {$message}", ['user_id' => $userId, 'scope' => 'system']); Feedback::flash('ERROR', 'DEFAULT', $message); } return false; @@ -339,13 +339,13 @@ class RateLimiter { $reason, $expiryTime ?? 'never' ); - $this->logger->info($logMessage, ['user_id' => $userId ?? null]); + $this->logger->log('info', $logMessage, ['user_id' => $userId ?? null, 'scope' => 'system']); } return $result; } catch (Exception $e) { if ($userId) { - $this->logger->error("IP Blacklist: Failed to add {$ip}: " . $e->getMessage(), ['user_id' => $userId]); + $this->logger->log('error', "IP Blacklist: Failed to add {$ip}: " . $e->getMessage(), ['user_id' => $userId, 'scope' => 'system']); Feedback::flash('ERROR', 'DEFAULT', "IP Blacklist: Failed to add {$ip}: " . $e->getMessage()); } return false; @@ -373,13 +373,13 @@ class RateLimiter { $ipDetails['created_by'], $ipDetails['reason'] ); - $this->logger->info($logMessage, ['user_id' => $userId ?? null]); + $this->logger->log('info', $logMessage, ['user_id' => $userId ?? null, 'scope' => 'system']); } return $result; } catch (Exception $e) { if ($userId) { - $this->logger->error("IP Blacklist: Failed to remove {$ip}: " . $e->getMessage(), ['user_id' => $userId]); + $this->logger->log('error', "IP Blacklist: Failed to remove {$ip}: " . $e->getMessage(), ['user_id' => $userId, 'scope' => 'system']); Feedback::flash('ERROR', 'DEFAULT', "IP Blacklist: Failed to remove {$ip}: " . $e->getMessage()); } return false; @@ -414,7 +414,7 @@ class RateLimiter { return true; } catch (Exception $e) { - $this->logger->error("Failed to cleanup expired entries: " . $e->getMessage()); + $this->logger->log('error', "Failed to cleanup expired entries: " . $e->getMessage(), ['user_id' => $userId ?? null, 'scope' => 'system']); Feedback::flash('ERROR', 'DEFAULT', "Failed to cleanup expired entries: " . $e->getMessage()); return false; } diff --git a/app/includes/csrf_middleware.php b/app/includes/csrf_middleware.php index 68361c0..16f88a0 100644 --- a/app/includes/csrf_middleware.php +++ b/app/includes/csrf_middleware.php @@ -40,7 +40,7 @@ function applyCsrfMiddleware() { $_GET['page'] ?? 'unknown', $_SESSION['username'] ?? 'anonymous' ); - $logObject->insertLog(null, $logMessage, 'system'); + $logObject->log('error', $logMessage, ['user_id' => null, 'scope' => 'system']); // Return error message http_response_code(403); diff --git a/public_html/index.php b/public_html/index.php index 8a3b20d..c0829af 100644 --- a/public_html/index.php +++ b/public_html/index.php @@ -204,7 +204,7 @@ if ($page == 'logout') { setcookie('username', "", time() - 100, $config['folder'], $config['domain'], isset($_SERVER['HTTPS']), true); // Log successful logout - $logObject->insertLog($userId, "Logout: User \"$currentUser\" logged out. IP: $user_IP", 'user'); + $logObject->log('info', "Logout: User \"$currentUser\" logged out. IP: $user_IP", ['user_id' => $userId, 'scope' => 'user']); // Set success message Feedback::flash('LOGIN', 'LOGOUT_SUCCESS');