Merge branch 'stable-3.1'

Author: Marius Burkard

install/lib/installer_base.lib.php

@@ -981,7 +981,7 @@ public function configure_postfix($options = '') {
 		wf($full_file_name, '/^/ FILTER amavis:[127.0.0.1]:10024');
 
 		//* Changing mode and group of the new created config files.
-		caselog('chmod o= '.$config_dir.'/mysql-virtual_*.cf* &> /dev/null',
+		caselog('chmod u=rw,g=r,o= '.$config_dir.'/mysql-virtual_*.cf* &> /dev/null',
 			__FILE__, __LINE__, 'chmod on mysql-virtual_*.cf*', 'chmod on mysql-virtual_*.cf* failed');
 		caselog('chgrp '.$cf['group'].' '.$config_dir.'/mysql-virtual_*.cf* &> /dev/null',
 			__FILE__, __LINE__, 'chgrp on mysql-virtual_*.cf*', 'chgrp on mysql-virtual_*.cf* failed');

install/sql/incremental/upd_dev_collection.sql

@@ -15,3 +15,17 @@ ALTER TABLE `sys_remoteaction` CHANGE `action_state` `action_state` ENUM('pendin
 ALTER TABLE `web_domain` CHANGE `folder_directive_snippets` `folder_directive_snippets` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NULL;
 ALTER TABLE `web_domain` ADD `log_retention` INT NOT NULL DEFAULT '30' AFTER `https_port`;
 ALTER TABLE `web_domain` CHANGE `stats_type` `stats_type` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT 'awstats';
+
+ALTER TABLE `spamfilter_policy` 
+CHANGE `virus_lover` `virus_lover` ENUM('N','Y') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'N',
+CHANGE `spam_lover` `spam_lover` ENUM('N','Y') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'N',
+CHANGE `banned_files_lover` `banned_files_lover` ENUM('N','Y') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'N',
+CHANGE `bad_header_lover` `bad_header_lover` ENUM('N','Y') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'N',
+CHANGE `bypass_virus_checks` `bypass_virus_checks` ENUM('N','Y') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'N',
+CHANGE `bypass_spam_checks` `bypass_spam_checks` ENUM('N','Y') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'N',
+CHANGE `bypass_banned_checks` `bypass_banned_checks` ENUM('N','Y') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'N',
+CHANGE `bypass_header_checks` `bypass_header_checks` ENUM('N','Y') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'N',
+CHANGE `spam_modifies_subj` `spam_modifies_subj` ENUM('N','Y') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'N',
+CHANGE `warnvirusrecip` `warnvirusrecip` ENUM('N','Y') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'N',
+CHANGE `warnbannedrecip` `warnbannedrecip` ENUM('N','Y') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'N',
+CHANGE `warnbadhrecip` `warnbadhrecip` ENUM('N','Y') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'N';

install/sql/ispconfig3.sql

@@ -1483,15 +1483,15 @@ CREATE TABLE `spamfilter_policy` (
   `sys_perm_group` varchar(5) NOT NULL DEFAULT '',
   `sys_perm_other` varchar(5) NOT NULL DEFAULT '',
   `policy_name` varchar(64) default NULL,
-  `virus_lover` enum('N','Y') default NULL,
-  `spam_lover` enum('N','Y') default NULL,
-  `banned_files_lover` enum('N','Y') default NULL,
-  `bad_header_lover` enum('N','Y') default NULL,
-  `bypass_virus_checks` enum('N','Y') default NULL,
-  `bypass_spam_checks` enum('N','Y') default NULL,
-  `bypass_banned_checks` enum('N','Y') default NULL,
-  `bypass_header_checks` enum('N','Y') default NULL,
-  `spam_modifies_subj` enum('N','Y') default NULL,
+  `virus_lover` enum('N','Y') default 'N',
+  `spam_lover` enum('N','Y') default 'N',
+  `banned_files_lover` enum('N','Y') default 'N',
+  `bad_header_lover` enum('N','Y') default 'N',
+  `bypass_virus_checks` enum('N','Y') default 'N',
+  `bypass_spam_checks` enum('N','Y') default 'N',
+  `bypass_banned_checks` enum('N','Y') default 'N',
+  `bypass_header_checks` enum('N','Y') default 'N',
+  `spam_modifies_subj` enum('N','Y') default 'N',
   `virus_quarantine_to` varchar(255) default NULL,
   `spam_quarantine_to` varchar(255) default NULL,
   `banned_quarantine_to` varchar(255) default NULL,
@@ -1507,9 +1507,9 @@ CREATE TABLE `spamfilter_policy` (
   `addr_extension_spam` varchar(64) default NULL,
   `addr_extension_banned` varchar(64) default NULL,
   `addr_extension_bad_header` varchar(64) default NULL,
-  `warnvirusrecip` enum('N','Y') default NULL,
-  `warnbannedrecip` enum('N','Y') default NULL,
-  `warnbadhrecip` enum('N','Y') default NULL,
+  `warnvirusrecip` enum('N','Y') default 'N',
+  `warnbannedrecip` enum('N','Y') default 'N',
+  `warnbadhrecip` enum('N','Y') default 'N',
   `newvirus_admin` varchar(64) default NULL,
   `virus_admin` varchar(64) default NULL,
   `banned_admin` varchar(64) default NULL,