Changeset 6038 for modules

Timestamp:

07/17/08 00:10:51 (5 years ago)

Author:

p_lindheimer

Message:

#2671 move macro-confirm to auto-generate, change to use background to handle compound recordings

Files:

• modules/branches/2.5/core/etc/extensions.conf (modified) (1 diff)
• modules/branches/2.5/core/functions.inc.php (modified) (2 diffs)

modules/branches/2.5/core/etc/extensions.conf

@@ -1039 +1039 @@
-
-;------------------------------------------------------------------------
-; [macro-confirm]
-;------------------------------------------------------------------------
-; CONTEXT:      macro-confirm                                                                                                              
-; PURPOSE:      added default message if none supplied
-;
-; Follom-Me and Ringgroups provide an option to supply a message to be
-; played as part of the confirmation. These changes have added a default
-; message if none is supplied.
-;
-;------------------------------------------------------------------------
-[macro-confirm]
-exten => s,1,Set(LOOPCOUNT=0)
-exten => s,n,Noop(CALLCONFIRMCID: ${CALLCONFIRMCID})
-
-; We set ABORT rather than CONTINUE, as we want the server to forget about this channel 
-; if it's declined, hung up, or timed out. We don't want it to continue on to the next
-; step in the dialplan, which could be anything!
-exten => s,n,Set(__MACRO_RESULT=ABORT)
-
-; ARG1 is the announcement to play to tell the user that they've got a call they need
-; to confirm. Something along the lines of 'You have an incoming call. Press 1 to accept, 9 to reject'
-exten => s,n,Set(MSG1=${IF($["foo${ARG1}" != "foo"]?${ARG1}:"incoming-call-1-accept-2-decline")})
-exten => s,n(start),Read(INPUT,${MSG1},1,,1,5)
-
-; So. We've now read something, or nothing. We should check to make sure that the call hasn't
-; already been answered by someone else. If it has, send this call to toolate
-exten => s,n,GotoIf(${DB_EXISTS(RG/${ARG3}/${UNIQCHAN})}?check:toolate)
-
-; We passed that test, so it means the call hasn't been answered. Has this user pushed 1? If so,
-; then go to OK.
-exten => s,n(check),GotoIf($["${INPUT}"="1"]?ok)
-
-; If they've pushed 9, then they definately don't want the call. Just pretend there was no response
-; and go to noanswer (or 2 since that will be default for asterisk)
-exten => s,n,GotoIf($["${INPUT}"="9"]?noanswer)
-exten => s,n,GotoIf($["${INPUT}"="2"]?noanswer)
-exten => s,n,GotoIf($["${INPUT}"="3"]?playcid)
-
-; Increment LOOPCOUNT, and check to make sure we haven't played it 5 times by now. We assume that
-; the person is able to push '1' in a reasonably short time.
-exten => s,n,Set(LOOPCOUNT=$[ ${LOOPCOUNT} + 1 ])
-exten => s,n,GotoIf($[ ${LOOPCOUNT} < 5 ]?start)
-
-; If we're here, that means we've played it MORE than 5 times. Set __MACRO_RESULT=ABORT, well, just 
-; coz, and goto fin, which is the last line, meaning it returns to the previous Dial, and pretends as
-; if nothing has happened.
-exten => s,n(noanswer),Set(__MACRO_RESULT=ABORT)
-exten => s,n,Goto(fin)
-
-; Test play callerid
-;
-exten => s,n(playcid),Noop(Playing CID: ${CALLCONFIRMCID})
-exten => s,n,SayDigits(${CALLCONFIRMCID})
-exten => s,n,Goto(start)
-
-; If we're here, it's because the call was already accepted by someone else.
-exten => s,n(toolate),Set(MSG2=${IF($["foo${ARG2}" != "foo"]?${ARG2}:"incoming-call-no-longer-avail")})
-exten => s,n,Playback(${MSG2})
-exten => s,n,Goto(noanswer)
-
-; If we made it here, it's because the call _WAS_ accepted, AND it's still ringing. We delete the
-; database entry (so that the DB_EXISTS line above will trigger a 'toolate' jump), and set the 
-; MACRO_RESULT variable to NOTHING. This is the magic string that joins both legs of the call together
-exten => s,n(ok),DBDel(RG/${ARG3}/${UNIQCHAN})
-exten => s,n,DBDel(${BLKVM_OVERRIDE})
-exten => s,n,Set(__MACRO_RESULT=)
-
-; The end.
-exten => s,n(fin),NoOp(Finished)
-exten => h,1,Noop(Hangup Extension in macro-confirm)
-exten => h,n,Macro(hangupcall)
-
-;------------------------------------------------------------------------
-
-;------------------------------------------------------------------------
-; [findmefollow-ringallv2]
-;------------------------------------------------------------------------

modules/branches/2.5/core/functions.inc.php

