From 5f19de3d1f3851054f65ed03611262be65340315 Mon Sep 17 00:00:00 2001 From: Michael Babker Date: Mon, 20 Jun 2016 16:17:36 -0500 Subject: [PATCH 001/151] Admin app - Use the autoloader --- administrator/components/com_admin/models/profile.php | 2 +- .../components/com_banners/models/forms/filter_banners.xml | 2 +- .../components/com_banners/models/forms/filter_tracks.xml | 2 +- .../components/com_banners/views/banners/view.html.php | 3 +-- .../components/com_banners/views/tracks/view.html.php | 2 -- administrator/components/com_cache/controller.php | 2 +- administrator/components/com_categories/controller.php | 2 +- .../com_categories/views/categories/tmpl/modal.php | 2 +- .../com_categories/views/categories/view.html.php | 2 +- .../components/com_categories/views/category/view.html.php | 2 +- administrator/components/com_contact/controller.php | 2 +- .../components/com_contact/views/contacts/tmpl/modal.php | 2 +- .../components/com_content/views/articles/tmpl/modal.php | 2 +- .../components/com_cpanel/views/cpanel/view.html.php | 6 ------ .../components/com_finder/models/fields/directories.php | 2 +- administrator/components/com_installer/controller.php | 2 +- .../com_joomlaupdate/views/upload/tmpl/captive.php | 2 +- administrator/components/com_languages/controller.php | 2 +- .../components/com_languages/controllers/override.php | 2 +- administrator/components/com_languages/models/override.php | 7 ++++--- .../components/com_languages/models/overrides.php | 2 +- administrator/components/com_languages/models/strings.php | 2 +- .../components/com_languages/views/language/view.html.php | 2 +- .../com_languages/views/multilangstatus/view.html.php | 2 +- administrator/components/com_media/media.php | 2 +- administrator/components/com_menus/controller.php | 6 ++---- administrator/components/com_menus/models/item.php | 2 +- administrator/components/com_messages/controller.php | 2 +- administrator/components/com_modules/controller.php | 2 +- .../components/com_modules/helpers/html/modules.php | 3 ++- administrator/components/com_modules/models/module.php | 2 +- .../com_modules/views/module/tmpl/edit_assignment.php | 4 ++-- .../com_modules/views/module/tmpl/edit_positions.php | 2 +- administrator/components/com_newsfeeds/controller.php | 2 +- .../com_newsfeeds/views/newsfeeds/tmpl/modal.php | 2 +- administrator/components/com_plugins/controller.php | 2 +- administrator/components/com_postinstall/postinstall.php | 6 ------ administrator/components/com_redirect/controller.php | 2 +- administrator/components/com_search/controller.php | 2 +- .../com_templates/views/style/tmpl/edit_assignment.php | 2 +- .../components/com_users/controllers/profile.json.php | 2 +- administrator/components/com_users/models/debuggroup.php | 2 +- administrator/components/com_users/models/debuguser.php | 2 +- administrator/modules/mod_login/helper.php | 2 +- .../templates/hathor/html/com_content/articles/modal.php | 2 +- .../hathor/html/com_modules/module/edit_assignment.php | 4 ++-- .../hathor/html/com_templates/style/edit_assignment.php | 4 ++-- 47 files changed, 52 insertions(+), 67 deletions(-) diff --git a/administrator/components/com_admin/models/profile.php b/administrator/components/com_admin/models/profile.php index e97d292bd73f0..779c279f616ad 100644 --- a/administrator/components/com_admin/models/profile.php +++ b/administrator/components/com_admin/models/profile.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -require_once JPATH_ADMINISTRATOR . '/components/com_users/models/user.php'; +JLoader::register('UsersModelUser', JPATH_ADMINISTRATOR . '/components/com_users/models/user.php'); /** * User model. diff --git a/administrator/components/com_banners/models/forms/filter_banners.xml b/administrator/components/com_banners/models/forms/filter_banners.xml index 5ef151967fb41..76268022c7fec 100644 --- a/administrator/components/com_banners/models/forms/filter_banners.xml +++ b/administrator/components/com_banners/models/forms/filter_banners.xml @@ -1,6 +1,6 @@
- + - + addToolbar(); - require_once JPATH_COMPONENT . '/models/fields/bannerclient.php'; // Include the component HTML helpers. JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); @@ -92,7 +91,7 @@ public function display($tpl = null) */ protected function addToolbar() { - require_once JPATH_COMPONENT . '/helpers/banners.php'; + JLoader::register('BannersHelper', JPATH_COMPONENT . '/helpers/banners.php'); $canDo = JHelperContent::getActions('com_banners', 'category', $this->state->get('filter.category_id')); $user = JFactory::getUser(); diff --git a/administrator/components/com_banners/views/tracks/view.html.php b/administrator/components/com_banners/views/tracks/view.html.php index 0135cafaa5c40..1f072b011797e 100644 --- a/administrator/components/com_banners/views/tracks/view.html.php +++ b/administrator/components/com_banners/views/tracks/view.html.php @@ -66,8 +66,6 @@ public function display($tpl = null) $this->addToolbar(); - require_once JPATH_COMPONENT . '/models/fields/bannerclient.php'; - $this->sidebar = JHtmlSidebar::render(); return parent::display($tpl); diff --git a/administrator/components/com_cache/controller.php b/administrator/components/com_cache/controller.php index 24854f3407332..4bf9f9c1d3eae 100644 --- a/administrator/components/com_cache/controller.php +++ b/administrator/components/com_cache/controller.php @@ -28,7 +28,7 @@ class CacheController extends JControllerLegacy */ public function display($cachable = false, $urlparams = false) { - require_once JPATH_COMPONENT . '/helpers/cache.php'; + JLoader::register('CacheHelper', JPATH_COMPONENT . '/helpers/cache.php'); // Get the document object. $document = JFactory::getDocument(); diff --git a/administrator/components/com_categories/controller.php b/administrator/components/com_categories/controller.php index ae7e2ce010b59..27063b53501ec 100644 --- a/administrator/components/com_categories/controller.php +++ b/administrator/components/com_categories/controller.php @@ -89,7 +89,7 @@ public function display($cachable = false, $urlparams = array()) $view->document = $document; // Load the submenu. - require_once JPATH_COMPONENT . '/helpers/categories.php'; + JLoader::register('CategoriesHelper', JPATH_COMPONENT . '/helpers/categories.php'); CategoriesHelper::addSubmenu($model->getState('filter.extension')); $view->display(); diff --git a/administrator/components/com_categories/views/categories/tmpl/modal.php b/administrator/components/com_categories/views/categories/tmpl/modal.php index b10924e8ae63c..909bf838d8dd8 100644 --- a/administrator/components/com_categories/views/categories/tmpl/modal.php +++ b/administrator/components/com_categories/views/categories/tmpl/modal.php @@ -16,7 +16,7 @@ JSession::checkToken('get') or die(JText::_('JINVALID_TOKEN')); } -require_once JPATH_ROOT . '/components/com_content/helpers/route.php'; +JLoader::register('ContentHelperRoute', JPATH_ROOT . '/components/com_content/helpers/route.php'); // Include the component HTML helpers. JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); diff --git a/administrator/components/com_categories/views/categories/view.html.php b/administrator/components/com_categories/views/categories/view.html.php index 98539bb2750ae..0add56ddecfb2 100644 --- a/administrator/components/com_categories/views/categories/view.html.php +++ b/administrator/components/com_categories/views/categories/view.html.php @@ -163,7 +163,7 @@ protected function addToolbar() || $lang->load($component, JPATH_ADMINISTRATOR . '/components/' . $component, null, false, true); // Load the category helper. - require_once JPATH_COMPONENT . '/helpers/categories.php'; + JLoader::register('CategoriesHelper', JPATH_COMPONENT . '/helpers/categories.php'); // If a component categories title string is present, let's use it. if ($lang->hasKey($component_title_key = strtoupper($component . ($section ? "_$section" : '')) . '_CATEGORIES_TITLE')) diff --git a/administrator/components/com_categories/views/category/view.html.php b/administrator/components/com_categories/views/category/view.html.php index 37fe2c8fb2910..bc56f1ba85c17 100644 --- a/administrator/components/com_categories/views/category/view.html.php +++ b/administrator/components/com_categories/views/category/view.html.php @@ -129,7 +129,7 @@ protected function addToolbar() || $lang->load($component, JPATH_ADMINISTRATOR . '/components/' . $component, null, false, true); // Load the category helper. - require_once JPATH_COMPONENT . '/helpers/categories.php'; + JLoader::register('CategoriesHelper', JPATH_COMPONENT . '/helpers/categories.php'); // Get the results for each action. $canDo = $this->canDo; diff --git a/administrator/components/com_contact/controller.php b/administrator/components/com_contact/controller.php index 5d8ca9f15c08d..a2dc1ce426afd 100644 --- a/administrator/components/com_contact/controller.php +++ b/administrator/components/com_contact/controller.php @@ -36,7 +36,7 @@ class ContactController extends JControllerLegacy */ public function display($cachable = false, $urlparams = array()) { - require_once JPATH_COMPONENT . '/helpers/contact.php'; + JLoader::register('ContactHelper', JPATH_COMPONENT . '/helpers/contact.php'); $view = $this->input->get('view', 'contacts'); $layout = $this->input->get('layout', 'default'); diff --git a/administrator/components/com_contact/views/contacts/tmpl/modal.php b/administrator/components/com_contact/views/contacts/tmpl/modal.php index 6279cb306c7b5..e9a81385e2d3d 100644 --- a/administrator/components/com_contact/views/contacts/tmpl/modal.php +++ b/administrator/components/com_contact/views/contacts/tmpl/modal.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -require_once JPATH_ROOT . '/components/com_contact/helpers/route.php'; +JLoader::register('ContactHelperRoute', JPATH_ROOT . '/components/com_contact/helpers/route.php'); JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); diff --git a/administrator/components/com_content/views/articles/tmpl/modal.php b/administrator/components/com_content/views/articles/tmpl/modal.php index 9365c667e98e6..e203021e641e0 100644 --- a/administrator/components/com_content/views/articles/tmpl/modal.php +++ b/administrator/components/com_content/views/articles/tmpl/modal.php @@ -16,7 +16,7 @@ JSession::checkToken('get') or die(JText::_('JINVALID_TOKEN')); } -require_once JPATH_ROOT . '/components/com_content/helpers/route.php'; +JLoader::register('ContentHelperRoute', JPATH_ROOT . '/components/com_content/helpers/route.php'); // Include the component HTML helpers. JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); diff --git a/administrator/components/com_cpanel/views/cpanel/view.html.php b/administrator/components/com_cpanel/views/cpanel/view.html.php index 189ec63c6d47a..27d8b2399c58d 100644 --- a/administrator/components/com_cpanel/views/cpanel/view.html.php +++ b/administrator/components/com_cpanel/views/cpanel/view.html.php @@ -47,12 +47,6 @@ public function display($tpl = null) // Display the cpanel modules $this->modules = JModuleHelper::getModules('cpanel'); - // Load the RAD layer and count the number of post-installation messages - if (!defined('FOF_INCLUDED')) - { - require_once JPATH_LIBRARIES . '/fof/include.php'; - } - try { $messages_model = FOFModel::getTmpInstance('Messages', 'PostinstallModel')->eid(700); diff --git a/administrator/components/com_finder/models/fields/directories.php b/administrator/components/com_finder/models/fields/directories.php index 2ccb80d9d952f..a65657b02d3f9 100644 --- a/administrator/components/com_finder/models/fields/directories.php +++ b/administrator/components/com_finder/models/fields/directories.php @@ -12,7 +12,7 @@ JFormHelper::loadFieldClass('list'); // Load the base adapter. -require_once JPATH_ADMINISTRATOR . '/components/com_finder/helpers/indexer/adapter.php'; +JLoader::register('FinderIndexerAdapter', JPATH_ADMINISTRATOR . '/components/com_finder/helpers/indexer/adapter.php'); /** * Renders a list of directories. diff --git a/administrator/components/com_installer/controller.php b/administrator/components/com_installer/controller.php index 6d4e23659050d..e7484b522e8fd 100644 --- a/administrator/components/com_installer/controller.php +++ b/administrator/components/com_installer/controller.php @@ -28,7 +28,7 @@ class InstallerController extends JControllerLegacy */ public function display($cachable = false, $urlparams = false) { - require_once JPATH_ADMINISTRATOR . '/components/com_installer/helpers/installer.php'; + JLoader::register('InstallerHelper', JPATH_ADMINISTRATOR . '/components/com_installer/helpers/installer.php'); // Get the document object. $document = JFactory::getDocument(); diff --git a/administrator/components/com_joomlaupdate/views/upload/tmpl/captive.php b/administrator/components/com_joomlaupdate/views/upload/tmpl/captive.php index 0ae0824514e74..2c32d13755848 100644 --- a/administrator/components/com_joomlaupdate/views/upload/tmpl/captive.php +++ b/administrator/components/com_joomlaupdate/views/upload/tmpl/captive.php @@ -12,7 +12,7 @@ JHtml::_('behavior.keepalive'); JHtml::_('bootstrap.tooltip'); -require_once JPATH_ADMINISTRATOR . '/modules/mod_login/helper.php'; +JLoader::register('ModLoginHelper', JPATH_ADMINISTRATOR . '/modules/mod_login/helper.php'); $twofactormethods = ModLoginHelper::getTwoFactorMethods(); diff --git a/administrator/components/com_languages/controller.php b/administrator/components/com_languages/controller.php index 564ba304a1ee6..a2215d986bfb8 100644 --- a/administrator/components/com_languages/controller.php +++ b/administrator/components/com_languages/controller.php @@ -34,7 +34,7 @@ class LanguagesController extends JControllerLegacy */ public function display($cachable = false, $urlparams = false) { - require_once JPATH_COMPONENT . '/helpers/languages.php'; + JLoader::register('LanguagesHelper', JPATH_COMPONENT . '/helpers/languages.php'); $view = $this->input->get('view', 'languages'); $layout = $this->input->get('layout', 'default'); diff --git a/administrator/components/com_languages/controllers/override.php b/administrator/components/com_languages/controllers/override.php index 0c6c67f02c36e..de0a04a7698ac 100644 --- a/administrator/components/com_languages/controllers/override.php +++ b/administrator/components/com_languages/controllers/override.php @@ -94,7 +94,7 @@ public function save($key = null, $urlVar = null) } // Require helper for filter functions called by JForm. - require_once JPATH_COMPONENT . '/helpers/languages.php'; + JLoader::register('LanguagesHelper', JPATH_COMPONENT . '/helpers/languages.php'); // Test whether the data is valid. $validData = $model->validate($form, $data); diff --git a/administrator/components/com_languages/models/override.php b/administrator/components/com_languages/models/override.php index bf3f5825e8706..21048ef0dd78d 100644 --- a/administrator/components/com_languages/models/override.php +++ b/administrator/components/com_languages/models/override.php @@ -89,7 +89,7 @@ protected function loadFormData() */ public function getItem($pk = null) { - require_once JPATH_COMPONENT . '/helpers/languages.php'; + JLoader::register('LanguagesHelper', JPATH_COMPONENT . '/helpers/languages.php'); $input = JFactory::getApplication()->input; $pk = (!empty($pk)) ? $pk : $input->get('id'); @@ -122,10 +122,11 @@ public function getItem($pk = null) */ public function save($data, $opposite_client = false) { - $app = JFactory::getApplication(); - require_once JPATH_COMPONENT . '/helpers/languages.php'; + JLoader::register('LanguagesHelper', JPATH_COMPONENT . '/helpers/languages.php'); jimport('joomla.filesystem.file'); + $app = JFactory::getApplication(); + $client = $app->getUserState('com_languages.overrides.filter.client', 0); $language = $app->getUserState('com_languages.overrides.filter.language', 'en-GB'); diff --git a/administrator/components/com_languages/models/overrides.php b/administrator/components/com_languages/models/overrides.php index bf762651686b7..9f39db9ee6d75 100644 --- a/administrator/components/com_languages/models/overrides.php +++ b/administrator/components/com_languages/models/overrides.php @@ -247,7 +247,7 @@ public function delete($cids) } jimport('joomla.filesystem.file'); - require_once JPATH_COMPONENT . '/helpers/languages.php'; + JLoader::register('LanguagesHelper', JPATH_COMPONENT . '/helpers/languages.php'); $filterclient = JFactory::getApplication()->getUserState('com_languages.overrides.filter.client'); $client = $filterclient == 0 ? 'SITE' : 'ADMINISTRATOR'; diff --git a/administrator/components/com_languages/models/strings.php b/administrator/components/com_languages/models/strings.php index fbe38bba778b5..c7689472dbd47 100644 --- a/administrator/components/com_languages/models/strings.php +++ b/administrator/components/com_languages/models/strings.php @@ -25,7 +25,7 @@ class LanguagesModelStrings extends JModelLegacy */ public function refresh() { - require_once JPATH_COMPONENT . '/helpers/languages.php'; + JLoader::register('LanguagesHelper', JPATH_COMPONENT . '/helpers/languages.php'); $app = JFactory::getApplication(); diff --git a/administrator/components/com_languages/views/language/view.html.php b/administrator/components/com_languages/views/language/view.html.php index 6aa594d2a3884..0badefb4f0357 100644 --- a/administrator/components/com_languages/views/language/view.html.php +++ b/administrator/components/com_languages/views/language/view.html.php @@ -57,7 +57,7 @@ public function display($tpl = null) */ protected function addToolbar() { - require_once JPATH_COMPONENT . '/helpers/languages.php'; + JLoader::register('LanguagesHelper', JPATH_COMPONENT . '/helpers/languages.php'); JFactory::getApplication()->input->set('hidemainmenu', 1); $isNew = empty($this->item->lang_id); diff --git a/administrator/components/com_languages/views/multilangstatus/view.html.php b/administrator/components/com_languages/views/multilangstatus/view.html.php index 7062e2131b144..f437427427110 100644 --- a/administrator/components/com_languages/views/multilangstatus/view.html.php +++ b/administrator/components/com_languages/views/multilangstatus/view.html.php @@ -25,7 +25,7 @@ class LanguagesViewMultilangstatus extends JViewLegacy */ public function display($tpl = null) { - require_once JPATH_COMPONENT . '/helpers/multilangstatus.php'; + JLoader::register('MultilangstatusHelper', JPATH_COMPONENT . '/helpers/multilangstatus.php'); $this->homes = MultilangstatusHelper::getHomes(); $this->language_filter = JLanguageMultilang::isEnabled(); diff --git a/administrator/components/com_media/media.php b/administrator/components/com_media/media.php index 10177130b20a8..9a99d40daa5ad 100644 --- a/administrator/components/com_media/media.php +++ b/administrator/components/com_media/media.php @@ -26,7 +26,7 @@ $params = JComponentHelper::getParams('com_media'); // Load the helper class -require_once JPATH_COMPONENT_ADMINISTRATOR . '/helpers/media.php'; +JLoader::register('MediaHelper', JPATH_COMPONENT_ADMINISTRATOR . '/helpers/media.php'); // Set the path definitions $popup_upload = $input->get('pop_up', null); diff --git a/administrator/components/com_menus/controller.php b/administrator/components/com_menus/controller.php index 18aa9a4a9a8be..de39a4f34d466 100644 --- a/administrator/components/com_menus/controller.php +++ b/administrator/components/com_menus/controller.php @@ -28,10 +28,8 @@ class MenusController extends JControllerLegacy */ public function display($cachable = false, $urlparams = false) { - require_once JPATH_COMPONENT . '/helpers/menus.php'; + JLoader::register('MenusHelper', JPATH_COMPONENT . '/helpers/menus.php'); - parent::display(); - - return $this; + return parent::display(); } } diff --git a/administrator/components/com_menus/models/item.php b/administrator/components/com_menus/models/item.php index e45a8af7d65d7..8214f82e7f507 100644 --- a/administrator/components/com_menus/models/item.php +++ b/administrator/components/com_menus/models/item.php @@ -12,7 +12,7 @@ use Joomla\Registry\Registry; jimport('joomla.filesystem.path'); -require_once JPATH_COMPONENT . '/helpers/menus.php'; +JLoader::register('MenusHelper', JPATH_COMPONENT . '/helpers/menus.php'); /** * Menu Item Model for Menus. diff --git a/administrator/components/com_messages/controller.php b/administrator/components/com_messages/controller.php index 447aab4285f9f..58f22d201ecd7 100644 --- a/administrator/components/com_messages/controller.php +++ b/administrator/components/com_messages/controller.php @@ -28,7 +28,7 @@ class MessagesController extends JControllerLegacy */ public function display($cachable = false, $urlparams = false) { - require_once JPATH_COMPONENT . '/helpers/messages.php'; + JLoader::register('MessagesHelper', JPATH_COMPONENT . '/helpers/messages.php'); $view = $this->input->get('view', 'messages'); $layout = $this->input->get('layout', 'default'); diff --git a/administrator/components/com_modules/controller.php b/administrator/components/com_modules/controller.php index 7f277519ba48e..c9180993ae82c 100644 --- a/administrator/components/com_modules/controller.php +++ b/administrator/components/com_modules/controller.php @@ -57,7 +57,7 @@ public function display($cachable = false, $urlparams = false) return $view->display(); } - require_once JPATH_COMPONENT . '/helpers/modules.php'; + JLoader::register('ModulesHelper', JPATH_COMPONENT . '/helpers/modules.php'); $layout = $this->input->get('layout', 'edit'); $id = $this->input->getInt('id'); diff --git a/administrator/components/com_modules/helpers/html/modules.php b/administrator/components/com_modules/helpers/html/modules.php index 14e68d8185d2f..1d14eacfbebb8 100644 --- a/administrator/components/com_modules/helpers/html/modules.php +++ b/administrator/components/com_modules/helpers/html/modules.php @@ -136,7 +136,8 @@ public static function state($value, $i, $enabled = true, $checkbox = 'cb') public static function positions($clientId, $state = 1, $selectedPosition = '') { - require_once JPATH_ADMINISTRATOR . '/components/com_templates/helpers/templates.php'; + JLoader::register('TemplatesHelper', JPATH_ADMINISTRATOR . '/components/com_templates/helpers/templates.php'); + $templates = array_keys(ModulesHelper::getTemplates($clientId, $state)); $templateGroups = array(); diff --git a/administrator/components/com_modules/models/module.php b/administrator/components/com_modules/models/module.php index b7af812801f55..55b9643f21dab 100644 --- a/administrator/components/com_modules/models/module.php +++ b/administrator/components/com_modules/models/module.php @@ -872,7 +872,7 @@ protected function preprocessForm(JForm $form, $data, $group = 'content') */ public function validate($form, $data, $group = null) { - require_once JPATH_ADMINISTRATOR . '/components/com_content/helpers/content.php'; + JLoader::register('ContentHelper', JPATH_ADMINISTRATOR . '/components/com_content/helpers/content.php'); return parent::validate($form, $data, $group); } diff --git a/administrator/components/com_modules/views/module/tmpl/edit_assignment.php b/administrator/components/com_modules/views/module/tmpl/edit_assignment.php index d1c1594f81708..b30b020a1a98b 100644 --- a/administrator/components/com_modules/views/module/tmpl/edit_assignment.php +++ b/administrator/components/com_modules/views/module/tmpl/edit_assignment.php @@ -9,8 +9,8 @@ defined('_JEXEC') or die; -// Initiasile related data. -require_once JPATH_ADMINISTRATOR . '/components/com_menus/helpers/menus.php'; +// Initialise related data. +JLoader::register('MenusHelper', JPATH_ADMINISTRATOR . '/components/com_menus/helpers/menus.php'); $menuTypes = MenusHelper::getMenuLinks(); JHtml::_('script', 'jui/treeselectmenu.jquery.min.js', false, true); diff --git a/administrator/components/com_modules/views/module/tmpl/edit_positions.php b/administrator/components/com_modules/views/module/tmpl/edit_positions.php index eaf28009a72fb..2ee47fcd436bc 100644 --- a/administrator/components/com_modules/views/module/tmpl/edit_positions.php +++ b/administrator/components/com_modules/views/module/tmpl/edit_positions.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -require_once JPATH_ADMINISTRATOR . '/components/com_templates/helpers/templates.php'; +JLoader::register('TemplatesHelper', JPATH_ADMINISTRATOR . '/components/com_templates/helpers/templates.php'); JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); $clientId = $this->item->client_id; diff --git a/administrator/components/com_newsfeeds/controller.php b/administrator/components/com_newsfeeds/controller.php index cda85773ddd0f..91b195d31b05e 100644 --- a/administrator/components/com_newsfeeds/controller.php +++ b/administrator/components/com_newsfeeds/controller.php @@ -28,7 +28,7 @@ class NewsfeedsController extends JControllerLegacy */ public function display($cachable = false, $urlparams = array()) { - require_once JPATH_COMPONENT . '/helpers/newsfeeds.php'; + JLoader::register('NewsfeedsHelper', JPATH_COMPONENT . '/helpers/newsfeeds.php'); $view = $this->input->get('view', 'newsfeeds'); $layout = $this->input->get('layout', 'default'); diff --git a/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/modal.php b/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/modal.php index 139db4d59c164..cb002e8360bdf 100644 --- a/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/modal.php +++ b/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/modal.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -require_once JPATH_ROOT . '/components/com_newsfeeds/helpers/route.php'; +JLoader::register('NewsfeedsHelperRoute', JPATH_ROOT . '/components/com_newsfeeds/helpers/route.php'); JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); diff --git a/administrator/components/com_plugins/controller.php b/administrator/components/com_plugins/controller.php index 725b064e86c7c..68646e5f05e8f 100644 --- a/administrator/components/com_plugins/controller.php +++ b/administrator/components/com_plugins/controller.php @@ -28,7 +28,7 @@ class PluginsController extends JControllerLegacy */ public function display($cachable = false, $urlparams = false) { - require_once JPATH_COMPONENT . '/helpers/plugins.php'; + JLoader::register('PluginsHelper', JPATH_COMPONENT . '/helpers/plugins.php'); // Load the submenu. PluginsHelper::addSubmenu($this->input->get('view', 'plugins')); diff --git a/administrator/components/com_postinstall/postinstall.php b/administrator/components/com_postinstall/postinstall.php index 38bd2f398f22b..1745aa617b165 100644 --- a/administrator/components/com_postinstall/postinstall.php +++ b/administrator/components/com_postinstall/postinstall.php @@ -9,11 +9,5 @@ defined('_JEXEC') or die; -// Load the RAD layer. -if (!defined('FOF_INCLUDED')) -{ - require_once JPATH_LIBRARIES . '/fof/include.php'; -} - // Dispatch the component. FOFDispatcher::getTmpInstance('com_postinstall')->dispatch(); diff --git a/administrator/components/com_redirect/controller.php b/administrator/components/com_redirect/controller.php index edba4e74f4c25..12af4c536949b 100644 --- a/administrator/components/com_redirect/controller.php +++ b/administrator/components/com_redirect/controller.php @@ -34,7 +34,7 @@ class RedirectController extends JControllerLegacy */ public function display($cachable = false, $urlparams = false) { - require_once JPATH_COMPONENT . '/helpers/redirect.php'; + JLoader::register('RedirectHelper', JPATH_COMPONENT . '/helpers/redirect.php'); // Load the submenu. RedirectHelper::addSubmenu($this->input->get('view', 'links')); diff --git a/administrator/components/com_search/controller.php b/administrator/components/com_search/controller.php index 4b94a2f3b3379..54818d75790c4 100644 --- a/administrator/components/com_search/controller.php +++ b/administrator/components/com_search/controller.php @@ -34,7 +34,7 @@ class SearchController extends JControllerLegacy */ public function display($cachable = false, $urlparams = false) { - require_once JPATH_COMPONENT . '/helpers/search.php'; + JLoader::register('SearchHelper', JPATH_COMPONENT . '/helpers/search.php'); // Load the submenu. SearchHelper::addSubmenu($this->input->get('view', 'searches')); diff --git a/administrator/components/com_templates/views/style/tmpl/edit_assignment.php b/administrator/components/com_templates/views/style/tmpl/edit_assignment.php index c0daf57be4cd5..8e33453613b8e 100644 --- a/administrator/components/com_templates/views/style/tmpl/edit_assignment.php +++ b/administrator/components/com_templates/views/style/tmpl/edit_assignment.php @@ -10,7 +10,7 @@ defined('_JEXEC') or die; // Initiasile related data. -require_once JPATH_ADMINISTRATOR . '/components/com_menus/helpers/menus.php'; +JLoader::register('MenusHelper', JPATH_ADMINISTRATOR . '/components/com_menus/helpers/menus.php'); $menuTypes = MenusHelper::getMenuLinks(); $user = JFactory::getUser(); ?> diff --git a/administrator/components/com_users/controllers/profile.json.php b/administrator/components/com_users/controllers/profile.json.php index b9390f4a97786..eed7aba5eaddf 100644 --- a/administrator/components/com_users/controllers/profile.json.php +++ b/administrator/components/com_users/controllers/profile.json.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -require_once JPATH_SITE . '/components/com_users/controllers/profile_base_json.php'; +JLoader::register('UsersControllerProfile_Base_Json', JPATH_SITE . '/components/com_users/controllers/profile_base_json.php'); /** * Profile controller class for Users. diff --git a/administrator/components/com_users/models/debuggroup.php b/administrator/components/com_users/models/debuggroup.php index dd9ed7526d218..4bb4c9eb9868a 100644 --- a/administrator/components/com_users/models/debuggroup.php +++ b/administrator/components/com_users/models/debuggroup.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -require_once JPATH_COMPONENT . '/helpers/debug.php'; +JLoader::register('UsersHelperDebug', JPATH_COMPONENT . '/helpers/debug.php'); /** * Methods supporting a list of user records. diff --git a/administrator/components/com_users/models/debuguser.php b/administrator/components/com_users/models/debuguser.php index 94e155af43f0c..ede8f437724e3 100644 --- a/administrator/components/com_users/models/debuguser.php +++ b/administrator/components/com_users/models/debuguser.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -require_once JPATH_COMPONENT . '/helpers/debug.php'; +JLoader::register('UsersHelperDebug', JPATH_COMPONENT . '/helpers/debug.php'); /** * Methods supporting a list of user records. diff --git a/administrator/modules/mod_login/helper.php b/administrator/modules/mod_login/helper.php index 906c2a59986f1..3bac8a84318e8 100644 --- a/administrator/modules/mod_login/helper.php +++ b/administrator/modules/mod_login/helper.php @@ -80,7 +80,7 @@ public static function getReturnUri() */ public static function getTwoFactorMethods() { - require_once JPATH_ADMINISTRATOR . '/components/com_users/helpers/users.php'; + JLoader::register('UsersHelper', JPATH_ADMINISTRATOR . '/components/com_users/helpers/users.php'); return UsersHelper::getTwoFactorMethods(); } diff --git a/administrator/templates/hathor/html/com_content/articles/modal.php b/administrator/templates/hathor/html/com_content/articles/modal.php index 7a03a43a507ba..e2aa9fb8b810f 100644 --- a/administrator/templates/hathor/html/com_content/articles/modal.php +++ b/administrator/templates/hathor/html/com_content/articles/modal.php @@ -16,7 +16,7 @@ JSession::checkToken('get') or die(JText::_('JINVALID_TOKEN')); } -require_once JPATH_ROOT . '/components/com_content/helpers/route.php'; +JLoader::register('ContentHelperRoute', JPATH_ROOT . '/components/com_content/helpers/route.php'); JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html'); diff --git a/administrator/templates/hathor/html/com_modules/module/edit_assignment.php b/administrator/templates/hathor/html/com_modules/module/edit_assignment.php index 174fe4d4163aa..b05b23c1dacca 100644 --- a/administrator/templates/hathor/html/com_modules/module/edit_assignment.php +++ b/administrator/templates/hathor/html/com_modules/module/edit_assignment.php @@ -9,8 +9,8 @@ defined('_JEXEC') or die; -// Initiasile related data. -require_once JPATH_ADMINISTRATOR.'/components/com_menus/helpers/menus.php'; +// Initialise related data. +JLoader::register('MenusHelper', JPATH_ADMINISTRATOR . '/components/com_menus/helpers/menus.php'); $menuTypes = MenusHelper::getMenuLinks(); JFactory::getDocument()->addScriptDeclaration(" diff --git a/administrator/templates/hathor/html/com_templates/style/edit_assignment.php b/administrator/templates/hathor/html/com_templates/style/edit_assignment.php index 9fb7a2f6b622d..50df87dff8b3a 100644 --- a/administrator/templates/hathor/html/com_templates/style/edit_assignment.php +++ b/administrator/templates/hathor/html/com_templates/style/edit_assignment.php @@ -9,8 +9,8 @@ defined('_JEXEC') or die; -// Initiasile related data. -require_once JPATH_ADMINISTRATOR.'/components/com_menus/helpers/menus.php'; +// Initialise related data. +JLoader::register('MenusHelper', JPATH_ADMINISTRATOR . '/components/com_menus/helpers/menus.php'); $menuTypes = MenusHelper::getMenuLinks(); $user = JFactory::getUser(); From 32bccc4b60417a1b314f811f5961d9aba2855032 Mon Sep 17 00:00:00 2001 From: Michael Babker Date: Tue, 21 Jun 2016 12:23:47 -0500 Subject: [PATCH 002/151] Add includes to this as well --- administrator/components/com_finder/controller.php | 2 +- administrator/components/com_joomlaupdate/controller.php | 5 +---- administrator/components/com_users/helpers/users.php | 6 ------ administrator/components/com_users/models/user.php | 6 ------ 4 files changed, 2 insertions(+), 17 deletions(-) diff --git a/administrator/components/com_finder/controller.php b/administrator/components/com_finder/controller.php index 502775321d565..b7fa30428de5c 100644 --- a/administrator/components/com_finder/controller.php +++ b/administrator/components/com_finder/controller.php @@ -34,7 +34,7 @@ class FinderController extends JControllerLegacy */ public function display($cachable = false, $urlparams = array()) { - include_once JPATH_COMPONENT . '/helpers/finder.php'; + JLoader::register('FinderHelper', JPATH_COMPONENT . '/helpers/finder.php'); $view = $this->input->get('view', 'index', 'word'); $layout = $this->input->get('layout', 'index', 'word'); diff --git a/administrator/components/com_joomlaupdate/controller.php b/administrator/components/com_joomlaupdate/controller.php index 1040f51a948f9..b9831e34d0bd6 100644 --- a/administrator/components/com_joomlaupdate/controller.php +++ b/administrator/components/com_joomlaupdate/controller.php @@ -47,10 +47,7 @@ public function display($cachable = false, $urlparams = false) $model = $this->getModel('default'); // Push the Installer Warnings model into the view, if we can load it - if (!class_exists('InstallerModelWarnings')) - { - @include_once JPATH_ADMINISTRATOR . '/components/com_installer/models/warnings.php'; - } + static::addModelPath(JPATH_ADMINISTRATOR . '/components/com_installer/models', 'InstallerModel'); $warningsModel = $this->getModel('warnings', 'InstallerModel'); diff --git a/administrator/components/com_users/helpers/users.php b/administrator/components/com_users/helpers/users.php index 90e76467d7ecf..fb8b4820ba11d 100644 --- a/administrator/components/com_users/helpers/users.php +++ b/administrator/components/com_users/helpers/users.php @@ -193,12 +193,6 @@ public static function getRangeOptions() */ public static function getTwoFactorMethods() { - // Load the Joomla! RAD layer - if (!defined('FOF_INCLUDED')) - { - include_once JPATH_LIBRARIES . '/fof/include.php'; - } - FOFPlatform::getInstance()->importPlugin('twofactorauth'); $identities = FOFPlatform::getInstance()->runPlugins('onUserTwofactorIdentify', array()); diff --git a/administrator/components/com_users/models/user.php b/administrator/components/com_users/models/user.php index 0a2f517bce256..a4fa23fd15f07 100644 --- a/administrator/components/com_users/models/user.php +++ b/administrator/components/com_users/models/user.php @@ -38,12 +38,6 @@ public function __construct($config = array()) ); parent::__construct($config); - - // Load the Joomla! RAD layer - if (!defined('FOF_INCLUDED')) - { - include_once JPATH_LIBRARIES . '/fof/include.php'; - } } /** From b7afe6c52150127b5b41fee5d4204d267e99e631 Mon Sep 17 00:00:00 2001 From: Michael Babker Date: Tue, 21 Jun 2016 12:50:08 -0500 Subject: [PATCH 003/151] Added more includes to search --- .../components/com_content/controllers/featured.php | 2 +- .../components/com_content/models/feature.php | 2 +- .../components/com_content/models/featured.php | 2 +- .../components/com_installer/models/discover.php | 2 +- .../com_installer/models/fields/extensionstatus.php | 2 +- .../com_installer/models/fields/folder.php | 2 +- .../com_installer/models/fields/location.php | 2 +- .../components/com_installer/models/fields/type.php | 2 +- .../components/com_installer/models/manage.php | 2 +- .../components/com_installer/models/updatesites.php | 6 ++---- .../com_installer/views/database/view.html.php | 2 +- .../com_installer/views/discover/view.html.php | 2 +- .../com_installer/views/install/view.html.php | 2 +- .../com_installer/views/languages/view.html.php | 2 +- .../com_installer/views/manage/view.html.php | 2 +- .../com_installer/views/update/view.html.php | 2 +- .../com_installer/views/updatesites/view.html.php | 2 +- .../com_installer/views/warnings/view.html.php | 2 +- .../com_modules/models/fields/modulesmodule.php | 2 +- .../com_modules/models/fields/modulesposition.php | 2 +- .../com_plugins/models/fields/plugintype.php | 2 +- .../models/fields/templatelocation.php | 2 +- .../com_templates/models/fields/templatename.php | 2 +- administrator/components/com_users/models/user.php | 6 ------ administrator/modules/mod_feed/mod_feed.php | 2 +- administrator/modules/mod_latest/mod_latest.php | 2 +- administrator/modules/mod_logged/mod_logged.php | 2 +- administrator/modules/mod_login/mod_login.php | 2 +- administrator/modules/mod_menu/mod_menu.php | 13 +++---------- administrator/modules/mod_popular/mod_popular.php | 2 +- .../modules/mod_quickicon/mod_quickicon.php | 2 +- .../modules/mod_stats_admin/mod_stats_admin.php | 2 +- administrator/modules/mod_version/mod_version.php | 2 +- 33 files changed, 35 insertions(+), 50 deletions(-) diff --git a/administrator/components/com_content/controllers/featured.php b/administrator/components/com_content/controllers/featured.php index 089df321927db..ee27c3040fdfe 100644 --- a/administrator/components/com_content/controllers/featured.php +++ b/administrator/components/com_content/controllers/featured.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -require_once __DIR__ . '/articles.php'; +JLoader::register('ContentControllerArticles', __DIR__ . '/articles.php'); /** * Featured content controller class. diff --git a/administrator/components/com_content/models/feature.php b/administrator/components/com_content/models/feature.php index f3730034575d5..7a12a1f876284 100644 --- a/administrator/components/com_content/models/feature.php +++ b/administrator/components/com_content/models/feature.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -require_once __DIR__ . '/article.php'; +JLoader::register('ContentModelArticle', __DIR__ . '/article.php'); /** * Feature model. diff --git a/administrator/components/com_content/models/featured.php b/administrator/components/com_content/models/featured.php index 1292491004258..f5d2ef8faeb59 100644 --- a/administrator/components/com_content/models/featured.php +++ b/administrator/components/com_content/models/featured.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -require_once __DIR__ . '/articles.php'; +JLoader::register('ContentModelArticles', __DIR__ . '/articles.php'); /** * About Page Model diff --git a/administrator/components/com_installer/models/discover.php b/administrator/components/com_installer/models/discover.php index 2b02c55e4925b..f09d1572d8396 100644 --- a/administrator/components/com_installer/models/discover.php +++ b/administrator/components/com_installer/models/discover.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -require_once __DIR__ . '/extension.php'; +JLoader::register('InstallerModel', __DIR__ . '/extension.php'); /** * Installer Discover Model diff --git a/administrator/components/com_installer/models/fields/extensionstatus.php b/administrator/components/com_installer/models/fields/extensionstatus.php index f9965d5eb5a5b..1a6ef20416835 100644 --- a/administrator/components/com_installer/models/fields/extensionstatus.php +++ b/administrator/components/com_installer/models/fields/extensionstatus.php @@ -11,7 +11,7 @@ JFormHelper::loadFieldClass('list'); -require_once __DIR__ . '/../../helpers/installer.php'; +JLoader::register('InstallerHelper', JPATH_ADMINISTRATOR . '/components/com_installer/helpers/installer.php'); /** * Status Field class for the Joomla Framework. diff --git a/administrator/components/com_installer/models/fields/folder.php b/administrator/components/com_installer/models/fields/folder.php index c73d8007c5493..08dbfd35fd24a 100644 --- a/administrator/components/com_installer/models/fields/folder.php +++ b/administrator/components/com_installer/models/fields/folder.php @@ -11,7 +11,7 @@ JFormHelper::loadFieldClass('list'); -require_once __DIR__ . '/../../helpers/installer.php'; +JLoader::register('InstallerHelper', JPATH_ADMINISTRATOR . '/components/com_installer/helpers/installer.php'); /** * Folder Field class for the Joomla Framework. diff --git a/administrator/components/com_installer/models/fields/location.php b/administrator/components/com_installer/models/fields/location.php index cf440c2a1cdea..a73177b668000 100644 --- a/administrator/components/com_installer/models/fields/location.php +++ b/administrator/components/com_installer/models/fields/location.php @@ -11,7 +11,7 @@ JFormHelper::loadFieldClass('list'); -require_once __DIR__ . '/../../helpers/installer.php'; +JLoader::register('InstallerHelper', JPATH_ADMINISTRATOR . '/components/com_installer/helpers/installer.php'); /** * Location Field class for the Joomla Framework. diff --git a/administrator/components/com_installer/models/fields/type.php b/administrator/components/com_installer/models/fields/type.php index bb2e72b2d65dc..e3f01db143824 100644 --- a/administrator/components/com_installer/models/fields/type.php +++ b/administrator/components/com_installer/models/fields/type.php @@ -11,7 +11,7 @@ JFormHelper::loadFieldClass('list'); -require_once __DIR__ . '/../../helpers/installer.php'; +JLoader::register('InstallerHelper', JPATH_ADMINISTRATOR . '/components/com_installer/helpers/installer.php'); /** * Type Field class for the Joomla Framework. diff --git a/administrator/components/com_installer/models/manage.php b/administrator/components/com_installer/models/manage.php index cdd9b0486bf5f..b4490328e0760 100644 --- a/administrator/components/com_installer/models/manage.php +++ b/administrator/components/com_installer/models/manage.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -require_once __DIR__ . '/extension.php'; +JLoader::register('InstallerModel', __DIR__ . '/extension.php'); /** * Installer Manage Model diff --git a/administrator/components/com_installer/models/updatesites.php b/administrator/components/com_installer/models/updatesites.php index d806da9bcf8fe..8042d7067e958 100644 --- a/administrator/components/com_installer/models/updatesites.php +++ b/administrator/components/com_installer/models/updatesites.php @@ -9,14 +9,12 @@ defined('_JEXEC') or die; -require_once __DIR__ . '/extension.php'; +JLoader::register('InstallerModel', __DIR__ . '/extension.php'); /** * Installer Update Sites Model * - * @package Joomla.Administrator - * @subpackage com_installer - * @since 3.4 + * @since 3.4 */ class InstallerModelUpdatesites extends InstallerModel { diff --git a/administrator/components/com_installer/views/database/view.html.php b/administrator/components/com_installer/views/database/view.html.php index 690ceb89f0c84..37a4d2cf72bd5 100644 --- a/administrator/components/com_installer/views/database/view.html.php +++ b/administrator/components/com_installer/views/database/view.html.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -include_once __DIR__ . '/../default/view.php'; +JLoader::register('InstallerViewDefault', dirname(__DIR__) . '/default/view.php'); /** * Extension Manager Manage View diff --git a/administrator/components/com_installer/views/discover/view.html.php b/administrator/components/com_installer/views/discover/view.html.php index 4600284f17159..c7b312583a29f 100644 --- a/administrator/components/com_installer/views/discover/view.html.php +++ b/administrator/components/com_installer/views/discover/view.html.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -include_once __DIR__ . '/../default/view.php'; +JLoader::register('InstallerViewDefault', dirname(__DIR__) . '/default/view.php'); /** * Extension Manager Discover View diff --git a/administrator/components/com_installer/views/install/view.html.php b/administrator/components/com_installer/views/install/view.html.php index c61c838919232..1ede88a5fc87d 100644 --- a/administrator/components/com_installer/views/install/view.html.php +++ b/administrator/components/com_installer/views/install/view.html.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -include_once __DIR__ . '/../default/view.php'; +JLoader::register('InstallerViewDefault', dirname(__DIR__) . '/default/view.php'); /** * Extension Manager Install View diff --git a/administrator/components/com_installer/views/languages/view.html.php b/administrator/components/com_installer/views/languages/view.html.php index 0ffb1b9e836c8..59cb4b5113543 100644 --- a/administrator/components/com_installer/views/languages/view.html.php +++ b/administrator/components/com_installer/views/languages/view.html.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -include_once __DIR__ . '/../default/view.php'; +JLoader::register('InstallerViewDefault', dirname(__DIR__) . '/default/view.php'); /** * Language installer view diff --git a/administrator/components/com_installer/views/manage/view.html.php b/administrator/components/com_installer/views/manage/view.html.php index 95807df3a5a30..7bfa0b6bfd55e 100644 --- a/administrator/components/com_installer/views/manage/view.html.php +++ b/administrator/components/com_installer/views/manage/view.html.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -include_once __DIR__ . '/../default/view.php'; +JLoader::register('InstallerViewDefault', dirname(__DIR__) . '/default/view.php'); /** * Extension Manager Manage View diff --git a/administrator/components/com_installer/views/update/view.html.php b/administrator/components/com_installer/views/update/view.html.php index 325e3a5a91b8a..00559a1a7c76b 100644 --- a/administrator/components/com_installer/views/update/view.html.php +++ b/administrator/components/com_installer/views/update/view.html.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -include_once __DIR__ . '/../default/view.php'; +JLoader::register('InstallerViewDefault', dirname(__DIR__) . '/default/view.php'); /** * Extension Manager Update View diff --git a/administrator/components/com_installer/views/updatesites/view.html.php b/administrator/components/com_installer/views/updatesites/view.html.php index 66087e240c031..5b377d4d9af7d 100644 --- a/administrator/components/com_installer/views/updatesites/view.html.php +++ b/administrator/components/com_installer/views/updatesites/view.html.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -include_once __DIR__ . '/../default/view.php'; +JLoader::register('InstallerViewDefault', dirname(__DIR__) . '/default/view.php'); /** * Extension Manager Update Sites View diff --git a/administrator/components/com_installer/views/warnings/view.html.php b/administrator/components/com_installer/views/warnings/view.html.php index 5cee0fc778fa7..b8370dbb11845 100644 --- a/administrator/components/com_installer/views/warnings/view.html.php +++ b/administrator/components/com_installer/views/warnings/view.html.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -include_once __DIR__ . '/../default/view.php'; +JLoader::register('InstallerViewDefault', dirname(__DIR__) . '/default/view.php'); /** * Extension Manager Templates View diff --git a/administrator/components/com_modules/models/fields/modulesmodule.php b/administrator/components/com_modules/models/fields/modulesmodule.php index 05727c2f13a08..81c3586a416c1 100644 --- a/administrator/components/com_modules/models/fields/modulesmodule.php +++ b/administrator/components/com_modules/models/fields/modulesmodule.php @@ -11,7 +11,7 @@ JFormHelper::loadFieldClass('list'); -require_once __DIR__ . '/../../helpers/modules.php'; +JLoader::register('ModulesHelper', JPATH_ADMINISTRATOR . '/components/com_modules/helpers/modules.php'); /** * ModulesPosition Field class for the Joomla Framework. diff --git a/administrator/components/com_modules/models/fields/modulesposition.php b/administrator/components/com_modules/models/fields/modulesposition.php index fd00ef4e787a2..8cda336e44462 100644 --- a/administrator/components/com_modules/models/fields/modulesposition.php +++ b/administrator/components/com_modules/models/fields/modulesposition.php @@ -11,7 +11,7 @@ JFormHelper::loadFieldClass('list'); -require_once __DIR__ . '/../../helpers/modules.php'; +JLoader::register('ModulesHelper', JPATH_ADMINISTRATOR . '/components/com_modules/helpers/modules.php'); /** * ModulesPosition Field class for the Joomla Framework. diff --git a/administrator/components/com_plugins/models/fields/plugintype.php b/administrator/components/com_plugins/models/fields/plugintype.php index abfc25a69ab69..16e0ebd8dcee6 100644 --- a/administrator/components/com_plugins/models/fields/plugintype.php +++ b/administrator/components/com_plugins/models/fields/plugintype.php @@ -11,7 +11,7 @@ JFormHelper::loadFieldClass('list'); -require_once __DIR__ . '/../../helpers/plugins.php'; +JLoader::register('PluginsHelper', JPATH_ADMINISTRATOR . '/components/com_plugins/helpers/plugins.php'); /** * Plugin Type Field class for the Joomla Framework. diff --git a/administrator/components/com_templates/models/fields/templatelocation.php b/administrator/components/com_templates/models/fields/templatelocation.php index 0c8c67774e25f..a7fd6ab1736cc 100644 --- a/administrator/components/com_templates/models/fields/templatelocation.php +++ b/administrator/components/com_templates/models/fields/templatelocation.php @@ -11,7 +11,7 @@ JFormHelper::loadFieldClass('list'); -require_once __DIR__ . '/../../helpers/templates.php'; +JLoader::register('TemplatesHelper', JPATH_ADMINISTRATOR . '/components/com_templates/helpers/templates.php'); /** * Template Style Field class for the Joomla Framework. diff --git a/administrator/components/com_templates/models/fields/templatename.php b/administrator/components/com_templates/models/fields/templatename.php index 00e7522445551..954fc4f10f791 100644 --- a/administrator/components/com_templates/models/fields/templatename.php +++ b/administrator/components/com_templates/models/fields/templatename.php @@ -11,7 +11,7 @@ JFormHelper::loadFieldClass('list'); -require_once __DIR__ . '/../../helpers/templates.php'; +JLoader::register('TemplatesHelper', JPATH_ADMINISTRATOR . '/components/com_templates/helpers/templates.php'); /** * Template Style Field class for the Joomla Framework. diff --git a/administrator/components/com_users/models/user.php b/administrator/components/com_users/models/user.php index a4fa23fd15f07..5cc0eb03ad15c 100644 --- a/administrator/components/com_users/models/user.php +++ b/administrator/components/com_users/models/user.php @@ -1225,12 +1225,6 @@ public function isValidSecretKey($user_id, $secretkey, $options = array()) 'secretkey' => $secretkey, ); - // Load the Joomla! RAD layer - if (!defined('FOF_INCLUDED')) - { - include_once JPATH_LIBRARIES . '/fof/include.php'; - } - // Try to validate the OTP FOFPlatform::getInstance()->importPlugin('twofactorauth'); diff --git a/administrator/modules/mod_feed/mod_feed.php b/administrator/modules/mod_feed/mod_feed.php index 274246033913f..d2e1755a65f4e 100644 --- a/administrator/modules/mod_feed/mod_feed.php +++ b/administrator/modules/mod_feed/mod_feed.php @@ -10,7 +10,7 @@ defined('_JEXEC') or die; // Include the feed functions only once -require_once __DIR__ . '/helper.php'; +JLoader::register('ModFeedHelper', __DIR__ . '/helper.php'); $rssurl = $params->get('rssurl', ''); $rssrtl = $params->get('rssrtl', 0); diff --git a/administrator/modules/mod_latest/mod_latest.php b/administrator/modules/mod_latest/mod_latest.php index fd15cee9ee4ee..e6dab1c4d911a 100644 --- a/administrator/modules/mod_latest/mod_latest.php +++ b/administrator/modules/mod_latest/mod_latest.php @@ -10,7 +10,7 @@ defined('_JEXEC') or die; // Include dependencies. -require_once __DIR__ . '/helper.php'; +JLoader::register('ModLatestHelper', __DIR__ . '/helper.php'); $list = ModLatestHelper::getList($params); diff --git a/administrator/modules/mod_logged/mod_logged.php b/administrator/modules/mod_logged/mod_logged.php index fb0c9b12d1f83..983d0d726ee4e 100644 --- a/administrator/modules/mod_logged/mod_logged.php +++ b/administrator/modules/mod_logged/mod_logged.php @@ -10,7 +10,7 @@ defined('_JEXEC') or die; // Include dependencies. -require_once __DIR__ . '/helper.php'; +JLoader::register('ModLoggedHelper', __DIR__ . '/helper.php'); $users = ModLoggedHelper::getList($params); diff --git a/administrator/modules/mod_login/mod_login.php b/administrator/modules/mod_login/mod_login.php index 435226c9abc4b..0577d589bbdaf 100644 --- a/administrator/modules/mod_login/mod_login.php +++ b/administrator/modules/mod_login/mod_login.php @@ -10,7 +10,7 @@ defined('_JEXEC') or die; // Include the login functions only once -require_once __DIR__ . '/helper.php'; +JLoader::register('ModLoginHelper', __DIR__ . '/helper.php'); $langs = ModLoginHelper::getLanguageList(); $twofactormethods = ModLoginHelper::getTwoFactorMethods(); diff --git a/administrator/modules/mod_menu/mod_menu.php b/administrator/modules/mod_menu/mod_menu.php index f1a9092ef935b..5f2e811c19006 100644 --- a/administrator/modules/mod_menu/mod_menu.php +++ b/administrator/modules/mod_menu/mod_menu.php @@ -10,20 +10,13 @@ defined('_JEXEC') or die; // Include the module helper classes. -if (!class_exists('ModMenuHelper')) -{ - require __DIR__ . '/helper.php'; -} - -if (!class_exists('JAdminCssMenu')) -{ - require __DIR__ . '/menu.php'; -} +JLoader::register('ModMenuHelper', __DIR__ . '/helper.php'); +JLoader::register('JAdminCssMenu', __DIR__ . '/menu.php'); $lang = JFactory::getLanguage(); $user = JFactory::getUser(); $input = JFactory::getApplication()->input; -$menu = new JAdminCSSMenu; +$menu = new JAdminCssMenu; $enabled = $input->getBool('hidemainmenu') ? false : true; // Render the module layout diff --git a/administrator/modules/mod_popular/mod_popular.php b/administrator/modules/mod_popular/mod_popular.php index 114a5a3e065aa..24462df1d0883 100644 --- a/administrator/modules/mod_popular/mod_popular.php +++ b/administrator/modules/mod_popular/mod_popular.php @@ -10,7 +10,7 @@ defined('_JEXEC') or die; // Include the mod_popular functions only once. -require_once __DIR__ . '/helper.php'; +JLoader::register('ModPopularHelper', __DIR__ . '/helper.php'); // Get module data. $list = ModPopularHelper::getList($params); diff --git a/administrator/modules/mod_quickicon/mod_quickicon.php b/administrator/modules/mod_quickicon/mod_quickicon.php index b52bf4525dab1..52cbe3838842d 100644 --- a/administrator/modules/mod_quickicon/mod_quickicon.php +++ b/administrator/modules/mod_quickicon/mod_quickicon.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -require_once __DIR__ . '/helper.php'; +JLoader::register('ModQuickIconHelper', __DIR__ . '/helper.php'); $buttons = ModQuickIconHelper::getButtons($params); diff --git a/administrator/modules/mod_stats_admin/mod_stats_admin.php b/administrator/modules/mod_stats_admin/mod_stats_admin.php index 20624106c09cc..d66d624e410f6 100644 --- a/administrator/modules/mod_stats_admin/mod_stats_admin.php +++ b/administrator/modules/mod_stats_admin/mod_stats_admin.php @@ -10,7 +10,7 @@ defined('_JEXEC') or die; // Include the mod_stats functions only once -require_once __DIR__ . '/helper.php'; +JLoader::register('ModStatsHelper', __DIR__ . '/helper.php'); $serverinfo = $params->get('serverinfo'); $siteinfo = $params->get('siteinfo'); diff --git a/administrator/modules/mod_version/mod_version.php b/administrator/modules/mod_version/mod_version.php index 15a2858a98340..d2848caa4ec84 100644 --- a/administrator/modules/mod_version/mod_version.php +++ b/administrator/modules/mod_version/mod_version.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -require_once __DIR__ . '/helper.php'; +JLoader::register('ModVersionHelper', __DIR__ . '/helper.php'); $version = ModVersionHelper::getVersion($params); From 69c55e4b91a62aae51b974bfe29dedb3a4315cfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wojciech=20Smoli=C5=84ski?= Date: Tue, 28 Jun 2016 20:45:36 +0200 Subject: [PATCH 004/151] tab to spaces (#10952) --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index fda3069c9ad66..b455faad2ca23 100644 --- a/composer.json +++ b/composer.json @@ -31,7 +31,7 @@ "leafo/lessphp": "0.5.0", "paragonie/random_compat": "~1.0", "phpmailer/phpmailer": "5.2.14", - "symfony/polyfill-php55": "~1.2", + "symfony/polyfill-php55": "~1.2", "symfony/polyfill-php56": "~1.0", "symfony/yaml": "2.*", "simplepie/simplepie": "1.3.1" From 08d6e492682518d33cb779e1c86db8a100a09a6d Mon Sep 17 00:00:00 2001 From: wilsonge Date: Tue, 28 Jun 2016 20:38:24 +0100 Subject: [PATCH 005/151] Tag 3.6.0 Release Candidate --- administrator/manifests/files/joomla.xml | 2 +- libraries/cms/version/version.php | 8 ++++---- .../libraries/joomla/session/JSessionStorageTest.php | 2 +- .../unit/suites/libraries/joomla/session/JSessionTest.php | 2 +- .../suites/libraries/joomla/session/handler/array.php | 2 +- .../joomla/session/storage/JSessionStorageApcTest.php | 2 +- .../session/storage/JSessionStorageDatabaseTest.php | 2 +- .../session/storage/JSessionStorageMemcacheTest.php | 2 +- .../joomla/session/storage/JSessionStorageNoneTest.php | 2 +- .../session/storage/JSessionStorageWincacheTest.php | 2 +- .../joomla/session/storage/JSessionStorageXcacheTest.php | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml index dcc24eff3013a..54ebb77d917bd 100644 --- a/administrator/manifests/files/joomla.xml +++ b/administrator/manifests/files/joomla.xml @@ -6,7 +6,7 @@ www.joomla.org (C) 2005 - 2016 Open Source Matters. All rights reserved GNU General Public License version 2 or later; see LICENSE.txt - 3.6.0-beta2 + 3.6.0-rc June 2016 FILES_JOOMLA_XML_DESCRIPTION diff --git a/libraries/cms/version/version.php b/libraries/cms/version/version.php index d63755904580c..83ac975dc9e9d 100644 --- a/libraries/cms/version/version.php +++ b/libraries/cms/version/version.php @@ -38,7 +38,7 @@ final class JVersion * @var string * @since 3.5 */ - const DEV_LEVEL = '0-beta2'; + const DEV_LEVEL = '0-rc'; /** * Development status. @@ -46,7 +46,7 @@ final class JVersion * @var string * @since 3.5 */ - const DEV_STATUS = 'Beta'; + const DEV_STATUS = 'Release Candidate'; /** * Build number. @@ -70,7 +70,7 @@ final class JVersion * @var string * @since 3.5 */ - const RELDATE = '16-June-2016'; + const RELDATE = '28-June-2016'; /** * Release time. @@ -78,7 +78,7 @@ final class JVersion * @var string * @since 3.5 */ - const RELTIME = '13:54'; + const RELTIME = '20:34'; /** * Release timezone. diff --git a/tests/unit/suites/libraries/joomla/session/JSessionStorageTest.php b/tests/unit/suites/libraries/joomla/session/JSessionStorageTest.php index 75313b6b63c37..c50d712995a9e 100644 --- a/tests/unit/suites/libraries/joomla/session/JSessionStorageTest.php +++ b/tests/unit/suites/libraries/joomla/session/JSessionStorageTest.php @@ -2,7 +2,7 @@ /** * @package Joomla.UnitTest * - * @copyright Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/tests/unit/suites/libraries/joomla/session/JSessionTest.php b/tests/unit/suites/libraries/joomla/session/JSessionTest.php index 9453dbd38e78e..92fe8d9939187 100644 --- a/tests/unit/suites/libraries/joomla/session/JSessionTest.php +++ b/tests/unit/suites/libraries/joomla/session/JSessionTest.php @@ -2,7 +2,7 @@ /** * @package Joomla.UnitTest * - * @copyright Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/tests/unit/suites/libraries/joomla/session/handler/array.php b/tests/unit/suites/libraries/joomla/session/handler/array.php index 6a1cf79712e70..c5c196bdc9593 100644 --- a/tests/unit/suites/libraries/joomla/session/handler/array.php +++ b/tests/unit/suites/libraries/joomla/session/handler/array.php @@ -3,7 +3,7 @@ * @package Joomla.Platform * @subpackage Session * - * @copyright Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/tests/unit/suites/libraries/joomla/session/storage/JSessionStorageApcTest.php b/tests/unit/suites/libraries/joomla/session/storage/JSessionStorageApcTest.php index e0f2f4355e787..52c857a3770df 100644 --- a/tests/unit/suites/libraries/joomla/session/storage/JSessionStorageApcTest.php +++ b/tests/unit/suites/libraries/joomla/session/storage/JSessionStorageApcTest.php @@ -2,7 +2,7 @@ /** * @package Joomla.UnitTest * - * @copyright Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/tests/unit/suites/libraries/joomla/session/storage/JSessionStorageDatabaseTest.php b/tests/unit/suites/libraries/joomla/session/storage/JSessionStorageDatabaseTest.php index 4398bc1a0bbf0..279204750e350 100644 --- a/tests/unit/suites/libraries/joomla/session/storage/JSessionStorageDatabaseTest.php +++ b/tests/unit/suites/libraries/joomla/session/storage/JSessionStorageDatabaseTest.php @@ -2,7 +2,7 @@ /** * @package Joomla.UnitTest * - * @copyright Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/tests/unit/suites/libraries/joomla/session/storage/JSessionStorageMemcacheTest.php b/tests/unit/suites/libraries/joomla/session/storage/JSessionStorageMemcacheTest.php index d660ae5e103e0..03965fc4fadd9 100644 --- a/tests/unit/suites/libraries/joomla/session/storage/JSessionStorageMemcacheTest.php +++ b/tests/unit/suites/libraries/joomla/session/storage/JSessionStorageMemcacheTest.php @@ -2,7 +2,7 @@ /** * @package Joomla.UnitTest * - * @copyright Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/tests/unit/suites/libraries/joomla/session/storage/JSessionStorageNoneTest.php b/tests/unit/suites/libraries/joomla/session/storage/JSessionStorageNoneTest.php index 55d4a77559795..43626dc3f4cad 100644 --- a/tests/unit/suites/libraries/joomla/session/storage/JSessionStorageNoneTest.php +++ b/tests/unit/suites/libraries/joomla/session/storage/JSessionStorageNoneTest.php @@ -2,7 +2,7 @@ /** * @package Joomla.UnitTest * - * @copyright Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/tests/unit/suites/libraries/joomla/session/storage/JSessionStorageWincacheTest.php b/tests/unit/suites/libraries/joomla/session/storage/JSessionStorageWincacheTest.php index 8806c4ff4c567..11512d013a0cb 100644 --- a/tests/unit/suites/libraries/joomla/session/storage/JSessionStorageWincacheTest.php +++ b/tests/unit/suites/libraries/joomla/session/storage/JSessionStorageWincacheTest.php @@ -2,7 +2,7 @@ /** * @package Joomla.UnitTest * - * @copyright Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/tests/unit/suites/libraries/joomla/session/storage/JSessionStorageXcacheTest.php b/tests/unit/suites/libraries/joomla/session/storage/JSessionStorageXcacheTest.php index a40b67218dc98..102b3226742c2 100644 --- a/tests/unit/suites/libraries/joomla/session/storage/JSessionStorageXcacheTest.php +++ b/tests/unit/suites/libraries/joomla/session/storage/JSessionStorageXcacheTest.php @@ -2,7 +2,7 @@ /** * @package Joomla.UnitTest * - * @copyright Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ From 25238939a06ca52b2a5ecde5c0996482c3ce656e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wojciech=20Smoli=C5=84ski?= Date: Wed, 29 Jun 2016 12:15:33 +0200 Subject: [PATCH 006/151] fix trim id site is in document_root on windows (#10956) --- libraries/cms/application/administrator.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/cms/application/administrator.php b/libraries/cms/application/administrator.php index 658b0cd36bb34..1d4e765e172dd 100644 --- a/libraries/cms/application/administrator.php +++ b/libraries/cms/application/administrator.php @@ -45,7 +45,7 @@ public function __construct(JInput $input = null, Registry $config = null, JAppl parent::__construct($input, $config, $client); // Set the root in the URI based on the application name - JUri::root(null, rtrim(dirname(JUri::base(true)), '/')); + JUri::root(null, rtrim(dirname(JUri::base(true)), '/\\')); } /** From 06d664054f0ca4394ce2c7d2c7c91887510a3f6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wojciech=20Smoli=C5=84ski?= Date: Wed, 29 Jun 2016 12:50:41 +0200 Subject: [PATCH 007/151] Modify modules cs rules (#10834) * modify PEAR.Functions.ValidDefaultValue excepions * test removal of Generic.CodeAnalysis.UselessOverridingMethod for modules * remove Generic.CodeAnalysis.UselessOverridingMethod from ruleset --- build/phpcs/Joomla/ruleset.xml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/build/phpcs/Joomla/ruleset.xml b/build/phpcs/Joomla/ruleset.xml index 8ec2d1a1de48e..ca7f229fc79f8 100644 --- a/build/phpcs/Joomla/ruleset.xml +++ b/build/phpcs/Joomla/ruleset.xml @@ -26,14 +26,6 @@ plugins/captcha/recaptcha/recaptchalib.php - - - administrator/components/* - components/* - modules/* - libraries/cms/* - libraries/joomla/* - */tmpl/* @@ -95,7 +87,7 @@ administrator/components/* components/* - modules/* + modules/mod_articles_category/helper.php libraries/cms/* From 769cef95e53bbe2f165828ac615ccbeb24cca39c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Demis=20Palma=20=E3=83=84?= Date: Sun, 3 Jul 2016 14:43:34 +0100 Subject: [PATCH 008/151] Fixed PHP Notice: Undefined variable $data (#10985) --- components/com_users/controllers/user.php | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/components/com_users/controllers/user.php b/components/com_users/controllers/user.php index 2b9d1c52d9bb0..a366ca4ab3dec 100644 --- a/components/com_users/controllers/user.php +++ b/components/com_users/controllers/user.php @@ -200,18 +200,13 @@ public function logout() } $return = 'index.php?Itemid=' . $return . $lang; - } - else - { - // Don't redirect to an external URL. - if (!JUri::isInternal($data['return'])) + + // Redirect to internal URLs only + if (JUri::isInternal($return)) { - $data['return'] = ''; + $app->redirect(JRoute::_($return, false)); } } - - // Redirect the user. - $app->redirect(JRoute::_($return, false)); } /** From cd2a9d220a3449c0c772da5c1203a2a13df6e3d5 Mon Sep 17 00:00:00 2001 From: Walt Sorensen Date: Mon, 4 Jul 2016 04:19:33 -0600 Subject: [PATCH 009/151] Fix some Code Style issues (#11011) Automatically Fixed with the PHPCS 2 fixers End of line character is invalid; expected "\n" but found "\r\n" at line 1 No blank line found after control structure / Please consider an empty line before the return statement; --- administrator/components/com_admin/models/sysinfo.php | 1 + 1 file changed, 1 insertion(+) diff --git a/administrator/components/com_admin/models/sysinfo.php b/administrator/components/com_admin/models/sysinfo.php index e13a05092e12d..c17e2bc4d92d9 100644 --- a/administrator/components/com_admin/models/sysinfo.php +++ b/administrator/components/com_admin/models/sysinfo.php @@ -209,6 +209,7 @@ protected function cleanSectionPrivateData($sectionValues) { $sectionValues = 'xxxxxx'; } + return strlen($sectionValues) ? 'xxxxxx' : ''; } From b7b79f79aa833321ba3d9a56e3e432f7d7e47131 Mon Sep 17 00:00:00 2001 From: Walt Sorensen Date: Mon, 4 Jul 2016 05:29:42 -0600 Subject: [PATCH 010/151] Code style fix (#11012) No blank line found after control structure --- administrator/components/com_banners/views/client/view.html.php | 1 + 1 file changed, 1 insertion(+) diff --git a/administrator/components/com_banners/views/client/view.html.php b/administrator/components/com_banners/views/client/view.html.php index 2d03c7b037198..1df2ea0e010e2 100644 --- a/administrator/components/com_banners/views/client/view.html.php +++ b/administrator/components/com_banners/views/client/view.html.php @@ -105,6 +105,7 @@ protected function addToolbar() { JToolbarHelper::save2new('client.save2new'); } + // If an existing item, can save to a copy. if (!$isNew && $canDo->get('core.create')) { From 63a44667dee75a4e381f38f0dba42d97bf0f8c89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyril=20Rez=C3=A9?= Date: Wed, 6 Jul 2016 23:14:14 +0200 Subject: [PATCH 011/151] Admin menu dropdown in Joomla! 3.6.0 RC1 (#10987) * Fix submenu top position * Fix missing pointer for dropdown-menu * Run generates * Revert "Run generates" This reverts commit 6cd63ab3b94dc188a381a8437addef78dddcd5b1. * Run generates * Run generatecss with missing rtf * Fix pointer display for dropdown-menu * Revert * Fix submenu placement in RTL * Revert "Fix pointer display for dropdown-menu" This reverts commit 9676831e982f951627a01b95a177b3e184b9ee02. * Revert "Revert" This reverts commit 8c324bade7dbb1ddd38718056f6d1f333d4420d4. * Fix dropdown pointer in RTL --- .../templates/isis/css/template-rtl.css | 18 ++++++++++++++ administrator/templates/isis/css/template.css | 14 +++++++++++ administrator/templates/isis/js/template.js | 24 +++++++++++-------- .../templates/isis/less/template-rtl.less | 4 ++++ .../templates/isis/less/template.less | 16 ++++++++++++- 5 files changed, 65 insertions(+), 11 deletions(-) diff --git a/administrator/templates/isis/css/template-rtl.css b/administrator/templates/isis/css/template-rtl.css index 5db9dddd37ea1..1f046ece4c4da 100644 --- a/administrator/templates/isis/css/template-rtl.css +++ b/administrator/templates/isis/css/template-rtl.css @@ -7277,6 +7277,20 @@ body .navbar-fixed-top { background-color: rgba(0,0,0,0.5); -webkit-box-shadow: 0 0 1px rgba(255,255,255,0.5); } +.navbar .nav > li > .dropdown-menu:after { + display: none; +} +.navbar .nav > .dropdown.open:after { + content: ''; + display: inline-block; + border-left: 6px solid transparent; + border-right: 6px solid transparent; + border-bottom: 6px solid #fff; + position: absolute; + top: 25px; + left: 10px; + z-index: 1001; +} .navbar .empty-nav { display: none; } @@ -8946,6 +8960,10 @@ input[type="url"] { background-color: rgba(0,0,0,0.5); -webkit-box-shadow: 0 0 1px rgba(255,255,255,0.5); } +.navbar .nav > .dropdown.open:after { + right: 10px; + width: 0; +} .navbar .empty-nav { display: none; } diff --git a/administrator/templates/isis/css/template.css b/administrator/templates/isis/css/template.css index c2a5b471c8937..df90caa6e4f00 100644 --- a/administrator/templates/isis/css/template.css +++ b/administrator/templates/isis/css/template.css @@ -7277,6 +7277,20 @@ body .navbar-fixed-top { background-color: rgba(0,0,0,0.5); -webkit-box-shadow: 0 0 1px rgba(255,255,255,0.5); } +.navbar .nav > li > .dropdown-menu:after { + display: none; +} +.navbar .nav > .dropdown.open:after { + content: ''; + display: inline-block; + border-left: 6px solid transparent; + border-right: 6px solid transparent; + border-bottom: 6px solid #fff; + position: absolute; + top: 25px; + left: 10px; + z-index: 1001; +} .navbar .empty-nav { display: none; } diff --git a/administrator/templates/isis/js/template.js b/administrator/templates/isis/js/template.js index 28eb4ffa762c5..3a2eaf3af1d6c 100644 --- a/administrator/templates/isis/js/template.js +++ b/administrator/templates/isis/js/template.js @@ -64,32 +64,36 @@ $('#menu > li > a').on('click mouseenter', function() { - menuWidth = $(this).next('ul').outerWidth(); + linkWidth = $(this).outerWidth(true); + menuWidth = $(this).next('ul').width(); + linkPaddingLeft = $(this).css('padding-left'); + offsetLeft = Math.round($(this).parents('li').offset().left) - parseInt(linkPaddingLeft); + emptyMenu.empty().hide(); }); menuScroll.find('.dropdown-submenu > a').on('mouseenter', function() { - var $self = $(this); - var dropdown = $self.next('.dropdown-menu'); - var offset = $self.offset(); - var scroll = $(window).scrollTop() + 5; - var width = menuWidth - 13; + var $self = $(this); + var dropdown = $self.next('ul'); + var submenuWidth = dropdown.outerWidth(); + var offsetTop = $self.offset().top; + var scroll = $(window).scrollTop() + 8; // Set the submenu position if ($('html').attr('dir') == 'rtl') { emptyMenu.css({ - top : offset.top - scroll, - left: offset.left - width + top : offsetTop - scroll, + left: offsetLeft - (menuWidth - linkWidth) - submenuWidth }); } else { emptyMenu.css({ - top : offset.top - scroll, - left: offset.left + width + top : offsetTop - scroll, + left: offsetLeft + menuWidth }); } diff --git a/administrator/templates/isis/less/template-rtl.less b/administrator/templates/isis/less/template-rtl.less index e30956bd42f85..dc3bd9dd0e2ef 100644 --- a/administrator/templates/isis/less/template-rtl.less +++ b/administrator/templates/isis/less/template-rtl.less @@ -37,6 +37,10 @@ } } } + .nav > .dropdown.open:after { + right: 10px; + width: 0; + } .empty-nav { display: none; } diff --git a/administrator/templates/isis/less/template.less b/administrator/templates/isis/less/template.less index d50c624b0a413..971ecdd422c93 100644 --- a/administrator/templates/isis/less/template.less +++ b/administrator/templates/isis/less/template.less @@ -247,6 +247,20 @@ body .navbar-fixed-top { -webkit-box-shadow: 0 0 1px rgba(255,255,255,.5); } } + .nav > li > .dropdown-menu:after { + display: none; + } + .nav > .dropdown.open:after { + content: ''; + display: inline-block; + border-left: 6px solid transparent; + border-right: 6px solid transparent; + border-bottom: 6px solid #fff; + position: absolute; + top: 25px; + left: 10px; + z-index: 1001; + } .empty-nav { display: none; } @@ -1375,4 +1389,4 @@ body.modal-open { margin-bottom: 0; } } -} \ No newline at end of file +} From bb1010ae038f6cbaf4aa78760b394bb13b6339ad Mon Sep 17 00:00:00 2001 From: wilsonge Date: Wed, 6 Jul 2016 22:28:38 +0100 Subject: [PATCH 012/151] Tag 3.6.0 RC2 --- administrator/language/en-GB/en-GB.xml | 2 +- administrator/language/en-GB/install.xml | 2 +- administrator/manifests/files/joomla.xml | 4 ++-- administrator/manifests/packages/pkg_en-GB.xml | 2 +- installation/language/en-GB/en-GB.xml | 2 +- language/en-GB/en-GB.xml | 2 +- language/en-GB/install.xml | 2 +- libraries/cms/version/version.php | 8 ++++---- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/administrator/language/en-GB/en-GB.xml b/administrator/language/en-GB/en-GB.xml index dab1b13b9a4b4..42033aedd6e7f 100644 --- a/administrator/language/en-GB/en-GB.xml +++ b/administrator/language/en-GB/en-GB.xml @@ -2,7 +2,7 @@ English (en-GB) 3.6.0 - June 2016 + July 2016 Joomla! Project admin@joomla.org www.joomla.org diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml index 8031d3eb870be..fe96cb04b97d6 100644 --- a/administrator/language/en-GB/install.xml +++ b/administrator/language/en-GB/install.xml @@ -3,7 +3,7 @@ English (United Kingdom) en-GB 3.6.0 - June 2016 + July 2016 Joomla! Project admin@joomla.org www.joomla.org diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml index 54ebb77d917bd..56fb16b8b5efe 100644 --- a/administrator/manifests/files/joomla.xml +++ b/administrator/manifests/files/joomla.xml @@ -6,8 +6,8 @@ www.joomla.org (C) 2005 - 2016 Open Source Matters. All rights reserved GNU General Public License version 2 or later; see LICENSE.txt - 3.6.0-rc - June 2016 + 3.6.0-rc2 + July 2016 FILES_JOOMLA_XML_DESCRIPTION administrator/components/com_admin/script.php diff --git a/administrator/manifests/packages/pkg_en-GB.xml b/administrator/manifests/packages/pkg_en-GB.xml index 47cf5fc21f1cc..5ec7737cb8a24 100644 --- a/administrator/manifests/packages/pkg_en-GB.xml +++ b/administrator/manifests/packages/pkg_en-GB.xml @@ -3,7 +3,7 @@ English (en-GB) Language Pack en-GB 3.6.0.1 - June 2016 + July 2016 Joomla! Project admin@joomla.org www.joomla.org diff --git a/installation/language/en-GB/en-GB.xml b/installation/language/en-GB/en-GB.xml index 6cdc9c55c4761..52e15e2b73a67 100644 --- a/installation/language/en-GB/en-GB.xml +++ b/installation/language/en-GB/en-GB.xml @@ -4,7 +4,7 @@ client="installation"> English (United Kingdom) 3.6.0 - June 2016 + July 2016 Joomla! Project Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/language/en-GB/en-GB.xml b/language/en-GB/en-GB.xml index d309f4fbe6e86..18429dc50c12e 100644 --- a/language/en-GB/en-GB.xml +++ b/language/en-GB/en-GB.xml @@ -2,7 +2,7 @@ English (en-GB) 3.6.0 - June 2016 + July 2016 Joomla! Project admin@joomla.org www.joomla.org diff --git a/language/en-GB/install.xml b/language/en-GB/install.xml index 7427c1b8457b8..8d7e7801502d4 100644 --- a/language/en-GB/install.xml +++ b/language/en-GB/install.xml @@ -3,7 +3,7 @@ English (United Kingdom) en-GB 3.6.0 - June 2016 + July 2016 Joomla! Project admin@joomla.org www.joomla.org diff --git a/libraries/cms/version/version.php b/libraries/cms/version/version.php index 83ac975dc9e9d..cf6269034e292 100644 --- a/libraries/cms/version/version.php +++ b/libraries/cms/version/version.php @@ -38,7 +38,7 @@ final class JVersion * @var string * @since 3.5 */ - const DEV_LEVEL = '0-rc'; + const DEV_LEVEL = '0-rc2'; /** * Development status. @@ -70,7 +70,7 @@ final class JVersion * @var string * @since 3.5 */ - const RELDATE = '28-June-2016'; + const RELDATE = '6-July-2016'; /** * Release time. @@ -78,7 +78,7 @@ final class JVersion * @var string * @since 3.5 */ - const RELTIME = '20:34'; + const RELTIME = '22:26'; /** * Release timezone. @@ -86,7 +86,7 @@ final class JVersion * @var string * @since 3.5 */ - const RELTZ = 'GMT'; + const RELTZ = 'CET'; /** * Copyright Notice. From 71452ea20f8242eed9e5652850b365f633a257b0 Mon Sep 17 00:00:00 2001 From: Thomas Hunziker Date: Fri, 8 Jul 2016 20:31:56 +0200 Subject: [PATCH 013/151] Adding Spanish-Colombia (es-CO) installation language. --- installation/language/es-CO/es-CO.ini | 326 ++++++++++++++++++++++++++ installation/language/es-CO/es-CO.xml | 19 ++ media/mod_languages/images/es_co.gif | Bin 0 -> 851 bytes 3 files changed, 345 insertions(+) create mode 100644 installation/language/es-CO/es-CO.ini create mode 100644 installation/language/es-CO/es-CO.xml create mode 100644 media/mod_languages/images/es_co.gif diff --git a/installation/language/es-CO/es-CO.ini b/installation/language/es-CO/es-CO.ini new file mode 100644 index 0000000000000..8b6a707e133a8 --- /dev/null +++ b/installation/language/es-CO/es-CO.ini @@ -0,0 +1,326 @@ +; Joomla! Project +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; License GNU General Public License version 2 or later; see LICENSE.txt +; Note : All ini files need to be saved as UTF-8 + +;Stepbar +INSTL_STEP_COMPLETE_LABEL="Terminar" +INSTL_STEP_DATABASE_LABEL="Base de datos" +INSTL_STEP_DEFAULTLANGUAGE_LABEL="Escoger idioma por defecto" +INSTL_STEP_FTP_LABEL="FTP" +INSTL_STEP_LANGUAGES_LABEL="Instalar idiomas" +INSTL_STEP_SITE_LABEL="Configuración" +INSTL_STEP_SUMMARY_LABEL="Resumen" + +;Language view +INSTL_SELECT_LANGUAGE_TITLE="Seleccionar idioma" +INSTL_WARNJAVASCRIPT="¡Advertencia! JavaScript debe estar activado para la correcta instalación de Joomla!" +INSTL_WARNJSON="Su instalación de PHP necesita tener JSON activado para poder instalar Joomla." + +;Preinstall view +INSTL_PRECHECK_TITLE="Chequeo preinstalación" +INSTL_PRECHECK_DESC="Si algunos de estos elementos no son soportados (marcados comoNo), por favor corríjalos.
No puede instalar Joomla! hasta que su configuración cumpla con los siguientes requisitos." +INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Configuración recomendada:" +INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Estos parámetros de PHP son recomendados para que sea totalmente compatible con Joomla.
Sin embargo, Joomla! funcionará si su configuración no concuerda con la recomendada." +INSTL_PRECHECK_DIRECTIVE="Directiva" +INSTL_PRECHECK_RECOMMENDED="Recomendado" +INSTL_PRECHECK_ACTUAL="Actual" + +; Database view +INSTL_DATABASE="Configuración de base de datos" +INSTL_DATABASE_HOST_DESC="Normalmente "_QQ_"localhost"_QQ_"." +INSTL_DATABASE_HOST_LABEL="Nombre del servidor" +INSTL_DATABASE_NAME_DESC="Algunos servidores solo permiten un nombre determinado de base de datos por sitio. Utilice el prefijo de tabla en este caso para varios sitios Joomla." +INSTL_DATABASE_NAME_LABEL="Nombre de la base de datos" +INSTL_DATABASE_NO_SCHEMA="No existe esquema de base de datos para este tipo de base de datos." +INSTL_DATABASE_OLD_PROCESS_DESC="Hacer una copia de seguridad o eliminar cualquier tabla existente de instalaciones anteriores de Joomla! con el mismo "_QQ_"Prefijo de tabla"_QQ_"." +INSTL_DATABASE_OLD_PROCESS_LABEL="Procesar la base de datos antigua" +INSTL_DATABASE_PASSWORD_DESC="Por seguridad es obligatorio usar una clave para la base de datos." +INSTL_DATABASE_PASSWORD_LABEL="Clave" +INSTL_DATABASE_PREFIX_DESC="Cree un prefijo de tabla o use el generado aleatoriamente. Idealmente cuatro o cinco caracteres de longitud. Solo puede contener caracteres alfanuméricos y DEBE terminar en un guión al piso. Asegúrese que el prefijo escogido no está siendo usado por otras tablas." +INSTL_DATABASE_PREFIX_LABEL="Prefijo de tabla" +INSTL_DATABASE_PREFIX_MSG="El prefijo de tabla debe iniciar con una letra, seguido de caracteres alfanuméricos opcionales y un guión al piso" +INSTL_DATABASE_TYPE_DESC="Probablemente "_QQ_"MySQLi"_QQ_"." +INSTL_DATABASE_TYPE_LABEL="Tipo de base de datos" +INSTL_DATABASE_USER_DESC="Puede ser "_QQ_"root"_QQ_" o un nombre de usuario dado por el hosting." +INSTL_DATABASE_USER_LABEL="Usuario" + +;FTP view +INSTL_AUTOFIND_FTP_PATH="Encontrar la ruta FTP automáticamente" +INSTL_FTP="Configuración FTP" +INSTL_FTP_DESC="

En algunos servidores deberá proporcionar credenciales FTP para poder realizar la instalación. Si tiene dificultades completando la instalación sin dichas credenciales, verifique con su empresa de hosting para determinar si esto es necesario.

Por seguridad, es mejor crear una cuenta FTP separada con acceso solo a la instalación de Joomla! y no al servidor completo. Su proveedor de hosting le puede ayudar con esto.

Nota: Si usted está instalando Joomla! en Windows, no se necesita la capa FTP.

" +INSTL_FTP_ENABLE_LABEL="Activar capa FTP" +INSTL_FTP_HOST_LABEL="Servidor FTP" +INSTL_FTP_PASSWORD_LABEL="Clave de FTP" +INSTL_FTP_PORT_LABEL="Puerto FTP" +INSTL_FTP_ROOT_LABEL="Ruta del directorio raíz de FTP" +INSTL_FTP_SAVE_LABEL="Guardar clave FTP" +INSTL_FTP_TITLE="Configuración FTP (Opcional - La mayoría de los usuarios pueden omitir este paso - Presione siguiente para continuar)" +INSTL_FTP_USER_LABEL="Usuario FTP" +INSTL_VERIFY_FTP_SETTINGS="Verificar configuración FTP" +INSTL_FTP_SETTINGS_CORRECT="Configuración correcta" +INSTL_FTP_USER_DESC="¡Atención! Se recomienda dejar este campo vacío e ingresar su usuario FTP cada vez que transfiera archivos." +INSTL_FTP_PASSWORD_DESC="¡Atención! Se recomienda dejar este campo vacío e ingresar su clave FTP cada vez que transfiera archivos." + +;Site View +INSTL_SITE="Configuración principal" +INSTL_ADMIN_EMAIL_LABEL="E-mail del administrador" +INSTL_ADMIN_EMAIL_DESC="Ingrese una dirección de correo electrónico, esta será el e-mail del Super usuario del sitio web." +INSTL_ADMIN_PASSWORD_LABEL="Clave de administrador" +INSTL_ADMIN_PASSWORD_DESC="Escriba la clave para su cuenta de Super usuario y confirmela en el campo de abajo." +INSTL_ADMIN_PASSWORD2_LABEL="Confirmar clave de administrador" +INSTL_ADMIN_USER_LABEL="Usuario administrador" +INSTL_ADMIN_USER_DESC="Escriba el nombre de usuario para su cuenta de Super usuario." +INSTL_SITE_NAME_LABEL="Nombre del sitio" +INSTL_SITE_NAME_DESC="Ingrese el nombre de su sitio Joomla!." +INSTL_SITE_METADESC_LABEL="Descripción" +INSTL_SITE_METADESC_TITLE_LABEL="Ingrese una descripción general del sitio web, la cual será usada por los motores de búsqueda. Normalmente es mejor no escribir más de 20 palabras." +INSTL_SITE_OFFLINE_LABEL="Sitio fuera de servicio" +INSTL_SITE_OFFLINE_TITLE_LABEL="Poner el sitio fuera de servicio cuando la instalación termine. El sitio puede ponerse en línea después en la Configuración global de Joomla!." +INSTL_SITE_INSTALL_SAMPLE_LABEL="Instalar datos de muestra" +INSTL_SITE_INSTALL_SAMPLE_DESC="Instalar los datos de muestra es altamente recomendado para principiantes.
Esta opción instalará contenido de muestra que está incluido en el paquete de instalación de Joomla!." +INSTL_SITE_INSTALL_SAMPLE_NONE="Ninguno (Requerido para la creación de un sitio multilingüe básico)" +INSTL_SAMPLE_BLOG_SET="Datos de muestra del blog en español" +INSTL_SAMPLE_BROCHURE_SET="Datos de muestra de publicidad en español" +INSTL_SAMPLE_DATA_SET="Datos de muestra básicos en español" +INSTL_SAMPLE_LEARN_SET="Datos de muestra de aprender Joomla en español" +INSTL_SAMPLE_TESTING_SET="Datos de muestra de prueba en español" +INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Instalar Joomla con solo un menú y un formulario de ingreso, sin contenido." +INSTL_SAMPLE_BLOG_SET_DESC="Instalar Joomla con algunos artículos y módulos tipo blog como posts antiguos, posts más leídos." +INSTL_SAMPLE_BROCHURE_SET_DESC="Instalar Joomla con unas páginas (un menú con páginas Inicio, Quienes somos, Noticias, Contáctenos) y modulos tales como búsqueda, personalizado y formulario de ingreso." +INSTL_SAMPLE_DATA_SET_DESC="Instalar Joomla con una página (un menú con un enlace) y módulos tales como el artículo más reciente y formulario de ingreso." +INSTL_SAMPLE_LEARN_SET_DESC="Instalar Joomla con artículos de ejemplo que describen como funciona Joomla." +INSTL_SAMPLE_TESTING_SET_DESC="Instalar Joomla con todos los elementos de menú posibles para ayudar a probar Joomla." + +;Summary view +INSTL_FINALISATION="Finalización" +INSTL_SUMMARY_INSTALL="Instalar" +INSTL_SUMMARY_EMAIL_LABEL="Configuración de correo electrónico" +INSTL_SUMMARY_EMAIL_DESC="Enviar un email con los parámetros de configuración a %s después de la instalación." +INSTL_SUMMARY_EMAIL_PASSWORDS_LABEL="Incluir claves en el mensaje" +INSTL_SUMMARY_EMAIL_PASSWORDS_DESC="¡Advertencia! No se recomienda enviar ni almacenar sus claves en el correo electrónico." + +;Installing view +INSTL_INSTALLING="Instalando ..." +INSTL_INSTALLING_DATABASE_BACKUP="Haciendo copia de seguridad de tablas antiguas de bases de datos" +INSTL_INSTALLING_DATABASE_REMOVE="Eliminando tablas antiguas de bases de datos" +INSTL_INSTALLING_DATABASE="Creando tablas de bases de datos" +INSTL_INSTALLING_SAMPLE="Instalando datos de muestra" +INSTL_INSTALLING_CONFIG="Creando archivo de configuración" +INSTL_INSTALLING_EMAIL="Enviando correo electrónico a %s" + +;Email +INSTL_EMAIL_SUBJECT="Detalles de la configuración: %s" +INSTL_EMAIL_HEADING="A continuación encontrará los parámetros de configuración para el nuevo sitio Joomla:" +INSTL_EMAIL_NOT_SENT="El mensaje de email no pudo ser enviado." + +;Complete view +INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Detalles de ingreso a la zona de administración" +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="La carpeta 'installation' ya fue borrada." +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_ERROR_FOLDER_DELETE="La carpeta 'installation' no pudo ser borrada. Por favor elimínela de forma manual." +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_FOLDER_REMOVED="Carpeta 'installation' eliminada." +INSTL_COMPLETE_LANGUAGE_1="Joomla! en su idioma y/o creación de un sitio multilingüe básico" +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_LANGUAGE_DESC="Antes de eliminar la carpeta 'installation' puede instalar idiomas adicionales a su sitio Joomla!, para esto haga clic en el siguiente botón." +INSTL_COMPLETE_LANGUAGE_DESC2="Nota: necesitará acceso a internet para poder descargar e instalar los nuevos idiomas.
Algunas configuraciones de servidor no permitirán que Joomla! instale los idiomas. Si este es su caso, podrá agregarlos más tarde en el administrador de Joomla!." +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_REMOVE_FOLDER="Eliminar la carpeta installation" +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_REMOVE_INSTALLATION="NO OLVIDE ELIMINAR LA CARPETA 'INSTALLATION'.
No podrá continuar el proceso hasta que la carpeta 'installation' haya sido borrada. Esta es una medida de seguridad de Joomla!" +INSTL_COMPLETE_TITLE="¡Listo! Joomla! ha sido instalado." +INSTL_COMPLETE_INSTALL_LANGUAGES="Pasos adicionales: Instalar idiomas" + +;Languages view +INSTL_LANGUAGES="Instalar paquetes de idiomas" +INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Idioma" +INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_TAG="Código del idioma" +INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Versión" +INSTL_LANGUAGES_DESC="La interfaz de Joomla está disponible en varios idiomas. Escoja sus idiomas preferidos seleccionando las casillas y luego instalándolos haciendo clic en el botón Siguiente.
Nota: esta operación tomará alrededor de 10 segundos para descargar e instalar cada idioma. Para evitar problemas de tiempos de espera, seleccione máximo 3 idiomas." +INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Esta operación tomará hasta 10 segundos por idioma
Por favor espere mientras los idiomas son descargados e instalados ..." +INSTL_LANGUAGES_MORE_LANGUAGES="Presione el botón 'Anterior' si desea instalar más idiomas." +INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="No ha seleccionado idiomas para instalar, si necesita instalar más idiomas, presione el botón 'Anterior' y escoja los lenguajes deseados de la lista." +INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! no pudo conectarse al servidor de idiomas. Por favor complete el proceso de instalación." +INSTL_LANGUAGES_WARNING_NO_INTERNET2="Nota: Podrá instalar los idiomas después, utilizando el administrador de Joomla!" +INSTL_LANGUAGES_WARNING_BACK_BUTTON="Regresar a la etapa anterior de instalación" + +;Default language view +INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE="Activar la función para multiples idiomas" +INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE_DESC="Si está activa, su sitio Joomla tendrá el multilingüe activado, con menús para cada idioma instalado." +INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN="Activar el plugin de código de idioma" +INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN_DESC="Si está activo, el plugin de código de idioma agregará la capacidad para cambiar el código de idioma en el documento HTML generado para mejorar el SEO." +INSTL_DEFAULTLANGUAGE_ADMINISTRATOR="Idioma por defecto para el administrador" +INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="Joomla no pudo establecer el idioma por defecto. El inglés será utilizado como idioma por defecto para el administrador de Joomla!." +INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="El idioma por defecto para el administrador de Joomla es: %s." +INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="Seleccionar" +INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_LANGUAGE="Idioma" +INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_TAG="Código" +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CONTENT_LANGUAGE="Joomla no pudo crear automáticamente el idioma de contenido %s" +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU="Joomla no pudo crear automáticamente el menú %s" +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_ITEM="Joomla no pudo crear automáticamente el elemento del menú inicio %s" +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_MODULE="Joomla no pudo crear automáticamente el módulo del menú %s" +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CATEGORY="Joomla no pudo crear automáticamente la categoría de contenido %s" +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_ARTICLE="Joomla no pudo crear automáticamente el artículo con contenido de idioma %s" +INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_MODULESWHITCHER_LANGUAGECODE="Joomla no pudo publicar automáticamente el módulo para cambiar idioma" +INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGECODE="Joomla no pudo activar automáticamente el plugin de código de idioma" +INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGEFILTER="Joomla no pudo activar automáticamente el plugin de filtro de idioma" +INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="Joomla no pudo instalar el idioma %s." +INSTL_DEFAULTLANGUAGE_COULD_NOT_PUBLISH_MOD_MULTILANGSTATUS="Joomla no pudo publicar automáticamente el módulo de estado del idioma" +INSTL_DEFAULTLANGUAGE_COULD_NOT_UNPUBLISH_MOD_DEFAULTMENU="Joomla no pudo despublicar automáticamente el módulo de menú por defecto" +INSTL_DEFAULTLANGUAGE_DESC="Joomla ha instalado los siguientes idiomas. Por favor seleccione su idioma por defecto para el administrador." +INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="Joomla ha instalado los siguientes idiomas. Por favor seleccione su idioma por defecto para el Frontend (sitio web público) de Joomla." +INSTL_DEFAULTLANGUAGE_FRONTEND="Idioma por defecto del sitio" +INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="Joomla no pudo establecer el idioma por defecto. El inglés será utilizado como idioma por defecto para el sitio público (frontend) de Joomla!." +INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="El idioma por defecto de su sitio es %s." +INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Instalar contenido para el idioma" +INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="Si está activo, Joomla automáticamente creará una categoría de contenido por cada idioma instalado. Además, un artículo destacado de ejemplo será creado en cada categoría." +INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Multilingüe" +INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="Esta sección permite activar automáticamente la función multilingüe de Joomla!." +INSTL_DEFAULTLANGUAGE_TRY_LATER="Podrá instalarlo después utilizando el administrador de Joomla!" + +; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español +INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Español colombiano" + +;Database Model +INSTL_DATABASE_COULD_NOT_CONNECT="No fue posible conectarse a la base de datos. Error de conexión: %s" +INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="El instalador no pudo conectarse a la base de datos especificada, ni tampoco pudo crearla. Por favor verifique su configuración y cree manualmente la base de datos de ser necesario." +INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="No se pudo actualizar la caché del manifiesto para la extensión: %s" +INSTL_DATABASE_EMPTY_NAME="" +INSTL_DATABASE_ERROR_BACKINGUP="Algunos errores ocurrieron al hacer la copia de seguridad de la base de datos." +INSTL_DATABASE_ERROR_CREATE="Un error ocurrió al crear la base de datos %s.
El usuario puede no tener privilegios suficientes para crear una base de datos. La base de datos debe ser creada por aparte antes de poder instalar Joomla!" +INSTL_DATABASE_ERROR_DELETE="Algunos errores ocurrieron al borrar la base de datos." +INSTL_DATABASE_FIELD_VALUE_REMOVE="Eliminar" +INSTL_DATABASE_FIELD_VALUE_BACKUP="Copia de seguridad" +INSTL_DATABASE_FIX_LOWERCASE="El prefijo de la tabla debe estar en minúsculas para PostgreSQL." +INSTL_DATABASE_FIX_TOO_LONG="El prefijo de la tabla MySQL debe ser de máximo 15 caracteres." +INSTL_DATABASE_INVALID_DB_DETAILS="Los detalles de la base de datos están incorrectos y/o vacíos." +INSTL_DATABASE_INVALID_MYSQL_VERSION="Necesita MySQL 5.0.4 o superior para continuar la instalación. Su versión es: %s" +INSTL_DATABASE_INVALID_MYSQLI_VERSION="Necesita MySQL 5.0.4 o superior para continuar la instalación. Su versión es: %s" +INSTL_DATABASE_INVALID_PDOMYSQL_VERSION="Necesita MySQL 5.0.4 o superior para continuar la instalación. Su versión es: %s" +INSTL_DATABASE_INVALID_POSTGRESQL_VERSION="Necesita PostgreSQL 8.3.18 o superior para continuar la instalación. Su versión es: %s" +INSTL_DATABASE_INVALID_SQLSRV_VERSION="Necesita SQL Server 2008 R2 (10.50.1600.1) o superior para continuar la instalación. Su versión es: %s" +INSTL_DATABASE_INVALID_SQLZURE_VERSION="Necesita SQL Server 2008 R2 (10.50.1600.1) o superior para continuar la instalación. Su versión es: %s" +INSTL_DATABASE_INVALID_TYPE="Por favor escoja el tipo de base de datos" +INSTL_DATABASE_NAME_TOO_LONG="El nombre de la base de datos MySQL debe tener máximo 64 caracteres." +INSTL_DATABASE_INVALID_NAME="Versiones de MySQL anteriores a 5.1.6 pueden no contener puntos u otros caracteres "_QQ_"especiales"_QQ_" en el nombre. Su version es: %s" +INSTL_DATABASE_NAME_INVALID_SPACES="Los nombres de las tablas y las bases de datos MySQL no pueden iniciar ni terminar con espacios." +INSTL_DATABASE_NAME_INVALID_CHAR="El identificador MySQL no puede contener un caracter NULL ASCII(0x00)." +INSTL_DATABASE_FILE_DOES_NOT_EXIST="El archivo %s no existe" + +;controllers +INSTL_COOKIES_NOT_ENABLED="Aparentemente los cookies no están activos en su navegador. No podrá instalar la apliación si las cookies están desactivadas. Es posible que sea un problema con la variable del servidor session.save_path, de ser así, por favor consulte con su proveedor de hosting en caso que no pueda verificarlo o arreglarlo usted." +INSTL_HEADER_ERROR="Error" + +;Helpers +INSTL_PAGE_TITLE="Instalador web de Joomla!" + +;Configuration model +INSTL_ERROR_CONNECT_DB="No fue posible conectarse a la base de datos. Error de conexión: %s" +INSTL_STD_OFFLINE_MSG="Este sitio está fuera de servicio por mantenimiento.
Por favor regrese más tarde." + +;FTP model +INSTL_FTP_INVALIDROOT="La carpeta FTP especificada no es la carpeta de esta instalación de Joomla!" +INSTL_FTP_NOCONNECT="No se puede conectar al servidor FTP" +INSTL_FTP_NODELE="La función "_QQ_"DELE"_QQ_" falló." +INSTL_FTP_NODIRECTORYLISTING="No se puede obtener el listado de la carpeta del servidor FTP." +INSTL_FTP_NOLIST="La función "_QQ_"LIST"_QQ_" falló." +INSTL_FTP_NOLOGIN="No se pudo iniciar sesión en el servidor FTP." +INSTL_FTP_NOMKD="La función "_QQ_"MKD"_QQ_" falló." +INSTL_FTP_NONLST="La función "_QQ_"NLST"_QQ_" falló." +INSTL_FTP_NOPWD="La función "_QQ_"PWD"_QQ_" falló." +INSTL_FTP_NORETR="La función "_QQ_"RETR"_QQ_" falló." +INSTL_FTP_NORMD="La función "_QQ_"RMD"_QQ_" falló." +INSTL_FTP_NOROOT="No se pudo acceder la carpeta FTP especificada." +INSTL_FTP_NOSTOR="La función "_QQ_"STOR"_QQ_" falló." +INSTL_FTP_NOSYST="La función "_QQ_"SYST"_QQ_" falló." +INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="No se pudo detectar la carpeta raíz FTP." + +;others +INSTL_CONFPROBLEM="No se puede escribir su archivo o carpeta de configuración o hubo un problema creando dicho archivo. Deberá insertar este código de forma manual. Seleccione todo el código y luego péguelo en un archivo de texto nuevo, llame este archivo 'configuration.php' y súbalo a la carpeta raíz de su sitio." +INSTL_DATABASE_SUPPORT="Soporte de base de datos:" +INSTL_DISPLAY_ERRORS="Mostrar errores" +INSTL_ERROR_DB="Ocurrieron errores al rellenar la base de datos: %s" +INSTL_ERROR_INITIALISE_SCHEMA="No se puede inicializar el esquema de base de datos" +INSTL_FILE_UPLOADS="Subir archivos" +INSTL_GNU_GPL_LICENSE="Licencia Pública General GNU" +INSTL_JSON_SUPPORT_AVAILABLE="Soporte JSON" +INSTL_MAGIC_QUOTES_GPC="Comillas mágicas GPC Off" +INSTL_MAGIC_QUOTES_RUNTIME="Tiempo de ejecución de comillas mágicas" +INSTL_MB_LANGUAGE_IS_DEFAULT="El idioma MB es por defecto" +INSTL_MB_STRING_OVERLOAD_OFF="Sobrecarga de cadena MB deshabilitada" +INSTL_MCRYPT_SUPPORT_AVAILABLE="Soporte Mcrypt" +INSTL_NOTICEMBLANGNOTDEFAULT="El idioma mbstring PHP no se encuentra en neutro. Se puede definir localmente escribiendo php_value mbstring.language neutral en su archivo .htaccess." +INSTL_NOTICEMBSTRINGOVERLOAD="La sobrecarga de la función mbstring PHP está activada. Esto puede desactivarse localmente escribiendo php_value mbstring.func_overload 0 en el archivo .htaccess." +INSTL_NOTICEMCRYPTNOTAVAILABLE="¡Advertencia! La extensión PHP mcrypt debe estar instalada o habilitada. Sin esto, algunas de las características de Joomla no estarán disponibles." +INSTL_NOTICEYOUCANSTILLINSTALL="
Puede continuar con la instalación, y al final los parámetros de configuración serán mostrados. Tendrá que subir manualmente el código: seleccione todo el código y luego péguelo en un archivo de texto nuevo, llame este archivo 'configuration.php' y súbalo a la carpeta raíz de su sitio." +INSTL_OUTPUT_BUFFERING="Búfer de salida" +INSTL_PARSE_INI_FILE_AVAILABLE="Soporte de parser INI" +INSTL_PHP_VERSION="Versión de PHP" +INSTL_PHP_VERSION_NEWER="Versión de PHP >= %s" +INSTL_REGISTER_GLOBALS="Register Globals deshabilitado" +INSTL_SAFE_MODE="Modo seguro" +INSTL_SESSION_AUTO_START="Inicio de sesión automático" +INSTL_WRITABLE="%s con permiso de escritura" +INSTL_XML_SUPPORT="Compatibilidad con XML" +INSTL_ZIP_SUPPORT_AVAILABLE="Soporte nativo de ZIP" +INSTL_ZLIB_COMPRESSION_SUPPORT="Soporte de compresión zlib" +INSTL_PROCESS_BUSY="Proceso en curso. Por favor espere..." + +;Global strings +JADMINISTRATOR="Administrador" +JCHECK_AGAIN="Verifique de nuevo" +JERROR="Error" +JEMAIL="Correo Electrónico" +JGLOBAL_ISFREESOFTWARE="%s es software libre publicado bajo la %s." +JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="El paquete de idioma no coincide con esta versión de Joomla!. Algunas traducciones pueden faltar." +JGLOBAL_SELECT_AN_OPTION="Seleccione una opción" +JGLOBAL_SELECT_NO_RESULTS_MATCH="No hay resultados" +JGLOBAL_SELECT_SOME_OPTIONS="Seleccione algunas opciones" +JINVALID_TOKEN="La solicitud más reciente fue negada porque contiene un token de seguridad inválido. Por favor actualice la página y vuelva a intentarlo." +JNEXT="Siguiente" +JNO="No" +JNOTICE="Aviso" +JOFF="Desactivado" +JON="Activado" +JPREVIOUS="Anterior" +JSITE="Sitio" +JUSERNAME="Usuario" +JYES="Sí" + +; Framework strings necessary when no lang pack is available +JLIB_DATABASE_ERROR_CONNECT_MYSQL="No se pudo conectar a MySQL." +JLIB_DATABASE_ERROR_DATABASE="Se produjo un error de base de datos." +JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="No se puede cargar el controlador de base de datos: %s" +JLIB_ENVIRONMENT_SESSION_EXPIRED="Su sesión ha caducado, por favor recargue la página." +JLIB_FILESYSTEM_ERROR_COPY_FAILED="La copia falló" +JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER_FILES="La ruta de JFolder: :files: no es una carpeta. Ruta: %s" +JLIB_FORM_FIELD_INVALID="Campo no válido: " +JLIB_FORM_VALIDATE_FIELD_INVALID="Campo no válido: %s" +JLIB_FORM_VALIDATE_FIELD_REQUIRED="Campo requerido: %s" +JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: no se pudo copiar el archivo %1$s a %2$s." +JLIB_INSTALLER_NOT_ERROR="Si el error está relacionado con la instalación de los archivos de idioma de TinyMCE, no tiene ningún efecto en la instalación de los idiomas. Algunos paquetes de idiomas creados antes de Joomla! 3.2.0 pueden intentar instalar archivos de idioma de TinyMCE separados. Como ahora están incluidos en la base de Joomla, ya no necesitan ser instalados." +JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: no se pudo conectar a la base de datos
joomla.library: %1$s - %2$s" + +; Strings for the language debugger +JDEBUG_LANGUAGE_FILES_IN_ERROR="Analizando errores en los archivos de idiomas" +JDEBUG_LANGUAGE_UNTRANSLATED_STRING="Cadenas sin traducir" +JNONE="Ninguno" + +; Necessary for errors +ADMIN_EMAIL="E-mail del administrador" +ADMIN_PASSWORD="Clave de administrador" +ADMIN_PASSWORD2="Confirmar clave de administrador" +SITE_NAME="Nombre del sitio" + +; Database types (allows for a more descriptive label than the internal name) +MYSQL="MySQL" +MYSQLI="MySQLi" +ORACLE="Oracle" +PDOMYSQL="MySQL (PDO)" +POSTGRESQL="PostgreSQL" +SQLAZURE="Microsoft SQL Azure" +SQLITE="SQLite" +SQLSRV="Microsoft SQL Server" + diff --git a/installation/language/es-CO/es-CO.xml b/installation/language/es-CO/es-CO.xml new file mode 100644 index 0000000000000..bf6f44c777831 --- /dev/null +++ b/installation/language/es-CO/es-CO.xml @@ -0,0 +1,19 @@ + + + Español (Colombia) + 3.6.0 + 2016-06-25 + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + GNU General Public License version 2 or later; see LICENSE.txt + + es-CO.ini + + + Español (Colombia) + es-CO + 0 + + + diff --git a/media/mod_languages/images/es_co.gif b/media/mod_languages/images/es_co.gif new file mode 100644 index 0000000000000000000000000000000000000000..c4b7a5a8d708d10802074aa5396b7945d057d1c1 GIT binary patch literal 851 zcmZ?wbhEHb6k_0E_|Cw Date: Mon, 11 Jul 2016 13:42:51 +0300 Subject: [PATCH 014/151] Fix tinyMCE modal close bug (again) (#11048) * fix modal close bug * freaking js --- libraries/cms/html/behavior.php | 17 ++++++++++++- media/system/js/tiny-close.js | 39 +++++++++++++++++++++++++++++ media/system/js/tiny-close.min.js | 1 + plugins/editors/tinymce/tinymce.php | 29 +-------------------- 4 files changed, 57 insertions(+), 29 deletions(-) create mode 100644 media/system/js/tiny-close.js create mode 100644 media/system/js/tiny-close.min.js diff --git a/libraries/cms/html/behavior.php b/libraries/cms/html/behavior.php index bdf2e65692112..a7bbe65c35f8f 100644 --- a/libraries/cms/html/behavior.php +++ b/libraries/cms/html/behavior.php @@ -407,7 +407,22 @@ public static function modal($selector = 'a.modal', $params = array()) }); function jModalClose() { SqueezeBox.close(); - }" + }; + // Patch for tinyMCE + if (typeof tinyMCE != 'undefined' && tinyMCE) { + var oldClose = jModalClose; + jModalClose = function () { + oldClose.apply(this, arguments); + tinyMCE.activeEditor.windowManager.close(); + }; + + var oldSqueezeBox = SqueezeBox.close; + SqueezeBox.close = function () { + oldSqueezeBox.apply(this, arguments); + tinyMCE.activeEditor.windowManager.close(); + }; + } + " ); // Set static array diff --git a/media/system/js/tiny-close.js b/media/system/js/tiny-close.js new file mode 100644 index 0000000000000..a62b4143288e4 --- /dev/null +++ b/media/system/js/tiny-close.js @@ -0,0 +1,39 @@ +/** + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @license GNU General Public License version 2 or later; see LICENSE.txt + */ + +/** + * This is used by tinyMCE in order to allow both mootools and bootstrap modals + * to close correctly + * + * @package Joomla + * @since 3.6 + * @version 1.0 + */ +jQuery(window).bind("load", function () { + if (jModalClose === undefined && typeof(jModalClose) != 'function') { + var jModalClose; + jModalClose = function () { + tinyMCE.activeEditor.windowManager.close(); + } + } else { + var oldClose = jModalClose; + jModalClose = function () { + oldClose.apply(this, arguments); + tinyMCE.activeEditor.windowManager.close(); + }; + } + if (SqueezeBox != undefined) { + var oldSqueezeBox = SqueezeBox.close; + SqueezeBox.close = function () { + oldSqueezeBox.apply(this, arguments); + tinyMCE.activeEditor.windowManager.close(); + } + } else { + var SqueezeBox = {}; + SqueezeBox.close = function () { + tinyMCE.activeEditor.windowManager.close(); + } + } +}); \ No newline at end of file diff --git a/media/system/js/tiny-close.min.js b/media/system/js/tiny-close.min.js new file mode 100644 index 0000000000000..ae63845d46c6f --- /dev/null +++ b/media/system/js/tiny-close.min.js @@ -0,0 +1 @@ +jQuery(window).bind("load",function(){if(void 0===i&&"function"!=typeof i){var i;i=function(){tinyMCE.activeEditor.windowManager.close()}}else{var n=i;i=function(){n.apply(this,arguments),tinyMCE.activeEditor.windowManager.close()}}if(void 0!=e){var o=e.close;e.close=function(){o.apply(this,arguments),tinyMCE.activeEditor.windowManager.close()}}else{var e={};e.close=function(){tinyMCE.activeEditor.windowManager.close()}}}); \ No newline at end of file diff --git a/plugins/editors/tinymce/tinymce.php b/plugins/editors/tinymce/tinymce.php index 3c52b620be010..d91a6a3503f1c 100644 --- a/plugins/editors/tinymce/tinymce.php +++ b/plugins/editors/tinymce/tinymce.php @@ -949,34 +949,7 @@ function jInsertEditorText( text, editor ) if (!empty($btnsNames)) { - JFactory::getDocument()->addScriptDeclaration( - " - if (jModalClose === undefined && typeof(jModalClose) != 'function') { - var jModalClose; - jModalClose = function() { - tinyMCE.activeEditor.windowManager.close(); - } - } else { - var oldClose = jModalClose; - jModalClose = function() { - oldClose.apply(this, arguments); - tinyMCE.activeEditor.windowManager.close(); - }; - } - if (SqueezeBox != undefined) { - var oldSqueezeBox = SqueezeBox.close; - SqueezeBox.close = function() { - oldSqueezeBox.apply(this, arguments); - tinyMCE.activeEditor.windowManager.close(); - } - } else { - var SqueezeBox = {}; - SqueezeBox.close = function() { - tinyMCE.activeEditor.windowManager.close(); - } - } - " - ); + JFactory::getDocument()->addScript(JUri::root(true) . '/media/system/js/tiny-close.min.js', null, true, false); } JFactory::getDocument()->addScriptDeclaration($script); From 792c7169207209be36fd11ad2bb577c55a37112f Mon Sep 17 00:00:00 2001 From: Anibal Sanchez Date: Tue, 12 Jul 2016 00:33:36 +0200 Subject: [PATCH 015/151] [#11044] - _removeAdminMenus removes wrong menu items - nested table error (#11069) --- libraries/joomla/table/nested.php | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/libraries/joomla/table/nested.php b/libraries/joomla/table/nested.php index 20c152618ed8b..03dbdd39cbb06 100644 --- a/libraries/joomla/table/nested.php +++ b/libraries/joomla/table/nested.php @@ -585,13 +585,19 @@ public function delete($pk = null, $children = true) ->where('lft BETWEEN ' . (int) $node->lft . ' AND ' . (int) $node->rgt); $this->_runQuery($query, 'JLIB_DATABASE_ERROR_DELETE_FAILED'); - // Compress the left and right values. + // Compress the left values. $query->clear() ->update($this->_tbl) ->set('lft = lft - ' . (int) $node->width) - ->set('rgt = rgt - ' . (int) $node->width) ->where('lft > ' . (int) $node->rgt); $this->_runQuery($query, 'JLIB_DATABASE_ERROR_DELETE_FAILED'); + + // Compress the right values. + $query->clear() + ->update($this->_tbl) + ->set('rgt = rgt - ' . (int) $node->width) + ->where('rgt > ' . (int) $node->rgt); + $this->_runQuery($query, 'JLIB_DATABASE_ERROR_DELETE_FAILED'); } // Leave the children and move them up a level. else @@ -618,13 +624,19 @@ public function delete($pk = null, $children = true) ->where('parent_id = ' . (int) $node->$k); $this->_runQuery($query, 'JLIB_DATABASE_ERROR_DELETE_FAILED'); - // Shift all of the left and right values that are right of the node. + // Shift all of the left values that are right of the node. $query->clear() ->update($this->_tbl) ->set('lft = lft - 2') - ->set('rgt = rgt - 2') ->where('lft > ' . (int) $node->rgt); $this->_runQuery($query, 'JLIB_DATABASE_ERROR_DELETE_FAILED'); + + // Shift all of the right values that are right of the node. + $query->clear() + ->update($this->_tbl) + ->set('rgt = rgt - 2') + ->where('rgt > ' . (int) $node->rgt); + $this->_runQuery($query, 'JLIB_DATABASE_ERROR_DELETE_FAILED'); } // Unlock the table for writing. From 25193c6072c81696d1a5661ebd126d8e1df328b9 Mon Sep 17 00:00:00 2001 From: Thomas Hunziker Date: Tue, 12 Jul 2016 07:48:43 +0200 Subject: [PATCH 016/151] Updated installation language file. --- installation/language/ja-JP/ja-JP.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/installation/language/ja-JP/ja-JP.ini b/installation/language/ja-JP/ja-JP.ini index e714ae1215675..8db26c7ab2a1a 100644 --- a/installation/language/ja-JP/ja-JP.ini +++ b/installation/language/ja-JP/ja-JP.ini @@ -33,11 +33,11 @@ INSTL_DATABASE_HOST_LABEL="ホスト名" INSTL_DATABASE_NAME_DESC="データベース名です。" INSTL_DATABASE_NAME_LABEL="データベース名" INSTL_DATABASE_NO_SCHEMA="このデータベースタイプにはデータベーススキーマは存在しません。" -INSTL_DATABASE_OLD_PROCESS_DESC="同じテーブルプレフィックスを持つ旧Joomlaのインストールから既存のテーブルを"バックアップ" または "削除"します。 +INSTL_DATABASE_OLD_PROCESS_DESC="同じ"テーブルプレフィックス"を持つ旧Joomlaのインストールから既存のテーブルを"バックアップ" または "削除"します。" INSTL_DATABASE_OLD_PROCESS_LABEL="古いデータベースの
処理" INSTL_DATABASE_PASSWORD_DESC="データベースのパスワードです。" INSTL_DATABASE_PASSWORD_LABEL="パスワード" -INSTL_DATABASE_PREFIX_DESC="テーブルプレフィックスは任意で記入するか、ランダム生成されたものをご使用ください。任意の場合は、英数字のみで4～5文字、アンダースコアで終わる文字列を指定します。選択されたプレフィックスが既に他のテーブルで使用されているものと同じにならないようにしてください。 +INSTL_DATABASE_PREFIX_DESC="テーブルプレフィックスは任意で記入するか、ランダム生成されたものをご使用ください。任意の場合は、英数字のみで4～5文字、アンダースコアで終わる文字列を指定します。選択されたプレフィックスが既に他のテーブルで使用されているものと同じにならないようにしてください。" INSTL_DATABASE_PREFIX_LABEL="テーブルプレフィックス" INSTL_DATABASE_PREFIX_MSG="テーブルプレフィックスの先頭はアルファベットで始める必要があり、2文字目以降は任意の半角英数字、最後にアンダースコアとなります。" INSTL_DATABASE_TYPE_DESC="おそらく MySQLi をご利用です" From 1e7f9cccbe1a7fba6f80549b953a3f02ad10791f Mon Sep 17 00:00:00 2001 From: wilsonge Date: Tue, 12 Jul 2016 21:15:46 +0100 Subject: [PATCH 017/151] Tag 3.6.0 Stable --- administrator/manifests/files/joomla.xml | 2 +- libraries/cms/version/version.php | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml index 56fb16b8b5efe..c82bd41110604 100644 --- a/administrator/manifests/files/joomla.xml +++ b/administrator/manifests/files/joomla.xml @@ -6,7 +6,7 @@ www.joomla.org (C) 2005 - 2016 Open Source Matters. All rights reserved GNU General Public License version 2 or later; see LICENSE.txt - 3.6.0-rc2 + 3.6.0 July 2016 FILES_JOOMLA_XML_DESCRIPTION diff --git a/libraries/cms/version/version.php b/libraries/cms/version/version.php index cf6269034e292..9a144a51d18b4 100644 --- a/libraries/cms/version/version.php +++ b/libraries/cms/version/version.php @@ -38,7 +38,7 @@ final class JVersion * @var string * @since 3.5 */ - const DEV_LEVEL = '0-rc2'; + const DEV_LEVEL = '0'; /** * Development status. @@ -46,7 +46,7 @@ final class JVersion * @var string * @since 3.5 */ - const DEV_STATUS = 'Release Candidate'; + const DEV_STATUS = 'Stable'; /** * Build number. @@ -70,7 +70,7 @@ final class JVersion * @var string * @since 3.5 */ - const RELDATE = '6-July-2016'; + const RELDATE = '12-July-2016'; /** * Release time. @@ -78,7 +78,7 @@ final class JVersion * @var string * @since 3.5 */ - const RELTIME = '22:26'; + const RELTIME = '21:14'; /** * Release timezone. @@ -86,7 +86,7 @@ final class JVersion * @var string * @since 3.5 */ - const RELTZ = 'CET'; + const RELTZ = 'GMT'; /** * Copyright Notice. From 4cf1dbdbcecab85b4331861aaa633d359bca9617 Mon Sep 17 00:00:00 2001 From: Michael Babker Date: Wed, 13 Jul 2016 04:03:18 -0500 Subject: [PATCH 018/151] Revert "Remove JLayoutFile deprecated methods from inside JLayoutFile class" (#11085) --- libraries/cms/layout/file.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/cms/layout/file.php b/libraries/cms/layout/file.php index 9cdeabe760299..041bf91dcc392 100644 --- a/libraries/cms/layout/file.php +++ b/libraries/cms/layout/file.php @@ -73,7 +73,7 @@ public function __construct($layoutId, $basePath = null, $options = null) $this->setOptions($options); // Main properties - $this->setLayoutId($layoutId); + $this->setLayout($layoutId); $this->basePath = $basePath; // Init Enviroment @@ -466,7 +466,7 @@ public function setComponent($option) $this->options->set('component', $component); // Refresh include paths - $this->clearIncludePaths(); + $this->refreshIncludePaths(); } /** @@ -501,7 +501,7 @@ public function setClient($client) $this->options->set('client', $client); // Refresh include paths - $this->clearIncludePaths(); + $this->refreshIncludePaths(); } /** From 40e0c83dce8398e059a1ad622a0716ecc04c76c8 Mon Sep 17 00:00:00 2001 From: wilsonge Date: Wed, 13 Jul 2016 10:32:32 +0100 Subject: [PATCH 019/151] Bump to 3.6.1-dev --- administrator/language/en-GB/en-GB.xml | 2 +- administrator/language/en-GB/install.xml | 2 +- administrator/manifests/files/joomla.xml | 2 +- administrator/manifests/packages/pkg_en-GB.xml | 2 +- installation/language/ar-AA/ar-AA.ini | 2 +- installation/language/en-GB/en-GB.xml | 2 +- installation/language/et-EE/et-EE.ini | 2 +- language/en-GB/en-GB.xml | 2 +- language/en-GB/install.xml | 2 +- libraries/cms/version/version.php | 8 ++++---- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/administrator/language/en-GB/en-GB.xml b/administrator/language/en-GB/en-GB.xml index 42033aedd6e7f..b83d257911e7c 100644 --- a/administrator/language/en-GB/en-GB.xml +++ b/administrator/language/en-GB/en-GB.xml @@ -1,7 +1,7 @@ English (en-GB) - 3.6.0 + 3.6.1 July 2016 Joomla! Project admin@joomla.org diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml index fe96cb04b97d6..64ed05413d877 100644 --- a/administrator/language/en-GB/install.xml +++ b/administrator/language/en-GB/install.xml @@ -2,7 +2,7 @@ English (United Kingdom) en-GB - 3.6.0 + 3.6.1 July 2016 Joomla! Project admin@joomla.org diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml index c82bd41110604..8cb44c5af22ef 100644 --- a/administrator/manifests/files/joomla.xml +++ b/administrator/manifests/files/joomla.xml @@ -6,7 +6,7 @@ www.joomla.org (C) 2005 - 2016 Open Source Matters. All rights reserved GNU General Public License version 2 or later; see LICENSE.txt - 3.6.0 + 3.6.1-dev July 2016 FILES_JOOMLA_XML_DESCRIPTION diff --git a/administrator/manifests/packages/pkg_en-GB.xml b/administrator/manifests/packages/pkg_en-GB.xml index 5ec7737cb8a24..a44fdc7bf0979 100644 --- a/administrator/manifests/packages/pkg_en-GB.xml +++ b/administrator/manifests/packages/pkg_en-GB.xml @@ -2,7 +2,7 @@ English (en-GB) Language Pack en-GB - 3.6.0.1 + 3.6.1.1 July 2016 Joomla! Project admin@joomla.org diff --git a/installation/language/ar-AA/ar-AA.ini b/installation/language/ar-AA/ar-AA.ini index ba528bdca8706..d0594e745faf9 100644 --- a/installation/language/ar-AA/ar-AA.ini +++ b/installation/language/ar-AA/ar-AA.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 - No BOM diff --git a/installation/language/en-GB/en-GB.xml b/installation/language/en-GB/en-GB.xml index 52e15e2b73a67..607f606c1f68f 100644 --- a/installation/language/en-GB/en-GB.xml +++ b/installation/language/en-GB/en-GB.xml @@ -3,7 +3,7 @@ version="3.6" client="installation"> English (United Kingdom) - 3.6.0 + 3.6.1 July 2016 Joomla! Project Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. diff --git a/installation/language/et-EE/et-EE.ini b/installation/language/et-EE/et-EE.ini index 28ca335482506..e8c79347166c8 100644 --- a/installation/language/et-EE/et-EE.ini +++ b/installation/language/et-EE/et-EE.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.xml b/language/en-GB/en-GB.xml index 18429dc50c12e..f22411343aa73 100644 --- a/language/en-GB/en-GB.xml +++ b/language/en-GB/en-GB.xml @@ -1,7 +1,7 @@ English (en-GB) - 3.6.0 + 3.6.1 July 2016 Joomla! Project admin@joomla.org diff --git a/language/en-GB/install.xml b/language/en-GB/install.xml index 8d7e7801502d4..2f6b7b56539a4 100644 --- a/language/en-GB/install.xml +++ b/language/en-GB/install.xml @@ -2,7 +2,7 @@ English (United Kingdom) en-GB - 3.6.0 + 3.6.1 July 2016 Joomla! Project admin@joomla.org diff --git a/libraries/cms/version/version.php b/libraries/cms/version/version.php index 9a144a51d18b4..0ec9ad13a5cec 100644 --- a/libraries/cms/version/version.php +++ b/libraries/cms/version/version.php @@ -38,7 +38,7 @@ final class JVersion * @var string * @since 3.5 */ - const DEV_LEVEL = '0'; + const DEV_LEVEL = '1-dev'; /** * Development status. @@ -46,7 +46,7 @@ final class JVersion * @var string * @since 3.5 */ - const DEV_STATUS = 'Stable'; + const DEV_STATUS = 'Development'; /** * Build number. @@ -70,7 +70,7 @@ final class JVersion * @var string * @since 3.5 */ - const RELDATE = '12-July-2016'; + const RELDATE = '13-July-2016'; /** * Release time. @@ -78,7 +78,7 @@ final class JVersion * @var string * @since 3.5 */ - const RELTIME = '21:14'; + const RELTIME = '10:08'; /** * Release timezone. From 32e95f1496930e69b1af83c1001175def253db42 Mon Sep 17 00:00:00 2001 From: Patrick Andersen Date: Wed, 13 Jul 2016 13:10:36 -0400 Subject: [PATCH 020/151] Rename JDatabaseIteratorAzure to JDatabaseIteratorSqlazure (#11110) Fixes a fatal error when viewing articles on an Azure database by bringing the naming in line with the rest of the Azure-related classes. --- libraries/joomla/database/iterator/{azure.php => sqlazure.php} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename libraries/joomla/database/iterator/{azure.php => sqlazure.php} (84%) diff --git a/libraries/joomla/database/iterator/azure.php b/libraries/joomla/database/iterator/sqlazure.php similarity index 84% rename from libraries/joomla/database/iterator/azure.php rename to libraries/joomla/database/iterator/sqlazure.php index 97d1e7d0cb4ca..0a02d398cdcb7 100644 --- a/libraries/joomla/database/iterator/azure.php +++ b/libraries/joomla/database/iterator/sqlazure.php @@ -14,6 +14,6 @@ * * @since 12.1 */ -class JDatabaseIteratorAzure extends JDatabaseIteratorSqlsrv +class JDatabaseIteratorSqlazure extends JDatabaseIteratorSqlsrv { } From 162d10458cd50387b768f6bf5113836359386b34 Mon Sep 17 00:00:00 2001 From: infograf768 Date: Thu, 14 Jul 2016 14:08:34 +0200 Subject: [PATCH 021/151] Correcting B/C Logout redirection (#11093) --- components/com_users/controllers/user.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/components/com_users/controllers/user.php b/components/com_users/controllers/user.php index a366ca4ab3dec..56efe6c0e1a5b 100644 --- a/components/com_users/controllers/user.php +++ b/components/com_users/controllers/user.php @@ -200,13 +200,18 @@ public function logout() } $return = 'index.php?Itemid=' . $return . $lang; - - // Redirect to internal URLs only - if (JUri::isInternal($return)) + } + else + { + // Don't redirect to an external URL. + if (!JUri::isInternal($return)) { - $app->redirect(JRoute::_($return, false)); + $return = ''; } } + + // Redirect the user. + $app->redirect(JRoute::_($return, false)); } /** From 7b17a8d5fc3164156828966462aaeb06622236bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wojciech=20Smoli=C5=84ski?= Date: Fri, 15 Jul 2016 15:56:31 +0200 Subject: [PATCH 022/151] add .editorconfig to .gitignore (#10859) --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index de6480de2cc66..fa5ff5c4f07a6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ # IDE & System Related Files # .buildpath +.editorconfig .project .settings .DS_Store From 8b3f434ffa20a145ad934e8bce4f9523782efc70 Mon Sep 17 00:00:00 2001 From: CI Date: Thu, 5 Feb 2015 11:16:20 +0100 Subject: [PATCH 023/151] JFormRuleEquals doesnt take into account group Fixes #5979 --- libraries/joomla/form/rule/equals.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libraries/joomla/form/rule/equals.php b/libraries/joomla/form/rule/equals.php index dddf3d5670deb..555458b74c1d2 100644 --- a/libraries/joomla/form/rule/equals.php +++ b/libraries/joomla/form/rule/equals.php @@ -57,12 +57,14 @@ public function test(SimpleXMLElement $element, $value, $group = null, Registry throw new InvalidArgumentException(sprintf('The value for $input must not be null in %s', get_class($this))); } - // Test the two values against each other. - if ($value == $input->get($field)) + $test = $input->get($field); + + if (isset($group) && $group !== '') { - return true; + $test = $input->get($group . '.' . $field); } - return false; + // Test the two values against each other. + return $value == $test; } } From 409f73bd57d0600acafa91f351da55d9bbedbbf0 Mon Sep 17 00:00:00 2001 From: AteDev Date: Sat, 16 Jul 2016 07:18:01 +0200 Subject: [PATCH 024/151] Incorrect check for response header Oauth2 Client (#7110) * Incorrect check for response header Oauth2 Client In Oauth2 Client, there is an incorrect check when we want to get access token back from http post. Some time (maybe all time) there is charset added in the content-type contained in reponse header. ## How to test Will add a custom component to help try it out later. * Just makes travis happy * another fix conditionnal + comment --- libraries/joomla/oauth2/client.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/joomla/oauth2/client.php b/libraries/joomla/oauth2/client.php index 35f8d25c942bc..e2238306870d7 100644 --- a/libraries/joomla/oauth2/client.php +++ b/libraries/joomla/oauth2/client.php @@ -80,7 +80,7 @@ public function authenticate() if ($response->code >= 200 && $response->code < 400) { - if ($response->headers['Content-Type'] == 'application/json') + if (strpos($response->headers['Content-Type'], 'application/json') === 0) { $token = array_merge(json_decode($response->body, true), array('created' => time())); } @@ -192,7 +192,7 @@ public function createUrl() /** * Send a signed Oauth request. * - * @param string $url The URL forf the request. + * @param string $url The URL for the request. * @param mixed $data The data to include in the request * @param array $headers The headers to send with the request * @param string $method The method with which to send the request @@ -365,7 +365,7 @@ public function refreshToken($token = null) if ($response->code >= 200 || $response->code < 400) { - if ($response->headers['Content-Type'] == 'application/json') + if (strpos($response->headers['Content-Type'], 'application/json') === 0) { $token = array_merge(json_decode($response->body, true), array('created' => time())); } From afead4591e56e628b50696c3d06a710147578389 Mon Sep 17 00:00:00 2001 From: Michael Babker Date: Sat, 16 Jul 2016 01:06:45 -0500 Subject: [PATCH 025/151] Alternative approach to #9999 to deal with hardcoded import of plugins (#10344) --- libraries/cms/application/site.php | 21 +++++++++++++++---- .../system/languagefilter/languagefilter.php | 5 ----- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/libraries/cms/application/site.php b/libraries/cms/application/site.php index dadadbf455904..57f9a3074ac6b 100644 --- a/libraries/cms/application/site.php +++ b/libraries/cms/application/site.php @@ -585,8 +585,21 @@ protected function initialiseApp($options = array()) $user->groups = array($guestUsergroup); } - // If a language was specified it has priority, otherwise use user or default language settings - JPluginHelper::importPlugin('system', 'languagefilter'); + /* + * If a language was specified it has priority, otherwise use user or default language settings + * Check this only if the languagefilter plugin is enabled + * + * @TODO - Remove the hardcoded dependency to the languagefilter plugin + */ + if (JPluginHelper::isEnabled('system', 'languagefilter')) + { + $plugin = JPluginHelper::getPlugin('system', 'languagefilter'); + + $pluginParams = new Registry($plugin->params); + + $this->setLanguageFilter(true); + $this->setDetectBrowser($pluginParams->get('detect_browser', '1') == '1'); + } if (empty($options['language'])) { @@ -600,7 +613,7 @@ protected function initialiseApp($options = array()) } } - if ($this->_language_filter && empty($options['language'])) + if ($this->getLanguageFilter() && empty($options['language'])) { // Detect cookie language $lang = $this->input->cookie->get(md5($this->get('secret') . 'language'), null, 'string'); @@ -624,7 +637,7 @@ protected function initialiseApp($options = array()) } } - if ($this->_detect_browser && empty($options['language'])) + if ($this->getDetectBrowser() && empty($options['language'])) { // Detect browser language $lang = JLanguageHelper::detectLanguage(); diff --git a/plugins/system/languagefilter/languagefilter.php b/plugins/system/languagefilter/languagefilter.php index e992b1d318daf..ccd0344b8e659 100644 --- a/plugins/system/languagefilter/languagefilter.php +++ b/plugins/system/languagefilter/languagefilter.php @@ -75,11 +75,6 @@ public function __construct(&$subject, $config) unset($this->sefs[$language->sef]); } } - - $this->app->setLanguageFilter(true); - - // Detect browser feature. - $this->app->setDetectBrowser($this->params->get('detect_browser', '1') == '1'); } } From bb28dc99e27ac2cf034a593b242df418b1dccc9f Mon Sep 17 00:00:00 2001 From: Allon Moritz Date: Sat, 16 Jul 2016 08:35:21 +0200 Subject: [PATCH 026/151] Trigger onContentAfterTitle event, display afterDisplayContent correct (#10400) --- modules/mod_articles_news/helper.php | 5 ++++- modules/mod_articles_news/tmpl/_item.php | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/mod_articles_news/helper.php b/modules/mod_articles_news/helper.php index ca74a9756d2ed..d41ceebf2620a 100644 --- a/modules/mod_articles_news/helper.php +++ b/modules/mod_articles_news/helper.php @@ -102,11 +102,14 @@ public static function getList(&$params) $item->introtext = preg_replace('/]*>/', '', $item->introtext); } - $results = $app->triggerEvent('onContentAfterDisplay', array('com_content.article', &$item, &$params, 1)); + $results = $app->triggerEvent('onContentAfterTitle', array('com_content.article', &$item, &$params, 1)); $item->afterDisplayTitle = trim(implode("\n", $results)); $results = $app->triggerEvent('onContentBeforeDisplay', array('com_content.article', &$item, &$params, 1)); $item->beforeDisplayContent = trim(implode("\n", $results)); + + $results = $app->triggerEvent('onContentAfterDisplay', array('com_content.article', &$item, &$params, 1)); + $item->afterDisplayContent = trim(implode("\n", $results)); } return $items; diff --git a/modules/mod_articles_news/tmpl/_item.php b/modules/mod_articles_news/tmpl/_item.php index 0a918f8a591d8..64b5dcb8dfcee 100644 --- a/modules/mod_articles_news/tmpl/_item.php +++ b/modules/mod_articles_news/tmpl/_item.php @@ -33,6 +33,8 @@ introtext; ?> +afterDisplayContent; ?> + link) && $item->readmore != 0 && $params->get('readmore')) : ?> link . '">' . $item->linkText . ''; ?> From 7756c18ebffb12a776da68c9ec54dc16aa246eac Mon Sep 17 00:00:00 2001 From: Walt Sorensen Date: Sat, 16 Jul 2016 00:43:08 -0600 Subject: [PATCH 027/151] Fix APC for when internal key name is entry_name (#10600) * Fix APC for when internal key name is entry_name // Some APC modules changed the internal key name from key to entry_name, HHMV is one such case * Fix comment typo * Fix APCu for when internal key name is entry_name Some APCu modules may have changed the internal key name from `key` or `info` to `entry_name` --- libraries/joomla/cache/storage/apc.php | 52 ++++++++++++++++++++++--- libraries/joomla/cache/storage/apcu.php | 52 ++++++++++++++++++++++--- 2 files changed, 92 insertions(+), 12 deletions(-) diff --git a/libraries/joomla/cache/storage/apc.php b/libraries/joomla/cache/storage/apc.php index ec68aa5f65a32..c76fa334de127 100644 --- a/libraries/joomla/cache/storage/apc.php +++ b/libraries/joomla/cache/storage/apc.php @@ -50,8 +50,22 @@ public function getAll() foreach ($keys as $key) { - // If APCu is being used for this adapter, the internal key name changed with APCu 4.0.7 from key to info - $name = isset($key['info']) ? $key['info'] : $key['key']; + if (isset($key['info'])) + { + // If APCu is being used for this adapter, the internal key name changed with APCu 4.0.7 from key to info + $name = $key['info']; + } + elseif (isset($key['entry_name'])) + { + // Some APC modules changed the internal key name from key to entry_name, HHVM is one such case + $name = $key['entry_name']; + } + else + { + // A fall back for the old internal key name + $name = $key['key']; + } + $namearr = explode('-', $name); if ($namearr !== false && $namearr[0] == $secret && $namearr[1] == 'cache') @@ -128,8 +142,21 @@ public function clean($group, $mode = null) foreach ($keys as $key) { - // If APCu is being used for this adapter, the internal key name changed with APCu 4.0.7 from key to info - $internalKey = isset($key['info']) ? $key['info'] : $key['key']; + if (isset($key['info'])) + { + // If APCu is being used for this adapter, the internal key name changed with APCu 4.0.7 from key to info + $internalKey = $key['info']; + } + elseif (isset($key['entry_name'])) + { + // Some APC modules changed the internal key name from key to entry_name, HHVM is one such case + $internalKey = $key['entry_name']; + } + else + { + // A fall back for the old internal key name + $internalKey = $key['key']; + } if (strpos($internalKey, $secret . '-cache-' . $group . '-') === 0 xor $mode != 'group') { @@ -155,8 +182,21 @@ public function gc() foreach ($keys as $key) { - // If APCu is being used for this adapter, the internal key name changed with APCu 4.0.7 from key to info - $internalKey = isset($key['info']) ? $key['info'] : $key['key']; + if (isset($key['info'])) + { + // If APCu is being used for this adapter, the internal key name changed with APCu 4.0.7 from key to info + $internalKey = $key['info']; + } + elseif (isset($key['entry_name'])) + { + // Some APC modules changed the internal key name from key to entry_name, HHVM is one such case + $internalKey = $key['entry_name']; + } + else + { + // A fall back for the old internal key name + $internalKey = $key['key']; + } if (strpos($internalKey, $secret . '-cache-')) { diff --git a/libraries/joomla/cache/storage/apcu.php b/libraries/joomla/cache/storage/apcu.php index 87c619996d129..889f02d6ec3bd 100644 --- a/libraries/joomla/cache/storage/apcu.php +++ b/libraries/joomla/cache/storage/apcu.php @@ -50,8 +50,22 @@ public function getAll() foreach ($keys as $key) { - // The internal key name changed with APCu 4.0.7 from key to info - $name = isset($key['info']) ? $key['info'] : $key['key']; + if (isset($key['info'])) + { + // The internal key name changed with APCu 4.0.7 from key to info + $name = $key['info']; + } + elseif (isset($key['entry_name'])) + { + // Some APCu modules changed the internal key name from key to entry_name + $name = $key['entry_name']; + } + else + { + // A fall back for the old internal key name + $name = $key['key']; + } + $namearr = explode('-', $name); if ($namearr !== false && $namearr[0] == $secret && $namearr[1] == 'cache') @@ -136,8 +150,21 @@ public function clean($group, $mode = null) foreach ($keys as $key) { - // The internal key name changed with APCu 4.0.7 from key to info - $internalKey = isset($key['info']) ? $key['info'] : $key['key']; + if (isset($key['info'])) + { + // The internal key name changed with APCu 4.0.7 from key to info + $internalKey = $key['info']; + } + elseif (isset($key['entry_name'])) + { + // Some APCu modules changed the internal key name from key to entry_name + $internalKey = $key['entry_name']; + } + else + { + // A fall back for the old internal key name + $internalKey = $key['key']; + } if (strpos($internalKey, $secret . '-cache-' . $group . '-') === 0 xor $mode != 'group') { @@ -163,8 +190,21 @@ public function gc() foreach ($keys as $key) { - // The internal key name changed with APCu 4.0.7 from key to info - $internalKey = isset($key['info']) ? $key['info'] : $key['key']; + if (isset($key['info'])) + { + // The internal key name changed with APCu 4.0.7 from key to info + $internalKey = $key['info']; + } + elseif (isset($key['entry_name'])) + { + // Some APCu modules changed the internal key name from key to entry_name + $internalKey = $key['entry_name']; + } + else + { + // A fall back for the old internal key name + $internalKey = $key['key']; + } if (strpos($internalKey, $secret . '-cache-')) { From 2f39c9c8582c45afc3b8a8a4b0736bf6a31e9ca5 Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Sat, 16 Jul 2016 07:52:59 +0100 Subject: [PATCH 028/151] Featured contacts (#10738) * add toolbar * move featured * update dropdown filter ordering to match columns --- .../com_contact/models/forms/filter_contacts.xml | 4 ++-- .../components/com_contact/views/contacts/tmpl/default.php | 7 +------ .../components/com_contact/views/contacts/view.html.php | 2 ++ 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/administrator/components/com_contact/models/forms/filter_contacts.xml b/administrator/components/com_contact/models/forms/filter_contacts.xml index 7e9433bbb54e7..60c8ad7d62d73 100755 --- a/administrator/components/com_contact/models/forms/filter_contacts.xml +++ b/administrator/components/com_contact/models/forms/filter_contacts.xml @@ -95,14 +95,14 @@ + + - -