joomla/cms
29
0
Fork 0
mirror of https://github.com/joomla/joomla-cms.git synced 2024-06-27 07:33:41 +00:00
Code Packages Releases Activity

Trim trailing white space.

Browse Source 
git-svn-id: http://joomlacode.org/svn/joomla/development/trunk@18212 6f6e1ebd-4c2b-0410-823f-f34bde69bce9
This commit is contained in:
Andrew Eddie 2010-07-22 06:02:54 +00:00
parent e3baf81d9c
commit a8d1676d0f
162 changed files with 955 additions and 955 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
administrator/components/com_banners/models/forms/banner.xml
View File

@ -52,7 +52,7 @@
label="COM_BANNERS_FIELD_CUSTOMCODE_LABEL" description="COM_BANNERS_FIELD_CUSTOMCODE_DESC" />
<field name="clickurl" type="text" class="inputbox"
label="COM_BANNERS_FIELD_CLICKURL_LABEL" description="COM_BANNERS_FIELD_CLICKURL_DESC" />
label="COM_BANNERS_FIELD_CLICKURL_LABEL" description="COM_BANNERS_FIELD_CLICKURL_DESC" />
</fieldset>
@ -82,7 +82,7 @@
label="COM_BANNERS_FIELD_PUBLISH_DOWN_LABEL" description="COM_BANNERS_FIELD_PUBLISH_DOWN_DESC"
class="inputbox" format="%Y-%m-%d %H:%M:%S" size="20"
filter="user_utc" />
<field name="sticky" type="list" default="0"
label="COM_BANNERS_FIELD_STICKY_LABEL"
description="COM_BANNERS_FIELD_STICKY_DESC"
@ -182,7 +182,7 @@
label="COM_BANNERS_FIELD_ALT_LABEL" description="COM_BANNERS_FIELD_ALT_DESC" />
</fieldset>
</fields>
<fieldset name="custom">
<field name="bannercode" type="textarea" class="inputbox"
rows="3" cols="30" filter="raw"

6
administrator/components/com_banners/tables/banner.php
View File

@ -95,12 +95,12 @@ class BannersTableBanner extends JTable
$this->setError(JText::sprintf('JLIB_DATABASE_ERROR_NEGATIVE_NOT_PERMITTED', JText::_('COM_BANNERS_FIELD_WIDTH_LABEL')));
return false;
}
if((int) $registry->get('height', 0) < 0){
$this->setError(JText::sprintf('JLIB_DATABASE_ERROR_NEGATIVE_NOT_PERMITTED', JText::_('COM_BANNERS_FIELD_HEIGHT_LABEL')));
return false;
}
}
// Converts the width and height to an absolute numeric value:
$width = abs((int) $registry->get('width', 0));
$height = abs((int) $registry->get('height', 0));

2
administrator/components/com_banners/views/clients/view.html.php
View File

@ -85,7 +85,7 @@ class BannersViewClients extends JView
} else if ($canDo->get('core.edit.state')) {
JToolBarHelper::trash('clients.trash','JTOOLBAR_TRASH');
}
if ($canDo->get('core.admin')) {
JToolBarHelper::divider();
JToolBarHelper::preferences('com_banners');

2
administrator/components/com_cache/controller.php
View File

@ -69,7 +69,7 @@ class CacheController extends JController
$cid = JRequest::getVar('cid', array(), 'post', 'array');
$model = $this->getModel('cache');
if(empty($cid)) {
JError::raiseWarning(500, JText::_('JERROR_NO_ITEMS_SELECTED'));
} else {

4
administrator/components/com_categories/models/forms/category.xml
View File

@ -232,9 +232,9 @@
description="JFIELD_METADATA_AUTHOR_DESC"
size="30"/>
<field name="robots"
<field name="robots"
type="list"
label="JFIELD_METADATA_ROBOTS_LABEL"
label="JFIELD_METADATA_ROBOTS_LABEL"
description="JFIELD_METADATA_ROBOTS_DESC"
>
<option value="">JGLOBAL_USE_GLOBAL</option>

2
administrator/components/com_config/models/application.php
View File

@ -141,7 +141,7 @@ class ConfigModelApplication extends JModelForm
if (empty($data['cache_handler'])) {
$data['caching'] = 0;
}
// Clean the cache if disabled but previously enabled.
if (!$data['caching'] && $prev['caching']) {
$cache = JFactory::getCache();

8
administrator/components/com_config/models/forms/application.xml
View File

@ -12,7 +12,7 @@
description="COM_CONFIG_FIELD_CACHE_DESC"
required="true"
filter="integer">
<option
<option
value="0">COM_CONFIG_FIELD_VALUE_CACHE_OFF</option>
<option
value="1">COM_CONFIG_FIELD_VALUE_CACHE_CONSERVATIVE</option>
@ -27,7 +27,7 @@
description="COM_CONFIG_FIELD_CACHE_HANDLER_DESC"
filter="word">
</field>
<field
name="cachetime"
type="text"
@ -36,9 +36,9 @@
description="COM_CONFIG_FIELD_CACHE_TIME_DESC"
required="true"
filter="integer"
size="6" />
size="6" />
</fieldset>
<fieldset
name="memcache"
label="COM_CONFIG_MEMCACHE_SETTINGS_LABEL">

4
administrator/components/com_config/views/component/tmpl/default.php
View File

@ -47,7 +47,7 @@ JHtml::_('behavior.formvalidation');
echo '<p class="tab-description">'.JText::_($fieldSet->description).'</p>';
endif;
?>
<?php
foreach ($this->form->getFieldset($name) as $field):
?>
@ -57,7 +57,7 @@ JHtml::_('behavior.formvalidation');
<?php
endforeach;
?>
<div class="clr"></div>
<?php

220
administrator/components/com_contact/config.xml
View File

@ -4,9 +4,9 @@
<fieldset name="contact"
label="COM_CONTACT_FIELD_CONFIG_INDIVIDUAL_CONTACT_DISPLAY"
>
<field name="show_contact_category"
<field name="show_contact_category"
type="list"
default="hide"
default="hide"
label="COM_CONTACT_FIELD_CONTACT_SHOW_CATEGORY_LABEL"
description="COM_CONTACT_FIELD_CONTACT_SHOW_CATEGORY_DESC"
>
@ -17,16 +17,16 @@
</option>
</field>
<field name="show_contact_list"
<field name="show_contact_list"
type="radio"
default="0"
default="0"
label="COM_CONTACT_FIELD_CONTACT_SHOW_LIST_LABEL"
description="COM_CONTACT_FIELD_CONTACT_SHOW_LIST_LABEL"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field name="presentation_style"
<field name="presentation_style"
type="list"
description="COM_CONTACT_FIELD_PRESENTATION_DESC"
label="COM_CONTACT_FIELD_PRESENTATION_LABEL"
@ -35,18 +35,18 @@
<option value="tabs">COM_CONTACT_FIELD_VALUE_TABS</option>
<option value="plain">COM_CONTACT_FIELD_VALUE_PLAIN</option>
</field>
<field name="show_name"
type="radio"
<field name="show_name"
type="radio"
default="1"
label="COM_CONTACT_FIELD_PARAMS_NAME_LABEL"
label="COM_CONTACT_FIELD_PARAMS_NAME_LABEL"
description="COM_CONTACT_FIELD_PARAMS_NAME_DESC"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field name="show_position"
type="radio"
<field name="show_position"
type="radio"
default="1"
label="COM_CONTACT_FIELD_PARAMS_CONTACT_POSITION_LABEL"
description="COM_CONTACT_FIELD_PARAMS_CONTACT_POSITION_DESC"
@ -55,8 +55,8 @@
<option value="1">JSHOW</option>
</field>
<field name="show_email"
type="radio"
<field name="show_email"
type="radio"
default="0"
label="COM_CONTACT_FIELD_PARAMS_CONTACT_E_MAIL_LABEL"
description="COM_CONTACT_FIELD_PARAMS_CONTACT_E_MAIL_DESC"
@ -65,7 +65,7 @@
<option value="1">JSHOW</option>
</field>
<field name="show_street_address"
<field name="show_street_address"
type="radio"
default="1" label="COM_CONTACT_FIELD_PARAMS_STREET_ADDRESS_LABEL"
description="COM_CONTACT_FIELD_PARAMS_STREET_ADDRESS_DESC"
@ -74,8 +74,8 @@
<option value="1">JSHOW</option>
</field>
<field name="show_suburb"
type="radio"
<field name="show_suburb"
type="radio"
default="1"
label="COM_CONTACT_FIELD_PARAMS_TOWN-SUBURB_LABEL"
description="COM_CONTACT_FIELD_PARAMS_TOWN-SUBURB_DESC"
@ -84,8 +84,8 @@
<option value="1">JSHOW</option>
</field>
<field name="show_state"
type="radio"
<field name="show_state"
type="radio"
default="1"
label="COM_CONTACT_FIELD_PARAMS_STATE-COUNTY_LABEL"
description="COM_CONTACT_FIELD_PARAMS_STATE-COUNTY_DESC"
@ -94,8 +94,8 @@
<option value="1">JSHOW</option>
</field>
<field name="show_postcode"
type="radio"
<field name="show_postcode"
type="radio"
default="1"
label="COM_CONTACT_FIELD_PARAMS_POST-ZIP_CODE_LABEL"
description="COM_CONTACT_FIELD_PARAMS_POST-ZIP_CODE_DESC"
@ -104,8 +104,8 @@
<option value="1">JSHOW</option>
</field>
<field name="show_country"
type="radio"
<field name="show_country"
type="radio"
default="1"
label="COM_CONTACT_FIELD_PARAMS_COUNTRY_LABEL"
description="COM_CONTACT_FIELD_PARAMS_COUNTRY_DESC"
@ -114,8 +114,8 @@
<option value="1">JSHOW</option>
</field>
<field name="show_telephone"
type="radio"
<field name="show_telephone"
type="radio"
default="1"
label="COM_CONTACT_FIELD_PARAMS_TELEPHONE_LABEL"
description="COM_CONTACT_FIELD_PARAMS_TELEPHONE_DESC"
@ -124,8 +124,8 @@
<option value="1">JSHOW</option>
</field>
<field name="show_mobile"
type="radio"
<field name="show_mobile"
type="radio"
default="1"
label="COM_CONTACT_FIELD_PARAMS_MOBILE_LABEL"
description="COM_CONTACT_FIELD_PARAMS_MOBILE_DESC"
@ -134,8 +134,8 @@
<option value="1">JSHOW</option>
</field>
<field name="show_fax"
type="radio"
<field name="show_fax"
type="radio"
default="1"
label="COM_CONTACT_FIELD_PARAMS_FAX_LABEL" description="COM_CONTACT_FIELD_PARAMS_FAX_DESC"
>
@ -143,8 +143,8 @@
<option value="1">JSHOW</option>
</field>
<field name="show_webpage"
type="radio"
<field name="show_webpage"
type="radio"
default="1"
label="COM_CONTACT_FIELD_PARAMS_WEBPAGE_LABEL"
description="COM_CONTACT_FIELD_PARAMS_WEBPAGE_DESC"
@ -153,8 +153,8 @@
<option value="1">JSHOW</option>
</field>
<field name="show_misc"
type="radio"
<field name="show_misc"
type="radio"
default="1"
label="COM_CONTACT_FIELD_PARAMS_MISC_INFO_LABEL"
description="COM_CONTACT_FIELD_PARAMS_MISC_INFO_DESC"
@ -163,32 +163,32 @@
<option value="1">JSHOW</option>
</field>
<field name="show_image"
type="radio"
<field name="show_image"
type="radio"
default="1"
label="COM_CONTACT_FIELD_PARAMS_SHOW_IMAGE_LABEL" description="COM_CONTACT_FIELD_PARAMS_SHOW_IMAGE_DESC"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field name="image"
<field name="image"
type="media"
label="COM_CONTACT_FIELD_PARAMS_IMAGE_LABEL"
label="COM_CONTACT_FIELD_PARAMS_IMAGE_LABEL"
description="COM_CONTACT_FIELD_PARAMS_IMAGE_DESC"
>
</field>
<field name="allow_vcard"
type="radio"
<field name="allow_vcard"
type="radio"
default="0"
label="COM_CONTACT_FIELD_PARAMS_VCARD_LABEL"
label="COM_CONTACT_FIELD_PARAMS_VCARD_LABEL"
description="COM_CONTACT_FIELD_PARAMS_VCARD_DESC"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field name="show_articles"
type="radio"
<field name="show_articles"
type="radio"
default="1"
label="COM_CONTACT_FIELD_ARTICLES_SHOW_LABEL"
description="COM_CONTACT_FIELD_ARTICLES_SHOW_DESC"
@ -197,8 +197,8 @@
<option value="1">JSHOW</option>
</field>
<field name="show_profile"
type="radio"
<field name="show_profile"
type="radio"
default="1"
label="COM_CONTACT_FIELD_PROFILE_SHOW_LABEL" description="COM_CONTACT_FIELD_PROFILE_SHOW_LABEL"
>
@ -206,9 +206,9 @@
<option value="1">JSHOW</option>
</field>
<field name="show_links"
<field name="show_links"
label="COM_CONTACT_FIELD_SHOW_LINKS_LABEL"
description="COM_CONTACT_FIELD_SHOW_LINKS_LABEL"
description="COM_CONTACT_FIELD_SHOW_LINKS_LABEL"
type="radio"
default="1"
>
@ -217,37 +217,37 @@
</field>
<field name="linka_name"
<field name="linka_name"
type="text"
label="COM_CONTACT_FIELD_LINKA_NAME_LABEL"
label="COM_CONTACT_FIELD_LINKA_NAME_LABEL"
description="COM_CONTACT_FIELD_LINK_NAME_DESC"
class="inputbox"
size="30"
class="inputbox"
size="30"
/>
<field name="linkb_name"
<field name="linkb_name"
type="text"
label="COM_CONTACT_FIELD_LINKB_NAME_LABEL"
label="COM_CONTACT_FIELD_LINKB_NAME_LABEL"
description="COM_CONTACT_FIELD_LINK_NAME_DESC"
class="inputbox"
size="30"
class="inputbox"
size="30"
/>
<field name="linkc_name" type="text"
label="COM_CONTACT_FIELD_LINKC_NAME_LABEL" description="COM_CONTACT_FIELD_LINK_NAME_DESC"
class="inputbox" size="30" />
<field name="linkd_name"
<field name="linkd_name"
type="text"
label="COM_CONTACT_FIELD_LINKD_NAME_LABEL"
label="COM_CONTACT_FIELD_LINKD_NAME_LABEL"
description="COM_CONTACT_FIELD_LINK_NAME_DESC"
class="inputbox"
size="30"
class="inputbox"
size="30"
/>
<field name="linke_name"
<field name="linke_name"
type="text"
label="COM_CONTACT_FIELD_LINKE_NAME_LABEL"
label="COM_CONTACT_FIELD_LINKE_NAME_LABEL"
description="COM_CONTACT_FIELD_LINK_NAME_DESC"
class="inputbox" size="30"
/>
@ -255,8 +255,8 @@
</fieldset>
<fieldset name="Icons" label="COM_CONTACT_ICONS_SETTINGS">
<field name="contact_icons"
type="list"
<field name="contact_icons"
type="list"
default="0"
label="COM_CONTACT_FIELD_ICONS_SETTINGS_LABEL"
description="COM_CONTACT_FIELD_ICONS_SETTINGS_DESC"
@ -269,35 +269,35 @@
</option>
</field>
<field name="icon_address"
<field name="icon_address"
type="media"
hide_none="1" label="COM_CONTACT_FIELD_ICONS_ADDRESS_LABEL"
description="COM_CONTACT_FIELD_ICONS_ADDRESS_DESC" />
<field name="icon_email"
<field name="icon_email"
type="media"
hide_none="1" label="COM_CONTACT_FIELD_ICONS_EMAIL_LABEL"
description="COM_CONTACT_FIELD_ICONS_EMAIL_DESC" />
<field name="icon_telephone"
<field name="icon_telephone"
type="media"
hide_none="1"
label="COM_CONTACT_FIELD_ICONS_TELEPHONE_LABEL"
description="COM_CONTACT_FIELD_ICONS_TELEPHONE_DESC" />
<field name="icon_mobile"
<field name="icon_mobile"
type="media"
hide_none="1"
label="COM_CONTACT_FIELD_ICONS_MOBILE_LABEL" description="COM_CONTACT_FIELD_ICONS_MOBILE_DESC" />
<field name="icon_fax"
<field name="icon_fax"
type="media"
hide_none="1" label="COM_CONTACT_FIELD_ICONS_FAX_LABEL"
description="COM_CONTACT_FIELD_ICONS_FAX_DESC" />
<field name="icon_misc"
<field name="icon_misc"
type="media"
hide_none="1"
hide_none="1"
label="COM_CONTACT_FIELD_ICONS_MISC_LABEL"
description="COM_CONTACT_FIELD_ICONS_MISC_DESC" />
</fieldset>
@ -305,8 +305,8 @@
<fieldset name="contacts"
label="COM_CONTACT_FIELD_CONFIG_TABLE_OF_CONTACTS"
>
<field name="show_headings"
type="radio"
<field name="show_headings"
type="radio"
default="1"
label="COM_CONTACT_FIELD_CONFIG_TABLE_HEADINGS_LABEL"
description="COM_CONTACT_FIELD_CONFIG_TABLE_HEADINGS_DESC"
@ -324,7 +324,7 @@
</field>
<field name="show_email_headings" type="radio"
default="0"
default="0"
label="COM_CONTACT_FIELD_CONFIG_EMAIL_LABEL"
description="COM_CONTACT_FIELD_CONFIG_EMAIL_DESC"
>
@ -332,7 +332,7 @@
<option value="1">JSHOW</option>
</field>
<field name="show_telephone_headings"
<field name="show_telephone_headings"
type="radio"
default="1" label="COM_CONTACT_FIELD_CONFIG_PHONE_LABEL"
description="COM_CONTACT_FIELD_CONFIG_PHONE_DESC"
@ -341,7 +341,7 @@
<option value="1">JSHOW</option>
</field>
<field name="show_mobile_headings"
<field name="show_mobile_headings"
type="radio"
default="1" label="COM_CONTACT_FIELD_CONFIG_MOBILE_LABEL"
description="COM_CONTACT_FIELD_CONFIG_MOBILE_DESC"
@ -350,7 +350,7 @@
<option value="1">JSHOW</option>
</field>
<field name="show_fax_headings"
<field name="show_fax_headings"
type="radio"
default="1" label="COM_CONTACT_FIELD_CONFIG_FAX_LABEL"
description="COM_CONTACT_FIELD_CONFIG_FAX_DESC"
@ -358,7 +358,7 @@
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field name="show_suburb_headings" type="radio"
default="0" label="COM_CONTACT_FIELD_CONFIG_SUBURB_LABEL"
description="COM_CONTACT_FIELD_CONFIG_SUBURB_DESC"
@ -367,7 +367,7 @@
<option value="1">JSHOW</option>
</field>
<field name="show_state_headings"
<field name="show_state_headings"
type="radio"
default="0" label="JGLOBAL_STATE"
description="COM_CONTACT_FIELD_CONFIG_STATE_DESC"
@ -375,8 +375,8 @@
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field name="show_country_headings"
<field name="show_country_headings"
type="radio"
default="1" label="COM_CONTACT_FIELD_CONFIG_COUNTRY_LABEL"
description="COM_CONTACT_FIELD_CONFIG_COUNTRY_DESC"
@ -384,15 +384,15 @@
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
</fieldset>
<fieldset name="Contact_Form"
label="COM_CONTACT_FIELD_CONFIG_CONTACT_FORM"
>
<field name="show_email_form"
type="radio"
<field name="show_email_form"
type="radio"
default="1"
label="COM_CONTACT_FIELD_EMAIL_SHOW_FORM_LABEL"
description="COM_CONTACT_FIELD_EMAIL_SHOW_FORM_DESC"
@ -401,8 +401,8 @@
<option value="1">JSHOW</option>
</field>
<field name="show_email_copy"
type="radio"
<field name="show_email_copy"
type="radio"
default="1"
label="COM_CONTACT_FIELD_EMAIL_EMAIL_COPY_LABEL"
description="COM_CONTACT_FIELD_EMAIL_EMAIL_COPY_DESC"
@ -411,32 +411,32 @@
<option value="1">JSHOW</option>
</field>
<field name="banned_email"
<field name="banned_email"
type="textarea"
label="COM_CONTACT_FIELD_CONFIG_BANNED_EMAIL_LABEL"
label="COM_CONTACT_FIELD_CONFIG_BANNED_EMAIL_LABEL"
rows="3"
cols="30"
description="COM_CONTACT_FIELD_CONFIG_BANNED_EMAIL_DESC"
cols="30"
description="COM_CONTACT_FIELD_CONFIG_BANNED_EMAIL_DESC"
/>
<field name="banned_subject"
<field name="banned_subject"
type="textarea"
label="COM_CONTACT_FIELD_CONFIG_BANNED_SUBJECT_LABEL"
rows="3"
cols="30"
description="COM_CONTACT_FIELD_CONFIG_BANNED_SUBJECT_DESC"
/>
<field name="banned_text"
type="textarea"
label="COM_CONTACT_FIELD_CONFIG_BANNED_TEXT_LABEL"
rows="3"
cols="30"
description="COM_CONTACT_FIELD_CONFIG_BANNED_TEXT_DESC"
cols="30"
description="COM_CONTACT_FIELD_CONFIG_BANNED_SUBJECT_DESC"
/>
<field name="validate_session"
type="radio"
<field name="banned_text"
type="textarea"
label="COM_CONTACT_FIELD_CONFIG_BANNED_TEXT_LABEL"
rows="3"
cols="30"
description="COM_CONTACT_FIELD_CONFIG_BANNED_TEXT_DESC"
/>
<field name="validate_session"
type="radio"
default="1"
label="COM_CONTACT_FIELD_CONFIG_SESSION_CHECK_LABEL"
description="COM_CONTACT_FIELD_CONFIG_SESSION_CHECK_DESC"
@ -445,8 +445,8 @@
<option value="1">JYES</option>
</field>
<field name="custom_reply"
type="radio"
<field name="custom_reply"
type="radio"
default="0"
label="COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_LABEL"
description="COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_DESC"
@ -455,8 +455,8 @@
<option value="1">JYES</option>
</field>
<field name="redirect"
type="text"
<field name="redirect"
type="text"
size="30"
label="COM_CONTACT_FIELD_CONFIG_REDIRECT_LABEL"
description="COM_CONTACT_FIELD_CONFIG_REDIRECT_DESC" />
@ -466,7 +466,7 @@
label="JGLOBAL_MENUS_LAYOUT_INTEGRATION_OPTIONS_LABEL"
>
<field name="show_category_crumb"
<field name="show_category_crumb"
type="radio"
default="0" label="COM_CONTACT_FIELD_BREADCRUMBS_LABEL"
description="COM_CONTACT_FIELD_BREADCRUMBS_DESC"
@ -477,16 +477,16 @@
</fieldset>
<fieldset name="permissions"
<fieldset name="permissions"
label="JCONFIG_PERMISSIONS_LABEL"
description="JCONFIG_PERMISSIONS_DESC"
>
<field name="rules"
type="rules"
<field name="rules"
type="rules"
label="JCONFIG_PERMISSIONS_LABEL"
filter="rules"
component="com_contact"
filter="rules"
component="com_contact"
section="component" />
</fieldset>

2
administrator/components/com_contact/models/contact.php
View File

@ -239,7 +239,7 @@ class ContactModelContact extends JModelAdmin
//$table->modified_by = $user->get('id');
}
}
/**
* A protected method to get a set of ordering conditions.
*

4
administrator/components/com_contact/models/contacts.php
View File

@ -141,10 +141,10 @@ class ContactModelContacts extends JModelList
$query->where('(ua.name LIKE '.$search.' OR ua.username LIKE '.$search.')');
} else {
$search = $db->Quote('%'.$db->getEscaped($search, true).'%');
$query->where('(a.name LIKE '.$search.' OR a.alias LIKE '.$search.')');
$query->where('(a.name LIKE '.$search.' OR a.alias LIKE '.$search.')');
}
}
// Filter on the language.
if ($language = $this->getState('filter.language')) {
$query->where('a.language = ' . $db->quote($language));

318
administrator/components/com_contact/models/forms/contact.xml
View File

@ -1,47 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
<form>
<fieldset>
<field name="id"
<field name="id"
type="text"
label="JGLOBAL_FIELD_ID_LABEL"
description="JGLOBAL_FIELD_ID_DESC"
size="10"
description="JGLOBAL_FIELD_ID_DESC"
size="10"
default="0"
required="true"
required="true"
readonly="true"
class="readonly"
/>
<field name="name"
<field name="name"
type="text"
label="COM_CONTACT_FIELD_NAME_LABEL"
label="COM_CONTACT_FIELD_NAME_LABEL"
description="COM_CONTACT_FIELD_NAME_DESC"
class="inputbox"
size="30"
class="inputbox"
size="30"
required="true"
/>
<field name="alias"
type="text"
<field name="alias"
type="text"
label="JFIELD_ALIAS_LABEL"
description="JFIELD_ALIAS_DESC"
class="inputbox"
size="30"
description="JFIELD_ALIAS_DESC"
class="inputbox"
size="30"
/>
<field name="user_id"
<field name="user_id"
type="user"
label="COM_CONTACT_FIELD_LINKED_USER_LABEL"
label="COM_CONTACT_FIELD_LINKED_USER_LABEL"
description="COM_CONTACT_FIELD_LINKED_USER_DESC"
/>
<field id="published"
name="published"
<field id="published"
name="published"
type="list"
label="JGLOBAL_STATE"
label="JGLOBAL_STATE"
description="JFIELD_PUBLISHED_DESC"
class="inputbox"
size="1"
class="inputbox"
size="1"
default="1"
>
<option value="1">
@ -56,169 +56,169 @@
JOPTION_REPORTED</option>
</field>
<field name="catid"
type="category"
<field name="catid"
type="category"
extension="com_contact"
label="JCATEGORY"
label="JCATEGORY"
description="JFIELD_CATEGORY_DESC"
class="inputbox"
class="inputbox"
required="true"
/>
<field name="access"
type="accesslevel"
<field name="access"
type="accesslevel"
label="JFIELD_ACCESS_LABEL"
description="JFIELD_ACCESS_DESC"
class="inputbox"
size="1"
description="JFIELD_ACCESS_DESC"
class="inputbox"
size="1"
/>
<field name="sortname1" type="text"
label="COM_CONTACT_FIELD_SORTNAME1_LABEL"
label="COM_CONTACT_FIELD_SORTNAME1_LABEL"
description="COM_CONTACT_FIELD_SORTNAME1_DESC"
class="inputbox"
size="30"
class="inputbox"
size="30"
/>
<field name="sortname2" type="text"
label="COM_CONTACT_FIELD_SORTNAME2_LABEL"
label="COM_CONTACT_FIELD_SORTNAME2_LABEL"
description="COM_CONTACT_FIELD_SORTNAME2_DESC"
class="inputbox" size="30" />
<field name="sortname3" type="text"
label="COM_CONTACT_FIELD_SORTNAME3_LABEL"
label="COM_CONTACT_FIELD_SORTNAME3_LABEL"
description="COM_CONTACT_FIELD_SORTNAME3_DESC"
class="inputbox"
size="30"
class="inputbox"
size="30"
/>
<field name="con_position" type="text"
label="COM_CONTACT_FIELD_INFORMATION_POSITION_LABEL"
description="COM_CONTACT_FIELD_INFORMATION_POSITION_DESC"
class="inputbox"
size="30"
class="inputbox"
size="30"
/>
<field name="email_to" type="text"
label="COM_CONTACT_FIELD_INFORMATION_EMAIL_LABEL"
description="COM_CONTACT_FIELD_INFORMATION_EMAIL_DESC"
class="inputbox"
size="30"
class="inputbox"
size="30"
/>
<field name="address" type="textarea"
label="COM_CONTACT_FIELD_INFORMATION_ADDRESS_LABEL"
description="COM_CONTACT_FIELD_INFORMATION_ADDRESS_DESC"
class="inputbox"
rows="3"
cols="30"
class="inputbox"
rows="3"
cols="30"
/>
<field name="suburb" type="text"
label="COM_CONTACT_FIELD_INFORMATION_SUBURB_LABEL"
description="COM_CONTACT_FIELD_INFORMATION_SUBURB_DESC"
class="inputbox"
size="30"
class="inputbox"
size="30"
/>
<field name="state" type="text"
label="COM_CONTACT_FIELD_INFORMATION_STATE_LABEL"
description="COM_CONTACT_FIELD_INFORMATION_STATE_DESC"
class="inputbox"
size="30"
class="inputbox"
size="30"
/>
<field name="postcode" type="text"
label="COM_CONTACT_FIELD_INFORMATION_POSTCODE_LABEL"
description="COM_CONTACT_FIELD_INFORMATION_POSTCODE_DESC"
class="inputbox"
size="30"
class="inputbox"
size="30"
/>
<field name="country" type="text"
label="COM_CONTACT_FIELD_INFORMATION_COUNTRY_LABEL"
description="COM_CONTACT_FIELD_INFORMATION_COUNTRY_DESC"
class="inputbox"
size="30"
class="inputbox"
size="30"
/>
<field name="telephone" type="text"
label="COM_CONTACT_FIELD_INFORMATION_TELEPHONE_LABEL"
description="COM_CONTACT_FIELD_INFORMATION_TELEPHONE_DESC"
class="inputbox"
size="30"
class="inputbox"
size="30"
/>
<field name="mobile" type="text"
label="COM_CONTACT_FIELD_INFORMATION_MOBILE_LABEL"
description="COM_CONTACT_FIELD_INFORMATION_MOBILE_DESC"
class="inputbox"
size="30"
class="inputbox"
size="30"
/>
<field name="fax" type="text"
label="COM_CONTACT_FIELD_INFORMATION_FAX_LABEL"
description="COM_CONTACT_FIELD_INFORMATION_FAX_DESC"
class="inputbox"
size="30"
class="inputbox"
size="30"
/>
<field name="webpage"
<field name="webpage"
type="text"
label="COM_CONTACT_FIELD_INFORMATION_WEBPAGE_LABEL"
description="COM_CONTACT_FIELD_INFORMATION_WEBPAGE_DESC"
class="inputbox"
size="30"
class="inputbox"
size="30"
/>
<field name="misc" type="editor"
label="COM_CONTACT_FIELD_INFORMATION_MISC_LABEL"
description="COM_CONTACT_FIELD_INFORMATION_MISC_DESC"
class="inputbox"
class="inputbox"
filter="safehtml"
buttons="true"
hide="readmore,pagebreak"
/>
<field name="image"
type="media"
<field name="image"
type="media"
hide_none="1"
label="COM_CONTACT_FIELD_PARAMS_IMAGE_LABEL"
label="COM_CONTACT_FIELD_PARAMS_IMAGE_LABEL"
description="COM_CONTACT_FIELD_PARAMS_IMAGE_DESC"
/>
<field name="checked_out"
type="hidden"
filter="unset"
<field name="checked_out"
type="hidden"
filter="unset"
/>
<field name="checked_out_time"
type="hidden"
<field name="checked_out_time"
type="hidden"
filter="unset"
/>
<field name="ordering"
type="ordering"
<field name="ordering"
type="ordering"
class="inputbox"
label="JFIELD_ORDERING_LABEL"
description="JFIELD_ORDERING_DESC"
label="JFIELD_ORDERING_LABEL"
description="JFIELD_ORDERING_DESC"
/>
<field name="metakey"
<field name="metakey"
type="textarea"
label="JFIELD_META_KEYWORDS_LABEL"
label="JFIELD_META_KEYWORDS_LABEL"
description="JFIELD_META_KEYWORDS_DESC"
class="inputbox"
rows="3"
class="inputbox"
rows="3"
cols="30"
/>
<field name="metadesc"
<field name="metadesc"
type="textarea"
label="JFIELD_META_DESCRIPTION_LABEL"
label="JFIELD_META_DESCRIPTION_LABEL"
description="JFIELD_META_DESCRIPTION_DESC"
class="inputbox"
rows="3"
cols="30"
class="inputbox"
rows="3"
cols="30"
/>
<field name="language" type="contentlanguage" label="JFIELD_LANGUAGE_LABEL"
@ -226,7 +226,7 @@
>
<option value="*">JALL</option>
</field>
<field name="featured"
<field name="featured"
type="radio"
label="COM_CONTACT_FIELD_FEATURED_LABEL"
description="COM_CONTACT_FIELD_FEATURED_DESC"
@ -236,10 +236,10 @@
<option value="1">JON</option>
</field>
<field name="contact_icons"
type="list"
<field name="contact_icons"
type="list"
default="0"
label="COM_CONTACT_FIELD_ICONS_SETTINGS"
label="COM_CONTACT_FIELD_ICONS_SETTINGS"
description="COM_CONTACT_FIELD_ICONS_SETTINGS_DESC"
>
<option value="0">COM_CONTACT_FIELD_VALUE_NONE
@ -250,59 +250,59 @@
</option>
</field>
<field name="icon_address"
type="media"
<field name="icon_address"
type="media"
hide_none="1"
label="COM_CONTACT_FIELD_ICONS_ADDRESS_LABEL"
description="COM_CONTACT_FIELD_ICONS_ADDRESS_DESC"
description="COM_CONTACT_FIELD_ICONS_ADDRESS_DESC"
/>
<field name="icon_email"
<field name="icon_email"
type="media"
hide_none="1" label="COM_CONTACT_FIELD_ICONS_EMAIL_LABEL"
description="COM_CONTACT_FIELD_ICONS_EMAIL_DESC"
description="COM_CONTACT_FIELD_ICONS_EMAIL_DESC"
/>
<field name="icon_telephone"
<field name="icon_telephone"
type="media" hide_none="1"
label="COM_CONTACT_FIELD_ICONS_TELEPHONE_LABEL"
description="COM_CONTACT_FIELD_ICONS_TELEPHONE_DESC" />
<field name="icon_mobile"
type="media"
<field name="icon_mobile"
type="media"
hide_none="1"
label="COM_CONTACT_FIELD_ICONS_MOBILE_LABEL"
description="COM_CONTACT_FIELD_ICONS_MOBILE_DESC"
label="COM_CONTACT_FIELD_ICONS_MOBILE_LABEL"
description="COM_CONTACT_FIELD_ICONS_MOBILE_DESC"
/>
<field name="icon_fax"
<field name="icon_fax"
type="media"
hide_none="1" label="COM_CONTACT_FIELD_ICONS_FAX_LABEL"
description="COM_CONTACT_FIELD_ICONS_FAX_DESC"
description="COM_CONTACT_FIELD_ICONS_FAX_DESC"
/>
<field name="icon_misc"
<field name="icon_misc"
type="media"
hide_none="1" label="COM_CONTACT_FIELD_ICONS_MISC_LABEL"
description="COM_CONTACT_FIELD_ICONS_MISC_DESC"
description="COM_CONTACT_FIELD_ICONS_MISC_DESC"
/>
<field id="metadata"
name="metadata"
<field id="metadata"
name="metadata"
type="textarea"
label="Contact_Metadata_Label"
label="Contact_Metadata_Label"
description="Contact_Metadata_Desc"
class="inputbox"
rows="3"
class="inputbox"
rows="3"
cols="30"
/>
</fieldset>
<fields name="params">
<fieldset name="jbasic"
<fieldset name="jbasic"
label="JGLOBAL_FIELDSET_DISPLAY_OPTIONS"
>
<field name="show_contact_category"
<field name="show_contact_category"
type="list"
label="JGLOBAL_SHOW_CATEGORY_LABEL"
description="COM_CONTACT_FIELD_SHOW_CATEGORY_DESC"
@ -314,8 +314,8 @@
<option value="show_with_link">COM_CONTACT_FIELD_VALUE_WITH_LINK
</option>
</field>
<field name="show_contact_list"
<field name="show_contact_list"
type="list"
label="COM_CONTACT_FIELD_CONTACT_SHOW_LIST_LABEL"
description="COM_CONTACT_FIELD_CONTACT_SHOW_LIST_LABEL"
@ -324,7 +324,7 @@
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field name="presentation_style" type="list"
description="COM_CONTACT_FIELD_PRESENTATION_DESC"
label="COM_CONTACT_FIELD_PRESENTATION_LABEL"
@ -334,7 +334,7 @@
<option value="tabs">COM_CONTACT_FIELD_VALUE_TABS</option>
<option value="plain">COM_CONTACT_FIELD_VALUE_PLAIN</option>
</field>
<field name="show_name"
<field name="show_name"
type="list"
label="COM_CONTACT_FIELD_PARAMS_NAME_LABEL" description="COM_CONTACT_FIELD_PARAMS_NAME_DESC"
>
@ -398,7 +398,7 @@
<option value="1">JSHOW</option>
</field>
<field name="show_country"
<field name="show_country"
type="list"
label="COM_CONTACT_FIELD_PARAMS_COUNTRY_LABEL"
description="COM_CONTACT_FIELD_PARAMS_COUNTRY_DESC"
@ -408,7 +408,7 @@
<option value="1">JSHOW</option>
</field>
<field name="show_telephone"
<field name="show_telephone"
type="list"
label="COM_CONTACT_FIELD_PARAMS_TELEPHONE_LABEL"
description="COM_CONTACT_FIELD_PARAMS_TELEPHONE_DESC"
@ -418,7 +418,7 @@
<option value="1">JSHOW</option>
</field>
<field name="show_mobile"
<field name="show_mobile"
type="list"
label="COM_CONTACT_FIELD_PARAMS_MOBILE_LABEL"
description="COM_CONTACT_FIELD_PARAMS_MOBILE_DESC"
@ -489,11 +489,11 @@
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field name="show_links"
<field name="show_links"
label="COM_CONTACT_FIELD_SHOW_LINKS_LABEL"
description="COM_CONTACT_FIELD_SHOW_LINKS_DESC"
type="list"
type="list"
>
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="0">JHIDE</option>
@ -501,84 +501,84 @@
</field>
<field name="linka_name" type="text"
label="COM_CONTACT_FIELD_LINKA_NAME_LABEL"
label="COM_CONTACT_FIELD_LINKA_NAME_LABEL"
description="COM_CONTACT_FIELD_LINK_NAME_DESC"
class="inputbox"
size="30"
class="inputbox"
size="30"
/>
<field name="linka" type="text"
label="COM_CONTACT_FIELD_LINKA_LABEL"
label="COM_CONTACT_FIELD_LINKA_LABEL"
description="COM_CONTACT_FIELD_LINKA_DESC"
class="inputbox"
size="30"
class="inputbox"
size="30"
/>
<field name="linkb_name" type="text"
label="COM_CONTACT_FIELD_LINKB_NAME_LABEL"
label="COM_CONTACT_FIELD_LINKB_NAME_LABEL"
description="COM_CONTACT_FIELD_LINK_NAME_DESC"
class="inputbox"
size="30"
class="inputbox"
size="30"
/>
<field name="linkb" type="text"
label="COM_CONTACT_FIELD_LINKB_LABEL"
label="COM_CONTACT_FIELD_LINKB_LABEL"
description="COM_CONTACT_FIELD_LINKB_DESC"
class="inputbox"
size="30"
class="inputbox"
size="30"
/>
<field name="linkc_name"
<field name="linkc_name"
type="text"
label="COM_CONTACT_FIELD_LINKC_NAME_LABEL"
label="COM_CONTACT_FIELD_LINKC_NAME_LABEL"
description="COM_CONTACT_FIELD_LINK_NAME_DESC"
class="inputbox"
size="30"
class="inputbox"
size="30"
/>
<field name="linkc"
<field name="linkc"
type="text"
label="COM_CONTACT_FIELD_LINKC_LABEL"
label="COM_CONTACT_FIELD_LINKC_LABEL"
description="COM_CONTACT_FIELD_LINKC_DESC"
class="inputbox"
size="30"
class="inputbox"
size="30"
/>
<field name="linkd_name"
<field name="linkd_name"
type="text"
label="COM_CONTACT_FIELD_LINKD_NAME_LABEL"
label="COM_CONTACT_FIELD_LINKD_NAME_LABEL"
description="COM_CONTACT_FIELD_LINK_NAME_DESC"
class="inputbox"
size="30"
class="inputbox"
size="30"
/>
<field name="linkd"
<field name="linkd"
type="text"
label="COM_CONTACT_FIELD_LINKD_LABEL"
label="COM_CONTACT_FIELD_LINKD_LABEL"
description="COM_CONTACT_FIELD_LINKD_DESC"
class="inputbox"
size="30"
class="inputbox"
size="30"
/>
<field name="linke_name"
type="text"
label="COM_CONTACT_FIELD_LINKE_NAME_LABEL"
label="COM_CONTACT_FIELD_LINKE_NAME_LABEL"
description="COM_CONTACT_FIELD_LINK_NAME_DESC"
class="inputbox"
size="30"
class="inputbox"
size="30"
/>
<field name="linke"
<field name="linke"
type="text"
label="COM_CONTACT_FIELD_LINKE_LABEL"
label="COM_CONTACT_FIELD_LINKE_LABEL"
description="COM_CONTACT_FIELD_LINKE_DESC"
class="inputbox"
size="30"
class="inputbox"
size="30"
/>
</fieldset>
<fieldset name="email"
label="COM_CONTACT_FIELDSET_CONTACT_FORM"
label="COM_CONTACT_FIELDSET_CONTACT_FORM"
description="COM_CONTACT_EMAIL_FORM_DETAILS"
>
@ -638,20 +638,20 @@
<option value="1">JYES</option>
</field>
<field name="redirect"
type="text"
<field name="redirect"
type="text"
size="30"
label="COM_CONTACT_FIELD_EMAIL_REDIRECT_LABEL"
description="COM_CONTACT_FIELD_EMAIL_REDIRECT_DESC" />
</fieldset>
</fields>
<fields name="metadata">
<fieldset name="jmetadata"
<fieldset name="jmetadata"
label="JGLOBAL_FIELDSET_METADATA_OPTIONS">
<field name="robots"
<field name="robots"
type="list"
label="JFIELD_METADATA_ROBOTS_LABEL"
label="JFIELD_METADATA_ROBOTS_LABEL"
description="JFIELD_METADATA_ROBOTS_DESC"
>
<option value="">JGLOBAL_USE_GLOBAL</option>
@ -663,7 +663,7 @@
</field>
<field name="rights" type="text"
label="JFIELD_METADATA_RIGHTS_LABEL"
label="JFIELD_METADATA_RIGHTS_LABEL"
description="JFIELD_METADATA_RIGHTS_DESC"
size="20" />
</fieldset>

4
administrator/components/com_contact/views/contact/tmpl/edit_metadata.php
View File

@ -22,10 +22,10 @@ foreach ($fieldSets as $name => $fieldSet) :
<?php if ($name == 'jmetadata') : // Include the real fields in this panel. ?>
<li><?php echo $this->form->getLabel('metadesc'); ?>
<?php echo $this->form->getInput('metadesc'); ?></li>
<li><?php echo $this->form->getLabel('metakey'); ?>
<?php echo $this->form->getInput('metakey'); ?></li>
<li><?php echo $this->form->getLabel('xreference'); ?>
<?php echo $this->form->getInput('xreference'); ?></li>
<?php endif; ?>

2
administrator/components/com_contact/views/contacts/tmpl/modal.php
View File

@ -52,7 +52,7 @@ $listDirn = $this->state->get('list.direction');
<table class="adminlist">
<thead>
<tr>
<th class="title">
<?php echo JHtml::_('grid.sort', 'JGLOBAL_TITLE', 'a.name', $listDirn, $listOrder); ?>
</th>

2
administrator/components/com_content/models/article.php
View File

@ -64,7 +64,7 @@ class ContentModelArticle extends JModelAdmin
if($table->state == 1 && intval($table->publish_up) == 0) {
$table->publish_up = JFactory::getDate()->toMySQL();
}
// Increment the content version number.
$table->version++;
}

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

@ -30,7 +30,7 @@ class ContentModelArticles extends JModelList
// Initialise variables.
$app = JFactory::getApplication();
$session = JFactory::getSession();
// Adjust the context to support modal layouts.
if ($layout = JRequest::getVar('layout', 'default')) {
$this->context .= '.'.$layout;
@ -50,7 +50,7 @@ class ContentModelArticles extends JModelList
// set the value of the category filter for the single record edit view
$session->set('com_content.article.filter.category_id',$categoryId);
$language = $app->getUserStateFromRequest($this->context.'.filter.language', 'filter_language', '');
$this->setState('filter.language', $language);
@ -166,12 +166,12 @@ class ContentModelArticles extends JModelList
$query->where('(a.title LIKE '.$search.' OR a.alias LIKE '.$search.')');
}
}
// Filter on the language.
if ($language = $this->getState('filter.language')) {
$query->where('a.language = '.$db->quote($language));
}
// Add the list ordering clause.
$orderCol = $this->state->get('list.ordering');
$orderDirn = $this->state->get('list.direction');

6
administrator/components/com_content/models/fields/modal/article.php
View File

@ -83,10 +83,10 @@ class JFormFieldModal_Article extends JFormField
$html[] = '</div>';
// The active article id field.
if (0 == (int)$this->value) {
if (0 == (int)$this->value) {
$value = '';
} else {
$value = (int)$this->value;
$value = (int)$this->value;
}
// class='required' for client side validation
@ -94,7 +94,7 @@ class JFormFieldModal_Article extends JFormField
if ($this->required) {
$class = ' class="required modal-value"';
}
$html[] = '<input type="hidden" id="'.$this->id.'_id"'.$class.' name="'.$this->name.'" value="'.$value.'" />';
return implode("\n", $html);

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

@ -118,7 +118,7 @@
description="COM_CONTENT_FIELD_RULES_DESC" class="inputbox" filter="rules"
component="com_content" section="article"
/>
</fieldset>
<fields name="attribs">
@ -260,9 +260,9 @@
<fields name="metadata">
<field name="robots"
<field name="robots"
type="list"
label="JFIELD_METADATA_ROBOTS_LABEL"
label="JFIELD_METADATA_ROBOTS_LABEL"
description="JFIELD_METADATA_ROBOTS_DESC"
>
<option value="">JGLOBAL_USE_GLOBAL</option>
@ -284,7 +284,7 @@
label="COM_CONTENT_FIELD_XREFERENCE_LABEL" description="COM_CONTENT_FIELD_XREFERENCE_DESC"
class="inputbox" size="20" />
</fields>
</form>

4
administrator/components/com_content/views/article/tmpl/edit.php
View File

@ -56,10 +56,10 @@ JHtml::_('behavior.keepalive');
<li><?php echo $this->form->getLabel('featured'); ?>
<?php echo $this->form->getInput('featured'); ?></li>
<li><?php echo $this->form->getLabel('id'); ?>
<?php echo $this->form->getInput('id'); ?></li>
</ul>
<div class="clr"></div>
<?php echo $this->form->getLabel('articletext'); ?>

2
administrator/components/com_content/views/articles/tmpl/modal.php
View File

@ -99,7 +99,7 @@ $listDirn = $this->state->get('list.direction');
<?php endforeach; ?>
</tbody>
</table>
<div>
<input type="hidden" name="task" value="" />
<input type="hidden" name="boxchecked" value="0" />

2
administrator/components/com_installer/models/forms/manage.xml
View File

@ -32,7 +32,7 @@
<option value="0">JDISABLED</option>
<option value="1">JENABLED</option>
</field>
<field type="type"
name="type"
hidden="true"

6
administrator/components/com_installer/views/manage/view.html.php
View File

@ -42,14 +42,14 @@ class InstallerViewManage extends InstallerViewDefault
JError::raiseError(500, implode("\n", $errors));
return false;
}
//Check if there are no matching items
if(!count($this->items)){
JFactory::getApplication()->enqueueMessage(
JFactory::getApplication()->enqueueMessage(
JText::_('COM_INSTALLER_MSG_MANAGE_NOEXTENSION')
);
}
// Display the view
parent::display($tpl);
}

4
administrator/components/com_languages/views/languages/tmpl/default.php
View File

@ -20,7 +20,7 @@ $listDirn = $this->state->get('list.direction');
<form action="<?php echo JRoute::_('index.php?option=com_languages&view=languages'); ?>" method="post" name="adminForm" id="adminForm">
<fieldset id="filter-bar">
<div class="filter-search fltlft">
<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></label>
<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->state->get('filter.search'); ?>" title="<?php echo JText::_('COM_LANGUAGES_SEARCH_IN_TITLE'); ?>" />
@ -29,7 +29,7 @@ $listDirn = $this->state->get('list.direction');
<button type="button" onclick="document.id('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
</div>
<div class="filter-select fltrt">
<select name="filter_published" class="inputbox" onchange="this.form.submit()">
<option value=""><?php echo JText::_('JOPTION_SELECT_PUBLISHED');?></option>

6
administrator/components/com_menus/controllers/items.php
View File

@ -59,7 +59,7 @@ class MenusControllerItems extends JControllerAdmin
return false;
}
}
public function saveorder()
{
JRequest::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
@ -67,7 +67,7 @@ class MenusControllerItems extends JControllerAdmin
// Get the arrays from the Request
$order = JRequest::getVar('order', null, 'post', 'array');
$originalOrder = explode(',', JRequest::getString('original_order_values'));
// Make sure something has changed
if (!($order === $originalOrder))
{
@ -80,7 +80,7 @@ class MenusControllerItems extends JControllerAdmin
return true;
}
}
/**
* Method to set the home property for a list of items
*

4
administrator/components/com_menus/models/forms/item_component.xml
View File

@ -47,9 +47,9 @@
label="JFIELD_META_KEYWORDS_LABEL" description="COM_MENUS_ITEM_FIELD_META_KEYWORDS_DESC"
rows="3" cols="40" />
<field name="robots"
<field name="robots"
type="list"
label="JFIELD_METADATA_ROBOTS_LABEL"
label="JFIELD_METADATA_ROBOTS_LABEL"
description="JFIELD_METADATA_ROBOTS_DESC"
>
<option value="">JGLOBAL_USE_GLOBAL</option>

4
administrator/components/com_menus/models/item.php
View File

@ -904,7 +904,7 @@ class MenusModelItem extends JModelAdmin
return true;
}
/**
* Method to save the reordered nested set tree.
* First we save the new order values in the lft values of the changed ids.
@ -928,7 +928,7 @@ class MenusModelItem extends JModelAdmin
return true;
}
/**
* Method to change the home state of one or more items.

2
administrator/components/com_menus/views/item/tmpl/edit.php
View File

@ -87,7 +87,7 @@ JHTML::_('behavior.modal');
<li><?php echo $this->form->getLabel('template_style_id'); ?>
<?php echo $this->form->getInput('template_style_id'); ?></li>
<li><?php echo $this->form->getLabel('id'); ?>
<?php echo $this->form->getInput('id'); ?></li>
</ul>

2
administrator/components/com_menus/views/item/tmpl/edit_modules.php
View File

@ -27,7 +27,7 @@ defined('_JEXEC') or die;
<?php $link = 'index.php?option=com_modules&amp;client_id=0&amp;task=module.edit&amp;id='. $module->id.'&amp;tmpl=component&amp;view=module&amp;layout=modal' ; ?>
<a class="modal" href="<?php echo $link;?>" rel="{handler: 'iframe', size: {x: 1024, y: 450}}" title="<?php echo JText::_('COM_MENUS_EDIT_MODULE_SETTINGS');?>">
<?php echo JText::sprintf('COM_MENUS_MODULE_ACCESS_POSITION', $this->escape($module->title), $this->escape($module->access_title), $this->escape($module->position)); ?></a>
</td>
<td class="center">
<?php if (is_null($module->menuid)) : ?>

2
administrator/components/com_menus/views/items/tmpl/default.php
View File

@ -76,7 +76,7 @@ $saveOrder = ($listOrder == 'a.lft' && $listDirn == 'asc');
<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ORDERING', 'a.lft', $listDirn, $listOrder); ?>
<?php if ($canOrder && $saveOrder) : ?>
<?php echo JHtml::_('grid.order', $this->items, 'filesave.png', 'items.saveorder'); ?>
<?php endif; ?>
<?php endif; ?>
</th>
<th width="10%">
<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ACCESS', 'access_level', $listDirn, $listOrder); ?>

2
administrator/components/com_modules/controllers/modules.php
View File

@ -36,7 +36,7 @@ class ModulesControllerModules extends JControllerAdmin
$cache->clean();
}
}
/**
* Method to clone an existing module.
* @since 1.6

6
administrator/components/com_modules/models/module.php
View File

@ -369,7 +369,7 @@ class ModulesModelModule extends JModelAdmin
{
return (object) array('key' => $this->helpKey, 'url' => $this->helpURL, 'local' => $this->helpLocal);
}
/**
* Returns a reference to the a Table object, always creating it.
*
@ -456,8 +456,8 @@ class ModulesModelModule extends JModelAdmin
$this->helpKey = $helpKey ? $helpKey : $this->helpKey;
$this->helpURL = $helpURL ? $helpURL : $this->helpURL;
$this->helpLocal = (($helpLoc == 'true') || ($helpLoc == '1') || ($helpLoc == 'local')) ? true : false;
}
}
}
// Trigger the default form events.

2
administrator/components/com_modules/views/module/tmpl/edit.php
View File

@ -127,7 +127,7 @@ $hasContent = empty($this->item->module) || $this->item->module == 'custom' || $
</ul>
</fieldset>
</div>
<div class="clr"></div>
<?php endif; ?>
<?php if ($this->item->client_id == 0) :?>

6
administrator/components/com_modules/views/module/tmpl/edit_assignment.php
View File

@ -63,11 +63,11 @@ $menuTypes = MenusHelper::getMenuLinks();
<?php foreach ($menuTypes as &$type) : ?>
<h3><?php echo $type->title ? $type->title : $type->menutype; ?></h3>
<ul class="menu-links">
<?php
<?php
foreach ($type->links as $link) :
if (trim($this->item->assignment) == '-'):
if (trim($this->item->assignment) == '-'):
$checked = '';
elseif ($this->item->assignment == 0):
elseif ($this->item->assignment == 0):
$checked = ' checked="checked"';
elseif ($this->item->assignment < 0):
$checked = in_array(-$link->value, $this->item->assigned) ? ' checked="checked"' : '';

4
administrator/components/com_modules/views/module/tmpl/modal_assignment.php
View File

@ -62,9 +62,9 @@ $menuTypes = MenusHelper::getMenuLinks();
<ul class="menu-links">
<?php
foreach ($type->links as $link) :
if (trim($this->item->assignment) == '-'):
if (trim($this->item->assignment) == '-'):
$checked = '';
elseif ($this->item->assignment == 0):
elseif ($this->item->assignment == 0):
$checked = ' checked="checked"';
elseif ($this->item->assignment < 0):
$checked = in_array(-$link->value, $this->item->assigned) ? ' checked="checked"' : '';

4
administrator/components/com_newsfeeds/models/forms/newsfeed.xml
View File

@ -167,9 +167,9 @@
<fields name="metadata">
<fieldset name="jmetadata" label="JGLOBAL_FIELDSET_METADATA_OPTIONS">
<field name="robots"
<field name="robots"
type="list"
label="JFIELD_METADATA_ROBOTS_LABEL"
label="JFIELD_METADATA_ROBOTS_LABEL"
description="JFIELD_METADATA_ROBOTS_DESC"
>
<option value="">JGLOBAL_USE_GLOBAL</option>

2
administrator/components/com_newsfeeds/models/newsfeeds.php
View File

@ -145,7 +145,7 @@ class NewsfeedsModelNewsfeeds extends JModelList
else
{
$search = $db->Quote('%'.$db->getEscaped($search, true).'%');
$query->where('(a.name LIKE '.$search.' OR a.alias LIKE '.$search.')');
$query->where('(a.name LIKE '.$search.' OR a.alias LIKE '.$search.')');
}
}

4
administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit.php
View File

@ -76,7 +76,7 @@ JHtml::_('behavior.keepalive');
<li><?php echo $this->form->getLabel('cache_time'); ?>
<?php echo $this->form->getInput('cache_time'); ?></li>
<li><?php echo $this->form->getLabel('rtl'); ?>
<?php echo $this->form->getInput('rtl'); ?></li>
@ -116,5 +116,5 @@ JHtml::_('behavior.keepalive');
<?php echo JHtml::_('form.token'); ?>
</div>
<div class="clr"></div>
<div class="clr"></div>
</form>

2
administrator/components/com_plugins/models/plugin.php
View File

@ -222,7 +222,7 @@ class PluginsModelPlugin extends JModelAdmin
{
// Load the extension plugin group.
JPluginHelper::importPlugin('extension');
// Setup type
$data['type'] = 'plugin';

4
administrator/components/com_plugins/views/plugin/tmpl/edit.php
View File

@ -60,12 +60,12 @@ JHtml::_('behavior.formvalidation');
</label>
<div class="clr"></div>
<span class="readonly plg-desc"><?php echo JText::_($text); ?></span>
<?php endif; ?>
<?php else : ?>
<?php echo JText::_('COM_PLUGINS_XML_ERR'); ?>
<?php endif; ?>
</fieldset>
</div>

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

@ -12,7 +12,7 @@
<option
value="1">JYES</option>
</field>
<field name="search_areas"
type="radio"
default="1"
@ -22,7 +22,7 @@
<option value="0">JNO</option>
<option value="1">JYES</option>
</field>
<field
name="show_date"
type="radio"

2
administrator/components/com_templates/helpers/templates.php
View File

@ -81,7 +81,7 @@ class TemplatesHelper
{
// Build the filter options.
$db = JFactory::getDbo();
if ($clientId == '*') {
$where = '';
} else {

2
administrator/components/com_templates/views/source/tmpl/edit.php
View File

@ -47,5 +47,5 @@ JHtml::_('behavior.keepalive');
<?php echo $this->form->getInput('extension_id'); ?>
<?php echo $this->form->getInput('filename'); ?>
</form>

2
administrator/components/com_users/models/forms/user.xml
View File

@ -95,7 +95,7 @@
filter="user_utc"
/>
<field
<field
name="id"
type="text"
class="readonly"

6
administrator/components/com_users/views/level/view.html.php
View File

@ -58,19 +58,19 @@ class UsersViewLevel extends JView
JToolBarHelper::title(JText::_($isNew ? 'COM_USERS_VIEW_NEW_LEVEL_TITLE' : 'COM_USERS_VIEW_EDIT_LEVEL_TITLE'), 'levels-add');
if ($canDo->get('core.edit'))
if ($canDo->get('core.edit'))
{
JToolBarHelper::apply('level.apply','JTOOLBAR_APPLY');
JToolBarHelper::save('level.save','JTOOLBAR_SAVE');
JToolBarHelper::custom('level.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
// If an existing item, can save to a copy.
if (!$isNew && $canDo->get('core.create'))
if (!$isNew && $canDo->get('core.create'))
{
JToolBarHelper::custom('level.save2copy', 'save-copy.png', 'save-copy_f2.png', 'JTOOLBAR_SAVE_AS_COPY', false);
}
if (empty($this->item->id))
if (empty($this->item->id))
{
JToolBarHelper::cancel('level.cancel','JTOOLBAR_CANCEL');
} else {

2
administrator/components/com_users/views/user/tmpl/edit.php
View File

@ -73,7 +73,7 @@ $fieldsets = $this->form->getFieldsets();
</fieldset>
<?php endforeach; ?>
<?php echo JHTML::_('sliders.end'); ?>
<input type="hidden" name="task" value="" />
<?php echo JHtml::_('form.token'); ?>
</div>

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

@ -20,7 +20,7 @@
label="COM_WEBLINKS_FIELD_CONFIG_INTRO_LABEL"
rows="3"
/>
<field name="show_link_hits" type="radio"
default="1"
description="COM_WEBLINKS_FIELD_CONFIG_HITS_DESC"

2
administrator/components/com_weblinks/models/weblinks.php
View File

@ -143,7 +143,7 @@ class WeblinksModelWeblinks extends JModelList
$query->where('a.id = '.(int) substr($search, 3));
} else {
$search = $db->Quote('%'.$db->getEscaped($search, true).'%');
$query->where('(a.title LIKE '.$search.' OR a.alias LIKE '.$search.')');
$query->where('(a.title LIKE '.$search.' OR a.alias LIKE '.$search.')');
}
}

12
administrator/components/com_weblinks/views/weblink/tmpl/edit.php
View File

@ -74,22 +74,22 @@ JHtml::_('behavior.formvalidation');
<ul class="adminformlist">
<li><?php echo $this->form->getLabel('created_by'); ?>
<?php echo $this->form->getInput('created_by'); ?></li>
<li><?php echo $this->form->getLabel('created_by_alias'); ?>
<?php echo $this->form->getInput('created_by_alias'); ?></li>
<li><?php echo $this->form->getLabel('created'); ?>
<?php echo $this->form->getInput('created'); ?></li>
<li><?php echo $this->form->getLabel('publish_up'); ?>
<?php echo $this->form->getInput('publish_up'); ?></li>
<li><?php echo $this->form->getLabel('publish_down'); ?>
<?php echo $this->form->getInput('publish_down'); ?></li>
<li><?php echo $this->form->getLabel('modified'); ?>
<?php echo $this->form->getInput('modified'); ?></li>
<li><?php echo $this->form->getLabel('version'); ?>
<?php echo $this->form->getInput('version'); ?></li>
</ul>

4
administrator/components/com_weblinks/views/weblink/tmpl/edit_metadata.php
View File

@ -22,10 +22,10 @@ foreach ($fieldSets as $name => $fieldSet) :
<?php if ($name == 'jmetadata') : // Include the real fields in this panel. ?>
<li><?php echo $this->form->getLabel('metadesc'); ?>
<?php echo $this->form->getInput('metadesc'); ?></li>
<li><?php echo $this->form->getLabel('metakey'); ?>
<?php echo $this->form->getInput('metakey'); ?></li>
<li><?php echo $this->form->getLabel('xreference'); ?>
<?php echo $this->form->getInput('xreference'); ?></li>
<?php endif; ?>

8
administrator/templates/bluestork/css/template.css
View File

@ -153,7 +153,7 @@ textarea:focus {
font-weight: bold;
}
.disabled,
.disabled,
p.error {
color: red;
font-weight: bold;
@ -876,7 +876,7 @@ span.readonly {
}
#jform_params_alt,
#jform_clickurl {
#jform_clickurl {
width: 355px;
}
@ -1373,7 +1373,7 @@ th.center,
float: none;
}
td.center img,
td.center img,
th.center img {
float: none;
}
@ -1382,7 +1382,7 @@ td.right,th.right {
text-align: right;
}
td.nowrap,
td.nowrap,
th.nowrap {
white-space: nowrap;
}

14
administrator/templates/bluestork/error.php
View File

@ -21,20 +21,20 @@ $app = JFactory::getApplication();
<jdoc:include type="head" />
<link rel="stylesheet" href="templates/system/css/system.css" type="text/css" />
<link href="templates/<?php echo $this->template ?>/css/template.css" rel="stylesheet" type="text/css" />
<?php if ($this->direction == 'rtl') : ?>
<link href="templates/<?php echo $this->template ?>/css/template_rtl.css" rel="stylesheet" type="text/css" />
<?php endif; ?>
<?php if ($this->direction == 'rtl') : ?>
<link href="templates/<?php echo $this->template ?>/css/template_rtl.css" rel="stylesheet" type="text/css" />
<?php endif; ?>
<!--[if gte IE 7]>
<link href="templates/<?php echo $this->template ?>/css/ie7.css" rel="stylesheet" type="text/css" />
<![endif]-->
</head>
<body id="minwidth-body">
<div id="border-top" class="h_blue">
@ -61,7 +61,7 @@ $app = JFactory::getApplication();
<?php echo JText::_('JGLOBAL_WARNJAVASCRIPT') ?>
</noscript>
<div class="clr"></div>
<div id="border-bottom"><div><div></div></div></div>
<div id="border-bottom"><div><div></div></div></div>
</body>
</html>

4
administrator/templates/hathor/css/menu_rtl.css
View File

@ -14,7 +14,7 @@
/**
* Menu Styling
*/
#menu ul li.node {
background: #ffffff url(../images/j_arrow_left.png) no-repeat left 50%;
}
@ -23,7 +23,7 @@
padding: 0.35em 2em 0.35em 2.5em;
background-position: right 50%;
}
#menu li {
float: right;
border-left: 1px solid #e3e4ca;

