Changeset 8781

Timestamp:

02/07/10 14:13:36 (2 years ago)

Author:

p_lindheimer

Message:

Auto Check-in of any outstanding patches

Files:

• modules/branches/2.7/core/functions.inc.php (modified) (4 diffs)
• modules/branches/2.7/core/page.routing.php (modified) (1 diff)

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

@@ -1505 +1505 @@
-      $outrts = sql($sql,"getAll",DB_FETCHMODE_ASSOC);
-      $ext->addInclude('from-internal-additional','outbound-allroutes');
-foo', '', new ext_noop('bar
+_!', '', new ext_macro('user-callerid,SKIPTTL
-      foreach($outrts as $outrt) {
-        $ext->addInclude('outbound-allroutes',$outrt['application']);
@@ -1511 +1511 @@
-        $thisrt = sql($sql,"getAll",DB_FETCHMODE_ASSOC);
-        $lastexten = false;
+        $pri_noop = true;
+        freepbx_debug($thisrt);
-        foreach($thisrt as $exten) {
+          // Then do one call to user-callerid and record-enable instead of each time as in the past
+          // macro-user-callerid moved to outbound-allroutes to obtain proper CID info which can be used
+          // in more advanced routing
+          //
+          if ($pri_noop) {
+            $ext->add($outrt['application'], $exten['extension'], '', new ext_noop('Macro(user-callerid): executed in outbound-allroutes PRI 1')); 
+            $pri_noop = false;
+          }
-          //if emergencyroute, then set channel var
-          if(strpos($exten['args'],"EMERGENCYROUTE") !== false)
@@ -1530 +1540 @@
-              // destinations.
-              //
-              // Then do one call to user-callerid and record-enable instead of each time as in the past
-              //
-              $ext->add($outrt['application'], $exten['extension'], '', new ext_macro('user-callerid,SKIPTTL'));
-              $ext->add($outrt['application'], $exten['extension'], '', new ext_setvar("_NODEST",""));
-              $ext->add($outrt['application'], $exten['extension'], '', new ext_macro('record-enable,${AMPUSER},OUT'));
@@ -1539 +1546 @@
-            $ext->add($outrt['application'], $exten['extension'], '', new ext_macro($exten['args']));
-          }
-
+ {
-            $ext->add($outrt['application'], $exten['extension'], '', new ext_macro("outisbusy"));
+            $pri_noop = true;
+          }
-        }
-      }

modules/branches/2.7/core/page.routing.php

@@ -377 +377 @@
-   <strong>[1237-9]</strong>&nbsp;   <?php echo _("matches any digit or letter in the brackets (in this example, 1,2,3,7,8,9)")?><br>
-   <strong>.</strong>&nbsp;&nbsp;&nbsp; <?php echo _("wildcard, matches one or more characters")?> <br>
-
+
+
-        </span></a>
-      </td>