Changeset 3711
- Timestamp:
- 02/06/07 02:03:44 (6 years ago)
- Files:
-
- modules/branches/2.3 (modified) (1 prop)
- modules/branches/2.3/announcement/functions.inc.php (modified) (2 diffs)
- modules/branches/2.3/announcement/module.xml (modified) (1 diff)
- modules/branches/2.3/ivr/functions.inc.php (modified) (3 diffs)
- modules/branches/2.3/ivr/module.xml (modified) (2 diffs)
- modules/branches/2.3/ivr/page.ivr.php (modified) (1 diff)
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 to /modules/branches/2.2:1-3588,3615-3635,3637-3638,3640,3674,3680,3686,3692,3702,3706,3710
modules/branches/2.3/announcement/functions.inc.php
r3703 r3711 25 25 $ext->add('app-announcement-'.$row[0], '_X', '', new ext_noop('User skipped announcement')); 26 26 if ($row[5]) { 27 $ext->add('app-announcement-'.$row[0], '_X', '', new ext_gotoif('$["x${IVR_CONTEXT}" = "x"]', $row[4].':${IVR_CONTEXT}, s,1'));27 $ext->add('app-announcement-'.$row[0], '_X', '', new ext_gotoif('$["x${IVR_CONTEXT}" = "x"]', $row[4].':${IVR_CONTEXT},return,1')); 28 28 } else { 29 29 $ext->add('app-announcement-'.$row[0], '_X', '', new ext_goto($row[4])); … … 34 34 35 35 if ($row[5]) { 36 $ext->add('app-announcement-'.$row[0], 's', '', new ext_gotoif('$["x${IVR_CONTEXT}" = "x"]', $row[4].':${IVR_CONTEXT}, s,1'));36 $ext->add('app-announcement-'.$row[0], 's', '', new ext_gotoif('$["x${IVR_CONTEXT}" = "x"]', $row[4].':${IVR_CONTEXT},return,1')); 37 37 } else { 38 38 $ext->add('app-announcement-'.$row[0], 's', '', new ext_goto($row[4])); modules/branches/2.3/announcement/module.xml
r3705 r3711 2 2 <rawname>announcement</rawname> 3 3 <name>Announcements</name> 4 <version>0. 4</version>4 <version>0.5</version> 5 5 <changelog> 6 *0.5* chaned to jump to ivr's return context 6 7 *0.4* Added Don't Answer option to not answer the channel (and playback early media if supported) 7 8 *0.3* Added support to return to calling IVR modules/branches/2.3/ivr/functions.inc.php
r3707 r3711 149 149 $ext->add($id, 's', '', new ext_setvar('LOOPCOUNT', 0)); 150 150 $ext->add($id, 's', '', new ext_setvar('__DIR-CONTEXT', $details['dircontext'])); 151 $ext->add($id, 's', '', new ext_setvar(' IVR_CONTEXT_${CONTEXT}', '${IVR_CONTEXT}'));151 $ext->add($id, 's', '', new ext_setvar('_IVR_CONTEXT_${CONTEXT}', '${IVR_CONTEXT}')); 152 152 $ext->add($id, 's', '', new ext_setvar('_IVR_CONTEXT', '${CONTEXT}')); 153 153 $ext->add($id, 's', '', new ext_answer('')); … … 171 171 $ext->add($id, $dest['selection'],'', new ext_setvar('__NODEST', '')); 172 172 if ($dest['ivr_ret']) { 173 $ext->add($id, $dest['selection'],'', new ext_gotoif('$["x${IVR_CONTEXT_${CONTEXT}}" = "x"]', $dest['dest'].':${IVR_CONTEXT_${CONTEXT}}, s,1'));173 $ext->add($id, $dest['selection'],'', new ext_gotoif('$["x${IVR_CONTEXT_${CONTEXT}}" = "x"]', $dest['dest'].':${IVR_CONTEXT_${CONTEXT}},return,1')); 174 174 } else { 175 175 $ext->add($id, $dest['selection'],'', new ext_goto($dest['dest'])); … … 191 191 $ext->add($id, 'loop', '', new ext_gotoif('$[${LOOPCOUNT} > 2]','hang,1')); 192 192 $ext->add($id, 'loop', '', new ext_goto($id.',s,begin')); 193 $ext->add($id, 'return', '', new ext_goto($id.',s,begin')); 193 194 } 194 195 $ext->add($id, 'fax', '', new ext_goto('ext-fax,in_fax,1')); modules/branches/2.3/ivr/module.xml
r3709 r3711 2 2 <rawname>ivr</rawname> 3 3 <name>IVR</name> 4 <version>2.5. 7</version>4 <version>2.5.8</version> 5 5 <type>setup</type> 6 6 <category>Inbound Call Control</category> … … 9 9 </description> 10 10 <changelog> 11 *2.5.8* insert a return extension so that annoucements and ivrs returning don't trample back over the top 11 12 *2.5.7* extended schema and added ability to have ivr options to return to calling parent ivrs if appropriate, otherwise specified destination 12 13 *2.5.6* Added: Set(IVR_CONTEXT=${CONTEXT}) to facilitate simple returns to calling context (e.g. from an announcement or custom app) modules/branches/2.3/ivr/page.ivr.php
r3707 r3711 278 278 <tr> <td style="text-align:right;"> 279 279 280 <small><a href="#" class="info"><?php echo _("Return to IVR")?><span><?php echo _("Check this box to have this option return to a parent IVR if it was called from a parent IVR. If not, it will go to the chosen destination.<br><br>The return path will be to any IVR that was in the call path prior to this IVR which could lead to strange results if there was an IVR called in the call path but not immediately before this")?></span></a></small><input type="checkbox" name="ivr_ret<?php echo $count ?>" "<?php echo $ivr_ret?'CHECKED':''; ?>"<br />280 <small><a href="#" class="info"><?php echo _("Return to IVR")?><span><?php echo _("Check this box to have this option return to a parent IVR if it was called from a parent IVR. If not, it will go to the chosen destination.<br><br>The return path will be to any IVR that was in the call path prior to this IVR which could lead to strange results if there was an IVR called in the call path but not immediately before this")?></span></a></small><input type="checkbox" name="ivr_ret<?php echo $count ?>" "<?php echo $ivr_ret?'CHECKED':''; ?>"<br><br /> 281 281 <input size="2" type="text" name="option<?php echo $count ?>" value="<?php echo $sel ?>"><br /> 282 282 <?php if (strlen($sel)) { ?>
