[Mldonkey-commits] mldonkey distribChangeLog src/daemon/common/com...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/06/18 20:24:21

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonOptions.ml 
        src/daemon/driver: driverControlers.ml driverInterface.ml 
                           driverMain.ml 

Log message:
        patch #5191

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.895&r2=1.896
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonOptions.ml?cvsroot=mldonkey&r1=1.153&r2=1.154
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverControlers.ml?cvsroot=mldonkey&r1=1.71&r2=1.72
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverInterface.ml?cvsroot=mldonkey&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverMain.ml?cvsroot=mldonkey&r1=1.112&r2=1.113

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.895
retrieving revision 1.896
diff -u -b -r1.895 -r1.896
--- distrib/ChangeLog   18 Jun 2006 20:09:35 -0000      1.895
+++ distrib/ChangeLog   18 Jun 2006 20:24:21 -0000      1.896
@@ -15,6 +15,7 @@
 =========
 
 2006/06/18
+5191: HTML: remove sysinfo on opening page & option motd_html
 5192: Fix deactivation of verbosity "gui"
 5163: Configure: CVS SCM support for Mac OS X 10.3 (gstat)
 

Index: src/daemon/common/commonOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonOptions.ml,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -b -r1.153 -r1.154
--- src/daemon/common/commonOptions.ml  18 Jun 2006 20:09:35 -0000      1.153
+++ src/daemon/common/commonOptions.ml  18 Jun 2006 20:24:21 -0000      1.154
@@ -1375,10 +1375,6 @@
 
 let commands_frame_height = define_expert_option current_section 
["commands_frame_height"] "The height of the command frame in pixel (depends on 
your screen and browser sizes)" int_option 46
 
-let motd_html = define_expert_option current_section ["motd_html"]
-    "Message printed at startup (automatically downloaded from the previous
-    URL directory" string_option "<br><div align=\"center\"><h3>Welcome to 
MLDonkey</h3></div>"
-
 let compaction_delay = define_expert_option current_section 
["compaction_delay"]
     "Force compaction every <n> hours (in [1..24])"
     int_option 2

Index: src/daemon/driver/driverControlers.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverControlers.ml,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- src/daemon/driver/driverControlers.ml       16 Jun 2006 16:52:35 -0000      
1.71
+++ src/daemon/driver/driverControlers.ml       18 Jun 2006 20:24:21 -0000      
1.72
@@ -1157,15 +1157,10 @@
 
         | "oneframe.html" ->
             html_open_page buf t r true;
-            Buffer.add_string buf !!motd_html;
+            Buffer.add_string buf (Printf.sprintf "<br><div 
align=\"center\"><h3>Welcome to MLDonkey %s</h3></div>" 
Autoconf.current_version);
            (match DriverInteractive.real_startup_message () with
               Some s -> Buffer.add_string buf (Printf.sprintf 
"<p><pre><b><h3>%s</b></h3></pre>" s);
-            | None -> ());
-           Buffer.add_string buf "<pre>\n";
-           ignore (buildinfo false buf);
-           Buffer.add_string buf "\n";
-           ignore (runinfo false buf o);
-           Buffer.add_string buf "</pre>\n"
+            | None -> ())
 
         | "bw_updown.png" ->
             (match http_error_no_gd "png" with

Index: src/daemon/driver/driverInterface.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverInterface.ml,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- src/daemon/driver/driverInterface.ml        16 Jun 2006 16:52:35 -0000      
1.47
+++ src/daemon/driver/driverInterface.ml        18 Jun 2006 20:24:21 -0000      
1.48
@@ -391,7 +391,7 @@
   gui.gui_initialized <- true;
   networks_iter_all (fun n ->
       gui_send gui (Network_info (network_info n)));
-  gui_send gui (Console ((DriverControlers.text_of_html !!motd_html) ^ "\n"));
+  gui_send gui (Console (Printf.sprintf "Welcome to MLDonkey %s\n" 
Autoconf.current_version));
   (match DriverInteractive.real_startup_message () with
     Some s -> gui_send gui (Console s);
   | None -> ());

Index: src/daemon/driver/driverMain.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverMain.ml,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -b -r1.112 -r1.113
--- src/daemon/driver/driverMain.ml     6 Jun 2006 22:31:18 -0000       1.112
+++ src/daemon/driver/driverMain.ml     18 Jun 2006 20:24:21 -0000      1.113
@@ -139,39 +139,6 @@
   add_infinite_timer 1. second_timer
 
 
-let _ =
-  CommonWeb.add_web_kind "motd.html" "Information of the day in HTML format" 
-    (fun _ filename ->
-      lprintf_nl (_b "motd.html changed");
-    motd_html =:= File.to_string filename
-  );
-  CommonWeb.add_web_kind "motd.conf" "Setup changes of the day" 
-    (fun _ filename ->
-    try
-      Unix2.tryopen_read filename (fun ic ->
-       try
-         while true do
-           let line = input_line ic in
-           let cmd, args = String2.cut_at line ' ' in
-           let name, value = String2.cut_at args ' ' in
-           match cmd with
-             | "set" ->
-                 CommonInteractive.set_fully_qualified_options name value
-             | "add_item" ->
-                 CommonInteractive.add_item_to_fully_qualified_options name 
value
-             | "del_item" ->
-                 CommonInteractive.del_item_from_fully_qualified_options name 
value
-             | _ ->
-      lprintf_nl (_b "UNUSED LINE: %s") line
-         done
-       with End_of_file -> ())
-    with
-       e -> 
-    lprintf_nl (_b "Error while reading motd.conf(%s): %s") filename
-           (Printexc2.to_string e)
-  )
-
-
 let save_mlsubmit_reg () =
 
 (* Generate the mlsubmit.reg file *)