Merge pull request #1637 from ArthurHoaro/fix/server-admin-update-check

Server admin: do not retrieve latest version without update_check

2 files changed, 13 insertions, 6 deletions

diff --git a/application/config/ConfigManager.php b/application/config/ConfigManager.php
index a035baae..3260d7c0 100644
--- a/application/config/ConfigManager.php
+++ b/application/config/ConfigManager.php
@@ -370,8 +370,8 @@ class ConfigManager
         $this->setEmpty('general.enable_async_metadata', true);
         $this->setEmpty('general.tags_separator', ' ');
 
-        $this->setEmpty('updates.check_updates', false);
-        $this->setEmpty('updates.check_updates_branch', 'stable');
+        $this->setEmpty('updates.check_updates', true);
+        $this->setEmpty('updates.check_updates_branch', 'latest');
         $this->setEmpty('updates.check_updates_interval', 86400);
 
         $this->setEmpty('feed.rss_permalinks', true);
diff --git a/application/front/controller/admin/ServerController.php b/application/front/controller/admin/ServerController.php
index bfc99422..780151dd 100644
--- a/application/front/controller/admin/ServerController.php
+++ b/application/front/controller/admin/ServerController.php
@@ -25,9 +25,16 @@ 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));
@@ -37,7 +44,7 @@ class ServerController extends ShaarliAdminController
         $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('release_url', $releaseUrl);
         $this->assignView('latest_version', $latestVersion);
         $this->assignView('current_version', $currentVersion);
         $this->assignView('thumbnails_mode', $this->container->conf->get('thumbnails.mode'));