Mirrors/sysPass
2
0
Fork 0
mirror of https://github.com/nuxsmin/sysPass.git synced 2026-03-04 07:34:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

* [ADD] Error page for common errors during initialization.

Browse Source 
* [FIX] Minor bugfixes
This commit is contained in:
nuxsmin
2018-03-19 23:36:30 +01:00
parent 85de6fd507
commit e4167f06fc
23 changed files with 167 additions and 462 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lib/SP/Core/ModuleBase.php
View File

@@ -30,8 +30,6 @@ use SP\Bootstrap;
use SP\Config\Config;
use SP\Core\Context\ContextInterface;
use SP\Core\Events\EventDispatcher;
use SP\Core\Exceptions\InitializationException;
use SP\Http\Request;
use SP\Providers\Log\LogHandler;
use SP\Providers\Mail\MailHandler;
use SP\Providers\Notification\NotificationHandler;
@@ -89,28 +87,22 @@ abstract class ModuleBase
* Devuelve un error 503 y un reintento de 120s al cliente.
*
* @param ContextInterface $context
* @param bool $check sólo comprobar si está activado el modo
* @throws InitializationException
* @return bool
*/
public function checkMaintenanceMode(ContextInterface $context, $check = false)
public function checkMaintenanceMode(ContextInterface $context)
{
if ($this->configData->isMaintenance()) {
Bootstrap::$LOCK = Util::getAppLock();
if ($check === true
|| Checks::isAjax($this->router)
|| Request::analyzeInt('nodbupgrade') === 1
|| (Bootstrap::$LOCK !== false && Bootstrap::$LOCK->userId > 0 && $context->isLoggedIn() && Bootstrap::$LOCK->userId === $context->getUserData()->getId())
) {
return;
}
throw new InitializationException(
__u('Aplicación en mantenimiento'),
InitializationException::INFO,
__u('En breve estará operativa')
);
return (Checks::isAjax($this->router)
|| (Bootstrap::$LOCK !== false
&& Bootstrap::$LOCK->userId > 0
&& $context->isLoggedIn()
&& Bootstrap::$LOCK->userId === $context->getUserData()->getId())
) === false;
}
return false;
}
/**