From 29de36f3483aac8af668021ffa1156eb491b5123 Mon Sep 17 00:00:00 2001
From: Matt Pass <matt@mattpass.com>
Date: Tue, 26 Feb 2013 13:15:09 +0000
Subject: [PATCH] Removing branch & branchReload, this now default

No need to work with the treeType of branch or branchReload, as
reloading branches are now the default and only tree type
---
 lib/get-tree.php | 48 +++++++++++++++++++++++-------------------------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/lib/get-tree.php b/lib/get-tree.php
index 2d71cad..34a12f9 100644
--- a/lib/get-tree.php
+++ b/lib/get-tree.php
@@ -1,5 +1,5 @@
 <?php
-if (!isset($ICEcoder['treeType'])) {
+if (!isset($ICEcoder['root'])) {
 	include("settings.php");
 }
 
@@ -14,31 +14,29 @@ $dirCount=0;
 <div id="branch">
 <?php
 // If we're just getting a branch, get that and set as the finalArray
-if ($ICEcoder['treeType'] == "branch" || $ICEcoder['treeType'] == "branchReload") {
-	$scanDir = ($docRoot && $iceRoot) ? $docRoot.$iceRoot : $_SERVER['DOCUMENT_ROOT'];
-	$location = "";
-	if (isset($_GET['location'])) {
-		$location = str_replace("|","/",$_GET['location']);
-	}
-
-	$dirArray = $filesArray = $finalArray = array();
-	$finalArray = scanDir($scanDir.$location);
-	foreach($finalArray as $entry) {
-		$canAdd = true;
-		for ($i=0;$i<count($_SESSION['bannedFiles']);$i++) {
-			if(strpos($entry,$_SESSION['bannedFiles'][$i])!==false) {$canAdd = false;}
-		}
-		if ($entry != "." && $entry != ".." && $canAdd) {
-			is_dir($docRoot.$iceRoot.$location."/".$entry)
-			? array_push($dirArray,$location."/".$entry)
-			: array_push($filesArray,$location."/".$entry);
-		}
-	}
-	natcasesort($dirArray);
-	natcasesort($filesArray);
-	$finalArray = array_merge($dirArray,$filesArray);
+$scanDir = ($docRoot && $iceRoot) ? $docRoot.$iceRoot : $_SERVER['DOCUMENT_ROOT'];
+$location = "";
+if (isset($_GET['location'])) {
+	$location = str_replace("|","/",$_GET['location']);
 }
 
+$dirArray = $filesArray = $finalArray = array();
+$finalArray = scanDir($scanDir.$location);
+foreach($finalArray as $entry) {
+	$canAdd = true;
+	for ($i=0;$i<count($_SESSION['bannedFiles']);$i++) {
+		if(strpos($entry,$_SESSION['bannedFiles'][$i])!==false) {$canAdd = false;}
+	}
+	if ($entry != "." && $entry != ".." && $canAdd) {
+		is_dir($docRoot.$iceRoot.$location."/".$entry)
+		? array_push($dirArray,$location."/".$entry)
+		: array_push($filesArray,$location."/".$entry);
+	}
+}
+natcasesort($dirArray);
+natcasesort($filesArray);
+$finalArray = array_merge($dirArray,$filesArray);
+
 for ($i=0;$i<count($finalArray);$i++) {
 	$fileFolderName = str_replace("\\","/",$finalArray[$i]);
 	$type = is_dir($docRoot.$iceRoot.$fileFolderName) ? "folder" : "file";
@@ -62,7 +60,7 @@ for ($i=0;$i<count($finalArray);$i++) {
 		$fileAtts = '<span style="color: #888; font-size: 8px" id="'.str_replace($docRoot,"",str_replace("/","|",$fileFolderName)).'_perms">'.$chmodInfo.'</span>';
 	}
 	$type == "folder" ? $class = 'pft-directory' : $class = 'pft-file '.strtolower($ext);
-	$loadParam = $type == "folder" && ($ICEcoder['treeType'] == "branch" || $ICEcoder['treeType'] == "branchReload") ? "true" : "false";
+	$loadParam = $type == "folder" ? "true" : "false";
 	echo "<li class=\"".$class."\"><a nohref title=\"$fileFolderName\" onMouseOver=\"top.ICEcoder.overFileFolder('$type','".str_replace($docRoot,"",str_replace("/","|",$fileFolderName))."')\" onMouseOut=\"top.ICEcoder.overFileFolder('$type','')\" onClick=\"top.ICEcoder.openCloseDir(this,$loadParam)\" style=\"position: relative; left:-22px\">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span id=\"".str_replace($docRoot,"",str_replace("/","|",$fileFolderName))."\">".basename($fileFolderName)."</span> ".$fileAtts."</a>\n";
 	if ($i<count($finalArray)) {echo "</li>\n";}
 	$lastPath = $fileFolderName;