diff options
| author | ivan <ivan> | 2003-04-19 17:51:27 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2003-04-19 17:51:27 +0000 |
| commit | fdccb39f148b8fb2a8a7818e9a7999c20b2e05bd (patch) | |
| tree | d40e51d680938c3cb2a95de289a982343d6fc045 | |
| parent | 2e9ff8b770519382f5767faf7a1dd15eb79eb7fe (diff) | |
/^\s*$/ setup/recur expressions now failsafe to 0 (closes: Bug#498)
deprecate old 1.3-style qmail integration
| -rw-r--r-- | FS/FS/Conf.pm | 4 | ||||
| -rw-r--r-- | 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 f0a4c9f45..b00e78255 100644 --- a/FS/FS/Conf.pm +++ b/FS/FS/Conf.pm @@ -527,8 +527,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 <b>shellmachine</b> option.', + 'section' => 'deprecated', + 'description' => '<b>DEPRECATED</b>, add <i>qmail</i> and <i>shellcommands</i> <a href="../browse/part_export.cgi">exports</a> 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 <b>shellmachine</b> 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') ) { |