Changeset 8041

Timestamp:

08/14/09 20:39:37 (4 years ago)

Author:

p_lindheimer

Message:

added Descritpion field to trunk page and renamed the Never Overide CallerID for clearity along with other cleanup

Files:

• modules/branches/2.6/core/module.xml (modified) (2 diffs)
• modules/branches/2.6/core/page.trunks.php (modified) (14 diffs)

modules/branches/2.6/core/module.xml

@@ -4 +4 @@
-  <category>Basic</category>
-  <name>Core</name>
-2
+3
-  <publisher>FreePBX</publisher>
-  <license>GPLv2+</license>
@@ -10 +10 @@
-  <canuninstall>no</canuninstall>
-  <changelog>
+    *2.6.0beta1.3* trunk tab improvements
-    *2.6.0beta1.2* added more sql escape in devices
-    *2.6.0beta1.1* #3696, (needs framework updated), #3702, #3706, #3712, #3691, #3693, #3705, #3644, #3739, #3741, #3744, #3790 

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

@@ -21 +21 @@
-$display='trunks'; 
-$extdisplay=isset($_REQUEST['extdisplay'])?$_REQUEST['extdisplay']:'';
+$trunknum = ltrim($extdisplay,'OUT_');
+
-$action = isset($_REQUEST['action'])?$_REQUEST['action']:'';
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-$failtrunk_enable = ($failtrunk == "")?'':'CHECKED';
-
-if (!isset($disabletrunk)) {
-  $disabletrunk = "off";
-}
-
-if (isset($_REQUEST["dialrules"])) {
-  //$dialpattern = $_REQUEST["dialpattern"];
-  $dialrules = explode("\n",$_REQUEST["dialrules"]);
-
@@ -74 +66 @@
-switch ($action) {
-  case "addtrunk":
-
-
-
+
-    
-    core_trunks_addDialRules($trunknum, $dialrules);
@@ -83 +73 @@
-  break;
-  case "edittrunk":
-
-
-
-
-
-
-
-
+
-    
-    // this can rewrite too, so edit is the same
@@ -100 +83 @@
-  
-    core_trunks_del($trunknum);
+    core_trunks_deleteDialRules($trunknum);
-    core_routing_trunk_del($trunknum);
-    
-    /* //DIALRULES
-    deleteTrunkRules($channelid);
-    */
-    core_trunks_deleteDialRules($trunknum);
-    needreload();
-    redirect_standard();
@@ -178 +157 @@
-}
-  
-//get all rows from globals
-$sql = "SELECT * FROM globals";
-$globals = $db->getAll($sql);
-if(DB::IsError($globals)) {
-  die_freepbx($globals->getMessage());
-}
-
-//create a set of variables that match the items in global[0]
-foreach ($globals as $global) {
-  ${trim($global[0])} = htmlentities($global[1]);
-}
-
-?>
-</div>
@@ -198 +165 @@
-<?php 
-//get existing trunk info
-
+
+
-
-foreach ($tresults as $tresult) {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -219 +205 @@
-  $trunks = array(
-    array('url'=> $baseURL.'tech=ZAP', 'tlabel' =>  _("Add Zap Trunk").(ast_with_dahdi()?" ("._("DAHDI compatibility mode").")":"" )),
+    array('url'=> $baseURL.'tech=SIP', 'tlabel' =>  _("Add SIP Trunk")),
-    array('url'=> $baseURL.'tech=IAX2', 'tlabel' =>  _("Add IAX2 Trunk")),
-    array('url'=> $baseURL.'tech=SIP', 'tlabel' =>  _("Add SIP Trunk")),
-    array('url'=> $baseURL.'tech=ENUM', 'tlabel' =>  _("Add ENUM Trunk")),
-    array('url'=> $baseURL.'tech=DUNDI', 'tlabel' =>  _("Add DUNDi Trunk")),
@@ -242 +228 @@
-    $failtrunk_enable = ($failtrunk == "")?'':'CHECKED';
-    $disabletrunk = htmlentities($trunk_details['disabled']);
+    $provider = $trunk_details['provider'];
+    $trunk_name = htmlentities($trunk_details['name']);
-    
-    if ($tech!="enum") {
@@ -249 +237 @@
-      if ($tech!="custom" && $tech!="dundi") {  // custom trunks will not have user/peer details in database table
-        // load from db
-!isset
+empty
-          $peerdetails = core_trunks_getTrunkPeerDetails($trunknum);
-        }
-
-
+
-          $usercontext = htmlentities($trunk_details['usercontext']);
-        }
-  
-!isset
+empty
-          $userconfig = core_trunks_getTrunkUserConfig($trunknum);
-        }
-          
-!isset
+empty
-          $register = core_trunks_getTrunkRegister($trunknum);
-        }
-      }
-    }
-    
-    if (count($dialrules) == 0) {
-      if ($temp = core_trunks_getDialRules($trunknum)) {
@@ -279 +265 @@
-    }
-
-
-    $upper_tech = strtoupper($tech);
-    echo "<h2>".sprintf(_("Edit %s Trunk"),$upper_tech).($upper_tech == 'ZAP' && ast_with_dahdi()?" ("._("DAHDI compatibility Mode").")":"")."</h2>";
-
+
+
-    $label = '<span><img width="16" height="16" border="0" title="'.$tlabel.'" alt="" src="images/core_delete.png"/>&nbsp;'.$tlabel.'</span>';
-?>
@@ -332 +318 @@
-    $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;
+  case 'sip':
+    break;
-  default:
-    $helptext = '';
@@ -349 +337 @@
-      <input type="hidden" name="action" value=""/>
-      <input type="hidden" name="tech" value="<?php echo $tech?>"/>
+      <input type="hidden" name="provider" value="<?php echo $provider?>"/>
-      <table>
-      <tr>
@@ -357 +346 @@
-      <tr>
-        <td>
-Outbound Caller ID")?><span><br><?php echo _("Caller ID for calls placed out on this trunk<br><br>Format: <b>\"caller name\" &lt;#######&gt;</b>. You can also use the magic string 'hidden' to hide the CallerID sent out over Digital lines ONLY (E1/T1/J1/BRI/SIP/IAX)
+Trunk Description")?><span><br><?php echo _("Descriptive Name for this Trunk
-        </td><td>
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        </td><td>
-          <input type="checkbox" name="keepcid" <?php if ($keepcid=="on") {echo "checked";}?> tabindex="<?php echo ++$tabindex;?>"/>
@@ -394 +390 @@
-          </td>
-      </tr>
-
-      <tr>
-          <td><a class="info" href="#"><?php echo _("Monitor Trunk Failures")?><span><?php echo _("If checked, supply the name of a custom AGI Script that will be called to report, log, email or otherwise take some action on trunk failures that are not caused by either NOANSWER or CANCEL.")?></span></a>: