Ticket #2591: trunks.patch

page.trunks.php

@@ -1 @@
-353 2007-12-05 22:09:16
+615 2008-01-26 19:50:13
-// routing.php Copyright (C) 2004 Greg MacLellan (greg@mtechsolutions.ca)
-// Asterisk Management Portal Copyright (C) 2004 Coalescent Systems Inc. (info@coalescentsystems.ca)
-//
@@ -13 +13 @@
-//GNU General Public License for more details.
-
-
-
-$display='trunks'; 
-$extdisplay=isset($_REQUEST['extdisplay'])?$_REQUEST['extdisplay']:'';
-$action = isset($_REQUEST['action'])?$_REQUEST['action']:'';
@@ -172 +171 @@
-  break;
-}
-  
-
-  
-//get all rows from globals
-$sql = "SELECT * FROM globals";
-$globals = $db->getAll($sql);
@@ -197 +194 @@
-$tresults = core_trunks_list();
-
-foreach ($tresults as $tresult) {
-#FFF
-ltrim($tresult[1],"AMP:"
+
+str_replace('AMP:', '', $tresult[1]
-}
-
-?>
@@ -217 +214 @@
-  <a href="<?php echo $_SERVER['PHP_SELF'].'?display='.urlencode($display); ?>&amp;tech=SIP"><?php echo _("Add SIP Trunk")?></a><br><br>
-  <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 {
-  if ($extdisplay) {
@@ -231 +229 @@
-    $failtrunk = isset(${"OUTFAIL_".$trunknum})?${"OUTFAIL_".$trunknum}:'';
-    $failtrunk_enable = ($failtrunk == "")?'':'CHECKED';
-    $disabletrunk = isset(${"OUTDISABLE_".$trunknum})?${"OUTDISABLE_".$trunknum}:'';
+
-    
-    if ($tech!="enum") {
-  
@@ -238 +237 @@
-        $channelid = core_trunks_getTrunkTrunkName($trunknum); 
-      }
-
-
+ && $tech!="dundi"
-        // load from db
-        if (!isset($peerdetails)) { 
-          $peerdetails = core_trunks_getTrunkPeerDetails($trunknum);
@@ -269 +268 @@
-      }
-      unset($temp);
-    }
-
+
-    echo "<h2>".sprintf(_("Edit %s Trunk"),strtoupper($tech))."</h2>";
-?>
-    <p><a title="<?php echo $channelid ?>" href="config.php?display=<?php echo urlencode($display) ?>&amp;extdisplay=<?php echo urlencode($extdisplay) ?>&amp;action=deltrunk"><?php echo _("Delete Trunk")?> <?php  echo substr($channelid,0,20); ?></a></p>
@@ -313 +312 @@
-    $areacode = "";
-  
-    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;
+}
+    
-?>
-  
-    <form name="trunkEdit" action="config.php" method="post" onsubmit="return trunkEdit_onsubmit('<?php echo ($extdisplay ? "edittrunk" : "addtrunk") ?>');">
@@ -345 +359 @@
-<?php
-  if ($tech == "sip" || substr($tech,0,3) == "iax") {
-?>
-
+tech-$
-<?php
-  } else {
-?>
@@ -494 +508 @@
-        do {
-          var localprefix = <?php echo 'prompt("'._("What prefix should be removed from the number?\\n\\n(ie. for US/CAN, 1+areacode, ie, \'1613\')").'")'?>;
-          if (localprefix == null) return;
-'Invalid prefix. Only 0-9, #, *, Z, N, and X are allowed.'
+"Invalid prefix. Only 0-9, #, *, Z, N, and X are allowed."
-        
-        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");
@@ -663 +677 @@
-        </tr> 
-  <?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:
-  ?>
-        <tr>
@@ -740 +766 @@
-theForm.outcid.focus();
-
-function trunkEdit_onsubmit(act) {
-'Invalid Outbound Caller ID'
-'Invalid Maximum Channels'
-'Invalid Dial Rules'
-'Invalid Outbound Dial Prefix'
-'Invalid Trunk Name entered'
-'Invalid Custom Dial String entered'
-'Trunk Name and User Context cannot be set to the same value'
-'User Context was left blank and User Details will not be saved!'
-'You must define an Outbound Caller ID when Choosing Never Override CallerID'
+"Invalid Outbound Caller ID"
+"Invalid Maximum Channels"
+"Invalid Dial Rules"
+"Invalid Outbound Dial Prefix"
+"Invalid Trunk Name entered"
+"Invalid Custom Dial String entered"
+"Trunk Name and User Context cannot be set to the same value"
+"User Context was left blank and User Details will not be saved!"
+"You must define an Outbound Caller ID when Choosing Never Override CallerID"
-
-  defaultEmptyOK = true;
-
@@ -767 +793 @@
-  if (!isDialIdentifierSpecial(theForm.dialoutprefix.value))
-    return warnInvalid(theForm.dialoutprefix, msgInvalidOutboundDialPrefix);
-  
-
+ && $tech != "dundi"
-  defaultEmptyOK = true;
-  if (isEmpty(theForm.channelid.value) || isWhitespace(theForm.channelid.value))
-    return warnInvalid(theForm.channelid, msgInvalidTrunkName);
-  
-  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); 
-