From 811653d71565cce94ca1b27f4cdebc60769e2d11 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 10 May 2014 15:18:20 +0200
Subject: fix icon for plugins following templates in extension manager

---
 lib/plugins/extension/helper/extension.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'lib/plugins/extension/helper')

diff --git a/lib/plugins/extension/helper/extension.php b/lib/plugins/extension/helper/extension.php
index 7958cd2da..43e4452c0 100644
--- a/lib/plugins/extension/helper/extension.php
+++ b/lib/plugins/extension/helper/extension.php
@@ -57,6 +57,8 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
         if(substr($id, 0 , 9) == 'template:'){
             $this->base = substr($id, 9);
             $this->is_template = true;
+        } else {
+            $this->is_template = false;
         }
 
         $this->localInfo = array();
-- 
cgit v1.2.3


From c0d17c851c1bf4371e550a105c91a17644de6b29 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Tue, 13 May 2014 18:39:04 +0200
Subject: removed another case of superflous multiple cache invalidation

---
 lib/plugins/extension/helper/extension.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'lib/plugins/extension/helper')

diff --git a/lib/plugins/extension/helper/extension.php b/lib/plugins/extension/helper/extension.php
index 43e4452c0..a4736a850 100644
--- a/lib/plugins/extension/helper/extension.php
+++ b/lib/plugins/extension/helper/extension.php
@@ -597,11 +597,8 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
             $path      = $this->download($url);
             $installed = $this->installArchive($path, true);
 
-            // purge caches
-            foreach($installed as $ext => $info){
-                $this->setExtension($ext);
-                $this->purgeCache();
-            }
+            // purge cache
+            $this->purgeCache();
         }catch (Exception $e){
             throw $e;
         }
-- 
cgit v1.2.3


From 59d6be95449db272ee0a6b6d437f535246f795c9 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Tue, 13 May 2014 19:42:05 +0200
Subject: update manager.dat correctly on install. closes #704

---
 lib/plugins/extension/helper/extension.php | 39 ++++++++++++++++++++++++++++--
 1 file changed, 37 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/extension/helper')

diff --git a/lib/plugins/extension/helper/extension.php b/lib/plugins/extension/helper/extension.php
index a4736a850..2aca0e218 100644
--- a/lib/plugins/extension/helper/extension.php
+++ b/lib/plugins/extension/helper/extension.php
@@ -292,7 +292,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      */
     public function getUpdateDate() {
         if (!empty($this->managerData['updated'])) return $this->managerData['updated'];
-        return false;
+        return $this->getInstallDate();
     }
 
     /**
@@ -577,6 +577,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
 
         try {
             $installed = $this->installArchive("$tmp/upload.archive", true, $basename);
+            $this->updateManagerData('', $installed);
             // purge cache
             $this->purgeCache();
         }catch (Exception $e){
@@ -596,6 +597,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
         try {
             $path      = $this->download($url);
             $installed = $this->installArchive($path, true);
+            $this->updateManagerData($url, $installed);
 
             // purge cache
             $this->purgeCache();
@@ -612,8 +614,10 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return array The list of installed extensions
      */
     public function installOrUpdate() {
-        $path      = $this->download($this->getDownloadURL());
+        $url       = $this->getDownloadURL();
+        $path      = $this->download($url);
         $installed = $this->installArchive($path, $this->isInstalled(), $this->getBase());
+        $this->updateManagerData($url, $installed);
 
         // refresh extension information
         if (!isset($installed[$this->getID()])) {
@@ -727,6 +731,37 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
         }
     }
 
+    /**
+     * Save the given URL and current datetime in the manager.dat file of all installed extensions
+     *
+     * @param string $url       Where the extension was downloaded from. (empty for manual installs via upload)
+     * @param array  $installed Optional list of installed plugins
+     */
+    protected function updateManagerData($url = '', $installed = null) {
+        $origID = $this->getID();
+
+        if(is_null($installed)) {
+            $installed = array($origID);
+        }
+
+        foreach($installed as $ext => $info) {
+            if($this->getID() != $ext) $this->setExtension($ext);
+            if($url) {
+                $this->managerData['downloadurl'] = $url;
+            } elseif(isset($this->managerData['downloadurl'])) {
+                unset($this->managerData['downloadurl']);
+            }
+            if(isset($this->managerData['installed'])) {
+                $this->managerData['updated'] = date('r');
+            } else {
+                $this->managerData['installed'] = date('r');
+            }
+            $this->writeManagerData();
+        }
+
+        if($this->getID() != $origID) $this->setExtension($origID);
+    }
+
     /**
      * Read the manager.dat file
      */
-- 
cgit v1.2.3