Changeset 9240

Timestamp:

03/16/10 20:07:40 (2 years ago)

Author:

p_lindheimer

Message:

closes #4135, closes #4143, closes #4144, re #4110 trunk dialrules with new text boxes, schema, replaced fixlocalprefix, added native DAHDI

Files:

• modules/branches/2.8/core/agi-bin/fixlocalprefix (modified) (2 diffs)
• modules/branches/2.8/core/core.css (moved) (moved from modules/branches/2.8/core/routing.css)
• modules/branches/2.8/core/functions.inc.php (modified) (17 diffs)
• modules/branches/2.8/core/install.php (modified) (3 diffs)
• modules/branches/2.8/core/module.xml (modified) (1 diff)
• modules/branches/2.8/core/page.routing.php (modified) (10 diffs)
• modules/branches/2.8/core/page.trunks.php (modified) (20 diffs)

modules/branches/2.8/core/agi-bin/fixlocalprefix

@@ -18 +18 @@
-// Copyright (C) 2004 Coalescent Systems Inc. (info@coalescentsystems.ca)
-//
+
-/* --------WARNING---------
- * 
@@ -24 +25 @@
- * to keep it from getting changed.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-*/
-
-include("phpagi.php");
-
-function get_var( $agi, $value)
-{
-  $r = $agi->get_variable( $value );
-  
-  if ($r['result'] == 1)
-  {
-    $result = $r['data'];
-    return $result;
-  }
-  else
-    return '';
-}
-
-function parse_conf($filename, &$conf, &$section) {
-  if (is_null($conf)) {
-    $conf = array();
-  }
-  if (is_null($section)) {
-    $section = "general";
-  }
-  
-  if (file_exists($filename)) {
-    $fd = fopen($filename, "r");
-    while ($line = fgets($fd, 1024)) {
-      if (preg_match("/^\s*([a-zA-Z0-9-_]+)\s*=\s*(.*?)\s*([;#].*)?$/",$line,$matches)) {
-        // name = value
-        // option line
-        $conf[$section][ $matches[1] ] = $matches[2];
-      } else if (preg_match("/^\s*\[(.+)\]/",$line,$matches)) {
-        // section name
-        $section = strtolower($matches[1]);
-      } else if (preg_match("/^\s*#include\s+(.*)\s*([;#].*)?/",$line,$matches)) {
-        // include another file
-        
-        if ($matches[1][0] == "/") {
-          // absolute path
-          $filename = $matches[1];
-        } else {
-          // relative path
-          $filename =  dirname($filename)."/".$matches[1];
-        }
-        
-        parse_conf($filename, $conf, $section);
-      }
-    }
-  }
-}
-
-function sanitizeNumber($number) {
-  global $agi;
-  if (strpos($number,"-") !== false) {
-    $agi->verbose("Stripping hyphens");
-    $number = str_replace("-","",$number);
-  }
-  return $number; 
-}
-
-function fixNumber($pattern, $number, &$agi) {
-  // valid chars in a pattern are 0-9XNZwW#*\.\[\]\-\+\|
-  $chars = '0-9XNZwW#*\.\[\]\-'; //escaped pcre-ready
-  
-  // convert x n and z to uppercase
-  $regex = str_replace(array('x','n','z'), array('X','N','Z'), $pattern);
-  // sanitize the pattern - remove any non-pattern chars
-  $regex = preg_replace("/[^0-9XNZwW#*\.\[\]\-\+\|]/", "", $regex);
-  // Also kill the '-' characters outside of groups
-  $regex = preg_replace("/((?:\[[^\]]*\])*)([^\[\]\-]*)-?/", "$1$2", $regex);
-
-  $agi->verbose('Using pattern '.$regex, 4);
-  // attempt to grab the pieces of the pattern
-  if (preg_match('/^(([0-9XNZwW#*\.\[\]\-]+)\|)?(([0-9XNZwW#*\.\[\]\-]+)\+)?([0-9XNZwW#*\.\[\]\-]*)$/', $regex, $matches)) {
-    // one of NXXXXXX, 613|NXXXXXX   1+NXXXXXX    613|1+NXXXXXX,  
-    // matches[2] = drop (eg 613),  matches[4] = prefix (eg 1),  matches[5] = rest of number (eg NXXXXX)
-    
-    $drop = $matches[2];
-    $prefix = $matches[4];
-    $static = $matches[5];
-  } else if (preg_match('/^(([0-9XNZwW#*\.\[\]\-]+)\+)?(([0-9XNZwW#*\.\[\]\-]+)\|)?([0-9XNZwW#*\.\[\]\-]*)$/', $regex, $matches)) {
-    // one of NXXXXXX,  613|NXXXXXX   1+NXXXXXX    1+613|NXXXXXX
-    // matches[2] = prefix (eg 1),  matches[4] = drop (eg 613),  matches[5] = rest of number (eg NXXXXX)
-    
-    $drop = $matches[4];
-    $prefix = $matches[2];
-    $static = $matches[5];
-  } else {
-    if (!is_null($agi)) {
-      $agi->verbose('Could not understand pattern "'.$pattern.'" ('.$regex.')', 1);
-    }
-    return false;
-  }
-  
-  // convert asterisk pattern matching into perl regular expression
-  $regex = str_replace(
-      array(
-        "X",
-        "Z",
-        "N",
-        ".",
-        "*",
-      ),
-      array(
-        "[0-9]",
-        "[1-9]",
-        "[2-9]",
-        "[0-9#*]+",
-        "\*",
-      ),
-      // note, we're doing a subpattern match on the static portion so it can be extracted later
-      $drop.'('.$static.')');
-  
-  if (preg_match('/^'.$regex.'$/', $number, $matches)) {
-    return $prefix.$matches[1];
-  }
-  return false;
-}
-
-/**********************************************************************************************************************/
-
-$agi = new AGI();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-exit(0);
-

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

