Version no update to v0.7.2

Changed content indicator in tab doesn't count if undo history is back
to the start
File highlighting now visually linked with the tabs of open docs
Selected file have blue BG, other open files 15% white BG
lastOpenedFiles now previousFiles in a few places

editor.php

@@ -40,30 +40,46 @@ span.CodeMirror-matchhighlight {background: #555}
 
 <div style="margin: 32px 43px; font-family: arial; font-size: 10px; color: #dddddd">
 <?php if($_SESSION['userLevel'] == 10) {
+	echo '<div style="float: left; margin-right: 50px">'.PHP_EOL;
 	echo '<h2 style="color: rgba(0,198,255,0.7)">server</h2>'.PHP_EOL;
-	echo '<span style="color:#888">Server name:</span><br>'.PHP_EOL;
-	echo $_SERVER['SERVER_NAME'].'<br><br>'.PHP_EOL;
-	echo '<span style="color:#888">Server OS:</span><br>'.PHP_EOL;
-	echo $_SERVER['SERVER_SOFTWARE'].'<br><br>'.PHP_EOL;
-	echo '<span style="color:#888">Server IP:</span><br>'.PHP_EOL;
-	echo $_SERVER['SERVER_ADDR'].'<br><br>'.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 $_SERVER['DOCUMENT_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">File & folder count:</span><br>'.PHP_EOL;
-	echo '<div id="fileFolderCounts"></div><br><br><br>'.PHP_EOL;
+	echo '<div id="fileFolderCounts"></div><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;
 
+	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;
+	echo str_replace("|","/",str_replace(",","<br>",$last10Files)).'<br><br><br>'.PHP_EOL;
+	echo '</div>'.PHP_EOL;
+
+	echo '<div style="clear: both">'.PHP_EOL;
 	echo '<h2 style="color: rgba(0,198,255,0.7)">your device</h2>'.PHP_EOL;
 	echo '<span style="color:#888">Browser:</span><br>'.PHP_EOL;
 	echo $_SERVER['HTTP_USER_AGENT'].'<br><br>'.PHP_EOL;
 	echo '<span style="color:#888">Your IP:</span><br>'.PHP_EOL;
-	echo $_SERVER['REMOTE_ADDR'].'<br><br><br>'.PHP_EOL;
-
-	echo '<h2 style="color: rgba(0,198,255,0.7)">general</h2>'.PHP_EOL;
-	echo '<span style="color:#888">Date & time:</span><br>'.PHP_EOL;
-	echo date("D jS M Y g:i:sa").'<br><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+=1000)+'').split(' '),
+	d=s[2]*1,
+	t=s[4].split(':'),
+	p=t[0]>11?'pm':'am',
+	e=d%20==1|d==31?'st':d%20==2?'nd':d%20==3?'rd':'th';
+	t[0]=--t[0]%12+1;
+	document.getElementById('serverDT').innerHTML=[s[0],d+e,s[1],s[3],t.join(':')+p].join(' ');
+},1000);
+</script>
 </div>
 
 <script>

index.php

@@ -43,9 +43,9 @@ window.onbeforeunload = function() {
 	}
 }
 
