[4.0] Fix database for Extensions - GSoC Expand Extensions Manager

administrator/components/com_installer/Controller/DatabaseController.php

@@ -10,7 +10,11 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\BaseController;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Session\Session;
+use Joomla\Component\Installer\Administrator\Model\DatabaseModel;
 use Joomla\Component\Joomlaupdate\Administrator\Model\UpdateModel;
 
 /**
@@ -25,21 +29,41 @@ class DatabaseController extends BaseController
 	 *
 	 * @return  void
 	 *
+	 * @throws  \Exception
+	 *
 	 * @since   2.5
 	 * @todo    Purge updates has to be replaced with an events system
 	 */
 	public function fix()
 	{
-		/* @var \Joomla\Component\Installer\Administrator\Model\DatabaseModel $model */
-		$model = $this->getModel('database');
-		$model->fix();
+		// Check for request forgeries
+		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
+
+		// Get items to fix the database.
+		$cid = $this->input->get('cid', array(), 'array');
+
+		if (!is_array($cid) || count($cid) < 1)
+		{
+			$this->app->getLogger()->warning(
+				Text::_(
+					'COM_INSTALLER_ERROR_NO_EXTENSIONS_SELECTED'
+				), array('category' => 'jerror')
+			);
+		}
+		else
+		{
+			// Get the model
+			/** @var DatabaseModel $model */
+			$model = $this->getModel('database');
+			$model->fix($cid);
 
-		$updateModel = new UpdateModel;
-		$updateModel->purge();
+			$updateModel = new UpdateModel;
+			$updateModel->purge();
 
-		// Refresh versionable assets cache
-		$this->app->flushAssets();
+			// Refresh versionable assets cache
+			$this->app->flushAssets();
+		}
 
-		$this->setRedirect(\JRoute::_('index.php?option=com_installer&view=database', false));
+		$this->setRedirect(Route::_('index.php?option=com_installer&view=database', false));
 	}
 }

administrator/components/com_installer/Helper/InstallerHelper.php

