Changeset 7967

Show
Ignore:
Timestamp:
08/03/09 15:19:34 (4 years ago)
Author:
jjshoe
Message:

#3611 #3435 #3317 #3307
Fixed pattern matching to prevent deadly parked call loop

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • modules/branches/2.5/parking/functions.inc.php

    r7217 r7967  
    5050      // Now generate dialplan 
    5151      $ext->add($contextname, "t", '', new ext_noop('Parked Call Timed Out and Got Orphaned')); 
    52       $ext->add($contextname, "_.", '', new ext_noop('Parked Call Timed Out and Got Orphaned')); 
     52      $ext->add($contextname, "_[0-9a-zA-Z*#].", '', new ext_noop('Parked Call Timed Out and Got Orphaned')); 
    5353 
    5454      // If we have an appropriate Asterisk patch, set paraemters for Asterisk 
     
    6565        if ($parkalertinfo) { 
    6666          $ext->add($contextname, "t", '', new ext_setvar('__ALERT_INFO',str_replace(';', '\;', $parkalertinfo))); 
    67           $ext->add($contextname, "_.", '', new ext_setvar('__ALERT_INFO',str_replace(';', '\;', $parkalertinfo))); 
     67          $ext->add($contextname, "_[0-9a-zA-Z*#].", '', new ext_setvar('__ALERT_INFO',str_replace(';', '\;', $parkalertinfo))); 
    6868        } 
    6969        if ($parkcid) { 
    7070          $ext->add($contextname, "t", '', new ext_setvar('CALLERID(name)', $parkcid.'${CALLERID(name)}')); 
    71           $ext->add($contextname, "_.", '', new ext_setvar('CALLERID(name)', $parkcid.'${CALLERID(name)}')); 
     71          $ext->add($contextname, "_[0-9a-zA-Z*#].", '', new ext_setvar('CALLERID(name)', $parkcid.'${CALLERID(name)}')); 
    7272        } 
    7373      } 
     
    7676        $parkingannmsg = recordings_get_file($parkingannmsg_id); 
    7777        $ext->add($contextname, "t", '', new ext_playback($parkingannmsg)); 
    78         $ext->add($contextname, "_.", '', new ext_playback($parkingannmsg)); 
     78        $ext->add($contextname, "_[0-9a-zA-Z*#].", '', new ext_playback($parkingannmsg)); 
    7979      } 
    8080      // goto the destination here 
    8181      // 
    8282      $ext->add($contextname, "t", '', new ext_goto($goto)); 
    83       $ext->add($contextname, "_.", '', new ext_goto($goto)); 
     83      $ext->add($contextname, "_[0-9a-zA-Z*#].", '', new ext_goto($goto)); 
    8484 
    8585      // Asterisk 1.4 requires hints to be generated for parking