Version 0.8.4

UTF-8, ternary switching & condensing code
Added UTF-8 charset metatag Ternary switching instead of if else Condensing 2 if statements into 1 Removed old commented line
2026-03-16 13:27:05 +01:00 · 2012-09-09 17:04:52 +01:00 · 2012-09-09 17:03:40 +01:00 · 2012-09-09 16:45:37 +01:00 · 2012-09-09 16:39:57 +01:00 · 2012-09-09 16:00:19 +01:00
22 changed files with 453 additions and 160 deletions
--- a/CodeMirror-2.33/README.md
+++ b/CodeMirror-2.33/README.md
@@ -1,8 +0,0 @@
-# CodeMirror [![Build Status](https://secure.travis-ci.org/marijnh/CodeMirror.png?branch=master)](http://travis-ci.org/marijnh/CodeMirror)
-
-CodeMirror is a JavaScript component that provides a code editor in
-the browser. When a mode is available for the language you are coding
-in, it will color your code, and optionally help with indentation.
-
-The project page is http://codemirror.net
-The manual is at http://codemirror.net/doc/manual.html
--- a/CodeMirror-2.33/theme/xq-dark.css
+++ b/CodeMirror-2.33/theme/xq-dark.css
@@ -1,46 +0,0 @@
-/*
-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;}
--- a/backups/info.txt
+++ b/backups/info.txt
@@ -1 +0,0 @@
-Backups are stored in this folder every 10 mins by default
--- a/backups/readme.txt
+++ b/backups/readme.txt
@@ -0,0 +1 @@
+Zip It! backups are stored in this folder
--- a/editor.php
+++ b/editor.php
@@ -4,6 +4,7 @@
 <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>
+<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
@@ -16,7 +17,7 @@ foldcode, searchcursor, match-highlighter
 //-->
 <script src="<?php echo $ICEcoder["codeMirrorDir"]; ?>/lib/codemirror-compressed.js"></script>
 <link rel="stylesheet" href="<?php
-if ($ICEcoder["theme"]=="default") {echo 'lib/editor.css';} else {echo $ICEcoder["codeMirrorDir"].'/theme/'.$ICEcoder["theme"].'.css';};
+$ICEcoder["theme"]=="default" ? echo 'lib/editor.css' : echo $ICEcoder["codeMirrorDir"].'/theme/'.$ICEcoder["theme"].'.css';
 $activeLineBG = $ICEcoder["theme"]=="eclipse" || $ICEcoder["theme"]=="elegant" || $ICEcoder["theme"]=="neat" ? "#ccc" : "#000";
 ?>">
 <style type="text/css">
@@ -145,12 +146,13 @@ function createNewCMInstance(num) {
 				canDoEndTag=false;
 				}
 			}
-			if(top.ICEcoder.tagString.slice(0,1)=="/"||top.ICEcoder.tagString.slice(0,1)=="?") {
-				canDoEndTag=false;
-			}
-			if (!top.ICEcoder.codeAssist||fileName && (fileName.indexOf(".js")>0||fileName.indexOf(".css")>0||fileName.indexOf(".less")>0)) {
-				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;
@@ -159,7 +161,6 @@ function createNewCMInstance(num) {
 				for (i=0;i<numTabs-1;i++) {
 					tabs += "\t";
 				}
-				//endTag = "</" + top.ICEcoder.htmlTagArray[top.ICEcoder.htmlTagArray.length-1] + ">";
 				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)) {
--- a/files.php
+++ b/files.php
@@ -124,8 +124,7 @@ for ($i=0;$i<count($finalArray);$i++) {
 	if ($_SESSION['userLevel'] == 10 || ($_SESSION['userLevel'] < 10 && !$restrictedFile)) {
 		echo "<li class=\"".$class."\"><a nohref title=\"$fileFolderName\" onMouseOver=\"top.ICEcoder.overFileFolder('$type','".str_replace($docRoot,"",str_replace("/","|",$fileFolderName))."')\" onMouseOut=\"top.ICEcoder.overFileFolder('$type','')\" style=\"position: relative; left:-22px\">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span id=\"".str_replace($docRoot,"",str_replace("/","|",$fileFolderName))."\">".basename($fileFolderName)."</span> ".$fileAtts."</a>\n";
 	} else {
-		if ($type == "file") {$fileAtts = "<img src=\"images/padlock.png\" style=\"cursor: pointer\" onClick=\"top.ICEcoder.message('Sorry, you need higher admin level rights to view.')\">";}
-		echo "<li class=\"".$class."\" style=\"cursor: default\"><span style=\"position: relative; left:-22px; color: #888\">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [HIDDEN] ".$fileAtts."</span>";
+		echo "<li class=\"".$class."\" style=\"cursor: default\"><span style=\"position: relative; left:-22px; color: #888\" onClick=\"top.ICEcoder.message('Sorry, you need higher admin level rights to view.')\">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [HIDDEN]</span>";
 	}
 	if ($i<count($finalArray)) {echo "</li>\n";}
 	$lastPath = $fileFolderName;
--- a/images/blank.gif
+++ b/images/blank.gif
--- a/images/files-arrow.gif
+++ b/images/files-arrow.gif
--- a/images/files-arrow.png
+++ b/images/files-arrow.png
--- a/images/nav-bg.gif
+++ b/images/nav-bg.gif
--- a/images/nav-bg.jpg
+++ b/images/nav-bg.jpg
--- a/images/padlock.png
+++ b/images/padlock.png
--- a/index.php
+++ b/index.php
@@ -1,26 +1,22 @@
 <?php
 include("lib/settings.php");
-$allowedIP = false;
-for($i=0;$i<count($_SESSION['allowedIPs']);$i++) {
-	if ($_SESSION['allowedIPs'][$i]==$_SERVER["REMOTE_ADDR"]||$_SESSION['allowedIPs'][$i]=="*") {
-		$allowedIP = true;
-	}
-}
-if (!$allowedIP) {
+
+// Check IP permissions
+if (!in_array($_SERVER["REMOTE_ADDR"], $_SESSION['allowedIPs']) && !in_array("*", $_SESSION['allowedIPs'])) {
 	header('Location: /');
 };

-// Check for updates of ICEcoder & CodeMirror
+// Check for updates
 if ($ICEcoder["checkUpdates"]) {
-	$ICEcoderLatestVer = json_encode(file_get_contents("http://icecoder.net/latest-version.txt"));
-	$ICEcoderLatestVer = rtrim(ltrim($ICEcoderLatestVer,"\""),"\"\\n");
-	if (ltrim($ICEcoder["versionNo"],"v ")<ltrim($ICEcoderLatestVer,"v ")) {
-		echo '<script>top.ICEcoder.message(\'ICEcoder '.$ICEcoderLatestVer.' now released\n\nPlease upgrade\');</script>';
+	$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 {
-		$cMLatestVer = json_encode(file_get_contents("http://codemirror.net/latest-version.txt"));
-		$cMLatestVer = rtrim(ltrim($cMLatestVer,"\""),"\"\\n");
-		if ($ICEcoder["cMThisVer"]<$cMLatestVer) {
-			echo '<script>top.ICEcoder.message(\'CodeMirror '.$cMLatestVer.' now released\n\nPlease upgrade\');</script>';
+		$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\')';
 		}
 	}
 }
@@ -29,7 +25,8 @@ if ($ICEcoder["checkUpdates"]) {

 <html onMouseDown="top.ICEcoder.mouseDown=true" onMouseUp="top.ICEcoder.mouseDown=false" onMouseMove="if(top.ICEcoder) {top.ICEcoder.getMouseXY(event,'top');top.ICEcoder.canResizeFilesW()}">
 <head>
-<title>ICEcoder <?php echo $ICEcoder["versionNo"];?></title>
+<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">
 <script>
@@ -37,31 +34,31 @@ theme = "<?php echo $ICEcoder["theme"]=="default" ? 'icecoder' : $ICEcoder["them
 tabsIndent = <?php echo $ICEcoder["tabsIndent"] ? 'true' : 'false';?>;
 openLastFiles = <?php echo $ICEcoder["openLastFiles"] ? 'true' : 'false';?>;
 tabWidth = <?php echo $ICEcoder["tabWidth"]; ?>;
-<?php
-echo 'iceRoot = "'.$ICEcoder["root"].'";'.PHP_EOL;
-?>
+iceRoot = "<?php echo $ICEcoder["root"]; ?>";
+
 window.onbeforeunload = function() {
-	for (var i=0; i<=top.ICEcoder.changedContent.length; i++) {
-		if (top.ICEcoder.changedContent[i]==1) {
-			return "You have some unsaved changes.";
-		}
+	if (top.ICEcoder.changedContent.indexOf(1)>-1) {
+		return "You have some unsaved changes.";
 	}
 }

 previousFiles = [<?php
 	if ($ICEcoder["previousFiles"]!="" && $_SESSION['userLevel'] == 10) {
 		$openFilesArray = explode(",",$ICEcoder["previousFiles"]);
-		for ($i=0;$i<count($openFilesArray);$i++) {
-			echo "'".$openFilesArray[$i]."'";
-			if ($i<count($openFilesArray)-1) {echo ",";};
-		}
+		echo "'".implode("','",$openFilesArray)."'";
 	}
 ?>];
+showFileMenu = function() {
+	document.getElementById('fileMenu').style.display='inline-block';
+}
 </script>
 <script language="JavaScript" src="lib/coder.js"></script>
 </head>

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

 <div id="blackMask" class="blackMask" onClick="ICEcoder.showHide('hide',this)">
 	<div class="popupVCenter">
@@ -82,23 +79,23 @@ previousFiles = [<?php

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

 <div id="header" class="header" onContextMenu="return false">
 	<div class="plugins" id="pluginsContainer">
 	<?php echo $pluginsDisplay; ?>
 	</div>
-	<div class="version"><?php echo $ICEcoder["versionNo"];?></div><img src="images/full-screen.gif" id="screenMode" class="screenModeIcon" onClick="top.ICEcoder.fullScreenSwitcher()">
+	<div class="version">v <?php echo $ICEcoder["versionNo"];?></div><img src="images/full-screen.gif" id="screenMode" class="screenModeIcon" onClick="top.ICEcoder.fullScreenSwitcher()">
 	<img src="images/ice-coder.png" class="logo" onClick="ICEcoder.helpScreen()" onContextMenu="ICEcoder.settingsScreen()">
 </div>

@@ -113,15 +110,15 @@ previousFiles = [<?php
 			</div>
 		</div>
 		<div class="accountOptions">
-			<div title="Save" onClick="ICEcoder.fMIcon('save')" id="fMSave" style="width: 30px; height: 32px; opacity: 0.3"></div>
-			<div title="Open" onClick="ICEcoder.fMIcon('open')" id="fMOpen" style="width: 25px; height: 32px; background-position: -32px -3px; margin: 3px 0 0 7px; opacity: 0.3"></div>
-			<div title="New File" onClick="ICEcoder.fMIcon('newFile')" id="fMNewFile" style="width: 15px; height: 16px; background-position: -64px 0; margin: 8px 0 0 10px; opacity: 0.3"></div>
-			<div title="New Folder" onClick="ICEcoder.fMIcon('newFolder')" id="fMNewFolder" style="width: 20px; height: 16px; background-position: -80px 0; margin: 8px 0 0 5px; opacity: 0.3"></div>
-			<div title="Delete" onClick="ICEcoder.fMIcon('delete')" id="fMDelete" style="width: 16px; height: 16px; background-position: -100px 0; margin: 8px 0 0 5px; opacity: 0.3"></div>
-			<div title="Rename" onClick="ICEcoder.fMIcon('rename')" id="fMRename" style="width: 16px; height: 16px; background-position: -116px 0; margin: 8px 0 0 5px; opacity: 0.3"></div>
-			<div title="View" onClick="ICEcoder.fMIcon('view')" id="fMView" style="width: 16px; height: 16px; background-position: -132px 0; margin: 8px 0 0 5px; opacity: 0.3"></div>
+			<div title="Save" onClick="ICEcoder.fMIcon('save')" id="fMSave" class="save"></div>
+			<div title="Open" onClick="ICEcoder.fMIcon('open')" id="fMOpen" class="open"></div>
+			<div title="New File" onClick="ICEcoder.fMIcon('newFile')" id="fMNewFile" class="newFile"></div>
+			<div title="New Folder" onClick="ICEcoder.fMIcon('newFolder')" id="fMNewFolder" class="newFolder"></div>
+			<div title="Delete" onClick="ICEcoder.fMIcon('delete')" id="fMDelete" class="delete"></div>
+			<div title="Rename" onClick="ICEcoder.fMIcon('rename')" id="fMRename" class="rename"></div>
+			<div title="View" onClick="ICEcoder.fMIcon('view')" id="fMView" class="view"></div>

-			<div title="Lock" onClick="ICEcoder.lockUnlockNav()" id="fmLock" style="position: relative; margin-left: 208px; margin-top: -27px; width: 12px; height: 16px; background-position: -64px -16px; z-index: 1"></div>
+			<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>
@@ -132,7 +129,7 @@ previousFiles = [<?php
 	<div id="tabsBar" class="tabsBar" onContextMenu="return false">
 		<?php
 		for ($i=1;$i<=10;$i++) {
-			echo '<div id="tab'.$i.'" class="tab" draggable="true" onClick="if(ICEcoder.canSwitchTabs) {ICEcoder.switchTab('.$i.')} else {ICEcoder.canSwitchTabs=true}"></div>';
+			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>
--- a/lib/coder.css
+++ b/lib/coder.css
@@ -72,7 +72,7 @@ h2 {font-size: 18px; font-weight: normal; color: #fff}
 .header .version {position: relative; display: inline-block; margin-top: 25px; font-size: 10px; color: #bbb}
 .header .logo {position: relative; margin: 5px 10px 0 5px; cursor: pointer}

-.files {position: absolute; display: inline-block; top: 0; left: 0; height: 100%; width: 250px; background-color: #444; background-image: url('../images/files-arrow.gif'); background-repeat: no-repeat; background-position: 100% 50%; overflow: hidden; z-index: 1;
+.files {position: absolute; display: inline-block; top: 0; left: 0; height: 100%; width: 250px; background-color: #444; background-image: url('../images/files-arrow.png'); background-repeat: no-repeat; background-position: 100% 50%; overflow: hidden; z-index: 1;
 	box-shadow: 0 0 10px 4px rgba(0,0,0,0.4);
 }
 .files .account {display: inline-block; height: 50px; width: 250px; margin-top: 40px; background-color: #888}
@@ -85,6 +85,14 @@ h2 {font-size: 18px; font-weight: normal; color: #fff}
 .files .accountOptions {position: relative; height: 32px; width: 100%; margin-left: 15px; margin-top: 8px}
 .files .accountOptions div {display: inline-block; background: url('../images/file-manager-icons.png') 0 0 no-repeat; cursor: pointer}
 .files .accountPassword {position: relative; border: 0; background-color: #333; color: #fff; height: 18px; width: 140px; margin-left: 14px; margin-top: 16px}
+.files .accountOptions .save {width: 30px; height: 32px; opacity: 0.3}
+.files .accountOptions .open {width: 25px; height: 32px; background-position: -32px -3px; margin: 3px 0 0 7px; opacity: 0.3}
+.files .accountOptions .newFile {width: 15px; height: 16px; background-position: -64px 0; margin: 8px 0 0 10px; opacity: 0.3}
+.files .accountOptions .newFolder {width: 20px; height: 16px; background-position: -80px 0; margin: 8px 0 0 5px; opacity: 0.3}
+.files .accountOptions .delete {width: 16px; height: 16px; background-position: -100px 0; margin: 8px 0 0 5px; opacity: 0.3}
+.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 .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}
@@ -98,13 +106,13 @@ h2 {font-size: 18px; font-weight: normal; color: #fff}

 .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.gif'); 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: 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;
 	-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.gif'); 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 1px 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;}
--- a/lib/config.php
+++ b/lib/config.php
@@ -2,7 +2,7 @@
 $ICEcoder = array(
 "root"			=> "",
 "tabsIndent"		=> true,
-"checkUpdates"		=> false,
+"checkUpdates"		=> true,
 "openLastFiles"		=> true,
 "findFilesExclude"	=> array("_coder",".doc",".gif",".jpg",".jpeg",".pdf",".png",".swf",".xml",".zip"),
 "codeAssist"		=> true,
--- a/lib/multiple-results.php
+++ b/lib/multiple-results.php
@@ -108,7 +108,7 @@ if (startTab!=top.ICEcoder.selectedTab) {
 				}
 				if (!$rFile && !$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 X times</div>";
+					$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'])) {
 						$ret .= "<div class=\\\"replace\\\" id=\\\"replace\\\" onClick=\\\"replaceInFileSingle('".$fullPath."');this.style.display=\'none\'\\\">replace</div>";
 					};
--- a/lib/settings-screen.php
+++ b/lib/settings-screen.php
@@ -1,5 +1,4 @@
 <?php include("settings.php");?>
-
 <!DOCTYPE html>

 <html>
@@ -19,8 +18,15 @@

 <link rel="stylesheet" href="editor.css">
 <?php
-$themeArray = array("blackboard","cobalt","eclipse","elegant","erlang-dark","lesser-dark","monokai","neat","night","rubyblue","vibrant-ink","xq-dark");
-for ($i=0;$i<count($themeArray)-1;$i++) {
+$themeArray = array();
+$handle = opendir('../'.$ICEcoder["codeMirrorDir"].'/theme/');
+while (false !== ($file = readdir($handle))) {
+	if ($file !== "." && $file != "..") {
+		array_push($themeArray,basename($file,".css"));
+	}
+}
+sort($themeArray);
+for ($i=0;$i<count($themeArray);$i++) {
 	echo '<link rel="stylesheet" href="../'.$ICEcoder["codeMirrorDir"].'/theme/'.$themeArray[$i].'.css">'.PHP_EOL;
 }
 ?>
@@ -30,7 +36,7 @@ for ($i=0;$i<count($themeArray)-1;$i++) {

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

 	<p>
 	git:<br>
@@ -128,7 +134,7 @@ theme<br>
 <select onchange="selectTheme();showButton()" id="select" name="theme">
    <option<?php if ($ICEcoder["theme"]=="default") {echo ' selected';}; ?>>default</option>
 <?php
-for ($i=0;$i<count($themeArray)-1;$i++) {
+for ($i=0;$i<count($themeArray);$i++) {
 	$optionSelected = $ICEcoder["theme"]==$themeArray[$i] ? ' selected' : '';
 	echo '<option'.$optionSelected.'>'.$themeArray[$i].'</option>'.PHP_EOL;
 }
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -29,7 +29,7 @@ include($settingsFile);

 // Add ICEcoder settings to beginning of $ICEcoder array
 $ICEcoder = array(
-	"versionNo"		=> "v 0.8.3",
+	"versionNo"		=> "0.8.4",
 	"codeMirrorDir"		=> "CodeMirror-2.33",
 	"cMThisVer"		=> 2.33
 )+$ICEcoder;
@@ -46,14 +46,14 @@ if (isset($_POST["theme"]) && $_POST["theme"] && $_SESSION['userLevel'] == 10) {
 	$ICEcoder["tabsIndent"]			= $_POST['tabsIndent'] ? "true" : "false";
 	$ICEcoder["checkUpdates"]		= $_POST['checkUpdates'] ? "true" : "false";
 	$ICEcoder["openLastFiles"]		= $_POST['openLastFiles'] ? "true" : "false";
-	$ICEcoder["findFilesExclude"]		= 'array("'.str_replace(', ','","',strClean($_POST['findFilesExclude'])).'")';
+	$ICEcoder["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";
 	if ($_POST['accountPassword']!="")	{$ICEcoder["accountPassword"] = generateHash(strClean($_POST['accountPassword']));};
-	$ICEcoder["restrictedFiles"]		= 'array("'.str_replace(', ','","',strClean($_POST['restrictedFiles'])).'")';
-	$ICEcoder["bannedFiles"]		= 'array("'.str_replace(', ','","',strClean($_POST['bannedFiles'])).'")';
-	$ICEcoder["allowedIPs"]			= 'array("'.str_replace(', ','","',strClean($_POST['allowedIPs'])).'")';
+	$ICEcoder["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']);
@@ -76,7 +76,7 @@ if (isset($_POST["theme"]) && $_POST["theme"] && $_SESSION['userLevel'] == 10) {
 	// OK, now the config file has been updated, update our current session with new arrays
 	$settingsArray = array("findFilesExclude","restrictedFiles","bannedFiles","allowedIPs");
 	for ($i=0;$i<count($settingsArray);$i++) {
-		$_SESSION[$settingsArray[$i]] = $ICEcoder[$settingsArray[$i]] = explode(", ",strClean($_POST[$settingsArray[$i]]));
+		$_SESSION[$settingsArray[$i]] = $ICEcoder[$settingsArray[$i]] = explode(",",str_replace(" ","",strClean($_POST[$settingsArray[$i]])));
 	}
 	// Work out the theme to use now
 	$ICEcoder["theme"]=="default" ? $themeURL = 'lib/editor.css' : $themeURL = $ICEcoder["codeMirrorDir"].'/theme/'.$ICEcoder["theme"].'.css';
@@ -227,7 +227,7 @@ if ($ICEcoder["accountPassword"] == "" && isset($_GET['settings'])) {
 		<div class="screenVCenter">
 			<div class="screenCenter">
 			<img src="../images/ice-coder.png">
-			<div class="version"><?php echo $ICEcoder["versionNo"];?></div>
+			<div class="version">v <?php echo $ICEcoder["versionNo"];?></div>
 			<form name="settingsUpdate" action="../" method="POST">
 			<input type="password" name="accountPassword" class="accountPassword">
 			<input type="submit" name="submit" value="Set Password" class="button">
--- a/plugins/ice-repo/ice-repo.css
+++ b/plugins/ice-repo/ice-repo.css
@@ -36,7 +36,7 @@ textarea, input {font-family: arial, verdana, helvetica, sans-serif; padding: 4p

 .row {position: relative; display: inline-block; background: #ccc; color: #000; width: 880px; padding: 10px 7px; margin-bottom: 2px; cursor: pointer; padding-left: 35px}
 .row:hover {background: #888; color: #fff}
-.row .icon {display: inline-block; width: 16px; height: 16px; margin-right: 7px; background-image:url(images/file-folder-icons.png); background-repeat: no-repeat}
+.row .icon {display: inline-block; width: 16px; height: 16px; margin-right: 7px; background-image:url('../../images/file-folder-icons.png'); background-repeat: no-repeat}
 .row .checkbox {position: absolute; display: inline-block; height: 38px; width: 30px; top: -4px; left: 0px}
 .rowContent {position: relative; display: none; background: #eee; width: 100%; height: 300px; padding: 7px; margin-bottom: 10px; overflow: auto}
 .pullGithub {position: absolute; display: inline-block; top: 7px; left: 822px; padding: 5px; background: #bbb; color: #444; font-size: 10px; cursor: pointer}
@@ -48,26 +48,27 @@ textarea, input {font-family: arial, verdana, helvetica, sans-serif; padding: 4p
 .infoPane {position: fixed; width: 270px; height: 100px; left: 960px; top: 340px; padding: 20px 10px 10px 10px; z-index: 100}

 /* Folder */
