joomla/cms
29
0
Fork 0
mirror of https://github.com/joomla/joomla-cms.git synced 2024-06-25 23:02:55 +00:00
Code Packages Releases Activity

Cleaning out trailing whitespace.

Browse Source 
git-svn-id: http://joomlacode.org/svn/joomla/development/trunk@16306 6f6e1ebd-4c2b-0410-823f-f34bde69bce9
This commit is contained in:
Louis Landry 2010-04-21 18:47:28 +00:00
parent 66908eb700
commit e2f56fdf4d
288 changed files with 1751 additions and 1752 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
administrator/components/com_banners/category.xml
View File

@ -6,7 +6,7 @@
name="params">
<fieldset
name="basic">
<field
name="foobar"
type="text"

2
administrator/components/com_banners/helpers/banners.php
View File

@ -28,7 +28,7 @@ class BannersHelper
'index.php?option=com_banners&view=clients',
$vName == 'clients'
);
JSubMenuHelper::addEntry(
JText::_('COM_BANNERS_SUBMENU_CATEGORIES'),
'index.php?option=com_categories&extension=com_banners',

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

@ -34,7 +34,7 @@ class BannersModelBanner extends JModelAdmin
$this->_item = 'banner';
$this->_option = 'com_banners';
}
/**
* Method to auto-populate the model state.
*/
@ -198,7 +198,7 @@ class BannersModelBanner extends JModelAdmin
return true;
}
/**
* Method to stick records.
*
@ -239,7 +239,7 @@ class BannersModelBanner extends JModelAdmin
return true;
}
function _orderConditions($table = null)
{
$condition = array();

4
administrator/components/com_banners/models/client.php
View File

@ -34,7 +34,7 @@ class BannersModelClient extends JModelAdmin
$this->_item = 'client';
$this->_option = 'com_banners';
}
/**
* Method to auto-populate the model state.
*/
@ -206,7 +206,7 @@ class BannersModelClient extends JModelAdmin
$table->name = htmlspecialchars_decode($table->name, ENT_QUOTES);
}
function _orderConditions($table = null)
{
$condition = array();

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

@ -5,10 +5,10 @@
addfieldpath="/administrator/components/com_banners/models/fields"
>
<field name="id" type="text" default="0" required="true"
readonly="true" class="readonly"
readonly="true" class="readonly"
label="JGLOBAL_FIELD_ID_LABEL" description ="JGLOBAL_FIELD_ID_DESC"/>
<field name="name" type="text" class="inputbox"
size="40" label="COM_BANNERS_FIELD_CLIENT_NAME_LABEL"

4
administrator/components/com_banners/views/banner/tmpl/edit.php
View File

@ -97,7 +97,7 @@ JHtml::_('behavior.formvalidation');
<?php echo $this->form->getLabel('state'); ?>
<?php echo $this->form->getInput('state'); ?>
<?php echo $this->form->getLabel('cid'); ?>
<?php echo $this->form->getInput('cid'); ?>
@ -112,7 +112,7 @@ JHtml::_('behavior.formvalidation');
<?php echo $this->form->getLabel('language'); ?>
<?php echo $this->form->getInput('language'); ?>
<?php echo $this->form->getLabel('id'); ?>
<?php echo $this->form->getInput('id'); ?>
<div class="clr"> </div>

14
administrator/components/com_banners/views/client/tmpl/edit.php
View File

@ -34,25 +34,25 @@ JHtml::_('behavior.formvalidation');
<legend><?php echo empty($this->item->id) ? JText::_('COM_BANNERS_NEW_CLIENT') : JText::sprintf('COM_BANNERS_EDIT_CLIENT', $this->item->id); ?></legend>
<?php echo $this->form->getLabel('name'); ?>
<?php echo $this->form->getInput('name'); ?>
<?php echo $this->form->getLabel('contact'); ?>
<?php echo $this->form->getInput('contact'); ?>
<?php echo $this->form->getLabel('email'); ?>
<?php echo $this->form->getInput('email'); ?>
<?php echo $this->form->getLabel('state'); ?>
<?php echo $this->form->getInput('state'); ?>
<?php echo $this->form->getLabel('purchase_type'); ?>
<?php echo $this->form->getInput('purchase_type'); ?>
<?php echo $this->form->getLabel('track_impressions'); ?>
<?php echo $this->form->getInput('track_impressions'); ?>
<?php echo $this->form->getLabel('track_clicks'); ?>
<?php echo $this->form->getInput('track_clicks'); ?>
<?php echo $this->form->getLabel('id'); ?>
<?php echo $this->form->getInput('id'); ?>

4
administrator/components/com_cache/models/cache.php
View File

@ -71,7 +71,7 @@ class CacheModelCache extends JModel
$this->setState('list.limit', $limit);
}
/**
* Method to get cache data
*
@ -86,7 +86,7 @@ class CacheModelCache extends JModel
$data = $cache->getAll();
if ($data != false) {$this->_data = $data;} else {$this->_data = array();}
}
return $this->_data;
}

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

@ -28,7 +28,7 @@ class CategoriesHelper
if ($extension == 'com_categories') {
return;
}
$parts = explode('.',$extension);
$component = $parts[0];
if (count($parts)>1)

4
administrator/components/com_categories/models/category.php
View File

@ -39,7 +39,7 @@ class CategoriesModelCategory extends JModelAdmin
$this->_item = 'category';
$this->_option = 'com_categories';
}
/**
* Returns a Table object, always creating it
*
@ -413,7 +413,7 @@ class CategoriesModelCategory extends JModelAdmin
protected function _batchCopy($value, $pks)
{
}
function _orderConditions($table = null)
{
$condition = array();

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

@ -6,7 +6,7 @@
type="text"
default="0"
required="true"
label="JGLOBAL_FIELD_ID_LABEL"
label="JGLOBAL_FIELD_ID_LABEL"
description ="JGLOBAL_FIELD_ID_DESC"
class="readonly"
readonly="true"/>
@ -196,7 +196,7 @@
<fields name="params">
<fieldset
name="basic">
<field
name="target"
type="componentlayout"
@ -204,7 +204,7 @@
description="JFIELD_ALT_COMPONENT_LAYOUT_DESC"
view="categories"
/>
<field
name="image"
type="imagelist"

2
administrator/components/com_checkin/views/checkin/tmpl/default.php
View File

@ -23,7 +23,7 @@ defined('_JEXEC') or die;
foreach ($this->tables as $table => $count): ?>
<tr class="row<?php echo $k; ?>">
<td>
<?php
<?php
echo JText::sprintf('COM_CHECKIN_CHECKING',$table); ?>
</td>

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

@ -52,7 +52,7 @@
<option
value="0">JNO</option>
</field>
<field
name="memcache_compress"
type="radio"
@ -65,7 +65,7 @@
<option
value="0">JNO</option>
</field>
<field
name="memcache_server_host"
type="text"
@ -74,7 +74,7 @@
description="COM_CONFIG_FIELD_MEMCACHE_HOST_DESC"
filter="string"
size="25" />
<field
name="memcache_server_port"
type="text"

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

@ -131,7 +131,7 @@
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field name="image" type="imagelistr" directory="/images"
<field name="image" type="imagelistr" directory="/images"
label="COM_CONTACT_FIELD_PARAMS_IMAGE_LABEL" description="COM_CONTACT_FIELD_PARAMS_IMAGE_DESC"
>
</field>

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

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<form>
<fieldset>
<field name="id" type="text"
<field name="id" type="text"
label="JGLOBAL_FIELD_ID_LABEL" description ="JGLOBAL_FIELD_ID_DESC"
size="10" default="0" required="true"
readonly="true" class="readonly" />

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

@ -105,7 +105,7 @@ JHtml::_('behavior.formvalidation');
<?php echo $this->form->getLabel('webpage'); ?>
<?php echo $this->form->getInput('webpage'); ?>
<?php echo $this->form->getLabel('sortname1'); ?>
<?php echo $this->form->getInput('sortname1'); ?>
@ -114,7 +114,7 @@ JHtml::_('behavior.formvalidation');
<?php echo $this->form->getLabel('sortname3'); ?>
<?php echo $this->form->getInput('sortname3'); ?>
</fieldset>
<?php echo JHtml::_('sliders.panel', JText::_('COM_CONTACT_FIELDSET_OPTIONS'), 'display-options'); ?>

10
administrator/components/com_content/config.xml
View File

@ -64,7 +64,7 @@
<option
value="1">JYes</option>
</field>
<field
name="show_parent_category"
type="radio"
@ -119,7 +119,7 @@
<option
value="1">JYes</option>
</field>
<field
name="show_create_date"
type="radio"
@ -286,7 +286,7 @@
<option
value="1">JGLOBAL_Across</option>
</field>
<field
name="show_pagination"
type="list"
@ -432,7 +432,7 @@
<option value="4">J4</option>
<option value="5">J5</option>
</field>
<field name="show_category_title" type="list"
label="JGLOBAL_SHOW_CATEGORY_TITLE"
description="JGLOBAL_SHOW_CATEGORY_TITLE_DESC"
@ -471,7 +471,7 @@
<option value="1">JSHOW</option>
</field>
<field name="show_cat_num_articles" type="radio"
label="JGLOBAL_NUMBER_CATEGORY_ITEMS_LABEL"
description="JGLOBAL_NUMBER_CATEGORY_ITEMS_DESC"

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

@ -33,7 +33,7 @@ class ContentModelArticle extends JModelAdmin
$this->_item = 'article';
$this->_option = 'com_content';
}
/**
* Method to auto-populate the model state.
*/
@ -316,7 +316,7 @@ class ContentModelArticle extends JModelAdmin
return true;
}
function _orderConditions($table = null)
{
$condition = array();

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

@ -5,7 +5,7 @@
<form>
<fieldset>
<field name="id" type="text" class="readonly"
label="CONTENT_ID_LABEL" size="10" default="0"
label="CONTENT_ID_LABEL" size="10" default="0"
readonly="true" />
<field name="asset_id" type="hidden" filter="unset" />

4
administrator/components/com_content/views/article/view.html.php
View File

@ -26,7 +26,7 @@ class ContentViewArticle extends JView
public function display($tpl = null)
{
$app = JFactory::getApplication();
if($this->_layout == 'pagebreak')
{
$eName = JRequest::getVar('e_name');
@ -37,7 +37,7 @@ class ContentViewArticle extends JView
parent::display($tpl);
return;
}
$state = $this->get('State');
$item = $this->get('Item');
$form = $this->get('Form');

2
administrator/components/com_installer/models/fields/client.php
View File

@ -29,7 +29,7 @@ class JFormFieldClient extends JFormField
*
* @return string The field input.
*/
protected function getInput()
protected function getInput()
{
$onchange = $this->element['onchange'] ? ' onchange="'.(string) $this->element['onchange'].'"' : '';
$options = array();

2
administrator/components/com_installer/models/fields/group.php
View File

@ -29,7 +29,7 @@ class JFormFieldGroup extends JFormField
*
* @return string The field input.
*/
protected function getInput()
protected function getInput()
{
$onchange = $this->element['onchange'] ? ' onchange="'.(string) $this->element['onchange'].'"' : '';
$options = array();

2
administrator/components/com_installer/models/fields/search.php
View File

@ -29,7 +29,7 @@ class JFormFieldSearch extends JFormField
*
* @return string The field input.
*/
protected function getInput()
protected function getInput()
{
$html = '';
$html.= '<input type="text" name="' . $this->name . '" id="' . $this->id . '" value="' . $this->value . '" title="' . JText::_('JSEARCH_FILTER') . '" onchange="this.form.submit();" />';

2
administrator/components/com_installer/models/fields/type.php
View File

@ -29,7 +29,7 @@ class JFormFieldType extends JFormField
*
* @return string The field input.
*/
protected function getInput()
protected function getInput()
{
$onchange = $this->element['onchange'] ? ' onchange="'.(string) $this->element['onchange'].'"' : '';
$options = array();

2
administrator/components/com_installer/models/manage.php
View File

@ -218,7 +218,7 @@ class InstallerModelManage extends InstallerModel {
$query->where('client_id=' . intval($client));
}
if ($group != '' && in_array($type, array('plugin', 'library', ''))) {
$query->where('folder=' . $this->_db->Quote($group == '*' ? '' : $group));
}

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

@ -33,7 +33,7 @@ class InstallerViewManage extends InstallerViewDefault
$form = $this->get('Form');
// Check for errors.
if (count($errors = $this->get('Errors')))
if (count($errors = $this->get('Errors')))
{
JError::raiseError(500, implode("\n", $errors));
return false;

8
administrator/components/com_login/controller.php
View File

@ -85,13 +85,13 @@ class LoginController extends JController
$app = &JFactory::getApplication();
$userid = JRequest::getInt('uid', null);
$options = array(
'clientid' => ($userid) ? 0 : 1
'clientid' => ($userid) ? 0 : 1
);
$result = $app->logout($userid, $options);
if (!JError::isError($result)) {
$model = &$this->getModel('login');
$return = $model->getState('return');

2
administrator/components/com_login/models/login.php
View File

@ -48,7 +48,7 @@ class LoginModelLogin extends JModel
if (empty($return)) {
$return = 'index.php';
}
$this->setState('return', $return);
}
}

2
administrator/components/com_menus/models/forms/item.xml
View File

@ -191,7 +191,7 @@
type="hidden"
filter="unset"/>
</fieldset>
<fields name="params">
</fields>
</form>

2
administrator/components/com_menus/models/forms/item_alias.xml
View File

@ -9,7 +9,7 @@
<field name="aliasoptions" type="menuitem"
description="COM_MENUS_ITEM_FIELD_ALIAS_DESC"
label="JFIELD_ALIAS_LABEL"
label="JFIELD_ALIAS_LABEL"
required="true" />
</fieldset>

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

@ -11,17 +11,17 @@
label="COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_LABEL"
description="COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_DESC"
default="" />
<field name="menu-anchor_css" type="text"
label="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_LABEL"
description="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_DESC"
default="" />
<field name="menu_image" type="text"
label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_LABEL"
description="COM_MENUS_ITEM_FIELD_MENU_IMAGE_DESC"
default="" />
<field name="show_page_heading" type="radio"
label="COM_MENUS_ITEM_FIELD_SHOW_PAGE_HEADING_LABEL"
description="COM_MENUS_ITEM_FIELD_SHOW_PAGE_HEADING_DESC"
@ -30,30 +30,30 @@
<option value="0" class="no">JNO</option>
<option value="1" class="yes">JYES</option>
</field>
<field name="page_title" type="text"
label="COM_MENUS_ITEM_FIELD_PAGE_TITLE_LABEL"
description="COM_MENUS_ITEM_FIELD_PAGE_TITLE_DESC"
default="" />
<field name="page_heading" type="text"
label="COM_MENUS_ITEM_FIELD_PAGE_HEADING_LABEL"
description="COM_MENUS_ITEM_FIELD_PAGE_HEADING_DESC"
default="" />
<field name="pageclass_sfx" type="text"
label="COM_MENUS_ITEM_FIELD_PAGE_CLASS_LABEL"
description="COM_MENUS_ITEM_FIELD_PAGE_CLASS_DESC"
default="" />
<field name="menu-meta_description" type="textarea"
label="JFIELD_META_DESCRIPTION_LABEL" description="COM_MENUS_ITEM_FIELD_META_DESCRIPTION_DESC"
default="" rows="3" cols="40" />
<field name="menu-meta_keywords" type="textarea"
label="JFIELD_META_KEYWORDS_LABEL" description="COM_MENUS_ITEM_FIELD_META_KEYWORDS_DESC"
default="" rows="3" cols="40" />
<field name="robots" type="list"
label="JFIELD_METADATA_ROBOTS_LABEL" description="JFIELD_METADATA_ROBOTS_DESC"
default=""
@ -65,7 +65,7 @@
<option value="3">JGLOBAL_NOINDEX_NOFOLLOW</option>
<option value="4">JGLOBAL_NO_ROBOTS_TAG</option>
</field>
<field name="secure" type="radio"
label="COM_MENUS_ITEM_FIELD_SECURE_LABEL" description="COM_MENUS_ITEM_FIELD_SECURE_DESC"
default="0" filter="integer"
@ -74,7 +74,7 @@
<option value="1">JON</option>
<option value="0">COM_MENUS_FIELD_VALUE_IGNORE
</option>
</field>
</fieldset>

2
administrator/components/com_menus/models/forms/item_separator.xml
View File

@ -2,7 +2,7 @@
<!-- $Id$ -->
<form>
<fields name="params">
<fieldset name="menu-options"
<fieldset name="menu-options"
label="COM_MENUS_LINKTYPE_OPTIONS_LABEL"
description=""
>

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

@ -41,7 +41,7 @@ class MenusModelItem extends JModelAdmin
$this->_item = 'item';
$this->_option = 'com_menus';
}
/**
* Auto-populate the model state.
*
@ -288,7 +288,7 @@ class MenusModelItem extends JModelAdmin
$this->setError($table->getError());
return false;
}
// Clear the component's cache
$cache = JFactory::getCache('com_modules');
$cache->clean();
@ -395,7 +395,7 @@ class MenusModelItem extends JModelAdmin
return false;
}
}
// Clear the component's cache
$cache = JFactory::getCache('com_modules');
$cache->clean();
@ -826,7 +826,7 @@ class MenusModelItem extends JModelAdmin
}
$this->setState('item.id', $table->id);
// Clear the component's cache
$cache = JFactory::getCache('com_modules');
$cache->clean();
@ -834,7 +834,7 @@ class MenusModelItem extends JModelAdmin
return true;
}
function _orderConditions($table = null)
{
$condition = array();

6
administrator/components/com_menus/models/menu.php
View File

@ -156,12 +156,12 @@ class MenusModelMenu extends JModelForm
}
$this->setState('menu.id', $table->id);
// Clear the component's cache
$cache = JFactory::getCache('com_modules');
$cache->clean();
$cache->clean('mod_menu');
return true;
}
@ -190,7 +190,7 @@ class MenusModelMenu extends JModelForm
return false;
}
}
// Clear the component's cache
$cache = JFactory::getCache('com_modules');
$cache->clean();

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

@ -109,7 +109,7 @@ $userId = $user->get('id');
<p class="smallsub" title="<?php echo $this->escape($item->path);?>">
(<?php echo '<span>'.JText::_('JFIELD_ALIAS_LABEL') . ':</span> ' . $this->escape($item->alias) ;?>)</p>
</td>
<td class="center">
<?php echo JHtml::_('jgrid.published', $item->published, $i, 'items.');?>

20
administrator/components/com_menus/views/items/view.html.php
View File

@ -44,27 +44,27 @@ class MenusViewItems extends JView
$this->assignRef('state', $state);
$this->assignRef('items', $items);
$this->assignRef('pagination', $pagination);
$this->ordering = array();
// Preprocess the list of items to find ordering divisions.
foreach ($items as $i => &$item)
{
$this->ordering[$item->parent_id][] = $item->id;
// item type text
switch ($item->type) {
case 'url':
$value = JText::_('COM_MENUS_TYPE_EXTERNAL_URL');
break;
case 'alias':
$value = JText::_('COM_MENUS_TYPE_ALIAS');
break;
case 'separator':
$value = JText::_('COM_MENUS_TYPE_SEPARATOR');
break;
case 'component':
default:
// load language
@ -72,9 +72,9 @@ class MenusViewItems extends JView
|| $lang->load($item->componentname.'.sys', JPATH_ADMINISTRATOR.'/components/'.$item->componentname, null, false, false)
|| $lang->load($item->componentname.'.sys', JPATH_ADMINISTRATOR, $lang->getDefault(), false, false)
|| $lang->load($item->componentname.'.sys', JPATH_ADMINISTRATOR.'/components/'.$item->componentname, $lang->getDefault(), false, false);
$value = JText::_($item->componentname);
parse_str($item->link, $vars);
if (isset($vars['view'])) {
// Attempt to load the view xml file.
@ -82,9 +82,9 @@ class MenusViewItems extends JView
if (is_file($file) && $xml = simplexml_load_file($file)) {
// Look for the first view node off of the root node.
if ($view = $xml->xpath('view[1]')) {
if (!empty($view[0]['title'])) {
if (!empty($view[0]['title'])) {
$vars['layout'] = isset($vars['layout']) ? $vars['layout'] : 'default';
// Attempt to load the layout xml file.
$file = JPATH_SITE.'/components/'.$item->componentname.'/views/'.$vars['view'].'/tmpl/'.$vars['layout'].'.xml';
if (is_file($file) && $xml = simplexml_load_file($file)) {
@ -107,7 +107,7 @@ class MenusViewItems extends JView
$value .= ' » ' . JText::_($item->componentname.'_'.$vars['view'].'_VIEW_DEFAULT_TITLE');
}
}
break;
break;
}
$items[$i]->item_type = $value;
}

6
administrator/components/com_messages/models/message.php
View File

@ -34,7 +34,7 @@ class MessagesModelMessage extends JModelAdmin
$this->_item = 'message';
$this->_option = 'com_messages';
}
/**
* Method to auto-populate the model state.
*/
@ -225,10 +225,10 @@ class MessagesModelMessage extends JModelAdmin
return true;
}
function _orderConditions($table = null)
{
$condition = array();
return $condition;
return $condition;
}
}

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

@ -65,12 +65,12 @@ class ModulesControllerModule extends JControllerForm
if (empty($data['position'])) {
$data['position'] = $data['custom_position'];
}
unset($data['custom_position']);
return parent::_allowSave($data, $key);
}
/**
* Override parent save method.
*/

4
administrator/components/com_modules/models/fields/moduleposition.php
View File

@ -87,7 +87,7 @@ class JFormFieldModulePosition extends JFormFieldList
}
$positions = array_unique($positions);
sort($positions);
$options[] = JHtml::_('select.option', '', JText::_('COM_MODULES_OPTION_SELECT_POSITION'));
foreach ($positions as $position) {
@ -96,7 +96,7 @@ class JFormFieldModulePosition extends JFormFieldList
// Merge any additional options in the XML definition.
$options = array_merge(parent::getOptions(), $options);
// Add javascript for custom position selection
JFactory::getDocument()->addScriptDeclaration('
function setModulePosition(el) {

4
administrator/components/com_modules/models/forms/module.xml
View File

@ -3,7 +3,7 @@
<form>
<fieldset>
<field name="id" type="text"
label="JGLOBAL_FIELD_ID_LABEL"
label="JGLOBAL_FIELD_ID_LABEL"
description="JGLOBAL_FIELD_ID_DESC"
default="0"
readonly="true"
@ -84,7 +84,7 @@
maxlength="50"
onchange="setModulePosition(this);"
/>
<field name="custom_position" type="text"
maxlength="50"
size="35"

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

@ -41,7 +41,7 @@ class ModulesModelModule extends JModelAdmin
$this->_item = 'module';
$this->_option = 'com_modules';
}
/**
* Method to auto-populate the model state.
*/
@ -103,7 +103,7 @@ class ModulesModelModule extends JModelAdmin
throw new Exception($table->getError());
}
}
// Clear the component's cache
$cache = JFactory::getCache('com_modules');
$cache->clean();
@ -178,7 +178,7 @@ class ModulesModelModule extends JModelAdmin
return JError::raiseWarning(500, $row->getError());
}
}
// Clear the component's cache
$cache = JFactory::getCache('com_modules');
$cache->clean();
@ -548,7 +548,7 @@ class ModulesModelModule extends JModelAdmin
return true;
}
function _orderConditions($table = null)
{
$condition = array();

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

@ -40,9 +40,9 @@ $hasContent = empty($this->item->module) || $this->item->module == 'custom' || $
<div class="width-60 fltlft">
<fieldset class="adminform">
<legend><?php echo JText::_('JOPTION_REQUIRED');?> </legend>
<!-- Module metadata -->
<?php echo $this->form->getLabel('title'); ?>
<?php echo $this->form->getInput('title'); ?>
@ -73,7 +73,7 @@ $hasContent = empty($this->item->module) || $this->item->module == 'custom' || $
<?php if ((string) $this->item->xml->name != 'Login Form'): ?>
<?php echo $this->form->getLabel('publish_up'); ?>
<?php echo $this->form->getInput('publish_up'); ?>
<?php echo $this->form->getLabel('publish_down'); ?>
<?php echo $this->form->getInput('publish_down'); ?>
<?php endif; ?>
@ -82,17 +82,17 @@ $hasContent = empty($this->item->module) || $this->item->module == 'custom' || $
<?php echo $this->form->getInput('language'); ?>
<?php if ($this->item->id) : ?>
<?php echo $this->form->getLabel('id'); ?>
<?php echo $this->form->getLabel('id'); ?>
<?php echo $this->form->getInput('id'); ?>
<?php endif; ?>
<?php echo $this->form->getLabel('module'); ?>
<?php echo $this->form->getInput('module'); ?>
<input type="text" size="35" value="<?php if ($this->item->xml) echo ($text = (string) $this->item->xml->name) ? JText::_($text) : $this->item->module;else echo JText::_(MODULES_ERR_XML);?>" class="readonly" readonly="readonly" />
<?php echo $this->form->getLabel('client_id'); ?>
<input type="text" size="35" value="<?php echo $this->item->client_id == 0 ? JText::_('JSITE') : JText::_('JADMINISTRATOR'); ?> " class="readonly" readonly="readonly" />
<input type="text" size="35" value="<?php echo $this->item->client_id == 0 ? JText::_('JSITE') : JText::_('JADMINISTRATOR'); ?> " class="readonly" readonly="readonly" />
<br class="clr" />
<?php if ($this->item->xml) : ?>
@ -105,7 +105,7 @@ $hasContent = empty($this->item->module) || $this->item->module == 'custom' || $
<?php else : ?>
<?php echo JText::_('COM_MODULES_ERR_XML'); ?>
<?php endif; ?>
<br class="clr" />
<br class="clr" />
</fieldset>
</div>

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

@ -18,7 +18,7 @@
<option
value="1">JSHOW</option>
</field>
<field
id="show_feed_description"
@ -32,7 +32,7 @@
<option
value="1">JSHOW</option>
</field>
<field
id="show_item_description"
@ -57,7 +57,7 @@
label="COM_NEWSFEEDS_FIELD_WORD_COUNT_LABEL"
description="COM_NEWSFEEDS_FIELD_WORD_COUNT_DESC" />
</fieldset>
<fieldset
name="category"
label="COM_NEWSFEEDS_FIELD_CONFIG_CATEGORY_SETTINGS_LABEL"
@ -116,7 +116,7 @@
</field>
<field
name="spacer1"
name="spacer1"
type="spacer"
hr="true"
/>
@ -133,17 +133,17 @@
<option
value="1">JSHOW</option>
</field>
<field
name="show_description_image"
type="radio"
default="1"
label="COM_NEWSFEEDS_FIELD_SHOW_CATEGORY_IMAGE_LABEL"
<field
name="show_description_image"
type="radio"
default="1"
label="COM_NEWSFEEDS_FIELD_SHOW_CATEGORY_IMAGE_LABEL"
description="COM_NEWSFEEDS_FIELD_SHOW_CATEGORY_IMAGE_DESC">
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="display_num"
type="list"
@ -161,27 +161,27 @@
<option value="100">J100</option>
<option value="0">JALL</option>
</field>
<field
name="show_pagination_limit"
type="radio"
default="1"
label="COM_NEWSFEEDS_FIELD_DISPLAY_SELECT_LABEL"
<field
name="show_pagination_limit"
type="radio"
default="1"
label="COM_NEWSFEEDS_FIELD_DISPLAY_SELECT_LABEL"
description="COM_NEWSFEEDS_FIELD_DISPLAY_SELECT_DESC">
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="show_pagination"
type="radio"
default="1"
label="COM_NEWSFEEDS_FIELD_PAGINATION_LABEL"
<field
name="show_pagination"
type="radio"
default="1"
label="COM_NEWSFEEDS_FIELD_PAGINATION_LABEL"
description="COM_NEWSFEEDS_FIELD_PAGINATION_DESC">
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="show_pagination_results"
type="radio"

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

@ -6,7 +6,7 @@
<fieldset>
<field name="id" type="text" default="0" required="true"
readonly="true" class="readonly"
label="JGLOBAL_FIELD_ID_LABEL" description ="JGLOBAL_FIELD_ID_DESC"
label="JGLOBAL_FIELD_ID_LABEL" description ="JGLOBAL_FIELD_ID_DESC"
/>
<field name="name" type="text" label="JFIELD_TITLE_LABEL"

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

@ -34,7 +34,7 @@ class NewsfeedsModelNewsfeed extends JModelAdmin
$this->_item = 'newsfeed';
$this->_option = 'com_newsfeeds';
}
/**
* Method to auto-populate the model state.
*/

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

