Changeset 3318

Timestamp:

12/13/06 23:59:30 (5 years ago)

Author:

p_lindheimer

Message:

Hopefully the final fix to get all modes of transfering a received call that came in from a queue, ringgroup or followme to subsequent users or direct to their voicemail. Finally able to get rid of dolocaldial, meaning the queue transfers in particular won't ring forever. These change REQUIRE updating findmefollow, ringgroups and queues to the latest

Files:

• freepbx/trunk/amp_conf/astetc/extensions.conf (modified) (9 diffs)

freepbx/trunk/amp_conf/astetc/extensions.conf

@@ -93 +93 @@
-exten => s,1,Macro(user-callerid)
-
-; Don't go to destinations like vm if NODEST is set
-;
-exten => s,n,Noop(CAME FROM: ${NODEST})
-exten => s,n,Set(RRNODEST=${NODEST})
-exten => s,n,Set(_NODEST=)
-
-exten => s,n,Set(FROMCONTEXT=exten-vm)
-exten => s,n,Set(VMBOX=${ARG1})
@@ -106 +100 @@
-exten => s,n,Macro(record-enable,${EXTTOCALL},IN)
-
-
-; If NODEST then bypass voicemail regardless
-;
-;exten => s,n,GotoIf($["${CHANNEL:0:5}" = "Local"]?dolocaldial,1) ; if the channel is Local
-exten => s,n,GotoIf($["foo${RRNODEST}" != "foo"]?dolocaldial,1) ; don't do voicemail
-
-exten => s,n,Macro(dial,${RT},${DIAL_OPTIONS},${EXTTOCALL})
-exten => s,n,GosubIf($[$["${DIALSTATUS}"="NOANSWER"] & $["foo${CFUEXT}"!="foo"]]?docfu,1) ; check for CFU in use on no answer
@@ -117 +105 @@
-exten => s,n,GotoIf($["${VMBOX}" = "novm"]?s-${DIALSTATUS},1) ; no voicemail in use for this extension
-exten => s,n,NoOp(Sending to Voicemail box ${EXTTOCALL})
-exten => s,n,Set(BLKVM=)
-exten => s,n,Macro(vm,${VMBOX},${DIALSTATUS})
-
-; Local channel should try to ring the phone only then come back out
-; i.e. it's wrong for it to Answer the call in any way (including Congestion
-; and stop the initiating dialplan from being returned to)
-;
-exten => dolocaldial,1,Set(RECALL=${BLKVM})
-exten => dolocaldial,n,Set(__BLKVM=${RRNODEST})
-
-exten => dolocaldial,n,Macro(dial,,${DIAL_OPTIONS},${EXTTOCALL})
-
-exten => dolocaldial,n,Set(__BLKVM=${RECALL})
-exten => dolocaldial,n,NoOp(Returned to dolocaldial with DIALSTATUS '${DIALSTATUS}')
-
-; Try the Call Forward on No Answer / Unavailable number
@@ -150 +125 @@
-exten => s,n,Set(VMGAIN=${IF($["foo${VM_GAIN}"!="foo"]?"g(${VM_GAIN})":"")})
-;
-
-
-
-
+
+
+
+
+
-;
-; we didn't branch so block this from voicemail
-;
-
-
+
-
-exten => s-BUSY,1,NoOp(BUSY voicemail)
@@ -224 +199 @@
-exten => s,n,Macro(record-enable,${EXTTOCALL},IN)
-
-
-
-
-
-
-
-
-
+
+
+
+
-exten => s,n,Set(PR_DIALSTATUS=${DIALSTATUS})
-
@@ -310 +281 @@
-exten => s,n,NoCDR()
- 
-s
-
-"foo${USE_CONFIRMATION}" = "foo" | "foo${RINGGROUP_INDEX}" = "foo" | "${CHANNEL}" != "${UNIQCHAN}"]?theend
+
+
+ "foo${USE_CONFIRMATION}" = "foo" | "foo${RINGGROUP_INDEX}" = "foo" | "${CHANNEL}" != "${UNIQCHAN}"]?skiprg
-exten => s,n,Noop(Cleaning Up Confirmation Flag: RG/${RINGGROUP_INDEX}/${CHANNEL})
-exten => s,n,DBDel(RG/${RINGGROUP_INDEX}/${CHANNEL})
+
+; Cleanup any remaining BLKVM flag
+;
+exten => s,n(skiprg),GotoIf($[ "foo${BLKVM_BASE}" = "foo" | "BLKVM/${BLKVM_BASE}/${CHANNEL}" != "${BLKVM_OVERRIDE}" ]?theend)
+exten => s,n,Noop(Cleaning Up Block VM Flag: ${BLKVM_OVERRIDE})
+exten => s,n,DBDel(${BLKVM_OVERRIDE})
+
-exten => s,n(theend),Wait(5)
-exten => s,n,Hangup
@@ -947 +925 @@
-exten => s,n,Set(ARG4=) ; otherwise it gets passed to dialparties.agi which processes it (prob bug) 
-
-exten => s,n,Set(__BLKVM=${NODEST})
-exten => s,n,Set(RECALL=${NODEST})
-exten => s,n,Set(__NODEST=)
-exten => s,n,Macro(dial,${ARG1},${ARG2},${ARG3})
-exten => s,n,Set(__NODEST=${RECALL})
-exten => s,n,Set(__BLKVM=)
-
-exten => s,n,Set(USE_CONFIRMATION=)
@@ -971 +944 @@
-[macro-auto-confirm]
-exten => s,1,Set(__MACRO_RESULT=)
+exten => s,n,DBDel(${BLKVM_OVERRIDE})
-exten => s,n,DBDel(RG/${ARG1}/${UNIQCHAN})
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-;------------------------------------------------------------------------
@@ -1054 +1039 @@
-; 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=)
-