michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 16:50:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Do all requires just once

Browse Source
This commit is contained in:
Jamie Cameron
2018-04-21 12:12:16 -07:00
parent 9f03709dfb
commit f336fffcff
6 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
filter/edit.cgi
View File

@@ -2,7 +2,6 @@
# Show details of one filter
require './filter-lib.pl';
&foreign_require("mailbox");
&ReadParse();
# Show page header and get the filter

14
filter/filter-lib.pl
View File

@@ -40,13 +40,12 @@ if (&get_product_name() eq 'usermin') {
}
&create_user_config_dirs();
&foreign_require("procmail", "procmail-lib.pl");
&foreign_require("mailbox");
}
else {
# Running under Webmin, so different modules are used
&foreign_require("procmail", "procmail-lib.pl");
&foreign_require("mailboxes", "mailboxes-lib.pl");
&foreign_require("usermin", "usermin-lib.pl");
&foreign_require("mailboxes");
&foreign_require("usermin");
$mail_system_module =
$mailboxes::config{'mail_system'} == 1 ? "postfix" :
$mailboxes::config{'mail_system'} == 2 ? "qmailadmin" :
@@ -54,6 +53,8 @@ else {
$autoreply_cmd = "$config_directory/$mail_system_module/autoreply.pl";
$user_autoreply_cmd = "$usermin::config{'usermin_dir'}/forward/autoreply.pl";
}
&foreign_require("spam");
&foreign_require("procmail");
# list_filters([file])
# Returns a list of filter objects, which have a 1-to-1 correlation with
@@ -248,7 +249,6 @@ elsif ($filter->{'cond'}) {
# Set action section
if ($filter->{'actionspam'}) {
&foreign_require("spam", "spam-lib.pl");
$recipe->{'type'} = '|';
$recipe->{'action'} = &spam::get_procmail_command();
push(@flags, "f", "w");
@@ -347,7 +347,6 @@ return $folder;
sub get_global_spamassassin
{
return $global_spamassassin if ($global_spamassassin);
&foreign_require("spam", "spam-lib.pl");
local @recipes = &procmail::parse_procmail_file(
$spam::config{'global_procmailrc'});
return &spam::find_spam_recipe(\@recipes) ? 1 : 0;
@@ -358,7 +357,6 @@ return &spam::find_spam_recipe(\@recipes) ? 1 : 0;
# Virtualmin per-domain procmail file
sub get_global_spam_path
{
&foreign_require("spam", "spam-lib.pl");
if ($virtualmin_domain_id) {
# Read the Virtualmin procmailrc for the domain
local $vmpmrc = "$config{'virtualmin_config'}/procmail/".
@@ -386,7 +384,6 @@ else {
# Virtualmin per-domain procmail file
sub get_global_spam_delete
{
&foreign_require("spam", "spam-lib.pl");
if ($virtualmin_domain_id) {
# Read the Virtualmin procmailrc for the domain
local $vmpmrc = "$config{'virtualmin_config'}/procmail/".
@@ -576,7 +573,6 @@ else {
local $folder = &file_to_folder($f->{'action'}, $folders, $home);
if ($folder) {
if (&get_product_name() eq 'usermin') {
&foreign_require("mailbox");
local $id = &mailbox::folder_name($folder);
$action = &text('index_afolder',
"<a href='../mailbox/index.cgi?id=$id'>".

1
filter/index.cgi
View File

@@ -2,7 +2,6 @@
# Show a table of simple actions
require './filter-lib.pl';
&foreign_require("mailbox");
&ui_print_header(undef, $text{'index_title'}, "", undef, 0, 1);
if (&get_product_name() eq 'webmin') {

1
filter/move.cgi
View File

@@ -2,7 +2,6 @@
# Apply a filter to email in some folder
require './filter-lib.pl';
&foreign_require("mailbox");
&ReadParse();
&error_setup($text{'move_err'});

2
filter/save.cgi
View File

@@ -2,7 +2,6 @@
# Create, update or delete a filter
require './filter-lib.pl';
&foreign_require("mailbox");
use Time::Local;
&ReadParse();
@@ -84,6 +83,7 @@ else {
$filter->{'condheader'} = $in{'condmenu'} || $in{'condheader'};
$filter->{'condheader'} =~ /^[a-zA-Z0-9\-]+$/ ||
&error($text{'save_econdheader'});
$in{'condvalue'} = &mailbox::encode_mimeword($in{'condvalue'});
if (!$in{'condregexp'} &&
$in{'condvalue'} =~ /[\^\$\.\*\+\?\|\(\)\[\]\{\}\\]/) {
# If the user didn't ask for a regexp but there are

1
filter/save_auto.cgi
View File

@@ -2,7 +2,6 @@
# Create, update or delete an autoreply filter
require './filter-lib.pl';
&foreign_require("mailbox");
&ReadParse();
&error_setup($text{'auto_err'});
use Time::Local;