@ -95,7 +95,7 @@ JHtml::_('behavior.keepalive');
<?php endforeach; ?>
</fieldset>
<?php echo JHtml::_('sliders.end'); ?>
</div>

2
administrator/components/com_plugins/models/forms/plugin.xml
View File

@ -4,7 +4,7 @@
<fieldset>
<field
name="extension_id"
label="JGLOBAL_FIELD_ID_LABEL"
label="JGLOBAL_FIELD_ID_LABEL"
description ="JGLOBAL_FIELD_ID_DESC"
type="text"
default="0"

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

@ -23,7 +23,7 @@ class PluginsModelPlugin extends JModelAdmin
* Item cache.
*/
private $_cache = array();
protected $_context = 'com_plugins';
/**
@ -39,7 +39,7 @@ class PluginsModelPlugin extends JModelAdmin
$this->_item = 'plugin';
$this->_option = 'com_plugins';
}
/**
* Method to auto-populate the model state.
*/
@ -265,7 +265,7 @@ class PluginsModelPlugin extends JModelAdmin
return true;
}
function _orderConditions($table = null)
{
$condition = array();

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

@ -51,7 +51,7 @@ JHtml::_('behavior.formvalidation');
<?php if ($this->item->extension_id) : ?>
<?php echo $this->form->getLabel('extension_id'); ?>
<?php echo $this->form->getInput('extension_id'); ?>
<?php echo $this->form->getInput('extension_id'); ?>
<?php endif; ?>
<br class="clr" />

2
administrator/components/com_redirect/manifest.xml
View File

@ -12,7 +12,7 @@
<description>COM_REDIRECT_XML_DESCRIPTION</description>
<administration>
<menu link="option=com_redirect" img="class:redirect">Redirect</menu>
<files folder="admin">
<filename>config.xml</filename>
<filename>controller.php</filename>

2
administrator/components/com_redirect/models/forms/link.xml
View File

@ -10,7 +10,7 @@
required="true"
readonly="true"
class="readonly"
label="JGLOBAL_FIELD_ID_LABEL"
label="JGLOBAL_FIELD_ID_LABEL"
description ="JGLOBAL_FIELD_ID_DESC" />
<field

2
administrator/components/com_redirect/models/link.php
View File

@ -208,7 +208,7 @@ class RedirectModelLink extends JModelForm
// Typecast variable.
$pks = (array) $pks;
$user = JFactory::getUser();
// Get a row instance.
$table = &$this->getTable();

2
administrator/components/com_redirect/views/link/tmpl/edit.php
View File

@ -56,7 +56,7 @@ JHtml::_('behavior.keepalive');
<?php echo $this->form->getInput('published'); ?>
</fieldset>
<fieldset class="adminform">
<legend><?php echo JText::_('COM_REDIRECT_DETAILS'); ?></legend>
<legend><?php echo JText::_('COM_REDIRECT_DETAILS'); ?></legend>
<?php echo $this->form->getLabel('created_date'); ?>
<?php echo $this->form->getInput('created_date'); ?>

4
administrator/components/com_templates/models/forms/style.xml
View File

@ -4,8 +4,8 @@
<fieldset>
<field
name="id"
label="JGLOBAL_FIELD_ID_LABEL"
description ="JGLOBAL_FIELD_ID_DESC"
label="JGLOBAL_FIELD_ID_LABEL"
description ="JGLOBAL_FIELD_ID_DESC"
type="hidden"
default="0"
required="true"

6
administrator/components/com_templates/views/style/tmpl/edit.php
View File

@ -38,15 +38,15 @@ JHtml::_('behavior.formvalidation');
<?php echo $this->form->getInput('title'); ?>
<?php echo $this->form->getLabel('client_id'); ?>
<input type="text" size="35" value="<?php echo $this->item->client_id == 0 ? JText::_('JSITE') : JText::_('JADMINISTRATOR'); ?> " class="readonly" readonly="readonly" />
<input type="text" size="35" value="<?php echo $this->item->client_id == 0 ? JText::_('JSITE') : JText::_('JADMINISTRATOR'); ?> " class="readonly" readonly="readonly" />
<?php echo $this->form->getLabel('home'); ?>
<?php echo $this->form->getInput('home'); ?>
<div class="clr"></div>
<?php if ($this->item->id) : ?>
<?php echo $this->form->getLabel('id'); ?>
<input type="text" size="35" value="<?php echo ($text = (string) JText::_($this->item->id)); ?>" class="readonly" readonly="readonly" />
<?php echo $this->form->getLabel('id'); ?>
<input type="text" size="35" value="<?php echo ($text = (string) JText::_($this->item->id)); ?>" class="readonly" readonly="readonly" />
<?php endif; ?>
</fieldset>

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

@ -49,7 +49,7 @@
size="30"
validate="email"
/>
<field
name="block"
type="radio"
@ -90,7 +90,7 @@
readonly="true"
>
</field>
</fieldset>
<field name="groups" type="hidden" />
@ -106,7 +106,7 @@
>
<option value="">JOption_Use_Default</option>
</field>
<field name="language" type="language"
client="site"
description="Users_Option_Frontend_Language_Desc"
@ -114,21 +114,21 @@
>
<option value="">JOption_Use_Default</option>
</field>
<field name="editor" type="editors"
description="Users_Option_Editor_Desc"
label="Users_Option_Editor_Label"
>
<option value="">JOption_Use_Default</option>
</field>
<field name="helpsite" type="helpsite"
label="Users_Option_Helpsite_Label"
description="Users_Option_Helpsite_Desc"
>
<option value="">JOption_Use_Default</option>
</field>
<field name="timezone" type="timezone"
label="Users_Option_Timezone_Label"
description="Users_Option_Timezone_Desc"

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

@ -16,7 +16,7 @@
<field name="comp_description" type="textarea"
cols="50"
description="COM_WEBLINKS_FIELD_CONFIG_INTRO_DESC"
description="COM_WEBLINKS_FIELD_CONFIG_INTRO_DESC"
label="COM_WEBLINKS_FIELD_CONFIG_INTRO_LABEL"
rows="3"
/>
@ -24,7 +24,7 @@
<field name="spacer1" type="spacer"
hr="true"
/>
<field name="show_link_hits" type="radio"
default="1"
description="COM_WEBLINKS_FIELD_CONFIG_HITS_DESC"
@ -78,7 +78,7 @@
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field name="count_clicks" type="radio"
default="1"
description="COM_WEBLINKS_FIELD_CONFIG_COUNTCLICKS_DESC"
@ -104,7 +104,7 @@
<field name="link_icons" type="imagelist"
default=""
description="COM_WEBLINKS_FIELD_CONFIG_ICON_DESC"
description="COM_WEBLINKS_FIELD_CONFIG_ICON_DESC"
directory="/images"
label="COM_WEBLINKS_FIELD_CONFIG_ICON_LABEL"
/>

8
administrator/components/com_weblinks/models/weblink.php
View File

@ -20,15 +20,15 @@ jimport('joomla.application.component.modeladmin');
class WeblinksModelWeblink extends JModelAdmin
{
protected $_context = 'com_weblinks';
function __construct($config = array())
{
parent::__construct($config);
$this->_item = 'weblink';
$this->_option = 'com_weblinks';
}
/**
* Method to auto-populate the model state.
*/
@ -240,7 +240,7 @@ class WeblinksModelWeblink extends JModelAdmin
//$table->modified_by = $user->get('id');
}
}
function _orderConditions($table = null)
{
$condition = array();

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

@ -74,10 +74,10 @@ JHtml::_('behavior.formvalidation');
<?php if ($field->hidden): ?>
<?php echo $field->input; ?>
<?php else: ?>
<?php echo $field->label; ?>
<?php echo $field->input; ?>
<?php endif; ?>
<?php endforeach; ?>

2
administrator/language/en-GB/en-GB.com_admin.ini
View File

@ -5,7 +5,7 @@
; Note : All ini files need to be saved as UTF-8
COM_ADMIN="Admin - System Infos"
COM_ADMIN_XML_DESCRIPTION="Administration system infos component"
COM_ADMIN_XML_DESCRIPTION="Administration system infos component"
COM_ADMIN_ALPHABETICAL_INDEX="Alphabetical Index"
COM_ADMIN_CACHE_DIRECTORY="(Cache Directory)"
COM_ADMIN_CHANGELOG="Changelog"

2
administrator/language/en-GB/en-GB.com_admin.sys.ini
View File

@ -5,4 +5,4 @@
; Note : All ini files need to be saved as UTF-8
COM_ADMIN="Admin - System Infos"
COM_ADMIN_XML_DESCRIPTION="Administration system infos component"
COM_ADMIN_XML_DESCRIPTION="Administration system infos component"

2
administrator/language/en-GB/en-GB.com_messages.ini
View File

@ -30,7 +30,7 @@ COM_MESSAGES_TOOLBAR_UNPUBLISH="Mark as Unread"
COM_MESSAGES_VIEW_PRIVATE_MESSAGE="Private Messages Manager: View Message"
COM_MESSAGES_WRITE_PRIVATE_MESSAGE="Write Private Message"
; models
; models
COM_MESSAGES_ERR_INVALID_USER="Invalid user"
COM_MESSAGES_ERR_SEND_FAILED="The user has locked their mailbox. Message failed."
COM_MESSAGES_FIELD_AUTO_PURGE_DESC="Automatically purge private messages after the given number of days."

2
administrator/language/en-GB/en-GB.com_search.ini
View File

@ -5,7 +5,7 @@
; Note : All ini files need to be saved as UTF-8
COM_SEARCH="Search"
COM_SEARCH_XML_DESCRIPTION="Component for search functions"
COM_SEARCH_XML_DESCRIPTION="Component for search functions"
COM_SEARCH_CONFIG_GATHER_SEARCH_STATISTICS_DESC="Record the search phrases submitted by visitors."
COM_SEARCH_CONFIG_GATHER_SEARCH_STATISTICS_LABEL="Gather Search Statistics"

2
administrator/language/en-GB/en-GB.com_search.sys.ini
View File

@ -5,7 +5,7 @@
; Note : All ini files need to be saved as UTF-8
COM_SEARCH="Search"
COM_SEARCH_XML_DESCRIPTION="Component for search functions"
COM_SEARCH_XML_DESCRIPTION="Component for search functions"
;
; View and layout titles and descriptions

2
administrator/language/en-GB/en-GB.com_templates.ini
View File

@ -32,7 +32,7 @@ COM_TEMPLATES_TOOLBAR_SET_HOME="Make Default"
COM_TEMPLATES_XML_DESCRIPTION="This component lets manage templates"
COM_TEMPLATES="Templates Manager"
; Edit styles
; Edit styles
COM_TEMPLATES_BASIC_FIELDSET_LABEL="Basic Options"
COM_TEMPLATES_ADVANCED_FIELDSET_LABEL="Advanced Options"
COM_TEMPLATES_FIELD_CLIENT_DESC="Whether this template is used for the front-end (0) or the back-end (1)"

4
administrator/language/en-GB/en-GB.com_weblinks.ini
View File

@ -5,7 +5,7 @@
; Note : All ini files need to be saved as UTF-8
COM_WEBLINKS="Weblinks"
COM_WEBLINKS_XML_DESCRIPTION="Component for web links management"
COM_WEBLINKS_XML_DESCRIPTION="Component for web links management"
COM_WEBLINKS_SUBMENU_WEBLINKS="Web Links"
COM_WEBLINKS_SUBMENU_CATEGORIES="Categories"
@ -32,7 +32,7 @@ COM_WEBLINKS_FIELD_VALUE_REPORTED="Reported"
COM_WEBLINKS_FIELD_ALIAS_DESC="The alias is used in the URL when SEF is on"
COM_WEBLINKS_FIELD_ALIAS_LABEL="Alias"
COM_WEBLINKS_FIELD_CATEGORYCHOOSE_DESC="Please choose a web links category to display"
COM_WEBLINKS_FIELD_CATEGORYCHOOSE_DESC="Please choose a web links category to display"
COM_WEBLINKS_FIELD_CATEGORY_DESC="Choose a category for this web link"
COM_WEBLINKS_FIELD_CATEGORY_LABEL="Category"
COM_WEBLINKS_FIELD_DESCRIPTION_DESC="Enter a description for the web link."

2
administrator/language/en-GB/en-GB.com_weblinks.sys.ini
View File

@ -5,7 +5,7 @@
; Note : All ini files need to be saved as UTF-8
COM_WEBLINKS="Weblinks"
COM_WEBLINKS_XML_DESCRIPTION="Component for weblinks management"
COM_WEBLINKS_XML_DESCRIPTION="Component for weblinks management"
COM_WEBLINKS_LINKS="Links"
COM_WEBLINKS_CATEGORIES="Categories"

2
administrator/language/en-GB/en-GB.plg_user_contactcreator.ini
View File

@ -1,4 +1,4 @@
; $Id:
; $Id:
; Joomla! Project
; Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php

2
administrator/language/xx-XX/xx-XX.com_admin.ini
View File

@ -5,7 +5,7 @@
; Note : All ini files need to be saved as UTF-8
COM_ADMIN="Admin - System Infos"
COM_ADMIN_XML_DESCRIPTION="Administration system infos component"
COM_ADMIN_XML_DESCRIPTION="Administration system infos component"
COM_ADMIN_ALPHABETICAL_INDEX="Alphabetical Index"
COM_ADMIN_CACHE_DIRECTORY="(Cache Directory)"
COM_ADMIN_CHANGELOG="Changelog"

2
administrator/language/xx-XX/xx-XX.com_admin.sys.ini
View File

@ -5,4 +5,4 @@
; Note : All ini files need to be saved as UTF-8
COM_ADMIN="Admin - System Infos"
COM_ADMIN_XML_DESCRIPTION="Administration system infos component"
COM_ADMIN_XML_DESCRIPTION="Administration system infos component"

2
administrator/language/xx-XX/xx-XX.com_messages.ini
View File

@ -30,7 +30,7 @@ COM_MESSAGES_TOOLBAR_UNPUBLISH="Mark as Unread"
COM_MESSAGES_VIEW_PRIVATE_MESSAGE="Private Messages Manager: View Message"
COM_MESSAGES_WRITE_PRIVATE_MESSAGE="Write Private Message"
; models
; models
COM_MESSAGES_ERR_INVALID_USER="Invalid user"
COM_MESSAGES_ERR_SEND_FAILED="The user has locked their mailbox. Message failed."
COM_MESSAGES_FIELD_AUTO_PURGE_DESC="Automatically purge private messages after the given number of days."

2
administrator/language/xx-XX/xx-XX.com_search.ini
View File

@ -5,7 +5,7 @@
; Note : All ini files need to be saved as UTF-8
COM_SEARCH="Search"
COM_SEARCH_XML_DESCRIPTION="Component for search functions"
COM_SEARCH_XML_DESCRIPTION="Component for search functions"
COM_SEARCH_CONFIG_GATHER_SEARCH_STATISTICS_DESC="Record the search phrases submitted by visitors."
COM_SEARCH_CONFIG_GATHER_SEARCH_STATISTICS_LABEL="Gather Search Statistics"

2
administrator/language/xx-XX/xx-XX.com_search.sys.ini
View File

@ -5,7 +5,7 @@
; Note : All ini files need to be saved as UTF-8
COM_SEARCH="Search"
COM_SEARCH_XML_DESCRIPTION="Component for search functions"
COM_SEARCH_XML_DESCRIPTION="Component for search functions"
;
; View and layout titles and descriptions

2
administrator/language/xx-XX/xx-XX.com_templates.ini
View File

@ -32,7 +32,7 @@ COM_TEMPLATES_TOOLBAR_SET_HOME="Make Default"
COM_TEMPLATES_XML_DESCRIPTION="This component lets manage templates"
COM_TEMPLATES="Templates Manager"
; Edit styles
; Edit styles
COM_TEMPLATES_BASIC_FIELDSET_LABEL="Basic Options"
COM_TEMPLATES_ADVANCED_FIELDSET_LABEL="Advanced Options"
COM_TEMPLATES_FIELD_CLIENT_DESC="Whether this template is used for the front-end (0) or the back-end (1)"

4
administrator/language/xx-XX/xx-XX.com_weblinks.ini
View File

@ -5,7 +5,7 @@
; Note : All ini files need to be saved as UTF-8
COM_WEBLINKS="Weblinks"
COM_WEBLINKS_XML_DESCRIPTION="Component for weblinks management"
COM_WEBLINKS_XML_DESCRIPTION="Component for weblinks management"
COM_WEBLINKS_SUBMENU_WEBLINKS="Web Links"
COM_WEBLINKS_SUBMENU_CATEGORIES="Categories"
@ -32,7 +32,7 @@ COM_WEBLINKS_FIELD_VALUE_REPORTED="Reported"
COM_WEBLINKS_FIELD_ALIAS_DESC="The alias is used in the URL when SEF is on"
COM_WEBLINKS_FIELD_ALIAS_LABEL="Alias"
COM_WEBLINKS_FIELD_CATEGORYCHOOSE_DESC="Please choose a web links category to display"
COM_WEBLINKS_FIELD_CATEGORYCHOOSE_DESC="Please choose a web links category to display"
COM_WEBLINKS_FIELD_CATEGORY_DESC="Choose a category for this web link"
COM_WEBLINKS_FIELD_CATEGORY_LABEL="Category"
COM_WEBLINKS_FIELD_DESCRIPTION_DESC="Enter a description for the web link."

2
administrator/language/xx-XX/xx-XX.com_weblinks.sys.ini
View File

@ -5,7 +5,7 @@
; Note : All ini files need to be saved as UTF-8
COM_WEBLINKS="Weblinks"
COM_WEBLINKS_XML_DESCRIPTION="Component for weblinks management"
COM_WEBLINKS_XML_DESCRIPTION="Component for weblinks management"
COM_WEBLINKS_LINKS="Links"
COM_WEBLINKS_CATEGORIES="Categories"

2
administrator/language/xx-XX/xx-XX.plg_user_contactcreator.ini
View File

@ -1,4 +1,4 @@
; $Id:
; $Id:
; Joomla! Project
; Copyright (C) 2005 - 2010 Open Source Matters. All rights reserved.
; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php

6
administrator/modules/mod_custom/mod_custom.xml
View File

@ -40,14 +40,14 @@
type="modulelayout"
label="JFIELD_ALT_LAYOUT_LABEL"
description="JFIELD_ALT_MODULE_LAYOUT_DESC" />
<field
name="moduleclass_sfx"
type="text"
default=""
label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC" />
<field
name="cache"
type="list"
@ -59,7 +59,7 @@
<option
value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
</field>
<field
name="cache_time"
type="text"

6
administrator/modules/mod_feed/mod_feed.xml
View File

@ -104,14 +104,14 @@
type="modulelayout"
label="JFIELD_ALT_LAYOUT_LABEL"
description="JFIELD_ALT_MODULE_LAYOUT_DESC" />
<field
name="moduleclass_sfx"
type="text"
default=""
label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC" />
<field
name="cache"
type="list"
@ -123,7 +123,7 @@
<option
value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
</field>
<field
name="cache_time"
type="text"

4
administrator/modules/mod_latest/mod_latest.xml
View File

@ -73,14 +73,14 @@
type="modulelayout"
label="JFIELD_ALT_LAYOUT_LABEL"
description="JFIELD_ALT_MODULE_LAYOUT_DESC" />
<field
name="moduleclass_sfx"
type="text"
default=""
label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC" />
<field
name="cache"
type="list"

8
administrator/modules/mod_logged/mod_logged.xml
View File

@ -33,9 +33,9 @@
default="1"
label="MOD_LOGGED_NAME"
description="MOD_LOGGED_FIELD_NAME_DESC" >
<option
<option
value="1">MOD_LOGGED_NAME</option>
<option
<option
value="0">MOD_LOGGED_USERNAME</option>
</field>
</fieldset>
@ -45,14 +45,14 @@
type="modulelayout"
label="JFIELD_ALT_LAYOUT_LABEL"
description="JFIELD_ALT_MODULE_LAYOUT_DESC" />
<field
name="moduleclass_sfx"
type="text"
default=""
label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC" />
<field
name="cache"
type="list"

4
administrator/modules/mod_logged/tmpl/default.php
View File

@ -14,7 +14,7 @@ defined('_JEXEC') or die;
<thead>
<tr>
<th>
<?php
<?php
if($params->get('name', 1)) {
echo JText::_('MOD_LOGGED_NAME');
} else {
@ -47,7 +47,7 @@ defined('_JEXEC') or die;
endif; ?>
</td>
<td class="center">
<?php
<?php
if($user->client_id) {
echo JText::_('JADMINISTRATOR');
} else {

4
administrator/modules/mod_login/mod_login.xml
View File

@ -40,14 +40,14 @@
type="modulelayout"
label="JFIELD_ALT_LAYOUT_LABEL"
description="JFIELD_ALT_MODULE_LAYOUT_DESC" />
<field
name="moduleclass_sfx"
type="text"
default=""
label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC" />
<field
name="cache"
type="list"

2
administrator/modules/mod_menu/mod_menu.xml
View File

@ -33,7 +33,7 @@
default=""
label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC" />
<field
name="cache"
type="list"

4
administrator/modules/mod_online/mod_online.xml
View File

@ -26,14 +26,14 @@
type="modulelayout"
label="JFIELD_ALT_LAYOUT_LABEL"
description="JFIELD_ALT_MODULE_LAYOUT_DESC" />
<field
name="moduleclass_sfx"
type="text"
default=""
label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC" />
<field
name="cache"
type="list"

4
administrator/modules/mod_popular/mod_popular.xml
View File

@ -62,14 +62,14 @@
type="modulelayout"
label="JFIELD_ALT_LAYOUT_LABEL"
description="JFIELD_ALT_MODULE_LAYOUT_DESC" />
<field
name="moduleclass_sfx"
type="text"
default=""
label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC" />
<field
name="cache"
type="list"

2
administrator/modules/mod_quickicon/helper.php
View File

@ -105,7 +105,7 @@ abstract class QuickIconHelper
'image' => 'icon-48-language.png',
'text' => JText::_('MOD_QUICKICON_LANGUAGE_MANAGER'),
)
);
}

