Changeset 5278

Show
Ignore:
Timestamp:
11/25/07 03:04:14 (6 years ago)
Author:
p_lindheimer
Message:

added annoucement_getdest() and announcement_getdestinfo() and modified announcement_get to return assoc info, added destination usage feedback to gui

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.4/announcement/functions.inc.php

    r5253 r5278  
    88  } 
    99  return $extens; 
     10} 
     11 
     12function announcement_getdest($exten) { 
     13  return array('app-announcement-'.$exten.',s,1'); 
     14} 
     15 
     16function announcement_getdestinfo($dest) { 
     17  global $active_modules; 
     18 
     19  if (substr(trim($dest),0,17) == 'app-announcement-') { 
     20    $exten = explode(',',$dest); 
     21    $exten = substr($exten[0],17); 
     22 
     23    $thisexten = announcement_get($exten); 
     24    if (empty($thisexten)) { 
     25      return array(); 
     26    } else { 
     27      $type = isset($active_modules['announcement']['type'])?$active_modules['announcement']['type']:'setup'; 
     28      return array('description' => 'Annoucement : '.$thisexten['description'], 
     29                   'edit_url' => 'config.php?display=announcement&type='.$type.'&extdisplay='.urlencode($exten), 
     30                  ); 
     31    } 
     32  } else { 
     33    return false; 
     34  } 
    1035} 
    1136 
    …… 
    7297function announcement_get($announcement_id) { 
    7398  global $db; 
    74   $sql = "SELECT announcement_id, description, recording, allow_skip, post_dest, return_ivr, noanswer, repeat_msg FROM announcement WHERE announcement_id = ".addslashes($announcement_id); 
    75   $row = $db->getRow($sql); 
     99  $sql = "SELECT announcement_id, description, recording, allow_skip, post_dest, return_ivr, noanswer, repeat_msg FROM announcement WHERE announcement_id = '".addslashes($announcement_id)."'"; 
     100  $row = $db->getRow($sql,DB_FETCHMODE_ASSOC); 
    76101  if(DB::IsError($row)) { 
    77102    die_freepbx($row->getMessage()."<br><br>Errpr selecting row from announcement");   
     103  } 
     104  // Added Associative query above but put positional indexes back to maintain backward compatibility 
     105  // 
     106  $i = 0; 
     107  foreach ($row as $item) { 
     108    $row[$i] = $item; 
     109    $i++; 
    78110  } 
    79111  return $row; 

  • modules/branches/2.4/announcement/page.announcement.php

    r4650 r5278  
    160160       
    161161      </tr> 
     162      <?php 
     163 
     164      if ($extdisplay) { 
     165        $usage_list = framework_display_destination_usage(announcement_getdest($extdisplay)); 
     166        if (!empty($usage_list)) { 
     167        ?> 
     168          <tr><td colspan="2"> 
     169          <a href="#" class="info"><?php echo $usage_list['text']?>:<span><?php echo $usage_list['tooltip']?></span></a> 
     170          </td></tr> 
     171        <?php 
     172        } 
     173      } 
     174      ?> 
    162175      </table> 
    163176      </form>