Version 1.2

Slight adjust to make text in footer look in line
'cursor nest locaton' wording starts with lowercase c
BG gif added which contains start, middle and end chevron graphics
Now showing DIV containing BG for start, middle or end chunks between
next tag names

CodeMirror-2.36/lib/codemirror.css

@@ -80,6 +80,7 @@
   word-wrap: normal;
   line-height: inherit;
   color: inherit;
+  overflow: visible;
 }
 
 .CodeMirror-wrap pre {
@@ -145,7 +146,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 +171,4 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
     visibility: hidden;
   }
 
-}
+}

CodeMirror-2.36/theme/ambiance.css

@@ -0,0 +1,83 @@
+/* ambiance theme for codemirror */
+
+/* Color scheme */
+
+.cm-s-ambiance .cm-keyword { color: #cda869; }
+.cm-s-ambiance .cm-atom { color: #CF7EA9; }
+.cm-s-ambiance .cm-number { color: #78CF8A; }
+.cm-s-ambiance .cm-def { color: #aac6e3; }
+.cm-s-ambiance .cm-variable { color: #ffb795; }
+.cm-s-ambiance .cm-variable-2 { color: #eed1b3; }
+.cm-s-ambiance .cm-variable-3 { color: #faded3; }
+.cm-s-ambiance .cm-property { color: #eed1b3; }
+.cm-s-ambiance .cm-operator {color: #fa8d6a;}
+.cm-s-ambiance .cm-comment { color: #555; font-style:italic; }
+.cm-s-ambiance .cm-string { color: #8f9d6a; }
+.cm-s-ambiance .cm-string-2 { color: #9d937c; }
+.cm-s-ambiance .cm-meta { color: #D2A8A1; }
+.cm-s-ambiance .cm-error { color: #AF2018; }
+.cm-s-ambiance .cm-qualifier { color: yellow; }
+.cm-s-ambiance .cm-builtin { color: #9999cc; }
+.cm-s-ambiance .cm-bracket { color: #24C2C7; }
+.cm-s-ambiance .cm-tag { color: #fee4ff }
+.cm-s-ambiance .cm-attribute {  color: #9B859D; }
+.cm-s-ambiance .cm-header {color: blue;}
+.cm-s-ambiance .cm-quote { color: #24C2C7; }
+.cm-s-ambiance .cm-hr { color: pink; }
+.cm-s-ambiance .cm-link { color: #F4C20B; }
+.cm-s-ambiance .cm-special { color: #FF9D00; }
+
+.cm-s-ambiance .CodeMirror-matchingbracket { color: #0f0; }
+.cm-s-ambiance .CodeMirror-nonmatchingbracket { color: #f22; }
+
+.cm-s-ambiance .CodeMirror-selected {
+  background: rgba(255, 255, 255, 0.15);
+}
+.CodeMirror-focused .cm-s-ambiance .CodeMirror-selected {
+  background: rgba(255, 255, 255, 0.10);
+}
+
+/* Editor styling */
+
+.cm-s-ambiance {
+  line-height: 1.40em;
+  font-family: Monaco, Menlo,"Andale Mono","lucida console","Courier New",monospace !important;
+  color: #E6E1DC;
+  background-color: #202020;
+  -webkit-box-shadow: inset 0 0 10px black;
+  -moz-box-shadow: inset 0 0 10px black;
+  -o-box-shadow: inset 0 0 10px black;
+  box-shadow: inset 0 0 10px black;
+}
+
+.cm-s-ambiance .CodeMirror-gutter {
+  background: #3D3D3D;
+  padding: 0 5px;
+  text-shadow: #333 1px 1px;
+  border-right: 1px solid #4D4D4D;
+  box-shadow: 0 10px 20px black;
+}
+
+.cm-s-ambiance .CodeMirror-gutter .CodeMirror-gutter-text {
+  text-shadow: 0px 1px 1px #4d4d4d;
+  color: #222;
+}
+
+.cm-s-ambiance .CodeMirror-lines {
+  
+}
+
+.cm-s-ambiance .CodeMirror-lines .CodeMirror-cursor {
+  border-left: 1px solid #7991E8;
+}
+
+.cm-s-ambiance .activeline {
+  background: none repeat scroll 0% 0% rgba(255, 255, 255, 0.031);
+}
+
+.cm-s-ambiance {
+  background: #202020;
+}
+.cm-s-ambiance .CodeMirror-gutter {
+  background: #3d3d3d;
+}

CodeMirror-2.36/theme/twilight.css

@@ -0,0 +1,26 @@
+.cm-s-twilight { background: #141414; color: #f7f7f7; } /**/
+.cm-s-twilight .CodeMirror-selected { background: #323232 !important; } /**/
+
+.cm-s-twilight .CodeMirror-gutter { background: #222; border-right: 1px solid #aaa; }
+.cm-s-twilight .CodeMirror-gutter-text { color: #aaa; }
+.cm-s-twilight .CodeMirror-cursor { border-left: 1px solid white !important; }
+
+.cm-s-twilight .cm-keyword {  color: #f9ee98; } /**/
+.cm-s-twilight .cm-atom { color: #FC0; }
+.cm-s-twilight .cm-number { color:  #ca7841; } /**/
+.cm-s-twilight .cm-def { color: #8DA6CE; }
+.cm-s-twilight span.cm-variable-2, .cm-s-twilight span.cm-tag { color: #607392; } /**/
+.cm-s-twilight span.cm-variable-3, .cm-s-twilight span.cm-def { color: #607392; } /**/
+.cm-s-twilight .cm-operator { color: #cda869; } /**/
+.cm-s-twilight .cm-comment { color:#777; font-style:italic; font-weight:normal; } /**/
+.cm-s-twilight .cm-string { color:#8f9d6a; font-style:italic; } /**/
+.cm-s-twilight .cm-string-2 { color:#bd6b18 } /*?*/
+.cm-s-twilight .cm-meta { background-color:#141414; color:#f7f7f7; } /*?*/
+.cm-s-twilight .cm-error { border-bottom: 1px solid red; }
+.cm-s-twilight .cm-builtin { color: #cda869; } /*?*/
+.cm-s-twilight .cm-tag { color: #997643; } /**/
+.cm-s-twilight .cm-attribute { color: #d6bb6d; } /*?*/
+.cm-s-twilight .cm-header { color: #FF6400; }
+.cm-s-twilight .cm-hr { color: #AEAEAE; }
+.cm-s-twilight .cm-link {   color:#ad9361; font-style:italic; font-underline:none; } /**/
+

CodeMirror-2.36/theme/xq-dark.css

@@ -0,0 +1,46 @@
+/*
+Copyright (C) 2011 by MarkLogic Corporation
+Author: Mike Brevoort <mike@brevoort.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+.cm-s-xq-dark { background: #0a001f; color: #f8f8f8; }
+.cm-s-xq-dark span.CodeMirror-selected { background: #a8f !important; }
+.cm-s-xq-dark .CodeMirror-gutter { background: #0a001f; border-right: 1px solid #aaa; }
+.cm-s-xq-dark .CodeMirror-gutter-text { color: #f8f8f8; }
+.cm-s-xq-dark .CodeMirror-cursor { border-left: 1px solid white !important; }
+
+.cm-s-xq-dark span.cm-keyword {color: #FFBD40;}
+.cm-s-xq-dark span.cm-atom {color: #6C8CD5;}
+.cm-s-xq-dark span.cm-number {color: #164;}
+.cm-s-xq-dark span.cm-def {color: #FFF; text-decoration:underline;}
+.cm-s-xq-dark span.cm-variable {color: #FFF;}
+.cm-s-xq-dark span.cm-variable-2 {color: #EEE;}
+.cm-s-xq-dark span.cm-variable-3 {color: #DDD;}
+.cm-s-xq-dark span.cm-property {}
+.cm-s-xq-dark span.cm-operator {}
+.cm-s-xq-dark span.cm-comment {color: gray;}
+.cm-s-xq-dark span.cm-string {color: #9FEE00;}
+.cm-s-xq-dark span.cm-meta {color: yellow;}
+.cm-s-xq-dark span.cm-error {color: #f00;}
+.cm-s-xq-dark span.cm-qualifier {color: #FFF700;}
+.cm-s-xq-dark span.cm-builtin {color: #30a;}
+.cm-s-xq-dark span.cm-bracket {color: #cc7;}
+.cm-s-xq-dark span.cm-tag {color: #FFBD40;}
+.cm-s-xq-dark span.cm-attribute {color: #FFF700;}

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
 

editor.php

@@ -3,17 +3,14 @@
 
 <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
@@ -21,7 +18,7 @@ if ($ICEcoder["theme"]=="default") {echo 'lib/editor.css';} else {echo $ICEcoder
 $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 {position: absolute; width: 0; background-color: #fff; color: #000; top: 0px; width: 100%; font-size: 13px; z-index: 1}
 .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}
@@ -35,155 +32,157 @@ 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
-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;};
-	}
-}
-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;
+	<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>
 
-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>
+	<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(' ');
+		}
+	},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;
+		},
+		onScroll: function() {
+			top.ICEcoder.mouseDown=false;
+		},
+		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

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());
@@ -33,8 +31,23 @@ class SortingIterator implements IteratorAggregate {
 	}
 }
 
+class IgnorantRecursiveDirectoryIterator extends RecursiveDirectoryIterator {
+	function getChildren() {
+		try {
+			if (!isset($GLOBALS['ICEcoder']['bannedPaths']) || 
+			!in_array($this->key(), $GLOBALS['ICEcoder']['bannedPaths'])) {
+				return parent::getChildren();
+			} else {
+				return new RecursiveArrayIterator(array());
+			}
+    		} catch(UnexpectedValueException $e) {
+			return new RecursiveArrayIterator(array());
+		}
+	}
+}
+
 // Get a full list of dirs & files and begin sorting using above class & function
-$objectList = new SortingIterator(new RecursiveIteratorIterator(new RecursiveDirectoryIterator($docRoot.$iceRoot), RecursiveIteratorIterator::SELF_FIRST), 'alphasort');
+$objectList = new SortingIterator(new RecursiveIteratorIterator(new IgnorantRecursiveDirectoryIterator($docRoot.$iceRoot), RecursiveIteratorIterator::SELF_FIRST), 'alphasort');
 
 // With that done, create arrays for out final ordered list and a temp container of files
 $finalArray = $tempArray =  array();
@@ -43,11 +56,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 +81,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 ||
-			strpos(dirname($finalArray[$j]),dirname($tempArray[$i]))===0) {
+			(strpos(dirname($finalArray[$j]),dirname($tempArray[$i]))===0 && substr($finalArray[$j],strlen(dirname($tempArray[$i])),1)=="/")) {
 			$insertAt++;
 		}
 	}
@@ -79,16 +94,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,12 +127,6 @@ 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>';
@@ -127,15 +138,14 @@ for ($i=0;$i<count($finalArray);$i++) {
 }
 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>";
 ?>
 

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,28 +33,34 @@ window.onbeforeunload = function() {
 	}
 }
 
-previousFiles = [<?php
+</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 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">
@@ -74,18 +71,20 @@ showFileMenu = function() {
 	</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>
+		<a href="javascript:top.ICEcoder.pasteFile(top.ICEcoder.rightClickedFile)" onMouseOver="ICEcoder.showFileMenu()">Paste</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.copyFile(top.ICEcoder.rightClickedFile)" onMouseOver="ICEcoder.showFileMenu()">Copy</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">
@@ -110,20 +109,20 @@ showFileMenu = function() {
 			<div title="Lock" onClick="ICEcoder.lockUnlockNav()" id="fmLock" class="lock"></div>
 		</div>
 	</div>
-	<iframe id="filesFrame" class="frame" name="ff" src="files.php" style="opacity: 0" onLoad="this.style.opacity='1'"></iframe>
+	<iframe id="filesFrame" class="frame" name="ff" src="files.php" style="opacity: 0" onLoad="this.style.opacity='1';this.contentWindow.onscroll=function(){top.ICEcoder.mouseDown=false}"></iframe>
 	<div class="serverMessage" id="serverMessage"></div>
 </div>
 
 <div id="editor" class="editor">
 	<div id="tabsBar" class="tabsBar" onContextMenu="return false">
 		<?php
-		for ($i=1;$i<=10;$i++) {
+		for ($i=1;$i<=100;$i++) {
 			echo '<div id="tab'.$i.'" class="tab" draggable="true" onClick="ICEcoder.canSwitchTabs ? ICEcoder.switchTab('.$i.') : ICEcoder.canSwitchTabs=true"></div>';
 		}
 		?><div class="newTab" onClick="ICEcoder.newTab()"><img src="images/nav-new.png"></div>
 	</div>
 	<div id="findBar" class="findBar" onContextMenu="return false">
-		<form name="findAndReplace">
+		<form name="findAndReplace" onSubmit="ICEcoder.findReplace('findReplace',false,true);return false">
 			<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)">
@@ -147,7 +146,7 @@ showFileMenu = function() {
 				<option>all files</option>
 				<option>all filenames</option>
 				</select>
-				<input type="button" name="submit" value="&gt;&gt;" class="submit" onClick="ICEcoder.findReplace('findReplace',false,true)">
+				<input type="submit" name="submit" value="&gt;&gt;" class="submit">
 				<div class="results" id="results"></div>
 			</div>
 		</form>
@@ -156,13 +155,12 @@ showFileMenu = function() {
 		<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">
 	<div class="nesting" id="nestValid">Nesting OK</div>
-	<div class="nestLoc">Cursor nest location</div>
+	<div class="nestLoc">cursor nest location</div>
 	<div class="nestDisplay" id="nestDisplay"></div>
 	<div class="charDisplay" id="charDisplay"><span id="char"></span></div>
 </div>

lib/config.php

@@ -4,19 +4,20 @@ $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","ICEcoder"),
+"bannedPaths"		=> array("/var/www/.git","/var/www/sites/all/modules","/var/www/sites/default/files"),
 "allowedIPs"		=> array("*"),
 "plugins"		=> array(
 			array("Adminer","plugins/adminer/icon.png","margin-top: 3px","plugins/adminer/adminer-3.4.0-mysql-en.php","_blank",""),
 			array("Zip It!","plugins/zip-it/icon.png","margin-top: 3px; margin-left: 3px","plugins/zip-it/?zip=|&exclude=*.doc*.gif*.jpg*.jpeg*.pdf*.png*.swf*.xml*.zip","fileControl:<b>Zipping Files</b>","30"),
 			array("ICErepo","plugins/ice-repo/icon.png","margin-top: 3px","plugins/ice-repo","_blank",""),
-			array("Dochub","plugins/dochub/icon.png","margin-top: 3px","http://dochub.io","_blank","")
+			array("Dochub","plugins/dochub/icon.png","margin-top: 3px","http://dochub.io","_blank",""),
+			array("Terminal","plugins/terminal/icon.gif","margin-top: 3px","plugins/terminal","_blank","")
 			),
 "theme"			=> "default",
 "tabWidth"		=> 4,

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}

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
@@ -19,18 +20,9 @@ $fileName = basename($file);
 if ($_GET['action']=="load") {
 	echo '<script>action="load";</script>';
 
-	// Determine what to do based on filename
-	// Everything is opened as text in the editor unless specified otherwise
-	$fileType="text";
-	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;
-			}
-		}
+	// Determine what to do based on mime type
+	$finfo = finfo_open(FILEINFO_MIME_TYPE);
+	if (strpos(finfo_file($finfo, $file),"text")===0) {
 		if (file_exists($file)) {
 			echo '<script>fileType="text";';
 			echo 'top.ICEcoder.shortURL = top.ICEcoder.rightClickedFile = top.ICEcoder.thisFileFolderLink = "'.$fileLoc."/".$fileName.'";';
@@ -38,45 +30,74 @@ if ($_GET['action']=="load") {
 			$loadedFile = file_get_contents($file);
 			echo '<textarea name="loadedFile" id="loadedFile">'.str_replace("</textarea>","<ICEcoder:/:textarea>",htmlentities($loadedFile)).'</textarea>';
 		} else {
-			echo '<script>fileType="nothing";</script>';
-			echo '<script>top.ICEcoder.message(\'Sorry, '.$fileLoc."/".$fileName.' doesn\\\'t seem to exist on the server\');</script>';
+			echo '<script>fileType="nothing"; top.ICEcoder.message(\'Sorry, '.$fileLoc."/".$fileName.' doesn\\\'t seem to exist on the server\');</script>';
 		}
-	};
-
-	if ($fileType=="image") {
+	} else if (strpos(finfo_file($finfo, $file),"image")===0) {
 		echo '<script>fileType="image";fileName=\''.$fileLoc."/".$fileName.'\'</script>';
+	} else {
+		echo '<script>fileType="other";window.open(\'http://'.$_SERVER['SERVER_NAME'].$fileLoc."/".$fileName.'\');</script>';
 	};
+	finfo_close($finfo);
 };
 
 // If we're due to add a new folder...
 if ($_GET['action']=="newFolder") {
-	if (is_writable($docRoot.$fileLoc)) {
+	if (!$demoMode && 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('Sorry, cannot create folder at\\n".$fileLoc."');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 paste a new file...
+if ($_GET['action']=="paste") {
+	$source = $file;
+	$dest = $docRoot.strClean(str_replace("|","/",$_GET['location']))."/".basename($source);
+	if (!$demoMode && is_writable(dirname($dest))) {
+		if (is_dir($source)) {
+			if (!is_dir($dest)) {
+				mkdir($dest, 0705);
+			}
+			foreach ($iterator = new RecursiveIteratorIterator(
+				new RecursiveDirectoryIterator($source, RecursiveDirectoryIterator::SKIP_DOTS),
+				RecursiveIteratorIterator::SELF_FIRST) as $item
+				) {
+				if ($item->isDir()) {
+					mkdir($dest.DIRECTORY_SEPARATOR.$iterator->getSubPathName(), 0705);
+				} else {
+					copy($item, $dest.DIRECTORY_SEPARATOR.$iterator->getSubPathName());
+				}
+			}
+		} else {
+			copy($source, $dest);
+		}
+		// Reload file manager
+		echo '<script>top.ICEcoder.selectedFiles=[];top.ICEcoder.updateFileManagerList(\'add\',\''.strClean(str_replace("|","/",$_GET['location'])).'\',\''.$fileName.'\');action="pasteFile";</script>';
+	} else {
+		echo "<script>action='nothing'; top.ICEcoder.message('Sorry, cannot copy \\n".str_replace($docRoot,"",$source)."\\n into \\n".str_replace($docRoot,"",$dest)."')</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 (is_writable($docRoot.$iceRoot.str_replace("|","/",strClean($_GET['oldFileName'])))) {
+	if (!$demoMode && 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 {
-		echo "<script>top.ICEcoder.message('Sorry, cannot rename\\n".strClean($_GET['oldFileName'])."');</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 (is_writable(str_replace("|","/",strClean($_GET['fileRef'])))) {
+	if (!$demoMode && 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);
@@ -85,36 +106,32 @@ if ($_GET['action']=="replaceText") {
 		fclose($fh);
 		echo '<script>action="replaceText";</script>';
 	} else {
-		echo "<script>top.ICEcoder.message('Sorry, cannot replace text in\\n".strClean($_GET['fileRef'])."');</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 (is_writable($file)) {
+	if (!$demoMode && 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 {
-		echo "<script>top.ICEcoder.message('Sorry, cannot change permissions on \\n".strClean($file)."');</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") {
-	$filesArray = split(";",$file); // May contain more than one file here
+	$filesArray = explode(";",$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]);
-			}
+		if (!$demoMode && 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>';
@@ -132,7 +149,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); 
@@ -144,7 +163,7 @@ if ($_GET['action']=="save") {
 	echo '<script>action="save";</script>';
 	// on the form posting via a reload, save the file
 	if (isset($_POST['contents'])) {
-		if ((file_exists($file) && is_writable($file)) || isset($_POST['newFileName']) && $_POST['newFileName']!="") {
+		if (!$demoMode && ((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']);
@@ -153,11 +172,11 @@ if ($_GET['action']=="save") {
 				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>';
+					echo '<script>top.ICEcoder.selectedFiles=[];top.ICEcoder.updateFileManagerList(\'add\',\''.$fileLoc.'\',\''.$fileName.'\');';
+					echo '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>';
+				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>';
@@ -182,12 +201,12 @@ if ($_GET['action']=="save") {
 					// Finally, switch back to original tab
 					top.ICEcoder.switchTab(thisTab);
 				}
+				action='nothing';
 				</script>
 				<?php
-				echo "<script>action='nothing';</script>";
 			}
         	} else {
-			echo "<script>top.ICEcoder.message('Sorry, cannot write\\n".$file."');action='nothing';</script>";
+			echo "<script>action='nothing';top.ICEcoder.message('Sorry, cannot write\\n".$file."')</script>";
 		}
 	echo '<script>top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);</script>';
 	}
@@ -240,8 +259,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>

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}

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>

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}
@@ -86,47 +86,49 @@ 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}
-.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;
-	-webkit-transition: all 0.2s;
-	-moz-transition: all 0.2s;
-	transition: all 0.2s;
+.files .serverMessage {position: absolute; display: none; width: 450px; bottom: 0; margin-bottom: 30px; background-color: rgba(255,255,255,0.8); font-size: 10px; padding: 7px 12px; opacity: 0;
+	-webkit-transition: opacity 0.2s;
+	-moz-transition: opacity 0.2s;
+	transition: opacity 0.2s;
 }
 .files .serverMessage b {font-size: 10px}
 
 .editor {position: absolute; display: inline-block; top: 0; left: 15px; width: 2400px}
 .editor .tabsBar {display: inline-block; height: 22px; width: 2400px; margin-top: 40px; padding-left: 41px; background-color: #888;}
-.tabsBar .tab {display: inline-block; display: none; background-image: url('../images/nav-bg.jpg'); background-repeat: repeat-x; background-position: 0 0; padding: 5px 8px 2px 8px; font-size: 10px; border-left: solid 1px #fff; border-right: solid 1px #777; color: #fff; cursor: pointer;
+.tabsBar .tab {display: none; background-image: url('../images/nav-bg.jpg'); background-repeat: repeat-x; background-position: 0 0; padding: 5px 8px 2px 8px; font-size: 10px; border-left: solid 1px #fff; border-right: solid 1px #777; color: #fff; cursor: pointer;
 	-webkit-transition: all 0.15s;
 	-moz-transition: all 0.15s;
 	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;}
 .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: 14px; border: 0; top: -2px; font-size: 10px; padding-left: 5px; margin-right: 3px}
+.findReplace .find {position: relative; width: 120px; height: 16px; border: 0; top: -3px; 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}
+.findReplace .replace {position: relative; width: 120px; height: 16px; border: 0; top: -3px; font-size: 10px; padding-left: 5px}
 .findReplace .targetText {height: 21px; font-size: 10px; margin: 8px 2px 0 2px}
-.findReplace .submit {position: relative; top: -2px; height: 17px; border: 1px solid #bbb; background-color: #f8f8f8; font-size: 10px; cursor: pointer}
+.findReplace .submit {position: relative; top: -2px; height: 17px; border: 0; background-color: #444; color: #eee; font-size: 10px; margin-left: 2px; cursor: pointer}
+.findReplace .submit:hover {background-color: #2187e7; color: #eee}
 .findReplace .results {position: relative; display: inline-block; width: 200px; height: 20px; font-size: 10px; margin: 8px 0 0 20px}
 .findBar .codeAssist {position: fixed; display: inline-block; width: 100px; right: 74px; top: 70px; height: 21px; font-size: 10px; z-index: 1}
 .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}
 .footer .nesting {display: inline-block; padding: 5px 8px; margin: 4px 0 0 15px; font-weight: bold; font-size: 10px; color: #fff; background-color: #0b0}
-.footer .nestLoc {position: absolute; display: inline-block; width: 120px; padding: 5px 0 0 8px; margin-top: 3px; left: 112px; font-weight: bold; font-size: 12px; color: #fff; text-align: right}
-.footer .nestDisplay {position: absolute; display: inline-block; padding: 5px 0 0 8px; margin-top: 3px; left: 255px; font-size: 12px; color: #fff; text-align: right}
+.footer .nestLoc {position: absolute; display: inline-block; width: 120px; padding: 5px 0 0 8px; margin-top: 2px; left: 112px; font-weight: bold; font-size: 12px; color: #fff; text-align: right}
+.footer .nestDisplay {position: absolute; display: inline-block; padding: 5px 0 0 8px; margin-top: 0px; left: 255px; font-size: 12px; color: #fff; text-align: right}
 .footer .charDisplay {position: absolute; display: inline-block; padding: 5px 0 0 8px; margin-top: 3px; left: 100%; font-weight: bold; font-size: 12px; color: #fff; text-align: right; width: 200px; text-align: right; margin-left: -220px}
 
 .textbox {box-shadow: inset 1px 1px 2px 0 rgba(0,0,0,0.4)}
@@ -141,4 +143,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}

lib/multiple-results.php

@@ -8,7 +8,7 @@
 <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" id="resultsPane">
@@ -16,14 +16,14 @@
 </div>
 <?php if (isset($_GET['replace'])) { ?>
 	<div class="replaceAll" id="replaceAll" onClick="<?php
-	if (strpos($_GET['target'],"filenames")) {
+	if (isset($_GET['target']) && strpos($_GET['target'],"filenames")) {
 		echo 'renameAll()';
-	} else if (strpos($_GET['target'],"files")) {
+	} else if (isset($_GET['target']) && strpos($_GET['target'],"files")) {
 		echo 'replaceInFilesAll()';
 	} else {
 		echo 'replaceAll()';
 	}
-	?>" style="opacity: 0.1"><?php echo strpos($_GET['target'],"filenames") ? 'rename all' : 'replace all';?></div>
+	?>" style="opacity: 0.1"><?php echo isset($_GET['target']) && strpos($_GET['target'],"filenames") ? 'rename all' : 'replace all';?></div>
 <?php ;}; ?>
 
 <script>
@@ -34,7 +34,7 @@ var resultsDisplay = "";
 var foundArray = [];
 foundInSelected = false;
 userTarget = top.document.findAndReplace.target.value;
-findText = top.findAndReplace.find.value;
+findText = top.findAndReplace.find.value.toLowerCase();
 <?php
 $findText = str_replace("ICEcoder:","",str_replace("&#39;","\'",$_GET['find']));
 // Find in open docs?
@@ -42,7 +42,7 @@ if (!isset($_GET['target'])) {
 $targetName = "document";
 ?>
 var startTab = top.ICEcoder.selectedTab;
-var rExp = new RegExp(decodeURIComponent(findText),"g");
+var rExp = new RegExp(findText,"gi");
 for (var i=1;i<=top.ICEcoder.openFiles.length;i++) {
 	top.ICEcoder.switchTab(i);
 	var cM = top.ICEcoder.getcMInstance();
@@ -68,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(findText)>-1 && targetURL.indexOf('_perms')>-1) {
+			if (targetURL.toLowerCase().indexOf(findText.toLowerCase())>-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) {
@@ -77,8 +77,16 @@ 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("/","\/",$findText); ?>/g,"<b>"+findText+"</b>")+ '</a><br><div id="foundCount'+i+'">'+spansArray[i].innerHTML+', rename to '+targetURL.replace(/\|/g,"/").replace(/_perms/g,"").replace(/<?php echo str_replace("/","\/",$findText); ?>/g,"<b><?php echo strClean($_GET['replace']);?></b>")+'</div>';
-					<?php if (isset($_GET['replace'])) { ?>
+					resultsDisplay += '<a href="javascript:top.ICEcoder.openFile(\'<?php echo $docRoot;?>'+targetURL.replace(/\|/g,"/").replace(/_perms/g,"")+'\');top.ICEcoder.showHide(\'hide\',top.document.getElementById(\'blackMask\'))">';
+					resultsDisplay += targetURL.toLowerCase().replace(/\|/g,"/").replace(/_perms/g,"").replace(/<?php echo str_replace("/","\/",strtolower($findText)); ?>/g,"<b>"+findText.toLowerCase()+"</b>");
+					resultsDisplay += '</a><br>';
+					<?php if (!isset($_GET['replace'])) { ?>
+						resultsDisplay += '<div id="foundCount'+i+'">'+spansArray[i].innerHTML+'</div>';
+					<?php ;} else { ?>
+						resultsDisplay += '<div id="foundCount'+i+'">'+spansArray[i].innerHTML+', rename to '+targetURL.toLowerCase().replace(/\|/g,"/").replace(/_perms/g,"").replace(/<?php echo str_replace("/","\/",strtolower($findText)); ?>/g,"<b><?php if(isset($_GET['replace'])) {echo strtolower(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>';
@@ -92,24 +100,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;
-				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'])) {
@@ -124,22 +130,22 @@ if (startTab!=top.ICEcoder.selectedTab) {
 		return $ret;
 	}
 
-	$results = phpGrep($findText, $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 = "";
+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;
 
@@ -164,7 +170,7 @@ var replaceAll = function() {
 }
 
 var replaceInFileSingle = function(fileRef) {
-	top.ICEcoder.replaceInFile(fileRef,findText,'<?php echo strClean($_GET['replace']); ?>');
+	top.ICEcoder.replaceInFile(fileRef,findText,'<?php if(isset($_GET['replace'])) {echo strClean($_GET['replace']);}; ?>');
 }
 
 var replaceInFilesAll = function() {
@@ -176,7 +182,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(find,"<?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);
 }
 

lib/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,20 +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
-echo is_readable($fileName) ? "Yes" : "No"; ?> / <?php echo is_writeable($fileName) ? "Yes" : "No";
-?></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 $fileName;
-?>
+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;
 ?>

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,7 +48,9 @@ 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>
@@ -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"];?>"
 	});

lib/settings.php

@@ -1,4 +1,13 @@
 <?php
+// Display & log all errors
+ini_set('display_errors', 1);
+ini_set('log_errors', 1);
+ini_set('error_log', dirname(__FILE__).'/../error-log.txt');
+error_reporting(-1);
+
+// Set our default timezone and supress warning with @
+@date_default_timezone_set(date_default_timezone_get());
+
 // Start a session if we haven't already
 if(!isset($_SESSION)) {session_start();}
 
@@ -29,13 +38,19 @@ include($settingsFile);
 
 // Add ICEcoder settings to beginning of $ICEcoder array
 $ICEcoder = array(
-	"versionNo"		=> "0.8.5",
-	"codeMirrorDir"		=> "CodeMirror-2.33",
-	"cMThisVer"		=> 2.33
+	"versionNo"		=> "1.2",
+	"codeMirrorDir"		=> "CodeMirror-2.36",
+	"demoMode"		=> false
 )+$ICEcoder;
 
+$onLoadExtras = "";
+$pluginsDisplay = "";
+
+if ($ICEcoder['demoMode'] && $ICEcoder['accountPassword']!="") {$_SESSION['loggedIn']=true;};
+$demoMode = $ICEcoder['demoMode'];
+
 // Update this config file?
-if ($_SESSION['loggedIn'] && isset($_POST["theme"]) && $_POST["theme"]) {
+if (!$demoMode && 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 +58,21 @@ if ($_SESSION['loggedIn'] && isset($_POST["theme"]) && $_POST["theme"]) {
 
 	// 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 +88,7 @@ if ($_SESSION['loggedIn'] && isset($_POST["theme"]) && $_POST["theme"]) {
 	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]])));
 	}
@@ -92,7 +106,7 @@ if(isset($_POST['loginPassword']) && generateHash(strClean($_POST['loginPassword
 $_SESSION['loggedIn'] = $_SESSION['loggedIn'];
 
 // Define the serverType, docRoot & iceRoot
-$serverType = stristr($_SERVER[SERVER_SOFTWARE], "win") ? "Windows" : "Linux";
+$serverType = stristr($_SERVER['SERVER_SOFTWARE'], "win") ? "Windows" : "Linux";
 $docRoot = rtrim(str_replace("\\","/",$_SERVER['DOCUMENT_ROOT']));
 $iceRoot = rtrim(str_replace("\\","/",$ICEcoder["root"]));
 if ($_SESSION['loggedIn']) {
@@ -100,7 +114,7 @@ if ($_SESSION['loggedIn']) {
 }
 
 // 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]];}
 }
@@ -124,7 +138,7 @@ if ($_SESSION['loggedIn'] && isset($_GET["saveFiles"]) && $_GET['saveFiles']) {
 	// Replace our previousFiles var with the the current
 	$repPosStart = strpos($settingsContents,'previousFiles"		=> "')+20;
 	$repPosEnd = strpos($settingsContents,'",',$repPosStart)-$repPosStart;
-	if ($_GET['saveFiles']!="CLEAR") {
+	if (!$demoMode && $_GET['saveFiles']!="CLEAR") {
 		$saveFiles=strClean($_GET['saveFiles']);
 		$saveFilesArray = explode(",",$saveFiles);
 		$saveFiles="";
@@ -135,7 +149,7 @@ if ($_SESSION['loggedIn'] && isset($_GET["saveFiles"]) && $_GET['saveFiles']) {
 		$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);
+		$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?
@@ -149,7 +163,7 @@ if ($_SESSION['loggedIn'] && isset($_GET["saveFiles"]) && $_GET['saveFiles']) {
 				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);
+				$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);
 			}
 		}
@@ -177,7 +191,7 @@ if ($_SESSION['loggedIn']) {
 	};
 
 	// If we're updating, replace the plugin display with our newly established one
-	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 = "";
@@ -214,7 +228,7 @@ if (!$_SESSION['loggedIn']) {
 		// 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);
+		$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
@@ -223,32 +237,36 @@ if (!$_SESSION['loggedIn']) {
 		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.<?php echo $ICEcoder["accountPassword"] == "" ? "account" : "login"; ?>Password.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="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 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
 }
 

plugins/terminal/index.php

@@ -0,0 +1,201 @@
+<?php
+include("../../lib/settings.php");
+if ($demoMode || !$_SESSION['loggedIn']) {
+	die("You must be logged in to access Terminal");
+}
+
+error_reporting(E_ALL);
+@session_start();
+
+if (isset($_SERVER['PHP_AUTH_USER'])) {
+	$_SESSION['user'] = $_SERVER['PHP_AUTH_USER'];
+	$_SESSION['pass'] = generateHash(strClean($_SERVER['PHP_AUTH_PW']),$ICEcoder["accountPassword"]);
+}
+$passwd = array($_SESSION['user'] => $ICEcoder["accountPassword"]);
+$aliases = array('la' 	=> 'ls -la',
+		'll' 	=> 'ls -lvhF',
+		'dir'	=> 'ls' );
+
+class phpTerm {
+	function phpTerm() {} // constructor
+
+	function formatPrompt() {
+		$user=shell_exec("whoami");
+		$host=explode(".", shell_exec("uname -n"));
+		$_SESSION['prompt'] = "".rtrim($user).""."@"."".rtrim($host[0])."";
+	}
+
+	function checkPassword($passwd) {
+		if(	!isset($_SERVER['PHP_AUTH_USER'])||
+			!isset($_SERVER['PHP_AUTH_PW']) ||
+			!isset($passwd[$_SERVER['PHP_AUTH_USER']]) ||
+			$passwd[$_SERVER['PHP_AUTH_USER']] != $_SESSION['pass']) 	{
+			return false;
+		} else {
+			return true;
+		}
+	}
+
+	function logout() {
+		header('WWW-Authenticate: Basic realm="Terminal"');
+		header('HTTP/1.0 401 Unauthorized');
+		exit();
+	}
+
+	function initVars() {
+		if (empty($_SESSION['cwd']) || @!empty($_GET['reset'])) {
+			$_SESSION['cwd'] = getcwd();
+			$_SESSION['history'] = array();
+			$_SESSION['output'] = '';
+			$_REQUEST['command'] ='';
+		}
+	}
+
+	function buildCommandHistory() {
+		if(!empty($_REQUEST['command'])) {
+			if(get_magic_quotes_gpc()) {
+				$_REQUEST['command'] = stripslashes($_REQUEST['command']);
+			}
+	
+			// drop old commands from list if exists
+			if (($i = array_search($_REQUEST['command'], $_SESSION['history'])) !== false) {
+				unset($_SESSION['history'][$i]);
+			}
+			array_unshift($_SESSION['history'], $_REQUEST['command']);
+
+			// append commmand */
+			$_SESSION['output'] .= "{$_SESSION['prompt']}".":>"."{$_REQUEST['command']}"."\n";
+		}
+	}
+
+	function buildJavaHistory() {
+		// build command history for use in the JavaScript 
+		if (empty($_SESSION['history'])) {
+			$_SESSION['js_command_hist'] = '""';
+		} else {
+			$escaped = array_map('addslashes', $_SESSION['history']);
+			$_SESSION['js_command_hist'] = '"", "' . implode('", "', $escaped) . '"';
+		}
+	}
+
+	function outputHandle($aliases) {
+		if (preg_match('/^[[:blank:]]*cd[[:blank:]]*$/', @$_REQUEST['command']))
+		{
+			$_SESSION['cwd'] = getcwd(); //dirname(__FILE__);
+		}
+		elseif(preg_match('/^[[:blank:]]*cd[[:blank:]]+([^;]+)$/', @$_REQUEST['command'], $regs)) {
+			// The current command is 'cd', which we have to handle as an internal shell command. 
+			// absolute/relative path ?"
+			($regs[1][0] == '/') ? $new_dir = $regs[1] : $new_dir = $_SESSION['cwd'] . '/' . $regs[1];
+		
+			// cosmetics 
+			while (strpos($new_dir, '/./') !== false) {
+				$new_dir = str_replace('/./', '/', $new_dir);
+			}
+			while (strpos($new_dir, '//') !== false) {
+				$new_dir = str_replace('//', '/', $new_dir);
+			}
+			while (preg_match('|/\.\.(?!\.)|', $new_dir)) {
+				$new_dir = preg_replace('|/?[^/]+/\.\.(?!\.)|', '', $new_dir);
+			}
+
+			if(empty($new_dir)): $new_dir = "/"; endif;
+
+			(@chdir($new_dir)) ? $_SESSION['cwd'] = $new_dir : $_SESSION['output'] .= "could not change to: $new_dir\n";
+		} else {
+			/* The command is not a 'cd' command, so we execute it after
+			changing the directory and save the output. */
+			chdir($_SESSION['cwd']);
+
+			/* Alias expansion. */
+			$length = strcspn(@$_REQUEST['command'], " \t");
+			$token = substr(@$_REQUEST['command'], 0, $length);
+			if (isset($aliases[$token]))
+			$_REQUEST['command'] = $aliases[$token] . substr($_REQUEST['command'], $length);
+		
+			$p = proc_open(@$_REQUEST['command'],
+				array(1 => array('pipe', 'w'),
+				2 => array('pipe', 'w')), $io);
+	
+			/* Read output sent to stdout. */
+			while (!feof($io[1])) {
+				$_SESSION['output'] .= htmlspecialchars(fgets($io[1]),ENT_COMPAT, 'UTF-8');
+			}
+			/* Read output sent to stderr. */
+			while (!feof($io[2])) {
+				$_SESSION['output'] .= htmlspecialchars(fgets($io[2]),ENT_COMPAT, 'UTF-8');
+			}
+			
+			fclose($io[1]);
+			fclose($io[2]);
+			proc_close($p);
+		}
+	}
+}
+
+$terminal = new phpTerm;
+
+if ($_REQUEST['command']=="logout") {
+	$terminal->logout();
+}
+
+if(!$terminal->checkPassword($passwd)) {
+	header('WWW-Authenticate: Basic realm="Terminal"');
+	header('HTTP/1.0 401 Unauthorized');
+} else {
+	$terminal->initVars();
+	$terminal->buildCommandHistory();
+	$terminal->buildJavaHistory();
+	if(!isset($_SESSION['prompt'])):$terminal->formatPrompt(); endif;
+	$terminal->outputHandle($aliases);
+?>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<title>PHP Terminal</title>
+<link rel="stylesheet" type="text/css" href="terminal.css" />  
+<script type="text/javascript" language="JavaScript">
+var current_line = 0;
+var command_hist = new Array(<?php echo $_SESSION['js_command_hist']; ?>);
+var last = 0;
+	
+function key(e) {
+	if (!e) var e = window.event;
+	if (e.keyCode == 38 && current_line < command_hist.length-1) {
+		command_hist[current_line] = document.shell.command.value;
+		current_line++;
+		document.shell.command.value = command_hist[current_line];
+	}
+	if (e.keyCode == 40 && current_line > 0) {
+		command_hist[current_line] = document.shell.command.value;
+		current_line--;
+		document.shell.command.value = command_hist[current_line];
+	}
+}
+
+function init() {
+	document.shell.setAttribute("autocomplete", "off");
+	document.shell.output.scrollTop = document.shell.output.scrollHeight;
+	document.shell.command.focus();
+}
+
+</script>
+</head>
+
+<body onload="init()">
+
+<div class="head"><?php echo $_SESSION['prompt'].":"."$_SESSION[cwd]"; ?></div>
+
+<form name="shell" action="<?php echo $_SERVER['PHP_SELF'];?>" method="post">
+	<textarea name="output" readonly="readonly" rows="24"><?php
+		$lines = substr_count($_SESSION['output'], "\n");
+		$padding = str_repeat("\n", max(0, 25 - $lines));
+		echo "\n\n".trim($padding . $_SESSION['output'])."\n";
+	?>
+	</textarea>
+	<p class="commandLine">$&gt; <input class="command" name="command" type="text"  size='50' onkeyup="key(event)" tabindex="1"></p>
+</form>
+
+</body>
+</html>
+<?php } ?>

plugins/terminal/terminal.css

@@ -0,0 +1,28 @@
+/* First, reset everything to a standard */
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, font, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, input, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td {
+	font-family: verdana, arial, monospace, sans-serif;
+	border: 0;
+	margin: 0;
+	padding: 0;
+	outline: 0;
+	font-size: 12px;
+	vertical-align: top;
+}
+
+html, body {width: 100%; height: 100%; background: #000}
+
+.head {position: fixed; top: 0; padding: 2px; background: rgba(124,124,124,0.8); color: #fff; font-weight: bold; z-index: 1}
+textarea {position: absolute; display: block; top: 0; padding: 0; width: 100%; height: 100%; min-height: 100%; border: 0; background: #000; color: #0c0}
+textarea:focus {outline: none}
+p {color: #0c0}
+.commandLine {position: fixed; width: 100%; bottom: 0; padding: 2px; background: rgba(32,32,32,0.9); z-index: 1}
+.command {width: 95%; font-family: verdana, arial, monospace, sans-serif; border: none; background: transparent; color: #0c0}
+.command:focus {outline: none}

plugins/zip-it/index.php

@@ -62,7 +62,7 @@ Class zipIt {
 			foreach($zipFiles as $file) {
 				$canAdd=true;
 				for ($i=0;$i<count($excludeFilesFolders);$i++) {
-					if(strpos($file,$excludeFilesFolders[$i])!==false) {$canAdd=false;};
+					if($excludeFilesFolders[$i] && strpos($file,$excludeFilesFolders[$i])!==false) {$canAdd=false;};
 				}
 				if ($canAdd==true) {
 					$zip->addFile($file,str_replace($docRoot."/","",$file));