Changeset 12263

Show
Ignore:
Timestamp:
06/23/11 16:44:21 (2 years ago)
Author:
mbrevda
Message:

re #5170 - update to work with queues

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r11823 r12263  
    924924  $results = sql($sql, "getAll",DB_FETCHMODE_ASSOC); 
    925925 
    926   if (function_exists('ivr_list')) { 
    927     $ivr_details = ivr_list(); 
     926  if (function_exists('ivr_get_details')) { 
     927    $ivr_details = ivr_get_details(); 
    928928    foreach ($ivr_details as $item) { 
    929       $ivr_hash[$item['ivr_id']] = $item; 
     929      $ivr_hash[$item['id']] = $item; 
    930930    } 
    931931    $check_ivr = true; 

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

    r11957 r12263  
    974974  <tr><td colspan="2"><br><h5><?php echo _("Periodic Announcements")?><hr></h5></td></tr> 
    975975   
    976 <?php if(function_exists('ivr_list')) { //only include if IVR module is enabled ?> 
     976<?php if(function_exists('ivr_get_details')) { //only include if IVR module is enabled ?> 
    977977  <tr> 
    978978    <td><a href="#" class="info"><?php echo _("IVR Break Out Menu:")?><span> <?php echo _("You can optionally present an existing IVR as a 'break out' menu.<br><br>This IVR must only contain single-digit 'dialed options'. The Recording set for the IVR will be played at intervals specified in 'Repeat Frequency', below.")?></span></a></td> 
    …… 
    987987      // 
    988988      // If a previous bogus IVR was listed, we will leave it in with an error but will no longer show such IVRs as valid options. 
    989       $unique_aas = ivr_list();    
     989      $unique_aas = ivr_get_details();     
    990990       
    991991      $compound_recordings = false; 
    …… 
    993993      if (isset($unique_aas)) { 
    994994        foreach ($unique_aas as $unique_aa) { 
    995           $menu_id = $unique_aa['ivr_id']; 
    996           $menu_name = $unique_aa['displayname']; 
    997  
    998           $unique_aa['announcement'] = recordings_get_file($unique_aa['announcement_id']); 
     995          $menu_id = $unique_aa['id']; 
     996          $menu_name = $unique_aa['name'] ? $unique_aa['name'] : 'IVR ' . $unique_aa['id']; 
     997 
     998          $unique_aa['announcement'] = recordings_get_file($unique_aa['announcement']); 
    999999          if (strpos($unique_aa['announcement'],"&") === false) { 
    10001000            echo '<option value="'.$menu_id.'" '.($default == $menu_id ? 'SELECTED' : '').'>'.($menu_name ? $menu_name : _("Menu ID ").$menu_id)."</option>\n";