Changeset 10254

Show
Ignore:
Timestamp:
09/13/10 15:31:48 (3 years ago)
Author:
p_lindheimer
Message:

Merged revisions 10253 via svnmerge from
http://svn.freepbx.org/modules/branches/2.7

........

r10253 | p_lindheimer | 2010-09-13 12:26:40 -0700 (Mon, 13 Sep 2010) | 1 line


fixes #4537 use TRUNK_OPTIONS on the DISA call, in case transfer and other options are enabled

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.8

    • Property svnmerge-integrated changed from /modules/branches/2.7:1-9074,9105,10001 /modules/branches/2.9:1-10122 to /modules/branches/2.7:1-9074,9105,10001,10253 /modules/branches/2.9:1-10122

  • modules/branches/2.8/disa/functions.inc.php

    r7647 r10254  
    9898        $ext->add('disa', $item['disa_id'], '', new ext_setvar('_KEEPCID', 'TRUE'));  
    9999        if ($thisitem['hangup'] == 'CHECKED') { 
    100           $ext->add('disa', $item['disa_id'], '', new ext_setvar('_HANGUP', 'Hg')); 
    101         } 
     100          $ext->add('disa', $item['disa_id'], '', new ext_setvar('_HANGUP', '${TRUNK_OPTIONS}Hg')); 
     101        } else { 
     102          $ext->add('disa', $item['disa_id'], '', new ext_setvar('_HANGUP', '${TRUNK_OPTIONS}')); 
     103        } 
    102104        $ext->add('disa', $item['disa_id'], '', new ext_setvar('TIMEOUT(digit)', $thisitem['digittimeout'])); 
    103105        $ext->add('disa', $item['disa_id'], '', new ext_setvar('TIMEOUT(response)', $thisitem['resptimeout'])); 

  • modules/branches/2.8/disa/module.xml

    r10080 r10254  
    22  <rawname>disa</rawname> 
    33  <name>DISA</name> 
    4   <version>2.8.0.0</version> 
     4  <version>2.8.0.1</version> 
    55  <publisher>FreePBX</publisher> 
    66  <license>GPLv2+</license> 
    …… 
    1212  <description>DISA Allows you 'Direct Inward System Access'. This gives you the ability to have an option on an IVR that gives you a dial tone, and you're able to dial out from the FreePBX machine as if you were connected to a standard extension. It appears as a Destination.</description> 
    1313  <changelog> 
     14    *2.8.0.1* #4537 
    1415    *2.8.0.0* published 2.8 version 
    1516    *2.7.0.0* spelling errors, localization