Changeset 3710

Show
Ignore:
Timestamp:
02/06/07 02:02:59 (6 years ago)
Author:
p_lindheimer
Message:

added a return target to keep from saved info being overwritten, and have ivr and announcement modules go to that target

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.2/announcement/functions.inc.php

    r3702 r3710  
    2525          $ext->add('app-announcement-'.$row[0], '_X', '', new ext_noop('User skipped announcement')); 
    2626          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')); 
    2828          } else { 
    2929            $ext->add('app-announcement-'.$row[0], '_X', '', new ext_goto($row[4])); 
    …… 
    3434 
    3535        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')); 
    3737        } else { 
    3838          $ext->add('app-announcement-'.$row[0], 's', '', new ext_goto($row[4])); 

  • modules/branches/2.2/announcement/module.xml

    r3704 r3710  
    22  <rawname>announcement</rawname> 
    33  <name>Announcements</name> 
    4   <version>0.4</version> 
     4  <version>0.5</version> 
    55  <changelog> 
     6    *0.5* chaned to jump to ivr's return context 
    67    *0.4* Added Don't Answer option to not answer the channel (and playback early media if supported) 
    78    *0.3* Added support to return to calling IVR 

  • modules/branches/2.2/ivr/functions.inc.php

    r3706 r3710  
    149149                    $ext->add($id, 's', '', new ext_setvar('LOOPCOUNT', 0)); 
    150150                    $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}')); 
    152152                    $ext->add($id, 's', '', new ext_setvar('_IVR_CONTEXT', '${CONTEXT}')); 
    153153                    $ext->add($id, 's', '', new ext_answer('')); 
    …… 
    171171              $ext->add($id, $dest['selection'],'', new ext_setvar('__NODEST', '')); 
    172172              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')); 
    174174              } else { 
    175175                $ext->add($id, $dest['selection'],'', new ext_goto($dest['dest'])); 
    …… 
    191191            $ext->add($id, 'loop', '', new ext_gotoif('$[${LOOPCOUNT} > 2]','hang,1')); 
    192192            $ext->add($id, 'loop', '', new ext_goto($id.',s,begin')); 
     193            $ext->add($id, 'return', '', new ext_goto($id.',s,begin')); 
    193194          } 
    194195          $ext->add($id, 'fax', '', new ext_goto('ext-fax,in_fax,1')); 

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

    r3708 r3710  
    22  <rawname>ivr</rawname> 
    33  <name>IVR</name> 
    4   <version>2.5.7</version> 
     4  <version>2.5.8</version> 
    55  <type>setup</type> 
    66  <category>Inbound Call Control</category> 
    …… 
    99  </description> 
    1010  <changelog> 
     11    *2.5.8* insert a return extension so that annoucements and ivrs returning don't trample back over the top 
    1112    *2.5.7* extended schema and added ability to have ivr options to return to calling parent ivrs if appropriate, otherwise specified destination 
    1213    *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.2/ivr/page.ivr.php

    r3706 r3710  
    278278  <tr> <td style="text-align:right;"> 
    279279 
    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 /> 
    281281    <input size="2" type="text" name="option<?php echo $count ?>" value="<?php echo $sel ?>"><br /> 
    282282<?php if (strlen($sel)) {  ?>