From c13b0b3103086aba66c78332c0ad9ff0d0c43f7e Mon Sep 17 00:00:00 2001
From: Ermal <eri@pfsense.org>
Date: Tue, 31 Aug 2010 15:34:27 +0000
Subject: Ticket #777. Use Base64 encoding for file content so javascript/php
 does not get confused!

---
 usr/local/www/edit.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'usr')

diff --git a/usr/local/www/edit.php b/usr/local/www/edit.php
index 6b71ad2..9236c3f 100644
--- a/usr/local/www/edit.php
+++ b/usr/local/www/edit.php
@@ -1,5 +1,4 @@
 <?php
-/* $Id$ */
 /*
 	edit.php
 	Copyright (C) 2004, 2005 Scott Ullrich
@@ -56,7 +55,7 @@ if($_REQUEST['action']) {
 				echo "|" . gettext("No file name specified") . ".|";
 			} else {
 				conf_mount_rw();
-				$_REQUEST['data'] = str_replace("\r", "", $_REQUEST['data']);
+				$_REQUEST['data'] = str_replace("\r", "", base64_decode($_REQUEST['data']));
 				$ret = file_put_contents($_REQUEST['file'], $_REQUEST['data']);
 				conf_mount_ro();
 				if($_REQUEST['file'] == "config.xml")
@@ -78,6 +77,7 @@ if($_REQUEST['action']) {
 require("head.inc");
 outputCSSFileInline("code-syntax-highlighter/SyntaxHighlighter.css");
 outputJavaScriptFileInline("filebrowser/browser.js");
+outputJavaScriptFileInline("javascript/base64.js");
 
 ?>
 
@@ -131,7 +131,7 @@ outputJavaScriptFileInline("filebrowser/browser.js");
 		$("fileStatus").innerHTML = "<?=gettext("Saving file"); ?> ...";
 		Effect.Appear("fileStatusBox", { duration: 0.5 });
 		
-		var fileContent = escape($("fileContent").value);
+		var fileContent = Base64.encode($("fileContent").value);
 		fileContent = fileContent.replace(/\+/g,"%2B");
 		
 		new Ajax.Request(
-- 
cgit v1.1