From f8771c4f1069dcf031df58edd6c418e3031724db Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Wed, 24 Apr 2024 10:29:03 -0600 Subject: [PATCH] Move emergency setting to its own category. --- app/emergency/app_config.php | 10 ++--- app/emergency/app_defaults.php | 37 +++++++++++++++++++ .../resources/scripts/app/emergency/index.lua | 15 +++++--- 3 files changed, 51 insertions(+), 11 deletions(-) create mode 100644 app/emergency/app_defaults.php diff --git a/app/emergency/app_config.php b/app/emergency/app_config.php index 06c1401b03..8b8634bda6 100644 --- a/app/emergency/app_config.php +++ b/app/emergency/app_config.php @@ -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'] = ""; -?> +?> \ No newline at end of file diff --git a/app/emergency/app_defaults.php b/app/emergency/app_defaults.php new file mode 100644 index 0000000000..41f7eed9de --- /dev/null +++ b/app/emergency/app_defaults.php @@ -0,0 +1,37 @@ + 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); + } + } + + } + +?> \ No newline at end of file diff --git a/app/switch/resources/scripts/app/emergency/index.lua b/app/switch/resources/scripts/app/emergency/index.lua index 329fc12ef8..f3dc40fde8 100644 --- a/app/switch/resources/scripts/app/emergency/index.lua +++ b/app/switch/resources/scripts/app/emergency/index.lua @@ -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(); +