Changeset 7907

Show
Ignore:
Timestamp:
08/02/09 16:37:44 (3 years ago)
Author:
p_lindheimer
Message:

fixes #3678 - allowing single quotes around filename, and also another issue where where \! was breaking amportal.conf parsing in variables (like db password)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/trunk/amp_conf/htdocs/admin/functions.inc.php

    r7906 r7907  
    759759  if (is_array($file)) { 
    760760    foreach ($file as $line) { 
    761       if (preg_match("/^\s*([a-zA-Z0-9_]+)=([a-zA-Z0-9 .&-@=_<>\"\']+)\s*$/",$line,$matches)) { 
     761      if (preg_match("/^\s*([a-zA-Z0-9_]+)=([a-zA-Z0-9 .&-@=_!<>\"\']+)\s*$/",$line,$matches)) { 
    762762        $conf[ $matches[1] ] = $matches[2]; 
    763763      } 
    …… 
    17101710        // duplace name line 
    17111711        $vmconf[$section][ $matches[1] ]["dups"][] = $matches[2]; 
    1712       } else if (preg_match("/^\s*#include\s+(.*)\s*([;#].*)?/",$line,$matches)) { 
     1712      } else if (preg_match('/^\s*#include\s+"{0,1}([^"]*)"{0,1}\s*([;#].*)?/',$line,$matches)) { 
    17131713        // include another file 
    17141714