svn diff

resources/install/scripts/fifo_member.lua

@@ -47,12 +47,30 @@ if ( session:ready() ) then
 	--fifo_lag = 10;
 
 	if (pin_number) then
-		digits = session:playAndGetDigits(3, 8, 3, digit_timeout, "#", sounds_dir.."/custom/please_enter_the_pin_number.wav", "", "\\d+");
+			--sleep
+				session:sleep(500);
+
+			--get the user pin number
+				min_digits = 2;
+				max_digits = 20;
+				digits = session:playAndGetDigits(min_digits, max_digits, max_tries, digit_timeout, "#", "phrase:voicemail_enter_pass:#", "", "\\d+");
+
+			--validate the user pin number
+				pin_number_table = explode(",",pin_number);
+				for index,pin_number in pairs(pin_number_table) do
 					if (digits == pin_number) then
+						--set the variable to true
+							auth = true;
+						--set the authorized pin number that was used
+							session:setVariable("pin_number", pin_number);
+						--end the loop
+							break;
+					end
+				end		if (digits == pin_number) then
 			--pin is correct
 
 			--press 1 to login and 2 to logout
-			menu_selection = session:playAndGetDigits(1, 1, max_tries, digit_timeout, "#", sounds_dir.."/custom/please_enter_the_phone_number.wav", "", "\\d+");
+				menu_selection = session:playAndGetDigits(1, 1, max_tries, digit_timeout, "#", sounds_dir.."/ivr/ivr-enter_destination_telephone_number.wav", "", "\\d+");
 				freeswitch.consoleLog("NOTICE", "menu_selection: "..menu_selection.."\n");
 				if (menu_selection == "1") then
 					session:execute("set", "fifo_member_add_result=${fifo_member(add "..queue_name.." {fifo_member_wait=nowait}user/"..user_name.." "..fifo_simo.." "..fifo_timeout.." "..fifo_lag.."} )"); --simo timeout lag
@@ -68,17 +86,21 @@ if ( session:ready() ) then
 			--wait for the file to be written before proceeding
 				--	session:sleep(1000);
 
+			--hangup
 				session:hangup();
 
 		else
-			session:streamFile(sounds_dir.."/custom/your_pin_number_is_incorect_goodbye.wav");
+			--auth failed
+				session:streamFile("phrase:voicemail_fail_auth:#");
+				session:hangup("NORMAL_CLEARING");
+				return;
 		end
 	else
 
 		--pin number is not required
 
 		--press 1 to login and 2 to logout
-		menu_selection = session:playAndGetDigits(1, 1, max_tries, digit_timeout, "#", sounds_dir.."/custom/please_enter_the_phone_number.wav", "", "\\d+");
+			menu_selection = session:playAndGetDigits(1, 1, max_tries, digit_timeout, "#", sounds_dir.."/ivr/ivr-enter_destination_telephone_number.wav", "", "\\d+");
 			freeswitch.consoleLog("NOTICE", "menu_selection: "..menu_selection.."\n");
 			if (menu_selection == "1") then
 				session:execute("set", "fifo_member_add_result=${fifo_member(add "..queue_name.." {fifo_member_wait=nowait}user/"..user_name.." "..fifo_simo.." "..fifo_timeout.." "..fifo_lag.."} )"); --simo timeout lag
@@ -92,8 +114,9 @@ if ( session:ready() ) then
 			end
 
 		--wait for the file to be written before proceeding
-		--	session:sleep(1000);
+			--session:sleep(1000);
 
+		--hangup
 			session:hangup();
 	end
 end

resources/install/scripts/intercept.lua

@@ -80,14 +80,26 @@ if ( session:ready() ) then
 
 	--if the pin number is provided then require it
 		if (pin_number) then
