more improvements

tony2001 · tony2001 · commit 299af4614690 · 2006-09-10T11:44:51.000Z
diff --git a/scripts/dev/check_parameters.php b/scripts/dev/check_parameters.php
@@ -22,7 +22,7 @@
 
 define('REPORT_LEVEL', 2); // 0 reports less false-positives. up to level 5.
 define('VERSION', '5.2');  // minimum is 5.2
-define('PHPDIR', dirname(__FILE__) . '/../..');
+define('PHPDIR', realpath(dirname(__FILE__) . '/../..'));
 
 
 // be sure you have enough memory and stack for PHP. pcre will push the limits!
@@ -64,7 +64,12 @@ function error($str, $level = 0)
 	global $current_file, $current_function, $line;
 
 	if ($level <= REPORT_LEVEL) {
-		echo substr($current_file, strlen(PHPDIR)+1) . " [$line] $current_function : $str\n";
+		if (strpos($current_file,PHPDIR) === 0) {
+			$filename = substr($current_file, strlen(PHPDIR)+1); 
+		} else {
+			$filename = $current_file;
+		}
+		echo $filename , " [$line] $current_function : $str\n";
 	}
 }
 
@@ -364,5 +369,5 @@ function recurse($path)
 }
 
 foreach ($dirs as $dir) {
-	recurse($dir);
+	recurse(realpath($dir));
 }

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`
`23`	`23`	`define('REPORT_LEVEL', 2); // 0 reports less false-positives. up to level 5.`
`24`	`24`	`define('VERSION', '5.2'); // minimum is 5.2`
`25`		`-define('PHPDIR', dirname(__FILE__) . '/../..');`
	`25`	`+define('PHPDIR', realpath(dirname(__FILE__) . '/../..'));`
`26`	`26`
`27`	`27`
`28`	`28`	`// be sure you have enough memory and stack for PHP. pcre will push the limits!`
`@@ -64,7 +64,12 @@ function error($str, $level = 0)`
`64`	`64`	`global $current_file, $current_function, $line;`
`65`	`65`
`66`	`66`	`if ($level <= REPORT_LEVEL) {`
`67`		`- echo substr($current_file, strlen(PHPDIR)+1) . " [$line] $current_function : $str\n";`
	`67`	`+ if (strpos($current_file,PHPDIR) === 0) {`
	`68`	`+ $filename = substr($current_file, strlen(PHPDIR)+1);`
	`69`	`+ } else {`
	`70`	`+ $filename = $current_file;`
	`71`	`+ }`
	`72`	`+ echo $filename , " [$line] $current_function : $str\n";`
`68`	`73`	`}`
`69`	`74`	`}`
`70`	`75`
`@@ -364,5 +369,5 @@ function recurse($path)`
`364`	`369`	`}`
`365`	`370`
`366`	`371`	`foreach ($dirs as $dir) {`
`367`		`- recurse($dir);`
	`372`	`+ recurse(realpath($dir));`
`368`	`373`	`}`