From 2494fe7f5ead061ea98a658e6f7717d08118759c Mon Sep 17 00:00:00 2001 From: frytimo Date: Fri, 3 Oct 2025 12:15:22 -0300 Subject: [PATCH] Revert using this keyword in static function (#7540) --- app/fax_queue/resources/classes/fax_queue.php | 12 ++++++------ core/users/resources/classes/users.php | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/fax_queue/resources/classes/fax_queue.php b/app/fax_queue/resources/classes/fax_queue.php index 6645080116..979b2eff06 100644 --- a/app/fax_queue/resources/classes/fax_queue.php +++ b/app/fax_queue/resources/classes/fax_queue.php @@ -299,21 +299,21 @@ * @return void */ public static function database_maintenance(settings $settings): void { - $this->database = $settings->database(); - $domains = maintenance_service::get_domains($this->database); + $database = $settings->database(); + $domains = maintenance_service::get_domains($database); foreach ($domains as $domain_uuid => $domain_name) { - $domain_settings = new settings(['database'=>$this->database, 'domain_uuid'=>$domain_uuid]); + $domain_settings = new settings(['database'=>$database, 'domain_uuid'=>$domain_uuid]); $retention_days = $domain_settings->get('fax_queue', 'database_retention_days', ''); //delete from v_fax_queue where fax_status = 'sent' and fax_date < NOW() - INTERVAL '$days_keep_fax_queue days' if (!empty($retention_days) && is_numeric($retention_days)) { $sql = "delete from v_fax_queue where fax_status = 'sent' and fax_date < NOW() - INTERVAL '$retention_days days'"; $sql .= " and domain_uuid = '$domain_uuid'"; - $this->database->execute($sql); - $code = $this->database->message['code'] ?? 0; + $database->execute($sql); + $code = $database->message['code'] ?? 0; if ($code == 200) { maintenance_service::log_write(self::class, "Successfully removed entries older than $retention_days", $domain_uuid); } else { - $message = $this->database->message['message'] ?? "An unknown error has occurred"; + $message = $database->message['message'] ?? "An unknown error has occurred"; maintenance_service::log_write(self::class, "Unable to remove old database records. Error message: $message ($code)", $domain_uuid, maintenance_service::LOG_ERROR); } } diff --git a/core/users/resources/classes/users.php b/core/users/resources/classes/users.php index 09306e384c..41a4f31158 100644 --- a/core/users/resources/classes/users.php +++ b/core/users/resources/classes/users.php @@ -288,20 +288,20 @@ * @return void */ public static function database_maintenance(settings $settings): void { - $this->database = $settings->database(); - $domains = maintenance_service::get_domains($this->database); + $database = $settings->database(); + $domains = maintenance_service::get_domains($database); foreach ($domains as $domain_uuid => $domain_name) { - $domain_settings = new settings(['database' => $this->database, 'domain_uuid' => $domain_uuid]); + $domain_settings = new settings(['database' => $database, 'domain_uuid' => $domain_uuid]); $retention_days = $domain_settings->get('users', 'database_retention_days', ''); if (!empty($retention_days) && is_numeric($retention_days)) { $sql = "delete from v_user_logs where timestamp < NOW() - INTERVAL '$retention_days days'"; $sql.= " and domain_uuid = '$domain_uuid'"; - $this->database->execute($sql); - $code = $this->database->message['code'] ?? 0; + $database->execute($sql); + $code = $database->message['code'] ?? 0; if ($code == 200) { maintenance_service::log_write(self::class, "Successfully removed entries older than $retention_days", $domain_uuid); } else { - $message = $this->database->message['message'] ?? "An unknown error has occurred"; + $message = $database->message['message'] ?? "An unknown error has occurred"; maintenance_service::log_write(self::class, "Unable to remove old database records. Error message: $message ($code)", $domain_uuid, maintenance_service::LOG_ERROR); } } else {