Changeset 9750

Show
Ignore:
Timestamp:
05/25/10 12:10:09 (2 years ago)
Author:
p_lindheimer
Message:

closes #4256 make all versions of parse_amportal_conf() use the same preg_match() line using framework's functions.inc.php as authoritative

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/branches/2.8/amp_conf/bin/archive_recordings

    r7346 r9750  
    5757  if (is_array($file)) { 
    5858    foreach ($file as $line) { 
    59       if (preg_match("/^\s*([a-zA-Z0-9_]+)=([a-zA-Z0-9 .&-@=_<>\"\']+)\s*$/",$line,$matches)) { 
     59      if (preg_match("/^\s*([a-zA-Z0-9_]+)=([a-zA-Z0-9 .&-@=_!<>\"\']+)\s*$/",$line,$matches)) { 
    6060        $conf[ $matches[1] ] = $matches[2]; 
    6161      } 

  • freepbx/branches/2.8/amp_conf/htdocs/admin/cdr/lib/defines.php

    r9510 r9750  
    77        $file = file($filename); 
    88        foreach ($file as $line) { 
    9                 if (preg_match("/^\s*([a-zA-Z0-9]+)\s*=\s*(.*)\s*([;#].*)?/",$line,$matches)) { 
     9                if (preg_match("/^\s*([a-zA-Z0-9_]+)=([a-zA-Z0-9 .&-@=_!<>\"\']+)\s*$/",$line,$matches)) { 
    1010                        $conf[ $matches[1] ] = $matches[2]; 
    1111                } 

  • freepbx/branches/2.8/amp_conf/htdocs_panel/index.php

    r8095 r9750  
    44  $file = file($filename); 
    55  foreach ($file as $line) { 
    6     if (preg_match("/^\s*([a-zA-Z0-9]+)\s*=\s*(.*)\s*([;#].*)?/",$line,$matches)) {  
     6    if (preg_match("/^\s*([a-zA-Z0-9_]+)=([a-zA-Z0-9 .&-@=_!<>\"\']+)\s*$/",$line,$matches)) { 
    77      $conf[ $matches[1] ] = $matches[2]; 
    88    } 

  • freepbx/branches/2.8/amp_conf/htdocs_panel/index_amp.php

    r8095 r9750  
    44  $file = file($filename); 
    55  foreach ($file as $line) { 
    6     if (preg_match("/^\s*([a-zA-Z0-9]+)\s*=\s*(.*)\s*([;#].*)?/",$line,$matches)) {  
     6    if (preg_match("/^\s*([a-zA-Z0-9_]+)=([a-zA-Z0-9 .&-@=_!<>\"\']+)\s*$/",$line,$matches)) { 
    77      $conf[ $matches[1] ] = $matches[2]; 
    88    }