From f7ec00b2f8ba3efc5bdeacef9c813f8a826ae3be Mon Sep 17 00:00:00 2001
From: Patrick Anders <p.anders@timmehosting.de>
Date: Wed, 10 Dec 2014 08:44:26 -0500
Subject: [PATCH] add Spdy option - http://en.wikipedia.org/wiki/SPDY
---
install/lib/update.lib.php | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/install/lib/update.lib.php b/install/lib/update.lib.php
index bc0453f..d2d11bf 100644
--- a/install/lib/update.lib.php
+++ b/install/lib/update.lib.php
@@ -29,10 +29,10 @@
//* Installer patch stub class
class installer_patch_update {
- protected function onBeforeSQL() {
+ public function onBeforeSQL() {
}
- protected function onAfterSQL() {
+ public function onAfterSQL() {
}
}
@@ -153,17 +153,22 @@
$conf['nginx']['installed'] = false;
}
- //* Do incremental DB updates only on installed ISPConfig versions > 3.0.3
- if(compare_ispconfig_version('3.0.3', ISPC_APP_VERSION) >= 0) {
+ //* Do incremental DB updates only on installed ISPConfig versions >= 3.0.3
+ if(version_compare('3.0.3', ISPC_APP_VERSION, '<=')) {
swriteln($inst->lng('Starting incremental database update.'));
//* get the version of the db schema from the server table
$found = true;
+ $dev_patch = false;
while($found == true) {
- $next_db_version = intval($current_db_version + 1);
+ if($dev_patch == true) $next_db_version = 'dev_collection';
+ else $next_db_version = intval($current_db_version + 1);
$sql_patch_filename = realpath(dirname(__FILE__).'/../').'/sql/incremental/upd_'.str_pad($next_db_version, 4, '0', STR_PAD_LEFT).'.sql';
$php_patch_filename = realpath(dirname(__FILE__).'/../').'/patches/upd_'.str_pad($next_db_version, 4, '0', STR_PAD_LEFT).'.php';
+
+ // comma separated list of version numbers were a update has to be done silently
+ $silent_update_versions = 'dev_collection,75';
if(is_file($sql_patch_filename)) {
@@ -179,26 +184,34 @@
}
//* Exec onBeforeSQL function
- if(isset($php_patch) && is_object($php_patch)) {
+ if(isset($php_patch) && is_object($php_patch) && method_exists($php_patch, 'onBeforeSQL')) {
$php_patch->onBeforeSQL();
swriteln($inst->lng('Executing PHP patch file').': '.$php_patch_filename);
}
//* Load patch file into database
if( !empty($conf["mysql"]["admin_password"]) ) {
- system("mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." --force -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." -p".escapeshellarg($conf['mysql']['admin_password'])." ".escapeshellarg($conf['mysql']['database'])." < ".$sql_patch_filename);
+ $cmd = "mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." --force -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." -p".escapeshellarg($conf['mysql']['admin_password'])." ".escapeshellarg($conf['mysql']['database'])." < ".$sql_patch_filename;
} else {
- system("mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." --force -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." ".escapeshellarg($conf['mysql']['database'])." < ".$sql_patch_filename);
+ $cmd = "mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." --force -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." ".escapeshellarg($conf['mysql']['database'])." < ".$sql_patch_filename;
}
+
+ if(in_array($next_db_version,explode(',',$silent_update_versions))) $cmd .= ' > /dev/null 2> /dev/null';
+ system($cmd);
+
swriteln($inst->lng('Loading SQL patch file').': '.$sql_patch_filename);
//* Exec onAfterSQL function
- if(isset($php_patch) && is_object($php_patch)) {
+ if(isset($php_patch) && is_object($php_patch) && method_exists($php_patch, 'onAfterSQL')) {
$php_patch->onAfterSQL();
}
- $current_db_version = $next_db_version;
+ if($dev_patch == false) $current_db_version = $next_db_version;
+ else $found = false;
+
if(isset($php_patch)) unset($php_patch);
+ } elseif($dev_patch == false) {
+ $dev_patch = true;
} else {
$found = false;
}
--
Gitblit v1.9.1