From 44f6d872981ecf98a9793cfc402fac399432e39a Mon Sep 17 00:00:00 2001 From: Johan Janssens Date: Tue, 16 Jun 2015 18:24:36 +0200 Subject: [PATCH] #1 - Completely remove com_installer. --- .../components/com_installer/access.xml | 9 - .../components/com_installer/config.xml | 18 - .../components/com_installer/controller.php | 66 ---- .../com_installer/controllers/manage.php | 126 ------- .../com_installer/helpers/html/manage.php | 67 ---- .../com_installer/helpers/installer.php | 103 ------ .../components/com_installer/installer.php | 20 -- .../components/com_installer/installer.xml | 29 -- .../com_installer/models/extension.php | 183 ---------- .../com_installer/models/manage.php | 329 ------------------ .../com_installer/views/default/view.php | 91 ----- .../views/manage/tmpl/default.php | 150 -------- .../com_installer/views/manage/view.html.php | 119 ------- .../language/en-GB/en-GB.com_installer.ini | 203 ----------- .../en-GB/en-GB.com_installer.sys.ini | 7 - app/administrator/language/en-GB/en-GB.ini | 1 - app/administrator/language/en-GB/install.xml | 2 - .../mod_menu/tmpl/default_disabled.php | 1 - .../modules/mod_menu/tmpl/default_enabled.php | 13 +- install/mysql/cms.sql | 1 - install/mysql/data.sql | 2 - install/mysql/testing.sql | 1 - tests/system/resetdb.sql | 1 - tests/system/suite/acl/acl0001Test.php | 2 - .../webdriver/Pages/System/AdminPage.php | 1 - tests/unit/stubs/database/jos_assets.csv | 1 - tests/unit/stubs/database/jos_extensions.csv | 1 - .../libraries/cms/html/JHtmlIconsTest.php | 7 - .../libraries/joomla/utilities/stubs/test.xml | 29 -- web/media/system/js/core-uncompressed.js | 4 +- 30 files changed, 2 insertions(+), 1585 deletions(-) delete mode 100644 app/administrator/components/com_installer/access.xml delete mode 100644 app/administrator/components/com_installer/config.xml delete mode 100644 app/administrator/components/com_installer/controller.php delete mode 100644 app/administrator/components/com_installer/controllers/manage.php delete mode 100644 app/administrator/components/com_installer/helpers/html/manage.php delete mode 100644 app/administrator/components/com_installer/helpers/installer.php delete mode 100644 app/administrator/components/com_installer/installer.php delete mode 100644 app/administrator/components/com_installer/installer.xml delete mode 100644 app/administrator/components/com_installer/models/extension.php delete mode 100644 app/administrator/components/com_installer/models/manage.php delete mode 100644 app/administrator/components/com_installer/views/default/view.php delete mode 100644 app/administrator/components/com_installer/views/manage/tmpl/default.php delete mode 100644 app/administrator/components/com_installer/views/manage/view.html.php delete mode 100644 app/administrator/language/en-GB/en-GB.com_installer.ini delete mode 100644 app/administrator/language/en-GB/en-GB.com_installer.sys.ini diff --git a/app/administrator/components/com_installer/access.xml b/app/administrator/components/com_installer/access.xml deleted file mode 100644 index 3a0f2c5ce1..0000000000 --- a/app/administrator/components/com_installer/access.xml +++ /dev/null @@ -1,9 +0,0 @@ - - -
- - - - -
- diff --git a/app/administrator/components/com_installer/config.xml b/app/administrator/components/com_installer/config.xml deleted file mode 100644 index 3e98de4587..0000000000 --- a/app/administrator/components/com_installer/config.xml +++ /dev/null @@ -1,18 +0,0 @@ - - -
- - -
- diff --git a/app/administrator/components/com_installer/controller.php b/app/administrator/components/com_installer/controller.php deleted file mode 100644 index 800d030532..0000000000 --- a/app/administrator/components/com_installer/controller.php +++ /dev/null @@ -1,66 +0,0 @@ -input->get('view', 'manage'); - $vFormat = $document->getType(); - $lName = $this->input->get('layout', 'default', 'string'); - - // Get and render the view. - if ($view = $this->getView($vName, $vFormat)) - { - $ftp = JClientHelper::setCredentialsFromRequest('ftp'); - $view->ftp = &$ftp; - - // Get the model for the view. - $model = $this->getModel($vName); - - // Push the model into the view (as default). - $view->setModel($model, true); - $view->setLayout($lName); - - // Push document object into the view. - $view->document = $document; - - // Load the submenu. - InstallerHelper::addSubmenu($vName); - $view->display(); - } - - return $this; - } -} diff --git a/app/administrator/components/com_installer/controllers/manage.php b/app/administrator/components/com_installer/controllers/manage.php deleted file mode 100644 index 029365edad..0000000000 --- a/app/administrator/components/com_installer/controllers/manage.php +++ /dev/null @@ -1,126 +0,0 @@ -registerTask('unpublish', 'publish'); - $this->registerTask('publish', 'publish'); - } - - /** - * Enable/Disable an extension (if supported). - * - * @return void - * - * @since 1.6 - */ - public function publish() - { - // Check for request forgeries. - JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN')); - - $ids = $this->input->get('cid', array(), 'array'); - $values = array('publish' => 1, 'unpublish' => 0); - $task = $this->getTask(); - $value = JArrayHelper::getValue($values, $task, 0, 'int'); - - if (empty($ids)) - { - JError::raiseWarning(500, JText::_('COM_INSTALLER_ERROR_NO_EXTENSIONS_SELECTED')); - } - else - { - // Get the model. - $model = $this->getModel('manage'); - - // Change the state of the records. - if (!$model->publish($ids, $value)) - { - JError::raiseWarning(500, implode('
', $model->getErrors())); - } - else - { - if ($value == 1) - { - $ntext = 'COM_INSTALLER_N_EXTENSIONS_PUBLISHED'; - } - elseif ($value == 0) - { - $ntext = 'COM_INSTALLER_N_EXTENSIONS_UNPUBLISHED'; - } - $this->setMessage(JText::plural($ntext, count($ids))); - } - } - - $this->setRedirect(JRoute::_('index.php?option=com_installer&view=manage', false)); - } - - /** - * Remove an extension (Uninstall). - * - * @return void - * - * @since 1.5 - */ - public function remove() - { - // Check for request forgeries - JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN')); - - $eid = $this->input->get('cid', array(), 'array'); - $model = $this->getModel('manage'); - - JArrayHelper::toInteger($eid, array()); - $model->remove($eid); - $this->setRedirect(JRoute::_('index.php?option=com_installer&view=manage', false)); - } - - /** - * Refreshes the cached metadata about an extension. - * - * Useful for debugging and testing purposes when the XML file might change. - * - * @return void - * - * @since 1.6 - */ - public function refresh() - { - // Check for request forgeries - JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN')); - - $uid = $this->input->get('cid', array(), 'array'); - $model = $this->getModel('manage'); - - JArrayHelper::toInteger($uid, array()); - $model->refresh($uid); - $this->setRedirect(JRoute::_('index.php?option=com_installer&view=manage', false)); - } -} diff --git a/app/administrator/components/com_installer/helpers/html/manage.php b/app/administrator/components/com_installer/helpers/html/manage.php deleted file mode 100644 index f0eb9449f1..0000000000 --- a/app/administrator/components/com_installer/helpers/html/manage.php +++ /dev/null @@ -1,67 +0,0 @@ - array( - '', - 'COM_INSTALLER_EXTENSION_PROTECTED', - '', - 'COM_INSTALLER_EXTENSION_PROTECTED', - true, - 'protected', - 'protected' - ), - 1 => array( - 'unpublish', - 'COM_INSTALLER_EXTENSION_ENABLED', - 'COM_INSTALLER_EXTENSION_DISABLE', - 'COM_INSTALLER_EXTENSION_ENABLED', - true, - 'publish', - 'publish' - ), - 0 => array( - 'publish', - 'COM_INSTALLER_EXTENSION_DISABLED', - 'COM_INSTALLER_EXTENSION_ENABLE', - 'COM_INSTALLER_EXTENSION_DISABLED', - true, - 'unpublish', - 'unpublish' - ), - ); - - return JHtml::_('jgrid.state', $states, $value, $i, 'manage.', $enabled, true, $checkbox); - } -} diff --git a/app/administrator/components/com_installer/helpers/installer.php b/app/administrator/components/com_installer/helpers/installer.php deleted file mode 100644 index d5160c8c3a..0000000000 --- a/app/administrator/components/com_installer/helpers/installer.php +++ /dev/null @@ -1,103 +0,0 @@ -getQuery(true) - ->select('DISTINCT type') - ->from('#__extensions'); - $db->setQuery($query); - $types = $db->loadColumn(); - - $options = array(); - foreach ($types as $type) - { - $options[] = JHtml::_('select.option', $type, 'COM_INSTALLER_TYPE_' . strtoupper($type)); - } - - return $options; - } - - /** - * Get a list of filter options for the extension types. - * - * @return array An array of stdClass objects. - * - * @since 3.0 - */ - public static function getExtensionGroupes() - { - $db = JFactory::getDbo(); - $query = $db->getQuery(true) - ->select('DISTINCT folder') - ->from('#__extensions') - ->where('folder != ' . $db->quote('')) - ->order('folder'); - $db->setQuery($query); - $folders = $db->loadColumn(); - - $options = array(); - foreach ($folders as $folder) - { - $options[] = JHtml::_('select.option', $folder, $folder); - } - - return $options; - } - - /** - * Gets a list of the actions that can be performed. - * - * @return JObject - * - * @since 1.6 - * @deprecated 3.2 Use JHelperContent::getActions() instead - */ - public static function getActions() - { - // Log usage of deprecated function - JLog::add(__METHOD__ . '() is deprecated, use JHelperContent::getActions() with new arguments order instead.', JLog::WARNING, 'deprecated'); - - // Get list of actions - $result = JHelperContent::getActions('com_installer'); - - return $result; - } -} diff --git a/app/administrator/components/com_installer/installer.php b/app/administrator/components/com_installer/installer.php deleted file mode 100644 index cd72e66a4a..0000000000 --- a/app/administrator/components/com_installer/installer.php +++ /dev/null @@ -1,20 +0,0 @@ -authorise('core.manage', 'com_installer')) -{ - return JError::raiseWarning(403, JText::_('JERROR_ALERTNOAUTHOR')); -} - -$controller = JControllerLegacy::getInstance('Installer'); -$controller->execute(JFactory::getApplication()->input->get('task')); -$controller->redirect(); diff --git a/app/administrator/components/com_installer/installer.xml b/app/administrator/components/com_installer/installer.xml deleted file mode 100644 index 11712d03be..0000000000 --- a/app/administrator/components/com_installer/installer.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - com_installer - Joomla! Project - April 2006 - (C) 2005 - 2014 Open Source Matters. All rights reserved. - GNU General Public License version 2 or later; see LICENSE.txt - admin@joomla.org - www.joomla.org - 3.0.0 - COM_INSTALLER_XML_DESCRIPTION - - - config.xml - controller.php - index.html - installer.php - controllers - helpers - models - views - - - language/en-GB.com_installer.ini - language/en-GB.com_installer.sys.ini - - - - diff --git a/app/administrator/components/com_installer/models/extension.php b/app/administrator/components/com_installer/models/extension.php deleted file mode 100644 index 6beb8c7514..0000000000 --- a/app/administrator/components/com_installer/models/extension.php +++ /dev/null @@ -1,183 +0,0 @@ -getState('list.ordering'); - $search = $this->getState('filter.search'); - - // Replace slashes so preg_match will work - $search = str_replace('/', ' ', $search); - $db = $this->getDbo(); - - if ($ordering == 'name' || (!empty($search) && stripos($search, 'id:') !== 0)) - { - $db->setQuery($query); - $result = $db->loadObjectList(); - $this->translate($result); - - if (!empty($search)) - { - $search = str_replace(' ', '.*', preg_quote(trim($search), '/')); - - foreach ($result as $i => $item) - { - if (!preg_match("/$search/i", $item->name)) - { - unset($result[$i]); - } - } - } - JArrayHelper::sortObjects($result, $this->getState('list.ordering'), $this->getState('list.direction') == 'desc' ? -1 : 1, true, true); - $total = count($result); - $this->cache[$this->getStoreId('getTotal')] = $total; - if ($total < $limitstart) - { - $limitstart = 0; - $this->setState('list.start', 0); - } - return array_slice($result, $limitstart, $limit ? $limit : null); - } - else - { - $query->order($db->quoteName($ordering) . ' ' . $this->getState('list.direction')); - $result = parent::_getList($query, $limitstart, $limit); - $this->translate($result); - return $result; - } - } - - /** - * Translate a list of objects - * - * @param array &$items The array of objects - * - * @return array The array of translated objects - */ - private function translate(&$items) - { - $lang = JFactory::getLanguage(); - foreach ($items as &$item) - { - if (strlen($item->manifest_cache)) - { - $data = json_decode($item->manifest_cache); - if ($data) - { - foreach ($data as $key => $value) - { - if ($key == 'type') - { - // Ignore the type field - continue; - } - $item->$key = $value; - } - } - } - $item->author_info = @$item->authorEmail . '
' . @$item->authorUrl; - $item->client = $item->client_id ? JText::_('JADMINISTRATOR') : JText::_('JSITE'); - $path = $item->client_id ? JPATH_ADMINISTRATOR : JPATH_SITE; - switch ($item->type) - { - case 'component': - $extension = $item->element; - $source = JPATH_ADMINISTRATOR . '/components/' . $extension; - $lang->load("$extension.sys", JPATH_ADMINISTRATOR, null, false, true) - || $lang->load("$extension.sys", $source, null, false, true); - break; - case 'file': - $extension = 'files_' . $item->element; - $lang->load("$extension.sys", JPATH_SITE, null, false, true); - break; - case 'library': - $extension = 'lib_' . $item->element; - $lang->load("$extension.sys", JPATH_SITE, null, false, true); - break; - case 'module': - $extension = $item->element; - $source = $path . '/modules/' . $extension; - $lang->load("$extension.sys", $path, null, false, true) - || $lang->load("$extension.sys", $source, null, false, true); - break; - case 'package': - $extension = $item->element; - $lang->load("$extension.sys", JPATH_SITE, null, false, true); - break; - case 'plugin': - $extension = 'plg_' . $item->folder . '_' . $item->element; - $source = JPATH_PLUGINS . '/' . $item->folder . '/' . $item->element; - $lang->load("$extension.sys", JPATH_ADMINISTRATOR, null, false, true) - || $lang->load("$extension.sys", $source, null, false, true); - break; - case 'template': - $extension = 'tpl_' . $item->element; - $source = $path . '/templates/' . $item->element; - $lang->load("$extension.sys", $path, null, false, true) - || $lang->load("$extension.sys", $source, null, false, true); - break; - } - if (!in_array($item->type, array('language', 'template', 'library'))) - { - $item->name = JText::_($item->name); - } - settype($item->description, 'string'); - if (!in_array($item->type, array('language'))) - { - $item->description = JText::_($item->description); - } - } - } -} diff --git a/app/administrator/components/com_installer/models/manage.php b/app/administrator/components/com_installer/models/manage.php deleted file mode 100644 index c49a512ca7..0000000000 --- a/app/administrator/components/com_installer/models/manage.php +++ /dev/null @@ -1,329 +0,0 @@ -getUserStateFromRequest($this->context . '.filter.search', 'filter_search'); - $this->setState('filter.search', $search); - - $clientId = $this->getUserStateFromRequest($this->context . '.filter.client_id', 'filter_client_id', ''); - $this->setState('filter.client_id', $clientId); - - $status = $this->getUserStateFromRequest($this->context . '.filter.status', 'filter_status', ''); - $this->setState('filter.status', $status); - - $categoryId = $this->getUserStateFromRequest($this->context . '.filter.type', 'filter_type', ''); - $this->setState('filter.type', $categoryId); - - $group = $this->getUserStateFromRequest($this->context . '.filter.group', 'filter_group', ''); - $this->setState('filter.group', $group); - - $this->setState('message', $app->getUserState('com_installer.message')); - $this->setState('extension_message', $app->getUserState('com_installer.extension_message')); - $app->setUserState('com_installer.message', ''); - $app->setUserState('com_installer.extension_message', ''); - - parent::populateState('name', 'asc'); - } - - /** - * Enable/Disable an extension. - * - * @param array &$eid Extension ids to un/publish - * @param int $value Publish value - * - * @return boolean True on success - * - * @since 1.5 - */ - public function publish(&$eid = array(), $value = 1) - { - $user = JFactory::getUser(); - if ($user->authorise('core.edit.state', 'com_installer')) - { - $result = true; - - /* - * Ensure eid is an array of extension ids - * TODO: If it isn't an array do we want to set an error and fail? - */ - if (!is_array($eid)) - { - $eid = array($eid); - } - - // Get a table object for the extension type - $table = JTable::getInstance('Extension'); - JTable::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_templates/tables'); - - // Enable the extension in the table and store it in the database - foreach ($eid as $i => $id) - { - $table->load($id); - if ($table->type == 'template') - { - $style = JTable::getInstance('Style', 'TemplatesTable'); - if ($style->load(array('template' => $table->element, 'client_id' => $table->client_id, 'home' => 1))) - { - JError::raiseNotice(403, JText::_('COM_INSTALLER_ERROR_DISABLE_DEFAULT_TEMPLATE_NOT_PERMITTED')); - unset($eid[$i]); - continue; - } - } - if ($table->protected == 1) - { - $result = false; - JError::raiseWarning(403, JText::_('JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED')); - } - else - { - $table->enabled = $value; - } - if (!$table->store()) - { - $this->setError($table->getError()); - $result = false; - } - } - } - else - { - $result = false; - JError::raiseWarning(403, JText::_('JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED')); - } - return $result; - } - - /** - * Refreshes the cached manifest information for an extension. - * - * @param int $eid extension identifier (key in #__extensions) - * - * @return boolean result of refresh - * - * @since 1.6 - */ - public function refresh($eid) - { - if (!is_array($eid)) - { - $eid = array($eid => 0); - } - - // Get an installer object for the extension type - $installer = JInstaller::getInstance(); - $result = 0; - - // Uninstall the chosen extensions - foreach ($eid as $id) - { - $result |= $installer->refreshManifestCache($id); - } - return $result; - } - - /** - * Remove (uninstall) an extension - * - * @param array $eid An array of identifiers - * - * @return boolean True on success - * - * @since 1.5 - */ - public function remove($eid = array()) - { - $user = JFactory::getUser(); - - if ($user->authorise('core.delete', 'com_installer')) - { - $failed = array(); - - /* - * Ensure eid is an array of extension ids in the form id => client_id - * TODO: If it isn't an array do we want to set an error and fail? - */ - if (!is_array($eid)) - { - $eid = array($eid => 0); - } - - // Get an installer object for the extension type - $installer = JInstaller::getInstance(); - $row = JTable::getInstance('extension'); - - // Uninstall the chosen extensions - $msgs = array(); - $result = false; - foreach ($eid as $id) - { - $id = trim($id); - $row->load($id); - - $langstring = 'COM_INSTALLER_TYPE_TYPE_' . strtoupper($row->type); - $rowtype = JText::_($langstring); - if (strpos($rowtype, $langstring) !== false) - { - $rowtype = $row->type; - } - - if ($row->type && $row->type != 'language') - { - $result = $installer->uninstall($row->type, $id); - - // Build an array of extensions that failed to uninstall - if ($result === false) - { - // There was an error in uninstalling the package - $msgs[] = JText::sprintf('COM_INSTALLER_UNINSTALL_ERROR', $rowtype); - $result = false; - } - else - { - // Package uninstalled sucessfully - $msgs[] = JText::sprintf('COM_INSTALLER_UNINSTALL_SUCCESS', $rowtype); - $result = true; - } - } - else - { - if ($row->type == 'language') - { - - // One should always uninstall a language package, not a single language - $msgs[] = JText::_('COM_INSTALLER_UNINSTALL_LANGUAGE'); - $result = false; - } - else - { - - // There was an error in uninstalling the package - $msgs[] = JText::sprintf('COM_INSTALLER_UNINSTALL_ERROR', $rowtype); - $result = false; - } - } - } - $msg = implode("
", $msgs); - $app = JFactory::getApplication(); - $app->enqueueMessage($msg); - $this->setState('action', 'remove'); - $this->setState('name', $installer->get('name')); - $app->setUserState('com_installer.message', $installer->message); - $app->setUserState('com_installer.extension_message', $installer->get('extension_message')); - return $result; - } - else - { - JError::raiseWarning(403, JText::_('JERROR_CORE_DELETE_NOT_PERMITTED')); - } - } - - /** - * Method to get the database query - * - * @return JDatabaseQuery The database query - * - * @since 1.6 - */ - protected function getListQuery() - { - $status = $this->getState('filter.status'); - $type = $this->getState('filter.type'); - $client = $this->getState('filter.client_id'); - $group = $this->getState('filter.group'); - $query = JFactory::getDbo()->getQuery(true) - ->select('*') - ->select('2*protected+(1-protected)*enabled as status') - ->from('#__extensions') - ->where('state=0'); - if ($status != '') - { - if ($status == '2') - { - $query->where('protected = 1'); - } - elseif ($status == '3') - { - $query->where('protected = 0'); - } - else - { - $query->where('protected = 0') - ->where('enabled=' . (int) $status); - } - } - if ($type) - { - $query->where('type=' . $this->_db->quote($type)); - } - if ($client != '') - { - $query->where('client_id=' . (int) $client); - } - if ($group != '' && in_array($type, array('plugin', 'library', ''))) - { - $query->where('folder=' . $this->_db->quote($group == '*' ? '' : $group)); - } - - // Filter by search in id - $search = $this->getState('filter.search'); - if (!empty($search) && stripos($search, 'id:') === 0) - { - $query->where('extension_id = ' . (int) substr($search, 3)); - } - - return $query; - } -} diff --git a/app/administrator/components/com_installer/views/default/view.php b/app/administrator/components/com_installer/views/default/view.php deleted file mode 100644 index ac37422e06..0000000000 --- a/app/administrator/components/com_installer/views/default/view.php +++ /dev/null @@ -1,91 +0,0 @@ -_addPath('template', $this->_basePath . '/views/default/tmpl'); - $this->_addPath('template', JPATH_THEMES . '/' . $app->getTemplate() . '/html/com_installer/default'); - } - - /** - * Display the view - * - * @param string $tpl Template - * - * @return void - * - * @since 1.5 - */ - public function display($tpl = null) - { - // Get data from the model - $state = $this->get('State'); - - // Are there messages to display ? - $showMessage = false; - if (is_object($state)) - { - $message1 = $state->get('message'); - $message2 = $state->get('extension_message'); - $showMessage = ($message1 || $message2); - } - - $this->showMessage = $showMessage; - $this->state = &$state; - - $this->addToolbar(); - parent::display($tpl); - } - - /** - * Add the page title and toolbar. - * - * @return void - * - * @since 1.6 - */ - protected function addToolbar() - { - $canDo = JHelperContent::getActions('com_installer'); - JToolbarHelper::title(JText::_('COM_INSTALLER_HEADER_' . $this->getName()), 'puzzle install'); - - if ($canDo->get('core.admin')) - { - JToolbarHelper::preferences('com_installer'); - JToolbarHelper::divider(); - } - - // Document - $document = JFactory::getDocument(); - $document->setTitle(JText::_('COM_INSTALLER_TITLE_' . $this->getName())); - - // Render side bar - $this->sidebar = JHtmlSidebar::render(); - } -} diff --git a/app/administrator/components/com_installer/views/manage/tmpl/default.php b/app/administrator/components/com_installer/views/manage/tmpl/default.php deleted file mode 100644 index ed1a754902..0000000000 --- a/app/administrator/components/com_installer/views/manage/tmpl/default.php +++ /dev/null @@ -1,150 +0,0 @@ -escape($this->state->get('list.ordering')); -$listDirn = $this->escape($this->state->get('list.direction')); -?> -
-
- sidebar)) : ?> -
- sidebar; ?> -
-
- -
- - - showMessage) : ?> - loadTemplate('message'); ?> - - - ftp) : ?> - loadTemplate('ftp'); ?> - -
-
- - pagination->getLimitBox(); ?> -
-
- -
-
- - -
-
-
- - items)) : ?> - - - - - - - - - - - - - - - - - - - - - - items as $i => $item) : ?> - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - -
- pagination->getListFooter(); ?> -
- extension_id); ?> - - - name; ?> - - - client; ?> - - element) : ?> - X - - status, $i, $item->status < 2, 'cb'); ?> - - - type); ?> - - version != '' ? $item->version : ' '; ?> - - creationDate != '' ? $item->creationDate : ' '; ?> - - - author != '' ? $item->author : ' '; ?> - - - folder != '' ? $item->folder : JText::_('COM_INSTALLER_TYPE_NONAPPLICABLE'); ?> - - extension_id ?> -
- - - - - - - - -
- -
diff --git a/app/administrator/components/com_installer/views/manage/view.html.php b/app/administrator/components/com_installer/views/manage/view.html.php deleted file mode 100644 index eed696a802..0000000000 --- a/app/administrator/components/com_installer/views/manage/view.html.php +++ /dev/null @@ -1,119 +0,0 @@ -state = $this->get('State'); - $this->items = $this->get('Items'); - $this->pagination = $this->get('Pagination'); - - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode("\n", $errors)); - return false; - } - - // Check if there are no matching items - if (!count($this->items)) - { - JFactory::getApplication()->enqueueMessage( - JText::_('COM_INSTALLER_MSG_MANAGE_NOEXTENSION'), - 'warning' - ); - } - - // Include the component HTML helpers. - JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); - - // Display the view - parent::display($tpl); - } - - /** - * Add the page title and toolbar. - * - * @return void - * - * @since 1.6 - */ - protected function addToolbar() - { - $canDo = JHelperContent::getActions('com_installer'); - if ($canDo->get('core.edit.state')) - { - JToolbarHelper::publish('manage.publish', 'JTOOLBAR_ENABLE', true); - JToolbarHelper::unpublish('manage.unpublish', 'JTOOLBAR_DISABLE', true); - JToolbarHelper::divider(); - } - JToolbarHelper::custom('manage.refresh', 'refresh', 'refresh', 'JTOOLBAR_REFRESH_CACHE', true); - JToolbarHelper::divider(); - - JToolbarHelper::help('JHELP_EXTENSIONS_EXTENSION_MANAGER_MANAGE'); - - JHtmlSidebar::setAction('index.php?option=com_installer&view=manage'); - - JHtmlSidebar::addFilter( - JText::_('COM_INSTALLER_VALUE_CLIENT_SELECT'), - 'filter_client_id', - JHtml::_('select.options', array('0' => 'JSITE', '1' => 'JADMINISTRATOR'), 'value', 'text', $this->state->get('filter.client_id'), true) - ); - - JHtmlSidebar::addFilter( - JText::_('COM_INSTALLER_VALUE_STATE_SELECT'), - 'filter_status', - JHtml::_('select.options', array('0' => 'JDISABLED', '1' => 'JENABLED', '2' => 'JPROTECTED', '3' => 'JUNPROTECTED'), 'value', 'text', $this->state->get('filter.status'), true) - ); - - JHtmlSidebar::addFilter( - JText::_('COM_INSTALLER_VALUE_TYPE_SELECT'), - 'filter_type', - JHtml::_('select.options', InstallerHelper::getExtensionTypes(), 'value', 'text', $this->state->get('filter.type'), true) - ); - - JHtmlSidebar::addFilter( - JText::_('COM_INSTALLER_VALUE_FOLDER_SELECT'), - 'filter_group', - JHtml::_('select.options', array_merge(InstallerHelper::getExtensionGroupes(), array('*' => JText::_('COM_INSTALLER_VALUE_FOLDER_NONAPPLICABLE'))), 'value', 'text', $this->state->get('filter.group'), true) - ); - - parent::addToolbar(); - } -} diff --git a/app/administrator/language/en-GB/en-GB.com_installer.ini b/app/administrator/language/en-GB/en-GB.com_installer.ini deleted file mode 100644 index bd984b5853..0000000000 --- a/app/administrator/language/en-GB/en-GB.com_installer.ini +++ /dev/null @@ -1,203 +0,0 @@ -; Joomla! Project -; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved. -; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php -; Note : All ini files need to be saved as UTF-8 - -COM_INSTALLER="Installation Manager" -COM_INSTALLER_AUTHOR_INFORMATION="Author Information" -COM_INSTALLER_CONFIGURATION="Installer configuration" -COM_INSTALLER_ENABLED_UPDATES_1=", 1 disabled site was enabled" -COM_INSTALLER_ENABLED_UPDATES_MORE=", %s disabled sites were enabled" -COM_INSTALLER_ERROR_DISABLE_DEFAULT_TEMPLATE_NOT_PERMITTED="Disable default template is not permitted" -COM_INSTALLER_ERROR_METHOD="Method Not Implemented" -COM_INSTALLER_ERROR_NO_EXTENSIONS_SELECTED="No extensions selected" -COM_INSTALLER_EXTENSION_DISABLE="Disable extension" -COM_INSTALLER_EXTENSION_DISABLED="Disabled extension" -COM_INSTALLER_EXTENSION_ENABLE="Enable extension" -COM_INSTALLER_EXTENSION_ENABLED="Enabled extension" -COM_INSTALLER_EXTENSION_PACKAGE_FILE="Extension package file" -COM_INSTALLER_EXTENSION_PROTECTED="Protected extension" -COM_INSTALLER_EXTENSION_PUBLISHED="Extension successfully enabled." -COM_INSTALLER_EXTENSION_UNPUBLISHED="Extension successfully disabled." -COM_INSTALLER_FAILED_TO_ENABLE_UPDATES=", failed to enable updates" -COM_INSTALLER_FAILED_TO_PURGE_UPDATES="Failed to purge updates" -COM_INSTALLER_FILTER_LABEL="Search by extension name" -COM_INSTALLER_HEADER_DATABASE="Extension Manager: Check Database" -COM_INSTALLER_HEADER_DISCOVER="Extension Manager: Discover" -COM_INSTALLER_HEADER_INSTALL="Extension Manager: Install" -COM_INSTALLER_HEADER_LANGUAGES="Install Accredited Language Translations" -COM_INSTALLER_HEADER_MANAGE="Extension Manager: Manage" -COM_INSTALLER_HEADER_UPDATE="Extension Manager: Update" -COM_INSTALLER_HEADER_WARNINGS="Extension Manager: Warnings" -COM_INSTALLER_HEADING_CLIENT="Client" -COM_INSTALLER_HEADING_DETAILS_URL="Details URL" -COM_INSTALLER_HEADING_DETAILSURL="URL Details" -COM_INSTALLER_HEADING_FOLDER="Folder" -COM_INSTALLER_HEADING_ID="ID" -COM_INSTALLER_HEADING_INSTALLTYPE="Install Type" -COM_INSTALLER_HEADING_LOCATION="Location" -COM_INSTALLER_HEADING_NAME="Name" -COM_INSTALLER_HEADING_TYPE="Type" -COM_INSTALLER_INSTALL_BUTTON="Install" -COM_INSTALLER_INSTALL_DIRECTORY="Install Directory" -COM_INSTALLER_INSTALL_ERROR="Error installing %s" -COM_INSTALLER_INSTALL_FROM_DIRECTORY="Install from Directory" -COM_INSTALLER_INSTALL_FROM_URL="Install from URL" -COM_INSTALLER_INSTALL_FROM_WEB="Install from Web" -COM_INSTALLER_INSTALL_FROM_WEB_ADD_TAB="Add "Install from Web" tab" -COM_INSTALLER_INSTALL_FROM_WEB_INFO="Joomla! Extensions Directory (JED) now available with Install from Web on this page." -COM_INSTALLER_INSTALL_FROM_WEB_TOS="By clicking "_QQ_"Add Install from Web tab"_QQ_" below, you agree to the JED Terms of Service and all applicable third party license terms." -COM_INSTALLER_INSTALL_SUCCESS="Installing %s was successful." -COM_INSTALLER_INSTALL_URL="Install URL" -COM_INSTALLER_INVALID_EXTENSION_UPDATE="Invalid extension update" -COM_INSTALLER_LABEL_HIDEPROTECTED_DESC="Hide protected extensions. Protected extensions can't be uninstalled." -COM_INSTALLER_LABEL_HIDEPROTECTED_LABEL="Hide protected extensions" -COM_INSTALLER_LANGUAGES_AVAILABLE_LANGUAGES="Available Languages" -COM_INSTALLER_LANGUAGES_FILTER_SEARCH_DESC="Search by language name." -COM_INSTALLER_MSG_DATABASE="This screen allows to you check that your database table structure is up to date with changes from the previous versions." -COM_INSTALLER_MSG_DATABASE_ADD_COLUMN="Table %2$s does not have column %3$s. (From file %1$s.)" -COM_INSTALLER_MSG_DATABASE_ADD_INDEX="Table %2$s does not have index %3$s. (From file %1$s.)" -COM_INSTALLER_MSG_DATABASE_CHANGE_COLUMN_TYPE="Table %2$s does not have column %3$s with type %4$s. (From file %1$s.)" -COM_INSTALLER_MSG_DATABASE_CHECKED_OK="%s database changes were checked successfully." -COM_INSTALLER_MSG_DATABASE_CREATE_TABLE="Table %2$s does not exist. (From file %1$s.)" -COM_INSTALLER_MSG_DATABASE_DRIVER="Database driver: %s." -COM_INSTALLER_MSG_DATABASE_DROP_COLUMN="Table %2$s should not have column %3$s. (From file %1$s.)" -COM_INSTALLER_MSG_DATABASE_DROP_INDEX="Table %2$s should not have index %3$s. (From file %1$s.)" -COM_INSTALLER_MSG_DATABASE_ERRORS="Warning: Database is not up to date!" -COM_INSTALLER_MSG_DATABASE_FILTER_ERROR="No default text filters found." -COM_INSTALLER_MSG_DATABASE_INFO="Other Information" -COM_INSTALLER_MSG_DATABASE_OK="Database table structure is up to date." -COM_INSTALLER_MSG_DATABASE_SCHEMA_ERROR="Database schema version (%s) does not match CMS version (%s)." -COM_INSTALLER_MSG_DATABASE_SCHEMA_VERSION="Database schema version (in #__schemas): %s." -COM_INSTALLER_MSG_DATABASE_SKIPPED="%s database changes did not alter table structure and were skipped." -COM_INSTALLER_MSG_DATABASE_UPDATE_VERSION="Update version (in #__extensions): %s." -COM_INSTALLER_MSG_DATABASE_UPDATEVERSION_ERROR="Database update version (%s) does not match CMS version (%s)." -COM_INSTALLER_MSG_DESCFTP="For installing or uninstalling Extensions, Joomla! will most likely need your FTP account details. Please enter them in the form fields below." -COM_INSTALLER_MSG_DESCFTPTITLE="FTP Login Details" -COM_INSTALLER_MSG_DISCOVER_DESCRIPTION="This screen allows you to discover extensions that have not gone through the normal installation process.
For example, some extensions are too large in file size to upload using the web interface due to limitations of the web hosting environment. Using this feature you can upload extension files directly to your web server using some other means such as FTP or SFTP and place those extension files into the appropriate directory.
You can then use the discover feature to find the newly uploaded extension and activate it in your Joomla! installation.
Using the discover operation you can also discover and install multiple extensions at the same time." -COM_INSTALLER_MSG_DISCOVER_FAILEDTOPURGEEXTENSIONS="Failed to purge extensions" -COM_INSTALLER_MSG_DISCOVER_INSTALLFAILED="Discover install failed" -COM_INSTALLER_MSG_DISCOVER_INSTALLSUCCESSFUL="Discover install successful" -COM_INSTALLER_MSG_DISCOVER_NOEXTENSION="No extensions have been discovered. Click Discover to find new extensions that might be available for install." -COM_INSTALLER_MSG_DISCOVER_NOEXTENSIONSELECTED="No extension selected" -COM_INSTALLER_MSG_DISCOVER_PURGEDDISCOVEREDEXTENSIONS="Purged discovered extensions" -COM_INSTALLER_MSG_INSTALL_ENTER_A_URL="Please enter a URL" -COM_INSTALLER_MSG_INSTALL_INVALID_URL="Invalid URL" -COM_INSTALLER_MSG_INSTALL_NO_FILE_SELECTED="No file selected" -COM_INSTALLER_MSG_INSTALL_PATH_DOES_NOT_HAVE_A_VALID_PACKAGE="Path does not have a valid package." -COM_INSTALLER_MSG_INSTALL_PLEASE_ENTER_A_PACKAGE_DIRECTORY="Please enter a package directory" -COM_INSTALLER_MSG_INSTALL_PLEASE_SELECT_A_DIRECTORY="Please select a directory" -COM_INSTALLER_MSG_INSTALL_PLEASE_SELECT_A_PACKAGE="Please select a package location" -COM_INSTALLER_MSG_INSTALL_WARNINSTALLFILE="The installer cannot continue until file uploads are enabled for the server." -COM_INSTALLER_MSG_INSTALL_WARNINSTALLUPLOADERROR="There was an error uploading this file to the server." -COM_INSTALLER_MSG_INSTALL_WARNINSTALLZLIB="The installer cannot continue until Zlib is installed." -COM_INSTALLER_MSG_LANGUAGES_CANT_FIND_REMOTE_MANIFEST="The installer can't get the url to the XML manifest file of the %s language." -COM_INSTALLER_MSG_LANGUAGES_CANT_FIND_REMOTE_PACKAGE="The installer can't get the url to the remote %s language." -COM_INSTALLER_MSG_LANGUAGES_NOLANGUAGES="There are no available languages to install at the moment. Please click on the "Find languages" button to check for updates on the Joomla Languages server. You will need an internet connection for this to work." -COM_INSTALLER_MSG_LANGUAGES_TRY_LATER="Try again later or contact the language team coordinator" -COM_INSTALLER_MSG_MANAGE_NOEXTENSION="There are no extensions installed matching your query" -COM_INSTALLER_MSG_N_DATABASE_ERROR_PANEL="%d Database Problems Found" -COM_INSTALLER_MSG_N_DATABASE_ERROR_PANEL_1="1 Database Problem Found" -COM_INSTALLER_MSG_UPDATE_ERROR="Error updating %s." -COM_INSTALLER_MSG_UPDATE_NODESC="No description available for this item." -COM_INSTALLER_MSG_UPDATE_NOUPDATES="There are no updates available at the moment. Please check again later." -COM_INSTALLER_MSG_UPDATE_SUCCESS="Updating %s was successful." -COM_INSTALLER_MSG_UPDATE_UPDATE="Update" -COM_INSTALLER_MSG_WARNINGFURTHERINFO="Further information on warnings" -COM_INSTALLER_MSG_WARNINGFURTHERINFODESC="For more information on warnings, see the Joomla! Documentation Site" -COM_INSTALLER_MSG_WARNINGS_FILEUPLOADISDISABLEDDESC="File uploads are required to upload extensions into the installer." -COM_INSTALLER_MSG_WARNINGS_FILEUPLOADSDISABLED="File uploads disabled" -COM_INSTALLER_MSG_WARNINGS_JOOMLATMPNOTSET="The Joomla! temporary directory is not set" -COM_INSTALLER_MSG_WARNINGS_LOWMEMORYDESC="Low PHP Memory Limit" -COM_INSTALLER_MSG_WARNINGS_LOWMEMORYWARN="Your PHP memory limit is set below 8MB which may cause some issues when installing large extensions. Please set your memory limit to at least 16MB." -COM_INSTALLER_MSG_WARNINGS_MEDMEMORYDESC="Potentially low PHP Memory Limit" -COM_INSTALLER_MSG_WARNINGS_MEDMEMORYWARN="Your PHP memory limit is set below 16MB which may cause some issues when installing large extensions. Please set your memory limit to at least 16MB." -COM_INSTALLER_MSG_WARNINGS_NONE="No warnings detected" -COM_INSTALLER_MSG_WARNINGS_NOTCOMPLETE="

