diff --git a/WebminCore.pm b/WebminCore.pm index 0593750cd..a59ebc278 100644 --- 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)); +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/web-lib-funcs.pl b/web-lib-funcs.pl index 71d965fa5..590170180 100755 --- a/web-lib-funcs.pl +++ b/web-lib-funcs.pl @@ -8121,9 +8121,6 @@ my $rv = "su".($env ? " -" : "").$shellarg. return $rv; } -$osdn_download_host = "prdownloads.sourceforge.net"; -$osdn_download_port = 80; - =head2 list_osdn_mirrors(project, file) Given a OSDN project and filename, returns a list of mirror URLs from diff --git a/web-lib.pl b/web-lib.pl index 95a6e6de7..be9b8c750 100755 --- a/web-lib.pl +++ b/web-lib.pl @@ -27,6 +27,8 @@ $main::default_debug_log_file = $ENV{'WEBMIN_VAR'}."/webmin.debug"; $webmin_feedback_address = "feedback\@webmin.com"; $default_lang = "en"; $default_charset = "iso-8859-1"; +$osdn_download_host = "prdownloads.sourceforge.net"; +$osdn_download_port = 80; =head2 unique(string, ...)