Plugins refactoring out logic + Now ignoring plugins that do not have the Manifest JSON file (they might be Piwik 1.X plugin)

2 files changed, 4 insertions, 29 deletions

diff --git a/plugins/CorePluginsAdmin/Controller.php b/plugins/CorePluginsAdmin/Controller.php
index 946eb15c4c..566ab4f76c 100644
--- a/plugins/CorePluginsAdmin/Controller.php
+++ b/plugins/CorePluginsAdmin/Controller.php
@@ -202,38 +202,13 @@ class Controller extends \Piwik\Controller\Admin
 
     protected function getPluginsInfo($themesOnly = false)
     {
-        $plugins = array();
-
-        $pluginsManager = \Piwik\PluginsManager::getInstance();
-        $listPlugins = array_merge(
-            $pluginsManager->readPluginsDirectory(),
-            Config::getInstance()->Plugins['Plugins']
-        );
-        $listPlugins = array_unique($listPlugins);
-        foreach ($listPlugins as $pluginName) {
-            \Piwik\PluginsManager::getInstance()->loadPlugin($pluginName);
-            $plugins[$pluginName] = array(
-                'activated'       => $pluginsManager->isPluginActivated($pluginName),
-                'alwaysActivated' => $pluginsManager->isPluginAlwaysActivated($pluginName),
-                'uninstallable'   => $pluginsManager->isPluginUninstallable($pluginName),
-            );
-        }
-        $pluginsManager->loadPluginTranslations();
-
-        $loadedPlugins = $pluginsManager->getLoadedPlugins();
-
-        foreach ($loadedPlugins as $oPlugin) {
-            $pluginName = $oPlugin->getPluginName();
-
-            $plugins[$pluginName]['info'] = $oPlugin->getInformation();
-        }
-
+        $plugins = PluginsManager::getInstance()->returnLoadedPluginsInfo();
 
         foreach ($plugins as $pluginName => &$plugin) {
             if (!isset($plugin['info'])) {
                 $plugin['info'] = array(
                     'description' => '<strong><em>' . Piwik_Translate('CorePluginsAdmin_PluginCannotBeFound')
-                        . '</strong></em>',
+                    . '</strong></em>',
                     'version'     => Piwik_Translate('General_Unknown'),
                     'theme'       => false,
                 );
@@ -243,7 +218,7 @@ class Controller extends \Piwik\Controller\Admin
         $pluginsFiltered = $this->keepPluginsOrThemes($themesOnly, $plugins);
         return $pluginsFiltered;
     }
-
+    
     protected function keepPluginsOrThemes($themesOnly, $plugins)
     {
         $pluginsFiltered = array();
diff --git a/plugins/CorePluginsAdmin/PluginInstaller.php b/plugins/CorePluginsAdmin/PluginInstaller.php
index 5978f2cc83..f9c04d8a7f 100644
--- a/plugins/CorePluginsAdmin/PluginInstaller.php
+++ b/plugins/CorePluginsAdmin/PluginInstaller.php
@@ -19,7 +19,7 @@ use Piwik\Unzip;
  */
 class PluginInstaller
 {
-    const PATH_TO_DOWNLOAD = '/tmp/plugins/';
+    const PATH_TO_DOWNLOAD = '/tmp/latest/plugins/';
     const PATH_TO_EXTRACT  = '/plugins/';
 
     private $pluginName;