@@ -1200 +1200 @@
-      }
-
+      /*
+      ;------------------------------------------------------------------------
+      ; [macro-confirm]
+      ;------------------------------------------------------------------------
+      ; CONTEXT:      macro-confirm                                                                                                              
+      ; PURPOSE:      added default message if none supplied
+      ;
+      ; Follom-Me and Ringgroups provide an option to supply a message to be
+      ; played as part of the confirmation. These changes have added a default
+      ; message if none is supplied.
+      ;
+      ;------------------------------------------------------------------------
+      */
+      $context = 'macro-confirm';
+      $exten = 's';
+
+      $ext->add($context, $exten, '', new ext_setvar('LOOPCOUNT','0'));
+      $ext->add($context, $exten, '', new ext_setvar('__MACRO_RESULT','ABORT'));
+      $ext->add($context, $exten, '', new ext_setvar('MSG1','${IF($["foo${ARG1}" != "foo"]?${ARG1}:"incoming-call-1-accept-2-decline")}'));
+      if (version_compare($version, "1.4", "ge")) { 
+        $ext->add($context, $exten, 'start', new ext_background('${MSG1},m,${CHANNEL(language)},macro-confirm'));
+      } else {
+        $ext->add($context, $exten, 'start', new ext_background('${MSG1},m,${LANGUAGE},macro-confirm'));
+      }
+      $ext->add($context, $exten, '', new ext_read('INPUT', '', 1, '', '', 4));
+      $ext->add($context, $exten, '', new ext_gotoif('$[${LEN(${INPUT})} > 0]', '${INPUT},1', 't,1'));
+
+      $exten = '1';
+      $ext->add($context, $exten, '', new ext_gotoif('$["${DB_EXISTS(RG/${ARG3}/${UNIQCHAN})}" = "0"]', 'toolate,1'));
+      $ext->add($context, $exten, '', new ext_dbdel('RG/${ARG3}/${UNIQCHAN}'));
+      $ext->add($context, $exten, '', new ext_dbdel('${BLKVM_OVERRIDE}'));
+      $ext->add($context, $exten, '', new ext_setvar('__MACRO_RESULT',''));
+      $ext->add($context, $exten, '', new ext_macroexit());
+
+      $exten = '2';
+      $ext->add($context, $exten, '', new ext_goto(1, 'noanswer'));
+
+      $exten = '3';
+      $ext->add($context, $exten, '', new ext_saydigits('${CALLCONFIRMCID}'));
+      $ext->add($context, $exten, '', new ext_gotoif('$["${DB_EXISTS(RG/${ARG3}/${UNIQCHAN})}" = "0"]', 'toolate,1','s,start'));
+
+      $exten = 't';
+      $ext->add($context, $exten, '', new ext_gotoif('$["${DB_EXISTS(RG/${ARG3}/${UNIQCHAN})}" = "0"]', 'toolate,1'));
+      $ext->add($context, $exten, '', new ext_setvar('LOOPCOUNT','$[ ${LOOPCOUNT} + 1 ]'));
+      $ext->add($context, $exten, '', new ext_gotoif('$[ ${LOOPCOUNT} < 5 ]', 's,start','noanswer,1'));
+
+      $exten = '_X';
+      if (version_compare($version, "1.4", "ge")) { 
+        $ext->add($context, $exten, '', new ext_background('invalid,m,${CHANNEL(language)},macro-confirm'));
+      } else {
+        $ext->add($context, $exten, '', new ext_background('invalid,m,${LANGUAGE},macro-confirm'));
+      }
+      $ext->add($context, $exten, '', new ext_gotoif('$["${DB_EXISTS(RG/${ARG3}/${UNIQCHAN})}" = "0"]', 'toolate,1'));
+      $ext->add($context, $exten, '', new ext_setvar('LOOPCOUNT','$[ ${LOOPCOUNT} + 1 ]'));
+      $ext->add($context, $exten, '', new ext_gotoif('$[ ${LOOPCOUNT} < 5 ]', 's,start','noanswer,1'));
+
+      $exten = 'noanswer';
+      $ext->add($context, $exten, '', new ext_setvar('__MACRO_RESULT','ABORT'));
+      $ext->add($context, $exten, '', new ext_macroexit());
+
+      $exten = 'toolate';
+      $ext->add($context, $exten, '', new ext_setvar('MSG2','${IF($["foo${ARG2}" != "foo"]?${ARG2}:"incoming-call-no-longer-avail")}'));
+      $ext->add($context, $exten, '', new ext_playback('${MSG2}'));
+      $ext->add($context, $exten, '', new ext_setvar('__MACRO_RESULT','ABORT'));
+      $ext->add($context, $exten, '', new ext_macroexit());
+
+      $exten = 'h';
+      $ext->add($context, $exten, '', new ext_macro('hangupcall'));
+
+
+
-      $context = 'macro-dialout-trunk';
-      $exten = 's';
@@ -1552 +1623 @@
-      
-      $ext->add($context, $exten, '', new ext_playback('beep'));
-
+
+
+
+
+
-      $ext->add($context, $exten, '', new ext_wait(1));
-      $ext->add($context, $exten, '', new ext_goto(1, 'confmenu'));