@@ -90 +90 @@
-      case 'features_featuremap_additional.conf':
-        return $this->generate_featuremap_additional($version);
-        break;
-      case 'localprefixes.conf':
-        return $this->generate_localprefixes($version);
-        break;
-    }
@@ -568 +565 @@
-      $output .= "channel=>$zapchannel\n";
-      $output .= $additional."\n";
-    }
-    return $output;
-  }
-  function generate_localprefixes($ast_version) {
-    $output = "";
-
-    $conf =  core_trunks_readDialRulesFile();
-    foreach ($conf as $section=>$values) {
-      $output .=  "[".$section."]\n";
-      foreach ($values as $key=>$value) {
-        $output .= $key."=".$value."\n";
-      }
-      $output .= "\n";
-    }
-    return $output;
@@ -1367 +1351 @@
-            continue;
-          }
+          $trunkgroup = 'OUT_'.$trunkprops['trunkid'];
-          switch ($trunkprops['tech']) {
-            case 'dundi':
@@ -1373 +1358 @@
-              $ext->add($macro_name, 's', '', new ext_goto('1','${ARG1}'));
-
-              $trunkgroup = 'OUT_'.$trunkprops['trunkid'];
-              $trunkcontext  = "from-trunk-".$trunkprops['tech']."-".$trunkprops['channelid'];
-              $ext->add($trunkcontext, '_.', '', new ext_set('GROUP()',$trunkgroup));
-              $ext->add($trunkcontext, '_.', '', new ext_goto('1','${EXTEN}','from-trunk'));
-
-'OUT_${DIAL_TRUNK}'
-${DIAL_TRUNK}
-OUT_${DIAL_TRUNK}
+$trunkgroup
+'.$trunkprops['trunkid'].'
+'.$trunkgroup.'
-              if ($ast_lt_16) { 
-                $ext->add($tcontext,$trunkprops['trunkid'],'nomax',new ext_execif('$["${CALLINGPRES_SV}" != ""]', 'SetCallerPres', '${CALLINGPRES_SV}'));
@@ -1387 +1371 @@
-              }
-              $ext->add($tcontext,$trunkprops['trunkid'],'',new ext_set('DIAL_NUMBER','${FROM_DID}'));
-execif('$["${PREFIX_TRUNK_${DIAL_TRUNK}}" != ""]','AGI','fixlocalprefix
+gosubif('$["${PREFIX_TRUNK_'.$trunkprops['trunkid'].'}" != ""]','sub-flp-'.$trunkprops['trunkid'].',s,1
-              $ext->add($tcontext, $trunkprops['trunkid'], '', new ext_macro('dundi-${DIAL_TRUNK}','${OUTNUM}'));
-              $ext->add($tcontext,$trunkprops['trunkid'],'hangit',new ext_hangup());
@@ -1397 +1381 @@
-            case 'iax2':
-            case 'sip':
-              $trunkgroup = 'OUT_'.$trunkprops['trunkid'];
-              $trunkcontext  = "from-trunk-".$trunkprops['tech']."-".$trunkprops['channelid'];
-              $ext->add($trunkcontext, '_.', '', new ext_set('GROUP()',$trunkgroup));
@@ -1436 +1419 @@
-          }
-          $ext->add($tcontext,$tcustom,'',new ext_set('DIAL_NUMBER','${FROM_DID}'));
-execif('$["${PREFIX_TRUNK_${DIAL_TRUNK}}" != ""]','AGI','fixlocalprefix
+gosubif('$["${PREFIX_TRUNK_${DIAL_TRUNK}}" != ""]','sub-flp-${DIAL_TRUNK},s,1
-          $ext->add($tcontext,$tcustom,'',new ext_dial('${EVAL(${TDIAL_STRING})}','300,${DIAL_TRUNK_OPTIONS}'));
-          $ext->add($tcontext,$tcustom,'hangit',new ext_hangup());
@@ -1451 +1434 @@
-          }
-          $ext->add($tcontext,$texten,'',new ext_set('DIAL_NUMBER','${FROM_DID}'));
-
+
+
-          $ext->add($tcontext,$texten,'',new ext_dial('${TDIAL_STRING}/${OUTNUM}','300,${DIAL_TRUNK_OPTIONS}'));
-          $ext->add($tcontext,$texten,'hangit',new ext_hangup());
-        }
-      }
+
+      $trunk_hash = core_trunks_list_dialrules();
+      if (is_array($trunk_hash) && count($trunk_hash)) {
+        foreach ($trunk_hash as $trunkid => $patterns) {
+          // First, generate the global referencing how many there are
+          $ext->addGlobal("PREFIX_TRUNK_$trunkid",count($patterns));
+
+          $context = 'sub-flp-'.$trunkid;
+          $target = 'TARGET_FLP4'.$trunkid;
+          $exten = 's';
+          foreach ($patterns as $pattern) {
+            $prepend = $pattern['prepend_digits'];
+            $offset =  strlen(preg_replace('/(\[[^\]]*\])/','X',$pattern['match_pattern_prefix']));
+
+            $regex_base = $pattern['match_pattern_prefix'].$pattern['match_pattern_pass'];
+
+            // convert asterisk pattern matching into perl regular expression
+            //  - two steps, use $ in place of +
+            //  - next replace $ with +
+            // if you don't do this, the str_replace() walks over itself
+            $regex_intermediate = str_replace(
+              array(
+                "X",
+                "Z",
+                "N",
+                ".",
+                "*",
+                "+",
+              ),
+              array(
+                "[0-9]",
+                "[1-9]",
+                "[2-9]",
+                "[0-9#*\$]$",
+                "\*",
+                "\+",
+              ),
+              $pattern['match_pattern_prefix'].$pattern['match_pattern_pass']
+            );
+            $regex = strtr($regex_intermediate,"$","+");
+
+            if ($pattern['prepend_digits'] == '' && $offset == 0) {
+              $ext->add($context, $exten, '', new ext_execif('$[${REGEX("^'.$regex.'$" ${DIAL_NUMBER})} = 1]','Return'));
+            } else {
+              $offset = $offset?':'.$offset:'';
+              $ext->add($context, $exten, '', new ext_execif('$[${REGEX("^'.$regex.'$" ${DIAL_NUMBER})} = 1]','Set',$target.'='.$pattern['prepend_digits'].'${DIAL_NUMBER'.$offset.'}'));
+              $ext->add($context, $exten, '', new ext_gotoif('$[${LEN(${'.$target.'})} != 0]', 'match'));
+            }
+
+          }
+          $ext->add($context, $exten, '', new ext_return(''));
+          $ext->add($context, $exten, 'match', new ext_set('DIAL_NUMBER','${'.$target.'}'));
+          $ext->add($context, $exten, '', new ext_return(''));
+        }
+      }
+
+
-      /* dialplan globals */
-      // modules should NOT use the globals table to store anything!
@@ -1551 +1592 @@
-          $has_extension_state = true;
-        }
-      }
-
-      // 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));
-        }
-      }
-
@@ -1915 +1944 @@
-      $ext->add($context, $exten, '', new ext_set('DIAL_TRUNK_OPTIONS', '${TRUNK_OPTIONS}'));
-      $ext->add($context, $exten, '', new ext_macro('outbound-callerid', '${DIAL_TRUNK}'));
-execif('$["${PREFIX_TRUNK_${DIAL_TRUNK}}" != ""]','AGI','fixlocalprefix
+gosubif('$["${PREFIX_TRUNK_${DIAL_TRUNK}}" != ""]','sub-flp-${DIAL_TRUNK},s,1
-      $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:"
@@ -2048 +2077 @@
-      $ext->add($context, $exten, '', new ext_set('DIAL_TRUNK_OPTIONS', '${TRUNK_OPTIONS}'));
-      $ext->add($context, $exten, '', new ext_macro('outbound-callerid', '${DIAL_TRUNK}'));
-execif('$["${PREFIX_TRUNK_${DIAL_TRUNK}}" != ""]','AGI','fixlocalprefix'));  // this sets DIAL_NUMBER to the proper dial string for this trunk
+gosubif('$["${PREFIX_TRUNK_${DIAL_TRUNK}}" != ""]','sub-flp-${DIAL_TRUNK},s,1'));  // manipulate DIAL_NUMBER
-      $ext->add($context, $exten, '', new ext_set('OUTNUM', '${OUTPREFIX_${DIAL_TRUNK}}${DIAL_NUMBER}'));  // OUTNUM is the final dial number
-
@@ -2218 +2247 @@
-      $ext->add($context, $exten, 'nomax', new ext_set('DIAL_NUMBER', '${ARG2}'));
-      $ext->add($context, $exten, '', new ext_set('DIAL_TRUNK', '${ARG1}'));
-execif('$["${PREFIX_TRUNK_${DIAL_TRUNK}}" != ""]','AGI','fixlocalprefix'));  // this sets DIAL_NUMBER to the proper dial string for this trunk
+gosubif('$["${PREFIX_TRUNK_${DIAL_TRUNK}}" != ""]','sub-flp-${DIAL_TRUNK},s,1'));  // manimpulate DIAL_NUMBER
-      //  Replacement for asterisk's ENUMLOOKUP function
-      $ext->add($context, $exten, '', new ext_agi('enumlookup.agi'));
@@ -4491 +4520 @@
-
-
-
-
-/* begin page.trunks.php functions */
-
@@ -4779 +4806 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  if(DB::IsError($result)) {
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-  foreach ($patterns as $pattern) {
-
-
-
-
-
+
+
-  }
-  return $rule_hash;
@@ -4911 +4952 @@
-}
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-//get outbound routes for a given trunk
@@ -4931 +4977 @@
-}
-
+function core_trunks_delete_dialrules($trunknum) {
+  global $db;
+  $trunknum = q($db->escapeSimple($trunknum));
+  sql("DELETE FROM `trunk_dialpatterns` WHERE `trunkid` = $trunknum");
+}
+
+
+//-----------------------------------------------------------------------------------------------------------------------------------------
+// The following APIs have all been removed and will result in crashes with traceback to obtain calling tree information
+
+function core_trunks_addDialRules($trunknum, $dialrules) {
+  $trace = debug_backtrace();
+  $function = $trace[0]['function'];
+  die_freepbx("function: $function has been deprecated and removed");
+}
+
-function core_trunks_deleteDialRules($trunknum) {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-/* end page.trunks.php functions */
@@ -5181 +5258 @@
-
-  $route_id =  $db->escapeSimple($route_id);
-
+*\#\+\
-  $insert_pattern = array();
-  foreach ($patterns as $pattern) {
-
-
-
-
+
+
+
+
+
+
+
+
-
-    $hash_index = md5($match_pattern_prefix.$match_pattern_pass.$match_cid);
-
+
+
+
-  }
-

modules/branches/2.8/core/install.php

@@ -267 +267 @@
-}
-
-
-// This next set of functions and code are used to migrate from the old
-// global variable storage of trunk data to the new trunk table and trunk
@@ -279 +278 @@
-        ereg("OUT_([0-9]+)",$unique_trunks[$b][0],$trunk_num2);
-        return ($trunk_num1[1] >= $trunk_num2[1]? 1:-1);
-}
-
-// Get values from localprefix configuration file where values are stored
-// for fixlocalprefix macro
-//
-function __parse_DialRulesFile($filename, &$conf, &$section) {
-  if (is_null($conf)) {
-    $conf = array();
-  }
-  if (is_null($section)) {
-    $section = "general";
-  }
-  
-  if (file_exists($filename)) {
-    $fd = fopen($filename, "r");
-    while ($line = fgets($fd, 1024)) {
-      if (preg_match("/^\s*([a-zA-Z0-9-_]+)\s*=\s*(.*?)\s*([;#].*)?$/",$line,$matches)) {
-        // name = value
-        // option line
-        $conf[$section][ $matches[1] ] = $matches[2];
-      } else if (preg_match("/^\s*\[(.+)\]/",$line,$matches)) {
-        // section name
-        $section = strtolower($matches[1]);
-      } else if (preg_match("/^\s*#include\s+(.*)\s*([;#].*)?/",$line,$matches)) {
-        // include another file
-        
-        if ($matches[1][0] == "/") {
-          // absolute path
-          $filename = $matches[1];
-        } else {
-          // relative path
-          $filename =  dirname($filename)."/".$matches[1];
-        }
-        __parse_DialRulesFile($filename, $conf, $section);
-      }
-    }
-  }
-}
-
-function __order_DialRules($a, $b) {
-  return substr($a,4) > substr($b,4);
-}
-
@@ -519 +477 @@
-}
-
-$sql = "
-CREATE TABLE `trunks_dialpatterns` 
-( 
-  `trunkid` INTEGER,
-  `rule` VARCHAR( 255 ) NOT NULL, 
-  `seq` INTEGER,
-  PRIMARY KEY  (`trunkid`, `rule`, `seq`) 
-) 
-";
-outn(_("Checking if trunks_dialpatterns table exists.."));
-$check = $db->query($sql);
-if(DB::IsError($check) && $check->getCode() != DB_ERROR_ALREADY_EXISTS) {
-  die_freepbx("Can not create trunks_dialpatterns table");
-} else if(DB::IsError($check) && $check->getCode() == DB_ERROR_ALREADY_EXISTS) {
-  out(_("already exists"));
-} else {
-  out(_("created"));
-  outn(_("loading table from localprefixes.conf.."));
-  $localPrefixFile = $amp_conf['ASTETCDIR']."/localprefixes.conf";
-  $conf == array();
-  __parse_DialRulesFile($localPrefixFile, $conf, $section);
-
-  $rules_arr = array();
-  foreach ($conf as $tname => $rules) {
-    $tid = ltrim($tname,'trunk-');
-    uksort($rules,'__order_DialRules'); //make sure they are in order
-    $seq = 1;
-    foreach ($rules as $rule) {
-      $rules_arr[] = array($tid,$rule,$seq);
-      $seq++;
-    }
-  }
-  $compiled = $db->prepare("INSERT INTO `trunks_dialpatterns` (trunkid, rule, seq) VALUES (?,?,?)");
-  $result = $db->executeMultiple($compiled,$rules_arr);
-  if(DB::IsError($result)) {
-    die_freepbx($result->getDebugInfo().'error populating trunks_dialpatterns table');  
-  }
-  out(_("loaded"));
-}
-
-outn(_("Checking if privacy manager options exists.."));
-$check = $db->query('SELECT pmmaxretries FROM incoming');

