joomla/cms
29
0
Fork 0
mirror of https://github.com/joomla/joomla-cms.git synced 2024-06-28 16:13:42 +00:00
Code Packages Releases Activity

Updated files to be more in sync with master (regarding syntax)

Browse Source
This commit is contained in:
Peter van Westen 2013-10-04 01:01:22 +02:00
parent 6aa63c7a90
commit 052847356c
36 changed files with 1315 additions and 960 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
administrator/components/com_cache/helpers/cache.php
View File

@ -35,11 +35,10 @@ class CacheHelper
/**
* 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)
{

7
administrator/components/com_categories/helpers/categories.php
View File

@ -22,12 +22,11 @@ class CategoriesHelper
/**
* Configure the Submenu links.
*
* @param string $extension The extension being used for the categories.
* @param string $extension The extension being used for the categories.
*
* @return void
* @return void
*
* @since 1.6
* @deprecated 3.2
* @since 1.6
*/
public static function addSubmenu($extension)
{

2
administrator/components/com_content/controllers/articles.php
View File

@ -85,7 +85,7 @@ class ContentControllerArticles extends JControllerAdmin
}
}
$this->setRedirect(JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_list, false));
$this->setRedirect('index.php?option=com_content&view=articles');
}
/**

11
administrator/components/com_content/models/articles.php
View File

@ -49,7 +49,9 @@ class ContentModelArticles extends JModelList
'publish_down', 'a.publish_down',
);
if(isset(JFactory::getApplication()->item_associations))
$app = JFactory::getApplication();
$assoc = isset($app->item_associations) ? $app->item_associations : 0;
if ($assoc)
{
$config['filter_fields'][] = 'association';
}
@ -153,6 +155,7 @@ class ContentModelArticles extends JModelList
$db = $this->getDbo();
$query = $db->getQuery(true);
$user = JFactory::getUser();
$app = JFactory::getApplication();
// Select the required fields from the table.
$query->select(
@ -186,7 +189,8 @@ class ContentModelArticles extends JModelList
->join('LEFT', '#__users AS ua ON ua.id = a.created_by');
// 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_content.item'))
@ -348,7 +352,8 @@ class ContentModelArticles extends JModelList
public function getItems()
{
$items = parent::getItems();
if (JFactory::getApplication()->isSite())
$app = JFactory::getApplication();
if ($app->isSite())
{
$user = JFactory::getUser();
$groups = $user->getAuthorisedViewLevels();

75
administrator/components/com_content/models/featured.php
View File

@ -50,11 +50,6 @@ class ContentModelFeatured extends ContentModelArticles
'publish_down', 'a.publish_down',
'fp.ordering',
);
if (JFactory::getApplication()->item_associations)
{
$config['filter_fields'][] = 'association';
}
}
parent::__construct($config);
@ -70,15 +65,13 @@ class ContentModelFeatured extends ContentModelArticles
// Create a new query object.
$db = $this->getDbo();
$query = $db->getQuery(true);
$user = JFactory::getUser();
// Select the required fields from the table.
$query->select(
$this->getState(
'list.select',
'a.id, a.title, a.alias, a.checked_out, a.checked_out_time, a.catid' .
', a.state, a.access, a.created, a.created_by, a.created_by_alias, a.ordering, a.featured, a.language, a.hits' .
', a.publish_up, a.publish_down'
'a.id, a.title, a.alias, a.checked_out, a.checked_out_time, a.catid, a.state, a.access, a.created, a.hits,' .
'a.language, a.created_by_alias, a.publish_up, a.publish_down'
)
);
$query->from('#__content AS a');
@ -107,28 +100,12 @@ class ContentModelFeatured extends ContentModelArticles
$query->select('ua.name AS author_name')
->join('LEFT', '#__users AS ua ON ua.id = a.created_by');
// Join over the associations.
if (isset(JFactory::getApplication()->item_associations))
{
$query->select('COUNT(asso2.id)>1 as association')
->join('LEFT', '#__associations AS asso ON asso.id = a.id AND asso.context=' . $db->quote('com_content.item'))
->join('LEFT', '#__associations AS asso2 ON asso2.key = asso.key')
->group('a.id');
}
// Filter by access level.
if ($access = $this->getState('filter.access'))
{
$query->where('a.access = ' . (int) $access);
}
// Implement View Level Access
if (!$user->authorise('core.admin'))
{
$groups = implode(',', $user->getAuthorisedViewLevels());
$query->where('a.access IN (' . $groups . ')');
}
// Filter by published state
$published = $this->getState('filter.published');
if (is_numeric($published))
@ -166,15 +143,7 @@ class ContentModelFeatured extends ContentModelArticles
$query->where('c.level <= ' . ((int) $level + (int) $baselevel - 1));
}
// Filter by author
$authorId = $this->getState('filter.author_id');
if (is_numeric($authorId))
{
$type = $this->getState('filter.author_id.include', true) ? '= ' : '<>';
$query->where('a.created_by ' . $type . (int) $authorId);
}
// Filter by search in title.
// Filter by search in title
$search = $this->getState('filter.search');
if (!empty($search))
{
@ -182,15 +151,10 @@ class ContentModelFeatured extends ContentModelArticles
{
$query->where('a.id = ' . (int) substr($search, 3));
}
elseif (stripos($search, 'author:') === 0)
{
$search = $db->quote('%' . $db->escape(substr($search, 7), true) . '%');
$query->where('(ua.name LIKE ' . $search . ' OR ua.username LIKE ' . $search . ')');
}
else
{
$search = $db->quote('%' . $db->escape($search, true) . '%');
$query->where('(a.title LIKE ' . $search . ' OR a.alias LIKE ' . $search . ')');
$query->where('a.title LIKE ' . $search . ' OR a.alias LIKE ' . $search);
}
}
@ -200,37 +164,10 @@ class ContentModelFeatured extends ContentModelArticles
$query->where('a.language = ' . $db->quote($language));
}
// Filter by a single tag.
$tagId = $this->getState('filter.tag');
if (is_numeric($tagId))
{
$query->where($db->quoteName('tagmap.tag_id') . ' = ' . (int) $tagId)
->join(
'LEFT', $db->quoteName('#__contentitem_tag_map', 'tagmap')
. ' ON ' . $db->quoteName('tagmap.content_item_id') . ' = ' . $db->quoteName('a.id')
. ' AND ' . $db->quoteName('tagmap.type_alias') . ' = ' . $db->quote('com_content.article')
);
}
// Add the list ordering clause.
$orderCol = $this->state->get('list.ordering', 'a.title');
$orderDirn = $this->state->get('list.direction', 'asc');
if ($orderCol == 'a.ordering' || $orderCol == 'category_title')
{
$orderCol = 'c.title ' . $orderDirn . ', a.ordering';
}
//sqlsrv change
if ($orderCol == 'language')
{
$orderCol = 'l.title';
}
if ($orderCol == 'access_level')
{
$orderCol = 'ag.title';
}
$query->order($db->escape($orderCol . ' ' . $orderDirn));
$query->order($db->escape($this->getState('list.ordering', 'a.title')) . ' ' . $db->escape($this->getState('list.direction', 'ASC')));
// echo nl2br(str_replace('#__','jos_',$query));
//echo nl2br(str_replace('#__','jos_',(string)$query));
return $query;
}
}

597
administrator/components/com_content/models/forms/article.xml
View File

@ -1,72 +1,50 @@
<?xml version="1.0" encoding="utf-8"?>
<form>
<fieldset addfieldpath="/administrator/components/com_categories/models/fields">
<field name="id"
type="text"
class="readonly"
label="JGLOBAL_FIELD_ID_LABEL"
description="JGLOBAL_FIELD_ID_DESC"
size="10"
default="0"
<fieldset addfieldpath="/administrator/components/com_categories/models/fields" >
<field name="id" type="text" class="readonly" label="JGLOBAL_FIELD_ID_LABEL"
description ="JGLOBAL_FIELD_ID_DESC" size="10" default="0"
readonly="true" />
<field name="asset_id"
type="hidden"
filter="unset" />
<field name="asset_id" type="hidden" filter="unset" />
<field name="title"
type="text"
label="JGLOBAL_TITLE"
<field name="title" type="text" label="JGLOBAL_TITLE"
description="JFIELD_TITLE_DESC"
class="inputbox input-xxlarge input-large-text"
size="40"
required="true" />
<field name="alias"
type="text"
label="JFIELD_ALIAS_LABEL"
<field name="alias" type="text" label="JFIELD_ALIAS_LABEL"
description="JFIELD_ALIAS_DESC"
placeholder="JFIELD_ALIAS_PLACEHOLDER"
class="inputbox"
size="40" />
class="inputbox" size="40" />
<field name="version_note"
type="text"
label="JGLOBAL_FIELD_VERSION_NOTE_LABEL"
<field name="version_note" type="text" label="JGLOBAL_FIELD_VERSION_NOTE_LABEL"
description="JGLOBAL_FIELD_VERSION_NOTE_DESC"
class="inputbox span12"
size="45" />
<field name="articletext"
type="editor"
class="inputbox"
label="COM_CONTENT_FIELD_ARTICLETEXT_LABEL"
description="COM_CONTENT_FIELD_ARTICLETEXT_DESC"
filter="JComponentHelper::filterText"
buttons="true" />
<field name="articletext" type="editor" class="inputbox"
label="COM_CONTENT_FIELD_ARTICLETEXT_LABEL" description="COM_CONTENT_FIELD_ARTICLETEXT_DESC"
filter="JComponentHelper::filterText" buttons="true" />
<field name="state"
type="list"
class="chzn-color-state"
label="JSTATUS"
description="JFIELD_PUBLISHED_DESC"
filter="intval"
size="1"
default="1">
<option value="1">JPUBLISHED</option>
<option value="0">JUNPUBLISHED</option>
<option value="2">JARCHIVED</option>
<option value="-2">JTRASHED</option>
<field name="state" type="list" label="JSTATUS"
description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
filter="intval" size="1" default="1"
>
<option value="1">
JPUBLISHED</option>
<option value="0">
JUNPUBLISHED</option>
<option value="2">
JARCHIVED</option>
<option value="-2">
JTRASHED</option>
</field>
<field name="catid"
type="categoryedit"
label="JCATEGORY"
description="JFIELD_CATEGORY_DESC"
class="inputbox"
required="true">
<field name="catid" type="categoryedit"
label="JCATEGORY" description="JFIELD_CATEGORY_DESC"
class="inputbox" required="true"
>
</field>
<field name="tags"
@ -74,159 +52,101 @@
label="JTAG"
description="JTAG_DESC"
class="inputbox"
multiple="true">
multiple="true"
>
</field>
<field name="buttonspacer"
<field
name="buttonspacer"
description="JGLOBAL_ACTION_PERMISSIONS_DESCRIPTION"
type="spacer" />
<field name="created"
type="calendar"
label="COM_CONTENT_FIELD_CREATED_LABEL"
description="COM_CONTENT_FIELD_CREATED_DESC"
class="inputbox"
size="22"
format="%Y-%m-%d %H:%M:%S"
<field name="created" type="calendar" label="COM_CONTENT_FIELD_CREATED_LABEL"
description="COM_CONTENT_FIELD_CREATED_DESC" class="inputbox" size="22"
format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
<field name="created_by" type="user"
label="COM_CONTENT_FIELD_CREATED_BY_LABEL" description="COM_CONTENT_FIELD_CREATED_BY_DESC" />
<field name="created_by_alias" type="text"
label="COM_CONTENT_FIELD_CREATED_BY_ALIAS_LABEL" description="COM_CONTENT_FIELD_CREATED_BY_ALIAS_DESC"
class="inputbox" size="20" />
<field name="modified" type="calendar" class="readonly"
label="JGLOBAL_FIELD_MODIFIED_LABEL" description="COM_CONTENT_FIELD_MODIFIED_DESC"
size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
<field name="modified_by" type="user"
label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
class="readonly"
readonly="true"
filter="unset"
/>
<field name="checked_out" type="hidden" filter="unset" />
<field name="checked_out_time" type="hidden" filter="unset" />
<field name="publish_up" type="calendar"
label="COM_CONTENT_FIELD_PUBLISH_UP_LABEL" description="COM_CONTENT_FIELD_PUBLISH_UP_DESC"
class="inputbox" format="%Y-%m-%d %H:%M:%S" size="22"
filter="user_utc" />
<field name="created_by"
type="user"
label="COM_CONTENT_FIELD_CREATED_BY_LABEL"
description="COM_CONTENT_FIELD_CREATED_BY_DESC" />
<field name="created_by_alias"
type="text"
label="COM_CONTENT_FIELD_CREATED_BY_ALIAS_LABEL"
description="COM_CONTENT_FIELD_CREATED_BY_ALIAS_DESC"
class="inputbox"
size="20" />
<field name="modified"
type="calendar"
class="readonly"
label="JGLOBAL_FIELD_MODIFIED_LABEL"
description="COM_CONTENT_FIELD_MODIFIED_DESC"
size="22"
readonly="true"
format="%Y-%m-%d %H:%M:%S"
<field name="publish_down" type="calendar"
label="COM_CONTENT_FIELD_PUBLISH_DOWN_LABEL" description="COM_CONTENT_FIELD_PUBLISH_DOWN_DESC"
class="inputbox" format="%Y-%m-%d %H:%M:%S" size="22"
filter="user_utc" />
<field name="modified_by"
type="user"
label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
class="readonly"
readonly="true"
filter="unset" />
<field name="version" type="text" class="readonly"
label="COM_CONTENT_FIELD_VERSION_LABEL" size="6" description="COM_CONTENT_FIELD_VERSION_DESC"
readonly="true" filter="unset" />
<field name="checked_out"
type="hidden"
filter="unset" />
<field name="checked_out_time"
type="hidden"
filter="unset" />
<field name="publish_up"
type="calendar"
label="COM_CONTENT_FIELD_PUBLISH_UP_LABEL"
description="COM_CONTENT_FIELD_PUBLISH_UP_DESC"
class="inputbox"
format="%Y-%m-%d %H:%M:%S"
size="22"
filter="user_utc" />
<field name="publish_down"
type="calendar"
label="COM_CONTENT_FIELD_PUBLISH_DOWN_LABEL"
description="COM_CONTENT_FIELD_PUBLISH_DOWN_DESC"
class="inputbox"
format="%Y-%m-%d %H:%M:%S"
size="22"
filter="user_utc" />
<field name="version"
type="text"
class="readonly"
label="COM_CONTENT_FIELD_VERSION_LABEL"
size="6"
description="COM_CONTENT_FIELD_VERSION_DESC"
readonly="true"
filter="unset" />
<field name="ordering"
type="text"
label="JFIELD_ORDERING_LABEL"
description="JFIELD_ORDERING_DESC"
class="inputbox"
size="6"
<field name="ordering" type="text" label="JFIELD_ORDERING_LABEL"
description="JFIELD_ORDERING_DESC" class="inputbox" size="6"
default="0" />
<field name="metakey"
type="textarea"
label="JFIELD_META_KEYWORDS_LABEL"
description="JFIELD_META_KEYWORDS_DESC"
class="inputbox"
rows="3"
cols="30" />
<field name="metakey" type="textarea"
label="JFIELD_META_KEYWORDS_LABEL" description="JFIELD_META_KEYWORDS_DESC"
class="inputbox" rows="3" cols="30" />
<field name="metadesc"
type="textarea"
label="JFIELD_META_DESCRIPTION_LABEL"
description="JFIELD_META_DESCRIPTION_DESC"
class="inputbox"
rows="3"
cols="30" />
<field name="metadesc" type="textarea"
label="JFIELD_META_DESCRIPTION_LABEL" description="JFIELD_META_DESCRIPTION_DESC"
class="inputbox" rows="3" cols="30" />
<field name="access"
type="accesslevel"
label="JFIELD_ACCESS_LABEL"
description="JFIELD_ACCESS_DESC"
size="1" />
<field name="access" type="accesslevel" label="JFIELD_ACCESS_LABEL"
description="JFIELD_ACCESS_DESC" size="1" />
<field name="hits"
type="text"
label="JGLOBAL_HITS"
description="COM_CONTENT_FIELD_HITS_DESC"
class="readonly"
size="6"
readonly="true"
filter="unset" />
<field name="hits" type="text" label="JGLOBAL_HITS"
description="COM_CONTENT_FIELD_HITS_DESC" class="readonly" size="6"
readonly="true" filter="unset" />
<field name="language"
type="contentlanguage"
label="JFIELD_LANGUAGE_LABEL"
description="COM_CONTENT_FIELD_LANGUAGE_DESC">
<field name="language" type="contentlanguage" label="JFIELD_LANGUAGE_LABEL"
description="COM_CONTENT_FIELD_LANGUAGE_DESC"
>
<option value="*">JALL</option>
</field>
<field name="featured"
type="radio"
<field name="featured" type="radio"
class="btn-group btn-group-yesno"
label="JFEATURED"
description="COM_CONTENT_FIELD_FEATURED_DESC"
default="0">
default="0"
>
<option value="0">JNO</option>
<option value="1">JYES</option>
</field>
<field name="rules"
type="rules"
label="JFIELD_RULES_LABEL"
translate_label="false" class="inputbox"
filter="rules"
component="com_content"
section="article"
validate="rules" />
<field name="rules" type="rules" label="JFIELD_RULES_LABEL"
translate_label="false" class="inputbox" filter="rules"
component="com_content" section="article" validate="rules"
/>
</fieldset>
<fields name="attribs" label="COM_CONTENT_ATTRIBS_FIELDSET_LABEL">
<fieldset name="basic"
label="COM_CONTENT_ATTRIBS_FIELDSET_LABEL">
<field name="show_title"
<fieldset name="basic" label="COM_CONTENT_ATTRIBS_FIELDSET_LABEL">
<field
name="show_title"
type="list"
class="chzn-color"
label="JGLOBAL_SHOW_TITLE_LABEL"
@ -236,13 +156,14 @@
<option value="1">JSHOW</option>
</field>
<field name="link_titles"
<field
name="link_titles"
type="list"
class="chzn-color"
label="JGLOBAL_LINKED_TITLES_LABEL"
description="JGLOBAL_LINKED_TITLES_DESC">
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="0">JNO</option>
<option value="0">JNO</option>
<option value="1">JYES</option>
</field>
@ -250,7 +171,8 @@
type="list"
class="chzn-color"
label="COM_CONTENT_FIELD_SHOW_TAGS_LABEL"
description="COM_CONTENT_FIELD_SHOW_TAGS_DESC">
description="COM_CONTENT_FIELD_SHOW_TAGS_DESC"
>
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
@ -260,13 +182,14 @@
type="list"
class="chzn-color"
description="JGLOBAL_SHOW_INTRO_DESC"
label="JGLOBAL_SHOW_INTRO_LABEL">
label="JGLOBAL_SHOW_INTRO_LABEL"
>
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field name="info_block_position"
<field
name="info_block_position"
type="list"
default=""
label="COM_CONTENT_FIELD_INFOBLOCK_POSITION_LABEL"
@ -277,167 +200,185 @@
<option value="2">COM_CONTENT_FIELD_OPTION_SPLIT</option>
</field>
<field name="show_category"
<field
name="show_category"
type="list"
class="chzn-color"
label="JGLOBAL_SHOW_CATEGORY_LABEL"
description="JGLOBAL_SHOW_CATEGORY_DESC">
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field name="link_category"
<field
name="link_category"
type="list"
class="chzn-color"
label="JGLOBAL_LINK_CATEGORY_LABEL"
description="JGLOBAL_LINK_CATEGORY_DESC">
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="0">JNO</option>
<option value="1">JYES</option>
<option value="0">JNO</option>
<option value="1">JYES</option>
</field>
<field name="show_parent_category"
<field
name="show_parent_category"
type="list"
class="chzn-color"
label="JGLOBAL_SHOW_PARENT_CATEGORY_LABEL"
description="JGLOBAL_SHOW_PARENT_CATEGORY_DESC">
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field name="link_parent_category"
<field
name="link_parent_category"
type="list"
class="chzn-color"
label="JGLOBAL_LINK_PARENT_CATEGORY_LABEL"
description="JGLOBAL_LINK_PARENT_CATEGORY_DESC">
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="0">JNO</option>
<option value="1">JYES</option>
<option value="0">JNO</option>
<option value="1">JYES</option>
</field>
<field name="show_author"
<field
name="show_author"
type="list"
class="chzn-color"
label="JGLOBAL_SHOW_AUTHOR_LABEL"
description="JGLOBAL_SHOW_AUTHOR_DESC">
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field name="link_author"
<field
name="link_author"
type="list"
class="chzn-color"
label="JGLOBAL_LINK_AUTHOR_LABEL"
description="JGLOBAL_LINK_AUTHOR_DESC">
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="0">JNO</option>
<option value="1">JYES</option>
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="0">JNO</option>
<option value="1">JYES</option>
</field>
<field name="show_create_date"
<field
name="show_create_date"
type="list"
class="chzn-color"
label="JGLOBAL_SHOW_CREATE_DATE_LABEL"
description="JGLOBAL_SHOW_CREATE_DATE_DESC">
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field name="show_modify_date"
<field
name="show_modify_date"
type="list"
class="chzn-color"
label="JGLOBAL_SHOW_MODIFY_DATE_LABEL"
description="JGLOBAL_SHOW_MODIFY_DATE_DESC">
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field name="show_publish_date"
<field
name="show_publish_date"
type="list"
class="chzn-color"
label="JGLOBAL_SHOW_PUBLISH_DATE_LABEL"
description="JGLOBAL_SHOW_PUBLISH_DATE_DESC">
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field name="show_item_navigation"
<field
name="show_item_navigation"
type="list"
class="chzn-color"
label="JGLOBAL_SHOW_NAVIGATION_LABEL"
description="JGLOBAL_SHOW_NAVIGATION_DESC">
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
<option value="1">JSHOW</option>
</field>
<field name="show_icons"
<field
name="show_icons"
type="list"
class="chzn-color"
label="JGLOBAL_SHOW_ICONS_LABEL"
description="JGLOBAL_SHOW_ICONS_DESC">
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field name="show_print_icon"
<field
name="show_print_icon"
type="list"
class="chzn-color"
label="JGLOBAL_SHOW_PRINT_ICON_LABEL"
description="JGLOBAL_SHOW_PRINT_ICON_DESC">
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field name="show_email_icon"
<field
name="show_email_icon"
type="list"
class="chzn-color"
label="JGLOBAL_SHOW_EMAIL_ICON_LABEL"
description="JGLOBAL_SHOW_EMAIL_ICON_DESC">
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field name="show_vote"
<field
name="show_vote"
type="list"
class="chzn-color"
label="JGLOBAL_SHOW_VOTE_LABEL"
description="JGLOBAL_SHOW_VOTE_DESC">
description="JGLOBAL_SHOW_VOTE_DESC"
>
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
<option value="1">JSHOW</option>
</field>
<field name="show_hits"
<field
name="show_hits"
type="list"
class="chzn-color"
label="JGLOBAL_SHOW_HITS_LABEL"
description="JGLOBAL_SHOW_HITS_DESC">
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field name="show_noauth"
<field
name="show_noauth"
type="list"
class="chzn-color"
label="JGLOBAL_SHOW_UNAUTH_LINKS_LABEL"
description="JGLOBAL_SHOW_UNAUTH_LINKS_DESC">
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="0">JNO</option>
<option value="1">JYES</option>
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="0">JNO</option>
<option value="1">JYES</option>
</field>
<field name="urls_position"
<field
name="urls_position"
type="list"
class="chzn-color"
label="COM_CONTENT_FIELD_URLSPOSITION_LABEL"
@ -447,119 +388,109 @@
<option value="1">COM_CONTENT_FIELD_OPTION_BELOW</option>
</field>
<field name="spacer2"
<field
name="spacer2"
type="spacer"
hr="true" />
hr="true"
/>
<field name="alternative_readmore"
type="inputbox"
<field name="alternative_readmore" type="inputbox"
label="JFIELD_READMORE_LABEL"
description="JFIELD_READMORE_DESC"
class="inputbox"
size="25" />
class="inputbox" size="25" />
<field name="article_layout"
type="componentlayout"
<field name="article_layout" type="componentlayout"
label="JFIELD_ALT_LAYOUT_LABEL"
description="JFIELD_ALT_COMPONENT_LAYOUT_DESC"
useglobal="true"
extension="com_content"
view="article" />
extension="com_content" view="article"
/>
</fieldset>
</fields>
<field name="xreference"
type="text"
<field name="xreference" type="text"
label="JFIELD_KEY_REFERENCE_LABEL"
description="JFIELD_KEY_REFERENCE_DESC"
class="inputbox"
size="20" />
class="inputbox" size="20" />
<fields name="images" label="COM_CONTENT_FIELD_IMAGE_OPTIONS">
<field name="image_intro"
<field
name="image_intro"
type="media"
label="COM_CONTENT_FIELD_INTRO_LABEL"
description="COM_CONTENT_FIELD_INTRO_DESC" />
<field name="float_intro"
<field
name="float_intro"
type="list"
label="COM_CONTENT_FLOAT_LABEL"
description="COM_CONTENT_FLOAT_DESC">
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="right">COM_CONTENT_RIGHT</option>
<option value="left">COM_CONTENT_LEFT</option>
<option value="none">COM_CONTENT_NONE</option>
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="right">COM_CONTENT_RIGHT</option>
<option value="left">COM_CONTENT_LEFT</option>
<option value="none">COM_CONTENT_NONE</option>
</field>
<field name="image_intro_alt"
type="text"
label="COM_CONTENT_FIELD_IMAGE_ALT_LABEL"
description="COM_CONTENT_FIELD_IMAGE_ALT_DESC"
class="inputbox"
size="20" />
size="20"/>
<field name="image_intro_caption"
type="text"
label="COM_CONTENT_FIELD_IMAGE_CAPTION_LABEL"
description="COM_CONTENT_FIELD_IMAGE_CAPTION_DESC"
class="inputbox"
size="20" />
<field name="spacer1"
size="20"/>
<field
name="spacer1"
type="spacer"
hr="true" />
<field name="image_fulltext"
hr="true"
/>
<field
name="image_fulltext"
type="media"
label="COM_CONTENT_FIELD_FULL_LABEL"
description="COM_CONTENT_FIELD_FULL_DESC" />
<field name="float_fulltext"
description="COM_CONTENT_FIELD_FULL_DESC"/>
<field
name="float_fulltext"
type="list"
label="COM_CONTENT_FLOAT_LABEL"
description="COM_CONTENT_FLOAT_DESC">
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="right">COM_CONTENT_RIGHT</option>
<option value="left">COM_CONTENT_LEFT</option>
<option value="none">COM_CONTENT_NONE</option>
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="right">COM_CONTENT_RIGHT</option>
<option value="left">COM_CONTENT_LEFT</option>
<option value="none">COM_CONTENT_NONE</option>
</field>
<field name="image_fulltext_alt"
type="text"
label="COM_CONTENT_FIELD_IMAGE_ALT_LABEL"
description="COM_CONTENT_FIELD_IMAGE_ALT_DESC"
class="inputbox"
size="20" />
size="20"/>
<field name="image_fulltext_caption"
type="text"
label="COM_CONTENT_FIELD_IMAGE_CAPTION_LABEL"
description="COM_CONTENT_FIELD_IMAGE_CAPTION_DESC"
class="inputbox"
size="20" />
size="20"/>
</fields>
<fields name="urls" label="COM_CONTENT_FIELD_URLS_OPTIONS">
<field name="urla"
<field
name="urla"
type="url"
validate="url"
filter="url"
label="COM_CONTENT_FIELD_URLA_LABEL"
description="COM_CONTENT_FIELD_URL_DESC" />
<field name="urlatext"
type="text"
label="COM_CONTENT_FIELD_URLA_LINK_TEXT_LABEL"
description="COM_CONTENT_FIELD_URL_LINK_TEXT_DESC"
class="inputbox"
size="20" />
<field name="targeta"
size="20"/>
<field
name="targeta"
type="list"
label="COM_CONTENT_URL_FIELD_BROWSERNAV_LABEL"
description="COM_CONTENT_URL_FIELD_BROWSERNAV_DESC"
@ -572,82 +503,83 @@
<option value="2">JBROWSERTARGET_POPUP</option>
<option value="3">JBROWSERTARGET_MODAL</option>
</field>
<field name="spacer3"
<field
name="spacer3"
type="spacer"
hr="true" />
<field name="urlb"
hr="true"
/>
<field
name="urlb"
type="url"
validate="url"
filter="url"
label="COM_CONTENT_FIELD_URLB_LABEL"
description="COM_CONTENT_FIELD_URL_DESC" />
description="COM_CONTENT_FIELD_URL_DESC"/>
<field name="urlbtext"
type="text"
label="COM_CONTENT_FIELD_URLB_LINK_TEXT_LABEL"
description="COM_CONTENT_FIELD_URL_LINK_TEXT_DESC"
class="inputbox"
size="20" />
<field name="targetb"
size="20"/>
<field
name="targetb"
type="list"
label="COM_CONTENT_URL_FIELD_BROWSERNAV_LABEL"
description="COM_CONTENT_URL_FIELD_BROWSERNAV_DESC"
default=""
filter="options"
class="inputbox">
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="0">JBROWSERTARGET_PARENT</option>
<option value="1">JBROWSERTARGET_NEW</option>
<option value="2">JBROWSERTARGET_POPUP</option>
<option value="3">JBROWSERTARGET_MODAL</option>
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="0">JBROWSERTARGET_PARENT</option>
<option value="1">JBROWSERTARGET_NEW</option>
<option value="2">JBROWSERTARGET_POPUP</option>
<option value="3">JBROWSERTARGET_MODAL</option>
</field>
<field name="spacer4"
<field
name="spacer4"
type="spacer"
hr="true" />
<field name="urlc"
hr="true"
/>
<field
name="urlc"
type="url"
validate="url"
filter="url"
label="COM_CONTENT_FIELD_URLC_LABEL"
description="COM_CONTENT_FIELD_URL_DESC" />
<field name="urlctext"
description="COM_CONTENT_FIELD_URL_DESC"/>
<field
name="urlctext"
type="text"
label="COM_CONTENT_FIELD_URLC_LINK_TEXT_LABEL"
description="COM_CONTENT_FIELD_URL_LINK_TEXT_DESC"
class="inputbox"
size="20" />
<field name="targetc"
size="20"/>
<field
name="targetc"
type="list"
label="COM_CONTENT_URL_FIELD_BROWSERNAV_LABEL"
description="COM_CONTENT_URL_FIELD_BROWSERNAV_DESC"
default=""
filter="options"
class="inputbox">
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="0">JBROWSERTARGET_PARENT</option>
<option value="1">JBROWSERTARGET_NEW</option>
<option value="2">JBROWSERTARGET_POPUP</option>
<option value="3">JBROWSERTARGET_MODAL</option>
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="0">JBROWSERTARGET_PARENT</option>
<option value="1">JBROWSERTARGET_NEW</option>
<option value="2">JBROWSERTARGET_POPUP</option>
<option value="3">JBROWSERTARGET_MODAL</option>
</field>
</fields>
<fields name="metadata" label="JGLOBAL_FIELDSET_METADATA_OPTIONS">
<fieldset name="jmetadata"
label="JGLOBAL_FIELDSET_METADATA_OPTIONS">
<field name="robots"
type="list"
label="JFIELD_METADATA_ROBOTS_LABEL"
description="JFIELD_METADATA_ROBOTS_DESC">
description="JFIELD_METADATA_ROBOTS_DESC"
>
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="index, follow">JGLOBAL_INDEX_FOLLOW</option>
<option value="noindex, follow">JGLOBAL_NOINDEX_FOLLOW</option>
@ -655,37 +587,24 @@
<option value="noindex, nofollow">JGLOBAL_NOINDEX_NOFOLLOW</option>
</field>
<field name="author"
type="text"
label="JAUTHOR"
description="JFIELD_METADATA_AUTHOR_DESC"
<field name="author" type="text"
label="JAUTHOR" description="JFIELD_METADATA_AUTHOR_DESC"
size="20" />
<field name="rights"
type="textarea"
label="JFIELD_META_RIGHTS_LABEL"
description="JFIELD_META_RIGHTS_DESC"
required="false"
filter="string"
cols="30"
rows="2" />
<field name="xreference"
type="text"
<field name="rights" type="textarea" label="JFIELD_META_RIGHTS_LABEL"
description="JFIELD_META_RIGHTS_DESC" required="false" filter="string"
cols="30" rows="2" />
<field name="xreference" type="text"
label="COM_CONTENT_FIELD_XREFERENCE_LABEL"
description="COM_CONTENT_FIELD_XREFERENCE_DESC"
class="inputbox"
size="20" />
class="inputbox" size="20" />
</fieldset>
</fields>
<!-- These fields are used to get labels for the Content History Preview and Compare Views -->
<fields>
<field name="introtext" label="COM_CONTENT_FIELD_INTROTEXT" />
<field name="fulltext" label="COM_CONTENT_FIELD_FULLTEXT" />
</fields>
</form>

6
administrator/components/com_contenthistory/controllers/history.php
View File

@ -30,7 +30,7 @@ class ContenthistoryControllerHistory extends JControllerAdmin
JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
// Get items to remove from the request.
$cid = $this->input->get('cid', array(), 'array');
$cid = $this->input->get('cid', array(), 'array');
if (!is_array($cid) || count($cid) < 1)
{
@ -78,9 +78,7 @@ class ContenthistoryControllerHistory extends JControllerAdmin
*/
public function getModel($name = 'History', $prefix = 'ContenthistoryModel', $config = array('ignore_request' => true))
{
$model = parent::getModel($name, $prefix, $config);
return $model;
return parent::getModel($name, $prefix, $config);
}
/**

27
administrator/components/com_contenthistory/controllers/preview.php
View File

@ -20,26 +20,17 @@ class ContenthistoryControllerPreview extends JControllerLegacy
{
/**
* Proxy for getModel.
* @since 1.6
*
* @param string $name The name of the model
* @param string $prefix The prefix for the model
* @param array $config An additional array of parameters
*
* @return JModelLegacy The model
*
* @since 3.2
*/
public function getModel($name = 'Preview', $prefix = 'ContenthistoryModel', $config = array('ignore_request' => true))
{
$model = parent::getModel($name, $prefix, $config);
return $model;
return parent::getModel($name, $prefix, $config);
}
/**
* Method to provide child classes the opportunity to process after the delete task.
*
* @param JModelLegacy $model The model for the component
* @param mixed $ids array of ids deleted.
*
* @return void
*
* @since 3.1
*/
protected function postDeleteHook(JModelLegacy $model, $ids = null)
{
}
}

