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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       08/02/03 23:13:20

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonMessages.ml 
        src/daemon/driver: driverCommands.ml driverControlers.ml 

Log message:
        patch #6080

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1355&r2=1.1356
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonMessages.ml?cvsroot=mldonkey&r1=1.70&r2=1.71
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverCommands.ml?cvsroot=mldonkey&r1=1.244&r2=1.245
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverControlers.ml?cvsroot=mldonkey&r1=1.110&r2=1.111

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1355
retrieving revision 1.1356
diff -u -b -r1.1355 -r1.1356
--- distrib/ChangeLog   3 Feb 2008 23:11:22 -0000       1.1355
+++ distrib/ChangeLog   3 Feb 2008 23:13:19 -0000       1.1356
@@ -15,6 +15,7 @@
 =========
 
 2008/02/04
+6080: HTTP interface: new command/button "logout" (Schlumpf)
 6077: bw_toggle: support new option "max_opened_connections_2" (Schlumpf)
 6401: Swarmer: Correctly update file_downloaded during recover_temp (pango)
 6400: EDK: Correctly update filename after recover_temp

Index: src/daemon/common/commonMessages.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonMessages.ml,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- src/daemon/common/commonMessages.ml 3 Feb 2008 23:11:23 -0000       1.70
+++ src/daemon/common/commonMessages.ml 3 Feb 2008 23:13:20 -0000       1.71
@@ -1146,6 +1146,9 @@
 <TD class=\"bu bbig\" title=\"View core log\"
 onMouseOver=\"mOvr(this,'mOvr1');\" onMouseOut=\"mOut(this);\"
 onClick=\"mSub('output','log')\">Log</TD>
+<TD class=\"bu bbig\" title=\"Logout interface\"
+onMouseOver=\"mOvr(this,'mOvr1');\" onMouseOut=\"mOut(this);\"
+onClick=\"mSub('output','logout')\">Logout</TD>
 <TD class=\"bu bbig\" title=\"Kill core\"
 onMouseOver=\"mOvr(this,'mOvr1');\" onMouseOut=\"mOut(this);\"
 onClick=\"mSub('output','kill')\">Kill core</TD>

Index: src/daemon/driver/driverCommands.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -b -r1.244 -r1.245
--- src/daemon/driver/driverCommands.ml 3 Feb 2008 23:11:23 -0000       1.244
+++ src/daemon/driver/driverCommands.ml 3 Feb 2008 23:13:20 -0000       1.245
@@ -329,6 +329,27 @@
         raise CommonTypes.CommandCloseSocket
     ), ":\t\t\t\t\t$bclose telnet$n";
 
+    "logout", Arg_none (fun o ->
+        let buf = o.conn_buf in
+        if o.conn_output = HTML then begin
+          if has_empty_password o.conn_user.ui_user then
+            print_command_result o "logout not required, your password is 
empty!"
+          else begin
+            if use_html_mods o then begin
+              html_mods_table_header buf "helpTable" "results" [];
+              Buffer.add_string buf "\\<tr class=\\\"dl-1\\\"\\>";
+              html_mods_td buf [("", "sr", "Are you sure?"); ];
+              Buffer.add_string buf "\\</tr\\>\\<tr class=\\\"dl-1\\\"\\>";
+              html_mods_td buf [("", "sr", "\\<div align=\\\"center\\\"\\>\\<a 
href=\\\"logout\\\" target=\\\"_parent\\\"\\>yes\\</a\\>\\</div\\>"); ];
+              Buffer.add_string buf "\\</tr\\>\\</table\\>\\</div\\>";
+            end else
+              Printf.bprintf buf "Are you sure? \\<a href=\\\"logout\\\" 
target=\\\"_parent\\\"\\>yes\\</a\\>"
+          end
+        end else
+          raise CommonTypes.CommandCloseSocket;
+      ""
+    ), ":\t\t\tlogout interface";      
+
     "kill", Arg_none (fun o ->
         if user2_is_admin o.conn_user.ui_user then
          begin

Index: src/daemon/driver/driverControlers.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverControlers.ml,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -b -r1.110 -r1.111
--- src/daemon/driver/driverControlers.ml       9 Dec 2007 20:39:38 -0000       
1.110
+++ src/daemon/driver/driverControlers.ml       3 Feb 2008 23:13:20 -0000       
1.111
@@ -950,7 +950,7 @@
         if Buffer.contents b <> "" then Printf.sprintf "(%s)" (Buffer.contents 
b) else "");
 
   let user = if r.options.login = "" then (admin_user 
()).CommonTypes.user_name else r.options.login in
-  if not (valid_password user r.options.passwd) then begin
+  if not (valid_password user r.options.passwd) || (r.get_url.Url.short_file = 
"logout") then begin
       clear_page buf;
       http_file_type := HTM;
       let _, error_text_long, header = Http_server.error_page "401" "" ""