@@ -10,6 +10,10 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+
 /**
  * Installer helper.
  *
@@ -23,46 +27,48 @@ class InstallerHelper
 	 * @param   string  $vName  The name of the active view.
 	 *
 	 * @return  void
+	 *
+	 * @since   1.6
 	 */
 	public static function addSubmenu($vName = 'install')
 	{
 		\JHtmlSidebar::addEntry(
-			\JText::_('COM_INSTALLER_SUBMENU_INSTALL'),
+			Text::_('COM_INSTALLER_SUBMENU_INSTALL'),
 			'index.php?option=com_installer',
 			$vName == 'install'
 		);
 		\JHtmlSidebar::addEntry(
-			\JText::_('COM_INSTALLER_SUBMENU_UPDATE'),
+			Text::_('COM_INSTALLER_SUBMENU_UPDATE'),
 			'index.php?option=com_installer&view=update',
 			$vName == 'update'
 		);
 		\JHtmlSidebar::addEntry(
-			\JText::_('COM_INSTALLER_SUBMENU_MANAGE'),
+			Text::_('COM_INSTALLER_SUBMENU_MANAGE'),
 			'index.php?option=com_installer&view=manage',
 			$vName == 'manage'
 		);
 		\JHtmlSidebar::addEntry(
-			\JText::_('COM_INSTALLER_SUBMENU_DISCOVER'),
+			Text::_('COM_INSTALLER_SUBMENU_DISCOVER'),
 			'index.php?option=com_installer&view=discover',
 			$vName == 'discover'
 		);
 		\JHtmlSidebar::addEntry(
-			\JText::_('COM_INSTALLER_SUBMENU_DATABASE'),
+			Text::_('COM_INSTALLER_SUBMENU_DATABASE'),
 			'index.php?option=com_installer&view=database',
 			$vName == 'database'
 		);
 		\JHtmlSidebar::addEntry(
-			\JText::_('COM_INSTALLER_SUBMENU_WARNINGS'),
+			Text::_('COM_INSTALLER_SUBMENU_WARNINGS'),
 			'index.php?option=com_installer&view=warnings',
 			$vName == 'warnings'
 		);
 		\JHtmlSidebar::addEntry(
-			\JText::_('COM_INSTALLER_SUBMENU_LANGUAGES'),
+			Text::_('COM_INSTALLER_SUBMENU_LANGUAGES'),
 			'index.php?option=com_installer&view=languages',
 			$vName == 'languages'
 		);
 		\JHtmlSidebar::addEntry(
-			\JText::_('COM_INSTALLER_SUBMENU_UPDATESITES'),
+			Text::_('COM_INSTALLER_SUBMENU_UPDATESITES'),
 			'index.php?option=com_installer&view=updatesites',
 			$vName == 'updatesites'
 		);
@@ -88,7 +94,7 @@ public static function getExtensionTypes()
 
 		foreach ($types as $type)
 		{
-			$options[] = \JHtml::_('select.option', $type, \JText::_('COM_INSTALLER_TYPE_' . strtoupper($type)));
+			$options[] = HTMLHelper::_('select.option', $type, Text::_('COM_INSTALLER_TYPE_' . strtoupper($type)));
 		}
 
 		return $options;
@@ -103,20 +109,20 @@ public static function getExtensionTypes()
 	 */
 	public static function getExtensionGroupes()
 	{
-		$db = \JFactory::getDbo();
+		$db = Factory::getDbo();
 		$query = $db->getQuery(true)
-			->select('DISTINCT folder')
-			->from('#__extensions')
-			->where('folder != ' . $db->quote(''))
-			->order('folder');
+			->select('DISTINCT ' . $db->quoteName('folder'))
+			->from($db->quoteName('#__extensions'))
+			->where($db->quoteName('folder') . ' != ' . $db->quote(''))
+			->order($db->quoteName('folder'));
 		$db->setQuery($query);
 		$folders = $db->loadColumn();
 
 		$options = array();
 
 		foreach ($folders as $folder)
 		{
-			$options[] = \JHtml::_('select.option', $folder, $folder);
+			$options[] = HTMLHelper::_('select.option', $folder, $folder);
 		}
 
 		return $options;
@@ -133,8 +139,8 @@ public static function getClientOptions()
 	{
 		// Build the filter options.
 		$options   = array();
-		$options[] = \JHtml::_('select.option', '0', \JText::_('JSITE'));
-		$options[] = \JHtml::_('select.option', '1', \JText::_('JADMINISTRATOR'));
+		$options[] = HTMLHelper::_('select.option', '0', Text::_('JSITE'));
+		$options[] = HTMLHelper::_('select.option', '1', Text::_('JADMINISTRATOR'));
 
 		return $options;
 	}
@@ -150,11 +156,54 @@ public static function getStateOptions()
 	{
 		// Build the filter options.
 		$options   = array();
-		$options[] = \JHtml::_('select.option', '0', \JText::_('JDISABLED'));
-		$options[] = \JHtml::_('select.option', '1', \JText::_('JENABLED'));
-		$options[] = \JHtml::_('select.option', '2', \JText::_('JPROTECTED'));
-		$options[] = \JHtml::_('select.option', '3', \JText::_('JUNPROTECTED'));
+		$options[] = HTMLHelper::_('select.option', '0', Text::_('JDISABLED'));
+		$options[] = HTMLHelper::_('select.option', '1', Text::_('JENABLED'));
+		$options[] = HTMLHelper::_('select.option', '2', Text::_('JPROTECTED'));
+		$options[] = HTMLHelper::_('select.option', '3', Text::_('JUNPROTECTED'));
 
 		return $options;
 	}
+
+	/**
+	 * Get a list of filter options for the application statuses.
+	 *
+	 * @param   string   $element    element of an extension
+	 * @param   string   $type       type of an extension
+	 * @param   integer  $client_id  client_id of an extension
+	 * @param   string   $folder     folder of an extension
+	 *
+	 * @return  \SimpleXMLElement
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public static function getInstallationXML($element, $type, $client_id = 1, $folder = null)
+	{
+		$path = $client_id ? JPATH_ADMINISTRATOR : JPATH_ROOT;
+
+		switch ($type)
+		{
+			case 'component':
+				$path .= '/components/' . $element . '/' . substr($element, 4) . '.xml';
+				break;
+			case 'plugin':
+				$path .= '/plugins/' . $folder . '/' . $element . '/' . $element . '.xml';
+				break;
+			case 'module':
+				$path .= '/modules/' . $element . '/' . $element->element . '.xml';
+				break;
+			case 'template':
+				$path .= '/templates/' . $element . '/templateDetails.xml';
+				break;
+			case 'library':
+				$path = JPATH_ADMINISTRATOR . '/manifests/libraries/' . $element . '.xml';
+				break;
+			case 'file':
+				$path = JPATH_ADMINISTRATOR . '/manifests/files/' . $element . '.xml';
+				break;
+			case 'package':
+				$path = JPATH_ADMINISTRATOR . '/manifests/packages/' . $element . '.xml';
+		}
+
+		return simplexml_load_file($path);
+	}
 }