Mirrors/sysPass
2
0
Fork 0
mirror of https://github.com/nuxsmin/sysPass.git synced 2026-03-02 22:54:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Fixed error on upgrade handling.

Browse Source
This commit is contained in:
nuxsmin
2014-08-11 03:29:45 +02:00
parent d072996f91
commit 07dfdba406
2 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
inc/init.php
View File

@@ -416,28 +416,30 @@ class SP_Init
if ($databaseVersion < $appVersion
&& SP_Common::parseParams('g', 'nodbupgrade', 0) === 0
) {
if (SP_Upgrade::needDBUpgrade($appVersion) && !self::checkMaintenanceMode(true)) {
if (SP_Config::getValue('upgrade_key', 0) === 0) {
SP_Config::setValue('upgrade_key', sha1(uniqid(mt_rand(), true)));
SP_Config::setValue('maintenance', true);
if (SP_Upgrade::needDBUpgrade($appVersion)){
if(!self::checkMaintenanceMode(true)) {
if (SP_Config::getValue('upgrade_key', 0) === 0) {
SP_Config::setValue('upgrade_key', sha1(uniqid(mt_rand(), true)));
SP_Config::setValue('maintenance', true);
}
self::initError(_('La aplicación necesita actualizarse'), _('Si es un administrador pulse en el enlace:') . ' <a href="index.php?upgrade=1&a=upgrade">' . _('Actualizar') . '</a>');
}
self::initError(_('La aplicación necesita actualizarse'), _('Si es un administrador pulse en el enlace:') . ' <a href="index.php?upgrade=1&a=upgrade">' . _('Actualizar') . '</a>');
}
$action = SP_Common::parseParams('g', 'a');
$hash = SP_Common::parseParams('g', 'h');
$action = SP_Common::parseParams('g', 'a');
$hash = SP_Common::parseParams('g', 'h');
if ($action === 'upgrade' && $hash === SP_Config::getValue('upgrade_key', 0)) {
if (SP_Upgrade::doUpgrade($databaseVersion)) {
SP_Config::setConfigValue('version', $appVersion);
SP_Config::setValue('maintenance', false);
SP_Config::deleteKey('upgrade_key');
$update = true;
if ($action === 'upgrade' && $hash === SP_Config::getValue('upgrade_key', 0)) {
if (SP_Upgrade::doUpgrade($databaseVersion)) {
SP_Config::setConfigValue('version', $appVersion);
SP_Config::setValue('maintenance', false);
SP_Config::deleteKey('upgrade_key');
$update = true;
}
} else {
SP_Html::render('upgrade');
exit();
}
} else {
SP_Html::render('upgrade');
exit();
}
}

2
inc/util.class.php
View File

@@ -264,7 +264,7 @@ class SP_Util
*/
public static function getVersion($retBuild = false)
{
$build = 14;
$build = 15;
$version = array(1, 1, 2);
if ($retBuild) {