refactored the constructs

for ($i=0;$i<count($var);$i++)
to
for ($i=0, $iMax = count($var); $i< $iMax; $i++)

so we don't spend processor time counting the same variable every loop
iteration

editor.php

@@ -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 {

lib/backup-versions.php

@@ -54,7 +54,7 @@
 	}
 }
 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;
 }
 ?>

lib/bug-files-check.php

@@ -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]) {

lib/file-control-xhr.php

@@ -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
@@ -272,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"];
 							}
@@ -365,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)) {
@@ -399,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;
@@ -427,7 +427,7 @@ function stitchChanges($fileLines) {
 					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]);
 						}
@@ -798,7 +798,7 @@ function getDetails($fileArr) {
 		}
 	// Local
 	} else {
-		for ($i=0;$i<count($filesArray);$i++) {
+		for ($i=0, $iMax = count($filesArray); $i< $iMax; $i++) {
             $fullPath = str_replace(array($docRoot, $iceRoot), "", $filesArray[$i]);
 			$fullPath = $docRoot.$iceRoot.$fullPath;
 

lib/file-control.php

@@ -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]."');";
@@ -69,7 +69,7 @@
 	$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;}
 	}
 

lib/ftp-manager.php

@@ -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']) {
@@ -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>';

lib/get-branch.php

@@ -142,7 +142,7 @@ function parseGitignore($file) { # $file = '/absolute/path/to/.gitignore'
 
 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
@@ -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]);
 	}
 	?>

lib/github-manager.php

@@ -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")).'",';
 			}
@@ -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>';

lib/github.php

@@ -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]);
 

lib/multiple-results.php

@@ -128,7 +128,7 @@ function phpGrep($q, $path, $base) {
 				$bFile = false;
 				$foundInSelFile = false;
 				// Exclude banned files
-				for ($i=0;$i<count($ICEcoder['bannedFiles']);$i++) {
+				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
@@ -138,7 +138,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;

lib/plugins-display.php

@@ -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]."')";
 		}

lib/plugins-manager.php

@@ -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,7 +109,7 @@
 		$settingsNew = '"plugins"		=> array(';
 
 		// Redo the arrays using the form data
-		for ($i=0; $i<count($oldPlugins); $i++) {
+		for ($i=0, $iMax = count($oldPlugins); $i< $iMax; $i++) {
 			$timer = (int)$_POST['timer' . $i];
 			if ($timer == 0) {
 				$timer = "";
@@ -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>';
 					}

lib/properties.php

@@ -58,7 +58,7 @@
 $dirList = scandir($fileName);
 $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++;

lib/settings-common.php

@@ -264,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

lib/settings-save-current-files.php

@@ -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].",";
 			}
@@ -36,7 +36,7 @@
 
 		// 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;