v1.0.0

Removed beta tag
Don't need key, simplify setting changedContent
2026-03-16 05:17:01 +01:00 · 2012-10-23 20:22:13 +01:00 · 2012-10-23 20:21:39 +01:00 · 2012-10-23 20:00:18 +01:00 · 2012-10-23 18:28:25 +01:00 · 2012-10-23 18:17:30 +01:00
15 changed files with 1507 additions and 1518 deletions
--- a/README.md
+++ b/README.md
@@ -3,6 +3,8 @@

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

+<img src="http://icecoder.net/images/ice-coder-web-ide.jpg" alt="ICEcoder web IDE">
+
 ###Features you'd expect
 * Context aware code highlighting
 * Supports HTML, CSS, LESS, JavaScript, CoffeeScript, PHP & Ruby
@@ -35,6 +37,7 @@ Early version of the web based IDE which allows for creation of websites in the
 * Colour preview block on CSS colours, ie red, #f00 or  RGBA(255,0,0,0.5)
 * MySQL Database management via Adminer plugin
 * Backs up files every 10 mins or on click of backup plugin icon
+* Github repo syncing with ICErepo plugin

 ###Installation

--- a/editor.php
+++ b/editor.php
@@ -35,7 +35,7 @@ span.CodeMirror-matchhighlight {background: #555}
 	<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; <?php echo $_SERVER['SERVER_SOFTWARE'];?> &nbsp;&nbsp; <?php echo $_SERVER['SERVER_ADDR'];?><br><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>
@@ -92,16 +92,16 @@ span.CodeMirror-matchhighlight {background: #555}
 <script>
 function createNewCMInstance(num) {
 	var fileName = top.ICEcoder.openFiles[top.ICEcoder.selectedTab-1];
-	top.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.foldStyle);
-	var codeFoldBrace = CodeMirror.newFoldFunction(CodeMirror.braceRangeFinder,top.foldStyle);
+	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,
+		indentUnit: top.ICEcoder.tabWidth,
+		tabSize: top.ICEcoder.tabWidth,
 		indentWithTabs: true,
 		electricChars: false,
 		onCursorActivity: function(thisCM) {
@@ -139,10 +139,8 @@ function createNewCMInstance(num) {
 			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]) {
+				if (top.ICEcoder.tagString!="script" && top.ICEcoder.tagNestExceptions.indexOf(top.ICEcoder.tagString)>-1) {
 					canDoEndTag=false;
-					}
 				}
 				if	(
 					top.ICEcoder.tagString.slice(0,1)=="/"||
@@ -177,7 +175,7 @@ function createNewCMInstance(num) {
 		},
 		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.tabsIndent ? "defaultTab" : "insertTab"](cm);},
+			"Tab": function(cm) {CodeMirror.commands[top.ICEcoder.tabsIndent ? "defaultTab" : "insertTab"](cm);},
 			"Shift-Tab": "indentLess",
 			"Ctrl-Up": function() {},
 			"Ctrl-Down": function() {}
--- a/favicon.png
+++ b/favicon.png
--- a/files.php
+++ b/files.php
@@ -5,7 +5,7 @@
 <head>
 <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);">
--- a/index.php
+++ b/index.php
@@ -1,23 +1,17 @@
-<?php
-include("lib/settings.php");
+<?php include("lib/settings.php");

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

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

 window.onbeforeunload = function() {
@@ -42,20 +33,26 @@ 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>
-
-<body onLoad="ICEcoder.init()<?php echo $updateMsg.$onLoadExtras;?>" onResize="ICEcoder.setLayout()" onKeyDown="return ICEcoder.interceptKeys('coder',event);" onKeyUp="parent.ICEcoder.resetKeys(event);">
+	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);">

 <div id="blackMask" class="blackMask" onClick="ICEcoder.showHide('hide',this)" onContextMenu="return false">
 	<div class="popupVCenter">
