[Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/direct_...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       10/10/23 18:51:16

Modified files:
        distrib        : ChangeLog 
        src/networks/direct_connect: dcInteractive.ml 

Log message:
        remove patch #7355 as requested

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1490&r2=1.1491
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/direct_connect/dcInteractive.ml?cvsroot=mldonkey&r1=1.42&r2=1.43

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1490
retrieving revision 1.1491
diff -u -b -r1.1490 -r1.1491
--- distrib/ChangeLog   23 Oct 2010 18:25:13 -0000      1.1490
+++ distrib/ChangeLog   23 Oct 2010 18:51:16 -0000      1.1491
@@ -21,7 +21,6 @@
 - HTML: reversed order of chat messages
 7319: EDK: Fix CryptoPP on mips64 abi n32 (viric)
 7356: options: ensure that tmp file is removed (ygrek)
-7355: DC web ui: escape commands' arguments (ygrek)
 7354: DC: cleanup temporary files (ygrek)
 7353: DC: silence "ADC not supported" message (ygrek)
 7352: net: do not log ordinary network errors (ygrek)

Index: src/networks/direct_connect/dcInteractive.ml
===================================================================
RCS file: 
/sources/mldonkey/mldonkey/src/networks/direct_connect/dcInteractive.ml,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- src/networks/direct_connect/dcInteractive.ml        23 Oct 2010 18:21:55 
-0000      1.42
+++ src/networks/direct_connect/dcInteractive.ml        23 Oct 2010 18:51:16 
-0000      1.43
@@ -110,8 +110,6 @@
 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);\\\"
@@ -119,7 +117,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")
-     (command cmd)
+     (String.concat "+" cmd) (* Url.encode ? *)
      text
 
 (* Print DC hubs header *)
@@ -874,13 +872,13 @@
 \\<!--
 function submitCmd() {
 var formID = document.getElementById(\\\"msgForm\\\")
-parent.output.location.href='submit?q=dcmessages+'+encodeURIComponent(formID.sendCmd.value)
+parent.output.location.href='submit?q=dcmessages+'+formID.sendCmd.value
 }
 function submitMessageForm() {
 var formID = document.getElementById(\\\"msgForm\\\")
-var msgTextOut = encodeURIComponent(formID.msgText.value)
-var msgUserOut = encodeURIComponent(formID.sendCmd.value)
-parent.fstatus.location.href='submit?q=dcsendmsg+'+msgUserOut+\\\"+\\\"+msgTextOut
+var regExp = new RegExp (' ', 'gi') 
+var msgTextOut = formID.msgText.value.replace(regExp, '+')
+parent.fstatus.location.href='submit?q=dcsendmsg+'+formID.sendCmd.value+\\\"+\\\"+msgTextOut
 formID.msgText.value=\\\"\\\"
 msgWindow.location.reload();
 }
@@ -890,11 +888,11 @@
         (match s with 
         | Some s ->
             let ip,port = (Ip.to_string s.server_ip),(string_of_int 
s.server_port) in
-            command ["dcmsglog";"20";ip;port], s.server_users, Printf.sprintf 
"%s %s" ip port 
+            Printf.sprintf "dcmsglog+20+%s+%s" ip port, s.server_users, 
Printf.sprintf "%s %s" ip port 
         | None ->
             (match u with 
             | Some u ->
-                command ["dcmsglog";"20";u.user_nick], [], u.user_nick
+                Printf.sprintf "dcmsglog+20+%s" u.user_nick, [], u.user_nick
             | None -> 
                 if !verbose_unexpected_messages then lprintf_nl "dcmessages: 
No user or server";
                 raise Not_found )