-lastOpenFiles = [<?php
-	if ($lastOpenedFiles!="" && $_SESSION['userLevel'] == 10) {
-		$openFilesArray = explode(",",$lastOpenedFiles);
+previousFiles = [<?php
+	if ($previousFiles!="" && $_SESSION['userLevel'] == 10) {
+		$openFilesArray = explode(",",$previousFiles);
 		for ($i=0;$i<count($openFilesArray);$i++) {
 			echo "'".$openFilesArray[$i]."'";
 			if ($i<count($openFilesArray)-1) {echo ",";};

lib/coder.js

@@ -369,13 +369,18 @@ var ICEcoder = {
 
 	// Reset all tabs to be without a highlight and then highlight the selected
 	redoTabHighlight: function(selectedTab) {
-		var bgVPos, tColor;
+		var cM, bgVPos, tColor, fileLink;
 
+		cM = ICEcoder.getcMInstance();
 		for(var i=1;i<=ICEcoder.changedContent.length;i++) {
 			if (document.getElementById('closeTabButton'+i)) {
-				ICEcoder.changedContent[i-1]==1 ? document.getElementById('closeTabButton'+i).style.backgroundColor = "#b00" : document.getElementById('closeTabButton'+i).style.backgroundColor = "rgba(255,255,255,0.3)";
+				ICEcoder.changedContent[i-1]==1 && cM.historySize().undo>0 ? document.getElementById('closeTabButton'+i).style.backgroundColor = "#b00" : document.getElementById('closeTabButton'+i).style.backgroundColor = "rgba(255,255,255,0.3)";
 			}
 			i==selectedTab ? tColor = "#000" : tColor = "#fff";
+			if ("undefined" != typeof top.ICEcoder.openFiles[i-1] && top.ICEcoder.openFiles[i-1] != "/[NEW]") {
+				fileLink = top.ICEcoder.filesFrame.contentWindow.document.getElementById(top.ICEcoder.openFiles[i-1].replace(/\//g,"|"));
+				i==selectedTab ? fileLink.style.backgroundColor = "#4499dd" : fileLink.style.backgroundColor = "rgba(255,255,255,0.15)";
+			}
 			document.getElementById('tab'+i).style.color = tColor;
 			i==selectedTab ? bgVPos = -22 : bgVPos = 0;
 			document.getElementById('tab'+i).style.backgroundPosition = "0 "+bgVPos+"px";
@@ -422,7 +427,7 @@ var ICEcoder = {
 		// Add a new value ready to indicate if this content has been changed
 		top.ICEcoder.changedContent.push(0);
 
-		top.ICEcoder.setLastOpenedFiles();
+		top.ICEcoder.setPreviousFiles();
 	},
 
 	// Create a new tab for a file
@@ -565,7 +570,7 @@ var ICEcoder = {
 			top.ICEcoder.changedContent.splice(closeTabNum-1,1);
 			top.parent.ICEcoder.redoTabHighlight(ICEcoder.selectedTab);
 
-			top.ICEcoder.setLastOpenedFiles();
+			top.ICEcoder.setPreviousFiles();
 		}
 		// Lastly, stop it from trying to also switch tab
 		top.ICEcoder.canSwitchTabs=false;
@@ -693,7 +698,19 @@ var ICEcoder = {
 
 	// Select or deselect file
 	selectDeselectFile: function(action,file) {
-		action == "select" ? file.style.backgroundColor="#888" : file.style.backgroundColor="transparent";
+		var isOpen;
+
+		top.ICEcoder.openFiles.indexOf(file.id.replace(/\|/g,"/")) > -1 ? isOpen = true : isOpen = false;
+
+		if (top.ICEcoder.openFiles[top.ICEcoder.selectedTab-1] == file.id.replace(/\|/g,"/")) {
+			file.style.backgroundColor="#4499dd";
+		} else {
+			if (action=="select") {
+				file.style.backgroundColor="#888";
+			} else {
+				isOpen ? file.style.backgroundColor = "rgba(255,255,255,0.15)" : file.style.backgroundColor="transparent";
+			}
+		}
 		action == "select" ? file.style.color="#fff" : file.style.color="#eee";
 	},
 
@@ -789,7 +806,7 @@ var ICEcoder = {
 		top.ICEcoder.serverQueue("add","lib/file-control.php?action=rename&file="+renamedFile+"&oldFileName="+top.ICEcoder.rightClickedFile.replace(/\|/g,"/"));
 		top.ICEcoder.serverMessage('<b>Renaming to</b><br>'+renamedFile);
 
-		top.ICEcoder.setLastOpenedFiles();
+		top.ICEcoder.setPreviousFiles();
 		}
 	},
 
@@ -1392,27 +1409,27 @@ var ICEcoder = {
 		top.ICEcoder.dontSelect = true;
 	},
 
-	// Set the current lastOpenedFiles in the settings file
-	setLastOpenedFiles: function() {
-		var lastOpenedFiles;
+	// Set the current previousFiles in the settings file
+	setPreviousFiles: function() {
+		var previousFiles;
 
-		lastOpenedFiles = "";
+		previousFiles = "";
 		// Generate a comma seperated list
 		for (var i=0;i<top.ICEcoder.openFiles.length;i++) {
 			if (top.ICEcoder.openFiles[i]!="" && top.ICEcoder.openFiles[i].indexOf("[NEW]")==-1) {
-				lastOpenedFiles += top.ICEcoder.openFiles[i].replace(/\//g,"|");
-				if (i<top.ICEcoder.openFiles.length-1) {lastOpenedFiles += ","};
+				previousFiles += top.ICEcoder.openFiles[i].replace(/\//g,"|");
+				if (i<top.ICEcoder.openFiles.length-1) {previousFiles += ","};
 			}
 		}
-		if (lastOpenedFiles=="") {lastOpenedFiles="CLEAR"};
+		if (previousFiles=="") {previousFiles="CLEAR"};
 		// Then send through to the settings page to update setting
-		top.ICEcoder.serverQueue("add","lib/settings.php?saveFiles="+lastOpenedFiles);
+		top.ICEcoder.serverQueue("add","lib/settings.php?saveFiles="+previousFiles);
 	},
 
 	// Opens the last files we had open
 	autoOpenFiles: function() {
-		for (var i=0;i<=top.lastOpenFiles.length-1;i++) {
-			top.ICEcoder.rightClickedFile=top.ICEcoder.thisFileFolderLink=top.fullPath+top.lastOpenFiles[i].replace('|','/');
+		for (var i=0;i<=top.previousFiles.length-1;i++) {
+			top.ICEcoder.rightClickedFile=top.ICEcoder.thisFileFolderLink=top.fullPath+top.previousFiles[i].replace('|','/');
 			top.ICEcoder.thisFileFolderType='file';
 			top.ICEcoder.openFile();
 		}

lib/config.php

@@ -1,5 +1,5 @@
 <?php
-$versionNo		= "v 0.7.1";
+$versionNo		= "v 0.7.2";
 $codeMirrorDir		= "CodeMirror-2.25";
 $cMThisVer		= 2.25;
 $tabsIndent		= true;
@@ -19,5 +19,6 @@ $plugins		= array(
 			array("Backup","images/backup-open-files.png","margin-top: 3px","plugins/backupOpenFiles/index.php","fileControl:<b>Zipping Open Files</b>","10")
 			);
 $theme			= "default";
-$lastOpenedFiles	= "";
+$previousFiles		= "";
+$last10Files		= "";
 ?>

lib/settings.php

@@ -19,9 +19,9 @@ include("config.php");
 if (isset($_POST["theme"]) && $_POST["theme"] && $_SESSION['userLevel'] == 10) {
 	$settingsFile = 'config.php';
 	$settingsContents = file_get_contents($settingsFile);
-	// Replace our lastOpenedFiles var with the the current
+	// Replace our settings vars
 	$repPosStart = strpos($settingsContents,'$tabsIndent');
-	$repPosEnd = strpos($settingsContents,'$lastOpenedFiles');
+	$repPosEnd = strpos($settingsContents,'$previousFiles');
 
 	// Prepare all our vars
 	if ($_POST['tabsIndent'])		{$tabsIndent = "true";} else {$tabsIndent = "false";};
@@ -77,14 +77,32 @@ if (isset($_GET["saveFiles"]) && $_GET['saveFiles']) {
 	if ($_SESSION['userLevel'] == 10) {
 		$settingsFile = 'config.php';
 		$settingsContents = file_get_contents($settingsFile);
-		// Replace our lastOpenedFiles var with the the current
-		$repPosStart = strpos($settingsContents,'lastOpenedFiles	= "')+19;
+
+		// Replace our previousFiles var with the the current
+		$repPosStart = strpos($settingsContents,'previousFiles		= "')+18;
 		$repPosEnd = strpos($settingsContents,'";',$repPosStart)-$repPosStart;
 		if ($_GET['saveFiles']!="CLEAR") {$saveFiles=$_GET['saveFiles'];} else {$saveFiles="";};
-		$settingsContents = substr($settingsContents,0,$repPosStart).$saveFiles.substr($settingsContents,($repPosStart+$repPosEnd),strlen($settingsContents));
+		$settingsContents1 = 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/config.php");
-		fwrite($fh, $settingsContents);
+		fwrite($fh, $settingsContents1);
+
+		// Update our top10Files var?
+		$saveFilesArray = explode(",",$saveFiles);
+		$last10FilesArray = explode(",",$last10Files);
+		for ($i=0;$i<count($saveFilesArray);$i++) {
+			$inLast10Files = in_array($saveFilesArray[$i],$last10FilesArray);
+			if (!$inLast10Files && $saveFilesArray[$i] !="") {
+				$repPosStart = strpos($settingsContents1,'last10Files		= "')+16;
+				$repPosEnd = strpos($settingsContents1,'";',$repPosStart)-$repPosStart;
+				if ($last10Files!="") {$commaExtra=",";} else {$commaExtra="";};
+				if (count($last10FilesArray)>=10) {$last10Files=substr($last10Files,0,strrpos($last10Files,','));};
+				$settingsContents2 = substr($settingsContents1,0,$repPosStart).$saveFilesArray[$i].$commaExtra.$last10Files.substr($settingsContents1,($repPosStart+$repPosEnd),strlen($settingsContents1));
+				// Now update the config file
+				$fh = fopen($settingsFile, 'w') or die("Can't update config file. Please set public write permissions on lib/config.php");
+				fwrite($fh, $settingsContents2);
+			}
+		}
 		fclose($fh);
 	}
 	echo '<script>top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);</script>';