Merge branch 'stable-3.1' into '5464-use-unique-id-for-additional-php-selection-in-website'

# Conflicts:
#   install/sql/incremental/upd_dev_collection.sql

Author: Till Brehm

install/sql/incremental/upd_dev_collection.sql

@@ -56,3 +56,6 @@ UPDATE `web_domain` as w LEFT JOIN sys_group as g ON (g.groupid = w.sys_groupid)
 
 ALTER TABLE `web_domain` CHANGE `apache_directives` `apache_directives` mediumtext NULL DEFAULT NULL;
 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 '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('n','y') NOT NULL default 'n',
+  `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,

install/tpl/debian6_dovecot.conf.master

@@ -60,6 +60,7 @@ plugin {
   # no longer needed, as 'sieve' is in userdb extra fields:
   sieve=/var/vmail/%d/%n/.sieve
 
+  sieve_before=/var/vmail/%d/%n/.ispconfig-before.sieve
   sieve_after=/var/vmail/%d/%n/.ispconfig.sieve
   sieve_max_script_size = 2M
   sieve_max_actions = 100

install/tpl/debian6_dovecot2.conf.master

@@ -29,6 +29,7 @@ plugin {
   # no longer needed, as 'sieve' is in userdb extra fields:
   sieve=/var/vmail/%d/%n/.sieve
 
+  sieve_before=/var/vmail/%d/%n/.ispconfig-before.sieve
   sieve_after=/var/vmail/%d/%n/.ispconfig.sieve
   sieve_max_script_size = 2M
   sieve_max_actions = 100

install/tpl/debian_dovecot.conf.master

@@ -1145,6 +1145,7 @@ plugin {
   # and they're not deleted automatically (use a cronjob or something).
   #lazy_expunge = .EXPUNGED/ .DELETED/ .DELETED/.EXPUNGED/
 
+  sieve_before=/var/vmail/%d/%n/.ispconfig-before.sieve
   sieve_after=/var/vmail/%d/%n/.ispconfig.sieve
   sieve_max_script_size = 2M
   sieve_max_actions = 100

install/tpl/debian_dovecot2.conf.master

@@ -28,6 +28,7 @@ plugin {
   # no longer needed, as 'sieve' is in userdb extra fields:
   sieve=/var/vmail/%d/%n/.sieve
 
+  sieve_before=/var/vmail/%d/%n/.ispconfig-before.sieve
   sieve_after=/var/vmail/%d/%n/.ispconfig.sieve
   sieve_max_script_size = 2M
   sieve_max_actions = 100

install/tpl/fedora_dovecot.conf.master

@@ -1306,6 +1306,7 @@ plugin {
   # ManageSieve this is where the uploaded scripts are stored.
   sieve_dir=~/sieve
 
+  sieve_before=/var/vmail/%d/%n/.ispconfig-before.sieve
   sieve_after=/var/vmail/%d/%n/.ispconfig.sieve
   sieve_max_script_size = 2M
   sieve_max_actions = 100

install/tpl/fedora_dovecot2.conf.master

@@ -26,6 +26,7 @@ plugin {
   # no longer needed, as 'sieve' is in userdb extra fields:
   sieve=/var/vmail/%d/%n/.sieve
 
+  sieve_before=/var/vmail/%d/%n/.ispconfig-before.sieve
   sieve_after=/var/vmail/%d/%n/.ispconfig.sieve
   sieve_max_script_size = 2M
   sieve_max_actions = 100

install/tpl/mysql-virtual_client.cf.master

@@ -1,8 +1,5 @@
 user = {mysql_server_ispconfig_user}
 password = {mysql_server_ispconfig_password}
 dbname = {mysql_server_database}
-table        = mail_access
-select_field = access
-where_field  = source
-additional_conditions = and type = 'client' and active = 'y'
-hosts = {mysql_server_ip}
+hosts = {mysql_server_ip}
+query = select access from mail_access where source = '%s' and type = 'client' and active = 'y'

install/tpl/mysql-virtual_domains.cf.master

@@ -1,8 +1,5 @@
 user = {mysql_server_ispconfig_user}
 password = {mysql_server_ispconfig_password}
 dbname = {mysql_server_database}
-table = mail_domain
-select_field = domain
-where_field = domain
-additional_conditions = and active = 'y' and server_id = {server_id}
-hosts = {mysql_server_ip}
+hosts = {mysql_server_ip}
+query = select domain from mail_domain where domain = '%s' and active = 'y' and server_id = {server_id}