-.ext-folder {background-position: -16px 0}
+.ext-folder {background-position: 0 0}

 /* Additional file types */
-.ext-coffee {background-position: -32px 0}
-.ext-css {background-position: -48px 0}
-.ext-gif {background-position: -64px 0}
-.ext-htm {background-position: -80px 0}
-.ext-html {background-position: -80px 0}
-.ext-jpg {background-position: -96px 0}
-.ext-jpeg {background-position: -96px 0}
-.ext-js {background-position: -112px 0}
-.ext-less {background-position: -128px 0}
-.ext-php {background-position: -144px 0}
-.ext-png {background-position: -160px 0}
-.ext-rb {background-position: -176px 0}
-.ext-rbx {background-position: -176px 0}
-.ext-rhtml {background-position: -176px 0}
-.ext-ruby {background-position: -176px 0}
-.ext-txt {background-position: -192px 0}
-.ext-zip {background-position: -208px 0}
+.ext-coffee {background-position: -48px 0}
+.ext-css {background-position: -64px 0}
+.ext-gif {background-position: -80px 0}
+.ext-htm {background-position: -96px 0}
+.ext-html {background-position: -96px 0}
+.ext-jpg {background-position: -112px 0}
+.ext-jpeg {background-position: -112px 0}
+.ext-js {background-position: -128px 0}
+.ext-less {background-position: -144px 0}
+.ext-php {background-position: -160px 0}
+.ext-png {background-position: -176px 0}
+.ext-rb {background-position: -192px 0}
+.ext-rbx {background-position: -192px 0}
+.ext-rhtml {background-position: -192px 0}
+.ext-ruby {background-position: -192px 0}
+.ext-txt {background-position: -208px 0}
+.ext-zip {background-position: -224px 0}
+.ext-file {background-position: -32px 0}

 table.diff {color: #888; border: 0; white-space: pre-wrap}
 table.diff tbody th {color:#888; font-size: 11px; font-weight: normal; padding: 2px; vertical-align:top}
--- a/plugins/ice-repo/ice-repo.js
+++ b/plugins/ice-repo/ice-repo.js
--- a/plugins/ice-repo/images/file-folder-icons.png
+++ b/plugins/ice-repo/images/file-folder-icons.png
--- a/plugins/zip-it/index.php
+++ b/plugins/zip-it/index.php
@@ -1,6 +1,6 @@
 <?php
 // -----------------------------------------------
-// Zip-It! for ICEcoder v0.9.4 by Matt Pass
+// Zip-It! for ICEcoder v0.9.5 by Matt Pass
 // Will backup requested files/folders in ICEcoder
 // and remove old backups older than $keepLastDays
 // -----------------------------------------------
@@ -13,12 +13,12 @@ include("../../lib/settings.php");
 </head>
 <body>
 <?
-$zipItSaveLocation = '../../backups/';
-if ($_GET['zip']=="|") {$zipItFileName = "root";} else {$zipItFileName = str_replace("|","_",strClean($_GET['zip']));};
-$zipItFileName .= '-'.time().'.zip';
+$saveLocation = '../../backups/';
+$_GET['zip']=="|" ? $fileName = "root" : $fileName = str_replace("|","_",strClean($_GET['zip']));
+$fileName .= '-'.time().'.zip';
 $keepLastDays = 7;

-if (!is_dir($zipItSaveLocation)) {mkdir($zipItSaveLocation, 0777);}
+if (!is_dir($saveLocation)) {mkdir($saveLocation, 0777);}
 Class zipIt {
 	public function zipFilesUp($zipDir,$zipFile,$keepLastDays,$docRoot) {
 		$zipName = $zipDir.$zipFile;
@@ -77,14 +77,14 @@ Class zipIt {
 	}
 }
 if($_SESSION['userLevel']==10) {
-	$zipItDoZip = new zipIt();
+	$doZip = new zipIt();
 	echo '<script>top.ICEcoder.serverMessage("<b>Zipping Files</b>");</script>';
-	$zipItAddToZip = $zipItDoZip->zipFilesUp($zipItSaveLocation,$zipItFileName,$keepLastDays,$docRoot);
-	if (!$zipItAddToZip) {
-		echo '<script>top.ICEcoder.message("Could not zip files up!");</script>';
-	} else {
-		echo '<script>setTimeout(function(){top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);},500);</script>';
-	}
+	$addToZip = $doZip->zipFilesUp($saveLocation,$fileName,$keepLastDays,$docRoot);
+	echo '<script>';
+	echo !$addToZip
+		? 'top.ICEcoder.message("Could not zip files up!");'
+		: 'setTimeout(function(){top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);},500);';
+	echo '</script>';
 }
 ?>
 </body>
Author	SHA1	Message	Date
Matt Pass	d8ff32f888	Version 0.8.4	2012-09-09 17:04:52 +01:00
Matt Pass	d0315891b7	UTF-8, ternary switching & condensing code Added UTF-8 charset metatag Ternary switching instead of if else Condensing 2 if statements into 1 Removed old commented line	2012-09-09 17:03:40 +01:00
Matt Pass	a796dc2376	Condensing & improving code Simplifying & condensing code in a number of areas Checking for changed content using indexOf showFileMenu function to handle continuing to show file menu (used when moving mouse over options to stop it dissapearing) Condensing multiple <?php ?> blocks File manager icons now using classes rather than inline styles Ternary if condition	2012-09-09 16:45:37 +01:00
Matt Pass	eb4cc629a3	File manager icon classes added Instead of using inline styles	2012-09-09 16:39:57 +01:00
Matt Pass	280320ef9a	Now using ICEcoder iconset & default class Use ICEcoders default iconset to save 7kb Adjust all CSS BG positions to match this image now Add ext-file to handle default (unsupported) filetypes	2012-09-09 16:00:19 +01:00
Matt Pass	328ddeb46d	Beautify, define filetypes & use default Unminify for user readability, can uglify in production use Add fileTypesArray to define supported filetypes If we have a file without a supported filetype, use ext-file as default	2012-09-09 15:58:06 +01:00
Matt Pass	13df2cb182	Remove icons Using ICEcoder iconset now to save bytes	2012-09-09 15:50:44 +01:00
Matt Pass	bf73a03125	Simplify building up previousFiles Using implode to create CSV within JS array block Added 'v ' to title tag	2012-09-08 19:50:10 +01:00
Matt Pass	8c98e13984	Version number is now numeric only Removed 'v ' prefix from version number so it can be evaluated in conditions easier Hardcoded 'v ' before all places where the version number is shown No longer need to ltrim 'v ' from the version number	2012-09-08 19:34:25 +01:00
Matt Pass	c159e9326e	Now checks for updates by default	2012-09-08 19:23:43 +01:00
Matt Pass	662bd1188d	ltrimming 'v ' on version num, put back in Needed to leave the ltrimming of 'v ' from the version number, put back in	2012-09-08 19:23:22 +01:00
Matt Pass	b3e57075de	No longer trimming 'v ' & clearer syntax on cmv The latest version number doesn't have a 'v ' prefix now Altered the syntax when checking cmv to make it shorter & clearer	2012-09-08 19:08:18 +01:00
Matt Pass	c6a08896f0	Condensing code, UTF-8 and messages on load Check for IP address or * in array via in_array Shorten long vars to $icv and $cmv in checking for updates UTF-8 char set added to head $updateMsg set if there is a newer version and this triggered onload	2012-09-08 18:50:24 +01:00
Matt Pass	8cfe6b557c	Removing spaces from 4 x CSVs before use Before saving the values, remove spaces from CSV values provided by user Also covering the same thing in the 4 x session arrays & arrays that are created	2012-09-08 17:23:58 +01:00
Matt Pass	8ce1da9485	Shortening a few vars and 2 x if conditions	2012-09-08 17:15:17 +01:00
Matt Pass	c44b1689b3	Remove padlock to simplify look No longer showing padlock next to hidden files, looks cleaner & simpler	2012-09-08 15:09:43 +01:00
Matt Pass	dcf2571437	Show found instance count Now showing number of times our find string is found in a file	2012-09-08 15:05:30 +01:00
Matt Pass	c9aca08d4e	readdir created theme array, fix to for counter Instead of using a hardcoded array, we are now generating this from CSS files in the CodeMirror theme folder Need to count the array length, not 1 less than it (2 places)	2012-09-08 15:04:06 +01:00
Matt Pass	fe8486d456	Switching to use new filetypes files-arrow.gif now .png nav-bg-gif now .jpg x 2	2012-09-08 15:00:27 +01:00
Matt Pass	b31dc5fb16	Saved bytes by using a JPG instead of GIF	2012-09-08 14:59:11 +01:00
Matt Pass	160ee475fd	Removed, no longer wanted next to files	2012-09-08 14:58:20 +01:00
Matt Pass	dca9e6a88a	GIF now a PNG to save bytes, also more subtle Mid-grey instead of white	2012-09-08 14:57:11 +01:00
Matt Pass	4172f7d157	Don't like this theme, removed	2012-09-08 14:56:06 +01:00
Matt Pass	7a2275b3fb	Resaved as web version, smaller	2012-09-08 14:55:18 +01:00
Matt Pass	76ac21a92d	info now readme, better & shorter description	2012-09-08 14:54:46 +01:00
Matt Pass	f21012202f	Removed file, not needed Don't need to include this in ICEcoder really	2012-09-08 14:54:08 +01:00
				`@@ -1 +0,0 @@`
				`Backups are stored in this folder every 10 mins by default`