Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/staging' into staging
Browse files Browse the repository at this point in the history
  • Loading branch information
@LivioCavallo
LivioCavallo committed Sep 3, 2017
2 parents eb9ce94 + bacc81f commit cbff398
Show file tree
Hide file tree
Showing 143 changed files with 14,139 additions and 2,401 deletions.
17 changes: 16 additions & 1 deletion administrator/components/com_admin/script.php
View file
Expand Up @@ -1566,6 +1566,7 @@ public function deleteUnexistingFiles()
'/components/com_wrapper/metadata.xml',
'/administrator/components/com_cache/layouts/joomla/searchtools/default/bar.php',
'/administrator/components/com_cache/layouts/joomla/searchtools/default.php',
'/administrator/components/com_content/models/fields/votelist.php',
'/administrator/components/com_languages/layouts/joomla/searchtools/default/bar.php',
'/administrator/components/com_languages/layouts/joomla/searchtools/default.php',
'/administrator/components/com_modules/layouts/joomla/searchtools/default/bar.php',
Expand Down Expand Up @@ -1659,6 +1660,7 @@ public function deleteUnexistingFiles()
'/libraries/cms/helper/route.php',
'/libraries/cms/helper/tags.php',
'/libraries/cms/helper/usergroups.php',
'/libraries/cms/html/html.php',
'/libraries/cms/installer/adapter.php',
'/libraries/cms/installer/extension.php',
'/libraries/cms/installer/helper.php',
Expand Down Expand Up @@ -1826,6 +1828,15 @@ public function deleteUnexistingFiles()
'/libraries/joomla/form/rule/url.php',
'/libraries/joomla/form/rule/username.php',
'/libraries/joomla/form/wrapper/helper.php',
'/libraries/joomla/http/factory.php',
'/libraries/joomla/http/http.php',
'/libraries/joomla/http/response.php',
'/libraries/joomla/http/transport.php',
'/libraries/joomla/http/transport/cacert.pem',
'/libraries/joomla/http/transport/curl.php',
'/libraries/joomla/http/transport/socket.php',
'/libraries/joomla/http/transport/stream.php',
'/libraries/joomla/http/wrapper/factory.php',
'/libraries/joomla/image/filter/backgroundfill.php',
'/libraries/joomla/image/filter/brightness.php',
'/libraries/joomla/image/filter/contrast.php',
Expand Down Expand Up @@ -2122,6 +2133,9 @@ public function deleteUnexistingFiles()
'/libraries/joomla/filter',
'/libraries/joomla/form/rule',
'/libraries/joomla/form/wrapper',
'/libraries/joomla/http/transport',
'/libraries/joomla/http/wrapper',
'/libraries/joomla/http',
'/libraries/joomla/image/filter',
'/libraries/joomla/image',
'/libraries/joomla/input',
Expand All @@ -2146,10 +2160,11 @@ public function deleteUnexistingFiles()
'/libraries/legacy/categories',
'/libraries/legacy/controller',
'/libraries/legacy/model',
'/libraries/legacy/table/menu',
'/libraries/legacy/view',
'/libraries/legacy/web',
'/media/editors/tinymce/plugins/jdragdrop',
'/administrator/modules/mod_menu/preset',
'/administrator/components/com_content/models/fields/votelist.php',
);

jimport('joomla.filesystem.file');
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_contact/views/contact/tmpl/edit.php
View file
Expand Up @@ -58,7 +58,7 @@
<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'details', empty($this->item->id) ? JText::_('COM_CONTACT_NEW_CONTACT') : JText::_('COM_CONTACT_EDIT_CONTACT')); ?>
<div class="row-fluid">
<div class="span9">
<div class="row-fluid form-horizontal-desktop">
<div class="row-fluid form-horizontal-desktop float-cols" >
<div class="span6">
<?php echo $this->form->renderField('user_id'); ?>
<?php echo $this->form->renderField('image'); ?>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_content/models/article.php
View file
Expand Up @@ -525,7 +525,7 @@ public function save($data)
$catid = CategoriesHelper::validateCategoryId($data['catid'], 'com_content');
}