-			min_digits = string.len(pin_number);
+			--sleep
-			max_digits = string.len(pin_number)+1;
+				session:sleep(500);
-			--digits = session:playAndGetDigits(min_digits, max_digits, max_tries, digit_timeout, "#", sounds_dir.."/"..default_language.."/"..default_dialect.."/"..default_voice.."/custom/please_enter_the_pin_number.wav", "", "\\d+");
+			--get the user pin number
+				min_digits = 2;
+				max_digits = 20;
 				digits = session:playAndGetDigits(min_digits, max_digits, max_tries, digit_timeout, "#", "phrase:voicemail_enter_pass:#", "", "\\d+");
+			--validate the user pin number
+				pin_number_table = explode(",",pin_number);
+				for index,pin_number in pairs(pin_number_table) do
 					if (digits == pin_number) then
-				--pin is correct
+						--set the variable to true
-			else
+							auth = true;
-				--session:streamFile(sounds_dir.."/"..default_language.."/"..default_dialect.."/"..default_voice.."/custom/your_pin_number_is_incorect_goodbye.wav");
+						--set the authorized pin number that was used
+							session:setVariable("pin_number", pin_number);
+						--end the loop
+							break;
+					end
+				end
+			--if not authorized play a message and then hangup
+				if (not auth) then
 					session:streamFile("phrase:voicemail_fail_auth:#");
 					session:hangup("NORMAL_CLEARING");
 					return;

resources/install/scripts/intercept_group.lua

@@ -78,14 +78,26 @@
 
 		--if the pin number is provided then require it
 			if (pin_number) then
-				min_digits = string.len(pin_number);
+				--sleep
-				max_digits = string.len(pin_number)+1;
+					session:sleep(500);
-				--digits = session:playAndGetDigits(min_digits, max_digits, max_tries, digit_timeout, "#", sounds_dir.."/"..default_language.."/"..default_dialect.."/"..default_voice.."/custom/please_enter_the_pin_number.wav", "", "\\d+");
+				--get the user pin number
+					min_digits = 2;
+					max_digits = 20;
 					digits = session:playAndGetDigits(min_digits, max_digits, max_tries, digit_timeout, "#", "phrase:voicemail_enter_pass:#", "", "\\d+");
+				--validate the user pin number
+					pin_number_table = explode(",",pin_number);
+					for index,pin_number in pairs(pin_number_table) do
 						if (digits == pin_number) then
-					--pin is correct
+							--set the variable to true
-				else
+								auth = true;
-					--session:streamFile(sounds_dir.."/"..default_language.."/"..default_dialect.."/"..default_voice.."/custom/your_pin_number_is_incorect_goodbye.wav");
+							--set the authorized pin number that was used
+								session:setVariable("pin_number", pin_number);
+							--end the loop
+								break;
+						end
+					end
+				--if not authorized play a message and then hangup
+					if (not auth) then
 						session:streamFile("phrase:voicemail_fail_auth:#");
 						session:hangup("NORMAL_CLEARING");
 						return;

resources/install/scripts/page.lua

@@ -91,13 +91,27 @@ if ( session:ready() ) then
 
 	--if the pin number is provided then require it
 	if (pin_number) then
-		min_digits = string.len(pin_number);
+		--sleep
-		max_digits = string.len(pin_number)+1;
+			session:sleep(500);
-		digits = session:playAndGetDigits(min_digits, max_digits, max_tries, digit_timeout, "#", sounds_dir.."/"..default_language.."/"..default_dialect.."/"..default_voice.."/custom/please_enter_the_pin_number.wav", "", "\\d+");
+		--get the user pin number
+			min_digits = 2;
+			max_digits = 20;
+			digits = session:playAndGetDigits(min_digits, max_digits, max_tries, digit_timeout, "#", "phrase:voicemail_enter_pass:#", "", "\\d+");
+		--validate the user pin number
+			pin_number_table = explode(",",pin_number);
+			for index,pin_number in pairs(pin_number_table) do
 				if (digits == pin_number) then
