Version number update to v0.7.6

Fix to saving previousFiles & last10Files
Only saves files now if there are some (ie !="CLEAR")
2026-03-16 13:27:05 +01:00 · 2012-07-01 14:01:31 +01:00 · 2012-07-01 14:01:04 +01:00 · 2012-07-01 13:54:27 +01:00 · 2012-07-01 13:49:32 +01:00 · 2012-07-01 13:46:43 +01:00
12 changed files with 325 additions and 82 deletions
--- a/editor.php
+++ b/editor.php
@@ -24,8 +24,8 @@ if ($theme=="default") {
 .cm-s-visible {display: block; top: 0}
 .cm-s-hidden {display: none; top: 4000px}
 .cm-s-activeLine {background: #000 !important;}
-// Make sure this next one remains the 5th item, updated with JS
-.cm-tab:after {position: relative; display: inline-block; width: 0; left: -1.4em; overflow: visible; color: #aaa; content: "<?php if ($visibleTabs) {?>\21e5<?;};?>";}
+/* Make sure this next one remains the 5th item, updated with JS */
+.cm-tab:after {position: relative; display: inline-block; width: 0; left: -1.4em; overflow: visible; color: #aaa; content: "<?php if($visibleTabs) {echo '\\21e5';};?>";}
 span.CodeMirror-matchhighlight {background: #555}
 .CodeMirror-focused span.CodeMirror-matchhighlight {color: #000; background: #555; !important}
 </style>
@@ -146,7 +146,7 @@ function createNewCMInstance(num) {
 			if(top.ICEcoder.tagString.slice(0,1)=="/"||top.ICEcoder.tagString.slice(0,1)=="?") {
 				canDoEndTag=false;
 			}
-			if (!top.ICEcoder.codeAssist||fileName.indexOf(".js")>0||fileName.indexOf(".css")>0||fileName.indexOf(".less")>0) {
+			if (!top.ICEcoder.codeAssist||fileName && (fileName.indexOf(".js")>0||fileName.indexOf(".css")>0||fileName.indexOf(".less")>0)) {
 				canDoEndTag=false;
 			}
 			contentType = top.ICEcoder.caretLocType;
--- a/files.php
+++ b/files.php
@@ -53,8 +53,8 @@ function fileManager_dir($directory, $return_link, $first_call=true) {
 			$fileAtts = "";

 			if ($serverType=="Linux") {
-				$chmodInfo = substr(sprintf('%o', fileperms($link)), -4);
-				$fileAtts = '<span style="color: #888; font-size: 8px">'.$chmodInfo.'</span>';
+				$chmodInfo = substr(sprintf('%o', fileperms($link)), -3);
+				$fileAtts = '<span style="color: #888; font-size: 8px" id="|_perms">'.$chmodInfo.'</span>';
 			}
 			$fileManager = "<ul class=\"fileManager\">";
 			$fileManager .= "<li class=\"pft-directory\"><a href=\"#\" onMouseOver=\"top.ICEcoder.overFileFolder('folder','$link')\" onMouseOut=\"top.ICEcoder.overFileFolder('folder','')\" style=\"position: relative; left:-22px\">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span id=\"|\">/ [ROOT]</span> ".$fileAtts."</a>";
@@ -88,8 +88,8 @@ function fileManager_dir($directory, $return_link, $first_call=true) {

 					$fileAtts = "";
 					if ($serverType=="Linux") {
-						$chmodInfo = substr(sprintf('%o', fileperms($link)), -4);
-						$fileAtts = '<span style="color: #888; font-size: 8px">'.$chmodInfo.'</span>';
+						$chmodInfo = substr(sprintf('%o', fileperms($link)), -3);
+						$fileAtts = '<span style="color: #888; font-size: 8px" id="'.str_replace("/","|",str_replace($docRoot,"",$link)).'_perms">'.$chmodInfo.'</span>';
 					}
 					if ($_SESSION['userLevel'] == 10 || ($_SESSION['userLevel'] < 10 && $restrictedFile==false)) {
 						$fileManager .= "<li class=\"pft-directory\"><a href=\"#\" onMouseOver=\"top.ICEcoder.overFileFolder('folder','$link')\" onMouseOut=\"top.ICEcoder.overFileFolder('folder','')\" style=\"position: relative; left:-22px\">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span id=\"".str_replace("/","|",str_replace($docRoot,"",$link))."\">" . htmlspecialchars($this_file) . "</span> ".$fileAtts."</a>";
@@ -117,12 +117,12 @@ function fileManager_dir($directory, $return_link, $first_call=true) {
 					if ($_SESSION['userLevel'] == 10 || ($_SESSION['userLevel'] < 10 && $restrictedFile==false)) {
 						$fileAtts = "";
 						if ($serverType=="Linux") {
-							$chmodInfo = substr(sprintf('%o', fileperms($link)), -4);
-							$fileAtts = '<span style="color: #888; font-size: 8px">'.$chmodInfo.'</span>';
+							$chmodInfo = substr(sprintf('%o', fileperms($link)), -3);
+							$fileAtts = '<span style="color: #888; font-size: 8px" id="'.str_replace("/","|",str_replace($docRoot,"",$link)).'_perms">'.$chmodInfo.'</span>';
 						}
 						$fileManager .= "<li class=\"pft-file " . strtolower($ext) . "\"><a nohref onMouseOver=\"top.ICEcoder.overFileFolder('file','$link')\" onMouseOut=\"top.ICEcoder.overFileFolder('file','')\" style=\"position: relative; left:-22px; cursor: pointer\">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span id=\"".str_replace("/","|",str_replace($docRoot,"",$link))."\">" . htmlspecialchars($this_file) . "</span> ".$fileAtts."</a></li>";
 					} else {
-						$fileAtts = "<img src=\"images/padlock.png\" style=\"cursor: pointer\" onClick=\"alert('Sorry, you need higher admin level rights to view.')\">";
+						$fileAtts = "<img src=\"images/padlock.png\" style=\"cursor: pointer\" onClick=\"top.ICEcoder.message('Sorry, you need higher admin level rights to view.')\">";
 						$fileManager .= "<li class=\"pft-file " . strtolower($ext) . "\" style=\"cursor: default\"><span style=\"position: relative; left:-22px; color: #888\">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [HIDDEN] ".$fileAtts."</span></li>";
 					}
 				}
--- a/index.php
+++ b/index.php
@@ -15,12 +15,12 @@ if ($checkUpdates) {
 	$ICEcoderLatestVer = json_encode(file_get_contents("http://icecoder.net/latest-version.txt"));
 	$ICEcoderLatestVer = rtrim(ltrim($ICEcoderLatestVer,"\""),"\"\\n");
 	if (ltrim($versionNo,"v ")<ltrim($ICEcoderLatestVer,"v ")) {
-		echo '<script>alert(\'ICEcoder '.$ICEcoderLatestVer.' now released\n\nPlease upgrade\');</script>';
+		echo '<script>top.ICEcoder.message(\'ICEcoder '.$ICEcoderLatestVer.' now released\n\nPlease upgrade\');</script>';
 	} else {
 		$cMLatestVer = json_encode(file_get_contents("http://codemirror.net/latest-version.txt"));
 		$cMLatestVer = rtrim(ltrim($cMLatestVer,"\""),"\"\\n");
 		if ($cMThisVer<$cMLatestVer) {
-			echo '<script>alert(\'Code Mirror '.$cMLatestVer.' now released\n\nPlease upgrade\');</script>';
+			echo '<script>top.ICEcoder.message(\'Code Mirror '.$cMLatestVer.' now released\n\nPlease upgrade\');</script>';
 		}
 	}
 }
@@ -38,8 +38,6 @@ theme = "<?php if ($theme=="default") {echo 'icecoder';} else {echo $theme;};?>"
 tabsIndent = <?php if ($tabsIndent) {echo 'true';} else {echo 'false';};?>;
 tabWidth = <?php echo $tabWidth; ?>;
 <?
-$docRoot = str_replace("\\","/",$_SERVER['DOCUMENT_ROOT']);
-if (strrpos($docRoot,"/")==strlen($docRoot)-1) {$docRoot = substr($docRoot,0,strlen($docRoot)-1);};
 echo 'fullPath = "'.$docRoot.'";'.PHP_EOL;
 ?>
 window.onbeforeunload = function() {
@@ -83,7 +81,7 @@ previousFiles = [<?php
 	</div>
 </div>

-<div id="fileMenu" class="fileMenu" onMouseOver="ICEcoder.changeFilesW('expand')" onMouseOut="ICEcoder.changeFilesW('contract')">
+<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>
@@ -94,6 +92,7 @@ previousFiles = [<?php
 		<a href="javascript:window.open(top.ICEcoder.rightClickedFile.substr((top.ICEcoder.rightClickedFile.indexOf(shortURLStarts)+top.shortURLStarts.length),top.ICEcoder.rightClickedFile.length))" onMouseOver="document.getElementById('fileMenu').style.display='inline-block'">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>
 </div>

 <div id="header" class="header" onContextMenu="return false">
@@ -101,7 +100,7 @@ previousFiles = [<?php
 	<?php echo $pluginsDisplay; ?>
 	</div>
 	<div class="version"><?php echo $versionNo;?></div><img src="images/full-screen.gif" id="screenMode" class="screenModeIcon" onClick="top.ICEcoder.fullScreenSwitcher()">
-	<img src="images/ice-coder.png" class="logo" onClick="ICEcoder.helpScreen('show')" onContextMenu="ICEcoder.settingsScreen('show')">
+	<img src="images/ice-coder.png" class="logo" onClick="ICEcoder.helpScreen()" onContextMenu="ICEcoder.settingsScreen()">
 </div>

 <div id="files" class="files" onMouseOver="ICEcoder.changeFilesW('expand')" onMouseOut="ICEcoder.changeFilesW('contract'); top.document.getElementById('fileMenu').style.display='none';">
--- a/lib/coder.js
+++ b/lib/coder.js
@@ -550,7 +550,7 @@ var ICEcoder = {
 		cM = ICEcoder.getcMInstance();
 		okToRemove = true;
 		if (ICEcoder.changedContent[closeTabNum-1]==1) {
-			okToRemove = confirm('You have made changes.\n\nAre you sure you want to close without saving?');
+			okToRemove = top.ICEcoder.ask('You have made changes.\n\nAre you sure you want to close without saving?');
 		}

 		if (okToRemove) {
@@ -743,7 +743,7 @@ var ICEcoder = {
 		var newFolder, shortURL;

 		shortURL = top.ICEcoder.rightClickedFile.substr((top.ICEcoder.rightClickedFile.indexOf(shortURLStarts)+top.shortURLStarts.length),top.ICEcoder.rightClickedFile.length).replace(/\|/g,"/");
-		newFolder = prompt('Enter New Folder Name at '+shortURL+'/','');
+		newFolder = top.ICEcoder.getInput('Enter New Folder Name at '+shortURL+'/','');
 		if (newFolder) {
 			newFolder = shortURL + "/" + newFolder;
 			top.ICEcoder.serverQueue("add","lib/file-control.php?action=newFolder&file="+newFolder.replace(/\//g,"|"));
@@ -780,7 +780,7 @@ var ICEcoder = {
 				}
 			} else {
 			// show a message because we have 10 files open
-				alert('Sorry, you can only have 10 files open at a time!');
+				top.ICEcoder.message('Sorry, you can only have 10 files open at a time!');
 				canOpenFile = false;
 			}

@@ -815,7 +815,7 @@ var ICEcoder = {
 		var renamedFile, shortURL;

 		shortURL = top.ICEcoder.rightClickedFile.substr((top.ICEcoder.rightClickedFile.indexOf(shortURLStarts)+top.shortURLStarts.length),top.ICEcoder.rightClickedFile.length).replace(/\|/g,"/");
-		renamedFile = prompt('Please enter the new name for',shortURL);
+		renamedFile = top.ICEcoder.getInput('Please enter the new name for',shortURL);
 		if (renamedFile) {
 			for (var i=0;i<top.ICEcoder.openFiles.length;i++) {
 				if(top.ICEcoder.openFiles[i]==shortURL.replace(/\|/g,"/")) {
@@ -836,7 +836,7 @@ var ICEcoder = {
 	deleteFile: function() {
 		var delFiles, selectedFilesList;

-		delFiles = confirm('Delete:\n\n'+top.ICEcoder.selectedFiles.toString().replace(/\|/g,"/").replace(/,/g,"\n")+'?');
+		delFiles = top.ICEcoder.ask('Delete:\n\n'+top.ICEcoder.selectedFiles.toString().replace(/\|/g,"/").replace(/,/g,"\n")+'?');
 		// Upon supply a new name, rename tabs and update filename on server
 		if (delFiles) {
 			selectedFilesList = "";
@@ -1155,7 +1155,7 @@ var ICEcoder = {
 	},

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

 		// Adding files
@@ -1227,6 +1227,15 @@ var ICEcoder = {
 			eval("targetElem.parentNode.onmouseover = function() { top.ICEcoder.overFileFolder('"+newMouseOver[1]+"','"+newMouseOver[3]+"');}");
 		}

+		// Chmod on files
+		if (action=="chmod") {
+			// Identify a shortened URL for our file and get our target element based on this
+			shortURL = top.ICEcoder.rightClickedFile.substr((top.ICEcoder.rightClickedFile.indexOf(shortURLStarts)+top.shortURLStarts.length),top.ICEcoder.rightClickedFile.length).replace(/\|/g,"/");
+			targetElem = document.getElementById('filesFrame').contentWindow.document.getElementById(shortURL.replace(/\//g,"|")+"_perms");
+			// Set the new perms
+			targetElem.innerHTML = perms;
+			}
+
 		// Deleting files
 		if (action=="delete") {
 			// Simply get our target and make it dissapear
@@ -1441,8 +1450,8 @@ var ICEcoder = {
 		// 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) {
+				if (i>0) {previousFiles += ","};
 				previousFiles += top.ICEcoder.openFiles[i].replace(/\//g,"|");
-				if (i<top.ICEcoder.openFiles.length-1) {previousFiles += ","};
 			}
 		}
 		if (previousFiles=="") {previousFiles="CLEAR"};
@@ -1476,26 +1485,30 @@ var ICEcoder = {
 					top.document.getElementById('accountLogin').style.top = "-50px";
 					setTimeout(function() {top.document.getElementById('accountLoginContainer').style.display = "none";},300);
 				} else {
-					alert('Sorry, that\'s not correct.');
+					top.ICEcoder.message('Sorry, that\'s not correct.');
 				}
 			}
 		}
 	},

 	// Show the settings screen
-	settingsScreen: function(vis) {
-		if (vis=="show") {
+	settingsScreen: function(hide) {
+		if (!hide) {
 			top.document.getElementById('mediaContainer').innerHTML = '<iframe src="lib/settings-screen.php" class="whiteGlow" style="width: 970px; height: 600px"></iframe>';
 		}
-		top.ICEcoder.showHide(vis,top.document.getElementById('blackMask'));
+		top.ICEcoder.showHide(hide?'hide':'show',top.document.getElementById('blackMask'));
 	},

 	// Show the help screen
-	helpScreen: function(vis) {
-		if (vis=="show") {
-			top.document.getElementById('mediaContainer').innerHTML = '<iframe src="lib/help.php" class="whiteGlow" style="width: 400px; height: 400px"></iframe>';
-		}
-		top.ICEcoder.showHide(vis,top.document.getElementById('blackMask'));
+	helpScreen: function() {
+		top.document.getElementById('mediaContainer').innerHTML = '<iframe src="lib/help.php" class="whiteGlow" style="width: 400px; height: 400px"></iframe>';
+		top.ICEcoder.showHide('show',top.document.getElementById('blackMask'));
+	},
+
+	// Show the properties screen
+	propertiesScreen: function(fileName) {
+		top.document.getElementById('mediaContainer').innerHTML = '<iframe src="lib/file-folder-properties.php?fileName='+fileName.replace(/\//g,"|")+'" class="whiteGlow" style="width: 660px; height: 330px"></iframe>';
+		top.ICEcoder.showHide('show',top.document.getElementById('blackMask'));
 	},

 	// Update the settings used when we make a change to them
@@ -1525,11 +1538,9 @@ var ICEcoder = {
 			top.document.getElementById('fileMenu').style.display='none';
 		}

-		console.log('TO FIX');
-		//cMCSS = ICEcoder.content.contentWindow.document;
-		//cMCSS.styleSheets[2].rules ? strCSS = 'rules' : strCSS = 'cssRules';
-		//document.settings.visibleTabs.checked ? document.styleSheets[2][strCSS][5].style['content'] = '"\\21e5"' : document.styleSheets[2][strCSS][5].style['content'] = '" "';
-
+		cMCSS = ICEcoder.content.contentWindow.document.styleSheets[2];
+		cMCSS.rules ? strCSS = 'rules' : strCSS = 'cssRules';
+		visibleTabs ? cMCSS[strCSS][5].style['content'] = '"\\21e5"' : cMCSS[strCSS][5].style['content'] = '" "';

 		top.tabWidth = tabWidth;
 		for (var i=0;i<ICEcoder.cMInstances.length;i++) {
@@ -1638,5 +1649,27 @@ var ICEcoder = {
 	// Tab drag ending
 	handleDragEnd: function(e) {
 		this.style.opacity = '1';
+	},
+
+	// Change permissions on a file/folder
+	chmod: function(file,perms) {
+		top.ICEcoder.showHide('hide',top.document.getElementById('blackMask'));
+		top.ICEcoder.serverQueue("add","lib/file-control.php?action=perms&file="+file+"&perms="+perms);
+		top.ICEcoder.serverMessage('<b>chMod '+perms+' on </b><br>'+file);
+	},
+
+	// Show a message
+	message: function(msg) {
+		alert(msg);
+	},
+
+	// Ask for confirmation
+	ask: function(question) {
+		return confirm(question);
+	},
+
+	// Get the users input
+	getInput: function(question,defaultValue) {
+		return prompt(question,defaultValue);
 	}
 };
--- a/lib/config.php
+++ b/lib/config.php
@@ -1,5 +1,5 @@
 <?php
-$versionNo		= "v 0.7.5";
+$versionNo		= "v 0.7.6";
 $codeMirrorDir		= "CodeMirror-2.25";
 $cMThisVer		= 2.25;
 $tabsIndent		= true;
--- a/lib/file-control.php
+++ b/lib/file-control.php
@@ -7,7 +7,7 @@ if (isset($_GET['saveType'])) {$saveType = strClean($_GET['saveType']);};
 $docRoot = str_replace("\\","/",$_SERVER['DOCUMENT_ROOT']);

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

@@ -35,7 +35,7 @@ if ($_GET['action']=="load") {
 			echo '<textarea name="loadedFile" id="loadedFile">'.str_replace("</textarea>","<ICEcoder:/:textarea>",$loadedFile).'</textarea>';
 		} else {
 			echo '<script>fileType="nothing";</script>';
-			echo '<script>alert(\'Sorry, you need a higher admin level to view this file\');</script>';
+			echo '<script>top.ICEcoder.message(\'Sorry, you need a higher admin level to view this file\');</script>';
 		}
 	};

@@ -55,9 +55,9 @@ if ($_GET['action']=="newFolder") {
 		echo '<script>top.ICEcoder.selectedFiles=[];top.ICEcoder.updateFileManagerList(\'add\',\''.$fileLoc.'\',\''.$fileName.'\');top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);action="newFolder";</script>';
 	} else {
 		if (!is_writable($docRoot.$file)) {
-			echo "<script>alert('Sorry, cannot create folder at\\n".substr($file,0,strrpos($file,"/"))."');</script>";
+			echo "<script>top.ICEcoder.message('Sorry, cannot create folder at\\n".substr($file,0,strrpos($file,"/"))."');</script>";
 		} else {
-			echo '<script>alert(\'Sorry, you need to be logged in to add folders\');</script>';
+			echo '<script>top.ICEcoder.message(\'Sorry, you need to be logged in to add folders\');</script>';
 		}
 		echo '<script>top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);action="nothing";</script>';
 	}
@@ -74,9 +74,28 @@ if ($_GET['action']=="rename") {
 		echo '<script>top.ICEcoder.selectedFiles=[];top.ICEcoder.updateFileManagerList(\'rename\',\''.$fileLoc.'\',\''.$fileName.'\');top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);action="rename";</script>';
 	} else {
 		if (!is_writable($_GET['oldFileName'])) {
-			echo "<script>alert('Sorry, cannot rename\\n".strClean($_GET['oldFileName'])."');</script>";
+			echo "<script>top.ICEcoder.message('Sorry, cannot rename\\n".strClean($_GET['oldFileName'])."');</script>";
 		} else {
-			echo '<script>alert(\'Sorry, you need to be logged in to rename\');</script>';
+			echo '<script>top.ICEcoder.message(\'Sorry, you need to be logged in to rename\');</script>';
+		}
+		echo '<script>top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);action="nothing";</script>';
+	}
+}
+
+// If we're due to change permissions on a file/folder...
+if ($_GET['action']=="perms") {
+	if ($_SESSION['userLevel'] > 0 && is_writable($docRoot.$file)) {
+		chmod($docRoot.$file,octdec(numClean($_GET['perms'])));
+		// Reload file manager
+		$fileName = substr($file,strrpos($file,"/")+1);
+		$fileLoc = substr($file,0,strrpos($file,"/"));
+		if ($fileLoc=="") {$fileLoc = "/";};
+		echo '<script>top.ICEcoder.selectedFiles=[];top.ICEcoder.updateFileManagerList(\'chmod\',\''.$fileLoc.'\',\''.$fileName.'\',\''.numClean($_GET['perms']).'\');top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);action="perms";</script>';
+	} else {
+		if (!is_writable($docRoot.$file)) {
+			echo "<script>top.ICEcoder.message('Sorry, cannot change permissions on \\n".strClean($docRoot.$file)."');</script>";
+		} else {
+			echo '<script>top.ICEcoder.message(\'Sorry, you need to be logged in to change permissions\');</script>';
 		}
 		echo '<script>top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);action="nothing";</script>';
 	}
@@ -99,15 +118,15 @@ if ($_GET['action']=="delete") {
 				if ($fileLoc=="") {$fileLoc = "/";};
 				echo '<script>top.ICEcoder.selectedFiles=[];top.ICEcoder.updateFileManagerList(\'delete\',\''.$fileLoc.'\',\''.$fileName.'\');top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);action="delete";</script>';
 			} else {
-				echo "<script>alert('Sorry can\\'t delete\\n".$filesArray[$i]."');</script>";
+				echo "<script>top.ICEcoder.message('Sorry can\\'t delete\\n".$filesArray[$i]."');</script>";
 			}
 			echo '<script>top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);action="nothing";</script>';
 		}
 	} else {
 		if (!is_writable($docRoot.$filesArray[$i])) {
-			echo "<script>alert('Sorry, cannot delete\\n".$docRoot.$filesArray[$i]."');</script>";
+			echo "<script>top.ICEcoder.message('Sorry, cannot delete\\n".$docRoot.$filesArray[$i]."');</script>";
 		} else {
-			echo '<script>alert(\'Sorry, you need to be logged in to delete\');</script>';
+			echo '<script>top.ICEcoder.message(\'Sorry, you need to be logged in to delete\');</script>';
 		}
 		echo '<script>top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);action="nothing";</script>';
 	}
@@ -162,7 +181,7 @@ if ($_GET['action']=="save") {
 					echo '<textarea name="userVersionFile" id="userVersionFile"></textarea>';
 					?>
 					<script>
-					var refreshFile = confirm('Sorry, this file has changed, cannot save\n<?php echo $file;?>\n\nReload this file and copy your version to a new document?');
+					var refreshFile = top.ICEcoder.ask('Sorry, this file has changed, cannot save\n<?php echo $file;?>\n\nReload this file and copy your version to a new document?');
 					if (refreshFile) {
 						var cM = top.ICEcoder.getcMInstance();
 						var thisTab = top.ICEcoder.selectedTab;
@@ -185,14 +204,14 @@ if ($_GET['action']=="save") {
 					echo '<script>top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);action="nothing";</script>';
 				}
        		} else {
-				echo "<script>alert('Sorry, cannot write\\n".$file."');</script>";
+				echo "<script>top.ICEcoder.message('Sorry, cannot write\\n".$file."');</script>";
 				echo '<script>top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);action="nothing";</script>';
 			}
 		} else {
 			if (!is_writable($saveFile)) {
-				echo "<script>alert('Sorry, cannot write\\n".$file."');</script>";
+				echo "<script>top.ICEcoder.message('Sorry, cannot write\\n".$file."');</script>";
 			} else {
-				echo '<script>alert(\'Sorry, you need to be logged in to save\');</script>';
+				echo '<script>top.ICEcoder.message(\'Sorry, you need to be logged in to save\');</script>';
 			}
 			echo '<script>top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);action="nothing";</script>';
 		}
@@ -250,12 +269,12 @@ if (action=="save") {
 	?>
 		if (top.ICEcoder.rightClickedFile) {
 			shortURL = top.ICEcoder.rightClickedFile.substr((top.ICEcoder.rightClickedFile.indexOf(top.shortURLStarts)+top.shortURLStarts.length),top.ICEcoder.rightClickedFile.length).replace(/\|/g,"/")+"/";
-			newFileName = prompt('Enter Filename',shortURL);
+			newFileName = top.ICEcoder.getInput('Enter Filename',shortURL);
 		} else {
-			newFileName = prompt('Enter Filename','/');
+			newFileName = top.ICEcoder.getInput('Enter Filename','/');
 		}
 		if (newFileName && top.document.getElementById('filesFrame').contentWindow.document.getElementById(newFileName.replace(/\//g,"|"))) {
-			overwriteOK = confirm('That file exists already, overwrite?');
+			overwriteOK = top.ICEcoder.ask('That file exists already, overwrite?');
 		}
 		document.saveFile.newFileName.value = newFileName;
 	<?php ;};?>
--- a/lib/file-folder-properties.css
+++ b/lib/file-folder-properties.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, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td {
+	border: 0;
+	margin: 0;
+	padding: 0;
+	outline: 0;
+	font-size: 12px;
+	vertical-align: top;
+}
+
+body {overflow: hidden;}
+
+h1 {font-size: 36px; font-weight: normal; color: #888; margin-bottom: 20px}
+th {padding-left: 23px; padding-bottom: 5px}
+th, td {text-align: left; font-size: 10px}
+
+.properties {font-family: arial, verdana, helvetica, sans-serif; background-color: #1c1c19; color: #fff; padding: 20px}
+.properties .column {display: inline-block; width: 210px; font-size: 10px; float: left}
+
+.properties .update {position: absolute; bottom: 0; right: 20px; padding: 5px 10px; font-size: 18px; background-color: rgba(0,198,255,0.7); opacity: 0.1; cursor: pointer}
--- a/lib/file-folder-properties.php
+++ b/lib/file-folder-properties.php
@@ -0,0 +1,159 @@
+<?php include("settings.php");?>
+<!DOCTYPE html>
+
+<html onContextMenu="return false">
+<head>
+<title>ICE Coder - <?php echo $versionNo;?> :: File/Folder Properties</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<link rel="stylesheet" type="text/css" href="file-folder-properties.css">
+</head>
+
+<body class="properties">
+
+<h1 id="title">properties</h1>
+
+<?php
+$fileName=str_replace("|","/",strClean($_GET['fileName']));
+?>
+<h2><?php echo basename($fileName); ?></h2><br>
+<span class="column" style="width: 180px">Size: <?php
+$bytes = filesize($fileName);
+// If it's a dir, get the dir size
+if (is_dir($fileName)) {
+	$io = popen('/usr/bin/du -sb '.$fileName, 'r');
+	$bytes = intval(fgets($io,80));
+	pclose($io);
+}
+// Change into kilobytes
+$outputSize = ($bytes/1024);
+$outputUnit = "kb";
+// Maybe we should show in megabytes?
+if ($outputSize >= 1024) {
+	$outputSize = ($outputSize/1024);
+	$outputUnit = "mb";
+}
+echo number_format($outputSize, 2, '.', '').$outputUnit." (".number_format($bytes)." bytes)";
+?></span>
+<span class="column" style="margin: 0 10px">Modified: <?php echo date( "D d M Y g:i:sa", filemtime($fileName)); ?></span>
+<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
+if ($_SESSION['userLevel'] == 10) {
+	echo is_readable($fileName) ? "Yes" : "No"; ?> / <?php echo is_writeable($fileName) ? "Yes" : "No";
+} else {
+	echo '[HIDDEN]';
+}
+?></span>
+<span class="column">Relative path: <?php echo str_replace($docRoot,"",$fileName);?></span>
+<span style="font-size:10px">
+<br><br>
+Absolute path:<br><?php
+if ($_SESSION['userLevel'] == 10) {echo $fileName;} else {echo '[HIDDEN]';}
+?>
+<br><br>
+</span>
+<span class="column" style="width: 180px">
+Permissions:
+<?
+$chmodInfo = substr(sprintf('%o', fileperms($fileName)), -4);
+echo $chmodInfo;
+?>
+</span>
+<span class="column" style="margin: 0 10px">
+<?php
+$perms = str_split(substr($chmodInfo,1,3)); // reduces 0705 down to 705
+$readVars  = array(4,5,6,7);
+$writeVars = array(2,3,6,7);
+$execVars  = array(1,3,5,7);
+?>
+<table>
+<tr><th>Owner</th><th>Group</th><th>Public</th></tr>
+<tr>
+<td><input type="checkbox" name="ownerR" id="owner4"<?php if(in_array($perms[0],$readVars)!="") {echo ' checked';};?> onClick="changePerms();showButton()"> Read</td>
+<td><input type="checkbox" name="groupR" id="group4"<?php if(in_array($perms[1],$readVars)!="") {echo ' checked';};?> onClick="changePerms();showButton()"> Read</td>
+<td><input type="checkbox" name="publicR" id="public4"<?php if(in_array($perms[2],$readVars)!="") {echo ' checked';};?> onClick="changePerms();showButton()"> Read</td>
+</tr>
+<tr>
+<td><input type="checkbox" name="ownerW" id="owner2"<?php if(in_array($perms[0],$writeVars)!="") {echo ' checked';};?> onClick="changePerms();showButton()"> Write</td>
+<td><input type="checkbox" name="groupW" id="group2"<?php if(in_array($perms[1],$writeVars)!="") {echo ' checked';};?> onClick="changePerms();showButton()"> Write</td>
+<td><input type="checkbox" name="publicW" id="public2"<?php if(in_array($perms[2],$writeVars)!="") {echo ' checked';};?> onClick="changePerms();showButton()"> Write</td>
+</tr>
+<tr>
+<td><input type="checkbox" name="ownerE" id="owner1"<?php if(in_array($perms[0],$execVars)!="") {echo ' checked';};?> onClick="changePerms();showButton()"> Execute</td>
+<td><input type="checkbox" name="groupE" id="group1"<?php if(in_array($perms[1],$execVars)!="") {echo ' checked';};?> onClick="changePerms();showButton()"> Execute</td>
+<td><input type="checkbox" name="publicE" id="public1"<?php if(in_array($perms[2],$execVars)!="") {echo ' checked';};?> onClick="changePerms();showButton()"> Execute</td>
+</tr>
+</table>
+</span>
+<span class="column">
+Change to:<br>
+<form name="chmod" action="#" method="GET">
+<input type="text" name="chmod" id="permText" style="width: 30px; border: 0; background-color: #444; font-size: 10px; color: #fff" maxlength="3" value="<?php echo substr($chmodInfo,1,3); ?>" onKeyUp="changePerms(this.value);showButton()" onChange="changePerms(this.value);showButton()">
+</form>
+</span>
+
+<div class="update" id="updateButton" onClick="validatePerms()">update</div>
+
+<script>
+readVars   = [4,5,6,7];
+writeVars  = [2,3,6,7];
+execVars   = [1,3,5,7];
+permGroups = ['owner','group','public'];
+permValues = [4,2,1];
+permTypes  = ['read','write','exec'];
+
+function changePerms(val) {
+	var permText = document.getElementById('permText').value;
+	// change checkboxes
+	if (val) {
+		// set values
+		if (permText.length==3) {
+			for (var i=0;i<=2;i++) {
+				for (var j=0;j<=2;j++) {
+				document.getElementById(permGroups[i]+permValues[j]).checked = window[permTypes[j]+'Vars'].indexOf(permText.split("")[i]*1)>-1;
+				}
+			}
+		// clear values
+		} else {
+			for (var i=0;i<=2;i++) {
+				for (var j=0;j<=2;j++) {
+					document.getElementById(permGroups[i]+permValues[j]).checked  = false;
+				}
+			}
+		}
+	// change text value
+	} else {
+		ownerPerms = (document.getElementById('owner4').checked*4)+(document.getElementById('owner2').checked*2)+(document.getElementById('owner1').checked*1);
+		groupPerms = (document.getElementById('group4').checked*4)+(document.getElementById('group2').checked*2)+(document.getElementById('group1').checked*1);
+		publicPerms = (document.getElementById('public4').checked*4)+(document.getElementById('public2').checked*2)+(document.getElementById('public1').checked*1);
+		document.getElementById('permText').value = ownerPerms.toString() + groupPerms.toString() + publicPerms.toString();
+	}
+}
+
+var showButton = function() {
+	document.getElementById('updateButton').style.opacity = 1;
+}
+
+var validatePerms = function() {
+	var permText = document.getElementById('permText').value;
+	canUpdate = true;
+	if (permText.length!=3 || isNaN(permText)) {canUpdate = false};
+	if (	permText.split("")[0]*1 <0 || permText.split("")[0]*1 >7 ||
+		permText.split("")[1]*1 <0 || permText.split("")[1]*1 >7 ||
+		permText.split("")[2]*1 <0 || permText.split("")[2]*1 >7) {
+		canUpdate = false;
+	}
+	<?php
+	if ($_SESSION['userLevel'] == 10) {
+	?>
+	if (canUpdate) {top.ICEcoder.chmod('<?php echo str_replace($docRoot,"",$fileName);?>',permText)};
+	<?php
+	;};
+	?>
+}
+</script>
+
+</body>
+
+</html>
--- a/lib/multiple-results.php
+++ b/lib/multiple-results.php
@@ -41,7 +41,7 @@ if (startTab!=top.ICEcoder.selectedTab) {
 }
 foundTabArray.length==0 ? showHide = "hide" : showHide = "show";
 top.ICEcoder.showHide(showHide,top.document.getElementById('blackMask'));
-if (foundTabArray.length==0) {alert('No matches found')};
+if (foundTabArray.length==0) {top.ICEcoder.message('No matches found')};
 <?php if (isset($_GET['replace'])) { ?>
 if (foundTabArray.length!=0) {document.getElementById('replaceAll').style.opacity = 1};
 <?php ;}; ?>
--- a/lib/settings-screen.php
+++ b/lib/settings-screen.php
@@ -13,6 +13,7 @@
 <style type="text/css">
 .CodeMirror {position: absolute; width: 0; background-color: #fff; font-family: monospace}
 .CodeMirror-scroll {height: 220px; width: 420px; overflow: hidden}
+/* Make sure this next one remains the 3rd item, updated with JS */
 .cm-tab:after {position: relative; display: inline-block; width: 0; left: -1.4em; overflow: visible; color: #aaa; content: "<?php if($visibleTabs) {echo '\21e5';};?>";}
 </style>

@@ -183,25 +184,24 @@ var showButton = function() {
 }

 var showHideTabs = function() {
-	console.log('TO FIX');
-	//cMCSS = ICEcoder.content.contentWindow.document;
-	//cMCSS.styleSheets[2].rules ? strCSS = 'rules' : strCSS = 'cssRules';
-	//document.settings.visibleTabs.checked ? document.styleSheets[2][strCSS][5].style['content'] = '"\\21e5"' : document.styleSheets[2][strCSS][5].style['content'] = '" "';
+	cMCSS = document.styleSheets[2];
+	cMCSS.rules ? strCSS = 'rules' : strCSS = 'cssRules';
+	document.settings.visibleTabs.checked ? cMCSS[strCSS][2].style['content'] = '"\\21e5"' : cMCSS[strCSS][2].style['content'] = '" "';
 }

 var validatePasswords = function() {
 	<?php if($_SESSION['userLevel']==10) { ?>
 	if (document.settings.accountPassword.value != 0 && document.settings.accountPassword.value.length<8) {
-		alert('Please use at least 8 chars in the password');
+		top.ICEcoder.message('Please use at least 8 chars in the password');
 	} else {
 		if (document.settings.accountPassword.value != document.settings.confirmPassword.value) {
-			alert('Sorry, your passwords don\'t match')
+			top.ICEcoder.message('Sorry, your passwords don\'t match')
 		} else {
 			document.settings.submit();
 		}
 	}
 	<?php } else { ?>
-		alert('Sorry, you need to be logged in to change settings');
+		top.ICEcoder.message('Sorry, you need to be logged in to change settings');
 	<?php ;}; ?>
 }
 </script>
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -25,6 +25,9 @@ function numClean($var) {
 // Settings are stored in this file
 include("config.php");

+$docRoot = str_replace("\\","/",$_SERVER['DOCUMENT_ROOT']);
+if (strrpos($docRoot,"/")==strlen($docRoot)-1) {$docRoot = substr($docRoot,0,strlen($docRoot)-1);};
+
 // Update this config file?
 if (isset($_POST["theme"]) && $_POST["theme"] && $_SESSION['userLevel'] == 10) {
 	$settingsFile = 'config.php';
@@ -93,26 +96,28 @@ if (isset($_GET["saveFiles"]) && $_GET['saveFiles']) {
 		// Replace our previousFiles var with the the current
 		$repPosStart = strpos($settingsContents,'previousFiles		= "')+18;
 		$repPosEnd = strpos($settingsContents,'";',$repPosStart)-$repPosStart;
-		if ($_GET['saveFiles']!="CLEAR") {$saveFiles=strClean($_GET['saveFiles']);} else {$saveFiles="";};
-		$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, $settingsContents1);
+		if ($_GET['saveFiles']!="CLEAR") {
+			$saveFiles=strClean($_GET['saveFiles']);
+			$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, $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);
+			// Update our last10Files 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);
--- a/plugins/zip-it/index.php
+++ b/plugins/zip-it/index.php
@@ -64,7 +64,7 @@ if($_SESSION['userLevel']==10) {
 	echo '<script>top.ICEcoder.serverMessage("<b>Zipping Files</b>");</script>';
 	$zipItAddToZip = $zipItDoZip->zipFilesUp($zipItSaveLocation.$zipItFileName);
 	if (!$zipItAddToZip) {
-		echo '<script>alert("Could not zip files up!");</script>';
+		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>';
 	}
Author	SHA1	Message	Date
Matt Pass	e4fd3927fa	Version number update to v0.7.6	2012-07-01 14:01:31 +01:00
Matt Pass	a5e7452673	Fix to saving previousFiles & last10Files Only saves files now if there are some (ie !="CLEAR")	2012-07-01 14:01:04 +01:00
Matt Pass	6a1796a284	Fixed previousFiles, settingsScreen & visibleTabs Comma added before next file ref in previousFiles array string settingsScreen now determins if it's being hidden or not (used by update button) Showing & hiding tabs now works again in useNewSettings function	2012-07-01 13:54:27 +01:00
Matt Pass	aaac445d84	CSS comment & simpler DOM targeting Added comment on moving 3rd CSS class showHideTabs now working again and simpler too	2012-07-01 13:49:32 +01:00
Matt Pass	fd9021190a	Wrong comment syntax & new file undefined issue Used // instead of /* */ in CSS, caused .cm-tab:after to be a missing class Simplified conditional inserting of tab arrow in PHP Only checking indexOf .js, .css and .less if there is a fileName	2012-07-01 13:46:43 +01:00
Matt Pass	5c35c18e49	Commit again, no changes	2012-07-01 13:43:13 +01:00
Matt Pass	89777eebcf	message, ask & getInput functions alert calls now routed to message function confirm calls now routed to ask function prompt calls now routed to getInput function This is so you can replace how these are handled if you wish (Useful if you want to get away from browser chrome & UA dialogs)	2012-06-27 21:23:54 +01:00
Matt Pass	18b2a1a65f	New perms param & chmod function updateFileManagerList now takes a perms param This is used when action=="chmod" The target element is established and the new perm set in the span New chmod function to receive file & new permission This then adds to the server queue and server message	2012-06-27 20:56:51 +01:00
Matt Pass	edc5a9ea0a	Perms value format change & perms span has ID 3 chars for perm now, ie 705, rather than 0705 Spans to contain the perm value now have an ID This is so they can be updated after we chmod	2012-06-27 20:54:39 +01:00
Matt Pass	72edcc692b	Dir size, chmod, perms update, hiding info Return false on context menu Show dir size if it's a dir Hiding read/write info and absolute path if not logged in Clarified by renaming relative path & absolute path Permisions table to show checkboxes according to value Input field & checkboxes linked, perm value established on changing value Simple validation carried out before you can submit Submit calls the chmod function which starts the process of change	2012-06-27 20:53:10 +01:00
Matt Pass	6e6a0dae96	Permissions function added New function to change permissions on request Takes permission & applies top file/folder Then updates file manager tree and server message If it can't be changed, provide alert message	2012-06-27 20:47:00 +01:00
Matt Pass	c6224c4a4a	User select, table style, altered cols & button Allow users to select elements in this window (needed to copy text) Styles added for new chmod table Slightly narrower columns Update button styling	2012-06-27 20:44:29 +01:00
Matt Pass	76f9c9dd7c	Omitting parens on functions caused issue Put parens back in, thought it worked without them (if you're not passing a var through?). Oh well.	2012-06-27 20:41:11 +01:00
Matt Pass	d75c7f9f50	Properties screen Shows basic info for files, accessed from file manager menu	2012-06-25 07:17:39 +01:00
Matt Pass	cc7887d452	$docRoot now defined here	2012-06-25 07:14:52 +01:00
Matt Pass	29f431cd78	Simplified screen showing & properties screen Removed vis argument from function, hardcoded 'show' New propertiesScreen function	2012-06-25 07:14:27 +01:00
Matt Pass	1a97623dee	$docRoot moved, file menu hiding & Properties $docRoot now established in settings.php File manager menu now hides onmouseout Properties added as an option to the file manager menu Don't need to pass 'show' to screen showing functions As we don't need parens with no params, () also removed	2012-06-25 07:12:57 +01:00