Changeset 7860

Show
Ignore:
Timestamp:
06/23/09 12:51:24 (1 year ago)
Author:
p_lindheimer
Message:

Merged revisions 7858-7859 via svnmerge from
http://svn.freepbx.org/modules/branches/2.5

........

r7858 | p_lindheimer | 2009-06-23 10:15:37 -0700 (Tue, 23 Jun 2009) | 1 line


fixes #3734 set FORWARD_CONTEXT before paging to block client side CF

........

r7859 | p_lindheimer | 2009-06-23 12:40:39 -0700 (Tue, 23 Jun 2009) | 1 line


ref #3732 missing enclosing ()

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.4

    • Property svnmerge-integrated changed from /modules/branches/2.3:1-5233,5245,5333,5336 /modules/branches/2.5:1-5852,5880,5930,5995,6016-6017,6030-6031,6142,6218,6291,6361,6363,6413-6414,6422,6428-6430,6442-6443,6557,6710,6714-6715,6969-6970,6984,7248,7281 to /modules/branches/2.3:1-5233,5245,5333,5336 /modules/branches/2.5:1-5852,5880,5930,5995,6016-6017,6030-6031,6142,6218,6291,6361,6363,6413-6414,6422,6428-6430,6442-6443,6557,6710,6714-6715,6969-6970,6984,7248,7281,7858-7859

  • modules/branches/2.4/ivr/module.xml

    r5825 r7860  
    22        <rawname>ivr</rawname> 
    33        <name>IVR</name> 
    4         <version>2.5.17</version> 
     4        <version>2.5.18</version> 
    55        <type>setup</type> 
    66        <category>Inbound Call Control</category> 
    …… 
    99        </description> 
    1010        <changelog> 
     11                *2.5.18* #3732 don't include zonemessages in directory options 
    1112                *2.5.17* #2858 Better handing of i and t options, added loop count and ability to loop before going to user defined i, t options 
    1213                *2.5.16.3* #2604, #2843 fix mal-formed html tags, Russian Translation 

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

    r7854 r7860  
    147147                                        $vmcontexts = array_keys($tresults); 
    148148                                        foreach ($vmcontexts as $vmc) { 
    149                                                 if ($vmc != 'general') && ($vmc != 'zonemessages)  
     149                                                if (($vmc != 'general') && ($vmc != 'zonemessages')) { 
    150150                                                        echo '<option value="'.$vmc.'"'.($vmc == $ivr_details['dircontext'] ? ' SELECTED' : '').'>'.$vmc."</option>\n"; 
    151                                                 } 
     151            } 
     152                                        } 
    152153                                        ?> 
    153154                                </select> 

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

    r5383 r7860  
    281281                                // make AMPUSER inherited here, so we can skip the proper 'self' if using cidnum masquerading 
    282282                                $ext->add($extpaging, $grp, '', new ext_setvar('_AMPUSER', '${AMPUSER}')); 
     283                                $ext->add($extpaging, $grp, '', new ext_setvar('_FORWARD_CONTEXT', 'block-cf')); 
    283284                                $ext->add($extpaging, $grp, '', new ext_page($dialstr)); 
    284285                        } 

  • modules/branches/2.4/paging/module.xml

    r5805 r7860  
    22        <rawname>paging</rawname> 
    33        <name>Paging and Intercom</name> 
    4         <version>2.4.0.5</version> 
     4        <version>2.4.0.6</version> 
    55        <type>setup</type> 
    66        <category>Internal Options &amp; Configuration</category> 
    77        <changelog> 
     8                *2.4.0.6* #3734 block client side CF on page 
    89                *2.4.0.5* #1939, #2843 Mitel Phone Support, Russian Translation, oldstyle module hooks added 
    910                *2.4.0.4* #2758 don't show intercom instructions when disabled, bogus codes were displayed