joomla/Component-Builder
40
26
Fork 12
Code Issues 78 Pull Requests 2 Projects 4 Wiki Activity

Moved the filter sanitation to insure no empty filters will get loaded

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2019-06-05 13:14:05 +02:00
parent e1f32c142b
commit 4a878e32ef
16 changed files with 362 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
admin/views/layouts/view.html.php
View File

@@ -193,13 +193,16 @@ class ComponentbuilderViewLayouts extends JViewLegacy
// Set Dynamic Get Name Selection
$this->dynamic_getNameOptions = JFormHelper::loadFieldType('Dynamicget')->options;
if ($this->dynamic_getNameOptions)
// We do some sanitation for filter
if (ComponentbuilderHelper::checkArray($this->dynamic_getNameOptions) &&
isset($this->dynamic_getNameOptions[0]->value) &&
!ComponentbuilderHelper::checkString($this->dynamic_getNameOptions[0]->value))
{
unset($this->dynamic_getNameOptions[0]);
}
// Only load filter if it has values
if (ComponentbuilderHelper::checkArray($this->dynamic_getNameOptions))
{
// We do some sanitation for filter
if (isset($this->dynamic_getNameOptions[0]) && !ComponentbuilderHelper::checkString($this->dynamic_getNameOptions[0]->value))
{
unset($this->dynamic_getNameOptions[0]);
}
// Dynamic Get Name Filter
JHtmlSidebar::addFilter(
'- Select '.JText::_('COM_COMPONENTBUILDER_LAYOUT_DYNAMIC_GET_LABEL').' -',
@@ -220,13 +223,16 @@ class ComponentbuilderViewLayouts extends JViewLegacy
// Set Add Php View Selection
$this->add_php_viewOptions = $this->getTheAdd_php_viewSelections();
if ($this->add_php_viewOptions)
// We do some sanitation for Add Php View filter
if (ComponentbuilderHelper::checkArray($this->add_php_viewOptions) &&
isset($this->add_php_viewOptions[0]->value) &&
!ComponentbuilderHelper::checkString($this->add_php_viewOptions[0]->value))
{
unset($this->add_php_viewOptions[0]);
}
// Only load Add Php View filter if it has values
if (ComponentbuilderHelper::checkArray($this->add_php_viewOptions))
{
// We do some sanitation for Add Php View filter
if (isset($this->add_php_viewOptions[0]) && !ComponentbuilderHelper::checkString($this->add_php_viewOptions[0]->value))
{
unset($this->add_php_viewOptions[0]);
}
// Add Php View Filter
JHtmlSidebar::addFilter(
'- Select '.JText::_('COM_COMPONENTBUILDER_LAYOUT_ADD_PHP_VIEW_LABEL').' -',