From c7b9800aee5425a3964963c77c761f4439578b75 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Thu, 1 Aug 2013 11:35:05 +0200
Subject: Extension manager: First draft of the extension class

---
 lib/plugins/extension/README               |  27 +++
 lib/plugins/extension/helper/extension.php | 289 +++++++++++++++++++++++++++++
 lib/plugins/extension/plugin.info.txt      |   7 +
 3 files changed, 323 insertions(+)
 create mode 100644 lib/plugins/extension/README
 create mode 100644 lib/plugins/extension/helper/extension.php
 create mode 100644 lib/plugins/extension/plugin.info.txt

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/README b/lib/plugins/extension/README
new file mode 100644
index 000000000..5eefe924d
--- /dev/null
+++ b/lib/plugins/extension/README
@@ -0,0 +1,27 @@
+extension Plugin for DokuWiki
+
+Extension manager
+
+All documentation for this plugin can be found at
+https://www.dokuwiki.org/plugin:extension
+
+If you install this plugin manually, make sure it is installed in
+lib/plugins/extension/ - if the folder is called different it
+will not work!
+
+Please refer to http://www.dokuwiki.org/plugins for additional info
+on how to install plugins in DokuWiki.
+
+----
+Copyright (C) Michael Hamann <michael@content-space.de>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; version 2 of the License
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+See the COPYING file in your DokuWiki folder for details
diff --git a/lib/plugins/extension/helper/extension.php b/lib/plugins/extension/helper/extension.php
new file mode 100644
index 000000000..2746837be
--- /dev/null
+++ b/lib/plugins/extension/helper/extension.php
@@ -0,0 +1,289 @@
+<?php
+/**
+ * DokuWiki Plugin extension (Helper Component)
+ *
+ * @license GPL 2 http://www.gnu.org/licenses/gpl-2.0.html
+ * @author  Michael Hamann <michael@content-space.de>
+ */
+
+// must be run within Dokuwiki
+if(!defined('DOKU_INC')) die();
+
+/**
+ * Class helper_plugin_extension_extension represents a single extension (plugin or template)
+ */
+class helper_plugin_extension_extension extends DokuWiki_Plugin {
+    private $name;
+    private $is_template;
+    private $localInfo;
+    private $remoteInfo;
+
+    /**
+     * @return bool false, this component is not a singleton
+     */
+    public function isSingleton() {
+        return false;
+    }
+
+    /**
+     * Set the name of the extension this instance shall represents, triggers loading the local and remote data
+     *
+     * @param string $name        The base name of the extension
+     * @param bool   $is_template If the extension is a template
+     * @return bool If some (local or remote) data was found
+     */
+    public function setExtension($name, $is_template) {
+        $this->name = $name;
+        $this->is_template = $is_template;
+    }
+
+    /**
+     * If the extension is installed locally
+     *
+     * @return bool If the extension is installed locally
+     */
+    public function isInstalled() {
+    }
+
+    /**
+     * If the extension should be updated, i.e. if an updated version is available
+     *
+     * @return bool If an update is available
+     */
+    public function updateAvailable() {
+        return $this->getInstalledVersion() < $this->getLastUpdate();
+    }
+
+    /**
+     * If the extension is a template
+     *
+     * @return bool If this extension is a template
+     */
+    public function isTemplate() {
+        return $this->is_template;
+    }
+
+    // Data from plugin.info.txt/template.info.txt or the repo when not available locally
+    /**
+     * Get the basename of the extension
+     *
+     * @return string The basename
+     */
+    public function getBase() {
+    }
+
+    /**
+     * Get the display name of the extension
+     *
+     * @return string The display name
+     */
+    public function getName() {
+    }
+
+    /**
+     * Get the author name of the extension
+     *
+     * @return string The name of the author
+     */
+    public function getAuthor() {
+    }
+
+    /**
+     * Get the email of the author of the extension
+     *
+     * @return string The email address
+     */
+    public function getEmail() {
+    }
+
+    /**
+     * Get the description of the extension
+     *
+     * @return string The description
+     */
+    public function getDescription() {
+    }
+
+    /**
+     * Get the URL of the extension, usually a page on dokuwiki.org
+     *
+     * @return string The URL
+     */
+    public function getURL() {
+    }
+
+    /**
+     * Get the installed version of the extension
+     *
+     * @return string The version, usually in the form yyyy-mm-dd
+     */
+    public function getInstalledVersion() {
+    }
+
+    /**
+     * Get the names of the dependencies of this extension
+     *
+     * @return array The base names of the dependencies
+     */
+    public function getDependencies() {
+    }
+
+    /**
+     * Get the names of all conflicting extensions
+     *
+     * @return array The names of the conflicting extensions
+     */
+    public function getConflicts() {
+    }
+
+    /**
+     * Get the names of similar extensions
+     *
+     * @return array The names of similar extensions
+     */
+    public function getSimilarPlugins() {
+    }
+
+    /**
+     * Get the names of the tags of the extension
+     *
+     * @return array The names of the tags of the extension
+     */
+    public function getTags() {
+    }
+
+    /**
+     * Get the text of the security warning if there is any
+     *
+     * @return string|bool The security warning if there is any, false otherwise
+     */
+    public function getSecurityWarning() {
+    }
+
+    /**
+     * Get the text of the security issue if there is any
+     *
+     * @return string|bool The security issue if there is any, false otherwise
+     */
+    public function getSecurityIssue() {
+    }
+
+    /**
+     * Get the URL of the screenshot of the extension if there is any
+     *
+     * @return string|bool The screenshot URL if there is any, false otherwise
+     */
+    public function getScreenshotURL() {
+    }
+
+    /**
+     * Get the last used download URL of the extension if there is any
+     *
+     * @return string|bool The previously used download URL, false if the extension has been installed manually
+     */
+    public function getLastDownloadURL() {
+    }
+
+    /**
+     * Get the download URL of the extension if there is any
+     *
+     * @return string|bool The download URL if there is any, false otherwise
+     */
+    public function getDownloadURL() {
+    }
+
+    /**
+     * Get the bug tracker URL of the extension if there is any
+     *
+     * @return string|bool The bug tracker URL if there is any, false otherwise
+     */
+    public function getBugtrackerURL() {
+    }
+
+    /**
+     * Get the URL of the source repository if there is any
+     *
+     * @return string|bool The URL of the source repository if there is any, false otherwise
+     */
+    public function getSourcerepoURL() {
+    }
+
+    /**
+     * Get the donation URL of the extension if there is any
+     *
+     * @return string|bool The donation URL if there is any, false otherwise
+     */
+    public function getDonationURL() {
+    }
+
+    /**
+     * Get the extension type(s)
+     *
+     * @return array The type(s) as array of strings
+     */
+    public function getType() {
+    }
+
+    /**
+     * Get a list of all DokuWiki versions this extension is compatible with
+     *
+     * @return array The versions in the form yyyy-mm-dd
+     */
+    public function getCompatibleVersions() {
+    }
+
+    /**
+     * Get the date of the last available update
+     *
+     * @return string The last available update in the form yyyy-mm-dd
+     */
+    public function getLastUpdate() {
+    }
+
+    /**
+     * Get the base path of the extension
+     *
+     * @return string The base path of the extension
+     */
+    public function getInstallDir() {
+        if ($this->isTemplate()) {
+            return basename(tpl_incdir()).$this->name;
+        } else {
+            return DOKU_PLUGIN.$this->name;
+        }
+    }
+
+    /**
+     * The type of extension installation
+     *
+     * @return string One of "none", "manual", "git" or "automatic"
+     */
+    public function getInstallType() {
+    }
+
+    /**
+     * If the extension can probably be installed/updated or uninstalled
+     *
+     * @return bool|string True or one of "nourl", "noparentperms" (template/plugin install path not writable), "noperms" (extension itself not writable)
+     */
+    public function canModify() {
+    }
+
+    /**
+     * Install or update the extension
+     *
+     * @return bool|string True or an error message
+     */
+    public function installOrUpdate() {
+    }
+
+    /**
+     * Uninstall the extension
+     *
+     * @return bool|string True or an error message
+     */
+    public function deleteExtension() {
+    }
+}
+
+// vim:ts=4:sw=4:et:
diff --git a/lib/plugins/extension/plugin.info.txt b/lib/plugins/extension/plugin.info.txt
new file mode 100644
index 000000000..3c4469ad7
--- /dev/null
+++ b/lib/plugins/extension/plugin.info.txt
@@ -0,0 +1,7 @@
+base   extension
+author Michael Hamann
+email  michael@content-space.de
+date   2013-08-01
+name   extension plugin
+desc   Extension manager
+url    https://www.dokuwiki.org/plugin:extension
-- 
cgit v1.2.3


From b9ca398d17863ad9a679d220dd742b0480fa80b6 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Thu, 1 Aug 2013 20:50:37 +0200
Subject: Extension manager: implemented more extension info and basic
 repository access

---
 lib/plugins/extension/helper/extension.php  | 188 ++++++++++++++++++++++++++--
 lib/plugins/extension/helper/repository.php | 112 +++++++++++++++++
 2 files changed, 292 insertions(+), 8 deletions(-)
 create mode 100644 lib/plugins/extension/helper/repository.php

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/helper/extension.php b/lib/plugins/extension/helper/extension.php
index 2746837be..b8981cf91 100644
--- a/lib/plugins/extension/helper/extension.php
+++ b/lib/plugins/extension/helper/extension.php
@@ -17,6 +17,9 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
     private $is_template;
     private $localInfo;
     private $remoteInfo;
+    private $managerData;
+    /** @var helper_plugin_extension_repository $repository */
+    private $repository = null;
 
     /**
      * @return bool false, this component is not a singleton
@@ -35,6 +38,28 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
     public function setExtension($name, $is_template) {
         $this->name = $name;
         $this->is_template = $is_template;
+        $this->localInfo = array();
+        $this->managerData = array();
+        $this->remoteInfo = array();
+
+        if ($this->isInstalled()) {
+            if ($this->isTemplate()) {
+                $infopath = $this->getInstallDir().'/template.info.txt';
+            } else {
+                $infopath = $this->getInstallDir().'/plugin.info.txt';
+            }
+            if (is_readable($infopath)) {
+                $this->localInfo = confToHash($infopath);
+            }
+
+            $this->readManagerData();
+        }
+
+        if ($this->repository == null) {
+            $this->repository = $this->loadHelper('extension_repository');
+        }
+
+        $this->remoteInfo = $this->repository->getData(($this->isTemplate() ? 'template:' : '').$this->getBase());
     }
 
     /**
@@ -43,6 +68,18 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return bool If the extension is installed locally
      */
     public function isInstalled() {
+        return is_dir($this->getInstallDir());
+    }
+
+    /**
+     * If the extension is enabled
+     *
+     * @return bool If the extension is enabled
+     */
+    public function isEnabled() {
+        /* @var Doku_Plugin_Controller $plugin_controller */
+        global $plugin_controller;
+        return !$plugin_controller->isdisabled($this->name);
     }
 
     /**
@@ -51,6 +88,8 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return bool If an update is available
      */
     public function updateAvailable() {
+        $lastupdate = $this->getLastUpdate();
+        if ($lastupdate === false) return false;
         return $this->getInstalledVersion() < $this->getLastUpdate();
     }
 
@@ -70,6 +109,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return string The basename
      */
     public function getBase() {
+        return $this->name;
     }
 
     /**
@@ -78,6 +118,9 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return string The display name
      */
     public function getName() {
+        if (isset($this->localInfo['name'])) return $this->localInfo['name'];
+        if (isset($this->remoteInfo['name'])) return $this->remoteInfo['name'];
+        return $this->name;
     }
 
     /**
@@ -86,14 +129,31 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return string The name of the author
      */
     public function getAuthor() {
+        if (isset($this->localInfo['author'])) return $this->localInfo['author'];
+        if (isset($this->remoteInfo['author'])) return $this->remoteInfo['author'];
+        return $this->getLang('unknownauthor');
     }
 
     /**
-     * Get the email of the author of the extension
+     * Get the email of the author of the extension if there is any
      *
-     * @return string The email address
+     * @return string|bool The email address or false if there is none
      */
     public function getEmail() {
+        // email is only in the local data
+        if (isset($this->localInfo['email'])) return $this->localInfo['email'];
+        return false;
+    }
+
+    /**
+     * Get the email id, i.e. the md5sum of the email
+     *
+     * @return string|bool The md5sum of the email if there is any, false otherwise
+     */
+    public function getEmailID() {
+        if (isset($this->remoteInfo['emailid'])) return $this->remoteInfo['emailid'];
+        if (isset($this->localInfo['email'])) return md5($this->localInfo['email']);
+        return false;
     }
 
     /**
@@ -102,6 +162,9 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return string The description
      */
     public function getDescription() {
+        if (isset($this->localInfo['desc'])) return $this->localInfo['desc'];
+        if (isset($this->remoteInfo['description'])) return $this->remoteInfo['description'];
+        return '';
     }
 
     /**
@@ -110,14 +173,19 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return string The URL
      */
     public function getURL() {
+        if (isset($this->localInfo['url'])) return $this->localInfo['url'];
+        return 'https://www.dokuwiki.org/plugin:'.$this->name;
     }
 
     /**
      * Get the installed version of the extension
      *
-     * @return string The version, usually in the form yyyy-mm-dd
+     * @return string|bool The version, usually in the form yyyy-mm-dd if there is any
      */
     public function getInstalledVersion() {
+        if (isset($this->localInfo['date'])) return $this->localInfo['date'];
+        if ($this->isInstalled()) return $this->getLang('unknownversion');
+        return false;
     }
 
     /**
@@ -126,6 +194,8 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return array The base names of the dependencies
      */
     public function getDependencies() {
+        if (isset($this->remoteInfo['dependencies'])) return $this->remoteInfo['dependencies'];
+        return array();
     }
 
     /**
@@ -134,6 +204,8 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return array The names of the conflicting extensions
      */
     public function getConflicts() {
+        if (isset($this->remoteInfo['conflicts'])) return $this->remoteInfo['dependencies'];
+        return array();
     }
 
     /**
@@ -141,7 +213,9 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      *
      * @return array The names of similar extensions
      */
-    public function getSimilarPlugins() {
+    public function getSimilarExtensions() {
+        if (isset($this->remoteInfo['similar'])) return $this->remoteInfo['similar'];
+        return array();
     }
 
     /**
@@ -150,6 +224,8 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return array The names of the tags of the extension
      */
     public function getTags() {
+        if (isset($this->remoteInfo['tags'])) return $this->remoteInfo['tags'];
+        return array();
     }
 
     /**
@@ -158,6 +234,8 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return string|bool The security warning if there is any, false otherwise
      */
     public function getSecurityWarning() {
+        if (isset($this->remoteInfo['securitywarning'])) return $this->remoteInfo['securitywarning'];
+        return false;
     }
 
     /**
@@ -166,6 +244,8 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return string|bool The security issue if there is any, false otherwise
      */
     public function getSecurityIssue() {
+        if (isset($this->remoteInfo['securityissue'])) return $this->remoteInfo['securityissue'];
+        return false;
     }
 
     /**
@@ -174,6 +254,8 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return string|bool The screenshot URL if there is any, false otherwise
      */
     public function getScreenshotURL() {
+        if (isset($this->remoteInfo['screenshoturl'])) return $this->remoteInfo['screenshoturl'];
+        return false;
     }
 
     /**
@@ -182,6 +264,8 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return string|bool The previously used download URL, false if the extension has been installed manually
      */
     public function getLastDownloadURL() {
+        if (isset($this->managerData['downloadurl'])) return $this->managerData['downloadurl'];
+        return false;
     }
 
     /**
@@ -190,6 +274,8 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return string|bool The download URL if there is any, false otherwise
      */
     public function getDownloadURL() {
+        if (isset($this->remoteInfo['downloadurl'])) return $this->remoteInfo['downloadurl'];
+        return false;
     }
 
     /**
@@ -198,6 +284,8 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return string|bool The bug tracker URL if there is any, false otherwise
      */
     public function getBugtrackerURL() {
+        if (isset($this->remoteInfo['bugtracker'])) return $this->remoteInfo['bugtracker'];
+        return false;
     }
 
     /**
@@ -206,6 +294,8 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return string|bool The URL of the source repository if there is any, false otherwise
      */
     public function getSourcerepoURL() {
+        if (isset($this->remoteInfo['sourcerepo'])) return $this->remoteInfo['sourcerepo'];
+        return false;
     }
 
     /**
@@ -214,6 +304,8 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return string|bool The donation URL if there is any, false otherwise
      */
     public function getDonationURL() {
+        if (isset($this->remoteInfo['donationurl'])) return $this->remoteInfo['donationurl'];
+        return false;
     }
 
     /**
@@ -221,23 +313,30 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      *
      * @return array The type(s) as array of strings
      */
-    public function getType() {
+    public function getTypes() {
+        if (isset($this->remoteInfo['types'])) return explode(', ', $this->remoteInfo['types']);
+        if ($this->isTemplate()) return array(32 => 'template');
+        return array();
     }
 
     /**
      * Get a list of all DokuWiki versions this extension is compatible with
      *
-     * @return array The versions in the form yyyy-mm-dd
+     * @return array The versions in the form yyyy-mm-dd => ('label' => label, 'implicit' => implicit)
      */
     public function getCompatibleVersions() {
+        if (isset($this->remoteInfo['compatible'])) return $this->remoteInfo['compatible'];
+        return array();
     }
 
     /**
      * Get the date of the last available update
      *
-     * @return string The last available update in the form yyyy-mm-dd
+     * @return string|bool The last available update in the form yyyy-mm-dd if there is any, false otherwise
      */
     public function getLastUpdate() {
+        if (isset($this->remoteInfo['lastupdate'])) return $this->remoteInfo['lastupdate'];
+        return false;
     }
 
     /**
@@ -259,6 +358,10 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return string One of "none", "manual", "git" or "automatic"
      */
     public function getInstallType() {
+        if (!$this->isInstalled()) return 'none';
+        if (!empty($this->managerData)) return 'automatic';
+        if (is_dir($this->getInstallDir().'/.git')) return 'git';
+        return 'manual';
     }
 
     /**
@@ -282,7 +385,76 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      *
      * @return bool|string True or an error message
      */
-    public function deleteExtension() {
+    public function uninstall() {
+    }
+
+    /**
+     * Enable the extension
+     *
+     * @return bool|string True or an error message
+     */
+    public function enable() {
+        if ($this->isTemplate()) return $this->getLang('notimplemented');
+        /* @var Doku_Plugin_Controller $plugin_controller */
+        global $plugin_controller;
+        if (!$this->isInstalled()) return $this->getLang('notinstalled');
+        if (!$this->isEnabled()) return $this->getLang('alreadyenabled');
+        if ($plugin_controller->enable($this->name)) {
+            return true;
+        } else {
+            return $this->getLang('pluginlistsaveerror');
+        }
+    }
+
+    /**
+     * Disable the extension
+     *
+     * @return bool|string True or an error message
+     */
+    public function disable() {
+        if ($this->isTemplate()) return $this->getLang('notimplemented');
+
+        /* @var Doku_Plugin_Controller $plugin_controller */
+        global $plugin_controller;
+        if (!$this->isInstalled()) return $this->getLang('notinstalled');
+        if (!$this->isEnabled()) return $this->getLang('alreadydisabled');
+        if ($plugin_controller->disable($this->name)) {
+            return true;
+        } else {
+            return $this->getLang('pluginlistsaveerror');
+        }
+    }
+
+    /**
+     * Read the manager.dat file
+     */
+    protected function readManagerData() {
+        $managerpath = $this->getInstallDir().'/manager.dat';
+        if (is_readable($managerpath)) {
+            $file = @file($managerpath);
+            if(!empty($file)) {
+                foreach($file as $line) {
+                    list($key, $value) = explode('=', trim($line, PHP_EOL), 2);
+                    $key = trim($key);
+                    $value = trim($value);
+                    // backwards compatible with old plugin manager
+                    if($key == 'url') $key = 'downloadurl';
+                    $this->managerData[$key] = $value;
+                }
+            }
+        }
+    }
+
+    /**
+     * Write the manager.data file
+     */
+    protected function writeManagerData() {
+        $managerpath = $this->getInstallDir().'/manager.dat';
+        $data = '';
+        foreach ($this->managerData as $k => $v) {
+            $data .= $k.'='.$v.DOKU_LF;
+        }
+        io_saveFile($managerpath, $data);
     }
 }
 
diff --git a/lib/plugins/extension/helper/repository.php b/lib/plugins/extension/helper/repository.php
new file mode 100644
index 000000000..37b9bc02c
--- /dev/null
+++ b/lib/plugins/extension/helper/repository.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * DokuWiki Plugin extension (Helper Component)
+ *
+ * @license GPL 2 http://www.gnu.org/licenses/gpl-2.0.html
+ * @author  Michael Hamann <michael@content-space.de>
+ */
+
+if (!defined('EXTENSION_REPOSITORY_API_ENDPOINT'))
+    define('EXTENSION_REPSITORY_API', 'http://www.dokuwiki.org/lib/plugins/pluginrepo/api.php');
+
+// must be run within Dokuwiki
+if(!defined('DOKU_INC')) die();
+
+/**
+ * Class helper_plugin_extension_repository provides access to the extension repository on dokuwiki.org
+ */
+class helper_plugin_extension_repository extends DokuWiki_Plugin {
+    private $loaded_extensions = array();
+    private $has_access = null;
+    /**
+     * Initialize the repository (cache), fetches data for all installed plugins
+     */
+    public function init() {
+        /* @var Doku_Plugin_Controller $plugin_controller */
+        global $plugin_controller;
+        if ($this->hasAccess()) {
+            $list = $plugin_controller->getList('', true);
+            $request_data = array('fmt' => 'php');
+            $request_needed = false;
+            foreach ($list as $name) {
+                $cache = new cache('##extension_manager##'.$name, 'repo');
+                $result = null;
+                if (!isset($this->loaded_extensions[$name]) && $this->hasAccess() && !$cache->useCache(array('age' => 3600 * 24))) {
+                    $this->loaded_extensions[$name] = true;
+                    $request_data['ext'][] = $name;
+                    $request_needed = true;
+                }
+            }
+
+            if ($request_needed) {
+                $httpclient = new DokuHTTPClient();
+                $data = $httpclient->post(EXTENSION_REPSITORY_API, $request_data);
+                if ($data !== false) {
+                    $extensions = unserialize($data);
+                    foreach ($extensions as $extension) {
+                        $cache = new cache('##extension_manager##'.$extension['plugin'], 'repo');
+                        $cache->storeCache(serialize($extension));
+                    }
+                } else {
+                    $this->has_access = false;
+                }
+            }
+        }
+    }
+
+    /**
+     * If repository access is available
+     *
+     * @return bool If repository access is available
+     */
+    public function hasAccess() {
+        if ($this->has_access === null) {
+            $cache = new cache('##extension_manager###hasAccess', 'repo');
+            $result = null;
+            if (!$cache->useCache(array('age' => 3600 * 24))) {
+                $httpclient = new DokuHTTPClient();
+                $httpclient->timeout = 5;
+                $data = $httpclient->get(EXTENSION_REPSITORY_API.'?cmd=ping');
+                if ($data !== false) {
+                    $this->has_access = true;
+                    $cache->storeCache(1);
+                } else {
+                    $this->has_access = false;
+                    $cache->storeCache(0);
+                }
+            } else {
+                $this->has_access = ($cache->retrieveCache(false) == 1);
+            }
+        }
+        return $this->has_access;
+    }
+
+    /**
+     * Get the remote data of an individual plugin or template
+     *
+     * @param string $name  The plugin name to get the data for, template names need to be prefix by 'template:'
+     * @return array The data or null if nothing was found (possibly no repository access)
+     */
+    public function getData($name) {
+        $cache = new cache('##extension_manager##'.$name, 'repo');
+        $result = null;
+        if (!isset($this->loaded_extensions[$name]) && $this->hasAccess() && !$cache->useCache(array('age' => 3600 * 24))) {
+            $this->loaded_extensions[$name] = true;
+            $httpclient = new DokuHTTPClient();
+            $data = $httpclient->get(EXTENSION_REPSITORY_API.'?fmt=php&ext[]='.urlencode($name));
+            if ($data !== false) {
+                $result = unserialize($data);
+                $cache->storeCache(serialize($result[0]));
+                return $result[0];
+            } else {
+                $this->has_access = false;
+            }
+        }
+        if (file_exists($cache->cache)) {
+            return unserialize($cache->retrieveCache(false));
+        }
+        return array();
+    }
+}
+
+// vim:ts=4:sw=4:et:
-- 
cgit v1.2.3


From 788f86d986d170475e9fda3578b4fde5ba4864dd Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Thu, 1 Aug 2013 21:14:17 +0200
Subject: Extension manager: add language file and simple admin component

---
 lib/plugins/extension/admin.php        | 58 ++++++++++++++++++++++++++++++++++
 lib/plugins/extension/lang/en/lang.php | 21 ++++++++++++
 2 files changed, 79 insertions(+)
 create mode 100644 lib/plugins/extension/admin.php
 create mode 100644 lib/plugins/extension/lang/en/lang.php

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/admin.php b/lib/plugins/extension/admin.php
new file mode 100644
index 000000000..19863e772
--- /dev/null
+++ b/lib/plugins/extension/admin.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * DokuWiki Plugin extension (Admin Component)
+ *
+ * @license GPL 2 http://www.gnu.org/licenses/gpl-2.0.html
+ * @author  Michael Hamann <michael@content-space.de>
+ */
+
+// must be run within Dokuwiki
+if(!defined('DOKU_INC')) die();
+
+class admin_plugin_extension extends DokuWiki_Admin_Plugin {
+
+    /**
+     * @return int sort number in admin menu
+     */
+    public function getMenuSort() {
+        return 0;
+    }
+
+    /**
+     * @return bool true if only access for superuser, false is for superusers and moderators
+     */
+    public function forAdminOnly() {
+        return true;
+    }
+
+    /**
+     * Should carry out any processing required by the plugin.
+     */
+    public function handle() {
+        /* @var helper_plugin_extension_repository $repository */
+        $repository = $this->loadHelper('extension_repository');
+        $repository->init();
+    }
+
+    /**
+     * Render HTML output, e.g. helpful text and a form
+     */
+    public function html() {
+        /* @var Doku_Plugin_Controller $plugin_controller */
+        global $plugin_controller;
+        ptln('<h1>'.$this->getLang('menu').'</h1>');
+
+        $pluginlist = $plugin_controller->getList('', true);
+        /* @var helper_plugin_extension_extension $extension */
+        $extension = $this->loadHelper('extension_extension');
+        foreach ($pluginlist as $name) {
+            $extension->setExtension($name, false);
+            ptln('<h2>'.hsc($extension->getName()).'</h2>');
+            ptln('<p>'.hsc($extension->getDescription()).'</p>');
+            ptln('<p>Latest available version: '.hsc($extension->getLastUpdate()).'</p>');
+            ptln('<p>Installed version: '.hsc($extension->getInstalledVersion()).'</p>');
+        }
+    }
+}
+
+// vim:ts=4:sw=4:et:
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/en/lang.php b/lib/plugins/extension/lang/en/lang.php
new file mode 100644
index 000000000..81069e498
--- /dev/null
+++ b/lib/plugins/extension/lang/en/lang.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * English language file for extension plugin
+ *
+ * @author Michael Hamann <michael@content-space.de>
+ */
+
+// menu entry for admin plugins
+$lang['menu'] = 'Extension manager';
+
+// custom language strings for the plugin
+$lang['notimplemented'] = 'This feature hasn\'t been implemented yet';
+$lang['alreadyenabled'] = 'This extension has already been enabled';
+$lang['alreadydisabled'] = 'This extension has already been disabled';
+$lang['pluginlistsaveerror'] = 'There was an error saving the plugin list';
+$lang['unknownauthor'] = 'Unknown author';
+$lang['unknownversion'] = 'Unknown version';
+
+
+
+//Setup VIM: ex: et ts=4 :
-- 
cgit v1.2.3


From 9c0a72696a95f03deea27243cb67a497ed3d6993 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Fri, 2 Aug 2013 12:28:08 +0200
Subject: Extension manager: fix install dir for templates

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

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/helper/extension.php b/lib/plugins/extension/helper/extension.php
index b8981cf91..05f64efeb 100644
--- a/lib/plugins/extension/helper/extension.php
+++ b/lib/plugins/extension/helper/extension.php
@@ -8,6 +8,7 @@
 
 // must be run within Dokuwiki
 if(!defined('DOKU_INC')) die();
+if(!defined('DOKU_TPLLIB')) define('DOKU_TPLLIB', DOKU_INC.'lib/tpl/');
 
 /**
  * Class helper_plugin_extension_extension represents a single extension (plugin or template)
@@ -346,7 +347,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      */
     public function getInstallDir() {
         if ($this->isTemplate()) {
-            return basename(tpl_incdir()).$this->name;
+            return DOKU_TPLLIB.$this->name;
         } else {
             return DOKU_PLUGIN.$this->name;
         }
-- 
cgit v1.2.3


From 7c30f5ced5496bbc22c78497011da33d121aeb56 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Fri, 2 Aug 2013 12:29:34 +0200
Subject: Extension manager: Use getInfo() when no info.txt is available

---
 lib/plugins/extension/helper/extension.php | 52 ++++++++++++++++++++++++------
 1 file changed, 43 insertions(+), 9 deletions(-)

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/helper/extension.php b/lib/plugins/extension/helper/extension.php
index 05f64efeb..4243afb69 100644
--- a/lib/plugins/extension/helper/extension.php
+++ b/lib/plugins/extension/helper/extension.php
@@ -44,15 +44,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
         $this->remoteInfo = array();
 
         if ($this->isInstalled()) {
-            if ($this->isTemplate()) {
-                $infopath = $this->getInstallDir().'/template.info.txt';
-            } else {
-                $infopath = $this->getInstallDir().'/plugin.info.txt';
-            }
-            if (is_readable($infopath)) {
-                $this->localInfo = confToHash($infopath);
-            }
-
+            $this->readLocalData();
             $this->readManagerData();
         }
 
@@ -426,6 +418,48 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
         }
     }
 
+    /**
+     * Read local extension data either from info.txt or getInfo()
+     */
+    protected function readLocalData() {
+        if ($this->isTemplate()) {
+            $infopath = $this->getInstallDir().'/template.info.txt';
+        } else {
+            $infopath = $this->getInstallDir().'/plugin.info.txt';
+        }
+
+        if (is_readable($infopath)) {
+            $this->localInfo = confToHash($infopath);
+        } elseif (!$this->isTemplate() && $this->isEnabled()) {
+            global $plugin_types;
+            $path       = $this->getInstallDir().'/';
+            $plugin     = null;
+
+            foreach($plugin_types as $type) {
+                if(@file_exists($path.$type.'.php')) {
+                    $plugin = plugin_load($type, $this->getBase());
+                    if ($plugin) break;
+                }
+
+                if($dh = @opendir($path.$type.'/')) {
+                    while(false !== ($cp = readdir($dh))) {
+                        if($cp == '.' || $cp == '..' || strtolower(substr($cp, -4)) != '.php') continue;
+
+                        $plugin = plugin_load($type, $this->getBase().'_'.substr($cp, 0, -4));
+                        if ($plugin) break;
+                    }
+                    if ($plugin) break;
+                    closedir($dh);
+                }
+            }
+
+            if ($plugin) {
+                /* @var DokuWiki_Plugin $plugin */
+                $this->localInfo = $plugin->getInfo();
+            }
+        }
+    }
+
     /**
      * Read the manager.dat file
      */
-- 
cgit v1.2.3


From 449f398253213589bf4cd3c28f2c38b9d853b06a Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Fri, 2 Aug 2013 12:30:42 +0200
Subject: Extension manager: Improve update check

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

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/helper/extension.php b/lib/plugins/extension/helper/extension.php
index 4243afb69..5e3074c83 100644
--- a/lib/plugins/extension/helper/extension.php
+++ b/lib/plugins/extension/helper/extension.php
@@ -83,6 +83,8 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
     public function updateAvailable() {
         $lastupdate = $this->getLastUpdate();
         if ($lastupdate === false) return false;
+        $installed  = $this->getInstalledVersion();
+        if ($installed === false || $installed === $this->getLang('unknownversion')) return true;
         return $this->getInstalledVersion() < $this->getLastUpdate();
     }
 
-- 
cgit v1.2.3


From 1981046ea006031f74fb082960756b3d2919b99e Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Fri, 2 Aug 2013 12:31:11 +0200
Subject: Extension manager: implement uninstall, canModify and install/update

---
 lib/plugins/extension/helper/extension.php | 361 ++++++++++++++++++++++++++++-
 lib/plugins/extension/lang/en/lang.php     |   6 +
 2 files changed, 366 insertions(+), 1 deletion(-)

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/helper/extension.php b/lib/plugins/extension/helper/extension.php
index 5e3074c83..b80e56a4d 100644
--- a/lib/plugins/extension/helper/extension.php
+++ b/lib/plugins/extension/helper/extension.php
@@ -365,6 +365,18 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return bool|string True or one of "nourl", "noparentperms" (template/plugin install path not writable), "noperms" (extension itself not writable)
      */
     public function canModify() {
+        if ($this->isInstalled()) {
+            if (!is_writable($this->getInstallDir())) {
+                return 'noperms';
+            }
+        }
+        $parent_path = ($this->isTemplate() ? DOKU_TPLLIB : DOKU_PLUGIN);
+        if (!is_writable($parent_path)) {
+            return 'noparentperms';
+        }
+
+        if (!$this->getDownloadURL()) return 'nourl';
+        return true;
     }
 
     /**
@@ -373,14 +385,26 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return bool|string True or an error message
      */
     public function installOrUpdate() {
+        if (($status = $this->download($this->getDownloadURL(), $path)) === true) {
+            if (($status = $this->installArchive($path, $installed_extensions, $this->isInstalled(), $this->getBase())) == true) {
+                // refresh extension information
+                if (!isset($installed_extensions[$this->getBase()])) {
+                    $status = 'Error, the requested extension hasn\'t been installed or updated';
+                }
+                $this->setExtension($this->name, $this->isTemplate());
+            }
+            $this->dir_delete(dirname($path));
+        }
+        return $status;
     }
 
     /**
      * Uninstall the extension
      *
-     * @return bool|string True or an error message
+     * @return bool If the plugin was sucessfully installed
      */
     public function uninstall() {
+        return $this->dir_delete($this->getInstallDir());
     }
 
     /**
@@ -493,6 +517,341 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
         }
         io_saveFile($managerpath, $data);
     }
+
+    /**
+     * delete, with recursive sub-directory support
+     *
+     * @param string $path The path that shall be deleted
+     * @return bool If the directory has been successfully deleted
+     */
+    protected function dir_delete($path) {
+        if(!is_string($path) || $path == "") return false;
+
+        if(is_dir($path) && !is_link($path)) {
+            if(!$dh = @opendir($path)) return false;
+
+            while ($f = readdir($dh)) {
+                if($f == '..' || $f == '.') continue;
+                $this->dir_delete("$path/$f");
+            }
+
+            closedir($dh);
+            return @rmdir($path);
+        } else {
+            return @unlink($path);
+        }
+    }
+
+    /**
+     * Download an archive to a protected path
+     * @param string $url  The url to get the archive from
+     * @param string $path The path where the archive was saved (output parameter)
+     * @return bool|string True on success, an error message on failure
+     */
+    public function download($url, &$path) {
+        // check the url
+        $matches = array();
+        if(!preg_match("/[^/]*$/", $url, $matches) || !$matches[0]) {
+            return $this->getLang('baddownloadurl');
+        }
+        $file = $matches[0];
+
+        // create tmp directory for download
+        if(!($tmp = io_mktmpdir())) {
+            return $this->getLang('error_dircreate');
+        }
+
+        // download
+        if(!$file = io_download($url, $tmp.'/', true, $file)) {
+            $this->dir_delete($tmp);
+            return sprintf($this->getLang('error_download'), $url);
+        }
+
+        $path = $tmp.'/'.$file;
+
+        return true;
+    }
+
+    /**
+     * @param string $file      The path to the archive that shall be installed
+     * @param bool   $overwrite If an already installed plugin should be overwritten
+     * @param array  $installed_extensions Array of all installed extensions in the form $base => ('type' => $type, 'action' => 'update'|'install')
+     * @param string $base      The basename of the plugin if it's known
+     * @return bool|string True on success, an error message on failure
+     */
+    public function installArchive($file, &$installed_extensions, $overwrite=false, $base = '') {
+        $error = false;
+
+        // create tmp directory for decompression
+        if(!($tmp = io_mktmpdir())) {
+            return $this->getLang('error_dircreate');
+        }
+
+        // add default base folder if specified to handle case where zip doesn't contain this
+        if($base && !@mkdir($tmp.'/'.$base)) {
+            $error = $this->getLang('error_dircreate');
+        }
+
+        if(!$error && !$this->decompress("$tmp/$file", "$tmp/".$base)) {
+            $error = sprintf($this->getLang('error_decompress'), $file);
+        }
+
+        // search $tmp/$base for the folder(s) that has been created
+        // move the folder(s) to lib/..
+        if(!$error) {
+            $result = array('old'=>array(), 'new'=>array());
+
+            if(!$this->find_folders($result, $tmp.'/'.$base, ($this->isTemplate() ? 'template' : 'plugin'))) {
+                $error = $this->getLang('error_findfolder');
+
+            } else {
+                // choose correct result array
+                if(count($result['new'])) {
+                    $install = $result['new'];
+                }else{
+                    $install = $result['old'];
+                }
+
+                // now install all found items
+                foreach($install as $item) {
+                    // where to install?
+                    if($item['type'] == 'template') {
+                        $target_base_dir = DOKU_TPLLIB;
+                    }else{
+                        $target_base_dir = DOKU_PLUGIN;
+                    }
+
+                    if(!empty($item['base'])) {
+                        // use base set in info.txt
+                    } elseif($base && count($install) == 1) {
+                        $item['base'] = $base;
+                    } else {
+                        // default - use directory as found in zip
+                        // plugins from github/master without *.info.txt will install in wrong folder
+                        // but using $info->id will make 'code3' fail (which should install in lib/code/..)
+                        $item['base'] = basename($item['tmp']);
+                    }
+
+                    // check to make sure we aren't overwriting anything
+                    $target = $target_base_dir.$item['base'];
+                    if(!$overwrite && @file_exists($target)) {
+                        // TODO remember our settings, ask the user to confirm overwrite
+                        continue;
+                    }
+
+                    $action = @file_exists($target) ? 'update' : 'install';
+
+                    // copy action
+                    if($this->dircopy($item['tmp'], $target)) {
+                        // TODO: write manager.dat!
+                        $installed_extensions[$item['base']] = array('type' => $item['type'], 'action' => $action);
+                    } else {
+                        $error = sprintf($this->getLang('error_copy').DOKU_LF, $item['base']);
+                        break;
+                    }
+                }
+            }
+        }
+
+        // cleanup
+        if($tmp) $this->dir_delete($tmp);
+
+        if($error) {
+            return $error;
+        }
+
+        return true;
+    }
+
+    /**
+     * Find out what was in the extracted directory
+     *
+     * Correct folders are searched recursively using the "*.info.txt" configs
+     * as indicator for a root folder. When such a file is found, it's base
+     * setting is used (when set). All folders found by this method are stored
+     * in the 'new' key of the $result array.
+     *
+     * For backwards compatibility all found top level folders are stored as
+     * in the 'old' key of the $result array.
+     *
+     * When no items are found in 'new' the copy mechanism should fall back
+     * the 'old' list.
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     * @param array $result - results are stored here
+     * @param string $base - the temp directory where the package was unpacked to
+     * @param string $default_type - type used if no info.txt available
+     * @param string $dir - a subdirectory. do not set. used by recursion
+     * @return bool - false on error
+     */
+    private function find_folders(&$result, $base, $default_type, $dir='') {
+        $this_dir = "$base$dir";
+        $dh       = @opendir($this_dir);
+        if(!$dh) return false;
+
+        $found_dirs           = array();
+        $found_files          = 0;
+        $found_template_parts = 0;
+        $found_info_txt       = false;
+        while (false !== ($f = readdir($dh))) {
+            if($f == '.' || $f == '..') continue;
+
+            if(is_dir("$this_dir/$f")) {
+                $found_dirs[] = "$dir/$f";
+
+            } else {
+                // it's a file -> check for config
+                $found_files++;
+                switch ($f) {
+                    case 'plugin.info.txt':
+                    case 'template.info.txt':
+                        $found_info_txt = true;
+                        $info = array();
+                        $type = explode('.', $f, 2);
+                        $info['type'] = $type[0];
+                        $info['tmp']  = $this_dir;
+                        $conf = confToHash("$this_dir/$f");
+                        $info['base'] = basename($conf['base']);
+                        $result['new'][] = $info;
+                        break;
+
+                    case 'main.php':
+                    case 'details.php':
+                    case 'mediamanager.php':
+                    case 'style.ini':
+                        $found_template_parts++;
+                        break;
+                }
+            }
+        }
+        closedir($dh);
+
+        // URL downloads default to 'plugin', try extra hard to indentify templates
+        if(!$default_type && $found_template_parts > 2 && !$found_info_txt) {
+            $info            = array();
+            $info['type']    = 'template';
+            $info['tmp']     = $this_dir;
+            $result['new'][] = $info;
+        }
+
+        // files in top level but no info.txt, assume this is zip missing a base directory
+        // works for all downloads unless direct URL where $base will be the tmp directory ($info->id was empty)
+        if(!$dir && $found_files > 0 && !$found_info_txt && $default_type) {
+            $info            = array();
+            $info['type']    = $default_type;
+            $info['tmp']     = $base;
+            $result['old'][] = $info;
+            return true;
+        }
+
+        foreach ($found_dirs as $found_dir) {
+            // if top level add to dir list for old method, then recurse
+            if(!$dir) {
+                $info            = array();
+                $info['type']    = ($default_type ? $default_type : 'plugin');
+                $info['tmp']     = "$base$found_dir";
+                $result['old'][] = $info;
+            }
+            $this->find_folders($result, $base, $default_type, "$found_dir");
+        }
+        return true;
+    }
+
+
+    /**
+     * Decompress a given file to the given target directory
+     *
+     * Determines the compression type from the file extension
+     */
+    private function decompress($file, $target) {
+        // decompression library doesn't like target folders ending in "/"
+        if(substr($target, -1) == "/") $target = substr($target, 0, -1);
+
+        $ext = $this->guess_archive($file);
+        if(in_array($ext, array('tar', 'bz', 'gz'))) {
+            switch($ext) {
+                case 'bz':
+                    $compress_type = Tar::COMPRESS_BZIP;
+                    break;
+                case 'gz':
+                    $compress_type = Tar::COMPRESS_GZIP;
+                    break;
+                default:
+                    $compress_type = Tar::COMPRESS_NONE;
+            }
+
+            $tar = new Tar();
+            try {
+                $tar->open($file, $compress_type);
+                $tar->extract($target);
+            } catch (Exception $e) {
+                return $e->getMessage();
+            }
+
+            return true;
+        } elseif($ext == 'zip') {
+
+            $zip = new ZipLib();
+            $ok  = $zip->Extract($file, $target);
+
+            return ($ok==-1 ? 'Error extracting the zip archive' : true);
+        }
+
+        // the only case when we don't get one of the recognized archive types is when the archive file can't be read
+        return 'Couldn\'t read archive file';
+    }
+
+    /**
+     * Determine the archive type of the given file
+     *
+     * Reads the first magic bytes of the given file for content type guessing,
+     * if neither bz, gz or zip are recognized, tar is assumed.
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     * @param string $file The file to analyze
+     * @return string|bool false if the file can't be read, otherwise an "extension"
+     */
+    private function guess_archive($file) {
+        $fh = fopen($file, 'rb');
+        if(!$fh) return false;
+        $magic = fread($fh, 5);
+        fclose($fh);
+
+        if(strpos($magic, "\x42\x5a") === 0) return 'bz';
+        if(strpos($magic, "\x1f\x8b") === 0) return 'gz';
+        if(strpos($magic, "\x50\x4b\x03\x04") === 0) return 'zip';
+        return 'tar';
+    }
+
+    /**
+     * Copy with recursive sub-directory support
+     */
+    private function dircopy($src, $dst) {
+        global $conf;
+
+        if(is_dir($src)) {
+            if(!$dh = @opendir($src)) return false;
+
+            if($ok = io_mkdir_p($dst)) {
+                while ($ok && (false !== ($f = readdir($dh)))) {
+                    if($f == '..' || $f == '.') continue;
+                    $ok = $this->dircopy("$src/$f", "$dst/$f");
+                }
+            }
+
+            closedir($dh);
+            return $ok;
+
+        } else {
+            $exists = @file_exists($dst);
+
+            if(!@copy($src, $dst)) return false;
+            if(!$exists && !empty($conf['fperm'])) chmod($dst, $conf['fperm']);
+            @touch($dst, filemtime($src));
+        }
+
+        return true;
+    }
 }
 
 // vim:ts=4:sw=4:et:
diff --git a/lib/plugins/extension/lang/en/lang.php b/lib/plugins/extension/lang/en/lang.php
index 81069e498..f0999ff01 100644
--- a/lib/plugins/extension/lang/en/lang.php
+++ b/lib/plugins/extension/lang/en/lang.php
@@ -17,5 +17,11 @@ $lang['unknownauthor'] = 'Unknown author';
 $lang['unknownversion'] = 'Unknown version';
 
 
+$lang['error_badurl']           = 'URL ends with slash - unable to determine file name from the url';
+$lang['error_dircreate']        = 'Unable to create temporary folder to receive download';
+$lang['error_download']         = 'Unable to download the file: %s';
+$lang['error_decompress']       = 'Unable to decompress the downloaded file. This maybe as a result of a bad download, in which case you should try again; or the compression format may be unknown, in which case you will need to download and install manually';
+$lang['error_findfolder']       = 'Unable to identify extension directory, you need to download and install manually';
+$lang['error_copy']             = 'There was a file copy error while attempting to install files for directory <em>%s</em>: the disk could be full or file access permissions may be incorrect. This may have resulted in a partially installed plugin and leave your wiki installation unstable';
 
 //Setup VIM: ex: et ts=4 :
-- 
cgit v1.2.3


From 02779b18797b2ee1304613de684d54988815dacb Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Fri, 2 Aug 2013 23:30:32 +0200
Subject: Extension manager: Implement extension table

This uses a lot of code and the whole design from the previous extension
manager implementation.
---
 lib/plugins/extension/admin.php            |  78 ++++-
 lib/plugins/extension/helper/extension.php | 189 ++++++++++--
 lib/plugins/extension/helper/list.php      | 477 +++++++++++++++++++++++++++++
 lib/plugins/extension/images/disabled.png  | Bin 0 -> 1486 bytes
 lib/plugins/extension/images/donate.png    | Bin 0 -> 1293 bytes
 lib/plugins/extension/images/down.png      | Bin 0 -> 280 bytes
 lib/plugins/extension/images/enabled.png   | Bin 0 -> 1231 bytes
 lib/plugins/extension/images/icons.xcf     | Bin 0 -> 43016 bytes
 lib/plugins/extension/images/license.txt   |   4 +
 lib/plugins/extension/images/plugin.png    | Bin 0 -> 6259 bytes
 lib/plugins/extension/images/template.png  | Bin 0 -> 6802 bytes
 lib/plugins/extension/images/up.png        | Bin 0 -> 281 bytes
 lib/plugins/extension/lang/en/lang.php     |  96 +++++-
 lib/plugins/extension/style.css            | 368 ++++++++++++++++++++++
 14 files changed, 1172 insertions(+), 40 deletions(-)
 create mode 100644 lib/plugins/extension/helper/list.php
 create mode 100644 lib/plugins/extension/images/disabled.png
 create mode 100644 lib/plugins/extension/images/donate.png
 create mode 100644 lib/plugins/extension/images/down.png
 create mode 100644 lib/plugins/extension/images/enabled.png
 create mode 100644 lib/plugins/extension/images/icons.xcf
 create mode 100644 lib/plugins/extension/images/license.txt
 create mode 100644 lib/plugins/extension/images/plugin.png
 create mode 100644 lib/plugins/extension/images/template.png
 create mode 100644 lib/plugins/extension/images/up.png
 create mode 100644 lib/plugins/extension/style.css

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/admin.php b/lib/plugins/extension/admin.php
index 19863e772..373f90183 100644
--- a/lib/plugins/extension/admin.php
+++ b/lib/plugins/extension/admin.php
@@ -9,7 +9,11 @@
 // must be run within Dokuwiki
 if(!defined('DOKU_INC')) die();
 
+/**
+ * Admin part of the extension manager
+ */
 class admin_plugin_extension extends DokuWiki_Admin_Plugin {
+    protected $infoFor = null;
 
     /**
      * @return int sort number in admin menu
@@ -26,32 +30,94 @@ class admin_plugin_extension extends DokuWiki_Admin_Plugin {
     }
 
     /**
-     * Should carry out any processing required by the plugin.
+     * Execute the requested action(s) and initialize the plugin repository
      */
     public function handle() {
+        global $INPUT;
+        // initialize the remote repository
         /* @var helper_plugin_extension_repository $repository */
         $repository = $this->loadHelper('extension_repository');
         $repository->init();
+
+        /* @var helper_plugin_extension_extension $extension */
+        $extension = $this->loadHelper('extension_extension');
+
+        if ($INPUT->post->has('fn')) {
+            $actions = $INPUT->post->arr('fn');
+            foreach ($actions as $action => $extensions) {
+                foreach ($extensions as $extname => $label) {
+                    switch ($action) {
+                        case 'info':
+                            $this->infoFor = $extname;
+                            break;
+                        case 'install':
+                            msg('Not implemented');
+                            break;
+                        case 'reinstall':
+                        case 'update':
+                            $extension->setExtension($extname, false);
+                            $status = $extension->installOrUpdate();
+                            if ($status !== true) {
+                                msg($status, -1);
+                            } else {
+                                msg(sprintf($this->getLang('msg_update_success'), hsc($extension->getName())), 1);
+                            }
+                            break;
+                        case 'uninstall':
+                            $extension->setExtension($extname, false);
+                            $status = $extension->uninstall();
+                            if ($status !== true) {
+                                msg($status, -1);
+                            } else {
+                                msg(sprintf($this->getLang('msg_delete_success'), hsc($extension->getName())), 1);
+                            }
+                            break;
+                        case 'enable';
+                            $extension->setExtension($extname, false);
+                            $status = $extension->enable();
+                            if ($status !== true) {
+                                msg($status, -1);
+                            } else {
+                                msg(sprintf($this->getLang('msg_enabled'), hsc($extension->getName())), 1);
+                            }
+                            break;
+                        case 'disable';
+                            $extension->setExtension($extname, false);
+                            $status = $extension->disable();
+                            if ($status !== true) {
+                                msg($status, -1);
+                            } else {
+                                msg(sprintf($this->getLang('msg_disabled'), hsc($extension->getName())), 1);
+                            }
+                            break;
+                    }
+                }
+            }
+        }
     }
 
     /**
-     * Render HTML output, e.g. helpful text and a form
+     * Render HTML output
      */
     public function html() {
         /* @var Doku_Plugin_Controller $plugin_controller */
         global $plugin_controller;
         ptln('<h1>'.$this->getLang('menu').'</h1>');
+        ptln('<div id="extension__manager">');
 
         $pluginlist = $plugin_controller->getList('', true);
         /* @var helper_plugin_extension_extension $extension */
         $extension = $this->loadHelper('extension_extension');
+        /* @var helper_plugin_extension_list $list */
+        $list = $this->loadHelper('extension_list');
+        $list->start_form();
         foreach ($pluginlist as $name) {
             $extension->setExtension($name, false);
-            ptln('<h2>'.hsc($extension->getName()).'</h2>');
-            ptln('<p>'.hsc($extension->getDescription()).'</p>');
-            ptln('<p>Latest available version: '.hsc($extension->getLastUpdate()).'</p>');
-            ptln('<p>Installed version: '.hsc($extension->getInstalledVersion()).'</p>');
+            $list->add_row($extension, $name == $this->infoFor);
         }
+        $list->end_form();
+        $list->render();
+        ptln('</div>');
     }
 }
 
diff --git a/lib/plugins/extension/helper/extension.php b/lib/plugins/extension/helper/extension.php
index b80e56a4d..093ee7828 100644
--- a/lib/plugins/extension/helper/extension.php
+++ b/lib/plugins/extension/helper/extension.php
@@ -64,6 +64,35 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
         return is_dir($this->getInstallDir());
     }
 
+    /**
+     * If the extension is bundled
+     *
+     * @return bool If the extension is bundled
+     */
+    public function isBundled() {
+        if (!empty($this->remoteInfo['bundled'])) return $this->remoteInfo['bundled'];
+        return in_array($this->name,
+                        array('acl', 'info', 'extension', 'test', 'revert', 'popularity', 'config', 'plugin', 'safefnrecode', 'authplain'));
+    }
+
+    /**
+     * If the extension is protected
+     *
+     * @return bool if the extension is protected
+     */
+    public function isProtected() {
+        return in_array($this->name, array('acl', 'config', 'info', 'plugin', 'revert', 'usermanager'));
+    }
+
+    /**
+     * If the extension is installed in the correct directory
+     *
+     * @return bool If the extension is installed in the correct directory
+     */
+    public function isInWrongFolder() {
+        return $this->name != $this->getBase();
+    }
+
     /**
      * If the extension is enabled
      *
@@ -97,6 +126,15 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
         return $this->is_template;
     }
 
+    /**
+     * Get the name of the installation directory
+     *
+     * @return string The name of the installation directory
+     */
+    public function getInstallName() {
+        return $this->name;
+    }
+
     // Data from plugin.info.txt/template.info.txt or the repo when not available locally
     /**
      * Get the basename of the extension
@@ -104,6 +142,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return string The basename
      */
     public function getBase() {
+        if (!empty($this->localInfo['base'])) return $this->localInfo['base'];
         return $this->name;
     }
 
@@ -113,20 +152,20 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return string The display name
      */
     public function getName() {
-        if (isset($this->localInfo['name'])) return $this->localInfo['name'];
-        if (isset($this->remoteInfo['name'])) return $this->remoteInfo['name'];
+        if (!empty($this->localInfo['name'])) return $this->localInfo['name'];
+        if (!empty($this->remoteInfo['name'])) return $this->remoteInfo['name'];
         return $this->name;
     }
 
     /**
      * Get the author name of the extension
      *
-     * @return string The name of the author
+     * @return string|bool The name of the author or false if there is none
      */
     public function getAuthor() {
-        if (isset($this->localInfo['author'])) return $this->localInfo['author'];
-        if (isset($this->remoteInfo['author'])) return $this->remoteInfo['author'];
-        return $this->getLang('unknownauthor');
+        if (!empty($this->localInfo['author'])) return $this->localInfo['author'];
+        if (!empty($this->remoteInfo['author'])) return $this->remoteInfo['author'];
+        return false;
     }
 
     /**
@@ -136,7 +175,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      */
     public function getEmail() {
         // email is only in the local data
-        if (isset($this->localInfo['email'])) return $this->localInfo['email'];
+        if (!empty($this->localInfo['email'])) return $this->localInfo['email'];
         return false;
     }
 
@@ -146,8 +185,8 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return string|bool The md5sum of the email if there is any, false otherwise
      */
     public function getEmailID() {
-        if (isset($this->remoteInfo['emailid'])) return $this->remoteInfo['emailid'];
-        if (isset($this->localInfo['email'])) return md5($this->localInfo['email']);
+        if (!empty($this->remoteInfo['emailid'])) return $this->remoteInfo['emailid'];
+        if (!empty($this->localInfo['email'])) return md5($this->localInfo['email']);
         return false;
     }
 
@@ -157,8 +196,8 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return string The description
      */
     public function getDescription() {
-        if (isset($this->localInfo['desc'])) return $this->localInfo['desc'];
-        if (isset($this->remoteInfo['description'])) return $this->remoteInfo['description'];
+        if (!empty($this->localInfo['desc'])) return $this->localInfo['desc'];
+        if (!empty($this->remoteInfo['description'])) return $this->remoteInfo['description'];
         return '';
     }
 
@@ -168,8 +207,8 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return string The URL
      */
     public function getURL() {
-        if (isset($this->localInfo['url'])) return $this->localInfo['url'];
-        return 'https://www.dokuwiki.org/plugin:'.$this->name;
+        if (!empty($this->localInfo['url'])) return $this->localInfo['url'];
+        return 'https://www.dokuwiki.org/'.($this->isTemplate() ? 'template' : 'plugin').':'.$this->getBase();
     }
 
     /**
@@ -178,28 +217,66 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return string|bool The version, usually in the form yyyy-mm-dd if there is any
      */
     public function getInstalledVersion() {
-        if (isset($this->localInfo['date'])) return $this->localInfo['date'];
+        if (!empty($this->localInfo['date'])) return $this->localInfo['date'];
         if ($this->isInstalled()) return $this->getLang('unknownversion');
         return false;
     }
 
+    /**
+     * Get the install date of the current version
+     *
+     * @return string|bool The date of the last update or false if not available
+     */
+    public function getUpdateDate() {
+        if (!empty($this->managerData['updated'])) return $this->managerData['updated'];
+        return false;
+    }
+
+    /**
+     * Get the date of the installation of the plugin
+     *
+     * @return string|bool The date of the installation or false if not available
+     */
+    public function getInstallDate() {
+        if (!empty($this->managerData['installed'])) return $this->managerData['installed'];
+        return false;
+    }
+
     /**
      * Get the names of the dependencies of this extension
      *
      * @return array The base names of the dependencies
      */
     public function getDependencies() {
-        if (isset($this->remoteInfo['dependencies'])) return $this->remoteInfo['dependencies'];
+        if (!empty($this->remoteInfo['dependencies'])) return $this->remoteInfo['dependencies'];
         return array();
     }
 
+    /**
+     * Get the names of the missing dependencies
+     *
+     * @return array The base names of the missing dependencies
+     */
+    public function getMissingDependencies() {
+        /* @var Doku_Plugin_Controller $plugin_controller */
+        global $plugin_controller;
+        $dependencies = $this->getDependencies();
+        $missing_dependencies = array();
+        foreach ($dependencies as $dependency) {
+            if ($plugin_controller->isdisabled($dependency)) {
+                $missing_dependencies[] = $dependency;
+            }
+        }
+        return $missing_dependencies;
+    }
+
     /**
      * Get the names of all conflicting extensions
      *
      * @return array The names of the conflicting extensions
      */
     public function getConflicts() {
-        if (isset($this->remoteInfo['conflicts'])) return $this->remoteInfo['dependencies'];
+        if (!empty($this->remoteInfo['conflicts'])) return $this->remoteInfo['dependencies'];
         return array();
     }
 
@@ -209,7 +286,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return array The names of similar extensions
      */
     public function getSimilarExtensions() {
-        if (isset($this->remoteInfo['similar'])) return $this->remoteInfo['similar'];
+        if (!empty($this->remoteInfo['similar'])) return $this->remoteInfo['similar'];
         return array();
     }
 
@@ -219,17 +296,28 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return array The names of the tags of the extension
      */
     public function getTags() {
-        if (isset($this->remoteInfo['tags'])) return $this->remoteInfo['tags'];
+        if (!empty($this->remoteInfo['tags'])) return $this->remoteInfo['tags'];
         return array();
     }
 
+    /**
+     * Get the popularity information as floating point number [0,1]
+     *
+     * @return float|bool The popularity information or false if it isn't available
+     */
+    public function getPopularity() {
+        if (!empty($this->remoteInfo['popularity'])) return $this->remoteInfo['popularity']/200.0;
+        return false;
+    }
+
+
     /**
      * Get the text of the security warning if there is any
      *
      * @return string|bool The security warning if there is any, false otherwise
      */
     public function getSecurityWarning() {
-        if (isset($this->remoteInfo['securitywarning'])) return $this->remoteInfo['securitywarning'];
+        if (!empty($this->remoteInfo['securitywarning'])) return $this->remoteInfo['securitywarning'];
         return false;
     }
 
@@ -239,7 +327,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return string|bool The security issue if there is any, false otherwise
      */
     public function getSecurityIssue() {
-        if (isset($this->remoteInfo['securityissue'])) return $this->remoteInfo['securityissue'];
+        if (!empty($this->remoteInfo['securityissue'])) return $this->remoteInfo['securityissue'];
         return false;
     }
 
@@ -249,17 +337,26 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return string|bool The screenshot URL if there is any, false otherwise
      */
     public function getScreenshotURL() {
-        if (isset($this->remoteInfo['screenshoturl'])) return $this->remoteInfo['screenshoturl'];
+        if (!empty($this->remoteInfo['screenshoturl'])) return $this->remoteInfo['screenshoturl'];
         return false;
     }
 
+    /**
+     * Get the URL of the thumbnail of the extension if there is any
+     *
+     * @return string|bool The thumbnail URL if there is any, false otherwise
+     */
+    public function getThumbnailURL() {
+        if (!empty($this->remoteInfo['thumbnailurl'])) return $this->remoteInfo['thumbnailurl'];
+        return false;
+    }
     /**
      * Get the last used download URL of the extension if there is any
      *
      * @return string|bool The previously used download URL, false if the extension has been installed manually
      */
     public function getLastDownloadURL() {
-        if (isset($this->managerData['downloadurl'])) return $this->managerData['downloadurl'];
+        if (!empty($this->managerData['downloadurl'])) return $this->managerData['downloadurl'];
         return false;
     }
 
@@ -269,17 +366,28 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return string|bool The download URL if there is any, false otherwise
      */
     public function getDownloadURL() {
-        if (isset($this->remoteInfo['downloadurl'])) return $this->remoteInfo['downloadurl'];
+        if (!empty($this->remoteInfo['downloadurl'])) return $this->remoteInfo['downloadurl'];
         return false;
     }
 
+    /**
+     * If the download URL has changed since the last download
+     *
+     * @return bool If the download URL has changed
+     */
+    public function hasDownloadURLChanged() {
+        $lasturl = $this->getLastDownloadURL();
+        $currenturl = $this->getDownloadURL();
+        return ($lasturl && $currenturl && $lasturl != $currenturl);
+    }
+
     /**
      * Get the bug tracker URL of the extension if there is any
      *
      * @return string|bool The bug tracker URL if there is any, false otherwise
      */
     public function getBugtrackerURL() {
-        if (isset($this->remoteInfo['bugtracker'])) return $this->remoteInfo['bugtracker'];
+        if (!empty($this->remoteInfo['bugtracker'])) return $this->remoteInfo['bugtracker'];
         return false;
     }
 
@@ -289,7 +397,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return string|bool The URL of the source repository if there is any, false otherwise
      */
     public function getSourcerepoURL() {
-        if (isset($this->remoteInfo['sourcerepo'])) return $this->remoteInfo['sourcerepo'];
+        if (!empty($this->remoteInfo['sourcerepo'])) return $this->remoteInfo['sourcerepo'];
         return false;
     }
 
@@ -299,7 +407,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return string|bool The donation URL if there is any, false otherwise
      */
     public function getDonationURL() {
-        if (isset($this->remoteInfo['donationurl'])) return $this->remoteInfo['donationurl'];
+        if (!empty($this->remoteInfo['donationurl'])) return $this->remoteInfo['donationurl'];
         return false;
     }
 
@@ -309,7 +417,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return array The type(s) as array of strings
      */
     public function getTypes() {
-        if (isset($this->remoteInfo['types'])) return explode(', ', $this->remoteInfo['types']);
+        if (!empty($this->remoteInfo['types'])) return $this->remoteInfo['types'];
         if ($this->isTemplate()) return array(32 => 'template');
         return array();
     }
@@ -320,7 +428,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return array The versions in the form yyyy-mm-dd => ('label' => label, 'implicit' => implicit)
      */
     public function getCompatibleVersions() {
-        if (isset($this->remoteInfo['compatible'])) return $this->remoteInfo['compatible'];
+        if (!empty($this->remoteInfo['compatible'])) return $this->remoteInfo['compatible'];
         return array();
     }
 
@@ -330,7 +438,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return string|bool The last available update in the form yyyy-mm-dd if there is any, false otherwise
      */
     public function getLastUpdate() {
-        if (isset($this->remoteInfo['lastupdate'])) return $this->remoteInfo['lastupdate'];
+        if (!empty($this->remoteInfo['lastupdate'])) return $this->remoteInfo['lastupdate'];
         return false;
     }
 
@@ -392,6 +500,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
                     $status = 'Error, the requested extension hasn\'t been installed or updated';
                 }
                 $this->setExtension($this->name, $this->isTemplate());
+                $this->purgeCache();
             }
             $this->dir_delete(dirname($path));
         }
@@ -404,6 +513,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return bool If the plugin was sucessfully installed
      */
     public function uninstall() {
+        $this->purgeCache();
         return $this->dir_delete($this->getInstallDir());
     }
 
@@ -417,8 +527,9 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
         /* @var Doku_Plugin_Controller $plugin_controller */
         global $plugin_controller;
         if (!$this->isInstalled()) return $this->getLang('notinstalled');
-        if (!$this->isEnabled()) return $this->getLang('alreadyenabled');
+        if ($this->isEnabled()) return $this->getLang('alreadyenabled');
         if ($plugin_controller->enable($this->name)) {
+            $this->purgeCache();
             return true;
         } else {
             return $this->getLang('pluginlistsaveerror');
@@ -438,12 +549,24 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
         if (!$this->isInstalled()) return $this->getLang('notinstalled');
         if (!$this->isEnabled()) return $this->getLang('alreadydisabled');
         if ($plugin_controller->disable($this->name)) {
+            $this->purgeCache();
             return true;
         } else {
             return $this->getLang('pluginlistsaveerror');
         }
     }
 
+    /**
+     * Purge the cache by touching the main configuration file
+     */
+    protected function purgeCache() {
+        global $config_cascade;
+
+        // expire dokuwiki caches
+        // touching local.php expires wiki page, JS and CSS caches
+        @touch(reset($config_cascade['main']['local']));
+    }
+
     /**
      * Read local extension data either from info.txt or getInfo()
      */
@@ -463,7 +586,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
 
             foreach($plugin_types as $type) {
                 if(@file_exists($path.$type.'.php')) {
-                    $plugin = plugin_load($type, $this->getBase());
+                    $plugin = plugin_load($type, $this->name);
                     if ($plugin) break;
                 }
 
@@ -471,7 +594,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
                     while(false !== ($cp = readdir($dh))) {
                         if($cp == '.' || $cp == '..' || strtolower(substr($cp, -4)) != '.php') continue;
 
-                        $plugin = plugin_load($type, $this->getBase().'_'.substr($cp, 0, -4));
+                        $plugin = plugin_load($type, $this->name.'_'.substr($cp, 0, -4));
                         if ($plugin) break;
                     }
                     if ($plugin) break;
@@ -551,7 +674,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
     public function download($url, &$path) {
         // check the url
         $matches = array();
-        if(!preg_match("/[^/]*$/", $url, $matches) || !$matches[0]) {
+        if(!preg_match("/[^\/]*$/", $url, $matches) || !$matches[0]) {
             return $this->getLang('baddownloadurl');
         }
         $file = $matches[0];
diff --git a/lib/plugins/extension/helper/list.php b/lib/plugins/extension/helper/list.php
new file mode 100644
index 000000000..ffb88114d
--- /dev/null
+++ b/lib/plugins/extension/helper/list.php
@@ -0,0 +1,477 @@
+<?php
+/**
+ * DokuWiki Plugin extension (Helper Component)
+ *
+ * @license GPL 2 http://www.gnu.org/licenses/gpl-2.0.html
+ * @author  Michael Hamann <michael@content-space.de>
+ */
+
+// must be run within Dokuwiki
+if(!defined('DOKU_INC')) die();
+
+/**
+ * Class helper_plugin_extension_extension represents a single extension (plugin or template)
+ */
+class helper_plugin_extension_list extends DokuWiki_Plugin {
+    protected $form = '';
+
+    function start_form() {
+        $this->form .= '<form id="extension__list" accept-charset="utf-8" method="post" action="">';
+        $hidden = array(
+            'do'=>'admin',
+            'page'=>'extension',
+            'sectok'=>getSecurityToken()
+        );
+        $this->add_hidden($hidden);
+        $this->form .= '<ul class="extensionList">';
+    }
+    /**
+     * Build single row of extension table
+     * @param helper_plugin_extension_extension  $extension The extension that shall be added
+     * @param bool                               $showinfo  Show the info area
+     */
+    function add_row(helper_plugin_extension_extension $extension, $showinfo = false) {
+        $this->start_row($extension);
+        $this->populate_column('legend', $this->make_legend($extension, $showinfo));
+        $this->populate_column('actions', $this->make_actions($extension));
+        $this->end_row();
+    }
+
+    /**
+     * Adds a header to the form
+     *
+     * @param string $id     The id of the header
+     * @param string $header The content of the header
+     * @param int    $level  The level of the header
+     */
+    function add_header($id, $header, $level = 2) {
+        $this->form .='<h'.$level.' id="'.$id.'">'.hsc($header).'</h'.$level.'>';
+    }
+
+    /**
+     * Adds a paragraph to the form
+     *
+     * @param string $data The content
+     */
+    function add_p($data) {
+        $this->form .= '<p>'.hsc($data).'</p>';
+    }
+
+    /**
+     * Add hidden fields to the form with the given data
+     * @param array $array
+     */
+    function add_hidden(array $array) {
+        $this->form .= '<div class="no">';
+        foreach ($array as $key => $value) {
+            $this->form .= '<input type="hidden" name="'.hsc($key).'" value="'.hsc($value).'" />';
+        }
+        $this->form .= '</div>';
+    }
+
+    /**
+     * Add closing tags
+     */
+    function end_form() {
+        $this->form .= '</ul>';
+        $this->form .= '</form>';
+    }
+
+    /**
+     * Print the form
+     */
+    function render() {
+        echo $this->form;
+    }
+
+    /**
+     * Start the HTML for the row for the extension
+     *
+     * @param helper_plugin_extension_extension $extension The extension
+     */
+    private function start_row(helper_plugin_extension_extension $extension) {
+        $this->form .= '<li id="extensionplugin__'.hsc($extension->getInstallName()).'" class="'.$this->make_class($extension).'">';
+    }
+
+    /**
+     * Add a column with the given class and content
+     * @param string $class The class name
+     * @param string $html  The content
+     */
+    private function populate_column($class, $html) {
+        $this->form .= '<div class="'.$class.' col">'.$html.'</div>';
+    }
+
+    /**
+     * End the row
+     */
+    private function end_row() {
+        $this->form .= '</li>'.DOKU_LF;
+    }
+
+    /**
+     * Generate the link to the plugin homepage
+     *
+     * @param helper_plugin_extension_extension $extension The extension
+     * @return string The HTML code
+     */
+    function make_homepagelink(helper_plugin_extension_extension $extension) {
+        $text = $this->getLang('homepage_link');
+        $url = hsc($extension->getURL());
+        return '<a href="'.$url.'" title="'.$url.'" class ="urlextern">'.$text.'</a> ';
+    }
+
+    /**
+     * Generate the class name for the row of the extensio
+     *
+     * @param helper_plugin_extension_extension $extension The extension object
+     * @return string The class name
+     */
+    function make_class(helper_plugin_extension_extension $extension) {
+        $class = ($extension->isTemplate()) ? 'template' : 'plugin';
+        if($extension->isInstalled()) {
+            $class.=' installed';
+            $class.= ($extension->isEnabled()) ? ' enabled':' disabled';
+        }
+        if(!$extension->canModify()) $class.= ' notselect';
+        if($extension->isProtected()) $class.=  ' protected';
+        //if($this->showinfo) $class.= ' showinfo';
+        return $class;
+    }
+
+    /**
+     * Generate a link to the author of the extension
+     *
+     * @param helper_plugin_extension_extension $extension The extension object
+     * @return string The HTML code of the link
+     */
+    function make_author(helper_plugin_extension_extension $extension) {
+        global $ID;
+
+        if($extension->getAuthor()) {
+
+            $params = array(
+                'do'=>'admin',
+                'page'=>'extension',
+                'tab'=>'search',
+                'q'=>'author:'.$extension->getAuthor()
+            );
+            $url = wl($ID, $params);
+            return '<a href="'.$url.'" title="'.$this->getLang('author_hint').'" >'.hsc($extension->getAuthor()).'</a>';
+        }
+        return "<em>".$this->getLang('unknown_author')."</em>";
+    }
+
+    /**
+     * Get the link and image tag for the screenshot/thumbnail
+     *
+     * @param helper_plugin_extension_extension $extension The extension object
+     * @return string The HTML code
+     */
+    function make_screenshot(helper_plugin_extension_extension $extension) {
+        if($extension->getScreenshotURL()) {
+            $img = '<a title="'.hsc($extension->getName()).'" href="'.hsc($extension->getScreenshotURL()).'" target="_blank">'.
+                '<img alt="'.hsc($extension->getName()).'" width="120" height="70" src="'.hsc($extension->getThumbnailURL()).'" />'.
+                '</a>';
+        } elseif($extension->isTemplate()) {
+            $img = '<img alt="template" width="120" height="70" src="'.DOKU_BASE.'lib/plugins/extension/images/template.png" />';
+
+        } else {
+            $img = '<img alt="plugin" width="120" height="70" src="'.DOKU_BASE.'lib/plugins/extension/images/plugin.png" />';
+        }
+        return '<div class="screenshot" >'.$img.'<span></span></div>';
+    }
+
+    /**
+     * Extension main description
+     *
+     * @param helper_plugin_extension_extension $extension The extension object
+     * @param bool                              $showinfo  Show the info section
+     * @return string The HTML code
+     */
+    function make_legend(helper_plugin_extension_extension $extension, $showinfo = false) {
+        $return  = '<div>';
+        $return .= '<h2>';
+        $return .= sprintf($this->getLang('extensionby'), hsc($extension->getName()), $this->make_author($extension));
+        $return .= '</h2>';
+
+        $return .= $this->make_screenshot($extension);
+
+        $popularity = $extension->getPopularity();
+        if ($popularity !== false && !$extension->isBundled()) {
+            $popularityText = sprintf($this->getLang('popularity'), $popularity);
+            $return .= '<div class="popularity" title="'.$popularityText.'"><div style="width: '.($popularity * 100).'%;"><span></span></div></div>';
+        }
+
+        $return .= '<p>';
+        if($extension->getDescription()) {
+            $return .=  hsc($extension->getDescription()).' ';
+        }
+        $return .= '</p>';
+
+        $return .= $this->make_linkbar($extension);
+        $return .= $this->make_action('info', $extension, $showinfo);
+        if ($showinfo) {
+            $return .= $this->make_info($extension);
+        }
+        $return .= $this->make_noticearea($extension);
+        $return .= '</div>';
+        return $return;
+    }
+
+    /**
+     * Generate the link bar HTML code
+     *
+     * @param helper_plugin_extension_extension $extension The extension instance
+     * @return string The HTML code
+     */
+    function make_linkbar(helper_plugin_extension_extension $extension) {
+        $return  = '<span class="linkbar">';
+        $return .= $this->make_homepagelink($extension);
+        if ($extension->getBugtrackerURL()) {
+            $return .= ' <a href="'.hsc($extension->getBugtrackerURL()).'" title="'.hsc($extension->getBugtrackerURL()).'" class ="interwiki iw_dokubug">'.$this->getLang('bugs_features').'</a> ';
+        }
+        foreach ($extension->getTags() as $tag) {
+            $return .= hsc($tag).' '; //$this->manager->handler->html_taglink($tag);
+        }
+        $return .= '</span>';
+        return $return;
+    }
+
+    /**
+     * Notice area
+     *
+     * @param helper_plugin_extension_extension $extension The extension
+     * @return string The HTML code
+     */
+    function make_noticearea(helper_plugin_extension_extension $extension) {
+        $return = '';
+        $missing_dependencies = $extension->getMissingDependencies();
+        if(!empty($missing_dependencies)) {
+            $return .= '<div class="msg error">'.
+                sprintf($this->getLang('missing_dependency'), implode(', ', /*array_map(array($this->helper, 'make_extensionsearchlink'),*/ $missing_dependencies)).
+                '</div>';
+        }
+        if($extension->isInWrongFolder()) {
+            $return .= '<div class="msg error">'.
+                sprintf($this->getLang('wrong_folder'), hsc($extension->getInstallName()), hsc($extension->getBase())).
+                '</div>';
+        }
+        if(($securityissue = $extension->getSecurityIssue()) !== false) {
+            $return .= '<div class="msg error">'.
+                sprintf($this->getLang('security_issue'), hsc($securityissue )).
+                '</div>';
+        }
+        if(($securitywarning = $extension->getSecurityWarning()) !== false) {
+            $return .= '<div class="msg notify">'.
+                sprintf($this->getLang('security_warning'), hsc($securitywarning)).
+                '</div>';
+        }
+        if($extension->updateAvailable()) {
+            $return .=  '<div class="msg notify">'.
+                sprintf($this->getLang('update_available'), hsc($extension->getLastUpdate())).
+                '</div>';
+        }
+        if($extension->hasDownloadURLChanged()) {
+            $return .=  '<div class="msg notify">'.
+                sprintf($this->getLang('url_change'), hsc($extension->getDownloadURL()), hsc($extension->getLastDownloadURL())).
+                '</div>';
+        }
+        return $return;
+    }
+
+    /**
+     * Create a link from the given URL
+     *
+     * Shortens the URL for display
+     *
+     * @param string $url
+     *
+     * @return string  HTML link
+     */
+    function shortlink($url){
+        $link = parse_url($url);
+
+        $base = $link['host'];
+        if($link['port']) $base .= $base.':'.$link['port'];
+        $long = $link['path'];
+        if($link['query']) $long .= $link['query'];
+
+        $name = shorten($base, $long, 55);
+
+        return '<a href="'.hsc($url).'" class="urlextern">'.hsc($name).'</a>';
+    }
+
+    /**
+     * Plugin/template details
+     *
+     * @param helper_plugin_extension_extension $extension The extension
+     * @return string The HTML code
+     */
+    function make_info(helper_plugin_extension_extension $extension) {
+        $default = $this->getLang('unknown');
+        $return = '<dl class="details">';
+
+        if (!$extension->isBundled()) {
+            $return .= '<dt>'.$this->getLang('downloadurl').'</dt>';
+            $return .= '<dd>';
+            $return .= ($extension->getDownloadURL() ? $this->shortlink($extension->getDownloadURL()) : $default);
+            $return .= '</dd>';
+
+            $return .= '<dt>'.$this->getLang('repository').'</dt>';
+            $return .= '<dd>';
+            $return .= ($extension->getSourcerepoURL() ? $this->shortlink($extension->getSourcerepoURL()) : $default);
+            $return .= '</dd>';
+        }
+
+        if ($extension->isInstalled()) {
+            if ($extension->getInstalledVersion()) {
+                $return .= '<dt>'.$this->getLang('installed_version').'</dt>';
+                $return .= '<dd>';
+                $return .= hsc($extension->getInstalledVersion());
+                $return .= '</dd>';
+            } else {
+                $return .= '<dt>'.$this->getLang('install_date').'</dt>';
+                $return .= '<dd>';
+                $return .= ($extension->getUpdateDate() ? hsc($extension->getUpdateDate()) : $this->getLang('unknown'));
+                $return .= '</dd>';
+            }
+        }
+        if (!$extension->isInstalled() || $extension->updateAvailable()) {
+            $return .= '<dt>'.$this->getLang('available_version').'</dt>';
+            $return .= '<dd>';
+            $return .= ($extension->getLastUpdate() ? hsc($extension->getLastUpdate()) : $this->getLang('unknown'));
+            $return .= '</dd>';
+        }
+
+        if($extension->getInstallDate()) {
+            $return .= '<dt>'.$this->getLang('installed').'</dt>';
+            $return .= '<dd>';
+            $return .= hsc($extension->getInstallDate());
+            $return .= '</dd>';
+        }
+
+        $return .= '<dt>'.$this->getLang('provides').'</dt>';
+        $return .= '<dd>';
+        $return .= ($extension->getTypes() ? hsc(implode(', ', $extension->getTypes())) : $default);
+        $return .= '</dd>';
+
+        if($extension->getCompatibleVersions()) {
+            $return .= '<dt>'.$this->getLang('compatible').'</dt>';
+            $return .= '<dd>';
+            foreach ($extension->getCompatibleVersions() as $date => $version) {
+                $return .= $version['label'].' ('.$date.'), ';
+            }
+            $return .= '</dd>';
+        }
+        if($extension->getDependencies()) {
+            $return .= '<dt>'.$this->getLang('depends').'</dt>';
+            $return .= '<dd>';
+            $return .= $this->make_linklist($extension->getDependencies());
+            $return .= '</dd>';
+        }
+
+        if($extension->getSimilarExtensions()) {
+            $return .= '<dt>'.$this->getLang('similar').'</dt>';
+            $return .= '<dd>';
+            $return .= $this->make_linklist($extension->getSimilarExtensions());
+            $return .= '</dd>';
+        }
+
+        if($extension->getConflicts()) {
+            $return .= '<dt>'.$this->getLang('conflicts').'</dt>';
+            $return .= '<dd>';
+            $return .= $this->make_linklist($extension->getConflicts());
+            $return .= '</dd>';
+        }
+        if ($extension->getDonationURL()) {
+            $return .= '<a href="'.hsc($extension->getDonationURL()).'" class="donate" title="'.$this->getLang('donate').'"></a>';
+        }
+        $return .= '</dl>';
+        return $return;
+    }
+
+    /**
+     * Generate a list of links for extensions
+     * @param array $links The links
+     * @return string The HTML code
+     */
+    function make_linklist($links) {
+        $return = '';
+        foreach ($links as $link) {
+            $dokulink = hsc($link);
+            if (strpos($link, 'template:') !== 0) $dokulink = 'plugin:'.$dokulink;
+            $return .= '<a href="http://www.dokuwiki.org/'.$dokulink.'" title="'.$dokulink.'" class="interwiki iw_doku">'.$link.'</a> ';
+        }
+        return $return;
+    }
+
+    /**
+     * Display the action buttons if they are possible
+     *
+     * @param helper_plugin_extension_extension $extension The extension
+     * @return string The HTML code
+     */
+    function make_actions(helper_plugin_extension_extension $extension) {
+        $return = '';
+        if (!$extension->isInstalled() && $extension->canModify() === true) {
+            $return .= $this->make_action('install', $extension);
+        } elseif ($extension->canModify()) {
+            if (!$extension->isBundled()) {
+                $return .= $this->make_action('uninstall', $extension);
+                if ($extension->getDownloadURL()) {
+                    if ($extension->updateAvailable()) {
+                        $return .= $this->make_action('update', $extension);
+                    } else {
+                        $return .= $this->make_action('reinstall', $extension);
+                    }
+                }
+            }
+            if (!$extension->isProtected()) {
+                if ($extension->isEnabled()) {
+                    $return .= $this->make_action('disable', $extension);
+                } else {
+                    $return .= $this->make_action('enable', $extension);
+                }
+            }
+        }
+
+        if (!$extension->isInstalled()) {
+            $return .= ' <span class="version">'.$this->getLang('available_version').' ';
+            $return .= ($extension->getLastUpdate() ? hsc($extension->getLastUpdate()) : $this->getLang('unknown')).'</span>';
+        }
+
+        return $return;
+    }
+
+    /**
+     * Display an action button for an extension
+     *
+     * @param string                            $action    The action
+     * @param helper_plugin_extension_extension $extension The extension
+     * @param bool                              $showinfo  If the info block is shown
+     * @return string The HTML code
+     */
+    function make_action($action, $extension, $showinfo = false) {
+        $title = $revertAction = $extraClass = '';
+
+        switch ($action) {
+            case 'info':
+                $title = 'title="'.$this->getLang('btn_info').'"';
+                if ($showinfo) {
+                    $revertAction = '-';
+                    $extraClass   = 'close';
+                }
+                break;
+            case 'install':
+            case 'reinstall':
+                $title = 'title="'.$extension->getDownloadURL().'"';
+                break;
+        }
+
+        $classes = 'button '.$action.' '.$extraClass;
+        $name    = 'fn['.$action.']['.$revertAction.hsc($extension->getInstallName()).']';
+
+        return '<input class="'.$classes.'" name="'.$name.'" type="submit" value="'.$this->getLang('btn_'.$action).'" '.$title.' />';
+    }
+}
diff --git a/lib/plugins/extension/images/disabled.png b/lib/plugins/extension/images/disabled.png
new file mode 100644
index 000000000..7a0dbb3b5
Binary files /dev/null and b/lib/plugins/extension/images/disabled.png differ
diff --git a/lib/plugins/extension/images/donate.png b/lib/plugins/extension/images/donate.png
new file mode 100644
index 000000000..b26ceb66e
Binary files /dev/null and b/lib/plugins/extension/images/donate.png differ
diff --git a/lib/plugins/extension/images/down.png b/lib/plugins/extension/images/down.png
new file mode 100644
index 000000000..df7beda4e
Binary files /dev/null and b/lib/plugins/extension/images/down.png differ
diff --git a/lib/plugins/extension/images/enabled.png b/lib/plugins/extension/images/enabled.png
new file mode 100644
index 000000000..7c051cda1
Binary files /dev/null and b/lib/plugins/extension/images/enabled.png differ
diff --git a/lib/plugins/extension/images/icons.xcf b/lib/plugins/extension/images/icons.xcf
new file mode 100644
index 000000000..a99747d81
Binary files /dev/null and b/lib/plugins/extension/images/icons.xcf differ
diff --git a/lib/plugins/extension/images/license.txt b/lib/plugins/extension/images/license.txt
new file mode 100644
index 000000000..254b9cdf6
--- /dev/null
+++ b/lib/plugins/extension/images/license.txt
@@ -0,0 +1,4 @@
+enabled.png - CC-BY-ND, (c) Emey87 http://www.iconfinder.com/icondetails/65590/48/lightbulb_icon
+disabled.png - CC-BY-ND, (c) Emey87 http://www.iconfinder.com/icondetails/65589/48/idea_lightbulb_off_icon
+plugin.png - public domain, (c) nicubunu, http://openclipart.org/detail/15093/blue-jigsaw-piece-07-by-nicubunu
+template.png - public domain, (c) mathec, http://openclipart.org/detail/166596/palette-by-mathec
diff --git a/lib/plugins/extension/images/plugin.png b/lib/plugins/extension/images/plugin.png
new file mode 100644
index 000000000..b9133681f
Binary files /dev/null and b/lib/plugins/extension/images/plugin.png differ
diff --git a/lib/plugins/extension/images/template.png b/lib/plugins/extension/images/template.png
new file mode 100644
index 000000000..383c4d0a3
Binary files /dev/null and b/lib/plugins/extension/images/template.png differ
diff --git a/lib/plugins/extension/images/up.png b/lib/plugins/extension/images/up.png
new file mode 100644
index 000000000..ec9337715
Binary files /dev/null and b/lib/plugins/extension/images/up.png differ
diff --git a/lib/plugins/extension/lang/en/lang.php b/lib/plugins/extension/lang/en/lang.php
index f0999ff01..b3a451ecc 100644
--- a/lib/plugins/extension/lang/en/lang.php
+++ b/lib/plugins/extension/lang/en/lang.php
@@ -3,6 +3,7 @@
  * English language file for extension plugin
  *
  * @author Michael Hamann <michael@content-space.de>
+ * @author Christopher Smith <chris@jalakai.co.uk>
  */
 
 // menu entry for admin plugins
@@ -16,6 +17,100 @@ $lang['pluginlistsaveerror'] = 'There was an error saving the plugin list';
 $lang['unknownauthor'] = 'Unknown author';
 $lang['unknownversion'] = 'Unknown version';
 
+// extension list
+$lang['btn_info']               = 'Show more info';
+$lang['btn_update']             = 'Update';
+$lang['btn_uninstall']          = 'Uninstall';
+$lang['btn_enable']             = 'Enable';
+$lang['btn_disable']            = 'Disable';
+//$lang['btn_disable_all']        = 'Disable all';
+//$lang['btn_settings']           = 'Settings';
+$lang['btn_install']           = 'Install';
+$lang['btn_reinstall']          = 'Re-install';
+//$lang['btn_disdown']            = 'Download as Disabled';
+//$lang['btn_dependown']          = 'Download with dependencies';
+
+$lang['extensionby']            = '<strong>%s</strong> by %s';
+$lang['popularity']             = 'Popularity: %s';
+$lang['homepage_link']          = 'Docs';
+$lang['bugs_features']          = 'Bugs';
+$lang['author_hint']            = 'Search extensions by this author';
+$lang['tag_hint']               = 'Search extensions with this tag';
+$lang['installed']              = 'Installed:';
+$lang['lastupdate']             = 'Last updated:';
+$lang['downloadurl']            = 'Download URL:';
+$lang['repository']             = 'Repository:';
+$lang['unknown']                = '<em>unknown</em>';
+$lang['installed_version']      = 'Installed version:';
+$lang['install_date']           = 'Your last update:';
+$lang['available_version']      = 'Version:';
+$lang['compatible']             = 'Compatible with:';
+$lang['depends']                = 'Depends on:';
+$lang['similar']                = 'Similar to:';
+$lang['conflicts']              = 'Conflicts with:';
+$lang['donate']                 = 'Donate';
+$lang['bundled']                = 'bundled';
+$lang['manual_install']         = 'manual install';
+
+$lang['msg_tpl_uninstalled']        = 'Template %s uninstalled';
+$lang['msg_tpl_uninstalled']     = 'Template %s could not be uninstalled';
+$lang['msg_uninstalled']            = 'Plugin %s uninstalled';
+$lang['msg_uninstalled']         = 'Plugin %s could not be uninstalled';
+
+$lang['msg_tpl_enabled']        = 'Template %s enabled';
+$lang['msg_tpl_notenabled']     = 'Template %s could not be enabled, check file permissions';
+$lang['msg_enabled']            = 'Plugin %s enabled';
+$lang['msg_notenabled']         = 'Plugin %s could not be enabled, check file permissions';
+
+$lang['msg_disabled']           = 'Plugin %s disabled';
+$lang['msg_notdisabled']        = 'Plugin %s could not be disabled, check file permissions';
+
+$lang['msg_url_failed']         = 'URL [%s] could not be downloaded.<br /> %s';
+$lang['msg_download_failed']    = 'Plugin %s could not be downloaded.<br /> %s';
+$lang['msg_download_success']   = 'Plugin %s installed successfully';
+$lang['msg_tpl_download_failed']  = 'Template %s could not be downloaded.<br /> %s';
+$lang['msg_tpl_download_success'] = 'Template %s installed successfully';
+$lang['msg_download_pkg_success']     = '%s extension package successfully installed (%s)';
+$lang['msg_tpl_download_pkg_success'] = '%s extension package successfully installed (%s)';
+
+$lang['msg_update_success']     = 'Plugin %s successfully updated';
+$lang['msg_update_failed']      = 'Update of plugin %s failed.<br /> %s';
+$lang['msg_tpl_update_success'] = 'Template %s successfully updated';
+$lang['msg_tpl_update_failed']  = 'Update of template %s failed.<br /> %s';
+$lang['msg_update_pkg_success']     = '%s extension package successfully updated (%s)';
+$lang['msg_tpl_update_pkg_success'] = '%s extension package successfully updated (%s)';
+
+$lang['msg_reinstall_success']  = 'Plugin %s re-installed successfully';
+$lang['msg_reinstall_failed']   = 'Failed to re-install plugin %s.<br /> %s';
+$lang['msg_tpl_reinstall_success'] = 'Template %s re-installed successfully';
+$lang['msg_tpl_reinstall_failed']  = 'Failed to re-install template %s.<br /> %s';
+$lang['msg_reinstall_pkg_success']     = '%s extension package successfully reinstalled (%s)';
+$lang['msg_tpl_reinstall_pkg_success'] = '%s extension package successfully reinstalled (%s)';
+
+// info titles
+$lang['plugin']                 = 'Plugin';
+$lang['provides']               = 'Provides:';
+$lang['noinfo']                 = 'This plugin returned no information, it may be invalid.';
+$lang['name']                   = 'Name:';
+$lang['date']                   = 'Date:';
+$lang['type']                   = 'Type:';
+$lang['desc']                   = 'Description:';
+$lang['author']                 = 'Author:';
+$lang['www']                    = 'Web:';
+
+// error messages
+$lang['needed_by']              = 'Needed by:';
+$lang['not_writable']           = 'DokuWiki can not write to the folder';
+$lang['missing_dependency']     = '<strong>Missing or disabled dependency:</strong> %s';
+$lang['security_issue']         = '<strong>Security Issue:</strong> %s';
+$lang['security_warning']       = '<strong>Security Warning:</strong> %s';
+$lang['update_available']       = '<strong>Update:</strong> New version %s is available.';
+$lang['wrong_folder']           = '<strong>Plugin installed incorrectly:</strong> Rename plugin directory "%s" to "%s".';
+$lang['url_change']             = '<strong>URL changed:</strong> Download URL has changed since last download. Check if the new URL is valid before updating the extension.<br />New: %s<br />Old: %s';
+$lang['gitmanaged']             = 'Extension installed with git';
+$lang['bundled_source']         = 'Bundled with DokuWiki source';
+$lang['no_url']                 = 'No download URL';
+$lang['no_manager']             = 'Could not find manager.dat file';
 
 $lang['error_badurl']           = 'URL ends with slash - unable to determine file name from the url';
 $lang['error_dircreate']        = 'Unable to create temporary folder to receive download';
@@ -23,5 +118,4 @@ $lang['error_download']         = 'Unable to download the file: %s';
 $lang['error_decompress']       = 'Unable to decompress the downloaded file. This maybe as a result of a bad download, in which case you should try again; or the compression format may be unknown, in which case you will need to download and install manually';
 $lang['error_findfolder']       = 'Unable to identify extension directory, you need to download and install manually';
 $lang['error_copy']             = 'There was a file copy error while attempting to install files for directory <em>%s</em>: the disk could be full or file access permissions may be incorrect. This may have resulted in a partially installed plugin and leave your wiki installation unstable';
-
 //Setup VIM: ex: et ts=4 :
diff --git a/lib/plugins/extension/style.css b/lib/plugins/extension/style.css
new file mode 100644
index 000000000..1cce52be8
--- /dev/null
+++ b/lib/plugins/extension/style.css
@@ -0,0 +1,368 @@
+/*
+ * Extension plugin styles
+ *
+ * @author  Christopher Smith <chris@jalakai.co.uk>
+ * @author  Piyush Mishra <me@piyushmishra.com>
+ * @author  Håkan Sandell <sandell.hakan@gmail.com>
+ * @author  Anika Henke <anika@selfthinker.org>
+ */
+
+/*
+ * tab support not included in "Angua", copied from _mediamanager.css
+ */
+#extension__manager .panelHeader {
+    background-color: __background_alt__;
+    margin-bottom: 10px;
+    padding: 10px;
+    text-align: left;
+    /* to counter partly missing border of ul.tabs: */
+    border-top: 1px solid __border__;
+    margin-top: -1px;
+}
+
+#extension__manager .panelHeader p {
+    float: left;
+    font-weight: normal;
+    font-size: 1em;
+    padding: 0;
+    margin: 0 0 3px;
+}
+[dir=rtl] #extension__manager .panelHeader p {
+    float: right;
+}
+
+#extension__manager ul.tabs div.message {
+    display: inline;
+    margin: 0 .5em;
+}
+
+/*
+ * general layout
+ */
+#extension__manager h2 {
+    margin-left: 0;
+}
+
+#extension__manager a.taglink {
+    padding: 1px 4px;
+    background-color: __background_neu__;
+    border-radius: 3px;
+}
+[dir=rtl] #extension__manager a.taglink {
+    display: inline-block;
+    line-height: 1.2;
+}
+
+#extension__manager .panelHeader div.error {
+    margin-top: 0;
+    float: left;
+}
+[dir=rtl] #extension__manager .panelHeader div.error {
+    float: right;
+}
+
+/*
+ * search & url download forms
+ */
+#extension__manager form.search,
+#extension__manager form.btn_reload {
+    float: right;
+}
+[dir=rtl] #extension__manager form.search,
+[dir=rtl] #extension__manager form.btn_reload {
+    float: left;
+}
+
+#extension__manager div.search form.search {
+    float: none;
+}
+
+#extension__manager .tagcloud {
+    width: 55%;
+    float: left;
+    margin: 0 0.5em 1em 0;
+}
+[dir=rtl] #extension__manager .tagcloud {
+    float: right;
+    margin: 0 0 1em .5em;
+}
+
+#extension__manager .tagcloud a.taglink {
+    background-color: inherit;
+}
+
+#extension__manager div.search {
+    width: 44%;
+    float: left;
+}
+[dir=rtl] #extension__manager div.search {
+    float: right;
+}
+
+#extension__manager fieldset {
+    margin-top: 0.5em;
+    width: auto;
+}
+
+#extension__manager fieldset p {
+    margin: 0.5em;
+    text-align: justify;
+    font-size: 85%;
+}
+
+/* tag cloud */
+#extension__manager a.cl0 { font-size: 0.7em; }
+#extension__manager a.cl1 { font-size: 0.9em; }
+#extension__manager a.cl2 { font-size: 1em; }
+#extension__manager a.cl3 { font-size: 1.3em; }
+#extension__manager a.cl4 { font-size: 1.6em; }
+#extension__manager a.cl5 { font-size: 1.9em; }
+
+
+#extension__manager .extensionList input.button {
+    margin: 0 .3em .3em 0;
+}
+[dir=rtl] #extension__manager .extensionList input.button {
+    margin: 0 0 .3em .3em;
+}
+
+/*
+ * extensions table
+ */
+#extension__manager .extensionList {
+    margin-left: 0;
+    margin-right: 0;
+    padding: 0;
+    list-style: none;
+}
+
+#extension__manager .extensionList li {
+    margin: 0 0 .5em;
+    padding: 0 0 .5em;
+    color: __text__;
+    border-bottom: 1px solid __border__;
+    overflow: hidden;
+}
+
+#extension__manager .legend {
+    position: relative;
+    width: 75%;
+    float: left;
+}
+[dir=rtl] #extension__manager .legend {
+    float: right;
+}
+
+#extension__manager .legend > div {
+    padding: 0 .5em 0 132px;
+    border-right: 1px solid __background_alt__;
+    overflow: hidden;
+}
+[dir=rtl] #extension__manager .legend > div {
+    padding: 0 132px 0 .5em;
+    border-left: 1px solid __background_alt__;
+    border-right-width: 0;
+}
+
+#extension__manager .enabled div.screenshot span {
+    background: transparent url(images/enabled.png) no-repeat 2px 2px;
+}
+
+#extension__manager .disabled div.screenshot span {
+    background: transparent url(images/disabled.png) no-repeat 2px 2px;
+}
+
+#extension__manager .legend div.screenshot {
+    margin-top: 4px;
+    margin-left: -132px;
+    max-width: 120px;
+    float: left;
+}
+[dir=rtl] #extension__manager .legend div.screenshot {
+    margin-left: 0;
+    margin-right: -132px;
+    float: right;
+}
+
+#extension__manager .legend div.screenshot span {
+    min-height: 24px;
+    min-width: 24px;
+    position: absolute;
+    left: 0;
+}
+[dir=rtl] #extension__manager .legend div.screenshot span {
+    left: auto;
+    right: 0;
+}
+
+#extension__manager .legend h2 {
+    width: 100%;
+    float: right;
+    margin: 0.2em 0 0.5em;
+    font-size: 100%;
+    font-weight: normal;
+    border: none;
+}
+[dir=rtl] #extension__manager .legend h2 {
+    float: left;
+}
+
+#extension__manager .legend h2 strong {
+    font-size: 120%;
+    font-weight: bold;
+    vertical-align: baseline;
+}
+
+#extension__manager .legend p {
+    margin: 0 0 0.6em 0;
+}
+
+#extension__manager .legend span.linkbar {
+    font-size: 85%;
+}
+
+#extension__manager .legend span.linkbar a.urlextern + a.taglink,
+#extension__manager .legend span.linkbar a.interwiki + a.taglink {
+    margin-left: 0.4em;
+}
+[dir=rtl] #extension__manager .legend span.linkbar a.urlextern + a.taglink,
+[dir=rtl] #extension__manager .legend span.linkbar a.interwiki + a.taglink {
+    margin-left: 0;
+}
+[dir=rtl] #extension__manager .legend span.linkbar a.urlextern,
+[dir=rtl] #extension__manager .legend span.linkbar a.interwiki {
+    margin-left: .4em;
+}
+
+#extension__manager .legend input.button {
+    background: transparent url(images/up.png) no-repeat 0 0;
+    box-shadow: none;
+    border-width: 0;
+    height: 14px;
+    text-indent: -99999px;
+    float: right;
+    margin: .5em 0 0;
+}
+[dir=rtl] #extension__manager .legend input.button {
+    float: left;
+    margin: .5em 0 0;
+}
+
+#extension__manager .legend  input.button.close {
+    background: transparent url(images/down.png) no-repeat 0 0;
+}
+
+#extension__manager .legend div.popularity {
+    background-color: __background__;
+    border: 1px solid silver;
+    height: .4em;
+    margin: 0 auto;
+    padding: 1px;
+    width: 5.5em;
+    position: absolute;
+    right: .5em;
+    top: 0.2em;
+}
+[dir=rtl] #extension__manager .legend div.popularity {
+    right: auto;
+    left: .5em;
+}
+
+#extension__manager .legend div.popularity div {
+    background-color: __border__;
+    height: 100%;
+}
+
+#extension__manager .legend div.popularity div span {
+    display: none;/* @todo: hide accessibly */
+}
+
+#extension__manager .actions {
+    padding: 0;
+    font-size: 95%;
+    width: 25%;
+    float: right;
+    text-align: right;
+}
+[dir=rtl] #extension__manager .actions {
+    float: left;
+    text-align: left;
+}
+
+#extension__manager .actions .version {
+    display: block;
+}
+
+#extension__manager .actions p {
+    margin: 0.2em 0;
+    text-align: center;
+}
+
+/*
+ * extensions table, detailed info box
+ */
+#extension__manager dl.details {
+    margin: 0.4em 0 0 0;
+    font-size: 85%;
+    border-top: 1px solid __background_alt__;
+    clear: both;
+}
+
+#extension__manager dl.details dt {
+    clear: left;
+    float: left;
+    width: 25%;
+    margin: 0;
+    text-align: right;
+    font-weight: normal;
+    padding: 0.2em 5px 0 0;
+}
+[dir=rtl] #extension__manager dl.details dt {
+    clear: right;
+    float: right;
+    text-align: left;
+    padding: 0.2em 0 0 5px;
+}
+
+#extension__manager dl.details dd {
+    margin-left: 25%;
+    font-weight: bold;
+    padding: 0.2em 0 0 5px;
+}
+[dir=rtl] #extension__manager dl.details dd {
+    margin-left: 0;
+    margin-right: 25%;
+    padding: 0.2em 5px 0 0 ;
+}
+
+#extension__manager dl.details dd a {
+    font-weight: normal;
+}
+
+#extension__manager #info__popup {
+    z-index: 20;
+    overflow: hidden;
+    opacity: 0.9;
+    border: 1px solid __border__;
+    background-color: __border__; /*background_other__;*/
+    text-align: left;
+    padding: 0.2em;
+}
+[dir=rtl] #extension__manager #info__popup {
+    text-align: right;
+}
+
+#extension__manager div.msg {
+    margin: 0.4em 0 0 0;
+}
+
+#extension__manager ul.tabs div.msg {
+    display: inline;
+    margin-left: 0.4em;
+}
+[dir=rtl] #extension__manager ul.tabs div.msg {
+    margin-left: 0;
+    margin-right: 0.4em;
+}
+
+/* end admin plugin styles */
-- 
cgit v1.2.3


From dfabb2233685be891929dd4065c257a025dc3151 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 4 Aug 2013 18:20:45 +0200
Subject: added tabURL builder

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

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/helper/list.php b/lib/plugins/extension/helper/list.php
index ffb88114d..e8b4f472f 100644
--- a/lib/plugins/extension/helper/list.php
+++ b/lib/plugins/extension/helper/list.php
@@ -474,4 +474,24 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
 
         return '<input class="'.$classes.'" name="'.$name.'" type="submit" value="'.$this->getLang('btn_'.$action).'" '.$title.' />';
     }
+
+    /**
+     * Create an URL inside the extension manager
+     *
+     * @param string tab tb to load, empty for current tab
+     * @param array $params associative array of parameter to set
+     * @return string
+     */
+    static public function tabURL($tab='', $params=array()){
+        global $ID;
+        global $INPUT;
+
+        if(!$tab) $tab = $INPUT->str('tab', 'installed', true);
+        $defaults = array(
+            'do'   => 'admin',
+            'page' => 'extension',
+            'tab'  => $tab,
+        );
+        return wl($ID, array_merge($defaults, $params));
+    }
 }
-- 
cgit v1.2.3


From b8d600ef317ee91b73133cc7af7a83cf12d5d0d9 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 4 Aug 2013 18:21:08 +0200
Subject: fixed screenshot height

---
 lib/plugins/extension/style.css | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/style.css b/lib/plugins/extension/style.css
index 1cce52be8..0a3a0cc0e 100644
--- a/lib/plugins/extension/style.css
+++ b/lib/plugins/extension/style.css
@@ -172,6 +172,11 @@
     background: transparent url(images/disabled.png) no-repeat 2px 2px;
 }
 
+#extension__manager div.screenshot img {
+    width: 120px;
+    height: 70px;
+}
+
 #extension__manager .legend div.screenshot {
     margin-top: 4px;
     margin-left: -132px;
-- 
cgit v1.2.3


From 141407788877f98d4acc6eabc7cc3e831eaa8317 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 4 Aug 2013 18:22:39 +0200
Subject: fixed typo in define

---
 lib/plugins/extension/helper/repository.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/helper/repository.php b/lib/plugins/extension/helper/repository.php
index 37b9bc02c..459d7cbec 100644
--- a/lib/plugins/extension/helper/repository.php
+++ b/lib/plugins/extension/helper/repository.php
@@ -6,8 +6,10 @@
  * @author  Michael Hamann <michael@content-space.de>
  */
 
+define('EXTENSION_REPOSITORY_API', 'http://localhost/dokuwiki/lib/plugins/pluginrepo/api.php');
+
 if (!defined('EXTENSION_REPOSITORY_API_ENDPOINT'))
-    define('EXTENSION_REPSITORY_API', 'http://www.dokuwiki.org/lib/plugins/pluginrepo/api.php');
+    define('EXTENSION_REPOSITORY_API', 'http://www.dokuwiki.org/lib/plugins/pluginrepo/api.php');
 
 // must be run within Dokuwiki
 if(!defined('DOKU_INC')) die();
@@ -40,7 +42,7 @@ class helper_plugin_extension_repository extends DokuWiki_Plugin {
 
             if ($request_needed) {
                 $httpclient = new DokuHTTPClient();
-                $data = $httpclient->post(EXTENSION_REPSITORY_API, $request_data);
+                $data = $httpclient->post(EXTENSION_REPOSITORY_API, $request_data);
                 if ($data !== false) {
                     $extensions = unserialize($data);
                     foreach ($extensions as $extension) {
@@ -66,7 +68,7 @@ class helper_plugin_extension_repository extends DokuWiki_Plugin {
             if (!$cache->useCache(array('age' => 3600 * 24))) {
                 $httpclient = new DokuHTTPClient();
                 $httpclient->timeout = 5;
-                $data = $httpclient->get(EXTENSION_REPSITORY_API.'?cmd=ping');
+                $data = $httpclient->get(EXTENSION_REPOSITORY_API.'?cmd=ping');
                 if ($data !== false) {
                     $this->has_access = true;
                     $cache->storeCache(1);
@@ -93,7 +95,7 @@ class helper_plugin_extension_repository extends DokuWiki_Plugin {
         if (!isset($this->loaded_extensions[$name]) && $this->hasAccess() && !$cache->useCache(array('age' => 3600 * 24))) {
             $this->loaded_extensions[$name] = true;
             $httpclient = new DokuHTTPClient();
-            $data = $httpclient->get(EXTENSION_REPSITORY_API.'?fmt=php&ext[]='.urlencode($name));
+            $data = $httpclient->get(EXTENSION_REPOSITORY_API.'?fmt=php&ext[]='.urlencode($name));
             if ($data !== false) {
                 $result = unserialize($data);
                 $cache->storeCache(serialize($result[0]));
-- 
cgit v1.2.3


From e45b5c14dbb09dd200d66ff21de1bba960113c68 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 4 Aug 2013 18:24:20 +0200
Subject: added connectivity recheck

---
 lib/plugins/extension/admin.php             | 7 +++++++
 lib/plugins/extension/helper/repository.php | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/admin.php b/lib/plugins/extension/admin.php
index 373f90183..6cad58595 100644
--- a/lib/plugins/extension/admin.php
+++ b/lib/plugins/extension/admin.php
@@ -39,6 +39,13 @@ class admin_plugin_extension extends DokuWiki_Admin_Plugin {
         $repository = $this->loadHelper('extension_repository');
         $repository->init();
 
+        if(!$repository->hasAccess()){
+            $url = helper_plugin_extension_list::tabURL('', array('purge'=>1));
+
+            msg('The DokuWiki extension repository can not be reached currently.
+                 Online Features are not available. [<a href="'.$url.'">retry</a>]', -1);
+        }
+
         /* @var helper_plugin_extension_extension $extension */
         $extension = $this->loadHelper('extension_extension');
 
diff --git a/lib/plugins/extension/helper/repository.php b/lib/plugins/extension/helper/repository.php
index 459d7cbec..a5012ccb5 100644
--- a/lib/plugins/extension/helper/repository.php
+++ b/lib/plugins/extension/helper/repository.php
@@ -65,7 +65,7 @@ class helper_plugin_extension_repository extends DokuWiki_Plugin {
         if ($this->has_access === null) {
             $cache = new cache('##extension_manager###hasAccess', 'repo');
             $result = null;
-            if (!$cache->useCache(array('age' => 3600 * 24))) {
+            if (!$cache->useCache(array('age' => 3600 * 24, 'purge'=>1))) {
                 $httpclient = new DokuHTTPClient();
                 $httpclient->timeout = 5;
                 $data = $httpclient->get(EXTENSION_REPOSITORY_API.'?cmd=ping');
-- 
cgit v1.2.3


From a8332b68fa9dd8f70d2fc9d9e50c34957cf9e24d Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 4 Aug 2013 18:24:53 +0200
Subject: various gui fixes

---
 lib/plugins/extension/helper/extension.php |  2 ++
 lib/plugins/extension/helper/list.php      | 34 +++++++++++++++++++-----------
 2 files changed, 24 insertions(+), 12 deletions(-)

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/helper/extension.php b/lib/plugins/extension/helper/extension.php
index 093ee7828..296b81ac5 100644
--- a/lib/plugins/extension/helper/extension.php
+++ b/lib/plugins/extension/helper/extension.php
@@ -53,6 +53,8 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
         }
 
         $this->remoteInfo = $this->repository->getData(($this->isTemplate() ? 'template:' : '').$this->getBase());
+
+        return ($this->localInfo || $this->remoteInfo);
     }
 
     /**
diff --git a/lib/plugins/extension/helper/list.php b/lib/plugins/extension/helper/list.php
index e8b4f472f..816d4a444 100644
--- a/lib/plugins/extension/helper/list.php
+++ b/lib/plugins/extension/helper/list.php
@@ -10,7 +10,7 @@
 if(!defined('DOKU_INC')) die();
 
 /**
- * Class helper_plugin_extension_extension represents a single extension (plugin or template)
+ * Class helper_plugin_extension_list takes care of creating a HTML list of extensions
  */
 class helper_plugin_extension_list extends DokuWiki_Plugin {
     protected $form = '';
@@ -150,16 +150,15 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
 
         if($extension->getAuthor()) {
 
-            $params = array(
-                'do'=>'admin',
-                'page'=>'extension',
-                'tab'=>'search',
-                'q'=>'author:'.$extension->getAuthor()
-            );
-            $url = wl($ID, $params);
-            return '<a href="'.$url.'" title="'.$this->getLang('author_hint').'" >'.hsc($extension->getAuthor()).'</a>';
+            $mailid = $extension->getEmailID();
+            if($mailid){
+                $url = $this->tabURL('search', array('q' => 'mailid:'.$mailid));
+                return '<a href="'.$url.'" class="author" title="'.$this->getLang('author_hint').'" >'.hsc($extension->getAuthor()).'</a>';
+            }else{
+                return '<span class="author">'.hsc($extension->getAuthor()).'</span>';
+            }
         }
-        return "<em>".$this->getLang('unknown_author')."</em>";
+        return "<em class=\"author\">".$this->getLang('unknown_author')."</em>";
     }
 
     /**
@@ -231,8 +230,19 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
         if ($extension->getBugtrackerURL()) {
             $return .= ' <a href="'.hsc($extension->getBugtrackerURL()).'" title="'.hsc($extension->getBugtrackerURL()).'" class ="interwiki iw_dokubug">'.$this->getLang('bugs_features').'</a> ';
         }
-        foreach ($extension->getTags() as $tag) {
-            $return .= hsc($tag).' '; //$this->manager->handler->html_taglink($tag);
+        if($extension->getTags()){
+            $first = true;
+            echo '<span class="tags">';
+            foreach ($extension->getTags() as $tag) {
+                if(!$first){
+                    $return .= ', ';
+                }else{
+                    $first = false;
+                }
+                $url = $this->tabURL('search', array('q' => 'tag:'.$tag));
+                $return .= '<a href="'.$url.'">'.hsc($tag).'</a>';
+            }
+            echo '</span>';
         }
         $return .= '</span>';
         return $return;
-- 
cgit v1.2.3


From d7410643d8e3db12a76845370d8eee2508fa6115 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 4 Aug 2013 19:46:02 +0200
Subject: added tab navigation

---
 lib/plugins/extension/admin.php        | 49 +++++++++++++++++------
 lib/plugins/extension/helper/gui.php   | 71 ++++++++++++++++++++++++++++++++++
 lib/plugins/extension/helper/list.php  | 35 +++++++----------
 lib/plugins/extension/lang/en/lang.php |  6 ++-
 4 files changed, 126 insertions(+), 35 deletions(-)
 create mode 100644 lib/plugins/extension/helper/gui.php

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/admin.php b/lib/plugins/extension/admin.php
index 6cad58595..4faafedb2 100644
--- a/lib/plugins/extension/admin.php
+++ b/lib/plugins/extension/admin.php
@@ -14,6 +14,17 @@ if(!defined('DOKU_INC')) die();
  */
 class admin_plugin_extension extends DokuWiki_Admin_Plugin {
     protected $infoFor = null;
+    /** @var  helper_plugin_extension_gui */
+    protected $gui;
+
+    /**
+     * Constructor
+     *
+     * loads additional helpers
+     */
+    public function __construct(){
+        $this->gui = plugin_load('helper', 'extension_gui');
+    }
 
     /**
      * @return int sort number in admin menu
@@ -40,7 +51,7 @@ class admin_plugin_extension extends DokuWiki_Admin_Plugin {
         $repository->init();
 
         if(!$repository->hasAccess()){
-            $url = helper_plugin_extension_list::tabURL('', array('purge'=>1));
+            $url = $this->gui->tabURL('', array('purge'=>1));
 
             msg('The DokuWiki extension repository can not be reached currently.
                  Online Features are not available. [<a href="'.$url.'">retry</a>]', -1);
@@ -109,21 +120,35 @@ class admin_plugin_extension extends DokuWiki_Admin_Plugin {
     public function html() {
         /* @var Doku_Plugin_Controller $plugin_controller */
         global $plugin_controller;
+        global $INPUT;
         ptln('<h1>'.$this->getLang('menu').'</h1>');
         ptln('<div id="extension__manager">');
 
-        $pluginlist = $plugin_controller->getList('', true);
-        /* @var helper_plugin_extension_extension $extension */
-        $extension = $this->loadHelper('extension_extension');
-        /* @var helper_plugin_extension_list $list */
-        $list = $this->loadHelper('extension_list');
-        $list->start_form();
-        foreach ($pluginlist as $name) {
-            $extension->setExtension($name, false);
-            $list->add_row($extension, $name == $this->infoFor);
+        $this->gui->tabNavigation();
+
+        switch($INPUT->str('tab','plugins')){
+            case 'search':
+                echo 'search interface';
+                break;
+            case 'plugins':
+            default:
+                // FIXME move to function?
+
+                $pluginlist = $plugin_controller->getList('', true);
+                /* @var helper_plugin_extension_extension $extension */
+                $extension = $this->loadHelper('extension_extension');
+                /* @var helper_plugin_extension_list $list */
+                $list = $this->loadHelper('extension_list');
+                $list->start_form();
+                foreach ($pluginlist as $name) {
+                    $extension->setExtension($name, false);
+                    $list->add_row($extension, $name == $this->infoFor);
+                }
+                $list->end_form();
+                $list->render();
         }
-        $list->end_form();
-        $list->render();
+
+
         ptln('</div>');
     }
 }
diff --git a/lib/plugins/extension/helper/gui.php b/lib/plugins/extension/helper/gui.php
new file mode 100644
index 000000000..eba5fbc7f
--- /dev/null
+++ b/lib/plugins/extension/helper/gui.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * DokuWiki Plugin extension (Helper Component)
+ *
+ * @license GPL 2 http://www.gnu.org/licenses/gpl-2.0.html
+ * @author  Andreas Gohr <andi@splitbrain.org>
+ */
+
+// must be run within Dokuwiki
+if(!defined('DOKU_INC')) die();
+
+/**
+ * Class helper_plugin_extension_list takes care of the overall GUI
+ */
+class helper_plugin_extension_gui extends DokuWiki_Plugin {
+
+    protected $tabs = array('plugins', 'templates', 'search');
+
+    /**
+     * Print the tab navigation
+     *
+     * @fixme style active one
+     */
+    public function tabNavigation() {
+        echo '<ul class="tabs">';
+        foreach(array('plugins', 'templates', 'search') as $tab) {
+            $url = $this->tabURL($tab);
+            if($this->currentTab() == $tab) {
+                $class = 'class="active"';
+            } else {
+                $class = '';
+            }
+            echo '<li '.$class.'><a href="'.$url.'">'.$this->getLang('tab_'.$tab).'</a></li>';
+        }
+        echo '</ul>';
+    }
+
+    /**
+     * Return the currently selected tab
+     *
+     * @return string
+     */
+    public function currentTab() {
+        global $INPUT;
+
+        $tab = $INPUT->str('tab', 'plugins', true);
+        if(!in_array($tab, $this->tabs)) $tab = 'plugins';
+        return $tab;
+    }
+
+    /**
+     * Create an URL inside the extension manager
+     *
+     * @param string $tab    tab to load, empty for current tab
+     * @param array  $params associative array of parameter to set
+     *
+     * @return string
+     */
+    public function tabURL($tab = '', $params = array()) {
+        global $ID;
+
+        if(!$tab) $tab = $this->currentTab();
+        $defaults = array(
+            'do'   => 'admin',
+            'page' => 'extension',
+            'tab'  => $tab,
+        );
+        return wl($ID, array_merge($defaults, $params));
+    }
+
+}
diff --git a/lib/plugins/extension/helper/list.php b/lib/plugins/extension/helper/list.php
index 816d4a444..1c337176d 100644
--- a/lib/plugins/extension/helper/list.php
+++ b/lib/plugins/extension/helper/list.php
@@ -14,6 +14,17 @@ if(!defined('DOKU_INC')) die();
  */
 class helper_plugin_extension_list extends DokuWiki_Plugin {
     protected $form = '';
+    /** @var  helper_plugin_extension_gui */
+    protected $gui;
+
+    /**
+     * Constructor
+     *
+     * loads additional helpers
+     */
+    public function __construct(){
+        $this->gui = plugin_load('helper', 'extension_gui');
+    }
 
     function start_form() {
         $this->form .= '<form id="extension__list" accept-charset="utf-8" method="post" action="">';
@@ -152,7 +163,7 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
 
             $mailid = $extension->getEmailID();
             if($mailid){
-                $url = $this->tabURL('search', array('q' => 'mailid:'.$mailid));
+                $url = $this->gui->tabURL('search', array('q' => 'mailid:'.$mailid));
                 return '<a href="'.$url.'" class="author" title="'.$this->getLang('author_hint').'" >'.hsc($extension->getAuthor()).'</a>';
             }else{
                 return '<span class="author">'.hsc($extension->getAuthor()).'</span>';
@@ -239,7 +250,7 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
                 }else{
                     $first = false;
                 }
-                $url = $this->tabURL('search', array('q' => 'tag:'.$tag));
+                $url = $this->gui->tabURL('search', array('q' => 'tag:'.$tag));
                 $return .= '<a href="'.$url.'">'.hsc($tag).'</a>';
             }
             echo '</span>';
@@ -484,24 +495,4 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
 
         return '<input class="'.$classes.'" name="'.$name.'" type="submit" value="'.$this->getLang('btn_'.$action).'" '.$title.' />';
     }
-
-    /**
-     * Create an URL inside the extension manager
-     *
-     * @param string tab tb to load, empty for current tab
-     * @param array $params associative array of parameter to set
-     * @return string
-     */
-    static public function tabURL($tab='', $params=array()){
-        global $ID;
-        global $INPUT;
-
-        if(!$tab) $tab = $INPUT->str('tab', 'installed', true);
-        $defaults = array(
-            'do'   => 'admin',
-            'page' => 'extension',
-            'tab'  => $tab,
-        );
-        return wl($ID, array_merge($defaults, $params));
-    }
 }
diff --git a/lib/plugins/extension/lang/en/lang.php b/lib/plugins/extension/lang/en/lang.php
index b3a451ecc..4439db879 100644
--- a/lib/plugins/extension/lang/en/lang.php
+++ b/lib/plugins/extension/lang/en/lang.php
@@ -7,7 +7,11 @@
  */
 
 // menu entry for admin plugins
-$lang['menu'] = 'Extension manager';
+$lang['menu'] = 'Extension Manager';
+
+$lang['tab_plugins']   = 'Installed Plugins';
+$lang['tab_templates'] = 'Installed Templates';
+$lang['tab_search']    = 'Search and Install';
 
 // custom language strings for the plugin
 $lang['notimplemented'] = 'This feature hasn\'t been implemented yet';
-- 
cgit v1.2.3


From 5d7f3164ea4199d7cf1215a1a8a5785218c9e149 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 4 Aug 2013 20:08:30 +0200
Subject: moved display stuff to gui class, added template list

---
 lib/plugins/extension/admin.php      | 23 +++++-----------------
 lib/plugins/extension/helper/gui.php | 37 ++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 18 deletions(-)

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/admin.php b/lib/plugins/extension/admin.php
index 4faafedb2..39ce9e947 100644
--- a/lib/plugins/extension/admin.php
+++ b/lib/plugins/extension/admin.php
@@ -118,34 +118,21 @@ class admin_plugin_extension extends DokuWiki_Admin_Plugin {
      * Render HTML output
      */
     public function html() {
-        /* @var Doku_Plugin_Controller $plugin_controller */
-        global $plugin_controller;
-        global $INPUT;
         ptln('<h1>'.$this->getLang('menu').'</h1>');
         ptln('<div id="extension__manager">');
 
         $this->gui->tabNavigation();
 
-        switch($INPUT->str('tab','plugins')){
+        switch($this->gui->currentTab()){
             case 'search':
                 echo 'search interface';
                 break;
+            case 'templates':
+                $this->gui->templateList();
+                break;
             case 'plugins':
             default:
-                // FIXME move to function?
-
-                $pluginlist = $plugin_controller->getList('', true);
-                /* @var helper_plugin_extension_extension $extension */
-                $extension = $this->loadHelper('extension_extension');
-                /* @var helper_plugin_extension_list $list */
-                $list = $this->loadHelper('extension_list');
-                $list->start_form();
-                foreach ($pluginlist as $name) {
-                    $extension->setExtension($name, false);
-                    $list->add_row($extension, $name == $this->infoFor);
-                }
-                $list->end_form();
-                $list->render();
+                $this->gui->pluginList();
         }
 
 
diff --git a/lib/plugins/extension/helper/gui.php b/lib/plugins/extension/helper/gui.php
index eba5fbc7f..41afc2069 100644
--- a/lib/plugins/extension/helper/gui.php
+++ b/lib/plugins/extension/helper/gui.php
@@ -16,6 +16,43 @@ class helper_plugin_extension_gui extends DokuWiki_Plugin {
 
     protected $tabs = array('plugins', 'templates', 'search');
 
+
+    public function pluginList(){
+        /* @var Doku_Plugin_Controller $plugin_controller */
+        global $plugin_controller;
+
+        $pluginlist = $plugin_controller->getList('', true);
+        /* @var helper_plugin_extension_extension $extension */
+        $extension = $this->loadHelper('extension_extension');
+        /* @var helper_plugin_extension_list $list */
+        $list = $this->loadHelper('extension_list');
+        $list->start_form();
+        foreach ($pluginlist as $name) {
+            $extension->setExtension($name, false);
+            $list->add_row($extension, $name == $this->infoFor);
+        }
+        $list->end_form();
+        $list->render();
+    }
+
+    public function templateList(){
+        // FIXME do we have a real way?
+        $tpllist = glob(DOKU_INC.'lib/tpl/*', GLOB_ONLYDIR);
+        $tpllist = array_map('basename', $tpllist);
+
+        /* @var helper_plugin_extension_extension $extension */
+        $extension = $this->loadHelper('extension_extension');
+        /* @var helper_plugin_extension_list $list */
+        $list = $this->loadHelper('extension_list');
+        $list->start_form();
+        foreach ($tpllist as $name) {
+            $extension->setExtension($name, true);
+            $list->add_row($extension, $name == $this->infoFor);
+        }
+        $list->end_form();
+        $list->render();
+    }
+
     /**
      * Print the tab navigation
      *
-- 
cgit v1.2.3


From 1dd40c86eb47f24a2e7c7022592fd9cd25ff07f2 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 4 Aug 2013 20:24:19 +0200
Subject: added intros

---
 lib/plugins/extension/admin.php                   |  6 +++---
 lib/plugins/extension/helper/gui.php              | 22 +++++++++++++++++++---
 lib/plugins/extension/lang/en/intro_plugins.txt   |  1 +
 lib/plugins/extension/lang/en/intro_search.txt    |  1 +
 lib/plugins/extension/lang/en/intro_templates.txt |  1 +
 5 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 lib/plugins/extension/lang/en/intro_plugins.txt
 create mode 100644 lib/plugins/extension/lang/en/intro_search.txt
 create mode 100644 lib/plugins/extension/lang/en/intro_templates.txt

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/admin.php b/lib/plugins/extension/admin.php
index 39ce9e947..ee180192d 100644
--- a/lib/plugins/extension/admin.php
+++ b/lib/plugins/extension/admin.php
@@ -125,14 +125,14 @@ class admin_plugin_extension extends DokuWiki_Admin_Plugin {
 
         switch($this->gui->currentTab()){
             case 'search':
-                echo 'search interface';
+                $this->gui->tabSearch();
                 break;
             case 'templates':
-                $this->gui->templateList();
+                $this->gui->tabTemplates();
                 break;
             case 'plugins':
             default:
-                $this->gui->pluginList();
+                $this->gui->tabPlugins();
         }
 
 
diff --git a/lib/plugins/extension/helper/gui.php b/lib/plugins/extension/helper/gui.php
index 41afc2069..7c83a3854 100644
--- a/lib/plugins/extension/helper/gui.php
+++ b/lib/plugins/extension/helper/gui.php
@@ -16,11 +16,15 @@ class helper_plugin_extension_gui extends DokuWiki_Plugin {
 
     protected $tabs = array('plugins', 'templates', 'search');
 
-
-    public function pluginList(){
+    /**
+     * display the plugin tab
+     */
+    public function tabPlugins(){
         /* @var Doku_Plugin_Controller $plugin_controller */
         global $plugin_controller;
 
+        echo $this->locale_xhtml('intro_plugins');
+
         $pluginlist = $plugin_controller->getList('', true);
         /* @var helper_plugin_extension_extension $extension */
         $extension = $this->loadHelper('extension_extension');
@@ -35,7 +39,12 @@ class helper_plugin_extension_gui extends DokuWiki_Plugin {
         $list->render();
     }
 
-    public function templateList(){
+    /**
+     * Display the template tab
+     */
+    public function tabTemplates(){
+        echo $this->locale_xhtml('intro_templates');
+
         // FIXME do we have a real way?
         $tpllist = glob(DOKU_INC.'lib/tpl/*', GLOB_ONLYDIR);
         $tpllist = array_map('basename', $tpllist);
@@ -53,6 +62,13 @@ class helper_plugin_extension_gui extends DokuWiki_Plugin {
         $list->render();
     }
 
+    /**
+     * Display the search tab
+     */
+    public function tabSearch(){
+        echo $this->locale_xhtml('intro_search');
+    }
+
     /**
      * Print the tab navigation
      *
diff --git a/lib/plugins/extension/lang/en/intro_plugins.txt b/lib/plugins/extension/lang/en/intro_plugins.txt
new file mode 100644
index 000000000..ef180135e
--- /dev/null
+++ b/lib/plugins/extension/lang/en/intro_plugins.txt
@@ -0,0 +1 @@
+Here you can view, enable and disable installed plugins.
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/en/intro_search.txt b/lib/plugins/extension/lang/en/intro_search.txt
new file mode 100644
index 000000000..003c99c61
--- /dev/null
+++ b/lib/plugins/extension/lang/en/intro_search.txt
@@ -0,0 +1 @@
+Here you can search for available plugins and templates for DokuWiki. Be sure to read more about Plugin Security before installing FIXME add link
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/en/intro_templates.txt b/lib/plugins/extension/lang/en/intro_templates.txt
new file mode 100644
index 000000000..2b3af727b
--- /dev/null
+++ b/lib/plugins/extension/lang/en/intro_templates.txt
@@ -0,0 +1 @@
+Here you can view, enable and disable installed templates. Note that only one template can be activated at a time.
\ No newline at end of file
-- 
cgit v1.2.3


From a218edff81be5cec78bfcb0f65042315ae4e656b Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 4 Aug 2013 20:24:28 +0200
Subject: removed test repository again

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

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/helper/repository.php b/lib/plugins/extension/helper/repository.php
index a5012ccb5..21082c0d8 100644
--- a/lib/plugins/extension/helper/repository.php
+++ b/lib/plugins/extension/helper/repository.php
@@ -6,7 +6,7 @@
  * @author  Michael Hamann <michael@content-space.de>
  */
 
-define('EXTENSION_REPOSITORY_API', 'http://localhost/dokuwiki/lib/plugins/pluginrepo/api.php');
+#define('EXTENSION_REPOSITORY_API', 'http://localhost/dokuwiki/lib/plugins/pluginrepo/api.php');
 
 if (!defined('EXTENSION_REPOSITORY_API_ENDPOINT'))
     define('EXTENSION_REPOSITORY_API', 'http://www.dokuwiki.org/lib/plugins/pluginrepo/api.php');
-- 
cgit v1.2.3


From 7944abddde7619d8d59740cde19743c090d4fd3d Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 4 Aug 2013 20:34:12 +0200
Subject: translated error message

---
 lib/plugins/extension/admin.php        | 4 +---
 lib/plugins/extension/lang/en/lang.php | 3 +++
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/admin.php b/lib/plugins/extension/admin.php
index ee180192d..c9f37affb 100644
--- a/lib/plugins/extension/admin.php
+++ b/lib/plugins/extension/admin.php
@@ -52,9 +52,7 @@ class admin_plugin_extension extends DokuWiki_Admin_Plugin {
 
         if(!$repository->hasAccess()){
             $url = $this->gui->tabURL('', array('purge'=>1));
-
-            msg('The DokuWiki extension repository can not be reached currently.
-                 Online Features are not available. [<a href="'.$url.'">retry</a>]', -1);
+            msg($this->getLang('repo_error').' [<a href="'.$url.'">'.$this->getLang('repo_retry').'</a>]', -1);
         }
 
         /* @var helper_plugin_extension_extension $extension */
diff --git a/lib/plugins/extension/lang/en/lang.php b/lib/plugins/extension/lang/en/lang.php
index 4439db879..10bf2087f 100644
--- a/lib/plugins/extension/lang/en/lang.php
+++ b/lib/plugins/extension/lang/en/lang.php
@@ -56,6 +56,9 @@ $lang['donate']                 = 'Donate';
 $lang['bundled']                = 'bundled';
 $lang['manual_install']         = 'manual install';
 
+$lang['repo_error'] = 'The DokuWiki extension repository can not be reached currently. Online Features are not available.';
+$lang['repo_retry'] = 'Retry';
+
 $lang['msg_tpl_uninstalled']        = 'Template %s uninstalled';
 $lang['msg_tpl_uninstalled']     = 'Template %s could not be uninstalled';
 $lang['msg_uninstalled']            = 'Plugin %s uninstalled';
-- 
cgit v1.2.3


From e8dda2c3faf5eb61b68d5afcbea13c5802484b4a Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 9 Aug 2013 13:08:06 +0200
Subject: added gravatar images

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

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/helper/list.php b/lib/plugins/extension/helper/list.php
index 1c337176d..843697667 100644
--- a/lib/plugins/extension/helper/list.php
+++ b/lib/plugins/extension/helper/list.php
@@ -164,7 +164,8 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
             $mailid = $extension->getEmailID();
             if($mailid){
                 $url = $this->gui->tabURL('search', array('q' => 'mailid:'.$mailid));
-                return '<a href="'.$url.'" class="author" title="'.$this->getLang('author_hint').'" >'.hsc($extension->getAuthor()).'</a>';
+                return '<a href="'.$url.'" class="author" title="'.$this->getLang('author_hint').'" ><img src="//www.gravatar.com/avatar/'.$mailid.'?s=20&d=mm" width="20" height="20"> '.hsc($extension->getAuthor()).'</a>';
+
             }else{
                 return '<span class="author">'.hsc($extension->getAuthor()).'</span>';
             }
-- 
cgit v1.2.3


From 55332151e03b99bbfd15e0fbaae391aae454d9eb Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 9 Aug 2013 13:43:35 +0200
Subject: some initial go at the search tab

---
 lib/plugins/extension/admin.php             |  2 +-
 lib/plugins/extension/helper/extension.php  | 29 +++++++++---
 lib/plugins/extension/helper/gui.php        | 49 +++++++++++++++----
 lib/plugins/extension/helper/repository.php | 73 +++++++++++++++++++++++++++++
 4 files changed, 136 insertions(+), 17 deletions(-)

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/admin.php b/lib/plugins/extension/admin.php
index c9f37affb..51d4a8d1d 100644
--- a/lib/plugins/extension/admin.php
+++ b/lib/plugins/extension/admin.php
@@ -48,7 +48,7 @@ class admin_plugin_extension extends DokuWiki_Admin_Plugin {
         // initialize the remote repository
         /* @var helper_plugin_extension_repository $repository */
         $repository = $this->loadHelper('extension_repository');
-        $repository->init();
+
 
         if(!$repository->hasAccess()){
             $url = $this->gui->tabURL('', array('purge'=>1));
diff --git a/lib/plugins/extension/helper/extension.php b/lib/plugins/extension/helper/extension.php
index 296b81ac5..53753fcc1 100644
--- a/lib/plugins/extension/helper/extension.php
+++ b/lib/plugins/extension/helper/extension.php
@@ -14,8 +14,9 @@ if(!defined('DOKU_TPLLIB')) define('DOKU_TPLLIB', DOKU_INC.'lib/tpl/');
  * Class helper_plugin_extension_extension represents a single extension (plugin or template)
  */
 class helper_plugin_extension_extension extends DokuWiki_Plugin {
+    private $id;
     private $name;
-    private $is_template;
+    private $is_template = false;
     private $localInfo;
     private $remoteInfo;
     private $managerData;
@@ -32,13 +33,18 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
     /**
      * Set the name of the extension this instance shall represents, triggers loading the local and remote data
      *
-     * @param string $name        The base name of the extension
-     * @param bool   $is_template If the extension is a template
+     * @param string $id  The id of the extension (prefixed with template: for templates)
      * @return bool If some (local or remote) data was found
      */
-    public function setExtension($name, $is_template) {
-        $this->name = $name;
-        $this->is_template = $is_template;
+    public function setExtension($id) {
+        $this->id   = $id;
+        $this->name = $id;
+
+        if(substr($id, 0 , 9) == 'template'){
+            $this->name = substr($id, 10);
+            $this->is_template = true;
+        }
+
         $this->localInfo = array();
         $this->managerData = array();
         $this->remoteInfo = array();
@@ -128,6 +134,17 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
         return $this->is_template;
     }
 
+    /**
+     * Get the ID of the extension
+     *
+     * This is the same as getName() for plugins, for templates it's getName() prefixed with 'template:'
+     *
+     * @return string
+     */
+    public function getID() {
+        return $this->id;
+    }
+
     /**
      * Get the name of the installation directory
      *
diff --git a/lib/plugins/extension/helper/gui.php b/lib/plugins/extension/helper/gui.php
index 7c83a3854..cf5b8a347 100644
--- a/lib/plugins/extension/helper/gui.php
+++ b/lib/plugins/extension/helper/gui.php
@@ -16,10 +16,13 @@ class helper_plugin_extension_gui extends DokuWiki_Plugin {
 
     protected $tabs = array('plugins', 'templates', 'search');
 
+    /** @var string the extension that should have an open info window FIXME currently broken*/
+    protected $infofor = '';
+
     /**
      * display the plugin tab
      */
-    public function tabPlugins(){
+    public function tabPlugins() {
         /* @var Doku_Plugin_Controller $plugin_controller */
         global $plugin_controller;
 
@@ -31,8 +34,8 @@ class helper_plugin_extension_gui extends DokuWiki_Plugin {
         /* @var helper_plugin_extension_list $list */
         $list = $this->loadHelper('extension_list');
         $list->start_form();
-        foreach ($pluginlist as $name) {
-            $extension->setExtension($name, false);
+        foreach($pluginlist as $name) {
+            $extension->setExtension($name);
             $list->add_row($extension, $name == $this->infoFor);
         }
         $list->end_form();
@@ -42,7 +45,7 @@ class helper_plugin_extension_gui extends DokuWiki_Plugin {
     /**
      * Display the template tab
      */
-    public function tabTemplates(){
+    public function tabTemplates() {
         echo $this->locale_xhtml('intro_templates');
 
         // FIXME do we have a real way?
@@ -54,8 +57,8 @@ class helper_plugin_extension_gui extends DokuWiki_Plugin {
         /* @var helper_plugin_extension_list $list */
         $list = $this->loadHelper('extension_list');
         $list->start_form();
-        foreach ($tpllist as $name) {
-            $extension->setExtension($name, true);
+        foreach($tpllist as $name) {
+            $extension->setExtension("template:$name");
             $list->add_row($extension, $name == $this->infoFor);
         }
         $list->end_form();
@@ -65,8 +68,34 @@ class helper_plugin_extension_gui extends DokuWiki_Plugin {
     /**
      * Display the search tab
      */
-    public function tabSearch(){
+    public function tabSearch() {
+        global $INPUT;
         echo $this->locale_xhtml('intro_search');
+
+        $form = new Doku_Form(array('action' => $this->tabURL('', array(), '&')));
+        $form->addElement(form_makeTextField('q', $INPUT->str('q'), 'Search'));
+        $form->addElement(form_makeButton('submit', '', 'Search'));
+        $form->printForm();
+
+        if(!$INPUT->bool('q')) return;
+
+
+        /* @var helper_plugin_extension_repository $repository FIXME should we use some gloabl instance? */
+        $repository = $this->loadHelper('extension_repository');
+        $result = $repository->search($INPUT->str('q'));
+
+        /* @var helper_plugin_extension_extension $extension */
+        $extension = $this->loadHelper('extension_extension');
+        /* @var helper_plugin_extension_list $list */
+        $list = $this->loadHelper('extension_list');
+        $list->start_form();
+        foreach($result as $name) {
+            $extension->setExtension($name);
+            $list->add_row($extension, $name == $this->infoFor);
+        }
+        $list->end_form();
+        $list->render();
+
     }
 
     /**
@@ -106,10 +135,10 @@ class helper_plugin_extension_gui extends DokuWiki_Plugin {
      *
      * @param string $tab    tab to load, empty for current tab
      * @param array  $params associative array of parameter to set
-     *
+     * @param string $sep    seperator to build the URL
      * @return string
      */
-    public function tabURL($tab = '', $params = array()) {
+    public function tabURL($tab = '', $params = array(), $sep = '&amp;') {
         global $ID;
 
         if(!$tab) $tab = $this->currentTab();
@@ -118,7 +147,7 @@ class helper_plugin_extension_gui extends DokuWiki_Plugin {
             'page' => 'extension',
             'tab'  => $tab,
         );
-        return wl($ID, array_merge($defaults, $params));
+        return wl($ID, array_merge($defaults, $params), false, $sep);
     }
 
 }
diff --git a/lib/plugins/extension/helper/repository.php b/lib/plugins/extension/helper/repository.php
index 21082c0d8..98128a9a3 100644
--- a/lib/plugins/extension/helper/repository.php
+++ b/lib/plugins/extension/helper/repository.php
@@ -109,6 +109,79 @@ class helper_plugin_extension_repository extends DokuWiki_Plugin {
         }
         return array();
     }
+
+    protected function cacheData($name, $data){
+
+    }
+
+    /**
+     * Search for plugins or templates using the given query string
+     *
+     * @param string $q the query string
+     * @return array a list of matching extensions
+     */
+    public function search($q){
+        $query = $this->parse_query($q);
+        $query['fmt'] = 'php';
+
+        $httpclient = new DokuHTTPClient();
+        $data = $httpclient->post(EXTENSION_REPOSITORY_API, $query);
+        if ($data === false) return array();
+        $result = unserialize($data);
+
+        $ids = array();
+
+        // store cache info for each extension
+        foreach($result as $ext){
+            $name = $ext['name'];
+            $cache = new cache('##extension_manager##'.$name, 'repo');
+            $cache->storeCache(serialize($ext));
+            $ids[] = $name;
+        }
+
+        return $ids;
+    }
+
+    /**
+     * Parses special queries from the query string
+     *
+     * @param string $q
+     * @return array
+     */
+    protected function parse_query($q){
+        $parameters = array(
+            'tag' => array(),
+            'mail' => array(),
+            'type' => array()
+        );
+
+        // extract tags
+        if(preg_match_all('/(^|\s)(tag:([\S]+))/', $q, $matches, PREG_SET_ORDER)){
+            foreach($matches as $m){
+                $q = str_replace($m[2], '', $q);
+                $parameters['tag'][] = $m[3];
+            }
+        }
+        // extract author ids
+        if(preg_match_all('/(^|\s)(authorid:([\S]+))/', $q, $matches, PREG_SET_ORDER)){
+            foreach($matches as $m){
+                $q = str_replace($m[2], '', $q);
+                $parameters['mail'][] = $m[3];
+            }
+        }
+        // extract types
+        if(preg_match_all('/(^|\s)(type:([\S]+))/', $q, $matches, PREG_SET_ORDER)){
+            foreach($matches as $m){
+                $q = str_replace($m[2], '', $q);
+                $parameters['type'][] = $m[3];
+            }
+        }
+
+        // FIXME make integer from type value
+
+        $parameters['q'] = trim($q);
+        return $parameters;
+    }
 }
 
 // vim:ts=4:sw=4:et:
-- 
cgit v1.2.3


From 813d7e0910cdbb80dceef4d952adc551987c84e7 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 9 Aug 2013 14:06:34 +0200
Subject: fixed some confusion between base, id and name

---
 lib/plugins/extension/admin.php             |  8 +++---
 lib/plugins/extension/helper/extension.php  | 40 ++++++++++++++---------------
 lib/plugins/extension/helper/list.php       |  8 +++---
 lib/plugins/extension/helper/repository.php |  6 +----
 4 files changed, 29 insertions(+), 33 deletions(-)

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/admin.php b/lib/plugins/extension/admin.php
index 51d4a8d1d..7faed142d 100644
--- a/lib/plugins/extension/admin.php
+++ b/lib/plugins/extension/admin.php
@@ -76,7 +76,7 @@ class admin_plugin_extension extends DokuWiki_Admin_Plugin {
                             if ($status !== true) {
                                 msg($status, -1);
                             } else {
-                                msg(sprintf($this->getLang('msg_update_success'), hsc($extension->getName())), 1);
+                                msg(sprintf($this->getLang('msg_update_success'), hsc($extension->getDisplayName())), 1);
                             }
                             break;
                         case 'uninstall':
@@ -85,7 +85,7 @@ class admin_plugin_extension extends DokuWiki_Admin_Plugin {
                             if ($status !== true) {
                                 msg($status, -1);
                             } else {
-                                msg(sprintf($this->getLang('msg_delete_success'), hsc($extension->getName())), 1);
+                                msg(sprintf($this->getLang('msg_delete_success'), hsc($extension->getDisplayName())), 1);
                             }
                             break;
                         case 'enable';
@@ -94,7 +94,7 @@ class admin_plugin_extension extends DokuWiki_Admin_Plugin {
                             if ($status !== true) {
                                 msg($status, -1);
                             } else {
-                                msg(sprintf($this->getLang('msg_enabled'), hsc($extension->getName())), 1);
+                                msg(sprintf($this->getLang('msg_enabled'), hsc($extension->getDisplayName())), 1);
                             }
                             break;
                         case 'disable';
@@ -103,7 +103,7 @@ class admin_plugin_extension extends DokuWiki_Admin_Plugin {
                             if ($status !== true) {
                                 msg($status, -1);
                             } else {
-                                msg(sprintf($this->getLang('msg_disabled'), hsc($extension->getName())), 1);
+                                msg(sprintf($this->getLang('msg_disabled'), hsc($extension->getDisplayName())), 1);
                             }
                             break;
                     }
diff --git a/lib/plugins/extension/helper/extension.php b/lib/plugins/extension/helper/extension.php
index 53753fcc1..6a152b169 100644
--- a/lib/plugins/extension/helper/extension.php
+++ b/lib/plugins/extension/helper/extension.php
@@ -15,7 +15,7 @@ if(!defined('DOKU_TPLLIB')) define('DOKU_TPLLIB', DOKU_INC.'lib/tpl/');
  */
 class helper_plugin_extension_extension extends DokuWiki_Plugin {
     private $id;
-    private $name;
+    private $base;
     private $is_template = false;
     private $localInfo;
     private $remoteInfo;
@@ -38,10 +38,10 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      */
     public function setExtension($id) {
         $this->id   = $id;
-        $this->name = $id;
+        $this->base = $id;
 
-        if(substr($id, 0 , 9) == 'template'){
-            $this->name = substr($id, 10);
+        if(substr($id, 0 , 9) == 'template:'){
+            $this->base = substr($id, 9);
             $this->is_template = true;
         }
 
@@ -58,7 +58,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
             $this->repository = $this->loadHelper('extension_repository');
         }
 
-        $this->remoteInfo = $this->repository->getData(($this->isTemplate() ? 'template:' : '').$this->getBase());
+        $this->remoteInfo = $this->repository->getData($this->getID());
 
         return ($this->localInfo || $this->remoteInfo);
     }
@@ -79,7 +79,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      */
     public function isBundled() {
         if (!empty($this->remoteInfo['bundled'])) return $this->remoteInfo['bundled'];
-        return in_array($this->name,
+        return in_array($this->base,
                         array('acl', 'info', 'extension', 'test', 'revert', 'popularity', 'config', 'plugin', 'safefnrecode', 'authplain'));
     }
 
@@ -89,7 +89,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return bool if the extension is protected
      */
     public function isProtected() {
-        return in_array($this->name, array('acl', 'config', 'info', 'plugin', 'revert', 'usermanager'));
+        return in_array($this->base, array('acl', 'config', 'info', 'plugin', 'revert', 'usermanager'));
     }
 
     /**
@@ -98,7 +98,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return bool If the extension is installed in the correct directory
      */
     public function isInWrongFolder() {
-        return $this->name != $this->getBase();
+        return $this->base != $this->getBase();
     }
 
     /**
@@ -109,7 +109,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
     public function isEnabled() {
         /* @var Doku_Plugin_Controller $plugin_controller */
         global $plugin_controller;
-        return !$plugin_controller->isdisabled($this->name);
+        return !$plugin_controller->isdisabled($this->base);
     }
 
     /**
@@ -151,7 +151,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return string The name of the installation directory
      */
     public function getInstallName() {
-        return $this->name;
+        return $this->base;
     }
 
     // Data from plugin.info.txt/template.info.txt or the repo when not available locally
@@ -162,7 +162,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      */
     public function getBase() {
         if (!empty($this->localInfo['base'])) return $this->localInfo['base'];
-        return $this->name;
+        return $this->base;
     }
 
     /**
@@ -170,10 +170,10 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      *
      * @return string The display name
      */
-    public function getName() {
+    public function getDisplayName() {
         if (!empty($this->localInfo['name'])) return $this->localInfo['name'];
         if (!empty($this->remoteInfo['name'])) return $this->remoteInfo['name'];
-        return $this->name;
+        return $this->base;
     }
 
     /**
@@ -468,9 +468,9 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      */
     public function getInstallDir() {
         if ($this->isTemplate()) {
-            return DOKU_TPLLIB.$this->name;
+            return DOKU_TPLLIB.$this->base;
         } else {
-            return DOKU_PLUGIN.$this->name;
+            return DOKU_PLUGIN.$this->base;
         }
     }
 
@@ -518,7 +518,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
                 if (!isset($installed_extensions[$this->getBase()])) {
                     $status = 'Error, the requested extension hasn\'t been installed or updated';
                 }
-                $this->setExtension($this->name, $this->isTemplate());
+                $this->setExtension($this->getID());
                 $this->purgeCache();
             }
             $this->dir_delete(dirname($path));
@@ -547,7 +547,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
         global $plugin_controller;
         if (!$this->isInstalled()) return $this->getLang('notinstalled');
         if ($this->isEnabled()) return $this->getLang('alreadyenabled');
-        if ($plugin_controller->enable($this->name)) {
+        if ($plugin_controller->enable($this->base)) {
             $this->purgeCache();
             return true;
         } else {
@@ -567,7 +567,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
         global $plugin_controller;
         if (!$this->isInstalled()) return $this->getLang('notinstalled');
         if (!$this->isEnabled()) return $this->getLang('alreadydisabled');
-        if ($plugin_controller->disable($this->name)) {
+        if ($plugin_controller->disable($this->base)) {
             $this->purgeCache();
             return true;
         } else {
@@ -605,7 +605,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
 
             foreach($plugin_types as $type) {
                 if(@file_exists($path.$type.'.php')) {
-                    $plugin = plugin_load($type, $this->name);
+                    $plugin = plugin_load($type, $this->base);
                     if ($plugin) break;
                 }
 
@@ -613,7 +613,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
                     while(false !== ($cp = readdir($dh))) {
                         if($cp == '.' || $cp == '..' || strtolower(substr($cp, -4)) != '.php') continue;
 
-                        $plugin = plugin_load($type, $this->name.'_'.substr($cp, 0, -4));
+                        $plugin = plugin_load($type, $this->base.'_'.substr($cp, 0, -4));
                         if ($plugin) break;
                     }
                     if ($plugin) break;
diff --git a/lib/plugins/extension/helper/list.php b/lib/plugins/extension/helper/list.php
index 843697667..12db5ea3c 100644
--- a/lib/plugins/extension/helper/list.php
+++ b/lib/plugins/extension/helper/list.php
@@ -163,7 +163,7 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
 
             $mailid = $extension->getEmailID();
             if($mailid){
-                $url = $this->gui->tabURL('search', array('q' => 'mailid:'.$mailid));
+                $url = $this->gui->tabURL('search', array('q' => 'authorid:'.$mailid));
                 return '<a href="'.$url.'" class="author" title="'.$this->getLang('author_hint').'" ><img src="//www.gravatar.com/avatar/'.$mailid.'?s=20&d=mm" width="20" height="20"> '.hsc($extension->getAuthor()).'</a>';
 
             }else{
@@ -181,8 +181,8 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
      */
     function make_screenshot(helper_plugin_extension_extension $extension) {
         if($extension->getScreenshotURL()) {
-            $img = '<a title="'.hsc($extension->getName()).'" href="'.hsc($extension->getScreenshotURL()).'" target="_blank">'.
-                '<img alt="'.hsc($extension->getName()).'" width="120" height="70" src="'.hsc($extension->getThumbnailURL()).'" />'.
+            $img = '<a title="'.hsc($extension->getDisplayName()).'" href="'.hsc($extension->getScreenshotURL()).'" target="_blank">'.
+                '<img alt="'.hsc($extension->getDisplayName()).'" width="120" height="70" src="'.hsc($extension->getThumbnailURL()).'" />'.
                 '</a>';
         } elseif($extension->isTemplate()) {
             $img = '<img alt="template" width="120" height="70" src="'.DOKU_BASE.'lib/plugins/extension/images/template.png" />';
@@ -203,7 +203,7 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
     function make_legend(helper_plugin_extension_extension $extension, $showinfo = false) {
         $return  = '<div>';
         $return .= '<h2>';
-        $return .= sprintf($this->getLang('extensionby'), hsc($extension->getName()), $this->make_author($extension));
+        $return .= sprintf($this->getLang('extensionby'), hsc($extension->getDisplayName()), $this->make_author($extension));
         $return .= '</h2>';
 
         $return .= $this->make_screenshot($extension);
diff --git a/lib/plugins/extension/helper/repository.php b/lib/plugins/extension/helper/repository.php
index 98128a9a3..38e07786e 100644
--- a/lib/plugins/extension/helper/repository.php
+++ b/lib/plugins/extension/helper/repository.php
@@ -110,10 +110,6 @@ class helper_plugin_extension_repository extends DokuWiki_Plugin {
         return array();
     }
 
-    protected function cacheData($name, $data){
-
-    }
-
     /**
      * Search for plugins or templates using the given query string
      *
@@ -133,7 +129,7 @@ class helper_plugin_extension_repository extends DokuWiki_Plugin {
 
         // store cache info for each extension
         foreach($result as $ext){
-            $name = $ext['name'];
+            $name = $ext['plugin'];
             $cache = new cache('##extension_manager##'.$name, 'repo');
             $cache->storeCache(serialize($ext));
             $ids[] = $name;
-- 
cgit v1.2.3


From 89275cfd7e4e8b88724a36ccf7ae7bd29342d494 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 9 Aug 2013 15:22:18 +0200
Subject: added a first unit test

---
 lib/plugins/extension/_test/extension.test.php | 62 ++++++++++++++++++++++++++
 lib/plugins/extension/helper/extension.php     | 11 ++++-
 lib/plugins/extension/plugin.info.txt          |  4 +-
 3 files changed, 74 insertions(+), 3 deletions(-)
 create mode 100644 lib/plugins/extension/_test/extension.test.php

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/_test/extension.test.php b/lib/plugins/extension/_test/extension.test.php
new file mode 100644
index 000000000..6dfa49a46
--- /dev/null
+++ b/lib/plugins/extension/_test/extension.test.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * @group plugin_extension
+ */
+class helper_plugin_extension_extension_test extends DokuWikiTest {
+
+     protected $pluginsEnabled = array('extension');
+
+    /**
+     * FIXME should we test this without internet first?
+     *
+     * @group internet
+     */
+    public function testExtensionParameters() {
+
+        $extension = new helper_plugin_extension_extension();
+
+        $extension->setExtension('extension');
+        $this->assertEquals('extension', $extension->getID());
+        $this->assertEquals('extension', $extension->getBase());
+        $this->assertEquals('Extension Manager', $extension->getDisplayName());
+        $this->assertEquals('Michael Hamann', $extension->getAuthor());
+        $this->assertEquals('michael@content-space.de', $extension->getEmail());
+        $this->assertEquals(md5('michael@content-space.de'), $extension->getEmailID());
+        $this->assertEquals('https://www.dokuwiki.org/plugin:extension', $extension->getURL());
+        $this->assertEquals('Allows managing and installing plugins and templates', $extension->getDescription());
+        $this->assertFalse($extension->isTemplate());
+        $this->assertTrue($extension->isEnabled());
+        $this->assertTrue($extension->isInstalled());
+        $this->assertTrue($extension->isBundled());
+
+        $extension->setExtension('testing');
+        $this->assertEquals('testing', $extension->getID());
+        $this->assertEquals('testing', $extension->getBase());
+        $this->assertEquals('Testing Plugin', $extension->getDisplayName());
+        $this->assertEquals('Tobias Sarnowski', $extension->getAuthor());
+        $this->assertEquals('tobias@trustedco.de', $extension->getEmail());
+        $this->assertEquals(md5('tobias@trustedco.de'), $extension->getEmailID());
+        $this->assertEquals('http://www.dokuwiki.org/plugin:testing', $extension->getURL());
+        $this->assertEquals('Used to test the test framework. Should always be disabled.', $extension->getDescription());
+        $this->assertFalse($extension->isTemplate());
+        $this->assertFalse($extension->isEnabled());
+        $this->assertTrue($extension->isInstalled());
+        $this->assertTrue($extension->isBundled());
+
+        $extension->setExtension('template:dokuwiki');
+        $this->assertEquals('template:dokuwiki', $extension->getID());
+        $this->assertEquals('dokuwiki', $extension->getBase());
+        $this->assertEquals('DokuWiki Template', $extension->getDisplayName());
+        $this->assertEquals('Anika Henke', $extension->getAuthor());
+        $this->assertEquals('anika@selfthinker.org', $extension->getEmail());
+        $this->assertEquals(md5('anika@selfthinker.org'), $extension->getEmailID());
+        $this->assertEquals('http://www.dokuwiki.org/template:dokuwiki', $extension->getURL());
+        $this->assertEquals('DokuWiki\'s default template since 2012', $extension->getDescription());
+        $this->assertTrue($extension->isTemplate());
+        $this->assertTrue($extension->isEnabled());
+        $this->assertTrue($extension->isInstalled());
+        $this->assertTrue($extension->isBundled());
+
+    }
+
+}
\ No newline at end of file
diff --git a/lib/plugins/extension/helper/extension.php b/lib/plugins/extension/helper/extension.php
index 6a152b169..88fb5e229 100644
--- a/lib/plugins/extension/helper/extension.php
+++ b/lib/plugins/extension/helper/extension.php
@@ -80,7 +80,11 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
     public function isBundled() {
         if (!empty($this->remoteInfo['bundled'])) return $this->remoteInfo['bundled'];
         return in_array($this->base,
-                        array('acl', 'info', 'extension', 'test', 'revert', 'popularity', 'config', 'plugin', 'safefnrecode', 'authplain'));
+                        array('acl', 'info', 'extension', 'test', 'revert', 'popularity',
+                              'config', 'plugin', 'safefnrecode', 'authplain', 'testing',
+                              'template:dokuwiki', 'template:default'
+                              )
+        );
     }
 
     /**
@@ -107,6 +111,11 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return bool If the extension is enabled
      */
     public function isEnabled() {
+        global $conf;
+        if($this->isTemplate()){
+            return ($conf['template'] == $this->getBase());
+        }
+
         /* @var Doku_Plugin_Controller $plugin_controller */
         global $plugin_controller;
         return !$plugin_controller->isdisabled($this->base);
diff --git a/lib/plugins/extension/plugin.info.txt b/lib/plugins/extension/plugin.info.txt
index 3c4469ad7..ef16d78a1 100644
--- a/lib/plugins/extension/plugin.info.txt
+++ b/lib/plugins/extension/plugin.info.txt
@@ -2,6 +2,6 @@ base   extension
 author Michael Hamann
 email  michael@content-space.de
 date   2013-08-01
-name   extension plugin
-desc   Extension manager
+name   Extension Manager
+desc   Allows managing and installing plugins and templates
 url    https://www.dokuwiki.org/plugin:extension
-- 
cgit v1.2.3


From ea9f3f904d439e9af84bdbed8e1a0bba3ed286b2 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 9 Aug 2013 15:31:45 +0200
Subject: added 4th tab for manual install

---
 lib/plugins/extension/admin.php                 |  3 +++
 lib/plugins/extension/helper/extension.php      |  2 +-
 lib/plugins/extension/helper/gui.php            | 11 +++++++++--
 lib/plugins/extension/lang/en/intro_install.txt |  1 +
 lib/plugins/extension/lang/en/lang.php          |  1 +
 5 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 lib/plugins/extension/lang/en/intro_install.txt

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/admin.php b/lib/plugins/extension/admin.php
index 7faed142d..cf4eb79d7 100644
--- a/lib/plugins/extension/admin.php
+++ b/lib/plugins/extension/admin.php
@@ -128,6 +128,9 @@ class admin_plugin_extension extends DokuWiki_Admin_Plugin {
             case 'templates':
                 $this->gui->tabTemplates();
                 break;
+            case 'install':
+                $this->gui->tabInstall();
+                break;
             case 'plugins':
             default:
                 $this->gui->tabPlugins();
diff --git a/lib/plugins/extension/helper/extension.php b/lib/plugins/extension/helper/extension.php
index 88fb5e229..244ec9b9a 100644
--- a/lib/plugins/extension/helper/extension.php
+++ b/lib/plugins/extension/helper/extension.php
@@ -702,7 +702,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
     public function download($url, &$path) {
         // check the url
         $matches = array();
-        if(!preg_match("/[^\/]*$/", $url, $matches) || !$matches[0]) {
+        if(!preg_match('/[^\/]*$/', $url, $matches) || !$matches[0]) {
             return $this->getLang('baddownloadurl');
         }
         $file = $matches[0];
diff --git a/lib/plugins/extension/helper/gui.php b/lib/plugins/extension/helper/gui.php
index cf5b8a347..09cea7fcb 100644
--- a/lib/plugins/extension/helper/gui.php
+++ b/lib/plugins/extension/helper/gui.php
@@ -14,7 +14,7 @@ if(!defined('DOKU_INC')) die();
  */
 class helper_plugin_extension_gui extends DokuWiki_Plugin {
 
-    protected $tabs = array('plugins', 'templates', 'search');
+    protected $tabs = array('plugins', 'templates', 'search', 'install');
 
     /** @var string the extension that should have an open info window FIXME currently broken*/
     protected $infofor = '';
@@ -98,6 +98,13 @@ class helper_plugin_extension_gui extends DokuWiki_Plugin {
 
     }
 
+    /**
+     * Display the template tab
+     */
+    public function tabInstall() {
+        echo $this->locale_xhtml('intro_install');
+    }
+
     /**
      * Print the tab navigation
      *
@@ -105,7 +112,7 @@ class helper_plugin_extension_gui extends DokuWiki_Plugin {
      */
     public function tabNavigation() {
         echo '<ul class="tabs">';
-        foreach(array('plugins', 'templates', 'search') as $tab) {
+        foreach($this->tabs as $tab) {
             $url = $this->tabURL($tab);
             if($this->currentTab() == $tab) {
                 $class = 'class="active"';
diff --git a/lib/plugins/extension/lang/en/intro_install.txt b/lib/plugins/extension/lang/en/intro_install.txt
new file mode 100644
index 000000000..f68d2d909
--- /dev/null
+++ b/lib/plugins/extension/lang/en/intro_install.txt
@@ -0,0 +1 @@
+Here you can manual install plugins and templates by either uploading them or providing a direct download URL.
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/en/lang.php b/lib/plugins/extension/lang/en/lang.php
index 10bf2087f..24cabe1fa 100644
--- a/lib/plugins/extension/lang/en/lang.php
+++ b/lib/plugins/extension/lang/en/lang.php
@@ -12,6 +12,7 @@ $lang['menu'] = 'Extension Manager';
 $lang['tab_plugins']   = 'Installed Plugins';
 $lang['tab_templates'] = 'Installed Templates';
 $lang['tab_search']    = 'Search and Install';
+$lang['tab_install']   = 'Manual Install';
 
 // custom language strings for the plugin
 $lang['notimplemented'] = 'This feature hasn\'t been implemented yet';
-- 
cgit v1.2.3


From 2d87f05b99091011a83d131724e9714f9c07f976 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 9 Aug 2013 15:40:05 +0200
Subject: moved CSS to LESS file, removed angua compatibility

---
 lib/plugins/extension/style.css  | 373 ---------------------------------------
 lib/plugins/extension/style.less | 345 ++++++++++++++++++++++++++++++++++++
 2 files changed, 345 insertions(+), 373 deletions(-)
 delete mode 100644 lib/plugins/extension/style.css
 create mode 100644 lib/plugins/extension/style.less

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/style.css b/lib/plugins/extension/style.css
deleted file mode 100644
index 0a3a0cc0e..000000000
--- a/lib/plugins/extension/style.css
+++ /dev/null
@@ -1,373 +0,0 @@
-/*
- * Extension plugin styles
- *
- * @author  Christopher Smith <chris@jalakai.co.uk>
- * @author  Piyush Mishra <me@piyushmishra.com>
- * @author  Håkan Sandell <sandell.hakan@gmail.com>
- * @author  Anika Henke <anika@selfthinker.org>
- */
-
-/*
- * tab support not included in "Angua", copied from _mediamanager.css
- */
-#extension__manager .panelHeader {
-    background-color: __background_alt__;
-    margin-bottom: 10px;
-    padding: 10px;
-    text-align: left;
-    /* to counter partly missing border of ul.tabs: */
-    border-top: 1px solid __border__;
-    margin-top: -1px;
-}
-
-#extension__manager .panelHeader p {
-    float: left;
-    font-weight: normal;
-    font-size: 1em;
-    padding: 0;
-    margin: 0 0 3px;
-}
-[dir=rtl] #extension__manager .panelHeader p {
-    float: right;
-}
-
-#extension__manager ul.tabs div.message {
-    display: inline;
-    margin: 0 .5em;
-}
-
-/*
- * general layout
- */
-#extension__manager h2 {
-    margin-left: 0;
-}
-
-#extension__manager a.taglink {
-    padding: 1px 4px;
-    background-color: __background_neu__;
-    border-radius: 3px;
-}
-[dir=rtl] #extension__manager a.taglink {
-    display: inline-block;
-    line-height: 1.2;
-}
-
-#extension__manager .panelHeader div.error {
-    margin-top: 0;
-    float: left;
-}
-[dir=rtl] #extension__manager .panelHeader div.error {
-    float: right;
-}
-
-/*
- * search & url download forms
- */
-#extension__manager form.search,
-#extension__manager form.btn_reload {
-    float: right;
-}
-[dir=rtl] #extension__manager form.search,
-[dir=rtl] #extension__manager form.btn_reload {
-    float: left;
-}
-
-#extension__manager div.search form.search {
-    float: none;
-}
-
-#extension__manager .tagcloud {
-    width: 55%;
-    float: left;
-    margin: 0 0.5em 1em 0;
-}
-[dir=rtl] #extension__manager .tagcloud {
-    float: right;
-    margin: 0 0 1em .5em;
-}
-
-#extension__manager .tagcloud a.taglink {
-    background-color: inherit;
-}
-
-#extension__manager div.search {
-    width: 44%;
-    float: left;
-}
-[dir=rtl] #extension__manager div.search {
-    float: right;
-}
-
-#extension__manager fieldset {
-    margin-top: 0.5em;
-    width: auto;
-}
-
-#extension__manager fieldset p {
-    margin: 0.5em;
-    text-align: justify;
-    font-size: 85%;
-}
-
-/* tag cloud */
-#extension__manager a.cl0 { font-size: 0.7em; }
-#extension__manager a.cl1 { font-size: 0.9em; }
-#extension__manager a.cl2 { font-size: 1em; }
-#extension__manager a.cl3 { font-size: 1.3em; }
-#extension__manager a.cl4 { font-size: 1.6em; }
-#extension__manager a.cl5 { font-size: 1.9em; }
-
-
-#extension__manager .extensionList input.button {
-    margin: 0 .3em .3em 0;
-}
-[dir=rtl] #extension__manager .extensionList input.button {
-    margin: 0 0 .3em .3em;
-}
-
-/*
- * extensions table
- */
-#extension__manager .extensionList {
-    margin-left: 0;
-    margin-right: 0;
-    padding: 0;
-    list-style: none;
-}
-
-#extension__manager .extensionList li {
-    margin: 0 0 .5em;
-    padding: 0 0 .5em;
-    color: __text__;
-    border-bottom: 1px solid __border__;
-    overflow: hidden;
-}
-
-#extension__manager .legend {
-    position: relative;
-    width: 75%;
-    float: left;
-}
-[dir=rtl] #extension__manager .legend {
-    float: right;
-}
-
-#extension__manager .legend > div {
-    padding: 0 .5em 0 132px;
-    border-right: 1px solid __background_alt__;
-    overflow: hidden;
-}
-[dir=rtl] #extension__manager .legend > div {
-    padding: 0 132px 0 .5em;
-    border-left: 1px solid __background_alt__;
-    border-right-width: 0;
-}
-
-#extension__manager .enabled div.screenshot span {
-    background: transparent url(images/enabled.png) no-repeat 2px 2px;
-}
-
-#extension__manager .disabled div.screenshot span {
-    background: transparent url(images/disabled.png) no-repeat 2px 2px;
-}
-
-#extension__manager div.screenshot img {
-    width: 120px;
-    height: 70px;
-}
-
-#extension__manager .legend div.screenshot {
-    margin-top: 4px;
-    margin-left: -132px;
-    max-width: 120px;
-    float: left;
-}
-[dir=rtl] #extension__manager .legend div.screenshot {
-    margin-left: 0;
-    margin-right: -132px;
-    float: right;
-}
-
-#extension__manager .legend div.screenshot span {
-    min-height: 24px;
-    min-width: 24px;
-    position: absolute;
-    left: 0;
-}
-[dir=rtl] #extension__manager .legend div.screenshot span {
-    left: auto;
-    right: 0;
-}
-
-#extension__manager .legend h2 {
-    width: 100%;
-    float: right;
-    margin: 0.2em 0 0.5em;
-    font-size: 100%;
-    font-weight: normal;
-    border: none;
-}
-[dir=rtl] #extension__manager .legend h2 {
-    float: left;
-}
-
-#extension__manager .legend h2 strong {
-    font-size: 120%;
-    font-weight: bold;
-    vertical-align: baseline;
-}
-
-#extension__manager .legend p {
-    margin: 0 0 0.6em 0;
-}
-
-#extension__manager .legend span.linkbar {
-    font-size: 85%;
-}
-
-#extension__manager .legend span.linkbar a.urlextern + a.taglink,
-#extension__manager .legend span.linkbar a.interwiki + a.taglink {
-    margin-left: 0.4em;
-}
-[dir=rtl] #extension__manager .legend span.linkbar a.urlextern + a.taglink,
-[dir=rtl] #extension__manager .legend span.linkbar a.interwiki + a.taglink {
-    margin-left: 0;
-}
-[dir=rtl] #extension__manager .legend span.linkbar a.urlextern,
-[dir=rtl] #extension__manager .legend span.linkbar a.interwiki {
-    margin-left: .4em;
-}
-
-#extension__manager .legend input.button {
-    background: transparent url(images/up.png) no-repeat 0 0;
-    box-shadow: none;
-    border-width: 0;
-    height: 14px;
-    text-indent: -99999px;
-    float: right;
-    margin: .5em 0 0;
-}
-[dir=rtl] #extension__manager .legend input.button {
-    float: left;
-    margin: .5em 0 0;
-}
-
-#extension__manager .legend  input.button.close {
-    background: transparent url(images/down.png) no-repeat 0 0;
-}
-
-#extension__manager .legend div.popularity {
-    background-color: __background__;
-    border: 1px solid silver;
-    height: .4em;
-    margin: 0 auto;
-    padding: 1px;
-    width: 5.5em;
-    position: absolute;
-    right: .5em;
-    top: 0.2em;
-}
-[dir=rtl] #extension__manager .legend div.popularity {
-    right: auto;
-    left: .5em;
-}
-
-#extension__manager .legend div.popularity div {
-    background-color: __border__;
-    height: 100%;
-}
-
-#extension__manager .legend div.popularity div span {
-    display: none;/* @todo: hide accessibly */
-}
-
-#extension__manager .actions {
-    padding: 0;
-    font-size: 95%;
-    width: 25%;
-    float: right;
-    text-align: right;
-}
-[dir=rtl] #extension__manager .actions {
-    float: left;
-    text-align: left;
-}
-
-#extension__manager .actions .version {
-    display: block;
-}
-
-#extension__manager .actions p {
-    margin: 0.2em 0;
-    text-align: center;
-}
-
-/*
- * extensions table, detailed info box
- */
-#extension__manager dl.details {
-    margin: 0.4em 0 0 0;
-    font-size: 85%;
-    border-top: 1px solid __background_alt__;
-    clear: both;
-}
-
-#extension__manager dl.details dt {
-    clear: left;
-    float: left;
-    width: 25%;
-    margin: 0;
-    text-align: right;
-    font-weight: normal;
-    padding: 0.2em 5px 0 0;
-}
-[dir=rtl] #extension__manager dl.details dt {
-    clear: right;
-    float: right;
-    text-align: left;
-    padding: 0.2em 0 0 5px;
-}
-
-#extension__manager dl.details dd {
-    margin-left: 25%;
-    font-weight: bold;
-    padding: 0.2em 0 0 5px;
-}
-[dir=rtl] #extension__manager dl.details dd {
-    margin-left: 0;
-    margin-right: 25%;
-    padding: 0.2em 5px 0 0 ;
-}
-
-#extension__manager dl.details dd a {
-    font-weight: normal;
-}
-
-#extension__manager #info__popup {
-    z-index: 20;
-    overflow: hidden;
-    opacity: 0.9;
-    border: 1px solid __border__;
-    background-color: __border__; /*background_other__;*/
-    text-align: left;
-    padding: 0.2em;
-}
-[dir=rtl] #extension__manager #info__popup {
-    text-align: right;
-}
-
-#extension__manager div.msg {
-    margin: 0.4em 0 0 0;
-}
-
-#extension__manager ul.tabs div.msg {
-    display: inline;
-    margin-left: 0.4em;
-}
-[dir=rtl] #extension__manager ul.tabs div.msg {
-    margin-left: 0;
-    margin-right: 0.4em;
-}
-
-/* end admin plugin styles */
diff --git a/lib/plugins/extension/style.less b/lib/plugins/extension/style.less
new file mode 100644
index 000000000..40fdb6075
--- /dev/null
+++ b/lib/plugins/extension/style.less
@@ -0,0 +1,345 @@
+/*
+ * Extension plugin styles
+ *
+ * @author  Christopher Smith <chris@jalakai.co.uk>
+ * @author  Piyush Mishra <me@piyushmishra.com>
+ * @author  Håkan Sandell <sandell.hakan@gmail.com>
+ * @author  Anika Henke <anika@selfthinker.org>
+ */
+
+
+/*
+ * general layout
+ */
+#extension__manager h2 {
+    margin-left: 0;
+}
+
+#extension__manager a.taglink {
+    padding: 1px 4px;
+    background-color: @ini_background_neu;
+    border-radius: 3px;
+}
+[dir=rtl] #extension__manager a.taglink {
+    display: inline-block;
+    line-height: 1.2;
+}
+
+#extension__manager .panelHeader div.error {
+    margin-top: 0;
+    float: left;
+}
+[dir=rtl] #extension__manager .panelHeader div.error {
+    float: right;
+}
+
+/*
+ * search & url download forms
+ */
+#extension__manager form.search,
+#extension__manager form.btn_reload {
+    float: right;
+}
+[dir=rtl] #extension__manager form.search,
+[dir=rtl] #extension__manager form.btn_reload {
+    float: left;
+}
+
+#extension__manager div.search form.search {
+    float: none;
+}
+
+#extension__manager .tagcloud {
+    width: 55%;
+    float: left;
+    margin: 0 0.5em 1em 0;
+}
+[dir=rtl] #extension__manager .tagcloud {
+    float: right;
+    margin: 0 0 1em .5em;
+}
+
+#extension__manager .tagcloud a.taglink {
+    background-color: inherit;
+}
+
+#extension__manager div.search {
+    width: 44%;
+    float: left;
+}
+[dir=rtl] #extension__manager div.search {
+    float: right;
+}
+
+#extension__manager fieldset {
+    margin-top: 0.5em;
+    width: auto;
+}
+
+#extension__manager fieldset p {
+    margin: 0.5em;
+    text-align: justify;
+    font-size: 85%;
+}
+
+/* tag cloud */
+#extension__manager a.cl0 { font-size: 0.7em; }
+#extension__manager a.cl1 { font-size: 0.9em; }
+#extension__manager a.cl2 { font-size: 1em; }
+#extension__manager a.cl3 { font-size: 1.3em; }
+#extension__manager a.cl4 { font-size: 1.6em; }
+#extension__manager a.cl5 { font-size: 1.9em; }
+
+
+#extension__manager .extensionList input.button {
+    margin: 0 .3em .3em 0;
+}
+[dir=rtl] #extension__manager .extensionList input.button {
+    margin: 0 0 .3em .3em;
+}
+
+/*
+ * extensions table
+ */
+#extension__manager .extensionList {
+    margin-left: 0;
+    margin-right: 0;
+    padding: 0;
+    list-style: none;
+}
+
+#extension__manager .extensionList li {
+    margin: 0 0 .5em;
+    padding: 0 0 .5em;
+    color: @ini_text;
+    border-bottom: 1px solid @ini_border;
+    overflow: hidden;
+}
+
+#extension__manager .legend {
+    position: relative;
+    width: 75%;
+    float: left;
+}
+[dir=rtl] #extension__manager .legend {
+    float: right;
+}
+
+#extension__manager .legend > div {
+    padding: 0 .5em 0 132px;
+    border-right: 1px solid @ini_background_alt;
+    overflow: hidden;
+}
+[dir=rtl] #extension__manager .legend > div {
+    padding: 0 132px 0 .5em;
+    border-left: 1px solid @ini_background_alt;
+    border-right-width: 0;
+}
+
+#extension__manager .enabled div.screenshot span {
+    background: transparent url(images/enabled.png) no-repeat 2px 2px;
+}
+
+#extension__manager .disabled div.screenshot span {
+    background: transparent url(images/disabled.png) no-repeat 2px 2px;
+}
+
+#extension__manager div.screenshot img {
+    width: 120px;
+    height: 70px;
+}
+
+#extension__manager .legend div.screenshot {
+    margin-top: 4px;
+    margin-left: -132px;
+    max-width: 120px;
+    float: left;
+}
+[dir=rtl] #extension__manager .legend div.screenshot {
+    margin-left: 0;
+    margin-right: -132px;
+    float: right;
+}
+
+#extension__manager .legend div.screenshot span {
+    min-height: 24px;
+    min-width: 24px;
+    position: absolute;
+    left: 0;
+}
+[dir=rtl] #extension__manager .legend div.screenshot span {
+    left: auto;
+    right: 0;
+}
+
+#extension__manager .legend h2 {
+    width: 100%;
+    float: right;
+    margin: 0.2em 0 0.5em;
+    font-size: 100%;
+    font-weight: normal;
+    border: none;
+}
+[dir=rtl] #extension__manager .legend h2 {
+    float: left;
+}
+
+#extension__manager .legend h2 strong {
+    font-size: 120%;
+    font-weight: bold;
+    vertical-align: baseline;
+}
+
+#extension__manager .legend p {
+    margin: 0 0 0.6em 0;
+}
+
+#extension__manager .legend span.linkbar {
+    font-size: 85%;
+}
+
+#extension__manager .legend span.linkbar a.urlextern + a.taglink,
+#extension__manager .legend span.linkbar a.interwiki + a.taglink {
+    margin-left: 0.4em;
+}
+[dir=rtl] #extension__manager .legend span.linkbar a.urlextern + a.taglink,
+[dir=rtl] #extension__manager .legend span.linkbar a.interwiki + a.taglink {
+    margin-left: 0;
+}
+[dir=rtl] #extension__manager .legend span.linkbar a.urlextern,
+[dir=rtl] #extension__manager .legend span.linkbar a.interwiki {
+    margin-left: .4em;
+}
+
+#extension__manager .legend input.button {
+    background: transparent url(images/up.png) no-repeat 0 0;
+    box-shadow: none;
+    border-width: 0;
+    height: 14px;
+    text-indent: -99999px;
+    float: right;
+    margin: .5em 0 0;
+}
+[dir=rtl] #extension__manager .legend input.button {
+    float: left;
+    margin: .5em 0 0;
+}
+
+#extension__manager .legend  input.button.close {
+    background: transparent url(images/down.png) no-repeat 0 0;
+}
+
+#extension__manager .legend div.popularity {
+    background-color: @ini_background;
+    border: 1px solid silver;
+    height: .4em;
+    margin: 0 auto;
+    padding: 1px;
+    width: 5.5em;
+    position: absolute;
+    right: .5em;
+    top: 0.2em;
+}
+[dir=rtl] #extension__manager .legend div.popularity {
+    right: auto;
+    left: .5em;
+}
+
+#extension__manager .legend div.popularity div {
+    background-color: @ini_border;
+    height: 100%;
+}
+
+#extension__manager .legend div.popularity div span {
+    display: none;/* @todo: hide accessibly */
+}
+
+#extension__manager .actions {
+    padding: 0;
+    font-size: 95%;
+    width: 25%;
+    float: right;
+    text-align: right;
+}
+[dir=rtl] #extension__manager .actions {
+    float: left;
+    text-align: left;
+}
+
+#extension__manager .actions .version {
+    display: block;
+}
+
+#extension__manager .actions p {
+    margin: 0.2em 0;
+    text-align: center;
+}
+
+/*
+ * extensions table, detailed info box
+ */
+#extension__manager dl.details {
+    margin: 0.4em 0 0 0;
+    font-size: 85%;
+    border-top: 1px solid @ini_background_alt;
+    clear: both;
+}
+
+#extension__manager dl.details dt {
+    clear: left;
+    float: left;
+    width: 25%;
+    margin: 0;
+    text-align: right;
+    font-weight: normal;
+    padding: 0.2em 5px 0 0;
+}
+[dir=rtl] #extension__manager dl.details dt {
+    clear: right;
+    float: right;
+    text-align: left;
+    padding: 0.2em 0 0 5px;
+}
+
+#extension__manager dl.details dd {
+    margin-left: 25%;
+    font-weight: bold;
+    padding: 0.2em 0 0 5px;
+}
+[dir=rtl] #extension__manager dl.details dd {
+    margin-left: 0;
+    margin-right: 25%;
+    padding: 0.2em 5px 0 0 ;
+}
+
+#extension__manager dl.details dd a {
+    font-weight: normal;
+}
+
+#extension__manager #info__popup {
+    z-index: 20;
+    overflow: hidden;
+    opacity: 0.9;
+    border: 1px solid @ini_border;
+    background-color: @ini_border; /*background_other__;*/
+    text-align: left;
+    padding: 0.2em;
+}
+[dir=rtl] #extension__manager #info__popup {
+    text-align: right;
+}
+
+#extension__manager div.msg {
+    margin: 0.4em 0 0 0;
+}
+
+#extension__manager ul.tabs div.msg {
+    display: inline;
+    margin-left: 0.4em;
+}
+[dir=rtl] #extension__manager ul.tabs div.msg {
+    margin-left: 0;
+    margin-right: 0.4em;
+}
+
+/* end admin plugin styles */
-- 
cgit v1.2.3


From 61746d5540723d7463a0c1d666decb9c164c6678 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 9 Aug 2013 16:07:21 +0200
Subject: added a very simplistic lightbox

---
 lib/plugins/extension/helper/list.php    |   2 +-
 lib/plugins/extension/images/overlay.png | Bin 0 -> 109 bytes
 lib/plugins/extension/script.js          |  34 +++++++++++++++++++++++++++++++
 lib/plugins/extension/style.less         |  29 ++++++++++++++++++++++++++
 4 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 lib/plugins/extension/images/overlay.png
 create mode 100644 lib/plugins/extension/script.js

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/helper/list.php b/lib/plugins/extension/helper/list.php
index 12db5ea3c..62031a69b 100644
--- a/lib/plugins/extension/helper/list.php
+++ b/lib/plugins/extension/helper/list.php
@@ -181,7 +181,7 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
      */
     function make_screenshot(helper_plugin_extension_extension $extension) {
         if($extension->getScreenshotURL()) {
-            $img = '<a title="'.hsc($extension->getDisplayName()).'" href="'.hsc($extension->getScreenshotURL()).'" target="_blank">'.
+            $img = '<a title="'.hsc($extension->getDisplayName()).'" href="'.hsc($extension->getScreenshotURL()).'" target="_blank" class="extension_screenshot">'.
                 '<img alt="'.hsc($extension->getDisplayName()).'" width="120" height="70" src="'.hsc($extension->getThumbnailURL()).'" />'.
                 '</a>';
         } elseif($extension->isTemplate()) {
diff --git a/lib/plugins/extension/images/overlay.png b/lib/plugins/extension/images/overlay.png
new file mode 100644
index 000000000..8f92c2fe7
Binary files /dev/null and b/lib/plugins/extension/images/overlay.png differ
diff --git a/lib/plugins/extension/script.js b/lib/plugins/extension/script.js
new file mode 100644
index 000000000..f2a6aae50
--- /dev/null
+++ b/lib/plugins/extension/script.js
@@ -0,0 +1,34 @@
+jQuery(function(){
+
+
+    /**
+     * very simple lightbox
+     * @link http://webdesign.tutsplus.com/tutorials/htmlcss-tutorials/super-simple-lightbox-with-css-and-jquery/
+     */
+    jQuery('a.extension_screenshot').click(function(e) {
+        e.preventDefault();
+
+        //Get clicked link href
+        var image_href = jQuery(this).attr("href");
+
+        // create lightbox if needed
+        var $lightbox = jQuery('#plugin__extensionlightbox');
+        if(!$lightbox.length){
+            $lightbox = jQuery('<div id="plugin__extensionlightbox"><p>Click to close</p><div></div></div>')
+                .appendTo(jQuery('body'))
+                .hide()
+                .click(function(){
+                    $lightbox.hide();
+                });
+        }
+
+        // fill and show it
+        $lightbox
+            .show()
+            .find('div').html('<img src="' + image_href + '" />');
+
+
+        return false;
+    });
+
+});
\ No newline at end of file
diff --git a/lib/plugins/extension/style.less b/lib/plugins/extension/style.less
index 40fdb6075..cd9eeaa74 100644
--- a/lib/plugins/extension/style.less
+++ b/lib/plugins/extension/style.less
@@ -7,6 +7,35 @@
  * @author  Anika Henke <anika@selfthinker.org>
  */
 
+/**
+ * very simple lightbox
+ * @link http://webdesign.tutsplus.com/tutorials/htmlcss-tutorials/super-simple-lightbox-with-css-and-jquery/
+ */
+#plugin__extensionlightbox {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background: url(images/overlay.png) repeat;
+    text-align: center;
+    cursor: pointer;
+
+    p {
+        text-align: right;
+        color: #fff;
+        margin-right: 20px;
+        font-size: 12px;
+    }
+
+    img {
+        box-shadow: 0 0 25px #111;
+        -webkit-box-shadow: 0 0 25px #111;
+        -moz-box-shadow: 0 0 25px #111;
+        max-width: 90%;
+        max-height: 90%;
+    }
+}
 
 /*
  * general layout
-- 
cgit v1.2.3


From 519895b5625277197a88748c515919515f1113b8 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 9 Aug 2013 20:04:17 +0200
Subject: added tests for the find_folders method

---
 lib/plugins/extension/_test/extension.test.php     | 234 ++++++++++++++++++++-
 .../extension/_test/testdata/either1/script.js     |   0
 .../_test/testdata/eithersub2/either2/script.js    |   0
 .../_test/testdata/plgfoo5/plugin.info.txt         |   7 +
 .../_test/testdata/plgsub3/plugin3/syntax.php      |   0
 .../_test/testdata/plgsub4/plugin4/plugin.info.txt |   7 +
 .../_test/testdata/plgsub6/plgfoo6/plugin.info.txt |   7 +
 .../extension/_test/testdata/plugin1/syntax.php    |   0
 .../_test/testdata/plugin2/plugin.info.txt         |   7 +
 .../extension/_test/testdata/template1/main.php    |   0
 .../extension/_test/testdata/template1/style.ini   |   0
 .../_test/testdata/template2/template.info.txt     |   7 +
 .../_test/testdata/tplfoo5/template.info.txt       |   7 +
 .../_test/testdata/tplsub3/template3/main.php      |   0
 .../_test/testdata/tplsub3/template3/style.ini     |   0
 .../testdata/tplsub4/template4/template.info.txt   |   7 +
 .../testdata/tplsub6/tplfoo6/template.info.txt     |   7 +
 lib/plugins/extension/admin.php                    |  10 +-
 lib/plugins/extension/helper/extension.php         | 190 ++++++++---------
 19 files changed, 382 insertions(+), 108 deletions(-)
 create mode 100644 lib/plugins/extension/_test/testdata/either1/script.js
 create mode 100644 lib/plugins/extension/_test/testdata/eithersub2/either2/script.js
 create mode 100644 lib/plugins/extension/_test/testdata/plgfoo5/plugin.info.txt
 create mode 100644 lib/plugins/extension/_test/testdata/plgsub3/plugin3/syntax.php
 create mode 100644 lib/plugins/extension/_test/testdata/plgsub4/plugin4/plugin.info.txt
 create mode 100644 lib/plugins/extension/_test/testdata/plgsub6/plgfoo6/plugin.info.txt
 create mode 100644 lib/plugins/extension/_test/testdata/plugin1/syntax.php
 create mode 100644 lib/plugins/extension/_test/testdata/plugin2/plugin.info.txt
 create mode 100644 lib/plugins/extension/_test/testdata/template1/main.php
 create mode 100644 lib/plugins/extension/_test/testdata/template1/style.ini
 create mode 100644 lib/plugins/extension/_test/testdata/template2/template.info.txt
 create mode 100644 lib/plugins/extension/_test/testdata/tplfoo5/template.info.txt
 create mode 100644 lib/plugins/extension/_test/testdata/tplsub3/template3/main.php
 create mode 100644 lib/plugins/extension/_test/testdata/tplsub3/template3/style.ini
 create mode 100644 lib/plugins/extension/_test/testdata/tplsub4/template4/template.info.txt
 create mode 100644 lib/plugins/extension/_test/testdata/tplsub6/tplfoo6/template.info.txt

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/_test/extension.test.php b/lib/plugins/extension/_test/extension.test.php
index 6dfa49a46..97726d212 100644
--- a/lib/plugins/extension/_test/extension.test.php
+++ b/lib/plugins/extension/_test/extension.test.php
@@ -1,10 +1,23 @@
 <?php
+
+/**
+ * Class mock_helper_plugin_extension_extension
+ *
+ * makes protected methods accessible
+ */
+class mock_helper_plugin_extension_extension extends helper_plugin_extension_extension {
+    public function find_folders(&$result, $base, $default_type = 'plugin', $dir = '') {
+        return parent::find_folders($result, $base, $default_type, $dir);
+    }
+
+}
+
 /**
  * @group plugin_extension
  */
 class helper_plugin_extension_extension_test extends DokuWikiTest {
 
-     protected $pluginsEnabled = array('extension');
+    protected $pluginsEnabled = array('extension');
 
     /**
      * FIXME should we test this without internet first?
@@ -12,7 +25,6 @@ class helper_plugin_extension_extension_test extends DokuWikiTest {
      * @group internet
      */
     public function testExtensionParameters() {
-
         $extension = new helper_plugin_extension_extension();
 
         $extension->setExtension('extension');
@@ -56,7 +68,225 @@ class helper_plugin_extension_extension_test extends DokuWikiTest {
         $this->assertTrue($extension->isEnabled());
         $this->assertTrue($extension->isInstalled());
         $this->assertTrue($extension->isBundled());
+    }
+
+    public function testFindFoldersPlugins() {
+        $extension = new mock_helper_plugin_extension_extension();
+        $tdir      = dirname(__FILE__).'/testdata';
+
+        $result = array('old' => array(), 'new' => array());
+        $ok     = $extension->find_folders($result, "$tdir/plugin1", 'plugin');
+        $this->assertTrue($ok);
+        $this->assertEquals(0, count($result['new']));
+        $this->assertEquals(1, count($result['old']));
+        $this->assertEquals('plugin', $result['old'][0]['type']);
+        $this->assertEquals('plugin1', $this->extdir($result['old'][0]['tmp']));
+
+        $result = array('old' => array(), 'new' => array());
+        $ok     = $extension->find_folders($result, "$tdir/plugin2", 'plugin');
+        $this->assertTrue($ok);
+        $this->assertEquals(1, count($result['new']));
+        $this->assertEquals('plugin', $result['new'][0]['type']);
+        $this->assertEquals('plugin2', $result['new'][0]['base']);
+        $this->assertEquals('plugin2', $this->extdir($result['new'][0]['tmp']));
+
+        $result = array('old' => array(), 'new' => array());
+        $ok     = $extension->find_folders($result, "$tdir/plgsub3", 'plugin');
+        $this->assertTrue($ok);
+        $this->assertEquals(0, count($result['new']));
+        $this->assertEquals(1, count($result['old']));
+        $this->assertEquals('plugin', $result['old'][0]['type']);
+        $this->assertEquals('plgsub3/plugin3', $this->extdir($result['old'][0]['tmp']));
+
+        $result = array('old' => array(), 'new' => array());
+        $ok     = $extension->find_folders($result, "$tdir/plgsub4", 'plugin');
+        $this->assertTrue($ok);
+        $this->assertEquals(1, count($result['new']));
+        $this->assertEquals('plugin', $result['new'][0]['type']);
+        $this->assertEquals('plugin4', $result['new'][0]['base']);
+        $this->assertEquals('plgsub4/plugin4', $this->extdir($result['new'][0]['tmp']));
+
+        $result = array('old' => array(), 'new' => array());
+        $ok     = $extension->find_folders($result, "$tdir/plgfoo5", 'plugin');
+        $this->assertTrue($ok);
+        $this->assertEquals(1, count($result['new']));
+        $this->assertEquals('plugin', $result['new'][0]['type']);
+        $this->assertEquals('plugin5', $result['new'][0]['base']);
+        $this->assertEquals('plgfoo5', $this->extdir($result['new'][0]['tmp']));
+
+        $result = array('old' => array(), 'new' => array());
+        $ok     = $extension->find_folders($result, "$tdir/plgsub6/plgfoo6", 'plugin');
+        $this->assertTrue($ok);
+        $this->assertEquals(1, count($result['new']));
+        $this->assertEquals('plugin', $result['new'][0]['type']);
+        $this->assertEquals('plugin6', $result['new'][0]['base']);
+        $this->assertEquals('plgsub6/plgfoo6', $this->extdir($result['new'][0]['tmp']));
+
+        $result = array('old' => array(), 'new' => array());
+        $ok     = $extension->find_folders($result, "$tdir/either1", 'plugin');
+        $this->assertTrue($ok);
+        $this->assertEquals(0, count($result['new']));
+        $this->assertEquals(1, count($result['old']));
+        $this->assertEquals('plugin', $result['old'][0]['type']);
+        $this->assertEquals('either1', $this->extdir($result['old'][0]['tmp']));
+
+        $result = array('old' => array(), 'new' => array());
+        $ok     = $extension->find_folders($result, "$tdir/eithersub2/either2", 'plugin');
+        $this->assertTrue($ok);
+        $this->assertEquals(0, count($result['new']));
+        $this->assertEquals(1, count($result['old']));
+        $this->assertEquals('plugin', $result['old'][0]['type']);
+        $this->assertEquals('eithersub2/either2', $this->extdir($result['old'][0]['tmp']));
+    }
+
+    public function testFindFoldersTemplates() {
+        $extension = new mock_helper_plugin_extension_extension();
+        $tdir      = dirname(__FILE__).'/testdata';
+
+        $result = array('old' => array(), 'new' => array());
+        $ok     = $extension->find_folders($result, "$tdir/template1", 'template');
+        $this->assertTrue($ok);
+        $this->assertEquals(0, count($result['new']));
+        $this->assertEquals(1, count($result['old']));
+        $this->assertEquals('template', $result['old'][0]['type']);
+        $this->assertEquals('template1', $this->extdir($result['old'][0]['tmp']));
 
+        $result = array('old' => array(), 'new' => array());
+        $ok     = $extension->find_folders($result, "$tdir/template2", 'template');
+        $this->assertTrue($ok);
+        $this->assertEquals(1, count($result['new']));
+        $this->assertEquals('template', $result['new'][0]['type']);
+        $this->assertEquals('template2', $result['new'][0]['base']);
+        $this->assertEquals('template2', $this->extdir($result['new'][0]['tmp']));
+
+        $result = array('old' => array(), 'new' => array());
+        $ok     = $extension->find_folders($result, "$tdir/tplsub3", 'template');
+        $this->assertTrue($ok);
+        $this->assertEquals(0, count($result['new']));
+        $this->assertEquals(1, count($result['old']));
+        $this->assertEquals('template', $result['old'][0]['type']);
+        $this->assertEquals('tplsub3/template3', $this->extdir($result['old'][0]['tmp']));
+
+        $result = array('old' => array(), 'new' => array());
+        $ok     = $extension->find_folders($result, "$tdir/tplsub4", 'template');
+        $this->assertTrue($ok);
+        $this->assertEquals(1, count($result['new']));
+        $this->assertEquals('template', $result['new'][0]['type']);
+        $this->assertEquals('template4', $result['new'][0]['base']);
+        $this->assertEquals('tplsub4/template4', $this->extdir($result['new'][0]['tmp']));
+
+        $result = array('old' => array(), 'new' => array());
+        $ok     = $extension->find_folders($result, "$tdir/tplfoo5", 'template');
+        $this->assertTrue($ok);
+        $this->assertEquals(1, count($result['new']));
+        $this->assertEquals('template', $result['new'][0]['type']);
+        $this->assertEquals('template5', $result['new'][0]['base']);
+        $this->assertEquals('tplfoo5', $this->extdir($result['new'][0]['tmp']));
+
+        $result = array('old' => array(), 'new' => array());
+        $ok     = $extension->find_folders($result, "$tdir/tplsub6/tplfoo6", 'template');
+        $this->assertTrue($ok);
+        $this->assertEquals(1, count($result['new']));
+        $this->assertEquals('template', $result['new'][0]['type']);
+        $this->assertEquals('template6', $result['new'][0]['base']);
+        $this->assertEquals('tplsub6/tplfoo6', $this->extdir($result['new'][0]['tmp']));
+
+        $result = array('old' => array(), 'new' => array());
+        $ok     = $extension->find_folders($result, "$tdir/either1", 'template');
+        $this->assertTrue($ok);
+        $this->assertEquals(0, count($result['new']));
+        $this->assertEquals(1, count($result['old']));
+        $this->assertEquals('template', $result['old'][0]['type']);
+        $this->assertEquals('either1', $this->extdir($result['old'][0]['tmp']));
+
+        $result = array('old' => array(), 'new' => array());
+        $ok     = $extension->find_folders($result, "$tdir/eithersub2/either2", 'template');
+        $this->assertTrue($ok);
+        $this->assertEquals(0, count($result['new']));
+        $this->assertEquals(1, count($result['old']));
+        $this->assertEquals('template', $result['old'][0]['type']);
+        $this->assertEquals('eithersub2/either2', $this->extdir($result['old'][0]['tmp']));
+    }
+
+    public function testFindFoldersTemplatesAutodetect() {
+        $extension = new mock_helper_plugin_extension_extension();
+        $tdir      = dirname(__FILE__).'/testdata';
+
+        $result = array('old' => array(), 'new' => array());
+        $ok     = $extension->find_folders($result, "$tdir/template1");
+        $this->assertTrue($ok);
+        $this->assertEquals(0, count($result['new']));
+        $this->assertEquals(1, count($result['old']));
+        $this->assertEquals('template', $result['old'][0]['type']);
+        $this->assertEquals('template1', $this->extdir($result['old'][0]['tmp']));
+
+        $result = array('old' => array(), 'new' => array());
+        $ok     = $extension->find_folders($result, "$tdir/template2");
+        $this->assertTrue($ok);
+        $this->assertEquals(1, count($result['new']));
+        $this->assertEquals('template', $result['new'][0]['type']);
+        $this->assertEquals('template2', $result['new'][0]['base']);
+        $this->assertEquals('template2', $this->extdir($result['new'][0]['tmp']));
+
+        $result = array('old' => array(), 'new' => array());
+        $ok     = $extension->find_folders($result, "$tdir/tplsub3");
+        $this->assertTrue($ok);
+        $this->assertEquals(0, count($result['new']));
+        $this->assertEquals(1, count($result['old']));
+        $this->assertEquals('template', $result['old'][0]['type']);
+        $this->assertEquals('tplsub3/template3', $this->extdir($result['old'][0]['tmp']));
+
+        $result = array('old' => array(), 'new' => array());
+        $ok     = $extension->find_folders($result, "$tdir/tplsub4");
+        $this->assertTrue($ok);
+        $this->assertEquals(1, count($result['new']));
+        $this->assertEquals('template', $result['new'][0]['type']);
+        $this->assertEquals('template4', $result['new'][0]['base']);
+        $this->assertEquals('tplsub4/template4', $this->extdir($result['new'][0]['tmp']));
+
+        $result = array('old' => array(), 'new' => array());
+        $ok     = $extension->find_folders($result, "$tdir/tplfoo5");
+        $this->assertTrue($ok);
+        $this->assertEquals(1, count($result['new']));
+        $this->assertEquals('template', $result['new'][0]['type']);
+        $this->assertEquals('template5', $result['new'][0]['base']);
+        $this->assertEquals('tplfoo5', $this->extdir($result['new'][0]['tmp']));
+
+        $result = array('old' => array(), 'new' => array());
+        $ok     = $extension->find_folders($result, "$tdir/tplsub6/tplfoo6");
+        $this->assertTrue($ok);
+        $this->assertEquals(1, count($result['new']));
+        $this->assertEquals('template', $result['new'][0]['type']);
+        $this->assertEquals('template6', $result['new'][0]['base']);
+        $this->assertEquals('tplsub6/tplfoo6', $this->extdir($result['new'][0]['tmp']));
+
+        $result = array('old' => array(), 'new' => array());
+        $ok     = $extension->find_folders($result, "$tdir/either1");
+        $this->assertTrue($ok);
+        $this->assertEquals(0, count($result['new']));
+        $this->assertEquals(1, count($result['old']));
+        $this->assertEquals('plugin', $result['old'][0]['type']);
+        $this->assertEquals('either1', $this->extdir($result['old'][0]['tmp']));
+
+        $result = array('old' => array(), 'new' => array());
+        $ok     = $extension->find_folders($result, "$tdir/eithersub2/either2");
+        $this->assertTrue($ok);
+        $this->assertEquals(0, count($result['new']));
+        $this->assertEquals(1, count($result['old']));
+        $this->assertEquals('plugin', $result['old'][0]['type']);
+        $this->assertEquals('eithersub2/either2', $this->extdir($result['old'][0]['tmp']));
     }
 
+    /**
+     * remove the test data directory from a dir name for cross install comparison
+     *
+     * @param string $dir
+     * @return string
+     */
+    protected function extdir($dir) {
+        $tdir = dirname(__FILE__).'/testdata';
+        $len  = strlen($tdir);
+        $dir  = trim(substr($dir, $len), '/');
+        return $dir;
+    }
 }
\ No newline at end of file
diff --git a/lib/plugins/extension/_test/testdata/either1/script.js b/lib/plugins/extension/_test/testdata/either1/script.js
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/plugins/extension/_test/testdata/eithersub2/either2/script.js b/lib/plugins/extension/_test/testdata/eithersub2/either2/script.js
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/plugins/extension/_test/testdata/plgfoo5/plugin.info.txt b/lib/plugins/extension/_test/testdata/plgfoo5/plugin.info.txt
new file mode 100644
index 000000000..cc4532d29
--- /dev/null
+++ b/lib/plugins/extension/_test/testdata/plgfoo5/plugin.info.txt
@@ -0,0 +1,7 @@
+base     plugin5
+author   Andreas Gohr
+email    andi@splitbrain.org
+date     2013-05-02
+name     Dummy Plugin
+desc     Dummy plugin data
+url      http://example.com/plugin:plugin5
diff --git a/lib/plugins/extension/_test/testdata/plgsub3/plugin3/syntax.php b/lib/plugins/extension/_test/testdata/plgsub3/plugin3/syntax.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/plugins/extension/_test/testdata/plgsub4/plugin4/plugin.info.txt b/lib/plugins/extension/_test/testdata/plgsub4/plugin4/plugin.info.txt
new file mode 100644
index 000000000..374b6bf24
--- /dev/null
+++ b/lib/plugins/extension/_test/testdata/plgsub4/plugin4/plugin.info.txt
@@ -0,0 +1,7 @@
+base     plugin4
+author   Andreas Gohr
+email    andi@splitbrain.org
+date     2013-05-02
+name     Dummy Plugin
+desc     Dummy plugin data
+url      http://example.com/plugin:plugin4
diff --git a/lib/plugins/extension/_test/testdata/plgsub6/plgfoo6/plugin.info.txt b/lib/plugins/extension/_test/testdata/plgsub6/plgfoo6/plugin.info.txt
new file mode 100644
index 000000000..461ff8735
--- /dev/null
+++ b/lib/plugins/extension/_test/testdata/plgsub6/plgfoo6/plugin.info.txt
@@ -0,0 +1,7 @@
+base     plugin6
+author   Andreas Gohr
+email    andi@splitbrain.org
+date     2013-05-02
+name     Dummy Plugin
+desc     Dummy plugin data
+url      http://example.com/plugin:plugin6
diff --git a/lib/plugins/extension/_test/testdata/plugin1/syntax.php b/lib/plugins/extension/_test/testdata/plugin1/syntax.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/plugins/extension/_test/testdata/plugin2/plugin.info.txt b/lib/plugins/extension/_test/testdata/plugin2/plugin.info.txt
new file mode 100644
index 000000000..d56758fe9
--- /dev/null
+++ b/lib/plugins/extension/_test/testdata/plugin2/plugin.info.txt
@@ -0,0 +1,7 @@
+base     plugin2
+author   Andreas Gohr
+email    andi@splitbrain.org
+date     2013-05-02
+name     Dummy Plugin
+desc     Dummy Plugin data
+url      http://example.com/plugin:plugin2
diff --git a/lib/plugins/extension/_test/testdata/template1/main.php b/lib/plugins/extension/_test/testdata/template1/main.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/plugins/extension/_test/testdata/template1/style.ini b/lib/plugins/extension/_test/testdata/template1/style.ini
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/plugins/extension/_test/testdata/template2/template.info.txt b/lib/plugins/extension/_test/testdata/template2/template.info.txt
new file mode 100644
index 000000000..882a7b914
--- /dev/null
+++ b/lib/plugins/extension/_test/testdata/template2/template.info.txt
@@ -0,0 +1,7 @@
+base     template2
+author   Andreas Gohr
+email    andi@splitbrain.org
+date     2013-05-02
+name     Dummy Template
+desc     Dummy template data
+url      http://example.com/template:template2
diff --git a/lib/plugins/extension/_test/testdata/tplfoo5/template.info.txt b/lib/plugins/extension/_test/testdata/tplfoo5/template.info.txt
new file mode 100644
index 000000000..4d7ecb8ef
--- /dev/null
+++ b/lib/plugins/extension/_test/testdata/tplfoo5/template.info.txt
@@ -0,0 +1,7 @@
+base     template5
+author   Andreas Gohr
+email    andi@splitbrain.org
+date     2013-05-02
+name     Dummy Template
+desc     Dummy template data
+url      http://example.com/template:template5
diff --git a/lib/plugins/extension/_test/testdata/tplsub3/template3/main.php b/lib/plugins/extension/_test/testdata/tplsub3/template3/main.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/plugins/extension/_test/testdata/tplsub3/template3/style.ini b/lib/plugins/extension/_test/testdata/tplsub3/template3/style.ini
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/plugins/extension/_test/testdata/tplsub4/template4/template.info.txt b/lib/plugins/extension/_test/testdata/tplsub4/template4/template.info.txt
new file mode 100644
index 000000000..f050555e5
--- /dev/null
+++ b/lib/plugins/extension/_test/testdata/tplsub4/template4/template.info.txt
@@ -0,0 +1,7 @@
+base     template4
+author   Andreas Gohr
+email    andi@splitbrain.org
+date     2013-05-02
+name     Dummy Template
+desc     Dummy template data
+url      http://example.com/template:template4
diff --git a/lib/plugins/extension/_test/testdata/tplsub6/tplfoo6/template.info.txt b/lib/plugins/extension/_test/testdata/tplsub6/tplfoo6/template.info.txt
new file mode 100644
index 000000000..ea4dc230d
--- /dev/null
+++ b/lib/plugins/extension/_test/testdata/tplsub6/tplfoo6/template.info.txt
@@ -0,0 +1,7 @@
+base     template6
+author   Andreas Gohr
+email    andi@splitbrain.org
+date     2013-05-02
+name     Dummy Template
+desc     Dummy template data
+url      http://example.com/template:template6
diff --git a/lib/plugins/extension/admin.php b/lib/plugins/extension/admin.php
index cf4eb79d7..e28fd612c 100644
--- a/lib/plugins/extension/admin.php
+++ b/lib/plugins/extension/admin.php
@@ -67,11 +67,9 @@ class admin_plugin_extension extends DokuWiki_Admin_Plugin {
                             $this->infoFor = $extname;
                             break;
                         case 'install':
-                            msg('Not implemented');
-                            break;
                         case 'reinstall':
                         case 'update':
-                            $extension->setExtension($extname, false);
+                            $extension->setExtension($extname);
                             $status = $extension->installOrUpdate();
                             if ($status !== true) {
                                 msg($status, -1);
@@ -80,7 +78,7 @@ class admin_plugin_extension extends DokuWiki_Admin_Plugin {
                             }
                             break;
                         case 'uninstall':
-                            $extension->setExtension($extname, false);
+                            $extension->setExtension($extname);
                             $status = $extension->uninstall();
                             if ($status !== true) {
                                 msg($status, -1);
@@ -89,7 +87,7 @@ class admin_plugin_extension extends DokuWiki_Admin_Plugin {
                             }
                             break;
                         case 'enable';
-                            $extension->setExtension($extname, false);
+                            $extension->setExtension($extname);
                             $status = $extension->enable();
                             if ($status !== true) {
                                 msg($status, -1);
@@ -98,7 +96,7 @@ class admin_plugin_extension extends DokuWiki_Admin_Plugin {
                             }
                             break;
                         case 'disable';
-                            $extension->setExtension($extname, false);
+                            $extension->setExtension($extname);
                             $status = $extension->disable();
                             if ($status !== true) {
                                 msg($status, -1);
diff --git a/lib/plugins/extension/helper/extension.php b/lib/plugins/extension/helper/extension.php
index 244ec9b9a..62f950cac 100644
--- a/lib/plugins/extension/helper/extension.php
+++ b/lib/plugins/extension/helper/extension.php
@@ -127,6 +127,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return bool If an update is available
      */
     public function updateAvailable() {
+        if(!$this->isInstalled()) return false;
         $lastupdate = $this->getLastUpdate();
         if ($lastupdate === false) return false;
         $installed  = $this->getInstalledVersion();
@@ -518,21 +519,24 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
     /**
      * Install or update the extension
      *
-     * @return bool|string True or an error message
+     * @throws \Exception when something goes wrong
+     * @return array The list of installed extensions
      */
     public function installOrUpdate() {
-        if (($status = $this->download($this->getDownloadURL(), $path)) === true) {
-            if (($status = $this->installArchive($path, $installed_extensions, $this->isInstalled(), $this->getBase())) == true) {
-                // refresh extension information
-                if (!isset($installed_extensions[$this->getBase()])) {
-                    $status = 'Error, the requested extension hasn\'t been installed or updated';
-                }
-                $this->setExtension($this->getID());
-                $this->purgeCache();
+        try {
+            $path      = $this->download($this->getDownloadURL());
+            $installed = $this->installArchive($path, $this->isInstalled(), $this->getBase());
+
+            // refresh extension information
+            if (!isset($installed[$this->getBase()])) {
+                throw new Exception('Error, the requested extension hasn\'t been installed or updated');
             }
-            $this->dir_delete(dirname($path));
+            $this->setExtension($this->getID());
+            $this->purgeCache();
+        }catch (Exception $e){
+            throw $e;
         }
-        return $status;
+        return $installed;
     }
 
     /**
@@ -695,112 +699,108 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
 
     /**
      * Download an archive to a protected path
+     *
      * @param string $url  The url to get the archive from
-     * @param string $path The path where the archive was saved (output parameter)
-     * @return bool|string True on success, an error message on failure
+     * @throws Exception   when something goes wrong
+     * @return string The path where the archive was saved
      */
-    public function download($url, &$path) {
+    public function download($url) {
         // check the url
         $matches = array();
         if(!preg_match('/[^\/]*$/', $url, $matches) || !$matches[0]) {
-            return $this->getLang('baddownloadurl');
+            throw new Exception($this->getLang('baddownloadurl'));
         }
         $file = $matches[0];
 
         // create tmp directory for download
         if(!($tmp = io_mktmpdir())) {
-            return $this->getLang('error_dircreate');
+            throw new Exception($this->getLang('error_dircreate'));
         }
 
         // download
-        if(!$file = io_download($url, $tmp.'/', true, $file)) {
+        if(!$file = io_download($url, $tmp.'/', true, $file, 0)) {
             $this->dir_delete($tmp);
-            return sprintf($this->getLang('error_download'), $url);
+            throw new Exception(sprintf($this->getLang('error_download'), hsc($url)));
         }
 
-        $path = $tmp.'/'.$file;
-
-        return true;
+        return $tmp.'/'.$file;
     }
 
     /**
      * @param string $file      The path to the archive that shall be installed
      * @param bool   $overwrite If an already installed plugin should be overwritten
-     * @param array  $installed_extensions Array of all installed extensions in the form $base => ('type' => $type, 'action' => 'update'|'install')
      * @param string $base      The basename of the plugin if it's known
+     * @throws Exception        when something went wrong
      * @return bool|string True on success, an error message on failure
      */
-    public function installArchive($file, &$installed_extensions, $overwrite=false, $base = '') {
+    public function installArchive($file, $overwrite=false, $base = '') {
         $error = false;
 
         // create tmp directory for decompression
         if(!($tmp = io_mktmpdir())) {
-            return $this->getLang('error_dircreate');
+            throw new Exception($this->getLang('error_dircreate'));
         }
 
         // add default base folder if specified to handle case where zip doesn't contain this
         if($base && !@mkdir($tmp.'/'.$base)) {
-            $error = $this->getLang('error_dircreate');
+            throw new Exception($this->getLang('error_dircreate'));
         }
 
-        if(!$error && !$this->decompress("$tmp/$file", "$tmp/".$base)) {
-            $error = sprintf($this->getLang('error_decompress'), $file);
+        // decompress
+        if(!$this->decompress("$tmp/$file", "$tmp/".$base)) {
+            throw new Exception(sprintf($this->getLang('error_decompress'), $file));
         }
 
         // search $tmp/$base for the folder(s) that has been created
         // move the folder(s) to lib/..
-        if(!$error) {
-            $result = array('old'=>array(), 'new'=>array());
-
-            if(!$this->find_folders($result, $tmp.'/'.$base, ($this->isTemplate() ? 'template' : 'plugin'))) {
-                $error = $this->getLang('error_findfolder');
+        $result = array('old'=>array(), 'new'=>array());
+        if(!$this->find_folders($result, $tmp.'/'.$base, ($this->isTemplate() ? 'template' : 'plugin'))) {
+            throw new Exception($this->getLang('error_findfolder'));
+        }
 
-            } else {
-                // choose correct result array
-                if(count($result['new'])) {
-                    $install = $result['new'];
-                }else{
-                    $install = $result['old'];
-                }
+        // choose correct result array
+        if(count($result['new'])) {
+            $install = $result['new'];
+        }else{
+            $install = $result['old'];
+        }
 
-                // now install all found items
-                foreach($install as $item) {
-                    // where to install?
-                    if($item['type'] == 'template') {
-                        $target_base_dir = DOKU_TPLLIB;
-                    }else{
-                        $target_base_dir = DOKU_PLUGIN;
-                    }
+        // now install all found items
+        foreach($install as $item) {
+            // where to install?
+            if($item['type'] == 'template') {
+                $target_base_dir = DOKU_TPLLIB;
+            }else{
+                $target_base_dir = DOKU_PLUGIN;
+            }
 
-                    if(!empty($item['base'])) {
-                        // use base set in info.txt
-                    } elseif($base && count($install) == 1) {
-                        $item['base'] = $base;
-                    } else {
-                        // default - use directory as found in zip
-                        // plugins from github/master without *.info.txt will install in wrong folder
-                        // but using $info->id will make 'code3' fail (which should install in lib/code/..)
-                        $item['base'] = basename($item['tmp']);
-                    }
+            if(!empty($item['base'])) {
+                // use base set in info.txt
+            } elseif($base && count($install) == 1) {
+                $item['base'] = $base;
+            } else {
+                // default - use directory as found in zip
+                // plugins from github/master without *.info.txt will install in wrong folder
+                // but using $info->id will make 'code3' fail (which should install in lib/code/..)
+                $item['base'] = basename($item['tmp']);
+            }
 
-                    // check to make sure we aren't overwriting anything
-                    $target = $target_base_dir.$item['base'];
-                    if(!$overwrite && @file_exists($target)) {
-                        // TODO remember our settings, ask the user to confirm overwrite
-                        continue;
-                    }
+            // check to make sure we aren't overwriting anything
+            $target = $target_base_dir.$item['base'];
+            if(!$overwrite && @file_exists($target)) {
+                // TODO remember our settings, ask the user to confirm overwrite
+                continue;
+            }
 
-                    $action = @file_exists($target) ? 'update' : 'install';
+            $action = @file_exists($target) ? 'update' : 'install';
 
-                    // copy action
-                    if($this->dircopy($item['tmp'], $target)) {
-                        // TODO: write manager.dat!
-                        $installed_extensions[$item['base']] = array('type' => $item['type'], 'action' => $action);
-                    } else {
-                        $error = sprintf($this->getLang('error_copy').DOKU_LF, $item['base']);
-                        break;
-                    }
-                }
+            // copy action
+            if($this->dircopy($item['tmp'], $target)) {
+                // TODO: write manager.dat!
+                $installed_extensions[$item['base']] = array('type' => $item['type'], 'action' => $action);
+            } else {
+                $error = sprintf($this->getLang('error_copy').DOKU_LF, $item['base']);
+                break;
             }
         }
 
@@ -830,25 +830,24 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      *
      * @author Andreas Gohr <andi@splitbrain.org>
      * @param array $result - results are stored here
-     * @param string $base - the temp directory where the package was unpacked to
+     * @param string $directory - the temp directory where the package was unpacked to
      * @param string $default_type - type used if no info.txt available
-     * @param string $dir - a subdirectory. do not set. used by recursion
+     * @param string $subdir - a subdirectory. do not set. used by recursion
      * @return bool - false on error
      */
-    private function find_folders(&$result, $base, $default_type, $dir='') {
-        $this_dir = "$base$dir";
+    protected function find_folders(&$result, $directory, $default_type='plugin', $subdir='') {
+        $this_dir = "$directory$subdir";
         $dh       = @opendir($this_dir);
         if(!$dh) return false;
 
         $found_dirs           = array();
         $found_files          = 0;
         $found_template_parts = 0;
-        $found_info_txt       = false;
         while (false !== ($f = readdir($dh))) {
             if($f == '.' || $f == '..') continue;
 
             if(is_dir("$this_dir/$f")) {
-                $found_dirs[] = "$dir/$f";
+                $found_dirs[] = "$subdir/$f";
 
             } else {
                 // it's a file -> check for config
@@ -856,7 +855,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
                 switch ($f) {
                     case 'plugin.info.txt':
                     case 'template.info.txt':
-                        $found_info_txt = true;
+                        // we have  found a clear marker, save and return
                         $info = array();
                         $type = explode('.', $f, 2);
                         $info['type'] = $type[0];
@@ -864,7 +863,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
                         $conf = confToHash("$this_dir/$f");
                         $info['base'] = basename($conf['base']);
                         $result['new'][] = $info;
-                        break;
+                        return true;
 
                     case 'main.php':
                     case 'details.php':
@@ -877,33 +876,24 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
         }
         closedir($dh);
 
-        // URL downloads default to 'plugin', try extra hard to indentify templates
-        if(!$default_type && $found_template_parts > 2 && !$found_info_txt) {
+        // files where found but no info.txt - use old method
+        if($found_files){
             $info            = array();
-            $info['type']    = 'template';
             $info['tmp']     = $this_dir;
-            $result['new'][] = $info;
-        }
+            // does this look like a template or should we use the default type?
+            if($found_template_parts >= 2) {
+                $info['type']    = 'template';
+            } else {
+                $info['type']    = $default_type;
+            }
 
-        // files in top level but no info.txt, assume this is zip missing a base directory
-        // works for all downloads unless direct URL where $base will be the tmp directory ($info->id was empty)
-        if(!$dir && $found_files > 0 && !$found_info_txt && $default_type) {
-            $info            = array();
-            $info['type']    = $default_type;
-            $info['tmp']     = $base;
             $result['old'][] = $info;
             return true;
         }
 
+        // we have no files yet -> recurse
         foreach ($found_dirs as $found_dir) {
-            // if top level add to dir list for old method, then recurse
-            if(!$dir) {
-                $info            = array();
-                $info['type']    = ($default_type ? $default_type : 'plugin');
-                $info['tmp']     = "$base$found_dir";
-                $result['old'][] = $info;
-            }
-            $this->find_folders($result, $base, $default_type, "$found_dir");
+            $this->find_folders($result, $directory, $default_type, "$found_dir");
         }
         return true;
     }
-- 
cgit v1.2.3


From 5c0b30bf48d7f8e5f3d5764cfab94d0d09c0a8b1 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 9 Aug 2013 21:26:20 +0200
Subject: installation now works

---
 lib/plugins/extension/admin.php            | 14 +++++++------
 lib/plugins/extension/helper/extension.php | 33 ++++++++++++++++++------------
 lib/plugins/extension/lang/en/lang.php     |  9 +++++++-
 3 files changed, 36 insertions(+), 20 deletions(-)

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/admin.php b/lib/plugins/extension/admin.php
index e28fd612c..f1ed83591 100644
--- a/lib/plugins/extension/admin.php
+++ b/lib/plugins/extension/admin.php
@@ -69,12 +69,14 @@ class admin_plugin_extension extends DokuWiki_Admin_Plugin {
                         case 'install':
                         case 'reinstall':
                         case 'update':
-                            $extension->setExtension($extname);
-                            $status = $extension->installOrUpdate();
-                            if ($status !== true) {
-                                msg($status, -1);
-                            } else {
-                                msg(sprintf($this->getLang('msg_update_success'), hsc($extension->getDisplayName())), 1);
+                            try {
+                                $extension->setExtension($extname);
+                                $installed = $extension->installOrUpdate();
+                                foreach($installed as $extension => $info){
+                                    msg(sprintf($this->getLang('msg_'.$info['type'].'_'.$info['action'].'_success'), $info['base']), 1);
+                                }
+                            }catch (Exception $e){
+                                msg($e->getMessage(), -1);
                             }
                             break;
                         case 'uninstall':
diff --git a/lib/plugins/extension/helper/extension.php b/lib/plugins/extension/helper/extension.php
index 62f950cac..8438253f9 100644
--- a/lib/plugins/extension/helper/extension.php
+++ b/lib/plugins/extension/helper/extension.php
@@ -528,7 +528,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
             $installed = $this->installArchive($path, $this->isInstalled(), $this->getBase());
 
             // refresh extension information
-            if (!isset($installed[$this->getBase()])) {
+            if (!isset($installed[$this->getID()])) {
                 throw new Exception('Error, the requested extension hasn\'t been installed or updated');
             }
             $this->setExtension($this->getID());
@@ -734,7 +734,6 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return bool|string True on success, an error message on failure
      */
     public function installArchive($file, $overwrite=false, $base = '') {
-        $error = false;
 
         // create tmp directory for decompression
         if(!($tmp = io_mktmpdir())) {
@@ -747,14 +746,21 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
         }
 
         // decompress
-        if(!$this->decompress("$tmp/$file", "$tmp/".$base)) {
+        if(!$this->decompress($file, "$tmp/".$base)) {
             throw new Exception(sprintf($this->getLang('error_decompress'), $file));
         }
 
         // search $tmp/$base for the folder(s) that has been created
         // move the folder(s) to lib/..
         $result = array('old'=>array(), 'new'=>array());
-        if(!$this->find_folders($result, $tmp.'/'.$base, ($this->isTemplate() ? 'template' : 'plugin'))) {
+        if($base){
+            // when a base was set it came from the current extension setup #fixme this is a bit hacky
+            $default = ($this->isTemplate() ? 'template' : 'plugin');
+        }else{
+            // assume a default of plugin, find_folders will autodetect templates
+            $default = 'plugin';
+        }
+        if(!$this->find_folders($result, $tmp.'/'.$base, $default)) {
             throw new Exception($this->getLang('error_findfolder'));
         }
 
@@ -796,22 +802,23 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
 
             // copy action
             if($this->dircopy($item['tmp'], $target)) {
-                // TODO: write manager.dat!
-                $installed_extensions[$item['base']] = array('type' => $item['type'], 'action' => $action);
+                // return info
+                $id = $item['base'];
+                if($item['type'] == 'template') $id = 'template:'.$id;
+                $installed_extensions[$id] = array(
+                    'base' => $item['base'],
+                    'type' => $item['type'],
+                    'action' => $action
+                );
             } else {
-                $error = sprintf($this->getLang('error_copy').DOKU_LF, $item['base']);
-                break;
+                throw new Exception(sprintf($this->getLang('error_copy').DOKU_LF, $item['base']));
             }
         }
 
         // cleanup
         if($tmp) $this->dir_delete($tmp);
 
-        if($error) {
-            return $error;
-        }
-
-        return true;
+        return $installed_extensions;
     }
 
     /**
diff --git a/lib/plugins/extension/lang/en/lang.php b/lib/plugins/extension/lang/en/lang.php
index 24cabe1fa..1a5c90923 100644
--- a/lib/plugins/extension/lang/en/lang.php
+++ b/lib/plugins/extension/lang/en/lang.php
@@ -73,11 +73,18 @@ $lang['msg_notenabled']         = 'Plugin %s could not be enabled, check file pe
 $lang['msg_disabled']           = 'Plugin %s disabled';
 $lang['msg_notdisabled']        = 'Plugin %s could not be disabled, check file permissions';
 
+
+$lang['msg_template_install_success'] = 'Template %s installed successfully';
+$lang['msg_template_update_success'] = 'Template %s updated successfully';
+$lang['msg_plugin_install_success'] = 'Plugin %s installed successfully';
+$lang['msg_plugin_update_success'] = 'Plugin %s updated successfully';
+
+
 $lang['msg_url_failed']         = 'URL [%s] could not be downloaded.<br /> %s';
 $lang['msg_download_failed']    = 'Plugin %s could not be downloaded.<br /> %s';
 $lang['msg_download_success']   = 'Plugin %s installed successfully';
 $lang['msg_tpl_download_failed']  = 'Template %s could not be downloaded.<br /> %s';
-$lang['msg_tpl_download_success'] = 'Template %s installed successfully';
+
 $lang['msg_download_pkg_success']     = '%s extension package successfully installed (%s)';
 $lang['msg_tpl_download_pkg_success'] = '%s extension package successfully installed (%s)';
 
-- 
cgit v1.2.3


From 045d57189c1fb4e8775603cd39927557e3eddfd9 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 9 Aug 2013 21:34:51 +0200
Subject: make sure temporary folders are cleaned up

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

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/helper/extension.php b/lib/plugins/extension/helper/extension.php
index 8438253f9..dc570aa0d 100644
--- a/lib/plugins/extension/helper/extension.php
+++ b/lib/plugins/extension/helper/extension.php
@@ -23,6 +23,20 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
     /** @var helper_plugin_extension_repository $repository */
     private $repository = null;
 
+    /** @var array list of temporary directories */
+    private $temporary = array();
+
+    /**
+     * Destructor
+     *
+     * deletes any dangling temporary directories
+     */
+    public function __destruct() {
+        foreach($this->temporary as $dir){
+            $this->dir_delete($dir);
+        }
+    }
+
     /**
      * @return bool false, this component is not a singleton
      */
@@ -697,6 +711,20 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
         }
     }
 
+    /**
+     * Returns a temporary directory
+     *
+     * The directory is registered for cleanup when the class is destroyed
+     *
+     * @return bool|string
+     */
+    protected function mkTmpDir(){
+        $dir = io_mktmpdir();
+        if(!$dir) return false;
+        $this->temporary[] = $dir;
+        return $dir;
+    }
+
     /**
      * Download an archive to a protected path
      *
@@ -713,7 +741,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
         $file = $matches[0];
 
         // create tmp directory for download
-        if(!($tmp = io_mktmpdir())) {
+        if(!($tmp = $this->mkTmpDir())) {
             throw new Exception($this->getLang('error_dircreate'));
         }
 
@@ -736,7 +764,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
     public function installArchive($file, $overwrite=false, $base = '') {
 
         // create tmp directory for decompression
-        if(!($tmp = io_mktmpdir())) {
+        if(!($tmp = $this->mkTmpDir())) {
             throw new Exception($this->getLang('error_dircreate'));
         }
 
-- 
cgit v1.2.3


From 341cc636324f216ddc217fc03f02004b8423b9f0 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 9 Aug 2013 21:38:31 +0200
Subject: sort plugins

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

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/helper/gui.php b/lib/plugins/extension/helper/gui.php
index 09cea7fcb..57dfefab3 100644
--- a/lib/plugins/extension/helper/gui.php
+++ b/lib/plugins/extension/helper/gui.php
@@ -29,6 +29,7 @@ class helper_plugin_extension_gui extends DokuWiki_Plugin {
         echo $this->locale_xhtml('intro_plugins');
 
         $pluginlist = $plugin_controller->getList('', true);
+        sort($pluginlist);
         /* @var helper_plugin_extension_extension $extension */
         $extension = $this->loadHelper('extension_extension');
         /* @var helper_plugin_extension_list $list */
@@ -51,6 +52,7 @@ class helper_plugin_extension_gui extends DokuWiki_Plugin {
         // FIXME do we have a real way?
         $tpllist = glob(DOKU_INC.'lib/tpl/*', GLOB_ONLYDIR);
         $tpllist = array_map('basename', $tpllist);
+        sort($tpllist);
 
         /* @var helper_plugin_extension_extension $extension */
         $extension = $this->loadHelper('extension_extension');
-- 
cgit v1.2.3


From 8251e9612a372ea2e25e0d896fb0c3b8e4c3af73 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 9 Aug 2013 21:54:37 +0200
Subject: some style changes

---
 lib/plugins/extension/helper/list.php |   8 +++++---
 lib/plugins/extension/images/tag.png  | Bin 0 -> 753 bytes
 lib/plugins/extension/style.less      |  30 +++++++++---------------------
 3 files changed, 14 insertions(+), 24 deletions(-)
 create mode 100644 lib/plugins/extension/images/tag.png

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/helper/list.php b/lib/plugins/extension/helper/list.php
index 62031a69b..79728b5ca 100644
--- a/lib/plugins/extension/helper/list.php
+++ b/lib/plugins/extension/helper/list.php
@@ -244,7 +244,7 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
         }
         if($extension->getTags()){
             $first = true;
-            echo '<span class="tags">';
+            $return .= '<span class="tags">';
             foreach ($extension->getTags() as $tag) {
                 if(!$first){
                     $return .= ', ';
@@ -254,7 +254,7 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
                 $url = $this->gui->tabURL('search', array('q' => 'tag:'.$tag));
                 $return .= '<a href="'.$url.'">'.hsc($tag).'</a>';
             }
-            echo '</span>';
+            $return .= '</span>';
         }
         $return .= '</span>';
         return $return;
@@ -451,7 +451,9 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
             }
             if (!$extension->isProtected()) {
                 if ($extension->isEnabled()) {
-                    $return .= $this->make_action('disable', $extension);
+                    if(!$extension->isTemplate()){ // templates can't be disabled, only anothe can be enabled
+                        $return .= $this->make_action('disable', $extension);
+                    }
                 } else {
                     $return .= $this->make_action('enable', $extension);
                 }
diff --git a/lib/plugins/extension/images/tag.png b/lib/plugins/extension/images/tag.png
new file mode 100644
index 000000000..155dbb3dd
Binary files /dev/null and b/lib/plugins/extension/images/tag.png differ
diff --git a/lib/plugins/extension/style.less b/lib/plugins/extension/style.less
index cd9eeaa74..53c260f8d 100644
--- a/lib/plugins/extension/style.less
+++ b/lib/plugins/extension/style.less
@@ -20,6 +20,7 @@
     background: url(images/overlay.png) repeat;
     text-align: center;
     cursor: pointer;
+    z-index: 9999;
 
     p {
         text-align: right;
@@ -44,16 +45,6 @@
     margin-left: 0;
 }
 
-#extension__manager a.taglink {
-    padding: 1px 4px;
-    background-color: @ini_background_neu;
-    border-radius: 3px;
-}
-[dir=rtl] #extension__manager a.taglink {
-    display: inline-block;
-    line-height: 1.2;
-}
-
 #extension__manager .panelHeader div.error {
     margin-top: 0;
     float: left;
@@ -173,6 +164,10 @@
     background: transparent url(images/disabled.png) no-repeat 2px 2px;
 }
 
+#extension__manager .disabled .legend {
+    opacity: 0.7;
+}
+
 #extension__manager div.screenshot img {
     width: 120px;
     height: 70px;
@@ -227,19 +222,12 @@
     font-size: 85%;
 }
 
-#extension__manager .legend span.linkbar a.urlextern + a.taglink,
-#extension__manager .legend span.linkbar a.interwiki + a.taglink {
-    margin-left: 0.4em;
-}
-[dir=rtl] #extension__manager .legend span.linkbar a.urlextern + a.taglink,
-[dir=rtl] #extension__manager .legend span.linkbar a.interwiki + a.taglink {
-    margin-left: 0;
-}
-[dir=rtl] #extension__manager .legend span.linkbar a.urlextern,
-[dir=rtl] #extension__manager .legend span.linkbar a.interwiki {
-    margin-left: .4em;
+#extension__manager .legend span.linkbar span.tags {
+    padding-left: 18px;
+    background: transparent url(images/tag.png) no-repeat 0 0;
 }
 
+
 #extension__manager .legend input.button {
     background: transparent url(images/up.png) no-repeat 0 0;
     box-shadow: none;
-- 
cgit v1.2.3


From 1e0eea17dc60dc6f5ec81ffcca313db353c88c44 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 9 Aug 2013 22:11:52 +0200
Subject: fixed popularity display

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

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/helper/extension.php b/lib/plugins/extension/helper/extension.php
index dc570aa0d..b3bce082f 100644
--- a/lib/plugins/extension/helper/extension.php
+++ b/lib/plugins/extension/helper/extension.php
@@ -349,7 +349,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return float|bool The popularity information or false if it isn't available
      */
     public function getPopularity() {
-        if (!empty($this->remoteInfo['popularity'])) return $this->remoteInfo['popularity']/200.0;
+        if (!empty($this->remoteInfo['popularity'])) return $this->remoteInfo['popularity'];
         return false;
     }
 
-- 
cgit v1.2.3


From 75e063084d865a011e074c29c5edb8569fe2cfe1 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 9 Aug 2013 22:58:01 +0200
Subject: made info mechanism work again

---
 lib/plugins/extension/admin.php             |  3 --
 lib/plugins/extension/helper/gui.php        | 21 +++++++++++---
 lib/plugins/extension/helper/list.php       | 43 ++++++++++++++---------------
 lib/plugins/extension/helper/repository.php | 12 ++++++--
 lib/plugins/extension/style.less            | 11 ++++----
 5 files changed, 54 insertions(+), 36 deletions(-)

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/admin.php b/lib/plugins/extension/admin.php
index f1ed83591..3237a26e5 100644
--- a/lib/plugins/extension/admin.php
+++ b/lib/plugins/extension/admin.php
@@ -63,9 +63,6 @@ class admin_plugin_extension extends DokuWiki_Admin_Plugin {
             foreach ($actions as $action => $extensions) {
                 foreach ($extensions as $extname => $label) {
                     switch ($action) {
-                        case 'info':
-                            $this->infoFor = $extname;
-                            break;
                         case 'install':
                         case 'reinstall':
                         case 'update':
diff --git a/lib/plugins/extension/helper/gui.php b/lib/plugins/extension/helper/gui.php
index 57dfefab3..6a0cdb22e 100644
--- a/lib/plugins/extension/helper/gui.php
+++ b/lib/plugins/extension/helper/gui.php
@@ -17,7 +17,18 @@ class helper_plugin_extension_gui extends DokuWiki_Plugin {
     protected $tabs = array('plugins', 'templates', 'search', 'install');
 
     /** @var string the extension that should have an open info window FIXME currently broken*/
-    protected $infofor = '';
+    protected $infoFor = '';
+
+    /**
+     * Constructor
+     *
+     * initializes requested info window
+     */
+    public function __construct(){
+        global $INPUT;
+        $this->infoFor = $INPUT->str('info');
+    }
+
 
     /**
      * display the plugin tab
@@ -37,7 +48,7 @@ class helper_plugin_extension_gui extends DokuWiki_Plugin {
         $list->start_form();
         foreach($pluginlist as $name) {
             $extension->setExtension($name);
-            $list->add_row($extension, $name == $this->infoFor);
+            $list->add_row($extension, $extension->getID() == $this->infoFor);
         }
         $list->end_form();
         $list->render();
@@ -61,7 +72,7 @@ class helper_plugin_extension_gui extends DokuWiki_Plugin {
         $list->start_form();
         foreach($tpllist as $name) {
             $extension->setExtension("template:$name");
-            $list->add_row($extension, $name == $this->infoFor);
+            $list->add_row($extension, $extension->getID() == $this->infoFor);
         }
         $list->end_form();
         $list->render();
@@ -93,7 +104,7 @@ class helper_plugin_extension_gui extends DokuWiki_Plugin {
         $list->start_form();
         foreach($result as $name) {
             $extension->setExtension($name);
-            $list->add_row($extension, $name == $this->infoFor);
+            $list->add_row($extension, $extension->getID() == $this->infoFor);
         }
         $list->end_form();
         $list->render();
@@ -149,12 +160,14 @@ class helper_plugin_extension_gui extends DokuWiki_Plugin {
      */
     public function tabURL($tab = '', $params = array(), $sep = '&amp;') {
         global $ID;
+        global $INPUT;
 
         if(!$tab) $tab = $this->currentTab();
         $defaults = array(
             'do'   => 'admin',
             'page' => 'extension',
             'tab'  => $tab,
+            'q'    => $INPUT->str('q')
         );
         return wl($ID, array_merge($defaults, $params), false, $sep);
     }
diff --git a/lib/plugins/extension/helper/list.php b/lib/plugins/extension/helper/list.php
index 79728b5ca..767a8ed40 100644
--- a/lib/plugins/extension/helper/list.php
+++ b/lib/plugins/extension/helper/list.php
@@ -101,7 +101,7 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
      * @param helper_plugin_extension_extension $extension The extension
      */
     private function start_row(helper_plugin_extension_extension $extension) {
-        $this->form .= '<li id="extensionplugin__'.hsc($extension->getInstallName()).'" class="'.$this->make_class($extension).'">';
+        $this->form .= '<li id="extensionplugin__'.hsc($extension->getID()).'" class="'.$this->make_class($extension).'">';
     }
 
     /**
@@ -221,7 +221,15 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
         $return .= '</p>';
 
         $return .= $this->make_linkbar($extension);
-        $return .= $this->make_action('info', $extension, $showinfo);
+
+        if($showinfo){
+            $url = $this->gui->tabURL('');
+            $return .= '<a href="'.$url.'#extensionplugin__'.$extension->getID().'" class="info close">'.$this->getLang('btn_info').'</a>';
+        }else{
+            $url = $this->gui->tabURL('', array('info' => $extension->getID()));
+            $return .= '<a href="'.$url.'#extensionplugin__'.$extension->getID().'" class="info">'.$this->getLang('btn_info').'</a>';
+        }
+
         if ($showinfo) {
             $return .= $this->make_info($extension);
         }
@@ -415,15 +423,14 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
 
     /**
      * Generate a list of links for extensions
-     * @param array $links The links
+     *
+     * @param array $ext The extensions
      * @return string The HTML code
      */
-    function make_linklist($links) {
+    function make_linklist($ext) {
         $return = '';
-        foreach ($links as $link) {
-            $dokulink = hsc($link);
-            if (strpos($link, 'template:') !== 0) $dokulink = 'plugin:'.$dokulink;
-            $return .= '<a href="http://www.dokuwiki.org/'.$dokulink.'" title="'.$dokulink.'" class="interwiki iw_doku">'.$link.'</a> ';
+        foreach ($ext as $link) {
+            $return .= '<a href="'.$this->gui->tabURL('search', array('q'=>'ext:'.$link)).'">'.hsc($link).'</a> ';
         }
         return $return;
     }
@@ -438,7 +445,7 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
         $return = '';
         if (!$extension->isInstalled() && $extension->canModify() === true) {
             $return .= $this->make_action('install', $extension);
-        } elseif ($extension->canModify()) {
+        } elseif ($extension->canModify() === true) {
             if (!$extension->isBundled()) {
                 $return .= $this->make_action('uninstall', $extension);
                 if ($extension->getDownloadURL()) {
@@ -451,7 +458,7 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
             }
             if (!$extension->isProtected()) {
                 if ($extension->isEnabled()) {
-                    if(!$extension->isTemplate()){ // templates can't be disabled, only anothe can be enabled
+                    if(!$extension->isTemplate()){ // templates can't be disabled, only another can be enabled
                         $return .= $this->make_action('disable', $extension);
                     }
                 } else {
@@ -473,28 +480,20 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
      *
      * @param string                            $action    The action
      * @param helper_plugin_extension_extension $extension The extension
-     * @param bool                              $showinfo  If the info block is shown
      * @return string The HTML code
      */
-    function make_action($action, $extension, $showinfo = false) {
-        $title = $revertAction = $extraClass = '';
+    function make_action($action, $extension) {
+        $title = '';
 
         switch ($action) {
-            case 'info':
-                $title = 'title="'.$this->getLang('btn_info').'"';
-                if ($showinfo) {
-                    $revertAction = '-';
-                    $extraClass   = 'close';
-                }
-                break;
             case 'install':
             case 'reinstall':
                 $title = 'title="'.$extension->getDownloadURL().'"';
                 break;
         }
 
-        $classes = 'button '.$action.' '.$extraClass;
-        $name    = 'fn['.$action.']['.$revertAction.hsc($extension->getInstallName()).']';
+        $classes = 'button '.$action;
+        $name    = 'fn['.$action.']['.hsc($extension->getID()).']';
 
         return '<input class="'.$classes.'" name="'.$name.'" type="submit" value="'.$this->getLang('btn_'.$action).'" '.$title.' />';
     }
diff --git a/lib/plugins/extension/helper/repository.php b/lib/plugins/extension/helper/repository.php
index 38e07786e..1f603a866 100644
--- a/lib/plugins/extension/helper/repository.php
+++ b/lib/plugins/extension/helper/repository.php
@@ -146,9 +146,10 @@ class helper_plugin_extension_repository extends DokuWiki_Plugin {
      */
     protected function parse_query($q){
         $parameters = array(
-            'tag' => array(),
+            'tag'  => array(),
             'mail' => array(),
-            'type' => array()
+            'type' => array(),
+            'ext'  => array()
         );
 
         // extract tags
@@ -165,6 +166,13 @@ class helper_plugin_extension_repository extends DokuWiki_Plugin {
                 $parameters['mail'][] = $m[3];
             }
         }
+        // extract extensions
+        if(preg_match_all('/(^|\s)(ext:([\S]+))/', $q, $matches, PREG_SET_ORDER)){
+            foreach($matches as $m){
+                $q = str_replace($m[2], '', $q);
+                $parameters['ext'][] = $m[3];
+            }
+        }
         // extract types
         if(preg_match_all('/(^|\s)(type:([\S]+))/', $q, $matches, PREG_SET_ORDER)){
             foreach($matches as $m){
diff --git a/lib/plugins/extension/style.less b/lib/plugins/extension/style.less
index 53c260f8d..fc5613044 100644
--- a/lib/plugins/extension/style.less
+++ b/lib/plugins/extension/style.less
@@ -228,21 +228,22 @@
 }
 
 
-#extension__manager .legend input.button {
+#extension__manager .legend a.info {
     background: transparent url(images/up.png) no-repeat 0 0;
-    box-shadow: none;
     border-width: 0;
-    height: 14px;
+    height: 13px;
+    width: 13px;
     text-indent: -99999px;
     float: right;
     margin: .5em 0 0;
+    overflow: hidden;
 }
-[dir=rtl] #extension__manager .legend input.button {
+[dir=rtl] #extension__manager .legend a.info {
     float: left;
     margin: .5em 0 0;
 }
 
-#extension__manager .legend  input.button.close {
+#extension__manager .legend  a.info.close {
     background: transparent url(images/down.png) no-repeat 0 0;
 }
 
-- 
cgit v1.2.3


From 72dda0b4378651b271f5fb516fb8e21a80ac3ebf Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 9 Aug 2013 23:55:39 +0200
Subject: added AJAX detail infos

---
 lib/plugins/extension/action.php      | 51 +++++++++++++++++++++++++++++++++++
 lib/plugins/extension/helper/list.php |  5 ++--
 lib/plugins/extension/script.js       | 29 +++++++++++++++++++-
 3 files changed, 82 insertions(+), 3 deletions(-)
 create mode 100644 lib/plugins/extension/action.php

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/action.php b/lib/plugins/extension/action.php
new file mode 100644
index 000000000..b35c1cb13
--- /dev/null
+++ b/lib/plugins/extension/action.php
@@ -0,0 +1,51 @@
+<?php
+/** DokuWiki Plugin extension (Action Component)
+ *
+ * @license GPL 2 http://www.gnu.org/licenses/gpl-2.0.html
+ * @author  Andreas Gohr <andi@splitbrain.org>
+ */
+
+// must be run within Dokuwiki
+if(!defined('DOKU_INC')) die();
+
+class action_plugin_extension extends DokuWiki_Action_Plugin {
+
+    /**
+     * Registers a callback function for a given event
+     *
+     * @param Doku_Event_Handler $controller DokuWiki's event controller object
+     * @return void
+     */
+    public function register(Doku_Event_Handler &$controller) {
+
+        $controller->register_hook('AJAX_CALL_UNKNOWN', 'BEFORE', $this, 'info');
+
+    }
+
+    public function info(Doku_Event &$event, $param){
+        global $INPUT;
+        if($event->data != 'plugin_extension') return;
+        $event->preventDefault();
+        $event->stopPropagation();
+
+        header('Content-Type: text/html; charset=utf-8');
+
+        $ext = $INPUT->str('ext');
+        if(!$ext) {
+            echo 'no extension given';
+            return;
+        }
+
+        /** @var helper_plugin_extension_extension $extension */
+        $extension = plugin_load('helper', 'extension_extension');
+        $extension->setExtension($ext);
+
+        /** @var helper_plugin_extension_list $list */
+        $list = plugin_load('helper', 'extension_list');
+
+
+        echo $list->make_info($extension);
+    }
+
+}
+
diff --git a/lib/plugins/extension/helper/list.php b/lib/plugins/extension/helper/list.php
index 767a8ed40..6b1d41f78 100644
--- a/lib/plugins/extension/helper/list.php
+++ b/lib/plugins/extension/helper/list.php
@@ -224,11 +224,12 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
 
         if($showinfo){
             $url = $this->gui->tabURL('');
-            $return .= '<a href="'.$url.'#extensionplugin__'.$extension->getID().'" class="info close">'.$this->getLang('btn_info').'</a>';
+            $class = 'close';
         }else{
             $url = $this->gui->tabURL('', array('info' => $extension->getID()));
-            $return .= '<a href="'.$url.'#extensionplugin__'.$extension->getID().'" class="info">'.$this->getLang('btn_info').'</a>';
+            $class = '';
         }
+        $return .= '<a href="'.$url.'#extensionplugin__'.$extension->getID().'" class="info '.$class.'" data-extid="'.$extension->getID().'">'.$this->getLang('btn_info').'</a>';
 
         if ($showinfo) {
             $return .= $this->make_info($extension);
diff --git a/lib/plugins/extension/script.js b/lib/plugins/extension/script.js
index f2a6aae50..7480801ac 100644
--- a/lib/plugins/extension/script.js
+++ b/lib/plugins/extension/script.js
@@ -5,7 +5,7 @@ jQuery(function(){
      * very simple lightbox
      * @link http://webdesign.tutsplus.com/tutorials/htmlcss-tutorials/super-simple-lightbox-with-css-and-jquery/
      */
-    jQuery('a.extension_screenshot').click(function(e) {
+    jQuery('#extension__manager a.extension_screenshot').click(function(e) {
         e.preventDefault();
 
         //Get clicked link href
@@ -31,4 +31,31 @@ jQuery(function(){
         return false;
     });
 
+    /**
+     * AJAX detail infos
+     */
+    jQuery('#extension__manager a.info').click(function(e){
+        e.preventDefault();
+
+        var $link = jQuery(this);
+        var $details = $link.parent().find('dl.details');
+        if($details.length){
+            $link.toggleClass('close');
+            $details.toggle();
+            return;
+        }
+
+        $link.addClass('close');
+        jQuery.get(
+            DOKU_BASE + 'lib/exe/ajax.php',
+            {
+                call: 'plugin_extension',
+                ext: $link.data('extid')
+            },
+            function(data){
+                $link.parent().append(data);
+            }
+        );
+    });
+
 });
\ No newline at end of file
-- 
cgit v1.2.3


From fee60c9e19860de9edb1dd146ec7063bb9eda392 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 10 Aug 2013 10:23:04 +0200
Subject: manual install tab now works

---
 lib/plugins/extension/admin.php            | 46 +++++++++-----
 lib/plugins/extension/helper/extension.php | 98 +++++++++++++++++++++++++-----
 lib/plugins/extension/helper/gui.php       | 14 +++--
 lib/plugins/extension/lang/en/lang.php     |  4 +-
 4 files changed, 127 insertions(+), 35 deletions(-)

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/admin.php b/lib/plugins/extension/admin.php
index 3237a26e5..62d94e899 100644
--- a/lib/plugins/extension/admin.php
+++ b/lib/plugins/extension/admin.php
@@ -22,7 +22,7 @@ class admin_plugin_extension extends DokuWiki_Admin_Plugin {
      *
      * loads additional helpers
      */
-    public function __construct(){
+    public function __construct() {
         $this->gui = plugin_load('helper', 'extension_gui');
     }
 
@@ -49,37 +49,36 @@ class admin_plugin_extension extends DokuWiki_Admin_Plugin {
         /* @var helper_plugin_extension_repository $repository */
         $repository = $this->loadHelper('extension_repository');
 
-
-        if(!$repository->hasAccess()){
-            $url = $this->gui->tabURL('', array('purge'=>1));
+        if(!$repository->hasAccess()) {
+            $url = $this->gui->tabURL('', array('purge' => 1));
             msg($this->getLang('repo_error').' [<a href="'.$url.'">'.$this->getLang('repo_retry').'</a>]', -1);
         }
 
         /* @var helper_plugin_extension_extension $extension */
         $extension = $this->loadHelper('extension_extension');
 
-        if ($INPUT->post->has('fn')) {
+        if($INPUT->post->has('fn') && checkSecurityToken()) {
             $actions = $INPUT->post->arr('fn');
-            foreach ($actions as $action => $extensions) {
-                foreach ($extensions as $extname => $label) {
-                    switch ($action) {
+            foreach($actions as $action => $extensions) {
+                foreach($extensions as $extname => $label) {
+                    switch($action) {
                         case 'install':
                         case 'reinstall':
                         case 'update':
                             try {
                                 $extension->setExtension($extname);
                                 $installed = $extension->installOrUpdate();
-                                foreach($installed as $extension => $info){
+                                foreach($installed as $ext => $info) {
                                     msg(sprintf($this->getLang('msg_'.$info['type'].'_'.$info['action'].'_success'), $info['base']), 1);
                                 }
-                            }catch (Exception $e){
+                            } catch(Exception $e) {
                                 msg($e->getMessage(), -1);
                             }
                             break;
                         case 'uninstall':
                             $extension->setExtension($extname);
                             $status = $extension->uninstall();
-                            if ($status !== true) {
+                            if($status !== true) {
                                 msg($status, -1);
                             } else {
                                 msg(sprintf($this->getLang('msg_delete_success'), hsc($extension->getDisplayName())), 1);
@@ -88,7 +87,7 @@ class admin_plugin_extension extends DokuWiki_Admin_Plugin {
                         case 'enable';
                             $extension->setExtension($extname);
                             $status = $extension->enable();
-                            if ($status !== true) {
+                            if($status !== true) {
                                 msg($status, -1);
                             } else {
                                 msg(sprintf($this->getLang('msg_enabled'), hsc($extension->getDisplayName())), 1);
@@ -97,7 +96,7 @@ class admin_plugin_extension extends DokuWiki_Admin_Plugin {
                         case 'disable';
                             $extension->setExtension($extname);
                             $status = $extension->disable();
-                            if ($status !== true) {
+                            if($status !== true) {
                                 msg($status, -1);
                             } else {
                                 msg(sprintf($this->getLang('msg_disabled'), hsc($extension->getDisplayName())), 1);
@@ -106,6 +105,24 @@ class admin_plugin_extension extends DokuWiki_Admin_Plugin {
                     }
                 }
             }
+        } elseif($INPUT->post->str('installurl') && checkSecurityToken()) {
+            try {
+                $installed = $extension->installFromURL($INPUT->post->str('installurl'));
+                foreach($installed as $ext => $info) {
+                    msg(sprintf($this->getLang('msg_'.$info['type'].'_'.$info['action'].'_success'), $info['base']), 1);
+                }
+            } catch(Exception $e) {
+                msg($e->getMessage(), -1);
+            }
+        } elseif(isset($_FILES['installfile']) && checkSecurityToken()) {
+            try {
+                $installed = $extension->installFromUpload('installfile');
+                foreach($installed as $ext => $info) {
+                    msg(sprintf($this->getLang('msg_'.$info['type'].'_'.$info['action'].'_success'), $info['base']), 1);
+                }
+            } catch(Exception $e) {
+                msg($e->getMessage(), -1);
+            }
         }
     }
 
@@ -118,7 +135,7 @@ class admin_plugin_extension extends DokuWiki_Admin_Plugin {
 
         $this->gui->tabNavigation();
 
-        switch($this->gui->currentTab()){
+        switch($this->gui->currentTab()) {
             case 'search':
                 $this->gui->tabSearch();
                 break;
@@ -133,7 +150,6 @@ class admin_plugin_extension extends DokuWiki_Admin_Plugin {
                 $this->gui->tabPlugins();
         }
 
-
         ptln('</div>');
     }
 }
diff --git a/lib/plugins/extension/helper/extension.php b/lib/plugins/extension/helper/extension.php
index b3bce082f..550fc33fb 100644
--- a/lib/plugins/extension/helper/extension.php
+++ b/lib/plugins/extension/helper/extension.php
@@ -530,6 +530,67 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
         return true;
     }
 
+    /**
+     * Install an extension from a user upload
+     *
+     * @param string $field name of the upload file
+     * @throws Exception when something goes wrong
+     * @return array The list of installed extensions
+     */
+    public function installFromUpload($field){
+        if($_FILES[$field]['error']){
+            throw new Exception($this->getLang('msg_upload_failed').' ('.$_FILES[$field]['error'].')');
+        }
+
+        $tmp = $this->mkTmpDir();
+        if(!$tmp) throw new Exception($this->getLang('error_dircreate'));
+
+        // filename may contain the plugin name for old style plugins...
+        $basename = basename($_FILES[$field]['name']);
+        $basename = preg_replace('/\.(tar\.gz|tar\.bz|tar\.bz2|tar|tgz|tbz|zip)$/', '', $basename);
+        $basename = preg_replace('/[\W]+/', '', $basename);
+
+        if(!move_uploaded_file($_FILES[$field]['tmp_name'], "$tmp/upload.archive")){
+            throw new Exception($this->getLang('msg_upload_failed'));
+        }
+
+        try {
+            $installed = $this->installArchive("$tmp/upload.archive", true, $basename);
+
+            // purge caches
+            foreach($installed as $ext => $info){
+                $this->setExtension($ext);
+                $this->purgeCache();
+            }
+        }catch (Exception $e){
+            throw $e;
+        }
+        return $installed;
+    }
+
+    /**
+     * Install an extension from a remote URL
+     *
+     * @param string $url
+     * @throws Exception when something goes wrong
+     * @return array The list of installed extensions
+     */
+    public function installFromURL($url){
+        try {
+            $path      = $this->download($url);
+            $installed = $this->installArchive($path, true);
+
+            // purge caches
+            foreach($installed as $ext => $info){
+                $this->setExtension($ext);
+                $this->purgeCache();
+            }
+        }catch (Exception $e){
+            throw $e;
+        }
+        return $installed;
+    }
+
     /**
      * Install or update the extension
      *
@@ -759,9 +820,10 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @param bool   $overwrite If an already installed plugin should be overwritten
      * @param string $base      The basename of the plugin if it's known
      * @throws Exception        when something went wrong
-     * @return bool|string True on success, an error message on failure
+     * @return array            list of installed extensions
      */
     public function installArchive($file, $overwrite=false, $base = '') {
+        $installed_extensions = array();
 
         // create tmp directory for decompression
         if(!($tmp = $this->mkTmpDir())) {
@@ -774,20 +836,16 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
         }
 
         // decompress
-        if(!$this->decompress($file, "$tmp/".$base)) {
-            throw new Exception(sprintf($this->getLang('error_decompress'), $file));
+        try{
+            $this->decompress($file, "$tmp/".$base);
+        } catch (Exception $e) {
+            throw $e;
         }
 
         // search $tmp/$base for the folder(s) that has been created
         // move the folder(s) to lib/..
         $result = array('old'=>array(), 'new'=>array());
-        if($base){
-            // when a base was set it came from the current extension setup #fixme this is a bit hacky
-            $default = ($this->isTemplate() ? 'template' : 'plugin');
-        }else{
-            // assume a default of plugin, find_folders will autodetect templates
-            $default = 'plugin';
-        }
+        $default = ($this->isTemplate() ? 'template' : 'plugin');
         if(!$this->find_folders($result, $tmp.'/'.$base, $default)) {
             throw new Exception($this->getLang('error_findfolder'));
         }
@@ -799,6 +857,10 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
             $install = $result['old'];
         }
 
+        if(!count($install)){
+            throw new Exception($this->getLang('error_findfolder'));
+        }
+
         // now install all found items
         foreach($install as $item) {
             // where to install?
@@ -933,11 +995,15 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
         return true;
     }
 
-
     /**
      * Decompress a given file to the given target directory
      *
      * Determines the compression type from the file extension
+     *
+     * @param string $file   archive to extract
+     * @param string $target directory to extract to
+     * @throws Exception
+     * @return bool
      */
     private function decompress($file, $target) {
         // decompression library doesn't like target folders ending in "/"
@@ -961,7 +1027,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
                 $tar->open($file, $compress_type);
                 $tar->extract($target);
             } catch (Exception $e) {
-                return $e->getMessage();
+                throw new Exception($this->getLang('error_decompress').' '.$e->getMessage());
             }
 
             return true;
@@ -970,11 +1036,15 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
             $zip = new ZipLib();
             $ok  = $zip->Extract($file, $target);
 
-            return ($ok==-1 ? 'Error extracting the zip archive' : true);
+            if($ok == -1){
+                throw new Exception($this->getLang('error_decompress').' Error extracting the zip archive');
+            }
+
+            return true;
         }
 
         // the only case when we don't get one of the recognized archive types is when the archive file can't be read
-        return 'Couldn\'t read archive file';
+        throw new Exception($this->getLang('error_decompress').' Couldn\'t read archive file');
     }
 
     /**
diff --git a/lib/plugins/extension/helper/gui.php b/lib/plugins/extension/helper/gui.php
index 6a0cdb22e..8577a1696 100644
--- a/lib/plugins/extension/helper/gui.php
+++ b/lib/plugins/extension/helper/gui.php
@@ -16,7 +16,7 @@ class helper_plugin_extension_gui extends DokuWiki_Plugin {
 
     protected $tabs = array('plugins', 'templates', 'search', 'install');
 
-    /** @var string the extension that should have an open info window FIXME currently broken*/
+    /** @var string the extension that should have an open info window FIXME currently broken */
     protected $infoFor = '';
 
     /**
@@ -24,12 +24,11 @@ class helper_plugin_extension_gui extends DokuWiki_Plugin {
      *
      * initializes requested info window
      */
-    public function __construct(){
+    public function __construct() {
         global $INPUT;
         $this->infoFor = $INPUT->str('info');
     }
 
-
     /**
      * display the plugin tab
      */
@@ -92,10 +91,9 @@ class helper_plugin_extension_gui extends DokuWiki_Plugin {
 
         if(!$INPUT->bool('q')) return;
 
-
         /* @var helper_plugin_extension_repository $repository FIXME should we use some gloabl instance? */
         $repository = $this->loadHelper('extension_repository');
-        $result = $repository->search($INPUT->str('q'));
+        $result     = $repository->search($INPUT->str('q'));
 
         /* @var helper_plugin_extension_extension $extension */
         $extension = $this->loadHelper('extension_extension');
@@ -116,6 +114,12 @@ class helper_plugin_extension_gui extends DokuWiki_Plugin {
      */
     public function tabInstall() {
         echo $this->locale_xhtml('intro_install');
+
+        $form = new Doku_Form(array('action' => $this->tabURL('', array(), '&'), 'enctype' => 'multipart/form-data'));
+        $form->addElement(form_makeTextField('installurl', '', 'Install from URL:', '', 'block'));
+        $form->addElement(form_makeFileField('installfile', 'Upload Extension:', '', 'block'));
+        $form->addElement(form_makeButton('submit', '', 'Install'));
+        $form->printForm();
     }
 
     /**
diff --git a/lib/plugins/extension/lang/en/lang.php b/lib/plugins/extension/lang/en/lang.php
index 1a5c90923..0c4582124 100644
--- a/lib/plugins/extension/lang/en/lang.php
+++ b/lib/plugins/extension/lang/en/lang.php
@@ -79,6 +79,8 @@ $lang['msg_template_update_success'] = 'Template %s updated successfully';
 $lang['msg_plugin_install_success'] = 'Plugin %s installed successfully';
 $lang['msg_plugin_update_success'] = 'Plugin %s updated successfully';
 
+$lang['msg_upload_failed'] = 'Uploading the file failed';
+
 
 $lang['msg_url_failed']         = 'URL [%s] could not be downloaded.<br /> %s';
 $lang['msg_download_failed']    = 'Plugin %s could not be downloaded.<br /> %s';
@@ -130,7 +132,7 @@ $lang['no_manager']             = 'Could not find manager.dat file';
 $lang['error_badurl']           = 'URL ends with slash - unable to determine file name from the url';
 $lang['error_dircreate']        = 'Unable to create temporary folder to receive download';
 $lang['error_download']         = 'Unable to download the file: %s';
-$lang['error_decompress']       = 'Unable to decompress the downloaded file. This maybe as a result of a bad download, in which case you should try again; or the compression format may be unknown, in which case you will need to download and install manually';
+$lang['error_decompress']       = 'Unable to decompress the downloaded file. This maybe as a result of a bad download, in which case you should try again; or the compression format may be unknown, in which case you will need to download and install manually.';
 $lang['error_findfolder']       = 'Unable to identify extension directory, you need to download and install manually';
 $lang['error_copy']             = 'There was a file copy error while attempting to install files for directory <em>%s</em>: the disk could be full or file access permissions may be incorrect. This may have resulted in a partially installed plugin and leave your wiki installation unstable';
 //Setup VIM: ex: et ts=4 :
-- 
cgit v1.2.3


From df7751c6c456e0107b11d547c159266b470470d9 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 10 Aug 2013 10:45:29 +0200
Subject: nicer tabs

---
 lib/plugins/extension/helper/gui.php              |  8 ++++++++
 lib/plugins/extension/lang/en/intro_install.txt   |  2 +-
 lib/plugins/extension/lang/en/intro_plugins.txt   |  2 +-
 lib/plugins/extension/lang/en/intro_search.txt    |  2 +-
 lib/plugins/extension/lang/en/intro_templates.txt |  2 +-
 lib/plugins/extension/style.less                  | 20 ++++++++++++++++++++
 6 files changed, 32 insertions(+), 4 deletions(-)

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/helper/gui.php b/lib/plugins/extension/helper/gui.php
index 8577a1696..7ad238af4 100644
--- a/lib/plugins/extension/helper/gui.php
+++ b/lib/plugins/extension/helper/gui.php
@@ -36,7 +36,9 @@ class helper_plugin_extension_gui extends DokuWiki_Plugin {
         /* @var Doku_Plugin_Controller $plugin_controller */
         global $plugin_controller;
 
+        echo '<div class="panelHeader">';
         echo $this->locale_xhtml('intro_plugins');
+        echo '</div>';
 
         $pluginlist = $plugin_controller->getList('', true);
         sort($pluginlist);
@@ -57,7 +59,9 @@ class helper_plugin_extension_gui extends DokuWiki_Plugin {
      * Display the template tab
      */
     public function tabTemplates() {
+        echo '<div class="panelHeader">';
         echo $this->locale_xhtml('intro_templates');
+        echo '</div>';
 
         // FIXME do we have a real way?
         $tpllist = glob(DOKU_INC.'lib/tpl/*', GLOB_ONLYDIR);
@@ -82,7 +86,9 @@ class helper_plugin_extension_gui extends DokuWiki_Plugin {
      */
     public function tabSearch() {
         global $INPUT;
+        echo '<div class="panelHeader">';
         echo $this->locale_xhtml('intro_search');
+        echo '</div>';
 
         $form = new Doku_Form(array('action' => $this->tabURL('', array(), '&')));
         $form->addElement(form_makeTextField('q', $INPUT->str('q'), 'Search'));
@@ -113,7 +119,9 @@ class helper_plugin_extension_gui extends DokuWiki_Plugin {
      * Display the template tab
      */
     public function tabInstall() {
+        echo '<div class="panelHeader">';
         echo $this->locale_xhtml('intro_install');
+        echo '</div>';
 
         $form = new Doku_Form(array('action' => $this->tabURL('', array(), '&'), 'enctype' => 'multipart/form-data'));
         $form->addElement(form_makeTextField('installurl', '', 'Install from URL:', '', 'block'));
diff --git a/lib/plugins/extension/lang/en/intro_install.txt b/lib/plugins/extension/lang/en/intro_install.txt
index f68d2d909..0556c8048 100644
--- a/lib/plugins/extension/lang/en/intro_install.txt
+++ b/lib/plugins/extension/lang/en/intro_install.txt
@@ -1 +1 @@
-Here you can manual install plugins and templates by either uploading them or providing a direct download URL.
\ No newline at end of file
+Here you can manually install plugins and templates by either uploading them or providing a direct download URL.
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/en/intro_plugins.txt b/lib/plugins/extension/lang/en/intro_plugins.txt
index ef180135e..4e42efee1 100644
--- a/lib/plugins/extension/lang/en/intro_plugins.txt
+++ b/lib/plugins/extension/lang/en/intro_plugins.txt
@@ -1 +1 @@
-Here you can view, enable and disable installed plugins.
\ No newline at end of file
+These are the plugins currently installed in your DokuWiki. You can enable or disable or even completely uninstall them here. Plugin updates are shown here as well, be sure to read the plugin's documentation before updating.
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/en/intro_search.txt b/lib/plugins/extension/lang/en/intro_search.txt
index 003c99c61..244cd6812 100644
--- a/lib/plugins/extension/lang/en/intro_search.txt
+++ b/lib/plugins/extension/lang/en/intro_search.txt
@@ -1 +1 @@
-Here you can search for available plugins and templates for DokuWiki. Be sure to read more about Plugin Security before installing FIXME add link
\ No newline at end of file
+This tab gives you access to all available 3rd party plugins and templates for DokuWiki. Please be aware that installing 3rd party code may pose a **security risk**, you may want to read about [[doku>security#plugin_security|plugin security]] first.
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/en/intro_templates.txt b/lib/plugins/extension/lang/en/intro_templates.txt
index 2b3af727b..d42180cc4 100644
--- a/lib/plugins/extension/lang/en/intro_templates.txt
+++ b/lib/plugins/extension/lang/en/intro_templates.txt
@@ -1 +1 @@
-Here you can view, enable and disable installed templates. Note that only one template can be activated at a time.
\ No newline at end of file
+These are the templates currently installed in your DokuWiki. Note that only one template can be activated at a time.
diff --git a/lib/plugins/extension/style.less b/lib/plugins/extension/style.less
index fc5613044..8c85bec46 100644
--- a/lib/plugins/extension/style.less
+++ b/lib/plugins/extension/style.less
@@ -38,6 +38,26 @@
     }
 }
 
+#extension__manager {
+    /* tab layout - most of it is in the main template */
+    ul.tabs li.active a {
+        background-color: @ini_background_alt;
+        border-bottom: solid 1px @ini_background_alt;
+        z-index: 2;
+    }
+    .panelHeader {
+        background-color: @ini_background_alt;
+        margin: 0 0 10px 0;
+        padding: 10px 10px 8px;
+        text-align: left;
+        overflow: hidden;
+    }
+}
+
+/* ------- FIXME everything below needs to be checked for usage ---------- */
+
+
+
 /*
  * general layout
  */
-- 
cgit v1.2.3


From 32fdfac2cd446733436dc1b344d7f73b78655cb1 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 10 Aug 2013 11:11:14 +0200
Subject: changed exception handling, redirect after post actions

---
 lib/plugins/extension/admin.php        | 98 +++++++++++++++++-----------------
 lib/plugins/extension/helper/gui.php   |  5 +-
 lib/plugins/extension/lang/en/lang.php |  2 +
 3 files changed, 53 insertions(+), 52 deletions(-)

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/admin.php b/lib/plugins/extension/admin.php
index 62d94e899..99c74848b 100644
--- a/lib/plugins/extension/admin.php
+++ b/lib/plugins/extension/admin.php
@@ -57,73 +57,71 @@ class admin_plugin_extension extends DokuWiki_Admin_Plugin {
         /* @var helper_plugin_extension_extension $extension */
         $extension = $this->loadHelper('extension_extension');
 
-        if($INPUT->post->has('fn') && checkSecurityToken()) {
-            $actions = $INPUT->post->arr('fn');
-            foreach($actions as $action => $extensions) {
-                foreach($extensions as $extname => $label) {
-                    switch($action) {
-                        case 'install':
-                        case 'reinstall':
-                        case 'update':
-                            try {
+        try {
+            if($INPUT->post->has('fn') && checkSecurityToken()) {
+                $actions = $INPUT->post->arr('fn');
+                foreach($actions as $action => $extensions) {
+                    foreach($extensions as $extname => $label) {
+                        switch($action) {
+                            case 'install':
+                            case 'reinstall':
+                            case 'update':
                                 $extension->setExtension($extname);
                                 $installed = $extension->installOrUpdate();
                                 foreach($installed as $ext => $info) {
                                     msg(sprintf($this->getLang('msg_'.$info['type'].'_'.$info['action'].'_success'), $info['base']), 1);
                                 }
-                            } catch(Exception $e) {
-                                msg($e->getMessage(), -1);
-                            }
-                            break;
-                        case 'uninstall':
-                            $extension->setExtension($extname);
-                            $status = $extension->uninstall();
-                            if($status !== true) {
-                                msg($status, -1);
-                            } else {
-                                msg(sprintf($this->getLang('msg_delete_success'), hsc($extension->getDisplayName())), 1);
-                            }
-                            break;
-                        case 'enable';
-                            $extension->setExtension($extname);
-                            $status = $extension->enable();
-                            if($status !== true) {
-                                msg($status, -1);
-                            } else {
-                                msg(sprintf($this->getLang('msg_enabled'), hsc($extension->getDisplayName())), 1);
-                            }
-                            break;
-                        case 'disable';
-                            $extension->setExtension($extname);
-                            $status = $extension->disable();
-                            if($status !== true) {
-                                msg($status, -1);
-                            } else {
-                                msg(sprintf($this->getLang('msg_disabled'), hsc($extension->getDisplayName())), 1);
-                            }
-                            break;
+                                break;
+                            case 'uninstall':
+                                $extension->setExtension($extname);
+                                $status = $extension->uninstall();
+                                if($status !== true) {
+                                    msg($status, -1);
+                                } else {
+                                    msg(sprintf($this->getLang('msg_delete_success'), hsc($extension->getDisplayName())), 1);
+                                }
+                                break;
+                            case 'enable';
+                                $extension->setExtension($extname);
+                                $status = $extension->enable();
+                                if($status !== true) {
+                                    msg($status, -1);
+                                } else {
+                                    msg(sprintf($this->getLang('msg_enabled'), hsc($extension->getDisplayName())), 1);
+                                }
+                                break;
+                            case 'disable';
+                                $extension->setExtension($extname);
+                                $status = $extension->disable();
+                                if($status !== true) {
+                                    msg($status, -1);
+                                } else {
+                                    msg(sprintf($this->getLang('msg_disabled'), hsc($extension->getDisplayName())), 1);
+                                }
+                                break;
+                        }
                     }
                 }
-            }
-        } elseif($INPUT->post->str('installurl') && checkSecurityToken()) {
-            try {
+                send_redirect($this->gui->tabURL('', array(), '&', true));
+            } elseif($INPUT->post->str('installurl') && checkSecurityToken()) {
                 $installed = $extension->installFromURL($INPUT->post->str('installurl'));
                 foreach($installed as $ext => $info) {
                     msg(sprintf($this->getLang('msg_'.$info['type'].'_'.$info['action'].'_success'), $info['base']), 1);
                 }
-            } catch(Exception $e) {
-                msg($e->getMessage(), -1);
-            }
-        } elseif(isset($_FILES['installfile']) && checkSecurityToken()) {
-            try {
+                send_redirect($this->gui->tabURL('', array(), '&', true));
+            } elseif(isset($_FILES['installfile']) && checkSecurityToken()) {
                 $installed = $extension->installFromUpload('installfile');
                 foreach($installed as $ext => $info) {
                     msg(sprintf($this->getLang('msg_'.$info['type'].'_'.$info['action'].'_success'), $info['base']), 1);
                 }
-            } catch(Exception $e) {
-                msg($e->getMessage(), -1);
+                send_redirect($this->gui->tabURL('', array(), '&', true));
             }
+
+        } catch(Exception $e) {
+            msg($e->getMessage(), -1);
+            send_redirect($this->gui->tabURL('', array(), '&', true));
         }
+
     }
 
     /**
diff --git a/lib/plugins/extension/helper/gui.php b/lib/plugins/extension/helper/gui.php
index 7ad238af4..2c2a19bf8 100644
--- a/lib/plugins/extension/helper/gui.php
+++ b/lib/plugins/extension/helper/gui.php
@@ -168,9 +168,10 @@ class helper_plugin_extension_gui extends DokuWiki_Plugin {
      * @param string $tab    tab to load, empty for current tab
      * @param array  $params associative array of parameter to set
      * @param string $sep    seperator to build the URL
+     * @param bool   $absolute create absolute URLs?
      * @return string
      */
-    public function tabURL($tab = '', $params = array(), $sep = '&amp;') {
+    public function tabURL($tab = '', $params = array(), $sep = '&amp;', $absolute=false) {
         global $ID;
         global $INPUT;
 
@@ -181,7 +182,7 @@ class helper_plugin_extension_gui extends DokuWiki_Plugin {
             'tab'  => $tab,
             'q'    => $INPUT->str('q')
         );
-        return wl($ID, array_merge($defaults, $params), false, $sep);
+        return wl($ID, array_merge($defaults, $params), $absolute, $sep);
     }
 
 }
diff --git a/lib/plugins/extension/lang/en/lang.php b/lib/plugins/extension/lang/en/lang.php
index 0c4582124..8aaa0d8d2 100644
--- a/lib/plugins/extension/lang/en/lang.php
+++ b/lib/plugins/extension/lang/en/lang.php
@@ -74,6 +74,8 @@ $lang['msg_disabled']           = 'Plugin %s disabled';
 $lang['msg_notdisabled']        = 'Plugin %s could not be disabled, check file permissions';
 
 
+$lang['msg_delete_success']     = 'Extension uninstalled';
+
 $lang['msg_template_install_success'] = 'Template %s installed successfully';
 $lang['msg_template_update_success'] = 'Template %s updated successfully';
 $lang['msg_plugin_install_success'] = 'Plugin %s installed successfully';
-- 
cgit v1.2.3


From 8d295da079a559bf0f254f0db383e0b3188f9985 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 10 Aug 2013 11:46:09 +0200
Subject: language cleanup

removed all unused strings
---
 lib/plugins/extension/helper/extension.php |   2 +-
 lib/plugins/extension/lang/en/lang.php     | 195 ++++++++++-------------------
 lib/plugins/extension/style.less           |   6 +-
 3 files changed, 70 insertions(+), 133 deletions(-)

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/helper/extension.php b/lib/plugins/extension/helper/extension.php
index 550fc33fb..d912a44c0 100644
--- a/lib/plugins/extension/helper/extension.php
+++ b/lib/plugins/extension/helper/extension.php
@@ -797,7 +797,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
         // check the url
         $matches = array();
         if(!preg_match('/[^\/]*$/', $url, $matches) || !$matches[0]) {
-            throw new Exception($this->getLang('baddownloadurl'));
+            throw new Exception($this->getLang('error_badurl'));
         }
         $file = $matches[0];
 
diff --git a/lib/plugins/extension/lang/en/lang.php b/lib/plugins/extension/lang/en/lang.php
index 8aaa0d8d2..db1449ae0 100644
--- a/lib/plugins/extension/lang/en/lang.php
+++ b/lib/plugins/extension/lang/en/lang.php
@@ -6,135 +6,68 @@
  * @author Christopher Smith <chris@jalakai.co.uk>
  */
 
-// menu entry for admin plugins
-$lang['menu'] = 'Extension Manager';
-
-$lang['tab_plugins']   = 'Installed Plugins';
-$lang['tab_templates'] = 'Installed Templates';
-$lang['tab_search']    = 'Search and Install';
-$lang['tab_install']   = 'Manual Install';
-
-// custom language strings for the plugin
-$lang['notimplemented'] = 'This feature hasn\'t been implemented yet';
-$lang['alreadyenabled'] = 'This extension has already been enabled';
-$lang['alreadydisabled'] = 'This extension has already been disabled';
-$lang['pluginlistsaveerror'] = 'There was an error saving the plugin list';
-$lang['unknownauthor'] = 'Unknown author';
-$lang['unknownversion'] = 'Unknown version';
-
-// extension list
-$lang['btn_info']               = 'Show more info';
-$lang['btn_update']             = 'Update';
-$lang['btn_uninstall']          = 'Uninstall';
-$lang['btn_enable']             = 'Enable';
-$lang['btn_disable']            = 'Disable';
-//$lang['btn_disable_all']        = 'Disable all';
-//$lang['btn_settings']           = 'Settings';
-$lang['btn_install']           = 'Install';
-$lang['btn_reinstall']          = 'Re-install';
-//$lang['btn_disdown']            = 'Download as Disabled';
-//$lang['btn_dependown']          = 'Download with dependencies';
-
-$lang['extensionby']            = '<strong>%s</strong> by %s';
-$lang['popularity']             = 'Popularity: %s';
-$lang['homepage_link']          = 'Docs';
-$lang['bugs_features']          = 'Bugs';
-$lang['author_hint']            = 'Search extensions by this author';
-$lang['tag_hint']               = 'Search extensions with this tag';
-$lang['installed']              = 'Installed:';
-$lang['lastupdate']             = 'Last updated:';
-$lang['downloadurl']            = 'Download URL:';
-$lang['repository']             = 'Repository:';
-$lang['unknown']                = '<em>unknown</em>';
-$lang['installed_version']      = 'Installed version:';
-$lang['install_date']           = 'Your last update:';
-$lang['available_version']      = 'Version:';
-$lang['compatible']             = 'Compatible with:';
-$lang['depends']                = 'Depends on:';
-$lang['similar']                = 'Similar to:';
-$lang['conflicts']              = 'Conflicts with:';
-$lang['donate']                 = 'Donate';
-$lang['bundled']                = 'bundled';
-$lang['manual_install']         = 'manual install';
-
-$lang['repo_error'] = 'The DokuWiki extension repository can not be reached currently. Online Features are not available.';
-$lang['repo_retry'] = 'Retry';
-
-$lang['msg_tpl_uninstalled']        = 'Template %s uninstalled';
-$lang['msg_tpl_uninstalled']     = 'Template %s could not be uninstalled';
-$lang['msg_uninstalled']            = 'Plugin %s uninstalled';
-$lang['msg_uninstalled']         = 'Plugin %s could not be uninstalled';
-
-$lang['msg_tpl_enabled']        = 'Template %s enabled';
-$lang['msg_tpl_notenabled']     = 'Template %s could not be enabled, check file permissions';
-$lang['msg_enabled']            = 'Plugin %s enabled';
-$lang['msg_notenabled']         = 'Plugin %s could not be enabled, check file permissions';
-
-$lang['msg_disabled']           = 'Plugin %s disabled';
-$lang['msg_notdisabled']        = 'Plugin %s could not be disabled, check file permissions';
-
-
-$lang['msg_delete_success']     = 'Extension uninstalled';
-
+$lang['menu']                         = 'Extension Manager';
+
+$lang['tab_plugins']                  = 'Installed Plugins';
+$lang['tab_templates']                = 'Installed Templates';
+$lang['tab_search']                   = 'Search and Install';
+$lang['tab_install']                  = 'Manual Install';
+
+$lang['notimplemented']               = 'This feature hasn\'t been implemented yet';
+$lang['notinstalled']                 = 'This extension is not installed';
+$lang['alreadyenabled']               = 'This extension has already been enabled';
+$lang['alreadydisabled']              = 'This extension has already been disabled';
+$lang['pluginlistsaveerror']          = 'There was an error saving the plugin list';
+$lang['unknownauthor']                = 'Unknown author';
+$lang['unknownversion']               = 'Unknown version';
+
+$lang['btn_info']                     = 'Show more info';
+$lang['btn_update']                   = 'Update';
+$lang['btn_uninstall']                = 'Uninstall';
+$lang['btn_enable']                   = 'Enable';
+$lang['btn_disable']                  = 'Disable';
+$lang['btn_install']                  = 'Install';
+$lang['btn_reinstall']                = 'Re-install';
+
+$lang['extensionby']                  = '<strong>%s</strong> by %s';
+$lang['popularity']                   = 'Popularity: %s';
+$lang['homepage_link']                = 'Docs';
+$lang['bugs_features']                = 'Bugs';
+$lang['author_hint']                  = 'Search extensions by this author';
+$lang['installed']                    = 'Installed:';
+$lang['downloadurl']                  = 'Download URL:';
+$lang['repository']                   = 'Repository:';
+$lang['unknown']                      = '<em>unknown</em>';
+$lang['installed_version']            = 'Installed version:';
+$lang['install_date']                 = 'Your last update:';
+$lang['available_version']            = 'Version:';
+$lang['compatible']                   = 'Compatible with:';
+$lang['depends']                      = 'Depends on:';
+$lang['similar']                      = 'Similar to:';
+$lang['conflicts']                    = 'Conflicts with:';
+$lang['donate']                       = 'Donate';
+$lang['repo_retry']                   = 'Retry';
+
+$lang['msg_enabled']                  = 'Plugin %s enabled';
+$lang['msg_disabled']                 = 'Plugin %s disabled';
+$lang['msg_delete_success']           = 'Extension uninstalled';
 $lang['msg_template_install_success'] = 'Template %s installed successfully';
-$lang['msg_template_update_success'] = 'Template %s updated successfully';
-$lang['msg_plugin_install_success'] = 'Plugin %s installed successfully';
-$lang['msg_plugin_update_success'] = 'Plugin %s updated successfully';
-
-$lang['msg_upload_failed'] = 'Uploading the file failed';
-
-
-$lang['msg_url_failed']         = 'URL [%s] could not be downloaded.<br /> %s';
-$lang['msg_download_failed']    = 'Plugin %s could not be downloaded.<br /> %s';
-$lang['msg_download_success']   = 'Plugin %s installed successfully';
-$lang['msg_tpl_download_failed']  = 'Template %s could not be downloaded.<br /> %s';
-
-$lang['msg_download_pkg_success']     = '%s extension package successfully installed (%s)';
-$lang['msg_tpl_download_pkg_success'] = '%s extension package successfully installed (%s)';
-
-$lang['msg_update_success']     = 'Plugin %s successfully updated';
-$lang['msg_update_failed']      = 'Update of plugin %s failed.<br /> %s';
-$lang['msg_tpl_update_success'] = 'Template %s successfully updated';
-$lang['msg_tpl_update_failed']  = 'Update of template %s failed.<br /> %s';
-$lang['msg_update_pkg_success']     = '%s extension package successfully updated (%s)';
-$lang['msg_tpl_update_pkg_success'] = '%s extension package successfully updated (%s)';
-
-$lang['msg_reinstall_success']  = 'Plugin %s re-installed successfully';
-$lang['msg_reinstall_failed']   = 'Failed to re-install plugin %s.<br /> %s';
-$lang['msg_tpl_reinstall_success'] = 'Template %s re-installed successfully';
-$lang['msg_tpl_reinstall_failed']  = 'Failed to re-install template %s.<br /> %s';
-$lang['msg_reinstall_pkg_success']     = '%s extension package successfully reinstalled (%s)';
-$lang['msg_tpl_reinstall_pkg_success'] = '%s extension package successfully reinstalled (%s)';
-
-// info titles
-$lang['plugin']                 = 'Plugin';
-$lang['provides']               = 'Provides:';
-$lang['noinfo']                 = 'This plugin returned no information, it may be invalid.';
-$lang['name']                   = 'Name:';
-$lang['date']                   = 'Date:';
-$lang['type']                   = 'Type:';
-$lang['desc']                   = 'Description:';
-$lang['author']                 = 'Author:';
-$lang['www']                    = 'Web:';
-
-// error messages
-$lang['needed_by']              = 'Needed by:';
-$lang['not_writable']           = 'DokuWiki can not write to the folder';
-$lang['missing_dependency']     = '<strong>Missing or disabled dependency:</strong> %s';
-$lang['security_issue']         = '<strong>Security Issue:</strong> %s';
-$lang['security_warning']       = '<strong>Security Warning:</strong> %s';
-$lang['update_available']       = '<strong>Update:</strong> New version %s is available.';
-$lang['wrong_folder']           = '<strong>Plugin installed incorrectly:</strong> Rename plugin directory "%s" to "%s".';
-$lang['url_change']             = '<strong>URL changed:</strong> Download URL has changed since last download. Check if the new URL is valid before updating the extension.<br />New: %s<br />Old: %s';
-$lang['gitmanaged']             = 'Extension installed with git';
-$lang['bundled_source']         = 'Bundled with DokuWiki source';
-$lang['no_url']                 = 'No download URL';
-$lang['no_manager']             = 'Could not find manager.dat file';
-
-$lang['error_badurl']           = 'URL ends with slash - unable to determine file name from the url';
-$lang['error_dircreate']        = 'Unable to create temporary folder to receive download';
-$lang['error_download']         = 'Unable to download the file: %s';
-$lang['error_decompress']       = 'Unable to decompress the downloaded file. This maybe as a result of a bad download, in which case you should try again; or the compression format may be unknown, in which case you will need to download and install manually.';
-$lang['error_findfolder']       = 'Unable to identify extension directory, you need to download and install manually';
-$lang['error_copy']             = 'There was a file copy error while attempting to install files for directory <em>%s</em>: the disk could be full or file access permissions may be incorrect. This may have resulted in a partially installed plugin and leave your wiki installation unstable';
-//Setup VIM: ex: et ts=4 :
+$lang['msg_template_update_success']  = 'Template %s updated successfully';
+$lang['msg_plugin_install_success']   = 'Plugin %s installed successfully';
+$lang['msg_plugin_update_success']    = 'Plugin %s updated successfully';
+$lang['msg_upload_failed']            = 'Uploading the file failed';
+
+$lang['provides']                     = 'Provides:';
+$lang['missing_dependency']           = '<strong>Missing or disabled dependency:</strong> %s';
+$lang['security_issue']               = '<strong>Security Issue:</strong> %s';
+$lang['security_warning']             = '<strong>Security Warning:</strong> %s';
+$lang['update_available']             = '<strong>Update:</strong> New version %s is available.';
+$lang['wrong_folder']                 = '<strong>Plugin installed incorrectly:</strong> Rename plugin directory "%s" to "%s".';
+$lang['url_change']                   = '<strong>URL changed:</strong> Download URL has changed since last download. Check if the new URL is valid before updating the extension.<br />New: %s<br />Old: %s';
+
+$lang['error_badurl']                 = 'URL ends with slash - unable to determine file name from the url';
+$lang['error_dircreate']              = 'Unable to create temporary folder to receive download';
+$lang['error_download']               = 'Unable to download the file: %s';
+$lang['error_decompress']             = 'Unable to decompress the downloaded file. This maybe as a result of a bad download, in which case you should try again; or the compression format may be unknown, in which case you will need to download and install manually.';
+$lang['error_findfolder']             = 'Unable to identify extension directory, you need to download and install manually';
+$lang['error_copy']                   = 'There was a file copy error while attempting to install files for directory <em>%s</em>: the disk could be full or file access permissions may be incorrect. This may have resulted in a partially installed plugin and leave your wiki installation unstable';
diff --git a/lib/plugins/extension/style.less b/lib/plugins/extension/style.less
index 8c85bec46..4a036f067 100644
--- a/lib/plugins/extension/style.less
+++ b/lib/plugins/extension/style.less
@@ -191,6 +191,8 @@
 #extension__manager div.screenshot img {
     width: 120px;
     height: 70px;
+    border-radius: 12px;
+    box-shadow: 2px 2px 2px #ccc;
 }
 
 #extension__manager .legend div.screenshot {
@@ -198,6 +200,7 @@
     margin-left: -132px;
     max-width: 120px;
     float: left;
+    position: relative;
 }
 [dir=rtl] #extension__manager .legend div.screenshot {
     margin-left: 0;
@@ -209,7 +212,8 @@
     min-height: 24px;
     min-width: 24px;
     position: absolute;
-    left: 0;
+    left: 0px;
+    top: 0px;
 }
 [dir=rtl] #extension__manager .legend div.screenshot span {
     left: auto;
-- 
cgit v1.2.3


From f910b299e4bbc59cfbe4e68af5d34ea2e5815574 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 10 Aug 2013 14:29:40 +0200
Subject: updated styles

RTL styles need to be readded
---
 lib/plugins/extension/helper/gui.php      |  16 +-
 lib/plugins/extension/images/icons.xcf    | Bin 43016 -> 67195 bytes
 lib/plugins/extension/images/plugin.png   | Bin 6259 -> 6824 bytes
 lib/plugins/extension/images/template.png | Bin 6802 -> 7547 bytes
 lib/plugins/extension/lang/en/lang.php    |   3 +
 lib/plugins/extension/style.less          | 477 ++++++++++++------------------
 6 files changed, 199 insertions(+), 297 deletions(-)

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/helper/gui.php b/lib/plugins/extension/helper/gui.php
index 2c2a19bf8..139a1a16a 100644
--- a/lib/plugins/extension/helper/gui.php
+++ b/lib/plugins/extension/helper/gui.php
@@ -90,9 +90,9 @@ class helper_plugin_extension_gui extends DokuWiki_Plugin {
         echo $this->locale_xhtml('intro_search');
         echo '</div>';
 
-        $form = new Doku_Form(array('action' => $this->tabURL('', array(), '&')));
-        $form->addElement(form_makeTextField('q', $INPUT->str('q'), 'Search'));
-        $form->addElement(form_makeButton('submit', '', 'Search'));
+        $form = new Doku_Form(array('action' => $this->tabURL('', array(), '&'), 'class' => 'search'));
+        $form->addElement(form_makeTextField('q', $INPUT->str('q'), $this->getLang('search_for')));
+        $form->addElement(form_makeButton('submit', '', $this->getLang('search')));
         $form->printForm();
 
         if(!$INPUT->bool('q')) return;
@@ -123,7 +123,7 @@ class helper_plugin_extension_gui extends DokuWiki_Plugin {
         echo $this->locale_xhtml('intro_install');
         echo '</div>';
 
-        $form = new Doku_Form(array('action' => $this->tabURL('', array(), '&'), 'enctype' => 'multipart/form-data'));
+        $form = new Doku_Form(array('action' => $this->tabURL('', array(), '&'), 'enctype' => 'multipart/form-data', 'class' => 'install'));
         $form->addElement(form_makeTextField('installurl', '', 'Install from URL:', '', 'block'));
         $form->addElement(form_makeFileField('installfile', 'Upload Extension:', '', 'block'));
         $form->addElement(form_makeButton('submit', '', 'Install'));
@@ -165,13 +165,13 @@ class helper_plugin_extension_gui extends DokuWiki_Plugin {
     /**
      * Create an URL inside the extension manager
      *
-     * @param string $tab    tab to load, empty for current tab
-     * @param array  $params associative array of parameter to set
-     * @param string $sep    seperator to build the URL
+     * @param string $tab      tab to load, empty for current tab
+     * @param array  $params   associative array of parameter to set
+     * @param string $sep      seperator to build the URL
      * @param bool   $absolute create absolute URLs?
      * @return string
      */
-    public function tabURL($tab = '', $params = array(), $sep = '&amp;', $absolute=false) {
+    public function tabURL($tab = '', $params = array(), $sep = '&amp;', $absolute = false) {
         global $ID;
         global $INPUT;
 
diff --git a/lib/plugins/extension/images/icons.xcf b/lib/plugins/extension/images/icons.xcf
index a99747d81..ab69b3099 100644
Binary files a/lib/plugins/extension/images/icons.xcf and b/lib/plugins/extension/images/icons.xcf differ
diff --git a/lib/plugins/extension/images/plugin.png b/lib/plugins/extension/images/plugin.png
index b9133681f..e4a2d3be6 100644
Binary files a/lib/plugins/extension/images/plugin.png and b/lib/plugins/extension/images/plugin.png differ
diff --git a/lib/plugins/extension/images/template.png b/lib/plugins/extension/images/template.png
index 383c4d0a3..ee74bc1d5 100644
Binary files a/lib/plugins/extension/images/template.png and b/lib/plugins/extension/images/template.png differ
diff --git a/lib/plugins/extension/lang/en/lang.php b/lib/plugins/extension/lang/en/lang.php
index db1449ae0..11c5caa2b 100644
--- a/lib/plugins/extension/lang/en/lang.php
+++ b/lib/plugins/extension/lang/en/lang.php
@@ -29,6 +29,9 @@ $lang['btn_disable']                  = 'Disable';
 $lang['btn_install']                  = 'Install';
 $lang['btn_reinstall']                = 'Re-install';
 
+$lang['search_for']                   = 'Search Extension:';
+$lang['search']                       = 'Search';
+
 $lang['extensionby']                  = '<strong>%s</strong> by %s';
 $lang['popularity']                   = 'Popularity: %s';
 $lang['homepage_link']                = 'Docs';
diff --git a/lib/plugins/extension/style.less b/lib/plugins/extension/style.less
index 4a036f067..e1a7a1d7b 100644
--- a/lib/plugins/extension/style.less
+++ b/lib/plugins/extension/style.less
@@ -38,8 +38,11 @@
     }
 }
 
+/**
+ * general styles
+ */
 #extension__manager {
-    /* tab layout - most of it is in the main template */
+    // tab layout - most of it is in the main template
     ul.tabs li.active a {
         background-color: @ini_background_alt;
         border-bottom: solid 1px @ini_background_alt;
@@ -52,336 +55,232 @@
         text-align: left;
         overflow: hidden;
     }
-}
-
-/* ------- FIXME everything below needs to be checked for usage ---------- */
-
-
-
-/*
- * general layout
- */
-#extension__manager h2 {
-    margin-left: 0;
-}
 
-#extension__manager .panelHeader div.error {
-    margin-top: 0;
-    float: left;
-}
-[dir=rtl] #extension__manager .panelHeader div.error {
-    float: right;
+    // message spacing
+    div.msg {
+        margin: 0.4em 0 0 0;
+    }
 }
 
 /*
- * search & url download forms
+ * extensions table
  */
-#extension__manager form.search,
-#extension__manager form.btn_reload {
-    float: right;
-}
-[dir=rtl] #extension__manager form.search,
-[dir=rtl] #extension__manager form.btn_reload {
-    float: left;
-}
-
-#extension__manager div.search form.search {
-    float: none;
-}
-
-#extension__manager .tagcloud {
-    width: 55%;
-    float: left;
-    margin: 0 0.5em 1em 0;
-}
-[dir=rtl] #extension__manager .tagcloud {
-    float: right;
-    margin: 0 0 1em .5em;
-}
-
-#extension__manager .tagcloud a.taglink {
-    background-color: inherit;
-}
-
-#extension__manager div.search {
-    width: 44%;
-    float: left;
-}
-[dir=rtl] #extension__manager div.search {
-    float: right;
-}
-
-#extension__manager fieldset {
-    margin-top: 0.5em;
-    width: auto;
-}
-
-#extension__manager fieldset p {
-    margin: 0.5em;
-    text-align: justify;
-    font-size: 85%;
-}
-
-/* tag cloud */
-#extension__manager a.cl0 { font-size: 0.7em; }
-#extension__manager a.cl1 { font-size: 0.9em; }
-#extension__manager a.cl2 { font-size: 1em; }
-#extension__manager a.cl3 { font-size: 1.3em; }
-#extension__manager a.cl4 { font-size: 1.6em; }
-#extension__manager a.cl5 { font-size: 1.9em; }
+#extension__list {
+    ul.extensionList {
+        margin-left: 0;
+        margin-right: 0;
+        padding: 0;
+        list-style: none;
+    }
 
+    ul.extensionList li {
+        margin: 0 0 .5em;
+        padding: 0 0 .5em;
+        color: @ini_text;
+        border-bottom: 1px solid @ini_border;
+        overflow: hidden;
+    }
 
-#extension__manager .extensionList input.button {
-    margin: 0 .3em .3em 0;
-}
-[dir=rtl] #extension__manager .extensionList input.button {
-    margin: 0 0 .3em .3em;
+    input.button {
+        margin: 0 .3em .3em 0;
+    }
 }
 
-/*
- * extensions table
+/**
+ * extension table left column
  */
-#extension__manager .extensionList {
-    margin-left: 0;
-    margin-right: 0;
-    padding: 0;
-    list-style: none;
-}
-
-#extension__manager .extensionList li {
-    margin: 0 0 .5em;
-    padding: 0 0 .5em;
-    color: @ini_text;
-    border-bottom: 1px solid @ini_border;
-    overflow: hidden;
-}
-
-#extension__manager .legend {
+#extension__list .legend {
     position: relative;
     width: 75%;
     float: left;
-}
-[dir=rtl] #extension__manager .legend {
-    float: right;
-}
 
-#extension__manager .legend > div {
-    padding: 0 .5em 0 132px;
-    border-right: 1px solid @ini_background_alt;
-    overflow: hidden;
-}
-[dir=rtl] #extension__manager .legend > div {
-    padding: 0 132px 0 .5em;
-    border-left: 1px solid @ini_background_alt;
-    border-right-width: 0;
-}
-
-#extension__manager .enabled div.screenshot span {
-    background: transparent url(images/enabled.png) no-repeat 2px 2px;
-}
-
-#extension__manager .disabled div.screenshot span {
-    background: transparent url(images/disabled.png) no-repeat 2px 2px;
-}
-
-#extension__manager .disabled .legend {
-    opacity: 0.7;
-}
-
-#extension__manager div.screenshot img {
-    width: 120px;
-    height: 70px;
-    border-radius: 12px;
-    box-shadow: 2px 2px 2px #ccc;
-}
-
-#extension__manager .legend div.screenshot {
-    margin-top: 4px;
-    margin-left: -132px;
-    max-width: 120px;
-    float: left;
-    position: relative;
-}
-[dir=rtl] #extension__manager .legend div.screenshot {
-    margin-left: 0;
-    margin-right: -132px;
-    float: right;
-}
+    // padding
+    > div {
+        padding: 0 .5em 0 132px;
+        border-right: 1px solid @ini_background_alt;
+        overflow: hidden;
+    }
 
-#extension__manager .legend div.screenshot span {
-    min-height: 24px;
-    min-width: 24px;
-    position: absolute;
-    left: 0px;
-    top: 0px;
-}
-[dir=rtl] #extension__manager .legend div.screenshot span {
-    left: auto;
-    right: 0;
-}
+    // screenshot
+    div.screenshot {
+        margin-top: 4px;
+        margin-left: -132px;
+        max-width: 120px;
+        float: left;
+        position: relative;
+
+        img {
+            width: 120px;
+            height: 70px;
+            border-radius: 5px;
+            box-shadow: 2px 2px 2px #666;
+        }
+
+        span {
+            min-height: 24px;
+            min-width: 24px;
+            position: absolute;
+            left: 0px;
+            top: 0px;
+        }
+    }
 
-#extension__manager .legend h2 {
-    width: 100%;
-    float: right;
-    margin: 0.2em 0 0.5em;
-    font-size: 100%;
-    font-weight: normal;
-    border: none;
-}
-[dir=rtl] #extension__manager .legend h2 {
-    float: left;
-}
+    // plugin headline
+    h2 {
+        width: 100%;
+        float: right;
+        margin: 0.2em 0 0.5em;
+        font-size: 100%;
+        font-weight: normal;
+        border: none;
+
+        strong {
+            font-size: 120%;
+            font-weight: bold;
+            vertical-align: baseline;
+        }
+    }
 
-#extension__manager .legend h2 strong {
-    font-size: 120%;
-    font-weight: bold;
-    vertical-align: baseline;
-}
+    // description
+    p {
+        margin: 0 0 0.6em 0;
+    }
 
-#extension__manager .legend p {
-    margin: 0 0 0.6em 0;
-}
+    // popularity bar
+    div.popularity {
+        background-color: @ini_background;
+        border: 1px solid silver;
+        height: .4em;
+        margin: 0 auto;
+        padding: 1px;
+        width: 5.5em;
+        position: absolute;
+        right: .5em;
+        top: 0.2em;
+
+        div {
+            background-color: @ini_border;
+            height: 100%;
+
+            span {
+                display: none;// @todo: hide accessibly
+            }
+        }
+    }
 
-#extension__manager .legend span.linkbar {
-    font-size: 85%;
-}
+    // Docs, Bugs, Tags
+    span.linkbar {
+        font-size: 85%;
 
-#extension__manager .legend span.linkbar span.tags {
-    padding-left: 18px;
-    background: transparent url(images/tag.png) no-repeat 0 0;
-}
+        span.tags {
+            padding-left: 18px;
+            background: transparent url(images/tag.png) no-repeat 0 0;
+        }
+    }
 
+    // more info button
+    a.info {
+        background: transparent url(images/up.png) no-repeat 0 0;
+        border-width: 0;
+        height: 13px;
+        width: 13px;
+        text-indent: -9999px;
+        float: right;
+        margin: .5em 0 0;
+        overflow: hidden;
 
-#extension__manager .legend a.info {
-    background: transparent url(images/up.png) no-repeat 0 0;
-    border-width: 0;
-    height: 13px;
-    width: 13px;
-    text-indent: -99999px;
-    float: right;
-    margin: .5em 0 0;
-    overflow: hidden;
-}
-[dir=rtl] #extension__manager .legend a.info {
-    float: left;
-    margin: .5em 0 0;
-}
+        &.close {
+            background: transparent url(images/down.png) no-repeat 0 0;
+        }
+    }
 
-#extension__manager .legend  a.info.close {
-    background: transparent url(images/down.png) no-repeat 0 0;
+    // detailed info box
+    dl.details {
+        margin: 0.4em 0 0 0;
+        font-size: 85%;
+        border-top: 1px solid @ini_background_alt;
+        clear: both;
+
+        dt {
+            clear: left;
+            float: left;
+            width: 25%;
+            margin: 0;
+            text-align: right;
+            font-weight: normal;
+            padding: 0.2em 5px 0 0;
+        }
+
+        dd {
+            margin-left: 25%;
+            font-weight: bold;
+            padding: 0.2em 0 0 5px;
+
+            a {
+                font-weight: normal;
+            }
+        }
+    }
 }
 
-#extension__manager .legend div.popularity {
-    background-color: @ini_background;
-    border: 1px solid silver;
-    height: .4em;
-    margin: 0 auto;
-    padding: 1px;
-    width: 5.5em;
-    position: absolute;
-    right: .5em;
-    top: 0.2em;
-}
-[dir=rtl] #extension__manager .legend div.popularity {
-    right: auto;
-    left: .5em;
-}
+/*
+ * Enabled/Disabled overrides
+ */
+#extension__list {
+    .enabled div.screenshot span {
+        background: transparent url(images/enabled.png) no-repeat 2px 2px;
+    }
 
-#extension__manager .legend div.popularity div {
-    background-color: @ini_border;
-    height: 100%;
-}
+    .disabled div.screenshot span {
+        background: transparent url(images/disabled.png) no-repeat 2px 2px;
+    }
 
-#extension__manager .legend div.popularity div span {
-    display: none;/* @todo: hide accessibly */
+    .disabled .legend {
+        opacity: 0.7;
+    }
 }
 
+/**
+ * extension table right column
+ */
 #extension__manager .actions {
     padding: 0;
     font-size: 95%;
     width: 25%;
     float: right;
     text-align: right;
-}
-[dir=rtl] #extension__manager .actions {
-    float: left;
-    text-align: left;
-}
 
-#extension__manager .actions .version {
-    display: block;
-}
+    .version {
+        display: block;
+    }
 
-#extension__manager .actions p {
-    margin: 0.2em 0;
-    text-align: center;
+    p {
+        margin: 0.2em 0;
+        text-align: center;
+    }
 }
 
-/*
- * extensions table, detailed info box
+/**
+ * Search form
  */
-#extension__manager dl.details {
-    margin: 0.4em 0 0 0;
-    font-size: 85%;
-    border-top: 1px solid @ini_background_alt;
-    clear: both;
-}
-
-#extension__manager dl.details dt {
-    clear: left;
-    float: left;
-    width: 25%;
-    margin: 0;
-    text-align: right;
-    font-weight: normal;
-    padding: 0.2em 5px 0 0;
-}
-[dir=rtl] #extension__manager dl.details dt {
-    clear: right;
-    float: right;
-    text-align: left;
-    padding: 0.2em 0 0 5px;
-}
-
-#extension__manager dl.details dd {
-    margin-left: 25%;
-    font-weight: bold;
-    padding: 0.2em 0 0 5px;
-}
-[dir=rtl] #extension__manager dl.details dd {
-    margin-left: 0;
-    margin-right: 25%;
-    padding: 0.2em 5px 0 0 ;
-}
-
-#extension__manager dl.details dd a {
-    font-weight: normal;
-}
+#extension__manager form.search {
+    display: block;
+    margin-bottom: 2em;
 
-#extension__manager #info__popup {
-    z-index: 20;
-    overflow: hidden;
-    opacity: 0.9;
-    border: 1px solid @ini_border;
-    background-color: @ini_border; /*background_other__;*/
-    text-align: left;
-    padding: 0.2em;
-}
-[dir=rtl] #extension__manager #info__popup {
-    text-align: right;
-}
+    span {
+        font-weight: bold;
+    }
 
-#extension__manager div.msg {
-    margin: 0.4em 0 0 0;
+    input.edit {
+        width: 25em;
+    }
 }
 
-#extension__manager ul.tabs div.msg {
-    display: inline;
-    margin-left: 0.4em;
-}
-[dir=rtl] #extension__manager ul.tabs div.msg {
-    margin-left: 0;
-    margin-right: 0.4em;
+/**
+ * Install form
+ */
+#extension__manager form.install {
+    text-align: center;
+    display: block;
+    width: 60%;
 }
-
-/* end admin plugin styles */
-- 
cgit v1.2.3


From 347e1146ca6a08dc90247a3f7da31cbc3a409aa0 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 10 Aug 2013 14:43:12 +0200
Subject: fixed screenshots

---
 lib/plugins/extension/helper/list.php           | 4 ++--
 lib/plugins/extension/lang/en/intro_install.txt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/helper/list.php b/lib/plugins/extension/helper/list.php
index 6b1d41f78..16ef71569 100644
--- a/lib/plugins/extension/helper/list.php
+++ b/lib/plugins/extension/helper/list.php
@@ -181,8 +181,8 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
      */
     function make_screenshot(helper_plugin_extension_extension $extension) {
         if($extension->getScreenshotURL()) {
-            $img = '<a title="'.hsc($extension->getDisplayName()).'" href="'.hsc($extension->getScreenshotURL()).'" target="_blank" class="extension_screenshot">'.
-                '<img alt="'.hsc($extension->getDisplayName()).'" width="120" height="70" src="'.hsc($extension->getThumbnailURL()).'" />'.
+            $img = '<a title="'.hsc($extension->getDisplayName()).'" href="'.$extension->getScreenshotURL().'" target="_blank" class="extension_screenshot">'.
+                '<img alt="'.hsc($extension->getDisplayName()).'" width="120" height="70" src="'.$extension->getThumbnailURL().'" />'.
                 '</a>';
         } elseif($extension->isTemplate()) {
             $img = '<img alt="template" width="120" height="70" src="'.DOKU_BASE.'lib/plugins/extension/images/template.png" />';
diff --git a/lib/plugins/extension/lang/en/intro_install.txt b/lib/plugins/extension/lang/en/intro_install.txt
index 0556c8048..a5d5ab008 100644
--- a/lib/plugins/extension/lang/en/intro_install.txt
+++ b/lib/plugins/extension/lang/en/intro_install.txt
@@ -1 +1 @@
-Here you can manually install plugins and templates by either uploading them or providing a direct download URL.
\ No newline at end of file
+Here you can manually install plugins and templates by either uploading them or providing a direct download URL.
-- 
cgit v1.2.3


From e445eeb3b675b350b4cebeeea610d4f7cd2e8f19 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 11 Aug 2013 11:19:34 +0200
Subject: fixed button logic

---
 lib/plugins/extension/helper/extension.php |  19 ++++++++++---------
 lib/plugins/extension/helper/list.php      |  26 ++++++++++++++++++++------
 lib/plugins/extension/images/warning.png   | Bin 0 -> 613 bytes
 lib/plugins/extension/lang/en/lang.php     |   4 ++++
 lib/plugins/extension/style.less           |   9 +++++++++
 5 files changed, 43 insertions(+), 15 deletions(-)
 create mode 100644 lib/plugins/extension/images/warning.png

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/helper/extension.php b/lib/plugins/extension/helper/extension.php
index d912a44c0..6136c3c9a 100644
--- a/lib/plugins/extension/helper/extension.php
+++ b/lib/plugins/extension/helper/extension.php
@@ -107,7 +107,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return bool if the extension is protected
      */
     public function isProtected() {
-        return in_array($this->base, array('acl', 'config', 'info', 'plugin', 'revert', 'usermanager'));
+        return in_array($this->id, array('acl', 'config', 'info', 'plugin', 'revert', 'usermanager', 'template:dokuwiki'));
     }
 
     /**
@@ -513,20 +513,21 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
     /**
      * If the extension can probably be installed/updated or uninstalled
      *
-     * @return bool|string True or one of "nourl", "noparentperms" (template/plugin install path not writable), "noperms" (extension itself not writable)
+     * @return bool|string True or error string
      */
     public function canModify() {
-        if ($this->isInstalled()) {
-            if (!is_writable($this->getInstallDir())) {
+        if($this->isInstalled()) {
+            if(!is_writable($this->getInstallDir())) {
                 return 'noperms';
             }
         }
-        $parent_path = ($this->isTemplate() ? DOKU_TPLLIB : DOKU_PLUGIN);
-        if (!is_writable($parent_path)) {
-            return 'noparentperms';
-        }
 
-        if (!$this->getDownloadURL()) return 'nourl';
+        if($this->isTemplate() && !is_writable(DOKU_TPLLIB)) {
+            return 'notplperms';
+
+        } elseif(!is_writable(DOKU_PLUGIN)) {
+            return 'nopluginperms';
+        }
         return true;
     }
 
diff --git a/lib/plugins/extension/helper/list.php b/lib/plugins/extension/helper/list.php
index 16ef71569..7ecd5b267 100644
--- a/lib/plugins/extension/helper/list.php
+++ b/lib/plugins/extension/helper/list.php
@@ -444,11 +444,13 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
      */
     function make_actions(helper_plugin_extension_extension $extension) {
         $return = '';
-        if (!$extension->isInstalled() && $extension->canModify() === true) {
-            $return .= $this->make_action('install', $extension);
-        } elseif ($extension->canModify() === true) {
-            if (!$extension->isBundled()) {
-                $return .= $this->make_action('uninstall', $extension);
+        $errors = '';
+
+        if ($extension->isInstalled()) {
+            if (($canmod = $extension->canModify()) === true) {
+                if (!$extension->isProtected()) {
+                    $return .= $this->make_action('uninstall', $extension);
+                }
                 if ($extension->getDownloadURL()) {
                     if ($extension->updateAvailable()) {
                         $return .= $this->make_action('update', $extension);
@@ -456,7 +458,10 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
                         $return .= $this->make_action('reinstall', $extension);
                     }
                 }
+            }else{
+                $errors .= '<p class="permerror">'.$this->getLang($canmod).'</p>';
             }
+
             if (!$extension->isProtected()) {
                 if ($extension->isEnabled()) {
                     if(!$extension->isTemplate()){ // templates can't be disabled, only another can be enabled
@@ -466,6 +471,15 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
                     $return .= $this->make_action('enable', $extension);
                 }
             }
+
+        }else{
+            if (($canmod = $extension->canModify()) === true) {
+                if ($extension->getDownloadURL()) {
+                    $return .= $this->make_action('install', $extension);
+                }
+            }else{
+                $errors .= '<div class="permerror">'.$this->getLang($canmod).'</div>';
+            }
         }
 
         if (!$extension->isInstalled()) {
@@ -473,7 +487,7 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
             $return .= ($extension->getLastUpdate() ? hsc($extension->getLastUpdate()) : $this->getLang('unknown')).'</span>';
         }
 
-        return $return;
+        return $return.' '.$errors;
     }
 
     /**
diff --git a/lib/plugins/extension/images/warning.png b/lib/plugins/extension/images/warning.png
new file mode 100644
index 000000000..c5e482f84
Binary files /dev/null and b/lib/plugins/extension/images/warning.png differ
diff --git a/lib/plugins/extension/lang/en/lang.php b/lib/plugins/extension/lang/en/lang.php
index 11c5caa2b..53ce597dd 100644
--- a/lib/plugins/extension/lang/en/lang.php
+++ b/lib/plugins/extension/lang/en/lang.php
@@ -74,3 +74,7 @@ $lang['error_download']               = 'Unable to download the file: %s';
 $lang['error_decompress']             = 'Unable to decompress the downloaded file. This maybe as a result of a bad download, in which case you should try again; or the compression format may be unknown, in which case you will need to download and install manually.';
 $lang['error_findfolder']             = 'Unable to identify extension directory, you need to download and install manually';
 $lang['error_copy']                   = 'There was a file copy error while attempting to install files for directory <em>%s</em>: the disk could be full or file access permissions may be incorrect. This may have resulted in a partially installed plugin and leave your wiki installation unstable';
+
+$lang['noperms']                      = 'Extension directory is not writable';
+$lang['notplperms']                   = 'Template directory is not writable';
+$lang['nopluginperms']                = 'Plugin directory is not writable';
\ No newline at end of file
diff --git a/lib/plugins/extension/style.less b/lib/plugins/extension/style.less
index e1a7a1d7b..762968611 100644
--- a/lib/plugins/extension/style.less
+++ b/lib/plugins/extension/style.less
@@ -258,6 +258,15 @@
         margin: 0.2em 0;
         text-align: center;
     }
+
+    p.permerror {
+        margin-left: 0.4em;
+        text-align: left;
+        padding-left: 19px;
+        background: transparent url(images/warning.png) center left no-repeat;
+        line-height: 18px;
+        font-size: 12px;
+    }
 }
 
 /**
-- 
cgit v1.2.3


From 7ca0915cf61dd8ff297bf1d3ebd6aafcab88a618 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 11 Aug 2013 11:52:47 +0200
Subject: fixed donation link

---
 lib/plugins/extension/helper/list.php   |  18 ++++++++++++------
 lib/plugins/extension/images/donate.png | Bin 1293 -> 724 bytes
 lib/plugins/extension/lang/en/lang.php  |   3 ++-
 lib/plugins/extension/style.less        |   7 ++++---
 4 files changed, 18 insertions(+), 10 deletions(-)

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/helper/list.php b/lib/plugins/extension/helper/list.php
index 7ecd5b267..ef589dedd 100644
--- a/lib/plugins/extension/helper/list.php
+++ b/lib/plugins/extension/helper/list.php
@@ -343,6 +343,14 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
         $default = $this->getLang('unknown');
         $return = '<dl class="details">';
 
+        if ($extension->getDonationURL()) {
+            $return .= '<dt>'.$this->getLang('donate').'</dt>';
+            $return .= '<dd>';
+            $return .= '<a href="'.$extension->getDonationURL().'" class="donate">'.$this->getLang('donate_action').'</a>';
+            $return .= '</dd>';
+        }
+
+
         if (!$extension->isBundled()) {
             $return .= '<dt>'.$this->getLang('downloadurl').'</dt>';
             $return .= '<dd>';
@@ -393,6 +401,7 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
             foreach ($extension->getCompatibleVersions() as $date => $version) {
                 $return .= $version['label'].' ('.$date.'), ';
             }
+            $return = rtrim($return, ', ');
             $return .= '</dd>';
         }
         if($extension->getDependencies()) {
@@ -415,9 +424,6 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
             $return .= $this->make_linklist($extension->getConflicts());
             $return .= '</dd>';
         }
-        if ($extension->getDonationURL()) {
-            $return .= '<a href="'.hsc($extension->getDonationURL()).'" class="donate" title="'.$this->getLang('donate').'"></a>';
-        }
         $return .= '</dl>';
         return $return;
     }
@@ -431,9 +437,9 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
     function make_linklist($ext) {
         $return = '';
         foreach ($ext as $link) {
-            $return .= '<a href="'.$this->gui->tabURL('search', array('q'=>'ext:'.$link)).'">'.hsc($link).'</a> ';
+            $return .= '<a href="'.$this->gui->tabURL('search', array('q'=>'ext:'.$link)).'">'.hsc($link).'</a>, ';
         }
-        return $return;
+        return rtrim($return, ', ');
     }
 
     /**
@@ -482,7 +488,7 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
             }
         }
 
-        if (!$extension->isInstalled()) {
+        if (!$extension->isInstalled() && $extension->getDownloadURL()) {
             $return .= ' <span class="version">'.$this->getLang('available_version').' ';
             $return .= ($extension->getLastUpdate() ? hsc($extension->getLastUpdate()) : $this->getLang('unknown')).'</span>';
         }
diff --git a/lib/plugins/extension/images/donate.png b/lib/plugins/extension/images/donate.png
index b26ceb66e..9e234da1c 100644
Binary files a/lib/plugins/extension/images/donate.png and b/lib/plugins/extension/images/donate.png differ
diff --git a/lib/plugins/extension/lang/en/lang.php b/lib/plugins/extension/lang/en/lang.php
index 53ce597dd..684ff2bad 100644
--- a/lib/plugins/extension/lang/en/lang.php
+++ b/lib/plugins/extension/lang/en/lang.php
@@ -48,7 +48,8 @@ $lang['compatible']                   = 'Compatible with:';
 $lang['depends']                      = 'Depends on:';
 $lang['similar']                      = 'Similar to:';
 $lang['conflicts']                    = 'Conflicts with:';
-$lang['donate']                       = 'Donate';
+$lang['donate']                       = 'Like this?';
+$lang['donate_action']                = 'Buy the author a coffee!';
 $lang['repo_retry']                   = 'Retry';
 
 $lang['msg_enabled']                  = 'Plugin %s enabled';
diff --git a/lib/plugins/extension/style.less b/lib/plugins/extension/style.less
index 762968611..0d86f5419 100644
--- a/lib/plugins/extension/style.less
+++ b/lib/plugins/extension/style.less
@@ -209,15 +209,16 @@
             text-align: right;
             font-weight: normal;
             padding: 0.2em 5px 0 0;
+            font-weight: bold;
         }
 
         dd {
             margin-left: 25%;
-            font-weight: bold;
             padding: 0.2em 0 0 5px;
 
-            a {
-                font-weight: normal;
+            a.donate {
+                padding-left: 18px;
+                background: transparent url(images/donate.png) left center no-repeat;
             }
         }
     }
-- 
cgit v1.2.3


From 9597c3b83b2dbf2787bf9046c911f0cc17d29481 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 11 Aug 2013 12:05:09 +0200
Subject: just not handle enable/disable for templates for now

---
 lib/plugins/extension/helper/extension.php        | 5 +++--
 lib/plugins/extension/helper/list.php             | 6 ++----
 lib/plugins/extension/lang/en/intro_templates.txt | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/helper/extension.php b/lib/plugins/extension/helper/extension.php
index 6136c3c9a..6ad8f5185 100644
--- a/lib/plugins/extension/helper/extension.php
+++ b/lib/plugins/extension/helper/extension.php
@@ -632,10 +632,11 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      */
     public function enable() {
         if ($this->isTemplate()) return $this->getLang('notimplemented');
-        /* @var Doku_Plugin_Controller $plugin_controller */
-        global $plugin_controller;
         if (!$this->isInstalled()) return $this->getLang('notinstalled');
         if ($this->isEnabled()) return $this->getLang('alreadyenabled');
+
+        /* @var Doku_Plugin_Controller $plugin_controller */
+        global $plugin_controller;
         if ($plugin_controller->enable($this->base)) {
             $this->purgeCache();
             return true;
diff --git a/lib/plugins/extension/helper/list.php b/lib/plugins/extension/helper/list.php
index ef589dedd..e33dbfa04 100644
--- a/lib/plugins/extension/helper/list.php
+++ b/lib/plugins/extension/helper/list.php
@@ -468,11 +468,9 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
                 $errors .= '<p class="permerror">'.$this->getLang($canmod).'</p>';
             }
 
-            if (!$extension->isProtected()) {
+            if (!$extension->isProtected() && !$extension->isTemplate()) { // no enable/disable for templates
                 if ($extension->isEnabled()) {
-                    if(!$extension->isTemplate()){ // templates can't be disabled, only another can be enabled
-                        $return .= $this->make_action('disable', $extension);
-                    }
+                    $return .= $this->make_action('disable', $extension);
                 } else {
                     $return .= $this->make_action('enable', $extension);
                 }
diff --git a/lib/plugins/extension/lang/en/intro_templates.txt b/lib/plugins/extension/lang/en/intro_templates.txt
index d42180cc4..8bc04631d 100644
--- a/lib/plugins/extension/lang/en/intro_templates.txt
+++ b/lib/plugins/extension/lang/en/intro_templates.txt
@@ -1 +1 @@
-These are the templates currently installed in your DokuWiki. Note that only one template can be activated at a time.
+These are the templates currently installed in your DokuWiki. You can select template to be used in the [[?do=admin&page=config|Configuration Manager]].
-- 
cgit v1.2.3


From 8ecc39810428baa07bb322c5f515f56bac533746 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 11 Aug 2013 12:14:17 +0200
Subject: confirm uninstalling of extensions

---
 lib/plugins/extension/lang/en/lang.php |  2 ++
 lib/plugins/extension/script.js        | 10 ++++++++++
 2 files changed, 12 insertions(+)

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/lang/en/lang.php b/lib/plugins/extension/lang/en/lang.php
index 684ff2bad..3b2d2f38d 100644
--- a/lib/plugins/extension/lang/en/lang.php
+++ b/lib/plugins/extension/lang/en/lang.php
@@ -29,6 +29,8 @@ $lang['btn_disable']                  = 'Disable';
 $lang['btn_install']                  = 'Install';
 $lang['btn_reinstall']                = 'Re-install';
 
+$lang['js']['reallydel']              = 'Really uninstall this extension?';
+
 $lang['search_for']                   = 'Search Extension:';
 $lang['search']                       = 'Search';
 
diff --git a/lib/plugins/extension/script.js b/lib/plugins/extension/script.js
index 7480801ac..bd3c97758 100644
--- a/lib/plugins/extension/script.js
+++ b/lib/plugins/extension/script.js
@@ -1,5 +1,15 @@
 jQuery(function(){
 
+    /**
+     * Confirm uninstalling
+     */
+    jQuery('#extension__manager input.uninstall').click(function(e){
+        if(!window.confirm(LANG.plugins.extension.reallydel)){
+            e.preventDefault();
+            return false;
+        }
+        return true;
+    });
 
     /**
      * very simple lightbox
-- 
cgit v1.2.3


From 2e308c3608bea50e07aacf51b232eaedbda6eb20 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 11 Aug 2013 12:14:44 +0200
Subject: only carry the q to search tab

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

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/helper/gui.php b/lib/plugins/extension/helper/gui.php
index 139a1a16a..76651515c 100644
--- a/lib/plugins/extension/helper/gui.php
+++ b/lib/plugins/extension/helper/gui.php
@@ -180,8 +180,9 @@ class helper_plugin_extension_gui extends DokuWiki_Plugin {
             'do'   => 'admin',
             'page' => 'extension',
             'tab'  => $tab,
-            'q'    => $INPUT->str('q')
         );
+        if($tab == 'search') $defaults['q'] = $INPUT->str('q');
+
         return wl($ID, array_merge($defaults, $params), $absolute, $sep);
     }
 
-- 
cgit v1.2.3


From 6fdd11e032b654dd27de346f7e54231ee043d7ef Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 15 Dec 2013 20:41:23 +0100
Subject: removed superflous README for bundled plugin

---
 lib/plugins/extension/README | 27 ---------------------------
 1 file changed, 27 deletions(-)
 delete mode 100644 lib/plugins/extension/README

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/README b/lib/plugins/extension/README
deleted file mode 100644
index 5eefe924d..000000000
--- a/lib/plugins/extension/README
+++ /dev/null
@@ -1,27 +0,0 @@
-extension Plugin for DokuWiki
-
-Extension manager
-
-All documentation for this plugin can be found at
-https://www.dokuwiki.org/plugin:extension
-
-If you install this plugin manually, make sure it is installed in
-lib/plugins/extension/ - if the folder is called different it
-will not work!
-
-Please refer to http://www.dokuwiki.org/plugins for additional info
-on how to install plugins in DokuWiki.
-
-----
-Copyright (C) Michael Hamann <michael@content-space.de>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-See the COPYING file in your DokuWiki folder for details
-- 
cgit v1.2.3


From 9a2e74c192a89e048b53aca9260e70759e8dfdc6 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 5 Jan 2014 19:55:36 +0100
Subject: the plugin is called testing not test

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

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/helper/extension.php b/lib/plugins/extension/helper/extension.php
index 6ad8f5185..04eb24a66 100644
--- a/lib/plugins/extension/helper/extension.php
+++ b/lib/plugins/extension/helper/extension.php
@@ -94,7 +94,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
     public function isBundled() {
         if (!empty($this->remoteInfo['bundled'])) return $this->remoteInfo['bundled'];
         return in_array($this->base,
-                        array('acl', 'info', 'extension', 'test', 'revert', 'popularity',
+                        array('acl', 'info', 'extension', 'testing', 'revert', 'popularity',
                               'config', 'plugin', 'safefnrecode', 'authplain', 'testing',
                               'template:dokuwiki', 'template:default'
                               )
-- 
cgit v1.2.3


From 947a0472355a8591b0ef449ad9add9c0b782ddcf Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 5 Jan 2014 19:57:07 +0100
Subject: template:default is no longer bundled

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

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/helper/extension.php b/lib/plugins/extension/helper/extension.php
index 04eb24a66..2d0e91301 100644
--- a/lib/plugins/extension/helper/extension.php
+++ b/lib/plugins/extension/helper/extension.php
@@ -96,7 +96,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
         return in_array($this->base,
                         array('acl', 'info', 'extension', 'testing', 'revert', 'popularity',
                               'config', 'plugin', 'safefnrecode', 'authplain', 'testing',
-                              'template:dokuwiki', 'template:default'
+                              'template:dokuwiki'
                               )
         );
     }
-- 
cgit v1.2.3


From 220ab8d2dfa86c96112098922b40017448d3500a Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 5 Jan 2014 20:01:45 +0100
Subject: even more fixes for the bundled extension list

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

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/helper/extension.php b/lib/plugins/extension/helper/extension.php
index 2d0e91301..4eedb2a25 100644
--- a/lib/plugins/extension/helper/extension.php
+++ b/lib/plugins/extension/helper/extension.php
@@ -94,10 +94,10 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
     public function isBundled() {
         if (!empty($this->remoteInfo['bundled'])) return $this->remoteInfo['bundled'];
         return in_array($this->base,
-                        array('acl', 'info', 'extension', 'testing', 'revert', 'popularity',
-                              'config', 'plugin', 'safefnrecode', 'authplain', 'testing',
-                              'template:dokuwiki'
-                              )
+                        array(
+                            'authad', 'authldap', 'authmysql', 'authpgsql', 'authplain', 'acl', 'info', 'extension',
+                            'revert', 'popularity', 'config', 'plugin', 'safefnrecode', 'testing', 'template:dokuwiki'
+                        )
         );
     }
 
-- 
cgit v1.2.3


From 16660d32b7c1e36a9940ee0ee9b692bf0dd1c313 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 5 Jan 2014 20:29:14 +0100
Subject: use config for firguring out if an extension is protected

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

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/helper/extension.php b/lib/plugins/extension/helper/extension.php
index 4eedb2a25..e3cb8a410 100644
--- a/lib/plugins/extension/helper/extension.php
+++ b/lib/plugins/extension/helper/extension.php
@@ -107,7 +107,10 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return bool if the extension is protected
      */
     public function isProtected() {
-        return in_array($this->id, array('acl', 'config', 'info', 'plugin', 'revert', 'usermanager', 'template:dokuwiki'));
+        /** @var Doku_Plugin_Controller $plugin_controller */
+        global $plugin_controller;
+        $cascade = $plugin_controller->getCascade();
+        return (isset($cascade['protected'][$this->id]) && $cascade['protected'][$this->id]);
     }
 
     /**
-- 
cgit v1.2.3


From bcdcd3d147fd8bcc680f24de88120c23d9533b50 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 5 Jan 2014 20:39:25 +0100
Subject: do not show updates for bundled plugins

---
 lib/plugins/extension/helper/extension.php | 1 +
 lib/plugins/extension/lang/en/lang.php     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/helper/extension.php b/lib/plugins/extension/helper/extension.php
index e3cb8a410..be29f95d8 100644
--- a/lib/plugins/extension/helper/extension.php
+++ b/lib/plugins/extension/helper/extension.php
@@ -145,6 +145,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      */
     public function updateAvailable() {
         if(!$this->isInstalled()) return false;
+        if($this->isBundled()) return false;
         $lastupdate = $this->getLastUpdate();
         if ($lastupdate === false) return false;
         $installed  = $this->getInstalledVersion();
diff --git a/lib/plugins/extension/lang/en/lang.php b/lib/plugins/extension/lang/en/lang.php
index 3b2d2f38d..593794ef2 100644
--- a/lib/plugins/extension/lang/en/lang.php
+++ b/lib/plugins/extension/lang/en/lang.php
@@ -45,7 +45,7 @@ $lang['repository']                   = 'Repository:';
 $lang['unknown']                      = '<em>unknown</em>';
 $lang['installed_version']            = 'Installed version:';
 $lang['install_date']                 = 'Your last update:';
-$lang['available_version']            = 'Version:';
+$lang['available_version']            = 'Available version:';
 $lang['compatible']                   = 'Compatible with:';
 $lang['depends']                      = 'Depends on:';
 $lang['similar']                      = 'Similar to:';
-- 
cgit v1.2.3


From 5284857cb2f94bc347eb56c694d894283fc41703 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 5 Jan 2014 20:45:32 +0100
Subject: protect authplain and current auth plugin

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

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/helper/extension.php b/lib/plugins/extension/helper/extension.php
index be29f95d8..2a7119189 100644
--- a/lib/plugins/extension/helper/extension.php
+++ b/lib/plugins/extension/helper/extension.php
@@ -102,11 +102,15 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
     }
 
     /**
-     * If the extension is protected
+     * If the extension is protected against any modification (disable/uninstall)
      *
      * @return bool if the extension is protected
      */
     public function isProtected() {
+        // never allow deinstalling the current auth plugin:
+        global $conf;
+        if ($this->id == $conf['authtype']) return true;
+
         /** @var Doku_Plugin_Controller $plugin_controller */
         global $plugin_controller;
         $cascade = $plugin_controller->getCascade();
-- 
cgit v1.2.3


From 13ae5e00de640e20e25bff36eb1b2585acf153d3 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 5 Jan 2014 20:45:52 +0100
Subject: typo fix

---
 lib/plugins/extension/lang/en/intro_templates.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/lang/en/intro_templates.txt b/lib/plugins/extension/lang/en/intro_templates.txt
index 8bc04631d..012a74995 100644
--- a/lib/plugins/extension/lang/en/intro_templates.txt
+++ b/lib/plugins/extension/lang/en/intro_templates.txt
@@ -1 +1 @@
-These are the templates currently installed in your DokuWiki. You can select template to be used in the [[?do=admin&page=config|Configuration Manager]].
+These are the templates currently installed in your DokuWiki. You can select the template to be used in the [[?do=admin&page=config|Configuration Manager]].
-- 
cgit v1.2.3


From 9672d9f3bf51a5b383078874035796c6ac776eb1 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 5 Jan 2014 20:58:48 +0100
Subject: removed the old plugin manager

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

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/helper/extension.php b/lib/plugins/extension/helper/extension.php
index 2a7119189..9cf4848ad 100644
--- a/lib/plugins/extension/helper/extension.php
+++ b/lib/plugins/extension/helper/extension.php
@@ -96,7 +96,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
         return in_array($this->base,
                         array(
                             'authad', 'authldap', 'authmysql', 'authpgsql', 'authplain', 'acl', 'info', 'extension',
-                            'revert', 'popularity', 'config', 'plugin', 'safefnrecode', 'testing', 'template:dokuwiki'
+                            'revert', 'popularity', 'config', 'safefnrecode', 'testing', 'template:dokuwiki'
                         )
         );
     }
-- 
cgit v1.2.3


From 4c005e3f9adeb9180a879cc38518d1cff63e9261 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 5 Jan 2014 21:02:00 +0100
Subject: fixed strict standard error and added some docblock

---
 lib/plugins/extension/action.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/action.php b/lib/plugins/extension/action.php
index b35c1cb13..0d6e7d996 100644
--- a/lib/plugins/extension/action.php
+++ b/lib/plugins/extension/action.php
@@ -16,12 +16,18 @@ class action_plugin_extension extends DokuWiki_Action_Plugin {
      * @param Doku_Event_Handler $controller DokuWiki's event controller object
      * @return void
      */
-    public function register(Doku_Event_Handler &$controller) {
+    public function register(Doku_Event_Handler $controller) {
 
         $controller->register_hook('AJAX_CALL_UNKNOWN', 'BEFORE', $this, 'info');
 
     }
 
+    /**
+     * Create the detail info for a single plugin
+     *
+     * @param Doku_Event $event
+     * @param            $param
+     */
     public function info(Doku_Event &$event, $param){
         global $INPUT;
         if($event->data != 'plugin_extension') return;
-- 
cgit v1.2.3


From a4667104ff9b4131c1aceaea022e65d0976a15d6 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 5 Jan 2014 21:22:31 +0100
Subject: added git warning

---
 lib/plugins/extension/helper/extension.php | 10 ++++++++++
 lib/plugins/extension/helper/list.php      |  4 ++++
 lib/plugins/extension/lang/en/lang.php     |  4 +++-
 3 files changed, 17 insertions(+), 1 deletion(-)

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/helper/extension.php b/lib/plugins/extension/helper/extension.php
index 9cf4848ad..d200d5ab0 100644
--- a/lib/plugins/extension/helper/extension.php
+++ b/lib/plugins/extension/helper/extension.php
@@ -86,6 +86,16 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
         return is_dir($this->getInstallDir());
     }
 
+    /**
+     * If the extension is under git control
+     *
+     * @return bool
+     */
+    public function isGitControlled() {
+        if(!$this->isInstalled()) return false;
+        return is_dir($this->getInstallDir().'/.git');
+    }
+
     /**
      * If the extension is bundled
      *
diff --git a/lib/plugins/extension/helper/list.php b/lib/plugins/extension/helper/list.php
index e33dbfa04..901a4e8fa 100644
--- a/lib/plugins/extension/helper/list.php
+++ b/lib/plugins/extension/helper/list.php
@@ -476,6 +476,10 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
                 }
             }
 
+            if ($extension->isGitControlled()){
+                $errors .= '<p class="permerror">'.$this->getLang('git').'</p>';
+            }
+
         }else{
             if (($canmod = $extension->canModify()) === true) {
                 if ($extension->getDownloadURL()) {
diff --git a/lib/plugins/extension/lang/en/lang.php b/lib/plugins/extension/lang/en/lang.php
index 593794ef2..c1e73d023 100644
--- a/lib/plugins/extension/lang/en/lang.php
+++ b/lib/plugins/extension/lang/en/lang.php
@@ -80,4 +80,6 @@ $lang['error_copy']                   = 'There was a file copy error while attem
 
 $lang['noperms']                      = 'Extension directory is not writable';
 $lang['notplperms']                   = 'Template directory is not writable';
-$lang['nopluginperms']                = 'Plugin directory is not writable';
\ No newline at end of file
+$lang['nopluginperms']                = 'Plugin directory is not writable';
+
+$lang['git']                          = 'This extension was installed via git, you may not want to update it here.';
\ No newline at end of file
-- 
cgit v1.2.3


From 47559c79fedce97add92eb193fb379b8795fc612 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 5 Jan 2014 20:22:40 +0000
Subject: fixed and improved some HTML in extension manager

---
 lib/plugins/extension/helper/list.php  | 47 +++++++++++++++++-----------------
 lib/plugins/extension/lang/en/lang.php |  3 ++-
 lib/plugins/extension/style.less       | 10 +++-----
 3 files changed, 29 insertions(+), 31 deletions(-)

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/helper/list.php b/lib/plugins/extension/helper/list.php
index 901a4e8fa..f387a6de6 100644
--- a/lib/plugins/extension/helper/list.php
+++ b/lib/plugins/extension/helper/list.php
@@ -56,7 +56,7 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
      * @param int    $level  The level of the header
      */
     function add_header($id, $header, $level = 2) {
-        $this->form .='<h'.$level.' id="'.$id.'">'.hsc($header).'</h'.$level.'>';
+        $this->form .='<h'.$level.' id="'.$id.'">'.hsc($header).'</h'.$level.'>'.DOKU_LF;
     }
 
     /**
@@ -65,7 +65,7 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
      * @param string $data The content
      */
     function add_p($data) {
-        $this->form .= '<p>'.hsc($data).'</p>';
+        $this->form .= '<p>'.hsc($data).'</p>'.DOKU_LF;
     }
 
     /**
@@ -77,7 +77,7 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
         foreach ($array as $key => $value) {
             $this->form .= '<input type="hidden" name="'.hsc($key).'" value="'.hsc($value).'" />';
         }
-        $this->form .= '</div>';
+        $this->form .= '</div>'.DOKU_LF;
     }
 
     /**
@@ -85,7 +85,7 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
      */
     function end_form() {
         $this->form .= '</ul>';
-        $this->form .= '</form>';
+        $this->form .= '</form>'.DOKU_LF;
     }
 
     /**
@@ -110,7 +110,7 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
      * @param string $html  The content
      */
     private function populate_column($class, $html) {
-        $this->form .= '<div class="'.$class.' col">'.$html.'</div>';
+        $this->form .= '<div class="'.$class.' col">'.$html.'</div>'.DOKU_LF;
     }
 
     /**
@@ -164,13 +164,13 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
             $mailid = $extension->getEmailID();
             if($mailid){
                 $url = $this->gui->tabURL('search', array('q' => 'authorid:'.$mailid));
-                return '<a href="'.$url.'" class="author" title="'.$this->getLang('author_hint').'" ><img src="//www.gravatar.com/avatar/'.$mailid.'?s=20&d=mm" width="20" height="20"> '.hsc($extension->getAuthor()).'</a>';
+                return '<a href="'.$url.'" class="author" title="'.$this->getLang('author_hint').'" ><img src="//www.gravatar.com/avatar/'.$mailid.'?s=20&amp;d=mm" width="20" height="20" alt="" /> '.hsc($extension->getAuthor()).'</a>';
 
             }else{
                 return '<span class="author">'.hsc($extension->getAuthor()).'</span>';
             }
         }
-        return "<em class=\"author\">".$this->getLang('unknown_author')."</em>";
+        return "<em class=\"author\">".$this->getLang('unknown_author')."</em>".DOKU_LF;
     }
 
     /**
@@ -181,16 +181,17 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
      */
     function make_screenshot(helper_plugin_extension_extension $extension) {
         if($extension->getScreenshotURL()) {
-            $img = '<a title="'.hsc($extension->getDisplayName()).'" href="'.$extension->getScreenshotURL().'" target="_blank" class="extension_screenshot">'.
-                '<img alt="'.hsc($extension->getDisplayName()).'" width="120" height="70" src="'.$extension->getThumbnailURL().'" />'.
+            $title = sprintf($this->getLang('screenshot'), hsc($extension->getDisplayName()));
+            $img = '<a href="'.hsc($extension->getScreenshotURL()).'" target="_blank" class="extension_screenshot">'.
+                '<img alt="'.$title.'" width="120" height="70" src="'.hsc($extension->getThumbnailURL()).'" />'.
                 '</a>';
         } elseif($extension->isTemplate()) {
-            $img = '<img alt="template" width="120" height="70" src="'.DOKU_BASE.'lib/plugins/extension/images/template.png" />';
+            $img = '<img alt="" width="120" height="70" src="'.DOKU_BASE.'lib/plugins/extension/images/template.png" />';
 
         } else {
-            $img = '<img alt="plugin" width="120" height="70" src="'.DOKU_BASE.'lib/plugins/extension/images/plugin.png" />';
+            $img = '<img alt="" width="120" height="70" src="'.DOKU_BASE.'lib/plugins/extension/images/plugin.png" />';
         }
-        return '<div class="screenshot" >'.$img.'<span></span></div>';
+        return '<div class="screenshot" >'.$img.'<span></span></div>'.DOKU_LF;
     }
 
     /**
@@ -204,21 +205,21 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
         $return  = '<div>';
         $return .= '<h2>';
         $return .= sprintf($this->getLang('extensionby'), hsc($extension->getDisplayName()), $this->make_author($extension));
-        $return .= '</h2>';
+        $return .= '</h2>'.DOKU_LF;
 
         $return .= $this->make_screenshot($extension);
 
         $popularity = $extension->getPopularity();
         if ($popularity !== false && !$extension->isBundled()) {
-            $popularityText = sprintf($this->getLang('popularity'), $popularity);
-            $return .= '<div class="popularity" title="'.$popularityText.'"><div style="width: '.($popularity * 100).'%;"><span></span></div></div>';
+            $popularityText = sprintf($this->getLang('popularity'), round($popularity*100, 2));
+            $return .= '<div class="popularity" title="'.$popularityText.'"><div style="width: '.($popularity * 100).'%;"><span class="a11y">'.$popularityText.'</span></div></div>'.DOKU_LF;
         }
 
         $return .= '<p>';
         if($extension->getDescription()) {
             $return .=  hsc($extension->getDescription()).' ';
         }
-        $return .= '</p>';
+        $return .= '</p>'.DOKU_LF;
 
         $return .= $this->make_linkbar($extension);
 
@@ -229,13 +230,13 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
             $url = $this->gui->tabURL('', array('info' => $extension->getID()));
             $class = '';
         }
-        $return .= '<a href="'.$url.'#extensionplugin__'.$extension->getID().'" class="info '.$class.'" data-extid="'.$extension->getID().'">'.$this->getLang('btn_info').'</a>';
+        $return .= ' <a href="'.$url.'#extensionplugin__'.$extension->getID().'" class="info '.$class.'" title="'.$this->getLang('btn_info').'" data-extid="'.$extension->getID().'">'.$this->getLang('btn_info').'</a>';
 
         if ($showinfo) {
             $return .= $this->make_info($extension);
         }
         $return .= $this->make_noticearea($extension);
-        $return .= '</div>';
+        $return .= '</div>'.DOKU_LF;
         return $return;
     }
 
@@ -246,7 +247,7 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
      * @return string The HTML code
      */
     function make_linkbar(helper_plugin_extension_extension $extension) {
-        $return  = '<span class="linkbar">';
+        $return  = '<div class="linkbar">';
         $return .= $this->make_homepagelink($extension);
         if ($extension->getBugtrackerURL()) {
             $return .= ' <a href="'.hsc($extension->getBugtrackerURL()).'" title="'.hsc($extension->getBugtrackerURL()).'" class ="interwiki iw_dokubug">'.$this->getLang('bugs_features').'</a> ';
@@ -265,7 +266,7 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
             }
             $return .= '</span>';
         }
-        $return .= '</span>';
+        $return .= '</div>'.DOKU_LF;
         return $return;
     }
 
@@ -308,7 +309,7 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
                 sprintf($this->getLang('url_change'), hsc($extension->getDownloadURL()), hsc($extension->getLastDownloadURL())).
                 '</div>';
         }
-        return $return;
+        return $return.DOKU_LF;
     }
 
     /**
@@ -424,7 +425,7 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
             $return .= $this->make_linklist($extension->getConflicts());
             $return .= '</dd>';
         }
-        $return .= '</dl>';
+        $return .= '</dl>'.DOKU_LF;
         return $return;
     }
 
@@ -495,7 +496,7 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
             $return .= ($extension->getLastUpdate() ? hsc($extension->getLastUpdate()) : $this->getLang('unknown')).'</span>';
         }
 
-        return $return.' '.$errors;
+        return $return.' '.$errors.DOKU_LF;
     }
 
     /**
diff --git a/lib/plugins/extension/lang/en/lang.php b/lib/plugins/extension/lang/en/lang.php
index c1e73d023..fd00b5007 100644
--- a/lib/plugins/extension/lang/en/lang.php
+++ b/lib/plugins/extension/lang/en/lang.php
@@ -35,7 +35,8 @@ $lang['search_for']                   = 'Search Extension:';
 $lang['search']                       = 'Search';
 
 $lang['extensionby']                  = '<strong>%s</strong> by %s';
-$lang['popularity']                   = 'Popularity: %s';
+$lang['screenshot']                   = 'Screenshot of %s';
+$lang['popularity']                   = 'Popularity: %s%%';
 $lang['homepage_link']                = 'Docs';
 $lang['bugs_features']                = 'Bugs';
 $lang['author_hint']                  = 'Search extensions by this author';
diff --git a/lib/plugins/extension/style.less b/lib/plugins/extension/style.less
index 0d86f5419..a60aac8bf 100644
--- a/lib/plugins/extension/style.less
+++ b/lib/plugins/extension/style.less
@@ -161,15 +161,11 @@
         div {
             background-color: @ini_border;
             height: 100%;
-
-            span {
-                display: none;// @todo: hide accessibly
-            }
         }
     }
 
     // Docs, Bugs, Tags
-    span.linkbar {
+    div.linkbar {
         font-size: 85%;
 
         span.tags {
@@ -180,7 +176,7 @@
 
     // more info button
     a.info {
-        background: transparent url(images/up.png) no-repeat 0 0;
+        background: transparent url(images/down.png) no-repeat 0 0;
         border-width: 0;
         height: 13px;
         width: 13px;
@@ -190,7 +186,7 @@
         overflow: hidden;
 
         &.close {
-            background: transparent url(images/down.png) no-repeat 0 0;
+            background: transparent url(images/up.png) no-repeat 0 0;
         }
     }
 
-- 
cgit v1.2.3


From 480a4d375c62fce58c46db400a5ec9617941c3bf Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 5 Jan 2014 20:45:03 +0000
Subject: added basic mobile styles to extension manager (not great, but makes
 things at least readable)

---
 lib/plugins/extension/all.less | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 lib/plugins/extension/all.less

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/all.less b/lib/plugins/extension/all.less
new file mode 100644
index 000000000..8b2533e2e
--- /dev/null
+++ b/lib/plugins/extension/all.less
@@ -0,0 +1,23 @@
+
+@media only screen and (max-width: 600px) {
+
+#extension__list .legend {
+    > div {
+        padding-left: 0;
+    }
+
+    div.screenshot {
+        margin: 0 .5em .5em 0;
+    }
+
+    h2 {
+        width: auto;
+        float: none;
+    }
+
+    div.linkbar {
+        clear: left;
+    }
+}
+
+} /* /@media */
-- 
cgit v1.2.3


From 77da6d6ca677e783f5e104226a179b5f09ab121d Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 5 Jan 2014 22:25:41 +0000
Subject: added css and html changes for RTL scripts to extension manager

---
 lib/plugins/extension/all.less             | 14 ++++++
 lib/plugins/extension/helper/extension.php |  4 +-
 lib/plugins/extension/helper/list.php      | 39 +++++++--------
 lib/plugins/extension/lang/en/lang.php     |  1 +
 lib/plugins/extension/style.less           | 77 ++++++++++++++++++++++++++++--
 5 files changed, 111 insertions(+), 24 deletions(-)

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/all.less b/lib/plugins/extension/all.less
index 8b2533e2e..3d9688e14 100644
--- a/lib/plugins/extension/all.less
+++ b/lib/plugins/extension/all.less
@@ -20,4 +20,18 @@
     }
 }
 
+[dir=rtl] #extension__list .legend {
+    > div {
+        padding-right: 0;
+    }
+
+    div.screenshot {
+        margin: 0 0 .5em .5em;
+    }
+
+    div.linkbar {
+        clear: right;
+    }
+}
+
 } /* /@media */
diff --git a/lib/plugins/extension/helper/extension.php b/lib/plugins/extension/helper/extension.php
index d200d5ab0..02c2cc8ad 100644
--- a/lib/plugins/extension/helper/extension.php
+++ b/lib/plugins/extension/helper/extension.php
@@ -829,7 +829,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
         // download
         if(!$file = io_download($url, $tmp.'/', true, $file, 0)) {
             $this->dir_delete($tmp);
-            throw new Exception(sprintf($this->getLang('error_download'), hsc($url)));
+            throw new Exception(sprintf($this->getLang('error_download'), '<bdi>'.hsc($url).'</bdi>'));
         }
 
         return $tmp.'/'.$file;
@@ -921,7 +921,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
                     'action' => $action
                 );
             } else {
-                throw new Exception(sprintf($this->getLang('error_copy').DOKU_LF, $item['base']));
+                throw new Exception(sprintf($this->getLang('error_copy').DOKU_LF, '<bdi>'.$item['base'].'</bdi>'));
             }
         }
 
diff --git a/lib/plugins/extension/helper/list.php b/lib/plugins/extension/helper/list.php
index f387a6de6..7a08655b7 100644
--- a/lib/plugins/extension/helper/list.php
+++ b/lib/plugins/extension/helper/list.php
@@ -164,10 +164,10 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
             $mailid = $extension->getEmailID();
             if($mailid){
                 $url = $this->gui->tabURL('search', array('q' => 'authorid:'.$mailid));
-                return '<a href="'.$url.'" class="author" title="'.$this->getLang('author_hint').'" ><img src="//www.gravatar.com/avatar/'.$mailid.'?s=20&amp;d=mm" width="20" height="20" alt="" /> '.hsc($extension->getAuthor()).'</a>';
+                return '<bdi><a href="'.$url.'" class="author" title="'.$this->getLang('author_hint').'" ><img src="//www.gravatar.com/avatar/'.$mailid.'?s=20&amp;d=mm" width="20" height="20" alt="" /> '.hsc($extension->getAuthor()).'</a></bdi>';
 
             }else{
-                return '<span class="author">'.hsc($extension->getAuthor()).'</span>';
+                return '<bdi><span class="author">'.hsc($extension->getAuthor()).'</span></bdi>';
             }
         }
         return "<em class=\"author\">".$this->getLang('unknown_author')."</em>".DOKU_LF;
@@ -204,7 +204,7 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
     function make_legend(helper_plugin_extension_extension $extension, $showinfo = false) {
         $return  = '<div>';
         $return .= '<h2>';
-        $return .= sprintf($this->getLang('extensionby'), hsc($extension->getDisplayName()), $this->make_author($extension));
+        $return .= sprintf($this->getLang('extensionby'), '<bdi>'.hsc($extension->getDisplayName()).'</bdi>', $this->make_author($extension));
         $return .= '</h2>'.DOKU_LF;
 
         $return .= $this->make_screenshot($extension);
@@ -215,11 +215,11 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
             $return .= '<div class="popularity" title="'.$popularityText.'"><div style="width: '.($popularity * 100).'%;"><span class="a11y">'.$popularityText.'</span></div></div>'.DOKU_LF;
         }
 
-        $return .= '<p>';
         if($extension->getDescription()) {
+            $return .= '<p><bdi>';
             $return .=  hsc($extension->getDescription()).' ';
+            $return .= '</bdi></p>'.DOKU_LF;
         }
-        $return .= '</p>'.DOKU_LF;
 
         $return .= $this->make_linkbar($extension);
 
@@ -255,6 +255,7 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
         if($extension->getTags()){
             $first = true;
             $return .= '<span class="tags">';
+            $return .= '<span class="a11y">'.$this->getLang('tags').'</span> ';
             foreach ($extension->getTags() as $tag) {
                 if(!$first){
                     $return .= ', ';
@@ -262,7 +263,7 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
                     $first = false;
                 }
                 $url = $this->gui->tabURL('search', array('q' => 'tag:'.$tag));
-                $return .= '<a href="'.$url.'">'.hsc($tag).'</a>';
+                $return .= '<bdi><a href="'.$url.'">'.hsc($tag).'</a></bdi>';
             }
             $return .= '</span>';
         }
@@ -281,22 +282,22 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
         $missing_dependencies = $extension->getMissingDependencies();
         if(!empty($missing_dependencies)) {
             $return .= '<div class="msg error">'.
-                sprintf($this->getLang('missing_dependency'), implode(', ', /*array_map(array($this->helper, 'make_extensionsearchlink'),*/ $missing_dependencies)).
+                sprintf($this->getLang('missing_dependency'), '<bdi>'.implode(', ', /*array_map(array($this->helper, 'make_extensionsearchlink'),*/ $missing_dependencies).'</bdi>').
                 '</div>';
         }
         if($extension->isInWrongFolder()) {
             $return .= '<div class="msg error">'.
-                sprintf($this->getLang('wrong_folder'), hsc($extension->getInstallName()), hsc($extension->getBase())).
+                sprintf($this->getLang('wrong_folder'), '<bdi>'.hsc($extension->getInstallName()).'</bdi>', '<bdi>'.hsc($extension->getBase()).'</bdi>').
                 '</div>';
         }
         if(($securityissue = $extension->getSecurityIssue()) !== false) {
             $return .= '<div class="msg error">'.
-                sprintf($this->getLang('security_issue'), hsc($securityissue )).
+                sprintf($this->getLang('security_issue'), '<bdi>'.hsc($securityissue).'</bdi>').
                 '</div>';
         }
         if(($securitywarning = $extension->getSecurityWarning()) !== false) {
             $return .= '<div class="msg notify">'.
-                sprintf($this->getLang('security_warning'), hsc($securitywarning)).
+                sprintf($this->getLang('security_warning'), '<bdi>'.hsc($securitywarning).'</bdi>').
                 '</div>';
         }
         if($extension->updateAvailable()) {
@@ -306,7 +307,7 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
         }
         if($extension->hasDownloadURLChanged()) {
             $return .=  '<div class="msg notify">'.
-                sprintf($this->getLang('url_change'), hsc($extension->getDownloadURL()), hsc($extension->getLastDownloadURL())).
+                sprintf($this->getLang('url_change'), '<bdi>'.hsc($extension->getDownloadURL()).'</bdi>', '<bdi>'.hsc($extension->getLastDownloadURL()).'</bdi>').
                 '</div>';
         }
         return $return.DOKU_LF;
@@ -354,14 +355,14 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
 
         if (!$extension->isBundled()) {
             $return .= '<dt>'.$this->getLang('downloadurl').'</dt>';
-            $return .= '<dd>';
+            $return .= '<dd><bdi>';
             $return .= ($extension->getDownloadURL() ? $this->shortlink($extension->getDownloadURL()) : $default);
-            $return .= '</dd>';
+            $return .= '</bdi></dd>';
 
             $return .= '<dt>'.$this->getLang('repository').'</dt>';
-            $return .= '<dd>';
+            $return .= '<dd><bdi>';
             $return .= ($extension->getSourcerepoURL() ? $this->shortlink($extension->getSourcerepoURL()) : $default);
-            $return .= '</dd>';
+            $return .= '</bdi></dd>';
         }
 
         if ($extension->isInstalled()) {
@@ -392,15 +393,15 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
         }
 
         $return .= '<dt>'.$this->getLang('provides').'</dt>';
-        $return .= '<dd>';
+        $return .= '<dd><bdi>';
         $return .= ($extension->getTypes() ? hsc(implode(', ', $extension->getTypes())) : $default);
-        $return .= '</dd>';
+        $return .= '</bdi></dd>';
 
         if($extension->getCompatibleVersions()) {
             $return .= '<dt>'.$this->getLang('compatible').'</dt>';
             $return .= '<dd>';
             foreach ($extension->getCompatibleVersions() as $date => $version) {
-                $return .= $version['label'].' ('.$date.'), ';
+                $return .= '<bdi>'.$version['label'].' ('.$date.')</bdi>, ';
             }
             $return = rtrim($return, ', ');
             $return .= '</dd>';
@@ -438,7 +439,7 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
     function make_linklist($ext) {
         $return = '';
         foreach ($ext as $link) {
-            $return .= '<a href="'.$this->gui->tabURL('search', array('q'=>'ext:'.$link)).'">'.hsc($link).'</a>, ';
+            $return .= '<bdi><a href="'.$this->gui->tabURL('search', array('q'=>'ext:'.$link)).'">'.hsc($link).'</a></bdi>, ';
         }
         return rtrim($return, ', ');
     }
diff --git a/lib/plugins/extension/lang/en/lang.php b/lib/plugins/extension/lang/en/lang.php
index fd00b5007..83ff19f00 100644
--- a/lib/plugins/extension/lang/en/lang.php
+++ b/lib/plugins/extension/lang/en/lang.php
@@ -39,6 +39,7 @@ $lang['screenshot']                   = 'Screenshot of %s';
 $lang['popularity']                   = 'Popularity: %s%%';
 $lang['homepage_link']                = 'Docs';
 $lang['bugs_features']                = 'Bugs';
+$lang['tags']                         = 'Tags:';
 $lang['author_hint']                  = 'Search extensions by this author';
 $lang['installed']                    = 'Installed:';
 $lang['downloadurl']                  = 'Download URL:';
diff --git a/lib/plugins/extension/style.less b/lib/plugins/extension/style.less
index a60aac8bf..d20689099 100644
--- a/lib/plugins/extension/style.less
+++ b/lib/plugins/extension/style.less
@@ -52,7 +52,6 @@
         background-color: @ini_background_alt;
         margin: 0 0 10px 0;
         padding: 10px 10px 8px;
-        text-align: left;
         overflow: hidden;
     }
 
@@ -120,8 +119,8 @@
             min-height: 24px;
             min-width: 24px;
             position: absolute;
-            left: 0px;
-            top: 0px;
+            left: 0;
+            top: 0;
         }
     }
 
@@ -220,6 +219,64 @@
     }
 }
 
+[dir=rtl] #extension__list .legend {
+    float: right;
+
+    > div {
+        padding: 0 132px 0 .5em;
+        border-left: 1px solid @ini_background_alt;
+        border-right-width: 0;
+    }
+
+    div.screenshot {
+        margin-left: 0;
+        margin-right: -132px;
+        float: right;
+
+        span {
+            left: auto;
+            right: 0;
+        }
+    }
+
+    h2 {
+        float: left;
+    }
+
+    div.popularity {
+        right: auto;
+        left: .5em;
+    }
+
+    div.linkbar span.tags,
+    dl.details dd a.donate {
+        padding-left: 0;
+        padding-right: 18px;
+        background-position: top right;
+    }
+
+    a.info {
+        float: left;
+    }
+
+    dl.details {
+        dt {
+            clear: right;
+            float: right;
+            text-align: left;
+            padding-left: 5px;
+            padding-right: 0;
+        }
+
+        dd {
+            margin-left: 0;
+            margin-right: 25%;
+            padding-left: 0;
+            padding-right: 5px;
+        }
+    }
+}
+
 /*
  * Enabled/Disabled overrides
  */
@@ -266,6 +323,20 @@
     }
 }
 
+[dir=rtl] #extension__manager .actions {
+    float: left;
+    text-align: left;
+
+    p.permerror {
+        margin-left: 0;
+        margin-right: 0.4em;
+        text-align: right;
+        padding-left: 0;
+        padding-right: 19px;
+        background-position: center right;
+    }
+}
+
 /**
  * Search form
  */
-- 
cgit v1.2.3


From 06d8000aa9e10b65a946d58d1cffe41aff987d2b Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 5 Jan 2014 23:11:23 +0000
Subject: added status to info list of extension plugin

---
 lib/plugins/extension/helper/list.php  | 39 ++++++++++++++++++++++++++++------
 lib/plugins/extension/lang/en/lang.php | 13 ++++++++++--
 2 files changed, 43 insertions(+), 9 deletions(-)

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/helper/list.php b/lib/plugins/extension/helper/list.php
index 7a08655b7..ba3681ce4 100644
--- a/lib/plugins/extension/helper/list.php
+++ b/lib/plugins/extension/helper/list.php
@@ -252,14 +252,13 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
         if ($extension->getBugtrackerURL()) {
             $return .= ' <a href="'.hsc($extension->getBugtrackerURL()).'" title="'.hsc($extension->getBugtrackerURL()).'" class ="interwiki iw_dokubug">'.$this->getLang('bugs_features').'</a> ';
         }
-        if($extension->getTags()){
+        if ($extension->getTags()){
             $first = true;
-            $return .= '<span class="tags">';
-            $return .= '<span class="a11y">'.$this->getLang('tags').'</span> ';
+            $return .= '<span class="tags">'.$this->getLang('tags').' ';
             foreach ($extension->getTags() as $tag) {
-                if(!$first){
+                if (!$first){
                     $return .= ', ';
-                }else{
+                } else {
                     $first = false;
                 }
                 $url = $this->gui->tabURL('search', array('q' => 'tag:'.$tag));
@@ -345,6 +344,9 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
         $default = $this->getLang('unknown');
         $return = '<dl class="details">';
 
+        $return .= '<dt>'.$this->getLang('status').'</dt>';
+        $return .= '<dd>'.$this->make_status($extension).'</dd>';
+
         if ($extension->getDonationURL()) {
             $return .= '<dt>'.$this->getLang('donate').'</dt>';
             $return .= '<dd>';
@@ -352,7 +354,6 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
             $return .= '</dd>';
         }
 
-
         if (!$extension->isBundled()) {
             $return .= '<dt>'.$this->getLang('downloadurl').'</dt>';
             $return .= '<dd><bdi>';
@@ -513,7 +514,7 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
         switch ($action) {
             case 'install':
             case 'reinstall':
-                $title = 'title="'.$extension->getDownloadURL().'"';
+                $title = 'title="'.hsc($extension->getDownloadURL()).'"';
                 break;
         }
 
@@ -522,4 +523,28 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
 
         return '<input class="'.$classes.'" name="'.$name.'" type="submit" value="'.$this->getLang('btn_'.$action).'" '.$title.' />';
     }
+
+    /**
+     * Plugin/template status
+     *
+     * @param helper_plugin_extension_extension $extension The extension
+     * @return string The description of all relevant statusses
+     */
+    function make_status(helper_plugin_extension_extension $extension) {
+        $return = '';
+        if ($extension->isInstalled()) {
+            $return .= $this->getLang('status_installed').' ';
+            if ($extension->isProtected()) {
+                $return .= $this->getLang('status_protected').' ';
+            } else {
+                $return .= $extension->isEnabled() ? $this->getLang('status_enabled').' ' : $this->getLang('status_disabled').' ';
+            }
+        } else {
+            $return .= $this->getLang('status_not_installed').' ';
+        }
+        $return .= !$extension->canModify() ? $this->getLang('status_unmodifiable').' ' : '';
+        $return .= $extension->isTemplate() ? $this->getLang('status_template') : $this->getLang('status_plugin');
+        return $return;
+    }
+
 }
diff --git a/lib/plugins/extension/lang/en/lang.php b/lib/plugins/extension/lang/en/lang.php
index 83ff19f00..06c83a708 100644
--- a/lib/plugins/extension/lang/en/lang.php
+++ b/lib/plugins/extension/lang/en/lang.php
@@ -55,6 +55,16 @@ $lang['conflicts']                    = 'Conflicts with:';
 $lang['donate']                       = 'Like this?';
 $lang['donate_action']                = 'Buy the author a coffee!';
 $lang['repo_retry']                   = 'Retry';
+$lang['provides']                     = 'Provides:';
+$lang['status']                       = 'Status:';
+$lang['status_installed']             = 'installed';
+$lang['status_not_installed']         = 'not installed';
+$lang['status_protected']             = 'protected';
+$lang['status_enabled']               = 'enabled';
+$lang['status_disabled']              = 'disabled';
+$lang['status_unmodifiable']          = 'unmodifiable';
+$lang['status_plugin']                = 'plugin';
+$lang['status_template']              = 'template';
 
 $lang['msg_enabled']                  = 'Plugin %s enabled';
 $lang['msg_disabled']                 = 'Plugin %s disabled';
@@ -65,7 +75,6 @@ $lang['msg_plugin_install_success']   = 'Plugin %s installed successfully';
 $lang['msg_plugin_update_success']    = 'Plugin %s updated successfully';
 $lang['msg_upload_failed']            = 'Uploading the file failed';
 
-$lang['provides']                     = 'Provides:';
 $lang['missing_dependency']           = '<strong>Missing or disabled dependency:</strong> %s';
 $lang['security_issue']               = '<strong>Security Issue:</strong> %s';
 $lang['security_warning']             = '<strong>Security Warning:</strong> %s';
@@ -84,4 +93,4 @@ $lang['noperms']                      = 'Extension directory is not writable';
 $lang['notplperms']                   = 'Template directory is not writable';
 $lang['nopluginperms']                = 'Plugin directory is not writable';
 
-$lang['git']                          = 'This extension was installed via git, you may not want to update it here.';
\ No newline at end of file
+$lang['git']                          = 'This extension was installed via git, you may not want to update it here.';
-- 
cgit v1.2.3


From 0826f6cbd906e92fd040dfd3377f1b2a9db13873 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Mon, 6 Jan 2014 21:06:09 +0100
Subject: now use new core funtion to recursively delete

---
 lib/plugins/extension/helper/extension.php | 32 ++++--------------------------
 1 file changed, 4 insertions(+), 28 deletions(-)

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/helper/extension.php b/lib/plugins/extension/helper/extension.php
index 02c2cc8ad..f91d237f7 100644
--- a/lib/plugins/extension/helper/extension.php
+++ b/lib/plugins/extension/helper/extension.php
@@ -33,7 +33,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      */
     public function __destruct() {
         foreach($this->temporary as $dir){
-            $this->dir_delete($dir);
+            io_rmdir($dir, true);
         }
     }
 
@@ -640,7 +640,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      */
     public function uninstall() {
         $this->purgeCache();
-        return $this->dir_delete($this->getInstallDir());
+        return io_rmdir($this->getInstallDir(), true);
     }
 
     /**
@@ -768,30 +768,6 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
         io_saveFile($managerpath, $data);
     }
 
-    /**
-     * delete, with recursive sub-directory support
-     *
-     * @param string $path The path that shall be deleted
-     * @return bool If the directory has been successfully deleted
-     */
-    protected function dir_delete($path) {
-        if(!is_string($path) || $path == "") return false;
-
-        if(is_dir($path) && !is_link($path)) {
-            if(!$dh = @opendir($path)) return false;
-
-            while ($f = readdir($dh)) {
-                if($f == '..' || $f == '.') continue;
-                $this->dir_delete("$path/$f");
-            }
-
-            closedir($dh);
-            return @rmdir($path);
-        } else {
-            return @unlink($path);
-        }
-    }
-
     /**
      * Returns a temporary directory
      *
@@ -828,7 +804,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
 
         // download
         if(!$file = io_download($url, $tmp.'/', true, $file, 0)) {
-            $this->dir_delete($tmp);
+            io_rmdir($tmp, true);
             throw new Exception(sprintf($this->getLang('error_download'), '<bdi>'.hsc($url).'</bdi>'));
         }
 
@@ -926,7 +902,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
         }
 
         // cleanup
-        if($tmp) $this->dir_delete($tmp);
+        if($tmp) io_rmdir($tmp, true);
 
         return $installed_extensions;
     }
-- 
cgit v1.2.3


From da5f0eee25838368de375eb14d345b70ae3cbc7a Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Mon, 6 Jan 2014 21:25:59 +0100
Subject: check for admin in AJAX backend

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

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/action.php b/lib/plugins/extension/action.php
index 0d6e7d996..9dd1648ff 100644
--- a/lib/plugins/extension/action.php
+++ b/lib/plugins/extension/action.php
@@ -29,7 +29,15 @@ class action_plugin_extension extends DokuWiki_Action_Plugin {
      * @param            $param
      */
     public function info(Doku_Event &$event, $param){
+        global $USERINFO;
         global $INPUT;
+
+        if(empty($_SERVER['REMOTE_USER']) || !auth_isadmin($_SERVER['REMOTE_USER'], $USERINFO['grps'])){
+            http_status(403);
+            echo 'Forbidden';
+            exit;
+        }
+
         if($event->data != 'plugin_extension') return;
         $event->preventDefault();
         $event->stopPropagation();
-- 
cgit v1.2.3


From 189c9cabe204e2493f7d44f66361ad167f7e1c02 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Mon, 6 Jan 2014 21:29:52 +0100
Subject: purge cache only once on install

this is not a extension specific cache but a global one. no need to
purge for each installed extension
---
 lib/plugins/extension/helper/extension.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/helper/extension.php b/lib/plugins/extension/helper/extension.php
index f91d237f7..3f4906463 100644
--- a/lib/plugins/extension/helper/extension.php
+++ b/lib/plugins/extension/helper/extension.php
@@ -575,12 +575,8 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
 
         try {
             $installed = $this->installArchive("$tmp/upload.archive", true, $basename);
-
-            // 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 cf37525f0abe7425193f3ec2bf426cf834a949a3 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Mon, 6 Jan 2014 21:31:14 +0100
Subject: typo fix

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

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/helper/extension.php b/lib/plugins/extension/helper/extension.php
index 3f4906463..1676e3962 100644
--- a/lib/plugins/extension/helper/extension.php
+++ b/lib/plugins/extension/helper/extension.php
@@ -632,7 +632,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
     /**
      * Uninstall the extension
      *
-     * @return bool If the plugin was sucessfully installed
+     * @return bool If the plugin was sucessfully uninstalled
      */
     public function uninstall() {
         $this->purgeCache();
-- 
cgit v1.2.3


From ec8911d4970372f2a513cf4f1fe78c46c29ed67c Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Wed, 8 Jan 2014 20:18:04 +0100
Subject: remove unneeded try/catch blocks

they were just catching and rethrowing
---
 lib/plugins/extension/helper/extension.php | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/helper/extension.php b/lib/plugins/extension/helper/extension.php
index 1676e3962..3ff2ebcd8 100644
--- a/lib/plugins/extension/helper/extension.php
+++ b/lib/plugins/extension/helper/extension.php
@@ -613,19 +613,15 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      * @return array The list of installed extensions
      */
     public function installOrUpdate() {
-        try {
-            $path      = $this->download($this->getDownloadURL());
-            $installed = $this->installArchive($path, $this->isInstalled(), $this->getBase());
+        $path      = $this->download($this->getDownloadURL());
+        $installed = $this->installArchive($path, $this->isInstalled(), $this->getBase());
 
-            // refresh extension information
-            if (!isset($installed[$this->getID()])) {
-                throw new Exception('Error, the requested extension hasn\'t been installed or updated');
-            }
-            $this->setExtension($this->getID());
-            $this->purgeCache();
-        }catch (Exception $e){
-            throw $e;
+        // refresh extension information
+        if (!isset($installed[$this->getID()])) {
+            throw new Exception('Error, the requested extension hasn\'t been installed or updated');
         }
+        $this->setExtension($this->getID());
+        $this->purgeCache();
         return $installed;
     }
 
@@ -828,11 +824,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
         }
 
         // decompress
-        try{
-            $this->decompress($file, "$tmp/".$base);
-        } catch (Exception $e) {
-            throw $e;
-        }
+        $this->decompress($file, "$tmp/".$base);
 
         // search $tmp/$base for the folder(s) that has been created
         // move the folder(s) to lib/..
-- 
cgit v1.2.3


From 4bad83d828217dc64292223b268c6a3674984070 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Wed, 8 Jan 2014 20:18:55 +0100
Subject: use DOKU_LF

PHP_EOL is platform dependent, so you get in trouble while migrating
between platforms.
---
 lib/plugins/extension/helper/extension.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/helper/extension.php b/lib/plugins/extension/helper/extension.php
index 3ff2ebcd8..c13aa983d 100644
--- a/lib/plugins/extension/helper/extension.php
+++ b/lib/plugins/extension/helper/extension.php
@@ -737,7 +737,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
             $file = @file($managerpath);
             if(!empty($file)) {
                 foreach($file as $line) {
-                    list($key, $value) = explode('=', trim($line, PHP_EOL), 2);
+                    list($key, $value) = explode('=', trim($line, DOKU_LF), 2);
                     $key = trim($key);
                     $value = trim($value);
                     // backwards compatible with old plugin manager
-- 
cgit v1.2.3


From bc1b7a8a0fdd1812e352cab5e2362bd5770d5b3b Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Wed, 8 Jan 2014 20:28:17 +0100
Subject: better filename parsing

The filename found in the URL will be used for old plugins missing a
base entry in their plugin.info.txt and lacking a subdirectory inside
the archive as well. This patch makes sure possible query strings aren't
included in the filename.

Note: io_download() will also try to get a filename from any
content-disposition header.

If no filename can be found we simply use an md5 sum of the URL and hope
the plugin will contain it's own hint for naming.
---
 lib/plugins/extension/helper/extension.php | 12 +++++++++---
 lib/plugins/extension/lang/en/lang.php     |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/helper/extension.php b/lib/plugins/extension/helper/extension.php
index c13aa983d..7958cd2da 100644
--- a/lib/plugins/extension/helper/extension.php
+++ b/lib/plugins/extension/helper/extension.php
@@ -783,11 +783,17 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      */
     public function download($url) {
         // check the url
-        $matches = array();
-        if(!preg_match('/[^\/]*$/', $url, $matches) || !$matches[0]) {
+        if(!preg_match('/https?:\/\//i', $url)){
             throw new Exception($this->getLang('error_badurl'));
         }
-        $file = $matches[0];
+
+        // try to get the file from the path (used as plugin name fallback)
+        $file = parse_url($url, PHP_URL_PATH);
+        if(is_null($file)){
+            $file = md5($url);
+        }else{
+            $file = utf8_basename($file);
+        }
 
         // create tmp directory for download
         if(!($tmp = $this->mkTmpDir())) {
diff --git a/lib/plugins/extension/lang/en/lang.php b/lib/plugins/extension/lang/en/lang.php
index 06c83a708..b11490c0c 100644
--- a/lib/plugins/extension/lang/en/lang.php
+++ b/lib/plugins/extension/lang/en/lang.php
@@ -82,7 +82,7 @@ $lang['update_available']             = '<strong>Update:</strong> New version %s
 $lang['wrong_folder']                 = '<strong>Plugin installed incorrectly:</strong> Rename plugin directory "%s" to "%s".';
 $lang['url_change']                   = '<strong>URL changed:</strong> Download URL has changed since last download. Check if the new URL is valid before updating the extension.<br />New: %s<br />Old: %s';
 
-$lang['error_badurl']                 = 'URL ends with slash - unable to determine file name from the url';
+$lang['error_badurl']                 = 'URLs should start with http or https';
 $lang['error_dircreate']              = 'Unable to create temporary folder to receive download';
 $lang['error_download']               = 'Unable to download the file: %s';
 $lang['error_decompress']             = 'Unable to decompress the downloaded file. This maybe as a result of a bad download, in which case you should try again; or the compression format may be unknown, in which case you will need to download and install manually.';
-- 
cgit v1.2.3


From c837868af892ada4c25333bec46583a0d42a240d Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Wed, 8 Jan 2014 20:29:17 +0100
Subject: added missing localization

---
 lib/plugins/extension/helper/gui.php   | 6 +++---
 lib/plugins/extension/lang/en/lang.php | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/helper/gui.php b/lib/plugins/extension/helper/gui.php
index 76651515c..953d50fa6 100644
--- a/lib/plugins/extension/helper/gui.php
+++ b/lib/plugins/extension/helper/gui.php
@@ -124,9 +124,9 @@ class helper_plugin_extension_gui extends DokuWiki_Plugin {
         echo '</div>';
 
         $form = new Doku_Form(array('action' => $this->tabURL('', array(), '&'), 'enctype' => 'multipart/form-data', 'class' => 'install'));
-        $form->addElement(form_makeTextField('installurl', '', 'Install from URL:', '', 'block'));
-        $form->addElement(form_makeFileField('installfile', 'Upload Extension:', '', 'block'));
-        $form->addElement(form_makeButton('submit', '', 'Install'));
+        $form->addElement(form_makeTextField('installurl', '', $this->getLang('install_url'), '', 'block'));
+        $form->addElement(form_makeFileField('installfile', $this->getLang('install_upload'), '', 'block'));
+        $form->addElement(form_makeButton('submit', '', $this->getLang('btn_install')));
         $form->printForm();
     }
 
diff --git a/lib/plugins/extension/lang/en/lang.php b/lib/plugins/extension/lang/en/lang.php
index b11490c0c..c0550c951 100644
--- a/lib/plugins/extension/lang/en/lang.php
+++ b/lib/plugins/extension/lang/en/lang.php
@@ -92,5 +92,7 @@ $lang['error_copy']                   = 'There was a file copy error while attem
 $lang['noperms']                      = 'Extension directory is not writable';
 $lang['notplperms']                   = 'Template directory is not writable';
 $lang['nopluginperms']                = 'Plugin directory is not writable';
-
 $lang['git']                          = 'This extension was installed via git, you may not want to update it here.';
+
+$lang['install_url']                  = 'Install from URL:';
+$lang['install_upload']               = 'Upload Extension:';
\ No newline at end of file
-- 
cgit v1.2.3


From b1e758012b3d801d5ab266e53e830fb7091508a2 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Wed, 8 Jan 2014 20:38:23 +0100
Subject: show a message when search returns no results

---
 lib/plugins/extension/helper/gui.php  | 10 +++++++---
 lib/plugins/extension/helper/list.php |  8 ++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/helper/gui.php b/lib/plugins/extension/helper/gui.php
index 953d50fa6..3a0f0c589 100644
--- a/lib/plugins/extension/helper/gui.php
+++ b/lib/plugins/extension/helper/gui.php
@@ -106,9 +106,13 @@ class helper_plugin_extension_gui extends DokuWiki_Plugin {
         /* @var helper_plugin_extension_list $list */
         $list = $this->loadHelper('extension_list');
         $list->start_form();
-        foreach($result as $name) {
-            $extension->setExtension($name);
-            $list->add_row($extension, $extension->getID() == $this->infoFor);
+        if($result){
+            foreach($result as $name) {
+                $extension->setExtension($name);
+                $list->add_row($extension, $extension->getID() == $this->infoFor);
+            }
+        } else {
+            $list->nothing_found();
         }
         $list->end_form();
         $list->render();
diff --git a/lib/plugins/extension/helper/list.php b/lib/plugins/extension/helper/list.php
index ba3681ce4..8cc303fbe 100644
--- a/lib/plugins/extension/helper/list.php
+++ b/lib/plugins/extension/helper/list.php
@@ -88,6 +88,14 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
         $this->form .= '</form>'.DOKU_LF;
     }
 
+    /**
+     * Show message when no results are found
+     */
+    function nothing_found() {
+        global $lang;
+        $this->form .= '<li class="notfound">'.$lang['nothingfound'].'</li>';
+    }
+
     /**
      * Print the form
      */
-- 
cgit v1.2.3


From 30b90257784ae25a5e30c968b4c9391bb47ff1a1 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Tue, 14 Jan 2014 08:21:22 +0100
Subject: added plugins group to test

---
 lib/plugins/extension/_test/extension.test.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/_test/extension.test.php b/lib/plugins/extension/_test/extension.test.php
index 97726d212..453b95e79 100644
--- a/lib/plugins/extension/_test/extension.test.php
+++ b/lib/plugins/extension/_test/extension.test.php
@@ -14,6 +14,7 @@ class mock_helper_plugin_extension_extension extends helper_plugin_extension_ext
 
 /**
  * @group plugin_extension
+ * @group plugins
  */
 class helper_plugin_extension_extension_test extends DokuWikiTest {
 
-- 
cgit v1.2.3


From b15cd32d2f75fbf943eda38a7b90f05d2806dae5 Mon Sep 17 00:00:00 2001
From: jgpcx <jerry@gpcx.de>
Date: Tue, 28 Jan 2014 17:02:25 +0100
Subject: Update action.php

fix bug that only allows admins any AJAX calls
---
 lib/plugins/extension/action.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/action.php b/lib/plugins/extension/action.php
index 9dd1648ff..3f2ccaace 100644
--- a/lib/plugins/extension/action.php
+++ b/lib/plugins/extension/action.php
@@ -32,16 +32,17 @@ class action_plugin_extension extends DokuWiki_Action_Plugin {
         global $USERINFO;
         global $INPUT;
 
+
+        if($event->data != 'plugin_extension') return;
+        $event->preventDefault();
+        $event->stopPropagation();
+
         if(empty($_SERVER['REMOTE_USER']) || !auth_isadmin($_SERVER['REMOTE_USER'], $USERINFO['grps'])){
             http_status(403);
             echo 'Forbidden';
             exit;
         }
 
-        if($event->data != 'plugin_extension') return;
-        $event->preventDefault();
-        $event->stopPropagation();
-
         header('Content-Type: text/html; charset=utf-8');
 
         $ext = $INPUT->str('ext');
-- 
cgit v1.2.3


From 73d93f2bf6cd03cd82558c91faf42dddbdef1d32 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Thu, 30 Jan 2014 23:58:43 +0100
Subject: extension manager: some minor tweaks in the info screen

---
 lib/plugins/extension/helper/list.php  | 21 ++++++++++++---------
 lib/plugins/extension/lang/en/lang.php |  1 +
 2 files changed, 13 insertions(+), 9 deletions(-)

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/helper/list.php b/lib/plugins/extension/helper/list.php
index 8cc303fbe..01a5c516a 100644
--- a/lib/plugins/extension/helper/list.php
+++ b/lib/plugins/extension/helper/list.php
@@ -406,7 +406,7 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
         $return .= ($extension->getTypes() ? hsc(implode(', ', $extension->getTypes())) : $default);
         $return .= '</bdi></dd>';
 
-        if($extension->getCompatibleVersions()) {
+        if(!$extension->isBundled() && $extension->getCompatibleVersions()) {
             $return .= '<dt>'.$this->getLang('compatible').'</dt>';
             $return .= '<dd>';
             foreach ($extension->getCompatibleVersions() as $date => $version) {
@@ -539,20 +539,23 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
      * @return string The description of all relevant statusses
      */
     function make_status(helper_plugin_extension_extension $extension) {
-        $return = '';
+        $status = array();
+
+
         if ($extension->isInstalled()) {
-            $return .= $this->getLang('status_installed').' ';
+            $status[] = $this->getLang('status_installed');
             if ($extension->isProtected()) {
-                $return .= $this->getLang('status_protected').' ';
+                $status[] = $this->getLang('status_protected');
             } else {
-                $return .= $extension->isEnabled() ? $this->getLang('status_enabled').' ' : $this->getLang('status_disabled').' ';
+                $status[] = $extension->isEnabled() ? $this->getLang('status_enabled') : $this->getLang('status_disabled');
             }
         } else {
-            $return .= $this->getLang('status_not_installed').' ';
+            $status[] = $this->getLang('status_not_installed');
         }
-        $return .= !$extension->canModify() ? $this->getLang('status_unmodifiable').' ' : '';
-        $return .= $extension->isTemplate() ? $this->getLang('status_template') : $this->getLang('status_plugin');
-        return $return;
+        if(!$extension->canModify()) $status[] = $this->getLang('status_unmodifiable');
+        if($extension->isBundled()) $status[] = $this->getLang('status_bundled');
+        $status[] = $extension->isTemplate() ? $this->getLang('status_template') : $this->getLang('status_plugin');
+        return join(', ', $status);
     }
 
 }
diff --git a/lib/plugins/extension/lang/en/lang.php b/lib/plugins/extension/lang/en/lang.php
index c0550c951..5224f694a 100644
--- a/lib/plugins/extension/lang/en/lang.php
+++ b/lib/plugins/extension/lang/en/lang.php
@@ -65,6 +65,7 @@ $lang['status_disabled']              = 'disabled';
 $lang['status_unmodifiable']          = 'unmodifiable';
 $lang['status_plugin']                = 'plugin';
 $lang['status_template']              = 'template';
+$lang['status_bundled']               = 'bundled';
 
 $lang['msg_enabled']                  = 'Plugin %s enabled';
 $lang['msg_disabled']                 = 'Plugin %s disabled';
-- 
cgit v1.2.3


From fd51614b39b1320c5723e8195f0bf69c25baaeb7 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 15 Feb 2014 10:10:38 +0100
Subject: enable/disable extensions via AJAX FS#2927

---
 lib/plugins/extension/action.php | 39 +++++++++++++++++++++++--------
 lib/plugins/extension/script.js  | 50 ++++++++++++++++++++++++++++++++++++----
 2 files changed, 75 insertions(+), 14 deletions(-)

(limited to 'lib/plugins/extension')

diff --git a/lib/plugins/extension/action.php b/lib/plugins/extension/action.php
index 3f2ccaace..9e48f134b 100644
--- a/lib/plugins/extension/action.php
+++ b/lib/plugins/extension/action.php
@@ -28,25 +28,23 @@ class action_plugin_extension extends DokuWiki_Action_Plugin {
      * @param Doku_Event $event
      * @param            $param
      */
-    public function info(Doku_Event &$event, $param){
+    public function info(Doku_Event &$event, $param) {
         global $USERINFO;
         global $INPUT;
 
-
         if($event->data != 'plugin_extension') return;
         $event->preventDefault();
         $event->stopPropagation();
 
-        if(empty($_SERVER['REMOTE_USER']) || !auth_isadmin($_SERVER['REMOTE_USER'], $USERINFO['grps'])){
+        if(empty($_SERVER['REMOTE_USER']) || !auth_isadmin($_SERVER['REMOTE_USER'], $USERINFO['grps'])) {
             http_status(403);
             echo 'Forbidden';
             exit;
         }
 
-        header('Content-Type: text/html; charset=utf-8');
-
         $ext = $INPUT->str('ext');
         if(!$ext) {
+            http_status(400);
             echo 'no extension given';
             return;
         }
@@ -55,11 +53,32 @@ class action_plugin_extension extends DokuWiki_Action_Plugin {
         $extension = plugin_load('helper', 'extension_extension');
         $extension->setExtension($ext);
 
-        /** @var helper_plugin_extension_list $list */
-        $list = plugin_load('helper', 'extension_list');
-
-
-        echo $list->make_info($extension);
+        $act = $INPUT->str('act');
+        switch($act) {
+            case 'enable':
+            case 'disable':
+                $json = new JSON();
+                $extension->$act(); //enables/disables
+
+                $reverse = ($act == 'disable') ? 'enable' : 'disable';
+
+                $return = array(
+                    'state'   => $act.'d', // isn't English wonderful? :-)
+                    'reverse' => $reverse,
+                    'label'   => $extension->getLang('btn_'.$reverse)
+                );
+
+                header('Content-Type: application/json');
+                echo $json->encode($return);
+                break;
+
+            case 'info':
+            default:
+                /** @var helper_plugin_extension_list $list */
+                $list = plugin_load('helper', 'extension_list');
+                header('Content-Type: text/html; charset=utf-8');
+                echo $list->make_info($extension);
+        }
     }
 
 }
diff --git a/lib/plugins/extension/script.js b/lib/plugins/extension/script.js
index bd3c97758..fab88162d 100644
--- a/lib/plugins/extension/script.js
+++ b/lib/plugins/extension/script.js
@@ -1,9 +1,11 @@
 jQuery(function(){
 
+    var $extmgr = jQuery('#extension__manager');
+
     /**
      * Confirm uninstalling
      */
-    jQuery('#extension__manager input.uninstall').click(function(e){
+    $extmgr.find('input.uninstall').click(function(e){
         if(!window.confirm(LANG.plugins.extension.reallydel)){
             e.preventDefault();
             return false;
@@ -15,7 +17,7 @@ jQuery(function(){
      * very simple lightbox
      * @link http://webdesign.tutsplus.com/tutorials/htmlcss-tutorials/super-simple-lightbox-with-css-and-jquery/
      */
-    jQuery('#extension__manager a.extension_screenshot').click(function(e) {
+    $extmgr.find('a.extension_screenshot').click(function(e) {
         e.preventDefault();
 
         //Get clicked link href
@@ -41,10 +43,49 @@ jQuery(function(){
         return false;
     });
 
+    /**
+     * Enable/Disable extension via AJAX
+     */
+    $extmgr.find('input.disable, input.enable').click(function (e) {
+        e.preventDefault();
+        var $btn = jQuery(this);
+
+        // get current state
+        var extension = $btn.attr('name').split('[')[2];
+        extension = extension.substr(0, extension.length - 1);
+        var act = ($btn.hasClass('disable')) ? 'disable' : 'enable';
+
+        // disable while we wait
+        $btn.attr('disabled', 'disabled');
+        $btn.css('cursor', 'wait');
+
+        // execute
+        jQuery.get(
+            DOKU_BASE + 'lib/exe/ajax.php',
+            {
+                call: 'plugin_extension',
+                ext:  extension,
+                act:  act
+            },
+            function (data) {
+                $btn.css('cursor', '')
+                    .removeAttr('disabled')
+                    .removeClass('disable')
+                    .removeClass('enable')
+                    .val(data.label)
+                    .addClass(data.reverse)
+                .parents('li')
+                    .removeClass('disabled')
+                    .removeClass('enabled')
+                    .addClass(data.state);
+            }
+        );
+    });
+
     /**
      * AJAX detail infos
      */
-    jQuery('#extension__manager a.info').click(function(e){
+    $extmgr.find('a.info').click(function(e){
         e.preventDefault();
 
         var $link = jQuery(this);
@@ -60,7 +101,8 @@ jQuery(function(){
             DOKU_BASE + 'lib/exe/ajax.php',
             {
                 call: 'plugin_extension',
-                ext: $link.data('extid')
+                ext: $link.data('extid'),
+                act: 'info'
             },
             function(data){
                 $link.parent().append(data);
-- 
cgit v1.2.3