joomla/Component-Builder
joomla/Component-Builder
39
23
Fork 11
Code Issues 81 Pull Requests Projects 4 Wiki Activity

Added Events to Compiler, the beginning of an API. #435

Merged
Llewellyn merged 26 commits from staging into master 2019-07-06 22:38:13 +00:00
Conversation 0 Commits 26 Files Changed 425 +362 -242
16 changed files with 362 additions and 242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4a878e32ef - Show all commits

2
README.md
View File

@ -150,7 +150,7 @@ TODO
+ *Version*: 2.9.18 + *Version*: 2.9.18
+ *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved. + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
+ *License*: GNU General Public License version 2 or later; see LICENSE.txt + *License*: GNU General Public License version 2 or later; see LICENSE.txt
+ *Line count*: **206555** + *Line count*: **206669**
+ *Field count*: **1136** + *Field count*: **1136**
+ *File count*: **1344** + *File count*: **1344**
+ *Folder count*: **209** + *Folder count*: **209**

2
admin/README.txt
View File

@ -150,7 +150,7 @@ TODO
+ *Version*: 2.9.18 + *Version*: 2.9.18
+ *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved. + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
+ *License*: GNU General Public License version 2 or later; see LICENSE.txt + *License*: GNU General Public License version 2 or later; see LICENSE.txt
+ *Line count*: **206555** + *Line count*: **206669**
+ *Field count*: **1136** + *Field count*: **1136**
+ *File count*: **1344** + *File count*: **1344**
+ *Folder count*: **209** + *Folder count*: **209**

30
admin/helpers/compiler/e_Interpretation.php
View File

@ -10866,13 +10866,16 @@ class Interpretation extends Fields
$type = ComponentbuilderHelper::safeString($filter['custom']['type'], 'F'); $type = ComponentbuilderHelper::safeString($filter['custom']['type'], 'F');
$otherFilter[] = PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Set " . $CodeName . " Selection"; $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) . "\$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(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) . "//" . $this->setLine(__LINE__) . " " . $CodeName . " Filter";
$otherFilter[] = $this->_t(3) . "JHtmlSidebar::addFilter("; $otherFilter[] = $this->_t(3) . "JHtmlSidebar::addFilter(";
$otherFilter[] = $this->_t(4) . "'- Select '.JText:" . ":_('" . $filter['lang'] . "').' -',"; $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[] = PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Set " . $Codename . " Selection";
$otherFilter[] = $this->_t(2) . "\$this->" . $filter['code'] . "Options = " . $functionName; $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(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) . "//" . $this->setLine(__LINE__) . " " . $Codename . " Filter";
$otherFilter[] = $this->_t(3) . "JHtmlSidebar::addFilter("; $otherFilter[] = $this->_t(3) . "JHtmlSidebar::addFilter(";
$otherFilter[] = $this->_t(4) . "'- Select '.JText:" . ":_('" . $filter['lang'] . "').' -',"; $otherFilter[] = $this->_t(4) . "'- Select '.JText:" . ":_('" . $filter['lang'] . "').' -',";

45
admin/views/admin_views/view.html.php
View File

