Move emergency setting to its own category.

This commit is contained in:
FusionPBX 2024-04-24 10:29:03 -06:00 committed by GitHub
parent c85e10ea09
commit f8771c4f10
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 51 additions and 11 deletions

View File

@ -7,7 +7,7 @@
$apps[$x]['subcategory'] = '';
$apps[$x]['version'] = '1.0.1';
$apps[$x]['license'] = 'Mozilla Public License 1.1';
$apps[$x]['contact_url'] = 'http://austen-it.com';
$apps[$x]['contact_url'] = '';
$apps[$x]['description']['en-us'] = '';
$apps[$x]['description']['es-mx'] = '';
$apps[$x]['description']['de'] = '';
@ -21,9 +21,9 @@
//default settings
$y=0;
$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "9317ddfd-6cb1-4294-9c57-4061dde66fe4";
$apps[$x]['default_settings'][$y]['default_setting_category'] = "dialplan";
$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "emergency_email_address";
$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "995d09b6-c37b-4eda-a458-5740b955206f";
$apps[$x]['default_settings'][$y]['default_setting_category'] = "emergency";
$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "email_address";
$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
$apps[$x]['default_settings'][$y]['default_setting_value'] = "";
$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
@ -92,4 +92,4 @@
$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
?>
?>

View File

@ -0,0 +1,37 @@
<?php
//if the number of rows is 0 then read the acl xml into the database
if ($domains_processed == 1) {
//move the emergency email address to a new default setting in the emergency category
$sql = "select * from v_default_settings ";
$sql .= "where default_setting_uuid = '9317ddfd-6cb1-4294-9c57-4061dde66fe4' ";
$sql .= "and length(default_setting_value) > 0 ";
$row = $database->select($sql, null, 'row');
if (isset($row) && is_array($row) && count($row) != 0) {
//ensure the new default setting exists before continuing
$sql = "select count(*) from v_default_settings ";
$sql .= "where default_setting_uuid = '995d09b6-c37b-4eda-a458-5740b955206f' ";
$num_rows = $database->select($sql, null, 'column');
if ($num_rows > 0) {
//move the values to the new default setting
$sql = "update v_default_settings set default_setting_value = '".$row['default_setting_value']."' ";
$sql .= "where default_setting_uuid = '995d09b6-c37b-4eda-a458-5740b955206f' ";
$database->execute($sql, null);
//move the values to the new default setting
$sql = "update v_domain_settings set domain_setting_category = 'emergency', domain_setting_subcategory = 'email_address' ";
$sql .= "where domain_setting_category = 'dialplan' ";
$sql .= "and domain_setting_subcategory = 'emergency_email_address' ";
$database->execute($sql, null);
//delete the old default setting after the new default setting has been updated
$sql = "delete from v_default_settings ";
$sql .= "where default_setting_uuid = '9317ddfd-6cb1-4294-9c57-4061dde66fe4' ";
$database->execute($sql, null);
}
}
}
?>

View File

@ -140,10 +140,11 @@ local sql = "SELECT count(domain_setting_value) ";
sql = sql .. "AS total ";
sql = sql .. "FROM v_domain_settings ";
sql = sql .. "WHERE domain_uuid = :domain_uuid ";
sql = sql .. "AND domain_setting_subcategory = :emergency_email_address ";
sql = sql .. "AND domain_setting_category = :category ";
sql = sql .. "AND domain_setting_subcategory = :email_address ";
sql = sql .. "AND domain_setting_enabled = :status ";
local params = {domain_uuid = domain_uuid, emergency_email_address = 'emergency_email_address', status = 't'}
local params = {domain_uuid = domain_uuid, category = 'emergency', email_address = 'email_address', status = 't'}
dbh:query(sql, params, function(result)
total = result.total;
@ -153,10 +154,10 @@ dbh:query(sql, params, function(result)
local sql = "SELECT default_setting_value ";
sql = sql .. "FROM v_default_settings ";
sql = sql .. "WHERE default_setting_category = :category ";
sql = sql .. "AND default_setting_subcategory = :emergency_email_address ";
sql = sql .. "AND default_setting_subcategory = :email_address ";
sql = sql .. "AND default_setting_enabled = :status ";
sql = sql .. "LIMIT 5 ";
local params = {category = 'dialplan', emergency_email_address = 'emergency_email_address', status = 't'}
local params = {category = 'emergency', email_address = 'email_address', status = 't'}
dbh:query(sql, params, function(result)
for key,row in pairs(result) do
table.insert(to, row);
@ -173,9 +174,10 @@ dbh:query(sql, params, function(result)
local sql = "SELECT domain_setting_value ";
sql = sql .. "FROM v_domain_settings ";
sql = sql .. "WHERE domain_uuid = :domain_uuid ";
sql = sql .. "AND domain_setting_subcategory = :emergency_email_address ";
sql = sql .. "AND domain_setting_category = :category ";
sql = sql .. "AND domain_setting_subcategory = :email_address ";
sql = sql .. "AND domain_setting_enabled = :status ";
local params = {domain_uuid = domain_uuid, emergency_email_address = 'emergency_email_address', status = 't'}
local params = {domain_uuid = domain_uuid, category = 'emergency', email_address = 'email_address', status = 't'}
dbh:query(sql, params, function(result)
for key,row in pairs(result) do
table.insert(to, row);
@ -259,3 +261,4 @@ end
dbh:query(sql, params);
dbh:release();