From 8c84ef9ea52bb2717b19a583a7f39d35fd8fea63 Mon Sep 17 00:00:00 2001
From: spiralvoice <spiralvoice>
Date: Sun, 7 Nov 2010 15:10:59 +0000
Subject: [PATCH] patch #7355

---
 distrib/ChangeLog                            |  1 +
 src/daemon/driver/driverCommands.ml          |  2 ++
 src/daemon/driver/driverControlers.ml        |  1 -
 src/networks/direct_connect/dcInteractive.ml | 16 +++++++++-------
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/distrib/ChangeLog b/distrib/ChangeLog
index e26c4845..be6b3f69 100644
--- a/distrib/ChangeLog
+++ b/distrib/ChangeLog
@@ -15,6 +15,7 @@ ChangeLog
 =========
 
 2010/11/07
+7355: HTML: Fix URL enconding of commands (ygrek)
 7375: FileTP: fix submitting ftp download links (ygrek)
 7374: BT: calculate compatible hash for wrong torrents (ygrek)
 6012: http_client: Support gzip accept-encoding + content-encoding (ygrek)
diff --git a/src/daemon/driver/driverCommands.ml b/src/daemon/driver/driverCommands.ml
index 50dfb7a0..03cdeb96 100644
--- a/src/daemon/driver/driverCommands.ml
+++ b/src/daemon/driver/driverCommands.ml
@@ -78,6 +78,8 @@ let files_to_cancel o =
   "Type 'confirm yes/no' to cancel them"
 
 let execute_command arg_list output cmd args =
+  if !verbose then
+    lprintf_nl "execute command %S %s" cmd (String.concat " " (List.map (Printf.sprintf "%S") args));
   let buf = output.conn_buf in
   try
     let rec iter list =
diff --git a/src/daemon/driver/driverControlers.ml b/src/daemon/driver/driverControlers.ml
index f7a3d6e7..8ed3b961 100644
--- a/src/daemon/driver/driverControlers.ml
+++ b/src/daemon/driver/driverControlers.ml
@@ -103,7 +103,6 @@ let rec dollar_escape o with_frames s =
 
 let eval auth cmd o =
   let buf = o.conn_buf in
-  let cmd = Url.decode ~raw:false cmd in
   let cmd =
     if String2.check_prefix cmd "ed2k://" ||
        String2.check_prefix cmd "ftp://" ||
diff --git a/src/networks/direct_connect/dcInteractive.ml b/src/networks/direct_connect/dcInteractive.ml
index 9e3f5836..d34863c4 100644
--- a/src/networks/direct_connect/dcInteractive.ml
+++ b/src/networks/direct_connect/dcInteractive.ml
@@ -110,6 +110,8 @@ let parse_url url user group =
 let register_commands list =
   register_commands (List2.tail_map (fun (n,f,h) -> (n, "Direct Connect", f,h)) list)
 
+let command l = String.concat "+" (List.map Url.encode l)
+
 let td_command text title ?(blink=false) ?(target=`Output) cmd =
   Printf.sprintf
      "\\<td class=\\\"srb\\\" %sonMouseOver=\\\"mOvr(this);\\\"
@@ -117,7 +119,7 @@ let td_command text title ?(blink=false) ?(target=`Output) cmd =
      onClick=\\\"parent.%s.location.href='submit?q=%s'\\\"\\>%s\\</td\\>"
      (if blink then "style=\\\"text-decoration:blink\\\" " else "")
      title (match target with `Output -> "output" | `Status -> "fstatus")
-     (String.concat "+" cmd) (* Url.encode ? *)
+     (command cmd)
      text
 
 (* Print DC hubs header *)
@@ -872,13 +874,13 @@ let commands = [
 \\<!--
 function submitCmd() {
 var formID = document.getElementById(\\\"msgForm\\\")
-parent.output.location.href='submit?q=dcmessages+'+formID.sendCmd.value
+parent.output.location.href='submit?q=dcmessages+'+encodeURIComponent(formID.sendCmd.value)
 }
 function submitMessageForm() {
 var formID = document.getElementById(\\\"msgForm\\\")
-var regExp = new RegExp (' ', 'gi') 
-var msgTextOut = formID.msgText.value.replace(regExp, '+')
-parent.fstatus.location.href='submit?q=dcsendmsg+'+formID.sendCmd.value+\\\"+\\\"+msgTextOut
+var msgTextOut = encodeURIComponent(formID.msgText.value)
+var msgUserOut = encodeURIComponent(formID.sendCmd.value)
+parent.fstatus.location.href='submit?q=dcsendmsg+'+msgUserOut+\\\"+\\\"+msgTextOut
 formID.msgText.value=\\\"\\\"
 msgWindow.location.reload();
 }
@@ -888,11 +890,11 @@ msgWindow.location.reload();
         (match s with 
         | Some s ->
             let ip,port = (Ip.to_string s.server_ip),(string_of_int s.server_port) in
-            Printf.sprintf "dcmsglog+20+%s+%s" ip port, s.server_users, Printf.sprintf "%s %s" ip port 
+            command ["dcmsglog";"20";ip;port], s.server_users, Printf.sprintf "%s %s" ip port 
         | None ->
             (match u with 
             | Some u ->
-                Printf.sprintf "dcmsglog+20+%s" u.user_nick, [], u.user_nick
+                command ["dcmsglog";"20";u.user_nick], [], u.user_nick
             | None -> 
                 if !verbose_unexpected_messages then lprintf_nl "dcmessages: No user or server";
                 raise Not_found )
-- 
2.11.4.GIT