always write before/after sieve scripts, and autoresponder dates optional

Author: jnorell

install/sql/incremental/upd_dev_collection.sql

@@ -49,4 +49,4 @@ ALTER TABLE `web_domain` CHANGE `apache_directives` `apache_directives` mediumte
 ALTER TABLE `web_domain` CHANGE `nginx_directives` `nginx_directives` mediumtext NULL DEFAULT NULL;
 
 -- add move to junk before/after option, default to after
-ALTER TABLE `mail_user` MODIFY `move_junk` enum('y','a','n') NOT NULL DEFAULT 'a';
+ALTER TABLE `mail_user` MODIFY `move_junk` enum('y','a','n') NOT NULL DEFAULT 'y';

install/sql/ispconfig3.sql

@@ -1046,7 +1046,7 @@ CREATE TABLE `mail_user` (
   `autoresponder_end_date` datetime NULL default NULL,
   `autoresponder_subject` varchar(255) NOT NULL default 'Out of office reply',
   `autoresponder_text` mediumtext NULL,
-  `move_junk` enum('y','a','n') NOT NULL default 'a',
+  `move_junk` enum('y','a','n') NOT NULL default 'y',
   `purge_trash_days` INT NOT NULL DEFAULT '0',
   `purge_junk_days` INT NOT NULL DEFAULT '0',
   `custom_mailfilter` mediumtext,

interface/lib/classes/validate_autoresponder.inc.php

@@ -31,25 +31,11 @@
 
 class validate_autoresponder extends validate_datetime
 {
-	function start_date($field_name, $field_value, $validator)
-	{
-		global $app;
-		
-		// save field value for later use in end_date()
-		$this->start_date = $field_value;
-
-		if($_POST['autoresponder'] == 'y' && $field_value == '') {
-			// we need a start date when autoresponder is on
-			return $app->tform->lng($validator['errmsg']).'<br />';
-		}
-	}
-
 	function end_date($field_name, $field_value, $validator)
 	{
 		global $app;
 
-		$start_date = $this->start_date;
-		//$start_date = $app->tform_actions->dataRecord['autoresponder_start_date'];
+		$start_date = $app->tform_actions->dataRecord['autoresponder_start_date'];
 
 		// Parse date
 		$datetimeformat = (isset($app->remoting_lib) ? $app->remoting_lib->datetimeformat : $app->tform->datetimeformat);
@@ -60,8 +46,8 @@ function end_date($field_name, $field_value, $validator)
 		$start_date_tstamp = mktime($start_date_array['hour'], $start_date_array['minute'], $start_date_array['second'], $start_date_array['month'], $start_date_array['day'], $start_date_array['year']);
 		$end_date_tstamp = mktime($end_date_array['hour'], $end_date_array['minute'], $end_date_array['second'], $end_date_array['month'], $end_date_array['day'], $end_date_array['year']);
 
-		// End date has to be > start date
-		if($end_date_tstamp <= $start_date_tstamp && ($start_date || $field_value)) {
+		// If both are set, end date has to be > start date
+		if($start_date && $field_value && $end_date_tstamp <= $start_date_tstamp) {
 			return $app->tform->lng($validator['errmsg']).'<br />';
 		}
 	}

interface/web/mail/form/mail_user.tform.php

@@ -364,10 +364,6 @@
 					0 => array ( 'type' => 'ISDATETIME',
 						'allowempty' => 'y',
 						'errmsg'=> 'autoresponder_start_date_is_no_date'),
-					1 => array ( 'type' => 'CUSTOM',
-						'class' => 'validate_autoresponder',
-						'function' => 'start_date',
-						'errmsg'=> 'autoresponder_start_date_is_required'),
 				)
 			),
 			'autoresponder_end_date' => array (
@@ -403,7 +399,7 @@
 			'move_junk' => array (
 				'datatype' => 'VARCHAR',
 				'formtype' => 'SELECT',
-				'default' => 'a',
+				'default' => 'y',
 				'value' => array('y' => 'move_junk_y_txt', 'a' => 'move_junk_a_txt', 'n' => 'move_junk_n_txt'),
 			),
 			'purge_trash_days' => array (

interface/web/mail/lib/lang/ar_mail_user.lng

@@ -11,7 +11,7 @@ $wb['autoresponder_txt'] = 'Active';
 $wb['autoresponder_start_date_txt'] = 'Start on';
 $wb['autoresponder_start_date_ispast'] = 'Start date cannot be in the past.';
 $wb['autoresponder_end_date_txt'] = 'End by';
-$wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.';
+$wb['autoresponder_end_date_isgreater'] = 'End date must be later than start date.';
 $wb['no_domain_perm'] = 'You have no permission for this domain.';
 $wb['error_no_pwd'] = 'Password is empty.';
 $wb['quota_error_isint'] = 'Mailbox size must be a number.';
@@ -60,7 +60,6 @@ $wb['monthly_backup_txt'] = 'Monthly';
 $wb['email_error_isascii'] = 'Please do not use special unicode characters for your password. This could lead to problems with your mail client.';
 $wb['cc_note_txt'] = '(Separate multiple email addresses with commas)';
 $wb['disablesmtp_txt'] = 'Disable SMTP (sending)';
-$wb['autoresponder_start_date_is_required'] = 'Start date must be set when Autoresponder is enabled.';
 $wb['sender_cc_txt'] = 'Send outgoing BCC to';
 $wb['sender_cc_error_isemail'] = 'The -Send outgoing copy to- field does not contain a valid email address';
 $wb['sender_cc_note_txt'] = '(Separate multiple email addresses with commas)';

interface/web/mail/lib/lang/bg_mail_user.lng

@@ -54,7 +54,6 @@ $wb['password_match_txt'] = 'The passwords do match.';
 $wb['email_error_isascii'] = 'Please do not use special unicode characters for your password. This could lead to problems with your mail client.';
 $wb['cc_note_txt'] = '(Separate multiple email addresses with commas)';
 $wb['disablesmtp_txt'] = 'Disable SMTP (sending)';
-$wb['autoresponder_start_date_is_required'] = 'Start date must be set when Autoresponder is enabled.';
 $wb['sender_cc_txt'] = 'Send outgoing BCC to';
 $wb['sender_cc_error_isemail'] = 'The -Send outgoing copy to- field does not contain a valid email address';
 $wb['backup_interval_txt'] = 'Backup interval';

interface/web/mail/lib/lang/br_mail_user.lng

@@ -14,7 +14,6 @@ $wb['autoresponder_start_date_txt'] = 'Iniciar em';
 $wb['autoresponder_start_date_ispast'] = 'O campo "Iniciar em" não pode ser menor que a data atual.';
 $wb['autoresponder_end_date_txt'] = 'Terminar em';
 $wb['autoresponder_end_date_isgreater'] = 'O campo "Terminar em" deve ser configurado e não pode ser menor ou igual a data atual.';
-$wb['autoresponder_start_date_is_required'] = 'Data iniciar deve ser configurado quando a opção de auto-resposta estiver habilitada.';
 $wb['no_domain_perm'] = 'Você não tem permissão para este domínio.';
 $wb['error_no_pwd'] = 'A senha está em branco.';
 $wb['quota_error_isint'] = 'O tamanho da conta de e-mail deve ser um número.';

interface/web/mail/lib/lang/ca_mail_user.lng

@@ -53,7 +53,6 @@ $wb['password_match_txt'] = 'Les mots de passe correspondent.';
 $wb['disablesmtp_txt'] = 'Désactiver SMTP (envoi)';
 $wb['email_error_isascii'] = 'Please do not use special unicode characters for your password. This could lead to problems with your mail client.';
 $wb['cc_note_txt'] = '(Séparer chaque adresses par une virgule)';
-$wb['autoresponder_start_date_is_required'] = 'Start date must be set when Autoresponder is enabled.';
 $wb['greylisting_txt'] = 'Enable greylisting';
 $wb['sender_cc_txt'] = 'Send outgoing BCC to';
 $wb['sender_cc_error_isemail'] = 'The -Send outgoing copy to- field does not contain a valid email address';

interface/web/mail/lib/lang/cz_mail_user.lng

@@ -53,7 +53,6 @@ $wb['password_match_txt'] = 'Hesla se shodují.';
 $wb['email_error_isascii'] = 'Please do not use special unicode characters for your password. This could lead to problems with your mail client.';
 $wb['cc_note_txt'] = '(Při posílání kopií na více e-mailových adres, oddělte čárkami.)';
 $wb['disablesmtp_txt'] = 'Zakázat SMTP (pouze odesílání)';
-$wb['autoresponder_start_date_is_required'] = 'Start date must be set when Autoresponder is enabled.';
 $wb['greylisting_txt'] = 'Povolit greylisting';
 $wb['sender_cc_txt'] = 'Odeslat odchozí kopii na';
 $wb['sender_cc_error_isemail'] = 'The -Send outgoing copy to- field does not contain a valid email address';

interface/web/mail/lib/lang/de_mail_user.lng

@@ -60,7 +60,6 @@ $wb['daily_backup_txt'] = 'taeglich';
 $wb['weekly_backup_txt'] = 'woechentlich';
 $wb['monthly_backup_txt'] = 'monatlich';
 $wb['cc_note_txt'] = '(Mehrere E-Mail-Adressen mit Kommas trennen)';
-$wb['autoresponder_start_date_is_required'] = 'Startdatum muss angegeben werden.';
 $wb['sender_cc_txt'] = 'Kopie ausgehender Emails senden an (BCC)';
 $wb['sender_cc_error_isemail'] = '-Kopie ausgehender Emails senden an- Feld enthält keine gültige Emailadresse';
 $wb['sender_cc_note_txt'] = '(Mehrere E-Mail-Adressen mit Kommas trennen)';