Changeset 7909

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

revert r7907, r7908 except amportal conf parsing fix, this appears to break parsing and needs further investigation, re #3678

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r7908 r7909  
    17101710        // duplace name line 
    17111711        $vmconf[$section][ $matches[1] ]["dups"][] = $matches[2]; 
    1712       } else if (preg_match('/^\s*#include\s+"{0,1}([^"]*)"{0,1}\s*([;#].*)?/',$line,$matches)) { 
     1712      } else if (preg_match("/^\s*#include\s+(.*)\s*([;#].*)?/",$line,$matches)) { 
    17131713        // include another file 
    17141714         
    …… 
    18001800        //DEBUG echo "\ndup mailbox"; 
    18011801        $output[] = $line; 
    1802       } else if (preg_match('/^(\s*)#include(\s+)"{0,1}([^"]*)"{0,1}(\s*[;#].*)?$/',$line,$matches)) { 
     1802      } else if (preg_match("/^(\s*)#include(\s+)(.*)(\s*[;#].*)?$/",$line,$matches)) { 
    18031803        // include another file 
    18041804        //DEBUG echo "\ninclude ".$matches[3]."<blockquote>";