@ -193,13 +193,16 @@ class ComponentbuilderViewAdmin_views extends JViewLegacy
// Set Add Fadein Selection // Set Add Fadein Selection
$this->add_fadeinOptions = $this->getTheAdd_fadeinSelections(); $this->add_fadeinOptions = $this->getTheAdd_fadeinSelections();
if ($this->add_fadeinOptions)
{
// We do some sanitation for Add Fadein filter // We do some sanitation for Add Fadein filter
if (isset($this->add_fadeinOptions[0]) && !ComponentbuilderHelper::checkString($this->add_fadeinOptions[0]->value)) if (ComponentbuilderHelper::checkArray($this->add_fadeinOptions) &&
isset($this->add_fadeinOptions[0]->value) &&
!ComponentbuilderHelper::checkString($this->add_fadeinOptions[0]->value))
{ {
unset($this->add_fadeinOptions[0]); unset($this->add_fadeinOptions[0]);
} }
// Only load Add Fadein filter if it has values
if (ComponentbuilderHelper::checkArray($this->add_fadeinOptions))
{
// Add Fadein Filter // Add Fadein Filter
JHtmlSidebar::addFilter( JHtmlSidebar::addFilter(
'- Select '.JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_FADEIN_LABEL').' -', '- Select '.JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_FADEIN_LABEL').' -',
@ -220,13 +223,16 @@ class ComponentbuilderViewAdmin_views extends JViewLegacy
// Set Type Selection // Set Type Selection
$this->typeOptions = $this->getTheTypeSelections(); $this->typeOptions = $this->getTheTypeSelections();
if ($this->typeOptions)
{
// We do some sanitation for Type filter // We do some sanitation for Type filter
if (isset($this->typeOptions[0]) && !ComponentbuilderHelper::checkString($this->typeOptions[0]->value)) if (ComponentbuilderHelper::checkArray($this->typeOptions) &&
isset($this->typeOptions[0]->value) &&
!ComponentbuilderHelper::checkString($this->typeOptions[0]->value))
{ {
unset($this->typeOptions[0]); unset($this->typeOptions[0]);
} }
// Only load Type filter if it has values
if (ComponentbuilderHelper::checkArray($this->typeOptions))
{
// Type Filter // Type Filter
JHtmlSidebar::addFilter( JHtmlSidebar::addFilter(
'- Select '.JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_TYPE_LABEL').' -', '- Select '.JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_TYPE_LABEL').' -',
@ -247,13 +253,16 @@ class ComponentbuilderViewAdmin_views extends JViewLegacy
// Set Add Custom Import Selection // Set Add Custom Import Selection
$this->add_custom_importOptions = $this->getTheAdd_custom_importSelections(); $this->add_custom_importOptions = $this->getTheAdd_custom_importSelections();
if ($this->add_custom_importOptions)
{
// We do some sanitation for Add Custom Import filter // We do some sanitation for Add Custom Import filter
if (isset($this->add_custom_importOptions[0]) && !ComponentbuilderHelper::checkString($this->add_custom_importOptions[0]->value)) 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]); unset($this->add_custom_importOptions[0]);
} }
// Only load Add Custom Import filter if it has values
if (ComponentbuilderHelper::checkArray($this->add_custom_importOptions))
{
// Add Custom Import Filter // Add Custom Import Filter
JHtmlSidebar::addFilter( JHtmlSidebar::addFilter(
'- Select '.JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_IMPORT_LABEL').' -', '- Select '.JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_IMPORT_LABEL').' -',
@ -274,13 +283,16 @@ class ComponentbuilderViewAdmin_views extends JViewLegacy
// Set Add Custom Button Selection // Set Add Custom Button Selection
$this->add_custom_buttonOptions = $this->getTheAdd_custom_buttonSelections(); $this->add_custom_buttonOptions = $this->getTheAdd_custom_buttonSelections();
if ($this->add_custom_buttonOptions)
{
// We do some sanitation for Add Custom Button filter // We do some sanitation for Add Custom Button filter
if (isset($this->add_custom_buttonOptions[0]) && !ComponentbuilderHelper::checkString($this->add_custom_buttonOptions[0]->value)) 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]); unset($this->add_custom_buttonOptions[0]);
} }
// Only load Add Custom Button filter if it has values
if (ComponentbuilderHelper::checkArray($this->add_custom_buttonOptions))
{
// Add Custom Button Filter // Add Custom Button Filter
JHtmlSidebar::addFilter( JHtmlSidebar::addFilter(
'- Select '.JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_BUTTON_LABEL').' -', '- Select '.JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_BUTTON_LABEL').' -',
@ -301,13 +313,16 @@ class ComponentbuilderViewAdmin_views extends JViewLegacy
// Set Add Php Ajax Selection // Set Add Php Ajax Selection
$this->add_php_ajaxOptions = $this->getTheAdd_php_ajaxSelections(); $this->add_php_ajaxOptions = $this->getTheAdd_php_ajaxSelections();
if ($this->add_php_ajaxOptions)
{
// We do some sanitation for Add Php Ajax filter // We do some sanitation for Add Php Ajax filter
if (isset($this->add_php_ajaxOptions[0]) && !ComponentbuilderHelper::checkString($this->add_php_ajaxOptions[0]->value)) 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]); unset($this->add_php_ajaxOptions[0]);
} }
// Only load Add Php Ajax filter if it has values
if (ComponentbuilderHelper::checkArray($this->add_php_ajaxOptions))
{
// Add Php Ajax Filter // Add Php Ajax Filter
JHtmlSidebar::addFilter( JHtmlSidebar::addFilter(
'- Select '.JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AJAX_LABEL').' -', '- Select '.JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AJAX_LABEL').' -',

27
admin/views/custom_admin_views/view.html.php
View File

@ -193,13 +193,16 @@ class ComponentbuilderViewCustom_admin_views extends JViewLegacy
// Set Main Get Name Selection // Set Main Get Name Selection
$this->main_getNameOptions = JFormHelper::loadFieldType('Maingets')->options; $this->main_getNameOptions = JFormHelper::loadFieldType('Maingets')->options;
if ($this->main_getNameOptions)
{
// We do some sanitation for filter // We do some sanitation for filter
if (isset($this->main_getNameOptions[0]) && !ComponentbuilderHelper::checkString($this->main_getNameOptions[0]->value)) if (ComponentbuilderHelper::checkArray($this->main_getNameOptions) &&
isset($this->main_getNameOptions[0]->value) &&
!ComponentbuilderHelper::checkString($this->main_getNameOptions[0]->value))
{ {
unset($this->main_getNameOptions[0]); unset($this->main_getNameOptions[0]);
} }
// Only load filter if it has values
if (ComponentbuilderHelper::checkArray($this->main_getNameOptions))
{
// Main Get Name Filter // Main Get Name Filter
JHtmlSidebar::addFilter( JHtmlSidebar::addFilter(
'- Select '.JText::_('COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MAIN_GET_LABEL').' -', '- 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 // Set Add Php Ajax Selection
$this->add_php_ajaxOptions = $this->getTheAdd_php_ajaxSelections(); $this->add_php_ajaxOptions = $this->getTheAdd_php_ajaxSelections();
if ($this->add_php_ajaxOptions)
{
// We do some sanitation for Add Php Ajax filter // We do some sanitation for Add Php Ajax filter
if (isset($this->add_php_ajaxOptions[0]) && !ComponentbuilderHelper::checkString($this->add_php_ajaxOptions[0]->value)) 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]); unset($this->add_php_ajaxOptions[0]);
} }
// Only load Add Php Ajax filter if it has values
if (ComponentbuilderHelper::checkArray($this->add_php_ajaxOptions))
{
// Add Php Ajax Filter // Add Php Ajax Filter
JHtmlSidebar::addFilter( JHtmlSidebar::addFilter(
'- Select '.JText::_('COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_AJAX_LABEL').' -', '- 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 // Set Add Custom Button Selection
$this->add_custom_buttonOptions = $this->getTheAdd_custom_buttonSelections(); $this->add_custom_buttonOptions = $this->getTheAdd_custom_buttonSelections();
if ($this->add_custom_buttonOptions)
{
// We do some sanitation for Add Custom Button filter // We do some sanitation for Add Custom Button filter
if (isset($this->add_custom_buttonOptions[0]) && !ComponentbuilderHelper::checkString($this->add_custom_buttonOptions[0]->value)) 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]); unset($this->add_custom_buttonOptions[0]);
} }
// Only load Add Custom Button filter if it has values
if (ComponentbuilderHelper::checkArray($this->add_custom_buttonOptions))
{
// Add Custom Button Filter // Add Custom Button Filter
JHtmlSidebar::addFilter( JHtmlSidebar::addFilter(
'- Select '.JText::_('COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_CUSTOM_BUTTON_LABEL').' -', '- Select '.JText::_('COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_CUSTOM_BUTTON_LABEL').' -',

36
admin/views/custom_codes/view.html.php
View File

@ -193,13 +193,16 @@ class ComponentbuilderViewCustom_codes extends JViewLegacy
// Set Component System Name Selection // Set Component System Name Selection
$this->componentSystem_nameOptions = JFormHelper::loadFieldType('Component')->options; $this->componentSystem_nameOptions = JFormHelper::loadFieldType('Component')->options;
if ($this->componentSystem_nameOptions)
{
// We do some sanitation for filter // We do some sanitation for filter
if (isset($this->componentSystem_nameOptions[0]) && !ComponentbuilderHelper::checkString($this->componentSystem_nameOptions[0]->value)) if (ComponentbuilderHelper::checkArray($this->componentSystem_nameOptions) &&
isset($this->componentSystem_nameOptions[0]->value) &&
!ComponentbuilderHelper::checkString($this->componentSystem_nameOptions[0]->value))
{ {
unset($this->componentSystem_nameOptions[0]); unset($this->componentSystem_nameOptions[0]);
} }
// Only load filter if it has values
if (ComponentbuilderHelper::checkArray($this->componentSystem_nameOptions))
{
// Component System Name Filter // Component System Name Filter
JHtmlSidebar::addFilter( JHtmlSidebar::addFilter(
'- Select '.JText::_('COM_COMPONENTBUILDER_CUSTOM_CODE_COMPONENT_LABEL').' -', '- Select '.JText::_('COM_COMPONENTBUILDER_CUSTOM_CODE_COMPONENT_LABEL').' -',
@ -220,13 +223,16 @@ class ComponentbuilderViewCustom_codes extends JViewLegacy
// Set Target Selection // Set Target Selection
$this->targetOptions = $this->getTheTargetSelections(); $this->targetOptions = $this->getTheTargetSelections();
if ($this->targetOptions)
{
// We do some sanitation for Target filter // We do some sanitation for Target filter
if (isset($this->targetOptions[0]) && !ComponentbuilderHelper::checkString($this->targetOptions[0]->value)) if (ComponentbuilderHelper::checkArray($this->targetOptions) &&
isset($this->targetOptions[0]->value) &&
!ComponentbuilderHelper::checkString($this->targetOptions[0]->value))
{ {
unset($this->targetOptions[0]); unset($this->targetOptions[0]);
} }
// Only load Target filter if it has values
if (ComponentbuilderHelper::checkArray($this->targetOptions))
{
// Target Filter // Target Filter
JHtmlSidebar::addFilter( JHtmlSidebar::addFilter(
'- Select '.JText::_('COM_COMPONENTBUILDER_CUSTOM_CODE_TARGET_LABEL').' -', '- Select '.JText::_('COM_COMPONENTBUILDER_CUSTOM_CODE_TARGET_LABEL').' -',
@ -247,13 +253,16 @@ class ComponentbuilderViewCustom_codes extends JViewLegacy
// Set Type Selection // Set Type Selection
$this->typeOptions = $this->getTheTypeSelections(); $this->typeOptions = $this->getTheTypeSelections();
if ($this->typeOptions)
{
// We do some sanitation for Type filter // We do some sanitation for Type filter
if (isset($this->typeOptions[0]) && !ComponentbuilderHelper::checkString($this->typeOptions[0]->value)) if (ComponentbuilderHelper::checkArray($this->typeOptions) &&
isset($this->typeOptions[0]->value) &&
!ComponentbuilderHelper::checkString($this->typeOptions[0]->value))
{ {
unset($this->typeOptions[0]); unset($this->typeOptions[0]);
} }
// Only load Type filter if it has values
if (ComponentbuilderHelper::checkArray($this->typeOptions))
{
// Type Filter // Type Filter
JHtmlSidebar::addFilter( JHtmlSidebar::addFilter(
'- Select '.JText::_('COM_COMPONENTBUILDER_CUSTOM_CODE_TYPE_LABEL').' -', '- Select '.JText::_('COM_COMPONENTBUILDER_CUSTOM_CODE_TYPE_LABEL').' -',
@ -274,13 +283,16 @@ class ComponentbuilderViewCustom_codes extends JViewLegacy
// Set Comment Type Selection // Set Comment Type Selection
$this->comment_typeOptions = $this->getTheComment_typeSelections(); $this->comment_typeOptions = $this->getTheComment_typeSelections();
if ($this->comment_typeOptions)
{
// We do some sanitation for Comment Type filter // We do some sanitation for Comment Type filter
if (isset($this->comment_typeOptions[0]) && !ComponentbuilderHelper::checkString($this->comment_typeOptions[0]->value)) if (ComponentbuilderHelper::checkArray($this->comment_typeOptions) &&
isset($this->comment_typeOptions[0]->value) &&
!ComponentbuilderHelper::checkString($this->comment_typeOptions[0]->value))
{ {
unset($this->comment_typeOptions[0]); unset($this->comment_typeOptions[0]);
} }
// Only load Comment Type filter if it has values
if (ComponentbuilderHelper::checkArray($this->comment_typeOptions))
{
// Comment Type Filter // Comment Type Filter
JHtmlSidebar::addFilter( JHtmlSidebar::addFilter(
'- Select '.JText::_('COM_COMPONENTBUILDER_CUSTOM_CODE_COMMENT_TYPE_LABEL').' -', '- Select '.JText::_('COM_COMPONENTBUILDER_CUSTOM_CODE_COMMENT_TYPE_LABEL').' -',

18
admin/views/dynamic_gets/view.html.php
View File

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

45
admin/views/fields/view.html.php
View File

@ -210,13 +210,16 @@ class ComponentbuilderViewFields extends JViewLegacy
// Set Fieldtype Name Selection // Set Fieldtype Name Selection
$this->fieldtypeNameOptions = JFormHelper::loadFieldType('Fieldtypes')->options; $this->fieldtypeNameOptions = JFormHelper::loadFieldType('Fieldtypes')->options;
if ($this->fieldtypeNameOptions)
{
// We do some sanitation for filter // We do some sanitation for filter
if (isset($this->fieldtypeNameOptions[0]) && !ComponentbuilderHelper::checkString($this->fieldtypeNameOptions[0]->value)) if (ComponentbuilderHelper::checkArray($this->fieldtypeNameOptions) &&
isset($this->fieldtypeNameOptions[0]->value) &&
!ComponentbuilderHelper::checkString($this->fieldtypeNameOptions[0]->value))
{ {
unset($this->fieldtypeNameOptions[0]); unset($this->fieldtypeNameOptions[0]);
} }
// Only load filter if it has values
if (ComponentbuilderHelper::checkArray($this->fieldtypeNameOptions))
{
// Fieldtype Name Filter // Fieldtype Name Filter
JHtmlSidebar::addFilter( JHtmlSidebar::addFilter(
'- Select '.JText::_('COM_COMPONENTBUILDER_FIELD_FIELDTYPE_LABEL').' -', '- Select '.JText::_('COM_COMPONENTBUILDER_FIELD_FIELDTYPE_LABEL').' -',
@ -237,13 +240,16 @@ class ComponentbuilderViewFields extends JViewLegacy
// Set Datatype Selection // Set Datatype Selection
$this->datatypeOptions = $this->getTheDatatypeSelections(); $this->datatypeOptions = $this->getTheDatatypeSelections();
if ($this->datatypeOptions)
{
// We do some sanitation for Datatype filter // We do some sanitation for Datatype filter
if (isset($this->datatypeOptions[0]) && !ComponentbuilderHelper::checkString($this->datatypeOptions[0]->value)) if (ComponentbuilderHelper::checkArray($this->datatypeOptions) &&
isset($this->datatypeOptions[0]->value) &&
!ComponentbuilderHelper::checkString($this->datatypeOptions[0]->value))
{ {
unset($this->datatypeOptions[0]); unset($this->datatypeOptions[0]);
} }
// Only load Datatype filter if it has values
if (ComponentbuilderHelper::checkArray($this->datatypeOptions))
{
// Datatype Filter // Datatype Filter
JHtmlSidebar::addFilter( JHtmlSidebar::addFilter(
'- Select '.JText::_('COM_COMPONENTBUILDER_FIELD_DATATYPE_LABEL').' -', '- Select '.JText::_('COM_COMPONENTBUILDER_FIELD_DATATYPE_LABEL').' -',
@ -264,13 +270,16 @@ class ComponentbuilderViewFields extends JViewLegacy
// Set Indexes Selection // Set Indexes Selection
$this->indexesOptions = $this->getTheIndexesSelections(); $this->indexesOptions = $this->getTheIndexesSelections();
if ($this->indexesOptions)
{
// We do some sanitation for Indexes filter // We do some sanitation for Indexes filter
if (isset($this->indexesOptions[0]) && !ComponentbuilderHelper::checkString($this->indexesOptions[0]->value)) if (ComponentbuilderHelper::checkArray($this->indexesOptions) &&
isset($this->indexesOptions[0]->value) &&
!ComponentbuilderHelper::checkString($this->indexesOptions[0]->value))
{ {
unset($this->indexesOptions[0]); unset($this->indexesOptions[0]);
} }
// Only load Indexes filter if it has values
if (ComponentbuilderHelper::checkArray($this->indexesOptions))
{
// Indexes Filter // Indexes Filter
JHtmlSidebar::addFilter( JHtmlSidebar::addFilter(
'- Select '.JText::_('COM_COMPONENTBUILDER_FIELD_INDEXES_LABEL').' -', '- Select '.JText::_('COM_COMPONENTBUILDER_FIELD_INDEXES_LABEL').' -',
@ -291,13 +300,16 @@ class ComponentbuilderViewFields extends JViewLegacy
// Set Null Switch Selection // Set Null Switch Selection
$this->null_switchOptions = $this->getTheNull_switchSelections(); $this->null_switchOptions = $this->getTheNull_switchSelections();
if ($this->null_switchOptions)
{
// We do some sanitation for Null Switch filter // We do some sanitation for Null Switch filter
if (isset($this->null_switchOptions[0]) && !ComponentbuilderHelper::checkString($this->null_switchOptions[0]->value)) if (ComponentbuilderHelper::checkArray($this->null_switchOptions) &&
isset($this->null_switchOptions[0]->value) &&
!ComponentbuilderHelper::checkString($this->null_switchOptions[0]->value))
{ {
unset($this->null_switchOptions[0]); unset($this->null_switchOptions[0]);
} }
// Only load Null Switch filter if it has values
if (ComponentbuilderHelper::checkArray($this->null_switchOptions))
{
// Null Switch Filter // Null Switch Filter
JHtmlSidebar::addFilter( JHtmlSidebar::addFilter(
'- Select '.JText::_('COM_COMPONENTBUILDER_FIELD_NULL_SWITCH_LABEL').' -', '- Select '.JText::_('COM_COMPONENTBUILDER_FIELD_NULL_SWITCH_LABEL').' -',
@ -318,13 +330,16 @@ class ComponentbuilderViewFields extends JViewLegacy
// Set Store Selection // Set Store Selection
$this->storeOptions = $this->getTheStoreSelections(); $this->storeOptions = $this->getTheStoreSelections();
if ($this->storeOptions)
{
// We do some sanitation for Store filter // We do some sanitation for Store filter
if (isset($this->storeOptions[0]) && !ComponentbuilderHelper::checkString($this->storeOptions[0]->value)) if (ComponentbuilderHelper::checkArray($this->storeOptions) &&
isset($this->storeOptions[0]->value) &&
!ComponentbuilderHelper::checkString($this->storeOptions[0]->value))
{ {
unset($this->storeOptions[0]); unset($this->storeOptions[0]);
} }
// Only load Store filter if it has values
if (ComponentbuilderHelper::checkArray($this->storeOptions))
{
// Store Filter // Store Filter
JHtmlSidebar::addFilter( JHtmlSidebar::addFilter(
'- Select '.JText::_('COM_COMPONENTBUILDER_FIELD_STORE_LABEL').' -', '- Select '.JText::_('COM_COMPONENTBUILDER_FIELD_STORE_LABEL').' -',

36
admin/views/help_documents/view.html.php
View File

@ -188,13 +188,16 @@ class ComponentbuilderViewHelp_documents extends JViewLegacy
// Set Type Selection // Set Type Selection
$this->typeOptions = $this->getTheTypeSelections(); $this->typeOptions = $this->getTheTypeSelections();
if ($this->typeOptions)
{
// We do some sanitation for Type filter // We do some sanitation for Type filter
if (isset($this->typeOptions[0]) && !ComponentbuilderHelper::checkString($this->typeOptions[0]->value)) if (ComponentbuilderHelper::checkArray($this->typeOptions) &&
isset($this->typeOptions[0]->value) &&
!ComponentbuilderHelper::checkString($this->typeOptions[0]->value))
{ {
unset($this->typeOptions[0]); unset($this->typeOptions[0]);
} }
// Only load Type filter if it has values
if (ComponentbuilderHelper::checkArray($this->typeOptions))
{
// Type Filter // Type Filter
JHtmlSidebar::addFilter( JHtmlSidebar::addFilter(
'- Select '.JText::_('COM_COMPONENTBUILDER_HELP_DOCUMENT_TYPE_LABEL').' -', '- Select '.JText::_('COM_COMPONENTBUILDER_HELP_DOCUMENT_TYPE_LABEL').' -',
@ -215,13 +218,16 @@ class ComponentbuilderViewHelp_documents extends JViewLegacy
// Set Location Selection // Set Location Selection
$this->locationOptions = $this->getTheLocationSelections(); $this->locationOptions = $this->getTheLocationSelections();
if ($this->locationOptions)
{
// We do some sanitation for Location filter // We do some sanitation for Location filter
if (isset($this->locationOptions[0]) && !ComponentbuilderHelper::checkString($this->locationOptions[0]->value)) if (ComponentbuilderHelper::checkArray($this->locationOptions) &&
isset($this->locationOptions[0]->value) &&
!ComponentbuilderHelper::checkString($this->locationOptions[0]->value))
{ {
unset($this->locationOptions[0]); unset($this->locationOptions[0]);
} }
// Only load Location filter if it has values
if (ComponentbuilderHelper::checkArray($this->locationOptions))
{
// Location Filter // Location Filter
JHtmlSidebar::addFilter( JHtmlSidebar::addFilter(
'- Select '.JText::_('COM_COMPONENTBUILDER_HELP_DOCUMENT_LOCATION_LABEL').' -', '- Select '.JText::_('COM_COMPONENTBUILDER_HELP_DOCUMENT_LOCATION_LABEL').' -',
@ -242,13 +248,16 @@ class ComponentbuilderViewHelp_documents extends JViewLegacy
// Set Admin View Selection // Set Admin View Selection
$this->admin_viewOptions = JFormHelper::loadFieldType('Adminviewfolderlist')->options; $this->admin_viewOptions = JFormHelper::loadFieldType('Adminviewfolderlist')->options;
if ($this->admin_viewOptions)
{
// We do some sanitation for Location filter // We do some sanitation for Location filter
if (isset($this->admin_viewOptions[0]) && !ComponentbuilderHelper::checkString($this->admin_viewOptions[0]->value)) if (ComponentbuilderHelper::checkArray($this->admin_viewOptions) &&
isset($this->admin_viewOptions[0]->value) &&
!ComponentbuilderHelper::checkString($this->admin_viewOptions[0]->value))
{ {
unset($this->admin_viewOptions[0]); unset($this->admin_viewOptions[0]);
} }
// Only load Location filter if it has values
if (ComponentbuilderHelper::checkArray($this->admin_viewOptions))
{
// Admin View Filter // Admin View Filter
JHtmlSidebar::addFilter( JHtmlSidebar::addFilter(
'- Select '.JText::_('COM_COMPONENTBUILDER_HELP_DOCUMENT_ADMIN_VIEW_LABEL').' -', '- Select '.JText::_('COM_COMPONENTBUILDER_HELP_DOCUMENT_ADMIN_VIEW_LABEL').' -',
@ -269,13 +278,16 @@ class ComponentbuilderViewHelp_documents extends JViewLegacy
// Set Site View Selection // Set Site View Selection
$this->site_viewOptions = JFormHelper::loadFieldType('Siteviewfolderlist')->options; $this->site_viewOptions = JFormHelper::loadFieldType('Siteviewfolderlist')->options;
if ($this->site_viewOptions)
{
// We do some sanitation for Location filter // We do some sanitation for Location filter
if (isset($this->site_viewOptions[0]) && !ComponentbuilderHelper::checkString($this->site_viewOptions[0]->value)) if (ComponentbuilderHelper::checkArray($this->site_viewOptions) &&
isset($this->site_viewOptions[0]->value) &&
!ComponentbuilderHelper::checkString($this->site_viewOptions[0]->value))
{ {
unset($this->site_viewOptions[0]); unset($this->site_viewOptions[0]);
} }
// Only load Location filter if it has values
if (ComponentbuilderHelper::checkArray($this->site_viewOptions))
{
// Site View Filter // Site View Filter
JHtmlSidebar::addFilter( JHtmlSidebar::addFilter(
'- Select '.JText::_('COM_COMPONENTBUILDER_HELP_DOCUMENT_SITE_VIEW_LABEL').' -', '- Select '.JText::_('COM_COMPONENTBUILDER_HELP_DOCUMENT_SITE_VIEW_LABEL').' -',

18
admin/views/joomla_components/view.html.php
View File

@ -218,13 +218,16 @@ class ComponentbuilderViewJoomla_components extends JViewLegacy
// Set Companyname Selection // Set Companyname Selection
$this->companynameOptions = $this->getTheCompanynameSelections(); $this->companynameOptions = $this->getTheCompanynameSelections();
if ($this->companynameOptions)
{
// We do some sanitation for Companyname filter // We do some sanitation for Companyname filter
if (isset($this->companynameOptions[0]) && !ComponentbuilderHelper::checkString($this->companynameOptions[0]->value)) if (ComponentbuilderHelper::checkArray($this->companynameOptions) &&
isset($this->companynameOptions[0]->value) &&
!ComponentbuilderHelper::checkString($this->companynameOptions[0]->value))
{ {
unset($this->companynameOptions[0]); unset($this->companynameOptions[0]);
} }
// Only load Companyname filter if it has values
if (ComponentbuilderHelper::checkArray($this->companynameOptions))
{
// Companyname Filter // Companyname Filter
JHtmlSidebar::addFilter( JHtmlSidebar::addFilter(
'- Select '.JText::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENT_COMPANYNAME_LABEL').' -', '- Select '.JText::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENT_COMPANYNAME_LABEL').' -',
@ -245,13 +248,16 @@ class ComponentbuilderViewJoomla_components extends JViewLegacy
// Set Author Selection // Set Author Selection
$this->authorOptions = $this->getTheAuthorSelections(); $this->authorOptions = $this->getTheAuthorSelections();
if ($this->authorOptions)
{
// We do some sanitation for Author filter // We do some sanitation for Author filter
if (isset($this->authorOptions[0]) && !ComponentbuilderHelper::checkString($this->authorOptions[0]->value)) if (ComponentbuilderHelper::checkArray($this->authorOptions) &&
isset($this->authorOptions[0]->value) &&
!ComponentbuilderHelper::checkString($this->authorOptions[0]->value))
{ {
unset($this->authorOptions[0]); unset($this->authorOptions[0]);
} }
// Only load Author filter if it has values
if (ComponentbuilderHelper::checkArray($this->authorOptions))
{
// Author Filter // Author Filter
JHtmlSidebar::addFilter( JHtmlSidebar::addFilter(
'- Select '.JText::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENT_AUTHOR_LABEL').' -', '- Select '.JText::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENT_AUTHOR_LABEL').' -',

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

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

18
admin/views/libraries/view.html.php
View File

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

18
admin/views/servers/view.html.php
View File

@ -188,13 +188,16 @@ class ComponentbuilderViewServers extends JViewLegacy
// Set Name Selection // Set Name Selection
$this->nameOptions = $this->getTheNameSelections(); $this->nameOptions = $this->getTheNameSelections();
if ($this->nameOptions)
{
// We do some sanitation for Name filter // We do some sanitation for Name filter
if (isset($this->nameOptions[0]) && !ComponentbuilderHelper::checkString($this->nameOptions[0]->value)) if (ComponentbuilderHelper::checkArray($this->nameOptions) &&
isset($this->nameOptions[0]->value) &&
!ComponentbuilderHelper::checkString($this->nameOptions[0]->value))
{ {
unset($this->nameOptions[0]); unset($this->nameOptions[0]);
} }
// Only load Name filter if it has values
if (ComponentbuilderHelper::checkArray($this->nameOptions))
{
// Name Filter // Name Filter
JHtmlSidebar::addFilter( JHtmlSidebar::addFilter(
'- Select '.JText::_('COM_COMPONENTBUILDER_SERVER_NAME_LABEL').' -', '- Select '.JText::_('COM_COMPONENTBUILDER_SERVER_NAME_LABEL').' -',
@ -215,13 +218,16 @@ class ComponentbuilderViewServers extends JViewLegacy
// Set Protocol Selection // Set Protocol Selection
$this->protocolOptions = $this->getTheProtocolSelections(); $this->protocolOptions = $this->getTheProtocolSelections();
if ($this->protocolOptions)
{
// We do some sanitation for Protocol filter // We do some sanitation for Protocol filter
if (isset($this->protocolOptions[0]) && !ComponentbuilderHelper::checkString($this->protocolOptions[0]->value)) if (ComponentbuilderHelper::checkArray($this->protocolOptions) &&
isset($this->protocolOptions[0]->value) &&
!ComponentbuilderHelper::checkString($this->protocolOptions[0]->value))
{ {
unset($this->protocolOptions[0]); unset($this->protocolOptions[0]);
} }
// Only load Protocol filter if it has values
if (ComponentbuilderHelper::checkArray($this->protocolOptions))
{
// Protocol Filter // Protocol Filter
JHtmlSidebar::addFilter( JHtmlSidebar::addFilter(
'- Select '.JText::_('COM_COMPONENTBUILDER_SERVER_PROTOCOL_LABEL').' -', '- Select '.JText::_('COM_COMPONENTBUILDER_SERVER_PROTOCOL_LABEL').' -',

27
admin/views/site_views/view.html.php
View File

@ -193,13 +193,16 @@ class ComponentbuilderViewSite_views extends JViewLegacy
// Set Main Get Name Selection // Set Main Get Name Selection
$this->main_getNameOptions = JFormHelper::loadFieldType('Maingets')->options; $this->main_getNameOptions = JFormHelper::loadFieldType('Maingets')->options;
if ($this->main_getNameOptions)
{
// We do some sanitation for filter // We do some sanitation for filter
if (isset($this->main_getNameOptions[0]) && !ComponentbuilderHelper::checkString($this->main_getNameOptions[0]->value)) if (ComponentbuilderHelper::checkArray($this->main_getNameOptions) &&
isset($this->main_getNameOptions[0]->value) &&
!ComponentbuilderHelper::checkString($this->main_getNameOptions[0]->value))
{ {
unset($this->main_getNameOptions[0]); unset($this->main_getNameOptions[0]);
} }
// Only load filter if it has values
if (ComponentbuilderHelper::checkArray($this->main_getNameOptions))
{
// Main Get Name Filter // Main Get Name Filter
JHtmlSidebar::addFilter( JHtmlSidebar::addFilter(
'- Select '.JText::_('COM_COMPONENTBUILDER_SITE_VIEW_MAIN_GET_LABEL').' -', '- Select '.JText::_('COM_COMPONENTBUILDER_SITE_VIEW_MAIN_GET_LABEL').' -',
@ -220,13 +223,16 @@ class ComponentbuilderViewSite_views extends JViewLegacy
// Set Add Php Ajax Selection // Set Add Php Ajax Selection
$this->add_php_ajaxOptions = $this->getTheAdd_php_ajaxSelections(); $this->add_php_ajaxOptions = $this->getTheAdd_php_ajaxSelections();
if ($this->add_php_ajaxOptions)
{
// We do some sanitation for Add Php Ajax filter // We do some sanitation for Add Php Ajax filter
if (isset($this->add_php_ajaxOptions[0]) && !ComponentbuilderHelper::checkString($this->add_php_ajaxOptions[0]->value)) 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]); unset($this->add_php_ajaxOptions[0]);
} }
// Only load Add Php Ajax filter if it has values
if (ComponentbuilderHelper::checkArray($this->add_php_ajaxOptions))
{
// Add Php Ajax Filter // Add Php Ajax Filter
JHtmlSidebar::addFilter( JHtmlSidebar::addFilter(
'- Select '.JText::_('COM_COMPONENTBUILDER_SITE_VIEW_ADD_PHP_AJAX_LABEL').' -', '- Select '.JText::_('COM_COMPONENTBUILDER_SITE_VIEW_ADD_PHP_AJAX_LABEL').' -',
@ -247,13 +253,16 @@ class ComponentbuilderViewSite_views extends JViewLegacy
// Set Add Custom Button Selection // Set Add Custom Button Selection
$this->add_custom_buttonOptions = $this->getTheAdd_custom_buttonSelections(); $this->add_custom_buttonOptions = $this->getTheAdd_custom_buttonSelections();
if ($this->add_custom_buttonOptions)
{
// We do some sanitation for Add Custom Button filter // We do some sanitation for Add Custom Button filter
if (isset($this->add_custom_buttonOptions[0]) && !ComponentbuilderHelper::checkString($this->add_custom_buttonOptions[0]->value)) 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]); unset($this->add_custom_buttonOptions[0]);
} }
// Only load Add Custom Button filter if it has values
if (ComponentbuilderHelper::checkArray($this->add_custom_buttonOptions))
{
// Add Custom Button Filter // Add Custom Button Filter
JHtmlSidebar::addFilter( JHtmlSidebar::addFilter(
'- Select '.JText::_('COM_COMPONENTBUILDER_SITE_VIEW_ADD_CUSTOM_BUTTON_LABEL').' -', '- Select '.JText::_('COM_COMPONENTBUILDER_SITE_VIEW_ADD_CUSTOM_BUTTON_LABEL').' -',

18
admin/views/snippets/view.html.php
View File

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

18
admin/views/templates/view.html.php
View File

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