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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/10/21 19:36:34

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

Log message:
        patch #5471

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1054&r2=1.1055
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverCommands.ml?cvsroot=mldonkey&r1=1.182&r2=1.183

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1054
retrieving revision 1.1055
diff -u -b -r1.1054 -r1.1055
--- distrib/ChangeLog   21 Oct 2006 19:35:54 -0000      1.1054
+++ distrib/ChangeLog   21 Oct 2006 19:36:34 -0000      1.1055
@@ -15,6 +15,7 @@
 =========
 
 2006/10/21
+5471: HTML: New colums for pending slots list: SUI, GeoIP, Filename
 5470: Options: New type percent_option, values are bound to be >= 0 and <= 100
 5469: HTML: Implement 404 error page for unknown URLs
 

Index: src/daemon/driver/driverCommands.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -b -r1.182 -r1.183
--- src/daemon/driver/driverCommands.ml 9 Oct 2006 16:19:34 -0000       1.182
+++ src/daemon/driver/driverCommands.ml 21 Oct 2006 19:36:34 -0000      1.183
@@ -2367,6 +2367,9 @@
                   ( "0", "srh", "Network", "Network" ) ;
                   ( "0", "srh", "Connection type [I]ndirect [D]irect", "C" ) ;
                   ( "0", "srh", "Client name", "Client name" ) ;
+                  ( "0", "srh", "Secure User Identification [N]one, [P]assed, 
[F]ailed", "S" ) ;
+                  ( "0", "srh", "IP address", "IP address" ) ;
+                 ] @ (if !Geoip.active then [( "0", "srh", "Country 
Code/Name", "CC" )] else []) @ [
                   ( "0", "srh", "Client brand", "CB" ) ;
                   ( "0", "srh", "Client release", "CR" ) ;
                   ] @
@@ -2374,12 +2377,13 @@
                   @ [
                   ( "0", "srh ar", "Total DL bytes from this client for all 
files", "DL" ) ;
                   ( "0", "srh ar", "Total UL bytes to this client for all 
files", "UL" ) ;
-                  ( "0", "srh", "IP address", "IP address" ) ]);
+                  ( "0", "srh", "Filename", "Filename" ) ]);
 
                 Intmap.iter (fun cnum c ->
 
                     try
                       let i = client_info c in
+                     let ips,cc,cn = string_of_kind_geo i.client_kind in
                       incr counter;
 
                       Printf.bprintf buf "\\<tr class=\\\"%s\\\"
@@ -2393,6 +2397,12 @@
                       client_print_html c o;
 
                       html_mods_td buf ([
+                        ("", "sr", (match i.client_sui_verified with
+                          | None -> "N"
+                          | Some b -> if b then "P" else "F"
+                        )); 
+                        ("", "sr", ips);
+                        ] @ (if !Geoip.active then [(cn, "sr", cc)] else []) @ 
[
                         ("", "sr", i.client_software);
                         ("", "sr", i.client_release);
                         ] @
@@ -2400,7 +2410,9 @@
                         @ [
                         ("", "sr ar", size_of_int64 i.client_downloaded);
                         ("", "sr ar", size_of_int64 i.client_uploaded);
-                        ("", "sr", string_of_kind i.client_kind); ]);
+                        ("", "sr", (match i.client_upload with
+                             Some f -> shorten f !!max_name_len
+                           | None -> "") ) ]);
 
                       Printf.bprintf buf "\\</tr\\>";
                     with _ -> ();