Changeset 4375

Show
Ignore:
Timestamp:
07/12/07 12:00:47 (1 year ago)
Author:
p_lindheimer
Message:

core destinations now separated into extensions, voicemail and Terminate Call cateogries, needs beta2 so don't publish until beta2 is added

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.3/core/functions.inc.php

    r4360 r4375  
    66        //static destinations 
    77        $extens = array(); 
    8         $extens[] = array('destination' => 'app-blackhole,hangup,1', 'description' => 'Hangup'); 
    9         $extens[] = array('destination' => 'app-blackhole,congestion,1', 'description' => 'Congestion'); 
    10         $extens[] = array('destination' => 'app-blackhole,busy,1', 'description' => 'Busy'); 
    11         $extens[] = array('destination' => 'app-blackhole,zapateller,1', 'description' => 'Play SIT Tone (Zapateller)'); 
    12         $extens[] = array('destination' => 'app-blackhole,musiconhold,1', 'description' => 'Put caller on hold forever'); 
     8        $category = 'Terminate Call'; 
     9        $extens[] = array('destination' => 'app-blackhole,hangup,1', 'description' => 'Hangup', 'category' => $category); 
     10        $extens[] = array('destination' => 'app-blackhole,congestion,1', 'description' => 'Congestion', 'category' => $category); 
     11        $extens[] = array('destination' => 'app-blackhole,busy,1', 'description' => 'Busy', 'category' => $category); 
     12        $extens[] = array('destination' => 'app-blackhole,zapateller,1', 'description' => 'Play SIT Tone (Zapateller)', 'category' => $category); 
     13        $extens[] = array('destination' => 'app-blackhole,musiconhold,1', 'description' => 'Put caller on hold forever', 'category' => $category); 
    1314         
    1415        //get the list of meetmes 
    …… 
    3637        if (isset($results)) { 
    3738                foreach($results as $result) { 
    38                         $extens[] = array('destination' => 'from-did-direct,'.$result['0'].',1', 'description' => $result['1'].' <'.$result['0'].'>'); 
    39  
     39                        $extens[] = array('destination' => 'from-did-direct,'.$result['0'].',1', 'description' => ' <'.$result['0'].'> '.$result['1'], 'category' => 'Extensions'); 
    4040                        if(isset($vmboxes[$result['0']])) { 
    41                                 $extens[] = array('destination' => 'ext-local,${VM_PREFIX}'.$result['0'].',1', 'description' => 'voicemail box '.$result['0']); 
     41                                $extens[] = array('destination' => 'ext-local,vmb'.$result['0'].',1', 'description' => '<'.$result[0].'> '.$result[1].' (busy)', 'category' => 'Voicemail'); 
     42                                $extens[] = array('destination' => 'ext-local,vmu'.$result['0'].',1', 'description' => '<'.$result[0].'> '.$result[1].' (unavail)', 'category' => 'Voicemail'); 
    4243                        } 
    4344                } 
    …… 
    382383                                                $ext->add('ext-local', '${VM_PREFIX}'.$exten['extension'], '', new ext_macro('vm',"$vm,DIRECTDIAL")); 
    383384                                                $ext->add('ext-local', '${VM_PREFIX}'.$exten['extension'], '', new ext_hangup('')); 
     385                                                $ext->add('ext-local', 'vmb'.$exten['extension'], '', new ext_macro('vm',"$vm,BUSY")); 
     386                                                $ext->add('ext-local', 'vmb'.$exten['extension'], '', new ext_hangup('')); 
     387                                                $ext->add('ext-local', 'vmu'.$exten['extension'], '', new ext_macro('vm',"$vm,NOANSWER")); 
     388                                                $ext->add('ext-local', 'vmu'.$exten['extension'], '', new ext_hangup('')); 
    384389                                        } 
    385390