v1.0.0

Removed beta tag
Don't need key, simplify setting changedContent
2026-03-16 13:27:05 +01:00 · 2012-10-23 20:22:13 +01:00 · 2012-10-23 20:21:39 +01:00 · 2012-10-23 20:00:18 +01:00 · 2012-10-23 18:28:25 +01:00 · 2012-10-23 18:17:30 +01:00
37 changed files with 1912 additions and 2087 deletions
--- a/CodeMirror-2.33/lib/codemirror-compressed.js
+++ b/CodeMirror-2.33/lib/codemirror-compressed.js
--- a/CodeMirror-2.34/LICENSE
+++ b/CodeMirror-2.34/LICENSE
--- a/CodeMirror-2.34/lib/codemirror-compressed.js
+++ b/CodeMirror-2.34/lib/codemirror-compressed.js
--- a/CodeMirror-2.34/lib/codemirror.css
+++ b/CodeMirror-2.34/lib/codemirror.css
@@ -145,7 +145,7 @@ div.CodeMirror-selected { background: #d9d9d9; }
 .cm-s-default span.cm-error {color: #f00;}
 .cm-s-default span.cm-qualifier {color: #555;}
 .cm-s-default span.cm-builtin {color: #30a;}
-.cm-s-default span.cm-bracket {color: #cc7;}
+.cm-s-default span.cm-bracket {color: #997;}
 .cm-s-default span.cm-tag {color: #170;}
 .cm-s-default span.cm-attribute {color: #00c;}
 .cm-s-default span.cm-header {color: blue;}
@@ -170,4 +170,4 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
    visibility: hidden;
  }

-}
+}
--- a/CodeMirror-2.34/theme/blackboard.css
+++ b/CodeMirror-2.34/theme/blackboard.css
--- a/CodeMirror-2.34/theme/cobalt.css
+++ b/CodeMirror-2.34/theme/cobalt.css
--- a/CodeMirror-2.34/theme/eclipse.css
+++ b/CodeMirror-2.34/theme/eclipse.css
--- a/CodeMirror-2.34/theme/elegant.css
+++ b/CodeMirror-2.34/theme/elegant.css
--- a/CodeMirror-2.34/theme/erlang-dark.css
+++ b/CodeMirror-2.34/theme/erlang-dark.css
--- a/CodeMirror-2.34/theme/lesser-dark.css
+++ b/CodeMirror-2.34/theme/lesser-dark.css
--- a/CodeMirror-2.34/theme/monokai.css
+++ b/CodeMirror-2.34/theme/monokai.css
--- a/CodeMirror-2.34/theme/neat.css
+++ b/CodeMirror-2.34/theme/neat.css
--- a/CodeMirror-2.34/theme/night.css
+++ b/CodeMirror-2.34/theme/night.css
--- a/CodeMirror-2.34/theme/rubyblue.css
+++ b/CodeMirror-2.34/theme/rubyblue.css
--- a/CodeMirror-2.34/theme/vibrant-ink.css
+++ b/CodeMirror-2.34/theme/vibrant-ink.css
--- a/README.md
+++ b/README.md
@@ -3,6 +3,8 @@

 Early version of the web based IDE which allows for creation of websites in the web browser. Uses the brilliant CodeMirror for code highlighting & editing, with a slick IDE wrapped around it to make the whole thing work.

+<img src="http://icecoder.net/images/ice-coder-web-ide.jpg" alt="ICEcoder web IDE">
+
 ###Features you'd expect
 * Context aware code highlighting
 * Supports HTML, CSS, LESS, JavaScript, CoffeeScript, PHP & Ruby
@@ -32,9 +34,10 @@ Early version of the web based IDE which allows for creation of websites in the
 * CTRL+S+Enter opens a sticky tab to show live edits
 * ESC = Comment/Uncomment line, incl partial lines
 * Image viewer
-* Colour preview block on CSS colours, ie red, #ff0000 or  RGBA(255,0,0,0.5)
+* Colour preview block on CSS colours, ie red, #f00 or  RGBA(255,0,0,0.5)
 * MySQL Database management via Adminer plugin
 * Backs up files every 10 mins or on click of backup plugin icon
+* Github repo syncing with ICErepo plugin

 ###Installation

--- a/editor.php
+++ b/editor.php
@@ -3,26 +3,23 @@

 <html style="margin: 0" onMouseDown="top.ICEcoder.mouseDown=true" onMouseUp="top.ICEcoder.mouseDown=false" onMouseMove="if(top.ICEcoder) {top.ICEcoder.getMouseXY(event,'editor');top.ICEcoder.canResizeFilesW()}">
 <head>
-<title>ICEcoder editor</title>
+<title>ICEcoder v <?php echo $ICEcoder["versionNo"];?> editor</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <link rel="stylesheet" href="<?php echo $ICEcoder["codeMirrorDir"]; ?>/lib/codemirror.css">
 <!--
 codemirror-compressed.js
-includes:
-codemirror.js
-modes:
-clike, coffeescript, css, javascript, less, php, ruby & xml
-utils:
-foldcode, searchcursor, match-highlighter
+incls:	codemirror.js
+modes:	clike, coffeescript, css, javascript, less, php, ruby & xml
+utils:	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,155 +32,154 @@ 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;
+	<div style="float: left; margin-right: 50px">
+		<h2 style="color: rgba(0,198,255,0.7)">server</h2>
+		<span style="color:#888">Server name, OS & IP:</span><br>
+		<?php echo $_SERVER['SERVER_NAME']." &nbsp;&nbsp ".$_SERVER['SERVER_SOFTWARE']." &nbsp;&nbsp ".$_SERVER['SERVER_ADDR'];?><br><br>
+		<span style="color:#888">Root:</span><br>
+		<?php echo $docRoot;?><br><br>
+		<span style="color:#888">ICEcoder root:</span><br>
+		<?php echo $docRoot.$ICEcoder['root'];?><br><br>
+		<span style="color:#888">PHP version:</span><br>
+		<?php echo phpversion();?><br><br>
+		<span style="color:#888">Date & time:</span><br>
+		<span id="serverDT"></span><br><br><br>
+	</div>

-	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;};
+	<div style="float: left">
+		<h2 style="color: rgba(0,198,255,0.7)">files</h2>
+		<span style="color:#888">Last 10 files opened:</span><br>
+		<?php
+			$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;};
+				}
+			}
+		;?>
+		<span style="color:#888">File & folder count:</span><br>
+		<div id="fileFolderCounts"></div><br><br><br>
+	</div>
+
+	<div style="clear: both">
+		<h2 style="color: rgba(0,198,255,0.7)">your device</h2>
+		<span style="color:#888">Browser:</span><br>
+		<?php echo $_SERVER['HTTP_USER_AGENT'];?><br><br>
+		<span style="color:#888">Your IP:</span><br>
+		<?php echo $_SERVER['REMOTE_ADDR'];?>
+	</div>
+	<script>
+	var nDT=<?php echo time()*1000;?>;
+	setInterval(function(){
+		var s=(new Date(nDT+=1e3)+'').split(' '),
+		d=s[2]*1,
+		t=s[4].split(':'),
+		p=t[0]>11?'pm':'am',
+		e=d%20==1|d>30?'st':d%20==2?'nd':d%20==3?'rd':'th';
+		t[0]=--t[0]%12+1;
+		if (document.getElementById('serverDT')) {
+			document.getElementById('serverDT').innerHTML=[s[0],d+e,s[1],s[3],t.join(':')+p].join(' ');
 		}
-	}
-	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;
-}; ?>
-<script>
-var nDT=<?php echo time()*1000;?>;
-setInterval(function(){
-	var s=(new Date(nDT+=1e3)+'').split(' '),
-	d=s[2]*1,
-	t=s[4].split(':'),
-	p=t[0]>11?'pm':'am',
-	e=d%20==1|d>30?'st':d%20==2?'nd':d%20==3?'rd':'th';
-	t[0]=--t[0]%12+1;
-	if (document.getElementById('serverDT')) {
-		document.getElementById('serverDT').innerHTML=[s[0],d+e,s[1],s[3],t.join(':')+p].join(' ');
-	}
-},1000);
-</script>
+	},1000);
+	</script>
 </div>

 <script>
 function createNewCMInstance(num) {
 	var fileName = top.ICEcoder.openFiles[top.ICEcoder.selectedTab-1];
-	var codeFold		 	= CodeMirror.newFoldFunction(CodeMirror.tagRangeFinder,'<span style=\"display: inline-block; width: 13px; height: 13px; background-color: #b00; color: #fff; text-align: center; cursor: pointer\"><span style="position: relative; top: -1px">+</span></span> %N%');
-	var codeFold_JS_Coffee_PHP_Ruby = CodeMirror.newFoldFunction(CodeMirror.braceRangeFinder,'<span style=\"display: inline-block; width: 13px; height: 13px; background-color: #b00; color: #fff; text-align: center; cursor: pointer\"><span style="position: relative; top: -1px">+</span></span> %N%');
+	top.ICEcoder.foldStyle = '<span style="position: absolute; display: inline-block; width: 13px; height: 13px; left: 0; background-color: #b00; color: #fff; text-align: center; cursor: pointer"><span style="position: relative; left: -1px">+</span></span> %N%';
+	var codeFoldTag = CodeMirror.newFoldFunction(CodeMirror.tagRangeFinder,top.ICEcoder.foldStyle);
+	var codeFoldBrace = CodeMirror.newFoldFunction(CodeMirror.braceRangeFinder,top.ICEcoder.foldStyle);

 	window['cM'+num] = CodeMirror(document.body, {
-        mode: "application/x-httpd-php",
-        lineNumbers: true,
-	lineWrapping: true,
-	indentUnit: top.tabWidth,
-	tabSize: top.tabWidth,
-        indentWithTabs: true,
-	electricChars: false,
-	onCursorActivity: function() {
-		top.ICEcoder.getCaretPosition();
-		top.ICEcoder.updateCharDisplay();
-		window['cM'+num].setLineClass(top.ICEcoder['cMActiveLine'+num], null);
-		if(!window['cM'+num].somethingSelected()) {
-			top.ICEcoder['cMActiveLine'+num] = window['cM'+num].setLineClass(window['cM'+num].getCursor().line, "cm-s-activeLine");
-		}
-		window['cM'+top.ICEcoder.cMInstances[top.ICEcoder.selectedTab-1]].matchHighlight("CodeMirror-matchhighlight");
-		top.ICEcoder.cssColorPreview();
-	},
-	onChange: function() {
-		// If we're not loading the file, it's a change, so update tab
-		if (!top.ICEcoder.loadingFile) {
-			top.ICEcoder.changedContent[top.ICEcoder.selectedTab-1] = 1;
-			top.ICEcoder.redoTabHighlight(top.ICEcoder.selectedTab);
-		}
-		top.ICEcoder.getCaretPosition();
-		top.ICEcoder.dontUpdateNest = false;
-		top.ICEcoder.updateCharDisplay();
-		top.ICEcoder.updateNestingIndicator();
-		if (top.ICEcoder.findMode) {
-			top.ICEcoder.results.splice(top.ICEcoder.findResult,1);
-			top.document.getElementById('results').innerHTML = top.ICEcoder.results.length + " results";
-			top.ICEcoder.findMode = false;
-		}
-	},
-	onKeyEvent: function(instance, e) {
-		top.ICEcoder.redoChangedContent(e);
-		top.ICEcoder.findReplace('find',true,false);
-		top.ICEcoder.getCaretPosition();
-		top.ICEcoder.updateCharDisplay();
-		tok = window['cM'+top.ICEcoder.cMInstances[top.ICEcoder.selectedTab-1]].getTokenAt(window['cM'+top.ICEcoder.cMInstances[top.ICEcoder.selectedTab-1]].getCursor());
-		if (tok.string!=">") {lastString=tok.string};
-		if (e.type=="keyup"&&e.keyCode=="16"&&lastKeyCode=="190") {
-			canDoEndTag=true;
-			for (i=0;i<top.ICEcoder.tagNestExceptions.length;i++) {
-				if(top.ICEcoder.tagString!="script" && top.ICEcoder.tagString==top.ICEcoder.tagNestExceptions[i]) {
-				canDoEndTag=false;
-				}
+		mode: "application/x-httpd-php",
+		lineNumbers: true,
+		lineWrapping: true,
+		indentUnit: top.ICEcoder.tabWidth,
+		tabSize: top.ICEcoder.tabWidth,
+		indentWithTabs: true,
+		electricChars: false,
+		onCursorActivity: function(thisCM) {
+			top.ICEcoder.getCaretPosition();
+			top.ICEcoder.updateCharDisplay();
+			window['cM'+num].setLineClass(top.ICEcoder['cMActiveLine'+num], null);
+			if(!window['cM'+num].somethingSelected()) {
+				top.ICEcoder['cMActiveLine'+num] = window['cM'+num].setLineClass(window['cM'+num].getCursor().line, "cm-s-activeLine");
 			}
-			if	(
-				top.ICEcoder.tagString.slice(0,1)=="/"||
-				top.ICEcoder.tagString.slice(0,1)=="?"||
-				!top.ICEcoder.codeAssist||
-				fileName && (fileName.indexOf(".js")>0||fileName.indexOf(".css")>0||fileName.indexOf(".less")>0)
-				) {canDoEndTag=false}
+			thisCM.matchHighlight("CodeMirror-matchhighlight");
+			top.ICEcoder.cssColorPreview();
+		},
+		onChange: function() {
+			// If we're not loading the file, it's a change, so update tab
+			if (!top.ICEcoder.loadingFile) {
+				top.ICEcoder.changedContent[top.ICEcoder.selectedTab-1] = 1;
+				top.ICEcoder.redoTabHighlight(top.ICEcoder.selectedTab);
+			}
+			top.ICEcoder.getCaretPosition();
+			top.ICEcoder.dontUpdateNest = false;
+			top.ICEcoder.updateCharDisplay();
+			top.ICEcoder.updateNestingIndicator();
+			if (top.ICEcoder.findMode) {
+				top.ICEcoder.results.splice(top.ICEcoder.findResult,1);
+				top.document.getElementById('results').innerHTML = top.ICEcoder.results.length + " results";
+				top.ICEcoder.findMode = false;
+			}
+		},
+		onKeyEvent: function(thisCM, e) {
+			top.ICEcoder.redoChangedContent(e);
+			top.ICEcoder.findReplace('find',true,false);
+			top.ICEcoder.getCaretPosition();
+			top.ICEcoder.updateCharDisplay();
+			tok = thisCM.getTokenAt(thisCM.getCursor());
+			if (tok.string!=">") {lastString=tok.string};
+			if (e.type=="keyup"&&e.keyCode=="16"&&lastKeyCode=="190") {
+				canDoEndTag=true;
+				if (top.ICEcoder.tagString!="script" && top.ICEcoder.tagNestExceptions.indexOf(top.ICEcoder.tagString)>-1) {
+					canDoEndTag=false;
+				}
+				if	(
+					top.ICEcoder.tagString.slice(0,1)=="/"||
+					top.ICEcoder.tagString.slice(0,1)=="?"||
+					!top.ICEcoder.codeAssist||
+					fileName && (fileName.indexOf(".js")>0||fileName.indexOf(".css")>0||fileName.indexOf(".less")>0)
+					) {canDoEndTag=false}

-			contentType = top.ICEcoder.caretLocType;
-			if (canDoEndTag && (contentType!="JavaScript"||(contentType=="JavaScript"&&top.ICEcoder.tagString=="script"))) {
-				numTabs = top.ICEcoder.htmlTagArray.length;
-				if (top.ICEcoder.htmlTagArray[0]=="html") {numTabs--};
-				tabs = "";
-				for (i=0;i<numTabs-1;i++) {
-					tabs += "\t";
+				contentType = top.ICEcoder.caretLocType;
+				if (canDoEndTag && (contentType!="JavaScript"||(contentType=="JavaScript"&&top.ICEcoder.tagString=="script"))) {
+					numTabs = top.ICEcoder.htmlTagArray.length;
+					if (top.ICEcoder.htmlTagArray[0]=="html") {numTabs--};
+					tabs = "";
+					for (i=0;i<numTabs-1;i++) {
+						tabs += "\t";
+					}
+					endTag = "</" + top.ICEcoder.tagString + ">";
+					if (top.ICEcoder.tagString=="script") {endTag="</"+"script>"};
+					if(top.ICEcoder.tagString=="title"||top.ICEcoder.tagString=="a"||top.ICEcoder.tagString=="li"||top.ICEcoder.tagString=="span"||(top.ICEcoder.tagString.slice(0,1)=="h"&&parseInt(top.ICEcoder.tagString.slice(1,2),10)>=1&&parseInt(top.ICEcoder.tagString.slice(1,2),10)<=7)) {
+						thisCM.replaceSelection(endTag);
+						thisCM.setCursor(thisCM.getCursor().line,thisCM.getCursor().ch-top.ICEcoder.tagString.length-3);
+					} else if(top.ICEcoder.tagString=="html"||top.ICEcoder.tagString=="head") {
+						thisCM.replaceSelection("\n\n"+endTag);
+						thisCM.setCursor(thisCM.getCursor().line-1,numTabs);
+					} else {
+						thisCM.replaceSelection("\n"+tabs+"\t\n"+tabs+endTag);
+						thisCM.setCursor(thisCM.getCursor().line-1,numTabs);
+					}
 				}
-				endTag = "</" + top.ICEcoder.tagString + ">";
-				if (top.ICEcoder.tagString=="script") {endTag="</"+"script>"};
-				if(top.ICEcoder.tagString=="title"||top.ICEcoder.tagString=="a"||top.ICEcoder.tagString=="li"||top.ICEcoder.tagString=="span"||(top.ICEcoder.tagString.slice(0,1)=="h"&&parseInt(top.ICEcoder.tagString.slice(1,2),10)>=1&&parseInt(top.ICEcoder.tagString.slice(1,2),10)<=7)) {
-					window['cM'+top.ICEcoder.cMInstances[top.ICEcoder.selectedTab-1]].replaceSelection(endTag);
-					window['cM'+top.ICEcoder.cMInstances[top.ICEcoder.selectedTab-1]].setCursor(window['cM'+top.ICEcoder.cMInstances[top.ICEcoder.selectedTab-1]].getCursor().line,window['cM'+top.ICEcoder.cMInstances[top.ICEcoder.selectedTab-1]].getCursor().ch-top.ICEcoder.tagString.length-3);
-				} else if(top.ICEcoder.tagString=="html"||top.ICEcoder.tagString=="head") {
-					window['cM'+top.ICEcoder.cMInstances[top.ICEcoder.selectedTab-1]].replaceSelection("\n\n"+endTag);
-					window['cM'+top.ICEcoder.cMInstances[top.ICEcoder.selectedTab-1]].setCursor(window['cM'+top.ICEcoder.cMInstances[top.ICEcoder.selectedTab-1]].getCursor().line-1,numTabs);
-				} else {
-					window['cM'+top.ICEcoder.cMInstances[top.ICEcoder.selectedTab-1]].replaceSelection("\n"+tabs+"\t\n"+tabs+endTag);
-					window['cM'+top.ICEcoder.cMInstances[top.ICEcoder.selectedTab-1]].setCursor(window['cM'+top.ICEcoder.cMInstances[top.ICEcoder.selectedTab-1]].getCursor().line-1,numTabs);
-				}
-			}
-		};
-		lastKeyCode = e.keyCode;
-	},
-	onGutterClick: !fileName || (fileName && fileName.indexOf(".js") == -1 && fileName.indexOf(".coffee") == -1 && fileName.indexOf(".php") && fileName.indexOf(".rb") == -1) ? codeFold : codeFold_JS_Coffee_PHP_Ruby,
-	extraKeys: {
-		"Tab": function(cm) {CodeMirror.commands[top.tabsIndent ? "defaultTab" : "insertTab"](cm);},
-		"Shift-Tab": "indentLess",
-		"Ctrl-Up": function() {},
-		"Ctrl-Down": function() {}
-	}
+			};
+			lastKeyCode = e.keyCode;
+		},
+		onGutterClick: !fileName || (fileName && fileName.indexOf(".js") == -1 && fileName.indexOf(".coffee") == -1 && fileName.indexOf(".php") && fileName.indexOf(".rb") == -1) ? codeFoldTag : codeFoldBrace,
+		extraKeys: {
+			"Tab": function(cm) {CodeMirror.commands[top.ICEcoder.tabsIndent ? "defaultTab" : "insertTab"](cm);},
+			"Shift-Tab": "indentLess",
+			"Ctrl-Up": function() {},
+			"Ctrl-Down": function() {}
+		}
 	});

 	// Now create the active line for this CodeMirror object
--- a/favicon.png
+++ b/favicon.png
--- a/files.php
+++ b/files.php
@@ -3,18 +3,16 @@

 <html onMouseDown="top.ICEcoder.mouseDown=true" onMouseUp="top.ICEcoder.mouseDown=false" onMouseMove="if(top.ICEcoder) {top.ICEcoder.getMouseXY(event,'files');top.ICEcoder.canResizeFilesW()}" onContextMenu="top.ICEcoder.rightClickedFile=top.ICEcoder.thisFileFolderLink; return top.ICEcoder.showMenu()" onClick="top.ICEcoder.selectFileFolder()">
 <head>
-<title>ICEcoder file manager</title>
+<title>ICEcoder v <?php echo $ICEcoder["versionNo"];?> file manager</title>
 <link rel="stylesheet" type="text/css" href="lib/files.css">
-<script src="lib/coder.js" type="text/javascript"></script>
+<script src="lib/ice-coder.js" type="text/javascript"></script>
 </head>

 <body onLoad="top.ICEcoder.fileManager()" onDblClick="top.ICEcoder.openFile()" onKeyDown="return top.ICEcoder.interceptKeys('files', event);" onKeyUp="top.ICEcoder.resetKeys(event);">
+
 <div title="Refresh" onClick="top.ICEcoder.refreshFileManager()" class="refresh"></div>

 <?php
-$ICEcoder["restrictedFiles"] = $_SESSION['restrictedFiles'];
-$ICEcoder["bannedFiles"] = $_SESSION['bannedFiles'];
-
 // Function to sort given values alphabetically
 function alphasort($a, $b) {
 	return strcasecmp($a->getPathname(), $b->getPathname());
@@ -43,11 +41,13 @@ $finalArray = $tempArray =  array();
 foreach ($objectList as $objectRef) {
 	$fileFolderName = substr($objectRef->getPathname(), strlen($docRoot.$iceRoot));
 	$canAdd = true;
-	for ($i=0;$i<count($ICEcoder["bannedFiles"]);$i++) {
-		if(strpos($fileFolderName,$ICEcoder["bannedFiles"][$i])!==false) {$canAdd = false;}
+	for ($i=0;$i<count($_SESSION['bannedFiles']);$i++) {
+		if(strpos($fileFolderName,$_SESSION['bannedFiles'][$i])!==false) {$canAdd = false;}
 	}
 	if ($objectRef->getFilename()!="." && $objectRef->getFilename()!=".." && $fileFolderName[strlen($fileFolderName)-1]!="/" && $canAdd) {
-		$fileFolderName!="/" && is_dir($docRoot.$iceRoot.$fileFolderName) ? array_push($finalArray,$fileFolderName) : array_push($tempArray,$fileFolderName);
+		$fileFolderName!="/" && is_dir($docRoot.$iceRoot.$fileFolderName)
+		? array_push($finalArray,$fileFolderName)
+		: array_push($tempArray,$fileFolderName);
 	}
 }

@@ -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++;
 		}
 	}
@@ -79,16 +79,18 @@ if ($serverType=="Linux") {
 	$chmodInfo = substr(sprintf('%o', fileperms($docRoot.$iceRoot)), -3);
 	$fileAtts = '<span style="color: #888; font-size: 8px" id="|_perms">'.$chmodInfo.'</span>';
 }
-echo "<ul class=\"fileManager\">\n";
-echo "<li class=\"pft-directory\">";
-echo "<a nohref title=\"/\" onMouseOver=\"top.ICEcoder.overFileFolder('folder','/')\" onMouseOut=\"top.ICEcoder.overFileFolder('folder','')\" style=\"position: relative; left:-22px\">";
-echo "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ";
-echo "<span id=\"|\">/ ";
-echo $iceRoot == "" ? "[ROOT]" : trim($iceRoot,"/");
-echo "</span> ";
-echo $fileAtts;
-echo "</a>";
-echo "</li>\n";
+?>
+<ul class="fileManager">
+<li class="pft-directory">
+<a nohref title="/" onMouseOver="top.ICEcoder.overFileFolder('folder','/')" onMouseOut="top.ICEcoder.overFileFolder('folder','')" style="position: relative; left:-22px">
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 
+<span id="|">/ 
+<?php echo $iceRoot == "" ? "[ROOT]" : trim($iceRoot,"/");?>
+</span> 
+<?php echo $fileAtts;?>
+</a>
+</li>
+<?php
 $lastPath="";
 $fileCount=0;
 $fileBytes=0;
@@ -110,36 +112,25 @@ for ($i=0;$i<count($finalArray);$i++) {
 			echo "</ul>\n";
 		}
 	}
-	$restrictedFile=false;
-	for ($j=0;$j<count($ICEcoder["restrictedFiles"]);$j++) {
-		if (strpos($fileFolderName,$ICEcoder["restrictedFiles"][$j])!="") {
-			$restrictedFile=true;
-		}
-	}
 	if ($serverType=="Linux") {
 		$chmodInfo = substr(sprintf('%o', fileperms($docRoot.$iceRoot.$fileFolderName)), -3);
 		$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;
 }
 echo "</ul>\n</ul>\n";

-	echo "<script>\n";
-	$varOutput = "top.ICEcoder.dirCount=";
-	$varOutput .= $dirCount ? $dirCount : "0";
-	$varOutput .= ";\ntop.ICEcoder.fileCount=";
-	$varOutput .= $fileCount ? $fileCount : "0";
-	$varOutput .= ";\ntop.ICEcoder.fileBytes=";
-	$varOutput .= $fileBytes ? $fileBytes : "0";
 	// Output the JS vars
-	echo $varOutput;
+	echo "<script>\n";
+	echo "top.ICEcoder.dirCount=";
+	echo $dirCount ? $dirCount : "0";
+	echo ";\ntop.ICEcoder.fileCount=";
+	echo $fileCount ? $fileCount : "0";
+	echo ";\ntop.ICEcoder.fileBytes=";
+	echo $fileBytes ? $fileBytes : "0";
 	echo ";\n</script>";
 ?>

--- a/index.php
+++ b/index.php
@@ -1,23 +1,17 @@
-<?php
-include("lib/settings.php");
+<?php include("lib/settings.php");

 // Check IP permissions
 if (!in_array($_SERVER["REMOTE_ADDR"], $_SESSION['allowedIPs']) && !in_array("*", $_SESSION['allowedIPs'])) {
 	header('Location: /');
 };

+$updateMsg = '';
 // Check for updates
 if ($ICEcoder["checkUpdates"]) {
 	$icv = json_encode(file_get_contents("http://icecoder.net/latest-version.txt"));
 	$icv = rtrim(ltrim($icv,'"'),'"\\n');
 	if ($ICEcoder["versionNo"]<$icv) {
 		$updateMsg = ';top.ICEcoder.message(\'ICEcoder '.$icv.' now released\n\nPlease upgrade\')';
-	} else {
-		$cmv = json_encode(file_get_contents("http://codemirror.net/latest-version.txt"));
-		$cmv = rtrim(ltrim($cmv,'"'),'"\\n');
-		if ($ICEcoder["cMThisVer"]<$cmv) {
-			$updateMsg = ';top.ICEcoder.message(\'CodeMirror '.$cmv.' now released\n\nPlease upgrade\')';
-		}
 	}
 }
 ?>
@@ -28,12 +22,9 @@ if ($ICEcoder["checkUpdates"]) {
 <title>ICEcoder v <?php echo $ICEcoder["versionNo"];?></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="lib/coder.css">
+<link rel="stylesheet" type="text/css" href="lib/ice-coder.css">
+<link rel="icon" type="image/png" href="favicon.png">
 <script>
-theme = "<?php echo $ICEcoder["theme"]=="default" ? 'icecoder' : $ICEcoder["theme"];?>";
-tabsIndent = <?php echo $ICEcoder["tabsIndent"] ? 'true' : 'false';?>;
-openLastFiles = <?php echo $ICEcoder["openLastFiles"] ? 'true' : 'false';?>;
-tabWidth = <?php echo $ICEcoder["tabWidth"]; ?>;
 iceRoot = "<?php echo $ICEcoder["root"]; ?>";

 window.onbeforeunload = function() {
@@ -42,31 +33,34 @@ window.onbeforeunload = function() {
 	}
 }

-previousFiles = [<?php
-	if ($ICEcoder["previousFiles"]!="" && $_SESSION['userLevel'] == 10) {
+</script>
+<script language="JavaScript" src="lib/ice-coder.js"></script>
+</head>
+
+<body onLoad="<?php
+	echo 'top.ICEcoder.previousFiles = [';
+	if ($ICEcoder["previousFiles"]!="") {
 		$openFilesArray = explode(",",$ICEcoder["previousFiles"]);
 		echo "'".implode("','",$openFilesArray)."'";
 	}
-?>];
-showFileMenu = function() {
-	document.getElementById('fileMenu').style.display='inline-block';
-}
-</script>
-<script language="JavaScript" src="lib/coder.js"></script>
-</head>
+	echo "];top.ICEcoder.theme = '";
+	echo $ICEcoder["theme"]=="default" ? 'icecoder' : $ICEcoder["theme"];
+	echo "'";
+	echo ';top.ICEcoder.tabsIndent = ';
+	echo $ICEcoder["tabsIndent"] ? 'true' : 'false';
+	echo ';top.ICEcoder.openLastFiles = ';
+	echo $ICEcoder["openLastFiles"] ? 'true' : 'false';
+	echo ';top.ICEcoder.tabWidth = ';
+	echo $ICEcoder["tabWidth"];
+?>;ICEcoder.init()<?php echo $updateMsg.$onLoadExtras;?>" onResize="ICEcoder.setLayout()" onKeyDown="return ICEcoder.interceptKeys('coder',event);" onKeyUp="parent.ICEcoder.resetKeys(event);">

-<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);">
-
-<div id="blackMask" class="blackMask" onClick="ICEcoder.showHide('hide',this)">
+<div id="blackMask" class="blackMask" onClick="ICEcoder.showHide('hide',this)" onContextMenu="return false">
 	<div class="popupVCenter">
 		<div class="popup" id="mediaContainer"></div>
 	</div>
 </div>

-<div id="loadingMask" class="blackMask" style="visibility: visible">
+<div id="loadingMask" class="blackMask" style="visibility: visible" onContextMenu="return false">
 	<span class="progressBar" id="progressBar" style="-webkit-animation:fullexpand 10s ease-out; -moz-animation:fullexpand 10s ease-out"></span>
 	<div class="popupVCenter">
 		<div class="popup">
@@ -77,18 +71,18 @@ echo ")".$updateMsg.$onLoadExtras;
 	</div>
 </div>

-<div id="fileMenu" class="fileMenu" onMouseOver="ICEcoder.changeFilesW('expand')" onMouseOut="ICEcoder.changeFilesW('contract');this.style.display='none'">
+<div id="fileMenu" class="fileMenu" onMouseOver="ICEcoder.changeFilesW('expand')" onMouseOut="ICEcoder.changeFilesW('contract');this.style.display='none'" onContextMenu="return false">
 	<span id="folderMenuItems">
-		<a href="javascript:top.ICEcoder.newFile()" onMouseOver="showFileMenu()">New File</a>
-		<a href="javascript:top.ICEcoder.newFolder()" onMouseOver="showFileMenu()">New Folder</a>
+		<a href="javascript:top.ICEcoder.newFile()" onMouseOver="ICEcoder.showFileMenu()">New File</a>
+		<a href="javascript:top.ICEcoder.newFolder()" onMouseOver="ICEcoder.showFileMenu()">New Folder</a>
 	</span>
-	<a href="javascript:top.ICEcoder.deleteFile(top.ICEcoder.rightClickedFile)" onMouseOver="showFileMenu()">Delete</a>
+	<a href="javascript:top.ICEcoder.deleteFile(top.ICEcoder.rightClickedFile)" onMouseOver="ICEcoder.showFileMenu()">Delete</a>
 	<span id="singleFileMenuItems">
-		<a href="javascript:top.ICEcoder.renameFile(top.ICEcoder.rightClickedFile)" onMouseOver="showFileMenu()">Rename</a>
-		<a href="javascript:window.open(top.ICEcoder.rightClickedFile)" onMouseOver="showFileMenu()">View Webpage</a>
+		<a href="javascript:top.ICEcoder.renameFile(top.ICEcoder.rightClickedFile)" onMouseOver="ICEcoder.showFileMenu()">Rename</a>
+		<a href="javascript:window.open(top.ICEcoder.rightClickedFile)" onMouseOver="ICEcoder.showFileMenu()">View Webpage</a>
 	</span>
-	<a href="javascript:top.ICEcoder.zipIt(top.ICEcoder.rightClickedFile)" onMouseOver="showFileMenu()">Zip It!</a>
-	<a href="javascript:top.ICEcoder.propertiesScreen(top.ICEcoder.rightClickedFile)" onMouseOver="showFileMenu()">Properties</a>
+	<a href="javascript:top.ICEcoder.zipIt(top.ICEcoder.rightClickedFile)" onMouseOver="ICEcoder.showFileMenu()">Zip It!</a>
+	<a href="javascript:top.ICEcoder.propertiesScreen(top.ICEcoder.rightClickedFile)" onMouseOver="ICEcoder.showFileMenu()">Properties</a>
 </div>

 <div id="header" class="header" onContextMenu="return false">
@@ -101,14 +95,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>
@@ -167,8 +153,7 @@ echo ")".$updateMsg.$onLoadExtras;
 		<div class="goLine">Go to Line<input type="text" name="goToLine" value="" id="goToLineNo" class="textbox goToLine">
 		</form>
 	</div>
-	<iframe name="contentFrame" id="content" src="editor.php" class="code">
-	</iframe>
+	<iframe name="contentFrame" id="content" src="editor.php" class="code"></iframe>
 </div>

 <div class="footer" id="footer" onContextMenu="return false">
--- a/lib/config.php
+++ b/lib/config.php
@@ -4,13 +4,12 @@ $ICEcoder = array(
 "tabsIndent"		=> true,
 "checkUpdates"		=> true,
 "openLastFiles"		=> true,
-"findFilesExclude"	=> array("_coder",".doc",".gif",".jpg",".jpeg",".pdf",".png",".swf",".xml",".zip"),
+"findFilesExclude"	=> array("_coder","ICEcoder",".doc",".gif",".jpg",".jpeg",".pdf",".png",".swf",".xml",".zip"),
 "codeAssist"		=> true,
 "visibleTabs"		=> false,
 "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/editor.css
+++ b/lib/editor.css
@@ -1,40 +1,40 @@
 /* ICE coder default theme: Based VERY loosely on Monokai */

-.cm-s-icecoder {color: #666; background: #1c1c19;}
+.cm-s-icecoder {color: #666; background: #1c1c19}

-.cm-s-icecoder span.cm-keyword {color: #f8f8f8; font-weight:bold;}
-.cm-s-icecoder span.cm-atom {color: #ae81ff;}
-.cm-s-icecoder span.cm-number {color: #0a0;}
-.cm-s-icecoder span.cm-def {color: #fd971f;}
+.cm-s-icecoder span.cm-keyword {color: #f8f8f8; font-weight:bold}
+.cm-s-icecoder span.cm-atom {color: #ae81ff}
+.cm-s-icecoder span.cm-number {color: #0a0}
+.cm-s-icecoder span.cm-def {color: #fd971f}

-.cm-s-icecoder span.cm-variable {color: #a6e22e;}
-.cm-s-icecoder span.cm-variable-2 {color: #f92672;}			
-.cm-s-icecoder span.cm-variable-3 {color: #0a0;}
+.cm-s-icecoder span.cm-variable {color: #a6e22e}
+.cm-s-icecoder span.cm-variable-2 {color: #f92672}			
+.cm-s-icecoder span.cm-variable-3 {color: #0a0}

-.cm-s-icecoder span.cm-property {color: #a6e22e;}
-.cm-s-icecoder span.cm-operator {color: #0a0;}
-.cm-s-icecoder span.cm-comment {color: #444;}
+.cm-s-icecoder span.cm-property {color: #a6e22e}
+.cm-s-icecoder span.cm-operator {color: #0a0}
+.cm-s-icecoder span.cm-comment {color: #444}

-.cm-s-icecoder span.cm-string {color: #fd0;}
-.cm-s-icecoder span.cm-string-2 {color: #f80;}
+.cm-s-icecoder span.cm-string {color: #fd0}
+.cm-s-icecoder span.cm-string-2 {color: #f80}

-.cm-s-icecoder span.cm-meta {color: #555;}
-.cm-s-icecoder span.cm-error {color: #f00;}
+.cm-s-icecoder span.cm-meta {color: #555}
+.cm-s-icecoder span.cm-error {color: #f00}

-.cm-s-icecoder span.cm-qualifier {color: #555;}
-.cm-s-icecoder span.cm-builtin {color: #06c;}
-.cm-s-icecoder span.cm-bracket {color: #cc7;}
+.cm-s-icecoder span.cm-qualifier {color: #555}
+.cm-s-icecoder span.cm-builtin {color: #06c}
+.cm-s-icecoder span.cm-bracket {color: #cc7}

-.cm-s-icecoder span.cm-tag {color: #e8e8e8;}
-.cm-s-icecoder span.cm-attribute {color: #00b8bb;}
+.cm-s-icecoder span.cm-tag {color: #e8e8e8}
+.cm-s-icecoder span.cm-attribute {color: #00b8bb}

-.cm-s-icecoder span.cm-header {color: #a0a;}
-.cm-s-icecoder span.cm-quote {color: #090;}
-.cm-s-icecoder span.cm-hr {color: #999;}
-.cm-s-icecoder span.cm-link {color: #ff0;}
+.cm-s-icecoder span.cm-header {color: #a0a}
+.cm-s-icecoder span.cm-quote {color: #090}
+.cm-s-icecoder span.cm-hr {color: #999}
+.cm-s-icecoder span.cm-link {color: #ff0}

-.cm-s-icecoder .CodeMirror-cursor {border-left: 1px solid white !important;}
-.cm-s-icecoder .CodeMirror-selected {background: #037 !important;}
+.cm-s-icecoder .CodeMirror-cursor {border-left: 1px solid white !important}
+.cm-s-icecoder .CodeMirror-selected {background: #037 !important}
 .cm-s-icecoder .CodeMirror-gutter {background: #333; border-right: 1px solid #e8e8e8}
 .cm-s-icecoder .CodeMirror-gutter-text {color: #999; width: 35px; cursor: default}
-.cm-s-icecoder .CodeMirror-matchingbracket {border: 1px solid grey; color: black !important;}
+.cm-s-icecoder .CodeMirror-matchingbracket {border: 1px solid grey; color: black !important}
--- a/lib/file-control.php
+++ b/lib/file-control.php
@@ -1,6 +1,7 @@
 <?php include("settings.php");?>
 <?php
 // Get the save type if any
+$saveType = "";
 if (isset($_GET['saveType'])) {$saveType = strClean($_GET['saveType']);};

 // Establish the filename/new filename
@@ -25,24 +26,14 @@ if ($_GET['action']=="load") {
 	if (strpos($fileName,".jpg")>0||strpos($fileName,".jpeg")>0||strpos($fileName,".gif")>0||strpos($fileName,".png")>0) {$fileType="image";};

 	if ($fileType=="text") {
-		$bannedFile=false;
-		for ($i=0;$i<count($ICEcoder["restrictedFiles"]);$i++) {
-			if (strpos($fileName,$ICEcoder["restrictedFiles"][$i])!="") {
-				$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>fileType="nothing"; top.ICEcoder.message(\'Sorry, '.$fileLoc."/".$fileName.' doesn\\\'t seem to exist on the server\');</script>';
 		}
 	};

@@ -53,43 +44,32 @@ 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>action='nothing'; top.ICEcoder.message('Sorry, cannot create folder at\\n".$fileLoc."')</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>action="nothing";</script>';
+		echo "<script>action='nothing'; top.ICEcoder.message('Sorry, cannot rename\\n".strClean($_GET['oldFileName'])."');</script>";
 	}
 	echo '<script>top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);</script>';
 }

 // 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,58 +78,37 @@ 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>action="nothing";</script>';
+		echo "<script>action='nothing'; top.ICEcoder.message('Sorry, cannot replace text in\\n".strClean($_GET['fileRef'])."');</script>";
 	}
 	echo '<script>top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);</script>';
 }

 // 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>action="nothing";</script>';
+		echo "<script>action='nothing'; top.ICEcoder.message('Sorry, cannot change permissions on \\n".strClean($file)."');</script>";
 	}
 	echo '<script>top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);</script>';
 }

 // 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>';
-			} else {
-				echo "<script>top.ICEcoder.message('Sorry can\\'t delete\\n".$filesArray[$i]."');</script>";
-			}
-			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>";
+	$filesArray = explode(";",$file); // May contain more than one file here
+	for ($i=0;$i<=count($filesArray)-1;$i++) {
+		if (is_writable($iceRoot.$filesArray[$i])) {
+			is_dir($iceRoot.$filesArray[$i])
+				? rrmdir($iceRoot.$filesArray[$i])
+				: unlink($iceRoot.$filesArray[$i]);
+			// 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>';
 	}
@@ -162,7 +121,9 @@ function rrmdir($dir) {
 		$objects = scandir($dir); 
 		foreach ($objects as $object) { 
 			if ($object != "." && $object != "..") { 
-				if (filetype($dir."/".$object) == "dir") rrmdir($dir."/".$object); else unlink($dir."/".$object); 
+				filetype($dir."/".$object) == "dir" 
+					? rrmdir($dir."/".$object)
+					: unlink($dir."/".$object); 
 			} 
 		} 
 		reset($objects); 
@@ -174,54 +135,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.'\');';
+					echo '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.stickyTab.location) {top.ICEcoder.stickyTab.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);
+				}
+				action='nothing';
+				</script>
+				<?php
 			}
-		} else {
-			echo "<script>top.ICEcoder.message('Sorry, you need to be logged in to save');action='nothing';</script>";
+        	} else {
+			echo "<script>action='nothing';top.ICEcoder.message('Sorry, cannot write\\n".$file."')</script>";
 		}
 	echo '<script>top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);</script>';
 	}
@@ -274,8 +231,8 @@ if (action=="load") {
 </script>

 <form name="saveFile" action="file-control.php?action=save&file=<?php if (isset($file)) {echo $file;}; if (isset($_GET['fileMDT']) && $_GET['fileMDT']!="undefined") {echo "&fileMDT=".numClean($_GET['fileMDT']);};?>" method="POST">
-<textarea name="contents"></textarea>
-<input type="hidden" name="newFileName" value="">
+	<textarea name="contents"></textarea>
+	<input type="hidden" name="newFileName" value="">
 </form>

 <script>
--- a/lib/files.css
+++ b/lib/files.css
@@ -51,21 +51,12 @@ body {margin: 0; overflow: auto}
 .fileManager LI.ext-coffee:before {background-position: -48px 0}
 .fileManager LI.ext-css:before {background-position: -64px 0}
 .fileManager LI.ext-gif:before {background-position: -80px 0}
-.fileManager LI.ext-htm:before {background-position: -96px 0}
-.fileManager LI.ext-html:before {background-position: -96px 0}
-.fileManager LI.ext-jpg:before {background-position: -112px 0}
-.fileManager LI.ext-jpeg:before {background-position: -112px 0}
+.fileManager LI.ext-htm:before, .fileManager LI.ext-html:before {background-position: -96px 0}
+.fileManager LI.ext-jpg:before, .fileManager LI.ext-jpeg:before {background-position: -112px 0}
 .fileManager LI.ext-js:before {background-position: -128px 0}
-/*.fileManager LI.ext-pdf:before {background-position: -???px 0} */
 .fileManager LI.ext-less:before {background-position: -144px 0}
 .fileManager LI.ext-php:before {background-position: -160px 0}
 .fileManager LI.ext-png:before {background-position: -176px 0}
-.fileManager LI.ext-rb:before {background-position: -192px 0}
-.fileManager LI.ext-rbx:before {background-position: -192px 0}
-.fileManager LI.ext-rhtml:before {background-position: -192px 0}
-.fileManager LI.ext-ruby:before {background-position: -192px 0}
-/*.fileManager LI.ext-sql:before {background-position: -???px 0} */
-/*.fileManager LI.ext-swf:before {background-position: -???px 0} */
+.fileManager LI.ext-rb:before, .fileManager LI.ext-ruby:before {background-position: -192px 0}
 .fileManager LI.ext-txt:before {background-position: -208px 0}
-/*.fileManager LI.ext-xml:before {background-position: -???px 0} */
 .fileManager LI.ext-zip:before {background-position: -224px 0}
--- a/lib/help.php
+++ b/lib/help.php
@@ -3,7 +3,7 @@

 <html>
 <head>
-<title>ICE Coder - <?php echo $ICEcoder["versionNo"];?> :: Help & Shortcuts</title>
+<title>ICEcoder <?php echo $ICEcoder["versionNo"];?> help</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <link rel="stylesheet" type="text/css" href="help.css">
 </head>
--- a/lib/ice-coder.css
+++ b/lib/ice-coder.css
@@ -39,30 +39,30 @@ h2 {font-size: 18px; font-weight: normal; color: #fff}
 	width:30px; height:30px; margin:0 auto; position:relative; top:-50px; -moz-animation:spinoff .5s infinite linear; -webkit-animation:spinoff .5s infinite linear;
 }
@-moz-keyframes spin {
-	0% { -moz-transform:rotate(0deg);}
-	100% { -moz-transform:rotate(360deg);}
+	0% {-moz-transform:rotate(0deg)}
+	100% {-moz-transform:rotate(360deg)}
 }
@-moz-keyframes spinoff {
-	0% { -moz-transform:rotate(0deg);}
-	100% { -moz-transform:rotate(-360deg);}
+	0% {-moz-transform:rotate(0deg)}
+	100% {-moz-transform:rotate(-360deg)}
 }
@-webkit-keyframes spin {
-	0% { -webkit-transform:rotate(0deg);}
-	100% { -webkit-transform:rotate(360deg);}
+	0% {-webkit-transform:rotate(0deg)}
+	100% {-webkit-transform:rotate(360deg)}
 }
@-webkit-keyframes spinoff {
-	0% { -webkit-transform:rotate(0deg); }
-	100% { -webkit-transform:rotate(-360deg);}
+	0% {-webkit-transform:rotate(0deg)}
+	100% {-webkit-transform:rotate(-360deg)}
 }

-.progressBar {top: 0; left: 0; width:100%; height:1px; margin:2px 0; background:#2187e7; position:absolute; box-shadow:0 0 10px 1px rgba(0,198,255,0.7)}
+.progressBar {position:absolute; top: 0; left: 0; width:100%; height:1px; margin:2px 0; background:#2187e7; box-shadow:0 0 10px 1px rgba(0,198,255,0.7)}
@-moz-keyframes fullexpand {
-	0%  { width:0;}
-	100%{ width:100%;}	
+	0%  {width:0}
+	100%{width:100%}	
 }
@-webkit-keyframes fullexpand {
-	0%  { width:0;}
-	100%{ width:100%;}	
+	0%  {width:0}
+	100%{width:100%}	
 }

 .header {position: absolute; display: inline-block; top: 0; left: 0; width: 100%; height: 40px; background-color: #fff; text-align: right; z-index: 2}
@@ -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}
@@ -93,7 +86,7 @@ h2 {font-size: 18px; font-weight: normal; color: #fff}
 .files .accountOptions .rename {width: 16px; height: 16px; background-position: -116px 0; margin: 8px 0 0 5px; opacity: 0.3}
 .files .accountOptions .view {width: 16px; height: 16px; background-position: -132px 0; margin: 8px 0 0 5px; opacity: 0.3}
 .files .accountOptions .lock {position: relative; margin-left: 208px; margin-top: -27px; width: 12px; height: 16px; background-position: -64px -16px; z-index: 1}
-.files input:focus, .findReplace input:focus, .findReplace select:focus, .accountPassword:focus {outline: none; box-shadow: 0 0 10px 1px rgba(0,198,255,0.7)}
+.files input:focus, .findReplace input:focus, .findReplace select:focus, .accountPassword:focus {outline: none; box-shadow: 0 0 10px 1px rgba(0,198,255,1)}
 .files .button {position: absolute; border: 0; background: #444; color: #eee; height:20px; margin-top: 16px; margin-left: 5px; font-size: 11px; cursor: pointer}
 .files .button:hover {background-color: #222; color: #eee}
 .files .frame {display: inline-block; width: 250px}
@@ -112,7 +105,7 @@ h2 {font-size: 18px; font-weight: normal; color: #fff}
 	transition: all 0.15s;
 }
 .tabsBar .tab .closeTab {margin: 1px 0 0 5px; border-radius: 6px}
-.tabsBar .newTab {display: inline-block; background-image: url('../images/nav-bg.jpg'); background-repeat: repeat-x; background-position: 0 0; padding: 6px 5px 1px 5px; border-left: solid 1px #fff; border-right: solid 1px #777; cursor: pointer;}
+.tabsBar .newTab {display: inline-block; background-image: url('../images/nav-bg.jpg'); background-repeat: repeat-x; background-position: 0 0; padding: 6px 5px 5px 5px; border-left: solid 1px #fff; border-right: solid 1px #777; cursor: pointer;}
 .editor .findBar {display: inline-block; height: 28px; width: 2400px; color: #fff; background-color: #141414}
 .findBar .findReplace {position: absolute; z-index: 1}
 .findReplace select {position: relative; font-size: 10px; margin: 8px 2px 0 2px; top: -2px;}
@@ -128,6 +121,7 @@ h2 {font-size: 18px; font-weight: normal; color: #fff}
 .findBar .codeAssist input {margin-top: -1px}
 .findBar .goLine {position: fixed; display: inline-block; width: 100px; right: -10px; top: 70px; height: 21px; font-size: 10px; z-index: 1}
 .goLine .goToLine {width: 25px; height: 16px; border: 0; font-size: 10px; margin: -3px 0 0 3px}
+.goLine .goToLine:focus {outline: none; box-shadow: 0 0 10px 1px rgba(0,198,255,1)}
 .editor .code {position: relative; display: inline-block; top: 28px; width: 600px; height: 600px; visibility: hidden}

 .footer {position: fixed; display: inline-block; width: 100%; height: 30px; bottom: 0; background-color: rgba(0,0,0,0.7); left: 0; z-index: 2}
@@ -148,4 +142,4 @@ h2 {font-size: 18px; font-weight: normal; color: #fff}
 .screenCenter .version {position: relative; display: block; margin: 5px 0 15px 0; font-size: 10px; color: #bbb}
 .screenCenter .accountPassword {border: 0; background-color: #333; color: #fff; height: 20px}
 .screenCenter .button {border: 0; background: #444; color: #eee; height: 22px; cursor: pointer}
-.screenCenter .button:hover {background-color: #333; color: #eee}
+.screenCenter .button:hover {background-color: #2187e7; color: #eee}
--- a/lib/ice-coder.js
+++ b/lib/ice-coder.js
--- a/lib/multiple-results.php
+++ b/lib/multiple-results.php
@@ -8,10 +8,10 @@
 <link rel="stylesheet" type="text/css" href="multiple-results.css">
 </head>

-<body class="results">
+<body class="results" onLoad="top.document.getElementById('loadingMask').style.visibility = 'hidden'">

 <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(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 if(isset($_GET['replace'])) {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 ;}; ?>
@@ -87,26 +92,22 @@ if (startTab!=top.ICEcoder.selectedTab) {
 	$r = 0;
 	function phpGrep($q, $path, $base) {
 		$fp = opendir($path);
-		$slash = $serverType == "Windows" ? "\\" : "/";
 		global $r;
 		global $ICEcoder;
+		global $serverType;
+		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)) {
-				$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['bannedFiles']);$i++) {
 					if (strpos($f,$ICEcoder['bannedFiles'][$i])>0) {$bFile = true;};
 				}
-				if (!$rFile && !$bFile) {
+				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'])) {
@@ -121,23 +122,23 @@ 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
 	}
 }
 ?>
-foundArray.length==0 ? showHide = "hide" : showHide = "show";
+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 ;}; ?>
-foundArray.length >= 2 ? plural = "s" : plural = "";
+plural = foundArray.length >= 2 ? "s" : "";
 targetName = "<?php echo $targetName;?>";
-foundInSelected ? selectedText = "selected " : selectedText = "";
-document.getElementById('title').innerHTML = "'<?php echo strClean($_GET['find']); ?>' found in "+foundArray.length+" "+selectedText+targetName+plural;
+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) {
@@ -161,7 +162,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 if(isset($_GET['replace'])) {echo strClean($_GET['replace']);}; ?>');
 }

 var replaceInFilesAll = function() {
@@ -173,7 +174,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 if(isset($_GET['replace'])) {echo strClean($_GET['replace']);}; ?>");
 	top.ICEcoder.renameFile(fileRef,newName);
 }

--- a/lib/file-folder-properties.css
+++ b/lib/file-folder-properties.css
--- a/lib/file-folder-properties.php
+++ b/lib/file-folder-properties.php
@@ -3,9 +3,9 @@

 <html onContextMenu="return false">
 <head>
-<title>ICE Coder - <?php echo $ICEcoder["versionNo"];?> :: File/Folder Properties</title>
+<title>ICEcoder <?php echo $ICEcoder["versionNo"];?> file/folder properties</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<link rel="stylesheet" type="text/css" href="file-folder-properties.css">
+<link rel="stylesheet" type="text/css" href="properties.css">
 </head>

 <body class="properties">
@@ -38,24 +38,18 @@ echo number_format($outputSize, 2, '.', '').$outputUnit." (".number_format($byte
 <span class="column">Last access: <?php echo date( "D d M Y g:i:sa", fileatime($fileName)); ?></span>
 <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]';
-}
-?></span>
+<span class="column" style="margin: 0 10px">Readable / Writeable: 
+<?php 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]';
-?>
+Absolute path:<br><?php echo $fileName;?>
 <br><br>
 </span>
 <span class="column" style="width: 180px">
 Permissions:
-<?
+<?php
 $chmodInfo = substr(sprintf('%o', fileperms($fileName)), -4);
 echo $chmodInfo;
 ?>
@@ -144,13 +138,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/settings-screen.php
+++ b/lib/settings-screen.php
@@ -3,7 +3,7 @@

 <html>
 <head>
-<title>ICEcoder settings screen</title>
+<title>ICEcoder <?php echo $ICEcoder["versionNo"];?> settings screen</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <link rel="stylesheet" type="text/css" href="settings-screen.css">
 <link rel="stylesheet" href="../<?php echo $ICEcoder["codeMirrorDir"]; ?>/lib/codemirror.css">
@@ -48,11 +48,13 @@ for ($i=0;$i<count($themeArray);$i++) {
 	<br><br>

 	codemirror version:<br>
-	<?php echo $ICEcoder["cMThisVer"]; ?>
+	<script>
+	document.write(CodeMirror.version);
+	</script>
 	<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>
@@ -98,8 +100,6 @@ new password <span style="font-size: 10px; color: #888">8 chars</span><br>
 confirm password<br>
 <input type="password" name="confirmPassword" onkeydown="showButton()"><br>
 <br>
-restricted files/folders<br>
-<input type="text" onkeydown="document.settings.changedFileSettings.value='true';showButton()" name="restrictedFiles" value="<?php for($i=0;$i<=count($ICEcoder["restrictedFiles"])-1;$i++) {echo $ICEcoder["restrictedFiles"][$i]; if ($i<count($ICEcoder["restrictedFiles"])-1) {echo ', ';};}; ?>"><br>
 banned files/folders<br>
 <input type="text" onkeydown="document.settings.changedFileSettings.value='true';showButton()" name="bannedFiles" value="<?php for($i=0;$i<=count($ICEcoder["bannedFiles"])-1;$i++) {echo $ICEcoder["bannedFiles"][$i]; if ($i<count($ICEcoder["bannedFiles"])-1) {echo ', ';};}; ?>"><br>
 <input type="hidden" name="changedFileSettings" value="false">
@@ -113,17 +113,9 @@ ip addresses<br>
 plugins array <span style="font-size: 10px; color: #888">name, img src, style, url, target, setInterval (mins)</span><br>
 <textarea name="plugins" class="plugins" onkeydown="showButton()"><?php
 for($i=0;$i<count($ICEcoder["plugins"]);$i++) {
-	for($j=0;$j<count($ICEcoder["plugins"][$i]);$j++) {
-		echo '"'.$ICEcoder["plugins"][$i][$j].'"';
-		if ($j<count($ICEcoder["plugins"][$i])-1) {
-			echo ',';
-		};
-		if (!($i==count($ICEcoder["plugins"])-1 && $j==count($ICEcoder["plugins"][$i])-1)) {
-			echo PHP_EOL;
-		}
-		if (($i<count($ICEcoder["plugins"])-1 && $j==count($ICEcoder["plugins"][$i])-1)) {
-			echo "====================".PHP_EOL;
-		}
+	echo '"'.implode('",'.PHP_EOL.'"', $ICEcoder["plugins"][$i]).'"';
+	if ($i<count($ICEcoder["plugins"])-1) {
+		echo PHP_EOL."====================".PHP_EOL;
 	}
 }
 ?></textarea>
@@ -172,8 +164,8 @@ function findSequence(goal) {
 var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
 	lineNumbers: true,
 	readOnly: "nocursor",
-	indentUnit: top.tabWidth,
-	tabSize: top.tabWidth,
+	indentUnit: top.ICEcoder.tabWidth,
+	tabSize: top.ICEcoder.tabWidth,
 	mode: "javascript",
 	theme: "<?php echo $ICEcoder["theme"]=="default" ? 'icecoder' : $ICEcoder["theme"];?>"
 	});
@@ -202,7 +194,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 +203,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
@@ -1,4 +1,8 @@
 <?php
+ini_set('display_errors', 1);
+ini_set('log_errors', 1);
+ini_set('error_log', dirname(__FILE__).'/../error_log.txt');
+error_reporting(-1);
 // Start a session if we haven't already
 if(!isset($_SESSION)) {session_start();}

@@ -29,13 +33,15 @@ include($settingsFile);

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

+$onLoadExtras = "";
+$pluginsDisplay = "";
+
 // Update this config file?
-if (isset($_POST["theme"]) && $_POST["theme"] && $_SESSION['userLevel'] == 10) {
+if (isset($_SESSION['loggedIn']) && $_SESSION['loggedIn'] && isset($_POST["theme"]) && $_POST["theme"]) {
 	$settingsContents = file_get_contents($settingsFile);
 	// Replace our settings vars
 	$repPosStart = strpos($settingsContents,'"root"');
@@ -43,22 +49,21 @@ if (isset($_POST["theme"]) && $_POST["theme"] && $_SESSION['userLevel'] == 10) {

 	// Prepare all our vars
 	$ICEcoder["root"]			= strClean($_POST['root']);
-	$ICEcoder["tabsIndent"]			= $_POST['tabsIndent'] ? "true" : "false";
-	$ICEcoder["checkUpdates"]		= $_POST['checkUpdates'] ? "true" : "false";
-	$ICEcoder["openLastFiles"]		= $_POST['openLastFiles'] ? "true" : "false";
+	$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";
 	$ICEcoder["findFilesExclude"]		= 'array("'.str_replace(',','","',str_replace(" ","",strClean($_POST['findFilesExclude']))).'")';
-	$ICEcoder["codeAssist"]			= $_POST['codeAssist'] ? "true" : "false";
-	$ICEcoder["visibleTabs"]		= $_POST['visibleTabs'] ? "true" : "false";
-	$ICEcoder["lockedNav"]			= $_POST['lockedNav'] ? "true" : "false";
+	$ICEcoder["codeAssist"]			= isset($_POST['codeAssist']) && $_POST['codeAssist'] ? "true" : "false";
+	$ICEcoder["visibleTabs"]		= isset($_POST['visibleTabs']) && $_POST['visibleTabs'] ? "true" : "false";
+	$ICEcoder["lockedNav"]			= isset($_POST['lockedNav']) && $_POST['lockedNav'] ? "true" : "false";
 	if ($_POST['accountPassword']!="")	{$ICEcoder["accountPassword"] = generateHash(strClean($_POST['accountPassword']));};
-	$ICEcoder["restrictedFiles"]		= 'array("'.str_replace(',','","',str_replace(" ","",strClean($_POST['restrictedFiles']))).'")';
 	$ICEcoder["bannedFiles"]		= 'array("'.str_replace(',','","',str_replace(" ","",strClean($_POST['bannedFiles']))).'")';
 	$ICEcoder["allowedIPs"]			= 'array("'.str_replace(',','","',str_replace(" ","",strClean($_POST['allowedIPs']))).'")';
 	$ICEcoder["plugins"]			= 'array('.PHP_EOL.'	array('.PHP_EOL.'	'.str_replace('====================','),'.PHP_EOL.'	array(',$_POST['plugins']).'))';
 	$ICEcoder["theme"]			= strClean($_POST['theme']);
 	$ICEcoder["tabWidth"]			= numClean($_POST['tabWidth']);

-	$settingsArray = array("root","tabsIndent","checkUpdates","openLastFiles","findFilesExclude","codeAssist","visibleTabs","lockedNav","accountPassword","restrictedFiles","bannedFiles","allowedIPs","plugins","theme","tabWidth");
+	$settingsArray = array("root","tabsIndent","checkUpdates","openLastFiles","findFilesExclude","codeAssist","visibleTabs","lockedNav","accountPassword","bannedFiles","allowedIPs","plugins","theme","tabWidth");
 	$settingsNew = "";
 	for ($i=0;$i<count($settingsArray);$i++) {
 		$settingsNew .= '"'.$settingsArray[$i].'"'.PHP_EOL.'	=> ';
@@ -74,7 +79,7 @@ if (isset($_POST["theme"]) && $_POST["theme"] && $_SESSION['userLevel'] == 10) {
 	fclose($fh);

 	// OK, now the config file has been updated, update our current session with new arrays
-	$settingsArray = array("findFilesExclude","restrictedFiles","bannedFiles","allowedIPs");
+	$settingsArray = array("findFilesExclude","bannedFiles","allowedIPs");
 	for ($i=0;$i<count($settingsArray);$i++) {
 		$_SESSION[$settingsArray[$i]] = $ICEcoder[$settingsArray[$i]] = explode(",",str_replace(" ","",strClean($_POST[$settingsArray[$i]])));
 	}
@@ -86,21 +91,21 @@ 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");
+$settingsArray = array("findFilesExclude","bannedFiles","allowedIPs");
 for ($i=0;$i<count($settingsArray);$i++) {
 	if (!isset($_SESSION[$settingsArray[$i]])) {$_SESSION[$settingsArray[$i]] = $ICEcoder[$settingsArray[$i]];}
 }
@@ -118,41 +123,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." and press refresh");
+		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." and press refresh");
+				fwrite($fh, $settingsContents);
 			}
 		}
 		fclose($fh);
@@ -160,10 +163,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 +182,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>if(top.document.getElementById('pluginsContainer')) {top.document.getElementById('pluginsContainer').innerHTML = '".$pluginsDisplay."'};</script>";

 	// Work out what plugins we'll need to set on a setInterval
 	$onLoadExtras = "";
@@ -192,7 +193,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,87 +205,63 @@ 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." and press refresh");
+		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>
+<!DOCTYPE html>

-	<html>
-	<head>
-	<title>ICEcoder <?php echo $ICEcoder["versionNo"];?> setup</title>
-	<link rel="stylesheet" type="text/css" href="coder.css">
-	</head>
+<html>
+<head>
+<title>ICEcoder <?php
+echo $ICEcoder["versionNo"]." : ";
+echo $ICEcoder["accountPassword"] == "" ? "Setup" : "Login";
+?></title>
+<link rel="stylesheet" type="text/css" href="ice-coder.css">
+<link rel="icon" type="image/png" href="../favicon.png">
+</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>
-			</div>
+<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="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>
+</div>

-	</body>
+</body>

-	</html>
+</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/icon.png
+++ b/plugins/ice-repo/icon.png
--- 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);