From 0f971b547e129702bbf997a82e7b4da6dbc91d09 Mon Sep 17 00:00:00 2001
From: Matt Pass <matt@mattpass.com>
Date: Tue, 21 Feb 2017 16:49:27 +0000
Subject: [PATCH] Strip \r and replace \n ith CR for browser pickup

---
 lib/file-control.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/file-control.php b/lib/file-control.php
index ec9680d..79a73ee 100644
--- a/lib/file-control.php
+++ b/lib/file-control.php
@@ -106,11 +106,18 @@ if ($_GET['action']=="load") {
 		// Get local file
 		} else {
 			$loadedFile = toUTF8noBOM(getData($file),true);
+			//echo 'console.log('.$loadedFile.');';
 		}
 			$encoding=ini_get("default_charset");
-			if($encoding=="")
+			if($encoding=="") {
 				$encoding="UTF-8";
-			echo '</script><textarea name="loadedFile" id="loadedFile">'.htmlentities($loadedFile,ENT_COMPAT,$encoding).'</textarea><script>';
+			}
+			// Left trim any \r from start of text after setting HTML entities on it according to encoding
+			$loadedFile = ltrim(htmlentities($loadedFile,ENT_COMPAT,$encoding),"\r");
+			if (substr($loadedFile,0,1) == "\n") {
+				$loadedFile = "&#13;".substr($loadedFile,1);
+			}
+			echo '</script><textarea name="loadedFile" id="loadedFile">'.$loadedFile.'</textarea><script>';
 			// Run our custom processes
 			include_once("../processes/on-file-load.php");
 		} else if (strpos($finfo,"image")===0) {