bugfix: access check was never cached

Now the API ping result is cached for 10 minutes and can be refreshed using the purge parameter as intended.
dokuwiki · May 19, 2019 · 98d21c0 · 98d21c0
1 parent a8d2f3c
commit 98d21c0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/lib/plugins/extension/admin.php b/lib/plugins/extension/admin.php
@@ -49,7 +49,7 @@ public function handle() {
         /* @var helper_plugin_extension_repository $repository */
         $repository = $this->loadHelper('extension_repository');
 
-        if(!$repository->hasAccess()) {
+        if(!$repository->hasAccess(!$INPUT->bool('purge'))) {
             $url = $this->gui->tabURL('', array('purge' => 1));
             msg($this->getLang('repo_error').' [<a href="'.$url.'">'.$this->getLang('repo_retry').'</a>]', -1);
         }
@@ -156,4 +156,4 @@ public function html() {
     }
 }
 
-// vim:ts=4:sw=4:et:
+// vim:ts=4:sw=4:et:
diff --git a/lib/plugins/extension/helper/repository.php b/lib/plugins/extension/helper/repository.php
@@ -59,13 +59,14 @@ public function init() {
     /**
      * If repository access is available
      *
+     * @param bool $usecache use cached result if still valid
      * @return bool If repository access is available
      */
-    public function hasAccess() {
+    public function hasAccess($usecache = true) {
         if ($this->has_access === null) {
             $cache = new cache('##extension_manager###hasAccess', '.repo');
 
-            if (!$cache->useCache(array('age' => 3600 * 24, 'purge'=>1))) {
+            if (!$cache->useCache(array('age' => 60*10, 'purge' => !$usecache))) {
                 $httpclient = new DokuHTTPClient();
                 $httpclient->timeout = 5;
                 $data = $httpclient->get(EXTENSION_REPOSITORY_API.'?cmd=ping');