joomla/Component-Builder
39
25
Fork 11
Code Issues 78 Pull Requests 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/libraries/view.html.php
View File

@ -183,13 +183,16 @@ class ComponentbuilderViewLibraries extends JViewLegacy
// Set How Selection
$this->howOptions = JFormHelper::loadFieldType('Filebehaviour')->options;
if ($this->howOptions)
// We do some sanitation for filter
if (ComponentbuilderHelper::checkArray($this->howOptions) &&
isset($this->howOptions[0]->value) &&
!ComponentbuilderHelper::checkString($this->howOptions[0]->value))
{
unset($this->howOptions[0]);
}
// Only load filter if it has values
if (ComponentbuilderHelper::checkArray($this->howOptions))
{
// We do some sanitation for filter
if (isset($this->howOptions[0]) && !ComponentbuilderHelper::checkString($this->howOptions[0]->value))
{
unset($this->howOptions[0]);
}
// How Filter
JHtmlSidebar::addFilter(
'- Select '.JText::_('COM_COMPONENTBUILDER_LIBRARY_HOW_LABEL').' -',
@ -210,13 +213,16 @@ class ComponentbuilderViewLibraries extends JViewLegacy
// Set Type Selection
$this->typeOptions = $this->getTheTypeSelections();
if ($this->typeOptions)
// We do some sanitation for Type filter
if (ComponentbuilderHelper::checkArray($this->typeOptions) &&
isset($this->typeOptions[0]->value) &&
!ComponentbuilderHelper::checkString($this->typeOptions[0]->value))
{
unset($this->typeOptions[0]);
}
// Only load Type filter if it has values
if (ComponentbuilderHelper::checkArray($this->typeOptions))
{
// We do some sanitation for Type filter
if (isset($this->typeOptions[0]) && !ComponentbuilderHelper::checkString($this->typeOptions[0]->value))
{
unset($this->typeOptions[0]);
}
// Type Filter
JHtmlSidebar::addFilter(
'- Select '.JText::_('COM_COMPONENTBUILDER_LIBRARY_TYPE_LABEL').' -',