Changeset 8632

Timestamp:

01/16/10 18:34:16 (3 years ago)

Author:

mickecarlsson

Message:

Updated outroutemsg to be able to set trunk report messages for the new trunk failure messages. Core will be updated to reflect these changes

Files:

• modules/branches/2.7/outroutemsg/functions.inc.php (modified) (5 diffs)
• modules/branches/2.7/outroutemsg/page.outroutemsg.php (modified) (6 diffs)

modules/branches/2.7/outroutemsg/functions.inc.php

@@ -2 +2 @@
-//Copyright (C) 2009 Philippe Lindheimer 
-//Copyright (C) 2009 Bandwidth.com
+//Copyright (C) 2010 Mikael Carlsson
-//
-//This program is free software; you can redistribute it and/or
@@ -89 +90 @@
-}
-
-
+, $no_answer_msg_id, $unalloc_msg_id, $no_transit_msg_id, $no_route_msg_id, $ch_unaccept_msg_id, $call_reject_msg_id, $nmbr_chngd_msg_id
-  global $db;
-
@@ -95 +96 @@
-  $intracompany_msg_id = $db->escapeSimple($intracompany_msg_id);
-  $emergency_msg_id    = $db->escapeSimple($emergency_msg_id);
-
+
+
+
+
+
+
+
+
-  // in future will do in a outroutemsg_del but not needed for now
-  //
-
+, 'no_answer_msg_id', 'unalloc_msg_id', 'no_transit_msg_id', 'no_route_msg_id', 'ch_unaccept_msg_id', 'call_reject_msg_id', 'nmbr_chngd_msg_id'
-  $result = $db->query($sql);
-  if(DB::IsError($result)) {
@@ -108 +116 @@
-    array('intracompany_msg_id', "$intracompany_msg_id"),
-    array('emergency_msg_id', "$emergency_msg_id"),
+    array('no_answer_msg_id', "$no_answer_msg_id"),
+    array('unalloc_msg_id', "$unalloc_msg_id"),
+    array('no_transit_msg_id', "$no_transit_msg_id"),
+    array('no_route_msg_id', "$no_route_msg_id"),
+    array('ch_unaccept_msg_id', "$ch_unaccept_msg_id"),
+    array('call_reject_msg_id', "$call_reject_msg_id"),
+    array('nmbr_chngd_msg_id', "$nmbr_chngd_msg_id"),
-    );
-
@@ -124 +139 @@
-    $results = array();
-  }
-
-  $results['default_msg_id']      = isset($results['default_msg_id'])      ? $results['default_msg_id']      : DEFAULT_MSG;
-  $results['intracompany_msg_id'] = isset($results['intracompany_msg_id']) ? $results['intracompany_msg_id'] : DEFAULT_MSG;
-  $results['emergency_msg_id']    = isset($results['emergency_msg_id'])    ? $results['emergency_msg_id']    : DEFAULT_MSG;
-
+
+
+
+
+
+
+
-  return $results;
-}

modules/branches/2.7/outroutemsg/page.outroutemsg.php