@@ -76,16 +73,16 @@ showFileMenu = function() {

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

 <div id="header" class="header" onContextMenu="return false">
--- a/lib/file-control.php
+++ b/lib/file-control.php
@@ -1,6 +1,7 @@
 <?php include("settings.php");?>
 <?php
 // Get the save type if any
+$saveType = "";
 if (isset($_GET['saveType'])) {$saveType = strClean($_GET['saveType']);};

 // Establish the filename/new filename
@@ -97,7 +98,7 @@ if ($_GET['action']=="perms") {

 // 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])) {
 			is_dir($iceRoot.$filesArray[$i])
@@ -147,7 +148,7 @@ if ($_GET['action']=="save") {
 					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>';
--- a/lib/help.php
+++ b/lib/help.php
@@ -3,7 +3,7 @@

 <html>
 <head>
-<title>ICE Coder <?php echo $ICEcoder["versionNo"];?> help</title>
+<title>ICEcoder <?php echo $ICEcoder["versionNo"];?> help</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <link rel="stylesheet" type="text/css" href="help.css">
 </head>
--- a/lib/ice-coder.css
+++ b/lib/ice-coder.css
@@ -86,7 +86,7 @@ h2 {font-size: 18px; font-weight: normal; color: #fff}
 .files .accountOptions .rename {width: 16px; height: 16px; background-position: -116px 0; margin: 8px 0 0 5px; opacity: 0.3}
 .files .accountOptions .view {width: 16px; height: 16px; background-position: -132px 0; margin: 8px 0 0 5px; opacity: 0.3}
 .files .accountOptions .lock {position: relative; margin-left: 208px; margin-top: -27px; width: 12px; height: 16px; background-position: -64px -16px; z-index: 1}
-.files input:focus, .findReplace input:focus, .findReplace select:focus, .accountPassword:focus {outline: none; box-shadow: 0 0 10px 1px rgba(0,198,255,0.7)}
+.files input:focus, .findReplace input:focus, .findReplace select:focus, .accountPassword:focus {outline: none; box-shadow: 0 0 10px 1px rgba(0,198,255,1)}
 .files .button {position: absolute; border: 0; background: #444; color: #eee; height:20px; margin-top: 16px; margin-left: 5px; font-size: 11px; cursor: pointer}
 .files .button:hover {background-color: #222; color: #eee}
 .files .frame {display: inline-block; width: 250px}
@@ -121,7 +121,8 @@ h2 {font-size: 18px; font-weight: normal; color: #fff}
 .findBar .codeAssist input {margin-top: -1px}
 .findBar .goLine {position: fixed; display: inline-block; width: 100px; right: -10px; top: 70px; height: 21px; font-size: 10px; z-index: 1}
 .goLine .goToLine {width: 25px; height: 16px; border: 0; font-size: 10px; margin: -3px 0 0 3px}
-.editor .code {position: relative; display: inline-block; top: 28px; width: 600px; height: 600px}
+.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}
@@ -141,4 +142,4 @@ h2 {font-size: 18px; font-weight: normal; color: #fff}
 .screenCenter .version {position: relative; display: block; margin: 5px 0 15px 0; font-size: 10px; color: #bbb}
 .screenCenter .accountPassword {border: 0; background-color: #333; color: #fff; height: 20px}
 .screenCenter .button {border: 0; background: #444; color: #eee; height: 22px; cursor: pointer}
-.screenCenter .button:hover {background-color: #333; color: #eee}
+.screenCenter .button:hover {background-color: #2187e7; color: #eee}
--- a/lib/ice-coder.js
+++ b/lib/ice-coder.js
--- a/lib/multiple-results.php
+++ b/lib/multiple-results.php
@@ -77,7 +77,7 @@ if (startTab!=top.ICEcoder.selectedTab) {
 					}
 				}
 				if (userTarget.indexOf("all")>-1 || (userTarget.indexOf("selected")>-1 && foundInSelected)) {
-					resultsDisplay += '<a href="javascript:top.ICEcoder.openFile(\'<?php echo $docRoot;?>'+targetURL.replace(/\|/g,"/").replace(/_perms/g,"")+'\');top.ICEcoder.showHide(\'hide\',top.document.getElementById(\'blackMask\'))">'+ targetURL.replace(/\|/g,"/").replace(/_perms/g,"").replace(/<?php echo str_replace("/","\/",$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>';
+					resultsDisplay += '<a href="javascript:top.ICEcoder.openFile(\'<?php echo $docRoot;?>'+targetURL.replace(/\|/g,"/").replace(/_perms/g,"")+'\');top.ICEcoder.showHide(\'hide\',top.document.getElementById(\'blackMask\'))">'+ targetURL.replace(/\|/g,"/").replace(/_perms/g,"").replace(/<?php echo str_replace("/","\/",$findText); ?>/g,"<b>"+findText+"</b>")+ '</a><br><div id="foundCount'+i+'">'+spansArray[i].innerHTML+', rename to '+targetURL.replace(/\|/g,"/").replace(/_perms/g,"").replace(/<?php echo str_replace("/","\/",$findText); ?>/g,"<b><?php if(isset($_GET['replace'])) {echo strClean($_GET['replace']);};?></b>")+'</div>';
 					<?php if (isset($_GET['replace'])) { ?>
 					resultsDisplay += '<div class="replace" id="replace" onClick="renameSingle('+i+');this.style.display=\'none\'">rename</div>';
 					<?php ;}; ?>
@@ -92,9 +92,11 @@ 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;
@@ -120,7 +122,7 @@ 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
@@ -160,7 +162,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() {
@@ -172,7 +174,7 @@ var replaceInFilesAll = function() {

 var renameSingle = function(arrayRef) {
 	fileRef = spansArray[arrayRef].id.replace(/\|/g,"/").replace(/_perms/g,"");
-	newName = spansArray[arrayRef].id.replace(/\|/g,"/").replace(/_perms/g,"").replace(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);
 }

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

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

 <body class="properties">
--- a/lib/settings-screen.php
+++ b/lib/settings-screen.php
@@ -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>
@@ -162,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"];?>"
 	});
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -1,4 +1,8 @@
 <?php
+ini_set('display_errors', 1);
+ini_set('log_errors', 1);
+ini_set('error_log', dirname(__FILE__).'/../error_log.txt');
+error_reporting(-1);
 // Start a session if we haven't already
 if(!isset($_SESSION)) {session_start();}

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

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

+$onLoadExtras = "";
+$pluginsDisplay = "";
+
 // Update this config file?
-if ($_SESSION['loggedIn'] && isset($_POST["theme"]) && $_POST["theme"]) {
+if (isset($_SESSION['loggedIn']) && $_SESSION['loggedIn'] && isset($_POST["theme"]) && $_POST["theme"]) {
 	$settingsContents = file_get_contents($settingsFile);
 	// Replace our settings vars
 	$repPosStart = strpos($settingsContents,'"root"');
@@ -43,13 +49,13 @@ 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["bannedFiles"]		= 'array("'.str_replace(',','","',str_replace(" ","",strClean($_POST['bannedFiles']))).'")';
 	$ICEcoder["allowedIPs"]			= 'array("'.str_replace(',','","',str_replace(" ","",strClean($_POST['allowedIPs']))).'")';
@@ -91,7 +97,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']) {
@@ -198,6 +204,9 @@ if ($_SESSION['loggedIn']) {
 		</script>
 		<?php
 	}
+
+	// Finally, show server data
+	$onLoadExtras .= ";top.ICEcoder.content.style.visibility='visible'";
 }

 // If we're due to show the settings screen
@@ -227,7 +236,8 @@ if (!$_SESSION['loggedIn']) {
 echo $ICEcoder["versionNo"]." : ";
 echo $ICEcoder["accountPassword"] == "" ? "Setup" : "Login";
 ?></title>
-<link rel="stylesheet" type="text/css" href="coder.css">
+<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()">
--- a/plugins/ice-repo/icon.png
+++ b/plugins/ice-repo/icon.png
Author	SHA1	Message	Date
Matt Pass	4b274f959e	v1.0.0	2012-10-23 20:22:13 +01:00
Matt Pass	e66811a4e2	Removed beta tag	2012-10-23 20:21:39 +01:00
Matt Pass	139bfe775c	Don't need key, simplify setting changedContent	2012-10-23 20:00:18 +01:00
Matt Pass	feb26af4bf	Now logging errors in the root	2012-10-23 18:28:25 +01:00
Matt Pass	27d75f810a	setup vars & check post vars before use 'server_software' also needs to be a string	2012-10-23 18:17:30 +01:00
Matt Pass	bc251d8c2b	Var usage tweaks to avoid errors/notices Check replace exists then use Global & init vars ICEroot is actually iceRoot	2012-10-23 18:16:25 +01:00
Matt Pass	bde9010000	init saveType before use, split is now explode	2012-10-23 18:14:34 +01:00
Matt Pass	91314f423f	init updateMsg before use	2012-10-23 18:14:09 +01:00
Matt Pass	2bb0a361aa	Clear mouseDown state if over scrollbar Clicking on scrollbar to scroll content set the mouseDown state to true This wasn't being reset on mouse up and moving mouse pointer towards the edge of the file manager enabled resizing of width Now on going beyond editor width (-scrollbar of 20px), sets mouseDown to false	2012-10-23 15:57:50 +01:00
Matt Pass	5517bf80f9	Fixing close tab issue & changedContent setting When redoing changedContent values, no longer consider if these keys are being pressed: Escape (27), Caps Lock (20), Shift, CTRL, Alt, Pause/Break (16-19), Left, Up, Right, Down (37-40), Num Lock, Scroll Lock (144-145), Insert, Delete (45,46) <<-- mistake, Page Up, Page Down, End, Home (33-36), Left Win Key, Right Win Key (91-92), F1-F12 (112-123) This is because CM's changed event will not be triggered with these keys and I'm not calling onkeypress anymore Also, rather than now just setting and ending up being stuck at 1 (ie, changed), we're now detecting if we have at least 1 undo level, if so set to 1, otherwise 0 (This means you can make changes and undo back to the start and it doesn't count as a change) Because this is being handled on changedContent array, no longer need to consider undo level size when figuring out close button BG colour openFileMDTs were not being shuffled along when closing tabs but are now Fixed issue with string replacing closeTabButtonX() - brackets not needed	2012-10-23 15:14:36 +01:00
Matt Pass	f141e6f7a7	cMThisVer removed, establishing via CM object now The version num is now being established from the CM object itself using the version method	2012-10-23 14:57:26 +01:00
Matt Pass	7220288460	No longer using hardcoded CM version num This is now being established using .version, which also indicates extra info (Such as '+' for post version updates included, 'beta' to signify that, etc)	2012-10-23 14:55:54 +01:00
Matt Pass	d9f4955736	No longer check if CodeMirror is latest version This is down to me to update upon new CM versions being released User wouldn't be interested and upgrading to newer version could cause complications It's also another check/dependency to slow things down/interfere Because of these reasons, I'm dropping this check	2012-10-23 14:54:26 +01:00
Matt Pass	13255bc58b	Clearing global vars theme, tabsIndent, openLastFiles, tabWidth, previousFiles, showFileMenu & foldStyle all now contained within ICEcoder object showFileMenu is a function to ensure file manager menu continues to show The few instances of i now have scope Initing the var fileName This is to reduce the number of global vars The only global vars should now be ICEcoder, docRoot & iceRoot	2012-10-20 23:52:36 +01:00
Matt Pass	2988de5501	v0.9.1 beta	2012-10-20 16:55:42 +01:00
Matt Pass	70a69f1c3b	stickyTabWindow now stickyTab Removed the flag variable stickyTab and stickyTabWindow now becomes this Saves excess vars	2012-10-20 16:44:55 +01:00
Matt Pass	7cce0bf865	Show screenshot of ICEcoder	2012-10-20 16:15:23 +01:00
Matt Pass	16e3e92c4a	Fullscreen icon now changing on event handler No longer detecting current image src and showing the opposite icon on click We're now changing the icon on screen change event handler	2012-10-20 16:14:56 +01:00
Matt Pass	5f1b78ea1d	Login screen button now blue on hover	2012-10-20 15:27:19 +01:00
Matt Pass	9f36a8e5f8	Favicon added and using ice-coder.js & .css	2012-10-09 08:22:56 +01:00
Matt Pass	89a2212408	JS src is ice-coder.js now	2012-10-09 08:22:19 +01:00
Matt Pass	9ed344d22d	Renamed to ice-coder.css and .js	2012-10-09 08:21:28 +01:00
Matt Pass	642db4c5b9	Renamed to properties.php & css	2012-10-09 07:57:28 +01:00
Matt Pass	2a93778df7	First sort of file into logical sections	2012-10-09 07:49:03 +01:00
Matt Pass	c11500b791	v0.9.0 alpha	2012-10-08 07:49:43 +01:00
Matt Pass	ee0303dc06	Code condensing pB var setup to avoid repeating long DOM elem refs again Removed end point from substr, not necessary Put 3 x themes into an array and test using indexOf instead Syntax spacing in a couple of areas	2012-10-08 07:37:08 +01:00
Matt Pass	0d55f3bd81	use showHide, fix availability bug & use regex use showHide function where possible Check file and fileName are available before using them Shorten code by setting in vars and reusing Syntax & comment simplification Use regex to work out previousFiles (also fixed comma prefix on string) Slight adjustment to for loop using less chars	2012-10-06 18:06:01 +01:00
Matt Pass	0e377c1aff	New regex for efficiency More specific regex used to ensure efficiency & speed are optimal Syntax spacing adjusts on couple of other lines	2012-10-06 15:43:23 +01:00
Matt Pass	388bd7cefa	Improved regex on CSS values Looks for hex, rgb/hsl-a or colour name values in their correct format Need match ? match[0] : '' to handle no match scenarios	2012-10-05 15:41:58 +01:00
Matt Pass	8234b3b063	newTab now innerLI & better cssColorPreview code newTab isn't a tab at all, it's inner contents of an LI, so now called innerLI 2nd insertBefore should be inserting newText not newLI again New code to get CSS values via regex Now only showing the preview if the caretLocType is CSS	2012-10-04 18:10:18 +01:00
Matt Pass	573a07026d	Simplifying and condensing code No need to return cM in getcMInstance, just return the ternary value Shortened a few comments for clarity & byte saving No need to add length as 2nd param on substrs in a couple of places newTab setup as string to be used in a couple of places Ternary shortening on elemType Converted ternary statement back to if else to byte save on 2 ternaries Reversing bool on codeAssist var by using ! instead break is shorter & better too, than increasing i's value to escape	2012-10-03 21:13:35 +01:00
Matt Pass	880e04d760	Anon objects & CM's searchCursor used, fixed nest Now just usage anonymous objects inline instead of creating for single use (saves adding extra vars and is less code) Removed findLen and replaceLen as only findLen was being used twice Replaced how we find & replace by using CM's searchcursor Fix to the selection on hover over nest items, doesn't need -1 (This is because I fixed CM's tagRangeFinder to include last line)	2012-10-03 19:39:11 +01:00
Matt Pass	683752762d	Fix to 1st line charCount & simplifying endPos.ch If our result is within the first line, add 1 to it to fix offset No need to have ternary case for replace all, this is now done with a regex	2012-10-03 08:03:51 +01:00
Matt Pass	79a78e0a58	Condensing and simplification Reducing code in many areas by condensing and simplifying	2012-10-02 07:56:05 +01:00
Matt Pass	c33bea997a	Lots of ternary & array check shortening Shorting to ternary statements instead of if else statements in many places Checking indexOf on arrays to condense code here too	2012-09-30 17:33:34 +01:00
Matt Pass	a2f8d9bc43	Combo moveLine function & code condensing moveLine(dir) func added as combo of moveLineUp and moveLineDown funcs Move initialising vars to start of func Used indexOf to check array for shortURL instead of for loop in 2 places Improving/removing a few comments Condensed code to now check if selectedFiles is empty or contains right clicked file and also condensed code to use indexOf on array instead of for loop Don't need foundFile because of this condensing Using ICEcoder ref for filesFrame and also showing dropdown higher up (next to mouse pointer/inline with file/folder name)	2012-09-30 16:24:03 +01:00
Matt Pass	80d717b4dc	Condensing code & new deselectAllFiles func Syntax format improvements on fileManager function selectFileFolder improvements: - Removed a load of vars we no longer need & new tgtFile var added - 2 x areas where we deselect files/folders now done via new function - tgtFile now avail to avoid duplicate setup - Other much more efficient and clearer processes setup to achieve same result New function added to deselect all files Ternary shortening on colouring of selected/deselected files & folders Swapped var order around	2012-09-30 14:55:59 +01:00
Matt Pass	e14a8df6a0	Check typeof parent and swap vars around Checking state.curState.context can cause issues is state.curState doesn't exist so just check state.curState instead Swapped a couple of vars round to match order of usage in func	2012-09-29 17:15:09 +01:00
Matt Pass	4be0067852	htmlTagArray defined in top settings now updateNestingIndicator now setup on a setInterval every 30 ms (This is due to timing issues and solves this without being noticable) Only if we have a context for the given tag build up the array If so, reset htmlTagArray and build up the array again This means we stick with the old array if we're in a script or style block (for example) Set the tagString to be the last item in the array If caretLocType is JS, set the tagString to script (This is because CodeMirror doesn't recognise this as a tag) updateNestingIndicator now works by: - checking if we have a cM instance and not in JS, Coffee etc filetypes - gets token information for the very end of the document - detects if it's className is an error or not to determin if the nesting is broken Fix to detecting the code type we're in as without -1, JavaScript is ignored as it's array item 0	2012-09-29 17:02:30 +01:00
Matt Pass	30a97ed4db	Using indexOf to check nestTagExceptions No need to use for loop here, instead use indexOf to check tagString is an array item within nestTagExceptions	2012-09-29 16:47:30 +01:00
Matt Pass	1257ed0174	New ICErepo logo Lost the standard Octocat logo in favour of this one	2012-09-29 11:43:19 +01:00
Matt Pass	c717dd7bba	Revised version to establish htmlTagArray Uses a method from Marijn Haverbeke to establish an array of nested tokens This means chars in the document don't need to be scanned and the array worked out in a more complex way It means quite a few lines can be condensed down to just 3 Also means it's far less expensive on the CPU, meaning there is no sluggishness onCursorActivity on large documents (ie typing etc)	2012-09-28 17:35:42 +01:00
Matt Pass	e0a7893578	Highlight line on moving up/down No longer setting the cursor ch position on moving line up/down Instead now highlighting the line that has been moved This is done via the new function highlightLine	2012-09-28 07:52:33 +01:00
Matt Pass	6df5adf0f1	Deselect file we're closing in the file manager	2012-09-27 18:07:11 +01:00
Matt Pass	7e773e5d0a	Go back to hiding code editor till loaded Shows as a white block until loaded, so go back to having it's visibility hidden until we're loaded and then show	2012-09-21 14:23:29 +01:00
Matt Pass	c3dbc4187f	Remove iceRoot from location & perms file path Clear iceRoot from the beginning of location (needed for when you set your own ICEroot), so it doesn't cause DOM ID issues/mismatches Also remove it from the file path passed through to file-control when changing perms when you have your own ICEroot and don't show in server message either	2012-09-21 14:22:14 +01:00
Matt Pass	6c004c3010	Remove ICEroot from path This is applied in file control and by not removing it we have 2 x dirs	2012-09-21 09:25:58 +01:00
Matt Pass	96054295a0	Condensing code in a few areas Reworked detecting if it's a JS, CoffeeScript, Ruby, CSS or LESS file by switching the indexOf around Also performed indexOf on an array rather than looking at each array item in a for loop Ternary shortening of code in a few areas	2012-09-20 18:15:20 +01:00
Matt Pass	640c0e9c4a	Input field glow updates Blue glow on input fields now set to 100% opacity, instead of 70%, was a bit weak before Also now showing on go to line input field	2012-09-20 09:41:21 +01:00
Matt Pass	ce04ef36da	setLayout on creating new tab Won't have height set on the editor instance otherwise	2012-09-20 09:29:16 +01:00
Matt Pass	677e90ed6b	Condensing PHP code into 1 echo	2012-09-20 09:25:16 +01:00