dbxe/fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change $setting to $settings (#7318)

Browse Source 
* Change $setting to $settings

* Update app_defaults.php

* Update fax_queue.php

* Update xml_cdr.php

* Update email_queue.php

* Update transcribe.php

* Update send.php

* Update fax_queue.php

* Update fax_send.php

* Update app_defaults.php

* Update email_queue.php

* Update app_defaults.php

* Update app_defaults.php

* Update app_defaults.php

* Update app_defaults.php

* Update app_defaults.php

* Update app_defaults.php

* Update app_defaults.php

* Update app_defaults.php

* Update app_defaults.php

* Update app_defaults.php

* Update app_defaults.php
This commit is contained in:
Alex
2025-03-14 16:19:49 -06:00
committed by GitHub
parent 7639f0755c
commit 1e96df6e95
22 changed files with 117 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/fax_queue/resources/job/fax_queue.php
+8 -11
View File
@@ -56,31 +56,28 @@
return $exists;
}
//get the email queue settings
$setting = new settings(["category" => "fax_queue"]);
//set the fax queue interval
if (!empty($setting->get('fax_queue', 'interval'))) {
$fax_queue_interval = $setting->get('fax_queue', 'interval');
if (!empty($settings->get('fax_queue', 'interval'))) {
$fax_queue_interval = $settings->get('fax_queue', 'interval');
}
else {
$fax_queue_interval = '30';
}
//set the fax queue limit
if (!empty($setting->get('fax_queue', 'limit'))) {
$fax_queue_limit = $setting->get('fax_queue', 'limit');
if (!empty($settings->get('fax_queue', 'limit'))) {
$fax_queue_limit = $settings->get('fax_queue', 'limit');
}
else {
$fax_queue_limit = '30';
}
if (!empty($setting->get('fax_queue', 'debug'))) {
$debug = $setting->get('fax_queue', 'debug');
if (!empty($settings->get('fax_queue', 'debug'))) {
$debug = $settings->get('fax_queue', 'debug');
}
//set the fax queue retry interval
if (!empty($setting->get('fax_queue', 'retry_interval'))) {
$fax_retry_interval = $setting->get('fax_queue', 'retry_interval');
if (!empty($settings->get('fax_queue', 'retry_interval'))) {
$fax_retry_interval = $settings->get('fax_queue', 'retry_interval');
}
else {
$fax_retry_interval = '180';
app/fax_queue/resources/job/fax_send.php
+9 -12
View File
@@ -184,22 +184,19 @@
}
unset($parameters);
//get the email queue settings
$setting = new settings(["domain_uuid" => $domain_uuid]);
//prepare the smtp from and from name variables
$email_from = $setting->get('fax','smtp_from');
$email_from_name = $setting->get('fax','smtp_from_name');
$email_from = $settings->get('fax','smtp_from');
$email_from_name = $settings->get('fax','smtp_from_name');
if (empty($email_from)) {
$email_from = $setting->get('email','smtp_from');
$email_from = $settings->get('email','smtp_from');
}
if (empty($email_from_name)) {
$email_from_name = $setting->get('email','smtp_from_name');
$email_from_name = $settings->get('email','smtp_from_name');
}
//prepare the variables to send the fax
$email_from_address = $email_from;
$retry_limit = $setting->get('fax_queue','retry_limit');
$retry_limit = $settings->get('fax_queue','retry_limit');
//prepare the fax retry count
if (!isset($fax_retry_count)) {
@@ -252,7 +249,7 @@
if ($fax_retry_count == 0) {
//use default settings or domain settings (defaults to t38)
$fax_options = '';
foreach($setting->get('fax','variable') as $variable) {
foreach($settings->get('fax','variable') as $variable) {
$fax_options .= $variable.",";
}
}
@@ -283,7 +280,7 @@
else {
//try the user definable method again
$fax_options = '';
foreach($setting->get('fax','variable') as $variable) {
foreach($settings->get('fax','variable') as $variable) {
$fax_options .= $variable.",";
}
}
@@ -298,7 +295,7 @@
//check to see if the destination number is local
$local_destination = false;
if ($setting->get('fax_queue','prefer_local', false)) {
if ($settings->get('fax_queue','prefer_local', false)) {
$sql = "select count(destination_uuid) ";
$sql .= "from v_destinations ";
$sql .= "where (";
@@ -463,7 +460,7 @@
//send the email
if (!empty($fax_email_address) && file_exists($fax_file)) {
//get the language code
$language_code = $setting->get('domain','language');
$language_code = $settings->get('domain','language');
//get the template subcategory
if (isset($fax_relay) && $fax_relay == 'true') {
app/fax_queue/resources/service/fax_queue.php
+8 -11
View File
@@ -103,31 +103,28 @@
file_put_contents($pid_file, getmypid());
}
//get the fax queue settings
$setting = new settings(["category" => "fax_queue"]);
//set the fax queue interval
if (!empty($setting->get('fax_queue', 'interval'))) {
$fax_queue_interval = $setting->get('fax_queue', 'interval');
if (!empty($settings->get('fax_queue', 'interval'))) {
$fax_queue_interval = $settings->get('fax_queue', 'interval');
}
else {
$fax_queue_interval = '30';
}
//set the fax queue limit
if (!empty($setting->get('fax_queue', 'limit'))) {
$fax_queue_limit = $setting->get('fax_queue', 'limit');
if (!empty($settings->get('fax_queue', 'limit'))) {
$fax_queue_limit = $settings->get('fax_queue', 'limit');
}
else {
$fax_queue_limit = '30';
}
if (!empty($setting->get('fax_queue', 'debug'))) {
$debug = $setting->get('fax_queue', 'debug');
if (!empty($settings->get('fax_queue', 'debug'))) {
$debug = $settings->get('fax_queue', 'debug');
}
//set the fax queue retry interval
if (!empty($setting->get('fax_queue', 'retry_interval'))) {
$fax_retry_interval = $setting->get('fax_queue', 'retry_interval');
if (!empty($settings->get('fax_queue', 'retry_interval'))) {
$fax_retry_interval = $settings->get('fax_queue', 'retry_interval');
}
else {
$fax_retry_interval = '180';