$this->container->basePath = rtrim($request->getUri()->getBasePath(), '/');
try {
+ if (!is_file($this->container->conf->getConfigFileExt())
+ && !in_array($next->getName(), ['displayInstall', 'saveInstall'], true)
+ ) {
+ return $response->withRedirect($this->container->basePath . '/install');
+ }
+
$this->runUpdates();
$this->checkOpenShaarli($request, $response, $next);
} catch (ShaarliFrontException $e) {
// Possible functional error
$this->container->pageBuilder->reset();
- $this->container->pageBuilder->assign('message', $e->getMessage());
+ $this->container->pageBuilder->assign('message', nl2br($e->getMessage()));
$response = $response->withStatus($e->getCode());
- return $response->write($this->container->pageBuilder->render('error'));
+ return $response->write($this->container->pageBuilder->render('error', $this->container->basePath));
} catch (UnauthorizedException $e) {
- return $response->withRedirect($this->container->basePath . '/login');
+ $returnUrl = urlencode($this->container->environment['REQUEST_URI']);
+
+ return $response->withRedirect($this->container->basePath . '/login?returnurl=' . $returnUrl);
} catch (\Throwable $e) {
// Unknown error encountered
$this->container->pageBuilder->reset();
$response = $response->withStatus(500);
- return $response->write($this->container->pageBuilder->render('error'));
+ return $response->write($this->container->pageBuilder->render('error', $this->container->basePath));
}
}
return;
}
+ $this->container->updater->setBasePath($this->container->basePath);
$newUpdates = $this->container->updater->update();
if (!empty($newUpdates)) {
$this->container->updater->writeUpdates(