X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=application%2Ffront%2Fcontroller%2Fadmin%2FServerController.php;h=4b74f4a94f4549385f1fa3f50e9082375ee66a12;hb=8a6b7e96b7176e03238bbb1bcaa4c8b0c25e6358;hp=bfc99422e7fbdf90bc689f929ca0b648dc7fcc89;hpb=b8e5a253ab5521ce2be6c0d3e04e0101527df3c1;p=github%2Fshaarli%2FShaarli.git
diff --git a/application/front/controller/admin/ServerController.php b/application/front/controller/admin/ServerController.php
index bfc99422..4b74f4a9 100644
--- a/application/front/controller/admin/ServerController.php
+++ b/application/front/controller/admin/ServerController.php
@@ -25,19 +25,31 @@ class ServerController extends ShaarliAdminController
*/
public function index(Request $request, Response $response): Response
{
- $latestVersion = 'v' . ApplicationUtils::getVersion(
- ApplicationUtils::$GIT_RAW_URL . '/latest/' . ApplicationUtils::$VERSION_FILE
- );
+ $releaseUrl = ApplicationUtils::$GITHUB_URL . '/releases/';
+ if ($this->container->conf->get('updates.check_updates', true)) {
+ $latestVersion = 'v' . ApplicationUtils::getVersion(
+ ApplicationUtils::$GIT_RAW_URL . '/latest/' . ApplicationUtils::$VERSION_FILE
+ );
+ $releaseUrl .= 'tag/' . $latestVersion;
+ } else {
+ $latestVersion = t('Check disabled');
+ }
+
$currentVersion = ApplicationUtils::getVersion('./shaarli_version.php');
$currentVersion = $currentVersion === 'dev' ? $currentVersion : 'v' . $currentVersion;
$phpEol = new \DateTimeImmutable(ApplicationUtils::getPhpEol(PHP_VERSION));
+ $permissions = array_merge(
+ ApplicationUtils::checkResourcePermissions($this->container->conf),
+ ApplicationUtils::checkDatastoreMutex()
+ );
+
$this->assignView('php_version', PHP_VERSION);
$this->assignView('php_eol', format_date($phpEol, false));
$this->assignView('php_has_reached_eol', $phpEol < new \DateTimeImmutable());
$this->assignView('php_extensions', ApplicationUtils::getPhpExtensionsRequirement());
- $this->assignView('permissions', ApplicationUtils::checkResourcePermissions($this->container->conf));
- $this->assignView('release_url', ApplicationUtils::$GITHUB_URL . '/releases/tag/' . $latestVersion);
+ $this->assignView('permissions', $permissions);
+ $this->assignView('release_url', $releaseUrl);
$this->assignView('latest_version', $latestVersion);
$this->assignView('current_version', $currentVersion);
$this->assignView('thumbnails_mode', $this->container->conf->get('thumbnails.mode'));
@@ -65,7 +77,9 @@ class ServerController extends ShaarliAdminController
$this->saveWarningMessage(
t('Thumbnails cache has been cleared.') . ' ' .
- '' . t('Please synchronize them.') .''
+ '' .
+ t('Please synchronize them.') .
+ ''
);
} else {
$folders = [