From 4a878e32ef5ffb3c1b5b6084df4abda0dddd8986 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Wed, 5 Jun 2019 13:14:05 +0200 Subject: [PATCH] Moved the filter sanitation to insure no empty filters will get loaded --- README.md | 2 +- admin/README.txt | 2 +- admin/helpers/compiler/e_Interpretation.php | 30 ++++---- admin/views/admin_views/view.html.php | 75 ++++++++++++-------- admin/views/custom_admin_views/view.html.php | 45 +++++++----- admin/views/custom_codes/view.html.php | 60 +++++++++------- admin/views/dynamic_gets/view.html.php | 30 ++++---- admin/views/fields/view.html.php | 75 ++++++++++++-------- admin/views/help_documents/view.html.php | 60 +++++++++------- admin/views/joomla_components/view.html.php | 30 ++++---- admin/views/layouts/view.html.php | 30 ++++---- admin/views/libraries/view.html.php | 30 ++++---- admin/views/servers/view.html.php | 30 ++++---- admin/views/site_views/view.html.php | 45 +++++++----- admin/views/snippets/view.html.php | 30 ++++---- admin/views/templates/view.html.php | 30 ++++---- 16 files changed, 362 insertions(+), 242 deletions(-) diff --git a/README.md b/README.md index 51a1eca66..31233e8df 100644 --- a/README.md +++ b/README.md @@ -150,7 +150,7 @@ TODO + *Version*: 2.9.18 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt -+ *Line count*: **206555** ++ *Line count*: **206669** + *Field count*: **1136** + *File count*: **1344** + *Folder count*: **209** diff --git a/admin/README.txt b/admin/README.txt index 51a1eca66..31233e8df 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -150,7 +150,7 @@ TODO + *Version*: 2.9.18 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt -+ *Line count*: **206555** ++ *Line count*: **206669** + *Field count*: **1136** + *File count*: **1344** + *Folder count*: **209** diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php index 88acd3488..f80750831 100644 --- a/admin/helpers/compiler/e_Interpretation.php +++ b/admin/helpers/compiler/e_Interpretation.php @@ -10866,13 +10866,16 @@ class Interpretation extends Fields $type = ComponentbuilderHelper::safeString($filter['custom']['type'], 'F'); $otherFilter[] = PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Set " . $CodeName . " Selection"; $otherFilter[] = $this->_t(2) . "\$this->" . $codeName . "Options = JFormHelper::loadFieldType('" . $type . "')->options;"; - $otherFilter[] = $this->_t(2) . "if (\$this->" . $codeName . "Options)"; + $otherFilter[] = $this->_t(2) . "//" . $this->setLine(__LINE__) . " We do some sanitation for " . $Codename . " filter"; + $otherFilter[] = $this->_t(2) . "if (" . $Component . "Helper::checkArray(\$this->" . $codeName . "Options) &&"; + $otherFilter[] = $this->_t(3) . "isset(\$this->" . $codeName . "Options[0]->value) &&"; + $otherFilter[] = $this->_t(3) . "!" . $Component . "Helper::checkString(\$this->" . $codeName . "Options[0]->value))"; + $otherFilter[] = $this->_t(2) . "{"; + $otherFilter[] = $this->_t(3) . "unset(\$this->" . $codeName . "Options[0]);"; + $otherFilter[] = $this->_t(2) . "}"; + $otherFilter[] = $this->_t(2) . "//" . $this->setLine(__LINE__) . " Only load " . $Codename . " filter if it has values"; + $otherFilter[] = $this->_t(2) . "if (" . $Component . "Helper::checkArray(\$this->" . $codeName . "Options))"; $otherFilter[] = $this->_t(2) . "{"; - $otherFilter[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " We do some sanitation for " . $Codename . " filter"; - $otherFilter[] = $this->_t(3) . "if (isset(\$this->" . $codeName . "Options[0]) && !" . $Component . "Helper::checkString(\$this->" . $codeName . "Options[0]->value))"; - $otherFilter[] = $this->_t(3) . "{"; - $otherFilter[] = $this->_t(4) . "unset(\$this->" . $codeName . "Options[0]);"; - $otherFilter[] = $this->_t(3) . "}"; $otherFilter[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " " . $CodeName . " Filter"; $otherFilter[] = $this->_t(3) . "JHtmlSidebar::addFilter("; $otherFilter[] = $this->_t(4) . "'- Select '.JText:" . ":_('" . $filter['lang'] . "').' -',"; @@ -10905,13 +10908,16 @@ class Interpretation extends Fields } $otherFilter[] = PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Set " . $Codename . " Selection"; $otherFilter[] = $this->_t(2) . "\$this->" . $filter['code'] . "Options = " . $functionName; - $otherFilter[] = $this->_t(2) . "if (\$this->" . $filter['code'] . "Options)"; + $otherFilter[] = $this->_t(2) . "//" . $this->setLine(__LINE__) . " We do some sanitation for " . $Codename . " filter"; + $otherFilter[] = $this->_t(2) . "if (" . $Component . "Helper::checkArray(\$this->" . $filter['code'] . "Options) &&"; + $otherFilter[] = $this->_t(3) . "isset(\$this->" . $filter['code'] . "Options[0]->value) &&"; + $otherFilter[] = $this->_t(3) . "!" . $Component . "Helper::checkString(\$this->" . $filter['code'] . "Options[0]->value))"; + $otherFilter[] = $this->_t(2) . "{"; + $otherFilter[] = $this->_t(3) . "unset(\$this->" . $filter['code'] . "Options[0]);"; + $otherFilter[] = $this->_t(2) . "}"; + $otherFilter[] = $this->_t(2) . "//" . $this->setLine(__LINE__) . " Only load " . $Codename . " filter if it has values"; + $otherFilter[] = $this->_t(2) . "if (" . $Component . "Helper::checkArray(\$this->" . $filter['code'] . "Options))"; $otherFilter[] = $this->_t(2) . "{"; - $otherFilter[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " We do some sanitation for " . $Codename . " filter"; - $otherFilter[] = $this->_t(3) . "if (isset(\$this->" . $filter['code'] . "Options[0]) && !" . $Component . "Helper::checkString(\$this->" . $filter['code'] . "Options[0]->value))"; - $otherFilter[] = $this->_t(3) . "{"; - $otherFilter[] = $this->_t(4) . "unset(\$this->" . $filter['code'] . "Options[0]);"; - $otherFilter[] = $this->_t(3) . "}"; $otherFilter[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " " . $Codename . " Filter"; $otherFilter[] = $this->_t(3) . "JHtmlSidebar::addFilter("; $otherFilter[] = $this->_t(4) . "'- Select '.JText:" . ":_('" . $filter['lang'] . "').' -',"; diff --git a/admin/views/admin_views/view.html.php b/admin/views/admin_views/view.html.php index 62e27a410..7e2f0163a 100644 --- a/admin/views/admin_views/view.html.php +++ b/admin/views/admin_views/view.html.php @@ -193,13 +193,16 @@ class ComponentbuilderViewAdmin_views extends JViewLegacy // Set Add Fadein Selection $this->add_fadeinOptions = $this->getTheAdd_fadeinSelections(); - if ($this->add_fadeinOptions) + // We do some sanitation for Add Fadein filter + if (ComponentbuilderHelper::checkArray($this->add_fadeinOptions) && + isset($this->add_fadeinOptions[0]->value) && + !ComponentbuilderHelper::checkString($this->add_fadeinOptions[0]->value)) + { + unset($this->add_fadeinOptions[0]); + } + // Only load Add Fadein filter if it has values + if (ComponentbuilderHelper::checkArray($this->add_fadeinOptions)) { - // We do some sanitation for Add Fadein filter - if (isset($this->add_fadeinOptions[0]) && !ComponentbuilderHelper::checkString($this->add_fadeinOptions[0]->value)) - { - unset($this->add_fadeinOptions[0]); - } // Add Fadein Filter JHtmlSidebar::addFilter( '- Select '.JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_FADEIN_LABEL').' -', @@ -220,13 +223,16 @@ class ComponentbuilderViewAdmin_views 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_ADMIN_VIEW_TYPE_LABEL').' -', @@ -247,13 +253,16 @@ class ComponentbuilderViewAdmin_views extends JViewLegacy // Set Add Custom Import Selection $this->add_custom_importOptions = $this->getTheAdd_custom_importSelections(); - if ($this->add_custom_importOptions) + // We do some sanitation for Add Custom Import filter + if (ComponentbuilderHelper::checkArray($this->add_custom_importOptions) && + isset($this->add_custom_importOptions[0]->value) && + !ComponentbuilderHelper::checkString($this->add_custom_importOptions[0]->value)) + { + unset($this->add_custom_importOptions[0]); + } + // Only load Add Custom Import filter if it has values + if (ComponentbuilderHelper::checkArray($this->add_custom_importOptions)) { - // We do some sanitation for Add Custom Import filter - if (isset($this->add_custom_importOptions[0]) && !ComponentbuilderHelper::checkString($this->add_custom_importOptions[0]->value)) - { - unset($this->add_custom_importOptions[0]); - } // Add Custom Import Filter JHtmlSidebar::addFilter( '- Select '.JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_IMPORT_LABEL').' -', @@ -274,13 +283,16 @@ class ComponentbuilderViewAdmin_views extends JViewLegacy // Set Add Custom Button Selection $this->add_custom_buttonOptions = $this->getTheAdd_custom_buttonSelections(); - if ($this->add_custom_buttonOptions) + // We do some sanitation for Add Custom Button filter + if (ComponentbuilderHelper::checkArray($this->add_custom_buttonOptions) && + isset($this->add_custom_buttonOptions[0]->value) && + !ComponentbuilderHelper::checkString($this->add_custom_buttonOptions[0]->value)) + { + unset($this->add_custom_buttonOptions[0]); + } + // Only load Add Custom Button filter if it has values + if (ComponentbuilderHelper::checkArray($this->add_custom_buttonOptions)) { - // We do some sanitation for Add Custom Button filter - if (isset($this->add_custom_buttonOptions[0]) && !ComponentbuilderHelper::checkString($this->add_custom_buttonOptions[0]->value)) - { - unset($this->add_custom_buttonOptions[0]); - } // Add Custom Button Filter JHtmlSidebar::addFilter( '- Select '.JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_BUTTON_LABEL').' -', @@ -301,13 +313,16 @@ class ComponentbuilderViewAdmin_views extends JViewLegacy // Set Add Php Ajax Selection $this->add_php_ajaxOptions = $this->getTheAdd_php_ajaxSelections(); - if ($this->add_php_ajaxOptions) + // We do some sanitation for Add Php Ajax filter + if (ComponentbuilderHelper::checkArray($this->add_php_ajaxOptions) && + isset($this->add_php_ajaxOptions[0]->value) && + !ComponentbuilderHelper::checkString($this->add_php_ajaxOptions[0]->value)) + { + unset($this->add_php_ajaxOptions[0]); + } + // Only load Add Php Ajax filter if it has values + if (ComponentbuilderHelper::checkArray($this->add_php_ajaxOptions)) { - // We do some sanitation for Add Php Ajax filter - if (isset($this->add_php_ajaxOptions[0]) && !ComponentbuilderHelper::checkString($this->add_php_ajaxOptions[0]->value)) - { - unset($this->add_php_ajaxOptions[0]); - } // Add Php Ajax Filter JHtmlSidebar::addFilter( '- Select '.JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AJAX_LABEL').' -', diff --git a/admin/views/custom_admin_views/view.html.php b/admin/views/custom_admin_views/view.html.php index 04072c852..6a846c5d6 100644 --- a/admin/views/custom_admin_views/view.html.php +++ b/admin/views/custom_admin_views/view.html.php @@ -193,13 +193,16 @@ class ComponentbuilderViewCustom_admin_views extends JViewLegacy // Set Main Get Name Selection $this->main_getNameOptions = JFormHelper::loadFieldType('Maingets')->options; - if ($this->main_getNameOptions) + // We do some sanitation for filter + if (ComponentbuilderHelper::checkArray($this->main_getNameOptions) && + isset($this->main_getNameOptions[0]->value) && + !ComponentbuilderHelper::checkString($this->main_getNameOptions[0]->value)) + { + unset($this->main_getNameOptions[0]); + } + // Only load filter if it has values + if (ComponentbuilderHelper::checkArray($this->main_getNameOptions)) { - // We do some sanitation for filter - if (isset($this->main_getNameOptions[0]) && !ComponentbuilderHelper::checkString($this->main_getNameOptions[0]->value)) - { - unset($this->main_getNameOptions[0]); - } // Main Get Name Filter JHtmlSidebar::addFilter( '- Select '.JText::_('COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MAIN_GET_LABEL').' -', @@ -220,13 +223,16 @@ class ComponentbuilderViewCustom_admin_views extends JViewLegacy // Set Add Php Ajax Selection $this->add_php_ajaxOptions = $this->getTheAdd_php_ajaxSelections(); - if ($this->add_php_ajaxOptions) + // We do some sanitation for Add Php Ajax filter + if (ComponentbuilderHelper::checkArray($this->add_php_ajaxOptions) && + isset($this->add_php_ajaxOptions[0]->value) && + !ComponentbuilderHelper::checkString($this->add_php_ajaxOptions[0]->value)) + { + unset($this->add_php_ajaxOptions[0]); + } + // Only load Add Php Ajax filter if it has values + if (ComponentbuilderHelper::checkArray($this->add_php_ajaxOptions)) { - // We do some sanitation for Add Php Ajax filter - if (isset($this->add_php_ajaxOptions[0]) && !ComponentbuilderHelper::checkString($this->add_php_ajaxOptions[0]->value)) - { - unset($this->add_php_ajaxOptions[0]); - } // Add Php Ajax Filter JHtmlSidebar::addFilter( '- Select '.JText::_('COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_AJAX_LABEL').' -', @@ -247,13 +253,16 @@ class ComponentbuilderViewCustom_admin_views extends JViewLegacy // Set Add Custom Button Selection $this->add_custom_buttonOptions = $this->getTheAdd_custom_buttonSelections(); - if ($this->add_custom_buttonOptions) + // We do some sanitation for Add Custom Button filter + if (ComponentbuilderHelper::checkArray($this->add_custom_buttonOptions) && + isset($this->add_custom_buttonOptions[0]->value) && + !ComponentbuilderHelper::checkString($this->add_custom_buttonOptions[0]->value)) + { + unset($this->add_custom_buttonOptions[0]); + } + // Only load Add Custom Button filter if it has values + if (ComponentbuilderHelper::checkArray($this->add_custom_buttonOptions)) { - // We do some sanitation for Add Custom Button filter - if (isset($this->add_custom_buttonOptions[0]) && !ComponentbuilderHelper::checkString($this->add_custom_buttonOptions[0]->value)) - { - unset($this->add_custom_buttonOptions[0]); - } // Add Custom Button Filter JHtmlSidebar::addFilter( '- Select '.JText::_('COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_CUSTOM_BUTTON_LABEL').' -', diff --git a/admin/views/custom_codes/view.html.php b/admin/views/custom_codes/view.html.php index 729900b2e..08224edcc 100644 --- a/admin/views/custom_codes/view.html.php +++ b/admin/views/custom_codes/view.html.php @@ -193,13 +193,16 @@ class ComponentbuilderViewCustom_codes extends JViewLegacy // Set Component System Name Selection $this->componentSystem_nameOptions = JFormHelper::loadFieldType('Component')->options; - if ($this->componentSystem_nameOptions) + // We do some sanitation for filter + if (ComponentbuilderHelper::checkArray($this->componentSystem_nameOptions) && + isset($this->componentSystem_nameOptions[0]->value) && + !ComponentbuilderHelper::checkString($this->componentSystem_nameOptions[0]->value)) + { + unset($this->componentSystem_nameOptions[0]); + } + // Only load filter if it has values + if (ComponentbuilderHelper::checkArray($this->componentSystem_nameOptions)) { - // We do some sanitation for filter - if (isset($this->componentSystem_nameOptions[0]) && !ComponentbuilderHelper::checkString($this->componentSystem_nameOptions[0]->value)) - { - unset($this->componentSystem_nameOptions[0]); - } // Component System Name Filter JHtmlSidebar::addFilter( '- Select '.JText::_('COM_COMPONENTBUILDER_CUSTOM_CODE_COMPONENT_LABEL').' -', @@ -220,13 +223,16 @@ class ComponentbuilderViewCustom_codes extends JViewLegacy // Set Target Selection $this->targetOptions = $this->getTheTargetSelections(); - if ($this->targetOptions) + // We do some sanitation for Target filter + if (ComponentbuilderHelper::checkArray($this->targetOptions) && + isset($this->targetOptions[0]->value) && + !ComponentbuilderHelper::checkString($this->targetOptions[0]->value)) + { + unset($this->targetOptions[0]); + } + // Only load Target filter if it has values + if (ComponentbuilderHelper::checkArray($this->targetOptions)) { - // We do some sanitation for Target filter - if (isset($this->targetOptions[0]) && !ComponentbuilderHelper::checkString($this->targetOptions[0]->value)) - { - unset($this->targetOptions[0]); - } // Target Filter JHtmlSidebar::addFilter( '- Select '.JText::_('COM_COMPONENTBUILDER_CUSTOM_CODE_TARGET_LABEL').' -', @@ -247,13 +253,16 @@ class ComponentbuilderViewCustom_codes 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_CUSTOM_CODE_TYPE_LABEL').' -', @@ -274,13 +283,16 @@ class ComponentbuilderViewCustom_codes extends JViewLegacy // Set Comment Type Selection $this->comment_typeOptions = $this->getTheComment_typeSelections(); - if ($this->comment_typeOptions) + // We do some sanitation for Comment Type filter + if (ComponentbuilderHelper::checkArray($this->comment_typeOptions) && + isset($this->comment_typeOptions[0]->value) && + !ComponentbuilderHelper::checkString($this->comment_typeOptions[0]->value)) + { + unset($this->comment_typeOptions[0]); + } + // Only load Comment Type filter if it has values + if (ComponentbuilderHelper::checkArray($this->comment_typeOptions)) { - // We do some sanitation for Comment Type filter - if (isset($this->comment_typeOptions[0]) && !ComponentbuilderHelper::checkString($this->comment_typeOptions[0]->value)) - { - unset($this->comment_typeOptions[0]); - } // Comment Type Filter JHtmlSidebar::addFilter( '- Select '.JText::_('COM_COMPONENTBUILDER_CUSTOM_CODE_COMMENT_TYPE_LABEL').' -', diff --git a/admin/views/dynamic_gets/view.html.php b/admin/views/dynamic_gets/view.html.php index 1ab2ae334..6c1161c57 100644 --- a/admin/views/dynamic_gets/view.html.php +++ b/admin/views/dynamic_gets/view.html.php @@ -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').' -', diff --git a/admin/views/fields/view.html.php b/admin/views/fields/view.html.php index 596391e67..95dae2132 100644 --- a/admin/views/fields/view.html.php +++ b/admin/views/fields/view.html.php @@ -210,13 +210,16 @@ class ComponentbuilderViewFields extends JViewLegacy // Set Fieldtype Name Selection $this->fieldtypeNameOptions = JFormHelper::loadFieldType('Fieldtypes')->options; - if ($this->fieldtypeNameOptions) + // We do some sanitation for filter + if (ComponentbuilderHelper::checkArray($this->fieldtypeNameOptions) && + isset($this->fieldtypeNameOptions[0]->value) && + !ComponentbuilderHelper::checkString($this->fieldtypeNameOptions[0]->value)) + { + unset($this->fieldtypeNameOptions[0]); + } + // Only load filter if it has values + if (ComponentbuilderHelper::checkArray($this->fieldtypeNameOptions)) { - // We do some sanitation for filter - if (isset($this->fieldtypeNameOptions[0]) && !ComponentbuilderHelper::checkString($this->fieldtypeNameOptions[0]->value)) - { - unset($this->fieldtypeNameOptions[0]); - } // Fieldtype Name Filter JHtmlSidebar::addFilter( '- Select '.JText::_('COM_COMPONENTBUILDER_FIELD_FIELDTYPE_LABEL').' -', @@ -237,13 +240,16 @@ class ComponentbuilderViewFields extends JViewLegacy // Set Datatype Selection $this->datatypeOptions = $this->getTheDatatypeSelections(); - if ($this->datatypeOptions) + // We do some sanitation for Datatype filter + if (ComponentbuilderHelper::checkArray($this->datatypeOptions) && + isset($this->datatypeOptions[0]->value) && + !ComponentbuilderHelper::checkString($this->datatypeOptions[0]->value)) + { + unset($this->datatypeOptions[0]); + } + // Only load Datatype filter if it has values + if (ComponentbuilderHelper::checkArray($this->datatypeOptions)) { - // We do some sanitation for Datatype filter - if (isset($this->datatypeOptions[0]) && !ComponentbuilderHelper::checkString($this->datatypeOptions[0]->value)) - { - unset($this->datatypeOptions[0]); - } // Datatype Filter JHtmlSidebar::addFilter( '- Select '.JText::_('COM_COMPONENTBUILDER_FIELD_DATATYPE_LABEL').' -', @@ -264,13 +270,16 @@ class ComponentbuilderViewFields extends JViewLegacy // Set Indexes Selection $this->indexesOptions = $this->getTheIndexesSelections(); - if ($this->indexesOptions) + // We do some sanitation for Indexes filter + if (ComponentbuilderHelper::checkArray($this->indexesOptions) && + isset($this->indexesOptions[0]->value) && + !ComponentbuilderHelper::checkString($this->indexesOptions[0]->value)) + { + unset($this->indexesOptions[0]); + } + // Only load Indexes filter if it has values + if (ComponentbuilderHelper::checkArray($this->indexesOptions)) { - // We do some sanitation for Indexes filter - if (isset($this->indexesOptions[0]) && !ComponentbuilderHelper::checkString($this->indexesOptions[0]->value)) - { - unset($this->indexesOptions[0]); - } // Indexes Filter JHtmlSidebar::addFilter( '- Select '.JText::_('COM_COMPONENTBUILDER_FIELD_INDEXES_LABEL').' -', @@ -291,13 +300,16 @@ class ComponentbuilderViewFields extends JViewLegacy // Set Null Switch Selection $this->null_switchOptions = $this->getTheNull_switchSelections(); - if ($this->null_switchOptions) + // We do some sanitation for Null Switch filter + if (ComponentbuilderHelper::checkArray($this->null_switchOptions) && + isset($this->null_switchOptions[0]->value) && + !ComponentbuilderHelper::checkString($this->null_switchOptions[0]->value)) + { + unset($this->null_switchOptions[0]); + } + // Only load Null Switch filter if it has values + if (ComponentbuilderHelper::checkArray($this->null_switchOptions)) { - // We do some sanitation for Null Switch filter - if (isset($this->null_switchOptions[0]) && !ComponentbuilderHelper::checkString($this->null_switchOptions[0]->value)) - { - unset($this->null_switchOptions[0]); - } // Null Switch Filter JHtmlSidebar::addFilter( '- Select '.JText::_('COM_COMPONENTBUILDER_FIELD_NULL_SWITCH_LABEL').' -', @@ -318,13 +330,16 @@ class ComponentbuilderViewFields extends JViewLegacy // Set Store Selection $this->storeOptions = $this->getTheStoreSelections(); - if ($this->storeOptions) + // We do some sanitation for Store filter + if (ComponentbuilderHelper::checkArray($this->storeOptions) && + isset($this->storeOptions[0]->value) && + !ComponentbuilderHelper::checkString($this->storeOptions[0]->value)) + { + unset($this->storeOptions[0]); + } + // Only load Store filter if it has values + if (ComponentbuilderHelper::checkArray($this->storeOptions)) { - // We do some sanitation for Store filter - if (isset($this->storeOptions[0]) && !ComponentbuilderHelper::checkString($this->storeOptions[0]->value)) - { - unset($this->storeOptions[0]); - } // Store Filter JHtmlSidebar::addFilter( '- Select '.JText::_('COM_COMPONENTBUILDER_FIELD_STORE_LABEL').' -', diff --git a/admin/views/help_documents/view.html.php b/admin/views/help_documents/view.html.php index 5f93a83e5..e6c9ffc39 100644 --- a/admin/views/help_documents/view.html.php +++ b/admin/views/help_documents/view.html.php @@ -188,13 +188,16 @@ class ComponentbuilderViewHelp_documents 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_HELP_DOCUMENT_TYPE_LABEL').' -', @@ -215,13 +218,16 @@ class ComponentbuilderViewHelp_documents extends JViewLegacy // Set Location Selection $this->locationOptions = $this->getTheLocationSelections(); - if ($this->locationOptions) + // We do some sanitation for Location filter + if (ComponentbuilderHelper::checkArray($this->locationOptions) && + isset($this->locationOptions[0]->value) && + !ComponentbuilderHelper::checkString($this->locationOptions[0]->value)) + { + unset($this->locationOptions[0]); + } + // Only load Location filter if it has values + if (ComponentbuilderHelper::checkArray($this->locationOptions)) { - // We do some sanitation for Location filter - if (isset($this->locationOptions[0]) && !ComponentbuilderHelper::checkString($this->locationOptions[0]->value)) - { - unset($this->locationOptions[0]); - } // Location Filter JHtmlSidebar::addFilter( '- Select '.JText::_('COM_COMPONENTBUILDER_HELP_DOCUMENT_LOCATION_LABEL').' -', @@ -242,13 +248,16 @@ class ComponentbuilderViewHelp_documents extends JViewLegacy // Set Admin View Selection $this->admin_viewOptions = JFormHelper::loadFieldType('Adminviewfolderlist')->options; - if ($this->admin_viewOptions) + // We do some sanitation for Location filter + if (ComponentbuilderHelper::checkArray($this->admin_viewOptions) && + isset($this->admin_viewOptions[0]->value) && + !ComponentbuilderHelper::checkString($this->admin_viewOptions[0]->value)) + { + unset($this->admin_viewOptions[0]); + } + // Only load Location filter if it has values + if (ComponentbuilderHelper::checkArray($this->admin_viewOptions)) { - // We do some sanitation for Location filter - if (isset($this->admin_viewOptions[0]) && !ComponentbuilderHelper::checkString($this->admin_viewOptions[0]->value)) - { - unset($this->admin_viewOptions[0]); - } // Admin View Filter JHtmlSidebar::addFilter( '- Select '.JText::_('COM_COMPONENTBUILDER_HELP_DOCUMENT_ADMIN_VIEW_LABEL').' -', @@ -269,13 +278,16 @@ class ComponentbuilderViewHelp_documents extends JViewLegacy // Set Site View Selection $this->site_viewOptions = JFormHelper::loadFieldType('Siteviewfolderlist')->options; - if ($this->site_viewOptions) + // We do some sanitation for Location filter + if (ComponentbuilderHelper::checkArray($this->site_viewOptions) && + isset($this->site_viewOptions[0]->value) && + !ComponentbuilderHelper::checkString($this->site_viewOptions[0]->value)) + { + unset($this->site_viewOptions[0]); + } + // Only load Location filter if it has values + if (ComponentbuilderHelper::checkArray($this->site_viewOptions)) { - // We do some sanitation for Location filter - if (isset($this->site_viewOptions[0]) && !ComponentbuilderHelper::checkString($this->site_viewOptions[0]->value)) - { - unset($this->site_viewOptions[0]); - } // Site View Filter JHtmlSidebar::addFilter( '- Select '.JText::_('COM_COMPONENTBUILDER_HELP_DOCUMENT_SITE_VIEW_LABEL').' -', diff --git a/admin/views/joomla_components/view.html.php b/admin/views/joomla_components/view.html.php index f417b0619..f2566e150 100644 --- a/admin/views/joomla_components/view.html.php +++ b/admin/views/joomla_components/view.html.php @@ -218,13 +218,16 @@ class ComponentbuilderViewJoomla_components extends JViewLegacy // Set Companyname Selection $this->companynameOptions = $this->getTheCompanynameSelections(); - if ($this->companynameOptions) + // We do some sanitation for Companyname filter + if (ComponentbuilderHelper::checkArray($this->companynameOptions) && + isset($this->companynameOptions[0]->value) && + !ComponentbuilderHelper::checkString($this->companynameOptions[0]->value)) + { + unset($this->companynameOptions[0]); + } + // Only load Companyname filter if it has values + if (ComponentbuilderHelper::checkArray($this->companynameOptions)) { - // We do some sanitation for Companyname filter - if (isset($this->companynameOptions[0]) && !ComponentbuilderHelper::checkString($this->companynameOptions[0]->value)) - { - unset($this->companynameOptions[0]); - } // Companyname Filter JHtmlSidebar::addFilter( '- Select '.JText::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENT_COMPANYNAME_LABEL').' -', @@ -245,13 +248,16 @@ class ComponentbuilderViewJoomla_components extends JViewLegacy // Set Author Selection $this->authorOptions = $this->getTheAuthorSelections(); - if ($this->authorOptions) + // We do some sanitation for Author filter + if (ComponentbuilderHelper::checkArray($this->authorOptions) && + isset($this->authorOptions[0]->value) && + !ComponentbuilderHelper::checkString($this->authorOptions[0]->value)) + { + unset($this->authorOptions[0]); + } + // Only load Author filter if it has values + if (ComponentbuilderHelper::checkArray($this->authorOptions)) { - // We do some sanitation for Author filter - if (isset($this->authorOptions[0]) && !ComponentbuilderHelper::checkString($this->authorOptions[0]->value)) - { - unset($this->authorOptions[0]); - } // Author Filter JHtmlSidebar::addFilter( '- Select '.JText::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENT_AUTHOR_LABEL').' -', diff --git a/admin/views/layouts/view.html.php b/admin/views/layouts/view.html.php index b15874800..5073b0f94 100644 --- a/admin/views/layouts/view.html.php +++ b/admin/views/layouts/view.html.php @@ -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').' -', diff --git a/admin/views/libraries/view.html.php b/admin/views/libraries/view.html.php index 9a4d5fd39..750b54488 100644 --- a/admin/views/libraries/view.html.php +++ b/admin/views/libraries/view.html.php @@ -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').' -', diff --git a/admin/views/servers/view.html.php b/admin/views/servers/view.html.php index 005fa8a8c..3f9b21d42 100644 --- a/admin/views/servers/view.html.php +++ b/admin/views/servers/view.html.php @@ -188,13 +188,16 @@ class ComponentbuilderViewServers extends JViewLegacy // Set Name Selection $this->nameOptions = $this->getTheNameSelections(); - if ($this->nameOptions) + // We do some sanitation for Name filter + if (ComponentbuilderHelper::checkArray($this->nameOptions) && + isset($this->nameOptions[0]->value) && + !ComponentbuilderHelper::checkString($this->nameOptions[0]->value)) + { + unset($this->nameOptions[0]); + } + // Only load Name filter if it has values + if (ComponentbuilderHelper::checkArray($this->nameOptions)) { - // We do some sanitation for Name filter - if (isset($this->nameOptions[0]) && !ComponentbuilderHelper::checkString($this->nameOptions[0]->value)) - { - unset($this->nameOptions[0]); - } // Name Filter JHtmlSidebar::addFilter( '- Select '.JText::_('COM_COMPONENTBUILDER_SERVER_NAME_LABEL').' -', @@ -215,13 +218,16 @@ class ComponentbuilderViewServers extends JViewLegacy // Set Protocol Selection $this->protocolOptions = $this->getTheProtocolSelections(); - if ($this->protocolOptions) + // We do some sanitation for Protocol filter + if (ComponentbuilderHelper::checkArray($this->protocolOptions) && + isset($this->protocolOptions[0]->value) && + !ComponentbuilderHelper::checkString($this->protocolOptions[0]->value)) + { + unset($this->protocolOptions[0]); + } + // Only load Protocol filter if it has values + if (ComponentbuilderHelper::checkArray($this->protocolOptions)) { - // We do some sanitation for Protocol filter - if (isset($this->protocolOptions[0]) && !ComponentbuilderHelper::checkString($this->protocolOptions[0]->value)) - { - unset($this->protocolOptions[0]); - } // Protocol Filter JHtmlSidebar::addFilter( '- Select '.JText::_('COM_COMPONENTBUILDER_SERVER_PROTOCOL_LABEL').' -', diff --git a/admin/views/site_views/view.html.php b/admin/views/site_views/view.html.php index f71087da6..ed2558801 100644 --- a/admin/views/site_views/view.html.php +++ b/admin/views/site_views/view.html.php @@ -193,13 +193,16 @@ class ComponentbuilderViewSite_views extends JViewLegacy // Set Main Get Name Selection $this->main_getNameOptions = JFormHelper::loadFieldType('Maingets')->options; - if ($this->main_getNameOptions) + // We do some sanitation for filter + if (ComponentbuilderHelper::checkArray($this->main_getNameOptions) && + isset($this->main_getNameOptions[0]->value) && + !ComponentbuilderHelper::checkString($this->main_getNameOptions[0]->value)) + { + unset($this->main_getNameOptions[0]); + } + // Only load filter if it has values + if (ComponentbuilderHelper::checkArray($this->main_getNameOptions)) { - // We do some sanitation for filter - if (isset($this->main_getNameOptions[0]) && !ComponentbuilderHelper::checkString($this->main_getNameOptions[0]->value)) - { - unset($this->main_getNameOptions[0]); - } // Main Get Name Filter JHtmlSidebar::addFilter( '- Select '.JText::_('COM_COMPONENTBUILDER_SITE_VIEW_MAIN_GET_LABEL').' -', @@ -220,13 +223,16 @@ class ComponentbuilderViewSite_views extends JViewLegacy // Set Add Php Ajax Selection $this->add_php_ajaxOptions = $this->getTheAdd_php_ajaxSelections(); - if ($this->add_php_ajaxOptions) + // We do some sanitation for Add Php Ajax filter + if (ComponentbuilderHelper::checkArray($this->add_php_ajaxOptions) && + isset($this->add_php_ajaxOptions[0]->value) && + !ComponentbuilderHelper::checkString($this->add_php_ajaxOptions[0]->value)) + { + unset($this->add_php_ajaxOptions[0]); + } + // Only load Add Php Ajax filter if it has values + if (ComponentbuilderHelper::checkArray($this->add_php_ajaxOptions)) { - // We do some sanitation for Add Php Ajax filter - if (isset($this->add_php_ajaxOptions[0]) && !ComponentbuilderHelper::checkString($this->add_php_ajaxOptions[0]->value)) - { - unset($this->add_php_ajaxOptions[0]); - } // Add Php Ajax Filter JHtmlSidebar::addFilter( '- Select '.JText::_('COM_COMPONENTBUILDER_SITE_VIEW_ADD_PHP_AJAX_LABEL').' -', @@ -247,13 +253,16 @@ class ComponentbuilderViewSite_views extends JViewLegacy // Set Add Custom Button Selection $this->add_custom_buttonOptions = $this->getTheAdd_custom_buttonSelections(); - if ($this->add_custom_buttonOptions) + // We do some sanitation for Add Custom Button filter + if (ComponentbuilderHelper::checkArray($this->add_custom_buttonOptions) && + isset($this->add_custom_buttonOptions[0]->value) && + !ComponentbuilderHelper::checkString($this->add_custom_buttonOptions[0]->value)) + { + unset($this->add_custom_buttonOptions[0]); + } + // Only load Add Custom Button filter if it has values + if (ComponentbuilderHelper::checkArray($this->add_custom_buttonOptions)) { - // We do some sanitation for Add Custom Button filter - if (isset($this->add_custom_buttonOptions[0]) && !ComponentbuilderHelper::checkString($this->add_custom_buttonOptions[0]->value)) - { - unset($this->add_custom_buttonOptions[0]); - } // Add Custom Button Filter JHtmlSidebar::addFilter( '- Select '.JText::_('COM_COMPONENTBUILDER_SITE_VIEW_ADD_CUSTOM_BUTTON_LABEL').' -', diff --git a/admin/views/snippets/view.html.php b/admin/views/snippets/view.html.php index a85326ec8..ac86ec282 100644 --- a/admin/views/snippets/view.html.php +++ b/admin/views/snippets/view.html.php @@ -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').' -', diff --git a/admin/views/templates/view.html.php b/admin/views/templates/view.html.php index 09651d2d3..482e94779 100644 --- a/admin/views/templates/view.html.php +++ b/admin/views/templates/view.html.php @@ -193,13 +193,16 @@ class ComponentbuilderViewTemplates 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_TEMPLATE_DYNAMIC_GET_LABEL').' -', @@ -220,13 +223,16 @@ class ComponentbuilderViewTemplates 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_TEMPLATE_ADD_PHP_VIEW_LABEL').' -',