Refs #3404, refactor some code into PluginsManager method and fix typo in PluginsManager.

git-svn-id: http://dev.piwik.org/svn/trunk@7297 59fd770c-687e-43c8-a1e3-f5a4ff64c105

core/Controller/Admin.php

@@ -45,18 +45,7 @@ abstract class Piwik_Controller_Admin extends Piwik_Controller
 		$view->usingOldGeoIPPlugin = Piwik_PluginsManager::getInstance()->isPluginActivated('GeoIP');
 		
 		// for cannot find installed plugin warning
-		$missingPlugins = false;
-		if (isset(Piwik_Config::getInstance()->Plugins['Plugins']))
-		{
-			foreach (Piwik_Config::getInstance()->Plugins['Plugins'] as $pluginName)
-			{
-				// if a plugin is listed in the config, but is not loaded, it does not exist in the folder
-				if (!Piwik_PluginsManager::getInstance()->isPluginLoaded($pluginName))
-				{
-					$missingPlugins[] = $pluginName;
-				}
-			}
-		}
+		$missingPlugins = Piwik_PluginsManager::getInstance()->getMissingPlugins();
 		if (!empty($missingPlugins))
 		{
 			$pluginsLink = Piwik_Url::getCurrentQueryStringWithParametersModified(array(

core/PluginsManager.php

@@ -167,8 +167,8 @@ class Piwik_PluginsManager
 					$result[] = $name;
 				}
 			}
-			return $result;
 		}
+		return $result;
 	}
 
 	/**
@@ -619,6 +619,29 @@ class Piwik_PluginsManager
 		$pluginNames = Piwik_Config::getInstance()->PluginsInstalled['PluginsInstalled'];
 		return $pluginNames;
 	}
+	
+	/**
+	 * Returns names of plugins that should be loaded, but cannot be since their
+	 * files cannot be found.
+	 * 
+	 * @return array
+	 */
+	public function getMissingPlugins()
+	{
+		$missingPlugins = array();
+		if (isset(Piwik_Config::getInstance()->Plugins['Plugins']))
+		{
+			foreach (Piwik_Config::getInstance()->Plugins['Plugins'] as $pluginName)
+			{
+				// if a plugin is listed in the config, but is not loaded, it does not exist in the folder
+				if (!Piwik_PluginsManager::getInstance()->isPluginLoaded($pluginName))
+				{
+					$missingPlugins[] = $pluginName;
+				}
+			}
+		}
+		return $missingPlugins;
+	}
 
 	/**
 	 * Install a plugin, if necessary