merged for live

This commit is contained in:
2016-12-16 17:22:28 +01:00
7 changed files with 89 additions and 9 deletions

View File

@@ -3416,6 +3416,7 @@ if (isFroxlorVersion('0.9.37-rc1')) {
updateToVersion('0.9.37');
}
<<<<<<< HEAD
if (isDatabaseVersion('201607210')) {
showUpdateStep("Adding new settings for customer shell option");
@@ -3551,4 +3552,16 @@ if (isFroxlorVersion('0.9.38.3')) {
showUpdateStep("Updating from 0.9.38.3 to 0.9.38.4", false);
updateToVersion('0.9.38.4');
if(isFroxlorVersion('0.9.37')) {
showUpdateStep("Adding Database column for greylisting",false);
Database::query("ALTER TABLE `".TABLE_MAIL_VIRTUAL."` ADD COLUMN IF NOT EXISTS disablegreylist TINYINT(1) DEFAULT 0");
updateToVersion('0.9.37-greylist');
}
if(isFroxlorVersion('0.9.37-greylist')) {
showUpdateStep("Adding new settings (greylisting enabled by default)", false);
Settings::AddNew("mail.greylist_enabled", "1");
Settings::AddNew("mail.greylist_disabled_default", "0");
updateToVersion('0.9.37-greylist2');
}