Changeset 5729

Show
Ignore:
Timestamp:
03/10/08 18:07:02 (10 months ago)
Author:
p_lindheimer
Message:

Merged revisions 5727 via svnmerge from
http://svn.freepbx.org/modules/branches/2.4

........

r5727 | p_lindheimer | 2008-03-10 18:03:28 -0700 (Mon, 10 Mar 2008) | 1 line


#2731 fix press 0 for operator in directory

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.3

    • Property svnmerge-integrated changed from /modules/branches/2.2:1-3588,3615-3635,3637-3638,3640,3674,3680,3686,3692,3702,3706,3710,3716,3758,3760,3762-3765,3767-3785,3787-3789,3801,3810,3828,3831,3839,3860,3866,3875,3877,3887,3899,3911,3913,3943,3982-3983,3990,3998,4007,4022-4023,4089,4092,4098,4265,4285 /modules/branches/2.4:1-5079,5090,5093,5097-5118,5120-5170,5172,5174,5176-5182,5184-5199,5202-5203,5205-5211,5239,5271-5272,5312,5383,5516,5544,5572,5606-5608,5615,5644,5651,5712-5713 to /modules/branches/2.2:1-3588,3615-3635,3637-3638,3640,3674,3680,3686,3692,3702,3706,3710,3716,3758,3760,3762-3765,3767-3785,3787-3789,3801,3810,3828,3831,3839,3860,3866,3875,3877,3887,3899,3911,3913,3943,3982-3983,3990,3998,4007,4022-4023,4089,4092,4098,4265,4285 /modules/branches/2.4:1-5079,5090,5093,5097-5118,5120-5170,5172,5174,5176-5182,5184-5199,5202-5203,5205-5211,5239,5271-5272,5312,5383,5516,5544,5572,5606-5608,5615,5644,5651,5712-5713,5727

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

    r4610 r5729  
    3333        global $db; 
    3434 
     35        $oxtn = $db->getOne("SELECT value from globals where variable='OPERATOR_XTN'"); //this needs to be here! 
     36 
    3537        $id = "app-directory"; // The context to be included. This must be unique. 
    3638 
    …… 
    4042        $ext->add($id, $c, '', new ext_answer('')); 
    4143        $ext->add($id, $c, '', new ext_wait('1')); // $cmd,1,Wait(1) 
    42         $ext->add($id, $c, '', new ext_agi('directory,${DIR-CONTEXT},from-did-direct,${DIRECTORY:0:1}${DIRECTORY_OPTS}'.(!empty($oxtn) ? 'o' : '') )); // AGI 
     44        $ext->add($id, $c, '', new ext_agi('directory,${DIR-CONTEXT},from-did-direct,${DIRECTORY:0:1}${DIRECTORY_OPTS}'.($oxtn != '' ? 'o' : '') )); 
    4345        $ext->add($id, $c, '', new ext_playback('vm-goodbye')); // $cmd,n,Playback(vm-goodbye) 
    4446        $ext->add($id, $c, '', new ext_hangup('')); // hangup 
    45         $oxtn = $db->getOne("SELECT value from globals where variable='OPERATOR_XTN'"); 
    4647        if ($oxtn != '') { 
    4748                $ext->add($id, 'o', '', new ext_goto('from-internal,${OPERATOR_XTN},1'));  

  • modules/branches/2.3/infoservices/module.xml

    r4934 r5729  
    22        <rawname>infoservices</rawname> 
    33        <name>Info Services</name> 
    4         <version>1.3.5.1</version> 
     4        <version>1.3.5.3</version> 
    55        <candisable>no</candisable> 
    66        <canuninstall>no</canuninstall> 
    …… 
    99        <description>Provides a number of applications accessable by feature codes: company directory, call trace (last call information), echo test, speaking clock, and speak current extension number.</description> 
    1010        <changelog> 
     11                *1.3.5.3* #2731 fix press 0 for operator in directory 
    1112                *1.3.5.2* changed categories 
    1213                *1.3.5.1* bump for rc1