michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-10 04:42:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Only load virtual-server module once

Browse Source 
https://github.com/webmin/webmin/issues/2634
This commit is contained in:
Jamie Cameron
2026-03-07 13:29:37 -08:00
parent 16245144eb
commit cd7f867c09
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
quota/email.pl
View File

@@ -12,6 +12,13 @@ foreach $fs (&list_filesystems()) {
}
}
# Load Virtualmin if available
my $has_virt = 0;
if (&foreign_check("virtual-server")) {
&foreign_require("virtual-server");
$has_virt = 1;
}
# Look for filesystems with warning enabled
$now = time();
foreach $k (keys %config) {
@@ -47,10 +54,7 @@ foreach $k (keys %config) {
# Work out the domain, perhaps from Virtualmin
$email = $user{$i,'user'}."\@".
$config{'email_domain_'.$f};
if ($config{'email_virtualmin_'.$f} &&
&foreign_check("virtual-server")) {
&foreign_require("virtual-server",
"virtual-server-lib.pl");
if ($config{'email_virtualmin_'.$f} && $has_virt) {
local $d = &virtual_server::get_user_domain(
$user{$i,'user'});
if ($d) {
@@ -129,8 +133,6 @@ foreach $k (keys %config) {
}
else {
# From Virtualmin
&foreign_require("virtual-server",
"virtual-server-lib.pl");
local $d = &virtual_server::get_domain_by(
"group", $group{$i,'group'},
"parent", undef);