Changeset 3944

Show
Ignore:
Timestamp:
04/27/07 12:23:59 (6 years ago)
Author:
p_lindheimer
Message:

Merged revisions 3943 via svnmerge from
https://amportal.svn.sourceforge.net/svnroot/amportal/modules/branches/2.2

........

r3943 | p_lindheimer | 2007-04-27 09:21:42 -0700 (Fri, 27 Apr 2007) | 1 line


make sure t ext getting put in (for some reason it wasn't always, this shoudl fix it)

........

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 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
  • modules/branches/2.3/ivr/functions.inc.php

    r3888 r3944  
    165165                    // Actually add the IVR commands now. 
    166166          $dests = ivr_get_dests($item['ivr_id']); 
     167          $timeout=false; 
     168          $invalid=false; 
     169          $addloop=false; 
    167170          if (!empty($dests)) { 
    168171            foreach($dests as $dest) { 
     
    187190          } 
    188191          // Apply invalid if required 
    189           if (!isset($invalid) || !$invalid) { 
     192          if (!$invalid) { 
    190193            $ext->add($id, 'i', '', new ext_playback('invalid')); 
    191194            $ext->add($id, 'i', '', new ext_goto('loop,1')); 
    192195            $addloop=true; 
    193196          } 
    194           if (!isset($timeout) || !$timeout) { 
     197          if (!$timeout) { 
    195198            $ext->add($id, 't', '', new ext_goto('loop,1')); 
    196199            $addloop=true; 
    197200          } 
    198           if (isset($addloop) && $addloop) { 
     201          if ($addloop) { 
    199202            $ext->add($id, 'loop', '', new ext_setvar('LOOPCOUNT','$[${LOOPCOUNT} + 1]'));   
    200203            $ext->add($id, 'loop', '', new ext_gotoif('$[${LOOPCOUNT} > 2]','hang,1')); 
  • modules/branches/2.3/ivr/module.xml

    r3890 r3944  
    22  <rawname>ivr</rawname> 
    33  <name>IVR</name> 
    4   <version>2.5.13</version> 
     4  <version>2.5.13.1</version> 
    55  <type>setup</type> 
    66  <category>Inbound Call Control</category> 
     
    99  </description> 
    1010  <changelog> 
     11    *2.5.13.1* make sure t ext getting put in (for some reason it wasn't always, this shoudl fix it) 
    1112    *2.5.13* #1871 't' extension not being created by default fixed 
    1213    *2.5.12* skip the answer/wait(1) if channel is already answered