diff --git a/editor.php b/editor.php
index ec297290..71d9d5f2 100644
--- a/editor.php
+++ b/editor.php
@@ -1,6 +1,6 @@
 <?php
-include("lib/headers.php");
-include("lib/settings.php");
+include "lib/headers.php";
+include "lib/settings.php";
 $t = $text['editor'];
 ?>
 <!DOCTYPE html>
@@ -21,34 +21,34 @@
 //-->
 <script src="<?php echo $ICEcoder["codeMirrorDir"]; ?>/lib/codemirror-compressed.js?microtime=<?php echo microtime(true);?>"></script>
 <?php
-if (file_exists(dirname(__FILE__)."/plugins/jshint/jshint-2.5.6.min.js")) {
+if (file_exists(__DIR__."/plugins/jshint/jshint-2.5.6.min.js")) {
 	echo '<script src="plugins/jshint/jshint-2.5.6.min.js?microtime='.microtime(true).'></script>';
 };?>
 <script src="lib/mmd.js?microtime=<?php echo microtime(true);?>"></script>
 <link rel="stylesheet" href="<?php echo $ICEcoder["codeMirrorDir"]; ?>/addon/fold/foldgutter.css?microtime=<?php echo microtime(true);?>">
 <link rel="stylesheet" href="<?php echo $ICEcoder["codeMirrorDir"]; ?>/addon/scroll/simplescrollbars.css?microtime=<?php echo microtime(true);?>">
 <?php
-if (file_exists(dirname(__FILE__)."/plugins/emmet/emmet.min.js")) {
+if (file_exists(__DIR__."/plugins/emmet/emmet.min.js")) {
 	echo '<script src="plugins/emmet/emmet.min.js?microtime='.microtime(true).'"></script>';
 };?>
 <?php
-if (file_exists(dirname(__FILE__)."/plugins/pesticide/pesticide.js")) {
+if (file_exists(__DIR__."/plugins/pesticide/pesticide.js")) {
 	echo '<script src="plugins/pesticide/pesticide.js?microtime='.microtime(true).'"></script>';
 };?>
 <?php
-if (file_exists(dirname(__FILE__)."/plugins/stats.js/stats.min.js")) {
+if (file_exists(__DIR__."/plugins/stats.js/stats.min.js")) {
 	echo '<script src="plugins/stats.js/stats.min.js?microtime='.microtime(true).'"></script>';
 };?>
 <?php
-if (file_exists(dirname(__FILE__)."/plugins/responsive-helper/responsive-helper.js")) {
+if (file_exists(__DIR__."/plugins/responsive-helper/responsive-helper.js")) {
 	echo '<script src="plugins/responsive-helper/responsive-helper.js?microtime='.microtime(true).'"></script>';
 };?>
 <link rel="stylesheet" href="<?php
 if ($ICEcoder["theme"]=="default") {echo 'lib/editor.css';} else {echo $ICEcoder["codeMirrorDir"].'/theme/'.$ICEcoder["theme"].'.css';};
 echo "?microtime=".microtime(true);
-if (array_search($ICEcoder["theme"],array("3024-day","base16-light","eclipse","elegant","mdn-like","neat","neo","paraiso-light","solarized","the-matrix","xq-light")) !== false) {
+if (in_array($ICEcoder["theme"],array("3024-day","base16-light","eclipse","elegant","mdn-like","neat","neo","paraiso-light","solarized","the-matrix","xq-light"))) {
 	$activeLineBG = "#ccc";
-} elseif (array_search($ICEcoder["theme"],array("3024-night","blackboard","colorforth","liquibyte","night","tomorrow-night-bright","tomorrow-night-eighties","vibrant-ink")) !== false) {
+} elseif (in_array($ICEcoder["theme"],array("3024-night","blackboard","colorforth","liquibyte","night","tomorrow-night-bright","tomorrow-night-eighties","vibrant-ink"))) {
 	$activeLineBG = "#888";
 } else {
 	$activeLineBG = "#000";
@@ -112,7 +112,7 @@
 		<span class="heading"><?php echo $t['ICEcoder root'];?></span><br>
 		<?php echo $docRoot.$iceRoot;?><br><br>
 		<span class="heading"><?php echo $t['PHP version'];?></span><br>
-		<?php echo phpversion();?><br><br>
+		<?php echo PHP_VERSION;?><br><br>
 		<span class="heading"><?php echo $t['Date & time'];?></span><br>
 		<span id="serverDT"></span><br><br>
 		<h2><?php echo $t['your device'];?></h2>
@@ -136,7 +136,7 @@
 		<span class="heading"><?php echo $t['Last 10 files...'];?></span><br>
 		<ul class="fileManager" id="last10Files" style="margin-left: 0; line-height: 20px"><?php
 			$last10FilesArray = explode(",",$ICEcoder["last10Files"]);
-			for ($i=0;$i<count($last10FilesArray);$i++) {
+			for ($i=0, $iMax = count($last10FilesArray); $i< $iMax; $i++) {
 				if ($ICEcoder["last10Files"]=="") {
 					echo '<div style="display: inline-block; margin-left: -39px; margin-top: -4px">'.$t['none'].'</div><br><br>';
 				} else {
@@ -318,7 +318,7 @@ function createNewCMInstance(num) {
 
 <div style="position: absolute; display: none; height: 100%; width: 100%; top: 0; padding: 3px 0 0 60px; line-height: 16px; font-family: monospace; font-size: 13px; z-index: 2147483647" id="game"></div>
 
-<?php include_once("processes/on-editor-load.php"); ?>
+<?php include_once "processes/on-editor-load.php"; ?>
 
 </body>
 
diff --git a/files.php b/files.php
index 3831e2db..ebc15980 100644
--- a/files.php
+++ b/files.php
@@ -1,6 +1,6 @@
 <?php
-include("lib/headers.php");
-include("lib/settings.php");
+include "lib/headers.php";
+include "lib/settings.php";
 $t = $text['files'];
 
 // Is our dir in the list of GitHub local paths?
diff --git a/index.php b/index.php
index e69333a9..22389bb6 100644
--- a/index.php
+++ b/index.php
@@ -1,6 +1,6 @@
 <?php
-include("lib/headers.php");
-include("lib/settings.php");
+include "lib/headers.php";
+include "lib/settings.php";
 $t = $text['index'];
 
 $updateMsg = '';
@@ -21,7 +21,7 @@
 	}
 }
 
-$isMac = strpos($_SERVER['HTTP_USER_AGENT'], "Macintosh")>-1 ? true : false;
+$isMac = strpos($_SERVER['HTTP_USER_AGENT'], "Macintosh") > -1;
 ?>
 <!DOCTYPE html>
 <html onMouseDown="top.ICEcoder.mouseDown=true; top.ICEcoder.resetAutoLogoutTimer();" onMouseUp="top.ICEcoder.mouseDown=false; top.ICEcoder.resetAutoLogoutTimer(); top.ICEcoder.mouseDownInCM=false; if (!top.ICEcoder.overCloseLink) {top.ICEcoder.tabDragEnd()}" onMouseMove="if(top.ICEcoder) {top.ICEcoder.getMouseXY(event,'top'); top.ICEcoder.resetAutoLogoutTimer(); top.ICEcoder.canResizeFilesW()}" onMouseWheel="top.ICEcoder.resetAutoLogoutTimer(); if (top.ICEcoder.getcMInstance() && !top.ICEcoder.getcMInstance().hasFocus() && !top.ICEcoder.getcMdiffInstance().hasFocus()) {event.wheelDelta > 0 ? top.ICEcoder.nextTab() : top.ICEcoder.previousTab();}">
@@ -171,7 +171,7 @@
 	</span>
 	<div onMouseOver="ICEcoder.showFileMenu()" style="padding: 2px 0"><hr></div>
 	<?php
-	if (file_exists(dirname(__FILE__)."/plugins/zip-it/index.php")) {
+	if (file_exists(__DIR__."/plugins/zip-it/index.php")) {
 		echo '<a href="javascript:top.ICEcoder.zipIt(top.ICEcoder.selectedFiles[top.ICEcoder.selectedFiles.length-1])" onMouseOver="ICEcoder.showFileMenu()">Zip It!</a>'.PHP_EOL;
 	};
 	?>
@@ -344,4 +344,4 @@
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/lib/auto-logout-warning.php b/lib/auto-logout-warning.php
index e8060ed8..5b8e2558 100644
--- a/lib/auto-logout-warning.php
+++ b/lib/auto-logout-warning.php
@@ -1,6 +1,6 @@
 <?php
-include("headers.php");
-include("settings.php");
+include "headers.php";
+include "settings.php";
 $t = $text['auto-logout-warning'];
 ?>
 <!DOCTYPE html>
@@ -21,4 +21,4 @@
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/lib/backup-versions-preview-loader.php b/lib/backup-versions-preview-loader.php
index 0f44e03e..5f7fbd46 100644
--- a/lib/backup-versions-preview-loader.php
+++ b/lib/backup-versions-preview-loader.php
@@ -1,7 +1,7 @@
 <?php
 // Load common functions
-include("headers.php");
-include("settings.php");
+include "headers.php";
+include "settings.php";
 
 $file = str_replace("|","/",xssClean($_GET['file'],'html'));
 
@@ -33,4 +33,4 @@
 parent.document.getElementById('buttonsContainer').style.display = 'inline-block';
 parent.editor.setValue(document.getElementById('loadedFile').value);
 parent.document.getElementById('infoContainer').innerHTML = 'Date & Time:<br><?php echo $datetime;?><br><br>Size:<br><?php echo $size;?>';
-</script>
\ No newline at end of file
+</script>
diff --git a/lib/backup-versions.php b/lib/backup-versions.php
index f49beb86..618c0796 100644
--- a/lib/backup-versions.php
+++ b/lib/backup-versions.php
@@ -1,7 +1,7 @@
 <?php
 // Load common functions
-include("headers.php");
-include("settings.php");
+include "headers.php";
+include "settings.php";
 $text = $_SESSION['text'];
 $t = $text['backup-versions'];
 
@@ -50,11 +50,11 @@
 
 while (false !== ($cssFile = readdir($handle))) {
 	if ($cssFile !== "." && $cssFile != "..") {
-		array_push($themeArray,basename($cssFile,".css"));
+		$themeArray[] = basename($cssFile, ".css");
 	}
 }
 sort($themeArray);
-for ($i=0;$i<count($themeArray);$i++) {
+for ($i=0, $iMax = count($themeArray); $i< $iMax; $i++) {
 	echo '<link rel="stylesheet" href="../'.$ICEcoder["codeMirrorDir"].'/theme/'.$themeArray[$i].'.css?microtime='.microtime(true).'">'.PHP_EOL;
 }
 ?>
@@ -110,7 +110,7 @@
 
 <?php
 echo "fileName = '".basename($file)."';";
-include(dirname(__FILE__)."/language-modes-partial.js");
+include __DIR__."/language-modes-partial.js";
 ?>
 
 var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
@@ -167,4 +167,4 @@
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/lib/bug-files-check.php b/lib/bug-files-check.php
index b18c68c4..56afc73a 100644
--- a/lib/bug-files-check.php
+++ b/lib/bug-files-check.php
@@ -1,7 +1,7 @@
 <?php
 // Load common functions
-include("headers.php");
-include_once("settings-common.php");
+include "headers.php";
+include_once "settings-common.php";
 $text = $_SESSION['text'];
 $t = $text['bug-files-check'];
 
@@ -11,7 +11,7 @@
 
 $result = "ok";
 
-for ($i=0; $i<count($files); $i++) {
+for ($i=0, $iMax = count($files); $i< $iMax; $i++) {
 	// Work out the real path for a file
 	$files[$i] = realpath($_SERVER['DOCUMENT_ROOT'].$files[$i]);
 	// If we can't find that file or it doesn't start with the doc root, it's an error
@@ -26,7 +26,7 @@
 
 	$filesWithNewBugs = 0;
 
-	for ($i=0; $i<count($files); $i++) {
+	for ($i=0, $iMax = count($files); $i< $iMax; $i++) {
 		// If we have set a filesize value previously and it's different to now, there's new bugs
 		$fileSizesSeenArray = explode(",",xssClean($_GET['filesSizesSeen'],"html"));
 		if ($fileSizesSeenArray[$i]!="null" && $fileSizesSeenArray[$i] != $filesSizesSeen[$i]) {
@@ -93,7 +93,7 @@
 }
 
 // Get dir name tmp dir's parent
-$tmpLoc = dirname(__FILE__);
+$tmpLoc = __DIR__;
 $tmpLoc = explode(DIRECTORY_SEPARATOR,$tmpLoc);
 $tmpLoc = $tmpLoc[count($tmpLoc)-2];
 
@@ -107,9 +107,9 @@
 );
 
 // Include our process once our bug checking work is done
-include("../processes/on-bug-check.php");
+include "../processes/on-bug-check.php";
 
 // Finally, display our status in JSON format as the XHR response text
 echo json_encode($status);
 
-?>
\ No newline at end of file
+?>
diff --git a/lib/download.php b/lib/download.php
index 079b3fbe..e93ff238 100644
--- a/lib/download.php
+++ b/lib/download.php
@@ -1,6 +1,6 @@
 <?php
-include("headers.php");
-include("settings.php");
+include "headers.php";
+include "settings.php";
 
 // Establish the real absolute path to the file
 $file = realpath($docRoot.$iceRoot.str_replace("|","/",strClean($_GET['file'])));
@@ -24,4 +24,4 @@
     readfile($file);
     exit;
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/file-control-xhr.php b/lib/file-control-xhr.php
index cbf70043..cf6a3211 100644
--- a/lib/file-control-xhr.php
+++ b/lib/file-control-xhr.php
@@ -1,7 +1,7 @@
 <?php
-include("headers.php");
-include("settings.php");
-include("ftp-control.php");
+include "headers.php";
+include "settings.php";
+include "ftp-control.php";
 $t = $text['file-control'];
 
 // ===============================
@@ -52,7 +52,7 @@
 
 	// Make each path in $file a full path (; seperated list)
 	$allFiles = explode(";",$file);
-	for ($i=0; $i<count($allFiles); $i++) {
+	for ($i=0, $iMax = count($allFiles); $i< $iMax; $i++) {
 		if (strpos($allFiles[$i],$docRoot)===false && $_GET['action']!="getRemoteFile") {
 			$allFiles[$i]=str_replace("|","/",$docRoot.$iceRoot.$allFiles[$i]);
 		}
@@ -65,7 +65,7 @@
 
 	// Check through all files to make sure they're valid/safe
 	$allFiles = explode(";",$file);
-	for ($i=0; $i<count($allFiles); $i++) {
+	for ($i=0, $iMax = count($allFiles); $i< $iMax; $i++) {
 
 		// Uncomment to alert and console.log the action and file, useful for debugging
 		// echo ";alert('".xssClean($_GET['action'],"html")." : ".$allFiles[$i]."');console.log('".xssClean($_GET['action'],"html")." : ".$allFiles[$i]."');";
@@ -109,7 +109,7 @@ function stitchChanges($fileLines) {
 	$changes = json_decode($_POST['changes'],true);
 
 	// For each of those changes, handle the same requests on file on server to to match client view seen
-	for ($i=0; $i<count($changes); $i++) {
+	for ($i=0, $iMax = count($changes); $i< $iMax; $i++) {
 		// Replace line(s)
 		if ($changes[$i][0] == "replace") {
 			for ($j=$changes[$i][1]; $j<=$changes[$i][2]-1; $j++) {			// Take 1 from end
@@ -157,9 +157,7 @@ function stitchChanges($fileLines) {
 	}
 
 	// Set and return the newly stitched together content
-	$contents = implode("",$fileLines);
-
-	return $contents;
+    return implode("",$fileLines);
 }
 
 
@@ -262,7 +260,7 @@ function stitchChanges($fileLines) {
 			// MDT'S MATCH, WRITE FILE
 			// =======================
 
-			if (!(isset($_GET['fileMDT']))||$filemtime==$_GET['fileMDT']) {
+			if (!isset($_GET['fileMDT']) ||$filemtime==$_GET['fileMDT']) {
 
 				// FTP Saving
 				if (isset($ftpSite)) {
@@ -274,7 +272,7 @@ function stitchChanges($fileLines) {
 						// Need to add a new line at the end of each because explode will lose them,
 						// want want to end up with same array that 'file($file)' produces for a local file
 						// - it keeps the line endings at the end of each array item
-						for ($i=0; $i<count($fileLines); $i++) {
+						for ($i=0, $iMax = count($fileLines); $i< $iMax; $i++) {
 							if ($i<count($fileLines)-1) {
 								$fileLines[$i] .= $ICEcoder["lineEnding"];
 							}
@@ -293,8 +291,7 @@ function stitchChanges($fileLines) {
 
 					// replace \r\n (Windows), \r (old Mac) and \n (Linux) line endings with whatever we chose to be lineEnding
 					$contents = str_replace("\r\n", $ICEcoder["lineEnding"], $contents);
-					$contents = str_replace("\r", $ICEcoder["lineEnding"], $contents);
-					$contents = str_replace("\n", $ICEcoder["lineEnding"], $contents);
+                    $contents = str_replace(array("\r", "\n"), array($ICEcoder["lineEnding"], $ICEcoder["lineEnding"]), $contents);
 					if (isset($_POST['changes']) && ($unixNewLines > 0) || ($windowsNewLines > 0)){
 						if ($unixNewLines > $windowsNewLines){
 							$contents = str_replace($ICEcoder["lineEnding"], "\n", $contents);
@@ -332,8 +329,7 @@ function stitchChanges($fileLines) {
 
 					// replace \r\n (Windows), \r (old Mac) and \n (Linux) line endings with whatever we chose to be lineEnding
 					$contents = str_replace("\r\n", $ICEcoder["lineEnding"], $contents);
-					$contents = str_replace("\r", $ICEcoder["lineEnding"], $contents);
-					$contents = str_replace("\n", $ICEcoder["lineEnding"], $contents);
+                    $contents = str_replace(array("\r", "\n"), array($ICEcoder["lineEnding"], $ICEcoder["lineEnding"]), $contents);
 					if (isset($_POST['changes']) && ($unixNewLines > 0) || ($windowsNewLines > 0)){
 						if ($unixNewLines > $windowsNewLines){
 							$contents = str_replace($ICEcoder["lineEnding"], "\n", $contents);
@@ -359,7 +355,7 @@ function stitchChanges($fileLines) {
 					$backupDirFormat = "Y-m-d";
 
 					// Establish the base, host and date dir parts...
-					$backupDirBase = str_replace("\\","/",dirname(__FILE__))."/../backups/";
+					$backupDirBase = str_replace("\\","/",__DIR__)."/../backups/";
 					$backupDirHost = isset($ftpSite) ? parse_url($ftpSite,PHP_URL_HOST) : "localhost";
 					$backupDirDate = date($backupDirFormat);
 
@@ -369,7 +365,7 @@ function stitchChanges($fileLines) {
 					// Make any dirs that don't exist if full path isn't there
 					if (!is_dir($backupDirBase.implode("/",$subDirsArray))) {
 						$pathIncr = "";
-						for ($i=0; $i<count($subDirsArray); $i++) {
+						for ($i=0, $iMax = count($subDirsArray); $i< $iMax; $i++) {
 							$pathIncr .= $subDirsArray[$i]."/";
 							// If this subdir isn't there, make it
 							if (!is_dir($backupDirBase.$pathIncr)) {
@@ -403,7 +399,7 @@ function stitchChanges($fileLines) {
 						$versionsInfoOrig = explode("\n",$versionsInfoOrig);
 						$replacedLine = false;
 						// For each line, either re-set number or simply include the line
-						for ($i=0; $i<count($versionsInfoOrig); $i++) {
+						for ($i=0, $iMax = count($versionsInfoOrig); $i< $iMax; $i++) {
 							if (strpos($versionsInfoOrig[$i],$fileLoc."/".$fileName." = ") === 0) {
 								$versionsInfo .= $fileLoc."/".$fileName." = ".$backupFileNum.PHP_EOL;
 								$replacedLine = true;
@@ -426,12 +422,12 @@ function stitchChanges($fileLines) {
 					clearstatcache();
 
 					// Finally, clear any old backup dirs than user set X days (inclusive)
-					$backupDirsList = scandir($backupDirBase.$backupDirHost);
+					$backupDirsList = scandir($backupDirBase . $backupDirHost, SCANDIR_SORT_NONE);
 					$backupDirsKeep = array();
 					for ($i=0; $i<=$ICEcoder["backupsDays"]; $i++) {
 						$backupDirsKeep[] = date($backupDirFormat, strtotime('-'.$i.' day',strtotime($backupDirDate)));
 					}
-					for ($i=0; $i<count($backupDirsList); $i++) {
+					for ($i=0, $iMax = count($backupDirsList); $i< $iMax; $i++) {
 						if ($backupDirsList[$i] != "." && $backupDirsList[$i] != ".." && !in_array($backupDirsList[$i],$backupDirsKeep)) {
 							rrmdir($backupDirBase.$backupDirHost."/".$backupDirsList[$i]);
 						}
@@ -487,7 +483,7 @@ function stitchChanges($fileLines) {
 						top.ICEcoder.redoTabHighlight(top.ICEcoder.selectedTab);';
 
 				// Run our custom processes
-				include_once("../processes/on-file-save.php");
+				include_once "../processes/on-file-save.php";
 
 			// ======================================================
 			// MDT'S DON'T MATCH, OFFER TO LOAD FILE & SHOW DIFF VIEW
@@ -559,7 +555,7 @@ function stitchChanges($fileLines) {
 		}
 		$finalAction = "newFolder";
 		// Run our custom processes
-		include_once("../processes/on-new-dir.php");
+		include_once "../processes/on-new-dir.php";
 	} else {
 		$doNext .= "top.ICEcoder.message('".$t['Sorry, cannot create...']."\\\\n".$fileLoc."');";
 		$finalAction = "nothing";
@@ -605,7 +601,7 @@ function stitchChanges($fileLines) {
 			}
 			$finalAction = "move";
 			// Run our custom processes
-			include_once("../processes/on-file-dir-move.php");
+			include_once "../processes/on-file-dir-move.php";
 		} else {
 			$doNext .= "top.ICEcoder.message('".$t['Sorry, cannot move']."\\\\n".str_replace("|","/",strClean($_GET['oldFileName']))."\\\\n\\\\n".$t['Maybe public write...']."');";
 			$finalAction = "nothing";
@@ -643,7 +639,7 @@ function stitchChanges($fileLines) {
 		}
 		$finalAction = "rename";
 		// Run our custom processes
-		include_once("../processes/on-file-dir-rename.php");
+		include_once "../processes/on-file-dir-rename.php";
 	} else {
 		$doNext .= "top.ICEcoder.message('".$t['Sorry, cannot rename']."\\\\n".strClean($_GET['oldFileName'])."\\\\n\\\\n".$t['Maybe public write...']."');";
 		$finalAction = "nothing";
@@ -700,7 +696,7 @@ function stitchChanges($fileLines) {
 		$doNext .= 'top.ICEcoder.updateFileManagerList(\'add\',\''.strClean(str_replace("|","/",$_GET['location'])).'\',\''.basename($dest).'\',false,false,false,\''.$fileOrFolder.'\');';
 		$finalAction = "pasteFile";
 		// Run our custom processes
-		include_once("../processes/on-file-dir-paste.php");
+		include_once "../processes/on-file-dir-paste.php";
 	} else {
 		$doNext .= "top.ICEcoder.message('".$t['Sorry, cannot copy']." \\\\n".str_replace($docRoot,"",$source)."\\\\n ".$t['into']." \\\\n".str_replace($docRoot,"",$dest)."');";
 		$finalAction = "nothing";
@@ -761,7 +757,7 @@ function getDetails($fileArr) {
 			$fileUploader=new fileUploader($uploads);
 		}
 		// Run our custom processes
-		include_once("../processes/on-file-upload.php");
+		include_once "../processes/on-file-upload.php";
 	} else {
 		$doNext .= "top.ICEcoder.message('".$t['Sorry, cannot upload...']."');";
 		$finalAction = "nothing";
@@ -791,7 +787,7 @@ function getDetails($fileArr) {
 				$doNext .= 'top.ICEcoder.selectedFiles=[];top.ICEcoder.updateFileManagerList(\'delete\',\''.$fileLoc.'\',\''.$fileName.'\');';
 				$finalAction = "delete";
 				// Run our custom processes
-				include_once("../processes/on-file-dir-delete.php");
+				include_once "../processes/on-file-dir-delete.php";
 			} else {
 				$doNext .= "top.ICEcoder.message('".$t['Sorry, cannot delete']."\\\\n".$fileLoc."/".$fileName."');";
 				$finalAction = "nothing";
@@ -802,9 +798,8 @@ function getDetails($fileArr) {
 		}
 	// Local
 	} else {
-		for ($i=0;$i<count($filesArray);$i++) {
-			$fullPath = str_replace($docRoot,"",$filesArray[$i]);
-			$fullPath = str_replace($iceRoot,"",$fullPath);
+		for ($i=0, $iMax = count($filesArray); $i< $iMax; $i++) {
+            $fullPath = str_replace(array($docRoot, $iceRoot), "", $filesArray[$i]);
 			$fullPath = $docRoot.$iceRoot.$fullPath;
 
 			if (rtrim($fullPath,"/") == rtrim($docRoot,"/")) {
@@ -815,7 +810,7 @@ function getDetails($fileArr) {
 				} else {
 					// Delete file to tmp dir or full delete
 					$ICEcoder['deleteToTmp']					
-						? rename($fullPath,str_replace("\\","/",dirname(__FILE__))."/../tmp/.".str_replace(":","_",str_replace("/","_",$fullPath)))
+						? rename($fullPath,str_replace("\\","/",__DIR__)."/../tmp/.".str_replace(":","_",str_replace("/","_",$fullPath)))
 						: unlink($fullPath);
 				}
 				$fileName = basename($fullPath);
@@ -825,7 +820,7 @@ function getDetails($fileArr) {
 				$doNext .= 'top.ICEcoder.selectedFiles=[];top.ICEcoder.updateFileManagerList(\'delete\',\''.$fileLoc.'\',\''.$fileName.'\');';
 				$finalAction = "delete";
 				// Run our custom processes
-				include_once("../processes/on-file-dir-delete.php");
+				include_once "../processes/on-file-dir-delete.php";
 			} else {
 				$doNext .= "top.ICEcoder.message('".$t['Sorry, cannot delete']."\\\\n".str_replace($docRoot,"",$fullPath)."');";
 				$finalAction = "nothing";
@@ -840,21 +835,21 @@ function rrmdir($dir) {
 	global $ICEcoder;
 
 	if (is_dir($dir)) { 
-		$objects = scandir($dir); 
+		$objects = scandir($dir, SCANDIR_SORT_NONE);
 		foreach ($objects as $object) { 
 			if ($object != "." && $object != "..") {
 				if (filetype($dir."/".$object) == "dir") {
 					rrmdir($dir."/".$object);
 				} else {
 					$ICEcoder['deleteToTmp']
-						? rename($dir."/".$object,str_replace("\\","/",dirname(__FILE__))."/../tmp/.".str_replace(":","_",str_replace("/","_",$dir))."/".$object)
+						? rename($dir."/".$object,str_replace("\\","/",__DIR__)."/../tmp/.".str_replace(":","_",str_replace("/","_",$dir))."/".$object)
 						: unlink($dir."/".$object);
 				}
 			} 
 		} 
 		reset($objects);
 		$ICEcoder['deleteToTmp']
-			? rename($dir,str_replace("\\","/",dirname(__FILE__))."/../tmp/.".str_replace(":","_",str_replace("/","_",$dir)))
+			? rename($dir,str_replace("\\","/",__DIR__)."/../tmp/.".str_replace(":","_",str_replace("/","_",$dir)))
 			: rmdir($dir);
 	} 
 };
@@ -872,7 +867,7 @@ function rrmdir($dir) {
 		fclose($fh);
 		$finalAction = "replaceText";
 		// Run our custom processes
-		include_once("../processes/on-file-replace-text.php");
+		include_once "../processes/on-file-replace-text.php";
 	} else {
 		$doNext .= "top.ICEcoder.message('".$t['Sorry, cannot replace...']."\\\\n".$file."');";
 		$finalAction = "nothing";
@@ -885,18 +880,17 @@ function rrmdir($dir) {
 // ==========================
 
 if (!isset($ftpSite) && !$error && $_GET['action']=="getRemoteFile") {
-	$lineNumber = max(isset($_REQUEST['lineNumber'])?intval($_REQUEST['lineNumber']):1, 1);
+	$lineNumber = max(isset($_REQUEST['lineNumber'])? (int)$_REQUEST['lineNumber'] :1, 1);
 	if ($remoteFile = toUTF8noBOM(getData($file,'curl'),true)) {
 		// replace \r\n (Windows), \r (old Mac) and \n (Linux) line endings with whatever we chose to be lineEnding
 		$remoteFile = str_replace("\r\n", $ICEcoder["lineEnding"], $remoteFile);
-		$remoteFile = str_replace("\r", $ICEcoder["lineEnding"], $remoteFile);
-		$remoteFile = str_replace("\n", $ICEcoder["lineEnding"], $remoteFile);
+        $remoteFile = str_replace(array("\r", "\n"), array($ICEcoder["lineEnding"], $ICEcoder["lineEnding"]), $remoteFile);
 		$doNext .= 'top.ICEcoder.newTab();';
 		$doNext .= 'top.ICEcoder.getcMInstance().setValue(\''.str_replace("\r","",str_replace("\t","\\\\t",str_replace("\n","\\\\n",str_replace("'","\\\\'",str_replace("\\","\\\\",preg_quote($remoteFile)))))).'\');';
 		$doNext .= 'top.ICEcoder.goToLine('.$lineNumber.');';
 		$finalAction = "getRemoteFile";
 		// Run our custom processes
-		include_once("../processes/on-get-remote-file.php");
+		include_once "../processes/on-get-remote-file.php";
 	} else {
 		$finalAction = "nothing";
 		$doNext .= 'top.ICEcoder.message(\''.$t['Sorry, could not...'].' '.$file.'\');';
@@ -931,7 +925,7 @@ function rrmdir($dir) {
 		}
 		$finalAction = "perms";
 		// Run our custom processes
-		include_once("../processes/on-file-dir-perms.php");
+		include_once "../processes/on-file-dir-perms.php";
 	} else {
 		$finalAction = "nothing";
 		$doNext .= "top.ICEcoder.message('".$t['Sorry, cannot change...']." \\n".strClean($file)."');";
@@ -1009,4 +1003,4 @@ function rrmdir($dir) {
 		"errorMsg" : "'.$errorMsg.'"
 	}
 }';
-?>
\ No newline at end of file
+?>
diff --git a/lib/file-control.php b/lib/file-control.php
index 50404421..982eb3a3 100644
--- a/lib/file-control.php
+++ b/lib/file-control.php
@@ -1,7 +1,7 @@
 <?php
-include("headers.php");
-include("settings.php");
-include("ftp-control.php");
+include "headers.php";
+include "settings.php";
+include "ftp-control.php";
 $t = $text['file-control'];
 ?>
 <?php if ($_SESSION['githubDiff']) { ?>
@@ -31,7 +31,7 @@
 
 // Make each path in $file a full path (; seperated list)
 $allFiles = explode(";",$file);
-for ($i=0; $i<count($allFiles); $i++) {
+for ($i=0, $iMax = count($allFiles); $i< $iMax; $i++) {
 	if (strpos($allFiles[$i],$docRoot)===false && $_GET['action']!="getRemoteFile") {
 		$allFiles[$i]=str_replace("|","/",$docRoot.$iceRoot.$allFiles[$i]);
 	}
@@ -44,7 +44,7 @@
 
 // Check through all files to make sure they're valid/safe
 $allFiles = explode(";",$file);
-for ($i=0; $i<count($allFiles); $i++) {
+for ($i=0, $iMax = count($allFiles); $i< $iMax; $i++) {
 
 	// Uncomment to alert and console.log the action and file, useful for debugging
 	// echo ";alert('".xssClean($_GET['action'],"html")." : ".$allFiles[$i]."');console.log('".xssClean($_GET['action'],"html")." : ".$allFiles[$i]."');";
@@ -66,10 +66,10 @@
 // If we're due to open a file...
 if ($_GET['action']=="load") {
 	echo 'action="load";';
-	$lineNumber = max(isset($_REQUEST['lineNumber'])?intval($_REQUEST['lineNumber']):1, 1);
+	$lineNumber = max(isset($_REQUEST['lineNumber'])? (int)$_REQUEST['lineNumber'] :1, 1);
 	// Check this file isn't on the banned list at all
 	$canOpen = true;
-	for ($i=0;$i<count($_SESSION['bannedFiles']);$i++) {
+	for ($i=0, $iMax = count($_SESSION['bannedFiles']); $i< $iMax; $i++) {
 		if(str_replace("*","",$_SESSION['bannedFiles'][$i]) != "" && strpos($file,str_replace("*","",$_SESSION['bannedFiles'][$i]))!==false) {$canOpen = false;}
 	}
 
@@ -85,9 +85,9 @@
 		} else {
 			$fileExt = explode(" ",pathinfo($file, PATHINFO_EXTENSION));
 			$fileExt = $fileExt[0];
-			if (array_search($fileExt,array("gif","jpg","jpeg","png"))!==false) {$finfo = "image";};
-			if (array_search($fileExt,array("doc","docx","ppt","rtf","pdf","zip","tar","gz","swf","asx","asf","midi","mp3","wav","aiff","mov","qt","wmv","mp4","odt","odg","odp"))!==false) {$finfo = "other";};
-		}
+			if (in_array($fileExt,array("gif","jpg","jpeg","png"))) {$finfo = "image";}
+            if (in_array($fileExt,array("doc","docx","ppt","rtf","pdf","zip","tar","gz","swf","asx","asf","midi","mp3","wav","aiff","mov","qt","wmv","mp4","odt","odg","odp"))) {$finfo = "other";}
+        }
 		if (strpos($finfo,"text")===0 || strpos($finfo, "application/xml")===0 || strpos($finfo,"empty")!==false) {
 			echo 'fileType="text";';
 			echo 'top.ICEcoder.shortURL = top.ICEcoder.thisFileFolderLink = "'.$fileLoc."/".$fileName.'";';
@@ -118,7 +118,7 @@
 			$loadedFile = preg_replace('/\\n/','&#13;',$loadedFile);
 			echo '</script><textarea name="loadedFile" id="loadedFile">'.$loadedFile.'</textarea><script>';
 			// Run our custom processes
-			include_once("../processes/on-file-load.php");
+			include_once "../processes/on-file-load.php";
 		} else if (strpos($finfo,"image")===0) {
 			echo 'fileType="image";fileName=\''.$fileLoc."/".$fileName.'\';';
 		} else {
@@ -165,8 +165,7 @@
 						$ghRemoteURLPaths = $ICEcoder['githubRemotePaths'];
 						$ghRemoteURL = $ghRemoteURLPaths[$ghRemoteURLPos];
 
-						$ghRemoteURL = str_replace("https://github.com/","",$ghRemoteURL);
-						$ghRemoteURL = str_replace("/","|",$ghRemoteURL);
+                        $ghRemoteURL = str_replace(array("https://github.com/", "/"), array("", "|"), $ghRemoteURL);
 
 						// If the file is not in a sub-sub dir of the doc root
 						if (!strpos($fileLoc,"/",1)) {
diff --git a/lib/ftp-control.php b/lib/ftp-control.php
index 93b388fb..7d525521 100644
--- a/lib/ftp-control.php
+++ b/lib/ftp-control.php
@@ -47,10 +47,8 @@ function ftpGetFileInfo($ftpConn, $directory = '.', $fileName) {
 	$detailedList = $ftpListArrays['detailedList'];
 
 	// Now get the file info for our file
-	$fileInfo = $detailedList[$fileName];
-
-	// Return the info
-	return $fileInfo;
+    // Return the info
+	return $detailedList[$fileName];
 }
 
 // Get contents over FTP
@@ -112,4 +110,4 @@ function ftpDelete($ftpConn, $type, $path) {
 		return ftp_rmdir($ftpConn, $path);
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/ftp-manager.php b/lib/ftp-manager.php
index 5cd94215..5d723e88 100644
--- a/lib/ftp-manager.php
+++ b/lib/ftp-manager.php
@@ -1,10 +1,10 @@
 <?php
-include("headers.php");
-include("settings.php");
+include "headers.php";
+include "settings.php";
 $t = $text['ftp-manager'];
 
 // If we have an action to perform
-if (!$demoMode && isset($_SESSION['loggedIn']) && $_SESSION['loggedIn'] && isset($_GET['action'])) {
+if (isset($_SESSION['loggedIn'], $_GET['action']) && !$demoMode && $_SESSION['loggedIn']) {
 
 	// Get our old FTP sites & user settings
 	$oldFTPSites = $ICEcoder["ftpSites"];
@@ -54,7 +54,7 @@
 	if ($_GET['action']!="choose" && $_GET['action']!="edit") {
 
 		// Look at each of the existing FTP sites
-		for ($i=0; $i<count($oldFTPSites); $i++) {
+		for ($i=0, $iMax = count($oldFTPSites); $i< $iMax; $i++) {
 
 			// Updating
 			if ($_GET['action']=="update" && $i == $_GET['ftpSiteRef']) {
@@ -103,7 +103,7 @@
 		$settingsContents = substr($settingsContents,0,$repPosStart).$settingsNew.substr($settingsContents,$repPosEnd,strlen($settingsContents));
 
 		// Now update the config file
-		if (is_writeable($settingsFile)) {
+		if (is_writable($settingsFile)) {
 			$fh = fopen($settingsFile, 'w');
 			fwrite($fh, $settingsContents);
 			fclose($fh);
@@ -142,7 +142,7 @@
 		<form id="ftpUpdateForm" action="ftp-manager.php?action=update" method="POST">
 			<table style="width: 100%">
 			<?php
-			for ($i=0; $i<count($ftpSites); $i++) {
+			for ($i=0, $iMax = count($ftpSites); $i< $iMax; $i++) {
 				echo '<tr>';
 				echo '<td style="padding: 10px 10px 8px 0">'.$ftpSites[$i]['site'].'</td>';
 				echo '<td style="padding: 10px 10px 8px 0">'.$ftpSites[$i]['host'].'</td>';
@@ -209,4 +209,4 @@
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/lib/get-branch.php b/lib/get-branch.php
index dff4e22e..0cac6b96 100644
--- a/lib/get-branch.php
+++ b/lib/get-branch.php
@@ -1,8 +1,8 @@
 <?php
 if (!isset($ICEcoder['root'])) {
-	include("headers.php");
-	include("settings.php");
-	include("ftp-control.php");
+	include "headers.php";
+	include "settings.php";
+	include "ftp-control.php";
 }
 
 if (!$_SESSION['loggedIn']) {
@@ -84,8 +84,8 @@ function parseGitignore($file) { # $file = '/absolute/path/to/.gitignore'
 	  foreach ($lines as $line) {
 		$line = trim($line);
 		if ($line === '') continue;                 # empty line
-		if (substr($line, 0, 1) == '#') continue;   # a comment
-		if (substr($line, 0, 1) == '!') {           # negated glob
+		if (strpos($line, '#') === 0) continue;   # a comment
+		if (strpos($line, '!') === 0) {           # negated glob
 		  $line = substr($line, 1);
 		  $files = array_diff(glob("$dir/*"), glob("$dir/$line"));
 		} else {                                    # normal glob
@@ -100,7 +100,7 @@ function parseGitignore($file) { # $file = '/absolute/path/to/.gitignore'
 	// Exclude the .git dir as first item as we don't want to see that
 	$excluded = array("/.git");
 	foreach ($gi as $scanpath) {
-		$excludedTest = (parseGitignore($scanpath));
+		$excludedTest = parseGitignore($scanpath);
 		if (count($excludedTest) > 0) {
 			$excluded = array_merge($excluded, $excludedTest);
 		}
@@ -109,7 +109,7 @@ function parseGitignore($file) { # $file = '/absolute/path/to/.gitignore'
 	$objectListArray = array();
 	foreach ($objectList as $objectRef) {
 		$fileFolderName = @ltrim(substr(str_replace("\\","/",$objectRef->getPathname()), strlen($path)),"/");
-		array_push($objectListArray,$fileFolderName);
+		$objectListArray[] = $fileFolderName;
 	}
 }
 
@@ -137,12 +137,12 @@ function parseGitignore($file) { # $file = '/absolute/path/to/.gitignore'
 	ftpEnd();
 // or get local list
 } else {
-	$finalArray = scanDir($scanDir.$location);
+	$finalArray = scandir($scanDir . $location, SCANDIR_SORT_NONE);
 }
 
 foreach($finalArray as $entry) {
 	$canAdd = true;
-	for ($i=0;$i<count($_SESSION['bannedFiles']);$i++) {
+	for ($i=0, $iMax = count($_SESSION['bannedFiles']); $i< $iMax; $i++) {
 		if(str_replace("*","",$_SESSION['bannedFiles'][$i]) != "" && strpos($entry,str_replace("*","",$_SESSION['bannedFiles'][$i]))!==false) {$canAdd = false;}
 	}
 	// Only applicable for local dir, ignoring ICEcoder's dir
@@ -169,7 +169,7 @@ function parseGitignore($file) { # $file = '/absolute/path/to/.gitignore'
 natcasesort($filesArray);
 
 $finalArray = array_merge($dirArray,$filesArray);
-for ($i=0;$i<count($finalArray);$i++) {
+for ($i=0, $iMax = count($finalArray); $i< $iMax; $i++) {
 	$fileFolderName = str_replace("\\","/",$finalArray[$i]);
 	if (!isset($ftpSite)) {
 		$type = is_dir($docRoot.$iceRoot.$fileFolderName) ? "folder" : "file";
@@ -228,7 +228,7 @@ function parseGitignore($file) { # $file = '/absolute/path/to/.gitignore'
 	$i=0;
 	$dirListArray = $dirSHAArray = $dirTypeArray = array();
 	// For each of the files in our local path...
-	for ($i=0; $i<count($objectListArray); $i++) {
+	for ($i=0, $iMax = count($objectListArray); $i< $iMax; $i++) {
 		$fileFolderName = "/".$objectListArray[$i];
 
 		// If we're not looking at a .git dir, it's not a .gitignore excluded path and not a dir
@@ -245,17 +245,17 @@ function parseGitignore($file) { # $file = '/absolute/path/to/.gitignore'
 			} else {
 				$fileExt = explode(" ",pathinfo($docRoot.$iceRoot.$fileFolderName, PATHINFO_EXTENSION));
 				$fileExt = $fileExt[0];
-				if (array_search($fileExt,array("gif","jpg","jpeg","png"))!==false) {$finfo = "image";};
-				if (array_search($fileExt,array("doc","docx","ppt","rtf","pdf","zip","tar","gz","swf","asx","asf","midi","mp3","wav","aiff","mov","qt","wmv","mp4","odt","odg","odp"))!==false) {$finfo = "other";};
-			}
+				if (in_array($fileExt,array("gif","jpg","jpeg","png"))) {$finfo = "image";}
+                if (in_array($fileExt,array("doc","docx","ppt","rtf","pdf","zip","tar","gz","swf","asx","asf","midi","mp3","wav","aiff","mov","qt","wmv","mp4","odt","odg","odp"))) {$finfo = "other";}
+            }
 			if (strpos($finfo,"text")===0 || strpos($finfo, "application/xml")===0 || strpos($finfo,"empty")!==false) {
 				$contents = str_replace("\r","",$contents);
 			};
 			// Establish the blob SHA contents and push name, SHA and type into 3 arrays
 			$store = "blob ".strlen($contents)."\000".$contents;
-			array_push($dirListArray,ltrim($fileFolderName,"/"));
-			array_push($dirSHAArray,sha1($store));
-			array_push($dirTypeArray,"file");
+			$dirListArray[] = ltrim($fileFolderName, "/");
+			$dirSHAArray[] = sha1($store);
+			$dirTypeArray[] = "file";
 		}
 	}
 
@@ -266,7 +266,7 @@ function parseGitignore($file) { # $file = '/absolute/path/to/.gitignore'
 	$ghRemoteURL = str_replace("https://github.com/","",$ghRemoteURL);
 
 	// Reduce absolute excluded paths to relative
-	for ($i=0; $i<count($excluded); $i++) {
+	for ($i=0, $iMax = count($excluded); $i< $iMax; $i++) {
 		$excluded[$i] = str_replace($docRoot.$iceRoot,"",$excluded[$i]);
 	}
 	?>
@@ -479,4 +479,4 @@ function parseGitignore($file) { # $file = '/absolute/path/to/.gitignore'
 	}
 	</script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/lib/github-manager.php b/lib/github-manager.php
index 761b831a..d50cd77e 100644
--- a/lib/github-manager.php
+++ b/lib/github-manager.php
@@ -1,10 +1,10 @@
 <?php
-include("headers.php");
-include("settings.php");
+include "headers.php";
+include "settings.php";
 $t = $text['github-manager'];
 
 // If we have an action to perform
-if (!$demoMode && isset($_SESSION['loggedIn']) && $_SESSION['loggedIn'] && isset($_GET['action'])) {
+if (isset($_SESSION['loggedIn'], $_GET['action']) && !$demoMode && $_SESSION['loggedIn']) {
 
 	// Get our old paths & user settings
 	$oldLocal = $ICEcoder["githubLocalPaths"];
@@ -48,7 +48,7 @@
 			$settingsContents = substr($settingsContents,0,$repPosStart).$settingsNew.substr($settingsContents,$repPosEnd,strlen($settingsContents));
 
 			// Now update the config file
-			if (is_writeable($settingsFile)) {
+			if (is_writable($settingsFile)) {
 				$fh = fopen($settingsFile, 'w');
 				fwrite($fh, $settingsContents);
 				fclose($fh);
@@ -81,7 +81,7 @@
 		}
 
 		// Then set all the old local paths
-		for ($i=0; $i<count($oldLocal); $i++) {
+		for ($i=0, $iMax = count($oldLocal); $i< $iMax; $i++) {
 			$settingsNew .= '"'.$oldLocal[$i].'",';
 		}
 		// Rtrim off the last comma
@@ -97,7 +97,7 @@
 		}
 
 		// Then set all the old remote paths
-		for ($i=0; $i<count($oldRemote); $i++) {
+		for ($i=0, $iMax = count($oldRemote); $i< $iMax; $i++) {
 			$settingsNew .= '"'.$oldRemote[$i].'",';
 		}
 		// Rtrim off the last comma
@@ -116,7 +116,7 @@
 		$settingsNew = '"githubLocalPaths"	=> array(';
 
 		// Redo the arrays using the form data
-		for ($i=0; $i<count($oldLocal); $i++) {
+		for ($i=0, $iMax = count($oldLocal); $i< $iMax; $i++) {
 			if ($_POST['githubLocalPath'.$i] != "") {
 				$settingsNew .= '"'.injClean(xssClean($_POST['githubLocalPath'.$i],"html")).'",';
 			}
@@ -129,7 +129,7 @@
 		$settingsNew .= '"githubRemotePaths"	=> array(';
 
 		// Redo the arrays using the form data
-		for ($i=0; $i<count($oldRemote); $i++) {
+		for ($i=0, $iMax = count($oldRemote); $i< $iMax; $i++) {
 			if ($_POST['githubRemotePath'.$i] != "") {
 				$settingsNew .= '"'.injClean(xssClean($_POST['githubRemotePath'.$i],"html")).'",';
 			}
@@ -151,7 +151,7 @@
 		$settingsContents = substr($settingsContents,0,$repPosStart).$settingsNew.substr($settingsContents,$repPosEnd,strlen($settingsContents));
 
 		// Now update the config file
-		if (is_writeable($settingsFile)) {
+		if (is_writable($settingsFile)) {
 			$fh = fopen($settingsFile, 'w');
 			fwrite($fh, $settingsContents);
 			fclose($fh);
@@ -195,7 +195,7 @@
 			<td style="padding-left: 5px"><?php echo $t['Remote GitHub path'];?> <span class="info" title="<?php echo $t['Absolute URL beginning...'];?>">[?]</span></td>
 			</tr>
 			<?php
-			for ($i=0; $i<count($pathsLocal); $i++) {
+			for ($i=0, $iMax = count($pathsLocal); $i< $iMax; $i++) {
 				echo '<tr>';
 				echo '<td style="padding: 0 10px 8px 0"><input type="text" name="githubLocalPath'.$i.'" value="'.$pathsLocal[$i].'" style="width: 250px"></td>';
 				echo '<td style="padding: 0 10px 8px 0"><input type="text" name="githubRemotePath'.$i.'" value="'.$pathsRemote[$i].'" style="width: 250px"></td>';
diff --git a/lib/github.php b/lib/github.php
index cf823478..92e12765 100644
--- a/lib/github.php
+++ b/lib/github.php
@@ -1,6 +1,6 @@
 <?php
-include("headers.php");
-include("settings.php");
+include "headers.php";
+include "settings.php";
 $t = $text['github'];
 
 // SSL check, as everything is over https
@@ -13,7 +13,7 @@
 }
 
 // If we have an action to perform
-if (!$demoMode && isset($_SESSION['loggedIn']) && $_SESSION['loggedIn'] && isset($_GET['action']) && $sslAvail) {
+if (isset($_SESSION['loggedIn'], $_GET['action']) && !$demoMode && $_SESSION['loggedIn'] && $sslAvail) {
 
 	// ====
 	// AUTH
@@ -173,7 +173,7 @@
 		$selectedFiles = xssClean($_GET['selectedFiles'],"html");
 		$selectedFiles = explode(";",$selectedFiles);
 
-		for ($i=0; $i<count($selectedFiles); $i++) {
+		for ($i=0, $iMax = count($selectedFiles); $i< $iMax; $i++) {
 			// Replace pipes with slashes
 			$file = str_replace("|","/",$selectedFiles[$i]);
 
diff --git a/lib/go-localhost-root.php b/lib/go-localhost-root.php
index 7117b894..70924ce4 100644
--- a/lib/go-localhost-root.php
+++ b/lib/go-localhost-root.php
@@ -1,5 +1,5 @@
 <?php
-include_once("settings.php");
+include_once "settings.php";
 $text = $_SESSION['text'];
 $t = $text['settings-update'];
 
@@ -15,10 +15,10 @@
 	$settingsContents =
 		substr($settingsContents,0,$repPosStart).
 		'"root"			=> "",'.PHP_EOL.
-		substr($settingsContents,($repPosEnd),strlen($settingsContents));
+		substr($settingsContents, $repPosEnd,strlen($settingsContents));
 
 	// Now update the config file
-	if (is_writeable($settingsFile)) {
+	if (is_writable($settingsFile)) {
 		$fh = fopen($settingsFile, 'w');
 		fwrite($fh, $settingsContents);
 		fclose($fh);
@@ -34,4 +34,4 @@
 	?>
 <?php
 ;};
-?>
\ No newline at end of file
+?>
diff --git a/lib/headers.php b/lib/headers.php
index b178e593..8bf27831 100644
--- a/lib/headers.php
+++ b/lib/headers.php
@@ -1,11 +1,11 @@
 <?php
 // Stop if we're running an old version in the tmp dir
-if(strpos(str_replace("\\","/",dirname(__FILE__)),"tmp/oldVersion") !== false) {
+if(strpos(str_replace("\\","/",__DIR__),"tmp/oldVersion") !== false) {
 	die("This is an old version of ICEcoder. Won't run from tmp/oldVersion/ dir.");
 }
 
 // Load common functions
-include_once(dirname(__FILE__)."/settings-common.php");
+include_once __DIR__."/settings-common.php";
 if (isset($_SESSION['text'])) {
 	$text = $_SESSION['text'];
 	$t = $text['headers'];
@@ -37,4 +37,4 @@
 	header('Pragma: no-cache');						// Caching over HTTP 1.0 covered
 	header('Expires: 0');							// Caching over Proxies covered
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/help.php b/lib/help.php
index 387308fe..fe00c75f 100644
--- a/lib/help.php
+++ b/lib/help.php
@@ -1,6 +1,6 @@
 <?php
-include("headers.php");
-include("settings.php");
+include "headers.php";
+include "settings.php";
 $t = $text['help'];
 ?>
 <!DOCTYPE html>
@@ -17,7 +17,7 @@
 
 <h1 id="title"><?php echo $t['shortcuts'];?></h1>
 
-<?php $isMac = strpos($_SERVER['HTTP_USER_AGENT'], "Macintosh")>-1 ? true : false;?>
+<?php $isMac = strpos($_SERVER['HTTP_USER_AGENT'], "Macintosh") > -1;?>
 <div style="display: inline-block; width: 385px; margin-right: 20px">
 	<h2><?php echo $t['Within document'];?></h2>
 	<!-- This can only be CTRL+space as Cmd+space is a reserved apple shortcut -->
@@ -78,4 +78,4 @@
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/lib/login.php b/lib/login.php
index 2bd17957..63e006b3 100644
--- a/lib/login.php
+++ b/lib/login.php
@@ -1,6 +1,6 @@
 <?php
-include("headers.php");
-include("settings.php");
+include "headers.php";
+include "settings.php";
 $t = $text['login'];
 ?>
 <!DOCTYPE html>
diff --git a/lib/multiple-results.php b/lib/multiple-results.php
index 8c3ecd18..2b0b1620 100644
--- a/lib/multiple-results.php
+++ b/lib/multiple-results.php
@@ -1,6 +1,6 @@
 <?php
-include("headers.php");
-include("settings.php");
+include "headers.php";
+include "settings.php";
 $t = $text['multiple-results'];
 ?>
 <?php
@@ -46,7 +46,7 @@
 userTarget = top.document.findAndReplace.target.value;
 findText = top.findAndReplace.find.value;
 <?php
-$findText = str_replace("ICEcoder:","",str_replace("&#39;","\'",$_GET['find']));
+$findText = str_replace(array("&#39;", "ICEcoder:"), array("\'", ""), $_GET['find']);
 // Find in open docs?
 if (!isset($_GET['target'])) {
 $targetName = $t['document'];
@@ -129,9 +129,9 @@ function phpGrep($q, $path, $base) {
 				$bFile = false;
 				$foundInSelFile = false;
 				// Exclude banned files
-				for ($i=0;$i<count($ICEcoder['bannedFiles']);$i++) {
-					if (strpos($f,str_replace("*","",$ICEcoder['bannedFiles'][$i]))!==false) {$bFile = true;};
-				}
+				for ($i=0, $iMax = count($ICEcoder['bannedFiles']); $i< $iMax; $i++) {
+					if (strpos($f,str_replace("*","",$ICEcoder['bannedFiles'][$i]))!==false) {$bFile = true;}
+                }
 				// Exclude the folder ICEcoder is running from
 				$rootPrefix = '/'.str_replace("/","\/",preg_quote(str_replace("\\","/",$docRoot))).'/';
 				$localPath = preg_replace($rootPrefix, '', $fullPath, 1);
@@ -139,7 +139,7 @@ function phpGrep($q, $path, $base) {
 					$bFile = true;
 				}
 				$findPath = str_replace($base,"",$fullPath);
-				for ($i=0;$i<count($selectedFiles);$i++) {
+				for ($i=0, $iMax = count($selectedFiles); $i< $iMax; $i++) {
 					$stringExtra = $selectedFiles[$i] != "|" ? "/" : "";
 					if (strpos($findPath.$stringExtra,str_replace("|","/",$selectedFiles[$i]).$stringExtra)===0) {
 						$foundInSelFile = true;
@@ -238,4 +238,4 @@ function phpGrep($q, $path, $base) {
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/lib/plugins-display.php b/lib/plugins-display.php
index 1a6e4323..5132dcf1 100644
--- a/lib/plugins-display.php
+++ b/lib/plugins-display.php
@@ -1,5 +1,5 @@
 <?php
-include("headers.php");
+include "headers.php";
 
 $onLoadExtras = "";
 $pluginsDisplay = "";
@@ -8,7 +8,7 @@
 if ($_SESSION['loggedIn']) {
 	// Work out the plugins to display to the user
 	$pluginsDisplay = "";
-	for ($i=0;$i<count($ICEcoder["plugins"]);$i++) {
+	for ($i=0, $iMax = count($ICEcoder["plugins"]); $i< $iMax; $i++) {
 		$target = explode(":",$ICEcoder["plugins"][$i][4]);
 		$pluginsDisplay .= '<a href="'.$ICEcoder["plugins"][$i][3].'" title="'.$ICEcoder["plugins"][$i][0].'" target="'.$target[0].'"><img src="'.$ICEcoder["plugins"][$i][1].'" style="'.$ICEcoder["plugins"][$i][2].'" alt="'.$ICEcoder["plugins"][$i][0].'"></a><br><br>';
 	};
@@ -20,7 +20,7 @@
 
 	// Work out what plugins we'll need to set on a setInterval
 	$onLoadExtras = "";
-	for ($i=0;$i<count($ICEcoder["plugins"]);$i++) {
+	for ($i=0, $iMax = count($ICEcoder["plugins"]); $i< $iMax; $i++) {
 		if ($ICEcoder["plugins"][$i][5]!="") {
 			$onLoadExtras .= ";top.ICEcoder.startPluginIntervals(".$i.",'".$ICEcoder["plugins"][$i][3]."','".$ICEcoder["plugins"][$i][4]."','".$ICEcoder["plugins"][$i][5]."')";
 		};
diff --git a/lib/plugins-manager.php b/lib/plugins-manager.php
index c5aef66b..1af53e73 100644
--- a/lib/plugins-manager.php
+++ b/lib/plugins-manager.php
@@ -1,6 +1,6 @@
 <?php
-include("headers.php");
-include("settings.php");
+include "headers.php";
+include "settings.php";
 $t = $text['plugins-manager'];
 
 // Set the plugin data source
@@ -11,7 +11,7 @@
 $pluginsData = json_decode($pluginsDataJS, true);
 
 // If we have an action to perform
-if (!$demoMode && isset($_SESSION['loggedIn']) && $_SESSION['loggedIn'] && isset($_GET['action'])) {
+if (isset($_SESSION['loggedIn'], $_GET['action']) && !$demoMode && $_SESSION['loggedIn']) {
 
 	// Get our old plugin & user settings
 	$oldPlugins = $ICEcoder["plugins"];
@@ -65,7 +65,7 @@
 		$settingsNew = '"plugins"		=> array(';
 
 		// Set all the old plugins
-		for ($i=0; $i<count($oldPlugins); $i++) {
+		for ($i=0, $iMax = count($oldPlugins); $i< $iMax; $i++) {
 			$settingsNew .= '	array("'.$oldPlugins[$i][0].'","'.$oldPlugins[$i][1].'","'.$oldPlugins[$i][2].'","'.$oldPlugins[$i][3].'","'.$oldPlugins[$i][4].'","'.$oldPlugins[$i][5].'"),';
 		}
 		// Then add the new one
@@ -83,7 +83,7 @@
 		$settingsNew = '"plugins"		=> array(';
 
 		// Set all the old plugins
-		for ($i=0; $i<count($oldPlugins); $i++) {
+		for ($i=0, $iMax = count($oldPlugins); $i< $iMax; $i++) {
 			// As long as it's not the one we want to remove
 			if ($oldPlugins[$i][0] != $pluginsData[$_GET['plugin']]['name']) {
 				$settingsNew .= '	array("'.$oldPlugins[$i][0].'","'.$oldPlugins[$i][1].'","'.$oldPlugins[$i][2].'","'.$oldPlugins[$i][3].'","'.$oldPlugins[$i][4].'","'.$oldPlugins[$i][5].'"),';
@@ -109,8 +109,8 @@
 		$settingsNew = '"plugins"		=> array(';
 
 		// Redo the arrays using the form data
-		for ($i=0; $i<count($oldPlugins); $i++) {
-			$timer = intval($_POST['timer'.$i]);
+		for ($i=0, $iMax = count($oldPlugins); $i< $iMax; $i++) {
+			$timer = (int)$_POST['timer' . $i];
 			if ($timer == 0) {
 				$timer = "";
 			}
@@ -132,7 +132,7 @@
 	$settingsContents = substr($settingsContents,0,$repPosStart).$settingsNew.substr($settingsContents,$repPosEnd,strlen($settingsContents));
 
 	// Now update the config file
-	if (is_writeable($settingsFile)) {
+	if (is_writable($settingsFile)) {
 		$fh = fopen($settingsFile, 'w');
 		fwrite($fh, $settingsContents);
 		fclose($fh);
@@ -202,7 +202,7 @@ function deletePlugin($dir) {
 			<td style="padding-left: 5px"><?php echo $t['Timer'];?></td>
 			</tr>
 			<?php
-			for ($i=0; $i<count($plugins); $i++) {
+			for ($i=0, $iMax = count($plugins); $i< $iMax; $i++) {
 				echo '<tr>';
 				echo '<td style="padding: 0 10px 8px 0; width: 28px; text-align: center"><img src="../'.$plugins[$i][1].'" alt="'.$plugins[$i][0].'"><input type="hidden" name="name'.$i.'" value="'.$plugins[$i][0].'"><input type="hidden" name="icon'.$i.'" value="'.$plugins[$i][1].'"><input type="hidden" name="style'.$i.'" value="'.$plugins[$i][2].'"></td>';
 				echo '<td style="padding: 8px 10px 8px 0; width: 250px; white-space: nowrap">'.$plugins[$i][0].'</td>';
@@ -233,13 +233,13 @@ function deletePlugin($dir) {
 		?>
 			<table>
 			<?php
-			for ($i=0; $i<count($pluginsData); $i++) {
+			for ($i=0, $iMax = count($pluginsData); $i< $iMax; $i++) {
 				if ($i % 2 == 0) {
 					echo '<tr>'.PHP_EOL;
 				}
 
 				$installUninstallButton = '<div style="display: inline-block; padding: 5px; background: #2187e7; color: #fff; font-size: 12px; cursor: pointer" onclick="window.location=\'plugins-manager.php?action=install&plugin='.$i.'&csrf='.$_SESSION["csrf"].'\'">'.$t['Install'].'</div>';
-				for ($j=0; $j<count($plugins); $j++) {
+				for ($j=0, $jMax = count($plugins); $j< $jMax; $j++) {
 					if ($pluginsData[$i]['name'] == $plugins[$j][0]) {
 						$installUninstallButton = '<div style="display: inline-block; padding: 5px; background: #333; color: #fff; font-size: 12px; cursor: pointer" onclick="window.location=\'plugins-manager.php?action=uninstall&plugin='.$i.'&csrf='.$_SESSION["csrf"].'\'">'.$t['Uninstall'].'</div>';
 					}
diff --git a/lib/properties.php b/lib/properties.php
index 615a475b..ccc7bfd7 100644
--- a/lib/properties.php
+++ b/lib/properties.php
@@ -1,6 +1,6 @@
 <?php
-include("headers.php");
-include("settings.php");
+include "headers.php";
+include "settings.php";
 $t = $text['properties'];
 
 // Establish the real absolute path to the file/folder
@@ -30,7 +30,7 @@
 // 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));
+	$bytes = (int)fgets($io, 80);
 	pclose($io);
 }
 // Change into kilobytes
@@ -48,17 +48,17 @@
 <br><br>
 <span class="column" style="width: 180px"><?php echo $t['Type'];?>: <?php echo is_dir($fileName) ? "Folder" : "File"; ?></span>
 <span class="column" style="margin: 0 10px"><?php echo $t['Readable Writeable'];?>: 
-<?php echo is_readable($fileName) ? "Yes" : "No"; ?> / <?php echo is_writeable($fileName) ? "Yes" : "No";?>
+<?php echo is_readable($fileName) ? "Yes" : "No"; ?> / <?php echo is_writable($fileName) ? "Yes" : "No";?>
 </span>
 <span class="column"><?php echo $t['Relative path'];?>: <?php echo str_replace($docRoot,"",$fileName);?></span>
 <br><br>
 <span class="column" style="width: 410px"><?php echo $t['Absolute path'];?>:<br><?php echo $fileName;?></span>
 <?php if (is_dir($fileName)) {?>
 <span class="column" style="width: 180px"><?php echo $t['Contains'];?>:<br><?php
-$dirList = scandir($fileName);
+$dirList = scandir($fileName, SCANDIR_SORT_NONE);
 $dirCount = 0;
 $fileCount = 0;
-for ($i=0; $i<count($dirList); $i++) {
+for ($i=0, $iMax = count($dirList); $i< $iMax; $i++) {
 	if ($dirList[$i] != "." && $dirList[$i] != "..") {
 		if (is_dir($fileName."/".$dirList[$i])) {
 			$dirCount++;
@@ -172,4 +172,4 @@ function changePerms(val) {
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/lib/session-active-ping.php b/lib/session-active-ping.php
index b6276a8a..6a7caa5e 100644
--- a/lib/session-active-ping.php
+++ b/lib/session-active-ping.php
@@ -1,6 +1,6 @@
 <?php
 // Load headings and settings
 // Do this every 5 mins to keep session alive
-include("headers.php");
-include("settings.php");
-?>
\ No newline at end of file
+include "headers.php";
+include "settings.php";
+?>
diff --git a/lib/settings-common.php b/lib/settings-common.php
index 00b7512d..909d17b3 100644
--- a/lib/settings-common.php
+++ b/lib/settings-common.php
@@ -2,7 +2,7 @@
 // Don't display, but log all errors
 ini_set('display_errors', 0);
 ini_set('log_errors', 1);
-ini_set('error_log', dirname(__FILE__).'/../error-log.txt');
+ini_set('error_log', __DIR__.'/../error-log.txt');
 error_reporting(-1);
 
 // Set our default timezone and supress warning with @
@@ -22,13 +22,13 @@
 	ini_set('session.name','ICEcoder_Cookie');			// Set a seperate cookie session name
 	ini_set('session.cookie_lifetime','0');        			// Until the browser restarts by default
 	ini_set('session.cookie_domain','');				// This domain only
-//	ini_set('session.cookie_path',str_replace($_SERVER['DOCUMENT_ROOT'],'',dirname(dirname(__FILE__)))); 	// ICEcoder path only, fails ON IE
+//	ini_set('session.cookie_path',str_replace($_SERVER['DOCUMENT_ROOT'],'',dirname(__DIR__))); 	// ICEcoder path only, fails ON IE
 	ini_set('session.use_trans_sid','0');				// Ensure this insecure feature is disabled
 	ini_set('session.hash_function','sha512');			// Use Sha512 for session
 	ini_set('session.hash_bits_per_character','6');			// Specify hash scheme of 0-9,a-v,A-Z,-,,
 //	ini_set('session.use_strict_mode','1');				// Reject any session ID that was user provided and not generated by the session			(since PHP 5.5.2)
 	ini_set('session.httponly','1');				// Only allow http protocol (ie, not JS) access to the cookie						(since PHP 5.2.0)
-	ini_set('session.save_path',dirname(__FILE__).'/../tmp');	// Localise the session files to /tmp
+	ini_set('session.save_path',__DIR__.'/../tmp');	// Localise the session files to /tmp
 
 	if (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') {
 		ini_set('session.cookie_secure','1');			// Only allows access to session ID when protocol is HTTPS, switched on under 'if https' condition 
@@ -90,7 +90,7 @@ function getData($url,$type='fopen',$dieMessage=false,$timeout=60) {
 
 // Logout if that's the action we're taking
 if (isset($_GET['logout'])) {
-	include(dirname(__FILE__)."/../processes/on-user-logout.php");
+	include __DIR__."/../processes/on-user-logout.php";
 	$_SESSION['loggedIn']=false;
 	$_SESSION['username']=false;
 	session_destroy();
@@ -128,7 +128,7 @@ function strClean($var) {
 
 // returns a number, whole or decimal or null
 function numClean($var) {
-	return is_numeric($var) ? floatval($var) : false;
+	return is_numeric($var) ? (float)$var : false;
 }
 
 // Clean XSS attempts using different contexts
@@ -167,14 +167,13 @@ function xssClean($data,$type) {
 		}
 	}
 
-	$output = str_replace($bad, $good, $data);
-	return $output;
+    return str_replace($bad, $good, $data);
 }
 
 
 // Clean PHP code injection attempts
 function injClean($data) {
-	$output = str_replace("(", "", str_replace(")", "", str_replace(";", "", $data)));
+	$output = str_replace(array(")", "("), "", str_replace(";", "", $data));
 	return $output;
 }
 
@@ -254,7 +253,7 @@ function getVersionsCount($fileLoc,$fileName) {
 	$dateCounts = array();
 	$backupDateDirs = array();
 	// Establish the base, host and date dirs within...
-	$backupDirBase = str_replace("\\","/",dirname(__FILE__))."/../backups/";
+	$backupDirBase = str_replace("\\","/",__DIR__)."/../backups/";
 	$backupDirHost = isset($ftpSite) ? parse_url($ftpSite,PHP_URL_HOST) : "localhost";
         // check if folder exists if local before enumerating contents
         if(!isset($ftpSite)) {
@@ -265,21 +264,21 @@ function getVersionsCount($fileLoc,$fileName) {
                 $backupDateDirs = scandir($backupDirBase.$backupDirHost,1);
         }
 	// Get rid of . and .. from date dirs array
-	for ($i=0; $i<count($backupDateDirs); $i++) {
+	for ($i=0, $iMax = count($backupDateDirs); $i< $iMax; $i++) {
 		if ($backupDateDirs[$i] == "." || $backupDateDirs[$i] == "..") {
 			array_splice($backupDateDirs,$i,1);
 			$i--;
 		}
 	}
 	// Check the backup index in each dir and add up the counts from matching lines
-	for ($i=0; $i<count($backupDateDirs); $i++) {
+	for ($i=0, $iMax = count($backupDateDirs); $i< $iMax; $i++) {
 		$backupIndex = $backupDirBase.$backupDirHost."/".$backupDateDirs[$i]."/.versions-index";
 		// Have a .versions-index file? Get contents
 		if (file_exists($backupIndex) && is_readable($backupIndex)) {
 			$versionsInfo = getData($backupIndex);
 			$versionsInfo = explode("\n",$versionsInfo);
 			// For each line, check if it's our file and if so, add the count to our $count value and $dateCount array
-			for ($j=0; $j<count($versionsInfo); $j++) {
+			for ($j=0, $jMax = count($versionsInfo); $j< $jMax; $j++) {
 				// Replace any backslashes in $fileLoc
 				$fileLoc = str_replace("\\","/",$fileLoc);
 				// Join $fileLock and $fileName into a path and replace double slashes
@@ -288,8 +287,8 @@ function getVersionsCount($fileLoc,$fileName) {
 				if (strpos($versionsInfo[$j],$fileRef) === 0) {
 					// We have a match, so split on the " = " and we can grab number as 2nd part
 					$lineInfo = explode(" = ",$versionsInfo[$j]);
-					$count += intval($lineInfo[1]);
-					$dateCounts[$backupDateDirs[$i]] = intval($lineInfo[1]);
+					$count += (int)$lineInfo[1];
+					$dateCounts[$backupDateDirs[$i]] = (int)$lineInfo[1];
 				}
 			}
 		}
diff --git a/lib/settings-save-current-files.php b/lib/settings-save-current-files.php
index 44b1b065..b9f60251 100644
--- a/lib/settings-save-current-files.php
+++ b/lib/settings-save-current-files.php
@@ -1,5 +1,5 @@
 <?php
-include_once("settings-common.php");
+include_once "settings-common.php";
 $text = $_SESSION['text'];
 $t = $text['settings-save-current-files'];
 
@@ -15,7 +15,7 @@
 			$saveFiles=strClean($_GET['saveFiles']);
 			$saveFilesArray = explode(",",$saveFiles);
 			$saveFiles="";
-			for ($i=0;$i<count($saveFilesArray);$i++) {
+			for ($i=0, $iMax = count($saveFilesArray); $i< $iMax; $i++) {
 				$saveFilesArray[$i] = str_replace("/","|",$docRoot).$saveFilesArray[$i];
 				$saveFiles .= $saveFilesArray[$i].",";
 			}
@@ -24,9 +24,9 @@
 			$saveFilesArray = array();
 			$saveFiles = "";
 		}
-		$settingsContents = substr($settingsContents,0,$repPosStart).$saveFiles.substr($settingsContents,($repPosStart+$repPosEnd),strlen($settingsContents));
+		$settingsContents = substr($settingsContents,0,$repPosStart).$saveFiles.substr($settingsContents, $repPosStart+$repPosEnd,strlen($settingsContents));
 		// Now update the config file
-		if (is_writeable($settingsFile)) {
+		if (is_writable($settingsFile)) {
 			$fh = fopen($settingsFile, 'w');
 			fwrite($fh, $settingsContents);
 			fclose($fh);
@@ -36,16 +36,16 @@
 
 		// Update our last10Files var?
 		$last10FilesArray = explode(",",$ICEcoder["last10Files"]);
-		for ($i=0;$i<count($saveFilesArray);$i++) {
+		for ($i=0, $iMax = count($saveFilesArray); $i< $iMax; $i++) {
 			$inLast10Files = in_array($saveFilesArray[$i],$last10FilesArray);
 			if (!$inLast10Files && $saveFilesArray[$i] !="") {
 				$repPosStart = strpos($settingsContents,'last10Files"		=> "')+18;
 				$repPosEnd = strpos($settingsContents,'"',$repPosStart)-$repPosStart;
 				$commaExtra = $ICEcoder["last10Files"]!="" ? "," : "";
-				if (count($last10FilesArray)>=10) {$ICEcoder["last10Files"]=substr($ICEcoder["last10Files"],0,strrpos($ICEcoder["last10Files"],','));};
-				$settingsContents = substr($settingsContents,0,$repPosStart).$saveFilesArray[$i].$commaExtra.$ICEcoder["last10Files"].substr($settingsContents,($repPosStart+$repPosEnd),strlen($settingsContents));
+				if (count($last10FilesArray)>=10) {$ICEcoder["last10Files"]=substr($ICEcoder["last10Files"],0,strrpos($ICEcoder["last10Files"],','));}
+                $settingsContents = substr($settingsContents,0,$repPosStart).$saveFilesArray[$i].$commaExtra.$ICEcoder["last10Files"].substr($settingsContents, $repPosStart+$repPosEnd,strlen($settingsContents));
 				// Now update the config file
-				if (is_writeable($settingsFile)) {
+				if (is_writable($settingsFile)) {
 					$fh = fopen($settingsFile, 'w');
 					fwrite($fh, $settingsContents);
 					fclose($fh);
@@ -57,4 +57,4 @@
 	}
 	echo '<script>top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);</script>';
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/settings-screen.php b/lib/settings-screen.php
index 068d30a3..c11e832e 100644
--- a/lib/settings-screen.php
+++ b/lib/settings-screen.php
@@ -1,6 +1,6 @@
 ﻿<?php
-include("headers.php");
-include("settings.php");
+include "headers.php";
+include "settings.php";
 $t = $text['settings-screen'];
 ?>
 <!DOCTYPE html>
@@ -27,11 +27,11 @@
 $handle = opendir('../'.$ICEcoder["codeMirrorDir"].'/theme/');
 while (false !== ($file = readdir($handle))) {
 	if ($file !== "." && $file != "..") {
-		array_push($themeArray,basename($file,".css"));
+		$themeArray[] = basename($file, ".css");
 	}
 }
 sort($themeArray);
-for ($i=0;$i<count($themeArray);$i++) {
+for ($i=0, $iMax = count($themeArray); $i< $iMax; $i++) {
 	echo '<link rel="stylesheet" href="../'.$ICEcoder["codeMirrorDir"].'/theme/'.$themeArray[$i].'.css?microtime='.microtime(true).'">'.PHP_EOL;
 }
 ?>
@@ -101,7 +101,7 @@
 		<?php
 		$langFiles = array("chinese-simplified.php","chinese-traditional.php","dutch.php","english.php","french.php","german.php","italian.php","norwegian.php","persian.php","portuguese-brazilian.php","spanish.php");
 		$langText = array("中国（简体）","中國（繁體）","Nederlands","English","Français","Deutsch","Italiano","Norsk","فارسی","Portugues(br)","Espa&ntilde;ol");
-		for ($i=0; $i<count($langFiles); $i++) {
+		for ($i=0, $iMax = count($langFiles); $i< $iMax; $i++) {
 			echo '<option value="'.$langFiles[$i].'"'.($ICEcoder["languageUser"]==$langFiles[$i] ? ' selected' : '').'>'.$langText[$i].'</option>'.PHP_EOL;
 		}
 		?>
@@ -163,11 +163,11 @@
 		<div style="padding: 5px 5px 5px 5px; color: #888">
 		<?php
 		// Display number of days backups available
-		$backupDirBase = str_replace("\\","/",dirname(__FILE__))."/../backups/";
+		$backupDirBase = str_replace("\\","/",__DIR__)."/../backups/";
 		$backupDirHost = isset($ftpSite) ? parse_url($ftpSite,PHP_URL_HOST) : "localhost";
-		$backupDirsList = scandir($backupDirBase.$backupDirHost);
+		$backupDirsList = scandir($backupDirBase . $backupDirHost, SCANDIR_SORT_NONE);
 		// Remove . and .. from array
-		for ($i=0; $i<count($backupDirsList); $i++) {
+		for ($i=0, $iMax = count($backupDirsList); $i< $iMax; $i++) {
 			if ($backupDirsList[$i] == "." || $backupDirsList[$i] == "..") {
 				array_splice($backupDirsList,$i,1);
 				$i--;
@@ -221,7 +221,7 @@ function find(start,history) {
 		<select onchange="selectTheme();showButton()" id="select" name="theme" style="width: 95px">
 		    <option<?php if ($ICEcoder["theme"]=="default") {echo ' selected';}; ?>>default</option>
 		<?php
-		for ($i=0;$i<count($themeArray);$i++) {
+		for ($i=0, $iMax = count($themeArray); $i< $iMax; $i++) {
 			$optionSelected = $ICEcoder["theme"]==$themeArray[$i] ? ' selected' : '';
 			echo '<option'.$optionSelected.'>'.$themeArray[$i].'</option>'.PHP_EOL;
 		}
@@ -438,4 +438,4 @@ function changeFontSize() {
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/lib/settings-update.php b/lib/settings-update.php
index a759ee12..4c4bb751 100644
--- a/lib/settings-update.php
+++ b/lib/settings-update.php
@@ -1,10 +1,10 @@
 <?php
-include_once("settings-common.php");
+include_once "settings-common.php";
 $text = $_SESSION['text'];
 $t = $text['settings-update'];
 
 // Update this config file?
-if (!$demoMode && isset($_SESSION['loggedIn']) && $_SESSION['loggedIn'] && isset($_POST["theme"]) && $_POST["theme"]) {
+if (isset($_SESSION['loggedIn'], $_POST["theme"]) && !$demoMode && $_SESSION['loggedIn'] && $_POST["theme"]) {
 	$settingsContents = getData($settingsFile);
 	// Replace our settings vars
 	$repPosStart = strpos($settingsContents,'"root"');
@@ -20,7 +20,7 @@
 	$ICEcoder["updateDiffOnSave"]		= isset($_POST['updateDiffOnSave']) && $_POST['updateDiffOnSave'] ? "true" : "false";
 	$ICEcoder["languageUser"]		= strClean($_POST['languageUser']);
 	$ICEcoder["backupsKept"]		= isset($_POST['backupsKept']) && $_POST['backupsKept'] ? "true" : "false";
-	$ICEcoder["backupsDays"]		= intval($_POST['backupsDays']);
+	$ICEcoder["backupsDays"]		= (int)$_POST['backupsDays'];
 	$ICEcoder["deleteToTmp"]		= isset($_POST['deleteToTmp']) && $_POST['deleteToTmp'] ? "true" : "false";
 	$ICEcoder["findFilesExclude"]		= 'array("'.str_replace(',','","',str_replace(" ","",strClean($_POST['findFilesExclude']))).'")';
 	$ICEcoder["codeAssist"]			= isset($_POST['codeAssist']) && $_POST['codeAssist'] ? "true" : "false";
@@ -32,7 +32,7 @@
 	$ICEcoder["bannedFiles"]		= 'array("'.str_replace(',','","',str_replace(" ","",strClean($_POST['bannedFiles']))).'")';
 	$ICEcoder["bannedPaths"]		= 'array("'.str_replace(',','","',str_replace(" ","",strClean($_POST['bannedPaths']))).'")';
 	$ICEcoder["allowedIPs"]			= 'array("'.str_replace(',','","',str_replace(" ","",strClean($_POST['allowedIPs']))).'")';
-	$ICEcoder["autoLogoutMins"]		= intval($_POST['autoLogoutMins']);
+	$ICEcoder["autoLogoutMins"]		= (int)$_POST['autoLogoutMins'];
 	$ICEcoder["theme"]			= strClean($_POST['theme']);
 	$ICEcoder["fontSize"]			= strClean($_POST['fontSize']);
 	$ICEcoder["lineWrapping"]		= strClean($_POST['lineWrapping']);
@@ -43,16 +43,16 @@
 	$ICEcoder["autoCloseBrackets"]		= strClean($_POST['autoCloseBrackets']);
 	$ICEcoder["indentWithTabs"]		= strClean($_POST['indentWithTabs']);
 	$ICEcoder["indentAuto"]			= strClean($_POST['indentAuto']);
-	$ICEcoder["indentSize"]			= intval($_POST['indentSize']);
+	$ICEcoder["indentSize"]			= (int)$_POST['indentSize'];
 	$ICEcoder["pluginPanelAligned"]		= strClean($_POST['pluginPanelAligned']);
 	$ICEcoder["bugFilePaths"]		= 'array("'.str_replace(',','","',str_replace(" ","",strClean($_POST['bugFilePaths']))).'")';
-	$ICEcoder["bugFileCheckTimer"]		= intval($_POST['bugFileCheckTimer']) >= 0 ? intval($_POST['bugFileCheckTimer']) : 0;
-	$ICEcoder["bugFileMaxLines"]		= intval($_POST['bugFileMaxLines']);
+	$ICEcoder["bugFileCheckTimer"]		= (int)$_POST['bugFileCheckTimer'] >= 0 ? (int)$_POST['bugFileCheckTimer'] : 0;
+	$ICEcoder["bugFileMaxLines"]		= (int)$_POST['bugFileMaxLines'];
 	$ICEcoder["githubAuthToken"]		= strClean($_POST['githubAuthToken']);
 
 	$settingsArray = array("root","checkUpdates","openLastFiles","updateDiffOnSave","languageUser","backupsKept","backupsDays","deleteToTmp","findFilesExclude","codeAssist","visibleTabs","lockedNav","tagWrapperCommand","autoComplete","password","bannedFiles","bannedPaths","allowedIPs","autoLogoutMins","theme","fontSize","lineWrapping","lineNumbers","showTrailingSpace","matchBrackets","autoCloseTags","autoCloseBrackets","indentWithTabs","indentAuto","indentSize","pluginPanelAligned","bugFilePaths","bugFileCheckTimer","bugFileMaxLines","githubAuthToken");
 	$settingsNew = "";
-	for ($i=0;$i<count($settingsArray);$i++) {
+	for ($i=0, $iMax = count($settingsArray); $i< $iMax; $i++) {
 		$settingsNew .= '"'.$settingsArray[$i].'"	=> ';
 		// Wrap certain values in double quotes
 		$settingWrap = $settingsArray[$i]=="root"||$settingsArray[$i]=="password"||$settingsArray[$i]=="languageUser"||$settingsArray[$i]=="theme"||$settingsArray[$i]=="fontSize"||$settingsArray[$i]=="tagWrapperCommand"||$settingsArray[$i]=="autoComplete"||$settingsArray[$i]=="pluginPanelAligned"||$settingsArray[$i]=="githubAuthToken" ? '"' : '';
@@ -60,10 +60,10 @@
 	}
 
 	// Compile our new settings
-	$settingsContents = substr($settingsContents,0,$repPosStart).$settingsNew.substr($settingsContents,($repPosEnd),strlen($settingsContents));
+	$settingsContents = substr($settingsContents,0,$repPosStart).$settingsNew.substr($settingsContents, $repPosEnd,strlen($settingsContents));
 
 	// Now update the config file
-	if (is_writeable($settingsFile)) {
+	if (is_writable($settingsFile)) {
 		$fh = fopen($settingsFile, 'w');
 		fwrite($fh, $settingsContents);
 		fclose($fh);
@@ -73,7 +73,7 @@
 
 	// OK, now the config file has been updated, update our current session with new arrays
 	$settingsArray = array("findFilesExclude","bannedFiles","allowedIPs");
-	for ($i=0;$i<count($settingsArray);$i++) {
+	for ($i=0, $iMax = count($settingsArray); $i< $iMax; $i++) {
 		$_SESSION[$settingsArray[$i]] = $ICEcoder[$settingsArray[$i]] = explode(",",str_replace(" ","",strClean($_POST[$settingsArray[$i]])));
 	}
 
@@ -87,14 +87,12 @@
 	// Change multiUser and enableRegistration in config___settings.php
 	$generalSettingsContents = getData($configSettings);
 	$isMultiUser = isset($_POST['multiUser']) && $_POST['multiUser'] ? "true" : "false";
-	$generalSettingsContents = str_replace('"multiUser"		=> true,','"multiUser"		=> '.$isMultiUser.',',$generalSettingsContents);
-	$generalSettingsContents = str_replace('"multiUser"		=> false,','"multiUser"		=> '.$isMultiUser.',',$generalSettingsContents);
+    $generalSettingsContents = str_replace(array('"multiUser"		=> true,', '"multiUser"		=> false,'), array('"multiUser"		=> ' . $isMultiUser . ',', '"multiUser"		=> ' . $isMultiUser . ','), $generalSettingsContents);
 
 	$isEnableRegistration = isset($_POST['enableRegistration']) && $_POST['enableRegistration'] ? "true" : "false";
-	$generalSettingsContents = str_replace('"enableRegistration"	=> true','"enableRegistration"	=> '.$isEnableRegistration,$generalSettingsContents);
-	$generalSettingsContents = str_replace('"enableRegistration"	=> false','"enableRegistration"	=> '.$isEnableRegistration,$generalSettingsContents);
+    $generalSettingsContents = str_replace(array('"enableRegistration"	=> true', '"enableRegistration"	=> false'), array('"enableRegistration"	=> ' . $isEnableRegistration, '"enableRegistration"	=> ' . $isEnableRegistration), $generalSettingsContents);
 
-	if (is_writeable($configSettings)) {
+	if (is_writable($configSettings)) {
 		$fConfigSettings = fopen($configSettings, 'w');
 		fwrite($fConfigSettings, $generalSettingsContents);
 		fclose($fConfigSettings);
@@ -114,4 +112,4 @@
 	$jsBugFilePaths = "['".str_replace(",","','",str_replace(" ","",strClean($_POST['bugFilePaths'])))."']";
 	echo "<script>top.ICEcoder.settingsScreen('hide');top.ICEcoder.useNewSettings('".$themeURL."',".$ICEcoder["codeAssist"].",".$ICEcoder["lockedNav"].",'".$ICEcoder["tagWrapperCommand"]."','".$ICEcoder["autoComplete"]."',".$ICEcoder["visibleTabs"].",'".$ICEcoder["fontSize"]."',".$ICEcoder["lineWrapping"].",".$ICEcoder["lineNumbers"].",".$ICEcoder["showTrailingSpace"].",".$ICEcoder["matchBrackets"].",".$ICEcoder["autoCloseTags"].",".$ICEcoder["autoCloseBrackets"].",".$ICEcoder["indentWithTabs"].",".$ICEcoder["indentAuto"].",".$ICEcoder["indentSize"].",'".$ICEcoder["pluginPanelAligned"]."',".$jsBugFilePaths.",".$ICEcoder["bugFileCheckTimer"].",".$ICEcoder["bugFileMaxLines"].",'".$githubAuthTokenSet."',".$ICEcoder["updateDiffOnSave"].",".$ICEcoder["autoLogoutMins"].",".$refreshFM.");top.iceRoot = '".$ICEcoder["root"]."';</script>";
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/settings.php b/lib/settings.php
index 7a84934c..7bd08a50 100644
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -5,10 +5,10 @@
 
 // Create a new config file if it doesn't exist yet.
 // The reason we create it, is so it has PHP write permissions, meaning we can update it later
-if (!file_exists(dirname(__FILE__)."/".$configSettings)) {
+if (!file_exists(__DIR__."/".$configSettings)) {
 	// Include our params to make use of (as $newConfigSettingsFile)
-	include(dirname(__FILE__)."/settings-system-params.php");
-	if ($fConfigSettings = fopen(dirname(__FILE__)."/".$configSettings, 'w')) {
+	include __DIR__."/settings-system-params.php";
+	if ($fConfigSettings = fopen(__DIR__."/".$configSettings, 'w')) {
 		fwrite($fConfigSettings, $newConfigSettingsFile);
 		fclose($fConfigSettings);
 	} else {
@@ -17,10 +17,10 @@
 }
 
 // Load config settings
-include(dirname(__FILE__)."/".$configSettings);
+include __DIR__."/".$configSettings;
 
 // Load common functions
-include_once(dirname(__FILE__)."/settings-common.php");
+include_once __DIR__."/settings-common.php";
 
 // Establish user settings file
 $username = "";
@@ -32,20 +32,20 @@
 $setPWorLogin = "login";
 
 // Create user settings file if it doesn't exist
-if (!file_exists(dirname(__FILE__)."/".$settingsFile) && $ICEcoderSettings['enableRegistration']) {
-	if (!copy(dirname(__FILE__)."/".$configUsersTemplate, dirname(__FILE__)."/".$settingsFile)) {
+if (!file_exists(__DIR__."/".$settingsFile) && $ICEcoderSettings['enableRegistration']) {
+	if (!copy(__DIR__."/".$configUsersTemplate, __DIR__."/".$settingsFile)) {
 		die("Couldn't create $settingsFile. Maybe you need write permissions on the lib folder?");
 	}
 	$setPWorLogin = "set password";
 }
 
 // Load user settings
-include(dirname(__FILE__)."/".$settingsFile);
+include __DIR__."/".$settingsFile;
 
 // Remove any previous files that are no longer there
 $prevFiles = explode(",",$ICEcoderUserSettings['previousFiles']);
 $prevFilesAvail = "";
-for ($i=0; $i<count($prevFiles); $i++) {
+for ($i=0, $iMax = count($prevFiles); $i< $iMax; $i++) {
 	if (file_exists(str_replace("|","/",$prevFiles[$i]))) {
 		$prevFilesAvail .= $prevFiles[$i].",";
 	}
@@ -55,18 +55,18 @@
 
 // Replace our config created date with the filemtime?
 if (basename($_SERVER['SCRIPT_NAME']) == "index.php" && $ICEcoderUserSettings['configCreateDate'] == 0) {
-	$settingsContents = getData(dirname(__FILE__)."/".$settingsFile);
+	$settingsContents = getData(__DIR__."/".$settingsFile);
 	clearstatcache();
-	$configfilemtime = filemtime(dirname(__FILE__)."/"."config___settings.php");
+	$configfilemtime = filemtime(__DIR__."/"."config___settings.php");
 	// Make it a number (avoids null, undefined etc)
-	$configfilemtime = intval($configfilemtime);
+	$configfilemtime = (int)$configfilemtime;
 	// Set it to the epoch time now if we don't have a real value
 	if ($configfilemtime == 0) {
 		$configfilemtime = time();
 	}
 	$settingsContents = str_replace('"configCreateDate"	=> 0,','"configCreateDate"	=> '.$configfilemtime.',',$settingsContents);
 	// Now update the config file
-	$fh = fopen(dirname(__FILE__)."/".$settingsFile, 'w') or die("Can't update config file. Please set public write permissions on ".$settingsFile." and press refresh");
+	$fh = fopen(__DIR__."/".$settingsFile, 'w') or die("Can't update config file. Please set public write permissions on ".$settingsFile." and press refresh");
 	fwrite($fh, $settingsContents);
 	fclose($fh);
 	// Set the new value in array
@@ -75,21 +75,21 @@
 
 // On mismatch of settings file to system, rename to .old and reload
 If ($ICEcoderUserSettings["versionNo"] != $ICEcoderSettings["versionNo"]) {
-	rename(dirname(__FILE__)."/".$settingsFile,dirname(__FILE__)."/".str_replace(".php",".old",$settingsFile));
+	rename(__DIR__."/".$settingsFile,__DIR__."/".str_replace(".php",".old",$settingsFile));
 	header("Location: settings.php");
 	echo "<script>window.location='settings.php';</script>";
 	die('Found old settings file, reloading...');
 }
 
 // Join ICEcoder settings and user settings together to make our final ICEcoder array
-$ICEcoder = $ICEcoderSettings + $ICEcoderUserSettings;
+$ICEcoder = array_merge($ICEcoderSettings , $ICEcoderUserSettings);
 
 // Include language file
 // Load base first as foundation
-include(dirname(__FILE__)."/../lang/".basename($ICEcoder['languageBase']));
+include __DIR__."/../lang/".basename($ICEcoder['languageBase']);
 $baseText = $text;
 // Load chosen language ontop to replace base
-include(dirname(__FILE__)."/../lang/".basename($ICEcoder['languageUser']));
+include __DIR__."/../lang/".basename($ICEcoder['languageUser']);
 $text = array_replace_recursive($baseText, $text);
 $_SESSION['text'] = $text;
 
@@ -114,10 +114,10 @@
 $tRemaining = ($ICEcoder['configCreateDate']+$tPeriod)-time();
 if ($tRemaining > $tPeriod || $ICEcoder['configCreateDate'] == 0) {$tRemaining = $tPeriod;};
 $tRemainingPerc = number_format($tRemaining/$tPeriod,2);
-$tDaysRemaining = intval($tRemaining/(60*60*24));
+$tDaysRemaining = (int)($tRemaining / (60 * 60 * 24));
 
 // Update this config file?
-include(dirname(__FILE__)."/settings-update.php");
+include __DIR__."/settings-update.php";
 
 // Set loggedIn and username to false if not set as yet
 if (!isset($_SESSION['loggedIn'])) {$_SESSION['loggedIn'] = false;};
@@ -132,12 +132,12 @@
 			$_SESSION['username'] = $_POST['username'];
 		}
 		$_SESSION['loggedIn'] = true;
-		include(dirname(__FILE__)."/../processes/on-user-login.php");
+		include __DIR__."/../processes/on-user-login.php";
 		header('Location: ../');
 		echo "<script>window.location='../';</script>";
 		die('Logging you in...');
 	} else {
-		include(dirname(__FILE__)."/../processes/on-user-login-fail.php");
+		include __DIR__."/../processes/on-user-login-fail.php";
 	}
 };
 
@@ -160,7 +160,7 @@
 
 // Setup our file security vars
 $settingsArray = array("findFilesExclude","bannedFiles","allowedIPs");
-for ($i=0;$i<count($settingsArray);$i++) {
+for ($i=0, $iMax = count($settingsArray); $i< $iMax; $i++) {
 	if (!isset($_SESSION[$settingsArray[$i]])) {$_SESSION[$settingsArray[$i]] = $ICEcoder[$settingsArray[$i]];}
 }
 
@@ -184,10 +184,10 @@
 }
 
 // Save currently opened files in previousFiles and last10Files arrays
-include(dirname(__FILE__)."/settings-save-current-files.php");
+include __DIR__."/settings-save-current-files.php";
 
 // Display the plugins
-include(dirname(__FILE__)."/plugins-display.php");
+include __DIR__."/plugins-display.php";
 
 // If loggedIn is false or we don't have a password set yet and we're not on login screen, boot user to that
 if ((!$_SESSION['loggedIn'] || $ICEcoder["password"] == "") && !strpos($_SERVER['SCRIPT_NAME'],"lib/login.php")) {
@@ -205,8 +205,7 @@
 	if (generateHash(strClean($_POST['email']),$_POST['code'])==$_POST['code']) {
 		$settingsContents = getData($settingsFile);
 		// Replace our empty email & code with the one submitted by user
-		$settingsContents = str_replace('"licenseEmail"		=> "",','"licenseEmail"		=> "'.$_POST['email'].'",',$settingsContents);
-		$settingsContents = str_replace('"licenseCode"		=> "",','"licenseCode"		=> "'.$_POST['code'].'",',$settingsContents);
+        $settingsContents = str_replace(array('"licenseEmail"		=> "",', '"licenseCode"		=> "",'), array('"licenseEmail"		=> "' . $_POST['email'] . '",', '"licenseCode"		=> "' . $_POST['code'] . '",'), $settingsContents);
 		// Now update the config file
 		$fh = fopen($settingsFile, 'w') or die("Can't update config file. Please set public write permissions on ".$settingsFile." and press refresh");
 		fwrite($fh, $settingsContents);
@@ -239,8 +238,7 @@
 		// Also set the update checker preference
 		$checkUpdates = $_POST['checkUpdates']=="true" ? "true" : "false";
 		// once to cover the true setting, once to cover false
-		$settingsContents = str_replace('"checkUpdates"		=> true,','"checkUpdates"		=> '.$checkUpdates.',',$settingsContents);
-		$settingsContents = str_replace('"checkUpdates"		=> false,','"checkUpdates"		=> '.$checkUpdates.',',$settingsContents);
+        $settingsContents = str_replace(array('"checkUpdates"		=> true,', '"checkUpdates"		=> false,'), array('"checkUpdates"		=> ' . $checkUpdates . ',', '"checkUpdates"		=> ' . $checkUpdates . ','), $settingsContents);
 		// Now update the config file
 		$fh = fopen($settingsFile, 'w') or die("Can't update config file. Please set public write permissions on ".$settingsFile." and press refresh");
 		fwrite($fh, $settingsContents);
@@ -251,15 +249,15 @@
 			$serverAddr = "127.0.0.1";
 		}
 		$settingsFileAddr = 'config-'.$username.str_replace(".","_",$serverAddr).'.php';
-		if (!file_exists(dirname(__FILE__)."/".$settingsFileAddr)) {
-			if (!copy(dirname(__FILE__)."/".$settingsFile, dirname(__FILE__)."/".$settingsFileAddr)) {
+		if (!file_exists(__DIR__."/".$settingsFileAddr)) {
+			if (!copy(__DIR__."/".$settingsFile, __DIR__."/".$settingsFileAddr)) {
 				die("Couldn't create $settingsFileAddr. Maybe you need write permissions on the lib folder?");
 			}
 		}
 		// Disable the enableRegistration config setting if the user had that option chosen
 		if (isset($_POST['disableFurtherRegistration'])) {
-			$updatedConfigSettingsFile = getData(dirname(__FILE__)."/".$configSettings);
-			if ($fUConfigSettings = fopen(dirname(__FILE__)."/".$configSettings, 'w')) {
+			$updatedConfigSettingsFile = getData(__DIR__."/".$configSettings);
+			if ($fUConfigSettings = fopen(__DIR__."/".$configSettings, 'w')) {
 				$updatedConfigSettingsFile = str_replace('"enableRegistration"	=> true','"enableRegistration"	=> false',$updatedConfigSettingsFile);
 				fwrite($fUConfigSettings, $updatedConfigSettingsFile);
 				fclose($fUConfigSettings);
@@ -272,7 +270,7 @@
 			$_SESSION['username']=$_POST['username'];
 		}
 		$_SESSION['loggedIn'] = true;
-		include(dirname(__FILE__)."/../processes/on-user-new.php");
+		include __DIR__."/../processes/on-user-new.php";
 		// Finally, load again as now this file has changed and auto login
 		header('Location: ../');
 		echo "<script>window.location='../';</script>";
@@ -290,4 +288,4 @@
 	// Continue with whatever we're doing
 	// ==================================
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/terminal-xhr.php b/lib/terminal-xhr.php
index 267f2771..a63aa49d 100644
--- a/lib/terminal-xhr.php
+++ b/lib/terminal-xhr.php
@@ -1,6 +1,6 @@
 <?php
-include(dirname(__FILE__)."/headers.php");
-include(dirname(__FILE__)."/settings.php");
+include __DIR__."/headers.php";
+include __DIR__."/settings.php";
 
 
 function proc_open_enabled() {
@@ -40,7 +40,7 @@ function proc_open_enabled() {
 
 // If command contains cd but no dir
 if (preg_match('/^[[:blank:]]*cd[[:blank:]]*$/', @$_REQUEST['command'])) {
-	$_SESSION['cwd'] = getcwd(); //dirname(__FILE__);
+	$_SESSION['cwd'] = getcwd(); //__DIR__;
 // Else cd to a dir
 } elseif (preg_match('/^[[:blank:]]*cd[[:blank:]]+([^;]+)$/', @$_REQUEST['command'], $regs)) {
 	// The current command is 'cd', which we have to handle as an internal shell command
diff --git a/lib/updater.php b/lib/updater.php
index 0eb8a1ea..70e85c9a 100644
--- a/lib/updater.php
+++ b/lib/updater.php
@@ -1,6 +1,6 @@
 <?php
-include("headers.php");
-include("settings.php");
+include "headers.php";
+include "settings.php";
 $t = $text['updater'];
 ?>
 <!DOCTYPE html>
@@ -24,15 +24,15 @@ function startUpdate() {
 			$testPath = $source.DIRECTORY_SEPARATOR.$iterator->getSubPathName();
 			$testPath = str_replace("\\","/",$testPath);
 			if (strpos($testPath,"/backups/")==false && strpos($testPath,"/plugins/")==false && strpos($testPath,"/.git/")==false) {
-				if (!is_writeable($item)) {
-					array_push($cantMoveArray,substr($item,count($source)+2));
+				if (!is_writable($item)) {
+					$cantMoveArray[] = substr($item, count($source) + 2);
 				}
 			}
 		}
 	}
 	if (count($cantMoveArray) > 0) {
 		echo '<br>Sorry, there are dirs/files that cannot be moved. Please set write permissions on them so ICEcoder may move the old version, to make way for the new.<br><br>You can reload this page after making perms changes to check the list again.<br><br>';
-		for ($i=0; $i<count($cantMoveArray); $i++) {
+		for ($i=0, $iMax = count($cantMoveArray); $i< $iMax; $i++) {
 			echo $cantMoveArray[$i]."<br>";
 		}
 		die('<br><a href="'.$source.'" style="color: #fff">&lt;&lt; Back to ICEcoder</a>');
@@ -90,7 +90,7 @@ function openZipNew($icvInfo) {
 	$source = 'ICEcoder v'.$icvInfo;
 	$target = '../';
 
-	$remoteFile = 'https://icecoder.net/ICEcoder-v'.(str_replace(" beta", "-beta",$icvInfo)).'.zip';
+	$remoteFile = 'https://icecoder.net/ICEcoder-v'. str_replace(" beta", "-beta",$icvInfo) .'.zip';
     	$file = "../tmp/new-version.zip";
 	$fileData = getData($remoteFile,'curl','Sorry, couldn\'t get latest version zip file.');
 	echo 'Storing zip file...<br>';
@@ -141,7 +141,7 @@ function transposeSettings($oldFile,$newFile,$saveFile) {
 
 	echo '- Transposing settings...<br>';
 	// Now need to copy the old settings over to new settings...
-	for ($i=0; $i<count($newSettingsArray); $i++) {
+	for ($i=0, $iMax = count($newSettingsArray); $i< $iMax; $i++) {
 		$thisKey = "";
 		if (strpos($newSettingsArray[$i],'"') > -1) {
 			$thisKey = explode('"',$newSettingsArray[$i]);
@@ -151,7 +151,7 @@ function transposeSettings($oldFile,$newFile,$saveFile) {
 		}
 		// We set the new line to begin with
 		$contentLine = $newSettingsArray[$i].PHP_EOL;
-		for ($j=0; $j<count($oldSettingsArray); $j++) {
+		for ($j=0, $jMax = count($oldSettingsArray); $j< $jMax; $j++) {
 			// And override with old setting if not blank, not in excluded array and we have a match
 			if ($thisKey != "" && $thisKey != "versionNo" && $thisKey != "codeMirrorDir" && strpos($oldSettingsArray[$j],'"'.$thisKey.'"') > -1) {
 				$contentLine = $oldSettingsArray[$j].PHP_EOL;
@@ -176,11 +176,11 @@ function copyOverSettings($icvInfo) {
 	echo 'Transposing system settings...<br>';
 	// Create a new config file if it doesn't exist yet.
 	// The reason we create it, is so it has PHP write permissions, meaning we can update it later
-	if (!file_exists(dirname(__FILE__)."/".$configSettings)) {
+	if (!file_exists(__DIR__."/".$configSettings)) {
 		echo 'Creating new settings file...<br>';
 		// Include our params to make use of (as $newConfigSettingsFile)
-		include(dirname(__FILE__)."/settings-system-params.php");
-		if ($fConfigSettings = fopen(dirname(__FILE__)."/".$configSettings, 'w')) {
+		include __DIR__."/settings-system-params.php";
+		if ($fConfigSettings = fopen(__DIR__."/".$configSettings, 'w')) {
 			fwrite($fConfigSettings, $newConfigSettingsFile);
 			fclose($fConfigSettings);
 		} else {
@@ -194,8 +194,8 @@ function copyOverSettings($icvInfo) {
 	transposeSettings(PATH."lib/config___users-template.php","config___users-template.php","config___users-template.php");
 
 	// Users settings files
-	$fileList = scanDir(PATH."lib/");
-	for ($i=0; $i<count($fileList); $i++) {
+	$fileList = scandir(PATH . "lib/", SCANDIR_SORT_NONE);
+	for ($i=0, $iMax = count($fileList); $i< $iMax; $i++) {
 		if (strpos($fileList[$i],"config-") > -1) {
 			echo 'Transposing users settings file '.$fileList[$i].'...<br>';
 			transposeSettings(PATH."lib/".$fileList[$i],"config___users-template.php",$fileList[$i]);
diff --git a/processes/on-bug-check.php b/processes/on-bug-check.php
index 1d14fecd..80a62bde 100644
--- a/processes/on-bug-check.php
+++ b/processes/on-bug-check.php
@@ -5,7 +5,7 @@
 // Purpose:	This file is run after a bug check, has $result string and $status arrays available to it
 // Langs:	PHP only
 // Example:
-// $fh = fopen(dirname(__FILE__)."/../bug-logs.log", 'a');
+// $fh = fopen(__DIR__."/../bug-logs.log", 'a');
 // fwrite($fh, "Bug check on: ".date("D dS M Y h:i:sa")."\nresult: ".$result.", status array:".var_export($status, true)."\n");
 // fclose($fh);
-?>
\ No newline at end of file
+?>
diff --git a/processes/on-editor-load.php b/processes/on-editor-load.php
index 9adcd8d6..13f1afaa 100644
--- a/processes/on-editor-load.php
+++ b/processes/on-editor-load.php
@@ -30,7 +30,7 @@
 			cMdiff.setOption("mode",mode);
 		}
 	} else if (cM && fileName) {
-		<?php include(dirname(__FILE__)."/../lib/language-modes-partial.js");?>
+		<?php include __DIR__."/../lib/language-modes-partial.js";?>
 
 		if (mode != cM.getOption("mode")) {
 			cM.setOption("mode",mode);
@@ -195,4 +195,4 @@
 
 	top.ICEcoder.caretLocType = caretLocType;
 }
-</script>
\ No newline at end of file
+</script>
diff --git a/processes/on-file-dir-delete.php b/processes/on-file-dir-delete.php
index 0fa96486..772776dd 100644
--- a/processes/on-file-dir-delete.php
+++ b/processes/on-file-dir-delete.php
@@ -5,7 +5,7 @@
 // Purpose:	This file is run when a file or dir is deleted, has $fileLoc and $fileName strings available to it
 // Langs:	PHP only
 // Example:
-// $fh = fopen(dirname(__FILE__)."/../file-dir-access.log", 'a');
+// $fh = fopen(__DIR__."/../file-dir-access.log", 'a');
 // fwrite($fh, "DELETED >>> ".date("D dS M Y h:i:sa").": ".$fileLoc."/".$fileName."\n");
 // fclose($fh);
-?>
\ No newline at end of file
+?>
diff --git a/processes/on-file-dir-move.php b/processes/on-file-dir-move.php
index c01c8709..e3dc8031 100644
--- a/processes/on-file-dir-move.php
+++ b/processes/on-file-dir-move.php
@@ -5,7 +5,7 @@
 // Purpose:	This file is run when a file or dir is moved, has $fileLoc and $fileName strings available to it
 // Langs:	PHP only
 // Example:
-// $fh = fopen(dirname(__FILE__)."/../file-dir-access.log", 'a');
+// $fh = fopen(__DIR__."/../file-dir-access.log", 'a');
 // fwrite($fh, "MOVED >>> ".date("D dS M Y h:i:sa").": ".$fileLoc."/".$fileName."\n");
 // fclose($fh);
-?>
\ No newline at end of file
+?>
diff --git a/processes/on-file-dir-paste.php b/processes/on-file-dir-paste.php
index cd318999..1e689865 100644
--- a/processes/on-file-dir-paste.php
+++ b/processes/on-file-dir-paste.php
@@ -5,7 +5,7 @@
 // Purpose:	This file is run when a file or dir is pasted, has $fileLoc, $fileName and $dest strings available to it
 // Langs:	PHP only
 // Example:
-// $fh = fopen(dirname(__FILE__)."/../file-dir-access.log", 'a');
+// $fh = fopen(__DIR__."/../file-dir-access.log", 'a');
 // fwrite($fh, "PASTE >>> ".date("D dS M Y h:i:sa").": ".$dest."\n");
 // fclose($fh);
-?>
\ No newline at end of file
+?>
diff --git a/processes/on-file-dir-perms.php b/processes/on-file-dir-perms.php
index b6c91dc7..0ab25aec 100644
--- a/processes/on-file-dir-perms.php
+++ b/processes/on-file-dir-perms.php
@@ -5,7 +5,7 @@
 // Purpose:	This file is run when a file or dir has its perms changed, has $fileLoc, $fileName and $_GET['perms'] strings available to it
 // Langs:	PHP only
 // Example:
-// $fh = fopen(dirname(__FILE__)."/../file-dir-access.log", 'a');
+// $fh = fopen(__DIR__."/../file-dir-access.log", 'a');
 // fwrite($fh, "PERMS >>> ".date("D dS M Y h:i:sa").": ".$fileLoc."/".$fileName." = ".$_GET['perms']."\n");
 // fclose($fh);
-?>
\ No newline at end of file
+?>
diff --git a/processes/on-file-dir-rename.php b/processes/on-file-dir-rename.php
index 3ab8d1e0..578068ef 100644
--- a/processes/on-file-dir-rename.php
+++ b/processes/on-file-dir-rename.php
@@ -5,7 +5,7 @@
 // Purpose:	This file is run when a file or dir is renamed, has $fileLoc and $fileName strings available to it
 // Langs:	PHP only
 // Example:
-// $fh = fopen(dirname(__FILE__)."/../file-dir-access.log", 'a');
+// $fh = fopen(__DIR__."/../file-dir-access.log", 'a');
 // fwrite($fh, "RENAMED >>> ".date("D dS M Y h:i:sa").": ".$fileLoc."/".$fileName."\n");
 // fclose($fh);
-?>
\ No newline at end of file
+?>
diff --git a/processes/on-file-load.php b/processes/on-file-load.php
index 885c1bea..5a09c4a2 100644
--- a/processes/on-file-load.php
+++ b/processes/on-file-load.php
@@ -5,7 +5,7 @@
 // Purpose:	This file is run when a file is loaded, has $fileLoc and $fileName strings available to it
 // Langs:	PHP only
 // Example:
-// $fh = fopen(dirname(__FILE__)."/../file-dir-access.log", 'a');
+// $fh = fopen(__DIR__."/../file-dir-access.log", 'a');
 // fwrite($fh, "LOAD >>> ".date("D dS M Y h:i:sa").": ".$fileLoc."/".$fileName."\n");
 // fclose($fh);
-?>
\ No newline at end of file
+?>
diff --git a/processes/on-file-replace-text.php b/processes/on-file-replace-text.php
index 7a56439d..b3da88bb 100644
--- a/processes/on-file-replace-text.php
+++ b/processes/on-file-replace-text.php
@@ -5,7 +5,7 @@
 // Purpose:	This file is run when a file has text in it replaced, has $_GET['fileRef'] string available to it
 // Langs:	PHP only
 // Example:
-// $fh = fopen(dirname(__FILE__)."/../file-dir-access.log", 'a');
+// $fh = fopen(__DIR__."/../file-dir-access.log", 'a');
 // fwrite($fh, "REPLACED TEXT >>> ".date("D dS M Y h:i:sa").": ".$_GET['fileRef']."\n");
 // fclose($fh);
-?>
\ No newline at end of file
+?>
diff --git a/processes/on-file-save.php b/processes/on-file-save.php
index 10f97ee9..0a7efa5b 100644
--- a/processes/on-file-save.php
+++ b/processes/on-file-save.php
@@ -5,7 +5,7 @@
 // Purpose:	This file is run when a user saves a file, has $fileLoc and $fileName strings available to it
 // Langs:	PHP only
 // Example:
-// $fh = fopen(dirname(__FILE__)."/../file-dir-access.log", 'a');
+// $fh = fopen(__DIR__."/../file-dir-access.log", 'a');
 // fwrite($fh, "SAVE >>> ".date("D dS M Y h:i:sa").": ".$fileLoc."/".$fileName."\n");
 // fclose($fh);
 
@@ -16,9 +16,9 @@
 $fileExt = $filePieces[count($filePieces)-1];
 
 // SCSS Compiling if we have SCSSPHP plugin installed
-if (strtolower($fileExt) == "scss" && file_exists(dirname(__FILE__)."/../plugins/scssphp/scss.inc.php")) {
+if (strtolower($fileExt) == "scss" && file_exists(__DIR__."/../plugins/scssphp/scss.inc.php")) {
 	// Load the SCSSPHP lib and start a new instance
-	require dirname(__FILE__)."/../plugins/scssphp/scss.inc.php";
+	require __DIR__."/../plugins/scssphp/scss.inc.php";
 	$scss = new scssc();
 
 	// Set the import path and formatting type
@@ -36,9 +36,9 @@
 }
 
 // LESS Compiling if we have LESSPHP plugin installed
-if (strtolower($fileExt) == "less" && file_exists(dirname(__FILE__)."/../plugins/lessphp/lessc.inc.php")) {
+if (strtolower($fileExt) == "less" && file_exists(__DIR__."/../plugins/lessphp/lessc.inc.php")) {
 	// Load the LESSPHP lib and start a new instance
-	require dirname(__FILE__)."/../plugins/lessphp/lessc.inc.php";
+	require __DIR__."/../plugins/lessphp/lessc.inc.php";
 	$less = new lessc();
 
 	// Set the formatting type and if we want to preserve comments
@@ -51,4 +51,4 @@
 		echo ";top.ICEcoder.message('Couldn\'t compile your LESS, error info below:\\n\\n".$e->getMessage()."');";
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/processes/on-file-upload.php b/processes/on-file-upload.php
index 6c252226..7dd676d5 100644
--- a/processes/on-file-upload.php
+++ b/processes/on-file-upload.php
@@ -5,7 +5,7 @@
 // Purpose:	This file is run when files are uploaded, has $uploads array available to it
 // Langs:	PHP only
 // Example:
-// $fh = fopen(dirname(__FILE__)."/../file-dir-access.log", 'a');
+// $fh = fopen(__DIR__."/../file-dir-access.log", 'a');
 // fwrite($fh, "UPLOAD >>> ".date("D dS M Y h:i:sa").": ".($uploads[0]->name)."\n");
 // fclose($fh);
-?>
\ No newline at end of file
+?>
diff --git a/processes/on-get-remote-file.php b/processes/on-get-remote-file.php
index a83b0e5b..fd4ba37e 100644
--- a/processes/on-get-remote-file.php
+++ b/processes/on-get-remote-file.php
@@ -5,7 +5,7 @@
 // Purpose:	This file is run when a remote file is loaded, has $file string available to it
 // Langs:	PHP only
 // Example:
-// $fh = fopen(dirname(__FILE__)."/../file-dir-access.log", 'a');
+// $fh = fopen(__DIR__."/../file-dir-access.log", 'a');
 // fwrite($fh, "GET REMOTE FILE >>> ".date("D dS M Y h:i:sa").": ".$file."\n");
 // fclose($fh);
-?>
\ No newline at end of file
+?>
diff --git a/processes/on-new-dir.php b/processes/on-new-dir.php
index c166fb92..78b6a166 100644
--- a/processes/on-new-dir.php
+++ b/processes/on-new-dir.php
@@ -5,7 +5,7 @@
 // Purpose:	This file is run when a dir is created, has $fileLoc and $fileName strings available to it
 // Langs:	PHP only
 // Example:
-// $fh = fopen(dirname(__FILE__)."/../file-dir-access.log", 'a');
+// $fh = fopen(__DIR__."/../file-dir-access.log", 'a');
 // fwrite($fh, "NEW DIR >>> ".date("D dS M Y h:i:sa").": ".$fileLoc."/".$fileName."\n");
 // fclose($fh);
-?>
\ No newline at end of file
+?>
diff --git a/processes/on-user-login-fail.php b/processes/on-user-login-fail.php
index 9289a8ce..7bb22b6f 100644
--- a/processes/on-user-login-fail.php
+++ b/processes/on-user-login-fail.php
@@ -5,7 +5,7 @@
 // Purpose:	This file is run when a login fail occurs
 // Langs:	PHP only
 // Example:
-// $fh = fopen(dirname(__FILE__)."/../user-access.log", 'a');
+// $fh = fopen(__DIR__."/../user-access.log", 'a');
 // fwrite($fh, "FAIL    ".date("D dS M Y h:i:sa").": ".$_POST['username']."\n");
 // fclose($fh);
-?>
\ No newline at end of file
+?>
diff --git a/processes/on-user-login.php b/processes/on-user-login.php
index 0842dd56..04d05b3c 100644
--- a/processes/on-user-login.php
+++ b/processes/on-user-login.php
@@ -5,7 +5,7 @@
 // Purpose:	This file is run when a user logs in
 // Langs:	PHP only
 // Example:
-// $fh = fopen(dirname(__FILE__)."/../user-access.log", 'a');
+// $fh = fopen(__DIR__."/../user-access.log", 'a');
 // fwrite($fh, "login   ".date("D dS M Y h:i:sa").": ".$_SESSION['username']."\n");
 // fclose($fh);
-?>
\ No newline at end of file
+?>
diff --git a/processes/on-user-logout.php b/processes/on-user-logout.php
index ba176bfd..18ec3d04 100644
--- a/processes/on-user-logout.php
+++ b/processes/on-user-logout.php
@@ -5,7 +5,7 @@
 // Purpose:	This file is run when a user logs out
 // Langs:	PHP only
 // Example:
-// $fh = fopen(dirname(__FILE__)."/../user-access.log", 'a');
+// $fh = fopen(__DIR__."/../user-access.log", 'a');
 // fwrite($fh, "logout  ".date("D dS M Y h:i:sa").": ".$_SESSION['username']."\n");
 // fclose($fh);
-?>
\ No newline at end of file
+?>
diff --git a/processes/on-user-new.php b/processes/on-user-new.php
index 40c57d36..939b2db3 100644
--- a/processes/on-user-new.php
+++ b/processes/on-user-new.php
@@ -5,7 +5,7 @@
 // Purpose:	This file is run when a new user sets up
 // Langs:	PHP only
 // Example:
-// $fh = fopen(dirname(__FILE__)."/../user-access.log", 'a');
+// $fh = fopen(__DIR__."/../user-access.log", 'a');
 // fwrite($fh, "NEW >>> ".date("D dS M Y h:i:sa").": ".$_SESSION['username']."\n");
 // fclose($fh);
-?>
\ No newline at end of file
+?>
diff --git a/terminal.php b/terminal.php
index 51cd2634..588dc833 100644
--- a/terminal.php
+++ b/terminal.php
@@ -1,6 +1,6 @@
 <?php
-include("lib/headers.php");
-include("lib/settings.php");
+include "lib/headers.php";
+include "lib/settings.php";
 ?>
 <!DOCTYPE html>
 <html lang="en">
@@ -104,4 +104,4 @@
 </form>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/test.php b/test.php
index f75506fc..e5455e66 100644
--- a/test.php
+++ b/test.php
@@ -19,10 +19,10 @@
 
 
 echo '<b>TEST 1 of 3: PHP Version:</b><br>ICEcoder needs at least PHP 5.0, tho 5.3 and above is recommended:<br><br>';
-echo "Your PHP Version: ".phpversion()."<br><br>";
+echo "Your PHP Version: ". PHP_VERSION ."<br><br>";
 
 echo '<b>TEST RESULT:</b> ';
-if (phpversion()*1 < 5.0) {
+if (PHP_VERSION *1 < 5.0) {
 	echo '<span style="color: #b00; font-weight: bold">Your version of PHP doesn\'t seem to be high enough!</span>';
 } else {
 	echo '<span style="color: #080; font-weight: bold">PHP version is OK</span>';
@@ -64,7 +64,7 @@
 $configSettings = 'config___settings.php';
 
 // Load config settings
-include(dirname(__FILE__)."/lib/".$configSettings);
+include __DIR__."/lib/".$configSettings;
 
 echo "This version of ICEcoder is: ".$ICEcoderSettings['versionNo']."<br><br>";
 echo '<b>TEST RESULT:</b> ';