modules/branches/2.8/core/module.xml

@@ -10 +10 @@
-  <canuninstall>no</canuninstall>
-  <changelog>
-
+, #4068, #4135, #4143, #4144
-    *2.8.0.0beta1.0* #4100, #4102, #4110 New Outbound Routing Schema and features
-    *2.7.0.2* really fix #4092

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

@@ -234 +234 @@
-  if ($key > 0) {
-    echo "\t\t<img src=\"images/resultset_up.png\" onclick=\"repositionRoute('{$tresult['route_id']}','up')\" alt='" .  _("Move Up") .
-
+cursor:pointer; 
-  } else {
-    echo "\t\t<img src='images/blank.gif' style='float:none; margin-left:0px; margin-bottom:0px;' width='12px' height='12px'>\n";
@@ -242 +242 @@
-  if ($key < ($positions-1)) {
-    echo "\t\t<img src='images/resultset_down.png' onclick=\"repositionRoute('{$tresult['route_id']}','down')\" alt='" . _("Move Down") .
-
+cursor:pointer; 
-  } else {
-    echo "\t\t<img src='images/blank.gif' style='float:none; margin-left:0px; margin-bottom:0px;' width='12px' height='12px'>\n";
@@ -250 +250 @@
-  if ($key > 0) {
-    echo "\t\t<img src=\"images/resultset_top.png\" onclick=\"repositionRoute('{$tresult['route_id']}','top')\" alt='" .  _("First") .
-
+cursor:pointer; 
-  } else {
-    echo "\t\t<img src='images/blank.gif' style='float:none; margin-left:0px; margin-bottom:0px;' width='12px' height='12px'>\n";
@@ -258 +258 @@
-  if ($key < ($positions-1)) {
-    echo "\t\t<img src='images/resultset_bottom.png' onclick=\"repositionRoute('{$tresult['route_id']}','bottom')\" alt='" . _("Last") .
-
+cursor:pointer; 
-  } else {
-    echo "\t\t<img src='images/blank.gif' style='float:none; margin-left:0px; margin-bottom:0px;' width='12px' height='12px'>\n";
@@ -421 +421 @@
-      <b>[1237-9]</b>&nbsp;   <?php echo _("matches any digit in the brackets (example: 1,2,3,7,8,9)")?><br />
-      <b>.</b>&nbsp;&nbsp;&nbsp; <?php echo _("wildcard, matches one or more dialed digits")?> <br />
-")?></b>&nbsp;&nbsp;&nbsp; <?php echo _("Digits to prepend to a successful match. If the dialed number matches the patterns specified by the subsequent columns, then thise
-
-
-
+:")?></b>&nbsp;&nbsp;&nbsp; <?php echo _("Digits to prepend to a successful match. If the dialed number matches the patterns specified by the subsequent columns, then this
+:
+:
+:
-      </span></a>
-      <hr></h5></td>
@@ -598 +598 @@
-        </select>
-        
-
+cursor:pointer; 
-      <?php   // move up
-      if ($key > 0) {?>
@@ -609 +609 @@
-      
-      if ($key < ($positions-1)) {?>
-
+cursor:pointer; 
-      <?php  } else { ?>
-        <img src="images/blank.gif" style="float:none; margin-left:0px; margin-bottom:0px;" width="9" height="11">
@@ -681 +681 @@
-
-function patternsRemove(idx) {
-
-
-
-
-
-
+
+
+
-function addCustomField(prepend_digit, pattern_prefix, pattern_pass, match_cid) {
-  var idx = $(".dial-pattern").size();
@@ -699 +696 @@
-  var dpt_match_cid = match_cid == '' ? 'dpt-title' : 'dpt-value';
-
-
+var new_insert = 
-  <tr>\
-    <td colspan="2">\
@@ -706 +703 @@
-    [<input title="<?php echo $mp_tit?>" type="text" size="16" id="pattern_pass_'+idx+'" name="pattern_pass['+idx+']" class="'+dpt_pattern_pass+'" value="'+pattern_pass+'" tabindex="'+tabindex2+'"> /\
-    <input title="<?php echo $ci_tit?>" type="text" size="14" id="match_cid_'+idx+'" name="match_cid['+idx+']" class="'+dpt_match_cid+'" value="'+match_cid+'" tabindex="'+tabindex3+'">]\
-
+cursor:pointer; 
-    </td>\
-  </tr>\
-
-
-$
+.prev()
+
+new_insert.find
-    populateFrom: "title",
-    changedClass: "text-normal",
-    focusClass: "text-normal"
-  });
-  // If any value were put in, handled those also
-  if (pattern_pass != '' || pattern_prefix != '' || prepend_digit != '' || match_cid != '') {
-$
+new_insert.find
-      changedClass: "text-red"
-    });

modules/branches/2.8/core/page.trunks.php

@@ -42 +42 @@
-$failtrunk_enable = ($failtrunk == "")?'':'CHECKED';
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-//if submitting form, update database
@@ -68 +71 @@
-    $trunknum = core_trunks_add($tech, $channelid, $dialoutprefix, $maxchans, $outcid, $peerdetails, $usercontext, $userconfig, $register, $keepcid, trim($failtrunk), $disabletrunk, $trunk_name, $provider);
-    
-   core_trunks_addDialRules($trunknum, $dialrules
+    core_trunks_update_dialrules($trunknum, $dialpattern_insert
-    needreload();
-    redirect_standard();
@@ -76 +79 @@
-    
-    // this can rewrite too, so edit is the same
-   core_trunks_addDialRules($trunknum, $dialrules
+    core_trunks_update_dialrules($trunknum, $dialpattern_insert, true
-    needreload();
-    redirect_standard('extdisplay');
@@ -83 +86 @@
-  
-    core_trunks_del($trunknum);
-   core_trunks_deleteDialR
+    core_trunks_delete_dialr
-    core_routing_trunk_del($trunknum);
-    needreload();
@@ -108 +111 @@
-
-      if (isset($xmldata['lca-data']['prefix'])) {
-
+
-        if ($action == 'populatenpanxx10') {
-          // 10 digit dialing
@@ -114 +117 @@
-          // - match local 10 digits
-          // - add 1 to anything else
-
+
+
+
+
+
-          // add NPA to 7-digits
-          foreach ($xmldata['lca-data']['prefix'] as $prefix) {
-
+
+
+
+
+
+
+
+
+
+
-          }
-          foreach ($xmldata['lca-data']['prefix'] as $prefix) {
-
+
+
+
+
+
+
+
+
+
+
-          }
-          // if a number was not matched as local, dial it with '1' prefix
-
+
+
+
+
+
-        } else {
-          // 7 digit dialing
@@ -130 +159 @@
-          // - add 1 to everything else
-          foreach ($xmldata['lca-data']['prefix'] as $prefix) {
-
+
+
+
+
+
+
+
+
+
+
-          }
-          foreach ($xmldata['lca-data']['prefix'] as $prefix) {
-
+
+
+
+
+
+
+
+
+
+
-          }
-
-
+
+
+
+
+
+
+
+
+
+
-        }
-
-        // check for duplicates, and re-sequence
-       $dialrules = array_values(array_unique($dialrules)
+        unset($hash_filter
-      } else {
-        $errormsg = _("Error fetching prefix list for: "). $_REQUEST["npanxx"];
@@ -241 +296 @@
-    $provider = $trunk_details['provider'];
-    $trunk_name = htmlentities($trunk_details['name']);
-
+
-    if ($tech!="enum") {
-  
@@ -264 +319 @@
-      }
-    }
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-    $upper_tech = strtoupper($tech);
-    if (trim($trunk_name) == '') {
@@ -333 +380 @@
-    echo "<h2>".sprintf(_("Add %s Trunk"),$upper_tech).($upper_tech == 'ZAP' && ast_with_dahdi()?" ("._("DAHDI compatibility mode").")":"")."</h2>";
-  } 
+  if (!isset($dialpattern_array)) {
+    $dialpattern_array = array();
+  }
+    
-switch ($tech) {
-  case 'dundi':
@@ -360 +411 @@
-      <tr>
-        <td colspan="2">
-
+hr><
-        </td>
-      </tr>
@@ -431 +482 @@
-      </tr>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      <tr>
-        <td>
@@ -529 +617 @@
-      function populateAlwaysAdd() {
-        do {
-         var localpattern = <?php echo 'prompt("'._("What is the local dialing pattern?\\n\\n(ie. NXXNXXXXXX for US/CAN 10-digit dialing, NXXXXXX for 7-digit)").'"'?>,"NXXXXXX"
+          var localpattern = <?php echo 'prompt("'._("What is the local dialing pattern?\\n\\n(ie. NXXNXXXXXX for US/CAN 10-digit dialing, NXXXXXX for 7-digit)").'"'?>,<?php echo _("NXXXXXX")?>
-          if (localpattern == null) return;
-        } while (!localpattern.match('^[0-9#*ZXN\.]+$') && <?php echo '!alert("'._("Invalid pattern. Only 0-9, #, *, Z, N, X and . are allowed.").'")'?>);
@@ -538 +626 @@
-        } while (!localprefix.match('^[0-9#*]+$') && <?php echo '!alert("'._("Invalid prefix. Only dialable characters (0-9, #, and *) are allowed.").'")'?>);
-
-
-
-
-
-
+
-      }
-      
@@ -552 +636 @@
-        
-        do {
-         var localpattern = <?php echo 'prompt("'._("What is the dialing pattern for local numbers after")?> "+localprefix+"? \n\n<?php echo _("(ie. NXXNXXXXXX for US/CAN 10-digit dialing, NXXXXXX for 7-digit)").'"'?>,"NXXXXXX"
+          var localpattern = <?php echo 'prompt("'._("What is the dialing pattern for local numbers after")?> "+localprefix+"? \n\n<?php echo _("(ie. NXXNXXXXXX for US/CAN 10-digit dialing, NXXXXXX for 7-digit)").'"'?>,<?php echo _("NXXXXXX")?>
-          if (localpattern == null) return;
-        } while (!localpattern.match('^[0-9#*ZXN\.]+$') && <?php echo '!alert("'._("Invalid pattern. Only 0-9, #, *, Z, N, X and . are allowed.").'")'?>);
-        
-
-
-
-
-
+
-      }
-      
@@ -581 +661 @@
-      }
-      </script>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-      <tr>
-        <td>
@@ -685 +672 @@
-      <tr>
-        <td colspan="2">
-         <h4><?php echo _("Outgoing Settings")?
+        <h4><?php echo _("Outgoing Settings")?><hr
-        </td>
-      </tr>
@@ -814 +801 @@
-<!--
-
+$(document).ready(function(){
+  /* Add a Custom Var / Val textbox */
+  $("#dial-pattern-add").click(function(){
+    addCustomField('','','','');
+  });
+  $("#dial-pattern-clear").click(function(){
+    clearAllPatterns();
+  });
+  $(".dpt-title").toggleVal({
+    populateFrom: "title",
+    changedClass: "text-normal",
+    focusClass: "text-normal"
+  });
+  $(".dpt-value").toggleVal({
+    changedClass: "text-red"
+  });
+}); 
+
+function patternsRemove(idx) {
+  $("#prepend_digit_"+idx).parent().parent().remove();
+}
+
+function addCustomField(prepend_digit, pattern_prefix, pattern_pass) {
+  var idx = $(".dial-pattern").size();
+  var idxp = idx - 1;
+  var tabindex = parseInt($("#pattern_pass_"+idxp).attr('tabindex')) + 1;
+  var tabindex1 = tabindex + 2;
+  var tabindex2 = tabindex + 3;
+  var dpt_prepend_digit = prepend_digit == '' ? 'dpt-title' : 'dpt-value';
+  var dpt_pattern_prefix = pattern_prefix == '' ? 'dpt-title' : 'dpt-value';
+  var dpt_pattern_pass = pattern_pass == '' ? 'dpt-title' : 'dpt-value';
+
+  var new_insert = $("#last_row").before('\
+  <tr>\
+    <td colspan="2">\
+    (<input title="<?php echo $pp_tit?>" type="text" size="5" id="prepend_digit_'+idx+'" name="prepend_digit['+idx+']" class="dp-prepend dial-pattern '+dpt_prepend_digit+'" value="'+prepend_digit+'" tabindex="'+tabindex+'">) +\
+    <input title="<?php echo $pf_tit?>" type="text" size="4" id="pattern_prefix_'+idx+'" name="pattern_prefix['+idx+']" class="dp-prefix '+dpt_pattern_prefix+'" value="'+pattern_prefix+'" tabindex="'+tabindex1+'"> |\
+    <input title="<?php echo $mp_tit?>" type="text" size="16" id="pattern_pass_'+idx+'" name="pattern_pass['+idx+']" class="dp-match '+dpt_pattern_pass+'" value="'+pattern_pass+'" tabindex="'+tabindex2+'">\
+      <img src="images/trash.png" style="cursor:pointer; float:none; margin-left:0px; margin-bottom:-3px;" alt="<?php echo _("remove")?>" title="<?php echo _("Click here to remove this pattern")?>" onclick="patternsRemove('+idx+')">\
+    </td>\
+  </tr>\
+  ').prev();
+
+  new_insert.find(".dpt-title").toggleVal({
+    populateFrom: "title",
+    changedClass: "text-normal",
+    focusClass: "text-normal"
+  });
+  if (pattern_pass != '' || pattern_prefix != '' || prepend_digit != '') {
+    new_insert.find(".dpt-value").toggleVal({
+      changedClass: "text-red"
+    });
+  }
+
+  return idx;
+}
+
+function clearPatterns() {
+  $(".dpt-title").each(function() {
+    if($(this).val() == $(this).data("defText")) {
+      $(this).val("");
+    }
+  });
+  return true;
+}
+
+function clearAllPatterns() {
+  $(".dpt-value").addClass('dpt-title').removeClass('dpt-value');
+  $(".toggleval").each(function() {
+    $(this).val("");
+  });
+  $(".dpt-title").toggleVal({
+    populateFrom: "title",
+    changedClass: "text-normal",
+    focusClass: "text-normal"
+  });
+  return true;
+}
+
+// all blanks are ok
+function validatePatterns() {
+  var culprit;
+  var msgInvalidDialPattern;
+  defaultEmptyOK = true;
+
+  // TODO: need to validate differently for prepend, prefix and match fields. The prepend
+  //      must be a dialable digit. The prefix can be any pattern but not contain "." and
+  //      the pattern can contain a "." also
+  //$filter_prepend = '/[^0-9\+\*\#/';
+  //$filter_match = '/[^0-9\-\+\*\#\.\[\]xXnNzZ]/';
+  //$filter_prefix = '/[^0-9\-\+\*\#\[\]xXnNzZ]/';
+  //defaultEmptyOK = false;
+  /* TODO: get some sort of check in for dialpatterns
+  if (!isDialpattern(theForm.dialpattern.value))
+    return warnInvalid(theForm.dialpattern, msgInvalidDialPattern);
+    */
+
+  $(".dp-prepend").each(function() {
+    if ($.trim(this.value) == '') {
+    } else if (this.value.search('[^0-9*#+\s]+') >= 0) {
+      culprit = this;
+      return false;
+    }
+  });
+  if (!culprit) {
+    $(".dp-prefix").each(function() {
+      if ($.trim($(this).val()) == '') {
+      } else if (!isDialpattern(this.value) || this.value.search('[._]+') >= 0) {
+        culprit = this;
+        return false;
+      }
+    });
+  }
+  if (!culprit) {
+    $(".dp-match").each(function() {
+      if ($.trim(this.value) == '') {
+      } else if (!isDialpattern(this.value) || this.value.search('[_]+') >= 0) {
+        culprit = this;
+        return false;
+      }
+    });
+  }
+
+  if (culprit != undefined) {
+    msgInvalidDialPattern = "<?php echo _('Dial pattern is invalid'); ?>";
+    // now we have to put it back...
+    // do I have to turn it off first though?
+    $(".dpt-title").each(function() {
+      if ($.trim($(this).val()) == '') {
+        $(this).toggleVal({
+          populateFrom: "title",
+          changedClass: "text-normal",
+          focusClass: "text-normal"
+        });
+      }
+    });
+    return warnInvalid(culprit, msgInvalidDialPattern);
+  } else {
+    return true;
+  }
+}
+
-var theForm = document.trunkEdit;
-
@@ -839 +968 @@
-  if (!isInteger(theForm.maxchans.value))
-    return warnInvalid(theForm.maxchans, msgInvalidMaxChans);
-  
-  if (!isDialrule(theForm.dialrules.value))
-    return warnInvalid(theForm.dialrules, msgInvalidDialRules);
-  
-  if (!isDialIdentifierSpecial(theForm.dialoutprefix.value))
@@ -870 +996 @@
-  <?php } ?>
-
-
-
+
+
+
+
+
+
+
-}
-