Merge branch 'master' into feature/letsencrypt-verbesserungen

This commit is contained in:
Michael Kaufmann
2016-12-11 08:23:46 +01:00
committed by GitHub
20 changed files with 145 additions and 64 deletions

View File

@@ -3547,8 +3547,18 @@ if (isFroxlorVersion('0.9.38.2')) {
updateToVersion('0.9.38.3');
}
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 (isDatabaseVersion('201611180')) {
showUpdateStep("Updating database table definition for panel_domains");
Database::query("ALTER TABLE `" . TABLE_PANEL_DOMAINS . "` ADD `phpenabled` tinyint(1) NOT NULL default '1' AFTER `parentdomainid`;");
lastStepStatus(0);
showUpdateStep("Adding field for let's-encrypt registration status");
Database::query("ALTER TABLE `".TABLE_PANEL_CUSTOMERS."` add `leregistered` TINYINT(1) NOT NULL DEFAULT 0;");
lastStepStatus(0);
@@ -3557,5 +3567,5 @@ if (isDatabaseVersion('201611180')) {
Settings::AddNew('system.leregistered', '0');
lastStepStatus(0);
updateToDbVersion('201611241');
updateToDbVersion('201612110');
}