33
administrator/components/com_contenthistory/models/history.php
View File

@ -14,7 +14,7 @@ defined('_JEXEC') or die;
*
* @package Joomla.Administrator
* @subpackage com_contenthistory
* @since 1.6
* @since 3.2
*/
class ContenthistoryModelHistory extends JModelList
{
@ -23,8 +23,8 @@ class ContenthistoryModelHistory extends JModelList
*
* @param array $config An optional associative array of configuration settings.
*
* @see JController
* @since 1.6
* @see JControllerLegacy
* @since 3.2
*/
public function __construct($config = array())
{
@ -227,11 +227,10 @@ class ContenthistoryModelHistory extends JModelList
*
* @return void
*
* @since 1.6
* @since 3.2
*/
protected function populateState($ordering = null, $direction = null)
{
$app = JFactory::getApplication('administrator');
$input = JFactory::getApplication()->input;
$itemId = $input->get('item_id', 0, 'integer');
$typeId = $input->get('type_id', 0, 'integer');
@ -255,7 +254,7 @@ class ContenthistoryModelHistory extends JModelList
*
* @return JDatabaseQuery
*
* @since 1.6
* @since 3.2
*/
protected function getListQuery()
{
@ -265,18 +264,18 @@ class ContenthistoryModelHistory extends JModelList
// Select the required fields from the table.
$query->select(
$this->getState(
'list.select',
'h.version_id, h.ucm_item_id, h.ucm_type_id, h.version_note, h.save_date, h.editor_user_id,' .
'h.character_count, h.sha1_hash, h.version_data, h.keep_forever'
)
);
$query->from($db->quoteName('#__ucm_history') . ' AS h');
$query->where($db->quoteName('h.ucm_item_id') . ' = ' . $this->getState('item_id'));
$query->where($db->quoteName('h.ucm_type_id') . ' = ' . $this->getState('type_id'));
$this->getState(
'list.select',
'h.version_id, h.ucm_item_id, h.ucm_type_id, h.version_note, h.save_date, h.editor_user_id,' .
'h.character_count, h.sha1_hash, h.version_data, h.keep_forever'
)
)
->from($db->quoteName('#__ucm_history') . ' AS h')
->where($db->quoteName('h.ucm_item_id') . ' = ' . $this->getState('item_id'))
->where($db->quoteName('h.ucm_type_id') . ' = ' . $this->getState('type_id'))
// Join over the users for the editor
$query->select('uc.name AS editor')
->select('uc.name AS editor')
->join('LEFT', '#__users AS uc ON uc.id = h.editor_user_id');
// Add the list ordering clause.
@ -307,7 +306,7 @@ class ContenthistoryModelHistory extends JModelList
if ($contentTable && $contentTable->load($keyValue))
{
$helper = new JHelperContenthistory;
$helper = new JHelper;
$dataObject = $helper->getDataObject($contentTable);
$result = $this->getTable('Contenthistory', 'JTable')->getSha1(json_encode($dataObject));

2
administrator/components/com_contenthistory/models/preview.php
View File

@ -16,7 +16,7 @@ JLoader::register('ContenthistoryHelper', JPATH_ADMINISTRATOR . '/components/com
*
* @package Joomla.Administrator
* @subpackage com_contenthistory
* @since 1.6
* @since 3.2
*/
class ContenthistoryModelPreview extends JModelItem
{

101
administrator/components/com_finder/config.xml
View File

@ -4,8 +4,8 @@
name="search"
label="COM_FINDER_FIELDSET_SEARCH_OPTIONS_LABEL"
description="COM_FINDER_FIELDSET_SEARCH_OPTIONS_DESCRIPTION" >
<field name="enabled"
<field
name="enabled"
type="radio"
class="btn-group btn-group-yesno"
default="0"
@ -14,8 +14,8 @@
<option value="0">JNO</option>
<option value="1">JYES</option>
</field>
<field name="show_description"
<field
name="show_description"
type="radio"
class="btn-group btn-group-yesno"
default="1"
@ -24,15 +24,14 @@
<option value="1">JSHOW</option>
<option value="0">JHIDE</option>
</field>
<field name="description_length"
<field
name="description_length"
type="text"
size="5"
default="255"
filter="integer"
label="COM_FINDER_CONFIG_DESCRIPTION_LENGTH_LABEL"
description="COM_FINDER_CONFIG_DESCRIPTION_LENGTH_DESCRIPTION" />
<field name="allow_empty_query"
type="radio"
class="btn-group btn-group-yesno"
@ -42,8 +41,8 @@
<option value="1">JYES</option>
<option value="0">JNO</option>
</field>
<field name="show_url"
<field
name="show_url"
type="radio"
class="btn-group btn-group-yesno"
default="1"
@ -52,8 +51,8 @@
<option value="1">JSHOW</option>
<option value="0">JHIDE</option>
</field>
<field name="show_autosuggest"
<field
name="show_autosuggest"
type="radio"
class="btn-group btn-group-yesno"
default="1"
@ -62,8 +61,8 @@
<option value="1">JSHOW</option>
<option value="0">JHIDE</option>
</field>
<field name="show_advanced"
<field
name="show_advanced"
type="radio"
class="btn-group btn-group-yesno"
default="1"
@ -72,7 +71,6 @@
<option value="1">JSHOW</option>
<option value="0">JHIDE</option>
</field>
<field name="show_advanced_tips"
type="radio"
class="btn-group btn-group-yesno"
@ -82,8 +80,8 @@
<option value="1">JSHOW</option>
<option value="0">JHIDE</option>
</field>
<field name="expand_advanced"
<field
name="expand_advanced"
type="radio"
class="btn-group btn-group-yesno"
default="0"
@ -92,8 +90,8 @@
<option value="1">JYES</option>
<option value="0">JNO</option>
</field>
<field name="show_date_filters"
<field
name="show_date_filters"
type="radio"
class="btn-group btn-group-yesno"
default="0"
@ -102,7 +100,6 @@
<option value="1">JSHOW</option>
<option value="0">JHIDE</option>
</field>
<field name="sort_order"
type="list"
default="relevance"
@ -113,7 +110,6 @@
<option value="date">COM_FINDER_CONFIG_SORT_OPTION_START_DATE</option>
<option value="price">COM_FINDER_CONFIG_SORT_OPTION_LIST_PRICE</option>
</field>
<field name="sort_direction"
type="list"
default="desc"
@ -123,8 +119,8 @@
<option value="desc">COM_FINDER_CONFIG_SORT_OPTION_DESCENDING</option>
<option value="asc">COM_FINDER_CONFIG_SORT_OPTION_ASCENDING</option>
</field>
<field name="highlight_terms"
<field
name="highlight_terms"
type="radio"
class="btn-group btn-group-yesno"
default="1"
@ -133,25 +129,26 @@
<option value="1">JYES</option>
<option value="0">JNO</option>
</field>
<field name="opensearch_name"
<field
name="opensearch_name"
type="text"
label="COM_FINDER_CONFIG_FIELD_OPENSEARCH_NAME_LABEL"
description="COM_FINDER_CONFIG_FIELD_OPENSEARCH_NAME_DESCRIPTION" />
<field name="opensearch_description"
description="COM_FINDER_CONFIG_FIELD_OPENSEARCH_NAME_DESCRIPTION"
/>
<field
name="opensearch_description"
type="textarea"
label="COM_FINDER_CONFIG_FIELD_OPENSEARCH_DESCRIPTON_LABEL"
description="COM_FINDER_CONFIG_FIELD_OPENSEARCH_DESCRIPTON_DESCRIPTION"
cols="30" rows="2" />
cols="30" rows="2"
/>
</fieldset>
<fieldset
name="index"
label="COM_FINDER_FIELDSET_INDEX_OPTIONS_LABEL"
description="COM_FINDER_FIELDSET_INDEX_OPTIONS_DESCRIPTION" >
<field name="batch_size"
<field
name="batch_size"
type="list"
default="50"
label="COM_FINDER_CONFIG_BATCH_SIZE_LABEL"
@ -168,51 +165,51 @@
<option value="250">J250</option>
<option value="300">J300</option>
</field>
<field name="memory_table_limit"
<field
name="memory_table_limit"
type="text"
size="10"
default="30000"
label="COM_FINDER_CONFIG_MEMORY_TABLE_LIMIT_LABEL"
description="COM_FINDER_CONFIG_MEMORY_TABLE_LIMIT_DESCRIPTION"
filter="integer" />
<field name="title_multiplier"
<field
name="title_multiplier"
type="text"
size="5"
default="1.7"
label="COM_FINDER_CONFIG_TITLE_MULTIPLIER_LABEL"
description="COM_FINDER_CONFIG_TITLE_MULTIPLIER_DESCRIPTION" />
<field name="text_multiplier"
<field
name="text_multiplier"
type="text"
size="5"
default="0.7"
label="COM_FINDER_CONFIG_TEXT_MULTIPLIER_LABEL"
description="COM_FINDER_CONFIG_TEXT_MULTIPLIER_DESCRIPTION" />
<field name="meta_multiplier"
<field
name="meta_multiplier"
type="text"
size="5"
default="1.2"
label="COM_FINDER_CONFIG_META_MULTIPLIER_LABEL"
description="COM_FINDER_CONFIG_META_MULTIPLIER_DESCRIPTION" />
<field name="path_multiplier"
<field
name="path_multiplier"
type="text"
size="5"
default="2.0"
label="COM_FINDER_CONFIG_PATH_MULTIPLIER_LABEL"
description="COM_FINDER_CONFIG_PATH_MULTIPLIER_DESCRIPTION" />
<field name="misc_multiplier"
<field
name="misc_multiplier"
type="text"
size="5"
default="0.3"
label="COM_FINDER_CONFIG_MISC_MULTIPLIER_LABEL"
description="COM_FINDER_CONFIG_MISC_MULTIPLIER_DESCRIPTION" />
<field name="stem"
<field
name="stem"
type="radio"
class="btn-group btn-group-yesno"
default="1"
@ -221,8 +218,8 @@
<option value="1">JYES</option>
<option value="0">JNO</option>
</field>
<field name="stemmer"
<field
name="stemmer"
type="list"
default="snowball"
label="COM_FINDER_CONFIG_STEMMER_LABEL"
@ -231,8 +228,8 @@
<option value="fr">COM_FINDER_CONFIG_STEMMER_FR</option>
<option value="snowball">COM_FINDER_CONFIG_STEMMER_SNOWBALL</option>
</field>
<field name="enable_logging"
<field
name="enable_logging"
type="radio"
class="btn-group btn-group-yesno"
default="0"
@ -241,14 +238,13 @@
<option value="1">JYES</option>
<option value="0">JNO</option>
</field>
</fieldset>
<fieldset
name="permissions"
label="JCONFIG_PERMISSIONS_LABEL"
description="JCONFIG_PERMISSIONS_DESC" >
<field name="rules"
<field
name="rules"
type="rules"
label="JCONFIG_PERMISSIONS_LABEL"
class="inputbox"
@ -256,6 +252,5 @@
validate="rules"
component="com_finder"
section="component" />
</fieldset>
</config>

18
administrator/components/com_installer/config.xml
View File

@ -3,30 +3,32 @@
<fieldset
name="preferences"
label="COM_INSTALLER_PREFERENCES_LABEL"
description="COM_INSTALLER_PREFERENCES_DESCRIPTION">
<field name="cachetimeout"
description="COM_INSTALLER_PREFERENCES_DESCRIPTION"
>
<field
name="cachetimeout"
type="integer"
label="COM_INSTALLER_CACHETIMEOUT_LABEL"
description="COM_INSTALLER_CACHETIMEOUT_DESC"
first="0"
last="24"
step="1"
default="6" />
default="6"
/>
</fieldset>
<fieldset
name="permissions"
label="JCONFIG_PERMISSIONS_LABEL"
description="JCONFIG_PERMISSIONS_DESC">
description="JCONFIG_PERMISSIONS_DESC"
>
<field name="rules"
<field
name="rules"
type="rules"
label="JCONFIG_PERMISSIONS_LABEL"
filter="rules"
validate="rules"
component="com_installer"
section="component" />
</fieldset>
</config>

23
administrator/components/com_joomlaupdate/config.xml
View File

@ -3,13 +3,16 @@
<fieldset
name="sources"
label="COM_JOOMLAUPDATE_CONFIG_SOURCES_LABEL"
description="COM_JOOMLAUPDATE_CONFIG_SOURCES_DESC">
description="COM_JOOMLAUPDATE_CONFIG_SOURCES_DESC"
>
<field name="updatesource"
<field
name="updatesource"
type="list"
default="lts"
label="COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_LABEL"
description="COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_DESC">
description="COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_DESC"
>
<option value="lts">COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_LTS</option>
<option value="sts">COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_STS</option>
<option value="testing">COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_TESTING</option>
@ -17,27 +20,29 @@
<option value="nochange">COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_NOCHANGE</option>
</field>
<field name="customurl"
<field
name="customurl"
type="text"
default=""
length="50"
label="COM_JOOMLAUPDATE_CONFIG_CUSTOMURL_LABEL"
description="COM_JOOMLAUPDATE_CONFIG_CUSTOMURL_DESC" />
description="COM_JOOMLAUPDATE_CONFIG_CUSTOMURL_DESC"
/>
</fieldset>
<fieldset
name="permissions"
label="JCONFIG_PERMISSIONS_LABEL"
description="JCONFIG_PERMISSIONS_DESC">
description="JCONFIG_PERMISSIONS_DESC"
>
<field name="rules"
<field
name="rules"
type="rules"
label="JCONFIG_PERMISSIONS_LABEL"
filter="rules"
validate="rules"
component="com_joomlaupdate"
section="component" />
</fieldset>
</config>

20
administrator/components/com_languages/config.xml
View File

@ -3,9 +3,11 @@
<fieldset
name="permissions"
label="JConfig_Permissions_Label"
description="JConfig_Permissions_Desc">
description="JConfig_Permissions_Desc"
>
<field name="rules"
<field
name="rules"
type="rules"
label="JConfig_Permissions_Label"
filter="rules"
@ -13,11 +15,13 @@
component="com_languages"
section="component" />
<field type="hidden"
name="site" />
<field type="hidden"
name="administrator" />
<field
type="hidden"
name="site"
/>
<field
type="hidden"
name="administrator"
/>
</fieldset>
</config>

55
administrator/components/com_media/config.xml
View File

@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<config>
<fieldset name="component">
<field name="upload_extensions"
<field
name="upload_extensions"
type="text"
size="50"
default="bmp,csv,doc,gif,ico,jpg,jpeg,odg,odp,ods,odt,pdf,png,ppt,swf,txt,xcf,xls,BMP,CSV,DOC,GIF,ICO,JPG,JPEG,ODG,ODP,ODS,ODT,PDF,PNG,PPT,SWF,TXT,XCF,XLS"
label="COM_MEDIA_FIELD_LEGAL_EXTENSIONS_LABEL"
description="COM_MEDIA_FIELD_LEGAL_EXTENSIONS_DESC" />
<field name="upload_maxsize"
<field
name="upload_maxsize"
type="text"
size="50"
default="10"
@ -18,83 +18,96 @@
description="COM_MEDIA_FIELD_MAXIMUM_SIZE_DESC" />
<field name="spacer1" type="spacer" class="text"
label="COM_MEDIA_FOLDERS_PATH_LABEL" />
label="COM_MEDIA_FOLDERS_PATH_LABEL"
/>
<field name="file_path"
<field
name="file_path"
type="text"
size="50"
default="images"
label="COM_MEDIA_FIELD_PATH_FILE_FOLDER_LABEL"
description="COM_MEDIA_FIELD_PATH_FILE_FOLDER_DESC" />
<field name="image_path"
<field
name="image_path"
type="text"
size="50"
default="images"
label="COM_MEDIA_FIELD_PATH_IMAGE_FOLDER_LABEL"
description="COM_MEDIA_FIELD_PATH_IMAGE_FOLDER_DESC" />
<field name="restrict_uploads"
<field
name="restrict_uploads"
type="radio"
class="btn-group btn-group-yesno"
default="1"
label="COM_MEDIA_FIELD_RESTRICT_UPLOADS_LABEL"
description="COM_MEDIA_FIELD_RESTRICT_UPLOADS_DESC">
<option value="0">JNO</option>
<option value="1">JYES</option>
<option
value="0">JNO</option>
<option
value="1">JYES</option>
</field>
<field name="check_mime"
<field
name="check_mime"
type="radio"
class="btn-group btn-group-yesno"
default="1"
label="COM_MEDIA_FIELD_CHECK_MIME_LABEL"
description="COM_MEDIA_FIELD_CHECK_MIME_DESC">
<option value="0">JNO</option>
<option value="1">JYES</option>
<option
value="0">JNO</option>
<option
value="1">JYES</option>
</field>
<field name="image_extensions"
<field
name="image_extensions"
type="text"
size="50"
default="bmp,gif,jpg,png"
label="COM_MEDIA_FIELD_LEGAL_IMAGE_EXTENSIONS_LABEL"
description="COM_MEDIA_FIELD_LEGAL_IMAGE_EXTENSIONS_DESC" />
<field name="ignore_extensions"
<field
name="ignore_extensions"
type="text"
size="50"
label="COM_MEDIA_FIELD_IGNORED_EXTENSIONS_LABEL"
description="COM_MEDIA_FIELD_IGNORED_EXTENSIONS_DESC" />
<field name="upload_mime"
<field
name="upload_mime"
type="text"
size="50"
default="image/jpeg,image/gif,image/png,image/bmp,application/x-shockwave-flash,application/msword,application/excel,application/pdf,application/powerpoint,text/plain,application/x-zip"
label="COM_MEDIA_FIELD_LEGAL_MIME_TYPES_LABEL"
description="COM_MEDIA_FIELD_LEGAL_MIME_TYPES_DESC" />
<field name="upload_mime_illegal"
<field
name="upload_mime_illegal"
type="text"
size="50"
default="text/html"
label="COM_MEDIA_FIELD_ILLEGAL_MIME_TYPES_LABEL"
description="COM_MEDIA_FIELD_ILLEGAL_MIME_TYPES_DESC" />
</fieldset>
<fieldset
name="permissions"
label="JCONFIG_PERMISSIONS_LABEL"
description="JCONFIG_PERMISSIONS_DESC">
description="JCONFIG_PERMISSIONS_DESC"
>
<field name="rules"
<field
name="rules"
type="rules"
label="JCONFIG_PERMISSIONS_LABEL"
filter="rules"
validate="rules"
component="com_media"
section="component" />
</fieldset>
</config>

38
administrator/components/com_menus/config.xml
View File

@ -2,48 +2,54 @@
<config>
<fieldset
name="page-options"
label="COM_MENUS_PAGE_OPTIONS_LABEL">
label="COM_MENUS_PAGE_OPTIONS_LABEL"
>
<field name="page_title"
<field
name="page_title"
type="text"
label="COM_MENUS_ITEM_FIELD_PAGE_TITLE_LABEL"
description="COM_MENUS_ITEM_FIELD_PAGE_TITLE_DESC" />
<field name="show_page_heading"
description="COM_MENUS_ITEM_FIELD_PAGE_TITLE_DESC"
/>
<field
name="show_page_heading"
type="radio"
class="btn-group btn-group-yesno"
label="COM_MENUS_ITEM_FIELD_SHOW_PAGE_HEADING_LABEL"
description="COM_MENUS_ITEM_FIELD_SHOW_PAGE_HEADING_DESC"
default="0"
filter="integer">
filter="integer"
>
<option value="0" class="no">JNO</option>
<option value="1" class="yes">JYES</option>
</field>
<field name="page_heading"
<field
name="page_heading"
type="text"
label="COM_MENUS_ITEM_FIELD_PAGE_HEADING_LABEL"
description="COM_MENUS_ITEM_FIELD_PAGE_HEADING_DESC" />
<field name="pageclass_sfx"
description="COM_MENUS_ITEM_FIELD_PAGE_HEADING_DESC"
/>
<field
name="pageclass_sfx"
type="text"
label="COM_MENUS_ITEM_FIELD_PAGE_CLASS_LABEL"
description="COM_MENUS_ITEM_FIELD_PAGE_CLASS_DESC" />
description="COM_MENUS_ITEM_FIELD_PAGE_CLASS_DESC"
/>
</fieldset>
<fieldset
name="permissions"
label="JCONFIG_PERMISSIONS_LABEL"
description="JCONFIG_PERMISSIONS_DESC">
description="JCONFIG_PERMISSIONS_DESC"
>
<field name="rules"
<field
name="rules"
type="rules"
label="JCONFIG_PERMISSIONS_LABEL"
filter="rules"
validate="rules"
component="com_menus"
section="component" />
</fieldset>
</config>

7
administrator/components/com_messages/config.xml
View File

@ -3,15 +3,16 @@
<fieldset
name="permissions"
label="JCONFIG_PERMISSIONS_LABEL"
description="JCONFIG_PERMISSIONS_DESC">
description="JCONFIG_PERMISSIONS_DESC"
>
<field name="rules"
<field
name="rules"
type="rules"
label="JCONFIG_PERMISSIONS_LABEL"
filter="rules"
validate="rules"
component="com_messages"
section="component" />
</fieldset>
</config>

23
administrator/components/com_messages/models/forms/config.xml
View File

@ -1,34 +1,39 @@
<?xml version="1.0" encoding="utf-8"?>
<form>
<fieldset>
<field name="lock"
<field
name="lock"
type="radio"
class="btn-group btn-group-yesno"
label="COM_MESSAGES_FIELD_LOCK_LABEL"
description="COM_MESSAGES_FIELD_LOCK_DESC"
default="0">
<option value="1">JYES</option>
<option value="0">JNO</option>
<option
value="1">JYES</option>
<option
value="0">JNO</option>
</field>
<field name="mail_on_new"
<field
name="mail_on_new"
type="radio"
class="btn-group btn-group-yesno"
label="COM_MESSAGES_FIELD_MAIL_ON_NEW_LABEL"
description="COM_MESSAGES_FIELD_MAIL_ON_NEW_DESC"
default="1">
<option value="1">JYES</option>
<option value="0">JNO</option>
<option
value="1">JYES</option>
<option
value="0">JNO</option>
</field>
<field name="auto_purge"
<field
name="auto_purge"
type="text"
class="inputbox"
size="6"
default="7"
label="COM_MESSAGES_FIELD_AUTO_PURGE_LABEL"
description="COM_MESSAGES_FIELD_AUTO_PURGE_DESC" />
</fieldset>
</form>

172
administrator/components/com_newsfeeds/config.xml
View File

@ -6,31 +6,40 @@
label="COM_NEWSFEEDS_FIELD_CONFIG_NEWSFEED_SETTINGS_LABEL"
description="COM_NEWSFEEDS_FIELD_CONFIG_NEWSFEED_SETTINGS_DESC">
<field name="newsfeed_layout" type="componentlayout"
<field
name="newsfeed_layout" type="componentlayout"
label="JGLOBAL_FIELD_LAYOUT_LABEL"
description="JGLOBAL_FIELD_LAYOUT_DESC"
menuitems="true"
extension="com_newsfeeds"
view="newsfeed" />
<field name="save_history"
view="newsfeed"
/>
<field
name="save_history"
type="radio"
class="btn-group btn-group-yesno"
default="1"
label="JGLOBAL_SAVE_HISTORY_OPTIONS_LABEL"
description="JGLOBAL_SAVE_HISTORY_OPTIONS_DESC">
<option value="0">JNO</option>
<option value="1">JYES</option>
description="JGLOBAL_SAVE_HISTORY_OPTIONS_DESC"
>
<option
value="0">JNO</option>
<option
value="1">JYES</option>
</field>
<field name="history_limit"
<field
name="history_limit"
type="text"
filter="integer"
label="JGLOBAL_HISTORY_LIMIT_OPTIONS_LABEL"
description="JGLOBAL_HISTORY_LIMIT_OPTIONS_DESC"
default="5" />
default="5"
/>
<field id="show_feed_image"
<field
id="show_feed_image"
name="show_feed_image"
type="radio"
class="btn-group btn-group-yesno"
@ -41,7 +50,8 @@
<option value="1">JSHOW</option>
</field>
<field id="show_feed_description"
<field
id="show_feed_description"
name="show_feed_description"
type="radio"
class="btn-group btn-group-yesno"
@ -52,7 +62,8 @@
<option value="1">JSHOW</option>
</field>
<field id="show_item_description"
<field
id="show_item_description"
name="show_item_description"
type="radio"
class="btn-group btn-group-yesno"
@ -63,7 +74,8 @@
<option value="1">JSHOW</option>
</field>
<field id="feed_character_count"
<field
id="feed_character_count"
name="feed_character_count"
type="text"
class="inputbox"
@ -72,16 +84,28 @@
label="COM_NEWSFEEDS_FIELD_CHARACTER_COUNT_LABEL"
description="COM_NEWSFEEDS_FIELD_CHARACTER_COUNT_DESC" />
<field id="feed_display_order"
name="feed_display_order"
<field
id="feed_display_order"
name="feed_display_order"
type="list"
label="COM_NEWSFEEDS_FIELD_FEED_DISPLAY_ORDER_LABEL"
description="COM_NEWSFEEDS_FIELD_FEED_DISPLAY_ORDER_DESC">
description="COM_NEWSFEEDS_FIELD_FEED_DISPLAY_ORDER_DESC"
>
<option value="des">JGLOBAL_MOST_RECENT_FIRST</option>
<option value="asc">JGLOBAL_OLDEST_FIRST</option>
</field>
<field name="float_first"
<field
name="float_first"
type="list"
label="COM_NEWSFEEDS_FLOAT_LABEL"
description="COM_NEWSFEEDS_FLOAT_DESC">
<option value="right">COM_NEWSFEEDS_RIGHT</option>
<option value="left">COM_NEWSFEEDS_LEFT</option>
<option value="none">COM_NEWSFEEDS_NONE</option>
</field>
<field
name="float_second"
type="list"
label="COM_NEWSFEEDS_FLOAT_LABEL"
description="COM_NEWSFEEDS_FLOAT_DESC">
@ -90,16 +114,8 @@
<option value="none">COM_NEWSFEEDS_NONE</option>
</field>
<field name="float_second"
type="list"
label="COM_NEWSFEEDS_FLOAT_LABEL"
description="COM_NEWSFEEDS_FLOAT_DESC">
<option value="right">COM_NEWSFEEDS_RIGHT</option>
<option value="left">COM_NEWSFEEDS_LEFT</option>
<option value="none">COM_NEWSFEEDS_NONE</option>
</field>
<field id="show_tags"
<field
id="show_tags"
name="show_tags"
type="radio"
class="btn-group btn-group-yesno"
@ -117,23 +133,27 @@
label="JCATEGORY"
description="COM_NEWSFEEDS_FIELD_CONFIG_CATEGORY_SETTINGS_DESC">
<field name="category_layout" type="componentlayout"
<field
name="category_layout" type="componentlayout"
label="JGLOBAL_FIELD_LAYOUT_LABEL"
description="JGLOBAL_FIELD_LAYOUT_DESC"
menuitems="true"
extension="com_newsfeeds"
view="category" />
view="category"
/>
<field name="show_category_title" type="radio"
class="btn-group btn-group-yesno"
label="JGLOBAL_SHOW_CATEGORY_TITLE"
description="JGLOBAL_SHOW_CATEGORY_TITLE_DESC"
default="1">
default="1"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field id="show_description"
<field
id="show_description"
name="show_description"
type="radio"
class="btn-group btn-group-yesno"
@ -144,12 +164,14 @@
<option value="1">JSHOW</option>
</field>
<field name="show_description_image"
<field
name="show_description_image"
type="radio"
class="btn-group btn-group-yesno"
default="1"
label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL"
description="JGLOBAL_SHOW_CATEGORY_IMAGE_DESC">
description="JGLOBAL_SHOW_CATEGORY_IMAGE_DESC"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
@ -157,7 +179,8 @@
<field name="maxLevel" type="list"
description="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_DESC"
label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
default="-1">
default="-1"
>
<option value="0">JNONE</option>
<option value="-1">JALL</option>
<option value="1">J1</option>
@ -171,7 +194,8 @@
class="btn-group btn-group-yesno"
label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
description="COM_NEWSFEEDS_SHOW_EMPTY_CATEGORIES_DESC"
default="0">
default="0"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
@ -180,18 +204,21 @@
class="btn-group btn-group-yesno"
default="1"
label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC">
description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field id="show_cat_items"
<field
id="show_cat_items"
name="show_cat_items"
type="radio"
class="btn-group btn-group-yesno"
default="1"
label="COM_NEWSFEEDS_FIELD_SHOW_CAT_ITEMS_LABEL"
description="COM_NEWSFEEDS_FIELD_SHOW_CAT_ITEMS_DESC">
description="COM_NEWSFEEDS_FIELD_SHOW_CAT_ITEMS_DESC"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
@ -200,7 +227,8 @@
label="COM_NEWSFEEDS_FIELD_SHOW_CAT_TAGS_LABEL"
description="COM_NEWSFEEDS_FIELD_SHOW_CAT_TAGS_DESC"
class="btn-group btn-group-yesno"
default="1">
default="1"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
@ -215,7 +243,8 @@
default="1"
class="btn-group btn-group-yesno"
label="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_LABEL"
description="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_DESC">
description="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_DESC"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
@ -223,7 +252,8 @@
<field name="maxLevelcat" type="list"
default="-1"
description="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_DESC"
label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL">
label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
>
<option value="-1">JALL</option>
<option value="1">J1</option>
<option value="2">J2</option>
@ -232,12 +262,12 @@
<option value="5">J5</option>
</field>
<field name="show_empty_categories_cat" type="radio"
class="btn-group btn-group-yesno"
default="0"
label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
description="COM_NEWSFEEDS_SHOW_EMPTY_CATEGORIES_DESC">
description="COM_NEWSFEEDS_SHOW_EMPTY_CATEGORIES_DESC"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
@ -246,7 +276,8 @@
class="btn-group btn-group-yesno"
default="1"
description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC"
label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL">
label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
@ -255,7 +286,8 @@
class="btn-group btn-group-yesno"
default="1"
description="COM_NEWSFEEDS_FIELD_SHOW_CAT_ITEMS_DESC"
label="COM_NEWSFEEDS_FIELD_SHOW_CAT_ITEMS_LABEL">
label="COM_NEWSFEEDS_FIELD_SHOW_CAT_ITEMS_LABEL"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
@ -267,54 +299,64 @@
label="JGLOBAL_LIST_LAYOUT_OPTIONS"
description="COM_NEWSFEEDS_FIELD_CONFIG_LIST_SETTINGS_DESC">
<field name="filter_field"
<field
name="filter_field"
type="list"
default="1"
description="JGLOBAL_FILTER_FIELD_DESC"
label="JGLOBAL_FILTER_FIELD_LABEL">
label="JGLOBAL_FILTER_FIELD_LABEL"
>
<option value="hide">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field name="show_pagination_limit"
<field
name="show_pagination_limit"
type="radio"
class="btn-group btn-group-yesno"
default="1"
label="JGLOBAL_DISPLAY_SELECT_LABEL"
description="JGLOBAL_DISPLAY_SELECT_DESC">
description="JGLOBAL_DISPLAY_SELECT_DESC"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field id="show_headings"
<field
id="show_headings"
name="show_headings"
type="radio"
class="btn-group btn-group-yesno"
default="1"
label="JGLOBAL_SHOW_HEADINGS_LABEL"
description="JGLOBAL_SHOW_HEADINGS_DESC">
description="JGLOBAL_SHOW_HEADINGS_DESC"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field id="show_articles"
<field
id="show_articles"
name="show_articles"
type="radio"
class="btn-group btn-group-yesno"
default="1"
label="COM_NEWSFEEDS_FIELD_NUM_ARTICLES_COLUMN_LABEL"
description="COM_NEWSFEEDS_FIELD_NUM_ARTICLES_COLUMN_DESC">
description="COM_NEWSFEEDS_FIELD_NUM_ARTICLES_COLUMN_DESC"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field id="show_link"
<field
id="show_link"
name="show_link"
type="radio"
class="btn-group btn-group-yesno"
default="1"
label="COM_NEWSFEEDS_FIELD_SHOW_LINKS_LABEL"
description="COM_NEWSFEEDS_FIELD_SHOW_LINKS_DESC">
description="COM_NEWSFEEDS_FIELD_SHOW_LINKS_DESC"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
@ -323,18 +365,21 @@
type="list"
default="2"
label="JGLOBAL_PAGINATION_LABEL"
description="JGLOBAL_PAGINATION_DESC">
description="JGLOBAL_PAGINATION_DESC"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
<option value="2">JGLOBAL_AUTO</option>
</field>
<field name="show_pagination_results"
<field
name="show_pagination_results"
type="radio"
class="btn-group btn-group-yesno"
default="1"
label="JGLOBAL_PAGINATION_RESULTS_LABEL"
description="JGLOBAL_PAGINATION_RESULTS_DESC">
description="JGLOBAL_PAGINATION_RESULTS_DESC"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
@ -344,15 +389,16 @@
<fieldset
name="permissions"
label="JCONFIG_PERMISSIONS_LABEL"
description="JCONFIG_PERMISSIONS_DESC">
description="JCONFIG_PERMISSIONS_DESC"
>
<field name="rules"
<field
name="rules"
type="rules"
label="JCONFIG_PERMISSIONS_LABEL"
filter="rules"
validate="rules"
component="com_newsfeeds"
section="component"/>
</fieldset>
</config>

4
administrator/components/com_plugins/config.xml
View File

@ -5,13 +5,13 @@
label="JCONFIG_PERMISSIONS_LABEL"
description="JCONFIG_PERMISSIONS_DESC">
<field name="rules"
<field
name="rules"
type="rules"
label="JCONFIG_PERMISSIONS_LABEL"
filter="rules"
validate="rules"
component="com_plugins"
section="component" />
</fieldset>
</config>

4
administrator/components/com_redirect/config.xml
View File

@ -5,13 +5,13 @@
label="JCONFIG_PERMISSIONS_LABEL"
description="JCONFIG_PERMISSIONS_DESC">
<field name="rules"
<field
name="rules"
type="rules"
label="JCONFIG_PERMISSIONS_LABEL"
filter="rules"
validate="rules"
component="com_redirect"
section="component" />
</fieldset>
</config>

43
administrator/components/com_search/config.xml
View File

@ -1,16 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<config>
<fieldset name="component">
<field name="enabled"
<field
name="enabled"
type="radio"
class="btn-group btn-group-yesno"
default="0"
label="COM_SEARCH_CONFIG_GATHER_SEARCH_STATISTICS_LABEL"
description="COM_SEARCH_CONFIG_GATHER_SEARCH_STATISTICS_DESC">
<option value="0">JNO</option>
<option value="1">JYES</option>
<option
value="0">JNO</option>
<option
value="1">JYES</option>
</field>
<field name="search_areas"
@ -18,46 +19,54 @@
class="btn-group btn-group-yesno"
default="1"
description="COM_SEARCH_FIELD_SEARCH_AREAS_DESC"
label="COM_SEARCH_FIELD_SEARCH_AREAS_LABEL">
label="COM_SEARCH_FIELD_SEARCH_AREAS_LABEL"
>
<option value="0">JNO</option>
<option value="1">JYES</option>
</field>
<field name="show_date"
<field
name="show_date"
type="radio"
class="btn-group btn-group-yesno"
default="1"
label="COM_SEARCH_CONFIG_FIELD_CREATED_DATE_LABEL"
description="COM_SEARCH_CONFIG_FIELD_CREATED_DATE_DESC">
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
<option
value="0">JHIDE</option>
<option
value="1">JSHOW</option>
</field>
<field name="opensearch_name"
<field
name="opensearch_name"
type="text"
label="COM_SEARCH_CONFIG_FIELD_OPENSEARCH_NAME_LABEL"
description="COM_SEARCH_CONFIG_FIELD_OPENSEARCH_NAME_DESC" />
description="COM_SEARCH_CONFIG_FIELD_OPENSEARCH_NAME_DESC"
/>
<field name="opensearch_description"
<field
name="opensearch_description"
type="textarea"
label="COM_SEARCH_CONFIG_FIELD_OPENSEARCH_DESCRIPTON_LABEL"
description="COM_SEARCH_CONFIG_FIELD_OPENSEARCH_DESCRIPTON_DESC"
cols="30" rows="2" />
cols="30" rows="2"
/>
</fieldset>
<fieldset
name="permissions"
label="JCONFIG_PERMISSIONS_LABEL"
description="JCONFIG_PERMISSIONS_DESC">
description="JCONFIG_PERMISSIONS_DESC"
>
<field name="rules"
<field
name="rules"
type="rules"
label="JCONFIG_PERMISSIONS_LABEL"
filter="rules"
validate="rules"
component="com_search"
section="component" />
</fieldset>
</config>

251
administrator/components/com_tags/config.xml
View File

@ -5,57 +5,69 @@
label="COM_TAGS_CONFIG_TAG_SETTINGS_LABEL"
description="COM_TAGS_CONFIG_TAG_SETTINGS_DESC">
<field name="tag_layout"
<field
name="tag_layout"
type="componentlayout"
label="COM_TAGS_CONFIG_TAGGED_ITEMS_FIELD_LAYOUT_LABEL"
description="COM_TAGS_CONFIG_TAGGED_ITEMS_FIELD_LAYOUT_DESC"
menuitems="true"
extension="com_tags"
view="tag" />
<field name="show_tag_title"
view="tag"
/>
<field
name="show_tag_title"
type="radio" class="btn-group btn-group-yesno"
label="COM_TAGS_SHOW_TAG_TITLE_LABEL"
description="COM_TAGS_SHOW_TAG_TITLE_DESC"
default="0">
default="0"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field name="tag_list_show_tag_image"
<field
name="tag_list_show_tag_image"
type="radio" class="btn-group btn-group-yesno"
description="COM_TAGS_SHOW_TAG_IMAGE_DESC"
label="COM_TAGS_SHOW_TAG_IMAGE_LABEL"
default="1">
default="1"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field name="tag_list_show_tag_description"
type="radio"
<field
name="tag_list_show_tag_description"
type="radio"
class="btn-group btn-group-yesno"
description="COM_TAGS_SHOW_TAG_DESCRIPTION_DESC"
label="COM_TAGS_SHOW_TAG_DESCRIPTION_LABEL"
default="1">
default="1"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field name="tag_list_image"
<field
name="tag_list_image"
type="media"
description="COM_TAGS_TAG_LIST_MEDIA_DESC"
label="COM_TAGS_TAG_LIST_MEDIA_LABEL" />
<field name="show_tag_num_items"
type="radio"
label="COM_TAGS_TAG_LIST_MEDIA_LABEL"
/>
<field
name="show_tag_num_items"
type="radio"
class="btn-group btn-group-yesno"
label="COM_TAGS_NUMBER_TAG_ITEMS_LABEL"
description="COM_TAGS_NUMBER_TAG_ITEMS_DESC"
default="0">
default="0"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field name="tag_list_orderby"
type="list"
default="title"
@ -68,57 +80,68 @@
<option value="publish_up">JGLOBAL_PUBLISHED_DATE</option>
</field>
<field name="tag_list_orderby_direction"
type="radio"
<field
name="tag_list_orderby_direction"
type="radio"
class="btn-group btn-group-yesno"
description="JGLOBAL_ORDER_DIRECTION_DESC"
label="JGLOBAL_ORDER_DIRECTION_LABEL"
default="ASC">
default="ASC"
>
<option value="ASC">JGLOBAL_ORDER_ASCENDING</option>
<option value="DESC">JGLOBAL_ORDER_DESCENDING</option>
</field>
<field name="show_headings"
<field
name="show_headings"
type="radio"
class="btn-group btn-group-yesno"
default="1"
default="1"
description="JGLOBAL_SHOW_HEADINGS_DESC"
label="JGLOBAL_SHOW_HEADINGS_LABEL">
label="JGLOBAL_SHOW_HEADINGS_LABEL"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field name="tag_list_show_date"
<field
name="tag_list_show_date"
type="list"
default="0"
label="JGLOBAL_SHOW_DATE_LABEL"
description="JGLOBAL_SHOW_DATE_DESC">
description="JGLOBAL_SHOW_DATE_DESC"
>
<option value="0">JHIDE</option>
<option value="created">JGLOBAL_CREATED</option>
<option value="modified">JGLOBAL_MODIFIED</option>
<option value="published">JPUBLISHED</option>
</field>
<field name="tag_list_show_item_image"
type="radio"
<field
name="tag_list_show_item_image"
type="radio"
class="btn-group btn-group-yesno"
description="COM_TAGS_SHOW_ITEM_IMAGE_DESC"
label="COM_TAGS_SHOW_ITEM_IMAGE_LABEL"
default="1">
default="1"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field name="tag_list_show_item_description"
type="radio"
class="btn-group btn-group-yesno"
<field
name="tag_list_show_item_description"
type="list"
label="COM_TAGS_TAG_LIST_SHOW_ITEM_DESCRIPTION_LABEL"
description="COM_TAGS_TAG_LIST_SHOW_ITEM_DESCRIPTION_DESC">
description="COM_TAGS_TAG_LIST_SHOW_ITEM_DESCRIPTION_DESC"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field name="tag_list_item_maximum_characters"
<field
name="tag_list_item_maximum_characters"
type="text"
filter="integer"
label="COM_TAGS_LIST_MAX_CHARACTERS_LABEL"
@ -126,41 +149,47 @@
</field>
</fieldset>
<fieldset
name="tagselection"
label="COM_TAGS_CONFIG_SELECTION_SETTINGS_LABEL"
description="COM_TAGS_CONFIG_SELECTION_SETTINGS_DESC">
<field name="return_any_or_all"
type="radio"
<field
name="return_any_or_all"
type="radio"
class="btn-group btn-group-yesno"
label="COM_TAGS_SEARCH_TYPE_LABEL"
description="COM_TAGS_SEARCH_TYPE_DESC"
default="1">
default="1"
>
<option value="0">COM_TAGS_ALL</option>
<option value="1">COM_TAGS_ANY</option>
</field>
<field name="include_children"
type="radio"
<field
name="include_children"
type="radio"
class="btn-group btn-group-yesno"
description="COM_TAGS_INCLUDE_CHILDREN_DESC"
label="COM_TAGS_INCLUDE_CHILDREN_LABEL"
default="0">
default="0"
>
<option value="0">COM_TAGS_EXCLUDE</option>
<option value="1">COM_TAGS_INCLUDE</option>
</field>
<field name="maximum"
<field
name="maximum"
type="text"
default="200"
filter="integer"
label="COM_TAGS_LIST_MAX_LABEL"
description="COM_TAGS_LIST_MAX_DESC">
</field>
<field name="tag_list_language_filter"
<field
name="tag_list_language_filter"
type="contentlanguage"
default="all"
label="COM_TAGS_FIELD_LANGUAGE_FILTER_LABEL"
@ -169,27 +198,31 @@
<option value="current_language">JCURRENT</option>
</field>
</fieldset>
</fieldset>
<fieldset
name="alltags"
label="COM_TAGS_CONFIG_ALL_TAGS_SETTINGS_LABEL"
description="COM_TAGS_CONFIG_ALL_TAGS_SETTINGS_DESC">
<field name="tags_layout"
<field
name="tags_layout"
type="componentlayout"
label="COM_TAGS_CONFIG_ALL_TAGS_FIELD_LAYOUT_LABEL"
description="COM_TAGS_CONFIG_ALL_TAGS_FIELD_LAYOUT_DESC"
menuitems="true"
extension="com_tags"
view="tags" />
view="tags"
/>
<field name="all_tags_orderby"
<field
name="all_tags_orderby"
type="list"
default="title"
label="JGLOBAL_FIELD_FIELD_ORDERING_LABEL"
description="JGLOBAL_FIELD_FIELD_ORDERING_DESC">
description="JGLOBAL_FIELD_FIELD_ORDERING_DESC"
>
<option value="title">JGLOBAL_TITLE</option>
<option value="hits">JGLOBAL_HITS</option>
<option value="created_time">JGLOBAL_CREATED_DATE</option>
@ -197,48 +230,58 @@
<option value="publish_up">JGLOBAL_PUBLISHED_DATE</option>
</field>
<field name="all_tags_orderby_direction"
type="radio"
<field
name="all_tags_orderby_direction"
type="radio"
class="btn-group btn-group-yesno"
description="JGLOBAL_ORDER_DIRECTION_DESC"
label="JGLOBAL_ORDER_DIRECTION_LABEL"
default="ASC">
default="ASC"
>
<option value="ASC">JGLOBAL_ORDER_ASCENDING</option>
<option value="DESC">JGLOBAL_ORDER_DESCENDING</option>
</field>
<field name="all_tags_show_tag_image"
type="radio"
<field
name="all_tags_show_tag_image"
type="radio"
class="btn-group btn-group-yesno"
description="COM_TAGS_SHOW_ITEM_IMAGE_DESC"
label="COM_TAGS_SHOW_ITEM_IMAGE_LABEL"
default="1">
default="1"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field name="all_tags_show_tag_descripion"
type="radio"
<field
name="all_tags_show_tag_descripion"
type="radio"
class="btn-group btn-group-yesno"
description="COM_TAGS_SHOW_ITEM_DESCRIPTION_DESC"
label="COM_TAGS_SHOW_ITEM_DESCRIPTION_LABEL"
default="1">
default="1"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field name="all_tags_tag_maximum_characters"
<field
name="all_tags_tag_maximum_characters"
type="text"
filter="integer"
label="COM_TAGS_LIST_MAX_CHARACTERS_LABEL"
description="COM_TAGS_LIST_MAX_CHARACTERS_DESC" />
<field name="all_tags_show_tag_hits"
type="radio"
description="COM_TAGS_LIST_MAX_CHARACTERS_DESC"
/>
<field
name="all_tags_show_tag_hits"
type="radio"
class="btn-group btn-group-yesno"
description="COM_TAGS_FIELD_CONFIG_HITS_DESC"
label="JGLOBAL_HITS"
default="0">
default="0"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
@ -248,75 +291,86 @@
name="shared"
label="COM_TAGS_CONFIG_SHARED_SETTINGS_LABEL"
description="COM_TAGS_CONFIG_SHARED_SETTINGS_DESC">
<field name="filter_field"
<field
name="filter_field"
type="radio"
class="btn-group btn-group-yesno"
default="1"
description="JGLOBAL_FILTER_FIELD_DESC"
label="JGLOBAL_FILTER_FIELD_LABEL">
label="JGLOBAL_FILTER_FIELD_LABEL"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field name="show_pagination_limit"
<field
name="show_pagination_limit"
type="radio"
default="1"
class="btn-group btn-group-yesno"
description="JGLOBAL_DISPLAY_SELECT_DESC"
label="JGLOBAL_DISPLAY_SELECT_LABEL">
label="JGLOBAL_DISPLAY_SELECT_LABEL"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field name="show_pagination"
<field
name="show_pagination"
type="list"
class="chzn-color"
default="2"
description="JGLOBAL_PAGINATION_DESC"
label="JGLOBAL_PAGINATION_LABEL">
label="JGLOBAL_PAGINATION_LABEL"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
<option value="2">JGLOBAL_AUTO</option>
</field>
<field name="show_pagination_results"
<field
name="show_pagination_results"
type="radio"
class="btn-group btn-group-yesno"
default="1"
label="JGLOBAL_PAGINATION_RESULTS_LABEL"
description="JGLOBAL_PAGINATION_RESULTS_DESC">
description="JGLOBAL_PAGINATION_RESULTS_DESC"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
</fieldset>
<fieldset
name="data_entry"
label="COM_TAGS_CONFIG_DATA_ENTRY_SETTINGS_LABEL"
description="COM_TAGS_CONFIG_DATA_ENTRY_SETTINGS_DESC">
<field name="tag_field_ajax_mode"
type="radio"
<field
name="tag_field_ajax_mode"
type="radio"
class="btn-group btn-group-yesno"
description="COM_TAGS_TAG_FIELD_MODE_DESC"
label="COM_TAGS_TAG_FIELD_MODE_LABEL"
default="1">
default="1"
>
<option value="1">COM_TAGS_TAG_FIELD_MODE_AJAX</option>
<option value="0">COM_TAGS_TAG_FIELD_MODE_NESTED</option>
</field>
</fieldset>
<fieldset
<fieldset
name="integration"
label="JGLOBAL_INTEGRATION_LABEL"
description="COM_TAGS_CONFIG_INTEGRATION_SETTINGS_DESC">
description="COM_TAGS_CONFIG_INTEGRATION_SETTINGS_DESC"
>
<field name="show_feed_link"
<field
name="show_feed_link"
type="radio"
class="btn-group btn-group-yesno"
default="1"
@ -331,15 +385,16 @@
<fieldset
name="permissions"
label="JCONFIG_PERMISSIONS_LABEL"
description="JCONFIG_PERMISSIONS_DESC">
description="JCONFIG_PERMISSIONS_DESC"
>
<field name="rules"
<field
name="rules"
type="rules"
label="JCONFIG_PERMISSIONS_LABEL"
filter="rules"
validate="rules"
component="com_tags"
section="component" />
</fieldset>
</config>

18
administrator/components/com_templates/config.xml
View File

@ -5,30 +5,32 @@
label="COM_TEMPLATES_SUBMENU_TEMPLATES"
description="COM_TEMPLATES_CONFIG_FIELDSET_DESC">
<field name="template_positions_display"
<field
name="template_positions_display"
type="radio"
class="btn-group btn-group-yesno"
default="0"
label="COM_TEMPLATES_CONFIG_POSITIONS_LABEL"
description="COM_TEMPLATES_CONFIG_POSITIONS_DESC">
<option value="0">JDISABLED</option>
<option value="1">JENABLED</option>
<option
value="0">JDISABLED</option>
<option
value="1">JENABLED</option>
</field>
</fieldset>
<fieldset
name="permissions"
label="JCONFIG_PERMISSIONS_LABEL"
description="JCONFIG_PERMISSIONS_DESC">
<field name="rules"
description="JCONFIG_PERMISSIONS_DESC"
>
<field
name="rules"
type="rules"
label="JCONFIG_PERMISSIONS_LABEL"
filter="rules"
validate="rules"
component="com_templates"
section="component" />
</fieldset>
</config>

126
administrator/components/com_users/config.xml
View File

@ -1,104 +1,127 @@
<?xml version="1.0" encoding="utf-8"?>
<config>
<fieldset name="component">
<field name="allowUserRegistration"
<field
name="allowUserRegistration"
type="radio"
class="btn-group btn-group-yesno"
default="1"
label="COM_USERS_CONFIG_FIELD_ALLOWREGISTRATION_LABEL"
description="COM_USERS_CONFIG_FIELD_ALLOWREGISTRATION_DESC">
<option value="0">JNO</option>
<option value="1">JYES</option>
<option
value="0">JNO</option>
<option
value="1">JYES</option>
</field>
<field name="new_usertype"
<field
name="new_usertype"
type="usergroup"
default="2"
label="COM_USERS_CONFIG_FIELD_NEW_USER_TYPE_LABEL"
description="COM_USERS_CONFIG_FIELD_NEW_USER_TYPE_DESC">
</field>
<field name="guest_usergroup"
<field
name="guest_usergroup"
type="usergroup"
default="1"
label="COM_USERS_CONFIG_FIELD_GUEST_USER_GROUP_LABEL"
description="COM_USERS_CONFIG_FIELD_GUEST_USER_GROUP_DESC">
</field>
<field name="sendpassword"
<field
name="sendpassword"
type="radio"
class="btn-group btn-group-yesno"
default="1"
label="COM_USERS_CONFIG_FIELD_SENDPASSWORD_LABEL"
description="COM_USERS_CONFIG_FIELD_SENDPASSWORD_DESC">
<option value="0">JNO</option>
<option value="1">JYES</option>
<option
value="0">JNO</option>
<option
value="1">JYES</option>
</field>
<field name="useractivation"
<field
name="useractivation"
type="list"
default="2"
label="COM_USERS_CONFIG_FIELD_USERACTIVATION_LABEL"
description="COM_USERS_CONFIG_FIELD_USERACTIVATION_DESC">
<option value="0">JNONE</option>
<option value="1">COM_USERS_CONFIG_FIELD_USERACTIVATION_OPTION_SELFACTIVATION</option>
<option value="2">COM_USERS_CONFIG_FIELD_USERACTIVATION_OPTION_ADMINACTIVATION</option>
<option
value="0">JNONE</option>
<option
value="1">COM_USERS_CONFIG_FIELD_USERACTIVATION_OPTION_SELFACTIVATION</option>
<option
value="2">COM_USERS_CONFIG_FIELD_USERACTIVATION_OPTION_ADMINACTIVATION</option>
</field>
<field name="mail_to_admin"
<field
name="mail_to_admin"
type="radio"
class="btn-group btn-group-yesno"
default="1"
label="COM_USERS_CONFIG_FIELD_MAILTOADMIN_LABEL"
description="COM_USERS_CONFIG_FIELD_MAILTOADMIN_DESC">
<option value="0">JNO</option>
<option value="1">JYES</option>
<option
value="0">JNO</option>
<option
value="1">JYES</option>
</field>
<field name="captcha"
<field
name="captcha"
type="plugins"
folder="captcha"
default=""
label="COM_USERS_CONFIG_FIELD_CAPTCHA_LABEL"
description="COM_USERS_CONFIG_FIELD_CAPTCHA_DESC"
filter="cmd" >
<option value="">JOPTION_USE_DEFAULT</option>
<option value="0">JOPTION_DO_NOT_USE</option>
<option
value="">JOPTION_USE_DEFAULT</option>
<option
value="0">JOPTION_DO_NOT_USE</option>
</field>
<field name="frontend_userparams"
<field
name="frontend_userparams"
type="radio"
class="btn-group btn-group-yesno"
default="1"
label="COM_USERS_CONFIG_FIELD_FRONTEND_USERPARAMS_LABEL"
description="COM_USERS_CONFIG_FIELD_FRONTEND_USERPARAMS_DESC">
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
<option
value="0">JHIDE</option>
<option
value="1">JSHOW</option>
</field>
<field name="site_language"
<field
name="site_language"
type="radio"
class="btn-group btn-group-yesno"
default="0"
label="COM_USERS_CONFIG_FIELD_FRONTEND_LANG_LABEL"
description="COM_USERS_CONFIG_FIELD_FRONTEND_LANG_DESC">
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
<option
value="0">JHIDE</option>
<option
value="1">JSHOW</option>
</field>
<field name="change_login_name"
<field
name="change_login_name"
type="radio"
class="btn-group btn-group-yesno"
default="0"
label="COM_USERS_CONFIG_FIELD_CHANGEUSERNAME_LABEL"
description="COM_USERS_CONFIG_FIELD_CHANGEUSERNAME_DESC">
<option value="0">JNO</option>
<option value="1">JYES</option>
<option
value="0">JNO</option>
<option
value="1">JYES</option>
</field>
<field name="reset_count"
<field
name="reset_count"
type="integer"
label="COM_USERS_CONFIG_FIELD_FRONTEND_RESET_COUNT_LABEL"
description="COM_USERS_CONFIG_FIELD_FRONTEND_RESET_COUNT_DESC"
@ -107,8 +130,8 @@
step="1"
default="10">
</field>
<field name="reset_time"
<field
name="reset_time"
type="integer"
label="COM_USERS_CONFIG_FIELD_FRONTEND_RESET_TIME_LABEL"
description="COM_USERS_CONFIG_FIELD_FRONTEND_RESET_TIME_DESC"
@ -118,7 +141,8 @@
default="1">
</field>
<field name="minimum_length"
<field
name="minimum_length"
type="integer"
label="COM_USERS_CONFIG_FIELD_MINIMUM_PASSWORD_LENGTH"
description="COM_USERS_CONFIG_FIELD_MINIMUM_PASSWORD_LENGTH_DESC"
@ -128,7 +152,8 @@
default="4">
</field>
<field name="minimum_integers"
<field
name="minimum_integers"
type="integer"
label="COM_USERS_CONFIG_FIELD_MINIMUM_INTEGERS"
description="COM_USERS_CONFIG_FIELD_MINIMUM_INTEGERS_DESC"
@ -138,7 +163,8 @@
default="0">
</field>
<field name="minimum_symbols"
<field
name="minimum_symbols"
type="integer"
label="COM_USERS_CONFIG_FIELD_MINIMUM_SYMBOLS"
description="COM_USERS_CONFIG_FIELD_MINIMUM_SYMBOLS_DESC"
@ -147,8 +173,8 @@
step="1"
default="0">
</field>
<field name="minimum_uppercase"
<field
name="minimum_uppercase"
type="integer"
label="COM_USERS_CONFIG_FIELD_MINIMUM_UPPERCASE"
description="COM_USERS_CONFIG_FIELD_MINIMUM_UPPERCASE_DESC"
@ -157,7 +183,6 @@
step="1"
default="0">
</field>
</fieldset>
<fieldset
@ -165,32 +190,37 @@
label="COM_USERS_MASS_MAIL"
description="COM_USERS_MASS_MAIL_DESC">
<field name="mailSubjectPrefix"
<field
name="mailSubjectPrefix"
type="text"
label="COM_USERS_CONFIG_FIELD_SUBJECT_PREFIX_LABEL"
description="COM_USERS_CONFIG_FIELD_SUBJECT_PREFIX_DESC" />
description="COM_USERS_CONFIG_FIELD_SUBJECT_PREFIX_DESC"
/>
<field name="mailBodySuffix"
<field
name="mailBodySuffix"
type="textarea"
rows="5"
cols="30"
label="COM_USERS_CONFIG_FIELD_MAILBODY_SUFFIX_LABEL"
description="COM_USERS_CONFIG_FIELD_MAILBODY_SUFFIX_DESC" />
description="COM_USERS_CONFIG_FIELD_MAILBODY_SUFFIX_DESC"
/>
</fieldset>
<fieldset
name="permissions"
label="JCONFIG_PERMISSIONS_LABEL"
description="JCONFIG_PERMISSIONS_DESC">
description="JCONFIG_PERMISSIONS_DESC"
>
<field name="rules"
<field
name="rules"
type="rules"
label="JCONFIG_PERMISSIONS_LABEL"
filter="rules"
validate="rules"
component="com_users"
section="component" />
</fieldset>
</config>

134
administrator/components/com_weblinks/config.xml
View File

@ -1,42 +1,50 @@
<?xml version="1.0" encoding="utf-8"?>
<config>
<fieldset name="component"
label="COM_WEBLINKS_COMPONENT_LABEL"
description="COM_WEBLINKS_COMPONENT_DESC">
description="COM_WEBLINKS_COMPONENT_DESC"
>
<field name="target" type="list"
default="0"
description="COM_WEBLINKS_FIELD_TARGET_DESC"
label="COM_WEBLINKS_FIELD_TARGET_LABEL">
label="COM_WEBLINKS_FIELD_TARGET_LABEL"
>
<option value="0">JBROWSERTARGET_PARENT</option>
<option value="1">JBROWSERTARGET_NEW</option>
<option value="2">JBROWSERTARGET_POPUP</option>
<option value="3">JBROWSERTARGET_MODAL</option>
</field>
<field name="save_history"
<field
name="save_history"
type="radio"
class="btn-group btn-group-yesno"
default="1"
label="JGLOBAL_SAVE_HISTORY_OPTIONS_LABEL"
description="JGLOBAL_SAVE_HISTORY_OPTIONS_DESC">
<option value="0">JNO</option>
<option value="1">JYES</option>
description="JGLOBAL_SAVE_HISTORY_OPTIONS_DESC"
>
<option
value="0">JNO</option>
<option
value="1">JYES</option>
</field>
<field name="history_limit"
<field
name="history_limit"
type="text"
filter="integer"
label="JGLOBAL_HISTORY_LIMIT_OPTIONS_LABEL"
description="JGLOBAL_HISTORY_LIMIT_OPTIONS_DESC"
default="5" />
default="5"
/>
<field name="count_clicks" type="radio"
class="btn-group btn-group-yesno"
default="1"
label="COM_WEBLINKS_FIELD_COUNTCLICKS_LABEL"
description="COM_WEBLINKS_FIELD_COUNTCLICKS_DESC">
<option value="0">JNO</option>
<option value="1">JYES</option>
</field>
@ -53,9 +61,20 @@
<field name="link_icons" type="media"
description="COM_WEBLINKS_FIELD_CONFIG_ICON_DESC"
label="COM_WEBLINKS_FIELD_CONFIG_ICON_LABEL" />
label="COM_WEBLINKS_FIELD_CONFIG_ICON_LABEL"
/>
<field name="float_first"
<field
name="float_first"
type="list"
label="COM_WEBLINKS_FLOAT_LABEL"
description="COM_WEBLINKS_FLOAT_DESC">
<option value="right">COM_WEBLINKS_RIGHT</option>
<option value="left">COM_WEBLINKS_LEFT</option>
<option value="none">COM_WEBLINKS_NONE</option>
</field>
<field
name="float_second"
type="list"
label="COM_WEBLINKS_FLOAT_LABEL"
description="COM_WEBLINKS_FLOAT_DESC">
@ -64,16 +83,8 @@
<option value="none">COM_WEBLINKS_NONE</option>
</field>
<field name="float_second"
type="list"
label="COM_WEBLINKS_FLOAT_LABEL"
description="COM_WEBLINKS_FLOAT_DESC">
<option value="right">COM_WEBLINKS_RIGHT</option>
<option value="left">COM_WEBLINKS_LEFT</option>
<option value="none">COM_WEBLINKS_NONE</option>
</field>
<field id="show_tags"
<field
id="show_tags"
name="show_tags"
type="radio"
class="btn-group btn-group-yesno"
@ -88,20 +99,24 @@
<fieldset name="category"
label="JCATEGORY"
description="COM_WEBLINKS_CATEGORY_DESC">
description="COM_WEBLINKS_CATEGORY_DESC"
>
<field name="category_layout" type="componentlayout"
<field
name="category_layout" type="componentlayout"
label="JGLOBAL_FIELD_LAYOUT_LABEL"
description="JGLOBAL_FIELD_LAYOUT_DESC"
menuitems="true"
extension="com_weblinks"
view="category" />
view="category"
/>
<field name="show_category_title" type="radio"
class="btn-group btn-group-yesno"
label="JGLOBAL_SHOW_CATEGORY_TITLE"
description="JGLOBAL_SHOW_CATEGORY_TITLE_DESC"
default="1">
default="1"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
@ -129,7 +144,8 @@
<field name="maxLevel" type="list"
description="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_DESC"
label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
default="-1">
default="-1"
>
<option value="0">JNONE</option>
<option value="-1">JALL</option>
<option value="1">J1</option>
@ -143,7 +159,8 @@
class="btn-group btn-group-yesno"
label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
description="COM_WEBLINKS_SHOW_EMPTY_CATEGORIES_DESC"
default="0">
default="0"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
@ -152,7 +169,8 @@
class="btn-group btn-group-yesno"
default="1"
description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC"
label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL">
label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
@ -161,7 +179,8 @@
class="btn-group btn-group-yesno"
default="1"
description="COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_DESC"
label="COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_LABEL">
label="COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_LABEL"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
@ -170,7 +189,8 @@
label="COM_WEBLINKS_FIELD_SHOW_CAT_TAGS_LABEL"
description="COM_WEBLINKS_FIELD_SHOW_CAT_TAGS_DESC"
class="btn-group btn-group-yesno"
default="1">
default="1"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
@ -179,13 +199,14 @@
<fieldset name="categories"
label="JCATEGORIES"
description="COM_WEBLINKS_CATEGORIES_DESC">
description="COM_WEBLINKS_CATEGORIES_DESC"
>
<field name="show_base_description" type="radio"
class="btn-group btn-group-yesno"
default="1"
label="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_LABEL"
description="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_DESC">
description="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_DESC"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
@ -193,7 +214,8 @@
<field name="maxLevelcat" type="list"
default="-1"
description="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_DESC"
label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL">
label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
>
<option value="-1">JALL</option>
<option value="1">J1</option>
<option value="2">J2</option>
@ -202,12 +224,12 @@
<option value="5">J5</option>
</field>
<field name="show_empty_categories_cat" type="radio"
class="btn-group btn-group-yesno"
default="0"
label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
description="COM_WEBLINKS_SHOW_EMPTY_CATEGORIES_DESC">
description="COM_WEBLINKS_SHOW_EMPTY_CATEGORIES_DESC"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
@ -216,7 +238,8 @@
class="btn-group btn-group-yesno"
default="1"
description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC"
label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL">
label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
@ -225,7 +248,9 @@
class="btn-group btn-group-yesno"
default="1"
description="COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_DESC"
label="COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_LABEL">
label="COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_LABEL"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
@ -235,18 +260,22 @@
<fieldset name="list_layout"
label="JGLOBAL_LIST_LAYOUT_OPTIONS"
description="COM_WEBLINKS_LIST_LAYOUT_DESC">
description="COM_WEBLINKS_LIST_LAYOUT_DESC"
>
<field name="filter_field"
<field
name="filter_field"
type="list"
default="1"
description="JGLOBAL_FILTER_FIELD_DESC"
label="JGLOBAL_FILTER_FIELD_LABEL">
label="JGLOBAL_FILTER_FIELD_LABEL"
>
<option value="hide">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field name="show_pagination_limit"
<field
name="show_pagination_limit"
type="radio" default="1"
class="btn-group btn-group-yesno"
label="JGLOBAL_DISPLAY_SELECT_LABEL"
@ -259,7 +288,8 @@
default="1"
class="btn-group btn-group-yesno"
description="JGLOBAL_SHOW_HEADINGS_DESC"
label="JGLOBAL_SHOW_HEADINGS_LABEL">
label="JGLOBAL_SHOW_HEADINGS_LABEL"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
@ -268,7 +298,8 @@
default="1"
class="btn-group btn-group-yesno"
description="COM_WEBLINKS_FIELD_CONFIG_LINKDESCRIPTION_DESC"
label="COM_WEBLINKS_FIELD_CONFIG_LINKDESCRIPTION_LABEL">
label="COM_WEBLINKS_FIELD_CONFIG_LINKDESCRIPTION_LABEL"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
@ -277,7 +308,8 @@
class="btn-group btn-group-yesno"
default="1"
description="COM_WEBLINKS_FIELD_CONFIG_HITS_DESC"
label="JGLOBAL_HITS">
label="JGLOBAL_HITS"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
@ -307,9 +339,11 @@
<fieldset
name="integration"
label="JGLOBAL_INTEGRATION_LABEL"
description="COM_WEBLINKS_CONFIG_INTEGRATION_SETTINGS_DESC">
description="COM_WEBLINKS_CONFIG_INTEGRATION_SETTINGS_DESC"
>
<field name="show_feed_link"
<field
name="show_feed_link"
type="radio"
class="btn-group btn-group-yesno"
default="1"
@ -323,7 +357,8 @@
<fieldset name="permissions"
description="JCONFIG_PERMISSIONS_DESC"
label="JCONFIG_PERMISSIONS_LABEL">
label="JCONFIG_PERMISSIONS_LABEL"
>
<field name="rules" type="rules"
component="com_weblinks"
@ -331,6 +366,5 @@
validate="rules"
label="JCONFIG_PERMISSIONS_LABEL"
section="component" />
</fieldset>
</config>

2
administrator/modules/mod_menu/tmpl/default_enabled.php
View File

@ -223,10 +223,10 @@ if ($user->authorise('core.manage', 'com_content'))
}
$menu->addChild(new JMenuNode(JText::_('MOD_MENU_COM_CONTENT_FEATURED'), 'index.php?option=com_content&view=featured', 'class:featured'));
$menu->addSeparator();
if ($user->authorise('core.manage', 'com_media'))
{
$menu->addSeparator();
$menu->addChild(new JMenuNode(JText::_('MOD_MENU_MEDIA_MANAGER'), 'index.php?option=com_media', 'class:media'));
}

8
layouts/joomla/toolbar/help.php
View File

@ -9,11 +9,11 @@
defined('_JEXEC') or die;
$url = $displayData['url'];
$text = $displayData['text'];
$doTask = $displayData['doTask'];
$text = $displayData['text'];
?>
<a href="<?php echo $url; ?>" target="_blank" rel="help" class="btn btn-small">
<button onclick="<?php echo $doTask; ?>" rel="help" class="btn btn-small">
<span class="icon-question-sign"></span>
<?php echo $text; ?>
</a>
</button>

10
layouts/joomla/toolbar/link.php
View File

@ -9,12 +9,12 @@
defined('_JEXEC') or die;
$url = $displayData['url'];
$class = $displayData['class'];
$text = $displayData['text'];
$doTask = $displayData['doTask'];
$class = $displayData['class'];
$text = $displayData['text'];
?>
<a href="<?php echo $url; ?>" class="btn btn-small">
<button onclick="location.href='<?php echo $doTask; ?>';" class="btn btn-small">
<span class="<?php echo $class; ?>"></span>
<?php echo $text; ?>
</a>
</button>

316
libraries/cms/layout/file.php
View File

@ -38,18 +38,35 @@ class JLayoutFile extends JLayoutBase
*/
protected $fullPath = null;
/**
* Paths to search for layouts
*
* @var array
* @since 3.2
*/
protected $includePaths = array();
/**
* Method to instantiate the file-based layout.
*
* @param string $layoutId Dot separated path to the layout file, relative to base path
* @param string $basePath Base path to use when loading layout files
* @param mixed $options Optional custom options to load. JRegistry or array format [@since 3.2]
*
* @since 3.0
*/
public function __construct($layoutId, $basePath = null)
public function __construct($layoutId, $basePath = null, $options = null)
{
$this->layoutId = $layoutId;
$this->basePath = is_null($basePath) ? JPATH_ROOT . '/layouts' : rtrim($basePath, DIRECTORY_SEPARATOR);
// Initialise / Load options
$this->setOptions($options);
// Main properties
$this->setLayout($layoutId);
$this->basePath = $basePath;
// Init Enviroment
$this->setComponent($this->options->get('component', 'auto'));
$this->setClient($this->options->get('client', 'auto'));
}
/**
@ -68,6 +85,11 @@ class JLayoutFile extends JLayoutBase
// Check possible overrides, and build the full path to layout file
$path = $this->getPath();
if ($this->options->get('debug', false))
{
echo "<pre>" . $this->renderDebugMessages() . "</pre>";
}
// If there exists such a layout file, include it and collect its output
if (!empty($path))
{
@ -89,22 +111,292 @@ class JLayoutFile extends JLayoutBase
*/
protected function getPath()
{
jimport('joomla.filesystem.path');
JLoader::import('joomla.filesystem.path');
if (is_null($this->fullPath) && !empty($this->layoutId))
{
$rawPath = str_replace('.', '/', $this->layoutId) . '.php';
$fileName = basename($rawPath);
$filePath = dirname($rawPath);
$this->addDebugMessage('<strong>Layout:</strong> ' . $this->layoutId);
$possiblePaths = array(
JPATH_THEMES . '/' . JFactory::getApplication()->getTemplate() . '/html/layouts/' . $filePath,
$this->basePath . '/' . $filePath
);
// Refresh paths
$this->refreshIncludePaths();
$this->fullPath = JPath::find($possiblePaths, $fileName);
$this->addDebugMessage('<strong>Include Paths:</strong> ' . print_r($this->includePaths, true));
$suffixes = $this->options->get('suffixes', array());
// Search for suffixed versions. Example: tags.j31.php
if (!empty($suffixes))
{
$this->addDebugMessage('<strong>Suffixes:</strong> ' . print_r($suffixes, true));
foreach ($suffixes as $suffix)
{
$rawPath = str_replace('.', '/', $this->layoutId) . '.' . $suffix . '.php';
$this->addDebugMessage('<strong>Searching layout for:</strong> ' . $rawPath);
if ($this->fullPath = JPath::find($this->includePaths, $rawPath))
{
$this->addDebugMessage('<strong>Found layout:</strong> ' . $this->fullPath);
return $this->fullPath;
}
}
}
// Standard version
$rawPath = str_replace('.', '/', $this->layoutId) . '.php';
$this->addDebugMessage('<strong>Searching layout for:</strong> ' . $rawPath);
$this->fullPath = JPath::find($this->includePaths, $rawPath);
if ($this->fullPath = JPath::find($this->includePaths, $rawPath))
{
$this->addDebugMessage('<strong>Found layout:</strong> ' . $this->fullPath);
}
}
return $this->fullPath;
}
/**
* Add one path to include in layout search. Proxy of addIncludePaths()
*
* @param string $path The path to search for layouts
*
* @return void
*
* @since 3.2
*/
public function addIncludePath($path)
{
$this->addIncludePaths($path);
}
/**
* Add one or more paths to include in layout search
*
* @param string $paths The path or array of paths to search for layouts
*
* @return void
*
* @since 3.2
*/
public function addIncludePaths($paths)
{
if (!empty($paths))
{
if (is_array($paths))
{
$this->includePaths = array_unique(array_merge($paths, $this->includePaths));
}
else
{
array_unshift($this->includePaths, $paths);
}
}
}
/**
* Validate that the active component is valid
*
* @param string $option URL Option of the component. Example: com_content
*
* @return boolean
*
* @since 3.2
*/
protected function validComponent($option = null)
{
// By default we will validate the active component
$component = ($option !== null) ? $option : $this->options->get('component', null);
if (!empty($component))
{
// Valid option format
if (substr_count($component, 'com_'))
{
// Latest check: component exists and is enabled
return JComponentHelper::isEnabled($component);
}
}
return false;
}
/**
* Method to change the component where search for layouts
*
* @param string $option URL Option of the component. Example: com_content
*
* @return mixed Component option string | null for none
*
* @since 3.2
*/
public function setComponent($option)
{
$component = null;
switch ((string) $option)
{
case 'none':
$component = null;
break;
case 'auto':
if (defined('JPATH_COMPONENT'))
{
$parts = explode('/', JPATH_COMPONENT);
$component = end($parts);
}
break;
default:
$component = $option;
break;
}
// Extra checks
if (!$this->validComponent($component))
{
$component = null;
}
$this->options->set('component', $component);
// Refresh include paths
$this->refreshIncludePaths();
}
/**
* Function to initialise the application client
*
* @param mixed $client Frontend: 'site' or 0 | Backend: 'admin' or 1
*
* @return void
*
* @since 3.2
*/
public function setClient($client)
{
// Force string conversion to avoid unexpected states
switch ((string) $client)
{
case 'site':
case '0':
$client = 0;
break;
case 'admin':
case '1':
$client = 1;
break;
default:
$client = (int) JFactory::getApplication()->isAdmin();
break;
}
$this->options->set('client', $client);
// Refresh include paths
$this->refreshIncludePaths();
}
/**
* Change the layout
*
* @param string $layoutId Layout to render
*
* @return void
*
* @since 3.2
*/
public function setLayout($layoutId)
{
$this->layoutId = $layoutId;
$this->fullPath = null;
}
/**
* Refresh the list of include paths
*
* @return void
*
* @since 3.2
*/
protected function refreshIncludePaths()
{
// Reset includePaths
$this->includePaths = array();
// (1 - lower priority) Frontend base layouts
$this->addIncludePaths(JPATH_ROOT . '/layouts');
// (2) Standard Joomla! layouts overriden
$this->addIncludePaths(JPATH_THEMES . '/' . JFactory::getApplication()->getTemplate() . '/html/layouts');
// Component layouts & overrides if exist
$component = $this->options->get('component', null);
if (!empty($component))
{
// (3) Component path
if ($this->options->get('client') == 0)
{
$this->addIncludePaths(JPATH_SITE . '/components/' . $component . '/layouts');
}
else
{
$this->addIncludePaths(JPATH_ADMINISTRATOR . '/components/' . $component . '/layouts');
}
// (4) Component template overrides path
$this->addIncludePath(JPATH_THEMES . '/' . JFactory::getApplication()->getTemplate() . '/html/layouts/' . $component);
}
// (5 - highest priority) Received a custom high priority path ?
if (!is_null($this->basePath))
{
$this->addIncludePath(rtrim($this->basePath, DIRECTORY_SEPARATOR));
}
}
/**
* Change the debug mode
*
* @param boolean $debug Enable / Disable debug
*
* @return void
*
* @since 3.2
*/
public function setDebug($debug)
{
$this->options->set('debug', (boolean) $debug);
}
/**
* Render a layout with the same include paths & options
*
* @param object $layoutId Object which properties are used inside the layout file to build displayed output
* @param mixed $displayData Data to be rendered
*
* @return string The necessary HTML to display the layout
*
* @since 3.2
*/
public function sublayout($layoutId, $displayData)
{
// Sublayouts are searched in a subfolder with the name of the current layout
if (!empty($this->layoutId))
{
$layoutId = $this->layoutId . '.' . $layoutId;
}
$sublayout = new static($layoutId, $this->basePath, $this->options);
$sublayout->includePaths = $this->includePaths;
return $sublayout->render($displayData);
}
}

5
libraries/cms/layout/helper.php
View File

@ -34,18 +34,19 @@ class JLayoutHelper
* @param string $layoutFile Dot separated path to the layout file, relative to base path
* @param object $displayData Object which properties are used inside the layout file to build displayed output
* @param string $basePath Base path to use when loading layout files
* @param mixed $options Optional custom options to load. JRegistry or array format
*
* @return string
*
* @since 3.1
*/
public static function render($layoutFile, $displayData = null, $basePath = '')
public static function render($layoutFile, $displayData = null, $basePath = '', $options = null)
{
$basePath = empty($basePath) ? self::$defaultBasePath : $basePath;
// Make sure we send null to JLayoutFile if no path set
$basePath = empty($basePath) ? null : $basePath;
$layout = new JLayoutFile($layoutFile, $basePath);
$layout = new JLayoutFile($layoutFile, $basePath, $options);
$renderedLayout = $layout->render($displayData);
return $renderedLayout;

17
libraries/cms/toolbar/button/help.php
View File

@ -40,8 +40,8 @@ class JToolbarButtonHelp extends JToolbarButton
{
// Store all data to the options array for use with JLayout
$options = array();
$options['text'] = JText::_('JTOOLBAR_HELP');
$options['url'] = JHelp::createURL($ref, $com, $override, $component);
$options['text'] = JText::_('JTOOLBAR_HELP');
$options['doTask'] = $this->_getCommand($ref, $com, $override, $component);
// Instantiate a new JLayoutFile instance and render the layout
$layout = new JLayoutFile('joomla.toolbar.help');
@ -66,15 +66,14 @@ class JToolbarButtonHelp extends JToolbarButton
/**
* Get the JavaScript command for the button
*
* @param string $ref The name of the help screen (its key reference).
* @param boolean $com Use the help file in the component directory.
* @param string $override Use this URL instead of any other.
* @param string $component Name of component to get Help (null for current component)
* @param string $ref The name of the help screen (its key reference).
* @param boolean $com Use the help file in the component directory.
* @param string $override Use this URL instead of any other.
* @param string $component Name of component to get Help (null for current component)
*
* @return string JavaScript command string
* @return string JavaScript command string
*
* @since 3.0
* @deprecated 3.2
* @since 3.0
*/
protected function _getCommand($ref, $com, $override, $component)
{

9
libraries/cms/toolbar/button/link.php
View File

@ -42,7 +42,7 @@ class JToolbarButtonLink extends JToolbarButton
$options = array();
$options['text'] = JText::_($text);
$options['class'] = $this->fetchIconClass($name);
$options['url'] = $url;
$options['doTask'] = $this->_getCommand($url);
// Instantiate a new JLayoutFile instance and render the layout
$layout = new JLayoutFile('joomla.toolbar.link');
@ -68,12 +68,11 @@ class JToolbarButtonLink extends JToolbarButton
/**
* Get the JavaScript command for the button
*
* @param object $url Button definition
* @param object $url Button definition
*
* @return string JavaScript command string
* @return string JavaScript command string
*
* @since 3.0
* @deprecated 3.2
* @since 3.0
*/
protected function _getCommand($url)
{

4
libraries/cms/toolbar/button/popup.php
View File

@ -67,7 +67,7 @@ class JToolbarButtonPopup extends JToolbarButton
$html[] = $layout->render($options);
// Place modal div and scripts in a new div
$html[] = '</div><div class="btn-group" style="width: 0; margin: 0">';
$html[] = '<div class="btn-group" style="width: 0; margin: 0">';
// Build the options array for the modal
$params = array();
@ -85,6 +85,8 @@ class JToolbarButtonPopup extends JToolbarButton
. '</script>';
}
$html[] = '</div>';
return implode("\n", $html);
}

6
plugins/content/emailcloak/emailcloak.xml
View File

@ -18,19 +18,17 @@
<language tag="en-GB">en-GB.plg_content_emailcloak.sys.ini</language>
</languages>
<config>
<fields name="params">
<fieldset name="basic">
<field name="mode" type="list"
default="1"
description="PLG_CONTENT_EMAILCLOAK_MODE_DESC"
label="PLG_CONTENT_EMAILCLOAK_MODE_LABEL">
label="PLG_CONTENT_EMAILCLOAK_MODE_LABEL"
>
<option value="0">PLG_CONTENT_EMAILCLOAK_NONLINKABLE</option>
<option value="1">PLG_CONTENT_EMAILCLOAK_LINKABLE</option>
</field>
</fieldset>
</fields>

94
plugins/system/debug/debug.xml
View File

@ -18,65 +18,70 @@
<language tag="en-GB">en-GB.plg_system_debug.sys.ini</language>
</languages>
<config>
<fields name="params">
<fieldset name="basic">
<field name="filter_groups" type="usergroup"
description="PLG_DEBUG_FIELD_ALLOWED_GROUPS_DESC"
label="PLG_DEBUG_FIELD_ALLOWED_GROUPS_LABEL"
multiple="true"
size="10" />
size="10"
/>
<field name="profile" type="radio"
class="btn-group btn-group-yesno"
default="1"
description="PLG_DEBUG_FIELD_PROFILING_DESC"
label="PLG_DEBUG_FIELD_PROFILING_LABEL">
<option value="1">JYES</option>
<option value="0">JNO</option>
label="PLG_DEBUG_FIELD_PROFILING_LABEL"
>
<option value="1">JYes</option>
<option value="0">JNo</option>
</field>
<field name="queries" type="radio"
class="btn-group btn-group-yesno"
default="1"
description="PLG_DEBUG_FIELD_QUERIES_DESC"
label="PLG_DEBUG_FIELD_QUERIES_LABEL">
<option value="1">JYES</option>
<option value="0">JNO</option>
label="PLG_DEBUG_FIELD_QUERIES_LABEL"
>
<option value="1">JYes</option>
<option value="0">JNo</option>
</field>
<field name="query_types" type="radio"
class="btn-group btn-group-yesno"
default="1"
description="PLG_DEBUG_FIELD_QUERY_TYPES_DESC"
label="PLG_DEBUG_FIELD_QUERY_TYPES_LABEL">
<option value="1">JYES</option>
<option value="0">JNO</option>
label="PLG_DEBUG_FIELD_QUERY_TYPES_LABEL"
>
<option value="1">JYes</option>
<option value="0">JNo</option>
</field>
<field name="memory" type="radio"
class="btn-group btn-group-yesno"
default="1"
description="PLG_DEBUG_FIELD_MEMORY_DESC"
label="PLG_DEBUG_FIELD_MEMORY_LABEL">
<option value="1">JYES</option>
<option value="0">JNO</option>
label="PLG_DEBUG_FIELD_MEMORY_LABEL"
>
<option value="1">JYes</option>
<option value="0">JNo</option>
</field>
<field name="logs" type="radio"
class="btn-group btn-group-yesno"
default="1"
description="PLG_DEBUG_FIELD_LOGS_DESC"
label="PLG_DEBUG_FIELD_LOGS_LABEL">
<option value="1">JYES</option>
<option value="0">JNO</option>
label="PLG_DEBUG_FIELD_LOGS_LABEL"
>
<option value="1">JYes</option>
<option value="0">JNo</option>
</field>
<field name="log_priorities" type="list" multiple="true" default="all"
label="PLG_DEBUG_FIELD_LOG_PRIORITIES_LABEL"
description="PLG_DEBUG_FIELD_LOG_PRIORITIES_DESC">
description="PLG_DEBUG_FIELD_LOG_PRIORITIES_DESC"
>
<option value="all">PLG_DEBUG_FIELD_LOG_PRIORITIES_ALL</option>
<option value="emergency">PLG_DEBUG_FIELD_LOG_PRIORITIES_EMERGENCY</option>
<option value="alert">PLG_DEBUG_FIELD_LOG_PRIORITIES_ALERT</option>
@ -90,15 +95,16 @@
<field name="log_categories" type="text" size="60" default=""
label="PLG_DEBUG_FIELD_LOG_CATEGORIES_LABEL"
description="PLG_DEBUG_FIELD_LOG_CATEGORIES_DESC" />
description="PLG_DEBUG_FIELD_LOG_CATEGORIES_DESC"
/>
<field name="log_category_mode" type="hidden" default="0"
label="PLG_DEBUG_FIELD_LOG_CATEGORY_MODE_LABEL"
description="PLG_DEBUG_FIELD_LOG_CATEGORY_MODE_DESC">
description="PLG_DEBUG_FIELD_LOG_CATEGORY_MODE_DESC"
>
<option value="0">PLG_DEBUG_FIELD_LOG_CATEGORY_MODE_INCLUDE</option>
<option value="1">PLG_DEBUG_FIELD_LOG_CATEGORY_MODE_EXCLUDE</option>
</field>
</fieldset>
<fieldset name="language"
@ -108,50 +114,55 @@
class="btn-group btn-group-yesno"
default="1"
description="PLG_DEBUG_FIELD_LANGUAGE_ERRORFILES_DESC"
label="PLG_DEBUG_FIELD_LANGUAGE_ERRORFILES_LABEL">
<option value="1">JYES</option>
<option value="0">JNO</option>
label="PLG_DEBUG_FIELD_LANGUAGE_ERRORFILES_LABEL"
>
<option value="1">JYes</option>
<option value="0">JNo</option>
</field>
<field name="language_files" type="radio"
class="btn-group btn-group-yesno"
default="1"
description="PLG_DEBUG_FIELD_LANGUAGE_FILES_DESC"
label="PLG_DEBUG_FIELD_LANGUAGE_FILES_LABEL">
<option value="1">JYES</option>
<option value="0">JNO</option>
label="PLG_DEBUG_FIELD_LANGUAGE_FILES_LABEL"
>
<option value="1">JYes</option>
<option value="0">JNo</option>
</field>
<field name="language_strings" type="radio"
class="btn-group btn-group-yesno"
default="1"
description="PLG_DEBUG_FIELD_LANGUAGE_STRING_DESC"
label="PLG_DEBUG_FIELD_LANGUAGE_STRING_LABEL">
<option value="1">JYES</option>
<option value="0">JNO</option>
label="PLG_DEBUG_FIELD_LANGUAGE_STRING_LABEL"
>
<option value="1">JYes</option>
<option value="0">JNo</option>
</field>
<field name="strip-first" type="radio"
class="btn-group btn-group-yesno"
default="1"
description="PLG_DEBUG_FIELD_STRIP_FIRST_DESC"
label="PLG_DEBUG_FIELD_STRIP_FIRST_LABEL">
<option value="1">JYES</option>
<option value="0">JNO</option>
label="PLG_DEBUG_FIELD_STRIP_FIRST_LABEL"
>
<option value="1">JYes</option>
<option value="0">JNo</option>
</field>
<field name="strip-prefix" type="textarea"
cols="30"
description="PLG_DEBUG_FIELD_STRIP_PREFIX_DESC"
label="PLG_DEBUG_FIELD_STRIP_PREFIX_LABEL"
rows="4" />
rows="4"
/>
<field name="strip-suffix" type="textarea"
cols="30"
description="PLG_DEBUG_FIELD_STRIP_SUFFIX_DESC"
label="PLG_DEBUG_FIELD_STRIP_SUFFIX_LABEL"
rows="4" />
rows="4"
/>
</fieldset>
<fieldset name="logging"
@ -161,13 +172,12 @@
class="btn-group btn-group-yesno"
default="0"
description="PLG_DEBUG_FIELD_LOG_DEPRECATED_DESC"
label="PLG_DEBUG_FIELD_LOG_DEPRECATED_LABEL">
<option value="1">JYES</option>
<option value="0">JNO</option>
label="PLG_DEBUG_FIELD_LOG_DEPRECATED_LABEL"
>
<option value="1">JYes</option>
<option value="0">JNo</option>
</field>
</fieldset>
</fields>
</config>
</extension>