-			--pin is correct
+					--set the variable to true
-		else
+						auth = true;
-			session:streamFile(sounds_dir.."/"..default_language.."/"..default_dialect.."/"..default_voice.."/custom/your_pin_number_is_incorect_goodbye.wav");
+					--set the authorized pin number that was used
+						session:setVariable("pin_number", pin_number);
+					--end the loop
+						break;
+				end
+			end
+		--if not authorized play a message and then hangup
+			if (not auth) then
+				session:streamFile("phrase:voicemail_fail_auth:#");
 				session:hangup("NORMAL_CLEARING");
 				return;
 			end

resources/install/scripts/pin_number.lua

@@ -67,11 +67,12 @@ if ( session:ready() ) then
 
 	--if the pin number is provided then require it
 		if (pin_number) then
+			--sleep
+				session:sleep(500);
 			--get the user pin number
 				min_digits = 2;
 				max_digits = 20;
 				digits = session:playAndGetDigits(min_digits, max_digits, max_tries, digit_timeout, "#", "phrase:voicemail_enter_pass:#", "", "\\d+");
-
 			--validate the user pin number
 				pin_number_table = explode(",",pin_number);
 				for index,pin_number in pairs(pin_number_table) do
@@ -84,7 +85,6 @@ if ( session:ready() ) then
 							break;
 					end
 				end
-
 			--if not authorized play a message and then hangup
 				if (not auth) then
 					session:streamFile("phrase:voicemail_fail_auth:#");

resources/install/scripts/roku.lua

@@ -45,16 +45,31 @@ if ( session:ready() ) then
 	timeoutpin = 7500;
 	timeouttransfer = 7500;
 
+--sounds_dir.."/"..default_language.."/"..default_dialect.."/"..default_voice.."
+
 	--if the pin number is provided then require it
 	if (pin_number) then
-			min_digits = string.len(pin_number);
+		--get the user pin number
-			max_digits = string.len(pin_number)+1;
+			min_digits = 2;
-			digits = session:playAndGetDigits(min_digits, max_digits, max_tries, digit_timeout, "#", sounds_dir.."/"..default_language.."/"..default_dialect.."/"..default_voice.."/custom/please_enter_the_pin_number.wav", "", "\\d+");
+			max_digits = 20;
+			digits = session:playAndGetDigits(min_digits, max_digits, max_tries, digit_timeout, "#", "phrase:voicemail_enter_pass:#", "", "\\d+");
+
+		--validate the user pin number
+			pin_number_table = explode(",",pin_number);
+			for index,pin_number in pairs(pin_number_table) do
 				if (digits == pin_number) then
-				--pin is correct
+					--set the variable to true
-				digits = "";
+						auth = true;
-			else
+					--set the authorized pin number that was used
-				session:streamFile(sounds_dir.."/"..default_language.."/"..default_dialect.."/"..default_voice.."/custom/your_pin_number_is_incorect_goodbye.wav");
+						session:setVariable("pin_number", pin_number);
+					--end the loop
+						break;
+				end
+			end
+
+		--if not authorized play a message and then hangup
+			if (not auth) then
+				session:streamFile("phrase:voicemail_fail_auth:#");
 				session:hangup("NORMAL_CLEARING");
 				return;
 			end
@@ -65,7 +80,7 @@ if ( session:ready() ) then
 		min_digits = 1;
 		max_digits = 1;
 		digitmaxlength = 1;
-		digits = session:playAndGetDigits(min_digits, max_digits, max_tries, digit_timeout, "#", sounds_dir.."/"..default_language.."/"..default_dialect.."/"..default_voice.."/custom/please_enter_the_phone_number.wav", "", "\\d+");
+		digits = session:playAndGetDigits(min_digits, max_digits, max_tries, digit_timeout, "#", sounds_dir.."/"..default_language.."/"..default_dialect.."/"..default_voice.."/ivr/ivr-enter_destination_telephone_number.wav", "", "\\d+");
 
 		x = 0;
 		while (session:ready() == true) do