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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/02/05 13:25:22

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

Log message:
        patch #4870

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.716&tr2=1.717&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml.diff?tr1=1.123&tr2=1.124&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/driver/driverControlers.ml.diff?tr1=1.61&tr2=1.62&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/driver/driverInteractive.ml.diff?tr1=1.61&tr2=1.62&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.716 mldonkey/distrib/ChangeLog:1.717
--- mldonkey/distrib/ChangeLog:1.716    Sun Feb  5 13:20:30 2006
+++ mldonkey/distrib/ChangeLog  Sun Feb  5 13:25:22 2006
@@ -15,6 +15,7 @@
 =========
 
 2006/02/05
+4870: runinfo: add connected_user and check empty PW (schlumpf)
 4872: Fix gd detection on NetBSD, use data from gdlib-config
       MinGW compile-guide was updated, gdlib-config has to be changed
 4871: Optimize some Printf.sprintf "%s" code
Index: mldonkey/src/daemon/driver/driverCommands.ml
diff -u mldonkey/src/daemon/driver/driverCommands.ml:1.123 
mldonkey/src/daemon/driver/driverCommands.ml:1.124
--- mldonkey/src/daemon/driver/driverCommands.ml:1.123  Sun Feb  5 13:19:14 2006
+++ mldonkey/src/daemon/driver/driverCommands.ml        Sun Feb  5 13:25:22 2006
@@ -454,7 +454,7 @@
     "sysinfo", Arg_none (fun o ->
        let buf = o.conn_buf in
         ignore(buildinfo (o.conn_output = HTML) buf);
-        ignore(runinfo (o.conn_output = HTML) buf);
+        ignore(runinfo (o.conn_output = HTML) buf o);
         ignore(diskinfo (o.conn_output = HTML) buf);
         ""
     ), ":\t\t\t\tprint mldonkey core build, runtime and disk information";
@@ -467,7 +467,7 @@
 
     "runinfo", Arg_none (fun o ->
        let buf = o.conn_buf in
-        ignore(runinfo (o.conn_output = HTML) buf);
+        ignore(runinfo (o.conn_output = HTML) buf o);
         ""
     ), ":\t\t\t\tprint mldonkey runtime information";
 
Index: mldonkey/src/daemon/driver/driverControlers.ml
diff -u mldonkey/src/daemon/driver/driverControlers.ml:1.61 
mldonkey/src/daemon/driver/driverControlers.ml:1.62
--- mldonkey/src/daemon/driver/driverControlers.ml:1.61 Fri Feb  3 03:12:14 2006
+++ mldonkey/src/daemon/driver/driverControlers.ml      Sun Feb  5 13:25:22 2006
@@ -1152,7 +1152,7 @@
            Buffer.add_string buf "</b></h3>";
            ignore (buildinfo false buf);
            Buffer.add_string buf "\n";
-           ignore (runinfo false buf);
+           ignore (runinfo false buf o);
            Buffer.add_string buf "</pre>\n"
 
         | "bw_updown.png" ->
Index: mldonkey/src/daemon/driver/driverInteractive.ml
diff -u mldonkey/src/daemon/driver/driverInteractive.ml:1.61 
mldonkey/src/daemon/driver/driverInteractive.ml:1.62
--- mldonkey/src/daemon/driver/driverInteractive.ml:1.61        Sun Feb  5 
13:19:14 2006
+++ mldonkey/src/daemon/driver/driverInteractive.ml     Sun Feb  5 13:25:22 2006
@@ -1721,11 +1721,15 @@
   else
     Printf.bprintf buf "\n\t--Buildinfo--\n%s\n" s
   
-let runinfo html buf =
+let runinfo html buf o =
   let dis_mess = "disabled, to enable adjust web_infos in downloads.ini for 
automatic download" in
+  let ui_user = o.conn_user.ui_user_name in
   let s =
   (
-       "Uptime:\t\t " ^ Date.time_to_string (last_time () - start_time) 
"verbose"
+        "User:\t\t " ^ ui_user
+      ^   (if List.assoc ui_user !!users = Md4.string "" then " (Warning: 
empty Password)"
+           else " (PW Protected)")
+      ^          " - uptime: " ^ Date.time_to_string (last_time () - 
start_time) "verbose"
       ^ "\nEnabled nets:\t"
       ^   (if Autoconf.donkey = "yes" && !!enable_donkey then " Donkey" else 
"")
       ^   (if Autoconf.donkey = "yes" && !!enable_overnet then " Overnet" else 
"")