Warning: Update Not Complete!

The update is only partially complete. Please do the second update to complete the process.

" -COM_INSTALLER_MSG_WARNINGS_PHPUPLOADNOTSET="The PHP temporary directory is not set" -COM_INSTALLER_MSG_WARNINGS_PHPUPLOADNOTSETDESC="The PHP temporary directory is the directory that PHP uses to store an uploaded file before Joomla! can access this file. Whilst the directory not being set isn't always a problem, if you are having issues with manifest files not being detected or uploaded files not being detected, setting this in your php.ini file might fix the issue." -COM_INSTALLER_MSG_WARNINGS_PHPUPLOADNOTWRITEABLE="The PHP temporary directory is not writeable" -COM_INSTALLER_MSG_WARNINGS_PHPUPLOADNOTWRITEABLEDESC="The PHP temporary directory is not writeable by the Joomla! instance, which may cause issues when attempting to upload extensions to Joomla!. If you are having issues uploading extensions, check the '%s' and set it to be writeable and see if this fixes the issue." -COM_INSTALLER_MSG_WARNINGS_SMALLPOSTSIZE="Small PHP maximum POST size" -COM_INSTALLER_MSG_WARNINGS_SMALLPOSTSIZEDESC="The maximum POST size sets the most amount of data that can be sent via POST to the server. This includes form submissions for articles, media (images, videos) and extensions. This value is less than 8MB which may impact on uploading large extensions. This is set in the php.ini under post_max_size" -COM_INSTALLER_MSG_WARNINGS_SMALLUPLOADSIZE="Maximum PHP file upload size is too small: This is set in php.ini in both upload_max_filesize and post_max_size settings of your PHP settings (located in php.ini and/or .htaccess file)" -COM_INSTALLER_MSG_WARNINGS_SMALLUPLOADSIZEDESC="The maximum file size for uploads is set to less than 8MB which may impact on uploading large extensions." -COM_INSTALLER_MSG_WARNINGS_UPDATE_NOTICE="Before updating ensure that the update is compatible with your Joomla! installation." -COM_INSTALLER_MSG_WARNINGS_UPLOADBIGGERTHANPOST="PHP Upload Size bigger than POST size" -COM_INSTALLER_MSG_WARNINGS_UPLOADBIGGERTHANPOSTDESC="The value of the upload_max_filesize in the php.ini file is greater than the post_max_size variable. The post_max_size variable will take precedence here and block requests larger than it. This is generally a server misconfiguration when trying to increase upload sizes. Please increase the upload_max_filesize to at least match the post_max_size variable or vice versa" -COM_INSTALLER_N_EXTENSIONS_PUBLISHED="%d extensions successfully enabled." -COM_INSTALLER_N_EXTENSIONS_PUBLISHED_1="%d extension successfully enabled." -COM_INSTALLER_N_EXTENSIONS_UNPUBLISHED="%d extensions successfully disabled." -COM_INSTALLER_N_EXTENSIONS_UNPUBLISHED_1="%d extension successfully disabled." -COM_INSTALLER_NEW_INSTALL="New install" -COM_INSTALLER_NO_INSTALL_TYPE_FOUND="No Install Type Found" -COM_INSTALLER_PACKAGE_DOWNLOAD_FAILED="Package download failed: %s" -COM_INSTALLER_PACKAGE_FILE="Package File" -COM_INSTALLER_PREFERENCES_DESCRIPTION="Fine-tune how extensions installation and updates work" -COM_INSTALLER_PREFERENCES_LABEL="Preferences" -COM_INSTALLER_PURGED_UPDATES="Purged updates" -COM_INSTALLER_SHOW_JED_INFORMATION_DESC="Show or hide the information at the top of the installer page about the Joomla! Extensions Directory." -COM_INSTALLER_SHOW_JED_INFORMATION_HIDE_MESSAGE="Hide message" -COM_INSTALLER_SHOW_JED_INFORMATION_LABEL="Joomla! Extensions Directory" -COM_INSTALLER_SHOW_JED_INFORMATION_SHOW_MESSAGE="Show message" -COM_INSTALLER_SHOW_JED_INFORMATION_TOOLTIP="Opens Installer Options for setting to hide this Joomla! Extensions Directory message." -COM_INSTALLER_SUBMENU_DATABASE="Database" -COM_INSTALLER_SUBMENU_DISCOVER="Discover" -COM_INSTALLER_SUBMENU_INSTALL="Install" -COM_INSTALLER_SUBMENU_LANGUAGES="Install languages" -COM_INSTALLER_SUBMENU_MANAGE="Manage" -COM_INSTALLER_SUBMENU_UPDATE="Update" -COM_INSTALLER_SUBMENU_WARNINGS="Warnings" -COM_INSTALLER_TITLE_DATABASE="Extension manager - Database" -COM_INSTALLER_TITLE_DISCOVER="Extension manager - Discover" -COM_INSTALLER_TITLE_INSTALL="Extension manager - Install" -COM_INSTALLER_TITLE_LANGUAGES="Extension manager - Install Languages" -COM_INSTALLER_TITLE_MANAGE="Extension manager - Manage" -COM_INSTALLER_TITLE_UPDATE="Extension manager - Update" -COM_INSTALLER_TITLE_WARNINGS="Extension manager - Warnings" -COM_INSTALLER_TOOLBAR_DATABASE_FIX="Fix" -COM_INSTALLER_TOOLBAR_DISCOVER="Discover" -COM_INSTALLER_TOOLBAR_FIND_LANGUAGES="Find languages" -COM_INSTALLER_TOOLBAR_FIND_UPDATES="Find Updates" -COM_INSTALLER_TOOLBAR_INSTALL="Install" -COM_INSTALLER_TOOLBAR_UPDATE="Update" -COM_INSTALLER_TYPE_CLIENT="Location" -COM_INSTALLER_TYPE_COMPONENT="Component" -COM_INSTALLER_TYPE_FILE="File" -COM_INSTALLER_TYPE_LANGUAGE="Language" -COM_INSTALLER_TYPE_LIBRARY="Library" -COM_INSTALLER_TYPE_MODULE="Module" -COM_INSTALLER_TYPE_NONAPPLICABLE="N/A" -COM_INSTALLER_TYPE_PACKAGE="Package" -COM_INSTALLER_TYPE_PLUGIN="Plugin" -COM_INSTALLER_TYPE_TEMPLATE="Template" -COM_INSTALLER_TYPE_TYPE_COMPONENT="component" -COM_INSTALLER_TYPE_TYPE_FILE="file" -COM_INSTALLER_TYPE_TYPE_LANGUAGE="language" -COM_INSTALLER_TYPE_TYPE_LIBRARY="library" -COM_INSTALLER_TYPE_TYPE_MODULE="module" -COM_INSTALLER_TYPE_TYPE_PACKAGE="package" -COM_INSTALLER_TYPE_TYPE_PLUGIN="plugin" -COM_INSTALLER_TYPE_TYPE_TEMPLATE="template" -COM_INSTALLER_UNABLE_TO_FIND_INSTALL_PACKAGE="Unable to find install package" -COM_INSTALLER_UNINSTALL_ERROR="Error uninstalling %s." -COM_INSTALLER_UNINSTALL_LANGUAGE="A language should always have been installed as a package.
To uninstall a language, filter type by package and uninstall the package." -COM_INSTALLER_UNINSTALL_SUCCESS="Uninstalling %s was successful." -COM_INSTALLER_UPLOAD_AND_INSTALL="Upload & Install" -COM_INSTALLER_UPLOAD_INSTALL_JOOMLA_EXTENSION="Upload & Install Joomla Extension" -COM_INSTALLER_UPLOAD_PACKAGE_FILE="Upload Package File" -COM_INSTALLER_VALUE_CLIENT_SELECT="- Select Location -" -COM_INSTALLER_VALUE_FOLDER_NONAPPLICABLE="N/A" -COM_INSTALLER_VALUE_FOLDER_SELECT="- Select Folder -" -COM_INSTALLER_VALUE_STATE_SELECT="- Select Status -" -COM_INSTALLER_VALUE_TYPE_SELECT="- Select Type -" -COM_INSTALLER_WEBINSTALLER_INSTALL_OBSOLETE="The Install from Web plugin has become obsolete and needs to be updated." -COM_INSTALLER_WEBINSTALLER_INSTALL_UPDATE_AVAILABLE="There is a new update available for the Install from Web plugin. It is advisable that you update as soon as possible." -COM_INSTALLER_WEBINSTALLER_INSTALL_WEB_CONFIRM="Please confirm the installation by clicking on the Install button" -COM_INSTALLER_WEBINSTALLER_INSTALL_WEB_CONFIRM_NAME="Extension Name" -COM_INSTALLER_WEBINSTALLER_INSTALL_WEB_CONFIRM_URL="Install from" -COM_INSTALLER_WEBINSTALLER_INSTALL_WEB_LOADING="Loading..." -COM_INSTALLER_WEBINSTALLER_INSTALL_WEB_LOADING_ERROR="Cannot connect to the Joomla! server. Please try again later." -COM_INSTALLER_WEBINSTALLER_LOAD_APPS="Click to load extensions browser" -COM_INSTALLER_XML_DESCRIPTION="Installer component for adding, removing and upgrading extensions" -JLIB_RULES_SETTING_NOTES="1. If you change the setting, it will apply to this component. Note that:
Inherited means that the permissions from global configuration and parent group will be used.
Denied means that no matter what the global configuration or parent group settings are, the group being edited cannot take this action on this component.
Allowed means that the group being edited will be able to take this action for this component (but if this is in conflict with the global configuration or parent group it will have no impact; a conflict will be indicated by Not Allowed (Locked) under Calculated Settings).
2. If you select a new setting, click Save to refresh the calculated settings." diff --git a/app/administrator/language/en-GB/en-GB.com_installer.sys.ini b/app/administrator/language/en-GB/en-GB.com_installer.sys.ini deleted file mode 100644 index 61c47e4cc1..0000000000 --- a/app/administrator/language/en-GB/en-GB.com_installer.sys.ini +++ /dev/null @@ -1,7 +0,0 @@ -; Joomla! Project -; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved. -; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php -; Note : All ini files need to be saved as UTF-8 - -COM_INSTALLER="Installation Manager" -COM_INSTALLER_XML_DESCRIPTION="Installer component for adding, removing and upgrading extensions" diff --git a/app/administrator/language/en-GB/en-GB.ini b/app/administrator/language/en-GB/en-GB.ini index dcf5aaf14b..f81b5028e6 100644 --- a/app/administrator/language/en-GB/en-GB.ini +++ b/app/administrator/language/en-GB/en-GB.ini @@ -566,7 +566,6 @@ JGRID_HEADING_ORDERING_DESC="Ordering descending" JHELP_COMPONENTS_CHECK-IN_CONFIGURATION="Components_Check-in_Configuration" JHELP_COMPONENTS_COM_CONTENT_OPTIONS="Components_Article_Manager_Options" JHELP_COMPONENTS_COM_FINDER_OPTIONS="Components_Smart_Search_Configuration" -JHELP_COMPONENTS_COM_INSTALLER_OPTIONS="Components_Installer_Configuration" JHELP_COMPONENTS_COM_JOOMLAUPDATE_OPTIONS="Components_Joomla_Update_Configuration" JHELP_COMPONENTS_COM_LANGUAGES_OPTIONS="Components_Language_Manager_Options" JHELP_COMPONENTS_COM_MEDIA_OPTIONS="Components_Media_Manager_Options" diff --git a/app/administrator/language/en-GB/install.xml b/app/administrator/language/en-GB/install.xml index c9faa7a19d..a90ae590ad 100644 --- a/app/administrator/language/en-GB/install.xml +++ b/app/administrator/language/en-GB/install.xml @@ -25,8 +25,6 @@ en-GB.com_cpanel.sys.ini en-GB.com_finder.ini en-GB.com_finder.sys.ini - en-GB.com_installer.ini - en-GB.com_installer.sys.ini en-GB.com_languages.ini en-GB.com_languages.sys.ini en-GB.com_login.ini diff --git a/app/administrator/modules/mod_menu/tmpl/default_disabled.php b/app/administrator/modules/mod_menu/tmpl/default_disabled.php index d771bd9161..d10f93f71a 100644 --- a/app/administrator/modules/mod_menu/tmpl/default_disabled.php +++ b/app/administrator/modules/mod_menu/tmpl/default_disabled.php @@ -54,7 +54,6 @@ /** * Extensions Submenu **/ -$im = $user->authorise('core.manage', 'com_installer'); $mm = $user->authorise('core.manage', 'com_modules'); $pm = $user->authorise('core.manage', 'com_plugins'); $tm = $user->authorise('core.manage', 'com_templates'); diff --git a/app/administrator/modules/mod_menu/tmpl/default_enabled.php b/app/administrator/modules/mod_menu/tmpl/default_enabled.php index 6793b40942..d4ad94b2cc 100644 --- a/app/administrator/modules/mod_menu/tmpl/default_enabled.php +++ b/app/administrator/modules/mod_menu/tmpl/default_enabled.php @@ -222,26 +222,15 @@ /* * Extensions Submenu */ -$im = $user->authorise('core.manage', 'com_installer'); $mm = $user->authorise('core.manage', 'com_modules'); $pm = $user->authorise('core.manage', 'com_plugins'); $tm = $user->authorise('core.manage', 'com_templates'); $lm = $user->authorise('core.manage', 'com_languages'); -if ($im || $mm || $pm || $tm || $lm) +if ($mm || $pm || $tm || $lm) { $menu->addChild(new JMenuNode(JText::_('MOD_MENU_EXTENSIONS_EXTENSIONS'), '#'), true); - if ($im) - { - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_EXTENSIONS_EXTENSION_MANAGER'), 'index.php?option=com_installer', 'class:install')); - } - - if ($im && ($mm || $pm || $tm || $lm)) - { - $menu->addSeparator(); - } - if ($mm) { $menu->addChild(new JMenuNode(JText::_('MOD_MENU_EXTENSIONS_MODULE_MANAGER'), 'index.php?option=com_modules', 'class:module')); diff --git a/install/mysql/cms.sql b/install/mysql/cms.sql index 62fc1976c9..2efadf260c 100644 --- a/install/mysql/cms.sql +++ b/install/mysql/cms.sql @@ -15,7 +15,6 @@ INSERT IGNORE INTO `assets` (`id`, `parent_id`, `lft`, `rgt`, `level`, `name`, ` (7, 1, 13, 16, 1, 'com_contact', 'com_contact', '{"core.admin":{"7":1},"core.manage":{"6":1},"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[],"core.edit.own":[]}'), (8, 1, 17, 22, 1, 'com_content', 'com_content', '{"core.admin":{"7":1},"core.manage":{"6":1},"core.create":{"3":1},"core.delete":[],"core.edit":{"4":1},"core.edit.state":{"5":1},"core.edit.own":[]}'), (9, 1, 23, 24, 1, 'com_cpanel', 'com_cpanel', '{}'), -(10, 1, 25, 26, 1, 'com_installer', 'com_installer', '{"core.admin":[],"core.manage":{"7":0},"core.delete":{"7":0},"core.edit.state":{"7":0}}'), (11, 1, 27, 28, 1, 'com_languages', 'com_languages', '{"core.admin":{"7":1},"core.manage":[],"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}'), (12, 1, 29, 30, 1, 'com_login', 'com_login', '{}'), (15, 1, 35, 36, 1, 'com_media', 'com_media', '{"core.admin":{"7":1},"core.manage":{"6":1},"core.create":{"3":1},"core.delete":{"5":1}}'), diff --git a/install/mysql/data.sql b/install/mysql/data.sql index 34fd4c8738..dba226bf65 100644 --- a/install/mysql/data.sql +++ b/install/mysql/data.sql @@ -14,7 +14,6 @@ INSERT INTO `assets` (`id`, `parent_id`, `lft`, `rgt`, `level`, `name`, `title`, (6, 1, 11, 12, 1, 'com_config', 'com_config', '{}'), (8, 1, 17, 20, 1, 'com_content', 'com_content', '{"core.admin":{"7":1},"core.manage":{"6":1},"core.create":{"3":1},"core.delete":[],"core.edit":{"4":1},"core.edit.state":{"5":1},"core.edit.own":[]}'), (9, 1, 21, 22, 1, 'com_cpanel', 'com_cpanel', '{}'), -(10, 1, 23, 24, 1, 'com_installer', 'com_installer', '{"core.admin":[],"core.manage":{"7":0},"core.delete":{"7":0},"core.edit.state":{"7":0}}'), (11, 1, 25, 26, 1, 'com_languages', 'com_languages', '{"core.admin":{"7":1},"core.manage":[],"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}'), (12, 1, 27, 28, 1, 'com_login', 'com_login', '{}'), (15, 1, 33, 34, 1, 'com_media', 'com_media', '{"core.admin":{"7":1},"core.manage":{"6":1},"core.create":{"3":1},"core.delete":{"5":1}}'), @@ -78,7 +77,6 @@ INSERT INTO `extensions` (`extension_id`, `name`, `type`, `element`, `folder`, ` (3, 'com_admin', 'component', 'com_admin', '', 1, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0), (6, 'com_categories', 'component', 'com_categories', '', 1, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0), (9, 'com_cpanel', 'component', 'com_cpanel', '', 1, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0), -(10, 'com_installer', 'component', 'com_installer', '', 1, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0), (11, 'com_languages', 'component', 'com_languages', '', 1, 1, 1, 1, '', '{"administrator":"en-GB","site":"en-GB"}', '', '', 0, '0000-00-00 00:00:00', 0, 0), (12, 'com_login', 'component', 'com_login', '', 1, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0), (13, 'com_media', 'component', 'com_media', '', 1, 1, 0, 1, '', '{"upload_extensions":"bmp,csv,doc,gif,ico,jpg,jpeg,odg,odp,ods,odt,pdf,png,ppt,swf,txt,xcf,xls,BMP,CSV,DOC,GIF,ICO,JPG,JPEG,ODG,ODP,ODS,ODT,PDF,PNG,PPT,SWF,TXT,XCF,XLS","upload_maxsize":"10","file_path":"images","image_path":"images","restrict_uploads":"1","allowed_media_usergroup":"3","check_mime":"1","image_extensions":"bmp,gif,jpg,png","ignore_extensions":"","upload_mime":"image\\/jpeg,image\\/gif,image\\/png,image\\/bmp,application\\/x-shockwave-flash,application\\/msword,application\\/excel,application\\/pdf,application\\/powerpoint,text\\/plain,application\\/x-zip","upload_mime_illegal":"text\\/html"}', '', '', 0, '0000-00-00 00:00:00', 0, 0), diff --git a/install/mysql/testing.sql b/install/mysql/testing.sql index c1dc30a205..a230e31075 100644 --- a/install/mysql/testing.sql +++ b/install/mysql/testing.sql @@ -16,7 +16,6 @@ INSERT IGNORE INTO `assets` (`id`, `parent_id`, `lft`, `rgt`, `level`, `name`, ` (6, 1, 16, 17, 1, 'com_config', 'com_config', '{}'), (8, 1, 88, 303, 1, 'com_content', 'com_content', '{"core.admin":{"7":1},"core.manage":{"6":1},"core.create":{"3":1},"core.delete":[],"core.edit":{"4":1},"core.edit.state":{"5":1},"core.edit.own":[]}'), (9, 1, 304, 305, 1, 'com_cpanel', 'com_cpanel', '{}'), -(10, 1, 306, 307, 1, 'com_installer', 'com_installer', '{"core.admin":[],"core.manage":{"7":0},"core.delete":{"7":0},"core.edit.state":{"7":0}}'), (11, 1, 308, 309, 1, 'com_languages', 'com_languages', '{"core.admin":{"7":1},"core.manage":[],"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}'), (12, 1, 310, 311, 1, 'com_login', 'com_login', '{}'), (15, 1, 316, 317, 1, 'com_media', 'com_media', '{"core.admin":{"7":1},"core.manage":{"6":1},"core.create":{"3":1},"core.delete":{"5":1},"core.edit":[],"core.edit.state":[]}'), diff --git a/tests/system/resetdb.sql b/tests/system/resetdb.sql index 154b4530b5..a55c77047c 100644 --- a/tests/system/resetdb.sql +++ b/tests/system/resetdb.sql @@ -202,7 +202,6 @@ INSERT INTO `jos_components` (`id`, `name`, `link`, `menuid`, `parent`, `admin_m (19, 'Media Manager', '', 0, 0, 'option=com_media', 'Media Manager', 'com_media', 0, '', 1, 'upload_extensions=bmp,csv,doc,epg,gif,ico,jpg,odg,odp,ods,odt,pdf,png,ppt,swf,txt,xcf,xls,BMP,CSV,DOC,EPG,GIF,ICO,JPG,ODG,ODP,ODS,ODT,PDF,PNG,PPT,SWF,TXT,XCF,XLS\nupload_maxsize=10485760\nfile_path=images\nimage_path=images/stories\nrestrict_uploads=1\ncheck_mime=1\nimage_extensions=bmp,gif,jpg,png\nignore_extensions=\nupload_mime=image/jpeg,image/gif,image/png,image/bmp,application/x-shockwave-flash,application/msword,application/excel,application/pdf,application/powerpoint,text/plain,application/x-zip\nupload_mime_illegal=text/html', 1), (20, 'Articles', 'option=com_content', 0, 0, '', '', 'com_content', 0, '', 1, 'show_noauth=0\nshow_title=1\nlink_titles=0\nshow_intro=1\nshow_section=0\nlink_section=0\nshow_category=0\nlink_category=0\nshow_author=1\nshow_create_date=1\nshow_modify_date=1\nshow_item_navigation=0\nshow_readmore=1\nshow_vote=0\nshow_icons=1\nshow_pdf_icon=1\nshow_print_icon=1\nshow_email_icon=1\nshow_hits=1\nfeed_summary=0\n\n', 1), (21, 'Configuration Manager', '', 0, 0, '', 'Configuration', 'com_config', 0, '', 1, '', 1), -(22, 'Installation Manager', '', 0, 0, '', 'Installer', 'com_installer', 0, '', 1, '', 1), (23, 'Language Manager', '', 0, 0, '', 'Languages', 'com_languages', 0, '', 1, 'administrator=en-GB\nsite=en-GB', 1), (25, 'Menu Editor', '', 0, 0, '', 'Menu Editor', 'com_menus', 0, '', 1, '', 1), (28, 'Modules Manager', '', 0, 0, '', 'Modules', 'com_modules', 0, '', 1, '', 1), diff --git a/tests/system/suite/acl/acl0001Test.php b/tests/system/suite/acl/acl0001Test.php index e960f89aa4..df382a92df 100644 --- a/tests/system/suite/acl/acl0001Test.php +++ b/tests/system/suite/acl/acl0001Test.php @@ -22,8 +22,6 @@ function testAclGroupCreation() $this->assertTrue($this->isElementPresent("//ul[@id='menu-com-menus-menus']"), 'Menus should be visible'); - $this->assertTrue($this->isElementPresent("//a[@href='index.php?option=com_installer']"), 'Extensions should be visible'); - $this->assertTrue($this->isElementPresent("//ul[@id='menu-com-menus-menus']"), 'Menu Manager should not be visible'); $this->assertTrue($this->isElementPresent("//a[@href='index.php?option=com_modules']"), 'Module Manager should not be visible'); diff --git a/tests/system/webdriver/Pages/System/AdminPage.php b/tests/system/webdriver/Pages/System/AdminPage.php index 94d23f757f..c18bb44378 100644 --- a/tests/system/webdriver/Pages/System/AdminPage.php +++ b/tests/system/webdriver/Pages/System/AdminPage.php @@ -110,7 +110,6 @@ abstract class AdminPage 'Links' => 'administrator/index.php?option=com_weblinks', 'Weblinks Categories' => 'administrator/index.php?option=com_categories&extension=com_weblinks', 'Extensions' => 'administrator/index.php#', - 'Extension Manager' => 'administrator/index.php?option=com_installer', 'Module Manager' => 'administrator/index.php?option=com_modules', 'Plugin Manager' => 'administrator/index.php?option=com_plugins', 'Template Manager' => 'administrator/index.php?option=com_templates', diff --git a/tests/unit/stubs/database/jos_assets.csv b/tests/unit/stubs/database/jos_assets.csv index 45f715ba15..edda0746c5 100644 --- a/tests/unit/stubs/database/jos_assets.csv +++ b/tests/unit/stubs/database/jos_assets.csv @@ -4,7 +4,6 @@ '6','1','16','17','1','com_config','com_config','{}' '8','1','88','297','1','com_content','com_content','{"core.admin":{"7":1},"core.manage":{"6":1},"core.create":{"3":1},"core.delete":[],"core.edit":{"4":1},"core.edit.state":{"5":1},"core.edit.own":[]}' '9','1','298','299','1','com_cpanel','com_cpanel','{}' -'10','1','300','301','1','com_installer','com_installer','{"core.admin":[],"core.manage":{"7":0},"core.delete":{"7":0},"core.edit.state":{"7":0}}' '11','1','302','303','1','com_languages','com_languages','{"core.admin":{"7":1},"core.manage":[],"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}' '12','1','304','305','1','com_login','com_login','{}' '15','1','310','311','1','com_media','com_media','{"core.admin":{"7":1},"core.manage":{"6":1},"core.create":{"3":1},"core.delete":{"5":1},"core.edit":[],"core.edit.state":[]}' diff --git a/tests/unit/stubs/database/jos_extensions.csv b/tests/unit/stubs/database/jos_extensions.csv index fc820e4d7e..13aec425bc 100644 --- a/tests/unit/stubs/database/jos_extensions.csv +++ b/tests/unit/stubs/database/jos_extensions.csv @@ -2,7 +2,6 @@ '3','com_admin','component','com_admin',,'1','1','1','1','{"name":"com_admin","type":"component","creationDate":"April 2006","author":"Joomla! Project","copyright":"(C) 2005 - 2014 Open Source Matters. All rights reserved.\\n\\t","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"COM_ADMIN_XML_DESCRIPTION","group":""}',,,,'0','0000-00-00 00:00:00','0','0' '6','com_categories','component','com_categories',,'1','1','1','1','{"name":"com_categories","type":"component","creationDate":"December 2007","author":"Joomla! Project","copyright":"(C) 2005 - 2014 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"COM_CATEGORIES_XML_DESCRIPTION","group":""}',,,,'0','0000-00-00 00:00:00','0','0' '9','com_cpanel','component','com_cpanel',,'1','1','1','1','{"name":"com_cpanel","type":"component","creationDate":"April 2006","author":"Joomla! Project","copyright":"(C) 2005 - 2014 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"COM_CPANEL_XML_DESCRIPTION","group":""}',,,,'0','0000-00-00 00:00:00','0','0' -'10','com_installer','component','com_installer',,'1','1','1','1','{"name":"com_installer","type":"component","creationDate":"April 2006","author":"Joomla! Project","copyright":"(C) 2005 - 2014 Open Source Matters. All rights reserved.\\t","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"COM_INSTALLER_XML_DESCRIPTION","group":""}','{}',,,'0','0000-00-00 00:00:00','0','0' '11','com_languages','component','com_languages',,'1','1','1','1','{"name":"com_languages","type":"component","creationDate":"2006","author":"Joomla! Project","copyright":"(C) 2005 - 2014 Open Source Matters. All rights reserved.\\n\\t","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"COM_LANGUAGES_XML_DESCRIPTION","group":""}','{"administrator":"en-GB","site":"en-GB"}',,,'0','0000-00-00 00:00:00','0','0' '12','com_login','component','com_login',,'1','1','1','1','{"name":"com_login","type":"component","creationDate":"April 2006","author":"Joomla! Project","copyright":"(C) 2005 - 2014 Open Source Matters. All rights reserved.\\t","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"COM_LOGIN_XML_DESCRIPTION","group":""}',,,,'0','0000-00-00 00:00:00','0','0' '13','com_media','component','com_media',,'1','1','0','1','{"name":"com_media","type":"component","creationDate":"April 2006","author":"Joomla! Project","copyright":"(C) 2005 - 2014 Open Source Matters. All rights reserved.\\t","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"COM_MEDIA_XML_DESCRIPTION","group":""}','{"upload_extensions":"bmp,csv,doc,gif,ico,jpg,jpeg,odg,odp,ods,odt,pdf,png,ppt,swf,txt,xcf,xls,BMP,CSV,DOC,GIF,ICO,JPG,JPEG,ODG,ODP,ODS,ODT,PDF,PNG,PPT,SWF,TXT,XCF,XLS","upload_maxsize":"10","file_path":"images","image_path":"images","restrict_uploads":"1","allowed_media_usergroup":"3","check_mime":"1","image_extensions":"bmp,gif,jpg,png","ignore_extensions":"","upload_mime":"image\\/jpeg,image\\/gif,image\\/png,image\\/bmp,application\\/x-shockwave-flash,application\\/msword,application\\/excel,application\\/pdf,application\\/powerpoint,text\\/plain,application\\/x-zip","upload_mime_illegal":"text\\/html"}',,,'0','0000-00-00 00:00:00','0','0' diff --git a/tests/unit/suites/libraries/cms/html/JHtmlIconsTest.php b/tests/unit/suites/libraries/cms/html/JHtmlIconsTest.php index 9722f9c423..0161ae2f41 100644 --- a/tests/unit/suites/libraries/cms/html/JHtmlIconsTest.php +++ b/tests/unit/suites/libraries/cms/html/JHtmlIconsTest.php @@ -66,13 +66,6 @@ public function testButtons() 'icon' => 'header/icon-48-article-add.png', 'text' => JText::_('MOD_QUICKICON_ADD_NEW_ARTICLE'), ), - array( - 'link' => JRoute::_('index.php?option=com_installer'), - 'image' => 'puzzle', - 'icon' => 'header/icon-48-extension.png', - 'text' => JText::_('MOD_QUICKICON_EXTENSION_MANAGER'), - 'access' => false - ), array( 'link' => JRoute::_('index.php?option=com_templates'), 'image' => 'eye', diff --git a/tests/unit/suites/libraries/joomla/utilities/stubs/test.xml b/tests/unit/suites/libraries/joomla/utilities/stubs/test.xml index f2cf1f0bb2..2b005f2339 100644 --- a/tests/unit/suites/libraries/joomla/utilities/stubs/test.xml +++ b/tests/unit/suites/libraries/joomla/utilities/stubs/test.xml @@ -59,16 +59,6 @@ com_cpanel {} - - 10 - 1 - 36 - 37 - 1 - com_installer - com_installer - {"core.admin":{"7":1},"core.manage":{"7":1},"core.create":[],"core.delete":[],"core.edit.state":[]} - 11 1 @@ -357,25 +347,6 @@ 0 0 - - 10 - Installation Manager - component - com_installer - - 1 - 1 - 1 - 0 - - - - - 0 - 0000-00-00 00:00:00 - 0 - 0 - 11 Language Manager diff --git a/web/media/system/js/core-uncompressed.js b/web/media/system/js/core-uncompressed.js index bca7614d63..5b888c05cd 100644 --- a/web/media/system/js/core-uncompressed.js +++ b/web/media/system/js/core-uncompressed.js @@ -161,9 +161,7 @@ Joomla.removeMessages = function() { } /** - * USED IN: administrator/components/com_cache/views/cache/tmpl/default.php - * administrator/components/com_installer/views/discover/tmpl/default_item.php - * administrator/components/com_installer/views/update/tmpl/default_item.php + * USED IN: * administrator/components/com_languages/helpers/html/languages.php * libraries/joomla/html/html/grid.php *