Backups folder added, text file as a placeholder

Small text file added to this folder giving info on ZipIt backups Wanted the backups folder in the repo as standard Added note to readme file to mention adding perms on this folder too (Saves asking users to give perms on parent ICEcoder dir
Added note about setting perms on backups folder
2026-03-15 21:07:12 +01:00 · 2012-07-20 17:54:37 +01:00 · 2012-07-20 17:52:25 +01:00 · 2012-07-20 17:48:17 +01:00 · 2012-07-20 17:45:19 +01:00 · 2012-07-20 17:31:30 +01:00
37 changed files with 320 additions and 595 deletions
--- a/CodeMirror-2.3/lib/codemirror-compressed.js
+++ b/CodeMirror-2.3/lib/codemirror-compressed.js
--- a/CodeMirror-2.3/lib/util/foldcode.js
+++ b/CodeMirror-2.3/lib/util/foldcode.js
@@ -1,196 +0,0 @@
-// the tagRangeFinder function is
-//   Copyright (C) 2011 by Daniel Glazman <daniel@glazman.org>
-// released under the MIT license (../../LICENSE) like the rest of CodeMirror
-CodeMirror.tagRangeFinder = function(cm, line, hideEnd) {
-  var nameStartChar = "A-Z_a-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD";
-  var nameChar = nameStartChar + "\-\:\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040";
-  var xmlNAMERegExp = new RegExp("^[" + nameStartChar + "][" + nameChar + "]*");
-
-  var lineText = cm.getLine(line);
-  var found = false;
-  var tag = null;
-  var pos = 0;
-  while (!found) {
-    pos = lineText.indexOf("<", pos);
-    if (-1 == pos) // no tag on line
-      return;
-    if (pos + 1 < lineText.length && lineText[pos + 1] == "/") { // closing tag
-      pos++;
-      continue;
-    }
-    // ok we weem to have a start tag
-    if (!lineText.substr(pos + 1).match(xmlNAMERegExp)) { // not a tag name...
-      pos++;
-      continue;
-    }
-    var gtPos = lineText.indexOf(">", pos + 1);
-    if (-1 == gtPos) { // end of start tag not in line
-      var l = line + 1;
-      var foundGt = false;
-      var lastLine = cm.lineCount();
-      while (l < lastLine && !foundGt) {
-        var lt = cm.getLine(l);
-        var gt = lt.indexOf(">");
-        if (-1 != gt) { // found a >
-          foundGt = true;
-          var slash = lt.lastIndexOf("/", gt);
-          if (-1 != slash && slash < gt) {
-            var str = lineText.substr(slash, gt - slash + 1);
-            if (!str.match( /\/\s*\>/ )) { // yep, that's the end of empty tag
-              if (hideEnd === true) l++;
-              return l;
-            }
-          }
-        }
-        l++;
-      }
-      found = true;
-    }
-    else {
-      var slashPos = lineText.lastIndexOf("/", gtPos);
-      if (-1 == slashPos) { // cannot be empty tag
-        found = true;
-        // don't continue
-      }
-      else { // empty tag?
-        // check if really empty tag
-        var str = lineText.substr(slashPos, gtPos - slashPos + 1);
-        if (!str.match( /\/\s*\>/ )) { // finally not empty
-          found = true;
-          // don't continue
-        }
-      }
-    }
-    if (found) {
-      var subLine = lineText.substr(pos + 1);
-      tag = subLine.match(xmlNAMERegExp);
-      if (tag) {
-        // we have an element name, wooohooo !
-        tag = tag[0];
-        // do we have the close tag on same line ???
-        if (-1 != lineText.indexOf("</" + tag + ">", pos)) // yep
-        {
-          found = false;
-        }
-        // we don't, so we have a candidate...
-      }
-      else
-        found = false;
-    }
-    if (!found)
-      pos++;
-  }
-
-  if (found) {
-    var startTag = "(\\<\\/" + tag + "\\>)|(\\<" + tag + "\\>)|(\\<" + tag + "\\s)|(\\<" + tag + "$)";
-    var startTagRegExp = new RegExp(startTag, "g");
-    var endTag = "</" + tag + ">";
-    var depth = 1;
-    var l = line + 1;
-    var lastLine = cm.lineCount();
-    while (l < lastLine) {
-      lineText = cm.getLine(l);
-      var match = lineText.match(startTagRegExp);
-      if (match) {
-        for (var i = 0; i < match.length; i++) {
-          if (match[i] == endTag)
-            depth--;
-          else
-            depth++;
-          if (!depth) {
-            if (hideEnd === true) l++;
-            return l;
-          }
-        }
-      }
-      l++;
-    }
-    return;
-  }
-};
-
-CodeMirror.braceRangeFinder = function(cm, line, hideEnd) {
-  var lineText = cm.getLine(line), at = lineText.length, startChar, tokenType;
-  for (;;) {
-    var found = lineText.lastIndexOf("{", at);
-    if (found < 0) break;
-    tokenType = cm.getTokenAt({line: line, ch: found}).className;
-    if (!/^(comment|string)/.test(tokenType)) { startChar = found; break; }
-    at = found - 1;
-  }
-  if (startChar == null || lineText.lastIndexOf("}") > startChar) return;
-  var count = 1, lastLine = cm.lineCount(), end;
-  outer: for (var i = line + 1; i < lastLine; ++i) {
-    var text = cm.getLine(i), pos = 0;
-    for (;;) {
-      var nextOpen = text.indexOf("{", pos), nextClose = text.indexOf("}", pos);
-      if (nextOpen < 0) nextOpen = text.length;
-      if (nextClose < 0) nextClose = text.length;
-      pos = Math.min(nextOpen, nextClose);
-      if (pos == text.length) break;
-      if (cm.getTokenAt({line: i, ch: pos + 1}).className == tokenType) {
-        if (pos == nextOpen) ++count;
-        else if (!--count) { end = i; break outer; }
-      }
-      ++pos;
-    }
-  }
-  if (end == null || end == line + 1) return;
-  if (hideEnd === true) end++;
-  return end;
-};
-
-CodeMirror.indentRangeFinder = function(cm, line) {
-  var tabSize = cm.getOption("tabSize");
-  var myIndent = cm.getLineHandle(line).indentation(tabSize), last;
-  for (var i = line + 1, end = cm.lineCount(); i < end; ++i) {
-    var handle = cm.getLineHandle(i);
-    if (!/^\s*$/.test(handle.text)) {
-      if (handle.indentation(tabSize) <= myIndent) break;
-      last = i;
-    }
-  }
-  if (!last) return null;
-  return last + 1;
-};
-
-CodeMirror.newFoldFunction = function(rangeFinder, markText, hideEnd) {
-  var folded = [];
-  if (markText == null) markText = '<div style="position: absolute; left: 2px; color:#600">&#x25bc;</div>%N%';
-
-  function isFolded(cm, n) {
-    for (var i = 0; i < folded.length; ++i) {
-      var start = cm.lineInfo(folded[i].start);
-      if (!start) folded.splice(i--, 1);
-      else if (start.line == n) return {pos: i, region: folded[i]};
-    }
-  }
-
-  function expand(cm, region) {
-    cm.clearMarker(region.start);
-    for (var i = 0; i < region.hidden.length; ++i)
-      cm.showLine(region.hidden[i]);
-  }
-
-  return function(cm, line) {
-    cm.operation(function() {
-      var known = isFolded(cm, line);
-      if (known) {
-        folded.splice(known.pos, 1);
-        expand(cm, known.region);
-      } else {
-        var end = rangeFinder(cm, line, hideEnd);
-        if (end == null) return;
-        var hidden = [];
-        for (var i = line + 1; i < end; ++i) {
-          var handle = cm.hideLine(i);
-          if (handle) hidden.push(handle);
-        }
-        var first = cm.setMarker(line, markText);
-        var region = {start: first, hidden: hidden};
-        cm.onDeleteLine(first, function() { expand(cm, region); });
-        folded.push(region);
-      }
-    });
-  };
-};
--- a/CodeMirror-2.3/lib/util/match-highlighter.js
+++ b/CodeMirror-2.3/lib/util/match-highlighter.js
@@ -1,44 +0,0 @@
-// Define match-highlighter commands. Depends on searchcursor.js
-// Use by attaching the following function call to the onCursorActivity event:
-	//myCodeMirror.matchHighlight(minChars);
-// And including a special span.CodeMirror-matchhighlight css class (also optionally a separate one for .CodeMirror-focused -- see demo matchhighlighter.html)
-
-(function() {
-  var DEFAULT_MIN_CHARS = 2;
-  
-  function MatchHighlightState() {
-	this.marked = [];
-  }
-  function getMatchHighlightState(cm) {
-	return cm._matchHighlightState || (cm._matchHighlightState = new MatchHighlightState());
-  }
-  
-  function clearMarks(cm) {
-	var state = getMatchHighlightState(cm);
-	for (var i = 0; i < state.marked.length; ++i)
-		state.marked[i].clear();
-	state.marked = [];
-  }
-  
-  function markDocument(cm, className, minChars) {
-    clearMarks(cm);
-	minChars = (typeof minChars !== 'undefined' ? minChars : DEFAULT_MIN_CHARS);
-	if (cm.somethingSelected() && cm.getSelection().replace(/^\s+|\s+$/g, "").length >= minChars) {
-		var state = getMatchHighlightState(cm);
-		var query = cm.getSelection();
-		cm.operation(function() {
-			if (cm.lineCount() < 2000) { // This is too expensive on big documents.
-			  for (var cursor = cm.getSearchCursor(query); cursor.findNext();) {
-				//Only apply matchhighlight to the matches other than the one actually selected
-				if (!(cursor.from().line === cm.getCursor(true).line && cursor.from().ch === cm.getCursor(true).ch))
-					state.marked.push(cm.markText(cursor.from(), cursor.to(), className));
-			  }
-			}
-		  });
-	}
-  }
-
-  CodeMirror.defineExtension("matchHighlight", function(className, minChars) {
-    markDocument(this, className, minChars);
-  });
-})();
--- a/CodeMirror-2.3/lib/util/searchcursor.js
+++ b/CodeMirror-2.3/lib/util/searchcursor.js
@@ -1,117 +0,0 @@
-(function(){
-  function SearchCursor(cm, query, pos, caseFold) {
-    this.atOccurrence = false; this.cm = cm;
-    if (caseFold == null && typeof query == "string") caseFold = false;
-
-    pos = pos ? cm.clipPos(pos) : {line: 0, ch: 0};
-    this.pos = {from: pos, to: pos};
-
-    // The matches method is filled in based on the type of query.
-    // It takes a position and a direction, and returns an object
-    // describing the next occurrence of the query, or null if no
-    // more matches were found.
-    if (typeof query != "string") // Regexp match
-      this.matches = function(reverse, pos) {
-        if (reverse) {
-          var line = cm.getLine(pos.line).slice(0, pos.ch), match = line.match(query), start = 0;
-          while (match) {
-            var ind = line.indexOf(match[0]);
-            start += ind;
-            line = line.slice(ind + 1);
-            var newmatch = line.match(query);
-            if (newmatch) match = newmatch;
-            else break;
-            start++;
-          }
-        }
-        else {
-          var line = cm.getLine(pos.line).slice(pos.ch), match = line.match(query),
-          start = match && pos.ch + line.indexOf(match[0]);
-        }
-        if (match)
-          return {from: {line: pos.line, ch: start},
-                  to: {line: pos.line, ch: start + match[0].length},
-                  match: match};
-      };
-    else { // String query
-      if (caseFold) query = query.toLowerCase();
-      var fold = caseFold ? function(str){return str.toLowerCase();} : function(str){return str;};
-      var target = query.split("\n");
-      // Different methods for single-line and multi-line queries
-      if (target.length == 1)
-        this.matches = function(reverse, pos) {
-          var line = fold(cm.getLine(pos.line)), len = query.length, match;
-          if (reverse ? (pos.ch >= len && (match = line.lastIndexOf(query, pos.ch - len)) != -1)
-              : (match = line.indexOf(query, pos.ch)) != -1)
-            return {from: {line: pos.line, ch: match},
-                    to: {line: pos.line, ch: match + len}};
-        };
-      else
-        this.matches = function(reverse, pos) {
-          var ln = pos.line, idx = (reverse ? target.length - 1 : 0), match = target[idx], line = fold(cm.getLine(ln));
-          var offsetA = (reverse ? line.indexOf(match) + match.length : line.lastIndexOf(match));
-          if (reverse ? offsetA >= pos.ch || offsetA != match.length
-              : offsetA <= pos.ch || offsetA != line.length - match.length)
-            return;
-          for (;;) {
-            if (reverse ? !ln : ln == cm.lineCount() - 1) return;
-            line = fold(cm.getLine(ln += reverse ? -1 : 1));
-            match = target[reverse ? --idx : ++idx];
-            if (idx > 0 && idx < target.length - 1) {
-              if (line != match) return;
-              else continue;
-            }
-            var offsetB = (reverse ? line.lastIndexOf(match) : line.indexOf(match) + match.length);
-            if (reverse ? offsetB != line.length - match.length : offsetB != match.length)
-              return;
-            var start = {line: pos.line, ch: offsetA}, end = {line: ln, ch: offsetB};
-            return {from: reverse ? end : start, to: reverse ? start : end};
-          }
-        };
-    }
-  }
-
-  SearchCursor.prototype = {
-    findNext: function() {return this.find(false);},
-    findPrevious: function() {return this.find(true);},
-
-    find: function(reverse) {
-      var self = this, pos = this.cm.clipPos(reverse ? this.pos.from : this.pos.to);
-      function savePosAndFail(line) {
-        var pos = {line: line, ch: 0};
-        self.pos = {from: pos, to: pos};
-        self.atOccurrence = false;
-        return false;
-      }
-
-      for (;;) {
-        if (this.pos = this.matches(reverse, pos)) {
-          this.atOccurrence = true;
-          return this.pos.match || true;
-        }
-        if (reverse) {
-          if (!pos.line) return savePosAndFail(0);
-          pos = {line: pos.line-1, ch: this.cm.getLine(pos.line-1).length};
-        }
-        else {
-          var maxLine = this.cm.lineCount();
-          if (pos.line == maxLine - 1) return savePosAndFail(maxLine);
-          pos = {line: pos.line+1, ch: 0};
-        }
-      }
-    },
-
-    from: function() {if (this.atOccurrence) return this.pos.from;},
-    to: function() {if (this.atOccurrence) return this.pos.to;},
-
-    replace: function(newText) {
-      var self = this;
-      if (this.atOccurrence)
-        self.pos.to = this.cm.replaceRange(newText, self.pos.from, self.pos.to);
-    }
-  };
-
-  CodeMirror.defineExtension("getSearchCursor", function(query, pos, caseFold) {
-    return new SearchCursor(this, query, pos, caseFold);
-  });
-})();
--- a/CodeMirror-2.31/LICENSE
+++ b/CodeMirror-2.31/LICENSE
--- a/CodeMirror-2.31/README.md
+++ b/CodeMirror-2.31/README.md
--- a/CodeMirror-2.31/lib/codemirror-compressed.js
+++ b/CodeMirror-2.31/lib/codemirror-compressed.js
--- a/CodeMirror-2.31/lib/codemirror.css
+++ b/CodeMirror-2.31/lib/codemirror.css
@@ -62,6 +62,7 @@
  text-align: right;
  padding: .4em .2em .4em .4em;
  white-space: pre !important;
+  cursor: default;
 }
 .CodeMirror-lines {
  padding: .4em;
--- a/CodeMirror-2.31/theme/ambiance.css
+++ b/CodeMirror-2.31/theme/ambiance.css
--- a/CodeMirror-2.31/theme/blackboard.css
+++ b/CodeMirror-2.31/theme/blackboard.css
--- a/CodeMirror-2.31/theme/cobalt.css
+++ b/CodeMirror-2.31/theme/cobalt.css
--- a/CodeMirror-2.31/theme/eclipse.css
+++ b/CodeMirror-2.31/theme/eclipse.css
--- a/CodeMirror-2.31/theme/elegant.css
+++ b/CodeMirror-2.31/theme/elegant.css
--- a/CodeMirror-2.31/theme/erlang-dark.css
+++ b/CodeMirror-2.31/theme/erlang-dark.css
--- a/CodeMirror-2.31/theme/lesser-dark.css
+++ b/CodeMirror-2.31/theme/lesser-dark.css
--- a/CodeMirror-2.31/theme/monokai.css
+++ b/CodeMirror-2.31/theme/monokai.css
--- a/CodeMirror-2.31/theme/neat.css
+++ b/CodeMirror-2.31/theme/neat.css
--- a/CodeMirror-2.31/theme/night.css
+++ b/CodeMirror-2.31/theme/night.css
--- a/CodeMirror-2.31/theme/rubyblue.css
+++ b/CodeMirror-2.31/theme/rubyblue.css
--- a/CodeMirror-2.31/theme/vibrant-ink.css
+++ b/CodeMirror-2.31/theme/vibrant-ink.css
@@ -1,4 +1,4 @@
-/* Taken from the popular Visual Studio Vibrant Ink Schema */
+/* Taken from the popular Visual Studio Vibrant Ink Schema */

 .cm-s-vibrant-ink { background: black; color: white; }
 .cm-s-vibrant-ink .CodeMirror-selected { background: #35493c !important; }
--- a/CodeMirror-2.31/theme/xq-dark.css
+++ b/CodeMirror-2.31/theme/xq-dark.css
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@ $ git clone git@github:mattpass/ICEcoder
 ####Step 2: Upload the files (Linux or Windows hosting OK)
 ```
 Upload to a new sub-dir URL such as yourdomain.com/_coder
-Set public write permissions on the lib/config.php file
+Set public write permissions on the backups folder and lib/config.php file
 ```

 ####Step 3: Start coding
--- a/backups/info.txt
+++ b/backups/info.txt
@@ -0,0 +1 @@
+Backups are stored in this folder every 10 mins by default
--- a/editor.php
+++ b/editor.php
@@ -1,23 +1,22 @@
 <?php include("lib/config.php");?>
 <!DOCTYPE html>

-<html style="margin: 0">
+<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>CodeMirror 2: ICE Coders Editor of Choice</title>
 <?php include("lib/settings.php");?>
-<link rel="stylesheet" href="<?php echo $codeMirrorDir; ?>/lib/codemirror.css">
-<!--codemirror-compressed.js includes codemirror.js plus the mode files for clike, coffeescript, css, javascript, less, php, ruby & xml //-->
-<script src="<?php echo $codeMirrorDir; ?>/lib/codemirror-compressed.js"></script>
-<script src="<?php echo $codeMirrorDir; ?>/lib/util/searchcursor.js"></script>
-<script src="<?php echo $codeMirrorDir; ?>/lib/util/match-highlighter.js"></script>
-<script src="<?php echo $codeMirrorDir; ?>/lib/util/foldcode.js"></script>
-<?php
-if ($theme=="default") {
-	echo '<link rel="stylesheet" href="lib/editor.css">';
-} else {
-	echo '<link rel="stylesheet" href="'.$codeMirrorDir.'/theme/'.$theme.'.css">';
-}
-?>
+<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
+//-->
+<script src="<?php echo $ICEcoder["codeMirrorDir"]; ?>/lib/codemirror-compressed.js"></script>
+<link rel="stylesheet" href="<?php echo $ICEcoder["theme"]=="default" ? 'lib/editor.css' : '{$ICEcoder["codeMirrorDir"]}/theme/{$ICEcoder["theme"]}.css';?>">
 <style type="text/css">
 .CodeMirror {position: absolute; width: 0; background-color: #fff; top: 0px; width: 100px; z-index: 1}
 .CodeMirror-scroll {height: 100px;}
@@ -25,7 +24,7 @@ if ($theme=="default") {
 span.CodeMirror-matchhighlight {background: #555}
 .CodeMirror-focused span.CodeMirror-matchhighlight {color: #000; background: #555; !important}
 /* Make sure this next one remains the 6th item, updated with JS */
-.cm-tab:after {position: relative; display: inline-block; width: 0; left: -1.4em; overflow: visible; color: #aaa; content: "<?php if($visibleTabs) {echo '\\21e5';};?>";}
+.cm-tab:after {position: relative; display: inline-block; width: 0; left: -1.4em; overflow: visible; color: #aaa; content: "<?php if($ICEcoder["visibleTabs"]) {echo '\\21e5';};?>";}
 </style>
 </head>

@@ -39,6 +38,8 @@ span.CodeMirror-matchhighlight {background: #555}
 	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 $_SERVER['DOCUMENT_ROOT'].'<br><br>'.PHP_EOL;
+	echo '<span style="color:#888">ICEcoder Root:</span><br>'.PHP_EOL;
+	echo $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;
@@ -48,9 +49,9 @@ span.CodeMirror-matchhighlight {background: #555}
 	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(",",$last10Files);
+	$last10FilesArray = explode(",",$ICEcoder["last10Files"]);
 	for ($i=0;$i<count($last10FilesArray);$i++) {
-		if ($last10Files=="") {
+		if ($ICEcoder["last10Files"]=="") {
 			echo '[none]<br><br>';
 		} else {
 			echo '<a style="cursor:pointer" onClick="top.ICEcoder.openFile(top.fullPath+\''.str_replace("|","/",$last10FilesArray[$i]).'\')">';
--- a/files.php
+++ b/files.php
@@ -1,6 +1,6 @@
 <!DOCTYPE html>

-<html onMouseDown="top.ICEcoder.mouseDown=true" onMouseUp="top.ICEcoder.mouseDown=false" onMouseMove="top.ICEcoder.getMouseXY(event);top.ICEcoder.canResizeFilesW()" onContextMenu="top.ICEcoder.rightClickedFile=top.ICEcoder.thisFileFolderLink; return top.ICEcoder.showMenu()" onClick="top.ICEcoder.selectFileFolder()">
+<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>
 <link rel="stylesheet" type="text/css" href="lib/files.css">
@@ -12,9 +12,9 @@

 <?php
 include("lib/settings.php");
-$restrictedFiles  = $_SESSION['restrictedFiles'];
-$bannedFiles  = $_SESSION['bannedFiles'];
-strrpos($_SERVER['DOCUMENT_ROOT'],":") ? $serverType = "Windows" : $serverType = "Linux";
+$ICEcoder["restrictedFiles"]  = $_SESSION['restrictedFiles'];
+$ICEcoder["bannedFiles"]  = $_SESSION['bannedFiles'];
+$serverType = strrpos($_SERVER['DOCUMENT_ROOT'],":") ? "Windows" : "Linux";

 // Function to sort given values alphabetically
 function alphasort($a, $b) {
@@ -35,7 +35,7 @@ class SortingIterator implements IteratorAggregate {
 }

 // Get a full list of dirs & files and begin sorting using above class & function
-$path = $_SERVER['DOCUMENT_ROOT'];
+$path = $ICEcoder["root"];
 $objectList = new SortingIterator(new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path), RecursiveIteratorIterator::SELF_FIRST), 'alphasort');

 // With that done, create arrays for out final ordered list and a temp container of files
@@ -43,12 +43,12 @@ $finalArray = $tempArray =  array();

 // To start, push folders from object into finalArray, files into tempArray
 foreach ($objectList as $objectRef) {
-	$fileFolderName = rtrim(substr($objectRef->getPathname(), strlen($path)),"..");
+	$fileFolderName = substr($objectRef->getPathname(), strlen($path));
 	$canAdd = true;
-	for ($i=0;$i<count($bannedFiles);$i++) {
-		if(strpos($fileFolderName,$bannedFiles[$i])!==false) {$canAdd = false;}
+	for ($i=0;$i<count($ICEcoder["bannedFiles"]);$i++) {
+		if(strpos($fileFolderName,$ICEcoder["bannedFiles"][$i])!==false) {$canAdd = false;}
 	}
-	if ($objectRef->getFilename()!="." && $fileFolderName[strlen($fileFolderName)-1]!="/" && $canAdd) {
+	if ($objectRef->getFilename()!="." && $objectRef->getFilename()!=".." && $fileFolderName[strlen($fileFolderName)-1]!="/" && $canAdd) {
 		$fileFolderName!="/" && is_dir($path.$fileFolderName) ? array_push($finalArray,$fileFolderName) : array_push($tempArray,$fileFolderName);
 	}
 }
@@ -81,11 +81,20 @@ if ($serverType=="Linux") {
 	$chmodInfo = substr(sprintf('%o', fileperms($path)), -3);
 	$fileAtts = '<span style="color: #888; font-size: 8px" id="|_perms">'.$chmodInfo.'</span>';
 }
-echo "<ul class=\"fileManager\">\n<li class=\"pft-directory\"><a href=\"#\" title=\"/\" onMouseOver=\"top.ICEcoder.overFileFolder('folder','$path/')\" onMouseOut=\"top.ICEcoder.overFileFolder('folder','')\" style=\"position: relative; left:-22px\">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span id=\"|\">/ [ROOT]</span> ".$fileAtts."</a></li>\n";
+echo "<ul class=\"fileManager\">\n";
+echo "<li class=\"pft-directory\">";
+echo "<a href=\"#\" title=\"/\" onMouseOver=\"top.ICEcoder.overFileFolder('folder','$path/')\" onMouseOut=\"top.ICEcoder.overFileFolder('folder','')\" style=\"position: relative; left:-22px\">";
+echo "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ";
+echo "<span id=\"|\">/ ";
+echo $path == $_SERVER['DOCUMENT_ROOT'] ? "[ROOT]" : str_replace($_SERVER['DOCUMENT_ROOT']."/","",$path);
+echo "</span> ";
+echo $fileAtts;
+echo "</a>";
+echo "</li>\n";
 $lastPath="";
 for ($i=0;$i<count($finalArray);$i++) {
 	$fileFolderName = str_replace("\\","/",$finalArray[$i]);
-	is_dir($path.$fileFolderName) ? $type="folder" : $type="file";
+	$type = is_dir($path.$fileFolderName) ? "folder" : "file";
 	$type=="folder" ? $dirCount++ : $fileCount++;
 	if (!is_dir($path.$fileFolderName)) {
 		$fileBytes+=filesize($path.$fileFolderName);
@@ -101,8 +110,8 @@ for ($i=0;$i<count($finalArray);$i++) {
 		}
 	}
 	$restrictedFile=false;
-	for ($j=0;$j<count($restrictedFiles);$j++) {
-		if (strpos($fileFolderName,$restrictedFiles[$j])!="") {
+	for ($j=0;$j<count($ICEcoder["restrictedFiles"]);$j++) {
+		if (strpos($fileFolderName,$ICEcoder["restrictedFiles"][$j])!="") {
 			$restrictedFile=true;
 		}
 	}
--- a/images/file-manager-icons.png
+++ b/images/file-manager-icons.png
--- a/index.php
+++ b/index.php
@@ -11,15 +11,15 @@ if (!$allowedIP) {
 };

 // Check for updates of ICEcoder & CodeMirror
-if ($checkUpdates) {
+if ($ICEcoder["checkUpdates"]) {
 	$ICEcoderLatestVer = json_encode(file_get_contents("http://icecoder.net/latest-version.txt"));
 	$ICEcoderLatestVer = rtrim(ltrim($ICEcoderLatestVer,"\""),"\"\\n");
-	if (ltrim($versionNo,"v ")<ltrim($ICEcoderLatestVer,"v ")) {
+	if (ltrim($ICEcoder["versionNo"],"v ")<ltrim($ICEcoderLatestVer,"v ")) {
 		echo '<script>top.ICEcoder.message(\'ICEcoder '.$ICEcoderLatestVer.' now released\n\nPlease upgrade\');</script>';
 	} else {
 		$cMLatestVer = json_encode(file_get_contents("http://codemirror.net/latest-version.txt"));
 		$cMLatestVer = rtrim(ltrim($cMLatestVer,"\""),"\"\\n");
-		if ($cMThisVer<$cMLatestVer) {
+		if ($ICEcoder["cMThisVer"]<$cMLatestVer) {
 			echo '<script>top.ICEcoder.message(\'Code Mirror '.$cMLatestVer.' now released\n\nPlease upgrade\');</script>';
 		}
 	}
@@ -27,18 +27,18 @@ if ($checkUpdates) {
 ?>
 <!DOCTYPE html>

-<html>
+<html onMouseDown="top.ICEcoder.mouseDown=true" onMouseUp="top.ICEcoder.mouseDown=false" onMouseMove="if(top.ICEcoder) {top.ICEcoder.getMouseXY(event,'top');top.ICEcoder.canResizeFilesW()}">
 <head>
-<title>ICE Coder - <?php echo $versionNo;?></title>
+<title>ICE Coder - <?php echo $ICEcoder["versionNo"];?></title>
 <meta name="robots" content="noindex, nofollow">
 <link rel="stylesheet" type="text/css" href="lib/coder.css">
 <script>
 shortURLStarts = "<?php echo $shortURLStarts;?>";
-theme = "<?php if ($theme=="default") {echo 'icecoder';} else {echo $theme;};?>";
-tabsIndent = <?php if ($tabsIndent) {echo 'true';} else {echo 'false';};?>;
-tabWidth = <?php echo $tabWidth; ?>;
+theme = "<?php echo $ICEcoder["theme"]=="default" ? 'icecoder' : $ICEcoder["theme"];?>";
+tabsIndent = <?php echo $ICEcoder["tabsIndent"] ? 'true' : 'false';?>;
+tabWidth = <?php echo $ICEcoder["tabWidth"]; ?>;
 <?
-echo 'fullPath = "'.$docRoot.'";'.PHP_EOL;
+echo 'fullPath = "'.$serverRoot.'";'.PHP_EOL;
 ?>
 window.onbeforeunload = function() {
 	for (var i=0; i<=top.ICEcoder.changedContent.length; i++) {
@@ -49,8 +49,8 @@ window.onbeforeunload = function() {
 }

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

-<body onLoad="ICEcoder.init(<?php if ($_SESSION['userLevel'] == 10) {echo "'login'";} ?>)<?php echo $onLoadExtras;?>" onResize="ICEcoder.setLayout()" onMouseMove="top.ICEcoder.getMouseXY(event);top.ICEcoder.canResizeFilesW()" onMouseDown="top.ICEcoder.mouseDown=true" onMouseUp="top.ICEcoder.mouseDown=false" onKeyDown="return ICEcoder.interceptKeys('coder', event);" onKeyUp="parent.ICEcoder.resetKeys(event);">
+<body onLoad="ICEcoder.init(<?php if ($_SESSION['userLevel'] == 10) {echo "'login'";} ?>)<?php echo $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">
@@ -99,7 +99,7 @@ previousFiles = [<?php
 	<div class="plugins" id="pluginsContainer">
 	<?php echo $pluginsDisplay; ?>
 	</div>
-	<div class="version"><?php echo $versionNo;?></div><img src="images/full-screen.gif" id="screenMode" class="screenModeIcon" onClick="top.ICEcoder.fullScreenSwitcher()">
+	<div class="version"><?php echo $ICEcoder["versionNo"];?></div><img src="images/full-screen.gif" id="screenMode" class="screenModeIcon" onClick="top.ICEcoder.fullScreenSwitcher()">
 	<img src="images/ice-coder.png" class="logo" onClick="ICEcoder.helpScreen()" onContextMenu="ICEcoder.settingsScreen()">
 </div>

@@ -141,7 +141,7 @@ previousFiles = [<?php
 			<div class="findReplace">
 				<div class="findText">Find</div>
 				<input type="text" name="find" value="" id="find" class="textbox find" onKeyUp="ICEcoder.findReplace('find',true,false)">
-				<div class="findTextPlural">'s</div>
+				
 				<select name="connector" onChange="ICEcoder.findReplaceOptions()">
 				<option>in</option>
 				<option>and</option>
--- a/lib/coder.css
+++ b/lib/coder.css
@@ -94,15 +94,15 @@ h2 {font-size: 18px; font-weight: normal; color: #fff}
 }
 .files .accountOptions {position: relative; height: 31px; width: 200px; margin-left: 15px; margin-top: 8px}
 .files .accountOptions img {cursor: pointer}
-.files .accountPassword {position: relative; border: 1px solid #888; background-color: #999; height: 18px; width: 140px; margin-left: 14px; margin-top: 15px}
+.files .accountPassword {position: relative; border: 0; background-color: #333; color: #fff; height: 18px; width: 140px; margin-left: 14px; margin-top: 16px}
 .files input:focus, .findReplace input:focus, .findReplace select:focus, .accountPassword:focus {
 	outline: none;
 	-webkit-box-shadow: 0 0 10px 1px rgba(0,198,255,0.7);
 	-moz-box-shadow: 0 0 10px 1px rgba(0,198,255,0.7);
 	box-shadow: 0 0 10px 1px rgba(0,198,255,0.7);
 }
-.files .button {position: absolute; border: 0; background: #999; color: #555; height:20px; margin-top: 16px; margin-left: 5px; font-size: 11px; cursor: pointer}
-.files .button:hover {background-color: #444; color: #eee}
+.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 .lock {position: relative; margin-left: 225px; margin-top: -20px; z-index: 1}
 .files .frame {display: inline-block; width: 250px}
 .files .serverMessage {position: absolute; display: inline-block; width: 450px; bottom: 0; margin-bottom: 30px; background-color: rgba(255,255,255,0.8); font-size: 10px; padding: 7px 12px; opacity: 0;
@@ -127,8 +127,7 @@ h2 {font-size: 18px; font-weight: normal; color: #fff}
 .findBar .findReplace {position: absolute; z-index: 1}
 .findReplace select {position: relative; font-size: 10px; margin: 8px 2px 0 2px; top: -2px;}
 .findReplace .findText {display: inline-block; height: 21px; font-size: 10px; margin: 8px 2px 0 2px; margin-left: 43px}
-.findReplace .find {position: relative; width: 120px; height: 16px; border: 0; top: -2px; font-size: 10px; padding-left: 5px}
-.findReplace .findTextPlural {display: inline-block; height: 21px; font-size: 10px; margin: 8px 2px 0 0}
+.findReplace .find {position: relative; width: 120px; height: 14px; border: 0; top: -2px; font-size: 10px; padding-left: 5px; margin-right: 3px}
 .findReplace .replaceAction {margin: 0 2px 0 0; top: -2px}
 .findReplace .replaceText {height: 21px; font-size: 10px; margin: 8px 2px 0 2px}
 .findReplace .replace {position: relative; width: 120px; height: 16px; border: 0; top: -2px; font-size: 10px; padding-left: 5px}
@@ -161,5 +160,6 @@ h2 {font-size: 18px; font-weight: normal; color: #fff}
 .screenContainer .screenVCenter {#position: absolute; display: table-cell; #top: 50%; vertical-align: middle; text-align: center}
 .screenVCenter .screenCenter {#position: relative; #top: -50%; text-align: center; display: inline}
 .screenCenter .version {position: relative; display: block; margin: 5px 0 15px 0; font-size: 10px; color: #bbb}
-.screenCenter .accountPassword {border: 1px solid #888; height: 18px}
-.screenCenter .button {border: 0; background: #666; color: #fff; height: 22px; cursor: pointer}
+.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}
--- a/lib/coder.js
+++ b/lib/coder.js
@@ -24,6 +24,7 @@ var ICEcoder = {
 	stickyTabWindow: false,		// Target variable for the sticky tab window
 	pluginIntervalRefs: [],		// Array of plugin interval refs
 	dragSrcEl: null,		// Tab element being dragged
+	ready: false,			// Indicates if ICEcoder is ready for action

 	// Don't consider these tags as part of nesting as they're singles, JS, PHP or Ruby code blocks
 	tagNestExceptions: ["!DOCTYPE","meta","link","img","br","hr","input","script","?php","?","%"],
@@ -63,6 +64,7 @@ var ICEcoder = {
 			tab.addEventListener('drop', ICEcoder.handleDrop, false);
 			tab.addEventListener('dragend', ICEcoder.handleDragEnd, false);
 		});
+		top.ICEcoder.ready = true;
 	},

 	// Set our layout according to the browser size
@@ -171,13 +173,8 @@ var ICEcoder = {
 					if (!ICEcoder.codeBlock) {
 						// OK, we can do something further as we're not in a code block
 						// If it's the same as the previously logged tag preceeded by /, it's the equivalent end tag
-						if (tagEnd=="/"+ICEcoder.htmlTagArray[ICEcoder.htmlTagArray.length-1]) {
-							// So remove the last logged tag, thereby going up one in the nest
-							ICEcoder.htmlTagArray.pop();
-						} else {
-							// Otherwise it's a different tag, add it to the end
-							ICEcoder.htmlTagArray.push(tagString);
-						}
+						// so remove the last logged tag, thereby going up one in the nest, otherwise it's a different tag, add it to the end
+						tagEnd=="/"+ICEcoder.htmlTagArray[ICEcoder.htmlTagArray.length-1] ? ICEcoder.htmlTagArray.pop() : ICEcoder.htmlTagArray.push(tagString);
 					} else if (
 						((ICEcoder.tagStart=="script"||ICEcoder.tagStart=="/script")&&tagEndJS=="</script")||
 						((ICEcoder.tagStart=="?php"||ICEcoder.tagStart=="?")&&tagEnd=="?")||
@@ -565,7 +562,7 @@ var ICEcoder = {
 				top.document.getElementById('tab'+i).innerHTML = top.document.getElementById('tab'+i).innerHTML.replace(("closeTab("+(i+1)+")"),"closeTab("+i+")").replace(("closeTabButton("+(i+1)+")"),"closeTabButton("+i+")");
 			}
 			// hide the instance we're closing by setting the hide class and removing from the array
-			ICEcoder.content.contentWindow['cM'+top.ICEcoder.cMInstances[closeTabNum-1]].setOption('theme',top.theme+' hidden');
+			ICEcoder.content.contentWindow['cM'+top.ICEcoder.cMInstances[closeTabNum-1]].getWrapperElement().style.display = "none";
 			top.ICEcoder.cMInstances.splice(closeTabNum-1,1);
 			// clear the rightmost tab (or only one left in a 1 tab scenario) & remove from the array
 			top.document.getElementById('tab'+ICEcoder.openFiles.length).style.display = "none";
@@ -805,22 +802,29 @@ var ICEcoder = {
 	},

 	// Prompt a rename dialog on demand
-	renameFile: function() {
-		var renamedFile, shortURL;
+	renameFile: function(oldName,newName) {
+		var shortURL;

-		shortURL = top.ICEcoder.rightClickedFile.substr((top.ICEcoder.rightClickedFile.indexOf(shortURLStarts)+top.shortURLStarts.length),top.ICEcoder.rightClickedFile.length).replace(/\|/g,"/");
-		renamedFile = top.ICEcoder.getInput('Please enter the new name for',shortURL);
-		if (renamedFile) {
+		if (!oldName) {
+			shortURL = top.ICEcoder.rightClickedFile.substr((top.ICEcoder.rightClickedFile.indexOf(shortURLStarts)+top.shortURLStarts.length),top.ICEcoder.rightClickedFile.length).replace(/\|/g,"/");
+			oldName = top.ICEcoder.rightClickedFile.replace(/\|/g,"/");
+		} else {
+			shortURL = oldName.substr((oldName.indexOf(shortURLStarts)+top.shortURLStarts.length),oldName.length).replace(/\|/g,"/");
+		}
+		if (!newName) {
+			newName = top.ICEcoder.getInput('Please enter the new name for',shortURL);
+		}
+		if (newName) {
 			for (var i=0;i<top.ICEcoder.openFiles.length;i++) {
 				if(top.ICEcoder.openFiles[i]==shortURL.replace(/\|/g,"/")) {
 					// rename array item and the tab
-					top.ICEcoder.openFiles[i] = renamedFile;
+					top.ICEcoder.openFiles[i] = newName;
 					closeTabLink = '<a nohref onClick="top.ICEcoder.files.contentWindow.closeTab('+(i+1)+')"><img src="images/nav-close.gif" id="closeTabButton'+(i+1)+'" class="closeTab"></a>';
 					top.document.getElementById('tab'+(i+1)).innerHTML = top.ICEcoder.openFiles[i] + " " + closeTabLink;
 				}
 			}
-		top.ICEcoder.serverQueue("add","lib/file-control.php?action=rename&file="+renamedFile+"&oldFileName="+top.ICEcoder.rightClickedFile.replace(/\|/g,"/"));
-		top.ICEcoder.serverMessage('<b>Renaming to</b><br>'+renamedFile);
+		top.ICEcoder.serverQueue("add","lib/file-control.php?action=rename&file="+newName+"&oldFileName="+oldName);
+		top.ICEcoder.serverMessage('<b>Renaming to</b><br>'+newName);

 		top.ICEcoder.setPreviousFiles();
 		}
@@ -1042,11 +1046,11 @@ var ICEcoder = {
 	getcMInstance: function(newTab) {
 		var cM;

-		if (newTab=="new"||(newTab!="new" && ICEcoder.openFiles.length>0)) {
-			cM = top.ICEcoder.content.contentWindow['cM'+ICEcoder.cMInstances[ICEcoder.selectedTab-1]];
-		} else {
-			cM = top.ICEcoder.content.contentWindow['cM1'];
-		}
+		cM = top.ICEcoder.content.contentWindow[
+			newTab=="new"||(newTab!="new" && ICEcoder.openFiles.length>0)
+			? 'cM'+ICEcoder.cMInstances[ICEcoder.selectedTab-1]
+			: 'cM1'
+		];
 		return cM;
 	},

@@ -1123,7 +1127,7 @@ var ICEcoder = {
 	},

 	// Get the mouse position on demand
-	getMouseXY: function(e) {
+	getMouseXY: function(e,area) {
 		var tempX, tempY, scrollTop, IE;

 		IE = !e.pageX ? true : false;
@@ -1135,25 +1139,36 @@ var ICEcoder = {
 			top.ICEcoder.mouseX = e.pageX;
 			top.ICEcoder.mouseY = e.pageY;
 		}
+		if (area!="top") {
+			top.ICEcoder.mouseY += 40 + 50;
+		}
+		if (area=="editor") {
+			top.ICEcoder.mouseX += top.ICEcoder.filesW;
+		}
 		top.ICEcoder.dragCursorTest();
 	},

 	// Test if we need to show a drag cursor or not
 	dragCursorTest: function() {
-		var winH;
+		var winH, cursorName;

-		window.innerWidth ? winH = window.innerHeight : winH = document.body.clientHeight;
-		if (!top.ICEcoder.mouseDown) {top.ICEcoder.draggingFilesW = false};
+		if (top.ICEcoder.ready) {
+			window.innerWidth ? winH = window.innerHeight : winH = document.body.clientHeight;
+			if (!top.ICEcoder.mouseDown) {top.ICEcoder.draggingFilesW = false};

-		if ((top.ICEcoder.mouseX > top.ICEcoder.filesW-7 && top.ICEcoder.mouseX < top.ICEcoder.filesW+7 && top.ICEcoder.mouseY > 40+50 && top.ICEcoder.mouseY < winH-30-40) || top.ICEcoder.draggingFilesW) {
-			top.document.body.style.cursor = "w-resize";
-		} else {
-			top.document.body.style.cursor = "auto";
+			if ((top.ICEcoder.mouseX > top.ICEcoder.filesW-7 && top.ICEcoder.mouseX < top.ICEcoder.filesW+7 && top.ICEcoder.mouseY > 40 && top.ICEcoder.mouseY < (winH-30)) || top.ICEcoder.draggingFilesW) {
+				cursorName = "w-resize";
+			} else {
+				cursorName = "auto";
+			}
+			if (top.ICEcoder.content.contentWindow.document && top.ICEcoder.filesFrame.contentWindow) {
+				top.document.body.style.cursor = top.ICEcoder.content.contentWindow.document.body.style.cursor = top.ICEcoder.filesFrame.contentWindow.document.body.style.cursor = cursorName;
+			}
 		}
 	},

 	// Update the file manager tree list on demand
-	updateFileManagerList: function(action,location,file,perms) {
+	updateFileManagerList: function(action,location,file,perms,oldName) {
 		var actionElemType, cssStyle, hrefLink, targetElem, locNest, newUL, newLI, nameLI, shortURL, newMouseOver;

 		// Adding files
@@ -1215,7 +1230,7 @@ var ICEcoder = {
 		// Renaming files
 		if (action=="rename") {
 			// Identify a shortened URL for our right clicked file and get our target element based on this
-			shortURL = top.ICEcoder.rightClickedFile.substr((top.ICEcoder.rightClickedFile.indexOf(shortURLStarts)+top.shortURLStarts.length),top.ICEcoder.rightClickedFile.length).replace(/\|/g,"/");
+			shortURL = oldName;
 			targetElem = document.getElementById('filesFrame').contentWindow.document.getElementById(shortURL.replace(/\//g,"|"));
 			// Set the name to be as per our new file/folder name
 			targetElem.innerHTML = file;
@@ -1567,7 +1582,7 @@ var ICEcoder = {
 		unitText = "kb";
 		// Maybe we should show in megabytes?
 		if (unitSize >= 1024) {
-			unitSize = unitSize / 1024;
+			unitSize = (unitSize / 1024).toFixed(2);
 			unitText = "mb";
 		}
 		// Update the display
--- a/lib/config.php
+++ b/lib/config.php
@@ -1,25 +1,28 @@
 <?php
-$versionNo		= "v 0.7.7";
-$codeMirrorDir		= "CodeMirror-2.3";
-$cMThisVer		= 2.3;
-$tabsIndent		= true;
-$checkUpdates		= false;
-$openLastFiles		= true;
-$findFilesExclude	= array("_coder",".doc",".gif",".jpg",".jpeg",".pdf",".png",".swf",".xml",".zip");
-$codeAssist		= true;
-$visibleTabs		= false;
-$lockedNav		= true;
-$accountPassword	= "";
-$restrictedFiles	= array("wp-",".php",".rb",".sql");
-$bannedFiles		= array("_coder","wp-",".exe");
-$allowedIPs		= array("*");
-$plugins		= array(
+$ICEcoder = array(
+"versionNo"		=> "v 0.7.8",
+"codeMirrorDir"		=> "CodeMirror-2.31",
+"cMThisVer"		=> 2.31,
+"root"			=> $_SERVER['DOCUMENT_ROOT']."", // set your own root here
+"tabsIndent"		=> true,
+"checkUpdates"		=> false,
+"openLastFiles"		=> true,
+"findFilesExclude"	=> array("_coder",".doc",".gif",".jpg",".jpeg",".pdf",".png",".swf",".xml",".zip"),
+"codeAssist"		=> true,
+"visibleTabs"		=> false,
+"lockedNav"		=> true,
+"accountPassword"	=> "",
+"restrictedFiles"	=> array("wp-",".php",".rb",".sql"),
+"bannedFiles"		=> array("_coder","wp-",".exe"),
+"allowedIPs"		=> array("*"),
+"plugins"		=> array(
 			array("Database Admin","images/database.png","margin-top: 3px","plugins/adminer/adminer-3.3.3-mysql-en.php","_blank",""),
 			array("Batch Image Processor","images/images.png","margin-top: 5px","http://birme.net","_blank",""),
-			array("Zip It!","images/zip-it.png","margin-top: 3px","plugins/zip-it/?zip=|&exclude=.doc,.gif,.jpg,.jpeg,.pdf,.png,.swf,.xml,.zip","fileControl:<b>Zipping Open Files</b>","10")
-			);
-$theme			= "default";
-$tabWidth		= 4;
-$previousFiles		= "";
-$last10Files		= "";
+			array("Zip It!","images/zip-it.png","margin-top: 3px","plugins/zip-it/?zip=|&exclude=.doc,.gif,.jpg,.jpeg,.pdf,.png,.swf,.xml,.zip","fileControl:<b>Zipping Files</b>","10")
+			),
+"theme"			=> "default",
+"tabWidth"		=> 4,
+"previousFiles"		=> "",
+"last10Files"		=> ""
+);
 ?>
--- a/lib/file-control.php
+++ b/lib/file-control.php
@@ -4,7 +4,7 @@
 // Establish the full file path reference
 $file=strClean($_GET['file']);
 if (isset($_GET['saveType'])) {$saveType = strClean($_GET['saveType']);};
-$docRoot = str_replace("\\","/",$_SERVER['DOCUMENT_ROOT']);
+$docRoot = str_replace("\\","/",$ICEcoder['root']);

 // Not done the first time we are on the save loop (ie, before the form posting reload)
 if ($_GET['action']=="load"||$_GET['action']=="newFolder"||$_GET['action']=="rename"||$_GET['action']=="delete"||$_GET['action']=="perms"||isset($_POST['contents'])) {
@@ -22,8 +22,8 @@ if ($_GET['action']=="load") {

 	if ($fileType=="text") {
 		$bannedFile=false;
-		for ($i=0;$i<count($restrictedFiles);$i++) {
-			if (strpos($file,$restrictedFiles[$i])!="") {
+		for ($i=0;$i<count($ICEcoder["restrictedFiles"]);$i++) {
+			if (strpos($file,$ICEcoder["restrictedFiles"][$i])!="") {
 				$bannedFile=true;
 			}
 		}
@@ -71,7 +71,7 @@ if ($_GET['action']=="rename") {
 		$fileName = substr($file,strrpos($file,"/")+1);
 		$fileLoc = substr($file,0,strrpos($file,"/"));
 		if ($fileLoc=="") {$fileLoc = "/";};
-		echo '<script>top.ICEcoder.selectedFiles=[];top.ICEcoder.updateFileManagerList(\'rename\',\''.$fileLoc.'\',\''.$fileName.'\');top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);action="rename";</script>';
+		echo '<script>top.ICEcoder.selectedFiles=[];top.ICEcoder.updateFileManagerList(\'rename\',\''.$fileLoc.'\',\''.$fileName.'\',\'\',\''.str_replace($docRoot,"",strClean($_GET['oldFileName'])).'\');top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);action="rename";</script>';
 	} else {
 		if (!is_writable($_GET['oldFileName'])) {
 			echo "<script>top.ICEcoder.message('Sorry, cannot rename\\n".strClean($_GET['oldFileName'])."');</script>";
@@ -154,7 +154,7 @@ if ($_GET['action']=="save") {
 			if (isset($_POST['newFileName'])&&$_POST['newFileName']!="") {
 				$file = strClean($_POST['newFileName']);
 			}
-			$saveFile = str_replace("\\","/",$_SERVER['DOCUMENT_ROOT']).$file;
+			$saveFile = $docRoot.$file;
 			$saveFile = str_replace("//","/",$saveFile);
 			if ((file_exists($saveFile) && is_writable($saveFile)) || $_POST['newFileName']!="") {
 				if (filemtime($saveFile)==$_GET['fileMDT']||!(isset($_GET['fileMDT']))) {
--- a/lib/file-folder-properties.php
+++ b/lib/file-folder-properties.php
@@ -3,7 +3,7 @@

 <html onContextMenu="return false">
 <head>
-<title>ICE Coder - <?php echo $versionNo;?> :: File/Folder Properties</title>
+<title>ICE Coder - <?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">
 </head>
@@ -45,11 +45,11 @@ if ($_SESSION['userLevel'] == 10) {
 	echo '[HIDDEN]';
 }
 ?></span>
-<span class="column">Relative path: <?php echo str_replace($docRoot,"",$fileName);?></span>
+<span class="column">Relative path: <?php echo str_replace($serverRoot,"",$fileName);?></span>
 <span style="font-size:10px">
 <br><br>
 Absolute path:<br><?php
-if ($_SESSION['userLevel'] == 10) {echo $fileName;} else {echo '[HIDDEN]';}
+echo $_SESSION['userLevel'] == 10 ? $fileName : '[HIDDEN]';
 ?>
 <br><br>
 </span>
@@ -147,7 +147,7 @@ var validatePerms = function() {
 	<?php
 	if ($_SESSION['userLevel'] == 10) {
 	?>
-	if (canUpdate) {top.ICEcoder.chmod('<?php echo str_replace($docRoot,"",$fileName);?>',permText)};
+	if (canUpdate) {top.ICEcoder.chmod('<?php echo str_replace($serverRoot,"",$fileName);?>',permText)};
 	<?php
 	;};
 	?>
--- a/lib/help.php
+++ b/lib/help.php
@@ -3,7 +3,7 @@

 <html>
 <head>
-<title>ICE Coder - <?php echo $versionNo;?> :: Help & Shortcuts</title>
+<title>ICE Coder - <?php echo $ICEcoder["versionNo"];?> :: Help & Shortcuts</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <link rel="stylesheet" type="text/css" href="help.css">
 </head>
--- a/lib/multiple-results.css
+++ b/lib/multiple-results.css
@@ -17,18 +17,18 @@ table, caption, tbody, tfoot, thead, tr, th, td {
 }

 body {overflow: hidden;
-   -webkit-user-select: none;
-   -moz-user-select: none;
-   -o-user-select:none;
-   user-select: none;
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	-o-user-select:none;
+	user-select: none;
 }

-h1 {font-size: 36px; font-weight: normal; color: #888; margin-bottom: 20px}
+h1 {font-size: 36px; font-weight: normal; color: #888; margin: 20px 20px 0 20px}
 h2 {font-size: 18px; font-weight: normal; color: #fff}
 hr {border: 0; height: 1px; background-color: #888}

 .results {font-family: arial, verdana, helvetica, sans-serif; background-color: #1c1c19; color: #fff}
-.results .resultsPane {position: relative; width: 660px; height: 560px; font-size: 10px; padding: 20px; float: left}
+.results .resultsPane {position: relative; width: 660px; height: 340px; overflow: auto; font-size: 10px; padding: 20px; float: left}
 .results .resultsPane a {color: rgba(0,198,255,0.7); text-decoration: none}
 .results .resultsPane a:hover {text-decoration: underline}
 .replace {position: absolute; margin-top: -28px; right: 20px; padding: 5px 10px; font-size: 14px; background-color: rgba(0,198,255,0.7); cursor: pointer}
--- a/lib/multiple-results.php
+++ b/lib/multiple-results.php
@@ -3,24 +3,31 @@

 <html>
 <head>
-<title>ICE Coder - <?php echo $versionNo;?> :: Multiple Results Screen</title>
+<title>ICE Coder - <?php echo $ICEcoder["versionNo"];?> :: Multiple Results Screen</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <link rel="stylesheet" type="text/css" href="multiple-results.css">
 </head>

 <body class="results">

+<h1 id="title"></h1>
 <div class="resultsPane">
-	<h1 id="title"></h1>
 	<div id="results"></div>
 </div>
 <?php if (isset($_GET['replace'])) { ?>
-<div class="replaceAll" id="replaceAll" onClick="replaceAll()" style="opacity: 0.1">replace all</div>
+<div class="replaceAll" id="replaceAll" onClick="<?php echo isset($_GET['target']) ? 'renameAll()' : 'replaceAll()';?>" style="opacity: 0.1"><?php echo isset($_GET['target']) ? 'rename all' : 'replace all';?></div>
 <?php ;}; ?>

 <script>
 var resultsDisplay = "";
-var foundTabArray = [];
+var foundArray = [];
+foundInSelected = false;
+userTarget = top.document.findAndReplace.target.value;
+<?php
+// 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");
 for (var i=1;i<=top.ICEcoder.openFiles.length;i++) {
@@ -33,20 +40,51 @@ for (var i=1;i<=top.ICEcoder.openFiles.length;i++) {
 		resultsDisplay += '<div class="replace" id="replace" onClick="replaceSingle('+i+');this.style.display=\'none\'">replace</div>';
 		<?php ;}; ?>
 		resultsDisplay += '<hr>';
-		foundTabArray.push(i);
+		foundArray.push(i);
 	}
 }
 if (startTab!=top.ICEcoder.selectedTab) {
 	top.ICEcoder.switchTab(startTab);
 }
-foundTabArray.length==0 ? showHide = "hide" : showHide = "show";
+<?php
+// Find in files or filenames
+} else {
+$targetName = "file/folder";
+?>
+	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 (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) {
+						foundInSelected = true;
+					}
+				}
+			}
+			if (userTarget.indexOf("all")>-1 || (userTarget.indexOf("selected")>-1 && foundInSelected)) {
+				resultsDisplay += '<a href="javascript:top.ICEcoder.openFile(\''+top.fullPath+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>';
+				<?php if (isset($_GET['replace'])) { ?>
+				resultsDisplay += '<div class="replace" id="replace" onClick="renameSingle('+i+');this.style.display=\'none\'">rename</div>';
+				<?php ;}; ?>
+				resultsDisplay += '<hr>';
+				foundArray.push(i);
+			}
+		}
+	}
+<?php
+;}
+?>
+foundArray.length==0 ? showHide = "hide" : showHide = "show";
 top.ICEcoder.showHide(showHide,top.document.getElementById('blackMask'));
-if (foundTabArray.length==0) {top.ICEcoder.message('No matches found')};
+if (foundArray.length==0) {top.ICEcoder.message('No matches found')};
 <?php if (isset($_GET['replace'])) { ?>
-if (foundTabArray.length!=0) {document.getElementById('replaceAll').style.opacity = 1};
+if (foundArray.length!=0) {document.getElementById('replaceAll').style.opacity = 1};
 <?php ;}; ?>
-foundTabArray.length >= 2 ? plural = "s" : plural = "";
-document.getElementById('title').innerHTML = "'<?php echo strClean($_GET['find']); ?>' found in "+foundTabArray.length+" file"+plural;
+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('results').innerHTML = resultsDisplay;

 var gotoTab = function(tab) {
@@ -63,8 +101,21 @@ var replaceSingle = function(tab) {
 }

 var replaceAll = function() {
-	for (var i=0;i<=foundTabArray.length-1;i++) {
-		replaceSingle(foundTabArray[i]);
+	for (var i=0;i<=foundArray.length-1;i++) {
+		replaceSingle(foundArray[i]);
+	}
+	top.ICEcoder.showHide('hide',top.document.getElementById('blackMask'));
+}
+
+var renameSingle = function(arrayRef) {
+	fileRef = top.fullPath+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']); ?>");
+	top.ICEcoder.renameFile(fileRef,newName);
+}
+
+var renameAll = function() {
+	for (var i=0;i<=foundArray.length-1;i++) {
+		renameSingle(foundArray[i]);
 	}
 	top.ICEcoder.showHide('hide',top.document.getElementById('blackMask'));
 }
--- a/lib/settings-screen.php
+++ b/lib/settings-screen.php
@@ -4,24 +4,24 @@

 <html>
 <head>
-<title>ICE Coder - <?php echo $versionNo;?> :: Settings Screen</title>
+<title>ICE Coder - <?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 $codeMirrorDir; ?>/lib/codemirror.css">
-<script src="../<?php echo $codeMirrorDir; ?>/lib/codemirror-compressed.js"></script>
+<link rel="stylesheet" href="../<?php echo $ICEcoder["codeMirrorDir"]; ?>/lib/codemirror.css">
+<script src="../<?php echo $ICEcoder["codeMirrorDir"]; ?>/lib/codemirror-compressed.js"></script>

 <style type="text/css">
 .CodeMirror {position: absolute; width: 0; background-color: #fff; font-family: monospace; width: 420px}
 .CodeMirror-scroll {height: 220px; overflow: hidden}
 /* Make sure this next one remains the 3rd item, updated with JS */
-.cm-tab:after {position: relative; display: inline-block; width: 0; left: -1.4em; overflow: visible; color: #aaa; content: "<?php if($visibleTabs) {echo '\21e5';};?>";}
+.cm-tab:after {position: relative; display: inline-block; width: 0; left: -1.4em; overflow: visible; color: #aaa; content: "<?php if($ICEcoder["visibleTabs"]) {echo '\21e5';};?>";}
 </style>

 <link rel="stylesheet" href="editor.css">
 <?php
 $themeArray = array("ambiance","blackboard","cobalt","eclipse","elegant","erlang-dark","lesser-dark","monokai","neat","night","rubyblue","vibrant-ink","xq-dark");
 for ($i=0;$i<count($themeArray)-1;$i++) {
-	echo '<link rel="stylesheet" href="../'.$codeMirrorDir.'/theme/'.$themeArray[$i].'.css">'.PHP_EOL;
+	echo '<link rel="stylesheet" href="../'.$ICEcoder["codeMirrorDir"].'/theme/'.$themeArray[$i].'.css">'.PHP_EOL;
 }
 ?>
 </head>
@@ -30,7 +30,7 @@ for ($i=0;$i<count($themeArray)-1;$i++) {

 <div class="infoPane">
 	<img src="../images/ice-coder.gif" class="logo">
-	<div class="version"><?php echo $versionNo;?></div>
+	<div class="version"><?php echo $ICEcoder["versionNo"];?></div>

 	<p>
 	git:<br>
@@ -38,15 +38,15 @@ for ($i=0;$i<count($themeArray)-1;$i++) {
 	<br><br>

 	codemirror dir:<br>
-	<?php echo $codeMirrorDir; ?>
+	<?php echo $ICEcoder["codeMirrorDir"]; ?>
 	<br><br>

 	codemirror version:<br>
-	<?php echo $cMThisVer; ?>
+	<?php echo $ICEcoder["cMThisVer"]; ?>
 	<br><br>

-	doc root:<br>
-	<?php if($_SESSION['userLevel']==10) { echo $_SERVER['DOCUMENT_ROOT']; } else { echo '[HIDDEN]'; }; ?>
+	file manager root:<br>
+	<?php echo $_SESSION['userLevel']==10 ? $ICEcoder['root'] : '[HIDDEN]';?>
 	<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>
@@ -72,18 +72,18 @@ for ($i=0;$i<count($themeArray)-1;$i++) {
 <div class="settingsColumn1">
 <h1>settings</h1>
 <h2>functionality</h2>
-<input type="checkbox" onclick="showButton()" name="tabsIndent" value="true"<?php if($tabsIndent) {echo ' checked';};?>> tab indents selection<br>
-<input type="checkbox" onclick="showButton()" name="checkUpdates" value="true"<?php if($checkUpdates) {echo ' checked';};?>> check for updates on load<br>
-<input type="checkbox" onclick="showButton()" name="openLastFiles" value="true"<?php if($openLastFiles) {echo ' checked';};?>> auto open last files on login<br>
+<input type="checkbox" onclick="showButton()" name="tabsIndent" value="true"<?php if($ICEcoder["tabsIndent"]) {echo ' checked';};?>> tab indents selection<br>
+<input type="checkbox" onclick="showButton()" name="checkUpdates" value="true"<?php if($ICEcoder["checkUpdates"]) {echo ' checked';};?>> check for updates on load<br>
+<input type="checkbox" onclick="showButton()" name="openLastFiles" value="true"<?php if($ICEcoder["openLastFiles"]) {echo ' checked';};?>> auto open last files on login<br>
 <br>
 when finding in files, exclude:<br>
-<input type="text" onkeydown="showButton()" name="findFilesExclude" value="<?php for($i=0;$i<=count($findFilesExclude)-1;$i++) {echo $findFilesExclude[$i]; if ($i<count($findFilesExclude)-1) {echo ', ';};}; ?>"><br>
+<input type="text" onkeydown="showButton()" name="findFilesExclude" value="<?php for($i=0;$i<=count($ICEcoder["findFilesExclude"])-1;$i++) {echo $ICEcoder["findFilesExclude"][$i]; if ($i<count($ICEcoder["findFilesExclude"])-1) {echo ', ';};}; ?>"><br>
 <br>

 <h2>assisting</h2>
-<input type="checkbox" onclick="showButton()" name="codeAssist" value="true"<?php if($codeAssist) {echo ' checked';};?>> code assist<br>
-<input type="checkbox" onclick="showButton();showHideTabs()" name="visibleTabs" value="true"<?php if($visibleTabs) {echo ' checked';};?>> visible tabs<br>
-<input type="checkbox" onclick="showButton()" name="lockedNav" value="true"<?php if($lockedNav) {echo ' checked';};?>> locked nav<br>
+<input type="checkbox" onclick="showButton()" name="codeAssist" value="true"<?php if($ICEcoder["codeAssist"]) {echo ' checked';};?>> code assist<br>
+<input type="checkbox" onclick="showButton();showHideTabs()" name="visibleTabs" value="true"<?php if($ICEcoder["visibleTabs"]) {echo ' checked';};?>> visible tabs<br>
+<input type="checkbox" onclick="showButton()" name="lockedNav" value="true"<?php if($ICEcoder["lockedNav"]) {echo ' checked';};?>> locked nav<br>
 <br>

 <h2>security</h2>
@@ -93,29 +93,29 @@ 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($restrictedFiles)-1;$i++) {echo $restrictedFiles[$i]; if ($i<count($restrictedFiles)-1) {echo ', ';};}; ?>"><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($bannedFiles)-1;$i++) {echo $bannedFiles[$i]; if ($i<count($bannedFiles)-1) {echo ', ';};}; ?>"><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">
 <br>
 ip addresses<br>
-<input type="text" onkeydown="showButton()" name="allowedIPs" value="<?php for($i=0;$i<=count($allowedIPs)-1;$i++) {echo $allowedIPs[$i]; if ($i<count($allowedIPs)-1) {echo ', ';};}; ?>"><br>
+<input type="text" onkeydown="showButton()" name="allowedIPs" value="<?php for($i=0;$i<=count($ICEcoder["allowedIPs"])-1;$i++) {echo $ICEcoder["allowedIPs"][$i]; if ($i<count($ICEcoder["allowedIPs"])-1) {echo ', ';};}; ?>"><br>
 </div>

 <div class="settingsColumn2">
 <h2>plugins</h2>
 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($plugins);$i++) {
-	for($j=0;$j<count($plugins[$i]);$j++) {
-		echo '"'.$plugins[$i][$j].'"';
-		if ($j<count($plugins[$i])-1) {
+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($plugins)-1 && $j==count($plugins[$i])-1)) {
+		if (!($i==count($ICEcoder["plugins"])-1 && $j==count($ICEcoder["plugins"][$i])-1)) {
 			echo PHP_EOL;
 		}
-		if (($i<count($plugins)-1 && $j==count($plugins[$i])-1)) {
+		if (($i<count($ICEcoder["plugins"])-1 && $j==count($ICEcoder["plugins"][$i])-1)) {
 			echo "====================".PHP_EOL;
 		}
 	}
@@ -126,10 +126,10 @@ for($i=0;$i<count($plugins);$i++) {
 <h2>style</h2>
 theme<br>
 <select onchange="selectTheme();showButton()" id="select" name="theme">
-    <option<?php if ($theme=="default") {echo ' selected';}; ?>>default</option>
+    <option<?php if ($ICEcoder["theme"]=="default") {echo ' selected';}; ?>>default</option>
 <?php
 for ($i=0;$i<count($themeArray)-1;$i++) {
-	if ($theme==$themeArray[$i]) {$optionSelected = ' selected';} else {$optionSelected = '';};
+	$optionSelected = $ICEcoder["theme"]==$themeArray[$i] ? ' selected' : '';
 	echo '<option'.$optionSelected.'>'.$themeArray[$i].'</option>'.PHP_EOL;
 }
 ?>
@@ -153,7 +153,7 @@ function findSequence(goal) {

 <span style="position: absolute; top: 520px">
 	tab width <span style="font-size: 10px; color: #888">chars</span><br>
-	<input type="text" name="tabWidth" id="tabWidth" style="width: 30px" onkeydown="showButton()" onkeyup="changeTabWidth()" value="<?php echo $tabWidth;?>">
+	<input type="text" name="tabWidth" id="tabWidth" style="width: 30px" onkeydown="showButton()" onkeyup="changeTabWidth()" value="<?php echo $ICEcoder["tabWidth"];?>">
 </span>

 <script>
@@ -163,7 +163,7 @@ var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
 	indentUnit: top.tabWidth,
 	tabSize: top.tabWidth,
 	mode: "javascript",
-	theme: "<?php if ($theme=="default") {echo 'icecoder';} else {echo $theme;}; ?>"
+	theme: "<?php echo $ICEcoder["theme"]=="default" ? 'icecoder' : $ICEcoder["theme"];?>"
 	});

 var input = document.getElementById("select");
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -25,66 +25,66 @@ function numClean($var) {
 // Settings are stored in this file
 include("config.php");

-$docRoot = str_replace("\\","/",$_SERVER['DOCUMENT_ROOT']);
-if (strrpos($docRoot,"/")==strlen($docRoot)-1) {$docRoot = substr($docRoot,0,strlen($docRoot)-1);};
+$serverRoot = str_replace("\\","/",$_SERVER['DOCUMENT_ROOT']);
+if (strrpos($serverRoot,"/")==strlen($serverRoot)-1) {$serverRoot = substr($serverRoot,0,strlen($serverRoot)-1);};

 // Update this config file?
 if (isset($_POST["theme"]) && $_POST["theme"] && $_SESSION['userLevel'] == 10) {
 	$settingsFile = 'config.php';
 	$settingsContents = file_get_contents($settingsFile);
 	// Replace our settings vars
-	$repPosStart = strpos($settingsContents,'$tabsIndent');
-	$repPosEnd = strpos($settingsContents,'$previousFiles');
+	$repPosStart = strpos($settingsContents,'"tabsIndent"');
+	$repPosEnd = strpos($settingsContents,'"previousFiles"');

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

-	$settingsNew  = '$tabsIndent		= '.$tabsIndent.';'.PHP_EOL;
-	$settingsNew .= '$checkUpdates		= '.$checkUpdates.';'.PHP_EOL;
-	$settingsNew .= '$openLastFiles		= '.$openLastFiles.';'.PHP_EOL;
-	$settingsNew .= '$findFilesExclude	= '.$findFilesExclude.';'.PHP_EOL;
-	$settingsNew .= '$codeAssist		= '.$codeAssist.';'.PHP_EOL;
-	$settingsNew .= '$visibleTabs		= '.$visibleTabs.';'.PHP_EOL;
-	$settingsNew .= '$lockedNav		= '.$lockedNav.';'.PHP_EOL;
-	$settingsNew .= '$accountPassword	= "'.$accountPassword.'";'.PHP_EOL;
-	$settingsNew .= '$restrictedFiles	= '.$restrictedFiles.';'.PHP_EOL;
-	$settingsNew .= '$bannedFiles		= '.$bannedFiles.';'.PHP_EOL;
-	$settingsNew .= '$allowedIPs		= '.$allowedIPs.';'.PHP_EOL;
-	$settingsNew .= '$plugins		= '.$plugins.';'.PHP_EOL;
-	$settingsNew .= '$theme			= "'.$theme.'";'.PHP_EOL;
-	$settingsNew .= '$tabWidth		= '.$tabWidth.';'.PHP_EOL;
+	$settingsNew  = '"tabsIndent"		=> '.$ICEcoder["tabsIndent"].','.PHP_EOL;
+	$settingsNew .= '"checkUpdates"		=> '.$ICEcoder["checkUpdates"].','.PHP_EOL;
+	$settingsNew .= '"openLastFiles"	=> '.$ICEcoder["openLastFiles"].','.PHP_EOL;
+	$settingsNew .= '"findFilesExclude"	=> '.$ICEcoder["findFilesExclude"].','.PHP_EOL;
+	$settingsNew .= '"codeAssist"		=> '.$ICEcoder["codeAssist"].','.PHP_EOL;
+	$settingsNew .= '"visibleTabs"		=> '.$ICEcoder["visibleTabs"].','.PHP_EOL;
+	$settingsNew .= '"lockedNav"		=> '.$ICEcoder["lockedNav"].','.PHP_EOL;
+	$settingsNew .= '"accountPassword"	=> "'.$ICEcoder["accountPassword"].'",'.PHP_EOL;
+	$settingsNew .= '"restrictedFiles"	=> '.$ICEcoder["restrictedFiles"].','.PHP_EOL;
+	$settingsNew .= '"bannedFiles"		=> '.$ICEcoder["bannedFiles"].','.PHP_EOL;
+	$settingsNew .= '"allowedIPs"		=> '.$ICEcoder["allowedIPs"].','.PHP_EOL;
+	$settingsNew .= '"plugins"		=> '.$ICEcoder["plugins"].','.PHP_EOL;
+	$settingsNew .= '"theme"		=> "'.$ICEcoder["theme"].'",'.PHP_EOL;
+	$settingsNew .= '"tabWidth"		=> '.$ICEcoder["tabWidth"].','.PHP_EOL;

 	// Compile our new settings
 	$settingsContents = substr($settingsContents,0,$repPosStart).$settingsNew.substr($settingsContents,($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/config.php");
+	$fh = fopen($settingsFile, 'w') or die("Can't update config file. Please set public write permissions on lib/config.php and press refresh");
 	fwrite($fh, $settingsContents);
 	fclose($fh);

 	// OK, now the config file has been updated, update our current session with new arrays
-	$_SESSION['findFilesExclude'] = $findFilesExclude = explode(", ",strClean($_POST['findFilesExclude']));
-	$_SESSION['restrictedFiles'] = $restrictedFiles = explode(", ",strClean($_POST['restrictedFiles']));
-	$_SESSION['bannedFiles'] = $bannedFiles = explode(", ",strClean($_POST['bannedFiles']));
-	$_SESSION['allowedIPs'] = $allowedIPs = explode(", ",strClean($_POST['allowedIPs']));
+	$_SESSION['findFilesExclude'] = $ICEcoder["findFilesExclude"] = explode(", ",strClean($_POST['findFilesExclude']));
+	$_SESSION['restrictedFiles'] = $ICEcoder["restrictedFiles"] = explode(", ",strClean($_POST['restrictedFiles']));
+	$_SESSION['bannedFiles'] = $ICEcoder["bannedFiles"] = explode(", ",strClean($_POST['bannedFiles']));
+	$_SESSION['allowedIPs'] = $ICEcoder["allowedIPs"] = explode(", ",strClean($_POST['allowedIPs']));
 	// Work out the theme to use now
-	if ($theme=="default") {$themeURL="lib/editor.css";} else {$themeURL=$codeMirrorDir."/theme/".$theme.".css";};
+	$ICEcoder["theme"]=="default" ? $themeURL = 'lib/editor.css' : $themeURL = $ICEcoder["codeMirrorDir"].'/theme/'.$ICEcoder["theme"].'.css';
 	// Do we need a file manager refresh?
-	if ($_POST['changedFileSettings']=="true") {$refreshFM="true";} else {$refreshFM="false";};
+	$refreshFM = $_POST['changedFileSettings']=="true" ? "true" : "false";
 	// With all that worked out, we can now hide the settings screen and apply the new settings
-	echo "<script>top.ICEcoder.settingsScreen('hide');top.ICEcoder.useNewSettings('".$themeURL."',".$tabsIndent.",".$codeAssist.",".$lockedNav.",".$visibleTabs.",".$tabWidth.",".$refreshFM.");</script>";
+	echo "<script>top.ICEcoder.settingsScreen('hide');top.ICEcoder.useNewSettings('".$themeURL."',".$ICEcoder["tabsIndent"].",".$ICEcoder["codeAssist"].",".$ICEcoder["lockedNav"].",".$ICEcoder["visibleTabs"].",".$ICEcoder["tabWidth"].",".$refreshFM.");</script>";
 }

 // Save the currently opened files for next time
@@ -94,8 +94,8 @@ if (isset($_GET["saveFiles"]) && $_GET['saveFiles']) {
 		$settingsContents = file_get_contents($settingsFile);

 		// Replace our previousFiles var with the the current
-		$repPosStart = strpos($settingsContents,'previousFiles		= "')+18;
-		$repPosEnd = strpos($settingsContents,'";',$repPosStart)-$repPosStart;
+		$repPosStart = strpos($settingsContents,'previousFiles"		=> "')+20;
+		$repPosEnd = strpos($settingsContents,'",',$repPosStart)-$repPosStart;
 		if ($_GET['saveFiles']!="CLEAR") {
 			$saveFiles=strClean($_GET['saveFiles']);
 			$settingsContents1 = substr($settingsContents,0,$repPosStart).$saveFiles.substr($settingsContents,($repPosStart+$repPosEnd),strlen($settingsContents));
@@ -105,15 +105,15 @@ if (isset($_GET["saveFiles"]) && $_GET['saveFiles']) {

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

 // Establish our user level
 if (!isset($_SESSION['userLevel'])) {$_SESSION['userLevel'] = 0;};
-if(isset($_POST['loginPassword']) && generateHash(strClean($_POST['loginPassword']),$accountPassword)==$accountPassword) {$_SESSION['userLevel'] = 10;};
+if(isset($_POST['loginPassword']) && generateHash(strClean($_POST['loginPassword']),$ICEcoder["accountPassword"])==$ICEcoder["accountPassword"]) {$_SESSION['userLevel'] = 10;};
 $_SESSION['userLevel'] = $_SESSION['userLevel'];

-if (!isset($_SESSION['findFilesExclude'])) {$_SESSION['findFilesExclude'] = $findFilesExclude;}
-if (!isset($_SESSION['restrictedFiles'])) {$_SESSION['restrictedFiles'] = $restrictedFiles;}
-if (!isset($_SESSION['bannedFiles'])) {$_SESSION['bannedFiles'] = $bannedFiles;}
-if (!isset($_SESSION['allowedIPs'])) {$_SESSION['allowedIPs'] = $allowedIPs;}
+if (!isset($_SESSION['findFilesExclude'])) {$_SESSION['findFilesExclude'] = $ICEcoder["findFilesExclude"];}
+if (!isset($_SESSION['restrictedFiles'])) {$_SESSION['restrictedFiles'] = $ICEcoder["restrictedFiles"];}
+if (!isset($_SESSION['bannedFiles'])) {$_SESSION['bannedFiles'] = $ICEcoder["bannedFiles"];}
+if (!isset($_SESSION['allowedIPs'])) {$_SESSION['allowedIPs'] = $ICEcoder["allowedIPs"];}

 // Determin our allowed IP addresses
 $allowedIP = false;
@@ -148,30 +148,30 @@ if (!$allowedIP) {
 };

 // Establish our shortened URL, explode the path based on server type (Linux or Windows)
-if (strpos($_SERVER['DOCUMENT_ROOT'],"/")>-1) {$slashType = "/";} else {$slashType = "\\";};
-$shortURLStarts = explode($slashType,$_SERVER['DOCUMENT_ROOT']);
+$slashType = strpos($_SERVER['DOCUMENT_ROOT'],"/")>-1  ? "/" : "\\";
+$shortURLStarts = explode($slashType,$ICEcoder['root']);

 // Then clear item at the end if there is one, plus trailing slash
 // We end up with the directory name of the server root
-if ($shortURLStarts[count($shortURLStarts)-1]!="") {$trimArray=1;} else {$trimArray=2;}
+$trimArray = $shortURLStarts[count($shortURLStarts)-1]!="" ? 1 : 2;
 $shortURLStarts = $shortURLStarts[count($shortURLStarts)-$trimArray];

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

 	// Work out the plugins to display to the user
 	$pluginsDisplay = "";
-	for ($i=0;$i<count($plugins);$i++) {
-		$target = explode(":",$plugins[$i][4]);
-		$pluginsDisplay .= '<a href="'.$plugins[$i][3].'" title="'.$plugins[$i][0].'" target="'.$target[0].'"><img src="'.$plugins[$i][1].'" style="'.$plugins[$i][2].'" alt="'.$plugins[$i][0].'"></a>';
+	for ($i=0;$i<count($ICEcoder["plugins"]);$i++) {
+		$target = explode(":",$ICEcoder["plugins"][$i][4]);
+		$pluginsDisplay .= '<a href="'.$ICEcoder["plugins"][$i][3].'" title="'.$ICEcoder["plugins"][$i][0].'" target="'.$target[0].'"><img src="'.$ICEcoder["plugins"][$i][1].'" style="'.$ICEcoder["plugins"][$i][2].'" alt="'.$ICEcoder["plugins"][$i][0].'"></a>';
 	};

 	// If we're updating, replace the plugin display with our newly established one
@@ -181,9 +181,9 @@ if ((isset($_POST["theme"]) && $_POST["theme"] && $_SESSION['userLevel'] == 10)

 	// Work out what plugins we'll need to set on a setInterval
 	$onLoadExtras = "";
-	for ($i=0;$i<count($plugins);$i++) {
-		if ($plugins[$i][5]!="") {
-			$onLoadExtras .= ";top.ICEcoder.startPluginIntervals(".$i.",'".$plugins[$i][3]."','".$plugins[$i][4]."','".$plugins[$i][5]."')";
+	for ($i=0;$i<count($ICEcoder["plugins"]);$i++) {
+		if ($ICEcoder["plugins"][$i][5]!="") {
+			$onLoadExtras .= ";top.ICEcoder.startPluginIntervals(".$i.",'".$ICEcoder["plugins"][$i][3]."','".$ICEcoder["plugins"][$i][4]."','".$ICEcoder["plugins"][$i][5]."')";
 		};
 	};

@@ -201,7 +201,7 @@ if ((isset($_POST["theme"]) && $_POST["theme"] && $_SESSION['userLevel'] == 10)
 	}

 	// Finally, open last opened files if we need to (applies to index.php only)
-	if ($openLastFiles) {
+	if ($ICEcoder["openLastFiles"]) {
 		$onLoadExtras .= ";top.ICEcoder.autoOpenFiles()";
 	}

@@ -212,23 +212,23 @@ if ((isset($_POST["theme"]) && $_POST["theme"] && $_SESSION['userLevel'] == 10)
 }

 // If we're due to show the settings screen
-if ($accountPassword == "" && isset($_GET['settings'])) {
+if ($ICEcoder["accountPassword"] == "" && isset($_GET['settings'])) {
 ?>
 	<!DOCTYPE html>

 	<html>
 	<head>
-	<title>ICE Coder - <?php echo $versionNo;?> :: Settings</title>
+	<title>ICE Coder - <?php echo $ICEcoder["versionNo"];?> :: Settings</title>
 	<link rel="stylesheet" type="text/css" href="coder.css">
 	</head>

-	<body>
+	<body onLoad="document.settingsUpdate.accountPassword.focus()">
 	
-	<div class="screenContainer">
+	<div class="screenContainer" style="background-color: #141414">
 		<div class="screenVCenter">
 			<div class="screenCenter">
 			<img src="../images/ice-coder.png">
-			<div class="version"><?php echo $versionNo;?></div>
+			<div class="version"><?php echo $ICEcoder["versionNo"];?></div>
 			<form name="settingsUpdate" action="../index.php" method="POST">
 			<input type="password" name="accountPassword" class="accountPassword">
 			<input type="submit" name="submit" value="Set Password" class="button">
@@ -244,14 +244,15 @@ if ($accountPassword == "" && isset($_GET['settings'])) {
 } 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 ($accountPassword == "" && strpos($_SERVER['PHP_SELF'],"index.php")>0) {
+	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/config.php';
 			$settingsContents = file_get_contents($settingsFile);
 			// Replace our empty password with the one submitted by user
-			$settingsContents = str_replace('$accountPassword	= "";','$accountPassword	= "'.$password.'";',$settingsContents);
+			$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 lib/config.php");
 			fwrite($fh, $settingsContents);
@@ -268,7 +269,7 @@ if ($accountPassword == "" && isset($_GET['settings'])) {

 	// 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']),$accountPassword)==$accountPassword) {
+		if(isset($_POST['loginPassword']) && generateHash(strClean($_POST['loginPassword']),$ICEcoder["accountPassword"])==$ICEcoder["accountPassword"]) {
 			$loginAttempt = 'loginOK';
 		} else {
 			$loginAttempt = 'loginFailed';
Author	SHA1	Message	Date
Matt Pass	b9921e155b	Backups folder added, text file as a placeholder Small text file added to this folder giving info on ZipIt backups Wanted the backups folder in the repo as standard Added note to readme file to mention adding perms on this folder too (Saves asking users to give perms on parent ICEcoder dir	2012-07-20 17:54:37 +01:00
Matt Pass	d7ed877ebd	Added note about setting perms on backups folder Used by ZipIt and unable to save backups if it can't create the folder in the first place	2012-07-20 17:52:25 +01:00
Matt Pass	436630b5c8	Now using CodeMirror 2.31 & new root setting Upgraded Codemirror from 2.3 to 2.31 New setting in ICEcoder array, root which defines the tree root	2012-07-20 17:48:17 +01:00
Matt Pass	5d2edc911d	serverRoot, ternary shortening & using tree root docRoot is now serverRoot here Ternary shortening in quite a few areas Using user defined tree root now instead of document root	2012-07-20 17:45:19 +01:00
Matt Pass	f0dcf68f8f	Ternary shortening on 3 x areas	2012-07-20 17:31:30 +01:00
Matt Pass	caca296562	Ternary shortening htmlTagArray & getcMInstance Reduced & simplified code to get the same result	2012-07-20 17:30:27 +01:00
Matt Pass	948978b5e1	docRoot is now the tree root, simplified saveFile	2012-07-20 17:25:51 +01:00
Matt Pass	a1c7a54172	docRoot now serverRoot here & ternary shortening	2012-07-20 17:18:10 +01:00
Matt Pass	38254f51d1	Combined CM libs, ternary statement & root info 3 x util libs (foldcode, searchcursor & match-highlighter) now in codemirror-compressed.js (this means less files and saves around 7k of data) Ternary statement now used to specify theme CSS file ICEcoder root shown which is the file manager tree root	2012-07-20 17:16:10 +01:00
Matt Pass	fe8c94bb90	Shortened 2 ternary conditions	2012-07-20 17:02:02 +01:00
Matt Pass	891aff80ed	Shoter ternary statements, fullPath = serverRoot Simpler statements now for a couple of ternary conditions fullPath in JS is now serverRoot in PHP (So you can define your own tree root)	2012-07-20 16:56:09 +01:00
Matt Pass	cfa77ab0a4	Clarifying code & using configurable root Couple of ternary conditions shortened $path equals a new ICEcoder setting which defines the FM tree root (Means you can set your own tree root now!) Broke long echo statement into seperate lines Shows root name or [ROOT] if it's the server root	2012-07-20 16:53:56 +01:00
Matt Pass	7ecbc2c407	Upgrade to CodeMirror 2.31 & More Compression CodeMirror upgraded from 2.3 to 2.31 3 x util JS libs now included in codemirror-compression.js Means we no longer need /util folder and 3 x files in it Also saves around 7k in filesize	2012-07-20 16:42:13 +01:00
Matt Pass	f185438b08	Remove CodeMirror 2.3 Upgrading to 2.31	2012-07-20 16:40:16 +01:00
Matt Pass	d413370104	Handling the ignoring of .. path differently No longer using rtrim Added as new condition in if statement	2012-07-20 07:49:07 +01:00
Matt Pass	2b54b192ed	'Zipping Files' is now the message Removed 'open' from server message (as we're zipping more than just open files now)	2012-07-20 07:47:20 +01:00
Matt Pass	0296379cfa	Fix to when we can show cursor & filesize shown Now only changes cursor if both iframes are loaded unitSize is shown in 2 decimal places now if unit type is megabytes	2012-07-13 18:10:01 +01:00
Matt Pass	e4e9217d84	Putting server vars into $ICEcoder array All server variables such as codeMirrorDir, visibleTabs etc now in $ICEcoder array This is so we have a single object to contain all settings, just like the JS equivalent	2012-07-13 18:05:28 +01:00
Matt Pass	bf06a64734	Version no update to v0.7.8 only	2012-07-11 13:40:24 +01:00
Matt Pass	7429ec9576	New var to determin if ICEcoder is ready False to start, true on init Only consider resizing file manager width if it's true	2012-07-11 13:34:06 +01:00
Matt Pass	176c8fc557	Only get mouseXY & test FM resizeon ICEcoder obj	2012-07-11 13:33:08 +01:00
Matt Pass	d2e5476432	Tweaks to getMouseXY & dragCursorTest Now passing through the area the function was triggered from If it's not the top strip, add on 40+50 px If it's the editor, add on the filesW value This gives us an XY position across the whole of ICEcoder Icon applied to top, content & filesFrame now	2012-07-11 13:20:10 +01:00
Matt Pass	c53b0ba3ad	Detect mouse down, up & move plus test FM resize Setting up mouseDown value as bool on down & up events Mouse move now gets X & Y pos along with determining area event triggered in Also then determins if we can resize file manager width & show w-resize icon All of this applied to HTML tag so at hightest DOM level	2012-07-11 13:16:54 +01:00
Matt Pass	e2137b3503	GIF icon changed Given it's own icon, previously looked too much like JPEG icon	2012-07-10 17:53:58 +01:00
Matt Pass	dc051e993b	closeTab CM 2.3 fix & new params Fix to closing tabs as now using CodeMirror 2.3 oldName & newName params passed to renameFile This is used by the replace in filenames function, but can also be API updateFileManagerList now has new param This again is so it can be used by find/replace, passed from file-control.php	2012-07-10 07:17:37 +01:00
Matt Pass	a0dbbbe397	Multiple results working with find in filenames Title outside of results DIV, which is now the scrollable container Rename all/replace all button wording Handling both cases now, find & documents and filenames The latter works by scanning IDs and building up array Find in filenames also handles selected filenames as well as all filenames Can rename singularly, rename all or click link to open file	2012-07-10 07:08:25 +01:00
Matt Pass	a5d473c546	h1 now outside of resultsPane, resultsPane scolls	2012-07-09 07:43:13 +01:00
Matt Pass	2204a15350	Focus on password box on load, style BG change	2012-07-09 07:36:25 +01:00
Matt Pass	971cd573fc	Now passing back oldFileName to updateFileManager Allows for API calls now not using rightClickedFile	2012-07-09 07:35:45 +01:00
Matt Pass	d3ba467e6a	Style improvements & removing plural Darker password box plus no border now Darker login button No longer want plurals DIV, class not needed Minor changes to find box height & adding margin-right Similar changes made to settings screen	2012-07-09 07:34:09 +01:00
Matt Pass	eb68960dca	No longer using plurals	2012-07-09 07:13:50 +01:00
				`@@ -0,0 +1 @@`
				`Backups are stored in this folder every 10 mins by default`