Changeset 9125

Timestamp:

03/10/10 20:20:09 (2 years ago)

Author:

p_lindheimer

Message:

more updates core_routing_xxx re #4110 (now and over the next couple days these check-ins may start to break trunk, BEWARE)

Files:

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

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

@@ -1602 +1602 @@
-          $cid = $pattern['match_cid'];
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-          $ext->add($context, $exten, '', new ext_noop('Macro(user-callerid): executed in outbound-allroutes PRI 1')); 
@@ -1637 +1629 @@
-          $ext->add($context, $exten, '', new ext_macro('record-enable,${AMPUSER},OUT'));
-
-          // ticket #3998: the $pos is incorrect if a range is included such as
-          // 9[0-3]|NXX.
-          // in this case we end up with EXTEN:6 instead of the correct EXTEN:2
-          //
-          $pos = strlen(preg_replace('/(\[[^\]]*\])/','X',$pattern['match_pattern_prefix']));
-          $pos = $pos == 0 ? '':':'.$pos;
-
-          $password = $route['password'];
-          foreach ($trunks as $trunk_id) {
@@ -1657 +1642 @@
-              break;
-            }
-pos
+offset
-            $password = '';
-          }
@@ -4815 +4800 @@
-function core_routing_get($route_id) {
-  global $db;
-$db->escapeSimple($route_id
+q($db->escapeSimple($route_id)
-  $route = sql($sql,"getRow",DB_FETCHMODE_ASSOC);
-  return $route;
@@ -4874 +4859 @@
-      return false;
-    }
-
+-1
-      unset($sequence[$key]);
-      $sequence[] = $route_id;
@@ -4911 +4896 @@
-function core_routing_delbyid($route_id) {
-  global $db;
-$db->escapeSimple($route_id
+q($db->escapeSimple($route_id)
-  sql('DELETE FROM `outbound_routes` WHERE `route_id` ='.$route_id);
-  sql('DELETE FROM `outbound_route_patterns` WHERE `route_id` ='.$route_id);
@@ -4921 +4906 @@
-function core_routing_trunk_delbyid($trunk_id) {
-  global $db;
-$db->escapeSimple($trunk_id
+q($db->escapeSimple($trunk_id)
-  sql('DELETE FROM `outbound_route_trunks` WHERE `trunk_id` ='.$trunk_id);
-}
@@ -4928 +4913 @@
-function core_routing_renamebyid($route_id, $new_name) {
-  global $db;
-$db->escapeSimple($route_id
+q($db->escapeSimple($route_id)
-  $new_name = $db->escapeSimple($new_name);
-  sql("UPDATE `outbound_routes` SET `name = '$new_name'  WHERE `route_id` = $route_id");
@@ -4936 +4921 @@
-function core_routing_getroutepatternsbyid($route_id) {
-  global $db;
-$db->escapeSimple($route_id
+q($db->escapeSimple($route_id)
-  $sql = "SELECT * FROM `outbound_route_patterns` WHERE `route_id` = $route_id ORDER BY `match_pattern_prefix`, `match_pattern_pass`";
-  $patterns = sql($sql,"getAll",DB_FETCHMODE_ASSOC);
@@ -4942 +4927 @@
-}
-
+/* Utility function to determine required dialpattern and offsets for a specific dialpattern record.
+ * Used when generating the dialplan and can be used by other modules that may be splicing into the
+ * dialplan such as pinsets or others.
+ */
+function core_routing_formatpattern($pattern) {
+  $exten = $pattern['match_pattern_prefix'].$pattern['match_pattern_pass'];
+  $cid = $pattern['match_cid'];
+  if (!preg_match("/^[0-9*+]+$/",$exten)) { 
+    // if # is detected above (as not in the list of acceptable patterns) then _ is appended due to Asterisk
+    // particulars in dealing with #
+    $exten = "_".$exten;
+  }
+  if ($cid != '' && !preg_match("/^[0-9*+]+$/",$cid)) { 
+    // same comment as above wrt to #
+    $cid = "_".$cid;
+  }
+  if ($cid != '') {
+    $exten .= '/'.$cid;
+  }
+  // ticket #3998: the $pos is incorrect if a range is included such as 9[0-3]|NXX in the prefix.
+  // in this example we end up with EXTEN:6 instead of the correct EXTEN:2
+  //
+  $pos = strlen(preg_replace('/(\[[^\]]*\])/','X',$pattern['match_pattern_prefix']));
+  return array('prepend_digits' => $pattern['prepend_digits'], 'dial_pattern' => $exten, 'offset' => $pos);
+}
+
-// function core_routing_getroutetrunks($route)
-function core_routing_getroutetrunksbyid($route_id) {
-  global $db;
-$db->escapeSimple($route_id
+q($db->escapeSimple($route_id)
-  $sql = "SELECT `trunk_id` FROM `outbound_route_trunks` WHERE `route_id` = $route_id ORDER BY `seq`";
-  $trunks = $db->getCol($sql); 
@@ -4966 +4977 @@
-  $intracompany_route = $db->escapeSimple($intracompany_route);
-  $mohclass = $db->escapeSimple($mohclass);
+  $seq = $db->escapeSimple($seq);
-  $time_group_id = $time_group_id == ''? 'NULL':$db->escapeSimple($time_group_id);
-  $sql = "UPDATE `outbound_routes` SET 
-    `name`='$name', `outcid`='$outcid', `outcid_mode`='$outcid_mode', `password`='$password', 
-    `emergency_route`='$emergency_route', `intracompany_route`='$intracompany_route', `mohclass`='$mohclass', 
-$route_id"
+".q($route_id)
-  sql($sql);
-
@@ -4982 +4994 @@
-// function core_routing_add($name,$patterns,$trunks,$method,$pass,$emergency="",$intracompany="",$mohsilence="",$routecid="",$routecid_mode="")
-function core_routing_addbyid($name, $outcid, $outcid_mode, $password, $emergency_route, $intracompany_route, $mohclass, $time_group_id, $patterns, $trunks, $seq = 'new') {
+  global $amp_conf;
-  global $db;
-
@@ -4995 +5008 @@
-    VALUES ('$name', '$outcid', '$outcid_mode', '$password', '$emergency_route', '$intracompany_route', '$mohclass', '$time_group_id')";
-  sql($sql);
-
+
+
+
+
-
-  core_routing_updatepatterns($route_id, $patterns);
@@ -5008 +5024 @@
-}
-
+/* TODO: duplicate prepend_patterns is a problem as only one will win. We need to catch this and filter it out. We can silently trap it
+         by hashing without the prepend (since a blank prepend is similar to no prepend) at a minimum and decide if we want to catch
+         this and throw an error...
+ */
-function core_routing_updatepatterns($route_id, &$patterns, $delete = false) {
-  global $db;
-
+  $route_id =  $db->escapeSimple($route_id);
-  $filter = '/[^0-9\-\.\[\]xXnNzZ]/';
-  $insert_pattern = array();
@@ -5019 +5040 @@
-    $prepend_digits = $db->escapeSimple(preg_replace($filter,'',strtoupper($pattern['prepend_digits'])));
-
-.$prepend_digits
+
-    $insert_pattern[$hash_index] = array($match_pattern_prefix, $match_pattern_pass, $match_cid, $prepend_digits);
-  }
-
-  if ($delete) {
-$route_id
+q($route_id)
-  }
-  $compiled = $db->prepare('INSERT INTO `outbound_route_patterns` (`route_id`, `match_pattern_prefix`, `match_pattern_pass`, `match_cid`, `prepend_digits`) VALUES ('.$route_id.',?,?,?,?)');
@@ -5036 +5057 @@
-  global $db;
-
+  $route_id = $db->escapeSimple($route_id);
-  $insert_trunk = array();
-  $seq = 0;
@@ -5043 +5065 @@
-  }
-  if ($delete) {
-$route_id
+q($route_id)
-  }
-  $compiled = $db->prepare("INSERT INTO `outbound_route_trunks` (`route_id`, `trunk_id`, `seq`) VALUES ($route_id,?,?)");
@@ -5057 +5079 @@
-function core_timegroups_usage($group_id) {
-
+  $group_id = q($group_id);
-  $results = sql("SELECT route_id, name FROM outbound_routes WHERE time_group_id = $group_id","getAll",DB_FETCHMODE_ASSOC);
-  if (empty($results)) {