nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2025-12-30 00:53:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix using keyword $this in static class voicemail (#7586)

Browse Source
This commit is contained in:
frytimo
2025-10-22 11:59:15 -03:00
committed by GitHub
parent 0fd652096f
commit 1c7df93020
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/voicemails/resources/classes/voicemail.php
View File

@@ -64,7 +64,7 @@
/** /**
* Internal array structure that is populated from the database * Internal array structure that is populated from the database
* @var array Array of settings loaded from Default Settings * @var settings A settings object loaded from Default Settings
*/ */
private $settings; private $settings;
@@ -845,7 +845,7 @@
} }
//encode subject //encode subject
$template['template_subject'] = trim(iconv_mime_encode(null, $template['template_subject'], ['scheme'=>'B','output-charset'=>'utf-8', 'line-break-chars'=>"\n"]), ': '); $template['template_subject'] = trim(iconv_mime_encode('', $template['template_subject'], ['scheme'=>'B','output-charset'=>'utf-8', 'line-break-chars'=>"\n"]), ': ');
//determine voicemail message file path and type //determine voicemail message file path and type
$voicemail_message_path = $switch_voicemail.'/default/'.$message['domain_name'].'/'.$message['voicemail_id']; $voicemail_message_path = $switch_voicemail.'/default/'.$message['domain_name'].'/'.$message['voicemail_id'];
@@ -1451,12 +1451,13 @@
//set table name for query //set table name for query
//$table = self::TABLE; //$table = self::TABLE;
$table = 'voicemail_messages'; $table = 'voicemail_messages';
$database = $settings->database();
//get a list of domains //get a list of domains
$domains = maintenance::get_domains($this->database); $domains = maintenance::get_domains($database);
foreach ($domains as $domain_uuid => $domain_name) { foreach ($domains as $domain_uuid => $domain_name) {
//get domain settings //get domain settings
$domain_settings = new settings(['database' => $this->database, 'domain_uuid' => $domain_uuid]); $domain_settings = new settings(['database' => $database, 'domain_uuid' => $domain_uuid]);
//ensure we have a retention day //ensure we have a retention day
$retention_days = $domain_settings->get('voicemail', maintenance::DATABASE_SUBCATEGORY, ''); $retention_days = $domain_settings->get('voicemail', maintenance::DATABASE_SUBCATEGORY, '');
@@ -1464,12 +1465,12 @@
//clear out old records //clear out old records
$sql = "delete from v_{$table} WHERE to_timestamp(created_epoch) < NOW() - INTERVAL '{$retention_days} days'" $sql = "delete from v_{$table} WHERE to_timestamp(created_epoch) < NOW() - INTERVAL '{$retention_days} days'"
. " and domain_uuid = '{$domain_uuid}'"; . " and domain_uuid = '{$domain_uuid}'";
$this->database->execute($sql); $database->execute($sql);
$code = $this->database->message['code'] ?? 0; $code = $database->message['code'] ?? 0;
if ($this->database->message['code'] == 200) { if ($database->message['code'] == 200) {
maintenance_service::log_write(self::class, "Successfully removed entries older than $retention_days", $domain_uuid); maintenance_service::log_write(self::class, "Successfully removed entries older than $retention_days", $domain_uuid);
} else { } 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); maintenance_service::log_write(self::class, "Unable to remove old database records. Error message: $message ($code)", $domain_uuid, maintenance_service::LOG_ERROR);
} }
} }

2
app/xml_cdr/resources/classes/xml_cdr.php
View File

@@ -76,7 +76,7 @@
/** /**
* Internal array structure that is populated from the database * Internal array structure that is populated from the database
* @var array Array of settings loaded from Default Settings * @var settings A settings object loaded from Default Settings
*/ */
private $settings; private $settings;