Changeset 3652

Timestamp:

01/25/07 16:35:10 (5 years ago)

Author:

naftali5

Message:

infrastucture to handle new ringmethod firstavail firstnotonphone #1671

Files:

• freepbx/trunk/amp_conf/agi-bin/dialparties.agi (modified) (5 diffs)
• freepbx/trunk/amp_conf/astetc/extensions.conf (modified) (1 diff)

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

@@ -383 +383 @@
-      }
-    }
+    elseif ( ($exthascw == 1) && ($rgmethod == 'firstnotonphone') )
+    { // get ExtensionState: 0-idle; 1-busy; 4-unavail; 8-ringing <--- these are unconfirmed
+      $extstate = is_ext_avail($extnum);
+      debug("Extension $extnum has ExtensionState: $extstate",1);
+      if ($extstate == 1)
+      { // CW in use - but blocked for hunt
+        debug("Extension $extnum has call waiting enabled but blocked for hunt",1);
+        $extnum = '';
+        $AGI->set_variable('DIALSTATUS','BUSY');  
+      }
+    }
-  }
-  
@@ -402 +413 @@
-    
-      // Update Caller ID for calltrace application
-
+ && ($rgmethod != "firstavailable") && ($rgmethod != "firstnotonphone")
-      {
-        if ( isset($cidnum) && is_numeric($cidnum) )
@@ -435 +446 @@
-$myhuntmember = "";
-
-
+ || ($rgmethod == "firstavailable") || ($rgmethod == "firstnotonphone")
-{
-  if ($cidnum)
@@ -447 +458 @@
-      //If the original array is included in the extension hash then set variables
-      $myhuntmember="HuntMember"."$loops";
-$rgmethod == "hunt"
+($rgmethod == "hunt") || ($rgmethod == "firstavailable") || ($rgmethod == "firstnotonphone")
-        $AGI->set_variable($myhuntmember,$ext_hunt[$k]);
-      elseif ($rgmethod == "memoryhunt") 
@@ -551 +562 @@
-  $AGI->noop('');
-} else {
-
+ || ($rgmethod == "firstavailable") || ($rgmethod == "firstnotonphone")
-  {
-    $ds = '|';

freepbx/trunk/amp_conf/astetc/extensions.conf

@@ -78 +78 @@
-exten => s,42,Dial(${${HuntMember}}${ds} ) ; dialparties will set the priority to 20 if $ds is not null and its a hunt group
-exten => s,43,Set(HuntLoop=$[1 + ${HuntLoop}])
-
-
+
+
+
+
-exten => s,50,DBdel(CALLTRACE/${CT_EXTEN})
-exten => s,51,Goto(s,42)