1 files changed, 25 insertions, 9 deletions

diff --git a/plugins/CorePluginsAdmin/Controller.php b/plugins/CorePluginsAdmin/Controller.php
index b759f2b550..866ed0f8ca 100644
--- a/plugins/CorePluginsAdmin/Controller.php
+++ b/plugins/CorePluginsAdmin/Controller.php
@@ -20,38 +20,54 @@ class Piwik_CorePluginsAdmin_Controller extends Piwik_Controller
 	{
 		Piwik::checkUserIsSuperUser();
 		
-		$listPlugins = Piwik_PluginsManager::getInstance()->readPluginsDirectory();
-		$loadedPlugins = Piwik_PluginsManager::getInstance()->getLoadedPlugins();
 		$plugins = array();
+	
+		$listPlugins = Piwik_PluginsManager::getInstance()->readPluginsDirectory();
 		foreach($listPlugins as $pluginName)
 		{
 			$oPlugin = Piwik_PluginsManager::getInstance()->loadPlugin($pluginName);
-			$plugins[$pluginName]= array( 	'activated' => Piwik_PluginsManager::getInstance()->isPluginActivated($pluginName),
-											'alwaysActivated' => Piwik_PluginsManager::getInstance()->isPluginAlwaysActivated($pluginName),
-											'info' => $oPlugin->getInformation()
-									);
+			$plugins[$pluginName] = array(
+			 	'activated' => Piwik_PluginsManager::getInstance()->isPluginActivated($pluginName),
+				'alwaysActivated' => Piwik_PluginsManager::getInstance()->isPluginAlwaysActivated($pluginName),
+			);
 		}
-		
+
+		Piwik_PluginsManager::getInstance()->loadTranslations();
+
+		$loadedPlugins = Piwik_PluginsManager::getInstance()->getLoadedPlugins();
+		foreach($loadedPlugins as $oPlugin)
+		{
+			$pluginName = $oPlugin->getClassName();
+			$plugins[$pluginName]['info'] = $oPlugin->getInformation();
+		}
+
 		$view = Piwik_View::factory('manage');
 		$view->pluginsName = $plugins;
 		$this->setGeneralVariablesView($view);
 		$view->menu = Piwik_GetAdminMenu();
+		if(!Zend_Registry::get('config')->isFileWritable())
+		{
+			$view->configFileNotWritable = true;
+		}
+		
 		echo $view->render();
 	}
 
 	function deactivate()
 	{
 		Piwik::checkUserIsSuperUser();
+		$this->checkTokenInUrl();
 		$pluginName = Piwik_Common::getRequestVar('pluginName', null, 'string');
 		Piwik_PluginsManager::getInstance()->deactivatePlugin($pluginName);
-		Piwik_Url::redirectToUrl('index.php?module=CorePluginsAdmin');
+		Piwik_Url::redirectToUrl('index.php?module=CorePluginsAdmin&action=index');
 	}
 
 	function activate()
 	{
 		Piwik::checkUserIsSuperUser();
+		$this->checkTokenInUrl();
 		$pluginName = Piwik_Common::getRequestVar('pluginName', null, 'string');
 		Piwik_PluginsManager::getInstance()->activatePlugin($pluginName);
-		Piwik_Url::redirectToUrl('index.php?module=CorePluginsAdmin');
+		Piwik_Url::redirectToUrl('index.php?module=CorePluginsAdmin&action=index');
 	}
 }