diff --git a/administrator/components/com_admin/models/forms/profile.xml b/administrator/components/com_admin/models/forms/profile.xml index f665004d4fbe7..6bc3ac83bd4c2 100644 --- a/administrator/components/com_admin/models/forms/profile.xml +++ b/administrator/components/com_admin/models/forms/profile.xml @@ -84,7 +84,7 @@ function_exists('zip_open') && function_exists('zip_read'), 'mbstring' => extension_loaded('mbstring'), 'iconv' => function_exists('iconv'), - 'mcrypt' => extension_loaded('mcrypt'), 'max_input_vars' => ini_get('max_input_vars'), ); diff --git a/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-01.sql b/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-01.sql index ef2951ee7e976..843ab1256a981 100644 --- a/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-01.sql +++ b/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-01.sql @@ -16,6 +16,7 @@ ALTER TABLE `#__banners` DROP KEY `idx_metakey_prefix`; ALTER TABLE `#__banner_clients` DROP KEY `idx_metakey_prefix`; ALTER TABLE `#__categories` DROP KEY `idx_path`; ALTER TABLE `#__categories` DROP KEY `idx_alias`; +ALTER TABLE `#__content` DROP KEY `idx_alias`; ALTER TABLE `#__content_types` DROP KEY `idx_alias`; ALTER TABLE `#__fields` DROP KEY `idx_context`; ALTER TABLE `#__fields_groups` DROP KEY `idx_context`; diff --git a/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-02.sql b/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-02.sql index 699b6ed5454be..4f63f989f60dc 100644 --- a/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-02.sql +++ b/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-02.sql @@ -224,6 +224,7 @@ ALTER TABLE `#__banners` ADD KEY `idx_metakey_prefix` (`metakey_prefix`(100)); ALTER TABLE `#__banner_clients` ADD KEY `idx_metakey_prefix` (`metakey_prefix`(100)); ALTER TABLE `#__categories` ADD KEY `idx_path` (`path`(100)); ALTER TABLE `#__categories` ADD KEY `idx_alias` (`alias`(100)); +ALTER TABLE `#__content` ADD KEY `idx_alias` (`alias`(191)); ALTER TABLE `#__content_types` ADD KEY `idx_alias` (`type_alias`(100)); ALTER TABLE `#__fields` ADD KEY `idx_context` (`context`(191)); ALTER TABLE `#__fields_groups` ADD KEY `idx_context` (`context`(191)); diff --git a/administrator/components/com_admin/sql/updates/mysql/3.8.2-2017-10-14.sql b/administrator/components/com_admin/sql/updates/mysql/3.8.2-2017-10-14.sql new file mode 100644 index 0000000000000..d379ef208d611 --- /dev/null +++ b/administrator/components/com_admin/sql/updates/mysql/3.8.2-2017-10-14.sql @@ -0,0 +1,5 @@ +-- +-- Add index for alias check #__content +-- + +ALTER TABLE `#__content` ADD INDEX `idx_alias` (`alias`(191)); diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.8.2-2017-10-14.sql b/administrator/components/com_admin/sql/updates/postgresql/3.8.2-2017-10-14.sql new file mode 100644 index 0000000000000..f7183db8bd2a3 --- /dev/null +++ b/administrator/components/com_admin/sql/updates/postgresql/3.8.2-2017-10-14.sql @@ -0,0 +1,5 @@ +-- +-- Add index for alias check #__content +-- + +CREATE INDEX "#__content_idx_alias" ON "#__content" ("alias"); diff --git a/administrator/components/com_admin/sql/updates/sqlazure/3.8.2-2017-10-14.sql b/administrator/components/com_admin/sql/updates/sqlazure/3.8.2-2017-10-14.sql new file mode 100644 index 0000000000000..72df8133711c1 --- /dev/null +++ b/administrator/components/com_admin/sql/updates/sqlazure/3.8.2-2017-10-14.sql @@ -0,0 +1,8 @@ +-- +-- Add index for alias check #__content +-- + +CREATE NONCLUSTERED INDEX [idx_alias] ON [#__content] +( + [alias] ASC +)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF); diff --git a/administrator/components/com_admin/views/help/tmpl/default.php b/administrator/components/com_admin/views/help/tmpl/default.php index 35b6122941db2..e8a5a790bc898 100644 --- a/administrator/components/com_admin/views/help/tmpl/default.php +++ b/administrator/components/com_admin/views/help/tmpl/default.php @@ -21,7 +21,7 @@
  • latest_version_check, JText::_('COM_ADMIN_LATEST_VERSION_CHECK'), array('target' => 'helpFrame')); ?>
  • 'helpFrame')); ?>
  • 'helpFrame')); ?>
    • -
    +
    • toc as $k => $v) : ?>
  • @@ -33,7 +33,7 @@
    - +
    diff --git a/administrator/components/com_admin/views/sysinfo/tmpl/default_phpsettings.php b/administrator/components/com_admin/views/sysinfo/tmpl/default_phpsettings.php index d17f2869a1ac0..17f58072c65e5 100644 --- a/administrator/components/com_admin/views/sysinfo/tmpl/default_phpsettings.php +++ b/administrator/components/com_admin/views/sysinfo/tmpl/default_phpsettings.php @@ -157,14 +157,6 @@ php_settings['iconv']); ?> - - - - - - php_settings['mcrypt']); ?> - - diff --git a/administrator/components/com_admin/views/sysinfo/view.html.php b/administrator/components/com_admin/views/sysinfo/view.html.php index 9162b2d65f83e..0912ead3f2596 100644 --- a/administrator/components/com_admin/views/sysinfo/view.html.php +++ b/administrator/components/com_admin/views/sysinfo/view.html.php @@ -92,7 +92,7 @@ public function display($tpl = null) * * @since 1.6 * @note Necessary for Hathor compatibility - * @deprecated 4.0 To be removed with Hathor + * @deprecated 4.0 To be removed with Hathor */ protected function _setSubMenu() { diff --git a/administrator/components/com_associations/helpers/associations.php b/administrator/components/com_associations/helpers/associations.php index 38b9193b8a2cf..f9d957c8347b3 100644 --- a/administrator/components/com_associations/helpers/associations.php +++ b/administrator/components/com_associations/helpers/associations.php @@ -10,6 +10,7 @@ defined('_JEXEC') or die; use Joomla\Registry\Registry; +use Joomla\CMS\Language\LanguageHelper; /** * Associations component helper. @@ -177,7 +178,7 @@ public static function getAssociationHtmlList($extensionName, $typeName, $itemId $titleFieldName = self::getTypeFieldName($extensionName, $typeName, 'title'); // Get all content languages. - $languages = self::getContentLanguages(); + $languages = LanguageHelper::getContentLanguages(array(0, 1)); $canEditReference = self::allowEdit($extensionName, $typeName, $itemId); $canCreate = self::allowAdd($extensionName, $typeName); @@ -444,18 +445,7 @@ private static function getEnabledExtensions() */ public static function getContentLanguages() { - $db = JFactory::getDbo(); - - // Get all content languages. - $query = $db->getQuery(true) - ->select($db->quoteName(array('sef', 'lang_code', 'image', 'title', 'published'))) - ->from($db->quoteName('#__languages')) - ->where($db->quoteName('published') . ' != -2') - ->order($db->quoteName('ordering') . ' ASC'); - - $db->setQuery($query); - - return $db->loadObjectList('lang_code'); + return LanguageHelper::getContentLanguages(array(0, 1)); } /** diff --git a/administrator/components/com_associations/models/fields/itemlanguage.php b/administrator/components/com_associations/models/fields/itemlanguage.php index 459a91a7c2c6f..d7e9566fccf66 100644 --- a/administrator/components/com_associations/models/fields/itemlanguage.php +++ b/administrator/components/com_associations/models/fields/itemlanguage.php @@ -10,6 +10,7 @@ defined('JPATH_BASE') or die; use Joomla\Utilities\ArrayHelper; +use Joomla\CMS\Language\LanguageHelper; JLoader::register('AssociationsHelper', JPATH_ADMINISTRATOR . '/components/com_associations/helpers/associations.php'); JFormHelper::loadFieldClass('list'); @@ -57,7 +58,7 @@ protected function getOptions() $canCreate = AssociationsHelper::allowAdd($extensionName, $typeName); // Gets existing languages. - $existingLanguages = AssociationsHelper::getContentLanguages(); + $existingLanguages = LanguageHelper::getContentLanguages(array(0, 1)); $options = array(); diff --git a/administrator/components/com_associations/models/fields/itemtype.php b/administrator/components/com_associations/models/fields/itemtype.php index 6ec671a3ec042..7d80c39a60502 100644 --- a/administrator/components/com_associations/models/fields/itemtype.php +++ b/administrator/components/com_associations/models/fields/itemtype.php @@ -26,7 +26,7 @@ class JFormFieldItemType extends JFormFieldGroupedList * @since 3.7.0 */ protected $type = 'ItemType'; - + /** * Method to get the field input markup. * diff --git a/administrator/components/com_associations/models/fields/modalassociation.php b/administrator/components/com_associations/models/fields/modalassociation.php index 5f2278dc70b5f..aac8dfa8da147 100644 --- a/administrator/components/com_associations/models/fields/modalassociation.php +++ b/administrator/components/com_associations/models/fields/modalassociation.php @@ -75,11 +75,11 @@ protected function getInput() // Clear association button $html[] = '' - . '' . JText::_('JCLEAR') - . ''; + . ' class="btn' . ($value ? '' : ' hidden') . '"' + . ' onclick="return Joomla.submitbutton(\'undo-association\');"' + . ' id="remove-assoc">' + . '' . JText::_('JCLEAR') + . ''; $html[] = ''; diff --git a/administrator/components/com_associations/views/association/tmpl/edit.php b/administrator/components/com_associations/views/association/tmpl/edit.php index d4e6b689a5c78..efb74ba184d55 100644 --- a/administrator/components/com_associations/views/association/tmpl/edit.php +++ b/administrator/components/com_associations/views/association/tmpl/edit.php @@ -32,7 +32,7 @@

    - "); + + $("#moduleEditModal").modal() + .find(".modal-body").empty().prepend(iFrame); + }) + .on("click", "#moduleEditModal .modal-footer .btn", function () { + var target = $(this).data("target"); + + if (target) { + $("#moduleEditModal iframe").contents().find(target).click(); + } + }); }); '); + JFactory::getDocument()->addStyleDeclaration(' ul.horizontal-buttons li { display: inline-block; padding-right: 10%; } '); + +// Set up the bootstrap modal that will be used for all module editors +echo JHtml::_( + 'bootstrap.renderModal', + 'moduleEditModal', + array( + 'title' => JText::_('COM_MENUS_EDIT_MODULE_SETTINGS'), + 'backdrop' => 'static', + 'keyboard' => false, + 'closeButton' => false, + 'bodyHeight' => '70', + 'modalWidth' => '80', + 'footer' => '' + . '' + . '', + ) +); + ?> - id . '&tmpl=component&view=module&layout=modal'; ?> - + escape($module->title); ?> @@ -131,30 +175,6 @@ - id . 'Modal', - array( - 'title' => JText::_('COM_MENUS_EDIT_MODULE_SETTINGS'), - 'backdrop' => 'static', - 'keyboard' => false, - 'closeButton' => false, - 'url' => $link, - 'height' => '400px', - 'width' => '800px', - 'bodyHeight' => '70', - 'modalWidth' => '80', - 'footer' => '' - . '' - . '', - ) - ); ?> diff --git a/administrator/components/com_menus/views/items/tmpl/modal.php b/administrator/components/com_menus/views/items/tmpl/modal.php index 1dd2ca38ab0f2..f09e20006347e 100644 --- a/administrator/components/com_menus/views/items/tmpl/modal.php +++ b/administrator/components/com_menus/views/items/tmpl/modal.php @@ -22,6 +22,7 @@ JHtml::_('behavior.polyfill', array('event'), 'lt IE 9'); JHtml::_('script', 'com_menus/admin-items-modal.min.js', array('version' => 'auto', 'relative' => true)); JHtml::_('bootstrap.tooltip', '.hasTooltip', array('placement' => 'bottom')); +JHtml::_('bootstrap.popover', '.hasPopover', array('placement' => 'bottom')); JHtml::_('formbehavior.chosen', 'select'); // Special case for the search field tooltip. @@ -32,17 +33,19 @@ $editor = $app->input->getCmd('editor', ''); $listOrder = $this->escape($this->state->get('list.ordering')); $listDirn = $this->escape($this->state->get('list.direction')); +$link = 'index.php?option=com_menus&view=items&layout=modal&tmpl=component&' . JSession::getFormToken() . '=1'; if (!empty($editor)) { // This view is used also in com_menus. Load the xtd script only if the editor is set! JFactory::getDocument()->addScriptOptions('xtd-menus', array('editor' => $editor)); $onclick = "jSelectMenuItem"; + $link = 'index.php?option=com_menus&view=items&layout=modal&tmpl=component&editor=' . $editor . '&' . JSession::getFormToken() . '=1'; } ?>
    -
    + $this)); ?> diff --git a/administrator/components/com_menus/views/items/view.html.php b/administrator/components/com_menus/views/items/view.html.php index 281c12f6d99e1..2506f16df052b 100644 --- a/administrator/components/com_menus/views/items/view.html.php +++ b/administrator/components/com_menus/views/items/view.html.php @@ -189,8 +189,8 @@ public function display($tpl = null) { $titleParts[] = $vars['view']; } - } + $value = implode(' » ', $titleParts); } else diff --git a/administrator/components/com_menus/views/menus/tmpl/default.php b/administrator/components/com_menus/views/menus/tmpl/default.php index 5674423bce40d..d25d5fad4eec6 100644 --- a/administrator/components/com_menus/views/menus/tmpl/default.php +++ b/administrator/components/com_menus/views/menus/tmpl/default.php @@ -176,7 +176,7 @@ escape($module->title), $this->escape($module->access_title), $this->escape($module->position)); ?> - escape($module->title), $this->escape($module->access_title), $this->escape($module->position)); ?> + escape($module->title), $this->escape($module->access_title), $this->escape($module->position)); ?>
    • diff --git a/administrator/components/com_messages/models/forms/config.xml b/administrator/components/com_messages/models/forms/config.xml index a890efa2894a0..3f162a72065f4 100644 --- a/administrator/components/com_messages/models/forms/config.xml +++ b/administrator/components/com_messages/models/forms/config.xml @@ -27,7 +27,7 @@ get('Errors'))) { JError::raiseError(500, implode("\n", $errors)); + return false; } diff --git a/administrator/components/com_modules/controller.php b/administrator/components/com_modules/controller.php index a0f5864c8d9f8..68717d4a901bd 100644 --- a/administrator/components/com_modules/controller.php +++ b/administrator/components/com_modules/controller.php @@ -35,7 +35,6 @@ public function display($cachable = false, $urlparams = false) // For JSON requests if ($document->getType() == 'json') { - $view = new ModulesViewModule; // Get/Create the model @@ -45,6 +44,7 @@ public function display($cachable = false, $urlparams = false) if (!$model->checkout($id)) { JFactory::getApplication()->enqueueMessage(JText::_('JLIB_APPLICATION_ERROR_CHECKIN_USER_MISMATCH'), 'error'); + return false; } diff --git a/administrator/components/com_modules/controllers/module.php b/administrator/components/com_modules/controllers/module.php index 951f145fcf00e..993bf6345d311 100644 --- a/administrator/components/com_modules/controllers/module.php +++ b/administrator/components/com_modules/controllers/module.php @@ -226,7 +226,6 @@ public function save($key = null, $urlVar = null) // Add path of forms directory JForm::addFormPath(JPATH_ADMINISTRATOR . '/components/com_modules/models/forms'); - } parent::save($key, $urlVar); diff --git a/administrator/components/com_modules/models/forms/module.xml b/administrator/components/com_modules/models/forms/module.xml index d138f0f676ad0..ea43b185fa831 100644 --- a/administrator/components/com_modules/models/forms/module.xml +++ b/administrator/components/com_modules/models/forms/module.xml @@ -3,7 +3,7 @@
    params)) { - // This allows us to inject parameter settings into a new module. $params = $app->getUserState('com_modules.add.module.params'); diff --git a/administrator/components/com_modules/models/modules.php b/administrator/components/com_modules/models/modules.php index db6f4604dd04f..a78ccf0e22c58 100644 --- a/administrator/components/com_modules/models/modules.php +++ b/administrator/components/com_modules/models/modules.php @@ -182,6 +182,7 @@ protected function _getList($query, $limitstart = 0, $limit = 0) // Process pagination. $total = count($result); $this->cache[$this->getStoreId('getTotal')] = $total; + if ($total < $limitstart) { $limitstart = 0; @@ -303,15 +304,25 @@ protected function getListQuery() // Group (careful with PostgreSQL) $query->group( - 'a.id, a.title, a.note, a.position, a.module, a.language, a.checked_out, ' . - 'a.checked_out_time, a.published, a.access, a.ordering, l.title, l.image, uc.name, ag.title, e.name, ' . - 'l.lang_code, uc.id, ag.id, mm.moduleid, e.element, a.publish_up, a.publish_down, e.enabled' - ); + 'a.id, a.title, a.note, a.position, a.module, a.language, a.checked_out, ' + . 'a.checked_out_time, a.published, a.access, a.ordering, l.title, l.image, uc.name, ag.title, e.name, ' + . 'l.lang_code, uc.id, ag.id, mm.moduleid, e.element, a.publish_up, a.publish_down, e.enabled' + ); // Filter by client. $clientId = $this->getState('client_id'); $query->where($db->quoteName('a.client_id') . ' = ' . (int) $clientId . ' AND ' . $db->quoteName('e.client_id') . ' = ' . (int) $clientId); + // Filter by current user access level. + $user = JFactory::getUser(); + + // Get the current user for authorisation checks + if ($user->authorise('core.admin') !== true) + { + $groups = implode(',', $user->getAuthorisedViewLevels()); + $query->where('a.access IN (' . $groups . ')'); + } + // Filter by access level. if ($access = $this->getState('filter.access')) { @@ -320,6 +331,7 @@ protected function getListQuery() // Filter by published state. $state = $this->getState('filter.state'); + if (is_numeric($state)) { $query->where($db->quoteName('a.published') . ' = ' . (int) $state); @@ -375,12 +387,14 @@ protected function getListQuery() (' . $subQuery1 . ') = 0 OR ((' . $subQuery1 . ') > 0 AND ' . $db->quoteName('a.id') . ' IN (' . $subQuery2 . ')) OR ((' . $subQuery1 . ') < 0 AND ' . $db->quoteName('a.id') . ' NOT IN (' . $subQuery3 . ')) - )'); + )' + ); } } // Filter by search in title or note or id:. $search = $this->getState('filter.search'); + if (!empty($search)) { if (stripos($search, 'id:') === 0) diff --git a/administrator/components/com_modules/views/modules/tmpl/modal.php b/administrator/components/com_modules/views/modules/tmpl/modal.php index 81784671ba6b4..dd602403bb041 100644 --- a/administrator/components/com_modules/views/modules/tmpl/modal.php +++ b/administrator/components/com_modules/views/modules/tmpl/modal.php @@ -17,6 +17,7 @@ // Load needed scripts JHtml::_('behavior.core'); JHtml::_('bootstrap.tooltip', '.hasTooltip', array('placement' => 'bottom')); +JHtml::_('bootstrap.popover', '.hasPopover', array('placement' => 'bottom')); JHtml::_('formbehavior.chosen', 'select'); // Scripts for the modules xtd-button diff --git a/administrator/components/com_modules/views/positions/view.html.php b/administrator/components/com_modules/views/positions/view.html.php index e1ec5c185b1f5..5dbb7b6b10c61 100644 --- a/administrator/components/com_modules/views/positions/view.html.php +++ b/administrator/components/com_modules/views/positions/view.html.php @@ -13,7 +13,7 @@ /** * View Module positions class. - * + * * @since 1.6 */ class ModulesViewPositions extends JViewLegacy diff --git a/administrator/components/com_newsfeeds/config.xml b/administrator/components/com_newsfeeds/config.xml index 5f2dcd16ec6cc..3e0b074a8ad3d 100644 --- a/administrator/components/com_newsfeeds/config.xml +++ b/administrator/components/com_newsfeeds/config.xml @@ -31,7 +31,7 @@ itemTypes)) { - switch ($typeName) { case 'newsfeed': diff --git a/administrator/components/com_newsfeeds/helpers/newsfeeds.php b/administrator/components/com_newsfeeds/helpers/newsfeeds.php index b3ed33cd18ca7..e6d21697b4332 100644 --- a/administrator/components/com_newsfeeds/helpers/newsfeeds.php +++ b/administrator/components/com_newsfeeds/helpers/newsfeeds.php @@ -109,11 +109,14 @@ public static function countTagItems(&$items, $extension) $db = JFactory::getDbo(); $parts = explode('.', $extension); $section = null; + if (count($parts) > 1) { $section = $parts[1]; } + $join = $db->qn('#__newsfeeds') . ' AS c ON ct.content_item_id=c.id'; + if ($section === 'category') { $join = $db->qn('#__categories') . ' AS c ON ct.content_item_id=c.id'; @@ -161,5 +164,5 @@ public static function countTagItems(&$items, $extension) } return $items; - } + } } diff --git a/administrator/components/com_newsfeeds/models/fields/modal/newsfeed.php b/administrator/components/com_newsfeeds/models/fields/modal/newsfeed.php index 04b2b7aba4740..b01596376f6e1 100644 --- a/administrator/components/com_newsfeeds/models/fields/modal/newsfeed.php +++ b/administrator/components/com_newsfeeds/models/fields/modal/newsfeed.php @@ -67,7 +67,8 @@ protected function getInput() function jSelectNewsfeed_" . $this->id . "(id, title, object) { window.processModalSelect('Newsfeed', '" . $this->id . "', id, title, '', object); } - "); + " + ); $scriptSelect[$this->id] = true; } diff --git a/administrator/components/com_newsfeeds/models/forms/newsfeed.xml b/administrator/components/com_newsfeeds/models/forms/newsfeed.xml index a0e2f1b9392fc..db1acff4fceb3 100644 --- a/administrator/components/com_newsfeeds/models/forms/newsfeed.xml +++ b/administrator/components/com_newsfeeds/models/forms/newsfeed.xml @@ -5,7 +5,7 @@ table->check()) { $this->setError($this->table->getError()); + return false; } @@ -121,6 +122,7 @@ protected function batchCopy($value, $pks, $contexts) if (!$this->table->store()) { $this->setError($this->table->getError()); + return false; } @@ -347,6 +349,7 @@ public function save($data) $data['alias'] = ''; } } + $data['published'] = 0; } @@ -486,6 +489,7 @@ protected function getReorderConditions($table) { $condition = array(); $condition[] = 'catid = ' . (int) $table->catid; + return $condition; } @@ -556,12 +560,14 @@ protected function generateNewTitle($category_id, $alias, $name) { // Alter the title & alias $table = $this->getTable(); + while ($table->load(array('alias' => $alias, 'catid' => $category_id))) { if ($name == $table->name) { $name = StringHelper::increment($name); } + $alias = StringHelper::increment($alias, 'dash'); } @@ -571,7 +577,7 @@ protected function generateNewTitle($category_id, $alias, $name) /** * Is the user allowed to create an on the fly category? * - * @return bool + * @return boolean * * @since 3.6.1 */ diff --git a/administrator/components/com_newsfeeds/models/newsfeeds.php b/administrator/components/com_newsfeeds/models/newsfeeds.php index 06348ee0ce4f3..4121ce897a29a 100644 --- a/administrator/components/com_newsfeeds/models/newsfeeds.php +++ b/administrator/components/com_newsfeeds/models/newsfeeds.php @@ -50,6 +50,7 @@ public function __construct($config = array()) ); $assoc = JLanguageAssociations::isEnabled(); + if ($assoc) { $config['filter_fields'][] = 'association'; @@ -263,6 +264,7 @@ protected function getListQuery() { ArrayHelper::toInteger($tagId); $tagId = implode(',', $tagId); + if (!empty($tagId)) { $hasTag = true; diff --git a/administrator/components/com_newsfeeds/tables/newsfeed.php b/administrator/components/com_newsfeeds/tables/newsfeed.php index 49188b94f4dfe..7080f924fc024 100644 --- a/administrator/components/com_newsfeeds/tables/newsfeed.php +++ b/administrator/components/com_newsfeeds/tables/newsfeed.php @@ -50,6 +50,7 @@ public function check() if (trim($this->name) == '') { $this->setError(JText::_('COM_NEWSFEEDS_WARNING_PROVIDE_VALID_NAME')); + return false; } @@ -146,6 +147,7 @@ public function store($updateNulls = false) $this->created_by = $user->get('id'); } } + // Verify that the alias is unique $table = JTable::getInstance('Newsfeed', 'NewsfeedsTable'); diff --git a/administrator/components/com_newsfeeds/views/newsfeed/view.html.php b/administrator/components/com_newsfeeds/views/newsfeed/view.html.php index 92ef8e2ae053d..c0c97748690d7 100644 --- a/administrator/components/com_newsfeeds/views/newsfeed/view.html.php +++ b/administrator/components/com_newsfeeds/views/newsfeed/view.html.php @@ -105,10 +105,12 @@ protected function addToolbar() JToolbarHelper::apply('newsfeed.apply'); JToolbarHelper::save('newsfeed.save'); } + if (!$checkedOut && count($user->getAuthorisedCategories('com_newsfeeds', 'core.create')) > 0) { JToolbarHelper::save2new('newsfeed.save2new'); } + // If an existing item, can save to a copy. if (!$isNew && $canDo->get('core.create')) { diff --git a/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/modal.php b/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/modal.php index 10ab99a55d9d7..7a695bf62f2b4 100644 --- a/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/modal.php +++ b/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/modal.php @@ -15,6 +15,7 @@ JHtml::_('behavior.core'); JHtml::_('bootstrap.tooltip', '.hasTooltip', array('placement' => 'bottom')); +JHtml::_('bootstrap.popover', '.hasPopover', array('placement' => 'bottom')); JHtml::_('formbehavior.chosen', 'select'); // Special case for the search field tooltip. diff --git a/administrator/components/com_newsfeeds/views/newsfeeds/view.html.php b/administrator/components/com_newsfeeds/views/newsfeeds/view.html.php index 024bd78d27b74..a0b53863a913f 100644 --- a/administrator/components/com_newsfeeds/views/newsfeeds/view.html.php +++ b/administrator/components/com_newsfeeds/views/newsfeeds/view.html.php @@ -67,6 +67,7 @@ public function display($tpl = null) if (count($errors = $this->get('Errors'))) { JError::raiseError(500, implode("\n", $errors)); + return false; } diff --git a/administrator/components/com_plugins/views/plugin/tmpl/edit.php b/administrator/components/com_plugins/views/plugin/tmpl/edit.php index 9303541c98ae3..afdc6a6bbfa03 100644 --- a/administrator/components/com_plugins/views/plugin/tmpl/edit.php +++ b/administrator/components/com_plugins/views/plugin/tmpl/edit.php @@ -17,22 +17,30 @@ JHtml::_('bootstrap.tooltip'); $this->fieldsets = $this->form->getFieldsets('params'); +$input = JFactory::getApplication()->input; + +// In case of modal +$isModal = $input->get('layout') === 'modal' ? true : false; +$layout = $isModal ? 'modal' : 'edit'; +$tmpl = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=component' : ''; + JFactory::getDocument()->addScriptDeclaration(" - Joomla.submitbutton = function(task) - { - if (task == 'plugin.cancel' || document.formvalidator.isValid(document.getElementById('style-form'))) { + Joomla.submitbutton = function(task) { + if (task === 'plugin.cancel' || document.formvalidator.isValid(document.getElementById('style-form'))) { Joomla.submitform(task, document.getElementById('style-form')); - } - - if (self !== top) { - window.top.setTimeout('window.parent.location = window.top.location.href', 1000); - window.parent.jQuery('#plugin" . $this->item->extension_id . "Modal').modal('hide'); + + if (task !== 'plugin.apply') { + if (self !== top ) { + window.top.setTimeout('window.parent.location = window.top.location.href', 1000); + window.parent.jQuery('#plugin" . $this->item->extension_id . "Modal').modal('hide'); + } + } } }; "); ?> - +
    'general')); ?> @@ -149,3 +157,4 @@ + diff --git a/administrator/components/com_plugins/views/plugin/tmpl/modal.php b/administrator/components/com_plugins/views/plugin/tmpl/modal.php index 69d18a30cd77f..b8e4f6dcf2355 100644 --- a/administrator/components/com_plugins/views/plugin/tmpl/modal.php +++ b/administrator/components/com_plugins/views/plugin/tmpl/modal.php @@ -18,9 +18,12 @@ }); '); ?> + -setLayout('edit'); -echo $this->loadTemplate(); +
    + setLayout('edit'); ?> + loadTemplate(); ?> +
    + diff --git a/administrator/components/com_redirect/layouts/toolbar/batch.php b/administrator/components/com_redirect/layouts/toolbar/batch.php index 01029f20c9776..dabf6babe5041 100644 --- a/administrator/components/com_redirect/layouts/toolbar/batch.php +++ b/administrator/components/com_redirect/layouts/toolbar/batch.php @@ -15,6 +15,6 @@ ?> diff --git a/administrator/components/com_redirect/models/forms/link.xml b/administrator/components/com_redirect/models/forms/link.xml index c7fd6b46a5585..80d1656a0727e 100644 --- a/administrator/components/com_redirect/models/forms/link.xml +++ b/administrator/components/com_redirect/models/forms/link.xml @@ -3,7 +3,7 @@
    @@ -87,7 +86,7 @@ set($db->quoteName('comment') . ' = ' . $db->quote($comment)); } + $db->setQuery($query); try diff --git a/administrator/components/com_redirect/models/links.php b/administrator/components/com_redirect/models/links.php index f09c7448f2863..25934d98015f5 100644 --- a/administrator/components/com_redirect/models/links.php +++ b/administrator/components/com_redirect/models/links.php @@ -193,7 +193,7 @@ protected function getListQuery() * * @param array $batch_urls Array of URLs to enter into the database * - * @return bool + * @return boolean */ public function batchProcess($batch_urls) { diff --git a/administrator/components/com_redirect/tables/link.php b/administrator/components/com_redirect/tables/link.php index 0f684de30b852..fec737d68869f 100644 --- a/administrator/components/com_redirect/tables/link.php +++ b/administrator/components/com_redirect/tables/link.php @@ -47,6 +47,7 @@ public function check() return false; } + // Check for NOT NULL. if (empty($this->referer)) { diff --git a/administrator/components/com_redirect/views/links/tmpl/default.php b/administrator/components/com_redirect/views/links/tmpl/default.php index 00d0cd09cc137..6e185baa2ce04 100644 --- a/administrator/components/com_redirect/views/links/tmpl/default.php +++ b/administrator/components/com_redirect/views/links/tmpl/default.php @@ -31,12 +31,19 @@ array( 'url' => $link, 'title' => JText::_('COM_REDIRECT_EDIT_PLUGIN_SETTINGS'), - 'height' => '400px', - 'modalWidth' => '60', + 'height' => '400px', + 'width' => '800px', + 'bodyHeight' => '70', + 'modalWidth' => '80', + 'closeButton' => false, + 'backdrop' => 'static', + 'keyboard' => false, 'footer' => '' - . '' + . '' ) ); ?> @@ -162,3 +169,4 @@
    + diff --git a/administrator/components/com_redirect/views/links/view.html.php b/administrator/components/com_redirect/views/links/view.html.php index 2a14dcf10ffc9..ae3f8d3220ce2 100644 --- a/administrator/components/com_redirect/views/links/view.html.php +++ b/administrator/components/com_redirect/views/links/view.html.php @@ -136,7 +136,7 @@ protected function addToolbar() JToolbarHelper::unpublish('links.unpublish', 'JTOOLBAR_DISABLE', true); } - if ($state->get('filter.state') != -1 ) + if ($state->get('filter.state') != -1) { JToolbarHelper::divider(); diff --git a/administrator/components/com_tags/config.xml b/administrator/components/com_tags/config.xml index 3c846ae774c6e..cd7c55ff1e74c 100644 --- a/administrator/components/com_tags/config.xml +++ b/administrator/components/com_tags/config.xml @@ -29,7 +29,7 @@ '); $this->metadesc = StringHelper::str_ireplace($bad_characters, '', $this->metadesc); } + // Not Null sanity check $date = JFactory::getDate(); diff --git a/administrator/components/com_tags/views/tag/view.html.php b/administrator/components/com_tags/views/tag/view.html.php index d0a13d63b430d..cb1889ca3f5c9 100644 --- a/administrator/components/com_tags/views/tag/view.html.php +++ b/administrator/components/com_tags/views/tag/view.html.php @@ -102,7 +102,7 @@ protected function addToolbar() { JToolbarHelper::apply('tag.apply'); JToolbarHelper::save('tag.save'); - + if ($canDo->get('core.create')) { JToolbarHelper::save2new('tag.save2new'); diff --git a/administrator/components/com_tags/views/tags/view.html.php b/administrator/components/com_tags/views/tags/view.html.php index 14d98fdd1852f..440e486fb7832 100644 --- a/administrator/components/com_tags/views/tags/view.html.php +++ b/administrator/components/com_tags/views/tags/view.html.php @@ -69,6 +69,7 @@ public function display($tpl = null) { $this->addToolbar(); } + parent::display($tpl); } diff --git a/administrator/components/com_templates/config.xml b/administrator/components/com_templates/config.xml index 3b7c468b0830f..dbf6c01629694 100644 --- a/administrator/components/com_templates/config.xml +++ b/administrator/components/com_templates/config.xml @@ -19,7 +19,7 @@ getType() == 'json') + if ($document->getType() === 'json') { - $app = JFactory::getApplication(); $lang = JFactory::getLanguage(); $model = $this->getModel(); @@ -68,7 +67,6 @@ public function save($key = null, $urlVar = null) // Access check. if (!$this->allowSave($data, $key)) { - $app->enqueueMessage(JText::_('JLIB_APPLICATION_ERROR_SAVE_NOT_PERMITTED'), 'error'); return false; @@ -153,7 +151,6 @@ public function save($key = null, $urlVar = null) $this->postSaveHook($model, $validData); return true; - } else { diff --git a/administrator/components/com_templates/controllers/template.php b/administrator/components/com_templates/controllers/template.php index 6f707a34c816f..58caba3f1836a 100644 --- a/administrator/components/com_templates/controllers/template.php +++ b/administrator/components/com_templates/controllers/template.php @@ -295,21 +295,19 @@ public function save() // Redirect the user based on the chosen task. switch ($task) { - case 'apply': - - // Redirect back to the edit screen. - $url = 'index.php?option=com_templates&view=template&id=' . $model->getState('extension.id') . '&file=' . $fileName; - $this->setRedirect(JRoute::_($url, false)); - break; - - default: - - // Redirect to the list screen. - $file = base64_encode('home'); - $id = $app->input->get('id'); - $url = 'index.php?option=com_templates&view=template&id=' . $id . '&file=' . $file; - $this->setRedirect(JRoute::_($url, false)); - break; + case 'apply': + // Redirect back to the edit screen. + $url = 'index.php?option=com_templates&view=template&id=' . $model->getState('extension.id') . '&file=' . $fileName; + $this->setRedirect(JRoute::_($url, false)); + break; + + default: + // Redirect to the list screen. + $file = base64_encode('home'); + $id = $app->input->get('id'); + $url = 'index.php?option=com_templates&view=template&id=' . $id . '&file=' . $file; + $this->setRedirect(JRoute::_($url, false)); + break; } } diff --git a/administrator/components/com_templates/models/fields/templatelocation.php b/administrator/components/com_templates/models/fields/templatelocation.php index 8e9777bc02c25..a38fd002011ed 100644 --- a/administrator/components/com_templates/models/fields/templatelocation.php +++ b/administrator/components/com_templates/models/fields/templatelocation.php @@ -14,7 +14,7 @@ JFormHelper::loadFieldClass('list'); /** - * Template Location field. + * Template Location field. * * @since 3.5 */ diff --git a/administrator/components/com_templates/models/forms/style.xml b/administrator/components/com_templates/models/forms/style.xml index 90ed931d373f9..897efc18dcd74 100644 --- a/administrator/components/com_templates/models/forms/style.xml +++ b/administrator/components/com_templates/models/forms/style.xml @@ -3,7 +3,7 @@
    quoteName('a.home') . ' IN (' . $menuItemLanguageSubQuery . ') OR ' . // Custom template styles override (only if assigned to the selected menu item). '(' . $db->quoteName('a.home') . ' = ' . $db->quote(0) . ' AND ' . $menuItemId . ' IN (' . $templateStylesMenuItemsSubQuery . '))' . - ')'); + ')' + ); } } diff --git a/administrator/components/com_templates/models/template.php b/administrator/components/com_templates/models/template.php index d66789aa1d4e1..6e663acc7dbee 100644 --- a/administrator/components/com_templates/models/template.php +++ b/administrator/components/com_templates/models/template.php @@ -441,6 +441,7 @@ public function &getSource() catch (Exception $e) { $app->enqueueMessage(JText::_('COM_TEMPLATES_ERROR_SOURCE_FILE_NOT_FOUND'), 'error'); + return; } @@ -885,6 +886,7 @@ public function createFile($name, $type, $location) return false; } + // Check if the format is allowed and will be showed in the backend $check = $this->checkFormat($type); @@ -1423,14 +1425,14 @@ public function extractArchive($file) } /** - * Check if the extension is allowed and will be shown in the template manager - * - * @param string $ext The extension to check if it is allowed - * - * @return boolean true if the extension is allowed false otherwise - * - * @since 3.6.0 - */ + * Check if the extension is allowed and will be shown in the template manager + * + * @param string $ext The extension to check if it is allowed + * + * @return boolean true if the extension is allowed false otherwise + * + * @since 3.6.0 + */ protected function checkFormat($ext) { if (!isset($this->allowedFormats)) diff --git a/administrator/components/com_templates/views/template/tmpl/default_modal_delete_body.php b/administrator/components/com_templates/views/template/tmpl/default_modal_delete_body.php index d1c6251aae374..9d8af625d5ba9 100644 --- a/administrator/components/com_templates/views/template/tmpl/default_modal_delete_body.php +++ b/administrator/components/com_templates/views/template/tmpl/default_modal_delete_body.php @@ -11,6 +11,6 @@ ?>
    -

    fileName); ?>

    +

    fileName); ?>

    \ No newline at end of file diff --git a/administrator/components/com_templates/views/template/view.html.php b/administrator/components/com_templates/views/template/view.html.php index d3471de5075cf..bed2894a30029 100644 --- a/administrator/components/com_templates/views/template/view.html.php +++ b/administrator/components/com_templates/views/template/view.html.php @@ -1,19 +1,19 @@ $pk) { diff --git a/administrator/components/com_users/models/user.php b/administrator/components/com_users/models/user.php index aa7cc87572d42..db59dd5c9df40 100644 --- a/administrator/components/com_users/models/user.php +++ b/administrator/components/com_users/models/user.php @@ -113,7 +113,7 @@ public function getItem($pk = null) public function getForm($data = array(), $loadData = true) { $pluginParams = new Registry; - + if (JPluginHelper::isEnabled('user', 'joomla')) { $plugin = JPluginHelper::getPlugin('user', 'joomla'); diff --git a/administrator/components/com_users/views/users/tmpl/default_batch_body.php b/administrator/components/com_users/views/users/tmpl/default_batch_body.php index ab6adc13ae1bb..71d4ad04fdef0 100644 --- a/administrator/components/com_users/views/users/tmpl/default_batch_body.php +++ b/administrator/components/com_users/views/users/tmpl/default_batch_body.php @@ -26,21 +26,21 @@
    -
    -
    @@ -189,7 +187,7 @@ getAuthorisedViewLevels(); if ($this->maxLevel != 0 && count($this->children[$this->category->id]) > 0) : ?> children[$this->category->id] as $id => $child) : ?> - params->get('show_empty_categories') || $child->numitems || count($child->getChildren())) : - if (!isset($this->children[$this->category->id][$id + 1])) : - $class = ' class="last"'; - endif; - ?> - > - - isRtl()) : ?> -

    - params->get('show_cat_num_articles', 1)) : ?> - - getNumItems(true); ?> - - - - escape($child->title); ?> + + access, $groups)) : ?> + params->get('show_empty_categories') || $child->numitems || count($child->getChildren())) : + if (!isset($this->children[$this->category->id][$id + 1])) : + $class = ' class="last"'; + endif; + ?> + > + + isRtl()) : ?> +

    + params->get('show_cat_num_articles', 1)) : ?> + + getNumItems(true); ?> + + + + escape($child->title); ?> - maxLevel > 1 && count($child->getChildren()) > 0) : ?> - + maxLevel > 1 && count($child->getChildren()) > 0) : ?> + + +

    + +

    + escape($child->title); ?> + params->get('show_cat_num_articles', 1)) : ?> + +   + getNumItems(true); ?> + + + + maxLevel > 1 && count($child->getChildren()) > 0) : ?> + + +

    -

    - -

    - escape($child->title); ?> - params->get('show_cat_num_articles', 1)) : ?> - -   - getNumItems(true); ?> - + + params->get('show_subcat_desc') == 1) : ?> + description) : ?> +
    + description, '', 'com_content.category'); ?> +
    + maxLevel > 1 && count($child->getChildren()) > 0) : ?> - +
    + children[$child->id] = $child->getChildren(); + $this->category = $child; + $this->maxLevel--; + echo $this->loadTemplate('children'); + $this->category = $child->getParent(); + $this->maxLevel++; + ?> +
    -

    - - - params->get('show_subcat_desc') == 1) : ?> - description) : ?> -
    - description, '', 'com_content.category'); ?> -
    - - - - maxLevel > 1 && count($child->getChildren()) > 0) : ?> -
    - children[$child->id] = $child->getChildren(); - $this->category = $child; - $this->maxLevel--; - echo $this->loadTemplate('children'); - $this->category = $child->getParent(); - $this->maxLevel++; - ?>
    - diff --git a/components/com_content/views/category/tmpl/default_articles.php b/components/com_content/views/category/tmpl/default_articles.php index 87571313a0c52..7affe0bdded3a 100644 --- a/components/com_content/views/category/tmpl/default_articles.php +++ b/components/com_content/views/category/tmpl/default_articles.php @@ -146,12 +146,14 @@ params->get('show_associations')) : ?> id); ?> - params->get('flags', 1)) : ?> - image . '.gif', $association['language']->title_native, array('title' => $association['language']->title_native), true); ?> -    - - sef; ?> -  sef); ?>  + lang_code != JFactory::getLanguage()->getTag()) : ?> + params->get('flags', 1) && $association['language']->image) : ?> + image . '.gif', $association['language']->title_native, array('title' => $association['language']->title_native), true); ?> +    + + sef; ?> +  sef); ?>  + diff --git a/components/com_content/views/category/tmpl/default_children.php b/components/com_content/views/category/tmpl/default_children.php index a950123454398..4784922fc96be 100644 --- a/components/com_content/views/category/tmpl/default_children.php +++ b/components/com_content/views/category/tmpl/default_children.php @@ -11,71 +11,78 @@ JHtml::_('bootstrap.tooltip'); -$class = ' class="first"'; -$lang = JFactory::getLanguage(); +$class = ' class="first"'; +$lang = JFactory::getLanguage(); +$user = JFactory::getUser(); +$groups = $user->getAuthorisedViewLevels(); ?> children[$this->category->id]) > 0) : ?> + children[$this->category->id] as $id => $child) : ?> - params->get('show_empty_categories') || $child->getNumItems(true) || count($child->getChildren())) : - if (!isset($this->children[$this->category->id][$id + 1])) : - $class = ' class="last"'; - endif; - ?> + + access, $groups)) : ?> + params->get('show_empty_categories') || $child->getNumItems(true) || count($child->getChildren())) : + if (!isset($this->children[$this->category->id][$id + 1])) : + $class = ' class="last"'; + endif; + ?> - > - - isRtl()) : ?> -

    - params->get('show_cat_num_articles', 1)) : ?> - - getNumItems(true); ?> - - - - escape($child->title); ?> + > + + isRtl()) : ?> +

    + params->get('show_cat_num_articles', 1)) : ?> + + getNumItems(true); ?> + + + + escape($child->title); ?> - getChildren()) > 0 && $this->maxLevel > 1) : ?> - + getChildren()) > 0 && $this->maxLevel > 1) : ?> + + +

    + +

    + escape($child->title); ?> + params->get('show_cat_num_articles', 1)) : ?> + + getNumItems(true); ?> + + + + getChildren()) > 0 && $this->maxLevel > 1) : ?> + + +

    -

    - -

    - escape($child->title); ?> - params->get('show_cat_num_articles', 1)) : ?> - - getNumItems(true); ?> - + + params->get('show_subcat_desc') == 1) : ?> + description) : ?> +
    + description, '', 'com_content.category'); ?> +
    + getChildren()) > 0 && $this->maxLevel > 1) : ?> - - - -

    - params->get('show_subcat_desc') == 1) : ?> - description) : ?> -
    - description, '', 'com_content.category'); ?> +
    + children[$child->id] = $child->getChildren(); + $this->category = $child; + $this->maxLevel--; + echo $this->loadTemplate('children'); + $this->category = $child->getParent(); + $this->maxLevel++; + ?>
    - - - getChildren()) > 0 && $this->maxLevel > 1) : ?> -
    - children[$child->id] = $child->getChildren(); - $this->category = $child; - $this->maxLevel--; - echo $this->loadTemplate('children'); - $this->category = $child->getParent(); - $this->maxLevel++; - ?>
    - -
    + diff --git a/components/com_content/views/category/view.feed.php b/components/com_content/views/category/view.feed.php index 2fa2c0e303f9f..7143fc71b0fcc 100644 --- a/components/com_content/views/category/view.feed.php +++ b/components/com_content/views/category/view.feed.php @@ -47,7 +47,7 @@ protected function reconcileNames($item) $item->description = '

    '; } - $item->description .= ($params->get('feed_summary', 0) ? $item->introtext . $item->fulltext : $item->introtext); + $item->description .= ($params->get('feed_summary', 0) ? $item->introtext . $item->fulltext : $item->introtext); // Add readmore link to description if introtext is shown, show_readmore is true and fulltext exists if (!$item->params->get('feed_summary', 0) && $item->params->get('feed_show_readmore', 0) && $item->fulltext) diff --git a/components/com_content/views/featured/tmpl/default.xml b/components/com_content/views/featured/tmpl/default.xml index b909a3f9cc198..ba25f440cc200 100644 --- a/components/com_content/views/featured/tmpl/default.xml +++ b/components/com_content/views/featured/tmpl/default.xml @@ -40,7 +40,7 @@ input; +$context = JFactory::getApplication()->getUserStateFromRequest('com_fields.fields.context', 'context', 'com_content.article', 'CMD'); +$parts = FieldsHelper::extract($context); + +if ($input->get('view') === 'fields' && $input->get('layout') === 'modal') +{ + if (!JFactory::getUser()->authorise('core.create', $parts[0]) + || !JFactory::getUser()->authorise('core.edit', $parts[0])) + { + JFactory::getApplication()->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'error'); + + return; + } +} + $controller = JControllerLegacy::getInstance('Fields'); -$controller->execute(JFactory::getApplication()->input->get('task')); +$controller->execute($input->get('task')); $controller->redirect(); diff --git a/components/com_finder/helpers/html/filter.php b/components/com_finder/helpers/html/filter.php index dbc88b2fee30c..91b58ce19ca4f 100644 --- a/components/com_finder/helpers/html/filter.php +++ b/components/com_finder/helpers/html/filter.php @@ -185,8 +185,8 @@ public static function slider($options = array()) // Build a node. $html .= '
    '; $html .= '
    '; - $html .= '

    - -

    diff --git a/components/com_mailto/views/mailto/view.html.php b/components/com_mailto/views/mailto/view.html.php index aff35e60d393b..219fb2766cdca 100644 --- a/components/com_mailto/views/mailto/view.html.php +++ b/components/com_mailto/views/mailto/view.html.php @@ -11,7 +11,7 @@ /** * Class for Mail. - * + * * @since 1.5 */ class MailtoViewMailto extends JViewLegacy diff --git a/components/com_newsfeeds/router.php b/components/com_newsfeeds/router.php index 1be4972f673b0..7b8c3eb46b888 100644 --- a/components/com_newsfeeds/router.php +++ b/components/com_newsfeeds/router.php @@ -141,22 +141,25 @@ public function getCategoryId($segment, $query) { if (isset($query['id'])) { - $category = JCategories::getInstance($this->getName())->get($query['id']); + $category = JCategories::getInstance($this->getName(), array('access' => false))->get($query['id']); - foreach ($category->getChildren() as $child) + if ($category) { - if ($this->noIDs) + foreach ($category->getChildren() as $child) { - if ($child->alias === $segment) + if ($this->noIDs) { - return $child->id; + if ($child->alias === $segment) + { + return $child->id; + } } - } - else - { - if ($child->id == (int) $segment) + else { - return $child->id; + if ($child->id == (int) $segment) + { + return $child->id; + } } } } diff --git a/components/com_newsfeeds/views/categories/tmpl/default.php b/components/com_newsfeeds/views/categories/tmpl/default.php index 0f6c60003c28a..1bc33cdf834ef 100644 --- a/components/com_newsfeeds/views/categories/tmpl/default.php +++ b/components/com_newsfeeds/views/categories/tmpl/default.php @@ -11,6 +11,11 @@ JHtml::addIncludePath(JPATH_COMPONENT . '/helpers'); JHtml::_('behavior.caption'); +JHtml::_('behavior.core'); + +// Add strings for translations in Javascript. +JText::script('JGLOBAL_EXPAND_CATEGORIES'); +JText::script('JGLOBAL_COLLAPSE_CATEGORIES'); JFactory::getDocument()->addScriptDeclaration(" jQuery(function($) { @@ -19,6 +24,12 @@ btn.on('click', function() { btn.find('span').toggleClass('icon-plus'); btn.find('span').toggleClass('icon-minus'); + if (btn.attr('aria-label') === Joomla.JText._('JGLOBAL_EXPAND_CATEGORIES')) + { + btn.attr('aria-label', Joomla.JText._('JGLOBAL_COLLAPSE_CATEGORIES')); + } else { + btn.attr('aria-label', Joomla.JText._('JGLOBAL_EXPAND_CATEGORIES')); + } }); }); });"); diff --git a/components/com_newsfeeds/views/categories/tmpl/default.xml b/components/com_newsfeeds/views/categories/tmpl/default.xml index e58da6af4528b..90b6712bfa622 100644 --- a/components/com_newsfeeds/views/categories/tmpl/default.xml +++ b/components/com_newsfeeds/views/categories/tmpl/default.xml @@ -338,7 +338,7 @@ getChildren()) > 0 && $this->maxLevelcat > 1) : ?> - + data-toggle="collapse" data-toggle="button" class="btn btn-mini pull-right" aria-label=""> + diff --git a/components/com_newsfeeds/views/category/tmpl/default.xml b/components/com_newsfeeds/views/category/tmpl/default.xml index aedaf33b9eceb..617a5789bd1b0 100644 --- a/components/com_newsfeeds/views/category/tmpl/default.xml +++ b/components/com_newsfeeds/views/category/tmpl/default.xml @@ -268,7 +268,7 @@ text; @@ -265,9 +268,6 @@ public function display($tpl = null) $created = JHtml::_('date', $result->created, JText::_('DATE_FORMAT_LC3')); } - // Make sure there are no slashes in the needle - $needle = str_replace('/', '\/', $needle); - $result->title = preg_replace("/\b($needle)\b/ui", $hl1 . "$1" . $hl2, htmlspecialchars($result->title, ENT_COMPAT, 'UTF-8')); $result->text = JHtml::_('content.prepare', $result->text, '', 'com_search.search'); $result->created = $created; diff --git a/components/com_tags/router.php b/components/com_tags/router.php index 4997c86dae731..3f151b4b14278 100644 --- a/components/com_tags/router.php +++ b/components/com_tags/router.php @@ -163,7 +163,7 @@ public function parse(&$segments) * @return string The segment with founded id * * @since 3.7 - */ + */ protected function fixSegment($segment) { $db = JFactory::getDbo(); diff --git a/components/com_tags/views/tag/tmpl/default.xml b/components/com_tags/views/tag/tmpl/default.xml index d18650fccfea2..4ad4318c74c10 100644 --- a/components/com_tags/views/tag/tmpl/default.xml +++ b/components/com_tags/views/tag/tmpl/default.xml @@ -167,7 +167,7 @@ access)) && in_array($item->access, $this->user->getAuthorisedViewLevels())) : ?>

  • - + escape($item->title); ?>

    diff --git a/components/com_users/controllers/registration.php b/components/com_users/controllers/registration.php index aef63d868dc62..f5580d6738cda 100644 --- a/components/com_users/controllers/registration.php +++ b/components/com_users/controllers/registration.php @@ -65,7 +65,7 @@ public function activate() if ($return === false) { // Redirect back to the home page. - $this->setMessage(JText::sprintf('COM_USERS_REGISTRATION_SAVE_FAILED', $model->getError()), 'warning'); + $this->setMessage(JText::sprintf('COM_USERS_REGISTRATION_SAVE_FAILED', $model->getError()), 'error'); $this->setRedirect('index.php'); return false; @@ -147,11 +147,11 @@ public function register() { if ($errors[$i] instanceof Exception) { - $app->enqueueMessage($errors[$i]->getMessage(), 'warning'); + $app->enqueueMessage($errors[$i]->getMessage(), 'error'); } else { - $app->enqueueMessage($errors[$i], 'warning'); + $app->enqueueMessage($errors[$i], 'error'); } } @@ -174,7 +174,7 @@ public function register() $app->setUserState('com_users.registration.data', $data); // Redirect back to the edit screen. - $this->setMessage($model->getError(), 'warning'); + $this->setMessage($model->getError(), 'error'); $this->setRedirect(JRoute::_('index.php?option=com_users&view=registration', false)); return false; diff --git a/components/com_users/helpers/legacyrouter.php b/components/com_users/helpers/legacyrouter.php index a1e421ca60a34..df141a7bea98d 100644 --- a/components/com_users/helpers/legacyrouter.php +++ b/components/com_users/helpers/legacyrouter.php @@ -74,42 +74,57 @@ public function build(&$query, &$segments) $items = $this->router->menu->getItems('component', 'com_users'); // Build an array of serialized query strings to menu item id mappings. - for ($i = 0, $n = count($items); $i < $n; $i++) + foreach ($items as $item) { + if (empty($item->query['view'])) + { + continue; + } + // Check to see if we have found the resend menu item. - if (empty($resend) && !empty($items[$i]->query['view']) && $items[$i]->query['view'] === 'resend') + if (empty($resend) && $item->query['view'] === 'resend') { - $resend = $items[$i]->id; + $resend = $item->id; + + continue; } // Check to see if we have found the reset menu item. - if (empty($reset) && !empty($items[$i]->query['view']) && $items[$i]->query['view'] === 'reset') + if (empty($reset) && $item->query['view'] === 'reset') { - $reset = $items[$i]->id; + $reset = $item->id; + + continue; } // Check to see if we have found the remind menu item. - if (empty($remind) && !empty($items[$i]->query['view']) && $items[$i]->query['view'] === 'remind') + if (empty($remind) && $item->query['view'] === 'remind') { - $remind = $items[$i]->id; + $remind = $item->id; + + continue; } // Check to see if we have found the login menu item. - if (empty($login) && !empty($items[$i]->query['view']) && $items[$i]->query['view'] === 'login') + if (empty($login) && $item->query['view'] === 'login') { - $login = $items[$i]->id; + $login = $item->id; + + continue; } // Check to see if we have found the registration menu item. - if (empty($registration) && !empty($items[$i]->query['view']) && $items[$i]->query['view'] === 'registration') + if (empty($registration) && $item->query['view'] === 'registration') { - $registration = $items[$i]->id; + $registration = $item->id; + + continue; } // Check to see if we have found the profile menu item. - if (empty($profile) && !empty($items[$i]->query['view']) && $items[$i]->query['view'] === 'profile') + if (empty($profile) && $item->query['view'] === 'profile') { - $profile = $items[$i]->id; + $profile = $item->id; } } diff --git a/components/com_users/helpers/route.php b/components/com_users/helpers/route.php index 646370a3c182d..89d46998914d2 100644 --- a/components/com_users/helpers/route.php +++ b/components/com_users/helpers/route.php @@ -32,10 +32,8 @@ public static function &getItems() // Get the menu items for this component. if (!isset($items)) { - $app = JFactory::getApplication(); - $menu = $app->getMenu(); - $com = JComponentHelper::getComponent('com_users'); - $items = $menu->getItems('component_id', $com->id); + $component = JComponentHelper::getComponent('com_users'); + $items = JFactory::getApplication()->getMenu()->getItems('component_id', $component->id); // If no items found, set to empty array. if (!$items) @@ -59,19 +57,17 @@ public static function getLoginRoute() { // Get the items. $items = self::getItems(); - $itemid = null; // Search for a suitable menu id. foreach ($items as $item) { if (isset($item->query['view']) && $item->query['view'] === 'login') { - $itemid = $item->id; - break; + return $item->id; } } - return $itemid; + return null; } /** @@ -86,7 +82,6 @@ public static function getProfileRoute() { // Get the items. $items = self::getItems(); - $itemid = null; // Search for a suitable menu id. // Menu link can only go to users own profile. @@ -95,12 +90,11 @@ public static function getProfileRoute() { if (isset($item->query['view']) && $item->query['view'] === 'profile') { - $itemid = $item->id; - break; + return $item->id; } } - return $itemid; + return null; } /** @@ -115,19 +109,17 @@ public static function getRegistrationRoute() { // Get the items. $items = self::getItems(); - $itemid = null; // Search for a suitable menu id. foreach ($items as $item) { if (isset($item->query['view']) && $item->query['view'] === 'registration') { - $itemid = $item->id; - break; + return $item->id; } } - return $itemid; + return null; } /** @@ -142,19 +134,17 @@ public static function getRemindRoute() { // Get the items. $items = self::getItems(); - $itemid = null; // Search for a suitable menu id. foreach ($items as $item) { if (isset($item->query['view']) && $item->query['view'] === 'remind') { - $itemid = $item->id; - break; + return $item->id; } } - return $itemid; + return null; } /** @@ -169,19 +159,17 @@ public static function getResendRoute() { // Get the items. $items = self::getItems(); - $itemid = null; // Search for a suitable menu id. foreach ($items as $item) { if (isset($item->query['view']) && $item->query['view'] === 'resend') { - $itemid = $item->id; - break; + return $item->id; } } - return $itemid; + return null; } /** @@ -196,18 +184,16 @@ public static function getResetRoute() { // Get the items. $items = self::getItems(); - $itemid = null; // Search for a suitable menu id. foreach ($items as $item) { if (isset($item->query['view']) && $item->query['view'] === 'reset') { - $itemid = $item->id; - break; + return $item->id; } } - return $itemid; + return null; } } diff --git a/components/com_users/models/forms/sitelang.xml b/components/com_users/models/forms/sitelang.xml index 430d5bd3ae63d..9db913f9fc19b 100644 --- a/components/com_users/models/forms/sitelang.xml +++ b/components/com_users/models/forms/sitelang.xml @@ -8,7 +8,6 @@ label="COM_USERS_USER_FIELD_FRONTEND_LANGUAGE_LABEL" description="COM_USERS_USER_FIELD_FRONTEND_LANGUAGE_DESC" client="site" - required="true" filter="cmd" default="active" /> diff --git a/components/com_users/models/profile.php b/components/com_users/models/profile.php index 0659613b97fbe..5d49111f39870 100644 --- a/components/com_users/models/profile.php +++ b/components/com_users/models/profile.php @@ -177,10 +177,6 @@ public function getForm($data = array(), $loadData = true) return false; } - // For com_fields the context is com_users.user - JLoader::import('components.com_fields.helpers.fields', JPATH_ADMINISTRATOR); - FieldsHelper::prepareForm('com_users.user', $form, $data); - // Check for username compliance and parameter set $isUsernameCompliant = true; $username = $loadData ? $form->getValue('username') : $this->loadFormData()->username; diff --git a/components/com_users/views/login/tmpl/default_login.php b/components/com_users/views/login/tmpl/default_login.php index 6a5f9646ed150..132624a54595c 100644 --- a/components/com_users/views/login/tmpl/default_login.php +++ b/components/com_users/views/login/tmpl/default_login.php @@ -60,7 +60,7 @@
    -
    diff --git a/components/com_wrapper/views/wrapper/tmpl/default.php b/components/com_wrapper/views/wrapper/tmpl/default.php index 08dea8acf71a5..dc68fab62ba67 100644 --- a/components/com_wrapper/views/wrapper/tmpl/default.php +++ b/components/com_wrapper/views/wrapper/tmpl/default.php @@ -32,6 +32,11 @@ height="escape($this->params->get('height')); ?>" scrolling="escape($this->params->get('scrolling')); ?>" frameborder="escape($this->params->get('frameborder', 1)); ?>" + escape($this->params->get('page_heading'))) : ?> + title="escape($this->params->get('page_heading')); ?>" + + title="escape($this->params->get('page_title')); ?>" + class="wrapperpageclass_sfx; ?>"> diff --git a/components/com_wrapper/views/wrapper/tmpl/default.xml b/components/com_wrapper/views/wrapper/tmpl/default.xml index 74f0c0b7cb254..f0c1e350de42e 100644 --- a/components/com_wrapper/views/wrapper/tmpl/default.xml +++ b/components/com_wrapper/views/wrapper/tmpl/default.xml @@ -51,7 +51,7 @@ =5.3.10" + "php": "^5.3.10|~7.0" }, "require-dev": { - "phpunit/phpunit": "4.*", + "phpunit/phpunit": "^4.8.35|^5.4.3|~6.0", "squizlabs/php_codesniffer": "1.*" }, "type": "joomla-package", @@ -271,8 +271,7 @@ }, "autoload": { "psr-4": { - "Joomla\\DI\\": "src/", - "Joomla\\DI\\Tests\\": "Tests/" + "Joomla\\DI\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -289,7 +288,7 @@ "ioc", "joomla" ], - "time": "2015-04-02T16:30:40+00:00" + "time": "2017-11-12T15:35:19+00:00" }, { "name": "joomla/event", @@ -534,26 +533,30 @@ }, { "name": "joomla/ldap", - "version": "1.2.0", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/joomla-framework/ldap.git", - "reference": "2d82a7e9ad0aa1091e8121ab8e194ff0e9d14208" + "reference": "4dce2db6a3d6d2b8c7847651ad011bb3ed7ba978" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/joomla-framework/ldap/zipball/2d82a7e9ad0aa1091e8121ab8e194ff0e9d14208", - "reference": "2d82a7e9ad0aa1091e8121ab8e194ff0e9d14208", + "url": "https://api.github.com/repos/joomla-framework/ldap/zipball/4dce2db6a3d6d2b8c7847651ad011bb3ed7ba978", + "reference": "4dce2db6a3d6d2b8c7847651ad011bb3ed7ba978", "shasum": "" }, "require": { "ext-ldap": "*", - "php": "^5.3.10|~7.0", - "symfony/polyfill-php56": "~1.0" + "php": "^5.3.10|~7.0" }, "require-dev": { + "joomla/registry": "^1.4.5|~2.0", "phpunit/phpunit": "^4.8.35|^5.4.3|~6.0", - "squizlabs/php_codesniffer": "1.*" + "squizlabs/php_codesniffer": "1.*", + "symfony/polyfill-php56": "~1.0" + }, + "suggest": { + "symfony/polyfill-php56": "If using PHP 5.5 or earlier to use ldap_escape() function" }, "type": "joomla-package", "extra": { @@ -577,7 +580,7 @@ "joomla", "ldap" ], - "time": "2017-07-27T13:13:55+00:00" + "time": "2017-10-21T15:41:55+00:00" }, { "name": "joomla/registry", @@ -922,16 +925,16 @@ }, { "name": "paragonie/sodium_compat", - "version": "v1.2.0", + "version": "v1.3.1", "source": { "type": "git", "url": "https://github.com/paragonie/sodium_compat.git", - "reference": "110b1707f45e3b59311bb488b3af7251673de9b7" + "reference": "6b3a59ef127445564a00e261eb1e960b6292f494" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/110b1707f45e3b59311bb488b3af7251673de9b7", - "reference": "110b1707f45e3b59311bb488b3af7251673de9b7", + "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/6b3a59ef127445564a00e261eb1e960b6292f494", + "reference": "6b3a59ef127445564a00e261eb1e960b6292f494", "shasum": "" }, "require": { @@ -999,20 +1002,20 @@ "secret-key cryptography", "side-channel resistant" ], - "time": "2017-09-01T01:19:04+00:00" + "time": "2017-09-29T21:27:52+00:00" }, { "name": "phpmailer/phpmailer", - "version": "v5.2.24", + "version": "v5.2.26", "source": { "type": "git", "url": "https://github.com/PHPMailer/PHPMailer.git", - "reference": "22d04c6a58145a244696f3f254c1875aa653b26a" + "reference": "70362997bda4376378be7d92d81e2200550923f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/22d04c6a58145a244696f3f254c1875aa653b26a", - "reference": "22d04c6a58145a244696f3f254c1875aa653b26a", + "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/70362997bda4376378be7d92d81e2200550923f7", + "reference": "70362997bda4376378be7d92d81e2200550923f7", "shasum": "" }, "require": { @@ -1076,7 +1079,7 @@ } ], "description": "PHPMailer is a full-featured email creation and transfer class for PHP", - "time": "2017-07-26T21:00:20+00:00" + "time": "2017-11-04T09:26:05+00:00" }, { "name": "psr/log", @@ -1181,16 +1184,16 @@ }, { "name": "symfony/polyfill-php55", - "version": "v1.4.0", + "version": "v1.6.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php55.git", - "reference": "94566239a7720cde0820f15f0cc348ddb51ba51d" + "reference": "b64e7f0c37ecf144ecc16668936eef94e628fbfd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/94566239a7720cde0820f15f0cc348ddb51ba51d", - "reference": "94566239a7720cde0820f15f0cc348ddb51ba51d", + "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/b64e7f0c37ecf144ecc16668936eef94e628fbfd", + "reference": "b64e7f0c37ecf144ecc16668936eef94e628fbfd", "shasum": "" }, "require": { @@ -1200,7 +1203,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "1.6-dev" } }, "autoload": { @@ -1233,20 +1236,20 @@ "portable", "shim" ], - "time": "2017-06-09T08:25:21+00:00" + "time": "2017-10-11T12:05:26+00:00" }, { "name": "symfony/polyfill-php56", - "version": "v1.4.0", + "version": "v1.6.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php56.git", - "reference": "bc0b7d6cb36b10cfabb170a3e359944a95174929" + "reference": "265fc96795492430762c29be291a371494ba3a5b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/bc0b7d6cb36b10cfabb170a3e359944a95174929", - "reference": "bc0b7d6cb36b10cfabb170a3e359944a95174929", + "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/265fc96795492430762c29be291a371494ba3a5b", + "reference": "265fc96795492430762c29be291a371494ba3a5b", "shasum": "" }, "require": { @@ -1256,7 +1259,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "1.6-dev" } }, "autoload": { @@ -1289,20 +1292,20 @@ "portable", "shim" ], - "time": "2017-06-09T08:25:21+00:00" + "time": "2017-10-11T12:05:26+00:00" }, { "name": "symfony/polyfill-util", - "version": "v1.4.0", + "version": "v1.6.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-util.git", - "reference": "ebccbde4aad410f6438d86d7d261c6b4d2b9a51d" + "reference": "6e719200c8e540e0c0effeb31f96bdb344b94176" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/ebccbde4aad410f6438d86d7d261c6b4d2b9a51d", - "reference": "ebccbde4aad410f6438d86d7d261c6b4d2b9a51d", + "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/6e719200c8e540e0c0effeb31f96bdb344b94176", + "reference": "6e719200c8e540e0c0effeb31f96bdb344b94176", "shasum": "" }, "require": { @@ -1311,7 +1314,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "1.6-dev" } }, "autoload": { @@ -1341,20 +1344,20 @@ "polyfill", "shim" ], - "time": "2017-06-09T08:25:21+00:00" + "time": "2017-10-11T12:05:26+00:00" }, { "name": "symfony/yaml", - "version": "v2.8.26", + "version": "v2.8.29", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "4c29dec8d489c4e37cf87ccd7166cd0b0e6a45c5" + "reference": "d819bf267e901727141fe828ae888486fd21236e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/4c29dec8d489c4e37cf87ccd7166cd0b0e6a45c5", - "reference": "4c29dec8d489c4e37cf87ccd7166cd0b0e6a45c5", + "url": "https://api.github.com/repos/symfony/yaml/zipball/d819bf267e901727141fe828ae888486fd21236e", + "reference": "d819bf267e901727141fe828ae888486fd21236e", "shasum": "" }, "require": { @@ -1390,7 +1393,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2017-06-01T20:52:29+00:00" + "time": "2017-11-05T15:25:56+00:00" } ], "packages-dev": [ @@ -1450,16 +1453,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v1.13.1", + "version": "v1.13.3", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "0ea4f7ed06ca55da1d8fc45da26ff87f261c4088" + "reference": "387e4c86c9dc0e1e4c475291fc114ec45b98e624" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/0ea4f7ed06ca55da1d8fc45da26ff87f261c4088", - "reference": "0ea4f7ed06ca55da1d8fc45da26ff87f261c4088", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/387e4c86c9dc0e1e4c475291fc114ec45b98e624", + "reference": "387e4c86c9dc0e1e4c475291fc114ec45b98e624", "shasum": "" }, "require": { @@ -1504,7 +1507,7 @@ } ], "description": "A tool to automatically fix PHP code style", - "time": "2016-12-01T00:05:05+00:00" + "time": "2017-09-11T14:11:16+00:00" }, { "name": "pear/cache_lite", @@ -1607,22 +1610,22 @@ }, { "name": "phpspec/prophecy", - "version": "v1.7.0", + "version": "v1.7.2", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "93d39f1f7f9326d746203c7c056f300f7f126073" + "reference": "c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/93d39f1f7f9326d746203c7c056f300f7f126073", - "reference": "93d39f1f7f9326d746203c7c056f300f7f126073", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6", + "reference": "c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6", "shasum": "" }, "require": { "doctrine/instantiator": "^1.0.2", "php": "^5.3|^7.0", - "phpdocumentor/reflection-docblock": "^2.0|^3.0.2", + "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0", "sebastian/comparator": "^1.1|^2.0", "sebastian/recursion-context": "^1.0|^2.0|^3.0" }, @@ -1633,7 +1636,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.6.x-dev" + "dev-master": "1.7.x-dev" } }, "autoload": { @@ -1666,7 +1669,7 @@ "spy", "stub" ], - "time": "2017-03-02T20:05:34+00:00" + "time": "2017-09-04T11:05:03+00:00" }, { "name": "phpunit/dbunit", @@ -2552,16 +2555,16 @@ }, { "name": "symfony/console", - "version": "v2.8.26", + "version": "v2.8.29", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "32a3c6b3398de5db8ed381f4ef92970c59c2fcdd" + "reference": "89143ce2b463515a75b5f5e9650e6ecfb2684158" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/32a3c6b3398de5db8ed381f4ef92970c59c2fcdd", - "reference": "32a3c6b3398de5db8ed381f4ef92970c59c2fcdd", + "url": "https://api.github.com/repos/symfony/console/zipball/89143ce2b463515a75b5f5e9650e6ecfb2684158", + "reference": "89143ce2b463515a75b5f5e9650e6ecfb2684158", "shasum": "" }, "require": { @@ -2609,20 +2612,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2017-07-29T21:26:04+00:00" + "time": "2017-11-07T14:08:47+00:00" }, { "name": "symfony/debug", - "version": "v2.8.26", + "version": "v2.8.29", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "236ca98a425758cc8c2ff2db423bfe4d1a736b8c" + "reference": "a0a29e9867debabdace779a20a9385c623a23bbd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/236ca98a425758cc8c2ff2db423bfe4d1a736b8c", - "reference": "236ca98a425758cc8c2ff2db423bfe4d1a736b8c", + "url": "https://api.github.com/repos/symfony/debug/zipball/a0a29e9867debabdace779a20a9385c623a23bbd", + "reference": "a0a29e9867debabdace779a20a9385c623a23bbd", "shasum": "" }, "require": { @@ -2666,20 +2669,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2017-07-28T15:21:22+00:00" + "time": "2017-10-24T13:48:52+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v2.8.26", + "version": "v2.8.29", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "1377400fd641d7d1935981546aaef780ecd5bf6d" + "reference": "b59aacf238fadda50d612c9de73b74751872a903" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/1377400fd641d7d1935981546aaef780ecd5bf6d", - "reference": "1377400fd641d7d1935981546aaef780ecd5bf6d", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b59aacf238fadda50d612c9de73b74751872a903", + "reference": "b59aacf238fadda50d612c9de73b74751872a903", "shasum": "" }, "require": { @@ -2726,20 +2729,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2017-06-02T07:47:27+00:00" + "time": "2017-11-05T15:25:56+00:00" }, { "name": "symfony/filesystem", - "version": "v2.8.26", + "version": "v2.8.29", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "714b1036010c354ae2b25d7f9ca27e14e265e9f2" + "reference": "10507c5f24577b0ad971b0d22097c823b2b45dd3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/714b1036010c354ae2b25d7f9ca27e14e265e9f2", - "reference": "714b1036010c354ae2b25d7f9ca27e14e265e9f2", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/10507c5f24577b0ad971b0d22097c823b2b45dd3", + "reference": "10507c5f24577b0ad971b0d22097c823b2b45dd3", "shasum": "" }, "require": { @@ -2775,20 +2778,20 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2017-07-11T07:12:11+00:00" + "time": "2017-11-07T14:08:47+00:00" }, { "name": "symfony/finder", - "version": "v2.8.26", + "version": "v2.8.29", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "4f4e84811004e065a3bb5ceeb1d9aa592630f9ad" + "reference": "efeceae6a05a9b2fcb3391333f1d4a828ff44ab8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/4f4e84811004e065a3bb5ceeb1d9aa592630f9ad", - "reference": "4f4e84811004e065a3bb5ceeb1d9aa592630f9ad", + "url": "https://api.github.com/repos/symfony/finder/zipball/efeceae6a05a9b2fcb3391333f1d4a828ff44ab8", + "reference": "efeceae6a05a9b2fcb3391333f1d4a828ff44ab8", "shasum": "" }, "require": { @@ -2824,20 +2827,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2017-06-01T20:52:29+00:00" + "time": "2017-11-05T15:25:56+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.4.0", + "version": "v1.6.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "f29dca382a6485c3cbe6379f0c61230167681937" + "reference": "2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/f29dca382a6485c3cbe6379f0c61230167681937", - "reference": "f29dca382a6485c3cbe6379f0c61230167681937", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296", + "reference": "2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296", "shasum": "" }, "require": { @@ -2849,7 +2852,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "1.6-dev" } }, "autoload": { @@ -2883,20 +2886,20 @@ "portable", "shim" ], - "time": "2017-06-09T14:24:12+00:00" + "time": "2017-10-11T12:05:26+00:00" }, { "name": "symfony/process", - "version": "v2.8.26", + "version": "v2.8.29", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "57e52a0a6a80ea0aec4fc1b785a7920a95cb88a8" + "reference": "d25449e031f600807949aab7cadbf267712f4eee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/57e52a0a6a80ea0aec4fc1b785a7920a95cb88a8", - "reference": "57e52a0a6a80ea0aec4fc1b785a7920a95cb88a8", + "url": "https://api.github.com/repos/symfony/process/zipball/d25449e031f600807949aab7cadbf267712f4eee", + "reference": "d25449e031f600807949aab7cadbf267712f4eee", "shasum": "" }, "require": { @@ -2932,20 +2935,20 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2017-07-03T08:04:30+00:00" + "time": "2017-11-05T15:25:56+00:00" }, { "name": "symfony/stopwatch", - "version": "v2.8.26", + "version": "v2.8.29", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", - "reference": "e02577b841394a78306d7b547701bb7bb705bad5" + "reference": "533bb9d7c2da1c6d2da163ecf0f22043ea98f59b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/e02577b841394a78306d7b547701bb7bb705bad5", - "reference": "e02577b841394a78306d7b547701bb7bb705bad5", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/533bb9d7c2da1c6d2da163ecf0f22043ea98f59b", + "reference": "533bb9d7c2da1c6d2da163ecf0f22043ea98f59b", "shasum": "" }, "require": { @@ -2981,7 +2984,7 @@ ], "description": "Symfony Stopwatch Component", "homepage": "https://symfony.com", - "time": "2017-04-12T14:07:15+00:00" + "time": "2017-11-10T18:59:36+00:00" } ], "aliases": [], diff --git a/installation/configuration.php-dist b/installation/configuration.php-dist index 19457ec1e8244..aed52b7cd773b 100644 --- a/installation/configuration.php-dist +++ b/installation/configuration.php-dist @@ -72,6 +72,9 @@ class JConfig public $session_memcache_server_port = '11211'; public $session_memcached_server_host = 'localhost'; public $session_memcached_server_port = '11211'; + public $session_redis_server_host = 'localhost'; + public $session_redis_server_port = '6379'; + public $session_redis_server_db = '0'; /* Mail Settings */ @@ -87,6 +90,8 @@ class JConfig public $smtpuser = ''; public $smtppass = ''; public $smtphost = 'localhost'; + public $smtpsecure = 'none'; + public $smtpport = '25'; /* Cache Settings */ public $caching = '0'; diff --git a/installation/language/cy-GB/cy-GB.ini b/installation/language/cy-GB/cy-GB.ini index a3e45b213ebf8..d73cd480375e6 100644 --- a/installation/language/cy-GB/cy-GB.ini +++ b/installation/language/cy-GB/cy-GB.ini @@ -31,8 +31,8 @@ INSTL_DATABASE="Ffurfweddiad cronfa ddata" INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="Ymholiad cronfa ddata PostgreSQL wedi methu." INSTL_DATABASE_HOST_DESC=""_QQ_"localhost"_QQ_" yw hwn fel arfer neu enw a ddarperir gan eich cwmni lletya." INSTL_DATABASE_HOST_LABEL="Enw'r lletywr" -INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="Nid oeddem yn gallu creu'r ffeil. Crëwch ffeil o'r enw "_QQ_"%s"_QQ_" a'i uwchlwytho i ffolder "_QQ_"gosod"_QQ_" eich gwefan Joomla." -INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="I gadarnhau mai chi yw perchennog y wefan hon dilëwch y ffeil o'r enw "_QQ_"%s"_QQ_" yr ydym newydd ei chreu yn ffolder "_QQ_"gosod"_QQ_" eich gwefan Joomla." +INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="Nid oeddem yn gallu creu'r ffeil. Crëwch ffeil o'r enw "_QQ_"%1$s"_QQ_" a'i uwchlwytho i ffolder "_QQ_"%2$s"_QQ_" eich gwefan Joomla." +INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="I gadarnhau mai chi yw perchennog y wefan hon dilëwch y ffeil o'r enw "_QQ_"%1$s"_QQ_" yr ydym newydd ei chreu yn ffolder "_QQ_"%2$s"_QQ_" eich gwefan Joomla." INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Yr ydych yn ceisio defnyddio gwesteiwr cronfa ddata nad yw ar eich gweinydd lleol. Am resymau diogelwch, mae angen i chi wirio perchnogaeth eich cyfrif gwe-letya. Darllenwch y dogfennau am fwy o wybodaeth." INSTL_DATABASE_NAME_DESC="Mae rhai lletywyr ond yn caniatau enw cronfa ddata arbennig ar gyfer pob gwefan. Yn yr achos yma defnyddiwch rhagddodiad tabl ar gyfer pob gwefan Joomla." INSTL_DATABASE_NAME_LABEL="Enw cronfa ddata" @@ -122,20 +122,14 @@ INSTL_EMAIL_NOT_SENT="Doedd dim modd anfon yr e-bost." ;Complete view INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Manylion mewngofnodi gweinyddol" -; The word 'installation' should not be translated as it is a physical folder. -INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Mae'r ffolder gosod eisoes wedi'i dileu." -; The word 'installation' should not be translated as it is a physical folder. -INSTL_COMPLETE_ERROR_FOLDER_DELETE="Doedd dim modd dileu'r ffolder gosod. Os gwelwch yn dda dilëwch y ffolder eich hun." -; The word 'installation' should not be translated as it is a physical folder. -INSTL_COMPLETE_FOLDER_REMOVED="Wedi llwyddo i dynnu'r ffolder gosod." +INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Mae'r ffolder "_QQ_"%s"_QQ_" eisoes wedi'i dileu." +INSTL_COMPLETE_ERROR_FOLDER_DELETE="Doedd dim modd dileu'r ffolder \"%s\". Os gwelwch yn dda dilëwch y ffolder eich hun." +INSTL_COMPLETE_FOLDER_REMOVED="Wedi llwyddo i dynnu'r ffolder gosod \"%s\"." INSTL_COMPLETE_LANGUAGE_1="Joomla! yn eich iaith a/neu creu gwefan sylfaenol amlieithog brodorol yn awtomatig" -; The word 'installation' should not be translated as it is a physical folder. -INSTL_COMPLETE_LANGUAGE_DESC="Cyn tynnu’r ffolder gosod medrwch osod ieithoedd ychwanegol. Os ydych eisiau ychwanegu ieithoedd i Joomla! cliciwch y botwm canlynol." +INSTL_COMPLETE_LANGUAGE_DESC="Cyn tynnu’r ffolder "_QQ_"%s"_QQ_" medrwch osod ieithoedd ychwanegol. Os ydych eisiau ychwanegu ieithoedd i'ch gwefan Joomla cliciwch y botwm canlynol." INSTL_COMPLETE_LANGUAGE_DESC2="Nodyn: Bydd angen mynediad i’r Rhyngrwyd arnoch i Joomla lawrlwytho a gosod yr iaith newydd.
    Nid yw rhai gosodiadau gweinydd yn caniatau Joomla i osod ieithoedd. Os dyna sy’n wir yma, peidiwch a phoeni, medrwch ei osod wedyn gan ddefnyddio Gweinyddwr Joomla." -; The word 'installation' should not be translated as it is a physical folder. -INSTL_COMPLETE_REMOVE_FOLDER="Tynnwch y ffolder gosod " -; The word 'installation' should not be translated as it is a physical folder. -INSTL_COMPLETE_REMOVE_INSTALLATION="COFIWCH DYNNU Y FFOLDER GOSOD YN LLWYR OS GWELWCH YN DDA.
    Ni fyddwch yn gallu parhau heibio’r pwynt yma nes bod y ffolder gosod wedi ei thynnu. Nodwedd diogelwch yn Joomla! yw hyn." +INSTL_COMPLETE_REMOVE_FOLDER="Tynnwch y ffolder "_QQ_"%s"_QQ_"" +INSTL_COMPLETE_REMOVE_INSTALLATION="COFIWCH DYNNU Y FFOLDER GOSOD YN LLWYR OS GWELWCH YN DDA.
    Ni fyddwch yn gallu parhau heibio’r pwynt yma nes bod y ffolder "_QQ_"%s"_QQ_" wedi ei thynnu. Nodwedd diogelwch yn Joomla yw hyn." INSTL_COMPLETE_TITLE="Llongyfarchiadau! Mae Joomla! wedi’i osod." INSTL_COMPLETE_INSTALL_LANGUAGES="Camau ychwanegol: Gosod Ieithoedd " diff --git a/installation/language/cy-GB/cy-GB.xml b/installation/language/cy-GB/cy-GB.xml index 9b8c88ffd3828..ff0ca56afb797 100644 --- a/installation/language/cy-GB/cy-GB.xml +++ b/installation/language/cy-GB/cy-GB.xml @@ -3,8 +3,8 @@ version="3.8" client="installation"> Welsh(United Kingdom) - 3.8.0 - August 2017 + 3.8.2 + October 2017 Welsh Translation Team : Joomla.cymru Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/en-GB/en-GB.ini b/installation/language/en-GB/en-GB.ini index c9d6fb6c70157..8b76f46e4cf6e 100644 --- a/installation/language/en-GB/en-GB.ini +++ b/installation/language/en-GB/en-GB.ini @@ -32,7 +32,7 @@ INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="PostgreSQL database query failed." INSTL_DATABASE_HOST_DESC="This is usually "localhost" or a name provided by your host." INSTL_DATABASE_HOST_LABEL="Host Name" INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="We were not able to create the file. Please manually create a file named "%1$s" and upload it to the "%2$s" folder of your Joomla site." -INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="In order to confirm that you are the owner of this website please delete the file named "%1$s" we have just created in the "%2$s" folder of your Joomla site." +INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="In order to confirm that you are the owner of this website please delete the file named "%1$s" we have created in the "%2$s" folder of your Joomla site." INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="You are trying to use a database host which is not on your local server. For security reasons, you need to verify the ownership of your web hosting account. Please read the documentation for more information." INSTL_DATABASE_NAME_DESC="Some hosts allow only a certain DB name per site. Use table prefix in this case for distinct Joomla! sites." INSTL_DATABASE_NAME_LABEL="Database Name" @@ -90,7 +90,7 @@ INSTL_SAMPLE_BROCHURE_SET="Brochure English (GB) Sample Data" INSTL_SAMPLE_DATA_SET="Default English (GB) Sample Data" INSTL_SAMPLE_LEARN_SET="Learn Joomla English (GB) Sample Data" INSTL_SAMPLE_TESTING_SET="Test English (GB) Sample Data" -INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Install Joomla with just one menu and a login form, without any content." +INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Install Joomla with one menu and a login form, without any content." INSTL_SAMPLE_BLOG_SET_DESC="Install Joomla with a few articles and blog related modules like Older Posts, Blog Roll, Most Read Posts." INSTL_SAMPLE_BROCHURE_SET_DESC="Install Joomla with a few pages (a menu with pages Home, About Us, News, Contact Us) and modules like Search, Custom, Login Form." INSTL_SAMPLE_DATA_SET_DESC="Install Joomla with one page (a menu with one link) and modules like Latest Article, Login Form." @@ -251,10 +251,8 @@ INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC Off" INSTL_MAGIC_QUOTES_RUNTIME="Magic Quotes Runtime" INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language is Default" INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload Off" -INSTL_MCRYPT_SUPPORT_AVAILABLE="Mcrypt Support" INSTL_NOTICEMBLANGNOTDEFAULT="PHP mbstring language is not set to neutral. This can be set locally by entering php_value mbstring.language neutral in your .htaccess file." INSTL_NOTICEMBSTRINGOVERLOAD="PHP mbstring function overload is set. This can be turned off locally by entering php_value mbstring.func_overload 0 in your .htaccess file." -INSTL_NOTICEMCRYPTNOTAVAILABLE="Warning! PHP mcrypt extension should be installed or enabled. Without this, some features of Joomla will not be available." INSTL_NOTICEYOUCANSTILLINSTALL="
    You can still continue the installation as the configuration settings will be displayed at the end. You will have to manually upload the code. Select in the text area to highlight all of the code and then paste into a new text file. Name this file 'configuration.php' and upload it to your site root folder." INSTL_OUTPUT_BUFFERING="Output Buffering" INSTL_PARSE_INI_FILE_AVAILABLE="INI Parser Support" diff --git a/installation/language/en-GB/en-GB.xml b/installation/language/en-GB/en-GB.xml index ea0721b8441db..7e1c76cb730e0 100644 --- a/installation/language/en-GB/en-GB.xml +++ b/installation/language/en-GB/en-GB.xml @@ -1,10 +1,10 @@ English (United Kingdom) - 3.8.2 - October 2017 + 3.8.4 + December 2017 Joomla! Project Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/model/database.php b/installation/model/database.php index 2fb9f26bcf832..ce33cc231dd21 100644 --- a/installation/model/database.php +++ b/installation/model/database.php @@ -177,7 +177,7 @@ public function initialise($options) if ($shouldCheckLocalhost && !in_array($options->db_host, $localhost)) { $remoteDbFileTestsPassed = JFactory::getSession()->get('remoteDbFileTestsPassed', false); - + // When all checks have been passed we don't need to do this here again. if ($remoteDbFileTestsPassed === false) { @@ -238,7 +238,7 @@ public function initialise($options) { // Add the general message JFactory::getApplication()->enqueueMessage($generalRemoteDatabaseMessage, 'warning'); - + JFactory::getApplication()->enqueueMessage( JText::sprintf( 'INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE', diff --git a/installation/model/setup.php b/installation/model/setup.php index 1ad0ba2777fc3..0089d22e3d6e5 100644 --- a/installation/model/setup.php +++ b/installation/model/setup.php @@ -296,13 +296,6 @@ public function getPhpOptions() $option->notice = null; $options[] = $option; - // Check for mcrypt support - $option = new stdClass; - $option->label = JText::_('INSTL_MCRYPT_SUPPORT_AVAILABLE'); - $option->state = is_callable('mcrypt_encrypt'); - $option->notice = $option->state ? null : JText::_('INSTL_NOTICEMCRYPTNOTAVAILABLE'); - $options[] = $option; - // Check for configuration file writable. $writable = (is_writable(JPATH_CONFIGURATION . '/configuration.php') || (!file_exists(JPATH_CONFIGURATION . '/configuration.php') && is_writable(JPATH_ROOT))); diff --git a/installation/sql/mysql/joomla.sql b/installation/sql/mysql/joomla.sql index deb3f8268a9fc..cee91087e06e4 100644 --- a/installation/sql/mysql/joomla.sql +++ b/installation/sql/mysql/joomla.sql @@ -353,7 +353,8 @@ CREATE TABLE IF NOT EXISTS `#__content` ( KEY `idx_createdby` (`created_by`), KEY `idx_featured_catid` (`featured`,`catid`), KEY `idx_language` (`language`), - KEY `idx_xreference` (`xreference`) + KEY `idx_xreference` (`xreference`), + KEY `idx_alias` (`alias`(191)) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci; -- -------------------------------------------------------- diff --git a/installation/sql/mysql/sample_learn.sql b/installation/sql/mysql/sample_learn.sql index 0b19d6e725b16..92f7febca397f 100644 --- a/installation/sql/mysql/sample_learn.sql +++ b/installation/sql/mysql/sample_learn.sql @@ -287,7 +287,7 @@ INSERT INTO `#__contact_details` (`id`, `name`, `alias`, `con_position`, `addres -- INSERT INTO `#__content` (`id`, `asset_id`, `title`, `alias`, `introtext`, `fulltext`, `state`, `catid`, `created`, `created_by`, `created_by_alias`, `modified`, `modified_by`, `checked_out`, `checked_out_time`, `publish_up`, `publish_down`, `images`, `urls`, `attribs`, `version`, `ordering`, `metakey`, `metadesc`, `access`, `hits`, `metadata`, `featured`, `language`, `xreference`) VALUES -(1, 89, 'Administrator Components', 'administrator-components', '

    All components are also used in the administrator area of your website. In addition to the ones listed here, there are components in the administrator that do not have direct front end displays, but do help shape your site. The most important ones for most users are

    • Media Manager
    • Extensions Manager
    • Menu Manager
    • Global Configuration
    • Banners
    • Redirect

    Media Manager

    The media manager component lets you upload and insert images into content throughout your site. Optionally, you can enable the flash uploader which will allow you to to upload multiple images. Help

    Extensions Manager

    The extensions manager lets you install, update, uninstall and manage all of your extensions. The extensions manager has been extensively redesigned, although the core install and uninstall functionality remains the same as in Joomla! 1.5. Help

    Menu Manager

    The menu manager lets you create the menus you see displayed on your site. It also allows you to assign modules and template styles to specific menu links. Help

    Global Configuration

    The global configuration is where the site administrator configures things such as whether search engine friendly urls are enabled, the site meta data (descriptive text used by search engines and indexers) and other functions. For many beginning users simply leaving the settings on default is a good way to begin, although when your site is ready for the public you will want to change the meta data to match its content. Help

    Banners

    The banners component provides a simple way to display a rotating image in a module and, if you wish to have advertising, a way to track the number of times an image is viewed and clicked. Help


    Redirect

    The redirect component is used to manage broken links that produce Page Not Found (404) errors. If enabled it will allow you to redirect broken links to specific pages. It can also be used to manage migration related URL changes. Help

    ', '', 1, 21, '2011-01-01 00:00:01', 123, 'Joomla', '0000-00-00 00:00:00', 0, 0, '0000-00-00 00:00:00', '2011-01-01 00:00:01', '0000-00-00 00:00:00', '{"image_intro":"","float_intro":"","image_intro_alt":"","image_intro_caption":"","image_fulltext":"","float_fulltext":"","image_fulltext_alt":"","image_fulltext_caption":""}', '{"urla":"","urlatext":"","targeta":"","urlb":"","urlbtext":"","targetb":"","urlc":"","urlctext":"","targetc":""}', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","alternative_readmore":"","article_layout":"","show_publishing_options":"","show_article_options":"","show_urls_images_backend":"","show_urls_images_frontend":""}', 1, 7, '', '', 1, 0, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', ''), +(1, 89, 'Administrator Components', 'administrator-components', '

    All components are also used in the administrator area of your website. In addition to the ones listed here, there are components in the administrator that do not have direct front end displays, but do help shape your site. The most important ones for most users are

    • Media Manager
    • Extensions Manager
    • Menu Manager
    • Global Configuration
    • Banners
    • Redirect

    Media Manager

    The media manager component lets you upload and insert images into content throughout your site. Optionally, you can enable the flash uploader which will allow you to to upload multiple images. Help

    Extensions Manager

    The extensions manager lets you install, update, uninstall and manage all of your extensions. The extensions manager has been extensively redesigned, although the core install and uninstall functionality remains the same as in Joomla! 1.5. Help

    Menu Manager

    The menu manager lets you create the menus you see displayed on your site. It also allows you to assign modules and template styles to specific menu links. Help

    Global Configuration

    The global configuration is where the site administrator configures things such as whether search engine friendly urls are enabled, the site metadata (descriptive text used by search engines and indexers) and other functions. For many beginning users simply leaving the settings on default is a good way to begin, although when your site is ready for the public you will want to change the metadata to match its content. Help

    Banners

    The banners component provides a simple way to display a rotating image in a module and, if you wish to have advertising, a way to track the number of times an image is viewed and clicked. Help


    Redirect

    The redirect component is used to manage broken links that produce Page Not Found (404) errors. If enabled it will allow you to redirect broken links to specific pages. It can also be used to manage migration related URL changes. Help

    ', '', 1, 21, '2011-01-01 00:00:01', 123, 'Joomla', '0000-00-00 00:00:00', 0, 0, '0000-00-00 00:00:00', '2011-01-01 00:00:01', '0000-00-00 00:00:00', '{"image_intro":"","float_intro":"","image_intro_alt":"","image_intro_caption":"","image_fulltext":"","float_fulltext":"","image_fulltext_alt":"","image_fulltext_caption":""}', '{"urla":"","urlatext":"","targeta":"","urlb":"","urlbtext":"","targetb":"","urlc":"","urlctext":"","targetc":""}', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","alternative_readmore":"","article_layout":"","show_publishing_options":"","show_article_options":"","show_urls_images_backend":"","show_urls_images_frontend":""}', 1, 7, '', '', 1, 0, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', ''), (2, 90, 'Archive Module', 'archive-module', '

    This module shows a list of the calendar months containing archived articles. After you have changed the status of an article to archived, this list will be automatically generated. Help

    {loadmodule articles_archive,Archived Articles}
    ', '', 1, 64, '2011-01-01 00:00:01', 123, 'Joomla', '0000-00-00 00:00:00', 0, 0, '0000-00-00 00:00:00', '2011-01-01 00:00:01', '0000-00-00 00:00:00', '', '', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","page_title":"","alternative_readmore":"","layout":""}', 1, 5, 'modules, content', '', 1, 0, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', ''), (3, 91, 'Article Categories Module', 'article-categories-module', '

    This module displays a list of categories from one parent category. Help

    {loadmodule articles_categories,Articles Categories}

    ', '', 1, 64, '2011-01-01 00:00:01', 123, 'Joomla', '0000-00-00 00:00:00', 0, 0, '0000-00-00 00:00:00', '2011-01-01 00:00:01', '0000-00-00 00:00:00', '', '', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","page_title":"","alternative_readmore":"","layout":""}', 1, 6, 'modules, content', '', 1, 0, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', ''), (4, 92, 'Articles Category Module', 'articles-category-module', '

    This module allows you to display the articles in a specific category. Help

    {loadmodule articles_category,Articles Category}
    ', '', 1, 64, '2011-01-01 00:00:01', 123, 'Joomla', '0000-00-00 00:00:00', 0, 0, '0000-00-00 00:00:00', '2011-01-01 00:00:01', '0000-00-00 00:00:00', '', '', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","page_title":"","alternative_readmore":"","layout":""}', 1, 7, '', 'articles,content', 1, 0, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', ''), diff --git a/installation/sql/mysql/sample_testing.sql b/installation/sql/mysql/sample_testing.sql index 48de4962b72cd..77cb9fb9e3ad1 100644 --- a/installation/sql/mysql/sample_testing.sql +++ b/installation/sql/mysql/sample_testing.sql @@ -292,7 +292,7 @@ INSERT INTO `#__contact_details` (`id`, `name`, `alias`, `con_position`, `addres -- INSERT INTO `#__content` (`id`, `asset_id`, `title`, `alias`, `introtext`, `fulltext`, `state`, `catid`, `created`, `created_by`, `created_by_alias`, `modified`, `modified_by`, `checked_out`, `checked_out_time`, `publish_up`, `publish_down`, `images`, `urls`, `attribs`, `version`, `ordering`, `metakey`, `metadesc`, `access`, `hits`, `metadata`, `featured`, `language`, `xreference`) VALUES -(1, 89, 'Administrator Components', 'administrator-components', '

    All components are also used in the administrator area of your website. In addition to the ones listed here, there are components in the administrator that do not have direct front end displays, but do help shape your site. The most important ones for most users are

    • Media Manager
    • Extensions Manager
    • Menu Manager
    • Global Configuration
    • Banners
    • Redirect

    Media Manager

    The media manager component lets you upload and insert images into content throughout your site. Optionally, you can enable the flash uploader which will allow you to to upload multiple images. Help

    Extensions Manager

    The extensions manager lets you install, update, uninstall and manage all of your extensions. The extensions manager has been extensively redesigned, although the core install and uninstall functionality remains the same as in Joomla! 1.5. Help

    Menu Manager

    The menu manager lets you create the menus you see displayed on your site. It also allows you to assign modules and template styles to specific menu links. Help

    Global Configuration

    The global configuration is where the site administrator configures things such as whether search engine friendly urls are enabled, the site meta data (descriptive text used by search engines and indexers) and other functions. For many beginning users simply leaving the settings on default is a good way to begin, although when your site is ready for the public you will want to change the meta data to match its content. Help

    Banners

    The banners component provides a simple way to display a rotating image in a module and, if you wish to have advertising, a way to track the number of times an image is viewed and clicked. Help


    Redirect

    The redirect component is used to manage broken links that produce Page Not Found (404) errors. If enabled it will allow you to redirect broken links to specific pages. It can also be used to manage migration related URL changes. Help

    ', '', 1, 21, '2011-01-01 00:00:01', 42, 'Joomla', '0000-00-00 00:00:00', 0, 0, '0000-00-00 00:00:00', '2011-01-01 00:00:01', '0000-00-00 00:00:00', '{"image_intro":"","float_intro":"","image_intro_alt":"","image_intro_caption":"","image_fulltext":"","float_fulltext":"","image_fulltext_alt":"","image_fulltext_caption":""}', '{"urla":"","urlatext":"","targeta":"","urlb":"","urlbtext":"","targetb":"","urlc":"","urlctext":"","targetc":""}', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","alternative_readmore":"","article_layout":"","show_publishing_options":"","show_article_options":"","show_urls_images_backend":"","show_urls_images_frontend":""}', 1, 7, '', '', 1, 0, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', ''), +(1, 89, 'Administrator Components', 'administrator-components', '

    All components are also used in the administrator area of your website. In addition to the ones listed here, there are components in the administrator that do not have direct front end displays, but do help shape your site. The most important ones for most users are

    • Media Manager
    • Extensions Manager
    • Menu Manager
    • Global Configuration
    • Banners
    • Redirect

    Media Manager

    The media manager component lets you upload and insert images into content throughout your site. Optionally, you can enable the flash uploader which will allow you to to upload multiple images. Help

    Extensions Manager

    The extensions manager lets you install, update, uninstall and manage all of your extensions. The extensions manager has been extensively redesigned, although the core install and uninstall functionality remains the same as in Joomla! 1.5. Help

    Menu Manager

    The menu manager lets you create the menus you see displayed on your site. It also allows you to assign modules and template styles to specific menu links. Help

    Global Configuration

    The global configuration is where the site administrator configures things such as whether search engine friendly urls are enabled, the site metadata (descriptive text used by search engines and indexers) and other functions. For many beginning users simply leaving the settings on default is a good way to begin, although when your site is ready for the public you will want to change the metadata to match its content. Help

    Banners

    The banners component provides a simple way to display a rotating image in a module and, if you wish to have advertising, a way to track the number of times an image is viewed and clicked. Help


    Redirect

    The redirect component is used to manage broken links that produce Page Not Found (404) errors. If enabled it will allow you to redirect broken links to specific pages. It can also be used to manage migration related URL changes. Help

    ', '', 1, 21, '2011-01-01 00:00:01', 42, 'Joomla', '0000-00-00 00:00:00', 0, 0, '0000-00-00 00:00:00', '2011-01-01 00:00:01', '0000-00-00 00:00:00', '{"image_intro":"","float_intro":"","image_intro_alt":"","image_intro_caption":"","image_fulltext":"","float_fulltext":"","image_fulltext_alt":"","image_fulltext_caption":""}', '{"urla":"","urlatext":"","targeta":"","urlb":"","urlbtext":"","targetb":"","urlc":"","urlctext":"","targetc":""}', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","alternative_readmore":"","article_layout":"","show_publishing_options":"","show_article_options":"","show_urls_images_backend":"","show_urls_images_frontend":""}', 1, 7, '', '', 1, 0, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', ''), (2, 90, 'Archive Module', 'archive-module', '

    This module shows a list of the calendar months containing archived articles. After you have changed the status of an article to archived, this list will be automatically generated. Help

    {loadmodule articles_archive,Archived Articles}
    ', '', 1, 64, '2011-01-01 00:00:01', 42, 'Joomla', '0000-00-00 00:00:00', 0, 0, '0000-00-00 00:00:00', '2011-01-01 00:00:01', '0000-00-00 00:00:00', '', '', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","page_title":"","alternative_readmore":"","layout":""}', 1, 5, 'modules, content', '', 1, 0, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', ''), (3, 91, 'Article Categories Module', 'article-categories-module', '

    This module displays a list of categories from one parent category. Help

    {loadmodule articles_categories,Articles Categories}

    ', '', 1, 64, '2011-01-01 00:00:01', 42, 'Joomla', '0000-00-00 00:00:00', 0, 0, '0000-00-00 00:00:00', '2011-01-01 00:00:01', '0000-00-00 00:00:00', '', '', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","page_title":"","alternative_readmore":"","layout":""}', 1, 6, 'modules, content', '', 1, 0, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', ''), (4, 92, 'Articles Category Module', 'articles-category-module', '

    This module allows you to display the articles in a specific category. Help

    {loadmodule articles_category,Articles Category}
    ', '', 1, 64, '2011-01-01 00:00:01', 42, 'Joomla', '0000-00-00 00:00:00', 0, 0, '0000-00-00 00:00:00', '2011-01-01 00:00:01', '0000-00-00 00:00:00', '', '', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","page_title":"","alternative_readmore":"","layout":""}', 1, 7, '', 'articles,content', 1, 0, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', ''), diff --git a/installation/sql/postgresql/joomla.sql b/installation/sql/postgresql/joomla.sql index e7dd1d17d6e5d..23927ccb4de1a 100644 --- a/installation/sql/postgresql/joomla.sql +++ b/installation/sql/postgresql/joomla.sql @@ -361,12 +361,14 @@ CREATE INDEX "#__content_idx_createdby" ON "#__content" ("created_by"); CREATE INDEX "#__content_idx_featured_catid" ON "#__content" ("featured", "catid"); CREATE INDEX "#__content_idx_language" ON "#__content" ("language"); CREATE INDEX "#__content_idx_xreference" ON "#__content" ("xreference"); +CREATE INDEX "#__content_idx_alias" ON "#__content" ("alias"); COMMENT ON COLUMN "#__content"."asset_id" IS 'FK to the #__assets table.'; COMMENT ON COLUMN "#__content"."featured" IS 'Set if article is featured.'; COMMENT ON COLUMN "#__content"."language" IS 'The language code for the article.'; COMMENT ON COLUMN "#__content"."xreference" IS 'A reference to enable linkages to external data sets.'; + -- -- Table structure for table `#__content_frontpage` -- diff --git a/installation/sql/postgresql/sample_learn.sql b/installation/sql/postgresql/sample_learn.sql index 40791c8ce29ce..2c5eebc7c9e61 100644 --- a/installation/sql/postgresql/sample_learn.sql +++ b/installation/sql/postgresql/sample_learn.sql @@ -293,7 +293,7 @@ SELECT setval('#__contact_details_id_seq', max(id)) FROM "#__contact_details"; -- INSERT INTO "#__content" ("id", "asset_id", "title", "alias", "introtext", "fulltext", "state", "catid", "created", "created_by", "created_by_alias", "modified", "modified_by", "checked_out", "checked_out_time", "publish_up", "publish_down", "images", "urls", "attribs", "version", "ordering", "metakey", "metadesc", "access", "hits", "metadata", "featured", "language", "xreference") VALUES -(1, 89, 'Administrator Components', 'administrator-components', '

    All components are also used in the administrator area of your website. In addition to the ones listed here, there are components in the administrator that do not have direct front end displays, but do help shape your site. The most important ones for most users are

    • Media Manager
    • Extensions Manager
    • Menu Manager
    • Global Configuration
    • Banners
    • Redirect

    Media Manager

    The media manager component lets you upload and insert images into content throughout your site. Optionally, you can enable the flash uploader which will allow you to to upload multiple images. Help

    Extensions Manager

    The extensions manager lets you install, update, uninstall and manage all of your extensions. The extensions manager has been extensively redesigned, although the core install and uninstall functionality remains the same as in Joomla! 1.5. Help

    Menu Manager

    The menu manager lets you create the menus you see displayed on your site. It also allows you to assign modules and template styles to specific menu links. Help

    Global Configuration

    The global configuration is where the site administrator configures things such as whether search engine friendly urls are enabled, the site meta data (descriptive text used by search engines and indexers) and other functions. For many beginning users simply leaving the settings on default is a good way to begin, although when your site is ready for the public you will want to change the meta data to match its content. Help

    Banners

    The banners component provides a simple way to display a rotating image in a module and, if you wish to have advertising, a way to track the number of times an image is viewed and clicked. Help


    Redirect

    The redirect component is used to manage broken links that produce Page Not Found (404) errors. If enabled it will allow you to redirect broken links to specific pages. It can also be used to manage migration related URL changes. Help

    ', '', 1, 21, '2011-01-01 00:00:01', 123, 'Joomla', '1970-01-01 00:00:00', 0, 0, '1970-01-01 00:00:00', '2011-01-01 00:00:01', '1970-01-01 00:00:00', '{"image_intro":"","float_intro":"","image_intro_alt":"","image_intro_caption":"","image_fulltext":"","float_fulltext":"","image_fulltext_alt":"","image_fulltext_caption":""}', '{"urla":"","urlatext":"","targeta":"","urlb":"","urlbtext":"","targetb":"","urlc":"","urlctext":"","targetc":""}', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","alternative_readmore":"","article_layout":"","show_publishing_options":"","show_article_options":"","show_urls_images_backend":"","show_urls_images_frontend":""}', 1, 7, '', '', 1, 0, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', ''), +(1, 89, 'Administrator Components', 'administrator-components', '

    All components are also used in the administrator area of your website. In addition to the ones listed here, there are components in the administrator that do not have direct front end displays, but do help shape your site. The most important ones for most users are

    • Media Manager
    • Extensions Manager
    • Menu Manager
    • Global Configuration
    • Banners
    • Redirect

    Media Manager

    The media manager component lets you upload and insert images into content throughout your site. Optionally, you can enable the flash uploader which will allow you to to upload multiple images. Help

    Extensions Manager

    The extensions manager lets you install, update, uninstall and manage all of your extensions. The extensions manager has been extensively redesigned, although the core install and uninstall functionality remains the same as in Joomla! 1.5. Help

    Menu Manager

    The menu manager lets you create the menus you see displayed on your site. It also allows you to assign modules and template styles to specific menu links. Help

    Global Configuration

    The global configuration is where the site administrator configures things such as whether search engine friendly urls are enabled, the site metadata (descriptive text used by search engines and indexers) and other functions. For many beginning users simply leaving the settings on default is a good way to begin, although when your site is ready for the public you will want to change the metadata to match its content. Help

    Banners

    The banners component provides a simple way to display a rotating image in a module and, if you wish to have advertising, a way to track the number of times an image is viewed and clicked. Help


    Redirect

    The redirect component is used to manage broken links that produce Page Not Found (404) errors. If enabled it will allow you to redirect broken links to specific pages. It can also be used to manage migration related URL changes. Help

    ', '', 1, 21, '2011-01-01 00:00:01', 123, 'Joomla', '1970-01-01 00:00:00', 0, 0, '1970-01-01 00:00:00', '2011-01-01 00:00:01', '1970-01-01 00:00:00', '{"image_intro":"","float_intro":"","image_intro_alt":"","image_intro_caption":"","image_fulltext":"","float_fulltext":"","image_fulltext_alt":"","image_fulltext_caption":""}', '{"urla":"","urlatext":"","targeta":"","urlb":"","urlbtext":"","targetb":"","urlc":"","urlctext":"","targetc":""}', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","alternative_readmore":"","article_layout":"","show_publishing_options":"","show_article_options":"","show_urls_images_backend":"","show_urls_images_frontend":""}', 1, 7, '', '', 1, 0, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', ''), (2, 90, 'Archive Module', 'archive-module', '

    This module shows a list of the calendar months containing archived articles. After you have changed the status of an article to archived, this list will be automatically generated. Help

    {loadmodule articles_archive,Archived Articles}
    ', '', 1, 64, '2011-01-01 00:00:01', 123, 'Joomla', '1970-01-01 00:00:00', 0, 0, '1970-01-01 00:00:00', '2011-01-01 00:00:01', '1970-01-01 00:00:00', '', '', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","page_title":"","alternative_readmore":"","layout":""}', 1, 5, 'modules, content', '', 1, 0, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', ''), (3, 91, 'Article Categories Module', 'article-categories-module', '

    This module displays a list of categories from one parent category. Help

    {loadmodule articles_categories,Articles Categories}

    ', '', 1, 64, '2011-01-01 00:00:01', 123, 'Joomla', '1970-01-01 00:00:00', 0, 0, '1970-01-01 00:00:00', '2011-01-01 00:00:01', '1970-01-01 00:00:00', '', '', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","page_title":"","alternative_readmore":"","layout":""}', 1, 6, 'modules, content', '', 1, 0, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', ''), (4, 92, 'Articles Category Module', 'articles-category-module', '

    This module allows you to display the articles in a specific category. Help

    {loadmodule articles_category,Articles Category}
    ', '', 1, 64, '2011-01-01 00:00:01', 123, 'Joomla', '1970-01-01 00:00:00', 0, 0, '1970-01-01 00:00:00', '2011-01-01 00:00:01', '1970-01-01 00:00:00', '', '', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","page_title":"","alternative_readmore":"","layout":""}', 1, 7, '', 'articles,content', 1, 0, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', ''), diff --git a/installation/sql/postgresql/sample_testing.sql b/installation/sql/postgresql/sample_testing.sql index d72e5d5208b62..5c1b591054e6e 100644 --- a/installation/sql/postgresql/sample_testing.sql +++ b/installation/sql/postgresql/sample_testing.sql @@ -298,7 +298,7 @@ SELECT setval('#__contact_details_id_seq', max(id)) FROM "#__contact_details"; -- INSERT INTO "#__content" ("id", "asset_id", "title", "alias", "introtext", "fulltext", "state", "catid", "created", "created_by", "created_by_alias", "modified", "modified_by", "checked_out", "checked_out_time", "publish_up", "publish_down", "images", "urls", "attribs", "version", "ordering", "metakey", "metadesc", "access", "hits", "metadata", "featured", "language", "xreference") VALUES -(1, 89, 'Administrator Components', 'administrator-components', '

    All components are also used in the administrator area of your website. In addition to the ones listed here, there are components in the administrator that do not have direct front end displays, but do help shape your site. The most important ones for most users are

    • Media Manager
    • Extensions Manager
    • Menu Manager
    • Global Configuration
    • Banners
    • Redirect

    Media Manager

    The media manager component lets you upload and insert images into content throughout your site. Optionally, you can enable the flash uploader which will allow you to to upload multiple images. Help

    Extensions Manager

    The extensions manager lets you install, update, uninstall and manage all of your extensions. The extensions manager has been extensively redesigned, although the core install and uninstall functionality remains the same as in Joomla! 1.5. Help

    Menu Manager

    The menu manager lets you create the menus you see displayed on your site. It also allows you to assign modules and template styles to specific menu links. Help

    Global Configuration

    The global configuration is where the site administrator configures things such as whether search engine friendly urls are enabled, the site meta data (descriptive text used by search engines and indexers) and other functions. For many beginning users simply leaving the settings on default is a good way to begin, although when your site is ready for the public you will want to change the meta data to match its content. Help

    Banners

    The banners component provides a simple way to display a rotating image in a module and, if you wish to have advertising, a way to track the number of times an image is viewed and clicked. Help


    Redirect

    The redirect component is used to manage broken links that produce Page Not Found (404) errors. If enabled it will allow you to redirect broken links to specific pages. It can also be used to manage migration related URL changes. Help

    ', '', 1, 21, '2011-01-01 00:00:01', 42, 'Joomla', '1970-01-01 00:00:00', 0, 0, '1970-01-01 00:00:00', '2011-01-01 00:00:01', '1970-01-01 00:00:00', '{"image_intro":"","float_intro":"","image_intro_alt":"","image_intro_caption":"","image_fulltext":"","float_fulltext":"","image_fulltext_alt":"","image_fulltext_caption":""}', '{"urla":"","urlatext":"","targeta":"","urlb":"","urlbtext":"","targetb":"","urlc":"","urlctext":"","targetc":""}', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","alternative_readmore":"","article_layout":"","show_publishing_options":"","show_article_options":"","show_urls_images_backend":"","show_urls_images_frontend":""}', 1, 7, '', '', 1, 0, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', ''), +(1, 89, 'Administrator Components', 'administrator-components', '

    All components are also used in the administrator area of your website. In addition to the ones listed here, there are components in the administrator that do not have direct front end displays, but do help shape your site. The most important ones for most users are

    • Media Manager
    • Extensions Manager
    • Menu Manager
    • Global Configuration
    • Banners
    • Redirect

    Media Manager

    The media manager component lets you upload and insert images into content throughout your site. Optionally, you can enable the flash uploader which will allow you to to upload multiple images. Help

    Extensions Manager

    The extensions manager lets you install, update, uninstall and manage all of your extensions. The extensions manager has been extensively redesigned, although the core install and uninstall functionality remains the same as in Joomla! 1.5. Help

    Menu Manager

    The menu manager lets you create the menus you see displayed on your site. It also allows you to assign modules and template styles to specific menu links. Help

    Global Configuration

    The global configuration is where the site administrator configures things such as whether search engine friendly urls are enabled, the site metadata (descriptive text used by search engines and indexers) and other functions. For many beginning users simply leaving the settings on default is a good way to begin, although when your site is ready for the public you will want to change the metadata to match its content. Help

    Banners

    The banners component provides a simple way to display a rotating image in a module and, if you wish to have advertising, a way to track the number of times an image is viewed and clicked. Help


    Redirect

    The redirect component is used to manage broken links that produce Page Not Found (404) errors. If enabled it will allow you to redirect broken links to specific pages. It can also be used to manage migration related URL changes. Help

    ', '', 1, 21, '2011-01-01 00:00:01', 42, 'Joomla', '1970-01-01 00:00:00', 0, 0, '1970-01-01 00:00:00', '2011-01-01 00:00:01', '1970-01-01 00:00:00', '{"image_intro":"","float_intro":"","image_intro_alt":"","image_intro_caption":"","image_fulltext":"","float_fulltext":"","image_fulltext_alt":"","image_fulltext_caption":""}', '{"urla":"","urlatext":"","targeta":"","urlb":"","urlbtext":"","targetb":"","urlc":"","urlctext":"","targetc":""}', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","alternative_readmore":"","article_layout":"","show_publishing_options":"","show_article_options":"","show_urls_images_backend":"","show_urls_images_frontend":""}', 1, 7, '', '', 1, 0, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', ''), (2, 90, 'Archive Module', 'archive-module', '

    This module shows a list of the calendar months containing archived articles. After you have changed the status of an article to archived, this list will be automatically generated. Help

    {loadmodule articles_archive,Archived Articles}
    ', '', 1, 64, '2011-01-01 00:00:01', 42, 'Joomla', '1970-01-01 00:00:00', 0, 0, '1970-01-01 00:00:00', '2011-01-01 00:00:01', '1970-01-01 00:00:00', '', '', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","page_title":"","alternative_readmore":"","layout":""}', 1, 5, 'modules, content', '', 1, 0, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', ''), (3, 91, 'Article Categories Module', 'article-categories-module', '

    This module displays a list of categories from one parent category. Help

    {loadmodule articles_categories,Articles Categories}

    ', '', 1, 64, '2011-01-01 00:00:01', 42, 'Joomla', '1970-01-01 00:00:00', 0, 0, '1970-01-01 00:00:00', '2011-01-01 00:00:01', '1970-01-01 00:00:00', '', '', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","page_title":"","alternative_readmore":"","layout":""}', 1, 6, 'modules, content', '', 1, 0, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', ''), (4, 92, 'Articles Category Module', 'articles-category-module', '

    This module allows you to display the articles in a specific category. Help

    {loadmodule articles_category,Articles Category}
    ', '', 1, 64, '2011-01-01 00:00:01', 42, 'Joomla', '1970-01-01 00:00:00', 0, 0, '1970-01-01 00:00:00', '2011-01-01 00:00:01', '1970-01-01 00:00:00', '', '', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","page_title":"","alternative_readmore":"","layout":""}', 1, 7, '', 'articles,content', 1, 0, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', ''), diff --git a/installation/sql/sqlazure/joomla.sql b/installation/sql/sqlazure/joomla.sql index 44591bcd37402..46100c6527642 100644 --- a/installation/sql/sqlazure/joomla.sql +++ b/installation/sql/sqlazure/joomla.sql @@ -540,6 +540,11 @@ CREATE NONCLUSTERED INDEX "idx_xreference" ON "#__content" "xreference" ASC )WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF); +CREATE NONCLUSTERED INDEX "idx_alias" ON "#__content" +( + "alias" ASC +)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF); + -- -- Table structure for table `#__content_frontpage` -- diff --git a/installation/sql/sqlazure/sample_learn.sql b/installation/sql/sqlazure/sample_learn.sql index c56445df752a0..563a950e451c6 100644 --- a/installation/sql/sqlazure/sample_learn.sql +++ b/installation/sql/sqlazure/sample_learn.sql @@ -305,7 +305,7 @@ SET IDENTITY_INSERT "#__contact_details" OFF; SET IDENTITY_INSERT "#__content" ON; INSERT INTO "#__content" ("id", "asset_id", "title", "alias", "introtext", "fulltext", "state", "catid", "created", "created_by", "created_by_alias", "modified", "modified_by", "checked_out", "checked_out_time", "publish_up", "publish_down", "images", "urls", "attribs", "version", "ordering", "metakey", "metadesc", "access", "hits", "metadata", "featured", "language", "xreference") VALUES -(1, 89, 'Administrator Components', 'administrator-components', '

    All components are also used in the administrator area of your website. In addition to the ones listed here, there are components in the administrator that do not have direct front end displays, but do help shape your site. The most important ones for most users are

    • Media Manager
    • Extensions Manager
    • Menu Manager
    • Global Configuration
    • Banners
    • Redirect

    Media Manager

    The media manager component lets you upload and insert images into content throughout your site. Optionally, you can enable the flash uploader which will allow you to to upload multiple images. Help

    Extensions Manager

    The extensions manager lets you install, update, uninstall and manage all of your extensions. The extensions manager has been extensively redesigned, although the core install and uninstall functionality remains the same as in Joomla! 1.5. Help

    Menu Manager

    The menu manager lets you create the menus you see displayed on your site. It also allows you to assign modules and template styles to specific menu links. Help

    Global Configuration

    The global configuration is where the site administrator configures things such as whether search engine friendly urls are enabled, the site meta data (descriptive text used by search engines and indexers) and other functions. For many beginning users simply leaving the settings on default is a good way to begin, although when your site is ready for the public you will want to change the meta data to match its content. Help

    Banners

    The banners component provides a simple way to display a rotating image in a module and, if you wish to have advertising, a way to track the number of times an image is viewed and clicked. Help


    Redirect

    The redirect component is used to manage broken links that produce Page Not Found (404) errors. If enabled it will allow you to redirect broken links to specific pages. It can also be used to manage migration related URL changes. Help

    ', '', 1, 21, '2011-01-01 00:00:01', 123, 'Joomla', '1900-01-01 00:00:00', 0, 0, '1900-01-01 00:00:00', '2011-01-01 00:00:01', '1900-01-01 00:00:00', '{"image_intro":"","float_intro":"","image_intro_alt":"","image_intro_caption":"","image_fulltext":"","float_fulltext":"","image_fulltext_alt":"","image_fulltext_caption":""}', '{"urla":"","urlatext":"","targeta":"","urlb":"","urlbtext":"","targetb":"","urlc":"","urlctext":"","targetc":""}', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","alternative_readmore":"","article_layout":"","show_publishing_options":"","show_article_options":"","show_urls_images_backend":"","show_urls_images_frontend":""}', 1, 7, '', '', 1, 0, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', ''), +(1, 89, 'Administrator Components', 'administrator-components', '

    All components are also used in the administrator area of your website. In addition to the ones listed here, there are components in the administrator that do not have direct front end displays, but do help shape your site. The most important ones for most users are

    • Media Manager
    • Extensions Manager
    • Menu Manager
    • Global Configuration
    • Banners
    • Redirect

    Media Manager

    The media manager component lets you upload and insert images into content throughout your site. Optionally, you can enable the flash uploader which will allow you to to upload multiple images. Help

    Extensions Manager

    The extensions manager lets you install, update, uninstall and manage all of your extensions. The extensions manager has been extensively redesigned, although the core install and uninstall functionality remains the same as in Joomla! 1.5. Help

    Menu Manager

    The menu manager lets you create the menus you see displayed on your site. It also allows you to assign modules and template styles to specific menu links. Help

    Global Configuration

    The global configuration is where the site administrator configures things such as whether search engine friendly urls are enabled, the site metadata (descriptive text used by search engines and indexers) and other functions. For many beginning users simply leaving the settings on default is a good way to begin, although when your site is ready for the public you will want to change the metadata to match its content. Help

    Banners

    The banners component provides a simple way to display a rotating image in a module and, if you wish to have advertising, a way to track the number of times an image is viewed and clicked. Help


    Redirect

    The redirect component is used to manage broken links that produce Page Not Found (404) errors. If enabled it will allow you to redirect broken links to specific pages. It can also be used to manage migration related URL changes. Help

    ', '', 1, 21, '2011-01-01 00:00:01', 123, 'Joomla', '1900-01-01 00:00:00', 0, 0, '1900-01-01 00:00:00', '2011-01-01 00:00:01', '1900-01-01 00:00:00', '{"image_intro":"","float_intro":"","image_intro_alt":"","image_intro_caption":"","image_fulltext":"","float_fulltext":"","image_fulltext_alt":"","image_fulltext_caption":""}', '{"urla":"","urlatext":"","targeta":"","urlb":"","urlbtext":"","targetb":"","urlc":"","urlctext":"","targetc":""}', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","alternative_readmore":"","article_layout":"","show_publishing_options":"","show_article_options":"","show_urls_images_backend":"","show_urls_images_frontend":""}', 1, 7, '', '', 1, 0, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', ''), (2, 90, 'Archive Module', 'archive-module', '

    This module shows a list of the calendar months containing archived articles. After you have changed the status of an article to archived, this list will be automatically generated. Help

    {loadmodule articles_archive,Archived Articles}
    ', '', 1, 64, '2011-01-01 00:00:01', 123, 'Joomla', '1900-01-01 00:00:00', 0, 0, '1900-01-01 00:00:00', '2011-01-01 00:00:01', '1900-01-01 00:00:00', '', '', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","page_title":"","alternative_readmore":"","layout":""}', 1, 5, 'modules, content', '', 1, 0, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', ''), (3, 91, 'Article Categories Module', 'article-categories-module', '

    This module displays a list of categories from one parent category. Help

    {loadmodule articles_categories,Articles Categories}

    ', '', 1, 64, '2011-01-01 00:00:01', 123, 'Joomla', '1900-01-01 00:00:00', 0, 0, '1900-01-01 00:00:00', '2011-01-01 00:00:01', '1900-01-01 00:00:00', '', '', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","page_title":"","alternative_readmore":"","layout":""}', 1, 6, 'modules, content', '', 1, 0, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', ''), (4, 92, 'Articles Category Module', 'articles-category-module', '

    This module allows you to display the articles in a specific category. Help

    {loadmodule articles_category,Articles Category}
    ', '', 1, 64, '2011-01-01 00:00:01', 123, 'Joomla', '1900-01-01 00:00:00', 0, 0, '1900-01-01 00:00:00', '2011-01-01 00:00:01', '1900-01-01 00:00:00', '', '', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","page_title":"","alternative_readmore":"","layout":""}', 1, 7, '', 'articles,content', 1, 0, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', ''), diff --git a/installation/sql/sqlazure/sample_testing.sql b/installation/sql/sqlazure/sample_testing.sql index 18746d7c9ac3e..c87ce07b24955 100644 --- a/installation/sql/sqlazure/sample_testing.sql +++ b/installation/sql/sqlazure/sample_testing.sql @@ -309,7 +309,7 @@ SET IDENTITY_INSERT "#__contact_details" OFF; SET IDENTITY_INSERT "#__content" ON; INSERT INTO "#__content" ("id", "asset_id", "title", "alias", "introtext", "fulltext", "state", "catid", "created", "created_by", "created_by_alias", "modified", "modified_by", "checked_out", "checked_out_time", "publish_up", "publish_down", "images", "urls", "attribs", "version", "ordering", "metakey", "metadesc", "access", "hits", "metadata", "featured", "language", "xreference") VALUES -(1, 89, 'Administrator Components', 'administrator-components', '

    All components are also used in the administrator area of your website. In addition to the ones listed here, there are components in the administrator that do not have direct front end displays, but do help shape your site. The most important ones for most users are

    • Media Manager
    • Extensions Manager
    • Menu Manager
    • Global Configuration
    • Banners
    • Redirect

    Media Manager

    The media manager component lets you upload and insert images into content throughout your site. Optionally, you can enable the flash uploader which will allow you to to upload multiple images. Help

    Extensions Manager

    The extensions manager lets you install, update, uninstall and manage all of your extensions. The extensions manager has been extensively redesigned, although the core install and uninstall functionality remains the same as in Joomla! 1.5. Help

    Menu Manager

    The menu manager lets you create the menus you see displayed on your site. It also allows you to assign modules and template styles to specific menu links. Help

    Global Configuration

    The global configuration is where the site administrator configures things such as whether search engine friendly urls are enabled, the site meta data (descriptive text used by search engines and indexers) and other functions. For many beginning users simply leaving the settings on default is a good way to begin, although when your site is ready for the public you will want to change the meta data to match its content. Help

    Banners

    The banners component provides a simple way to display a rotating image in a module and, if you wish to have advertising, a way to track the number of times an image is viewed and clicked. Help


    Redirect

    The redirect component is used to manage broken links that produce Page Not Found (404) errors. If enabled it will allow you to redirect broken links to specific pages. It can also be used to manage migration related URL changes. Help

    ', '', 1, 21, '2011-01-01 00:00:01', 42, 'Joomla', '1900-01-01 00:00:00', 0, 0, '1900-01-01 00:00:00', '2011-01-01 00:00:01', '1900-01-01 00:00:00', '{"image_intro":"","float_intro":"","image_intro_alt":"","image_intro_caption":"","image_fulltext":"","float_fulltext":"","image_fulltext_alt":"","image_fulltext_caption":""}', '{"urla":"","urlatext":"","targeta":"","urlb":"","urlbtext":"","targetb":"","urlc":"","urlctext":"","targetc":""}', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","alternative_readmore":"","article_layout":"","show_publishing_options":"","show_article_options":"","show_urls_images_backend":"","show_urls_images_frontend":""}', 1, 7, '', '', 1, 0, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', ''), +(1, 89, 'Administrator Components', 'administrator-components', '

    All components are also used in the administrator area of your website. In addition to the ones listed here, there are components in the administrator that do not have direct front end displays, but do help shape your site. The most important ones for most users are

    • Media Manager
    • Extensions Manager
    • Menu Manager
    • Global Configuration
    • Banners
    • Redirect

    Media Manager

    The media manager component lets you upload and insert images into content throughout your site. Optionally, you can enable the flash uploader which will allow you to to upload multiple images. Help

    Extensions Manager

    The extensions manager lets you install, update, uninstall and manage all of your extensions. The extensions manager has been extensively redesigned, although the core install and uninstall functionality remains the same as in Joomla! 1.5. Help

    Menu Manager

    The menu manager lets you create the menus you see displayed on your site. It also allows you to assign modules and template styles to specific menu links. Help

    Global Configuration

    The global configuration is where the site administrator configures things such as whether search engine friendly urls are enabled, the site metadata (descriptive text used by search engines and indexers) and other functions. For many beginning users simply leaving the settings on default is a good way to begin, although when your site is ready for the public you will want to change the metadata to match its content. Help

    Banners

    The banners component provides a simple way to display a rotating image in a module and, if you wish to have advertising, a way to track the number of times an image is viewed and clicked. Help


    Redirect

    The redirect component is used to manage broken links that produce Page Not Found (404) errors. If enabled it will allow you to redirect broken links to specific pages. It can also be used to manage migration related URL changes. Help

    ', '', 1, 21, '2011-01-01 00:00:01', 42, 'Joomla', '1900-01-01 00:00:00', 0, 0, '1900-01-01 00:00:00', '2011-01-01 00:00:01', '1900-01-01 00:00:00', '{"image_intro":"","float_intro":"","image_intro_alt":"","image_intro_caption":"","image_fulltext":"","float_fulltext":"","image_fulltext_alt":"","image_fulltext_caption":""}', '{"urla":"","urlatext":"","targeta":"","urlb":"","urlbtext":"","targetb":"","urlc":"","urlctext":"","targetc":""}', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","alternative_readmore":"","article_layout":"","show_publishing_options":"","show_article_options":"","show_urls_images_backend":"","show_urls_images_frontend":""}', 1, 7, '', '', 1, 0, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', ''), (2, 90, 'Archive Module', 'archive-module', '

    This module shows a list of the calendar months containing archived articles. After you have changed the status of an article to archived, this list will be automatically generated. Help

    {loadmodule articles_archive,Archived Articles}
    ', '', 1, 64, '2011-01-01 00:00:01', 42, 'Joomla', '1900-01-01 00:00:00', 0, 0, '1900-01-01 00:00:00', '2011-01-01 00:00:01', '1900-01-01 00:00:00', '', '', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","page_title":"","alternative_readmore":"","layout":""}', 1, 5, 'modules, content', '', 1, 0, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', ''), (3, 91, 'Article Categories Module', 'article-categories-module', '

    This module displays a list of categories from one parent category. Help

    {loadmodule articles_categories,Articles Categories}

    ', '', 1, 64, '2011-01-01 00:00:01', 42, 'Joomla', '1900-01-01 00:00:00', 0, 0, '1900-01-01 00:00:00', '2011-01-01 00:00:01', '1900-01-01 00:00:00', '', '', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","page_title":"","alternative_readmore":"","layout":""}', 1, 6, 'modules, content', '', 1, 0, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', ''), (4, 92, 'Articles Category Module', 'articles-category-module', '

    This module allows you to display the articles in a specific category. Help

    {loadmodule articles_category,Articles Category}
    ', '', 1, 64, '2011-01-01 00:00:01', 42, 'Joomla', '1900-01-01 00:00:00', 0, 0, '1900-01-01 00:00:00', '2011-01-01 00:00:01', '1900-01-01 00:00:00', '', '', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","page_title":"","alternative_readmore":"","layout":""}', 1, 7, '', 'articles,content', 1, 0, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', ''), diff --git a/installation/template/js/installation.js b/installation/template/js/installation.js index c48b40421e373..2969819a480c1 100644 --- a/installation/template/js/installation.js +++ b/installation/template/js/installation.js @@ -390,16 +390,6 @@ function initElements() // Turn radios into btn-group $('.radio.btn-group label').addClass('btn'); - $('fieldset.btn-group').each(function() { - var $self = $(this); - // Handle disabled, prevent clicks on the container, and add disabled style to each button - if ($self.prop('disabled')) - { - $self.css('pointer-events', 'none').off('click'); - $self.find('.btn').addClass('disabled'); - } - }); - $('.btn-group label:not(.active)').click(function() { var label = $(this); diff --git a/language/en-GB/en-GB.com_media.ini b/language/en-GB/en-GB.com_media.ini index 55baa7ad4327f..ddc9372c4d066 100644 --- a/language/en-GB/en-GB.com_media.ini +++ b/language/en-GB/en-GB.com_media.ini @@ -47,7 +47,7 @@ COM_MEDIA_FIELD_PATH_FILE_FOLDER_DESC="Enter the path to the file folder relativ COM_MEDIA_FIELD_PATH_FILE_FOLDER_LABEL="Path to File Folder" COM_MEDIA_FIELD_PATH_IMAGE_FOLDER_DESC="Enter the path to the image folder relative to root." COM_MEDIA_FIELD_PATH_IMAGE_FOLDER_LABEL="Path to Image Folder" -COM_MEDIA_FIELD_RESTRICT_UPLOADS_DESC="Restrict uploads for lower than manager users to just images if Fileinfo or MIME Magic isn't installed." +COM_MEDIA_FIELD_RESTRICT_UPLOADS_DESC="Restrict uploads for lower than manager users to images if Fileinfo or MIME Magic isn't installed." COM_MEDIA_FIELD_RESTRICT_UPLOADS_LABEL="Restrict Uploads" COM_MEDIA_FILES="Files" COM_MEDIA_FILESIZE="File size" diff --git a/language/en-GB/en-GB.ini b/language/en-GB/en-GB.ini index 6b7cf4a9d4c95..ac0e200c8410a 100644 --- a/language/en-GB/en-GB.ini +++ b/language/en-GB/en-GB.ini @@ -191,6 +191,7 @@ JGLOBAL_CATEGORY_NOT_FOUND="Category not found" JGLOBAL_CENTER="Center" JGLOBAL_CHECK_ALL="Check All Items" JGLOBAL_CLICK_TO_SORT_THIS_COLUMN="Select to sort by this column" +JGLOBAL_COLLAPSE_CATEGORIES="Show less categories" JGLOBAL_CREATED_DATE_ON="Created on %s" JGLOBAL_CUSTOM_CATEGORY="New Categories" JGLOBAL_DESCRIPTION="Description" @@ -199,6 +200,8 @@ JGLOBAL_EDIT="Edit" JGLOBAL_EDIT_TITLE="Edit article" JGLOBAL_EMAIL="Email" JGLOBAL_EMAIL_TITLE="Email this link to a friend" +JGLOBAL_EXPAND_CATEGORIES="Show more categories" +JGLOBAL_FIELD_ADD="Add" JGLOBAL_FIELD_CATEGORIES_CHOOSE_CATEGORY_DESC="Categories that are within this category will be displayed." JGLOBAL_FIELD_CATEGORIES_CHOOSE_CATEGORY_LABEL="Select a Top Level Category" JGLOBAL_FIELD_CATEGORIES_DESC_DESC="If you enter some text in this field, it will replace the Top Level Category Description, if it has one." @@ -221,12 +224,14 @@ JGLOBAL_FIELD_LAYOUT_LABEL="Choose a Layout" JGLOBAL_FIELD_MODIFIED_LABEL="Modified Date" JGLOBAL_FIELD_MODIFIED_BY_DESC="The user who did the last modification." JGLOBAL_FIELD_MODIFIED_BY_LABEL="Modified By" +JGLOBAL_FIELD_MOVE="Move" JGLOBAL_FIELD_NUM_CATEGORY_ITEMS_DESC="Number of categories to display for each level." JGLOBAL_FIELD_NUM_CATEGORY_ITEMS_LABEL="Number of Categories" JGLOBAL_FIELD_PUBLISH_DOWN_DESC="An optional date to stop publishing." JGLOBAL_FIELD_PUBLISH_DOWN_LABEL="Finish Publishing" JGLOBAL_FIELD_PUBLISH_UP_DESC="An optional date to start publishing." JGLOBAL_FIELD_PUBLISH_UP_LABEL="Start Publishing" +JGLOBAL_FIELD_REMOVE="Remove" JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_DESC="Show description of the top level category or alternatively replace with the text from the description field found in the menu item. If using Root as a top level category, the description field has to be filled." JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_LABEL="Top Level Category Description" JGLOBAL_FIELD_VERSION_NOTE_DESC="Enter an optional note for this version of the item." diff --git a/language/en-GB/en-GB.lib_joomla.ini b/language/en-GB/en-GB.lib_joomla.ini index e6bc338892b0e..0dcf85838b851 100644 --- a/language/en-GB/en-GB.lib_joomla.ini +++ b/language/en-GB/en-GB.lib_joomla.ini @@ -386,6 +386,7 @@ JLIB_HTML_BEHAVIOR_HOLD_MOUSE="- Hold mouse button on any of the buttons above f JLIB_HTML_BEHAVIOR_MONTH_SELECT="- Use the < and > buttons to select month\n" JLIB_HTML_BEHAVIOR_NEXT_MONTH_HOLD_FOR_MENU="Select to move to the next month. Select and hold for a list of the months." JLIB_HTML_BEHAVIOR_NEXT_YEAR_HOLD_FOR_MENU="Select to move to the next year. Select and hold for a list of years." +JLIB_HTML_BEHAVIOR_OPEN_CALENDAR="Open the calendar" JLIB_HTML_BEHAVIOR_PREV_MONTH_HOLD_FOR_MENU="Select to move to the previous month. Select and hold for a list of the months." JLIB_HTML_BEHAVIOR_PREV_YEAR_HOLD_FOR_MENU="Select to move to the previous year. Select and hold for a list of years." JLIB_HTML_BEHAVIOR_SELECT_DATE="Select a date." @@ -425,11 +426,15 @@ JLIB_HTML_ERROR_FUNCTION_NOT_SUPPORTED="Function not supported." JLIB_HTML_ERROR_NOTFOUNDINFILE="%s: :%s not found in file." JLIB_HTML_ERROR_NOTSUPPORTED_NOFILE="%s: :%s not supported. File not found." JLIB_HTML_ERROR_NOTSUPPORTED="%s: :%s not supported." +JLIB_HTML_GOTO_PAGE="Go to page %s" +JLIB_HTML_GOTO_POSITION="Go to %s page" JLIB_HTML_MOVE_DOWN="Move Down" JLIB_HTML_MOVE_UP="Move Up" JLIB_HTML_NO_PARAMETERS_FOR_THIS_ITEM="There are no parameters for this item." JLIB_HTML_NO_RECORDS_FOUND="No records found." +JLIB_HTML_PAGE_CURRENT="Page %s" JLIB_HTML_PAGE_CURRENT_OF_TOTAL="Page %s of %s" +JLIB_HTML_PAGINATION="Pagination" JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST="Please first make a selection from the list." JLIB_HTML_PUBLISH_ITEM="Publish Item" JLIB_HTML_PUBLISHED_EXPIRED_ITEM="Published, but has Expired." diff --git a/language/en-GB/en-GB.mod_articles_category.ini b/language/en-GB/en-GB.mod_articles_category.ini index 49c891f0d5e72..3fdffb91ad1b9 100644 --- a/language/en-GB/en-GB.mod_articles_category.ini +++ b/language/en-GB/en-GB.mod_articles_category.ini @@ -48,7 +48,7 @@ MOD_ARTICLES_CATEGORY_FIELD_INTROTEXTLIMIT_DESC="Please enter in a numeric chara MOD_ARTICLES_CATEGORY_FIELD_INTROTEXTLIMIT_LABEL="Introtext Limit" MOD_ARTICLES_CATEGORY_FIELD_LINKTITLES_LABEL="Linked Titles" MOD_ARTICLES_CATEGORY_FIELD_LINKTITLES_DESC="Linked titles." -MOD_ARTICLES_CATEGORY_FIELD_MODE_DESC="Please select the mode you would like to use. If Normal Mode is chosen, then simply configure the module and it will display a static list of Articles on the menu items you assign the module to. If Dynamic Mode is chosen, then you can still configure the module normally, however now the Category option will no longer be used. Instead, the module will dynamically detect if you are on a Category view and will display the list of articles within that Category accordingly. When Dynamic Mode is chosen, it is best to leave the module set to display on all pages, as it will decide to display anything dynamically." +MOD_ARTICLES_CATEGORY_FIELD_MODE_DESC="Please select the mode you would like to use. If Normal Mode is chosen, then configure the module and it will display a static list of Articles on the menu items you assign the module to. If Dynamic Mode is chosen, then you can still configure the module normally, however now the Category option will no longer be used. Instead, the module will dynamically detect if you are on a Category view and will display the list of articles within that Category accordingly. When Dynamic Mode is chosen, it is best to leave the module set to display on all pages, as it will decide to display anything dynamically." MOD_ARTICLES_CATEGORY_FIELD_MODE_LABEL="Mode" MOD_ARTICLES_CATEGORY_FIELD_MONTHYEARFORMAT_DESC="Please enter in a valid date format. See: http://php.net/date for formatting information." MOD_ARTICLES_CATEGORY_FIELD_MONTHYEARFORMAT_LABEL="Month and Year Display Format" diff --git a/language/en-GB/en-GB.xml b/language/en-GB/en-GB.xml index 6c1b38143bbfd..14dfee5b897a0 100644 --- a/language/en-GB/en-GB.xml +++ b/language/en-GB/en-GB.xml @@ -1,8 +1,8 @@ - + English (en-GB) - 3.8.2 - October 2017 + 3.8.4 + December 2017 Joomla! Project admin@joomla.org www.joomla.org diff --git a/language/en-GB/install.xml b/language/en-GB/install.xml index 8bf77480963ef..6b4ffcf04cbd1 100644 --- a/language/en-GB/install.xml +++ b/language/en-GB/install.xml @@ -1,9 +1,9 @@ - + English (en-GB) en-GB - 3.8.2 - October 2017 + 3.8.4 + December 2017 Joomla! Project admin@joomla.org www.joomla.org diff --git a/layouts/joomla/content/info_block/associations.php b/layouts/joomla/content/info_block/associations.php index a34e7f59b56ee..5f7677c1dec8d 100644 --- a/layouts/joomla/content/info_block/associations.php +++ b/layouts/joomla/content/info_block/associations.php @@ -11,15 +11,18 @@ ?> associations)) : ?> associations; ?> +
    - params->get('flags', 1) && $association['language']->image) : ?> - image . '.gif', $association['language']->title_native, array('title' => $association['language']->title_native), true); ?> -    - - sef; ?> -  sef); ?>  + lang_code != JFactory::getLanguage()->getTag()) : ?> + params->get('flags', 1) && $association['language']->image) : ?> + image . '.gif', $association['language']->title_native, array('title' => $association['language']->title_native), true); ?> +    + + sef; ?> +  sef); ?>  +
    diff --git a/layouts/joomla/content/language.php b/layouts/joomla/content/language.php index 4e1e2e6641b41..385636f426418 100644 --- a/layouts/joomla/content/language.php +++ b/layouts/joomla/content/language.php @@ -17,7 +17,7 @@ } elseif ($item->language_image) { - echo JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, null, true) . ' ' . htmlspecialchars($item->language_title, ENT_COMPAT, 'UTF-8'); + echo JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', '', null, true) . ' ' . htmlspecialchars($item->language_title, ENT_COMPAT, 'UTF-8'); } elseif ($item->language_title) { diff --git a/layouts/joomla/content/tags.php b/layouts/joomla/content/tags.php index 42551e01f0f76..ef2a6e0016bd4 100644 --- a/layouts/joomla/content/tags.php +++ b/layouts/joomla/content/tags.php @@ -23,7 +23,7 @@ params); ?> get('tag_link_class', 'label label-info'); ?>
  • - + escape($tag->title); ?>
    • diff --git a/layouts/joomla/edit/frontediting_modules.php b/layouts/joomla/edit/frontediting_modules.php index 0a4cb47443361..d9af2ec8ee15f 100644 --- a/layouts/joomla/edit/frontediting_modules.php +++ b/layouts/joomla/edit/frontediting_modules.php @@ -18,6 +18,7 @@ $parameters = JComponentHelper::getParams('com_modules'); $redirectUri = '&return=' . urlencode(base64_encode(JUri::getInstance()->toString())); $target = '_blank'; +$itemid = JFactory::getApplication()->input->get('Itemid', '0', 'int'); if (preg_match('/<(?:div|span|nav|ul|ol|h\d) [^>]*class="[^"]* jmoddiv"/', $moduleHtml)) { @@ -30,7 +31,7 @@ if ($parameters->get('redirect_edit', 'site') === 'site') { - $editUrl = JUri::base() . 'index.php?option=com_config&controller=config.display.modules&id=' . (int) $mod->id . $redirectUri; + $editUrl = JUri::base() . 'index.php?option=com_config&controller=config.display.modules&id=' . (int) $mod->id . '&Itemid=' . $itemid . $redirectUri; $target = '_self'; } diff --git a/layouts/joomla/form/field/calendar.php b/layouts/joomla/form/field/calendar.php index ec14fe84bd330..4ce9f1bfd2f78 100644 --- a/layouts/joomla/form/field/calendar.php +++ b/layouts/joomla/form/field/calendar.php @@ -127,7 +127,8 @@ data-only-months-nav="" - > + title="" + >
    diff --git a/layouts/joomla/form/field/checkboxes.php b/layouts/joomla/form/field/checkboxes.php index 66db1b82fca1f..dfeee8eb4375c 100644 --- a/layouts/joomla/form/field/checkboxes.php +++ b/layouts/joomla/form/field/checkboxes.php @@ -44,7 +44,7 @@ // Including fallback code for HTML5 non supported browsers. JHtml::_('jquery.framework'); -JHtml::_('script', 'system/html5fallback.js', array('version' => 'auto', 'relative' => true)); +JHtml::_('script', 'system/html5fallback.js', array('version' => 'auto', 'relative' => true, 'conditional' => 'lt IE 9')); /** * The format of the input tag to be filled in using sprintf. diff --git a/layouts/joomla/form/field/color/advanced.php b/layouts/joomla/form/field/color/advanced.php index aaef836012c55..ec3164d40ece5 100644 --- a/layouts/joomla/form/field/color/advanced.php +++ b/layouts/joomla/form/field/color/advanced.php @@ -71,10 +71,10 @@ // Including fallback code for HTML5 non supported browsers. JHtml::_('jquery.framework'); -JHtml::_('script', 'system/html5fallback.js', array('version' => 'auto', 'relative' => true)); +JHtml::_('script', 'system/html5fallback.js', array('version' => 'auto', 'relative' => true, 'conditional' => 'lt IE 9')); JHtml::_('script', 'jui/jquery.minicolors.min.js', array('version' => 'auto', 'relative' => true)); JHtml::_('stylesheet', 'jui/jquery.minicolors.css', array('version' => 'auto', 'relative' => true)); JHtml::_('script', 'system/color-field-adv-init.min.js', array('version' => 'auto', 'relative' => true)); ?> /> +echo $hint . $class . $position . $control . $readonly . $disabled . $onchange . $autocomplete . $autofocus . $format . $keywords . $direction . $validate; ?>/> diff --git a/layouts/joomla/form/field/color/simple.php b/layouts/joomla/form/field/color/simple.php index b6011841389cd..a124c51fcb6d8 100644 --- a/layouts/joomla/form/field/color/simple.php +++ b/layouts/joomla/form/field/color/simple.php @@ -51,7 +51,7 @@ // Include jQuery JHtml::_('jquery.framework'); -JHtml::_('script', 'system/html5fallback.js', array('version' => 'auto', 'relative' => true)); +JHtml::_('script', 'system/html5fallback.js', array('version' => 'auto', 'relative' => true, 'conditional' => 'lt IE 9')); JHtml::_('script', 'jui/jquery.simplecolors.min.js', array('version' => 'auto', 'relative' => true)); JHtml::_('stylesheet', 'jui/jquery.simplecolors.css', array('version' => 'auto', 'relative' => true)); JHtml::_('script', 'system/color-field-init.min.js', array('version' => 'auto', 'relative' => true)); diff --git a/layouts/joomla/form/field/combo.php b/layouts/joomla/form/field/combo.php index 286ca02456b49..637ad4ee8d96d 100644 --- a/layouts/joomla/form/field/combo.php +++ b/layouts/joomla/form/field/combo.php @@ -42,7 +42,7 @@ // Including fallback code for HTML5 non supported browsers. JHtml::_('jquery.framework'); -JHtml::_('script', 'system/html5fallback.js', array('version' => 'auto', 'relative' => true)); +JHtml::_('script', 'system/html5fallback.js', array('version' => 'auto', 'relative' => true, 'conditional' => 'lt IE 9')); JHtml::_('behavior.combobox'); $attr = !empty($class) ? ' class="combobox ' . $class . '"' : ' class="combobox"'; diff --git a/layouts/joomla/form/field/email.php b/layouts/joomla/form/field/email.php index 94c4007ad9951..249a700270bac 100644 --- a/layouts/joomla/form/field/email.php +++ b/layouts/joomla/form/field/email.php @@ -64,7 +64,7 @@ // Including fallback code for HTML5 non supported browsers. JHtml::_('jquery.framework'); -JHtml::_('script', 'system/html5fallback.js', array('version' => 'auto', 'relative' => true)); +JHtml::_('script', 'system/html5fallback.js', array('version' => 'auto', 'relative' => true, 'conditional' => 'lt IE 9')); ?> 'auto', 'relative' => true)); +JHtml::_('script', 'system/html5fallback.js', array('version' => 'auto', 'relative' => true, 'conditional' => 'lt IE 9')); $attributes = array( strlen($hint) ? 'placeholder="' . htmlspecialchars($hint, ENT_COMPAT, 'UTF-8') . '"' : '', diff --git a/layouts/joomla/form/field/radio.php b/layouts/joomla/form/field/radio.php index 502429c7a8360..82f87fdb0c5ad 100644 --- a/layouts/joomla/form/field/radio.php +++ b/layouts/joomla/form/field/radio.php @@ -42,7 +42,7 @@ // Including fallback code for HTML5 non supported browsers. JHtml::_('jquery.framework'); -JHtml::_('script', 'system/html5fallback.js', array('version' => 'auto', 'relative' => true)); +JHtml::_('script', 'system/html5fallback.js', array('version' => 'auto', 'relative' => true, 'conditional' => 'lt IE 9')); /** * The format of the input tag to be filled in using sprintf. @@ -54,8 +54,9 @@ $format = ''; $alt = preg_replace('/[^a-zA-Z0-9_\-]/', '_', $name); ?> -
    + > @@ -64,22 +65,24 @@ value === $value) ? 'checked="checked"' : ''; + $disabled = !empty($option->disable) ? 'disabled' : ''; + $style = $disabled ? 'style="pointer-events: none"' : ''; + $option->class = trim($option->class . ' ' . $disabled); $optionClass = !empty($option->class) ? 'class="' . $option->class . '"' : ''; - $disabled = !empty($option->disable) || ($disabled && !$checked) ? 'disabled' : ''; // Initialize some JavaScript option attributes. $onclick = !empty($option->onclick) ? 'onclick="' . $option->onclick . '"' : ''; $onchange = !empty($option->onchange) ? 'onchange="' . $option->onchange . '"' : ''; $oid = $id . $i; $ovalue = htmlspecialchars($option->value, ENT_COMPAT, 'UTF-8'); - $attributes = array_filter(array($checked, $optionClass, $disabled, $onchange, $onclick)); + $attributes = array_filter(array($checked, $optionClass, $disabled, $style, $onchange, $onclick)); ?> -