6
administrator/modules/mod_quickicon/mod_quickicon.xml
View File

@ -26,14 +26,14 @@
type="modulelayout"
label="JFIELD_ALT_LAYOUT_LABEL"
description="JFIELD_ALT_MODULE_LAYOUT_DESC" />
<field
name="moduleclass_sfx"
type="text"
default=""
label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC" />
<field
name="cache"
type="list"
@ -45,7 +45,7 @@
<option
value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
</field>
<field
name="cache_time"
type="text"

4
administrator/modules/mod_status/mod_status.xml
View File

@ -25,14 +25,14 @@
type="modulelayout"
label="JFIELD_ALT_LAYOUT_LABEL"
description="JFIELD_ALT_MODULE_LAYOUT_DESC" />
<field
name="moduleclass_sfx"
type="text"
default=""
label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC" />
<field
name="cache"
type="list"

2
administrator/modules/mod_status/tmpl/default.php
View File

@ -26,7 +26,7 @@ $output = array();
// Print the back-end logged in users.
$output[] = "<span class=\"loggedin-users\">".$count. " " . JText::_('MOD_STATUS_BACKEND_USERS') . "</span>";
// Reverse rendering order for rtl display.
if ($lang->isRTL()) {
$output = array_reverse($output);

4
administrator/modules/mod_submenu/mod_submenu.xml
View File

@ -26,14 +26,14 @@
type="modulelayout"
label="JFIELD_ALT_LAYOUT_LABEL"
description="JFIELD_ALT_MODULE_LAYOUT_DESC" />
<field
name="moduleclass_sfx"
type="text"
default=""
label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC" />
<field
name="cache"
type="list"

4
administrator/modules/mod_title/mod_title.xml
View File

@ -25,14 +25,14 @@
type="modulelayout"
label="JFIELD_ALT_LAYOUT_LABEL"
description="JFIELD_ALT_MODULE_LAYOUT_DESC" />
<field
name="moduleclass_sfx"
type="text"
default=""
label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC" />
<field
name="cache"
type="list"

4
administrator/modules/mod_toolbar/mod_toolbar.xml
View File

@ -25,14 +25,14 @@
type="modulelayout"
label="JFIELD_ALT_LAYOUT_LABEL"
description="JFIELD_ALT_MODULE_LAYOUT_DESC" />
<field
name="moduleclass_sfx"
type="text"
default=""
label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC" />
<field
name="cache"
type="list"

4
administrator/modules/mod_unread/mod_unread.xml
View File

@ -26,14 +26,14 @@
type="modulelayout"
label="JFIELD_ALT_LAYOUT_LABEL"
description="JFIELD_ALT_MODULE_LAYOUT_DESC" />
<field
name="moduleclass_sfx"
type="text"
default=""
label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC" />
<field
name="cache"
type="list"

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

@ -804,7 +804,7 @@ fieldset label {
float: left;
clear: left;
margin: 5px 5px 2px 0;
}
fieldset ul {
margin: 0;
@ -816,7 +816,7 @@ form label {
fieldset input,
fieldset textarea,
fieldset select,
fieldset img,
fieldset img,
fieldset button {
float: left;
width: auto;
@ -837,7 +837,7 @@ fieldset#filter-bar label {
}
/*
/*
fieldset#user-groups,
fieldset.adminform,
fieldset.adminform-legacy {
@ -973,7 +973,7 @@ label#batch-access-lbl {
}
/*
/*
label#jform_description-lbl {
padding: 10px 0;
}
@ -985,12 +985,12 @@ fieldset.adminform.long label {
}
fieldset.adminform.long input {
}
div#menu-assignment {
height: 300px;
height: 300px;
overflow: auto;
clear:left;
}
@ -2723,8 +2723,8 @@ a.icon-16-menu span img {
/* -- COMPONENT STYLES ------------------------------ */
div.message {
text-align: center;
@ -3233,7 +3233,7 @@ table#acl-config td {
}
table#acl-config th.acl-groups {
padding-left: 8px;
padding-left: 8px;
}
table#acl-config td select {
float:none;

6
administrator/templates/bluestork/templateDetails.xml
View File

@ -64,7 +64,7 @@
<option
value="1">JENABLED</option>
</field>
<field
name="textBig"
type="list"
@ -76,7 +76,7 @@
<option
value="1">JENABLED</option>
</field>
<field
name="highContrast"
type="list"
@ -88,7 +88,7 @@
<option
value="1">JENABLED</option>
</field>
</fieldset>
</fields>
</config>

20
components/com_banners/models/banner.php
View File

@ -44,9 +44,9 @@ class BannersModelBanner extends JModel
}
// track clicks
$item = $this->getItem();
$trackClicks = $item->track_clicks;
if ($trackClicks < 0 && $item->cid) {
@ -104,13 +104,13 @@ class BannersModelBanner extends JModel
function &getItem()
{
if (!isset($this->_item))
{
$cache = JFactory::getCache('com_banners', '');
{
$cache = JFactory::getCache('com_banners', '');
$id = $this->getState('banner.id');
$this->_item = $cache->get($id);
if ($this->_item === false) {
// redirect to banner url
$db = $this->getDbo();
@ -122,15 +122,15 @@ class BannersModelBanner extends JModel
);
$query->from('#__banners as a');
$query->where('a.id = ' . (int) $id);
$query->join('LEFT', '#__banner_clients AS cl ON cl.id = a.cid');
$query->select('cl.track_clicks as client_track_clicks');
$db->setQuery((string)$query);
if (!$db->query()) {
JError::raiseError(500, $db->getErrorMsg());
}
$this->_item = $db->loadObject();
$cache->store($this->_item, $id);
}

22
components/com_contact/controller.php
View File

@ -27,34 +27,34 @@ class ContactController extends JController
*/
function display()
{
$cachable = true;
// Set the default view name and format from the Request.
$vName = JRequest::getWord('view', 'categories');
// Workaround for the item view
if ($vName == 'contact')
{
if ($vName == 'contact')
{
$document = &JFactory::getDocument();
$vFormat = $document->getType();
$view = $this->getView($vName, $vFormat);
$modelCat = $this->getModel('category');
$view->setModel($modelCat);
}
$user = &JFactory::getUser();
if ($user->get('id') || ($_SERVER['REQUEST_METHOD'] == 'POST' &&
if ($user->get('id') || ($_SERVER['REQUEST_METHOD'] == 'POST' &&
($vName = 'category' || ($vName = 'contact' && JRequest::getVar('task') == 'submit' )))) {
$cachable = false;
}
$safeurlparams = array('id'=>'INT','catid'=>'INT','limit'=>'INT','limitstart'=>'INT',
'filter_order'=>'CMD','filter_order_Dir'=>'CMD');
parent::display($cachable,$safeurlparams);
}
/**

2
components/com_contact/helpers/route.php
View File

@ -23,7 +23,7 @@ jimport('joomla.application.categories');
* @since 1.5
*/
abstract class ContactHelperRoute
{
{
protected static $lookup;
/**
* @param int The route of the newsfeed

10
components/com_contact/models/categories.php
View File

@ -32,11 +32,11 @@ class ContactModelCategories extends JModel
* @var string
*/
protected $_extension = 'com_contact';
private $_parent = null;
private $_items = null;
/**
* Method to auto-populate the model state.
*
@ -108,10 +108,10 @@ class ContactModelCategories extends JModel
$this->_items = false;
}
}
return $this->_items;
}
public function getParent()
{
if(!is_object($this->_parent))

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