Changeset 12013

Show
Ignore:
Timestamp:
04/18/11 12:06:13 (2 years ago)
Author:
mickecarlsson
Message:

Re #5055 removed stray code

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • modules/branches/2.9/outroutemsg/functions.inc.php

    r8842 r12013  
    9191} 
    9292 
    93 function outroutemsg_add($default_msg_id, $intracompany_msg_id, $emergency_msg_id, $no_answer_msg_id, $invalidnmbr_msg_id, $unalloc_msg_id) { 
     93function outroutemsg_add($default_msg_id, $intracompany_msg_id, $emergency_msg_id, $no_answer_msg_id, $invalidnmbr_msg_id) { 
    9494  global $db; 
    9595 
     
    9999  $no_answer_msg_id    = $db->escapeSimple($no_answer_msg_id); 
    100100  $invalidnmbr_msg_id  = $db->escapeSimple($invalidnmbr_msg_id); 
    101   $unalloc_msg_id      = $db->escapeSimple($unalloc_msg_id); 
    102101   
    103102  // in future will do in a outroutemsg_del but not needed for now 
    104103  // 
    105   $sql = "DELETE FROM outroutemsg WHERE `keyword` IN  ('default_msg_id', 'intracompany_msg_id', 'emergency_msg_id', 'no_answer_msg_id', 'invalidnmbr_msg_id', 'unalloc_msg_id')"; 
     104  $sql = "DELETE FROM outroutemsg WHERE `keyword` IN  ('default_msg_id', 'intracompany_msg_id', 'emergency_msg_id', 'no_answer_msg_id', 'invalidnmbr_msg_id')"; 
    106105  $result = $db->query($sql); 
    107106  if(DB::IsError($result)) { 
     
    115114    array('no_answer_msg_id', "$no_answer_msg_id"), 
    116115    array('invalidnmbr_msg_id', "$invalidnmbr_msg_id"), 
    117     array('unalloc_msg_id', "$unalloc_msg_id"), 
    118116    ); 
    119117 
     
    137135  $results['no_answer_msg_id']    = isset($results['no_answer_msg_id'])    ? $results['no_answer_msg_id']    : DEFAULT_MSG; 
    138136  $results['invalidnmbr_msg_id']  = isset($results['invalidnmbr_msg_id'])  ? $results['invalidnmbr_msg_id']  : DEFAULT_MSG; 
    139   $results['unalloc_msg_id']      = isset($results['unalloc_msg_id'])      ? $results['unalloc_msg_id']      : DEFAULT_MSG; 
    140137  return $results; 
    141138} 
  • modules/branches/2.9/outroutemsg/page.outroutemsg.php

    r8644 r12013  
    3131  $no_answer_msg_id    = isset($_REQUEST['no_answer_msg_id'])    ? trim($_REQUEST['no_answer_msg_id'])    : DEFAULT_MSG;   
    3232  $invalidnmbr_msg_id  = isset($_REQUEST['invalidnmbr_msg_id'])  ? trim($_REQUEST['invalidnmbr_msg_id'])  : DEFAULT_MSG; 
    33   $unalloc_msg_id      = isset($_REQUEST['unalloc_msg_id'])      ? trim($_REQUEST['unalloc_msg_id'])      : DEFAULT_MSG;   
    3433 
    3534  if ($action == 'submit') { 
    36     outroutemsg_add($default_msg_id, $intracompany_msg_id, $emergency_msg_id, $no_answer_msg_id, $invalidnmbr_msg_id, $unalloc_msg_id); 
     35    outroutemsg_add($default_msg_id, $intracompany_msg_id, $emergency_msg_id, $no_answer_msg_id, $invalidnmbr_msg_id); 
    3736    needreload(); 
    3837  } 
     
    5251  $no_answer_msg_id    = $outroutemsg_settings['no_answer_msg_id']; 
    5352  $invalidnmbr_msg_id  = $outroutemsg_settings['invalidnmbr_msg_id']; 
    54   $unalloc_msg_id      = $outroutemsg_settings['unalloc_msg_id']; 
    5553} 
    5654 
     
    153151</tr> 
    154152 
    155 <tr><td colspan="2"><h5><?php echo _("Unallocated Number")?><hr></h5></td></tr> 
    156 <tr> 
    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> 
    158   <td align=right> 
    159     <select name="unalloc_msg_id" id="unalloc_msg_id" tabindex="<?php echo ++$tabindex;?>"> 
    160     <?php 
    161       echo '<option value="'.DEFAULT_MSG.'"'.(DEFAULT_MSG == $unalloc_msg_id ? ' SELECTED' : '').'>'._("Default Message")."</option>\n"; 
    162       echo '<option value="'.CONGESTION_TONE.'"'.(CONGESTION_TONE == $unalloc_msg_id ? ' SELECTED' : '').'>'._("Congestion Tones")."</option>\n"; 
    163       if (isset($tresults[0])) { 
    164         foreach ($tresults as $tresult) { 
    165           echo '<option value="'.$tresult['id'].'"'.($tresult['id'] == $unalloc_msg_id ? ' SELECTED' : '').'>'.$tresult['displayname']."</option>\n"; 
    166         } 
    167       } 
    168     ?> 
    169     </select> 
    170   </td> 
    171 </tr> 
    172  
    173153<tr> 
    174154  <td colspan="2"><br><h6><input name="Submit" type="submit" value="<?php echo _("Submit Changes")?>" tabindex="<?php echo ++$tabindex;?>"></h6></td>