Changeset 6603

Show
Ignore:
Timestamp:
09/07/08 19:58:31 (5 years ago)
Author:
mbrevda
Message:

add 'n' option to queues - fail on timeout, closes #3147

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.5/queues/functions.inc.php

    r6527 r6603  
    301301          if ($q['rtone'] == 1) 
    302302            $options .= 'r'; 
     303          if ($q['retry'] == none){ 
     304             $options .= 'n'; 
     305             } 
    303306          if (isset($q['music'])) { 
    304307            $ext->add('ext-queues', $exten, '', new ext_setvar('__MOHCLASS', $q['music'])); 

  • modules/branches/2.5/queues/page.queues.php

    r6447 r6603  
    451451      <?php 
    452452        $default = (isset($timeout) ? $timeout : 15); 
    453         echo '<option value="0" '.(0 == $default ? 'SELECTED' : '').'>'."Unlimited".'</option>'; 
     453        echo '<option value="0" '.(0 == $default ? 'SELECTED' : '').'>'._("Unlimited").'</option>'; 
    454454        for ($i=1; $i <= 60; $i++) { 
    455455          echo '<option value="'.$i.'" '.($i == $default ? 'SELECTED' : '').'>'.queues_timeString($i,true).'</option>'; 
    …… 
    461461 
    462462  <tr> 
    463     <td><a href="#" class="info"><?php echo _("Retry:")?><span><?php echo _("The number of seconds we wait before trying all the phones again")?></span></a></td> 
     463    <td><a href="#" class="info"><?php echo _("Retry:")?><span><?php echo _("The number of seconds we wait before trying all the phones again. Select none to dissable retying and to go straight to the fail over destination")?></span></a></td> 
    464464    <td> 
    465465      <select name="retry" tabindex="<?php echo ++$tabindex;?>"> 
    466      <?php 
     466      <?php 
    467467        $default = (isset($retry) ? $retry : 5); 
    468         for ($i=0; $i <= 20; $i++) { 
     468        echo '<option value="none" '.($default == "none" ? 'SELECTED' : '').'>'._("None").'</option>'; 
     469        for ($i=1; $i <= 20; $i++) { 
    469470          echo '<option value="'.$i.'" '.($i == $default ? 'SELECTED' : '').'>'.queues_timeString($i,true).'</option>'; 
    470471        }