// Save New Categoryg
// Save New Category
if ($catid == 0 && $this->canCreateCategory())
{
$table = array();
Expand Down
143 changes: 71 additions & 72 deletions administrator/components/com_content/models/forms/filter_featured.xml
View file
Expand Up @@ -2,101 +2,100 @@
<form>
<fields name="filter">
<field
name="search"
type="text"
label="COM_CONTENT_FILTER_SEARCH_LABEL"
description="COM_CONTENT_FILTER_SEARCH_DESC"
hint="JSEARCH_FILTER"
name="search"
type="text"
label="COM_CONTENT_FILTER_SEARCH_LABEL"
description="COM_CONTENT_FILTER_SEARCH_DESC"
hint="JSEARCH_FILTER"
/>

<field
name="published"
type="status"
label="COM_CONTENT_FILTER_PUBLISHED"
description="COM_CONTENT_FILTER_PUBLISHED_DESC"
onchange="this.form.submit();"
>
name="published"
type="status"
label="COM_CONTENT_FILTER_PUBLISHED"
description="COM_CONTENT_FILTER_PUBLISHED_DESC"
onchange="this.form.submit();"
>
<option value="">JOPTION_SELECT_PUBLISHED</option>
</field>

<field
name="category_id"
type="category"
label="JOPTION_FILTER_CATEGORY"
description="JOPTION_FILTER_CATEGORY_DESC"
multiple="true"
class="multipleCategories"
extension="com_content"
onchange="this.form.submit();"
name="category_id"
type="category"
label="JOPTION_FILTER_CATEGORY"
description="JOPTION_FILTER_CATEGORY_DESC"
multiple="true"
class="multipleCategories"
extension="com_content"
onchange="this.form.submit();"
/>

<field
name="level"
type="integer"
label="JOPTION_FILTER_LEVEL"
description="JOPTION_FILTER_LEVEL_DESC"
first="1"
last="10"
step="1"
languages="*"
onchange="this.form.submit();"
>
name="level"
type="integer"
label="JOPTION_FILTER_LEVEL"
description="JOPTION_FILTER_LEVEL_DESC"
first="1"
last="10"
step="1"
languages="*"
onchange="this.form.submit();"
>
<option value="">JOPTION_SELECT_MAX_LEVELS</option>
</field>

<field
name="author_id"
type="author"
label="COM_CONTENT_FILTER_AUTHOR"
description="COM_CONTENT_FILTER_AUTHOR_DESC"
multiple="true"
class="multipleAuthors"
onchange="this.form.submit();"
name="author_id"
type="author"
label="COM_CONTENT_FILTER_AUTHOR"
description="COM_CONTENT_FILTER_AUTHOR_DESC"
multiple="true"
class="multipleAuthors"
onchange="this.form.submit();"
/>

<field
name="access"
type="accesslevel"
label="JOPTION_FILTER_ACCESS"
description="JOPTION_FILTER_ACCESS_DESC"
multiple="true"
class="multipleAccessLevels"
onchange="this.form.submit();"
name="access"
type="accesslevel"
label="JOPTION_FILTER_ACCESS"
description="JOPTION_FILTER_ACCESS_DESC"
multiple="true"
class="multipleAccessLevels"
onchange="this.form.submit();"
/>

<field
name="language"
type="contentlanguage"
label="JOPTION_FILTER_LANGUAGE"
description="JOPTION_FILTER_LANGUAGE_DESC"
onchange="this.form.submit();"
>
name="language"
type="contentlanguage"
label="JOPTION_FILTER_LANGUAGE"
description="JOPTION_FILTER_LANGUAGE_DESC"
onchange="this.form.submit();"
>
<option value="">JOPTION_SELECT_LANGUAGE</option>
<option value="*">JALL</option>
</field>

<field
name="tag"
type="tag"
label="JOPTION_FILTER_TAG"
description="JOPTION_FILTER_TAG_DESC"
multiple="true"
class="multipleTags"
mode="nested"
onchange="this.form.submit();"
name="tag"
type="tag"
label="JOPTION_FILTER_TAG"
description="JOPTION_FILTER_TAG_DESC"
multiple="true"
class="multipleTags"
mode="nested"
onchange="this.form.submit();"
/>

</fields>

<fields name="list">
<field
name="fullordering"
type="list"
label="COM_CONTENT_LIST_FULL_ORDERING"
description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
onchange="this.form.submit();"
default="a.title ASC"
>
name="fullordering"
type="list"
label="COM_CONTENT_LIST_FULL_ORDERING"
description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
onchange="this.form.submit();"
default="a.title ASC"
>
<option value="">JGLOBAL_SORT_BY</option>
<option value="fp.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
<option value="fp.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
Expand Down Expand Up @@ -129,13 +128,13 @@
</field>

<field
name="limit"
type="limitbox"
label="COM_CONTENT_LIST_LIMIT"
description="COM_CONTENT_LIST_LIMIT_DESC"
class="input-mini"
default="25"
onchange="this.form.submit();"
name="limit"
type="limitbox"
label="COM_CONTENT_LIST_LIMIT"
description="COM_CONTENT_LIST_LIMIT_DESC"
class="input-mini"
default="25"
onchange="this.form.submit();"
/>
</fields>
</form>
2 changes: 1 addition & 1 deletion administrator/components/com_menus/controllers/menus.php
View file
Expand Up @@ -92,7 +92,7 @@ public function delete()
// Remove the items.
if (!$model->delete($cids))
{
$this->setMessage($model->getError());
$this->setMessage($model->getError(), 'error');
}
else
{
Expand Down
23 changes: 23 additions & 0 deletions administrator/components/com_menus/views/item/tmpl/edit.php
View file
Expand Up @@ -46,7 +46,30 @@
$('#jform_parent_id').trigger('liszt:updated');
});
});
// Menu type Login Form specific
$('#item-form').on('submit', function() {
if ($('#jform_params_login_redirect_url') && $('#jform_params_logout_redirect_url')) {
// Login
if ($('#jform_params_login_redirect_url').closest('.control-group').css('display') === 'block') {
$('#jform_params_login_redirect_menuitem_id').val('');
}
if ($('#jform_params_login_redirect_menuitem_name').closest('.control-group').css('display') === 'block') {
$('#jform_params_login_redirect_url').val('');
}
// Logout
if ($('#jform_params_logout_redirect_url').closest('.control-group').css('display') === 'block') {
$('#jform_params_logout_redirect_menuitem_id').val('');
}
if ($('#jform_params_logout_redirect_menuitem_id').closest('.control-group').css('display') === 'block') {
$('#jform_params_logout_redirect_url').val('');
}
}
});
});
Joomla.submitbutton = function(task, type){
if (task == 'item.setType' || task == 'item.setMenuType')
{
Expand Down
7 changes: 4 additions & 3 deletions administrator/components/com_menus/views/menus/tmpl/default.php
View file
Expand Up @@ -170,19 +170,20 @@
<ul class="dropdown-menu">
<?php foreach ($this->modules[$item->menutype] as &$module) : ?>
<li>
<?php if ($canEdit) : ?>
<?php if ($user->authorise('core.edit', 'com_modules.module.' . (int) $module->id)) : ?>
<?php $link = JRoute::_('index.php?option=com_modules&task=module.edit&id=' . $module->id . '&return=' . $return . '&tmpl=component&layout=modal'); ?>
<a href="#moduleEdit<?php echo $module->id; ?>Modal" role="button" class="button" data-toggle="modal" 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>
<?php else : ?>
<?php echo JText::sprintf('COM_MENUS_MODULE_ACCESS_POSITION', $this->escape($module->title), $this->escape($module->access_title), $this->escape($module->position)); ?>
<a href="#" class="disabled" disabled="disabled">
<?php echo JText::sprintf('COM_MENUS_MODULE_ACCESS_POSITION', $this->escape($module->title), $this->escape($module->access_title), $this->escape($module->position)); ?></a>
<?php endif; ?>
</li>
<?php endforeach; ?>
</ul>
</div>
<?php foreach ($this->modules[$item->menutype] as &$module) : ?>
<?php if ($canEdit) : ?>
<?php if ($user->authorise('core.edit', 'com_modules.module.' . (int) $module->id)) : ?>
<?php $link = JRoute::_('index.php?option=com_modules&task=module.edit&id=' . $module->id . '&return=' . $return . '&tmpl=component&layout=modal'); ?>
<?php echo JHtml::_(
'bootstrap.renderModal',
Expand Down
11 changes: 8 additions & 3 deletions administrator/components/com_modules/controllers/module.php
View file
Expand Up @@ -118,14 +118,19 @@ protected function allowEdit($data = array(), $key = 'id')
$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
$user = JFactory::getUser();

// Check general edit permission first.
// Zero record (id:0), return component edit permission by calling parent controller method
if (!$recordId)
{
return parent::allowEdit($data, $key);
}

// Check edit on the record asset (explicit or inherited)
if ($user->authorise('core.edit', 'com_modules.module.' . $recordId))
{
return true;
}

// Since there is no asset tracking, revert to the component permissions.
return parent::allowEdit($data, $key);
return false;
}

/**
Expand Down
3 changes: 2 additions & 1 deletion administrator/components/com_plugins/config.xml
View file
Expand Up @@ -12,6 +12,7 @@
filter="rules"
validate="rules"
component="com_plugins"
section="component" />
section="component"
/>
</fieldset>
</config>
7 changes: 7 additions & 0 deletions administrator/components/com_redirect/config.xml
View file
Expand Up @@ -15,6 +15,13 @@
<option value="1">JYES</option>
<option value="0">JNO</option>
</field>
<field
name="separator"
type="text"
label="COM_REDIRECT_BULK_SEPARATOR_LABEL"
description="COM_REDIRECT_BULK_SEPARATOR_DESC"
default="|"
/>
</fieldset>

<fieldset
Expand Down
3 changes: 2 additions & 1 deletion administrator/components/com_redirect/controllers/links.php
View file
Expand Up @@ -132,7 +132,8 @@ public function batch()
{
if (!empty($batch_urls_line))
{
$batch_urls[] = array_map('trim', explode('|', $batch_urls_line));
$params = JComponentHelper::getParams('com_redirect');
$batch_urls[] = array_map('trim', explode($params->get('separator', '|'), $batch_urls_line));
}
}

Expand Down
10 changes: 1 addition & 9 deletions administrator/components/com_redirect/models/links.php
View file
Expand Up @@ -214,15 +214,7 @@ public function batchProcess($batch_urls)

foreach ($batch_urls as $batch_url)
{
// Source URLs need to have the correct URL format to work properly
if (strpos($batch_url[0], JUri::root()) === false)
{
$old_url = JUri::root() . $batch_url[0];
}
else
{
$old_url = $batch_url[0];
}
$old_url = $batch_url[0];

// Destination URL can also be an external URL
if (!empty($batch_url[1]))
Expand Down

0 comments on commit cbff398

Please sign in to comment.