Changeset 3625

Timestamp:

01/24/07 10:00:11 (2 years ago)

Author:

p_lindheimer

Message:

added disable trunk feature to disable but not remove it. Added hook to insert user provided monitoring/reporting mechanism on turnk failures, per trunk. Change hagnupcall to not have a delay

Files:

• freepbx/trunk/amp_conf/astetc/extensions.conf (modified) (3 diffs)
• freepbx/trunk/amp_conf/htdocs/admin/modules/core/functions.inc.php (modified) (10 diffs)
• freepbx/trunk/amp_conf/htdocs/admin/modules/core/page.routing.php (modified) (4 diffs)
• freepbx/trunk/amp_conf/htdocs/admin/modules/core/page.trunks.php (modified) (8 diffs)

freepbx/trunk/amp_conf/astetc/extensions.conf

@@ -312 +312 @@
-exten => s,n,DBDel(FM/DND/${FMGRP}/${CHANNEL})
-
-
-
+
-
-[macro-faxreceive]
@@ -357 +356 @@
-[macro-dialout-trunk]
-exten => s,1,Set(DIAL_TRUNK=${ARG1})
+exten => s,n,GotoIf($["x${OUTDISABLE_${ARG1}}" = "xon"]?disabletrunk,1)
-
-; If NODEST is set, clear it. No point in remembering since dialout-trunk will just end in the
@@ -412 +412 @@
-exten => s-CANCEL,3,Congestion(20)
-
-
+
+
+
+
+
-
-exten => h,1,Macro(hangupcall)

freepbx/trunk/amp_conf/htdocs/admin/modules/core/functions.inc.php

@@ -1276 +1276 @@
-
-// we're adding ,don't require a $trunknum
-
+, $failtrunk, $disabletrunk
-        global $db;
-        
@@ -1287 +1287 @@
-        }
-        
-
+, $failtrunk, $disabletrunk
-        
-        return $trunknum;
@@ -1300 +1300 @@
-
-        //delete from globals table
-
+,'OUTFAIL_$trunknum','OUTDISABLE_$trunknum'
-        
-        //write outids
@@ -1317 +1317 @@
-}
-
-
+, $failtrunk, $disabletrunk
-        //echo "editTrunk($trunknum, $channelid, $dialoutprefix, $maxchans, $outcid, $peerdetails, $usercontext, $userconfig, $register)";
-        $tech = core_trunks_getTrunkTech($trunknum);
-        core_trunks_del($trunknum, $tech);
-
+, $failtrunk, $disabletrunk
-}
-
-// just used internally by addTrunk() and editTrunk()
-//obsolete
-
+, $failtrunk, $disabletrunk
-        global $db;
-        
@@ -1343 +1343 @@
-                        array('OUTCID_'.$trunknum, $outcid),
-                        array('OUTKEEPCID_'.$trunknum, $keepcid),
+                        array('OUTFAIL_'.$trunknum, $failtrunk),
+                        array('OUTDISABLE_'.$trunknum, $disabletrunk),
-                        );
-                        
@@ -1354 +1356 @@
-        
-        core_trunks_writeoutids();
+
+        $disable_flag = ($disabletrunk == "on")?1:0;
-        
-        switch (strtolower($tech)) {
-                case "iax":
-                case "iax2":
-
+,$disable_flag
-                        if ($usercontext != ""){
-
+,$disable_flag
-                        }
-                        if ($register != ""){
-
+,$disable_flag
-                        }
-                break;
-                case "sip":
-
+,$disable_flag
-                        if ($usercontext != ""){
-
+,$disable_flag
-                        }
-                        if ($register != ""){
-
+,$disable_flag
-                        }
-                break;
@@ -1395 +1399 @@
-
-//add trunk info to sip or iax table
-
+,$disable_flag=0
-        global $db;
-        
@@ -1416 +1420 @@
-                $dbconfitem[]=array($k,$v);
-        }
-) values ('9999$trunknum',?,?
+, flags) values ('9999$trunknum',?,?,'$disable_flag'
-        $result = $db->executeMultiple($compiled,$dbconfitem);
-        if(DB::IsError($result)) {
-) values ('9999$trunknum',?,?
+, flags) values ('9999$trunknum',?,?,'$disable_flag'
-        }
-}
@@ -1432 +1436 @@
-                // TODO: sqlite work arround - diego 
-                // need to reorder the trunks in PHP code
-
+
+
+
+
+
+
+
+
+
+
+
-        }
-        else
-        {
-                // we have to escape _ for mysql: normally a wildcard
-
+
+
+
+
+
+
+
+
+
+
+
-        }
-
@@ -1476 +1500 @@
-}
-
-
-) values ('9999999$trunknum','register','$re
+,$disable_flag=0
+, flags) values ('9999999$trunknum','register','$reg','$disable_fla
-}
-

freepbx/trunk/amp_conf/htdocs/admin/modules/core/page.routing.php

