Changeset 7296

Timestamp:

11/17/08 19:18:01 (5 years ago)

Author:

p_lindheimer

Message:

clean up directed call pickup code by putting all the contexts to call into a single Pickup() call, there is no reason to have multipe priorities to try

Files:

• modules/branches/2.6/core/functions.inc.php (modified) (2 diffs)

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

@@ -767 +767 @@
-        unset($fcc);
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        if ($intercom_code != '') {
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        // In order to do call pickup in ringgroups, we will need to try the ringgoup number
-        // when doing call pickup for that ringgoup so we must see who is a member of what ringgroup
@@ -808 +813 @@
-        // to try the ringgoup.
-        foreach ($rg_members as $exten => $grps) {
-ext->add('app-pickup', "$fc_pickup".$exten, '', new $ext_pickup($exten))
-ext->add('app-pickup', "$fc_pickup".$exten, '', new $ext_pickup($exten.'@ext-local'));
-ext->add('app-pickup', "$fc_pickup".$exten, '', new $ext_pickup($exten.'@from-internal'));
-ext->add('app-pickup', "$fc_pickup".$exten, '', new $ext_pickup($exten.'@from-did-direct'));
-ext->add('app-pickup', "$fc_pickup".$exten, '', new $ext_pickup('LC-'.$exten.'@from-internal'));
-ext->add('app-pickup', "$fc_pickup".$exten, '', new $ext_pickup('FMPR-'.$exten));
-ext->add('app-pickup', "$fc_pickup".$exten, '', new $ext_pickup('FMPR-'.$exten.'@from-internal'));
-
+picklist  = $exten
+picklist .= '&'.$exten.'@ext-local'; 
+picklist .= '&'.$exten.'@from-internal'; 
+picklist .= '&'.$exten.'@from-did-direct'; 
+picklist .= '&LC-'.$exten.'@from-internal'; 
+picklist .= '&FMPR-'.$exten.'@from-internal'; 
+picklist .= '&FMPR-'.$exten.'@from-did-direct'; 
+
-          foreach ($grps as $grp) {
-ext->add('app-pickup', "$fc_pickup".$exten, '', new $ext_pickup($grp.'@from-internal'));
-ext->add('app-pickup', "$fc_pickup".$exten, '', new $ext_pickup($grp.'@ext-group'));
+picklist .= '&'.$grp.'@from-internal'; 
+picklist .= '&'.$grp.'@ext-group'; 
-          }
+          $ext->add('app-pickup', "$fc_pickup".$exten, '', new $ext_pickup($picklist));
-          $ext->add('app-pickup', "$fc_pickup".$exten, '', new ext_hangup(''));
+          if ($intercom_code != '') {
+            $ext->add('app-pickup', "$fc_pickup".$intercom_code.$exten, '', new $ext_pickup($picklist));
+            $ext->add('app-pickup', "$fc_pickup".$intercom_code.$exten, '', new ext_hangup(''));
+          }
-        }
-      }