[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/driver/dr...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       10/11/07 15:10:59

Modified files:
        distrib        : ChangeLog 
        src/daemon/driver: driverCommands.ml driverControlers.ml 
        src/networks/direct_connect: dcInteractive.ml 

Log message:
        patch #7355

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1501&r2=1.1502
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverCommands.ml?cvsroot=mldonkey&r1=1.259&r2=1.260
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverControlers.ml?cvsroot=mldonkey&r1=1.117&r2=1.118
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/direct_connect/dcInteractive.ml?cvsroot=mldonkey&r1=1.44&r2=1.45

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1501
retrieving revision 1.1502
diff -u -b -r1.1501 -r1.1502
--- distrib/ChangeLog   7 Nov 2010 15:08:04 -0000       1.1501
+++ distrib/ChangeLog   7 Nov 2010 15:10:59 -0000       1.1502
@@ -15,6 +15,7 @@
 =========
 
 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)

Index: src/daemon/driver/driverCommands.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -b -r1.259 -r1.260
--- src/daemon/driver/driverCommands.ml 1 Nov 2010 17:19:23 -0000       1.259
+++ src/daemon/driver/driverCommands.ml 7 Nov 2010 15:10:59 -0000       1.260
@@ -78,6 +78,8 @@
   "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 =

Index: src/daemon/driver/driverControlers.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverControlers.ml,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -b -r1.117 -r1.118
--- src/daemon/driver/driverControlers.ml       15 Jul 2010 18:25:24 -0000      
1.117
+++ src/daemon/driver/driverControlers.ml       7 Nov 2010 15:10:59 -0000       
1.118
@@ -103,7 +103,6 @@
 
 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://"; ||

Index: src/networks/direct_connect/dcInteractive.ml
===================================================================
RCS file: 
/sources/mldonkey/mldonkey/src/networks/direct_connect/dcInteractive.ml,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- src/networks/direct_connect/dcInteractive.ml        1 Nov 2010 17:09:29 
-0000       1.44
+++ src/networks/direct_connect/dcInteractive.ml        7 Nov 2010 15:10:59 
-0000       1.45
@@ -110,6 +110,8 @@
 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 @@
      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 @@
 \\<!--
 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 @@
         (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 )