Handle trust_unknown_referers set in callers pacakge

diff --git a/WebminCore.pm b/WebminCore.pm
index 5d167ec..8ad98fa 100644 (file)
--- a/WebminCore.pm
+++ b/WebminCore.pm
@@ -24,7 +24,7 @@ require Exporter;
 
 # Add global variables in web-lib.pl
 push(@EXPORT, qw(&unique));
-push(@EXPORT, qw($config_directory $var_directory $remote_error_handler %month_to_number_map %number_to_month_map $webmin_feedback_address $default_lang $default_charset $module_index_name $module_index_link %in $in @in $progress_callback_prefix $progress_callback_url $wait_for_debug $wait_for_input @matches $osdn_download_host $osdn_download_port $trust_unknown_referers));
+push(@EXPORT, qw($config_directory $var_directory $remote_error_handler %month_to_number_map %number_to_month_map $webmin_feedback_address $default_lang $default_charset $module_index_name $module_index_link %in $in @in $progress_callback_prefix $progress_callback_url $wait_for_debug $wait_for_input @matches $osdn_download_host $osdn_download_port));
 
 # Functions defined in themes
 push(@EXPORT, qw(&theme_post_save_domain &theme_post_save_domains &theme_post_save_server &theme_select_server &theme_select_domain &theme_post_save_folder &theme_post_change_modules));

diff --git a/file/edit_html.cgi b/file/edit_html.cgi
index ba92c25..a121ee7 100755 (executable)
--- a/file/edit_html.cgi
+++ b/file/edit_html.cgi
@@ -1,7 +1,6 @@
 #!/usr/local/bin/perl
 # Show an HTML editor window
 
-$WebminCore::trust_unknown_referers = 1;
 $trust_unknown_referers = 1;
 require './file-lib.pl';
 do '../ui-lib.pl';

diff --git a/file/filesystems.cgi b/file/filesystems.cgi
index 2864c1b..23a3616 100755 (executable)
--- a/file/filesystems.cgi
+++ b/file/filesystems.cgi
@@ -2,7 +2,6 @@
 # filesystems.cgi
 # List all filesystems and their types
 
-$WebminCore::trust_unknown_referers = 1;
 $trust_unknown_referers = 1;
 require './file-lib.pl';
 print "Content-type: text/plain\n\n";

diff --git a/file/show.cgi b/file/show.cgi
index a11e878..5b08fd3 100755 (executable)
--- a/file/show.cgi
+++ b/file/show.cgi
@@ -2,7 +2,6 @@
 # show.cgi
 # Output some file for the browser
 
-$WebminCore::trust_unknown_referers = 1;
 $trust_unknown_referers = 1;
 require './file-lib.pl';
 &ReadParse();

diff --git a/file/upform.cgi b/file/upform.cgi
index c98d30a..4fcaded 100755 (executable)
--- a/file/upform.cgi
+++ b/file/upform.cgi
@@ -2,7 +2,6 @@
 # upform.cgi
 # Display the upload form
 
-$WebminCore::trust_unknown_referers = 1;
 $trust_unknown_referers = 1;
 require './file-lib.pl';
 $disallowed_buttons{'upload'} && &error($text{'ebutton'});

diff --git a/web-lib-funcs.pl b/web-lib-funcs.pl
index d7fd0ea..7ee9f8e 100755 (executable)
--- a/web-lib-funcs.pl
+++ b/web-lib-funcs.pl
@@ -3725,7 +3725,9 @@ if ($0 &&
     $ENV{'HTTP_USER_AGENT'} !~ /^Webmin/i &&
     ($referer_site && $referer_site ne $http_host &&
      &indexof($referer_site, @referers) < 0 ||
-    !$referer_site && $gconfig{'referers_none'}) && !$trust_unknown_referers) {
+    !$referer_site && $gconfig{'referers_none'}) &&
+    !$trust_unknown_referers &&
+    !&get_module_variable('$trust_unknown_referers')) {
        # Looks like a link from elsewhere .. show an error
        &header($text{'referer_title'}, "", undef, 0, 1, 1);