28
administrator/templates/hathor/css/template.css
View File

@ -1310,7 +1310,7 @@ th.ordering-col a {
th.ordering-col a img {
margin-left: 4px;
margin-right: 4px;
}
}
.categories th.ordering-col input, .categories td.order input {
font-size: 1em;
@ -1583,11 +1583,11 @@ table.noshow fieldset {
a.saveorder {
width: 16px;
height: 16px;
display:block;
display:block;
overflow: hidden;
background: url(../images/admin/filesave.png) no-repeat;
float:right;
margin-right: 8px;
margin-right: 8px;
}
a.saveorder.inactive {
@ -1805,27 +1805,27 @@ div.pagination {
margin: 0 10px;
font-size: 1.2em;
height: 1.8em;
line-height: 1.8em;
line-height: 1.8em;
}
.pagination div.limit label {
font-size: 100%;
height: 1.8em;
line-height: 1.8em;
line-height: 1.8em;
}
.pagination div.limit select {
font-size: 100%;
height: 1.8em;
line-height: 1.8em;
line-height: 1.8em;
}
/* The Go submittal button */
.pagination button {
font-size: 100%;
font-size: 100%;
height: 1.8em;
line-height: 1.8em;
line-height: 1.8em;
margin-right: 20px;
}
@ -1879,28 +1879,28 @@ div.pagination {
margin: 0 10px;
font-size: 1.2em;
height: 1.6em;
line-height: 1.6em;
line-height: 1.6em;
}
.pagination div.limit label {
font-size: 100%;
height: 1.6em;
line-height: 1.6em;
line-height: 1.6em;
}
.pagination div.limit select {
font-size: 100%;
height: 1.6em;
line-height: 1.6em;
line-height: 1.6em;
padding: 0;
}
/* The Go submittal button */
.pagination button {
font-size: 100%;
font-size: 100%;
height: 1.6em;
line-height: 1.6em;
line-height: 1.6em;
margin-right: 20px;
padding-bottom: 5px;
}

14
administrator/templates/hathor/html/com_categories/category/edit.php
View File

@ -42,25 +42,25 @@ JHtml::_('behavior.formvalidation');
<ul class="adminformlist">
<li><?php echo $this->form->getLabel('title'); ?>
<?php echo $this->form->getInput('title'); ?></li>
<li><?php echo $this->form->getLabel('alias'); ?>
<?php echo $this->form->getInput('alias'); ?></li>
<li><?php echo $this->form->getLabel('extension'); ?>
<?php echo $this->form->getInput('extension'); ?></li>
<li><?php echo $this->form->getLabel('parent_id'); ?>
<?php echo $this->form->getInput('parent_id'); ?></li>
<li><?php echo $this->form->getLabel('published'); ?>
<?php echo $this->form->getInput('published'); ?></li>
<li><?php echo $this->form->getLabel('access'); ?>
<?php echo $this->form->getInput('access'); ?></li>
<li><?php echo $this->form->getLabel('language'); ?>
<?php echo $this->form->getInput('language'); ?></li>
<li><?php echo $this->form->getLabel('id'); ?>
<?php echo $this->form->getInput('id'); ?></li>
</ul>

6
administrator/templates/hathor/html/com_categories/category/edit_metadata.php
View File

@ -13,10 +13,10 @@ defined('_JEXEC') or die;
<ul class="adminformlist">
<li><?php echo $this->form->getLabel('metadesc'); ?>
<?php echo $this->form->getInput('metadesc'); ?></li>
<li><?php echo $this->form->getLabel('metakey'); ?>
<?php echo $this->form->getInput('metakey'); ?></li>
<?php foreach($this->form->getGroup('metadata') as $field): ?>
<?php if ($field->hidden): ?>
<li><?php echo $field->input; ?></li>
@ -25,7 +25,7 @@ defined('_JEXEC') or die;
<?php echo $field->input; ?></li>
<?php endif; ?>
<?php endforeach; ?>
<?php if ($this->item->created_time) : ?>
<li><?php echo $this->form->getLabel('created_time'); ?>
<?php echo $this->form->getInput('created_time'); ?></li>

4
administrator/templates/hathor/html/com_content/article/edit.php
View File

@ -59,10 +59,10 @@ JHtml::_('behavior.keepalive');
<li><?php echo $this->form->getLabel('featured'); ?>
<?php echo $this->form->getInput('featured'); ?></li>
<li><?php echo $this->form->getLabel('id'); ?>
<?php echo $this->form->getInput('id'); ?></li>
</ul>
<div class="clr"></div>

2
administrator/templates/hathor/html/com_installer/default/default_ftp.php
View File

@ -23,7 +23,7 @@ defined('_JEXEC') or die;
<ul class="adminformlist">
<li><label for="username"><?php echo JText::_('JGLOBAL_USERNAME'); ?></label>
<input type="text" id="username" name="username" class="inputbox" value="" /></li>
<li><label for="password"><?php echo JText::_('JGLOBAL_PASSWORD'); ?></label>
<input type="password" id="password" name="password" class="input_box" value="" /></li>
</ul>

28
administrator/templates/hathor/html/com_menus/item/edit.php
View File

@ -46,51 +46,51 @@ JHTML::_('behavior.modal');
<ul class="adminformlist">
<li><?php echo $this->form->getLabel('title'); ?>
<?php echo $this->form->getInput('title'); ?></li>
<li><?php echo $this->form->getLabel('type'); ?>
<?php echo $this->form->getInput('type'); ?></li>
<?php if ($this->item->type =='url'): ?>
<?php $this->form->setFieldAttribute('link','readonly','false');?>
<li><?php echo $this->form->getLabel('link'); ?>
<?php echo $this->form->getInput('link'); ?></li>
<?php endif ?>
<li><?php echo $this->form->getLabel('alias'); ?>
<?php echo $this->form->getInput('alias'); ?></li>
<li><?php echo $this->form->getLabel('note'); ?>
<?php echo $this->form->getInput('note'); ?></li>
<?php if ($this->item->type !=='url'): ?>
<li><?php echo $this->form->getLabel('link'); ?>
<?php echo $this->form->getInput('link'); ?></li>
<?php endif ?>
<li><?php echo $this->form->getLabel('published'); ?>
<?php echo $this->form->getInput('published'); ?></li>
<li><?php echo $this->form->getLabel('access'); ?>
<?php echo $this->form->getInput('access'); ?></li>
<li><?php echo $this->form->getLabel('menutype'); ?>
<?php echo $this->form->getInput('menutype'); ?></li>
<li><?php echo $this->form->getLabel('parent_id'); ?>
<?php echo $this->form->getInput('parent_id'); ?></li>
<li><?php echo $this->form->getLabel('browserNav'); ?>
<?php echo $this->form->getInput('browserNav'); ?></li>
<li><?php echo $this->form->getLabel('home'); ?>
<?php echo $this->form->getInput('home'); ?></li>
<li><?php echo $this->form->getLabel('language'); ?>
<?php echo $this->form->getInput('language'); ?></li>
<li><?php echo $this->form->getLabel('template_style_id'); ?>
<?php echo $this->form->getInput('template_style_id'); ?></li>
<li><?php echo $this->form->getLabel('id'); ?>
<?php echo $this->form->getInput('id'); ?></li>
</ul>

4
administrator/templates/hathor/html/com_menus/menu/edit.php
View File

@ -36,10 +36,10 @@ JHtml::_('behavior.formvalidation');
<ul class="adminformlist">
<li><?php echo $this->form->getLabel('title'); ?>
<?php echo $this->form->getInput('title'); ?></li>
<li><?php echo $this->form->getLabel('menutype'); ?>
<?php echo $this->form->getInput('menutype'); ?></li>
<li><?php echo $this->form->getLabel('description'); ?>
<?php echo $this->form->getInput('description'); ?></li>
</ul>

16
administrator/templates/hathor/html/com_modules/module/edit.php
View File

@ -43,20 +43,20 @@ $hasContent = empty($this->item->module) || $this->item->module == 'custom' || $
<li><?php echo $this->form->getLabel('title'); ?>
<?php echo $this->form->getInput('title'); ?></li>
<li><?php echo $this->form->getLabel('position'); ?>
<?php echo $this->form->getInput('custom_position'); ?>
<label id="jform_custom_position-lbl" for="jform_custom_position" class="element-invisible"><?php echo JText::_('TPL_HATHOR_COM_MODULES_CUSTOM_POSITION_LABEL');?></label>
<?php echo $this->form->getInput('position'); ?></li>
<?php if ((string) $this->item->xml->name != 'Login Form'): ?>
<li><?php echo $this->form->getLabel('published'); ?>
<?php echo $this->form->getInput('published'); ?></li>
<?php endif; ?>
<li><?php echo $this->form->getLabel('access'); ?>
<?php echo $this->form->getInput('access'); ?></li>
<li><?php echo $this->form->getLabel('ordering'); ?>
<?php echo $this->form->getInput('ordering'); ?></li>
@ -81,16 +81,16 @@ $hasContent = empty($this->item->module) || $this->item->module == 'custom' || $
<li><?php echo $this->form->getLabel('id'); ?>
<?php echo $this->form->getInput('id'); ?></li>
<?php endif; ?>
<li><?php echo $this->form->getLabel('module'); ?>
<?php echo $this->form->getInput('module'); ?>
<span class="faux-input"><?php if ($this->item->xml) echo ($text = (string) $this->item->xml->name) ? JText::_($text) : $this->item->module;else echo JText::_(MODULES_ERR_XML);?></span></li>
<li><?php echo $this->form->getLabel('client_id'); ?>
<input type="text" size="35" id="jform_client_id" value="<?php echo $this->item->client_id == 0 ? JText::_('JSITE') : JText::_('JADMINISTRATOR'); ?> " class="readonly" readonly="readonly" />
<?php echo $this->form->getInput('client_id'); ?></li>
</ul>
<?php if ($this->item->xml) : ?>
<?php if ($text = trim($this->item->xml->description)) : ?>
<span class="faux-label">
@ -119,7 +119,7 @@ $hasContent = empty($this->item->module) || $this->item->module == 'custom' || $
</ul>
</fieldset>
<?php endif; ?>
<?php if ($this->item->client_id == 0) :?>
<div>
<?php echo $this->loadTemplate('assignment'); ?>

8
administrator/templates/hathor/html/com_newsfeeds/newsfeeds/modal.php
View File

@ -34,7 +34,7 @@ $listDirn = $this->state->get('list.direction');
<option value=""><?php echo JText::_('JOPTION_SELECT_ACCESS');?></option>
<?php echo JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access'));?>
</select>
<label class="selectlabel" for="filter_published">
<?php echo JText::_('JOPTION_SELECT_PUBLISHED'); ?>
</label>
@ -50,7 +50,7 @@ $listDirn = $this->state->get('list.direction');
<option value=""><?php echo JText::_('JOPTION_SELECT_CATEGORY');?></option>
<?php echo JHtml::_('select.options', JHtml::_('category.options', 'com_newsfeeds'), 'value', 'text', $this->state->get('filter.category_id'));?>
</select>
<button type="button" id="filter-go" onclick="this.form.submit();">
<?php echo JText::_('JSUBMIT'); ?></button>
</div>
@ -94,9 +94,9 @@ $listDirn = $this->state->get('list.direction');
<?php endforeach; ?>
</tbody>
</table>
<?php echo $this->pagination->getListFooter(); ?>
<input type="hidden" name="task" value="" />
<input type="hidden" name="boxchecked" value="0" />
<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />

8
administrator/templates/hathor/html/com_plugins/plugin/edit.php
View File

@ -28,7 +28,7 @@ JHtml::_('behavior.formvalidation');
<fieldset class="adminform">
<legend><?php echo JText::_('JDETAILS') ?></legend>
<ul class="adminformlist">
<li><?php echo $this->form->getLabel('name'); ?>
<?php echo $this->form->getInput('name'); ?>
<span class="readonly plg-name"><?php echo JText::_($this->item->name);?></span></li>
@ -56,7 +56,7 @@ JHtml::_('behavior.formvalidation');
<!-- Plugin metadata -->
<?php if ($this->item->xml) : ?>
<?php if ($text = trim($this->item->xml->description)) : ?>
<label id="jform_extdescription-lbl">
<?php echo JText::_('JGLOBAL_DESCRIPTION'); ?>
</label>
@ -64,12 +64,12 @@ JHtml::_('behavior.formvalidation');
<div class="readonly plg-desc extdescript">
<?php echo JText::_($text); ?>
</div>
<?php endif; ?>
<?php else : ?>
<?php echo JText::_('COM_PLUGINS_XML_ERR'); ?>
<?php endif; ?>
</fieldset>
</div>

20
administrator/templates/hathor/html/com_weblinks/weblink/edit.php
View File

@ -36,28 +36,28 @@ JHtml::_('behavior.formvalidation');
<ul class="adminformlist">
<li><?php echo $this->form->getLabel('title'); ?>
<?php echo $this->form->getInput('title'); ?></li>
<li><?php echo $this->form->getLabel('alias'); ?>
<?php echo $this->form->getInput('alias'); ?></li>
<li><?php echo $this->form->getLabel('url'); ?>
<?php echo $this->form->getInput('url'); ?></li>
<li><?php echo $this->form->getLabel('state'); ?>
<?php echo $this->form->getInput('state'); ?></li>
<li><?php echo $this->form->getLabel('catid'); ?>
<?php echo $this->form->getInput('catid'); ?></li>
<li><?php echo $this->form->getLabel('ordering'); ?>
<?php echo $this->form->getInput('ordering'); ?></li>
<li><?php echo $this->form->getLabel('access'); ?>
<?php echo $this->form->getInput('access'); ?></li>
<li><?php echo $this->form->getLabel('language'); ?>
<?php echo $this->form->getInput('language'); ?></li>
<li><?php echo $this->form->getLabel('id'); ?>
<?php echo $this->form->getInput('id'); ?></li>
</ul>
@ -76,7 +76,7 @@ JHtml::_('behavior.formvalidation');
<fieldset class="panelform">
<legend class="element-invisible"><?php echo JText::_('JGLOBAL_FIELDSET_PUBLISHING'); ?></legend>
<ul class="adminformlist">
<li><?php echo $this->form->getLabel('created_by'); ?>
<?php echo $this->form->getInput('created_by'); ?></li>
@ -104,7 +104,7 @@ JHtml::_('behavior.formvalidation');
<?php echo $this->loadTemplate('params'); ?>
<?php echo $this->loadTemplate('metadata'); ?>
</div>
<div class="clr"></div>

6
administrator/templates/hathor/html/com_weblinks/weblink/edit_metadata.php
View File

@ -20,14 +20,14 @@ foreach ($fieldSets as $name => $fieldSet) :
?>
<fieldset class="panelform">
<legend class="element-invisible"><?php echo JText::_($fieldSet->label); ?></legend>
<ul class="adminformlist">
<ul class="adminformlist">
<?php if ($name == 'jmetadata') : // Include the real fields in this panel. ?>
<li><?php echo $this->form->getLabel('metadesc'); ?>
<?php echo $this->form->getInput('metadesc'); ?></li>
<li><?php echo $this->form->getLabel('metakey'); ?>
<?php echo $this->form->getInput('metakey'); ?><li>
<li><?php echo $this->form->getLabel('xreference'); ?>
<?php echo $this->form->getInput('xreference'); ?></li>
<?php endif; ?>

2
administrator/templates/hathor/html/com_weblinks/weblink/edit_params.php
View File

@ -20,7 +20,7 @@ foreach ($fieldSets as $name => $fieldSet) :
?>
<fieldset class="panelform">
<legend class="element-invisible"><?php echo JText::_($fieldSet->label); ?></legend>
<ul class="adminformlist">
<ul class="adminformlist">
<?php foreach ($this->form->getFieldset($name) as $field) : ?>
<li><?php echo $field->label; ?>
<?php echo $field->input; ?></li>

6
components/com_banners/models/banners.php
View File

@ -88,11 +88,11 @@ class BannersModelBanners extends JModelList
$query->select('cl.track_impressions as client_track_impressions');
$query->where('cl.state = 1');
}
// Filter by a single or group of categories
$categoryId = $this->getState('filter.category_id');
$catid = $this->getState('filter.category_id', array());
if (is_numeric($categoryId)) {
$type = $this->getState('filter.category_id.include', true) ? '= ' : '<> ';
@ -120,7 +120,7 @@ class BannersModelBanners extends JModelList
$categoryId = implode(',', $categoryId);
$type = $this->getState('filter.category_id.include', true) ? 'IN' : 'NOT IN';
$query->where('a.catid '.$type.' ('.$categoryId.')');
}
}
if ($tagSearch) {

2
components/com_contact/controller.php
View File

@ -51,5 +51,5 @@ class ContactController extends JController
parent::display($cachable,$safeurlparams);
return $this;
}
}
}

