Changeset 6508

Timestamp:

08/30/08 00:04:49 (3 months ago)

Author:

p_lindheimer

Message:

closes #3130 create global variables for each trunk that has dialrules, and only call fixlocalprefix for thos trunks that have rules, to avoid overhead if not needed

Files:

• modules/branches/2.5/core/functions.inc.php (modified) (4 diffs)

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

@@ -1186 +1186 @@
-                        }
-
+                        // Let's create globals for each trunk to determine which one's have fixlocalprefix settings.
+                        // this allows us to skip calling the agi script if there are no rules to process saving
+                        // on performance
+                        //
+                        $conf = core_trunks_readDialRulesFile();
+                        if (is_array($conf)) {
+                                foreach ($conf as $trunknum => $entries) {
+                                        $trunkname = substr($trunknum,6);
+                                        $ext->addGlobal("PREFIX_TRUNK_$trunkname",count($entries));
+                                }
+                        }
+
-                        /* outbound routes */
-                        // modules should use their own table for storage (and module_get_config() to add dialplan)
@@ -1369 +1381 @@
-                        $ext->add($context, $exten, '', new ext_set('DIAL_TRUNK_OPTIONS', '${TRUNK_OPTIONS}'));
-                        $ext->add($context, $exten, '', new ext_macro('outbound-callerid', '${DIAL_TRUNK}'));
-agi(
+execif('$["${PREFIX_TRUNK_${DIAL_TRUNK}}" != ""]','AGI',
-                        $ext->add($context, $exten, '', new ext_set('OUTNUM', '${OUTPREFIX_${DIAL_TRUNK}}${DIAL_NUMBER}'));  // OUTNUM is the final dial number
-                        $ext->add($context, $exten, '', new ext_set('custom', '${CUT(OUT_${DIAL_TRUNK},:,1)}'));  // Custom trunks are prefixed with "AMP:"
@@ -1448 +1460 @@
-                        $ext->add($context, $exten, '', new ext_set('DIAL_TRUNK_OPTIONS', '${TRUNK_OPTIONS}'));
-                        $ext->add($context, $exten, '', new ext_macro('outbound-callerid', '${DIAL_TRUNK}'));
-agi(
+execif('$["${PREFIX_TRUNK_${DIAL_TRUNK}}" != ""]','AGI',
-                        $ext->add($context, $exten, '', new ext_set('OUTNUM', '${OUTPREFIX_${DIAL_TRUNK}}${DIAL_NUMBER}'));  // OUTNUM is the final dial number
-
@@ -1555 +1567 @@
-                        $ext->add($context, $exten, 'nomax', new ext_set('DIAL_NUMBER', '${ARG2}'));
-                        $ext->add($context, $exten, '', new ext_set('DIAL_TRUNK', '${ARG1}'));
-agi(
+execif('$["${PREFIX_TRUNK_${DIAL_TRUNK}}" != ""]','AGI',
-                        //  Replacement for asterisk's ENUMLOOKUP function
-                        $ext->add($context, $exten, '', new ext_agi('enumlookup.agi'));