Merge branch 'master' of ssh://git.freeswitch.org:222/freeswitch-contrib

mcollins/wakeup_call/Wakeup_Call_Macros.xml

@@ -2,13 +2,19 @@
   <!-- Wake-up call phrases -->
   <!-- Put this file in conf/lang/en/ivr/ directory -->
 <!--
-    Requires FreeSWITCH Callie sounds version 1.0.16 or later
+    Requires FreeSWITCH Callie sounds version 1.0.21 or later
 -->
   <macro name="For_one_time_wakeup_call">
     <input pattern="(.*)">
       <match>
+<!--	<action function="sleep" data="1000"/>
+	<action function="play-file" data="ivr/ivr-not_requested_wakeup_call.wav"/>-->
 	<action function="sleep" data="1000"/>
 	<action function="play-file" data="ivr/ivr-for_one_time_wakeup_call.wav"/>
+	<action function="play-file" data="ivr/ivr-please_enter_the.wav"/>
+	<action function="play-file" data="time/hour.wav"/>
+	<action function="play-file" data="currency/and.wav"/>
+	<action function="play-file" data="time/minute.wav"/>
       </match>
     </input>
   </macro>

mcollins/wakeup_call/wakeup-call.lua

@@ -11,6 +11,7 @@ require "date"
 
 api = freeswitch.API()
 session:answer()
+session:sleep(1000)
 session:setAutoHangup(false)
 
 -- Sound files and phrases
@@ -39,9 +40,10 @@ my_wuc = api:execute("db","select/wuc/" .. caller)
 
 while (session:ready()) do
 	if ( my_wuc == '' ) then
-		wakeup_dialstring = "originate {ignore_early_media=true,origination_caller_id_number=*55}user/" .. caller .. " wake_up_sleepy_head"
+		wakeup_dialstring = "originate {ignore_early_media=true,origination_caller_id_number=9253,origination_caller_id_name='Wakeup Call'}user/" .. caller .. " wake_up_sleepy_head"
 		freeswitch.consoleLog("INFO","Setting wakeup dialstring to:\n" .. wakeup_dialstring .. "\n\n")
 		-- No wuc, ask caller to create one
+		session:streamFile("ivr/ivr-not_requested_wakeup_call.wav");
 		freeswitch.consoleLog("INFO", "No wakeup call for " .. caller .. ", let's create one\n")
 		digits = session:playAndGetDigits(4,4,3,9000,"#",get_time,invalid,"([012][0-9]|2[0123])[012345][0-9]")