Changeset 9087

Timestamp:

03/07/10 00:02:51 (3 years ago)

Author:

p_lindheimer

Message:

additional work towards new outbound route schema re #4110 still not and minimal tested

Files:

• modules/branches/2.8/core/functions.inc.php (modified) (11 diffs)

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

@@ -1576 +1576 @@
-
-if (false) { // new outbound routes
-
-
+-byid
+-byid
-      $routes = core_routing_list();
-      $trunk_table = core_trunks_listbyid();
@@ -1586 +1586 @@
-          if (is_array($times) && count($times)) {
-            foreach ($times as $time) {
-
+-byid
-            }
-          } else {
-
+-byid
-          }
-        } else {
-
+-byid
-        }
-
@@ -1600 +1600 @@
-        foreach ($patterns as $pattern) {
-          $exten = $pattern['match_pattern_prefix'].$pattern['match_pattern_pass'];
+          $cid = $pattern['match_cid'];
+
+          //TODO: does the plus need to be backslashed?
+          if (!preg_match("/^[0-9*+]+$/",$exten)) { 
+            // note # is not here, as asterisk doesn't recoginize it as a normal digit, thus it requires _ pattern matching
+            // it's not strictly digits, so it must have patterns, so prepend a _
+            $exten = "_".$exten;
+          }
+          if (!preg_match("/^[0-9*+]+$/",$cid)) { 
+            // note # is not here, as asterisk doesn't recoginize it as a normal digit, thus it requires _ pattern matching
+            // it's not strictly digits, so it must have patterns, so prepend a _
+            $cid = "_".$cid;
+          }
+          if ($cid != '') {
+            $exten .= '/'.$cid;
+          }
+
-          $ext->add($context, $exten, '', new ext_noop('Macro(user-callerid): executed in outbound-allroutes PRI 1')); 
-          if ($route['emergencyy_route'] != '') {
@@ -4533 +4550 @@
-
-function core_trunks_listbyid() {
-
+,'getAll',DB_FETCHMODE_ASSOC
-  $trunk_list = array();
-  foreach ($result as $trunk) {
+    if ($trunk['name'] == '') {
+      $tech = strtoupper($trunk['tech']);
+      switch ($tech) {
+        case 'IAX':
+          $trunk['name'] = 'IAX2/'.$trunk['channelid'];
+          break;
+        case 'CUSTOM':
+          $trunk['name'] = 'AMP:'.$trunk['channelid'];
+          break;
+        default:
+          $trunk['name'] = $tech.'/'.$trunk['channelid'];
+          break;
+      }
+    }
-    $trunk_list[$trunk['trunkid']] = $trunk;
-  }
@@ -4792 +4823 @@
-function core_routing_get($route_id) {
-  global $db;
-cidnum
+route_id
-  $route = sql($sql,"getRow",DB_FETCHMODE_ASSOC);
-  return $route;
@@ -4813 +4844 @@
-    die_freepbx($sequence->getDebugInfo()); 
-  }
-  echo "route_id: $route_id, seq: $seq\n";
-  print_r($sequence);
-
-  $key = array_search($route_id,$sequence);
@@ -4897 +4926 @@
-// function core_routing_rename($oldname, $newname)
-function core_routing_renamebyid($route_id, $new_name) {
-
+global 
-  $route_id = $db->escapeSimple($route_id);
-  $new_name = $db->escapeSimple($new_name);
@@ -4905 +4934 @@
-// function core_routing_getroutepatterns($route)
-function core_routing_getroutepatternsbyid($route_id) {
-
+global 
-  $route_id = $db->escapeSimple($route_id);
-  $sql = "SELECT * FROM `outbound_route_patterns` WHERE `route_id` = $route_id ORDER BY `match_pattern_prefix`, `match_pattern_pass`";
@@ -4914 +4943 @@
-// function core_routing_getroutetrunks($route)
-function core_routing_getroutetrunksbyid($route_id) {
-
+global 
-  $route_id = $db->escapeSimple($route_id);
-  $sql = "SELECT `trunk_id` FROM `outbound_route_trunks` WHERE `route_id` = $route_id ORDER BY `seq`";
@@ -4978 +5007 @@
-      $db->escapeSimple($pattern['match_pattern_prefix']),
-      $db->escapeSimple($pattern['match_pattern_pass']),
+      $db->escapeSimple($pattern['match_cid']),
-      $db->escapeSimple($pattern['prepend_digits']),
-    );
@@ -4984 +5014 @@
-    $sql('DELETE FROM `outbound_route_patterns` WHERE `route_id`='.$route_id);
-  }
-prepend_digits`) VALUES (
+match_cid`, `prepend_digits`) VALUES (?,
-  $result = $db->executeMultiple($compiled,$insert_pattern);
-  if(DB::IsError($result)) {