2
components/com_contact/controllers/contact.php
View File

@ -1,6 +1,6 @@
<?php
/**
* @version
* @version
* @copyright Copyright (C) 2005 - 2010 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/

4
components/com_contact/models/contact.php
View File

@ -163,7 +163,7 @@ class ContactModelContact extends JModelItem
protected function getContactQuery($pk = null)
{
{
// TODO: Cache on the fingerprint of the arguments
$db = $this->getDbo();
$user = JFactory::getUser();
@ -236,5 +236,5 @@ class ContactModelContact extends JModelItem
return $result;
}
}
}
}

4
components/com_contact/models/form/contact.xml
View File

@ -239,9 +239,9 @@
<fields name="metadata">
<fieldset name="metadata" label="JGLOBAL_FIELDSET_METADATA_OPTIONS">
<field name="robots"
<field name="robots"
type="list"
label="JFIELD_METADATA_ROBOTS_LABEL"
label="JFIELD_METADATA_ROBOTS_LABEL"
description="JFIELD_METADATA_ROBOTS_DESC"
>
<option value="">JGLOBAL_USE_GLOBAL</option>

2
components/com_contact/views/categories/tmpl/default.xml
View File

@ -297,7 +297,7 @@
<option value="1">JSHOW</option>
</field>
<field name="show_links" type="list"
<field name="show_links" type="list"
description="COM_CONTACT_FIELD_SHOW_LINKS_DESC"
label="COM_CONTACT_FIELD_SHOW_LINKS_LABEL"
>

18
components/com_contact/views/category/tmpl/default.xml
View File

@ -102,7 +102,7 @@
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field name="show_position_headings" type="list"
label="COM_CONTACT_FIELD_CONFIG_POSITION_LABEL"
description="COM_CONTACT_FIELD_CONFIG_POSITION_DESC"
@ -121,7 +121,7 @@
<option value="1">JSHOW</option>
</field>
<field name="show_telephone_headings"
<field name="show_telephone_headings"
type="list"
label="COM_CONTACT_FIELD_CONFIG_PHONE_LABEL"
description="COM_CONTACT_FIELD_CONFIG_PHONE_DESC"
@ -131,7 +131,7 @@
<option value="1">JSHOW</option>
</field>
<field name="show_mobile_headings"
<field name="show_mobile_headings"
type="list"
label="COM_CONTACT_FIELD_CONFIG_MOBILE_LABEL"
description="COM_CONTACT_FIELD_CONFIG_MOBILE_DESC"
@ -141,7 +141,7 @@
<option value="1">JSHOW</option>
</field>
<field name="show_fax_headings"
<field name="show_fax_headings"
type="list"
label="COM_CONTACT_FIELD_CONFIG_FAX_LABEL"
description="COM_CONTACT_FIELD_CONFIG_FAX_DESC"
@ -150,7 +150,7 @@
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field name="show_suburb_headings" type="list"
label="COM_CONTACT_FIELD_CONFIG_SUBURB_LABEL"
description="COM_CONTACT_FIELD_CONFIG_SUBURB_DESC"
@ -160,7 +160,7 @@
<option value="1">JSHOW</option>
</field>
<field name="show_state_headings"
<field name="show_state_headings"
type="list"
label="JGLOBAL_STATE"
description="COM_CONTACT_FIELD_CONFIG_STATE_DESC"
@ -169,8 +169,8 @@
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field name="show_country_headings"
<field name="show_country_headings"
type="list"
label="COM_CONTACT_FIELD_CONFIG_COUNTRY_LABEL"
description="COM_CONTACT_FIELD_CONFIG_COUNTRY_DESC"
@ -205,7 +205,7 @@
description="COM_CONTACT_FIELD_PRESENTATION_DESC"
label="COM_CONTACT_FIELD_PRESENTATION_LABEL"
>
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="sliders">COM_CONTACT_FIELD_VALUE_SLIDERS</option>
<option value="tabs">COM_CONTACT_FIELD_VALUE_TABS</option>
<option value="plain">COM_CONTACT_FIELD_VALUE_PLAIN</option>

6
components/com_contact/views/category/tmpl/default_items.php
View File

@ -72,13 +72,13 @@ $listDirn = $this->state->get('list.direction');
<?php echo JHtml::_('grid.sort', 'COM_CONTACT_SUBURB', 'a.suburb', $listDirn, $listOrder); ?>
</th>
<?php endif; ?>
<?php if ($this->params->get('show_state_headings')) : ?>
<th class="item-state">
<?php echo JHtml::_('grid.sort', 'COM_CONTACT_STATE', 'a.state', $listDirn, $listOrder); ?>
</th>
<?php endif; ?>
<?php if ($this->params->get('show_country_headings')) : ?>
<th class="item-state">
<?php echo JHtml::_('grid.sort', 'COM_CONTACT_COUNTRY', 'a.country', $listDirn, $listOrder); ?>
@ -142,7 +142,7 @@ $listDirn = $this->state->get('list.direction');
<?php echo $item->state; ?>
</td>
<?php endif; ?>
<?php if ($this->params->get('show_country_headings')) : ?>
<td class="item-state">
<?php echo $item->country; ?>

6
components/com_contact/views/category/view.html.php
View File

@ -145,8 +145,8 @@ class ContactViewCategory extends JView
$title = JText::sprintf('JPAGETITLE', htmlspecialchars_decode($app->getCfg('sitename')), $title);
}
$this->document->setTitle($title);
if ($this->category->metadesc) {
$this->document->setDescription($this->category->metadesc);
}
@ -170,7 +170,7 @@ class ContactViewCategory extends JView
$this->document->setMetadata($k, $v);
}
}
// Add alternate feed link
if ($this->params->get('show_feed_link', 1) == 1)
{

18
components/com_contact/views/contact/tmpl/default.php
View File

@ -39,13 +39,13 @@ $cparams = JComponentHelper::getParams ('com_media');
<span class="contact-image">
<?php echo JHTML::_('image',$this->contact->image, JText::_('COM_CONTACT_IMAGE_DETAILS'), array('align' => 'middle')); ?>
</span>
<?php endif; ?>
<?php endif; ?>
<?php if ($this->params->get('presentation_style')!='plain'){?>
<?php echo JHtml::_($this->params->get('presentation_style').'.start', 'contact-slider'); ?>
<?php echo JHtml::_($this->params->get('presentation_style').'.start', 'contact-slider'); ?>
<?php echo JHtml::_($this->params->get('presentation_style').'.panel',JText::_('COM_CONTACT_DETAILS'), 'basic-details'); } ?>
<?php if ($this->params->get('presentation_style')=='plain'):?>
<?php echo '<h3>'. JText::_('COM_CONTACT_DETAILS').'</h3>'; ?>
<?php endif; ?>
<?php endif; ?>
<?php if ($this->params->get('show_contact_list') && count($this->contact) > 1) : ?>
<form action="<?php echo JRoute::_('index.php') ?>" method="post" name="selectForm" id="selectForm">
<?php echo JText::_('COM_CONTACT_SELECT_CONTACT'); ?>:
@ -72,10 +72,10 @@ $cparams = JComponentHelper::getParams ('com_media');
<?php if ($this->params->get('presentation_style')!='plain'):?>
<?php echo JHtml::_($this->params->get('presentation_style').'.panel', JText::_('COM_CONTACT_EMAIL_FORM'), 'display-form'); ?>
<?php endif; ?>
<?php endif; ?>
<?php if ($this->params->get('presentation_style')=='plain'):?>
<?php echo '<h3>'. JText::_('COM_CONTACT_EMAIL_FORM').'</h3>'; ?>
<?php endif; ?>
<?php endif; ?>
<?php echo $this->loadTemplate('form'); ?>
<?php endif; ?>
<?php if ($this->params->get('show_links')) : ?>
@ -93,10 +93,10 @@ $cparams = JComponentHelper::getParams ('com_media');
<?php if ($this->params->get('show_profile') && $this->contact->user_id) : ?>
<?php if ($this->params->get('presentation_style')!='plain'):?>
<?php echo JHtml::_($this->params->get('presentation_style').'.panel', JText::_('COM_CONTACT_PROFILE'), 'display-profile'); ?>
<?php endif; ?>
<?php endif; ?>
<?php if ($this->params->get('presentation_style')=='plain'):?>
<?php echo '<h3>'. JText::_('COM_CONTACT_PROFILE').'</h3>'; ?>
<?php endif; ?>
<?php endif; ?>
<?php echo $this->loadTemplate('profile'); ?>
<?php endif; ?>
<?php if ($this->contact->misc && $this->params->get('show_misc')) : ?>
@ -104,7 +104,7 @@ $cparams = JComponentHelper::getParams ('com_media');
<?php echo JHtml::_($this->params->get('presentation_style').'.panel', JText::_('COM_CONTACT_OTHER_INFORMATION'), 'display-misc');} ?>
<?php if ($this->params->get('presentation_style')=='plain'):?>
<?php echo '<h3>'. JText::_('COM_CONTACT_OTHER_INFORMATION').'</h3>'; ?>
<?php endif; ?>
<?php endif; ?>
<div class="contact-miscinfo">
<span class="<?php echo $this->params->get('marker_class'); ?>">
<?php echo $this->params->get('marker_misc'); ?>
@ -115,5 +115,5 @@ $cparams = JComponentHelper::getParams ('com_media');
</div>
<?php endif; ?>
<?php if ($this->params->get('presentation_style')!='plain'){?>
<?php echo JHtml::_($this->params->get('presentation_style').'.end');} ?>
<?php echo JHtml::_($this->params->get('presentation_style').'.end');} ?>
</div>

74
components/com_contact/views/contact/tmpl/default.xml
View File

@ -14,7 +14,7 @@
<fieldset name="request"
addfieldpath="/administrator/components/com_contact/models/fields"
>
<field name="id"
<field name="id"
type="modal_contacts"
description="COM_CONTACT_SELECT_CONTACT_DESC"
label="COM_CONTACT_SELECT_CONTACT_LABEL"
@ -42,20 +42,20 @@
</fieldset>
<!-- Basic options. -->
<fieldset name="params"
<fieldset name="params"
label="COM_CONTACT_BASIC_OPTIONS_FIELDSET_LABEL"
>
<field name="presentation_style"
<field name="presentation_style"
type="list"
description="COM_CONTACT_FIELD_PRESENTATION_DESC"
label="COM_CONTACT_FIELD_PRESENTATION_LABEL"
>
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="sliders">COM_CONTACT_FIELD_VALUE_SLIDERS</option>
<option value="tabs">COM_CONTACT_FIELD_VALUE_TABS</option>
<option value="plain">COM_CONTACT_FIELD_VALUE_PLAIN</option>
</field>
<field name="show_contact_category"
<field name="show_contact_category"
type="list"
description="COM_CONTACT_FIELD_CONTACT_SHOW_CATEGORY_DESC"
label="COM_CONTACT_FIELD_CONTACT_SHOW_CATEGORY_LABEL"
@ -66,7 +66,7 @@
<option value="show_with_link">COM_CONTACT_FIELD_VALUE_WITH_LINK</option>
</field>
<field name="show_contact_list"
<field name="show_contact_list"
type="list"
description="COM_CONTACT_FIELD_CONTACT_SHOW_LIST_DESC"
label="COM_CONTACT_FIELD_CONTACT_SHOW_LIST_LABEL"
@ -76,7 +76,7 @@
<option value="1">JSHOW</option>
</field>
<field name="show_name"
<field name="show_name"
type="list"
description="COM_CONTACT_FIELD_PARAMS_NAME_DESC"
label="COM_CONTACT_FIELD_PARAMS_NAME_LABEL"
@ -86,7 +86,7 @@
<option value="1">JSHOW</option>
</field>
<field name="show_position"
<field name="show_position"
type="list"
description="COM_CONTACT_FIELD_PARAMS_CONTACT_POSITION_DESC"
label="COM_CONTACT_FIELD_PARAMS_CONTACT_POSITION_LABEL"
@ -97,7 +97,7 @@
</field>
<field name="show_email"
<field name="show_email"
type="list"
description="COM_CONTACT_FIELD_PARAMS_CONTACT_E_MAIL_DESC"
label="COM_CONTACT_FIELD_PARAMS_CONTACT_E_MAIL_LABEL"
@ -107,7 +107,7 @@
<option value="1">JSHOW</option>
</field>
<field name="show_street_address"
<field name="show_street_address"
type="list"
description="COM_CONTACT_FIELD_PARAMS_STREET_ADDRESS_DESC"
label="COM_CONTACT_FIELD_PARAMS_STREET_ADDRESS_LABEL"
@ -117,7 +117,7 @@
<option value="1">JSHOW</option>
</field>
<field name="show_suburb"
<field name="show_suburb"
type="list"
description="COM_CONTACT_FIELD_PARAMS_TOWN-SUBURB_DESC"
label="COM_CONTACT_FIELD_PARAMS_TOWN-SUBURB_LABEL"
@ -127,7 +127,7 @@
<option value="1">JSHOW</option>
</field>
<field name="show_state"
<field name="show_state"
type="list"
description="COM_CONTACT_FIELD_PARAMS_STATE-COUNTY_DESC"
label="COM_CONTACT_FIELD_PARAMS_STATE-COUNTY_LABEL"
@ -137,7 +137,7 @@
<option value="1">JSHOW</option>
</field>
<field name="show_postcode"
<field name="show_postcode"
type="list"
description="COM_CONTACT_FIELD_PARAMS_POST-ZIP_CODE_DESC"
label="COM_CONTACT_FIELD_PARAMS_POST-ZIP_CODE_LABEL"
@ -147,7 +147,7 @@
<option value="1">JSHOW</option>
</field>
<field name="show_country"
<field name="show_country"
type="list"
description="COM_CONTACT_FIELD_PARAMS_COUNTRY_DESC"
label="COM_CONTACT_FIELD_PARAMS_COUNTRY_LABEL"
@ -157,7 +157,7 @@
<option value="1">JSHOW</option>
</field>
<field name="show_telephone"
<field name="show_telephone"
type="list"
description="COM_CONTACT_FIELD_PARAMS_TELEPHONE_DESC"
label="COM_CONTACT_FIELD_PARAMS_TELEPHONE_LABEL"
@ -167,7 +167,7 @@
<option value="1">JSHOW</option>
</field>
<field name="show_mobile"
<field name="show_mobile"
type="list"
description="COM_CONTACT_FIELD_PARAMS_MOBILE_DESC"
label="COM_CONTACT_FIELD_PARAMS_MOBILE_LABEL"
@ -177,7 +177,7 @@
<option value="1">JSHOW</option>
</field>
<field name="show_fax"
<field name="show_fax"
type="list"
description="COM_CONTACT_FIELD_PARAMS_FAX_DESC"
label="COM_CONTACT_FIELD_PARAMS_FAX_LABEL"
@ -187,7 +187,7 @@
<option value="1">JSHOW</option>
</field>
<field name="show_webpage"
<field name="show_webpage"
type="list"
description="COM_CONTACT_FIELD_PARAMS_WEBPAGE_DESC"
label="COM_CONTACT_FIELD_PARAMS_WEBPAGE_LABEL"
@ -197,7 +197,7 @@
<option value="1">JSHOW</option>
</field>
<field name="show_misc"
<field name="show_misc"
type="list"
description="COM_CONTACT_FIELD_PARAMS_MISC_INFO_DESC"
label="COM_CONTACT_FIELD_PARAMS_MISC_INFO_LABEL"
@ -207,7 +207,7 @@
<option value="1">JSHOW</option>
</field>
<field name="show_image"
<field name="show_image"
type="list"
description="COM_CONTACT_FIELD_PARAMS_IMAGE_DESC"
label="COM_CONTACT_FIELD_PARAMS_IMAGE_LABEL"
@ -217,7 +217,7 @@
<option value="1">JSHOW</option>
</field>
<field name="allow_vcard"
<field name="allow_vcard"
type="list"
description="COM_CONTACT_FIELD_PARAMS_VCARD_DESC"
label="COM_CONTACT_FIELD_PARAMS_VCARD_LABEL"
@ -227,7 +227,7 @@
<option value="1">JSHOW</option>
</field>
<field name="show_articles"
<field name="show_articles"
type="list"
description="COM_CONTACT_FIELD_ARTICLES_SHOW_DESC"
label="COM_CONTACT_FIELD_ARTICLES_SHOW_LABEL"
@ -237,8 +237,8 @@
<option value="1">JSHOW</option>
</field>
<field name="show_links"
type="list"
<field name="show_links"
type="list"
description="COM_CONTACT_FIELD_SHOW_LINKS_DESC"
label="COM_CONTACT_FIELD_SHOW_LINKS_LABEL"
>
@ -247,35 +247,35 @@
<option value="1">JSHOW</option>
</field>
<field name="linka_name"
<field name="linka_name"
type="text"
description="COM_CONTACT_FIELD_LINK_NAME_DESC"
label="COM_CONTACT_FIELD_LINKA_NAME_LABEL"
size="30"
/>
<field name="linkb_name"
<field name="linkb_name"
type="text"
description="COM_CONTACT_FIELD_LINK_NAME_DESC"
label="COM_CONTACT_FIELD_LINKB_NAME_LABEL"
size="30"
/>
<field name="linkc_name"
<field name="linkc_name"
type="text"
description="COM_CONTACT_FIELD_LINK_NAME_DESC"
label="COM_CONTACT_FIELD_LINKC_NAME_LABEL"
size="30"
/>
<field name="linkd_name"
<field name="linkd_name"
type="text"
description="COM_CONTACT_FIELD_LINK_NAME_DESC"
label="COM_CONTACT_FIELD_LINKD_NAME_LABEL"
size="30"
/>
<field name="linke_name"
<field name="linke_name"
type="text"
description="COM_CONTACT_FIELD_LINK_NAME_DESC"
label="COM_CONTACT_FIELD_LINKE_NAME_LABEL"
@ -284,7 +284,7 @@
</fieldset>
<!-- Form options. -->
<fieldset name="Contact_Form"
<fieldset name="Contact_Form"
label="COM_CONTACT_MAIL_FIELDSET_LABEL"
>
@ -297,7 +297,7 @@
<option value="1">JSHOW</option>
</field>
<field name="show_email_copy"
<field name="show_email_copy"
type="list"
description="COM_CONTACT_FIELD_EMAIL_EMAIL_COPY_DESC"
label="COM_CONTACT_FIELD_EMAIL_EMAIL_COPY_LABEL"
@ -307,7 +307,7 @@
<option value="1">JSHOW</option>
</field>
<field name="banned_email"
<field name="banned_email"
type="textarea"
cols="30"
description="COM_CONTACT_FIELD_CONFIG_BANNED_EMAIL_DESC"
@ -315,7 +315,7 @@
rows="3"
/>
<field name="banned_subject"
<field name="banned_subject"
type="textarea"
cols="30"
description="COM_CONTACT_FIELD_CONFIG_BANNED_SUBJECT_DESC"
@ -323,7 +323,7 @@
rows="3"
/>
<field name="banned_text"
<field name="banned_text"
type="textarea"
cols="30"
description="COM_CONTACT_FIELD_CONFIG_BANNED_TEXT_DESC"
@ -331,7 +331,7 @@
rows="3"
/>
<field name="validate_session"
<field name="validate_session"
type="list"
description="COM_CONTACT_FIELD_CONFIG_SESSION_CHECK_DESC"
label="COM_CONTACT_FIELD_CONFIG_SESSION_CHECK_LABEL"
@ -341,7 +341,7 @@
<option value="1">JYES</option>
</field>
<field name="custom_reply"
<field name="custom_reply"
type="list"
description="COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_DESC"
label="COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_LABEL"
@ -351,7 +351,7 @@
<option value="1">JYES</option>
</field>
<field name="redirect"
<field name="redirect"
type="text"
description="COM_CONTACT_FIELD_CONFIG_REDIRECT_DESC"
label="COM_CONTACT_FIELD_CONFIG_REDIRECT_LABEL"

16
components/com_contact/views/contact/view.html.php
View File

@ -26,11 +26,11 @@ class ContactViewContact extends JView
function display($tpl = null)
{
// Initialise variables.
{
// Initialise variables.
$app = JFactory::getApplication();
$user = JFactory::getUser();
$dispatcher =& JDispatcher::getInstance();
$dispatcher =& JDispatcher::getInstance();
// Get model data.
$state = $this->get('State');
@ -41,16 +41,16 @@ class ContactViewContact extends JView
JError::raiseWarning(500, implode("\n", $errors));
return false;
}
// Get the parameters of the active menu item
$menus = $app->getMenu();
$menu = $menus->getActive();
$params = $app->getParams();
$item_params = new JRegistry;
$item_params->loadJSON($item->params);
$params->merge($item_params);
// check if access is not public
$groups = $user->authorisedLevels();
@ -136,7 +136,7 @@ class ContactViewContact extends JView
$this->assignRef('state', $state);
$this->assignRef('item', $item);
$this->assignRef('user', $user);
$this->_prepareDocument();
parent::display($tpl);
@ -186,7 +186,7 @@ class ContactViewContact extends JView
$title = JText::sprintf('JPAGETITLE', htmlspecialchars_decode($app->getCfg('sitename')), $title);
}
$this->document->setTitle($title);
if ($this->item->metadesc)
{
$this->document->setDescription($this->item->metadesc);

22
components/com_contact/views/featured/tmpl/default.xml
View File

@ -102,7 +102,7 @@
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field name="show_position_headings" type="list"
label="COM_CONTACT_FIELD_CONFIG_POSITION_LABEL"
description="COM_CONTACT_FIELD_CONFIG_POSITION_DESC"
@ -121,7 +121,7 @@
<option value="1">JSHOW</option>
</field>
<field name="show_telephone_headings"
<field name="show_telephone_headings"
type="list"
label="COM_CONTACT_FIELD_CONFIG_PHONE_LABEL"
description="COM_CONTACT_FIELD_CONFIG_PHONE_DESC"
@ -131,7 +131,7 @@
<option value="1">JSHOW</option>
</field>
<field name="show_mobile_headings"
<field name="show_mobile_headings"
type="list"
label="COM_CONTACT_FIELD_CONFIG_MOBILE_LABEL"
description="COM_CONTACT_FIELD_CONFIG_MOBILE_DESC"
@ -141,7 +141,7 @@
<option value="1">JSHOW</option>
</field>
<field name="show_fax_headings"
<field name="show_fax_headings"
type="list"
label="COM_CONTACT_FIELD_CONFIG_FAX_LABEL"
description="COM_CONTACT_FIELD_CONFIG_FAX_DESC"
@ -150,7 +150,7 @@
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field name="show_suburb_headings" type="list"
label="COM_CONTACT_FIELD_CONFIG_SUBURB_LABEL"
description="COM_CONTACT_FIELD_CONFIG_SUBURB_DESC"
@ -160,17 +160,17 @@
<option value="1">JSHOW</option>
</field>
<field name="show_state_headings"
<field name="show_state_headings"
type="list"
label="JGLOBAL_STATE"
description="COM_CONTACT_FIELD_CONFIG_STATE_DESC"
>
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field name="show_country_headings"
<field name="show_country_headings"
type="list"
label="COM_CONTACT_FIELD_CONFIG_COUNTRY_LABEL"
description="COM_CONTACT_FIELD_CONFIG_COUNTRY_DESC"
@ -205,7 +205,7 @@
description="COM_CONTACT_FIELD_PRESENTATION_DESC"
label="COM_CONTACT_FIELD_PRESENTATION_LABEL"
>
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="sliders">COM_CONTACT_FIELD_VALUE_SLIDERS</option>
<option value="tabs">COM_CONTACT_FIELD_VALUE_TABS</option>
<option value="plain">COM_CONTACT_FIELD_VALUE_PLAIN</option>
@ -355,7 +355,7 @@
<option value="1">JSHOW</option>
</field>
<field name="show_links" type="list"
<field name="show_links" type="list"
description="COM_CONTACT_FIELD_SHOW_LINKS_DESC"
label="COM_CONTACT_FIELD_SHOW_LINKS_LABEL"
>

14
components/com_contact/views/featured/tmpl/default_items.php
View File

@ -68,25 +68,25 @@ $params = &$this->item->params;
<?php echo JText::_('COM_CONTACT_FAX'); ?>
</th>
<?php endif; ?>
<?php if ($this->params->get('show_suburb_headings')) : ?>
<th class="item-suburb">
<?php echo JHtml::_('grid.sort', 'COM_CONTACT_SUBURB', 'a.suburb', $listDirn, $listOrder); ?>
</th>
<?php endif; ?>
<?php if ($this->params->get('show_state_headings')) : ?>
<th class="item-state">
<?php echo JHtml::_('grid.sort', 'COM_CONTACT_STATE', 'a.state', $listDirn, $listOrder); ?>
</th>
<?php endif; ?>
<?php if ($this->params->get('show_country_headings')) : ?>
<th class="item-state">
<?php echo JHtml::_('grid.sort', 'COM_CONTACT_COUNTRY', 'a.country', $listDirn, $listOrder); ?>
</th>
<?php endif; ?>
</tr>
</thead>
<?php endif; ?>
@ -132,19 +132,19 @@ $params = &$this->item->params;
<?php echo $item->fax; ?>
</td>
<?php endif; ?>
<?php if ($this->params->get('show_suburb_headings')) : ?>
<td class="item-suburb">
<?php echo $item->suburb; ?>
</td>
<?php endif; ?>
<?php if ($this->params->get('show_state_headings')) : ?>
<td class="item-state">
<?php echo $item->state; ?>
</td>
<?php endif; ?>
<?php if ($this->params->get('show_country_headings')) : ?>
<td class="item-state">
<?php echo $item->country; ?>

2
components/com_content/controller.php
View File

@ -32,7 +32,7 @@ class ContentController extends JController
JHTML::_('stylesheet','system/adminlist.css', array(), true);
$config['base_path'] = JPATH_COMPONENT_ADMINISTRATOR;
}
parent::__construct($config);
}

2
components/com_content/controllers/article.php
View File

@ -153,7 +153,7 @@ class ContentControllerArticle extends JController
$app->setUserState($context.'id', $id);
$app->setUserState($context.'data', null);
// ItemID required on redirect for correct Template Style
// ItemID required on redirect for correct Template Style
$redirect = 'index.php?option=com_content&view=form&layout=edit';
if (JRequest::getInt('Itemid') == 0) {
} else {

2
components/com_content/models/category.php
View File

@ -234,7 +234,7 @@ class ContentModelCategory extends JModelItem
$options['countItems'] = $params->get('show_cat_num_articles', 0);
}
else {
$options['countItems'] = 0;
$options['countItems'] = 0;
}
$categories = JCategories::getInstance('Content', $options);
$this->_item = $categories->get($this->getState('category.id', 'root'));

4
components/com_content/views/article/tmpl/default.xml
View File

@ -217,9 +217,9 @@
<!-- Metadata options. -->
<fieldset name="metadata" label="JGLOBAL_FIELDSET_METADATA_OPTIONS">
<field name="robots"
<field name="robots"
type="list"
label="JFIELD_METADATA_ROBOTS_LABEL"
label="JFIELD_METADATA_ROBOTS_LABEL"
description="JFIELD_METADATA_ROBOTS_DESC"
>
<option value="">JGLOBAL_USE_GLOBAL</option>

2
components/com_content/views/category/tmpl/default_articles.php
View File

@ -83,7 +83,7 @@ $listDirn = $this->state->get('list.direction');
<tr class="cat-list-row<?php echo $i % 2; ?>">
<?php if (in_array($article->access, $this->user->authorisedLevels())) : ?>
<td class="list-title">
<a href="<?php echo JRoute::_(ContentHelperRoute::getArticleRoute($article->slug, $article->catid)); ?>">
<?php echo $this->escape($article->title); ?></a>

2
components/com_newsfeeds/models/newsfeed.php
View File

@ -124,7 +124,7 @@ class NewsfeedsModelNewsfeed extends JModel
$db->setQuery($query);
$this->_data = $db->loadObject();
// Convert metadata fields to objects.
$registry = new JRegistry;
$registry->loadJSON($this->_data->metadata);

4
components/com_newsfeeds/views/category/view.html.php
View File

@ -136,7 +136,7 @@ class NewsfeedsViewCategory extends JView
$title = JText::sprintf('JPAGETITLE', htmlspecialchars_decode($app->getCfg('sitename')), $title);
}
$this->document->setTitle($title);
if ($this->category->metadesc) {
$this->document->setDescription($this->category->metadesc);
}
@ -160,7 +160,7 @@ class NewsfeedsViewCategory extends JView
$this->document->setMetadata($k, $v);
}
}
// Add alternate feed link
if ($this->params->get('show_feed_link', 1) == 1)

4
components/com_newsfeeds/views/newsfeed/view.html.php
View File

@ -135,7 +135,7 @@ class NewsfeedsViewNewsfeed extends JView
$title = JText::sprintf('JPAGETITLE', htmlspecialchars_decode($app->getCfg('sitename')), $title);
}
$this->document->setTitle($title);
if ($this->newsfeed->metadesc)
{
$this->document->setDescription($this->newsfeed->metadesc);
@ -154,6 +154,6 @@ class NewsfeedsViewNewsfeed extends JView
$this->document->setMetadata($k, $v);
}
}
}
}

6
components/com_search/views/search/tmpl/default.xml
View File

@ -3,7 +3,7 @@
<layout title="COM_SEARCH_SEARCH_VIEW_DEFAULT_TITLE">
<help
key = "JHELP_MENUS_MENU_ITEM_SEARCH_RESULTS"
/>
/>
<message>
<![CDATA[COM_SEARCH_SEARCH_VIEW_DEFAULT_DESC]]>
</message>
@ -16,7 +16,7 @@
<fieldset name="basic" label="COM_MENUS_BASIC_FIELDSET_LABEL">
<field name="search_areas" type="list"
description="COM_SEARCH_FIELD_SEARCH_AREAS_DESC"
label="COM_SEARCH_FIELD_SEARCH_AREAS_LABEL"
>
@ -26,7 +26,7 @@
</field>
<field name="show_date" type="list"
description="COM_SEARCH_CONFIG_FIELD_CREATED_DATE_DESC"
label="COM_SEARCH_CONFIG_FIELD_CREATED_DATE_LABEL"
>

2
components/com_users/models/profile.php
View File

@ -187,7 +187,7 @@ class UsersModelProfile extends JModelForm
{
$form->loadFile('frontend',false);
if (JFactory::getUser()->authorise('core.login.admin')) {
$form->loadFile('frontend_admin',false);
$form->loadFile('frontend_admin',false);
}
}
parent::preprocessForm($form, $data, 'user');

2
components/com_users/views/profile/tmpl/default.xml
View File

@ -3,7 +3,7 @@
<layout title="com_user_profile_view_default_title">
<help
key = "JHELP_MENUS_MENU_ITEM_USER_PROFILE"
/>
/>
<message>
<![CDATA[com_user_profile_view_default_desc]]>
</message>

2
components/com_users/views/profile/tmpl/edit.xml
View File

@ -3,7 +3,7 @@
<layout title="com_user_profile_edit_default_title">
<help
key = "JHELP_MENUS_MENU_ITEM_USER_PROFILE_EDIT"
/>
/>
<message>
<![CDATA[com_user_profile_edit_default_desc]]>
</message>

2
components/com_users/views/registration/tmpl/default.xml
View File

@ -3,7 +3,7 @@
<layout title="COM_USER_REGISTRATION_DEFAULT_TITLE">
<help
key="JHELP_MENUS_MENU_ITEM_USER_REGISTRATION"
/>
/>
<message>
<![CDATA[COM_USER_REGISTRATION_DEFAULT_DESC]]>
</message>

2
components/com_users/views/remind/tmpl/default.xml
View File

@ -3,7 +3,7 @@
<layout title="COM_USER_REMIND_DEFAULT_TITLE">
<help
key = "JHELP_MENUS_MENU_ITEM_USER_REMINDER"
/>
/>
<message>
<![CDATA[COM_USER_REMIND_DEFAULT_DESC]]>
</message>

2
components/com_users/views/reset/tmpl/default.xml
View File

@ -3,7 +3,7 @@
<layout title="com_user_reset_default_title">
<help
key="JHELP_MENUS_MENU_ITEM_USER_PASSWORD_RESET"
/>
/>
<message>
<![CDATA[com_user_reset_view_default_desc]]>
</message>

6
components/com_weblinks/controllers/weblink.php
View File

@ -16,7 +16,7 @@ jimport('joomla.application.component.controllerform');
* @since 1.5
*/
class WeblinksControllerWeblink extends JControllerForm
{
{
/**
* @since 1.6
*/
@ -94,7 +94,7 @@ class WeblinksControllerWeblink extends JControllerForm
// Redirect to the list screen.
$this->setRedirect($this->_getReturnPage());
}
protected function _getReturnPage()
{
$app = JFactory::getApplication();
@ -123,7 +123,7 @@ class WeblinksControllerWeblink extends JControllerForm
$app->setUserState($context.'return', $return);
}
/**
* Go to a weblink
*

4
components/com_weblinks/models/forms/weblink.xml
View File

@ -55,7 +55,7 @@
required="true"
size="45"
/>
<field
name="language"
type="contentlanguage"
@ -64,6 +64,6 @@
class="inputbox">
<option value="*">JALL</option>
</field>
</fieldset>
</form>

2
components/com_weblinks/views/categories/tmpl/default.xml
View File

@ -3,7 +3,7 @@
<layout title="com_weblinks_categories_view_default_title">
<help
key="JHELP_MENUS_MENU_ITEM_WEBLINK_CATEGORIES"
/>
/>
<message>
<![CDATA[com_weblinks_categories_view_default_desc]]>
</message>

2
components/com_weblinks/views/category/tmpl/default.xml
View File

@ -3,7 +3,7 @@
<layout title="com_weblinks_category_view_default_title">
<help
key="JHELP_MENUS_MENU_ITEM_WEBLINK_CATEGORY"
/>
/>
<message>
<![CDATA[com_weblinks_category_view_default_desc]]>
</message>

4
components/com_weblinks/views/category/view.html.php
View File

@ -141,7 +141,7 @@ class WeblinksViewCategory extends JView
$title = JText::sprintf('JPAGETITLE', htmlspecialchars_decode($app->getCfg('sitename')), $title);
}
$this->document->setTitle($title);
if ($this->category->metadesc) {
$this->document->setDescription($this->category->metadesc);
}
@ -165,7 +165,7 @@ class WeblinksViewCategory extends JView
$this->document->setMetadata($k, $v);
}
}
// Add alternate feed link
if ($this->params->get('show_feed_link', 1) == 1)

2
components/com_weblinks/views/form/tmpl/edit.xml
View File

@ -4,7 +4,7 @@
title="com_weblinks_form_view_default_title">
<help
key="JHELP_MENUS_MENU_ITEM_WEBLINK_SUBMIT"
/>
/>
<message>
<![CDATA[com_weblinks_form_view_default_desc]]>
</message>

Some files were not shown because too many files have changed in this diff Show More