diff --git a/administrator/components/com_finder/controllers/indexer.json.php b/administrator/components/com_finder/controllers/indexer.json.php index 1a269e5b248..86a39efec40 100644 --- a/administrator/components/com_finder/controllers/indexer.json.php +++ b/administrator/components/com_finder/controllers/indexer.json.php @@ -168,7 +168,6 @@ class FinderControllerIndexer extends JControllerLegacy $admin = clone(JFactory::getApplication()); // Get the site app. - include_once JPATH_SITE . '/includes/application.php'; $site = JApplication::getInstance('site'); // Swap the app. @@ -282,9 +281,10 @@ class FinderControllerIndexer extends JControllerLegacy // Send the assigned error code if we are catching an exception. if ($data instanceof Exception) { + $app = JFactory::getApplication(); JLog::add($data->getMessage(), JLog::ERROR); - JResponse::setHeader('status', $data->getCode()); - JResponse::sendHeaders(); + $app->setHeader('status', $data->getCode()); + $app->sendHeaders(); } // Create the response object. diff --git a/administrator/components/com_finder/helpers/finder.php b/administrator/components/com_finder/helpers/finder.php index 738ae43796b..f06deed21a8 100644 --- a/administrator/components/com_finder/helpers/finder.php +++ b/administrator/components/com_finder/helpers/finder.php @@ -27,12 +27,11 @@ class FinderHelper /** * Configure the Linkbar. * - * @param string $vName The name of the active view. + * @param string $vName The name of the active view. * - * @return void + * @return void * - * @since 2.5 - * @deprecated 3.2 + * @since 2.5 */ public static function addSubmenu($vName) { diff --git a/administrator/components/com_finder/helpers/indexer/helper.php b/administrator/components/com_finder/helpers/indexer/helper.php index 58c9defb205..ee0dae1eef6 100644 --- a/administrator/components/com_finder/helpers/indexer/helper.php +++ b/administrator/components/com_finder/helpers/indexer/helper.php @@ -405,8 +405,6 @@ class FinderIndexerHelper // Only get the router once. if (!($router instanceof JRouter)) { - include_once JPATH_SITE . '/includes/application.php'; - // Get and configure the site router. $config = JFactory::getConfig(); $router = JRouter::getInstance('site'); diff --git a/administrator/components/com_installer/views/languages/tmpl/default_filter.php b/administrator/components/com_installer/views/languages/tmpl/default_filter.php index 823af2d72d6..eb6616c69ff 100644 --- a/administrator/components/com_installer/views/languages/tmpl/default_filter.php +++ b/administrator/components/com_installer/views/languages/tmpl/default_filter.php @@ -24,6 +24,4 @@ JHtml::_('bootstrap.tooltip'); - -
- +
diff --git a/administrator/components/com_languages/models/forms/language.xml b/administrator/components/com_languages/models/forms/language.xml index 5e1fc44b9c3..7e8247d6383 100644 --- a/administrator/components/com_languages/models/forms/language.xml +++ b/administrator/components/com_languages/models/forms/language.xml @@ -1,13 +1,13 @@
- + readonly="true" + /> + size="10" + /> + size="40" + /> + size="40" + /> + size="10" + /> + size="10" + /> + rows="5" + /> + size="1" + > - + - + description="JFIELD_ACCESS_DESC" + />
-
- + cols="30" + /> - + cols="30" + />
-
- - + size="50" + />
diff --git a/administrator/components/com_languages/models/forms/override.xml b/administrator/components/com_languages/models/forms/override.xml index 45558c8c997..f7d0834ce42 100644 --- a/administrator/components/com_languages/models/forms/override.xml +++ b/administrator/components/com_languages/models/forms/override.xml @@ -1,8 +1,8 @@
- - - - - - + size="50" + /> + size="50" + /> + size="80" + /> - -
diff --git a/administrator/components/com_media/media.xml b/administrator/components/com_media/media.xml index 3c76a2d70d1..12ab75ee112 100644 --- a/administrator/components/com_media/media.xml +++ b/administrator/components/com_media/media.xml @@ -27,6 +27,7 @@ media.php controllers helpers + layouts models views diff --git a/administrator/components/com_menus/controllers/item.php b/administrator/components/com_menus/controllers/item.php index c8bdbc1ceaf..391bc6344d8 100644 --- a/administrator/components/com_menus/controllers/item.php +++ b/administrator/components/com_menus/controllers/item.php @@ -138,6 +138,16 @@ class MenusControllerItem extends JControllerForm $context = 'com_menus.edit.item'; $recordId = $this->input->getInt('id'); + if (!$this->checkEditId($context, $recordId)) + { + // Somehow the person just went to the form and saved it - we don't allow that. + $this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $recordId)); + $this->setMessage($this->getError(), 'error'); + $this->setRedirect(JRoute::_('index.php?option=com_menus&view=items' . $this->getRedirectToListAppend(), false)); + + return false; + } + // Populate the row id from the session. $data['id'] = $recordId; @@ -161,6 +171,7 @@ class MenusControllerItem extends JControllerForm // Validate the posted data. // This post is made up of two forms, one for the item and one for params. $form = $model->getForm($data); + if (!$form) { JError::raiseError(500, $model->getError()); diff --git a/administrator/components/com_menus/controllers/menu.php b/administrator/components/com_menus/controllers/menu.php index a4146c437a7..f0849f8dd7e 100644 --- a/administrator/components/com_menus/controllers/menu.php +++ b/administrator/components/com_menus/controllers/menu.php @@ -48,6 +48,16 @@ class MenusControllerMenu extends JControllerForm $task = $this->getTask(); $recordId = $this->input->getInt('id'); + if (!$this->checkEditId($context, $recordId)) + { + // Somehow the person just went to the form and saved it - we don't allow that. + $this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $recordId)); + $this->setMessage($this->getError(), 'error'); + $this->setRedirect(JRoute::_('index.php?option='.$this->option.'&view='.$this->view_list.$this->getRedirectToListAppend(), false)); + + return false; + } + // Make sure we are not trying to modify an administrator menu. if (isset($data['client_id']) && $data['client_id'] == 1){ JError::raiseNotice(0, JText::_('COM_MENUS_MENU_TYPE_NOT_ALLOWED')); diff --git a/administrator/components/com_menus/helpers/menus.php b/administrator/components/com_menus/helpers/menus.php index 999fce9b453..c8372495840 100644 --- a/administrator/components/com_menus/helpers/menus.php +++ b/administrator/components/com_menus/helpers/menus.php @@ -27,7 +27,6 @@ class MenusHelper * Configure the Linkbar. * * @param string The name of the active view. - * @deprecated 3.2 */ public static function addSubmenu($vName) { diff --git a/administrator/components/com_menus/models/item.php b/administrator/components/com_menus/models/item.php index 4b3c2583d0c..c0284d665c9 100644 --- a/administrator/components/com_menus/models/item.php +++ b/administrator/components/com_menus/models/item.php @@ -557,6 +557,7 @@ class MenusModelItem extends JModelAdmin // Get the form. $form = $this->loadForm('com_menus.item', 'item', array('control' => 'jform', 'load_data' => $loadData), true); + if (empty($form)) { return false; @@ -695,6 +696,7 @@ class MenusModelItem extends JModelAdmin // Determine the component id. $component = JComponentHelper::getComponent($args['option']); + if (isset($component->id)) { $table->component_id = $component->id; @@ -740,7 +742,9 @@ class MenusModelItem extends JModelAdmin } // Load associated menu items - if (isset(JFactory::getApplication()->item_associations)) + $app = JFactory::getApplication(); + $assoc = isset($app->item_associations) ? $app->item_associations : 0; + if ($assoc) { if ($pk != null) { @@ -926,13 +930,18 @@ class MenusModelItem extends JModelAdmin $formFile = false; // Check for the layout XML file. Use standard xml file if it exists. - $path = JPath::clean($base . '/views/' . $view . '/tmpl/' . $layout . '.xml'); + $tplFolders = array( + $base . '/views/' . $view . '/tmpl', + $base . '/view/' . $view . '/tmpl' + ); + $path = JPath::find($tplFolders, $layout . '.xml'); + if (is_file($path)) { $formFile = $path; } - // if custom layout, get the xml file from the template folder + // If custom layout, get the xml file from the template folder // template folder is first part of file name -- template:folder if (!$formFile && (strpos($layout, ':') > 0)) { @@ -948,9 +957,18 @@ class MenusModelItem extends JModelAdmin //Now check for a view manifest file if (!$formFile) { - if (isset($view) && is_file($path = JPath::clean($base . '/views/' . $view . '/metadata.xml'))) + if (isset($view)) { - $formFile = $path; + $metadataFolders = array( + $base . '/view/' . $view, + $base . '/views/' . $view + ); + $metaPath = JPath::find($metadataFiles, 'metadata.xml'); + + if (is_file($path = JPath::clean($metaPath))) + { + $formFile = $path; + } } else { @@ -1036,7 +1054,10 @@ class MenusModelItem extends JModelAdmin } // Association menu items - if (isset(JFactory::getApplication()->item_associations)) + $app = JFactory::getApplication(); + $assoc = isset($app->item_associations) ? $app->item_associations : 0; + + if ($assoc) { $languages = JLanguageHelper::getLanguages('lang_code'); @@ -1236,7 +1257,9 @@ class MenusModelItem extends JModelAdmin $this->setState('item.menutype', $table->menutype); // Load associated menu items - if (isset(JFactory::getApplication()->item_associations)) + $app = JFactory::getApplication(); + $assoc = isset($app->item_associations) ? $app->item_associations : 0; + if ($assoc) { // Adding self to the association $associations = $data['associations']; diff --git a/administrator/components/com_menus/models/items.php b/administrator/components/com_menus/models/items.php index 6ca895f29b7..abdfeec6ae1 100644 --- a/administrator/components/com_menus/models/items.php +++ b/administrator/components/com_menus/models/items.php @@ -47,7 +47,9 @@ class MenusModelItems extends JModelList 'home', 'a.home', ); - if (isset(JFactory::getApplication()->item_associations)) + $app = JFactory::getApplication(); + $assoc = isset($app->item_associations) ? $app->item_associations : 0; + if ($assoc) { $config['filter_fields'][] = 'association'; } @@ -173,6 +175,7 @@ class MenusModelItems extends JModelList $db = $this->getDbo(); $query = $db->getQuery(true); $user = JFactory::getUser(); + $app = JFactory::getApplication(); // Select all fields from the table. $query->select( @@ -212,7 +215,8 @@ class MenusModelItems extends JModelList ->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access'); // Join over the associations. - if (isset(JFactory::getApplication()->item_associations)) + $assoc = isset($app->item_associations) ? $app->item_associations : 0; + if ($assoc) { $query->select('COUNT(asso2.id)>1 as association') ->join('LEFT', '#__associations AS asso ON asso.id = a.id AND asso.context=' . $db->quote('com_menus.item')) diff --git a/administrator/components/com_menus/models/menutypes.php b/administrator/components/com_menus/models/menutypes.php index 84d5f518e56..9a4c9ba7bbc 100644 --- a/administrator/components/com_menus/models/menutypes.php +++ b/administrator/components/com_menus/models/menutypes.php @@ -10,7 +10,7 @@ defined('_JEXEC') or die; jimport('joomla.filesystem.folder'); - +jimport('joomla.filesystem.path'); /** * Menu Item Types Model for Menus. * @@ -23,7 +23,7 @@ class MenusModelMenutypes extends JModelLegacy /** * A reverse lookup of the base link URL to Title * - * @var array + * @var array */ protected $rlu = array(); @@ -81,10 +81,10 @@ class MenusModelMenutypes extends JModelLegacy if (isset($option->request['option'])) { - $lang->load($option->request['option'].'.sys', JPATH_ADMINISTRATOR, null, false, false) - || $lang->load($option->request['option'].'.sys', JPATH_ADMINISTRATOR.'/components/'.$option->request['option'], null, false, false) - || $lang->load($option->request['option'].'.sys', JPATH_ADMINISTRATOR, $lang->getDefault(), false, false) - || $lang->load($option->request['option'].'.sys', JPATH_ADMINISTRATOR.'/components/'.$option->request['option'], $lang->getDefault(), false, false); + $lang->load($option->request['option'] . '.sys', JPATH_ADMINISTRATOR, null, false, false) + || $lang->load($option->request['option'] . '.sys', JPATH_ADMINISTRATOR. ' /components/'.$option->request['option'], null, false, false) + || $lang->load($option->request['option'] . '.sys', JPATH_ADMINISTRATOR, $lang->getDefault(), false, false) + || $lang->load($option->request['option'] . '.sys', JPATH_ADMINISTRATOR . '/components/'.$option->request['option'], $lang->getDefault(), false, false); } } } @@ -115,7 +115,7 @@ class MenusModelMenutypes extends JModelLegacy { $options = array(); - $mainXML = JPATH_SITE.'/components/'.$component.'/metadata.xml'; + $mainXML = JPATH_SITE . '/components/' . $component . '/metadata.xml'; if (is_file($mainXML)) { @@ -215,7 +215,16 @@ class MenusModelMenutypes extends JModelLegacy $options = array(); // Get the views for this component. - $path = JPATH_SITE . '/components/' . $component . '/views'; + if (is_dir(JPATH_SITE . '/components/' . $component)) + { + $folders = JFolder::folders(JPATH_SITE . '/components/' . $component, 'view', false, true); + } + $path = ''; + + if (!empty($folders[0])) + { + $path = $folders[0]; + } if (is_dir($path)) { @@ -232,7 +241,7 @@ class MenusModelMenutypes extends JModelLegacy if (strpos($view, '_') !== 0) { // Determine if a metadata file exists for the view. - $file = $path.'/'.$view.'/metadata.xml'; + $file = $path . '/' . $view . '/metadata.xml'; if (is_file($file)) { @@ -286,15 +295,18 @@ class MenusModelMenutypes extends JModelLegacy } } } - else { + else + { $options = array_merge($options, (array) $this->getTypeOptionsFromLayouts($component, $view)); } } + unset($xml); } } - else { + else + { $options = array_merge($options, (array) $this->getTypeOptionsFromLayouts($component, $view)); } } @@ -309,9 +321,19 @@ class MenusModelMenutypes extends JModelLegacy $layouts = array(); $layoutNames = array(); $lang = JFactory::getLanguage(); + $path = ''; + + // Get the views for this component. + if (is_dir(JPATH_SITE . '/components/' . $component)) + { + $folders = JFolder::folders(JPATH_SITE . '/components/' . $component, 'view', false, true); + } + + if (!empty($folders[0])) + { + $path = $folders[0] . '/' . $view . '/tmpl'; + } - // Get the layouts from the view folder. - $path = JPATH_SITE . '/components/' . $component . '/views/' . $view . '/tmpl'; if (is_dir($path)) { $layouts = array_merge($layouts, JFolder::files($path, '.xml$', false, true)); @@ -321,7 +343,7 @@ class MenusModelMenutypes extends JModelLegacy return $options; } - // build list of standard layout names + // Build list of standard layout names foreach ($layouts as $layout) { // Ignore private layouts. @@ -332,20 +354,22 @@ class MenusModelMenutypes extends JModelLegacy } } - // get the template layouts + // Get the template layouts // TODO: This should only search one template -- the current template for this item (default of specified) $folders = JFolder::folders(JPATH_SITE . '/templates', '', false, true); + // Array to hold association between template file names and templates $templateName = array(); + foreach ($folders as $folder) { if (is_dir($folder . '/html/' . $component . '/' . $view)) { $template = basename($folder); - $lang->load('tpl_'.$template.'.sys', JPATH_SITE, null, false, false) - || $lang->load('tpl_'.$template.'.sys', JPATH_SITE.'/templates/'.$template, null, false, false) - || $lang->load('tpl_'.$template.'.sys', JPATH_SITE, $lang->getDefault(), false, false) - || $lang->load('tpl_'.$template.'.sys', JPATH_SITE.'/templates/'.$template, $lang->getDefault(), false, false); + $lang->load('tpl_' . $template . '.sys', JPATH_SITE, null, false, false) + || $lang->load('tpl_' . $template . '.sys', JPATH_SITE . '/templates/' . $template, null, false, false) + || $lang->load('tpl_' . $template . '.sys', JPATH_SITE, $lang->getDefault(), false, false) + || $lang->load('tpl_' . $template . '.sys', JPATH_SITE . '/templates/' . $template, $lang->getDefault(), false, false); $templateLayouts = JFolder::files($folder . '/html/' . $component . '/' . $view, '.xml$', false, true); @@ -358,6 +382,7 @@ class MenusModelMenutypes extends JModelLegacy if (array_search($templateLayoutName, $layoutNames) === false) { $layouts[] = $layout; + // Set template name array so we can get the right template for the layout $templateName[$layout] = basename($folder); } diff --git a/administrator/components/com_messages/helpers/messages.php b/administrator/components/com_messages/helpers/messages.php index e7b308b199a..5a18f373743 100644 --- a/administrator/components/com_messages/helpers/messages.php +++ b/administrator/components/com_messages/helpers/messages.php @@ -19,11 +19,10 @@ class MessagesHelper /** * Configure the Linkbar. * - * @param string The name of the active view. + * @param string The name of the active view. * - * @return void - * @since 1.6 - * @deprecated 3.2 + * @return void + * @since 1.6 */ public static function addSubmenu($vName) { diff --git a/administrator/components/com_newsfeeds/helpers/newsfeeds.php b/administrator/components/com_newsfeeds/helpers/newsfeeds.php index de081679a18..76c435e6a00 100644 --- a/administrator/components/com_newsfeeds/helpers/newsfeeds.php +++ b/administrator/components/com_newsfeeds/helpers/newsfeeds.php @@ -16,15 +16,16 @@ defined('_JEXEC') or die; * @subpackage com_newsfeeds * @since 1.6 */ -class NewsfeedsHelper +class NewsfeedsHelper extends JHelperContent { public static $extension = 'com_newsfeeds'; /** * Configure the Linkbar. * - * @param string The name of the active view. - * @deprecated 3.2 + * @param string $vName The name of the active view. + * + * @return void */ public static function addSubmenu($vName) { @@ -38,6 +39,7 @@ class NewsfeedsHelper 'index.php?option=com_categories&extension=com_newsfeeds', $vName == 'categories' ); + if ($vName == 'categories') { JToolbarHelper::title( @@ -46,36 +48,4 @@ class NewsfeedsHelper } } - /** - * Gets a list of the actions that can be performed. - * - * @param integer The category ID. - * - * @return JObject - */ - public static function getActions($categoryId = 0, $newsfeedId = 0) - { - $user = JFactory::getUser(); - $result = new JObject; - - if (empty($categoryId)) - { - $assetName = 'com_newsfeeds'; - $level = 'component'; - } - else - { - $assetName = 'com_newsfeeds.category.'.(int) $categoryId; - $level = 'category'; - } - - $actions = JAccess::getActions('com_newsfeeds', $level); - - foreach ($actions as $action) - { - $result->set($action->name, $user->authorise($action->name, $assetName)); - } - - return $result; - } } diff --git a/administrator/components/com_newsfeeds/models/newsfeed.php b/administrator/components/com_newsfeeds/models/newsfeed.php index ee7f56c95e2..aaf4c1e70d3 100644 --- a/administrator/components/com_newsfeeds/models/newsfeed.php +++ b/administrator/components/com_newsfeeds/models/newsfeed.php @@ -316,7 +316,9 @@ class NewsfeedsModelNewsfeed extends JModelAdmin if (parent::save($data)) { - if (isset($app->item_associations)) + + $assoc = isset($app->item_associations) ? $app->item_associations : 0; + if ($assoc) { $id = (int) $this->getState($this->getName() . '.id'); $item = $this->getItem($id); @@ -410,7 +412,10 @@ class NewsfeedsModelNewsfeed extends JModelAdmin } // Load associated newsfeeds items - if (isset(JFactory::getApplication()->item_associations)) + $app = JFactory::getApplication(); + $assoc = isset($app->item_associations) ? $app->item_associations : 0; + + if ($assoc) { $item->associations = array(); @@ -512,7 +517,9 @@ class NewsfeedsModelNewsfeed extends JModelAdmin protected function preprocessForm(JForm $form, $data, $group = 'content') { // Association newsfeeds items - if (isset(JFactory::getApplication()->item_associations)) + $app = JFactory::getApplication(); + $assoc = isset($app->item_associations) ? $app->item_associations : 0; + if ($assoc) { $languages = JLanguageHelper::getLanguages('lang_code'); diff --git a/administrator/components/com_newsfeeds/models/newsfeeds.php b/administrator/components/com_newsfeeds/models/newsfeeds.php index 76cf13eb9db..d801f04ed98 100644 --- a/administrator/components/com_newsfeeds/models/newsfeeds.php +++ b/administrator/components/com_newsfeeds/models/newsfeeds.php @@ -48,7 +48,9 @@ class NewsfeedsModelNewsfeeds extends JModelList 'numarticles', ); - if (isset(JFactory::getApplication()->item_associations)) + $app = JFactory::getApplication(); + $assoc = isset($app->item_associations) ? $app->item_associations : 0; + if ($assoc) { $config['filter_fields'][] = 'association'; } @@ -142,6 +144,7 @@ class NewsfeedsModelNewsfeeds extends JModelList $db = $this->getDbo(); $query = $db->getQuery(true); $user = JFactory::getUser(); + $app = JFactory::getApplication(); // Select the required fields from the table. $query->select( @@ -171,7 +174,8 @@ class NewsfeedsModelNewsfeeds extends JModelList ->join('LEFT', '#__categories AS c ON c.id = a.catid'); // Join over the associations. - if (isset(JFactory::getApplication()->item_associations)) + $assoc = isset($app->item_associations) ? $app->item_associations : 0; + if ($assoc) { $query->select('COUNT(asso2.id)>1 as association') ->join('LEFT', '#__associations AS asso ON asso.id = a.id AND asso.context=' . $db->quote('com_newsfeeds.item')) diff --git a/administrator/modules/mod_quickicon/helper.php b/administrator/modules/mod_quickicon/helper.php index d237979e88e..4e93ea8dcfb 100644 --- a/administrator/modules/mod_quickicon/helper.php +++ b/administrator/modules/mod_quickicon/helper.php @@ -56,121 +56,85 @@ abstract class ModQuickIconHelper 'image' => 'file-add', 'icon' => 'header/icon-48-article-add.png', 'text' => JText::_('MOD_QUICKICON_ADD_NEW_ARTICLE'), - 'access' => array('core.manage', 'com_content', 'core.create', 'com_content', ), - 'group' => 'MOD_QUICKICON_CONTENT' + 'access' => array('core.manage', 'com_content', 'core.create', 'com_content', ) ), array( 'link' => JRoute::_('index.php?option=com_content'), 'image' => 'pencil-2', 'icon' => 'header/icon-48-article.png', 'text' => JText::_('MOD_QUICKICON_ARTICLE_MANAGER'), - 'access' => array('core.manage', 'com_content'), - 'group' => 'MOD_QUICKICON_CONTENT' + 'access' => array('core.manage', 'com_content') ), array( 'link' => JRoute::_('index.php?option=com_categories&extension=com_content'), 'image' => 'folder', 'icon' => 'header/icon-48-category.png', 'text' => JText::_('MOD_QUICKICON_CATEGORY_MANAGER'), - 'access' => array('core.manage', 'com_content'), - 'group' => 'MOD_QUICKICON_CONTENT' + 'access' => array('core.manage', 'com_content') ), array( 'link' => JRoute::_('index.php?option=com_media'), 'image' => 'pictures', 'icon' => 'header/icon-48-media.png', 'text' => JText::_('MOD_QUICKICON_MEDIA_MANAGER'), - 'access' => array('core.manage', 'com_media'), - 'group' => 'MOD_QUICKICON_CONTENT' + 'access' => array('core.manage', 'com_media') ), array( 'link' => JRoute::_('index.php?option=com_menus'), 'image' => 'list-view', 'icon' => 'header/icon-48-menumgr.png', 'text' => JText::_('MOD_QUICKICON_MENU_MANAGER'), - 'access' => array('core.manage', 'com_menus'), - 'group' => 'MOD_QUICKICON_STRUCTURE' + 'access' => array('core.manage', 'com_menus') ), array( 'link' => JRoute::_('index.php?option=com_users'), 'image' => 'address', 'icon' => 'header/icon-48-user.png', 'text' => JText::_('MOD_QUICKICON_USER_MANAGER'), - 'access' => array('core.manage', 'com_users'), - 'group' => 'MOD_QUICKICON_USERS' + 'access' => array('core.manage', 'com_users') ), array( 'link' => JRoute::_('index.php?option=com_modules'), 'image' => 'cube', 'icon' => 'header/icon-48-module.png', 'text' => JText::_('MOD_QUICKICON_MODULE_MANAGER'), - 'access' => array('core.manage', 'com_modules'), - 'group' => 'MOD_QUICKICON_STRUCTURE' - ), - array( - 'link' => JRoute::_('index.php?option=com_config'), - 'image' => 'cog', - 'icon' => 'header/icon-48-config.png', - 'text' => JText::_('MOD_QUICKICON_GLOBAL_CONFIGURATION'), - 'access' => array('core.manage', 'com_config', 'core.admin', 'com_config'), - 'group' => 'MOD_QUICKICON_CONFIGURATION_AND_EXTENSIONS' + 'access' => array('core.manage', 'com_modules') ), array( 'link' => JRoute::_('index.php?option=com_installer'), 'image' => 'puzzle', 'icon' => 'header/icon-48-extension.png', 'text' => JText::_('MOD_QUICKICON_EXTENSION_MANAGER'), - 'access' => array('core.manage', 'com_installer'), - 'group' => 'MOD_QUICKICON_CONFIGURATION_AND_EXTENSIONS' - ), - array( - 'link' => JRoute::_('index.php?option=com_templates'), - 'image' => 'eye', - 'icon' => 'header/icon-48-themes.png', - 'text' => JText::_('MOD_QUICKICON_TEMPLATE_MANAGER'), - 'access' => array('core.manage', 'com_templates'), - 'group' => 'MOD_QUICKICON_CONFIGURATION_AND_EXTENSIONS' + 'access' => array('core.manage', 'com_installer') ), array( 'link' => JRoute::_('index.php?option=com_languages'), 'image' => 'comments-2', 'icon' => 'header/icon-48-language.png', 'text' => JText::_('MOD_QUICKICON_LANGUAGE_MANAGER'), - 'access' => array('core.manage', 'com_languages'), - 'group' => 'MOD_QUICKICON_CONFIGURATION_AND_EXTENSIONS' + 'access' => array('core.manage', 'com_languages') + ), + array( + 'link' => JRoute::_('index.php?option=com_config'), + 'image' => 'cog', + 'icon' => 'header/icon-48-config.png', + 'text' => JText::_('MOD_QUICKICON_GLOBAL_CONFIGURATION'), + 'access' => array('core.manage', 'com_config', 'core.admin', 'com_config') + ), + array( + 'link' => JRoute::_('index.php?option=com_templates'), + 'image' => 'eye', + 'icon' => 'header/icon-48-themes.png', + 'text' => JText::_('MOD_QUICKICON_TEMPLATE_MANAGER'), + 'access' => array('core.manage', 'com_templates') ), array( 'link' => JRoute::_('index.php?option=com_admin&task=profile.edit&id=' . JFactory::getUser()->id), 'image' => 'vcard', - 'icon' => 'header/icon-48-user-edit.png', + 'icon' => 'header/icon-48-user-profile.png', 'text' => JText::_('MOD_QUICKICON_PROFILE'), - 'access' => true, - 'group' => 'MOD_QUICKICON_USERS' + 'access' => true ), - array( - 'link' => JRoute::_('index.php?option=com_admin&view=sysinfo'), - 'image' => 'health', - 'icon' => 'header/icon-48-info.png', - 'text' => JText::_('MOD_QUICKICON_SYSTEM_INFORMATION'), - 'access' => true, - 'group' => 'MOD_QUICKICON_MAINTENANCE' - ), - array( - 'link' => JRoute::_('index.php?option=com_checkin'), - 'image' => 'checkmark', - 'icon' => 'header/icon-48-checkin.png', - 'text' => JText::_('MOD_QUICKICON_GLOBAL_CHECKIN'), - 'access' => array('core.admin', 'com_checkin'), - 'group' => 'MOD_QUICKICON_MAINTENANCE' - ), - array( - 'link' => JRoute::_('index.php?option=com_cache'), - 'image' => 'refresh', - 'icon' => 'header/icon-48-clear.png', - 'text' => JText::_('MOD_QUICKICON_CLEAR_CACHE'), - 'access' => array('core.manage', 'com_cache'), - 'group' => 'MOD_QUICKICON_MAINTENANCE' - ) ); } else @@ -191,8 +155,7 @@ abstract class ModQuickIconHelper 'link' => null, 'image' => 'cog', 'text' => null, - 'access' => true, - 'group' => 'MOD_QUICKICON_EXTENSIONS' + 'access' => true ); $icon = array_merge($default, $icon); @@ -207,23 +170,6 @@ abstract class ModQuickIconHelper return self::$buttons[$key]; } - /** - * Classifies the $buttons by group - * - * @param array $buttons Then buttons - * @return array The buttons sorted by groups - */ - public static function groupButtons($buttons) - { - $groupedButtons = array(); - - foreach ($buttons as $button) - { - $groupedButtons[$button['group']][] = $button; - } - return $groupedButtons; - } - /** * Get the alternate title for the module * diff --git a/components/com_weblinks/models/category.php b/components/com_weblinks/models/category.php index 9dc466a2764..531ff934583 100644 --- a/components/com_weblinks/models/category.php +++ b/components/com_weblinks/models/category.php @@ -336,4 +336,30 @@ class WeblinksModelCategory extends JModelList } return $this->_children; } + + /** + * Increment the hit counter for the category. + * + * @param int $pk Optional primary key of the category to increment. + * + * @return boolean True if successful; false otherwise and internal error set. + * + * @since 3.2 + */ + public function hit($pk = 0) + { + $input = JFactory::getApplication()->input; + $hitcount = $input->getInt('hitcount', 1); + + if ($hitcount) + { + $pk = (!empty($pk)) ? $pk : (int) $this->getState('category.id'); + + $table = JTable::getInstance('Category', 'JTable'); + $table->load($pk); + $table->hit($pk); + } + + return true; + } } diff --git a/modules/mod_articles_archive/mod_articles_archive.xml b/modules/mod_articles_archive/mod_articles_archive.xml index d66f28e7e53..9392abcf17f 100644 --- a/modules/mod_articles_archive/mod_articles_archive.xml +++ b/modules/mod_articles_archive/mod_articles_archive.xml @@ -1,6 +1,7 @@ + method="upgrade" +> mod_articles_archive Joomla! Project July 2006 @@ -25,20 +26,15 @@ - -
- -
- @@ -50,7 +46,8 @@ + description="COM_MODULES_FIELD_CACHING_DESC" + > @@ -59,15 +56,14 @@ default="900" label="COM_MODULES_FIELD_CACHE_TIME_LABEL" description="COM_MODULES_FIELD_CACHE_TIME_DESC" /> - - - + -
- diff --git a/modules/mod_articles_categories/helper.php b/modules/mod_articles_categories/helper.php index f89331e9178..a0520b4b93c 100644 --- a/modules/mod_articles_categories/helper.php +++ b/modules/mod_articles_categories/helper.php @@ -21,7 +21,10 @@ abstract class ModArticlesCategoriesHelper { public static function getList(&$params) { - $categories = JCategories::getInstance('Content'); + $options = array(); + $options['countItems'] = $params->get('numitems', 0); + + $categories = JCategories::getInstance('Content', $options); $category = $categories->get($params->get('parent', 'root')); if ($category != null) diff --git a/modules/mod_articles_categories/mod_articles_categories.xml b/modules/mod_articles_categories/mod_articles_categories.xml index 395f4d8b42f..4211604044b 100644 --- a/modules/mod_articles_categories/mod_articles_categories.xml +++ b/modules/mod_articles_categories/mod_articles_categories.xml @@ -23,42 +23,56 @@ - -
- - - - - - + + - - + + + + - - + + - + default="0" + > @@ -75,7 +89,8 @@ + default="0" + > @@ -90,15 +105,13 @@
-
- - + description="MOD_ARTICLES_CATEGORIES_TITLE_HEADING_DESC" + > @@ -113,14 +126,13 @@ - + -
- diff --git a/modules/mod_articles_categories/tmpl/default_items.php b/modules/mod_articles_categories/tmpl/default_items.php index e05ca0e5d2c..f3d6b7b24b4 100644 --- a/modules/mod_articles_categories/tmpl/default_items.php +++ b/modules/mod_articles_categories/tmpl/default_items.php @@ -14,7 +14,9 @@ foreach ($list as $item) :
  • id))) echo ' class="active"';?>> level - $startLevel - 1; ?> get('item_heading') + $levelup; ?>> - title;?> + title;?>get('numitems')): ?> + (numitems; ?>) + get('item_heading') + $levelup; ?>> - -
    - - - + description="MOD_ARTICLES_CATEGORY_FIELD_MODE_DESC" + > + + -
    - + label="MOD_ARTICLES_CATEGORY_FIELD_GROUP_DYNAMIC_LABEL" + > + description="MOD_ARTICLES_CATEGORY_FIELD_SHOWONARTICLEPAGE_DESC" + > -
    - + label="MOD_ARTICLES_CATEGORY_FIELD_GROUP_FILTERING_LABEL" + > - - - + description="MOD_ARTICLES_CATEGORY_FIELD_SHOWFEATURED_DESC" + > + + + - - + description="MOD_ARTICLES_CATEGORY_FIELD_CATFILTERINGTYPE_DESC" + > + + + description="MOD_ARTICLES_CATEGORY_FIELD_CATEGORY_DESC" + > - - + description="MOD_ARTICLES_CATEGORY_FIELD_SHOWCHILDCATEGORYARTICLES_DESC" + > + + - - + description="MOD_ARTICLES_CATEGORY_FIELD_AUTHORFILTERING_DESC" + > + + + key_field="id" value_field="name" + > @@ -118,9 +132,12 @@ - - + description="MOD_ARTICLES_CATEGORY_FIELD_AUTHORALIASFILTERING_DESC" + > + + - + key_field="created_by_alias" value_field="created_by_alias" + > + @@ -145,18 +164,26 @@ - - - + description="MOD_ARTICLES_CATEGORY_FIELD_DATEFILTERING_DESC" + > + + + - - - + description="MOD_ARTICLES_CATEGORY_FIELD_DATERANGEFIELD_DESC" + > + + + -
    - + label="MOD_ARTICLES_CATEGORY_FIELD_GROUP_ORDERING_LABEL" + > - - - - - - - - - - + description="MOD_ARTICLES_CATEGORY_FIELD_ARTICLEORDERING_DESC" + > + + + + + + + + + + - - + description="MOD_ARTICLES_CATEGORY_FIELD_ARTICLEORDERINGDIR_DESC" + > + + -
    - + label="MOD_ARTICLES_CATEGORY_FIELD_GROUP_GROUPING_LABEL" + > - - - - - + description="MOD_ARTICLES_CATEGORY_FIELD_ARTICLEGROUPING_DESC" + > + + + + + - - + description="MOD_ARTICLES_CATEGORY_FIELD_ARTICLEGROUPINGDIR_DESC" + > + + -
    + label="MOD_ARTICLES_CATEGORY_FIELD_GROUP_DISPLAY_LABEL" + > - - + description="MOD_ARTICLES_CATEGORY_FIELD_LINKTITLES_DESC" + > + + - - + description="MOD_ARTICLES_CATEGORY_FIELD_SHOWDATE_DESC" + > + + - - - + description="MOD_ARTICLES_CATEGORY_FIELD_DATEFIELD_DESC" + > + + + - - + description="MOD_ARTICLES_CATEGORY_FIELD_SHOWCATEGORY_DESC" + > + + - - + description="MOD_ARTICLES_CATEGORY_FIELD_SHOWHITS_DESC" + > + + - - + description="MOD_ARTICLES_CATEGORY_FIELD_SHOWAUTHOR_DESC" + > + + - - + description="MOD_ARTICLES_CATEGORY_FIELD_SHOWINTROTEXT_DESC" + > + + - - - + class="btn-group btn-group-yesno" + > + + - + class="btn-group btn-group-yesno" + > - + description="JGLOBAL_SHOW_READMORE_LIMIT_DESC" + />
    - @@ -345,14 +422,13 @@ - + -
    -     diff --git a/modules/mod_articles_latest/helper.php b/modules/mod_articles_latest/helper.php index 1c8deae7335..f2ede5137a6 100644 --- a/modules/mod_articles_latest/helper.php +++ b/modules/mod_articles_latest/helper.php @@ -90,6 +90,7 @@ abstract class ModArticlesLatestHelper 'mc_dsc' => 'CASE WHEN (a.modified = ' . $db->quote($db->getNullDate()) . ') THEN a.created ELSE a.modified END', 'c_dsc' => 'a.created', 'p_dsc' => 'a.publish_up', + 'random' => 'RAND()', ); $ordering = JArrayHelper::getValue($order_map, $params->get('ordering'), 'a.publish_up'); $dir = 'DESC'; diff --git a/modules/mod_articles_latest/mod_articles_latest.xml b/modules/mod_articles_latest/mod_articles_latest.xml index 4930fca4ec1..c1d00c50537 100644 --- a/modules/mod_articles_latest/mod_articles_latest.xml +++ b/modules/mod_articles_latest/mod_articles_latest.xml @@ -26,12 +26,10 @@ - -
    - - - - - - - - + + + - - - - - + + + + + - - - - + + +
    @@ -84,39 +97,44 @@
    - - - - - + + - - - - + -
    -     diff --git a/modules/mod_articles_news/mod_articles_news.xml b/modules/mod_articles_news/mod_articles_news.xml index e4a27a57aa7..341c21122b3 100644 --- a/modules/mod_articles_news/mod_articles_news.xml +++ b/modules/mod_articles_news/mod_articles_news.xml @@ -26,12 +26,10 @@ - -
    - - JOPTION_ALL_CATEGORIES - - - + + - - - + + - - - - + + + - - - - - - + + + + + - - - + + - - - + + - - - - - - + + + +
    @@ -125,39 +152,46 @@
    - - - - - + + - - - +
    -     diff --git a/modules/mod_articles_popular/mod_articles_popular.xml b/modules/mod_articles_popular/mod_articles_popular.xml index 027e2b91f5c..52753cf24c6 100644 --- a/modules/mod_articles_popular/mod_articles_popular.xml +++ b/modules/mod_articles_popular/mod_articles_popular.xml @@ -26,12 +26,11 @@ - -
    - JOPTION_ALL_CATEGORIES - - - - + +
    @@ -63,39 +66,46 @@
    - - - - - + + - - - +
    -     diff --git a/modules/mod_banners/mod_banners.xml b/modules/mod_banners/mod_banners.xml index dcc8bb21c06..27d0af15b43 100644 --- a/modules/mod_banners/mod_banners.xml +++ b/modules/mod_banners/mod_banners.xml @@ -26,23 +26,25 @@ - -
    - - - - - + + + - - - - JOPTION_ALL_CATEGORIES - - - + + - - - - + + - - -
    - - - - - - + + - -
    -     diff --git a/modules/mod_breadcrumbs/mod_breadcrumbs.xml b/modules/mod_breadcrumbs/mod_breadcrumbs.xml index 16f331face8..39de724f70a 100644 --- a/modules/mod_breadcrumbs/mod_breadcrumbs.xml +++ b/modules/mod_breadcrumbs/mod_breadcrumbs.xml @@ -26,87 +26,91 @@ - -
    - - - - + + - - - - + + - - - - - - + + - - -
    - - - - - - - - + + - - - - - + -
    -     diff --git a/modules/mod_custom/mod_custom.xml b/modules/mod_custom/mod_custom.xml index 48c5bcdc724..fc5802e59aa 100644 --- a/modules/mod_custom/mod_custom.xml +++ b/modules/mod_custom/mod_custom.xml @@ -24,57 +24,63 @@ - -
    - - + - - + + - - - +
    + - - - - + + - - - - + -
    - diff --git a/modules/mod_feed/mod_feed.xml b/modules/mod_feed/mod_feed.xml index 9e825eb8c89..c8186328aa6 100644 --- a/modules/mod_feed/mod_feed.xml +++ b/modules/mod_feed/mod_feed.xml @@ -24,114 +24,123 @@ en-GB.mod_feed.sys.ini - - -
    - - - - - - + + - - - - + + - - - - + + - - - - + + - - - - - - + + - - -
    - -
    - - + - - - - + + - -
    -     diff --git a/modules/mod_finder/mod_finder.xml b/modules/mod_finder/mod_finder.xml index 88da9df59ff..b7bf5bc419d 100644 --- a/modules/mod_finder/mod_finder.xml +++ b/modules/mod_finder/mod_finder.xml @@ -22,127 +22,140 @@ - -
    - - - - - - + + - - - - - + + + -
    -
    - - - - - - - - - - - - + + - - - - - - + + + + - - - - + + - - - - - - + + + + - - - - + + - - - - -
    -     diff --git a/modules/mod_footer/mod_footer.xml b/modules/mod_footer/mod_footer.xml index 044e59bc7fb..730f431c87b 100644 --- a/modules/mod_footer/mod_footer.xml +++ b/modules/mod_footer/mod_footer.xml @@ -24,44 +24,43 @@ - -
    - - - - - - - - + + - - - - - + -
    -     diff --git a/modules/mod_languages/mod_languages.xml b/modules/mod_languages/mod_languages.xml index 31675ea0a98..c9f59dd5cff 100644 --- a/modules/mod_languages/mod_languages.xml +++ b/modules/mod_languages/mod_languages.xml @@ -27,21 +27,17 @@
    - -
    - -
    - - - - JNO - - - + JNO - - JNO - - JNO - - - + JNO -
    -
    - - - - - - + + - - - + -
    -     diff --git a/modules/mod_login/mod_login.xml b/modules/mod_login/mod_login.xml index 2a9297da1eb..156b0caac10 100644 --- a/modules/mod_login/mod_login.xml +++ b/modules/mod_login/mod_login.xml @@ -25,106 +25,114 @@ - -
    - - - - - - - + - - - + - - - - + + - - - - + + - - - - + + - - - - + +
    - - - - - - + -
    -     diff --git a/modules/mod_menu/helper.php b/modules/mod_menu/helper.php index d18d11e4182..5230df93562 100644 --- a/modules/mod_menu/helper.php +++ b/modules/mod_menu/helper.php @@ -101,7 +101,7 @@ class ModMenuHelper break; default: - $router = JSite::getRouter(); + $router = $app::getRouter(); if ($router->getMode() == JROUTER_MODE_SEF) { $item->flink = 'index.php?Itemid=' . $item->id; diff --git a/modules/mod_menu/mod_menu.xml b/modules/mod_menu/mod_menu.xml index 59668e99a14..d3e0f3c29a6 100644 --- a/modules/mod_menu/mod_menu.xml +++ b/modules/mod_menu/mod_menu.xml @@ -25,28 +25,28 @@ - -
    - - - - + description="MOD_MENU_FIELD_ACTIVE_DESC" + > - - + description="MOD_MENU_FIELD_STARTLEVEL_DESC" + > @@ -59,11 +59,13 @@ - + description="MOD_MENU_FIELD_ENDLEVEL_DESC" + > @@ -77,69 +79,77 @@ - - - + + -
    - - - - - - - - - + + - - - - - + -
    -     diff --git a/modules/mod_random_image/mod_random_image.xml b/modules/mod_random_image/mod_random_image.xml index 49ce7587a82..968b61f8c3e 100644 --- a/modules/mod_random_image/mod_random_image.xml +++ b/modules/mod_random_image/mod_random_image.xml @@ -25,61 +25,57 @@ - -
    - - - - - - - - - - -
    - - - - - - - + -
    -     diff --git a/modules/mod_related_items/mod_related_items.xml b/modules/mod_related_items/mod_related_items.xml index f5b833b9cac..d5545112316 100644 --- a/modules/mod_related_items/mod_related_items.xml +++ b/modules/mod_related_items/mod_related_items.xml @@ -25,52 +25,50 @@ - -
    - - - - + + - -
    - - - - - - - - + + -
    -     diff --git a/modules/mod_search/mod_search.xml b/modules/mod_search/mod_search.xml index 446148ac344..56ae893127f 100644 --- a/modules/mod_search/mod_search.xml +++ b/modules/mod_search/mod_search.xml @@ -25,118 +25,126 @@ - -
    - - - - - - - - - - + + - - - - - - + + + + - - - - + + - - - - - - + + - - - - -
    - - - - - - - - + + - - - - - + -
    -     diff --git a/modules/mod_stats/mod_stats.xml b/modules/mod_stats/mod_stats.xml index 843346ba100..7e0801e64b2 100644 --- a/modules/mod_stats/mod_stats.xml +++ b/modules/mod_stats/mod_stats.xml @@ -25,84 +25,88 @@ - -
    - - - - + + - - - - + + - - - - + + - - -
    - - - - - - - - + + - - - - - + -
    -     diff --git a/modules/mod_syndicate/mod_syndicate.xml b/modules/mod_syndicate/mod_syndicate.xml index 0ace3e0b55c..19617d3e7f2 100644 --- a/modules/mod_syndicate/mod_syndicate.xml +++ b/modules/mod_syndicate/mod_syndicate.xml @@ -25,60 +25,60 @@ - -
    - - - - + + - - - - - - + + -
    - - - - - - - + -
    -     diff --git a/modules/mod_tags_popular/mod_tags_popular.xml b/modules/mod_tags_popular/mod_tags_popular.xml index 4e51547e04b..835c3b6d8f0 100644 --- a/modules/mod_tags_popular/mod_tags_popular.xml +++ b/modules/mod_tags_popular/mod_tags_popular.xml @@ -26,12 +26,10 @@ - -
    - - - - - - - - - - + + + + + + -
    - - - - - - - - + + -
    -     diff --git a/modules/mod_tags_similar/mod_tags_similar.xml b/modules/mod_tags_similar/mod_tags_similar.xml index c05bc073b30..772494db778 100644 --- a/modules/mod_tags_similar/mod_tags_similar.xml +++ b/modules/mod_tags_similar/mod_tags_similar.xml @@ -26,12 +26,10 @@ - -
    - - - - - - - + + + -
    - - - - - - - - + + -
    -     diff --git a/modules/mod_users_latest/mod_users_latest.xml b/modules/mod_users_latest/mod_users_latest.xml index a03f01f9be0..9bba2621ab4 100644 --- a/modules/mod_users_latest/mod_users_latest.xml +++ b/modules/mod_users_latest/mod_users_latest.xml @@ -25,65 +25,67 @@ - -
    - - - - - - + + -
    - - - - - - + + - - - - - + -
    -     diff --git a/modules/mod_weblinks/mod_weblinks.xml b/modules/mod_weblinks/mod_weblinks.xml index 978eec8ed6d..9319eb985e4 100644 --- a/modules/mod_weblinks/mod_weblinks.xml +++ b/modules/mod_weblinks/mod_weblinks.xml @@ -26,130 +26,146 @@ - -
    - - - - - - - - - + + + - - - - + + - - - - - + + + - - - - + + - - - - + + - - - - + + - - - - + + + -
    - - - - - - - - + + - - - - - + -
    -     diff --git a/modules/mod_whosonline/mod_whosonline.xml b/modules/mod_whosonline/mod_whosonline.xml index 85fd1915847..cf2c5a62886 100644 --- a/modules/mod_whosonline/mod_whosonline.xml +++ b/modules/mod_whosonline/mod_whosonline.xml @@ -26,55 +26,56 @@ - -
    - - - - - + + + -
    - - - - - - - + - - - - + + -
    -     diff --git a/modules/mod_wrapper/mod_wrapper.xml b/modules/mod_wrapper/mod_wrapper.xml index fab3b76a335..0e28d46bcec 100644 --- a/modules/mod_wrapper/mod_wrapper.xml +++ b/modules/mod_wrapper/mod_wrapper.xml @@ -25,115 +25,122 @@ - -
    - - - - - - + + - - - - - + + + - - - - - - - - + + - - - - + + - - -
    - - - - - - - - + + - - - - - + -
    -     diff --git a/plugins/authentication/gmail/gmail.xml b/plugins/authentication/gmail/gmail.xml index fd164288960..d3b62ea0206 100644 --- a/plugins/authentication/gmail/gmail.xml +++ b/plugins/authentication/gmail/gmail.xml @@ -18,15 +18,14 @@ en-GB.plg_authentication_gmail.sys.ini -
    - + label="PLG_GMAIL_FIELD_APPLYSUFFIX_LABEL" + > @@ -35,13 +34,15 @@ + size="20" + /> + label="PLG_GMAIL_FIELD_VERIFYPEER_LABEL" + > @@ -49,8 +50,8 @@ - + size="20" + />
    diff --git a/plugins/authentication/ldap/ldap.xml b/plugins/authentication/ldap/ldap.xml index aa628781ca9..f0660291481 100644 --- a/plugins/authentication/ldap/ldap.xml +++ b/plugins/authentication/ldap/ldap.xml @@ -18,53 +18,57 @@ en-GB.plg_authentication_ldap.sys.ini -
    - + size="20" + /> + size="20" + /> - - + label="PLG_LDAP_FIELD_V3_LABEL" + > + + - - + label="PLG_LDAP_FIELD_NEGOCIATE_LABEL" + > + + - - + label="PLG_LDAP_FIELD_REFERRALS_LABEL" + > + + + label="PLG_LDAP_FIELD_AUTHMETHOD_LABEL" + > @@ -72,48 +76,55 @@ + size="20" + /> + size="20" + /> + size="20" + /> + size="20" + /> + size="20" + /> + size="20" + /> + size="20" + /> - + size="20" + />
    diff --git a/plugins/content/finder/finder.xml b/plugins/content/finder/finder.xml index 78abcd32d3a..a4106069914 100644 --- a/plugins/content/finder/finder.xml +++ b/plugins/content/finder/finder.xml @@ -19,9 +19,7 @@ en-GB.plg_content_finder.sys.ini - - diff --git a/plugins/content/joomla/joomla.xml b/plugins/content/joomla/joomla.xml index 94a4e45c4c6..f5125389f16 100644 --- a/plugins/content/joomla/joomla.xml +++ b/plugins/content/joomla/joomla.xml @@ -19,11 +19,8 @@ en-GB.plg_content_joomla.sys.ini - -
    - JNO -
    -     diff --git a/plugins/content/loadmodule/loadmodule.xml b/plugins/content/loadmodule/loadmodule.xml index c2b7fa55d56..87b79a2b70d 100644 --- a/plugins/content/loadmodule/loadmodule.xml +++ b/plugins/content/loadmodule/loadmodule.xml @@ -18,11 +18,9 @@ en-GB.plg_content_loadmodule.sys.ini -
    - PLG_LOADMODULE_FIELD_VALUE_MULTIPLEDIVS -
    diff --git a/plugins/content/pagebreak/pagebreak.xml b/plugins/content/pagebreak/pagebreak.xml index fdbebdcf9d7..60f37d29d3e 100644 --- a/plugins/content/pagebreak/pagebreak.xml +++ b/plugins/content/pagebreak/pagebreak.xml @@ -18,29 +18,27 @@ en-GB.plg_content_pagebreak.sys.ini -
    - + label="PLG_CONTENT_PAGEBREAK_SITE_TITLE_LABEL" + > - + label="PLG_CONTENT_PAGEBREAK_SITE_ARTICLEINDEX_LABEL" + > - @@ -49,7 +47,8 @@ class="btn-group btn-group-yesno" default="1" description="PLG_CONTENT_PAGEBREAK_TOC_DESC" - label="PLG_CONTENT_PAGEBREAK_TOC_LABEL"> + label="PLG_CONTENT_PAGEBREAK_TOC_LABEL" + > @@ -58,20 +57,20 @@ class="btn-group btn-group-yesno" default="1" description="PLG_CONTENT_PAGEBREAK_SHOW_ALL_DESC" - label="PLG_CONTENT_PAGEBREAK_SHOW_ALL_LABEL"> + label="PLG_CONTENT_PAGEBREAK_SHOW_ALL_LABEL" + > - + label="PLG_CONTENT_PAGEBREAK_STYLE_LABEL" + > -
    diff --git a/plugins/content/pagenavigation/pagenavigation.xml b/plugins/content/pagenavigation/pagenavigation.xml index fbce7613e3b..911c966ebbc 100644 --- a/plugins/content/pagenavigation/pagenavigation.xml +++ b/plugins/content/pagenavigation/pagenavigation.xml @@ -18,15 +18,14 @@ en-GB.plg_content_pagenavigation.sys.ini -
    - + label="PLG_PAGENAVIGATION_FIELD_POSITION_LABEL" + > @@ -34,13 +33,12 @@ + label="PLG_PAGENAVIGATION_FIELD_RELATIVE_LABEL" + > -
    -     diff --git a/plugins/editors/codemirror/codemirror.xml b/plugins/editors/codemirror/codemirror.xml index bd1a33f4f14..79ce40e67ee 100644 --- a/plugins/editors/codemirror/codemirror.xml +++ b/plugins/editors/codemirror/codemirror.xml @@ -17,16 +17,15 @@ en-GB.plg_editors_codemirror.sys.ini -
    - + label="PLG_CODEMIRROR_FIELD_LINENUMBERS_LABEL" + > @@ -34,11 +33,11 @@ + label="PLG_CODEMIRROR_FIELD_TABMODE_LABEL" + > -
    diff --git a/plugins/quickicon/extensionupdate/extensionupdate.xml b/plugins/quickicon/extensionupdate/extensionupdate.xml index 048d30fd10a..53e99e908d3 100644 --- a/plugins/quickicon/extensionupdate/extensionupdate.xml +++ b/plugins/quickicon/extensionupdate/extensionupdate.xml @@ -18,19 +18,15 @@ en-GB.plg_quickicon_extensionupdate.sys.ini - -
    - - + label="PLG_QUICKICON_EXTENSIONUPDATE_GROUP_LABEL" + />
    -     diff --git a/plugins/quickicon/joomlaupdate/joomlaupdate.xml b/plugins/quickicon/joomlaupdate/joomlaupdate.xml index 6802e7fd97b..b92d92482f9 100644 --- a/plugins/quickicon/joomlaupdate/joomlaupdate.xml +++ b/plugins/quickicon/joomlaupdate/joomlaupdate.xml @@ -18,19 +18,15 @@ en-GB.plg_quickicon_joomlaupdate.sys.ini - -
    - - + label="PLG_QUICKICON_JOOMLAUPDATE_GROUP_LABEL" + />
    -     diff --git a/plugins/search/categories/categories.xml b/plugins/search/categories/categories.xml index 08e6d9098bb..27907e4ff49 100644 --- a/plugins/search/categories/categories.xml +++ b/plugins/search/categories/categories.xml @@ -18,22 +18,22 @@ en-GB.plg_search_categories.sys.ini -
    - + size="5" + /> + label="JFIELD_PLG_SEARCH_ALL_LABEL" + > @@ -42,11 +42,11 @@ class="btn-group btn-group-yesno" default="0" description="JFIELD_PLG_SEARCH_ARCHIVED_DESC" - label="JFIELD_PLG_SEARCH_ARCHIVED_LABEL"> + label="JFIELD_PLG_SEARCH_ARCHIVED_LABEL" + > -
    diff --git a/plugins/search/newsfeeds/newsfeeds.xml b/plugins/search/newsfeeds/newsfeeds.xml index 1cc67dd272f..0b1d25868e3 100644 --- a/plugins/search/newsfeeds/newsfeeds.xml +++ b/plugins/search/newsfeeds/newsfeeds.xml @@ -18,7 +18,6 @@ en-GB.plg_search_newsfeeds.sys.ini -
    @@ -27,13 +26,15 @@ default="50" description="JFIELD_PLG_SEARCH_SEARCHLIMIT_DESC" label="JFIELD_PLG_SEARCH_SEARCHLIMIT_LABEL" - size="5" /> + size="5" + /> + label="JFIELD_PLG_SEARCH_ALL_LABEL" + > @@ -42,11 +43,11 @@ class="btn-group btn-group-yesno" default="0" description="JFIELD_PLG_SEARCH_ARCHIVED_DESC" - label="JFIELD_PLG_SEARCH_ARCHIVED_LABEL"> + label="JFIELD_PLG_SEARCH_ARCHIVED_LABEL" + > -
    diff --git a/plugins/system/cache/cache.xml b/plugins/system/cache/cache.xml index 6361f2bfc61..aca0d92bea2 100644 --- a/plugins/system/cache/cache.xml +++ b/plugins/system/cache/cache.xml @@ -18,7 +18,6 @@ en-GB.plg_system_cache.sys.ini -
    @@ -26,11 +25,13 @@ class="btn-group btn-group-yesno" default="0" description="PLG_CACHE_FIELD_BROWSERCACHE_DESC" - label="PLG_CACHE_FIELD_BROWSERCACHE_LABEL"> - - + label="PLG_CACHE_FIELD_BROWSERCACHE_LABEL" + > + + -
    diff --git a/plugins/system/languagefilter/languagefilter.xml b/plugins/system/languagefilter/languagefilter.xml index 72c1b2a985b..00eb30ecd19 100644 --- a/plugins/system/languagefilter/languagefilter.xml +++ b/plugins/system/languagefilter/languagefilter.xml @@ -18,66 +18,62 @@ en-GB.plg_system_languagefilter.sys.ini - -
    - + default="0" + > - + class="btn-group btn-group-yesno" + > - + default="1" + class="btn-group btn-group-yesno" + > - + class="btn-group btn-group-yesno" + > - + default="0" + class="btn-group" + > - + default="1" + class="btn-group btn-group-yesno" + > -
    -     diff --git a/plugins/system/log/log.xml b/plugins/system/log/log.xml index 7c9192e85ac..cba435280f9 100644 --- a/plugins/system/log/log.xml +++ b/plugins/system/log/log.xml @@ -18,22 +18,18 @@ en-GB.plg_system_log.sys.ini - -
    - + default="0" + > -
    -     diff --git a/plugins/system/p3p/p3p.xml b/plugins/system/p3p/p3p.xml index d7d01c24d4e..0539eb8c129 100644 --- a/plugins/system/p3p/p3p.xml +++ b/plugins/system/p3p/p3p.xml @@ -18,19 +18,15 @@ en-GB.plg_system_p3p.sys.ini - -
    - - + size="37" + />
    -     diff --git a/plugins/user/joomla/joomla.xml b/plugins/user/joomla/joomla.xml index 42702922cc9..2532dc12333 100644 --- a/plugins/user/joomla/joomla.xml +++ b/plugins/user/joomla/joomla.xml @@ -18,18 +18,17 @@ en-GB.plg_user_joomla.sys.ini -
    - - - + label="PLG_USER_JOOMLA_FIELD_AUTOREGISTER_LABEL" + > + + - - + +