@@ -268 +268 @@
-foreach (core_trunks_list() as $temp) {
-        $trunks[$temp[0]] = $temp[1];
+        $trunkstate[$temp[0]] = $temp[2];
-}
-
@@ -506 +507 @@
-                        </td>
-                        <td>
-               <select id='trunkpri<?php echo $key ?>' name="trunkpriority[<?php echo $key ?>]
-
+<select id='trunkpri<?php echo $key ?>' name="trunkpriority[<?php echo $key ?>]" style="background: <?php echo $trunkstate[$trunk]=="off"?"#FFF":"#DDD" ?> ;" onChange="showDisable(<?php echo $key ?>); return true;
+ style="background: #FFF;"
-                                <?php 
-                                foreach ($trunks as $name=>$display) {
-
+
+
+
+
+
-                                }
-                                ?>
@@ -550 +555 @@
-                                <?php 
-                                foreach ($trunks as $name=>$display) {
-
+
+
+
+
+
-                                }
-                                ?>
@@ -586 +595 @@
-} else {
-        theForm.routepass.focus();
+}
+
+function showDisable(key) {
+<?php
+        $bgmap = 'bgc = {';
+        foreach ($trunks as $name=>$display) {
+                $bgmap .= " \"$name\":";
+                $bgmap .= ($trunkstate[$name] == 'off')?'"#FFF",':'"#DDD",';
+        }
+        echo rtrim($bgmap,',')." };\n";
+?>
+        if (document.getElementById('trunkpri'+key).value =='') {
+                document.getElementById('trunkpri'+key).style.background = '#FFF';
+        } else {
+                document.getElementById('trunkpri'+key).style.background = bgc[document.getElementById('trunkpri'+key).value];
+        }
-}
-

freepbx/trunk/amp_conf/htdocs/admin/modules/core/page.trunks.php

@@ -25 +25 @@
-
-// populate some global variables from the request string
-
+,"failtrunk","disabletrunk"
-foreach ($set_globals as $var) {
-        if (isset($_REQUEST[$var])) {
@@ -35 +35 @@
-if (!isset($keepcid)) {
-        $keepcid = "off";
+}
+// ensure that failtrunk is set to something:
+if (!isset($failtrunk)) {
+        $failtrunk = "";
+}
+if (!isset($disabletrunk)) {
+        $disabletrunk = "off";
-}
-
@@ -60 +67 @@
-switch ($action) {
-        case "addtrunk":
-
+
+
+
-                
-                core_trunks_addDialRules($trunknum, $dialrules);
@@ -67 +76 @@
-        break;
-        case "edittrunk":
-
+
+
+
-                
-                /* //DIALRULES
@@ -184 +195 @@
-
-foreach ($tresults as $tresult) {
-
+
+
-}
-
@@ -214 +226 @@
-                $dialoutprefix = ${"OUTPREFIX_".$trunknum};
-                $keepcid = isset(${"OUTKEEPCID_".$trunknum})?${"OUTKEEPCID_".$trunknum}:'';
+                $failtrunk = isset(${"OUTFAIL_".$trunknum})?${"OUTFAIL_".$trunknum}:'';
+                $failtrunk_enable = ($failtrunk == "")?'':'CHECKED';
+                $disabletrunk = isset(${"OUTDISABLE_".$trunknum})?${"OUTDISABLE_".$trunknum}:'';
-                
-                if ($tech!="enum") {
@@ -340 +355 @@
-                                </td>
-                        </tr>
+
+                        <tr>
+                            <td><a class="info" href="#"><?php echo _("Disable Trunk")?><span><?php echo _("Check this to disable this trunk in all routes where it is used.")?></span></a>:
+                            </td>
+                            <td>
+                                <input type='checkbox' name='disabletrunk' id="disabletrunk" <?php if ($disabletrunk=="on") { echo 'CHECKED'; }?> OnClick='disable_verify(disabletrunk); return true;'><small><?php echo _("Disable")?></small>
+                            </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>:
+                            </td>
+                            <td>
+                                <input <?php if (!$failtrunk_enable) echo "disabled style='background: #DDD;'"?> type="text" size="20" name="failtrunk" value="<?php echo htmlspecialchars($failtrunk)?>"/>
+                                <input type='checkbox' name='failtrunk_enable' id="failtrunk_enable" value='1' <?php if ($failtrunk_enable) { echo 'CHECKED'; }?> OnClick='disable_field(failtrunk,failtrunk_enable); return true;'><small><?php echo _("Enable")?></small>
+                            </td>
+                        </tr>
+
-                        <tr>
-                                <td colspan="2">
@@ -388 +421 @@
-                        <script language="javascript">
-                        
+                        function disable_field(field, field_enable) {
+                            if (field_enable.checked) {
+                                field.style.backgroundColor = '#FFF';
+                                field.disabled = false;
+                            }
+                            else {
+                                field.style.backgroundColor = '#DDD';
+                                field.disabled = true;
+                            }
+                        }
+
+                        function disable_verify(field) {
+                            if (field.checked) {
+                                var answer=confirm("Are you sure you want to disable this trunk in all routes it is used?");
+                                if (!answer) {
+                                    field.checked = false;
+                                }
+                            }
+                            else {
+                                alert("You have enabled this trunk in all routes it is used");
+                            }
+                        }
+
-                        function populateLookup(digits) {
-<?php