From 83f9b3d04757ee67af4ed8585014f6215551942e Mon Sep 17 00:00:00 2001
From: Mark Crane <markjcrane@gmail.com>
Date: Mon, 8 Oct 2012 18:31:06 +0000
Subject: [PATCH] Fix a bug with default settings -> voicemail when ssl is
 selected.

---
 .../default_settings/default_setting_edit.php |  2 +-
 includes/install/scripts/fax_retry.lua        | 24 +++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/core/default_settings/default_setting_edit.php b/core/default_settings/default_setting_edit.php
index 8089f414c3..415678154f 100644
--- a/core/default_settings/default_setting_edit.php
+++ b/core/default_settings/default_setting_edit.php
@@ -299,7 +299,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "    <option value='tls'>tls</option>\n";
 		}
 		if ($row['default_setting_value'] == "ssl") { 
-		echo "    <option value='ssl' >ssl</option>\n";
+		echo "    <option value='ssl' selected='selected'>ssl</option>\n";
 		}
 		else {
 		echo "    <option value='ssl'>ssl</option>\n";
diff --git a/includes/install/scripts/fax_retry.lua b/includes/install/scripts/fax_retry.lua
index 578d74e281..3e3289532a 100644
--- a/includes/install/scripts/fax_retry.lua
+++ b/includes/install/scripts/fax_retry.lua
@@ -1,3 +1,18 @@
+--include the lua script
+	scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1));
+	include = assert(loadfile(scripts_dir .. "/resources/config.lua"));
+	include();
+
+--connect to the database
+	--ODBC - data source name
+		if (dsn_name) then
+			dbh = freeswitch.Dbh(dsn_name,dsn_username,dsn_password);
+		end
+	--FreeSWITCH core db handler
+		if (db_type == "sqlite") then
+			dbh = freeswitch.Dbh("core:"..db_path.."/"..db_name);
+		end
+
 --set default variables
 	fax_retry_sleep = 10;
 	fax_retry_limit = 3;
@@ -20,10 +35,19 @@
 	--variable_fax_transfer_rate: 14400
 
 -- set channel variables to lua variables
+	domain_uuid = env:getHeader("domain_uuid");
 	uuid = env:getHeader("uuid");
 	fax_success = env:getHeader("fax_success");
+	fax_result_code = env:getHeader("fax_result_code");
 	fax_result_text = env:getHeader("fax_result_text");
 	fax_ecm_used = env:getHeader("fax_ecm_used");
+	fax_local_station_id = env:getHeader("fax_local_station_id");
+	fax_document_transferred_pages = env:getHeader("fax_document_transferred_pages");
+	fax_document_total_pages = env:getHeader("fax_document_total_pages");
+	fax_image_resolution = env:getHeader("fax_image_resolution");
+	fax_image_size = env:getHeader("fax_image_size");
+	fax_bad_rows = env:getHeader("fax_bad_rows");
+	fax_transfer_rate = env:getHeader("fax_transfer_rate");
 	fax_retry_attempts = tonumber(env:getHeader("fax_retry_attempts"));
 	fax_retry_limit = tonumber(env:getHeader("fax_retry_limit"));
 	fax_retry_sleep = tonumber(env:getHeader("fax_retry_sleep"));