[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       07/04/13 10:35:31

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonMessages.ml 
        src/daemon/driver: driverCommands.ml 
        src/networks/donkey: donkeyOvernet.ml 

Log message:
        patch #5866

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1231&r2=1.1232
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonMessages.ml?cvsroot=mldonkey&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverCommands.ml?cvsroot=mldonkey&r1=1.226&r2=1.227
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyOvernet.ml?cvsroot=mldonkey&r1=1.77&r2=1.78

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1231
retrieving revision 1.1232
diff -u -b -r1.1231 -r1.1232
--- distrib/ChangeLog   12 Apr 2007 11:32:50 -0000      1.1231
+++ distrib/ChangeLog   13 Apr 2007 10:35:30 -0000      1.1232
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2007/04/13
+5866: HTML: fix third button row to also successful act within frames 
(schlumpf)
+
 2007/04/12
 5867: EDK: Show country code/flags for indirect clients
 5862: BT: Informative GUI console messages after sending a .torrent file to GUI

Index: src/daemon/common/commonMessages.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonMessages.ml,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- src/daemon/common/commonMessages.ml 10 Apr 2007 16:25:50 -0000      1.68
+++ src/daemon/common/commonMessages.ml 13 Apr 2007 10:35:30 -0000      1.69
@@ -1046,7 +1046,7 @@
 onclick=\"servers();\">Import Server.met</TD>
 <TD class=\"bu bbig\" title=\"Open Serverlist\"
 onMouseOver=\"mOvr(this,'mOvr1');\" onMouseOut=\"mOut(this);\"
-onClick=\"mSub('fstatus','bw_stats');top.output.location.href='http://www.gruk.org/list.php'\">Serverlist</TD>
+onClick=\"mSub('fstatus','bw_stats');parent.frames[_getFrameByName('output')].location.href='http://www.gruk.org/list.php'\">Serverlist</TD>
 </TR></TBODY></TABLE></DIV>
 
 <DIV ID=\"tab4\" style=\"display: none\">
@@ -1133,16 +1133,16 @@
 onClick=\"mSub('output','porttest')\">Porttest</TD>
 <TD class=\"bu bbig\" title=\"View ChangeLog\"
 onMouseOver=\"mOvr(this,'mOvr1');\" onMouseOut=\"mOut(this);\"
-onClick=\"top.output.location.href='http://savannah.nongnu.org/cgi-bin/viewcvs/mldonkey/mldonkey/distrib/ChangeLog?rev=HEAD&amp;content-type=text/vnd.viewcvs-markup'\">ChangeLog</TD>
+onClick=\"parent.frames[_getFrameByName('output')].location.href='http://savannah.nongnu.org/cgi-bin/viewcvs/mldonkey/mldonkey/distrib/ChangeLog?rev=HEAD&amp;content-type=text/vnd.viewcvs-markup'\">ChangeLog</TD>
 <TD class=\"bu bbig\" title=\"Homepage\"
 onMouseOver=\"mOvr(this,'mOvr1');\" onMouseOut=\"mOut(this);\"
-onClick=\"top.output.location.href='http://mldonkey.sourceforge.net'\">Homepage</TD>
+onClick=\"parent.frames[_getFrameByName('output')].location.href='http://mldonkey.sourceforge.net'\">Homepage</TD>
 <TD class=\"bu bbig\" title=\"Support forum english\"
 onMouseOver=\"mOvr(this,'mOvr1');\" onMouseOut=\"mOut(this);\"
-onClick=\"top.output.location.href='http://mldonkey.sourceforge.net/forums'\">English
 support</TD>
+onClick=\"parent.frames[_getFrameByName('output')].location.href='http://mldonkey.sourceforge.net/forums'\">English
 support</TD>
 <TD class=\"bu bbig\" title=\"Support forum german\"
 onMouseOver=\"mOvr(this,'mOvr1');\" onMouseOut=\"mOut(this);\"
-onClick=\"top.output.location.href='http://mldonkey.org/phpbb2'\">German 
forum</TD>
+onClick=\"parent.frames[_getFrameByName('output')].location.href='http://mldonkey.org/phpbb2'\">German
 forum</TD>
 <TD class=\"bu bbig\" title=\"View core log\"
 onMouseOver=\"mOvr(this,'mOvr1');\" onMouseOut=\"mOut(this);\"
 onClick=\"mSub('output','log')\">Log</TD>

Index: src/daemon/driver/driverCommands.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -b -r1.226 -r1.227
--- src/daemon/driver/driverCommands.ml 2 Apr 2007 20:51:08 -0000       1.226
+++ src/daemon/driver/driverCommands.ml 13 Apr 2007 10:35:30 -0000      1.227
@@ -1611,7 +1611,7 @@
                 if use_html_mods o then
                   custom_commands := !custom_commands @ [ ( "bu bbig",
                   name,
-                  Printf.sprintf 
"top.output.location.href='submit\\?custom=%s'" (Url.encode name),
+                  Printf.sprintf "mSub('output','custom=%s')" (Url.encode 
name),
                   name ) ; ]
                 else
                   Printf.bprintf buf
@@ -1626,13 +1626,13 @@
         if use_html_mods o then
           html_mods_commands buf "commandsTable" "commands" (!custom_commands 
@ [
             ("bu bbig", "Visit FileHeaven",
-             "top.output.location.href='http://www.fileheaven.org/'", 
"FileHeaven");
+             
"parent.frames[_getFrameByName('output')].location.href='http://www.fileheaven.org/'",
 "FileHeaven");
             ("bu bbig", "Visit FileDonkey",
-             "top.output.location.href='http://www.filedonkey.com/'", 
"FileDonkey");
+             
"parent.frames[_getFrameByName('output')].location.href='http://www.filedonkey.com/'",
 "FileDonkey");
             ("bu bbig", "Visit Bitzi",
-             "top.output.location.href='http://www.fileheaven.org/'", "Bitzi");
+             
"parent.frames[_getFrameByName('output')].location.href='http://www.fileheaven.org/'",
 "Bitzi");
             ("bu bbig", "Visit eMugle",
-             "top.output.location.href='http://www.emugle.com/'", "eMugle");
+             
"parent.frames[_getFrameByName('output')].location.href='http://www.emugle.com/'",
 "eMugle");
           ]);
         ""
     ), ":\t\t\tview custom queries";

