Merge branch 'temp'

Conflicts: lib/settings.php Fixing stupid Github problems
Version 0.8.5
2026-03-17 05:47:03 +01:00 · 2012-09-19 09:42:57 +01:00 · 2012-09-19 09:15:39 +01:00 · 2012-09-19 09:14:49 +01:00 · 2012-09-19 09:10:08 +01:00 · 2012-09-19 09:02:14 +01:00
15 changed files with 228 additions and 348 deletions
--- a/editor.php
+++ b/editor.php
@@ -17,12 +17,12 @@ foldcode, searchcursor, match-highlighter
 //-->
 <script src="<?php echo $ICEcoder["codeMirrorDir"]; ?>/lib/codemirror-compressed.js"></script>
 <link rel="stylesheet" href="<?php
-$ICEcoder["theme"]=="default" ? echo 'lib/editor.css' : echo $ICEcoder["codeMirrorDir"].'/theme/'.$ICEcoder["theme"].'.css';
+if ($ICEcoder["theme"]=="default") {echo 'lib/editor.css';} else {echo $ICEcoder["codeMirrorDir"].'/theme/'.$ICEcoder["theme"].'.css';};
 $activeLineBG = $ICEcoder["theme"]=="eclipse" || $ICEcoder["theme"]=="elegant" || $ICEcoder["theme"]=="neat" ? "#ccc" : "#000";
 ?>">
 <style type="text/css">
 .CodeMirror {position: absolute; width: 0; background-color: #fff; color: #000; top: 0px; width: 100%; z-index: 1}
-.CodeMirror-scroll {height: 100%}
+.CodeMirror-scroll {height: auto; overflow: visible}
 /* Make sure this next one remains the 3rd item, updated with JS */
 .cm-s-activeLine {background: <?php echo $activeLineBG;?> !important}
 span.CodeMirror-matchhighlight {background: #555}
@@ -35,47 +35,47 @@ span.CodeMirror-matchhighlight {background: #555}
 <body onLoad="top.ICEcoder.updateFileFolderCount()" style="color: #fff; margin: 0" onKeyDown="return top.ICEcoder.interceptKeys('content', event);" onKeyUp="top.ICEcoder.resetKeys(event);">

 <div style="margin: 32px 43px; font-family: arial; font-size: 10px; color: #ddd">
-<?php if($_SESSION['userLevel'] == 10) {
-	echo '<div style="float: left; margin-right: 50px">'.PHP_EOL;
-	echo '<h2 style="color: rgba(0,198,255,0.7)">server</h2>'.PHP_EOL;
-	echo '<span style="color:#888">Server name, OS & IP:</span><br>'.PHP_EOL;
-	echo $_SERVER['SERVER_NAME'].' &nbsp;&nbsp; '.$_SERVER['SERVER_SOFTWARE'].' &nbsp;&nbsp; '.$_SERVER['SERVER_ADDR'].'<br><br>'.PHP_EOL;
-	echo '<span style="color:#888">Root:</span><br>'.PHP_EOL;
-	echo $docRoot.'<br><br>'.PHP_EOL;
-	echo '<span style="color:#888">ICEcoder root:</span><br>'.PHP_EOL;
-	echo $docRoot.$ICEcoder['root'].'<br><br>'.PHP_EOL;
-	echo '<span style="color:#888">PHP version:</span><br>'.PHP_EOL;
-	echo phpversion().'<br><br>'.PHP_EOL;
-	echo '<span style="color:#888">Date & time:</span><br>'.PHP_EOL;
-	echo '<span id="serverDT"></span><br><br><br>'.PHP_EOL;
-	echo '</div>'.PHP_EOL;
+<?php
+echo '<div style="float: left; margin-right: 50px">'.PHP_EOL;
+echo '<h2 style="color: rgba(0,198,255,0.7)">server</h2>'.PHP_EOL;
+echo '<span style="color:#888">Server name, OS & IP:</span><br>'.PHP_EOL;
+echo $_SERVER['SERVER_NAME'].' &nbsp;&nbsp; '.$_SERVER['SERVER_SOFTWARE'].' &nbsp;&nbsp; '.$_SERVER['SERVER_ADDR'].'<br><br>'.PHP_EOL;
+echo '<span style="color:#888">Root:</span><br>'.PHP_EOL;
+echo $docRoot.'<br><br>'.PHP_EOL;
+echo '<span style="color:#888">ICEcoder root:</span><br>'.PHP_EOL;
+echo $docRoot.$ICEcoder['root'].'<br><br>'.PHP_EOL;
+echo '<span style="color:#888">PHP version:</span><br>'.PHP_EOL;
+echo phpversion().'<br><br>'.PHP_EOL;
+echo '<span style="color:#888">Date & time:</span><br>'.PHP_EOL;
+echo '<span id="serverDT"></span><br><br><br>'.PHP_EOL;
+echo '</div>'.PHP_EOL;

-	echo '<div style="float: left">'.PHP_EOL;
-	echo '<h2 style="color: rgba(0,198,255,0.7)">files</h2>'.PHP_EOL;
-	echo '<span style="color:#888">Last 10 files opened:</span><br>'.PHP_EOL;
-	$last10FilesArray = explode(",",$ICEcoder["last10Files"]);
-	for ($i=0;$i<count($last10FilesArray);$i++) {
-		if ($ICEcoder["last10Files"]=="") {
-			echo '[none]<br><br>';
-		} else {
-			echo '<a style="cursor:pointer" onClick="top.ICEcoder.openFile(\''.str_replace("|","/",$last10FilesArray[$i]).'\')">';
-			echo str_replace($docRoot,"",str_replace("|","/",$last10FilesArray[$i]));
-			echo '</a><br>'.PHP_EOL;
-			if ($i==count($last10FilesArray)-1) {echo '<br>'.PHP_EOL;};
-		}
+echo '<div style="float: left">'.PHP_EOL;
+echo '<h2 style="color: rgba(0,198,255,0.7)">files</h2>'.PHP_EOL;
+echo '<span style="color:#888">Last 10 files opened:</span><br>'.PHP_EOL;
+$last10FilesArray = explode(",",$ICEcoder["last10Files"]);
+for ($i=0;$i<count($last10FilesArray);$i++) {
+	if ($ICEcoder["last10Files"]=="") {
+		echo '[none]<br><br>';
+	} else {
+		echo '<a style="cursor:pointer" onClick="top.ICEcoder.openFile(\''.str_replace("|","/",$last10FilesArray[$i]).'\')">';
+		echo str_replace($docRoot,"",str_replace("|","/",$last10FilesArray[$i]));
+		echo '</a><br>'.PHP_EOL;
+		if ($i==count($last10FilesArray)-1) {echo '<br>'.PHP_EOL;};
 	}
-	echo '<span style="color:#888">File & folder count:</span><br>'.PHP_EOL;
-	echo '<div id="fileFolderCounts"></div><br><br><br>'.PHP_EOL;
-	echo '</div>'.PHP_EOL;
+}
+echo '<span style="color:#888">File & folder count:</span><br>'.PHP_EOL;
+echo '<div id="fileFolderCounts"></div><br><br><br>'.PHP_EOL;
+echo '</div>'.PHP_EOL;

-	echo '<div style="clear: both">'.PHP_EOL;
-	echo '<h2 style="color: rgba(0,198,255,0.7)">your device</h2>'.PHP_EOL;
-	echo '<span style="color:#888">Browser:</span><br>'.PHP_EOL;
-	echo $_SERVER['HTTP_USER_AGENT'].'<br><br>'.PHP_EOL;
-	echo '<span style="color:#888">Your IP:</span><br>'.PHP_EOL;
-	echo $_SERVER['REMOTE_ADDR'].PHP_EOL;
-	echo '</div>'.PHP_EOL;
-}; ?>
+echo '<div style="clear: both">'.PHP_EOL;
+echo '<h2 style="color: rgba(0,198,255,0.7)">your device</h2>'.PHP_EOL;
+echo '<span style="color:#888">Browser:</span><br>'.PHP_EOL;
+echo $_SERVER['HTTP_USER_AGENT'].'<br><br>'.PHP_EOL;
+echo '<span style="color:#888">Your IP:</span><br>'.PHP_EOL;
+echo $_SERVER['REMOTE_ADDR'].PHP_EOL;
+echo '</div>'.PHP_EOL;
+?>
 <script>
 var nDT=<?php echo time()*1000;?>;
 setInterval(function(){
--- a/files.php
+++ b/files.php
@@ -66,7 +66,7 @@ for ($i=0;$i<count($tempArray);$i++) {
 	for ($j=$insertAt;$j<count($finalArray);$j++) {
 		if (	strcasecmp(dirname($finalArray[$j]), dirname($tempArray[$i]))==0 &&
 			strcasecmp(basename($finalArray[$j]), basename($tempArray[$i]))<0 ||
-			strstr(dirname($finalArray[$j]),dirname($tempArray[$i]))) {
+			strpos(dirname($finalArray[$j]),dirname($tempArray[$i]))===0) {
 			$insertAt++;
 		}
 	}
@@ -121,11 +121,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);
-	if ($_SESSION['userLevel'] == 10 || ($_SESSION['userLevel'] < 10 && !$restrictedFile)) {
-		echo "<li class=\"".$class."\"><a nohref title=\"$fileFolderName\" onMouseOver=\"top.ICEcoder.overFileFolder('$type','".str_replace($docRoot,"",str_replace("/","|",$fileFolderName))."')\" onMouseOut=\"top.ICEcoder.overFileFolder('$type','')\" 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";
-	} else {
-		echo "<li class=\"".$class."\" style=\"cursor: default\"><span style=\"position: relative; left:-22px; color: #888\" onClick=\"top.ICEcoder.message('Sorry, you need higher admin level rights to view.')\">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [HIDDEN]</span>";
-	}
+	echo "<li class=\"".$class."\"><a nohref title=\"$fileFolderName\" onMouseOver=\"top.ICEcoder.overFileFolder('$type','".str_replace($docRoot,"",str_replace("/","|",$fileFolderName))."')\" onMouseOut=\"top.ICEcoder.overFileFolder('$type','')\" 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;
 }
--- a/index.php
+++ b/index.php
@@ -43,7 +43,7 @@ window.onbeforeunload = function() {
 }

 previousFiles = [<?php
-	if ($ICEcoder["previousFiles"]!="" && $_SESSION['userLevel'] == 10) {
+	if ($ICEcoder["previousFiles"]!="") {
 		$openFilesArray = explode(",",$ICEcoder["previousFiles"]);
 		echo "'".implode("','",$openFilesArray)."'";
 	}
@@ -55,10 +55,7 @@ showFileMenu = function() {
 <script language="JavaScript" src="lib/coder.js"></script>
 </head>

-<body onLoad="ICEcoder.init(<?php
-if ($_SESSION['userLevel'] == 10) {echo "'login'";};
-echo ")".$updateMsg.$onLoadExtras;
-?>" onResize="ICEcoder.setLayout()" onKeyDown="return ICEcoder.interceptKeys('coder',event);" onKeyUp="parent.ICEcoder.resetKeys(event);">
+<body onLoad="ICEcoder.init()<?php echo $updateMsg.$onLoadExtras;?>" onResize="ICEcoder.setLayout()" onKeyDown="return ICEcoder.interceptKeys('coder',event);" onKeyUp="parent.ICEcoder.resetKeys(event);">

 <div id="blackMask" class="blackMask" onClick="ICEcoder.showHide('hide',this)">
 	<div class="popupVCenter">
@@ -101,14 +98,6 @@ echo ")".$updateMsg.$onLoadExtras;

 <div id="files" class="files" onMouseOver="ICEcoder.changeFilesW('expand')" onMouseOut="ICEcoder.changeFilesW('contract'); top.document.getElementById('fileMenu').style.display='none';">
 	<div class="account" id="account">
-		<div class="accountLoginContainer" id="accountLoginContainer">
-			<div class="accountLogin" id="accountLogin">
-				<form name="login" action="lib/settings.php" method="POST" target="ff">
-				<input type="password" name="loginPassword" class="accountPassword">
-				<input type="submit" name="submit" value="Login" class="button">
-				</form>
-			</div>
-		</div>
 		<div class="accountOptions">
 			<div title="Save" onClick="ICEcoder.fMIcon('save')" id="fMSave" class="save"></div>
 			<div title="Open" onClick="ICEcoder.fMIcon('open')" id="fMOpen" class="open"></div>
--- a/lib/coder.css
+++ b/lib/coder.css
@@ -76,15 +76,8 @@ h2 {font-size: 18px; font-weight: normal; color: #fff}
 	box-shadow: 0 0 10px 4px rgba(0,0,0,0.4);
 }
 .files .account {display: inline-block; height: 50px; width: 250px; margin-top: 40px; background-color: #888}
-.files .accountLoginContainer {position: absolute; width: 250px; height: 50px; z-index: 1}
-.files .accountLoginContainer .accountLogin {position: absolute; width: 250px; height: 50px; top: 0; background-color: #666;
-	-webkit-transition: top 0.3s;
-	-moz-transition: top 0.3s;
-	transition: top 0.3s;
-}
 .files .accountOptions {position: relative; height: 32px; width: 100%; margin-left: 15px; margin-top: 8px}
 .files .accountOptions div {display: inline-block; background: url('../images/file-manager-icons.png') 0 0 no-repeat; cursor: pointer}
-.files .accountPassword {position: relative; border: 0; background-color: #333; color: #fff; height: 18px; width: 140px; margin-left: 14px; margin-top: 16px}
 .files .accountOptions .save {width: 30px; height: 32px; opacity: 0.3}
 .files .accountOptions .open {width: 25px; height: 32px; background-position: -32px -3px; margin: 3px 0 0 7px; opacity: 0.3}
 .files .accountOptions .newFile {width: 15px; height: 16px; background-position: -64px 0; margin: 8px 0 0 10px; opacity: 0.3}
--- a/lib/coder.js
+++ b/lib/coder.js
@@ -31,7 +31,7 @@ var ICEcoder = {

 	// Set our aliases
 	initAliases: function() {
-		var aliasArray = ["header","files","account","accountLogin","fmLock","filesFrame","editor","tabsBar","findBar","content","footer","nestValid","nestDisplay","charDisplay"];
+		var aliasArray = ["header","files","account","fmLock","filesFrame","editor","tabsBar","findBar","content","footer","nestValid","nestDisplay","charDisplay"];

 		// Create our ID aliases
 		for (var i=0;i<aliasArray.length;i++) {
@@ -40,21 +40,13 @@ var ICEcoder = {
 	},

 	// On load, set the layout and get the nest location
-	init: function(login) {
+	init: function() {
 		// Set layout & the nest location
 		ICEcoder.setLayout();

-		// Hide the loading screen
+		// Hide the loading screen & auto open last files?
 		top.document.getElementById('loadingMask').style.visibility = "hidden";
-
-		// If we're logging in, slide the login area to reveal the icons
-		if (login) {
-			top.document.getElementById('accountLogin').style.top = "-50px";
-			setTimeout(function() {top.document.getElementById('accountLoginContainer').style.display = "none";},300);
-			if (top.openLastFiles) {top.ICEcoder.autoOpenFiles()};
-		} else {
-			top.document.getElementsByName('loginPassword')[0].focus();
-		}
+		if (top.openLastFiles) {top.ICEcoder.autoOpenFiles()};

 		// Add drag based events to our tabs
 		var tabs = document.querySelectorAll('.tab');
@@ -70,7 +62,7 @@ var ICEcoder = {

 	// Set our layout according to the browser size
 	setLayout: function(dontSetEditor) {
-		var winW, winH, headerH, footerH, accountH, tabsBarH, findBarH, cMCSS;
+		var winW, winH, headerH, footerH, accountH, tabsBarH, findBarH;

 		// Determin width & height available
 		winW = window.innerWidth ? window.innerWidth : document.body.clientWidth;
@@ -79,7 +71,7 @@ var ICEcoder = {
 		// Apply sizes to various elements of the page
 		headerH = 40, footerH = 30, accountH = 50, tabsBarH = 21, findBarH = 28;
 		this.header.style.width = this.tabsBar.style.width = this.findBar.style.width = winW + "px";
-		this.files.style.width = this.accountLogin.style.width = this.editor.style.left = this.filesW + "px";
+		this.files.style.width = this.editor.style.left = this.filesW + "px";
 		this.account.style.height = this.accountH + "px";
 		this.fmLock.style.marginLeft = (this.filesW-42) + "px";
 		this.filesFrame.style.height = (winH-headerH-accountH-footerH) + "px";
@@ -88,17 +80,12 @@ var ICEcoder = {
 		if (!dontSetEditor) {
 			this.editor.style.width = ICEcoder.content.style.width = (winW-this.filesW) + "px";
 			ICEcoder.content.style.height = (winH-headerH-footerH-tabsBarH-findBarH) + "px";
-
+			
 			// Resize the CodeMirror instances to match the window size
-			cMCSS = ICEcoder.content.contentWindow.document.styleSheets[2];
-			if (cMCSS) {
-				strCSS = cMCSS.rules ? 'rules' : 'cssRules';
-				for(var i=0;i<cMCSS[strCSS].length;i++) {
-					if(cMCSS[strCSS][i].selectorText==".CodeMirror-scroll") {
-						cMCSS[strCSS][i].style['height'] = ICEcoder.content.style.height;
-					}
-				}
-			}
+			setTimeout(function(){
+				for (i=0;i<top.ICEcoder.openFiles.length;i++) {
+				top.ICEcoder.content.contentWindow['cM'+ICEcoder.cMInstances[i]].setSize("100%",top.ICEcoder.content.style.height);
+			}},4);
 		}
 	},

@@ -785,7 +772,9 @@ var ICEcoder = {
 			top.ICEcoder.thisFileFolderLink=fileLink;
 			top.ICEcoder.thisFileFolderType="file";
 		}
-		if (top.ICEcoder.thisFileFolderLink!="" && top.ICEcoder.thisFileFolderType=="file") {
+		if (top.ICEcoder.isOpen(top.ICEcoder.thisFileFolderLink)!==false) {
+			top.ICEcoder.switchTab(top.ICEcoder.isOpen(top.ICEcoder.thisFileFolderLink)+1);
+		} else if (top.ICEcoder.thisFileFolderLink!="" && top.ICEcoder.thisFileFolderType=="file") {
 			var shortURL, canOpenFile;

 			// work out a shortened URL for the file
@@ -1058,6 +1047,8 @@ var ICEcoder = {
 				if (document.findAndReplace.target.value.indexOf("file")>=0) {
 					targetQS = "&target="+document.findAndReplace.target.value.replace(/ /g,"-");
 				}
+				find = find.replace(/\'/g, '&#39;');
+				find != encodeURIComponent(find) ? find = 'ICEcoder:'+encodeURIComponent(find) : find;
 				top.document.getElementById('mediaContainer').innerHTML = '<iframe src="lib/multiple-results.php?find='+find+replaceQS+targetQS+'" class="whiteGlow" style="width: 700px; height: 500px"></iframe>';
 			}
 		}
@@ -1537,20 +1528,21 @@ var ICEcoder = {

 	// Opens the last files we had open
 	autoOpenFiles: function() {
-		var loadFileURL;
-
 		for (var i=0;i<=top.previousFiles.length-1;i++) {
-			loadFileURL = top.previousFiles[i].replace(/\|/g, "/").replace(top.docRoot+top.iceRoot,"");
-			if (top.ICEcoder.openFiles.indexOf(loadFileURL)==-1) {
-				top.ICEcoder.rightClickedFile=top.ICEcoder.thisFileFolderLink=top.previousFiles[i].replace('|','/');
-				top.ICEcoder.thisFileFolderType='file';
-				top.ICEcoder.openFile();
-			}
+			top.ICEcoder.rightClickedFile=top.ICEcoder.thisFileFolderLink=top.previousFiles[i].replace('|','/');
+			top.ICEcoder.thisFileFolderType='file';
+			top.ICEcoder.openFile();
 		}
 	},

+	// Check if a file is already open
+	isOpen: function(file) {
+		file = file.replace(/\|/g, "/").replace(top.docRoot+top.iceRoot,"");
+		return top.ICEcoder.openFiles.indexOf(file)!=-1 ? top.ICEcoder.openFiles.indexOf(file) : false;
+	},
+
 	// Refresh file manager on demand
-	refreshFileManager: function(loginAttempt) {
+	refreshFileManager: function() {
 		top.document.getElementById('progressBar').style.webkitAnimation = top.document.getElementById('progressBar').style.mozAnimation = '';
 		setTimeout(function () {
 			top.document.getElementById('progressBar').style.webkitAnimation = top.document.getElementById('progressBar').style.mozAnimation = 'fullexpand 10s ease-out';
@@ -1561,19 +1553,6 @@ var ICEcoder = {
 		top.ICEcoder.filesFrame.onload = function() {
 			top.ICEcoder.filesFrame.style.opacity="1";
 			top.document.getElementById('loadingMask').style.visibility = "hidden";
-			if (loginAttempt) {
-				if (loginAttempt == "loginOK") {
-					if (top.ICEcoder.openFiles.length==0) {
-						top.ICEcoder.content.style.visibility='visible';
-						top.ICEcoder.content.src = "editor.php";
-					}
-					top.document.getElementById('accountLogin').style.top = "-50px";
-					setTimeout(function() {top.document.getElementById('accountLoginContainer').style.display = "none";},300);
-					if (top.openLastFiles) {top.ICEcoder.autoOpenFiles()};
-				} else {
-					top.ICEcoder.message('Sorry, that\'s not correct.');
-				}
-			}
 		}
 	},

--- a/lib/config.php
+++ b/lib/config.php
@@ -10,7 +10,7 @@ $ICEcoder = array(
 "lockedNav"		=> true,
 "accountPassword"	=> "",
 "restrictedFiles"	=> array("wp-",".php",".rb",".sql",".zip"),
-"bannedFiles"		=> array("_coder","wp-",".exe"),
+"bannedFiles"		=> array("_coder","ICEcoder"),
 "allowedIPs"		=> array("*"),
 "plugins"		=> array(
 			array("Adminer","plugins/adminer/icon.png","margin-top: 3px","plugins/adminer/adminer-3.4.0-mysql-en.php","_blank",""),
--- a/lib/file-control.php
+++ b/lib/file-control.php
@@ -31,18 +31,15 @@ if ($_GET['action']=="load") {
 				$bannedFile=true;
 			}
 		}
-		if (file_exists($file) && ($_SESSION['userLevel'] > 0 || ($_SESSION['userLevel'] == 0 && !$bannedFile))) {
+		if (file_exists($file)) {
 			echo '<script>fileType="text";';
 			echo 'top.ICEcoder.shortURL = top.ICEcoder.rightClickedFile = top.ICEcoder.thisFileFolderLink = "'.$fileLoc."/".$fileName.'";';
 			echo '</script>';
 			$loadedFile = file_get_contents($file);
 			echo '<textarea name="loadedFile" id="loadedFile">'.str_replace("</textarea>","<ICEcoder:/:textarea>",htmlentities($loadedFile)).'</textarea>';
-		} else if (!file_exists($file)) {
-			echo '<script>fileType="nothing";</script>';
-			echo '<script>top.ICEcoder.message(\'Sorry, '.$fileLoc."/".$fileName.' doesn\\\'t seem to exist on the server\');</script>';
 		} else {
 			echo '<script>fileType="nothing";</script>';
-			echo '<script>top.ICEcoder.message(\'Sorry, you need a higher admin level to view this file\');</script>';
+			echo '<script>top.ICEcoder.message(\'Sorry, '.$fileLoc."/".$fileName.' doesn\\\'t seem to exist on the server\');</script>';
 		}
 	};

@@ -53,35 +50,25 @@ if ($_GET['action']=="load") {

 // If we're due to add a new folder...
 if ($_GET['action']=="newFolder") {
-	if (is_writable($docRoot.$fileLoc) && $_SESSION['userLevel'] > 0) {
+	if (is_writable($docRoot.$fileLoc)) {
 		mkdir($file, 0705);
 		// Reload file manager
 		echo '<script>top.ICEcoder.selectedFiles=[];top.ICEcoder.updateFileManagerList(\'add\',\''.$fileLoc.'\',\''.$fileName.'\');action="newFolder";</script>';
 	} else {
-		echo "<script>top.ICEcoder.message('";
-		if (!is_writable($docRoot.$fileLoc)) {
-			echo "Sorry, cannot create folder at\\n".$fileLoc;
-		} else {
-			echo "Sorry, you need to be logged in to add folders";
-		}
-		echo "');action='nothing';</script>";
+		echo "<script>top.ICEcoder.message('Sorry, cannot create folder at\\n".$fileLoc."');action='nothing';</script>";
 	}
 	echo '<script>top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);</script>';
 }

 // If we're due to rename a file/folder...
 if ($_GET['action']=="rename") {
-	if ($_SESSION['userLevel'] > 0 && is_writable($docRoot.$iceRoot.str_replace("|","/",strClean($_GET['oldFileName'])))) {
+	if (is_writable($docRoot.$iceRoot.str_replace("|","/",strClean($_GET['oldFileName'])))) {
 		rename($docRoot.$iceRoot.str_replace("|","/",strClean($_GET['oldFileName'])),$docRoot.$fileLoc."/".$fileName);
 		// Reload file manager
 		echo '<script>top.ICEcoder.selectedFiles=[];top.ICEcoder.updateFileManagerList(\'rename\',\''.$fileLoc.'\',\''.$fileName.'\',\'\',\''.str_replace($iceRoot,"",strClean($_GET['oldFileName'])).'\');';
 		echo 'action="rename";</script>';
 	} else {
-		if (!is_writable($_GET['oldFileName'])) {
-			echo "<script>top.ICEcoder.message('Sorry, cannot rename\\n".strClean($_GET['oldFileName'])."');</script>";
-		} else {
-			echo '<script>top.ICEcoder.message(\'Sorry, you need to be logged in to rename\');</script>';
-		}
+		echo "<script>top.ICEcoder.message('Sorry, cannot rename\\n".strClean($_GET['oldFileName'])."');</script>";
 		echo '<script>action="nothing";</script>';
 	}
 	echo '<script>top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);</script>';
@@ -89,7 +76,7 @@ if ($_GET['action']=="rename") {

 // If we're due to replace text in a file...
 if ($_GET['action']=="replaceText") {
-	if ($_SESSION['userLevel'] > 0 && is_writable(str_replace("|","/",strClean($_GET['fileRef'])))) {
+	if (is_writable(str_replace("|","/",strClean($_GET['fileRef'])))) {
 		$file = str_replace("|","/",strClean($_GET['fileRef']));
 		$loadedFile = file_get_contents($file);
 		$newContent = str_replace(strClean($_GET['find']),strClean($_GET['replace']),$loadedFile);
@@ -98,11 +85,7 @@ if ($_GET['action']=="replaceText") {
 		fclose($fh);
 		echo '<script>action="replaceText";</script>';
 	} else {
-		if (!is_writable(str_replace("|","/",strClean($_GET['fileRef'])))) {
-			echo "<script>top.ICEcoder.message('Sorry, cannot replace text in\\n".strClean($_GET['fileRef'])."');</script>";
-		} else {
-			echo '<script>top.ICEcoder.message(\'Sorry, you need to be logged in to rename\');</script>';
-		}
+		echo "<script>top.ICEcoder.message('Sorry, cannot replace text in\\n".strClean($_GET['fileRef'])."');</script>";
 		echo '<script>action="nothing";</script>';
 	}
 	echo '<script>top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);</script>';
@@ -110,17 +93,13 @@ if ($_GET['action']=="replaceText") {

 // If we're due to change permissions on a file/folder...
 if ($_GET['action']=="perms") {
-	if ($_SESSION['userLevel'] > 0 && is_writable($file)) {
+	if (is_writable($file)) {
 		chmod($file,octdec(numClean($_GET['perms'])));
 		// Reload file manager
 		echo '<script>top.ICEcoder.selectedFiles=[];top.ICEcoder.updateFileManagerList(\'chmod\',\''.$fileLoc.'\',\''.$fileName.'\',\''.numClean($_GET['perms']).'\');';
 		echo 'action="perms";</script>';
 	} else {
-		if (!is_writable($file)) {
-			echo "<script>top.ICEcoder.message('Sorry, cannot change permissions on \\n".strClean($file)."');</script>";
-		} else {
-			echo '<script>top.ICEcoder.message(\'Sorry, you need to be logged in to change permissions\');</script>';
-		}
+		echo "<script>top.ICEcoder.message('Sorry, cannot change permissions on \\n".strClean($file)."');</script>";
 		echo '<script>action="nothing";</script>';
 	}
 	echo '<script>top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);</script>';
@@ -128,28 +107,19 @@ if ($_GET['action']=="perms") {

 // If we're due to delete a file...
 if ($_GET['action']=="delete") {
-	if ($_SESSION['userLevel'] > 0) {
-		$filesArray = split(";",$file); // May contain more than one file here
-		for ($i=0;$i<=count($filesArray)-1;$i++) {
-			if (is_writable($iceRoot.$filesArray[$i])) {
-				if (is_dir($iceRoot.$filesArray[$i])) { 
-					rrmdir($iceRoot.$filesArray[$i]);
-				} else {
-					unlink($iceRoot.$filesArray[$i]);
-				}
-				// Reload file manager
-				echo '<script>top.ICEcoder.selectedFiles=[];top.ICEcoder.updateFileManagerList(\'delete\',\''.$fileLoc.'\',\''.$fileName.'\');';
-				echo 'action="delete";</script>';
+	$filesArray = split(";",$file); // May contain more than one file here
+	for ($i=0;$i<=count($filesArray)-1;$i++) {
+		if (is_writable($iceRoot.$filesArray[$i])) {
+			if (is_dir($iceRoot.$filesArray[$i])) { 
+				rrmdir($iceRoot.$filesArray[$i]);
 			} else {
-				echo "<script>top.ICEcoder.message('Sorry can\\'t delete\\n".$filesArray[$i]."');</script>";
+				unlink($iceRoot.$filesArray[$i]);
 			}
-			echo '<script>action="nothing";</script>';
-		}
-	} else {
-		if (!is_writable($iceRoot.$filesArray[$i])) {
-			echo "<script>top.ICEcoder.message('Sorry, cannot delete\\n".$iceRoot.$filesArray[$i]."');</script>";
+			// Reload file manager
+			echo '<script>top.ICEcoder.selectedFiles=[];top.ICEcoder.updateFileManagerList(\'delete\',\''.$fileLoc.'\',\''.$fileName.'\');';
+			echo 'action="delete";</script>';
 		} else {
-			echo '<script>top.ICEcoder.message(\'Sorry, you need to be logged in to delete\');</script>';
+			echo "<script>top.ICEcoder.message('Sorry can\\'t delete\\n".$filesArray[$i]."');</script>";
 		}
 		echo '<script>action="nothing";</script>';
 	}
@@ -174,54 +144,50 @@ if ($_GET['action']=="save") {
 	echo '<script>action="save";</script>';
 	// on the form posting via a reload, save the file
 	if (isset($_POST['contents'])) {
-		if ($_SESSION['userLevel'] > 0) {
-			if ((file_exists($file) && is_writable($file)) || isset($_POST['newFileName']) && $_POST['newFileName']!="") {
-				if (filemtime($file)==$_GET['fileMDT']||!(isset($_GET['fileMDT']))) {
-					$fh = fopen($file, 'w') or die("Sorry, cannot save");
-					fwrite($fh, $_POST['contents']);
-					fclose($fh);
-					clearstatcache();
-					echo '<script>top.ICEcoder.openFileMDTs[top.ICEcoder.selectedTab-1]="'.filemtime($file).'";</script>';
-					// Reload file manager & rename tab if it was a new file
-					if (isset($_POST['newFileName']) && $_POST['newFileName']!="") {
-						echo '<script>top.ICEcoder.selectedFiles=[];top.ICEcoder.updateFileManagerList(\'add\',\''.$fileLoc.'\',\''.$fileName.'\');</script>';
-						echo '<script>top.ICEcoder.renameTab(top.ICEcoder.selectedTab,\''.$fileLoc."/".$fileName.'\');</script>';
-					}
-					// Reload stickytab window
-					echo '<script>if (top.ICEcoder.stickyTabWindow.location) {top.ICEcoder.stickyTabWindow.location.reload()};action="doneSave";</script>';
-				} else {
-					$loadedFile = file_get_contents($file);
-					echo '<textarea name="loadedFile" id="loadedFile">'.str_replace("</textarea>","<ICEcoder:/:textarea>",htmlentities($loadedFile)).'</textarea>';
-					echo '<textarea name="userVersionFile" id="userVersionFile"></textarea>';
-					?>
-					<script>
-					var refreshFile = top.ICEcoder.ask('Sorry, this file has changed, cannot save\n<?php echo $file;?>\n\nReload this file and copy your version to a new document?');
-					if (refreshFile) {
-						var cM = top.ICEcoder.getcMInstance();
-						var thisTab = top.ICEcoder.selectedTab;
-						document.getElementById('userVersionFile').value = cM.getValue();
-						// Revert back to original
-						cM.setValue(document.getElementById('loadedFile').value);
-						top.ICEcoder.changedContent[thisTab-1] = 0;
-						top.ICEcoder.openFileMDTs[top.ICEcoder.selectedTab-1] = "<?php echo filemtime($file); ?>";
-						cM.clearHistory();
-						// Now for the new file
-						top.ICEcoder.newTab();
-						cM = top.ICEcoder.getcMInstance();
-						cM.setValue(document.getElementById('userVersionFile').value);
-						cM.clearHistory();
-						// Finally, switch back to original tab
-						top.ICEcoder.switchTab(thisTab);
-					}
-					</script>
-					<?php
-					echo "<script>action='nothing';</script>";
+		if ((file_exists($file) && is_writable($file)) || isset($_POST['newFileName']) && $_POST['newFileName']!="") {
+			if (filemtime($file)==$_GET['fileMDT']||!(isset($_GET['fileMDT']))) {
+				$fh = fopen($file, 'w') or die("Sorry, cannot save");
+				fwrite($fh, $_POST['contents']);
+				fclose($fh);
+				clearstatcache();
+				echo '<script>top.ICEcoder.openFileMDTs[top.ICEcoder.selectedTab-1]="'.filemtime($file).'";</script>';
+				// Reload file manager & rename tab if it was a new file
+				if (isset($_POST['newFileName']) && $_POST['newFileName']!="") {
+					echo '<script>top.ICEcoder.selectedFiles=[];top.ICEcoder.updateFileManagerList(\'add\',\''.$fileLoc.'\',\''.$fileName.'\');</script>';
+					echo '<script>top.ICEcoder.renameTab(top.ICEcoder.selectedTab,\''.$fileLoc."/".$fileName.'\');</script>';
 				}
-        		} else {
-				echo "<script>top.ICEcoder.message('Sorry, cannot write\\n".$file."');action='nothing';</script>";
+				// Reload stickytab window
+				echo '<script>if (top.ICEcoder.stickyTabWindow.location) {top.ICEcoder.stickyTabWindow.location.reload()};action="doneSave";</script>';
+			} else {
+				$loadedFile = file_get_contents($file);
+				echo '<textarea name="loadedFile" id="loadedFile">'.str_replace("</textarea>","<ICEcoder:/:textarea>",htmlentities($loadedFile)).'</textarea>';
+				echo '<textarea name="userVersionFile" id="userVersionFile"></textarea>';
+				?>
+				<script>
+				var refreshFile = top.ICEcoder.ask('Sorry, this file has changed, cannot save\n<?php echo $file;?>\n\nReload this file and copy your version to a new document?');
+				if (refreshFile) {
+					var cM = top.ICEcoder.getcMInstance();
+					var thisTab = top.ICEcoder.selectedTab;
+					document.getElementById('userVersionFile').value = cM.getValue();
+					// Revert back to original
+					cM.setValue(document.getElementById('loadedFile').value);
+					top.ICEcoder.changedContent[thisTab-1] = 0;
+					top.ICEcoder.openFileMDTs[top.ICEcoder.selectedTab-1] = "<?php echo filemtime($file); ?>";
+					cM.clearHistory();
+					// Now for the new file
+					top.ICEcoder.newTab();
+					cM = top.ICEcoder.getcMInstance();
+					cM.setValue(document.getElementById('userVersionFile').value);
+					cM.clearHistory();
+					// Finally, switch back to original tab
+					top.ICEcoder.switchTab(thisTab);
+				}
+				</script>
+				<?php
+				echo "<script>action='nothing';</script>";
 			}
-		} else {
-			echo "<script>top.ICEcoder.message('Sorry, you need to be logged in to save');action='nothing';</script>";
+        	} else {
+			echo "<script>top.ICEcoder.message('Sorry, cannot write\\n".$file."');action='nothing';</script>";
 		}
 	echo '<script>top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);</script>';
 	}
--- a/lib/file-folder-properties.php
+++ b/lib/file-folder-properties.php
@@ -39,17 +39,13 @@ echo number_format($outputSize, 2, '.', '').$outputUnit." (".number_format($byte
 <br><br>
 <span class="column" style="width: 180px">Type: <?php echo is_dir($fileName) ? "Folder" : "File"; ?></span>
 <span class="column" style="margin: 0 10px">Readable / Writeable: <?php
-if ($_SESSION['userLevel'] == 10) {
-	echo is_readable($fileName) ? "Yes" : "No"; ?> / <?php echo is_writeable($fileName) ? "Yes" : "No";
-} else {
-	echo '[HIDDEN]';
-}
+echo is_readable($fileName) ? "Yes" : "No"; ?> / <?php echo is_writeable($fileName) ? "Yes" : "No";
 ?></span>
 <span class="column">Relative path: <?php echo str_replace($docRoot,"",$fileName);?></span>
 <span style="font-size:10px">
 <br><br>
 Absolute path:<br><?php
-echo $_SESSION['userLevel'] == 10 ? $fileName : '[HIDDEN]';
+echo $fileName;
 ?>
 <br><br>
 </span>
@@ -144,13 +140,7 @@ var validatePerms = function() {
 		permText.split("")[2]*1 <0 || permText.split("")[2]*1 >7) {
 		canUpdate = false;
 	}
-	<?php
-	if ($_SESSION['userLevel'] == 10) {
-	?>
 	if (canUpdate) {top.ICEcoder.chmod('<?php echo str_replace($docRoot,"",$fileName);?>',permText)};
-	<?php
-	;};
-	?>
 }
 </script>

--- a/lib/multiple-results.php
+++ b/lib/multiple-results.php
@@ -11,7 +11,7 @@
 <body class="results">

 <h1 id="title"></h1>
-<div class="resultsPane">
+<div class="resultsPane" id="resultsPane">
 	<div id="results"></div>
 </div>
 <?php if (isset($_GET['replace'])) { ?>
@@ -27,17 +27,22 @@
 <?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;
 <?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("<?php echo strClean($_GET['find']); ?>","g");
+var rExp = new RegExp(decodeURIComponent(findText),"g");
 for (var i=1;i<=top.ICEcoder.openFiles.length;i++) {
 	top.ICEcoder.switchTab(i);
 	var cM = top.ICEcoder.getcMInstance();
@@ -63,7 +68,7 @@ if (startTab!=top.ICEcoder.selectedTab) {
 		var spansArray = top.ICEcoder.filesFrame.contentWindow.document.getElementsByTagName('span');
 		for (var i=0;i<spansArray.length;i++) {
 			targetURL = spansArray[i].id.replace(/\|/g,"/");
-			if (targetURL.indexOf('<?php echo strClean($_GET['find']); ?>')>-1 && targetURL.indexOf('_perms')>-1) {
+			if (targetURL.indexOf(findText)>-1 && targetURL.indexOf('_perms')>-1) {
 				if (userTarget.indexOf("selected")>-1) {
 					for (var j=0;j<top.ICEcoder.selectedFiles.length;j++) {
 						if (top.ICEcoder.selectedFiles[j].indexOf(targetURL.replace(/\//g,"|").replace(/_perms/g,""))>-1) {
@@ -72,7 +77,7 @@ if (startTab!=top.ICEcoder.selectedTab) {
 					}
 				}
 				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\'))">'+ targetURL.replace(/\|/g,"/").replace(/_perms/g,"").replace(/<?php echo str_replace("/","\/",strClean($_GET['find'])); ?>/g,"<b><?php echo strClean($_GET['find']); ?></b>")+ '</a><br><div id="foundCount'+i+'">'+spansArray[i].innerHTML+', rename to '+targetURL.replace(/\|/g,"/").replace(/_perms/g,"").replace(/<?php echo str_replace("/","\/",strClean($_GET['find'])); ?>/g,"<b><?php echo strClean($_GET['replace']);?></b>")+'</div>';
+					resultsDisplay += '<a href="javascript:top.ICEcoder.openFile(\'<?php echo $docRoot;?>'+targetURL.replace(/\|/g,"/").replace(/_perms/g,"")+'\');top.ICEcoder.showHide(\'hide\',top.document.getElementById(\'blackMask\'))">'+ targetURL.replace(/\|/g,"/").replace(/_perms/g,"").replace(/<?php echo str_replace("/","\/",$findText); ?>/g,"<b>"+findText+"</b>")+ '</a><br><div id="foundCount'+i+'">'+spansArray[i].innerHTML+', rename to '+targetURL.replace(/\|/g,"/").replace(/_perms/g,"").replace(/<?php echo str_replace("/","\/",$findText); ?>/g,"<b><?php echo 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 ;}; ?>
@@ -98,10 +103,8 @@ if (startTab!=top.ICEcoder.selectedTab) {
 			} else if(stristr(file_get_contents($fullPath), $q)) {
 				$rFile = false;
 				$bFile = false;
-				if ($_SESSION['userLevel']==0) {
-					for ($i=0;$i<count($ICEcoder["restrictedFiles"]);$i++) {
-						if (strpos($f,$ICEcoder['restrictedFiles'][$i])>0) {$rFile = true;};
-					}
+				for ($i=0;$i<count($ICEcoder["restrictedFiles"]);$i++) {
+					if (strpos($f,$ICEcoder['restrictedFiles'][$i])>0) {$rFile = true;};
 				}
 				for ($i=0;$i<count($ICEcoder['bannedFiles']);$i++) {
 					if (strpos($f,$ICEcoder['bannedFiles'][$i])>0) {$bFile = true;};
@@ -121,7 +124,7 @@ if (startTab!=top.ICEcoder.selectedTab) {
 		return $ret;
 	}

-	$results = phpGrep(strClean($_GET['find']), $docRoot.$ICEroot, $docRoot.$ICEroot);
+	$results = phpGrep($findText, $docRoot.$ICEroot, $docRoot.$ICEroot);
 	echo 'resultsDisplay += "'.$results.'";';
 ?>
 <?php
@@ -137,7 +140,7 @@ if (foundArray.length!=0) {document.getElementById('replaceAll').style.opacity =
 foundArray.length >= 2 ? plural = "s" : plural = "";
 targetName = "<?php echo $targetName;?>";
 foundInSelected ? selectedText = "selected " : selectedText = "";
-document.getElementById('title').innerHTML = "'<?php echo strClean($_GET['find']); ?>' found in "+foundArray.length+" "+selectedText+targetName+plural;
+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) {
@@ -161,7 +164,7 @@ var replaceAll = function() {
 }

 var replaceInFileSingle = function(fileRef) {
-	top.ICEcoder.replaceInFile(fileRef,'<?php echo strClean($_GET['find']); ?>','<?php echo strClean($_GET['replace']); ?>');
+	top.ICEcoder.replaceInFile(fileRef,findText,'<?php echo strClean($_GET['replace']); ?>');
 }

 var replaceInFilesAll = function() {
@@ -173,7 +176,7 @@ var replaceInFilesAll = function() {

 var renameSingle = function(arrayRef) {
 	fileRef = spansArray[arrayRef].id.replace(/\|/g,"/").replace(/_perms/g,"");
-	newName = spansArray[arrayRef].id.replace(/\|/g,"/").replace(/_perms/g,"").replace(/<?php echo str_replace("/","\/",strClean($_GET['find'])); ?>/g,"<?php echo strClean($_GET['replace']); ?>");
+	newName = spansArray[arrayRef].id.replace(/\|/g,"/").replace(/_perms/g,"").replace(find,"<?php echo strClean($_GET['replace']); ?>");
 	top.ICEcoder.renameFile(fileRef,newName);
 }

--- a/lib/settings-screen.php
+++ b/lib/settings-screen.php
@@ -52,7 +52,7 @@ for ($i=0;$i<count($themeArray);$i++) {
 	<br><br>

 	file manager root:<br>
-	<?php echo $_SESSION['userLevel']==10 ? $ICEcoder['root'] : '[HIDDEN]';?>
+	<?php echo $ICEcoder['root'];?>
 	<br><br><br><br>

 	<div style="font-size: 10px; line-height: 12px">ICE coder by Matt Pass (<a href="http://www.twitter.com/mattpass" style="font-size: 10px" target="_blank">@mattpass</a>)<br><br>
@@ -202,7 +202,6 @@ var showHideTabs = function() {
 }

 var validatePasswords = function() {
-	<?php if($_SESSION['userLevel']==10) { ?>
 	if (document.settings.accountPassword.value != 0 && document.settings.accountPassword.value.length<8) {
 		top.ICEcoder.message('Please use at least 8 chars in the password');
 	} else {
@@ -212,9 +211,6 @@ var validatePasswords = function() {
 			document.settings.submit();
 		}
 	}
-	<?php } else { ?>
-		top.ICEcoder.message('Sorry, you need to be logged in to change settings');
-	<?php ;}; ?>
 }
 </script>

--- a/lib/settings.php
+++ b/lib/settings.php
@@ -29,13 +29,13 @@ include($settingsFile);

 // Add ICEcoder settings to beginning of $ICEcoder array
 $ICEcoder = array(
-	"versionNo"		=> "0.8.4",
+	"versionNo"		=> "0.8.5",
 	"codeMirrorDir"		=> "CodeMirror-2.33",
 	"cMThisVer"		=> 2.33
 )+$ICEcoder;

 // Update this config file?
-if (isset($_POST["theme"]) && $_POST["theme"] && $_SESSION['userLevel'] == 10) {
+if ($_SESSION['loggedIn'] && isset($_POST["theme"]) && $_POST["theme"]) {
 	$settingsContents = file_get_contents($settingsFile);
 	// Replace our settings vars
 	$repPosStart = strpos($settingsContents,'"root"');
@@ -86,18 +86,18 @@ if (isset($_POST["theme"]) && $_POST["theme"] && $_SESSION['userLevel'] == 10) {
 	echo "<script>top.ICEcoder.settingsScreen('hide');top.ICEcoder.useNewSettings('".$themeURL."',".$ICEcoder["tabsIndent"].",".$ICEcoder["codeAssist"].",".$ICEcoder["lockedNav"].",".$ICEcoder["visibleTabs"].",".$ICEcoder["tabWidth"].",".$refreshFM.");</script>";
 }

-// Define the docRoot & iceRoot
+// Establish our user level
+if (!isset($_SESSION['loggedIn'])) {$_SESSION['loggedIn'] = false;};
+if(isset($_POST['loginPassword']) && generateHash(strClean($_POST['loginPassword']),$ICEcoder["accountPassword"])==$ICEcoder["accountPassword"]) {$_SESSION['loggedIn'] = true; header('Location: ../');};
+$_SESSION['loggedIn'] = $_SESSION['loggedIn'];
+
+// Define the serverType, docRoot & iceRoot
+$serverType = stristr($_SERVER[SERVER_SOFTWARE], "win") ? "Windows" : "Linux";
 $docRoot = rtrim(str_replace("\\","/",$_SERVER['DOCUMENT_ROOT']));
 $iceRoot = rtrim(str_replace("\\","/",$ICEcoder["root"]));
-if ($_SESSION['userLevel'] == 10) {
+if ($_SESSION['loggedIn']) {
 	echo "<script>top.docRoot='".$docRoot."';top.iceRoot='".$iceRoot."'</script>";
 }
-$serverType = stristr($_SERVER[SERVER_SOFTWARE], "win") ? "Windows" : "Linux";
-
-// Establish our user level
-if (!isset($_SESSION['userLevel'])) {$_SESSION['userLevel'] = 0;};
-if(isset($_POST['loginPassword']) && generateHash(strClean($_POST['loginPassword']),$ICEcoder["accountPassword"])==$ICEcoder["accountPassword"]) {$_SESSION['userLevel'] = 10;};
-$_SESSION['userLevel'] = $_SESSION['userLevel'];

 // Setup our file security vars
 $settingsArray = array("findFilesExclude","restrictedFiles","bannedFiles","allowedIPs");
@@ -118,41 +118,39 @@ if (!$allowedIP) {
 };

 // Save the currently opened files for next time
-if (isset($_GET["saveFiles"]) && $_GET['saveFiles']) {
-	if ($_SESSION['userLevel'] == 10) {
-		$settingsContents = file_get_contents($settingsFile);
+if ($_SESSION['loggedIn'] && isset($_GET["saveFiles"]) && $_GET['saveFiles']) {
+	$settingsContents = file_get_contents($settingsFile);

-		// Replace our previousFiles var with the the current
-		$repPosStart = strpos($settingsContents,'previousFiles"		=> "')+20;
-		$repPosEnd = strpos($settingsContents,'",',$repPosStart)-$repPosStart;
-		if ($_GET['saveFiles']!="CLEAR") {
-			$saveFiles=strClean($_GET['saveFiles']);
-			$saveFilesArray = explode(",",$saveFiles);
-			$saveFiles="";
-			for ($i=0;$i<count($saveFilesArray);$i++) {
-				$saveFilesArray[$i] = str_replace("/","|",$docRoot).$saveFilesArray[$i];
-				$saveFiles .= $saveFilesArray[$i].",";
-			}
-			$saveFiles = rtrim($saveFiles,",");
-			$settingsContents = substr($settingsContents,0,$repPosStart).$saveFiles.substr($settingsContents,($repPosStart+$repPosEnd),strlen($settingsContents));
-			// Now update the config file
-			$fh = fopen($settingsFile, 'w') or die("Can't update config file. Please set public write permissions on lib/".$settingsFile);
-			fwrite($fh, $settingsContents);
+	// Replace our previousFiles var with the the current
+	$repPosStart = strpos($settingsContents,'previousFiles"		=> "')+20;
+	$repPosEnd = strpos($settingsContents,'",',$repPosStart)-$repPosStart;
+	if ($_GET['saveFiles']!="CLEAR") {
+		$saveFiles=strClean($_GET['saveFiles']);
+		$saveFilesArray = explode(",",$saveFiles);
+		$saveFiles="";
+		for ($i=0;$i<count($saveFilesArray);$i++) {
+			$saveFilesArray[$i] = str_replace("/","|",$docRoot).$saveFilesArray[$i];
+			$saveFiles .= $saveFilesArray[$i].",";
+		}
+		$saveFiles = rtrim($saveFiles,",");
+		$settingsContents = substr($settingsContents,0,$repPosStart).$saveFiles.substr($settingsContents,($repPosStart+$repPosEnd),strlen($settingsContents));
+		// Now update the config file
+		$fh = fopen($settingsFile, 'w') or die("Can't update config file. Please set public write permissions on lib/".$settingsFile);
+		fwrite($fh, $settingsContents);

-			// Update our last10Files var?
-			$last10FilesArray = explode(",",$ICEcoder["last10Files"]);
-			for ($i=0;$i<count($saveFilesArray);$i++) {
-				$inLast10Files = in_array($saveFilesArray[$i],$last10FilesArray);
-				if (!$inLast10Files && $saveFilesArray[$i] !="") {
-					$repPosStart = strpos($settingsContents,'last10Files"		=> "')+18;
-					$repPosEnd = strpos($settingsContents,'"',$repPosStart)-$repPosStart;
-					$commaExtra = $ICEcoder["last10Files"]!="" ? "," : "";
-					if (count($last10FilesArray)>=10) {$ICEcoder["last10Files"]=substr($ICEcoder["last10Files"],0,strrpos($ICEcoder["last10Files"],','));};
-					$settingsContents = substr($settingsContents,0,$repPosStart).$saveFilesArray[$i].$commaExtra.$ICEcoder["last10Files"].substr($settingsContents,($repPosStart+$repPosEnd),strlen($settingsContents));
-					// Now update the config file
-					$fh = fopen($settingsFile, 'w') or die("Can't update config file. Please set public write permissions on lib/".$settingsFile);
-					fwrite($fh, $settingsContents);
-				}
+		// Update our last10Files var?
+		$last10FilesArray = explode(",",$ICEcoder["last10Files"]);
+		for ($i=0;$i<count($saveFilesArray);$i++) {
+			$inLast10Files = in_array($saveFilesArray[$i],$last10FilesArray);
+			if (!$inLast10Files && $saveFilesArray[$i] !="") {
+				$repPosStart = strpos($settingsContents,'last10Files"		=> "')+18;
+				$repPosEnd = strpos($settingsContents,'"',$repPosStart)-$repPosStart;
+				$commaExtra = $ICEcoder["last10Files"]!="" ? "," : "";
+				if (count($last10FilesArray)>=10) {$ICEcoder["last10Files"]=substr($ICEcoder["last10Files"],0,strrpos($ICEcoder["last10Files"],','));};
+				$settingsContents = substr($settingsContents,0,$repPosStart).$saveFilesArray[$i].$commaExtra.$ICEcoder["last10Files"].substr($settingsContents,($repPosStart+$repPosEnd),strlen($settingsContents));
+				// Now update the config file
+				$fh = fopen($settingsFile, 'w') or die("Can't update config file. Please set public write permissions on lib/".$settingsFile);
+				fwrite($fh, $settingsContents);
 			}
 		}
 		fclose($fh);
@@ -160,10 +158,10 @@ if (isset($_GET["saveFiles"]) && $_GET['saveFiles']) {
 	echo '<script>top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);</script>';
 }

-// If we're updating or calling from the index.php page, do/redo plugins
-if ((isset($_POST["theme"]) && $_POST["theme"] && $_SESSION['userLevel'] == 10) || strpos($_SERVER['PHP_SELF'],"index.php")>0) {
+// If we're updating, do/redo plugins
+if ($_SESSION['loggedIn']) {
 	// If we're updating, we need to recreate the plugins array
-	if (isset($_POST["theme"]) && $_POST["theme"] && $_SESSION['userLevel'] == 10) {
+	if (isset($_POST["theme"]) && $_POST["theme"]) {
 		$ICEcoder["plugins"] = array();
 		$pluginsArray = explode("====================",str_replace("\"","",str_replace("\r","",str_replace("\n","",$_POST['plugins']))));
 		for ($i=0;$i<count($pluginsArray);$i++) {
@@ -179,9 +177,7 @@ if ((isset($_POST["theme"]) && $_POST["theme"] && $_SESSION['userLevel'] == 10)
 	};

 	// If we're updating, replace the plugin display with our newly established one
-	if (isset($_POST["theme"]) && $_POST["theme"] && $_SESSION['userLevel'] == 10) {
-		echo "<script>top.document.getElementById('pluginsContainer').innerHTML = '".$pluginsDisplay."';</script>";
-	}
+	echo "<script>top.document.getElementById('pluginsContainer').innerHTML = '".$pluginsDisplay."';</script>";

 	// Work out what plugins we'll need to set on a setInterval
 	$onLoadExtras = "";
@@ -192,7 +188,7 @@ if ((isset($_POST["theme"]) && $_POST["theme"] && $_SESSION['userLevel'] == 10)
 	};

 	// If we're updating our settings, clear existing setIntervals & the array refs, then start new ones
-	if (isset($_POST["theme"]) && $_POST["theme"] && $_SESSION['userLevel'] == 10) {
+	if (isset($_POST["theme"]) && $_POST["theme"]) {
 		?>
 		<script>
 		for (i=0;i<=top.ICEcoder.pluginIntervalRefs.length-1;i++) {
@@ -204,14 +200,28 @@ if ((isset($_POST["theme"]) && $_POST["theme"] && $_SESSION['userLevel'] == 10)
 		<?php
 	}

-	// Finally, show server data if we're logged in
-	if ($_SESSION['userLevel'] == 10) {
-		$onLoadExtras .= ";top.ICEcoder.content.style.visibility='visible'";
-	}
+	// Finally, show server data
+	$onLoadExtras .= ";top.ICEcoder.content.style.visibility='visible'";
 }

 // If we're due to show the settings screen
-if ($ICEcoder["accountPassword"] == "" && isset($_GET['settings'])) {
+if (!$_SESSION['loggedIn']) {
+	// If the password hasn't been set and we're setting it
+	if ($ICEcoder["accountPassword"] == "" && isset($_POST['accountPassword'])) {
+		$password = generateHash(strClean($_POST['accountPassword']));
+		$settingsFile = $settingsFile;
+		$settingsContents = file_get_contents($settingsFile);
+		// Replace our empty password with the one submitted by user
+		$settingsContents = str_replace('"accountPassword"	=> "",','"accountPassword"	=> "'.$password.'",',$settingsContents);
+		// Now update the config file
+		$fh = fopen($settingsFile, 'w') or die("Can't update config file. Please set public write permissions on ".$settingsFile);
+		fwrite($fh, $settingsContents);
+		fclose($fh);
+		// Set the session user level
+		$_SESSION['loggedIn'] = true;
+		// Finally, load again as now this file has changed and auto login
+		header('Location: ../');
+	}
 ?>
 	<!DOCTYPE html>

@@ -221,16 +231,16 @@ if ($ICEcoder["accountPassword"] == "" && isset($_GET['settings'])) {
 	<link rel="stylesheet" type="text/css" href="coder.css">
 	</head>

-	<body onLoad="document.settingsUpdate.accountPassword.focus()">
+	<body onLoad="document.settingsUpdate.<?php echo $ICEcoder["accountPassword"] == "" ? "account" : "login"; ?>Password.focus()">
 	
 	<div class="screenContainer" style="background-color: #141414">
 		<div class="screenVCenter">
 			<div class="screenCenter">
 			<img src="../images/ice-coder.png">
 			<div class="version">v <?php echo $ICEcoder["versionNo"];?></div>
-			<form name="settingsUpdate" action="../" method="POST">
-			<input type="password" name="accountPassword" class="accountPassword">
-			<input type="submit" name="submit" value="Set Password" class="button">
+			<form name="settingsUpdate" action="settings.php" method="POST">
+			<input type="password" name="<?php echo $ICEcoder["accountPassword"] == "" ? "account" : "login"; ?>Password" class="accountPassword">
+			<input type="submit" name="submit" value="<?php echo $ICEcoder["accountPassword"] == "" ? "Set Password" : "Login"; ?>" class="button">
 			</form>
 			</div>
 		</div>
@@ -240,51 +250,9 @@ if ($ICEcoder["accountPassword"] == "" && isset($_GET['settings'])) {

 	</html>
 <?php
-} else {
-	// If the password hasn't been set, set it, but only if we're including
-	// from the index.php file (as this file is included from multiple places)
-	if ($ICEcoder["accountPassword"] == "" && strpos($_SERVER['PHP_SELF'],"index.php")>0) {
-		// If we're setting a password
+}

-		if (isset($_POST['accountPassword'])) {
-			$password = generateHash(strClean($_POST['accountPassword']));
-			$settingsFile = 'lib/'.$settingsFile;
-			$settingsContents = file_get_contents($settingsFile);
-			// Replace our empty password with the one submitted by user
-			$settingsContents = str_replace('"accountPassword"	=> "",','"accountPassword"	=> "'.$password.'",',$settingsContents);
-			// Now update the config file
-			$fh = fopen($settingsFile, 'w') or die("Can't update config file. Please set public write permissions on ".$settingsFile);
-			fwrite($fh, $settingsContents);
-			fclose($fh);
-			// Set the session user level
-			$_SESSION['userLevel'] = 10;
-			// Finally, load again as now this file has changed and auto login
-			header('Location: index.php');
-		} else {
-			// We need to set the password
-			header('Location: lib/settings.php?settings=set');
-		}
-	}
-
-	// If we're logging in, refresh the file manager and show icons if login is correct
-	if(isset($_POST['loginPassword'])) {
-		if(isset($_POST['loginPassword']) && generateHash(strClean($_POST['loginPassword']),$ICEcoder["accountPassword"])==$ICEcoder["accountPassword"]) {
-			$loginAttempt = 'loginOK';
-			if ($ICEcoder["previousFiles"]!="") {
-				$openFilesArray = explode(",",$ICEcoder["previousFiles"]);
-				echo '<script>';
-				echo 'top.previousFiles = [';
-				for ($i=0;$i<count($openFilesArray);$i++) {
-					echo "'".$openFilesArray[$i]."'";
-					if ($i<count($openFilesArray)-1) {echo ",";};
-				}
-				echo '];';
-				echo '</script>';
-			}
-		} else {
-			$loginAttempt = 'loginFailed';
-		}
-		echo "<script>top.ICEcoder.refreshFileManager('".$loginAttempt."');</script>";
-	}
+if ((!$_SESSION['loggedIn'] || $ICEcoder["accountPassword"] == "") && !strpos($_SERVER['SCRIPT_NAME'],"lib/settings.php")) {
+	header('Location: lib/settings.php');
 }
 ?>
--- a/plugins/ice-repo/contents.php
+++ b/plugins/ice-repo/contents.php
@@ -1,6 +1,6 @@
 <?php
 session_start();
-if ($_SESSION['userLevel'] == 0) {
+if (!$_SESSION['loggedIn']) {
 	die("Sorry, you need to be logged in to use ICErepo");
 }

--- a/plugins/ice-repo/file-control.php
+++ b/plugins/ice-repo/file-control.php
@@ -1,6 +1,6 @@
 <?php
 session_start();
-if ($_SESSION['userLevel'] == 0) {
+if (!$_SESSION['loggedIn']) {
 	die("Sorry, you need to be logged in to use ICErepo");
 }
 // returns converted entities where there are HTML entity equivalents
--- a/plugins/ice-repo/index.php
+++ b/plugins/ice-repo/index.php
@@ -1,7 +1,7 @@
 <?php
 session_start();
-// $_SESSION['userLevel'] = 10;
-if ($_SESSION['userLevel'] == 0) {
+// $_SESSION['loggedIn'] = true;
+if (!$_SESSION['loggedIn']) {
 	die("Sorry, you need to be logged in to use ICErepo");
 }

--- a/plugins/zip-it/index.php
+++ b/plugins/zip-it/index.php
@@ -76,7 +76,7 @@ Class zipIt {
 		}
 	}
 }
-if($_SESSION['userLevel']==10) {
+if($_SESSION['loggedIn']) {
 	$doZip = new zipIt();
 	echo '<script>top.ICEcoder.serverMessage("<b>Zipping Files</b>");</script>';
 	$addToZip = $doZip->zipFilesUp($saveLocation,$fileName,$keepLastDays,$docRoot);
Author	SHA1	Message	Date
Matt Pass	ed0bad79ad	Merge branch 'temp' Conflicts: lib/settings.php Fixing stupid Github problems	2012-09-19 09:42:57 +01:00
Matt Pass	021a217f2c	Version 0.8.5	2012-09-19 09:15:39 +01:00
Matt Pass	0c2ab575a1	Error with Github here, actual change is line 180 Line 180 checks if pluginsContainer exists and if so, sets the innerHTML	2012-09-19 09:14:49 +01:00
Matt Pass	338ca3bb24	if loggedIn conditions removed User cannot view this file if not logged in, so not logged in handling no longer needed	2012-09-19 09:10:08 +01:00
Matt Pass	7c718b5131	accountLogin and login related items removed accountLogin removed as an aliasArray to create login param not needed on init function Remove the if & else condition depending on login, this is not done here anymore No need to set login, not there anymore refreshFileManager no longer needs to take action on logging in, user would already be logged in	2012-09-19 09:02:14 +01:00
Matt Pass	cbeb595f48	if loggedIn condition removed You cannot view this file if not logged in, so no need to check again	2012-09-19 08:59:08 +01:00
Matt Pass	293d3aa259	Classes removed for login area	2012-09-19 08:55:19 +01:00
Matt Pass	21d1c1f9ba	No longer need login area Logging in now done on seperate screen not here	2012-09-19 08:54:51 +01:00
Matt Pass	ef6bf6e4df	Removing of if condition regarding loggedIn You can only view this file if logged in now, do no need for if or if else conditions	2012-09-19 08:44:11 +01:00
Matt Pass	aa6cfcc76e	No need for if condition here Removed if checks and else conditions in a couple of places	2012-09-19 08:42:11 +01:00
Matt Pass	924919fb6f	No need for if condition now You can only see multiple results if logged in, so no need for this if condition	2012-09-19 08:40:37 +01:00
Matt Pass	15b4793d32	bannedFiles changed Now just hide _coder and ICEcoder folders to hide ICEcoder itself from the file manager Users can now see everything else	2012-09-19 08:38:55 +01:00
Matt Pass	22a1305cb1	Cannot view if not logged in No need to check for loggedIn anymore, you simply cannout view this page if not logged in Removed login param from init() function call	2012-09-19 08:35:43 +01:00
Matt Pass	7c3cc891f3	Remove if condition No longer showing ICEcoder if we're not logged in, so no need for if else	2012-09-19 08:33:47 +01:00
Matt Pass	158e03b5fd	Reworked, so no login, no access to anything Big set of changes so that you only see a login screen until you're logged in Upon receiving a good login password attempt, also now immeditaley redirect after setting session var Rearranged a few chunks of code to logically make more sense SImplified quite a few things by condensing code Now shows a login/set password screen Prior to showing this though, if we're setting a password and once hasn't been set yet, do that and redirect If we're not logged in or don't have a password plus not on the settings file, redirect to that to login or set password	2012-09-18 21:12:15 +01:00
Matt Pass	e2aefab2ae	SESSION userLevel now loggedIn Moving away from the idea of multiple user levels, users will either have full access or no access Swapped all userLevel session vars to a loggedIn var, which is a bool Makes things simpler and paves the way towards the new login screen (before you see any files, code etc)	2012-09-18 08:53:13 +01:00
Matt Pass	4027ecee5a	Use strpos instead of strstr Instead of just finding our dirname within the finalArray using strstr, now using strpos and detecting if it's pos 0, which is much more appropriate & reliable. Example: Looking for /bob/t1.txt for may potentially return a false positive for finding '/bob' in '/another/bob1/abc' and files therefore t1.txt ends up in the wrong folder. This false positive only occurs when the write order of hard drive storage has stored another/bob1/abc before /bob and therefore retrieval load order can cause this odd, occasional issue. Checking for /bob being the start of our finalArray item through strpos===0 eliminates this possibility.	2012-09-16 10:25:14 +01:00
Matt Pass	b1ca05fec3	Dynamic scoll height, undo URI encoding, use vars resultsPane id setup. This then allows us to change the height to fill more of the popup if we don't have replaceAll button at the bottom. Establish findText in both PHP and JS (they need different sources for their values unfortunately) (JS for encoding simplicity by just using input field value and PHP to get GET value as it can't pick up the parent input field value) Use findText in both JS and PHP variations where appropriate	2012-09-14 18:02:45 +01:00
Matt Pass	21ef12f143	URI encoding var with ICEcoder: prefix Don't need cM anymore Replace apostrophes with HTML entity value If we have something that should be URI encoded, encode it but also with an ICEcoder: prefix, so we know we need to unencode it	2012-09-14 17:48:16 +01:00
Matt Pass	6cf1def982	Don't mess with CSS, instead use API to set size Instead of detecting & altering stylesheets, run through CM instances and set the size Needs to be done via setTimeout to avoid timing issues	2012-09-13 18:16:15 +01:00
Matt Pass	2c1e032f38	Set the recommended default of h:auto & o:visible Not that this works without a container. Could investigate wrapping in a 100% high container instead?	2012-09-13 18:13:42 +01:00
Matt Pass	56887c9f1f	Better checking of open files before loading New isOpen function added This receives a file ref (absolute or relative) and checks a relative, pipe replaced version against the openFiles array If it finds a match, the file is already open, it will return the array position, otherwise return false The openFile function now uses this array when attempting to open a file It firstly checks if it's open or not, if it is, it will switch to that tab, otherwise proceed to open it autoOpenFiles no longer has to check for this, as it's handled by openFile function anyway	2012-09-13 09:29:27 +01:00
Matt Pass	8715f79251	Reverting ternary statement Not sure why the ternary version here isn't working, reverted to an if else	2012-09-11 09:29:34 +01:00