Changeset 14235

Show
Ignore:
Timestamp:
07/09/12 18:06:06 (11 months ago)
Author:
p_lindheimer
Message:

fixes #5883 allows # and * to be used to skip as well as single digits

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r13091 r14235  
    9393            $ext->add('app-announcement-'.$row['announcement_id'], 's', '', new ext_waitexten('')); 
    9494          } 
    95            
    9695          if ($row['allow_skip']) { 
    97             $ext->add('app-announcement-'.$row['announcement_id'], '_X', '', new ext_noop('User skipped announcement')); 
     96            $skip = "_[0-9*#]"; 
     97            $ext->add('app-announcement-'.$row['announcement_id'], $skip, '', new ext_noop('User skipped announcement')); 
    9898            if ($row['return_ivr']) { 
    99               $ext->add('app-announcement-'.$row['announcement_id'], '_X', '', new ext_gotoif('$["x${IVR_CONTEXT}" = "x"]', $row['post_dest'].':${IVR_CONTEXT},return,1')); 
     99              $ext->add('app-announcement-'.$row['announcement_id'], $skip, '', new ext_gotoif('$["x${IVR_CONTEXT}" = "x"]', $row['post_dest'].':${IVR_CONTEXT},return,1')); 
    100100            } else { 
    101               $ext->add('app-announcement-'.$row['announcement_id'], '_X', '', new ext_goto($row['post_dest'])); 
     101              $ext->add('app-announcement-'.$row['announcement_id'], $skip, '', new ext_goto($row['post_dest'])); 
    102102            } 
    103103          }