Index: src/networks/donkey/donkeyOvernet.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyOvernet.ml,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- src/networks/donkey/donkeyOvernet.ml        17 Mar 2007 18:03:01 -0000      
1.77
+++ src/networks/donkey/donkeyOvernet.ml        13 Apr 2007 10:35:30 -0000      
1.78
@@ -1768,16 +1768,16 @@
         let buf = o.conn_buf in
         html_mods_commands buf "commandsTable" "commands" ([
           ("bu bbig", command_prefix_to_net ^ " boots list",
-           "top.output.location.href='submit\\?q=" ^ command_prefix ^ "boots'",
+           "mSub('output','" ^ command_prefix ^ "boots')",
            command_prefix_to_net ^ " boots");
           ("bu bbig", command_prefix_to_net ^ " buckets list",
-           "top.output.location.href='submit\\?q=" ^ command_prefix ^ 
"buckets'",
+           "mSub('output','" ^ command_prefix ^ "buckets')",
            command_prefix_to_net ^ " buckets");
           ("bu bbig", command_prefix_to_net ^ " stats",
-           "top.output.location.href='submit\\?q=" ^ command_prefix ^ "stats'",
+           "mSub('output','" ^ command_prefix ^ "stats')",
            command_prefix_to_net ^ " stats");
           ("bu bbig", command_prefix_to_net ^ " store list",
-           "top.output.location.href='submit\\?q=" ^ command_prefix ^ "store'",
+           "mSub('output','" ^ command_prefix ^ "store')",
            command_prefix_to_net ^ " store");
           ]);
         "";