[PHP-DOC] cvs: phpdoc /scripts/iniupdate ini_search_lib.php

[Nuno Lopes]

nlopess         Mon Dec 26 12:13:32 2005 EDT

  Modified files:              
    /phpdoc/scripts/iniupdate   ini_search_lib.php 
  Log:
  sync with the other machine: tune the regex for catching default values when 
sources use cfg_get_*()
  
http://cvs.php.net/viewcvs.cgi/phpdoc/scripts/iniupdate/ini_search_lib.php?r1=1.5&r2=1.6&diff_format=u
Index: phpdoc/scripts/iniupdate/ini_search_lib.php
diff -u phpdoc/scripts/iniupdate/ini_search_lib.php:1.5 
phpdoc/scripts/iniupdate/ini_search_lib.php:1.6
--- phpdoc/scripts/iniupdate/ini_search_lib.php:1.5     Wed Jul 20 18:45:50 2005
+++ phpdoc/scripts/iniupdate/ini_search_lib.php Mon Dec 26 12:13:32 2005
@@ -87,7 +87,7 @@
             
if(preg_match_all('/cfg_get_([^(]+)\s*\(\s*"([^"]+)",\s*&([^\s=]+)\s*\)/S', 
$file, $match, PREG_SET_ORDER)) {
 
                 foreach($match as $arr) {
-                    
preg_match('/(?:(FAILURE|SUCCESS)\s*==\s*)?'.preg_quote($arr[0]).'(?:\s*==\s*(FAILURE|SUCCESS))?(?:(?:.|[\r\n]){1,30}'.preg_quote($arr[3]).'\s*=\s*(.+);)?/',
 $file, $m);
+                    
preg_match('/(?:(FAILURE|SUCCESS)\s*==\s*)?'.preg_quote($arr[0]).'(?:\s*==\s*(FAILURE|SUCCESS))?(?:(?:[^=]|==){1,40}'.preg_quote($arr[3]).'\s*=\s*(.+);)?/',
 $file, $m);
 
                     if ($m[1] == 'FAILURE' || $m[2] == 'FAILURE') {
                         $cfg_get[] = array($arr[2], $arr[1] == 'string' ? 
$m[3] : '"'.$m[3].'"');