From 59c1fbe2efdf0e9290777b0a3fd8b7fdda9e5684 Mon Sep 17 00:00:00 2001
From: Alexey Melnichuk <mimir@newmail.ru>
Date: Fri, 7 Aug 2015 12:11:27 +0400
Subject: [PATCH] Fix. Always use `/` separator on FS command. Fix. Override
 `temp_dir` from `config.lua` file.

---
 .../install/scripts/app/conference_center/index.lua  |  4 ++--
 resources/install/scripts/app/voicemail/index.lua    | 11 ++++++-----
 .../scripts/configuration/conference.conf.lua        |  8 ++++----
 resources/install/scripts/confirm.lua                |  2 +-
 resources/install/scripts/ivr_menu.lua               | 11 ++++++-----
 resources/install/scripts/recordings.lua             | 11 ++++++-----
 resources/install/scripts/streamfile.lua             | 12 +++++++-----
 7 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/resources/install/scripts/app/conference_center/index.lua b/resources/install/scripts/app/conference_center/index.lua
index 774976f303..5f2a21a919 100644
--- a/resources/install/scripts/app/conference_center/index.lua
+++ b/resources/install/scripts/app/conference_center/index.lua
@@ -589,7 +589,7 @@
 							max_len_seconds = 5;
 							silence_threshold = "500";
 							silence_secs = "3";
-							session:recordFile(temp_dir .. "/conference-"..uuid..".wav", max_len_seconds, silence_threshold, silence_secs);
+							session:recordFile(temp_dir:gsub("\\","/") .. "/conference-"..uuid..".wav", max_len_seconds, silence_threshold, silence_secs);
 					end
 
 				--play a message that the conference is being a recorded
@@ -678,7 +678,7 @@
 				--announce the caller
 					if (announce == "true") then
 						--announce the caller - play the recording
-							cmd = "conference "..meeting_uuid.."-"..domain_name.." play " .. temp_dir .. "/conference-"..uuid..".wav";
+							cmd = "conference "..meeting_uuid.."-"..domain_name.." play " .. temp_dir:gsub("\\", "/") .. "/conference-"..uuid..".wav";
 							--freeswitch.consoleLog("notice", "[conference center] ".. cmd .."\n");
 							response = api:executeString(cmd);
 						--play has entered the conference
diff --git a/resources/install/scripts/app/voicemail/index.lua b/resources/install/scripts/app/voicemail/index.lua
index 42f1e54751..e0c2383890 100644
--- a/resources/install/scripts/app/voicemail/index.lua
+++ b/resources/install/scripts/app/voicemail/index.lua
@@ -142,11 +142,12 @@
 					end
 				end
 			end
