From 55692d3c494acd9b85862fb24bb802441c47c726 Mon Sep 17 00:00:00 2001
From: Matt Pass <matt@mattpass.com>
Date: Mon, 25 Apr 2016 09:50:09 +0100
Subject: [PATCH] Error handling improvements

Replace \r in content, only do extra JS if could FTP write OK
Get original content and check charCount and if finding different sizes,
log into to file
---
 lib/file-control-xhr.php | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/lib/file-control-xhr.php b/lib/file-control-xhr.php
index ed084d0..307f55b 100644
--- a/lib/file-control-xhr.php
+++ b/lib/file-control-xhr.php
@@ -270,7 +270,7 @@ if (!$error && $_GET['action']=="save") {
 					if (isset($_POST['changes'])) {
 						// Get existing file contents as lines
 						$loadedFile = toUTF8noBOM(ftpGetContents($ftpConn, $ftpRoot.$fileLoc."/".$fileName, $ftpMode));
-						$fileLines = explode("\n",$loadedFile);
+						$fileLines = explode("\n",str_replace("\r","",$loadedFile));
 						// 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
@@ -305,13 +305,15 @@ if (!$error && $_GET['action']=="save") {
 					// Write our file contents
 					if (!ftpWriteFile($ftpConn, $ftpFilepath, $contents, $ftpMode)) {
 						$doNext .= 'top.ICEcoder.message("Sorry, could not write '.$ftpFilepath.' at '.$ftpHost.'");';
+					} else {
+						$doNext .= 'top.ICEcoder.openFileMDTs[top.ICEcoder.selectedTab-1]="'.$filemtime.'";';
+						$doNext .= '(function() {var x=top.ICEcoder.openFileVersions; var y=top.ICEcoder.selectedTab-1; x[y] = "undefined" != typeof x[y] ? x[y]+1 : 1})();top.ICEcoder.updateVersionsDisplay();';
 					}
-					$doNext .= 'top.ICEcoder.openFileMDTs[top.ICEcoder.selectedTab-1]="'.$filemtime.'";';
-					$doNext .= '(function() {var x=top.ICEcoder.openFileVersions; var y=top.ICEcoder.selectedTab-1; x[y] = "undefined" != typeof x[y] ? x[y]+1 : 1})();top.ICEcoder.updateVersionsDisplay();';
 				// Local saving
 				} else {
 					if (isset($_POST['changes'])) {
 						// Get existing file contents as lines and stitch changes onto it
+						$origContent = file_get_contents($file);
 						$fileLines = file($file);
 						$contents = stitchChanges($fileLines);
 
@@ -353,6 +355,13 @@ if (!$error && $_GET['action']=="save") {
 					$doNext .= '(function() {var x=top.ICEcoder.openFileVersions; var y=top.ICEcoder.selectedTab-1; x[y] = "undefined" != typeof x[y] ? x[y]+1 : 1})();top.ICEcoder.updateVersionsDisplay();';
 				}
 
+				// Log info in a file should there be a difference in char counts
+				$docLines = explode("\n",$contents);
+					$doNext .= 'top.ICEcoder.message("Sorry, there was a size difference reported between what you see and what has been saved. Please check your file to see if the change has been applied properly.\\\n\\\nIf not, please send tmp/save-error-log.php to info@icecoder.net along. All files sent to us will be dealt with confidentially and deleted after analysis.");';
+					$fh = fopen(dirname(__FILE__)."/../tmp/save-error-log.php", 'a');
+					fclose($fh);
+				}
+
 				// Save a version controlled backup source of the file
 				if ($ICEcoder["backupsKept"]) {
 					$backupDirFormat = "Y-m-d";