Changeset 3406

Timestamp:

12/21/06 19:41:20 (5 years ago)

Author:

p_lindheimer

Message:

core changes required for new ringallv2 ring strategy added to followme. This strategy allows the primary extension in a followme to start ringing for the pre-ring time, and if present in its own ringgroup (the typical behavior), it will continue ringing and not hangup and then re-ring. This avoids the double missed calls on many phones from the normal modes

Files:

• freepbx/trunk/amp_conf/agi-bin/dialparties.agi (modified) (10 diffs)
• freepbx/trunk/amp_conf/astetc/extensions.conf (modified) (4 diffs)

freepbx/trunk/amp_conf/agi-bin/dialparties.agi

@@ -60 +60 @@
-$pr_dialstatus  = get_var( $AGI, "PR_DIALSTATUS" );
-
+$fmgrp  = get_var( $AGI, "FMGRP" );
-$nodest = get_var( $AGI, "NODEST" );
-if (empty($nodest)) $nodest = '';
-
+$ringgroup_index  = get_var( $AGI, "RINGGROUP_INDEX" );
-$use_confirmation = get_var( $AGI, "USE_CONFIRMATION" );
-
+
+
+
-
-if (empty($timer))  $timer    = 0;
@@ -70 +74 @@
-if (empty($rgmethod)) $rgmethod = "none";
-
-if (empty($use_confirmation)) $use_confirmation = "FALSE";
-
-debug("Methodology of ring is  '$rgmethod'", 1);
-debug("USE_CONFIRMATION:  '$use_confirmation'", 4);
-debug("RINGGROUP_INDEX:   '$ringgroup_index'", 4);
-
-// reset the ringgroup method to its fundamental algorithm and pull out if
-// master mode.
+
+$recall_mastermode=$rgmethod;
-
-if ($rgmethod == "ringall-prim") {
@@ -89 +92 @@
-  $mastermode = 1;
-} else 
+} elseif ($rgmethod == "ringallv2-prim") 
+{
+  $rgmethod = "ringallv2";
+  $mastermode = 1;
-  $mastermode = 0;
-
@@ -96 +103 @@
-// if they set a -prim mode in one of the others
-//
-$rgmethod != "ringall
- reset to: '$rgmethod'
+trim($rgmethod) != "ringall") && (trim($rgmethod) != "ringallv2
+: '$rgmethod' resetting to ringall
-  $rgmethod = "ringall";
-}
@@ -119 +126 @@
-  
-  $arg_cnt++;
+}
+
+// FollowMe Preparation for Pre-Ring:
+//
+// If the primary extension is in the ringgroup list, then it should be rung
+// during both the pre-ring time and the list time, so it's real prering time
+// is the entire time. If it is not in the list, then it should only ring
+// for the pre-ring time. This section determines the times and then adds it
+// to the list if not already there, so that the dialstring is computed
+// appropriately. This section also makes sure that the primary extension
+// is at the top of the list.
+//
+// Notes before I forget. The primary may have been in the list and screwed
+// above. So ... do I need to move this up, probably.
+//
+if ($rgmethod == "ringallv2" && $fmgrp != "") {
+
+  $fmgrp_primaryremoved = 0;
+
+  $fmgrp_prering  = $AGI->database_get('AMPUSER', $fmgrp."/followme/prering"); 
+  $fmgrp_prering  = $fmgrp_prering['data'] > 1 ? $fmgrp_prering['data'] : 2;
+     
+  $fmgrp_grptime  = $AGI->database_get('AMPUSER', $fmgrp."/followme/grptime"); 
+  $fmgrp_grptime  = $fmgrp_grptime['data'];
+
+  debug("got fmgrp_prering: $fmgrp_prering, fmgrp_grptime: $fmgrp_grptime",4);
+
+  $fmgrp_totalprering = $fmgrp_grptime + $fmgrp_prering;
+
+  debug("fmgrp_totalprering: $fmgrp_totalprering",4);
+
+  if (in_array($fmgrp, $ext)) {
+    debug("found extension in pre-ring and array",4);
+    $fmgrp_realprering = $fmgrp_totalprering;
+    if ($ext[0] != $fmgrp) {
+      $tmpx=array_flip($ext);
+      unset($ext[$tmpx[$fmgrp]]);
+      array_unshift($ext,$fmgrp);
+    }
+  } else {
+    debug("extension not in group list, ringging only during perring time",4);
+    $fmgrp_realprering = $fmgrp_prering;
+    array_unshift($ext,$fmgrp);
+  }
+debug("ringallv2 ring times: REALPRERING: $fmgrp_realprering, PRERING: $fmgrp_prering",4);
-}
-
@@ -164 +216 @@
-// Now check for DND
-foreach ( $ext as $k )
-  //if ( !preg_match($k, "/\#/", $matches) )
+
-  if ( (strpos($k,"#")==0) )
-  {
@@ -180 +232 @@
-      {
-        $dndprimary = 1;
+        $fmgrp_primaryremoved = 1;
-        debug("Primary extension is DND, so if mastermode, all should be dnd", 4);
-      }
@@ -190 +243 @@
-
-// Main calling loop
+//
-$skipremaining = 0; // used to allow primary to ring but skip the rest
-
-$ds = '';
-foreach ( $ext as $k )
@@ -343 +396 @@
-    {
-      $dsarray[$realext] = 1;  // could be dial string i suppose but currently only using for duplicate check
-
-
+
+
+
-    
-      // Update Caller ID for calltrace application
@@ -422 +476 @@
-if (!strlen($ds))
-{
+// FollowMe Changes:
+//
+// We need to determine if the generated dialstring can be dialed as is. This will be the case if there are no
+// or is only a single extension to dial. 
+//
+// First, unset any blank fields so we know how many extensions there are to call.
+//
+// If mastermode (skipremaining == 1) was triggered then we just set the ringtime to what the primary extension
+// should ring for and let this dialstring go.
+//
+// If there is only one extension in the list, then we need to determine how long to ring it (depending on if it
+// was the primary or another extension, then let the generated dialstring ring it.
+//
+// Otherwise, we need to re-create the dialstring to be processed by our special dialplan that will ring the
+// primary extension and hold the group list for the required delay. Also - if we are in a call confirmation mode
+// then we need to reset the call confirm variables with one level of inheritance so that they remain in the new
+// channels but don't get further propogated after that. We also clear it for the remainder of this instance since
+// we are not yet triggering further actions until the next call.
+//
+// Notes: $fmgrp_primaryremoved is set to 1 if the primary has been removed from the list so we know that it was dnd-ed.
+//        this only matters in non-prim mode, where we need to know if the remaining list contains the primary extension
+//        or not.
+//
+if ($rgmethod == 'ringallv2') {
+  $count = 0;
+  foreach ($ext as $x) {
+    if ($x == '') {
+      unset($ext[$count]);
+    }
+    $count++;
+  }
+
+  if (($skipremaining == 1) || (count($ext) == 1 && $fmgrp_primaryremoved == 0)) {
+    $timer = $fmgrp_realprering;
+  } elseif (count($ext) == 1 && $fmgrp_primaryremoved == 1) {
+    $timer = $fmgrp_grptime;
+  } elseif (count($ext) == 1) {
+    $timer = $fmgrp_totalprering; // not sure what would trigger this ?
+  } else {
+    $timer = $fmgrp_totalprering; 
+    $ds = "Local/FMPR-".array_shift($ext)."@from-internal&Local/FMGL-".implode('-',$ext)."@from-internal";
+
+    $fmgrp_fmunique = $AGI->request['agi_channel'];
+    $AGI->set_variable('_FMUNIQUE',$fmgrp_fmunique);            
+    $AGI->set_variable('_RingGroupMethod',"ringall");           
+    $fmgrp_prering -= 2;
+    $AGI->set_variable('_FMPRERING',$fmgrp_prering);            
+    $AGI->set_variable('_FMREALPRERING',$fmgrp_realprering);            
+    $AGI->set_variable('_FMGRPTIME',$fmgrp_grptime);            
+    $AGI->set_variable('_FMPRIME',($recall_mastermode == "ringallv2")?"FALSE":"TRUE");            
+
+    debug("FMUNIQUE: $fmgrp_fmunique, FMRERING: $fmgrp_prering, FMREALPRERING: $fmgrp_realprering, FMGRPTIME: $fmgrp_grptime",4);
+
+    if ($use_confirmation != 'FALSE') {
+      $AGI->set_variable('_USE_CONFIRMATION',$use_confirmation);            
+      $AGI->set_variable('_RINGGROUP_INDEX',$ringgroup_index);            
+      $use_confirmation = 'FALSE';
+    }
+  }
+}
+
+if ($nodest != '' && $use_confirmation == 'FALSE') {
+  if (strpos($dialopts,"M(auto-blkvm)") > 0  || strpos($dialopts,"M(auto-blkvm)") === 0 ||
+      strpos($dialopts,"M(auto-confirm") > 0 || strpos($dialopts,"M(auto-confirm") === 0 ||
+      strpos($dialopts,"M(confirm") > 0      || strpos($dialopts,"M(confirm") === 0) {
+    debug("NODEST: $nodest blkvm enabled macro already in dialopts: $dialopts",4);
+  } else {
+    $dialopts .= "M(auto-blkvm)";
+    debug("NODEST: $nodest adding M(auto-blkvm) to dialopts: $dialopts",4);
+  }
+}
+
-  $AGI->noop('');
-} else {

freepbx/trunk/amp_conf/astetc/extensions.conf

@@ -281 +281 @@
-; Cleanup any remaining RG flag
-;
-foo${USE_CONFIRMATION}" = "foo" | "foo${RINGGROUP_INDEX}" = "foo
+x${USE_CONFIRMATION}" = "x" | "x${RINGGROUP_INDEX}" = "x
-exten => s,n,Noop(Cleaning Up Confirmation Flag: RG/${RINGGROUP_INDEX}/${CHANNEL})
-exten => s,n,DBDel(RG/${RINGGROUP_INDEX}/${CHANNEL})
@@ -287 +287 @@
-; Cleanup any remaining BLKVM flag
-;
-foo${BLKVM_BASE}" = "foo" | "BLKVM/${BLKVM_BASE}/${CHANNEL}" != "${BLKVM_OVERRIDE}" ]?theend
+x${BLKVM_BASE}" = "x" | "BLKVM/${BLKVM_BASE}/${CHANNEL}" != "${BLKVM_OVERRIDE}" ]?skipblkvm
-exten => s,n,Noop(Cleaning Up Block VM Flag: ${BLKVM_OVERRIDE})
-exten => s,n,DBDel(${BLKVM_OVERRIDE})
-
-
+
+
+
+
+
+
-exten => s,n,Hangup
-
@@ -802 +807 @@
-exten => s,n,Playtones(congestion)
-exten => s,n,Congestion(5)
+include => findmefollow-ringallv2
-exten => h,1,NoOp(Hangup)
-exten => i,1,NoOp(Invalid)
@@ -1048 +1054 @@
-;------------------------------------------------------------------------
-
+;------------------------------------------------------------------------
+; [findmefollow-ringallv2]
+;------------------------------------------------------------------------
+; This context, to be included in from-internal, implements the PreRing part of findmefollow
+; as well as the GroupRing part. It also communicates between the two so that if DND is set
+; on the primary extension, and mastermode is enabled, then the other extensions will not ring
+;
+;------------------------------------------------------------------------
+[findmefollow-ringallv2]
+exten => _FMPR-.,1,Noop(In FMPR ${FMGRP} with ${EXTEN:5})
+exten => _FMPR-.,n,Set(RingGroupMethod=)
+exten => _FMPR-.,n,Set(USE_CONFIRMATION=)
+exten => _FMPR-.,n,Set(RINGGROUP_INDEX=)
+exten => _FMPR-.,n,Macro(simple-dial,${EXTEN:5},${FMREALPRERING})
+exten => _FMPR-.,n,GotoIf($["${DIALSTATUS}" != "BUSY"]?nodnd)
+exten => _FMPR-.,n,Set(DB(FM/DND/${FMGRP}/${FMUNIQUE})=DND)
+exten => _FMPR-.,n(nodnd),Noop(Ending FMPR ${FMGRP} with ${EXTEN:5} and dialstatus ${DIALSTATUS})
+exten => _FMPR-.,n,Hangup()
+
+exten => _FMGL-.,1,Noop(In FMGL ${FMGRP} with ${EXTEN:5})
+exten => _FMGL-.,n,Wait(1)
+exten => _FMGL-.,n,GotoIf($["${DB(FM/DND/${FMGRP}/${FMUNIQUE})}" = "DND"]?dodnd)
+exten => _FMGL-.,n,Wait(1)
+exten => _FMGL-.,n,GotoIf($["${DB(FM/DND/${FMGRP}/${FMUNIQUE})}" = "DND"]?dodnd)
+exten => _FMGL-.,n,Wait(${FMPRERING})
+exten => _FMGL-.,n,GotoIf($["${DB(FM/DND/${FMGRP}/${FMUNIQUE})}" = "DND"]?dodnd)
+exten => _FMGL-.,n,DBDel(FM/DND/${FMGRP}/${FMUNIQUE})
+exten => _FMGL-.,n(dodial),Macro(dial,${FMGRPTIME},${DIAL_OPTIONS},${EXTEN:5})
+exten => _FMGL-.,n,Noop(Ending FMGL ${FMGRP} with ${EXTEN:5} and dialstatus ${DIALSTATUS})
+exten => _FMGL-.,n,Hangup()
+exten => _FMGL-.,n+10(dodnd),DBDel(FM/DND/${FMGRP}/${FMUNIQUE})
+exten => _FMGL-.,n,GotoIf($["${FMPRIME}" = "FALSE"]?dodial)
+exten => _FMGL-.,n,Noop(Got DND in FMGL ${FMGRP} with ${EXTEN:5} in ${RingGroupMethod} mode, aborting)
+exten => _FMGL-.,n,Hangup()
+
+;------------------------------------------------------------------------
+
-; ############################################################################
-; Extension Contexts [ext]