Changeset 13926

Show
Ignore:
Timestamp:
03/27/12 11:56:48 (1 year ago)
Author:
p_lindheimer
Message:

Merged revisions 13925 via svnmerge from
http://www.freepbx.org/v2/svn/freepbx/branches/2.7

................

r13925 | p_lindheimer | 2012-03-27 08:53:01 -0700 (Tue, 27 Mar 2012) | 23 lines


Merged revisions 13924 via svnmerge from
http://www.freepbx.org/v2/svn/freepbx/branches/2.8


................

r13924 | p_lindheimer | 2012-03-27 08:51:34 -0700 (Tue, 27 Mar 2012) | 16 lines


Merged revisions 13923 via svnmerge from
http://www.freepbx.org/v2/svn/freepbx/branches/2.9


................

r13923 | p_lindheimer | 2012-03-27 08:49:39 -0700 (Tue, 27 Mar 2012) | 9 lines


Merged revisions 13922 via svnmerge from
http://www.freepbx.org/v2/svn/freepbx/branches/2.10


........

r13922 | p_lindheimer | 2012-03-27 08:46:48 -0700 (Tue, 27 Mar 2012) | 1 line


fixes #5729 validate the callback number and also double check when pulling it from the AstDB in case it has been tampered with in there

........

................

................

................

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/branches/2.6

    • Property svn:mergeinfo changed from
      /freepbx/branches/2.10:13870,13876
      /freepbx/branches/2.7:13873,13879,13883
      /freepbx/branches/2.8:13872,13878,13882
      /freepbx/branches/2.9:13871,13875-13877,13881       to
      /freepbx/branches/2.10:13870,13876,13922
      /freepbx/branches/2.7:13873,13879,13883,13925
      /freepbx/branches/2.8:13872,13878,13882,13924
      /freepbx/branches/2.9:13871,13875-13877,13881,13923
    • Property svnmerge-integrated changed from /freepbx/branches/2.5:1-7770,8119,8161 /freepbx/branches/2.7:1-9517,10464,11466,11744,13873,13879,13883 to /freepbx/branches/2.7:1-9517,10464,11466,11744,13873,13879,13883,13925 /freepbx/branches/2.5:1-7770,8119,8161

  • freepbx/branches/2.6/amp_conf/htdocs/recordings/includes/callme.php

    r7042 r13926  
    5353function callme_getnum($exten) 
    5454{ 
    55         global $astman; 
    56         $cmd    = "database get AMPUSER $exten/callmenum"; 
     55 global $astman; 
     56 $cmd     = "database get AMPUSER $exten/callmenum"; 
    5757  $callme_num   = ''; 
    58         $results  = $astman->Command($cmd); 
     58 $results   = $astman->Command($cmd); 
    5959 
    6060  if (is_array($results)) 
    …… 
    7979        global $astman; 
    8080 
     81        $callme_num = preg_replace("/[^0-9*#+]/", "", $callme_num); 
    8182        $cmd = "database put AMPUSER $exten/callmenum $callme_num"; 
    8283        $astman->Command($cmd); 
    …… 
    8990{ 
    9091  global $astman; 
     92 
     93  if (!preg_match("/^[0-9*#+]+$/",$to)) {  
     94    return false; 
     95  } 
     96  if (!preg_match("/^[0-9]+$/",$from)) {  
     97    return false; 
     98  } 
     99  // TODO: should I check that new_path is a valid sound file to play and bomb out if not as possible security protection? 
     100 
    91101  $channel  = "Local/$to@from-internal/n"; 
    92102  $context  = "vm-callme";