Exclude the dir ICEcoder is running from

mattpass · mattpass · commit eb634555dfd7 · 2014-01-11T17:43:17.000Z
After globalling $docRoot and $ICEcodeDir, work out a $localPath for the
file we have a result for
If our results match, we are looking in the ICEcoder dir and should
exclude as a result
diff --git a/lib/multiple-results.php b/lib/multiple-results.php
@@ -113,7 +113,7 @@
 	$r = 0;
 	function phpGrep($q, $path, $base) {
 		$fp = opendir($path);
-		global $r, $ICEcoder, $serverType, $selectedFiles, $context;
+		global $r, $ICEcoder, $serverType, $selectedFiles, $docRoot, $ICEcoderDir, $context;
 		if (!isset($ret)) {$ret="";};
 		$slash = $serverType == strpos($path,"\\")>-1 ? "\\" : "/";
 		while($f = readdir($fp)) {
@@ -124,9 +124,15 @@ function phpGrep($q, $path, $base) {
 			} else if(stristr(toUTF8noBOM(file_get_contents($fullPath,false,$context),false), $q)) {
 				$bFile = false;
 				$foundInSelFile = false;
+				// Exclude banned files
 				for ($i=0;$i<count($ICEcoder['bannedFiles']);$i++) {
 					if (strpos($f,$ICEcoder['bannedFiles'][$i])!==false) {$bFile = true;};
 				}
+				// Exclude the folder ICEcoder is running from
+				$localPath = str_replace(str_replace("\\","/",$docRoot),"",$fullPath);
+				if (strpos($localPath, $ICEcoderDir)===0) {
+					$bFile = true;
+				}
 				$findPath = str_replace($base,"",$fullPath);
 				for ($i=0;$i<count($selectedFiles);$i++) {
 					$stringExtra = $selectedFiles[$i] != "|" ? "/" : "";
