From 9828c1abe2a5df570028e55fa0356b3a0cac1d76 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Tue, 5 Aug 2014 14:08:17 +0200 Subject: Fix default vacation status (#1490019) - improve error message --- plugins/managesieve/lib/Roundcube/rcube_sieve_vacation.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'plugins/managesieve/lib/Roundcube/rcube_sieve_vacation.php') diff --git a/plugins/managesieve/lib/Roundcube/rcube_sieve_vacation.php b/plugins/managesieve/lib/Roundcube/rcube_sieve_vacation.php index 9ba52b03b..1c3181706 100644 --- a/plugins/managesieve/lib/Roundcube/rcube_sieve_vacation.php +++ b/plugins/managesieve/lib/Roundcube/rcube_sieve_vacation.php @@ -124,8 +124,9 @@ class rcube_sieve_vacation extends rcube_sieve_engine } if ($vacation_action['reason'] == '') { - $error = 'managesieve.cannotbeempty'; + $error = 'managesieve.emptyvacationbody'; } + if ($vacation_action[$interval_type] && !preg_match('/^[0-9]+$/', $vacation_action[$interval_type])) { $error = 'managesieve.forbiddenchars'; } @@ -367,7 +368,7 @@ class rcube_sieve_vacation extends rcube_sieve_engine } $table->add('title', html::label('vacation_status', $this->plugin->gettext('vacation.status'))); - $table->add(null, $status->show($this->vacation['disabled'] ? 'off' : 'on')); + $table->add(null, $status->show(!isset($this->vacation['disabled']) || $this->vacation['disabled'] ? 'off' : 'on')); $out .= html::tag('fieldset', $class, html::tag('legend', null, $this->plugin->gettext('vacation.reply')) . $table->show($attrib)); -- cgit v1.2.3