From a69e1bbb7f8c8fc3327d69042ee36af2dfc165d8 Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Tue, 3 Mar 2009 21:32:10 +0000
Subject: [PATCH] Use new module

---
 webmin/change_advanced.cgi | 11 ++++++++---
 webmin/edit_advanced.cgi   | 14 ++++++++++----
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/webmin/change_advanced.cgi b/webmin/change_advanced.cgi
index 732927047..6e98d4181 100755
--- a/webmin/change_advanced.cgi
+++ b/webmin/change_advanced.cgi
@@ -75,9 +75,14 @@ if (defined($in{'sclass'})) {
 &unlock_file("$config_directory/config");
 
 if (defined($in{'preload'})) {
-	# Save preload option
-	@preload = $in{'preload'} ? ( [ "main", "web-lib-funcs.pl" ] ) : ( );
-	&save_preloads(\%miniserv, \@preload);
+	# Save preload option, forcing new mode
+	if ($in{'preload'}) {
+		$miniserv{'premodules'} = 'WebminCore';
+		}
+	else {
+		delete($miniserv{'premodules'});
+		}
+	&save_preloads(\%miniserv, [ ]);
 	}
 
 # Save password pass option
diff --git a/webmin/edit_advanced.cgi b/webmin/edit_advanced.cgi
index a2c633add..e23dcc004 100755
--- a/webmin/edit_advanced.cgi
+++ b/webmin/edit_advanced.cgi
@@ -39,11 +39,17 @@ $ttable .= &ui_columns_end();
 print &ui_table_row($text{'advanced_tempmods'}, $ttable);
 
 @preloads = &get_preloads(\%miniserv);
-if (!@preloads ||
-    $preloads[0]->[0] eq "main" && $preloads[0]->[1] eq "web-lib-funcs.pl") {
-	# Only show preload option if in supported mode
+if (!@preloads && (!$miniserv{'premodules'} ||
+		   $miniserv{'premodules'} eq 'WebminCore')) {
+	# New-style preload possible or enabled
 	print &ui_table_row($text{'advanced_preload'},
-			    &ui_yesno_radio("preload", @preloads ? 1 : 0));
+		    &ui_yesno_radio("preload",
+				    $miniserv{'premodules'} eq 'WebminCore'));
+	}
+elsif ($preloads[0]->[0] eq "main" && $preloads[0]->[1] eq "web-lib-funcs.pl") {
+	# Old-style preloads enabled
+	print &ui_table_row($text{'advanced_preload'},
+			    &ui_yesno_radio("preload", 1));
 	}
 
 # Show call stack on error