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

@ -198,13 +198,16 @@ class ComponentbuilderViewSnippets extends JViewLegacy
// Set Type Name Selection
$this->typeNameOptions = JFormHelper::loadFieldType('Snippettype')->options;
if ($this->typeNameOptions)
// We do some sanitation for filter
if (ComponentbuilderHelper::checkArray($this->typeNameOptions) &&
isset($this->typeNameOptions[0]->value) &&
!ComponentbuilderHelper::checkString($this->typeNameOptions[0]->value))
{
unset($this->typeNameOptions[0]);
}
// Only load filter if it has values
if (ComponentbuilderHelper::checkArray($this->typeNameOptions))
{
// We do some sanitation for filter
if (isset($this->typeNameOptions[0]) && !ComponentbuilderHelper::checkString($this->typeNameOptions[0]->value))
{
unset($this->typeNameOptions[0]);
}
// Type Name Filter
JHtmlSidebar::addFilter(
'- Select '.JText::_('COM_COMPONENTBUILDER_SNIPPET_TYPE_LABEL').' -',
@ -225,13 +228,16 @@ class ComponentbuilderViewSnippets extends JViewLegacy
// Set Library Name Selection
$this->libraryNameOptions = JFormHelper::loadFieldType('Library')->options;
if ($this->libraryNameOptions)
// We do some sanitation for filter
if (ComponentbuilderHelper::checkArray($this->libraryNameOptions) &&
isset($this->libraryNameOptions[0]->value) &&
!ComponentbuilderHelper::checkString($this->libraryNameOptions[0]->value))
{
unset($this->libraryNameOptions[0]);
}
// Only load filter if it has values
if (ComponentbuilderHelper::checkArray($this->libraryNameOptions))
{
// We do some sanitation for filter
if (isset($this->libraryNameOptions[0]) && !ComponentbuilderHelper::checkString($this->libraryNameOptions[0]->value))
{
unset($this->libraryNameOptions[0]);
}
// Library Name Filter
JHtmlSidebar::addFilter(
'- Select '.JText::_('COM_COMPONENTBUILDER_SNIPPET_LIBRARY_LABEL').' -',