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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/11/19 23:03:42

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

Log message:
        patch #5564

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1100&r2=1.1101
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonOptions.ml?cvsroot=mldonkey&r1=1.187&r2=1.188
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverCommands.ml?cvsroot=mldonkey&r1=1.197&r2=1.198
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverControlers.ml?cvsroot=mldonkey&r1=1.92&r2=1.93

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1100
retrieving revision 1.1101
diff -u -b -r1.1100 -r1.1101
--- distrib/ChangeLog   19 Nov 2006 23:02:18 -0000      1.1100
+++ distrib/ChangeLog   19 Nov 2006 23:03:42 -0000      1.1101
@@ -15,6 +15,7 @@
 =========
 
 2006/11/20
+5564: HTML: Remove non-working option use_html_frames (Schlumpf)
 5563: EDK: Fix broken log message when master server changes (Schlumpf)
 
 2006/11/15

Index: src/daemon/common/commonOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonOptions.ml,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -b -r1.187 -r1.188
--- src/daemon/common/commonOptions.ml  15 Nov 2006 12:37:13 -0000      1.187
+++ src/daemon/common/commonOptions.ml  19 Nov 2006 23:03:42 -0000      1.188
@@ -1458,10 +1458,6 @@
   "The realm shown when connecting with a WEB browser"
     string_option "MLdonkey"
 
-let use_html_frames = define_expert_option current_section ["use_html_frames"]
-  "This option controls whether the WEB interface should use frames or not"
-    bool_option true
-
 let html_frame_border = define_expert_option current_section 
["html_frame_border"]
   "This option controls whether the WEB interface should show frame borders or 
not"
     bool_option true

Index: src/daemon/driver/driverCommands.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -b -r1.197 -r1.198
--- src/daemon/driver/driverCommands.ml 15 Nov 2006 12:37:13 -0000      1.197
+++ src/daemon/driver/driverCommands.ml 19 Nov 2006 23:03:42 -0000      1.198
@@ -1676,7 +1676,6 @@
                        strings_of_option html_mods_load_message_file;
                        strings_of_option html_mods_max_messages;
                        strings_of_option html_mods_bw_refresh_delay;
-                       strings_of_option use_html_frames;
                        strings_of_option html_frame_border;
                        strings_of_option html_checkbox_vd_file_list;
                        strings_of_option html_checkbox_search_file_list;
@@ -3526,7 +3525,6 @@
             html_mods =:= true;
             html_mods_style =:= 0;
             commands_frame_height =:= 
CommonMessages.styles.(!!html_mods_style).frame_height;
-            use_html_frames =:= true;
             CommonMessages.colour_changer() ;
           end;
 
@@ -3544,7 +3542,6 @@
           end
         else begin
             html_mods =:= true;
-            use_html_frames =:= true;
             html_mods_theme =:= "";
             let num = int_of_string (List.hd args) in
 
@@ -3635,8 +3632,7 @@
             ""
           end
         else begin
-(* html_mods =:= true;
-            use_html_frames =:= true; *)
+(* html_mods =:= true; *)
             html_mods_theme =:= List.hd args;
             "\\<script 
type=\\\"text/javascript\\\"\\>top.window.location.reload();\\</script\\>"
           end

Index: src/daemon/driver/driverControlers.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverControlers.ml,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -b -r1.92 -r1.93
--- src/daemon/driver/driverControlers.ml       9 Nov 2006 21:32:26 -0000       
1.92
+++ src/daemon/driver/driverControlers.ml       19 Nov 2006 23:03:42 -0000      
1.93
@@ -775,14 +775,6 @@
     really_input file s 0 size;
     s)
 
-let add_simple_commands buf =
-  let this_page = "commands.html" in
-  Buffer.add_string buf (
-    if !!html_mods_theme != "" && theme_page_exists this_page then
-      read_theme_page this_page else
-    if !!html_mods then !!CommonMessages.web_common_header_mods0
-    else !!CommonMessages.web_common_header_old)
-
 let http_add_gen_header r =
   add_reply_header r "Server" "MLdonkey";
   add_reply_header r "Connection" "close"
@@ -883,9 +875,7 @@
                         else !!CommonMessages.html_header_old);
 
   Buffer.add_string buf "</head>\n";
-  if open_body then Buffer.add_string buf "<body>\n";
-  if not !!use_html_frames then add_simple_commands buf;
-  ()
+  if open_body then Buffer.add_string buf "<body>\n"
 
 let html_close_page buf close_body =
   if close_body then Buffer.add_string buf "</body>\n";
@@ -1054,7 +1044,6 @@
               if !!html_mods then !!CommonMessages.multidllink_mods0
               else !!CommonMessages.multidllink_old)
         | "" | "index.html" ->
-            if !!use_html_frames then begin
                 html_open_page buf t r false;
                 let this_page = "frames.html" in
                 if !!html_mods_theme != "" && theme_page_exists this_page then
@@ -1085,9 +1074,7 @@
 </frameset>
 <frame name=\"output\" src=\"oneframe.html\">
 </frameset>
-" !!commands_frame_height;
-              end else
-              html_open_page buf t r true
+" !!commands_frame_height
         | "complex_search.html" ->
             html_open_page buf t r true;
             CommonSearch.complex_search buf
@@ -1541,8 +1528,8 @@
 
   let s =
     match !http_file_type with
-      HTM -> html_close_page buf false; dollar_escape o !!use_html_frames 
(Buffer.contents buf)
-    | MLHTM -> html_close_page buf true; dollar_escape o !!use_html_frames 
(Buffer.contents buf)
+      HTM -> html_close_page buf false; dollar_escape o true (Buffer.contents 
buf)
+    | MLHTM -> html_close_page buf true; dollar_escape o true (Buffer.contents 
buf)
     | TXT
     | UNK
     | BIN -> Buffer.contents buf