From 91911a10ca38dc1510172be015572775d0890c31 Mon Sep 17 00:00:00 2001 From: markjcrane Date: Sun, 16 Aug 2015 01:53:39 -0600 Subject: [PATCH] Add fax default setting keep_local. --- app/fax/app_config.php | 9 +++++---- app/fax/app_defaults.php | 8 +++++++- app/fax/fax_edit.php | 1 + 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/fax/app_config.php b/app/fax/app_config.php index b0e94962d6..8567a0023d 100644 --- a/app/fax/app_config.php +++ b/app/fax/app_config.php @@ -256,10 +256,6 @@ $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Authorized email-to-fax sender addresses."; $z++; - $apps[$x]['db'][$y]['fields'][$z]['name'] = "fax_local"; - $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; - $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = ""; - $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = "fax_pin_number"; $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = ""; @@ -281,6 +277,11 @@ $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = ""; $z++; + //$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "fax_keep_local"; + //$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "fax_local"; + //$apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; + //$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = ""; + //$z++; $apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "fax_description"; $apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "faxdescription"; $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; diff --git a/app/fax/app_defaults.php b/app/fax/app_defaults.php index 1ce47330ac..b3ab8cd98c 100644 --- a/app/fax/app_defaults.php +++ b/app/fax/app_defaults.php @@ -53,7 +53,13 @@ if ($domains_processed == 1) { $array[$x]['default_setting_enabled'] = 'true'; $array[$x]['default_setting_description'] = 'Send a T38 reinvite when a fax tone is detected.'; $x++; - + $array[$x]['default_setting_category'] = 'fax'; + $array[$x]['default_setting_subcategory'] = 'keep_local'; + $array[$x]['default_setting_name'] = 'boolean'; + $array[$x]['default_setting_value'] = 'true'; + $array[$x]['default_setting_enabled'] = 'true'; + $array[$x]['default_setting_description'] = 'Keep the file after sending or receiving the fax.'; + $x++; //get an array of the default settings $sql = "select * from v_default_settings "; $prep_statement = $db->prepare($sql); diff --git a/app/fax/fax_edit.php b/app/fax/fax_edit.php index e52a9ade26..70243b2e25 100644 --- a/app/fax/fax_edit.php +++ b/app/fax/fax_edit.php @@ -135,6 +135,7 @@ else { } else { $forward_prefix = $forward_prefix.$fax_forward_number.'#'; //found } + $fax_local = check_str($_POST["fax_local"]); $fax_description = check_str($_POST["fax_description"]); }