Changeset 8469

Timestamp:

01/04/10 17:24:11 (2 years ago)

Author:

p_lindheimer

Message:

reverts r8391, r8460, r8462 re #3934 and re #3889 and re #3993 changes break outbound dialplan, need to revisit this to get a dialplan that does not break exiting code (the pri 1 instruction in each outbound route was not getting executed with the last changes)

Files:

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

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

@@ -1515 +1515 @@
-      $outrts = sql($sql,"getAll",DB_FETCHMODE_ASSOC);
-      $ext->addInclude('from-internal-additional','outbound-allroutes');
-_!', '', new ext_macro('user-callerid,SKIPTTL
+foo', '', new ext_noop('bar
-      foreach($outrts as $outrt) {
-        $ext->addInclude('outbound-allroutes',$outrt['application']);
@@ -1538 +1538 @@
-              // 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'));

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

@@ -367 +367 @@
-   <strong>.</strong>&nbsp;&nbsp;&nbsp; <?php echo _("wildcard, matches one or more characters")?> <br>
-   <strong>|</strong>&nbsp;&nbsp;&nbsp; <?php echo _("separates a dialing prefix from the number (for example, 9|NXXXXXX would match when some dialed \"95551234\" but would only pass \"5551234\" to the trunks)")?>
-   <br/><strong>/</strong>&nbsp;&nbsp;&nbsp; <?php echo _("appended to a dial pattern, matches a callerid or callerid pattern (for example, NXXXXXX/104 would match only if dialed by extension \"104\")")?>      
-        </span></a>
-      </td>