From 6041fb5c9e307e1190082d8228a32d3270b41286 Mon Sep 17 00:00:00 2001 From: ivan Date: Sat, 19 Apr 2003 17:52:49 +0000 Subject: [PATCH] /^\s*$/ setup/recur expressions now failsafe to 0 (closes: Bug#498) deprecate old 1.3-style qmail integration --- FS/FS/Conf.pm | 4 ++-- FS/FS/part_pkg.pm | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm index fcc150cd4..4a0576a99 100644 --- a/FS/FS/Conf.pm +++ b/FS/FS/Conf.pm @@ -541,8 +541,8 @@ httemplate/docs/config.html { 'key' => 'qmailmachines', - 'section' => 'mail', - 'description' => 'Your qmail machines, one per line. This enables export of `/var/qmail/control/virtualdomains\', `/var/qmail/control/recipientmap\', and `/var/qmail/control/rcpthosts\'. Setting this option (even if empty) also turns on user `.qmail-extension\' file maintenance in conjunction with the shellmachine option.', + 'section' => 'deprecated', + 'description' => 'DEPRECATED, add qmail and shellcommands exports instead. This option used to export `/var/qmail/control/virtualdomains\', `/var/qmail/control/recipientmap\', and `/var/qmail/control/rcpthosts\'. Setting this option (even if empty) also turns on user `.qmail-extension\' file maintenance in conjunction with the shellmachine option.', 'type' => [qw( checkbox textarea )], }, diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm index 99d88d56a..60b0e01f9 100644 --- a/FS/FS/part_pkg.pm +++ b/FS/FS/part_pkg.pm @@ -180,6 +180,8 @@ insert and replace methods. sub check { my $self = shift; + for (qw(setup recur)) { $self->set($_=>0) if $self->get($_) =~ /^\s*$/; } + my $conf = new FS::Conf; if ( $conf->exists('safe-part_pkg') ) { -- 2.11.0