-			temp_dir = "";
-			if (settings['server'] ~= nil) then
-				if (settings['server']['temp'] ~= nil) then
-					if (settings['server']['temp']['dir'] ~= nil) then
-						temp_dir = settings['server']['temp']['dir'];
+			if (not temp_dir) or (#temp_dir == 0) then
+				if (settings['server'] ~= nil) then
+					if (settings['server']['temp'] ~= nil) then
+						if (settings['server']['temp']['dir'] ~= nil) then
+							temp_dir = settings['server']['temp']['dir'];
+						end
 					end
 				end
 			end
diff --git a/resources/install/scripts/app/xml_handler/resources/scripts/configuration/conference.conf.lua b/resources/install/scripts/app/xml_handler/resources/scripts/configuration/conference.conf.lua
index 8d41d44532..ad2252ad83 100644
--- a/resources/install/scripts/app/xml_handler/resources/scripts/configuration/conference.conf.lua
+++ b/resources/install/scripts/app/xml_handler/resources/scripts/configuration/conference.conf.lua
@@ -103,7 +103,7 @@
 	table.insert(xml, [[					<param name="caller-id-name" value="$${outbound_caller_name}"/>]]);
 	table.insert(xml, [[					<param name="caller-id-number" value="$${outbound_caller_id}"/>]]);
 	table.insert(xml, [[					<param name="comfort-noise" value="true"/>]]);
-	table.insert(xml, [[					<param name="auto-record" value="]]..temp_dir .. [[/test.wav"/>]]);
+	table.insert(xml, [[					<param name="auto-record" value="]] .. temp_dir:gsub("\\","/") .. [[/test.wav"/>]]);
 	table.insert(xml, [[				</profile>]]);
 
 	table.insert(xml, [[				<profile name="wideband">]]);
@@ -131,7 +131,7 @@
 	table.insert(xml, [[					<param name="caller-id-name" value="$${outbound_caller_name}"/>]]);
 	table.insert(xml, [[					<param name="caller-id-number" value="$${outbound_caller_id}"/>]]);
 	table.insert(xml, [[					<param name="comfort-noise" value="true"/>]]);
-	table.insert(xml, [[					<param name="auto-record" value="]]..temp_dir .. [[/test.wav"/>]]);
+	table.insert(xml, [[					<param name="auto-record" value="]] .. temp_dir:gsub("\\","/") .. [[/test.wav"/>]]);
 	table.insert(xml, [[				</profile>]]);
 
 	table.insert(xml, [[				<profile name="ultrawideband">]]);
@@ -159,7 +159,7 @@
 	table.insert(xml, [[					<param name="caller-id-name" value="$${outbound_caller_name}"/>]]);
 	table.insert(xml, [[					<param name="caller-id-number" value="$${outbound_caller_id}"/>]]);
 	table.insert(xml, [[					<param name="comfort-noise" value="true"/>]]);
-	table.insert(xml, [[					<param name="auto-record" value="]]..temp_dir .. [[/test.wav"/>]]);
+	table.insert(xml, [[					<param name="auto-record" value="]] .. temp_dir:gsub("\\","/") .. [[/test.wav"/>]]);
 	table.insert(xml, [[				</profile>]]);
 
 	table.insert(xml, [[				<profile name="cdquality">]]);
@@ -187,7 +187,7 @@
 	table.insert(xml, [[					<param name="caller-id-name" value="$${outbound_caller_name}"/>]]);
 	table.insert(xml, [[					<param name="caller-id-number" value="$${outbound_caller_id}"/>]]);
 	table.insert(xml, [[					<param name="comfort-noise" value="true"/>]]);
-	table.insert(xml, [[					<param name="auto-record" value="]]..temp_dir .. [[/test.wav"/>]]);
+	table.insert(xml, [[					<param name="auto-record" value="]] .. temp_dir:gsub("\\","/") .. [[/test.wav"/>]]);
 	table.insert(xml, [[				</profile>]]);
 
 	table.insert(xml, [[				<profile name="sla">]]);
diff --git a/resources/install/scripts/confirm.lua b/resources/install/scripts/confirm.lua
index 40873d7ed5..7c8f452ce1 100644
--- a/resources/install/scripts/confirm.lua
+++ b/resources/install/scripts/confirm.lua
@@ -83,7 +83,7 @@
 						digit = '';
 						if (file_exists(call_screen_file)) then
 							max_tries = "1";
-							digit = session:playAndGetDigits(min_digits, max_digits, max_tries, "500", "#", call_screen_file, "", "\\d+");
+							digit = session:playAndGetDigits(min_digits, max_digits, max_tries, "500", "#", call_screen_file:gsub("\\","/"), "", "\\d+");
 						end
 						if (string.len(digit) == 0) then
 							max_tries = "3";
diff --git a/resources/install/scripts/ivr_menu.lua b/resources/install/scripts/ivr_menu.lua
index 19a3cb04db..b4d916de0c 100644
--- a/resources/install/scripts/ivr_menu.lua
+++ b/resources/install/scripts/ivr_menu.lua
@@ -68,11 +68,12 @@
 			end
 		end
 	end
-	temp_dir = "";
-	if (settings['server'] ~= nil) then
-		if (settings['server']['temp'] ~= nil) then
-			if (settings['server']['temp']['dir'] ~= nil) then
-				temp_dir = settings['server']['temp']['dir'];
+	if (not temp_dir) or (#temp_dir == 0) then
+		if (settings['server'] ~= nil) then
+			if (settings['server']['temp'] ~= nil) then
+				if (settings['server']['temp']['dir'] ~= nil) then
+					temp_dir = settings['server']['temp']['dir'];
+				end
 			end
 		end
 	end
diff --git a/resources/install/scripts/recordings.lua b/resources/install/scripts/recordings.lua
index ecc1d4f1a0..40c5624cc1 100644
--- a/resources/install/scripts/recordings.lua
+++ b/resources/install/scripts/recordings.lua
@@ -72,11 +72,12 @@
 			end
 		end
 	end
-	temp_dir = "";
-	if (settings['server'] ~= nil) then
-		if (settings['server']['temp'] ~= nil) then
-			if (settings['server']['temp']['dir'] ~= nil) then
-				temp_dir = settings['server']['temp']['dir'];
+	if (not temp_dir) or (#temp_dir == 0) then
+		if (settings['server'] ~= nil) then
+			if (settings['server']['temp'] ~= nil) then
+				if (settings['server']['temp']['dir'] ~= nil) then
+					temp_dir = settings['server']['temp']['dir'];
+				end
 			end
 		end
 	end
diff --git a/resources/install/scripts/streamfile.lua b/resources/install/scripts/streamfile.lua
index 377974dae7..02b6ca3d47 100644
--- a/resources/install/scripts/streamfile.lua
+++ b/resources/install/scripts/streamfile.lua
@@ -44,11 +44,13 @@
 			end
 		end
 	end
-	temp_dir = "";
-	if (settings['server'] ~= nil) then
-		if (settings['server']['temp'] ~= nil) then
-			if (settings['server']['temp']['dir'] ~= nil) then
-				temp_dir = settings['server']['temp']['dir'];
+
+	if (not temp_dir) or (#temp_dir == 0) then
+		if (settings['server'] ~= nil) then
+			if (settings['server']['temp'] ~= nil) then
+				if (settings['server']['temp']['dir'] ~= nil) then
+					temp_dir = settings['server']['temp']['dir'];
+				end
 			end
 		end
 	end