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/dynamic_gets/view.html.php
View File

@@ -193,13 +193,16 @@ class ComponentbuilderViewDynamic_gets extends JViewLegacy
// Set Main Source Selection
$this->main_sourceOptions = $this->getTheMain_sourceSelections();
if ($this->main_sourceOptions)
// We do some sanitation for Main Source filter
if (ComponentbuilderHelper::checkArray($this->main_sourceOptions) &&
isset($this->main_sourceOptions[0]->value) &&
!ComponentbuilderHelper::checkString($this->main_sourceOptions[0]->value))
{
unset($this->main_sourceOptions[0]);
}
// Only load Main Source filter if it has values
if (ComponentbuilderHelper::checkArray($this->main_sourceOptions))
{
// We do some sanitation for Main Source filter
if (isset($this->main_sourceOptions[0]) && !ComponentbuilderHelper::checkString($this->main_sourceOptions[0]->value))
{
unset($this->main_sourceOptions[0]);
}
// Main Source Filter
JHtmlSidebar::addFilter(
'- Select '.JText::_('COM_COMPONENTBUILDER_DYNAMIC_GET_MAIN_SOURCE_LABEL').' -',
@@ -220,13 +223,16 @@ class ComponentbuilderViewDynamic_gets extends JViewLegacy
// Set Gettype Selection
$this->gettypeOptions = $this->getTheGettypeSelections();
if ($this->gettypeOptions)
// We do some sanitation for Gettype filter
if (ComponentbuilderHelper::checkArray($this->gettypeOptions) &&
isset($this->gettypeOptions[0]->value) &&
!ComponentbuilderHelper::checkString($this->gettypeOptions[0]->value))
{
unset($this->gettypeOptions[0]);
}
// Only load Gettype filter if it has values
if (ComponentbuilderHelper::checkArray($this->gettypeOptions))
{
// We do some sanitation for Gettype filter
if (isset($this->gettypeOptions[0]) && !ComponentbuilderHelper::checkString($this->gettypeOptions[0]->value))
{
unset($this->gettypeOptions[0]);
}
// Gettype Filter
JHtmlSidebar::addFilter(
'- Select '.JText::_('COM_COMPONENTBUILDER_DYNAMIC_GET_GETTYPE_LABEL').' -',