From e3431f201c17c38e9c73319b1827887fdca92be6 Mon Sep 17 00:00:00 2001
From: Matt Pass <matt@mattpass.com>
Date: Tue, 26 Feb 2013 13:10:18 +0000
Subject: [PATCH] Setting treeType is no longer an option

Branch loading is now the default and only way to view a tree
---
 lib/config-template.php | 1 -
 lib/settings-screen.php | 9 ---------
 lib/settings.php        | 5 ++---
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/lib/config-template.php b/lib/config-template.php
index 50cee33..595b6e1 100644
--- a/lib/config-template.php
+++ b/lib/config-template.php
@@ -1,7 +1,6 @@
 <?php
 $ICEcoder = array(
 "root"			=> "",
-"treeType"		=> "full",
 "tabsIndent"		=> true,
 "checkUpdates"		=> true,
 "openLastFiles"		=> true,
diff --git a/lib/settings-screen.php b/lib/settings-screen.php
index 726ab65..a239475 100644
--- a/lib/settings-screen.php
+++ b/lib/settings-screen.php
@@ -168,15 +168,6 @@ function findSequence(goal) {
 	<h2>file manager</h2>
 	root <span style="font-size: 10px; color: #888">slash prefixed</span><br>
 	<input type="text" name="root" style="width: 200px" onkeydown="document.settings.changedFileSettings.value='true';showButton()" value="<?php echo $ICEcoder["root"];?>">
-
-	<span style="position: absolute; margin: -39px 0 0 210px">
-		tree type<br>
-		<select onchange="document.settings.changedFileSettings.value='true';showButton()" name="treeType">
-			<option value="full"<?php if($ICEcoder["treeType"]=="full") {echo " selected";};?>>full</option>
-			<option value="branch"<?php if($ICEcoder["treeType"]=="branch") {echo " selected";};?>>branch</option>
-			<option value="branchReload"<?php if($ICEcoder["treeType"]=="branchReload") {echo " selected";};?>>branch reload</option>
-		</select>
-	</span>
 </span>
 
 <script>
diff --git a/lib/settings.php b/lib/settings.php
index 74c2283..433eed9 100644
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -71,7 +71,6 @@ if (!$demoMode && isset($_SESSION['loggedIn']) && $_SESSION['loggedIn'] && isset
 
 	// Prepare all our vars
 	$ICEcoder["root"]			= strClean($_POST['root']);
-	$ICEcoder["treeType"]			= strClean($_POST['treeType']);
 	$ICEcoder["tabsIndent"]			= isset($_POST['tabsIndent']) && $_POST['tabsIndent'] ? "true" : "false";
 	$ICEcoder["checkUpdates"]		= isset($_POST['checkUpdates']) && $_POST['checkUpdates'] ? "true" : "false";
 	$ICEcoder["openLastFiles"]		= isset($_POST['openLastFiles']) && $_POST['openLastFiles'] ? "true" : "false";
@@ -88,11 +87,11 @@ if (!$demoMode && isset($_SESSION['loggedIn']) && $_SESSION['loggedIn'] && isset
 	$ICEcoder["lineWrapping"]		= strClean($_POST['lineWrapping']);
 	$ICEcoder["tabWidth"]			= numClean($_POST['tabWidth']);
 
-	$settingsArray = array("root","treeType","tabsIndent","checkUpdates","openLastFiles","findFilesExclude","codeAssist","visibleTabs","lockedNav","accountPassword","bannedFiles","bannedPaths","allowedIPs","plugins","theme","lineWrapping","tabWidth");
+	$settingsArray = array("root","tabsIndent","checkUpdates","openLastFiles","findFilesExclude","codeAssist","visibleTabs","lockedNav","accountPassword","bannedFiles","bannedPaths","allowedIPs","plugins","theme","lineWrapping","tabWidth");
 	$settingsNew = "";
 	for ($i=0;$i<count($settingsArray);$i++) {
 		$settingsNew .= '"'.$settingsArray[$i].'"'.PHP_EOL.'	=> ';
-		$settingWrap = $settingsArray[$i]=="root"||$settingsArray[$i]=="treeType"||$settingsArray[$i]=="accountPassword"||$settingsArray[$i]=="theme" ? '"' : '';
+		$settingWrap = $settingsArray[$i]=="root"||$settingsArray[$i]=="accountPassword"||$settingsArray[$i]=="theme" ? '"' : '';
 		$settingsNew .= $settingWrap.$ICEcoder[$settingsArray[$i]].$settingWrap.','.PHP_EOL.PHP_EOL;
 	}