From 14053fbfdd3d8e4375ed3221ba8c1b246129bd05 Mon Sep 17 00:00:00 2001
From: Matt Pass <matt@mattpass.com>
Date: Sun, 30 Dec 2012 19:24:17 +0000
Subject: [PATCH] Fixed banned & selected finding issues

Remove old echo test message
Added new $foundInSelFile var
Both this and bFile are false to begin with
Testing on not false of bannedFile in strpos
If we find our matching item is one of our selected files, set
$foundInSelFile to true
Only if we don't have a banned file and either we have no selected
files, or we do have some and have a match, push to array etc
PHP_EOL's to make source easier to read
---
 lib/multiple-results.php | 432 +++++++++++++++++++--------------------
 1 file changed, 216 insertions(+), 216 deletions(-)
diff --git a/lib/multiple-results.php b/lib/multiple-results.php
index 7e4227a..b0dbae5 100644
--- a/lib/multiple-results.php
+++ b/lib/multiple-results.php
@@ -1,217 +1,217 @@
-<?php include("settings.php");?>
-<?php
-	if(isset($_GET['selectedFiles'])) {
-		$selectedFiles=explode(":",strClean($_GET['selectedFiles']));
-		echo $selectedFiles[0].".....".$selectedFiles[1];
-	}
-?>
-<!DOCTYPE html>
-
-<html>
-<head>
-<title>ICEcoder <?php echo $ICEcoder["versionNo"];?> multiple results screen</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="robots" content="noindex, nofollow">
-<link rel="stylesheet" type="text/css" href="multiple-results.css">
-</head>
-
-<body class="results" onLoad="top.document.getElementById('loadingMask').style.visibility = 'hidden'">
-
-<h1 id="title"></h1>
-<div class="resultsPane" id="resultsPane">
-	<div id="results"></div>
-</div>
-<?php if (isset($_GET['replace'])) { ?>
-	<div class="replaceAll" id="replaceAll" onClick="<?php
-	if (isset($_GET['target']) && strpos($_GET['target'],"filenames")) {
-		echo 'renameAll()';
-	} else if (isset($_GET['target']) && strpos($_GET['target'],"files")) {
-		echo 'replaceInFilesAll()';
-	} else {
-		echo 'replaceAll()';
-	}
-	?>" style="opacity: 0.1"><?php echo isset($_GET['target']) && strpos($_GET['target'],"filenames") ? 'rename all' : 'replace all';?></div>
-<?php ;}; ?>
-
-<script>
-<?php if (!isset($_GET['replace'])) { ?>
-	document.getElementById('resultsPane').style.height = "380px";
-<?php ;}; ?>
-var resultsDisplay = "";
-var foundArray = [];
-foundInSelected = false;
-userTarget = top.document.findAndReplace.target.value;
-findText = top.findAndReplace.find.value.toLowerCase();
-<?php
-$findText = str_replace("ICEcoder:","",str_replace("&#39;","\'",$_GET['find']));
-// Find in open docs?
-if (!isset($_GET['target'])) {
-$targetName = "document";
-?>
-var startTab = top.ICEcoder.selectedTab;
-var rExp = new RegExp(findText,"gi");
-for (var i=1;i<=top.ICEcoder.openFiles.length;i++) {
-	top.ICEcoder.switchTab(i);
-	var cM = top.ICEcoder.getcMInstance();
-	var content = cM.getValue();
-	if (content.match(rExp)) {
-		resultsDisplay += '<a href="javascript:gotoTab('+i+')">'+ top.ICEcoder.openFiles[i-1]+ '</a><br><div id="foundCount'+i+'">Found '+content.match(rExp).length+' times</div>';
-		<?php if (isset($_GET['replace'])) { ?>
-		resultsDisplay += '<div class="replace" id="replace" onClick="replaceSingle('+i+');this.style.display=\'none\'">replace</div>';
-		<?php ;}; ?>
-		resultsDisplay += '<hr>';
-		foundArray.push(i);
-	}
-}
-if (startTab!=top.ICEcoder.selectedTab) {
-	top.ICEcoder.switchTab(startTab);
-}
-<?php
-// Find in files or filenames
-} else {
-	if (strpos($_GET['target'],"filenames")>0) {
-	$targetName = "file/folder";
-?>
-		var spansArray = top.ICEcoder.filesFrame.contentWindow.document.getElementsByTagName('span');
-		for (var i=0;i<spansArray.length;i++) {
-			foundInSelected = false;
-			targetURL = spansArray[i].id.replace(/\|/g,"/").toLowerCase();
-			if (	targetURL.lastIndexOf(findText.toLowerCase()) > targetURL.lastIndexOf("/") 
-				&& targetURL.indexOf(findText.toLowerCase())>-1 && targetURL.indexOf('_perms')>-1) {
-				if (userTarget.indexOf("selected")>-1) {
-					for (var j=0;j<top.ICEcoder.selectedFiles.length;j++) {
-						if (
-							targetURL.replace(/\//g,"|").indexOf(top.ICEcoder.selectedFiles[j].replace(/\//g,"|").replace(/_perms/g,""))==0
-							&& (
-								targetURL.replace(/\|/g,"/").replace(/_perms/g,"")==top.ICEcoder.selectedFiles[j].replace(/\|/g,"/").replace(/_perms/g,"")
-								||
-								(targetURL.replace(/\|/g,"/").split("/").length > top.ICEcoder.selectedFiles[j].replace(/\|/g,"/").split("/").length && targetURL.charAt(top.ICEcoder.selectedFiles[j].length)=="/"))) {
-							foundInSelected = true;
-						}
-					}
-				}
-				if (userTarget.indexOf("all")>-1 || (userTarget.indexOf("selected")>-1 && foundInSelected)) {
-					resultsDisplay += '<a href="javascript:top.ICEcoder.openFile(\'<?php echo $docRoot;?>'+targetURL.replace(/\|/g,"/").replace(/_perms/g,"")+'\');top.ICEcoder.showHide(\'hide\',top.document.getElementById(\'blackMask\'))">';
-					resultsDisplay += targetURL.replace(/\|/g,"/").replace(/_perms/g,"").replace(/<?php echo str_replace("/","\/",strtolower($findText)); ?>/g,"<b>"+findText.toLowerCase()+"</b>");
-					resultsDisplay += '</a><br>';
-					<?php if (!isset($_GET['replace'])) { ?>
-						resultsDisplay += '<div id="foundCount'+i+'">'+spansArray[i].innerHTML+'</div>';
-					<?php ;} else { ?>
-						resultsDisplay += '<div id="foundCount'+i+'">'+spansArray[i].innerHTML+', rename to '+targetURL.replace(/\|/g,"/").replace(/_perms/g,"").replace(/<?php echo str_replace("/","\/",strtolower($findText)); ?>/g,"<b><?php if(isset($_GET['replace'])) {echo strtolower(strClean($_GET['replace']));};?></b>")+'</div>';
-					<?php
-					;};
-					if (isset($_GET['replace'])) { ?>
-					resultsDisplay += '<div class="replace" id="replace" onClick="renameSingle('+i+');this.style.display=\'none\'">rename</div>';
-					<?php ;}; ?>
-					resultsDisplay += '<hr>';
-					foundArray.push(i);
-				}
-			}
-		}
-<?php
-	} else {
-	$targetName = "file";
-	$r = 0;
-	function phpGrep($q, $path, $base) {
-		$fp = opendir($path);
-		global $r, $ICEcoder, $serverType, $selectedFiles;
-		if (!isset($ret)) {$ret="";};
-		$slash = $serverType == "Windows" ? "\\" : "/";
-		while($f = readdir($fp)) {
-			if(preg_match("#^\.+$#", $f)) continue;
-			$fullPath = $path.$slash.$f;
-			if(is_dir($fullPath)) {
-				$ret .= phpGrep($q, $fullPath, $base);
-			} else if(stristr(file_get_contents($fullPath), $q)) {
-				$bFile = false;
-				for ($i=0;$i<count($ICEcoder['bannedFiles']);$i++) {
-					if (strpos($f,$ICEcoder['bannedFiles'][$i])>0) {$bFile = true;};
-				}
-				$findPath = str_replace($base,"",$fullPath);
-				for ($i=0;$i<count($selectedFiles);$i++) {
-					if (strpos($findPath,str_replace("|","/",$selectedFiles[$i]))!==0) {
-						$bFile = true;
-					}
-				}
-				if (!$bFile) {
-					$ret .= "<a href=\\\"javascript:top.ICEcoder.openFile('".$fullPath."');top.ICEcoder.showHide('hide',top.document.getElementById('blackMask'))\\\">";
-					$ret .= str_replace($base,"",$fullPath)."</a><div id=\\\"foundCount".$r."\\\">Found ".substr_count(strtolower(file_get_contents($fullPath)),$q)." times</div>";
-					if (isset($_GET['replace'])) {
-						$ret .= "<div class=\\\"replace\\\" id=\\\"replace\\\" onClick=\\\"replaceInFileSingle('".$fullPath."');this.style.display=\'none\'\\\">replace</div>";
-					};
-					$ret .= '<hr>';
-					echo 'foundArray.push("'.$fullPath.'");';
-					$r++;
-				}
-			}
-		}
-		return $ret;
-	}
-
-	$results = phpGrep($findText, $docRoot.$iceRoot, $docRoot.$iceRoot);
-	echo 'resultsDisplay += "'.$results.'";';
-?>
-<?php
-	}
-}
-?>
-showHide = foundArray.length==0 ? "hide" : "show";
-top.ICEcoder.showHide(showHide,top.document.getElementById('blackMask'));
-if (foundArray.length==0) {top.ICEcoder.message('No matches found')};
-<?php if (isset($_GET['replace'])) { ?>
-if (foundArray.length!=0) {document.getElementById('replaceAll').style.opacity = 1};
-<?php ;}; ?>
-plural = foundArray.length >= 2 ? "s" : "";
-targetName = "<?php echo $targetName;?>";
-selectedText = foundInSelected ? "selected " : "";
-document.getElementById('title').innerHTML = findText.replace(/&/g,"&amp;").replace(/>/g,"&gt;").replace(/</g,"&lt;").replace(/"/g,"&quot;").replace(/'/g,"&apos;")+" found in "+foundArray.length+" "+selectedText+targetName+plural;
-document.getElementById('results').innerHTML = resultsDisplay;
-
-var gotoTab = function(tab) {
-	top.ICEcoder.switchTab(tab);
-	top.ICEcoder.showHide('hide',top.document.getElementById('blackMask'));
-}
-
-var replaceSingle = function(tab) {
-	top.ICEcoder.switchTab(tab);
-	cM = top.ICEcoder.getcMInstance();
-	content = cM.getValue();
-	cM.setValue(cM.getValue().replace(rExp,top.document.getElementById('replace').value));
-	document.getElementById('foundCount'+tab).innerHTML = document.getElementById('foundCount'+tab).innerHTML.replace('Found','Replaced');
-}
-
-var replaceAll = function() {
-	for (var i=0;i<=foundArray.length-1;i++) {
-		replaceSingle(foundArray[i]);
-	}
-	top.ICEcoder.showHide('hide',top.document.getElementById('blackMask'));
-}
-
-var replaceInFileSingle = function(fileRef) {
-	top.ICEcoder.replaceInFile(fileRef,findText,'<?php if(isset($_GET['replace'])) {echo strClean($_GET['replace']);}; ?>');
-}
-
-var replaceInFilesAll = function() {
-	for (var i=0;i<=foundArray.length-1;i++) {
-		replaceInFileSingle(foundArray[i]);
-	}
-	top.ICEcoder.showHide('hide',top.document.getElementById('blackMask'));
-}
-
-var renameSingle = function(arrayRef) {
-	fileRef = spansArray[arrayRef].id.replace(/\|/g,"/").replace(/_perms/g,"");
-	newName = spansArray[arrayRef].id.replace(/\|/g,"/").replace(/_perms/g,"").replace(find,"<?php if(isset($_GET['replace'])) {echo strClean($_GET['replace']);}; ?>");
-	top.ICEcoder.renameFile(fileRef,newName);
-}
-
-var renameAll = function() {
-	for (var i=0;i<=foundArray.length-1;i++) {
-		renameSingle(foundArray[i]);
-	}
-	top.ICEcoder.showHide('hide',top.document.getElementById('blackMask'));
-}
-</script>
-
-</body>
-
+<?php include("settings.php");?>
+<?php
+	if(isset($_GET['selectedFiles'])) {
+		$selectedFiles=explode(":",strClean($_GET['selectedFiles']));
+	}
+?>
+<!DOCTYPE html>
+
+<html>
+<head>
+<title>ICEcoder <?php echo $ICEcoder["versionNo"];?> multiple results screen</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="robots" content="noindex, nofollow">
+<link rel="stylesheet" type="text/css" href="multiple-results.css">
+</head>
+
+<body class="results" onLoad="top.document.getElementById('loadingMask').style.visibility = 'hidden'">
+
+<h1 id="title"></h1>
+<div class="resultsPane" id="resultsPane">
+	<div id="results"></div>
+</div>
+<?php if (isset($_GET['replace'])) { ?>
+	<div class="replaceAll" id="replaceAll" onClick="<?php
+	if (isset($_GET['target']) && strpos($_GET['target'],"filenames")) {
+		echo 'renameAll()';
+	} else if (isset($_GET['target']) && strpos($_GET['target'],"files")) {
+		echo 'replaceInFilesAll()';
+	} else {
+		echo 'replaceAll()';
+	}
+	?>" style="opacity: 0.1"><?php echo isset($_GET['target']) && strpos($_GET['target'],"filenames") ? 'rename all' : 'replace all';?></div>
+<?php ;}; ?>
+
+<script>
+<?php if (!isset($_GET['replace'])) { ?>
+	document.getElementById('resultsPane').style.height = "380px";
+<?php ;}; ?>
+var resultsDisplay = "";
+var foundArray = [];
+foundInSelected = false;
+userTarget = top.document.findAndReplace.target.value;
+findText = top.findAndReplace.find.value.toLowerCase();
+<?php
+$findText = str_replace("ICEcoder:","",str_replace("&#39;","\'",$_GET['find']));
+// Find in open docs?
+if (!isset($_GET['target'])) {
+$targetName = "document";
+?>
+var startTab = top.ICEcoder.selectedTab;
+var rExp = new RegExp(findText,"gi");
+for (var i=1;i<=top.ICEcoder.openFiles.length;i++) {
+	top.ICEcoder.switchTab(i);
+	var cM = top.ICEcoder.getcMInstance();
+	var content = cM.getValue();
+	if (content.match(rExp)) {
+		resultsDisplay += '<a href="javascript:gotoTab('+i+')">'+ top.ICEcoder.openFiles[i-1]+ '</a><br><div id="foundCount'+i+'">Found '+content.match(rExp).length+' times</div>';
+		<?php if (isset($_GET['replace'])) { ?>
+		resultsDisplay += '<div class="replace" id="replace" onClick="replaceSingle('+i+');this.style.display=\'none\'">replace</div>';
+		<?php ;}; ?>
+		resultsDisplay += '<hr>';
+		foundArray.push(i);
+	}
+}
+if (startTab!=top.ICEcoder.selectedTab) {
+	top.ICEcoder.switchTab(startTab);
+}
+<?php
+// Find in files or filenames
+} else {
+	if (strpos($_GET['target'],"filenames")>0) {
+	$targetName = "file/folder";
+?>
+		var spansArray = top.ICEcoder.filesFrame.contentWindow.document.getElementsByTagName('span');
+		for (var i=0;i<spansArray.length;i++) {
+			foundInSelected = false;
+			targetURL = spansArray[i].id.replace(/\|/g,"/").toLowerCase();
+			if (	targetURL.lastIndexOf(findText.toLowerCase()) > targetURL.lastIndexOf("/") 
+				&& targetURL.indexOf(findText.toLowerCase())>-1 && targetURL.indexOf('_perms')>-1) {
+				if (userTarget.indexOf("selected")>-1) {
+					for (var j=0;j<top.ICEcoder.selectedFiles.length;j++) {
+						if (
+							targetURL.replace(/\//g,"|").indexOf(top.ICEcoder.selectedFiles[j].replace(/\//g,"|").replace(/_perms/g,""))==0
+							&& (
+								targetURL.replace(/\|/g,"/").replace(/_perms/g,"")==top.ICEcoder.selectedFiles[j].replace(/\|/g,"/").replace(/_perms/g,"")
+								||
+								(targetURL.replace(/\|/g,"/").split("/").length > top.ICEcoder.selectedFiles[j].replace(/\|/g,"/").split("/").length && targetURL.charAt(top.ICEcoder.selectedFiles[j].length)=="/"))) {
+							foundInSelected = true;
+						}
+					}
+				}
+				if (userTarget.indexOf("all")>-1 || (userTarget.indexOf("selected")>-1 && foundInSelected)) {
+					resultsDisplay += '<a href="javascript:top.ICEcoder.openFile(\'<?php echo $docRoot;?>'+targetURL.replace(/\|/g,"/").replace(/_perms/g,"")+'\');top.ICEcoder.showHide(\'hide\',top.document.getElementById(\'blackMask\'))">';
+					resultsDisplay += targetURL.replace(/\|/g,"/").replace(/_perms/g,"").replace(/<?php echo str_replace("/","\/",strtolower($findText)); ?>/g,"<b>"+findText.toLowerCase()+"</b>");
+					resultsDisplay += '</a><br>';
+					<?php if (!isset($_GET['replace'])) { ?>
+						resultsDisplay += '<div id="foundCount'+i+'">'+spansArray[i].innerHTML+'</div>';
+					<?php ;} else { ?>
+						resultsDisplay += '<div id="foundCount'+i+'">'+spansArray[i].innerHTML+', rename to '+targetURL.replace(/\|/g,"/").replace(/_perms/g,"").replace(/<?php echo str_replace("/","\/",strtolower($findText)); ?>/g,"<b><?php if(isset($_GET['replace'])) {echo strtolower(strClean($_GET['replace']));};?></b>")+'</div>';
+					<?php
+					;};
+					if (isset($_GET['replace'])) { ?>
+					resultsDisplay += '<div class="replace" id="replace" onClick="renameSingle('+i+');this.style.display=\'none\'">rename</div>';
+					<?php ;}; ?>
+					resultsDisplay += '<hr>';
+					foundArray.push(i);
+				}
+			}
+		}
+<?php
+	} else {
+	$targetName = "file";
+	$r = 0;
+	function phpGrep($q, $path, $base) {
+		$fp = opendir($path);
+		global $r, $ICEcoder, $serverType, $selectedFiles;
+		if (!isset($ret)) {$ret="";};
+		$slash = $serverType == "Windows" ? "\\" : "/";
+		while($f = readdir($fp)) {
+			if(preg_match("#^\.+$#", $f)) continue;
+			$fullPath = $path.$slash.$f;
+			if(is_dir($fullPath)) {
+				$ret .= phpGrep($q, $fullPath, $base);
+			} else if(stristr(file_get_contents($fullPath), $q)) {
+				$bFile = false;
+				$foundInSelFile = false;
+				for ($i=0;$i<count($ICEcoder['bannedFiles']);$i++) {
+					if (strpos($f,$ICEcoder['bannedFiles'][$i])!==false) {$bFile = true;};
+				}
+				$findPath = str_replace($base,"",$fullPath);
+				for ($i=0;$i<count($selectedFiles);$i++) {
+					if (strpos($findPath,str_replace("|","/",$selectedFiles[$i]))===0) {
+						$foundInSelFile = true;
+					}
+				}
+				if (!$bFile && (count($selectedFiles)==0 || count($selectedFiles)>0 && $foundInSelFile)) {
+					$ret .= "<a href=\\\"javascript:top.ICEcoder.openFile('".$fullPath."');top.ICEcoder.showHide('hide',top.document.getElementById('blackMask'))\\\">";
+					$ret .= str_replace($base,"",$fullPath)."</a><div id=\\\"foundCount".$r."\\\">Found ".substr_count(strtolower(file_get_contents($fullPath)),$q)." times</div>";
+					if (isset($_GET['replace'])) {
+						$ret .= "<div class=\\\"replace\\\" id=\\\"replace\\\" onClick=\\\"replaceInFileSingle('".$fullPath."');this.style.display=\'none\'\\\">replace</div>".PHP_EOL;
+					};
+					$ret .= '<hr>';
+					echo 'foundArray.push("'.$fullPath.'");'.PHP_EOL;
+					$r++;
+				}
+			}
+		}
+		return $ret;
+	}
+
+	$results = phpGrep($findText, $docRoot.$iceRoot, $docRoot.$iceRoot);
+	echo 'resultsDisplay += "'.$results.'";';
+?>
+<?php
+	}
+}
+?>
+showHide = foundArray.length==0 ? "hide" : "show";
+top.ICEcoder.showHide(showHide,top.document.getElementById('blackMask'));
+if (foundArray.length==0) {top.ICEcoder.message('No matches found')};
+<?php if (isset($_GET['replace'])) { ?>
+if (foundArray.length!=0) {document.getElementById('replaceAll').style.opacity = 1};
+<?php ;}; ?>
+plural = foundArray.length >= 2 ? "s" : "";
+targetName = "<?php echo $targetName;?>";
+selectedText = foundInSelected ? "selected " : "";
+document.getElementById('title').innerHTML = findText.replace(/&/g,"&amp;").replace(/>/g,"&gt;").replace(/</g,"&lt;").replace(/"/g,"&quot;").replace(/'/g,"&apos;")+" found in "+foundArray.length+" "+selectedText+targetName+plural;
+document.getElementById('results').innerHTML = resultsDisplay;
+
+var gotoTab = function(tab) {
+	top.ICEcoder.switchTab(tab);
+	top.ICEcoder.showHide('hide',top.document.getElementById('blackMask'));
+}
+
+var replaceSingle = function(tab) {
+	top.ICEcoder.switchTab(tab);
+	cM = top.ICEcoder.getcMInstance();
+	content = cM.getValue();
+	cM.setValue(cM.getValue().replace(rExp,top.document.getElementById('replace').value));
+	document.getElementById('foundCount'+tab).innerHTML = document.getElementById('foundCount'+tab).innerHTML.replace('Found','Replaced');
+}
+
+var replaceAll = function() {
+	for (var i=0;i<=foundArray.length-1;i++) {
+		replaceSingle(foundArray[i]);
+	}
+	top.ICEcoder.showHide('hide',top.document.getElementById('blackMask'));
+}
+
+var replaceInFileSingle = function(fileRef) {
+	top.ICEcoder.replaceInFile(fileRef,findText,'<?php if(isset($_GET['replace'])) {echo strClean($_GET['replace']);}; ?>');
+}
+
+var replaceInFilesAll = function() {
+	for (var i=0;i<=foundArray.length-1;i++) {
+		replaceInFileSingle(foundArray[i]);
+	}
+	top.ICEcoder.showHide('hide',top.document.getElementById('blackMask'));
+}
+
+var renameSingle = function(arrayRef) {
+	fileRef = spansArray[arrayRef].id.replace(/\|/g,"/").replace(/_perms/g,"");
+	newName = spansArray[arrayRef].id.replace(/\|/g,"/").replace(/_perms/g,"").replace(find,"<?php if(isset($_GET['replace'])) {echo strClean($_GET['replace']);}; ?>");
+	top.ICEcoder.renameFile(fileRef,newName);
+}
+
+var renameAll = function() {
+	for (var i=0;i<=foundArray.length-1;i++) {
+		renameSingle(foundArray[i]);
+	}
+	top.ICEcoder.showHide('hide',top.document.getElementById('blackMask'));
+}
+</script>
+
+</body>
+
 </html>
\ No newline at end of file