@@ -2 +2 @@
-//Copyright (C) 2009 Philippe Lindheimer 
-//Copyright (C) 2009 Bandwidth.com
+//Copyright (C) 2010 Mikael Carlsson
-//
-//This program is free software; you can redistribute it and/or
@@ -28 +29 @@
-  $intracompany_msg_id = isset($_REQUEST['intracompany_msg_id']) ? trim($_REQUEST['intracompany_msg_id']) : DEFAULT_MSG;
-  $emergency_msg_id    = isset($_REQUEST['emergency_msg_id'])    ? trim($_REQUEST['emergency_msg_id'])    : DEFAULT_MSG;
+  $no_answer_msg_id    = isset($_REQUEST['no_answer_msg_id'])    ? trim($_REQUEST['no_answer_msg_id'])    : DEFAULT_MSG;  
+  $unalloc_msg_id      = isset($_REQUEST['unalloc_msg_id'])      ? trim($_REQUEST['unalloc_msg_id'])      : DEFAULT_MSG;
+  $no_transit_msg_id   = isset($_REQUEST['no_transit_msg_id'])   ? trim($_REQUEST['no_transit_msg_id'])   : DEFAULT_MSG;  
+  $no_route_msg_id     = isset($_REQUEST['no_route_msg_id'])     ? trim($_REQUEST['no_route_msg_id'])     : DEFAULT_MSG;
+  $ch_unaccept_msg_id  = isset($_REQUEST['ch_unaccept_msg_id'])  ? trim($_REQUEST['ch_unaccept_msg_id'])  : DEFAULT_MSG;
+  $call_reject_msg_id  = isset($_REQUEST['call_reject_msg_id'])  ? trim($_REQUEST['call_reject_msg_id'])  : DEFAULT_MSG;
+  $nmbr_chngd_msg_id   = isset($_REQUEST['nmbr_chngd_msg_id'])   ? trim($_REQUEST['nmbr_chngd_msg_id'])   : DEFAULT_MSG;
-
-  if ($action == 'submit') {
-
+, $no_answer_msg_id, $unalloc_msg_id, $no_transit_msg_id, $no_route_msg_id, $ch_unaccept_msg_id, $call_reject_msg_id, $nmbr_chngd_msg_id
-    needreload();
-  }
@@ -46 +54 @@
-  $intracompany_msg_id = $outroutemsg_settings['intracompany_msg_id'];
-  $emergency_msg_id    = $outroutemsg_settings['emergency_msg_id'];
+  $no_answer_msg_id    = $outroutemsg_settings['no_answer_msg_id'];
+  $unalloc_msg_id      = $outroutemsg_settings['unalloc_msg_id'];
+  $no_transit_msg_id   = $outroutemsg_settings['no_transit_msg_id'];
+  $no_route_msg_id     = $outroutemsg_settings['no_route_msg_id'];
+  $ch_unaccept_msg_id  = $outroutemsg_settings['ch_unaccept_msg_id'];
+  $call_reject_msg_id  = $outroutemsg_settings['call_reject_msg_id'];
+  $nmbr_chngd_msg_id   = $outroutemsg_settings['nmbr_chngd_msg_id'];  
-}
-
-?>
-<h2><?php echo _("Route Congestion Messages")?></h2>
+<h4><?php echo _("No Routes Available")?></h4>
-<form name="outroutemsg" action="config.php" method="post">
-<input type="hidden" name="display" value="<?php echo $dispnum ?>"/>
-<input type="hidden" name="action" value="submit"/>
-<table>
-
-
-
+
-<tr>
-  <td><a href="#" class="info"><?php echo _("Message or Tone")?><span><?php echo _("Message or tone to be played if no trunks are available.")?></span></a></td>
@@ -74 +88 @@
-</tr>
-
-br><
+
-<tr>
-  <td><a href="#" class="info"><?php echo _("Message or Tone")?><span><?php echo _("Message or tone to be played if no trunks are available. Used on routes marked as intra-company only.")?></span></a></td>
@@ -92 +106 @@
-</tr>
-
-br><
+
-<tr>
-  <td><a href="#" class="info"><?php echo _("Message or Tone")?><span><?php echo _("Message or tone to be played if no trunks are available. Used on all emergency routes. Consider a message instructing callers to find an alternative means of calling emergency services such as a cell phone or alarm system panel.")?></span></a></td>
@@ -109 +123 @@
-  </td>
-</tr>
+<tr><td colspan="2"><br><h4><?php echo _("Trunk Failures")?></h4></td></tr>
+
+<tr><td colspan="2"><h5><?php echo _("No Answer")?><hr></h5></td></tr>
+<tr>
+  <td><a href="#" class="info"><?php echo _("Message or Tone")?><span><?php echo _("Message or tone to be played if there was no answer. Hangupcause is 18 or 19")?></span></a></td>
+  <td align=right>
+    <select name="no_answer_msg_id" id="no_answer_msg_id" tabindex="<?php echo ++$tabindex;?>">
+    <?php
+      echo '<option value="'.DEFAULT_MSG.'"'.(DEFAULT_MSG == $no_answer_msg_id ? ' SELECTED' : '').'>'._("Default Message")."</option>\n";
+      echo '<option value="'.CONGESTION_TONE.'"'.(CONGESTION_TONE == $no_answer_msg_id ? ' SELECTED' : '').'>'._("Congestion Tones")."</option>\n";
+      if (isset($tresults[0])) {
+        foreach ($tresults as $tresult) {
+          echo '<option value="'.$tresult['id'].'"'.($tresult['id'] == $no_answer_msg_id ? ' SELECTED' : '').'>'.$tresult['displayname']."</option>\n";
+        }
+      }
+    ?>
+    </select>
+  </td>
+</tr>
+
+<tr><td colspan="2"><h5><?php echo _("Unallocated/Unassigned Number")?><hr></h5></td></tr>
+<tr>
+  <td><a href="#" class="info"><?php echo _("Message or Tone")?><span><?php echo _("Message or tone to be played if trunk reports Unallocated/Unassigned number. Hangupcause is 27, 28 or 31")?></span></a></td>
+  <td align=right>
+    <select name="unalloc_msg_id" id="unalloc_msg_id" tabindex="<?php echo ++$tabindex;?>">
+    <?php
+      echo '<option value="'.DEFAULT_MSG.'"'.(DEFAULT_MSG == $unalloc_msg_id ? ' SELECTED' : '').'>'._("Default Message")."</option>\n";
+      echo '<option value="'.CONGESTION_TONE.'"'.(CONGESTION_TONE == $unalloc_msg_id ? ' SELECTED' : '').'>'._("Congestion Tones")."</option>\n";
+      if (isset($tresults[0])) {
+        foreach ($tresults as $tresult) {
+          echo '<option value="'.$tresult['id'].'"'.($tresult['id'] == $unalloc_msg_id ? ' SELECTED' : '').'>'.$tresult['displayname']."</option>\n";
+        }
+      }
+    ?>
+    </select>
+  </td>
+</tr>
+
+<tr><td colspan="2"><h5><?php echo _("No Route To Transit Network")?><hr></h5></td></tr>
+<tr>
+  <td><a href="#" class="info"><?php echo _("Message or Tone")?><span><?php echo _("Message or tone to be played if trunk reports No Route to Transit Network. Hangupcause is 1 or 2")?></span></a></td>
+  <td align=right>
+    <select name="no_transit_msg_id" id="no_transit_msg_id" tabindex="<?php echo ++$tabindex;?>">
+    <?php
+      echo '<option value="'.DEFAULT_MSG.'"'.(DEFAULT_MSG == $no_transit_msg_id ? ' SELECTED' : '').'>'._("Default Message")."</option>\n";
+      echo '<option value="'.CONGESTION_TONE.'"'.(CONGESTION_TONE == $no_transit_msg_id ? ' SELECTED' : '').'>'._("Congestion Tones")."</option>\n";
+      if (isset($tresults[0])) {
+        foreach ($tresults as $tresult) {
+          echo '<option value="'.$tresult['id'].'"'.($tresult['id'] == $no_transit_msg_id ? ' SELECTED' : '').'>'.$tresult['displayname']."</option>\n";
+        }
+      }
+    ?>
+    </select>
+  </td>
+</tr>
+
+<tr><td colspan="2"><h5><?php echo _("No Route To Destination")?><hr></h5></td></tr>
+<tr>
+  <td><a href="#" class="info"><?php echo _("Message or Tone")?><span><?php echo _("Message or tone to be played if trunk reports No Route to Destination. Hangupcause is 3")?></span></a></td>
+  <td align=right>
+    <select name="no_route_msg_id" id="no_route_msg_id" tabindex="<?php echo ++$tabindex;?>">
+    <?php
+      echo '<option value="'.DEFAULT_MSG.'"'.(DEFAULT_MSG == $no_route_msg_id ? ' SELECTED' : '').'>'._("Default Message")."</option>\n";
+      echo '<option value="'.CONGESTION_TONE.'"'.(CONGESTION_TONE == $no_route_msg_id ? ' SELECTED' : '').'>'._("Congestion Tones")."</option>\n";
+      if (isset($tresults[0])) {
+        foreach ($tresults as $tresult) {
+          echo '<option value="'.$tresult['id'].'"'.($tresult['id'] == $no_route_msg_id ? ' SELECTED' : '').'>'.$tresult['displayname']."</option>\n";
+        }
+      }
+    ?>
+    </select>
+  </td>
+</tr>
+
+<tr><td colspan="2"><h5><?php echo _("Channel Unacceptable")?><hr></h5></td></tr>
+<tr>
+  <td><a href="#" class="info"><?php echo _("Message or Tone")?><span><?php echo _("Message or tone to be played if trunk reports Channel Unacceptable. Hangupcause is 6")?></span></a></td>
+  <td align=right>
+    <select name="ch_unaccept_msg_id" id="ch_unaccept_msg_id" tabindex="<?php echo ++$tabindex;?>">
+    <?php
+      echo '<option value="'.DEFAULT_MSG.'"'.(DEFAULT_MSG == $ch_unaccept_msg_id ? ' SELECTED' : '').'>'._("Default Message")."</option>\n";
+      echo '<option value="'.CONGESTION_TONE.'"'.(CONGESTION_TONE == $ch_unaccept_msg_id ? ' SELECTED' : '').'>'._("Congestion Tones")."</option>\n";
+      if (isset($tresults[0])) {
+        foreach ($tresults as $tresult) {
+          echo '<option value="'.$tresult['id'].'"'.($tresult['id'] == $ch_unaccept_msg_id ? ' SELECTED' : '').'>'.$tresult['displayname']."</option>\n";
+        }
+      }
+    ?>
+    </select>
+  </td>
+</tr>
+
+<tr><td colspan="2"><h5><?php echo _("Call Rejected")?><hr></h5></td></tr>
+<tr>
+  <td><a href="#" class="info"><?php echo _("Message or Tone")?><span><?php echo _("Message or tone to be played if trunk rejected the call. Hangupcause is 21")?></span></a></td>
+  <td align=right>
+    <select name="call_reject_msg_id" id="call_reject_msg_id" tabindex="<?php echo ++$tabindex;?>">
+    <?php
+      echo '<option value="'.DEFAULT_MSG.'"'.(DEFAULT_MSG == $call_reject_msg_id ? ' SELECTED' : '').'>'._("Default Message")."</option>\n";
+      echo '<option value="'.CONGESTION_TONE.'"'.(CONGESTION_TONE == $call_reject_msg_id ? ' SELECTED' : '').'>'._("Congestion Tones")."</option>\n";
+      if (isset($tresults[0])) {
+        foreach ($tresults as $tresult) {
+          echo '<option value="'.$tresult['id'].'"'.($tresult['id'] == $call_reject_msg_id ? ' SELECTED' : '').'>'.$tresult['displayname']."</option>\n";
+        }
+      }
+    ?>
+    </select>
+  </td>
+</tr>
+
+<tr><td colspan="2"><h5><?php echo _("Number Changed")?><hr></h5></td></tr>
+<tr>
+  <td><a href="#" class="info"><?php echo _("Message or Tone")?><span><?php echo _("Message or tone to be played if trunk reports Number Changed. Hangupcause is 22 or 23")?></span></a></td>
+  <td align=right>
+    <select name="nmbr_chngd_msg_id" id="nmbr_chngd_msg_id" tabindex="<?php echo ++$tabindex;?>">
+    <?php
+      echo '<option value="'.DEFAULT_MSG.'"'.(DEFAULT_MSG == $nmbr_chngd_msg_id ? ' SELECTED' : '').'>'._("Default Message")."</option>\n";
+      echo '<option value="'.CONGESTION_TONE.'"'.(CONGESTION_TONE == $nmbr_chngd_msg_id ? ' SELECTED' : '').'>'._("Congestion Tones")."</option>\n";
+      if (isset($tresults[0])) {
+        foreach ($tresults as $tresult) {
+          echo '<option value="'.$tresult['id'].'"'.($tresult['id'] == $nmbr_chngd_msg_id ? ' SELECTED' : '').'>'.$tresult['displayname']."</option>\n";
+        }
+      }
+    ?>
+    </select>
+  </td>
+</tr>
+
-<tr>
-  <td colspan="2"><br><h6><input name="Submit" type="submit" value="<?php echo _("Submit Changes")?>" tabindex="<?php echo ++$tabindex;?>"></h6></td>