Changeset 8644

Timestamp:

01/20/10 14:03:07 (3 years ago)

Author:

mickecarlsson

Message:

Re #3805 clean up leftovers and fix typos

Files:

• modules/branches/2.7/core/functions.inc.php (modified) (2 diffs)
• modules/branches/2.7/outroutemsg/page.outroutemsg.php (modified) (4 diffs)

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

@@ -1808 +1808 @@
-      $ext->add($context, $exten, '', new ext_noop('Dial failed due to trunk reporting Address Incomplete - giving up'));
-      $ext->add($context, $exten, '', new ext_progress());
-unalloc
+invalidnmbr
-                          case DEFAULT_MSG:
-                        $ext->add($context, $exten, '', new ext_playback('ss-noservice,noanswer'));
@@ -1816 +1816 @@
-                                break;
-                          default:
-unalloc
+invalidnmbr
-                                $message = ($message != "") ? $message : "ss-noservice";
-                                $ext->add($context, $exten, '', new ext_playback("$message, noanswer"));

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

@@ -30 +30 @@
-  $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;  
-
-
-
-
-
-
+
+
-
-  if ($action == 'submit') {
-unalloc_msg_id, $no_transit_msg_id, $no_route_msg_id, $ch_unaccept_msg_id, $call_reject_msg_id, $nmbr_chngd
+invalidnmbr_msg_id, $unalloc
-    needreload();
-  }
@@ -55 +51 @@
-  $emergency_msg_id    = $outroutemsg_settings['emergency_msg_id'];
-  $no_answer_msg_id    = $outroutemsg_settings['no_answer_msg_id'];
+  $invalidnmbr_msg_id  = $outroutemsg_settings['invalidnmbr_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'];  
-}
-
@@ -147 +139 @@
-  <td><a href="#" class="info"><?php echo _("Message or Tone")?><span><?php echo _("Message or tone to be played if trunk reports Number or Address Incomplete. Usually this means that the number you have dialed is to short. Default message is:<br>\"The number you have dialed is not in service. Please check the number and try again.\"<br>Hangupcause is 28")?></span></a></td>
-  <td align=right>
-unalloc_msg_id" id="unalloc
+invalidnmbr_msg_id" id="invalidnmbr
-    <?php
-      echo '<option value="'.DEFAULT_MSG.'"'.(DEFAULT_MSG == $invalidnmbr_msg_id ? ' SELECTED' : '').'>'._("Default Message")."</option>\n";
@@ -165 +157 @@
-  <td><a href="#" class="info"><?php echo _("Message or Tone")?><span><?php echo _("Message or tone to be played if trunk reports Unallocated Number. Usually this means that the number dialed does not exist. Default message is:<br>\"The number you have dialed is not in service. Please check the number and try again.\"<br>Hangupcause is 1")?></span></a></td>
-  <td align=right>
-no_transit_msg_id" id="no_transit
+unalloc_msg_id" id="unalloc
-    <?php
-      echo '<option value="'.DEFAULT_MSG.'"'.(DEFAULT_MSG == $unalloc_msg_id ? ' SELECTED' : '').'>'._("Default Message")."</option>\n";