Changeset 5566

Timestamp:

01/10/08 14:06:39 (5 years ago)

Author:

p_lindheimer

Message:

fix bug in core_trunks_list(true) that could not handle same name of different technologies, requires dashboard fix which also uses this routine. Add partial support for DUNDi trunks in FreePBX (required manual configuration of dundi.conf, but full support to use in routing/trunks once configured

Files:

• modules/branches/2.4/core/functions.inc.php (modified) (11 diffs)
• modules/branches/2.4/core/page.trunks.php (modified) (10 diffs)
• modules/branches/2.4/dashboard/class.astinfo.php (modified) (2 diffs)

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

@@ -943 +943 @@
-              $ext->add($trunkcontext, '_.', '', new ext_goto('1','${EXTEN}','from-trunk'));
-              break;
+            case 'DUNDI':
+              $macro_name = 'macro-dundi-'.substr($trunkprops['globalvar'],4);
+              $ext->addSwitch($macro_name,'DUNDI/'.$trunkprops['name']);
+              $ext->add($macro_name, 's', '', new ext_goto('1','${ARG1}'));
+              break;
-            default:
-          }
@@ -1018 +1023 @@
-          if(strpos($exten['args'],"MOHCLASS") !== false)
-            $ext->add($outrt['application'], $exten['extension'], '', new ext_setvar("MOHCLASS", '${IF($["x${MOHCLASS}"="x"]?'.substr($exten['args'],9).':${MOHCLASS})}' ));
-
+ || strpos($exten['args'],"dialout-dundi") !== false
-            if ($exten['extension'] !== $lastexten) {
-
@@ -1039 +1044 @@
-        }
-      }
+
-      general_generate_indications();
-
@@ -1172 +1178 @@
-
-
+
+
+      $context = 'macro-dialout-dundi';
+      $exten = 's';
+      
+      /*
+       * Dialout Dundi Trunk
+       */
+      $ext->add($context, $exten, '', new ext_set('DIAL_TRUNK', '${ARG1}'));
+      $ext->add($context, $exten, '', new ext_execif('$[$["${ARG3}" != ""] & $["${DB(AMPUSER/${AMPUSER}/pinless)}" != "NOPASSWD"]]', 'Authenticate', '${ARG3}'));
+      $ext->add($context, $exten, '', new ext_gotoif('$["x${OUTDISABLE_${DIAL_TRUNK}}" = "xon"]', 'disabletrunk,1'));
+      $ext->add($context, $exten, '', new ext_set('DIAL_NUMBER', '${ARG2}')); // fixlocalprefix depends on this
+      $ext->add($context, $exten, '', new ext_set('DIAL_TRUNK_OPTIONS', '${DIAL_OPTIONS}')); // will be reset to TRUNK_OPTIONS if not intra-company
+      $ext->add($context, $exten, '', new ext_set('GROUP()', 'OUT_${DIAL_TRUNK}'));
+      $ext->add($context, $exten, '', new ext_gotoif('$["${OUTMAXCHANS_${DIAL_TRUNK}}foo" = "foo"]', 'nomax'));
+      $ext->add($context, $exten, '', new ext_gotoif('$[ ${GROUP_COUNT(OUT_${DIAL_TRUNK})} > ${OUTMAXCHANS_${DIAL_TRUNK}} ]', 'chanfull'));
+      $ext->add($context, $exten, 'nomax', new ext_gotoif('$["${INTRACOMPANYROUTE}" = "YES"]', 'skipoutcid'));  // Set to YES if treated like internal
+      $ext->add($context, $exten, '', new ext_set('DIAL_TRUNK_OPTIONS', '${TRUNK_OPTIONS}'));
+      $ext->add($context, $exten, '', new ext_macro('outbound-callerid', '${DIAL_TRUNK}'));
+      $ext->add($context, $exten, 'skipoutcid', new ext_agi('fixlocalprefix'));  // this sets DIAL_NUMBER to the proper dial string for this trunk
+      $ext->add($context, $exten, '', new ext_set('OUTNUM', '${OUTPREFIX_${DIAL_TRUNK}}${DIAL_NUMBER}'));  // OUTNUM is the final dial number
+
+      // Back to normal processing, whether intracompany or not.
+      // But add the macro-setmusic if we don't want music on this outbound call
+      $ext->add($context, $exten, '', new ext_gotoif('$[$["${MOHCLASS}" = "default"] | $["foo${MOHCLASS}" = "foo"]]', 'gocall'));  // Set to YES if we should pump silence
+      $ext->add($context, $exten, '', new ext_set('DIAL_TRUNK_OPTIONS', 'M(setmusic^${MOHCLASS})${DIAL_TRUNK_OPTIONS}'));  // set MoH or off
+    
+      // This macro call will always be blank and is provided as a hook for customization required prior to making a call
+      // such as adding SIP header information or other requirements. All the channel variables from above are present
+      
+      $ext->add($context, $exten, 'gocall', new ext_macro('dialout-trunk-predial-hook'));
+      $ext->add($context, $exten, '', new ext_gotoif('$["${PREDIAL_HOOK_RET}" = "BYPASS"]', 'bypass,1'));
+    
+      $ext->add($context, $exten, '', new ext_gotoif('$["${custom}" = "AMP"]', 'customtrunk'));
+
+      $ext->add($context, $exten, '', new ext_macro('dundi-${DIAL_TRUNK}','${OUTNUM}'));
+      $ext->add($context, $exten, '', new ext_goto(1, 's-${DIALSTATUS}'));
+      
+      $ext->add($context, $exten, 'chanfull', new ext_noop('max channels used up'));
+    
+      $exten = 's-BUSY';
+      $ext->add($context, $exten, '', new ext_noop('Dial failed due to trunk reporting BUSY - giving up'));
+      $ext->add($context, $exten, '', new ext_playtones('busy'));
+      $ext->add($context, $exten, '', new ext_busy(20));
+    
+      $exten = 's-NOANSWER';
+      $ext->add($context, $exten, '', new ext_noop('Dial failed due to trunk reporting NOANSWER - giving up'));
+      $ext->add($context, $exten, '', new ext_playtones('congestion'));
+      $ext->add($context, $exten, '', new ext_congestion(20));
+    
+      $exten = 's-CANCEL';
+      $ext->add($context, $exten, '', new ext_noop('Dial failed due to trunk reporting CANCEL - giving up'));
+      $ext->add($context, $exten, '', new ext_playtones('congestion'));
+      $ext->add($context, $exten, '', new ext_congestion(20));
+    
+      $exten = '_s-.';
+      $ext->add($context, $exten, '', new ext_gotoif('$["x${OUTFAIL_${ARG1}}" = "x"]', 'noreport'));
+      $ext->add($context, $exten, '', new ext_agi('${OUTFAIL_${ARG1}}'));
+      $ext->add($context, $exten, 'noreport', new ext_noop('TRUNK Dial failed due to ${DIALSTATUS} - failing through to other trunks'));
+      
+      $ext->add($context, 'disabletrunk', '', new ext_noop('TRUNK: ${OUT_${DIAL_TRUNK}} DISABLED - falling through to next trunk'));
+      $ext->add($context, 'bypass', '', new ext_noop('TRUNK: ${OUT_${DIAL_TRUNK}} BYPASSING because dialout-trunk-predial-hook'));
+    
+      $ext->add($context, 'h', '', new ext_macro('hangupcall'));
+
+
+
-      /*
-       * sets the callerid of the device to that of the logged in user
@@ -2783 +2856 @@
-    foreach ($unique_trunks as $trunk) {
-      list($tech,$name) = explode('/',$trunk[1]);
-name
+trunk[1]
-        'name' => $name,
-        'tech' => $tech,
@@ -2989 +3062 @@
-
-  if ($amp_conf["AMPDBENGINE"] == "sqlite3")
-
+ OR args LIKE 'dialout-dundi,".$trunknum.",%'
-  else
-
+ OR args LIKE 'dialout-dundi,".$trunknum.",%'
-
-  $results = sql( $sql_code, "getAll" );
@@ -3327 +3400 @@
-        $pass_str = "";
-
-
+ {
-        $sql .= "'dialout-enum,".substr($trunk,4).",\${".$exten."},".$pass_str."'"; // cut off OUT_ from $trunk
-
+
+
+
-        $sql .= "'dialout-trunk,".substr($trunk,4).",\${".$exten."},".$pass_str."'"; // cut off OUT_ from $trunk
+      }
-      $sql .= ")";
-      
@@ -3445 +3521 @@
-function core_routing_getroutepatterns($route) {
-  global $db;
-'dialout-enum
+ 'dialout-enum%' OR args LIKE 'dialout-dundi
-  $results = $db->getAll($sql);
-  if(DB::IsError($results)) {
@@ -3473 +3549 @@
-function core_routing_getroutetrunks($route) {
-  global $db;
-
+ OR args LIKE 'dialout-dundi,%'
-  $results = $db->getAll($sql);
-  if(DB::IsError($results)) {
@@ -3491 +3567 @@
-        $trunks[] = "OUT_".$matches[1];
-      }
+    } else if (preg_match('/^dialout-dundi,(\d+)/', $row[0], $matches)) {
+      if (!in_array("OUT_".$matches[1], $trunks)) {
+        $trunks[] = "OUT_".$matches[1];
+      }
-    }
-  }
@@ -3500 +3580 @@
-function core_routing_getroutepassword($route) {
-  global $db;
-
+ OR args LIKE 'dialout-dundi,%'
-  $results = $db->getOne($sql);
-  if(DB::IsError($results)) {

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

@@ -12 +12 @@
-//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//GNU General Public License for more details.
-
-
-
@@ -173 +172 @@
-}
-  
-
-  
-//get all rows from globals
-$sql = "SELECT * FROM globals";
@@ -218 +215 @@
-  <a href="<?php echo $_SERVER['PHP_SELF'].'?display='.urlencode($display); ?>&amp;tech=ENUM"><?php echo _("Add ENUM Trunk")?></a><br><br>
-  <a href="<?php echo $_SERVER['PHP_SELF'].'?display='.urlencode($display); ?>&amp;tech=CUSTOM"><?php echo _("Add Custom Trunk")?></a><br><br>
+  <a href="<?php echo $_SERVER['PHP_SELF'].'?display='.urlencode($display); ?>&amp;tech=DUNDI"><?php echo _("Add DUNDi Trunk")?></a><br><br>
-<?php 
-} else {
@@ -232 +230 @@
-    $failtrunk_enable = ($failtrunk == "")?'':'CHECKED';
-    $disabletrunk = isset(${"OUTDISABLE_".$trunknum})?${"OUTDISABLE_".$trunknum}:'';
+
-    
-    if ($tech!="enum") {
@@ -239 +238 @@
-      }
-
-
+ && $tech!="dundi"
-        // load from db
-        if (!isset($peerdetails)) { 
@@ -270 +269 @@
-      unset($temp);
-    }
-
+
-    echo "<h2>".sprintf(_("Edit %s Trunk"),strtoupper($tech))."</h2>";
-?>
@@ -314 +313 @@
-  
-    echo "<h2>".sprintf("Add %s Trunk",strtoupper($tech))."</h2>";
+
-  } 
+switch ($tech) {
+  case 'dundi':
+    $helptext = _('FreePBX offers limited support for DUNDi trunks and additional manual configuration is required. The trunk name should correspond to the [mappings] section of the remote dundi.conf systems. For example, you may have a mapping on the remote system, and corresponding configurations in dundi.conf locally, that looks as follows:<br /><br />[mappings]<br />priv => dundi-extens,0,IAX2/priv:${SECRET}@218.23.42.26/${NUMBER},noparital<br /><br />In this example, you would create this trunk and name it priv. You would then create the corresponding IAX2 trunk with proper settings to work with DUNDi. This can be done by making an IAX2 trunk in FreePBX or by using the iax_custom.conf file.<br />The dundi-extens context in this example must be created in extensions_custom.conf. This can simply include contexts such as ext-local, ext-intercom-users, ext-paging and so forth to provide access to the corresponding extensions and features provided by these various contexts and generated by FreePBX.');
+    break;
+  default:
+    $helptext = '';
+}
+if ($helptext != '') {
+  if ($extdisplay) {
+    echo "<br /><br />";
+  }
+  echo $helptext;
+}
+    
-?>
-  
@@ -664 +678 @@
-  <?php
-    break;
+    case "dundi":
+  ?>
+        <tr>
+          <td>
+            <a href=# class="info"><?php echo _("DUNDi Mapping")?><span><?php echo _("This is the name of the DUNDi mapping as defined in the [mappings] section of remote dundi.conf peers. This corresponds to the 'include' section of the peer details in the local dundi.conf file. This requires manual configuration of DUNDi to use this trunk.")?></span></a>: 
+          </td><td>
+            <input type="text" size="35" maxlength="46" name="channelid" value="<?php echo htmlspecialchars($channelid) ?>"/>
+            <input type="hidden" size="14" name="usercontext" value="notneeded"/>
+          </td>
+        </tr> 
+  <?php
+    break;
-    default:
-  ?>
@@ -768 +794 @@
-    return warnInvalid(theForm.dialoutprefix, msgInvalidOutboundDialPrefix);
-  
-
+ && $tech != "dundi"
-  defaultEmptyOK = true;
-  if (isEmpty(theForm.channelid.value) || isWhitespace(theForm.channelid.value))
@@ -775 +801 @@
-  if (theForm.channelid.value == theForm.usercontext.value)
-    return warnInvalid(theForm.usercontext, msgInvalidTrunkAndUserSame);
-
+ || $tech == "dundi"
-  if (isEmpty(theForm.channelid.value) || isWhitespace(theForm.channelid.value)) 
-    return warnInvalid(theForm.channelid, msgInvalidChannelName); 

modules/branches/2.4/dashboard/class.astinfo.php

@@ -103 +103 @@
-        $online = !empty($matches[6]); 
-
-
+'SIP/'.
-          // this is a trunk
-          //TODO match trunk tech as well? 
@@ -143 +143 @@
-        $online = !empty($matches[6]); 
-
-
+'IAX2/'.
-          // this is a trunk
-          //TODO match trunk tech as well?