From dd3335771ccd99b15802fc699d4577c3048bb5ac Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Sun, 13 Feb 2022 00:28:17 +0200 Subject: [PATCH] Improve help to allow the help url to be global in all the views. Fixed the zip wrapper to include .htaccess files for library folders. --- README.md | 2 +- admin/README.txt | 2 +- admin/compiler/joomla_3/DASHJViewLagacy.php | 6 +++--- admin/compiler/joomla_3/JViewLegacy_custom_admin.php | 6 +++--- admin/compiler/joomla_3/JViewLegacy_import.php | 6 +++--- admin/compiler/joomla_3/JViewLegacy_import_custom.php | 6 +++--- admin/compiler/joomla_3/JViewLegacy_list.php | 6 +++--- admin/compiler/joomla_3/JViewLegacy_list_custom_admin.php | 6 +++--- admin/compiler/joomla_3/JViewLegacy_list_site.php | 6 +++--- admin/compiler/joomla_3/JViewLegacy_site.php | 6 +++--- admin/helpers/componentbuilder.php | 4 ++-- admin/views/admin_views/view.html.php | 6 +++--- admin/views/admins_custom_tabs/view.html.php | 6 +++--- admin/views/admins_fields/view.html.php | 6 +++--- admin/views/admins_fields_conditions/view.html.php | 6 +++--- admin/views/admins_fields_relations/view.html.php | 6 +++--- admin/views/class_extendings/view.html.php | 6 +++--- admin/views/class_methods/view.html.php | 6 +++--- admin/views/class_properties/view.html.php | 6 +++--- admin/views/compiler/view.html.php | 6 +++--- admin/views/componentbuilder/view.html.php | 6 +++--- admin/views/components_admin_views/view.html.php | 6 +++--- admin/views/components_config/view.html.php | 6 +++--- admin/views/components_custom_admin_menus/view.html.php | 6 +++--- admin/views/components_custom_admin_views/view.html.php | 6 +++--- admin/views/components_dashboard/view.html.php | 6 +++--- admin/views/components_files_folders/view.html.php | 6 +++--- admin/views/components_modules/view.html.php | 6 +++--- admin/views/components_mysql_tweaks/view.html.php | 6 +++--- admin/views/components_placeholders/view.html.php | 6 +++--- admin/views/components_plugins/view.html.php | 6 +++--- admin/views/components_site_views/view.html.php | 6 +++--- admin/views/components_updates/view.html.php | 6 +++--- admin/views/custom_admin_views/view.html.php | 6 +++--- admin/views/custom_codes/view.html.php | 6 +++--- admin/views/dynamic_gets/view.html.php | 6 +++--- admin/views/fields/view.html.php | 6 +++--- admin/views/fieldtypes/view.html.php | 6 +++--- admin/views/get_snippets/view.html.php | 6 +++--- admin/views/help_documents/view.html.php | 6 +++--- admin/views/import/view.html.php | 6 +++--- admin/views/import_joomla_components/view.html.php | 6 +++--- admin/views/import_language_translations/view.html.php | 6 +++--- admin/views/joomla_components/view.html.php | 6 +++--- admin/views/joomla_modules/view.html.php | 6 +++--- admin/views/joomla_modules_files_folders_urls/view.html.php | 6 +++--- admin/views/joomla_modules_updates/view.html.php | 6 +++--- admin/views/joomla_plugin_groups/view.html.php | 6 +++--- admin/views/joomla_plugins/view.html.php | 6 +++--- admin/views/joomla_plugins_files_folders_urls/view.html.php | 6 +++--- admin/views/joomla_plugins_updates/view.html.php | 6 +++--- admin/views/language_translations/view.html.php | 6 +++--- admin/views/languages/view.html.php | 6 +++--- admin/views/layouts/view.html.php | 6 +++--- admin/views/libraries/view.html.php | 6 +++--- admin/views/libraries_config/view.html.php | 6 +++--- admin/views/libraries_files_folders_urls/view.html.php | 6 +++--- admin/views/placeholders/view.html.php | 6 +++--- admin/views/servers/view.html.php | 6 +++--- admin/views/site_views/view.html.php | 6 +++--- admin/views/snippet_types/view.html.php | 6 +++--- admin/views/snippets/view.html.php | 6 +++--- admin/views/templates/view.html.php | 6 +++--- admin/views/validation_rules/view.html.php | 6 +++--- componentbuilder.xml | 2 +- site/helpers/componentbuilder.php | 4 ++-- site/views/api/view.html.php | 6 +++--- 67 files changed, 193 insertions(+), 193 deletions(-) diff --git a/README.md b/README.md index fe59c63ee..bb2aaa1a6 100644 --- a/README.md +++ b/README.md @@ -143,7 +143,7 @@ TODO + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 9th February, 2022 ++ *Last Build*: 12th February, 2022 + *Version*: 2.12.15 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt diff --git a/admin/README.txt b/admin/README.txt index fe59c63ee..bb2aaa1a6 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -143,7 +143,7 @@ TODO + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 9th February, 2022 ++ *Last Build*: 12th February, 2022 + *Version*: 2.12.15 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt diff --git a/admin/compiler/joomla_3/DASHJViewLagacy.php b/admin/compiler/joomla_3/DASHJViewLagacy.php index f8570c57e..c9a759f75 100644 --- a/admin/compiler/joomla_3/DASHJViewLagacy.php +++ b/admin/compiler/joomla_3/DASHJViewLagacy.php @@ -62,10 +62,10 @@ class ###Component###View###Component### extends JViewLegacy JToolBarHelper::title(JText::_('COM_###COMPONENT###_DASHBOARD'), 'grid-2'); // set help url for this view if found - $help_url = ###Component###Helper::getHelpUrl('###component###'); - if (###Component###Helper::checkString($help_url)) + $this->help_url = ###Component###Helper::getHelpUrl('###component###'); + if (###Component###Helper::checkString($this->help_url)) { - JToolbarHelper::help('COM_###COMPONENT###_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_###COMPONENT###_HELP_MANAGER', false, $this->help_url); } if ($canDo->get('core.admin') || $canDo->get('core.options')) diff --git a/admin/compiler/joomla_3/JViewLegacy_custom_admin.php b/admin/compiler/joomla_3/JViewLegacy_custom_admin.php index d0fe52b18..8f3201187 100644 --- a/admin/compiler/joomla_3/JViewLegacy_custom_admin.php +++ b/admin/compiler/joomla_3/JViewLegacy_custom_admin.php @@ -63,10 +63,10 @@ class ###Component###View###SView### extends JViewLegacy JToolbarHelper::title($title,'###ICOMOON###');###CUSTOM_ADMIN_CUSTOM_BUTTONS### // set help url for this view if found - $help_url = ###Component###Helper::getHelpUrl('###sviews###'); - if (###Component###Helper::checkString($help_url)) + $this->help_url = ###Component###Helper::getHelpUrl('###sviews###'); + if (###Component###Helper::checkString($this->help_url)) { - JToolbarHelper::help('COM_###COMPONENT###_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_###COMPONENT###_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/compiler/joomla_3/JViewLegacy_import.php b/admin/compiler/joomla_3/JViewLegacy_import.php index 853c4cb75..3371eace3 100644 --- a/admin/compiler/joomla_3/JViewLegacy_import.php +++ b/admin/compiler/joomla_3/JViewLegacy_import.php @@ -89,10 +89,10 @@ class ###Component###ViewImport extends JViewLegacy } // set help url for this view if found - $help_url = ###Component###Helper::getHelpUrl('import'); - if (###Component###Helper::checkString($help_url)) + $this->help_url = ###Component###Helper::getHelpUrl('import'); + if (###Component###Helper::checkString($this->help_url)) { - JToolbarHelper::help('COM_###COMPONENT###_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_###COMPONENT###_HELP_MANAGER', false, $this->help_url); } } } diff --git a/admin/compiler/joomla_3/JViewLegacy_import_custom.php b/admin/compiler/joomla_3/JViewLegacy_import_custom.php index e540e6e31..f8b56738c 100644 --- a/admin/compiler/joomla_3/JViewLegacy_import_custom.php +++ b/admin/compiler/joomla_3/JViewLegacy_import_custom.php @@ -37,10 +37,10 @@ class ###Component###View###View### extends JViewLegacy } // set help url for this view if found - $help_url = ###Component###Helper::getHelpUrl('###view###'); - if (###Component###Helper::checkString($help_url)) + $this->help_url = ###Component###Helper::getHelpUrl('###view###'); + if (###Component###Helper::checkString($this->help_url)) { - JToolbarHelper::help('COM_###COMPONENT###_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_###COMPONENT###_HELP_MANAGER', false, $this->help_url); } } } diff --git a/admin/compiler/joomla_3/JViewLegacy_list.php b/admin/compiler/joomla_3/JViewLegacy_list.php index 2f2718e14..2b457fe14 100644 --- a/admin/compiler/joomla_3/JViewLegacy_list.php +++ b/admin/compiler/joomla_3/JViewLegacy_list.php @@ -129,10 +129,10 @@ class ###Component###View###Views### extends JViewLegacy }###ADMIN_CUSTOM_FUNCTION_ONLY_BUTTONS_LIST######IMPORTBUTTON### // set help url for this view if found - $help_url = ###Component###Helper::getHelpUrl('###views###'); - if (###Component###Helper::checkString($help_url)) + $this->help_url = ###Component###Helper::getHelpUrl('###views###'); + if (###Component###Helper::checkString($this->help_url)) { - JToolbarHelper::help('COM_###COMPONENT###_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_###COMPONENT###_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/compiler/joomla_3/JViewLegacy_list_custom_admin.php b/admin/compiler/joomla_3/JViewLegacy_list_custom_admin.php index f128fab13..f56863a6c 100644 --- a/admin/compiler/joomla_3/JViewLegacy_list_custom_admin.php +++ b/admin/compiler/joomla_3/JViewLegacy_list_custom_admin.php @@ -53,10 +53,10 @@ class ###Component###View###SViews### extends JViewLegacy JToolbarHelper::title(JText::_('COM_###COMPONENT###_###SVIEWS###'),'###ICOMOON###');###CUSTOM_ADMIN_CUSTOM_BUTTONS### // set help url for this view if found - $help_url = ###Component###Helper::getHelpUrl('###sviews###'); - if (###Component###Helper::checkString($help_url)) + $this->help_url = ###Component###Helper::getHelpUrl('###sviews###'); + if (###Component###Helper::checkString($this->help_url)) { - JToolbarHelper::help('COM_###COMPONENT###_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_###COMPONENT###_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/compiler/joomla_3/JViewLegacy_list_site.php b/admin/compiler/joomla_3/JViewLegacy_list_site.php index db213620c..7a2410c70 100644 --- a/admin/compiler/joomla_3/JViewLegacy_list_site.php +++ b/admin/compiler/joomla_3/JViewLegacy_list_site.php @@ -49,10 +49,10 @@ class ###Component###View###SViews### extends JViewLegacy {###SITE_CUSTOM_BUTTONS### // set help url for this view if found - $help_url = ###Component###Helper::getHelpUrl('###sviews###'); - if (###Component###Helper::checkString($help_url)) + $this->help_url = ###Component###Helper::getHelpUrl('###sviews###'); + if (###Component###Helper::checkString($this->help_url)) { - JToolbarHelper::help('COM_###COMPONENT###_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_###COMPONENT###_HELP_MANAGER', false, $this->help_url); } // now initiate the toolbar $this->toolbar = JToolbar::getInstance(); diff --git a/admin/compiler/joomla_3/JViewLegacy_site.php b/admin/compiler/joomla_3/JViewLegacy_site.php index 27473368a..7a7b1e978 100644 --- a/admin/compiler/joomla_3/JViewLegacy_site.php +++ b/admin/compiler/joomla_3/JViewLegacy_site.php @@ -49,10 +49,10 @@ class ###Component###View###SView### extends JViewLegacy {###SITE_CUSTOM_BUTTONS### // set help url for this view if found - $help_url = ###Component###Helper::getHelpUrl('###sview###'); - if (###Component###Helper::checkString($help_url)) + $this->help_url = ###Component###Helper::getHelpUrl('###sview###'); + if (###Component###Helper::checkString($this->help_url)) { - JToolbarHelper::help('COM_###COMPONENT###_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_###COMPONENT###_HELP_MANAGER', false, $this->help_url); } // now initiate the toolbar $this->toolbar = JToolbar::getInstance(); diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php index 462a4bc60..99c85408c 100644 --- a/admin/helpers/componentbuilder.php +++ b/admin/helpers/componentbuilder.php @@ -2823,8 +2823,8 @@ abstract class ComponentbuilderHelper // delete an existing zip file (or use an exclusion parameter in Folder::files() File::delete($filepath); - // get a list of files in the current directory tree - $files = Folder::files('.', '', true, true); + // get a list of files in the current directory tree (also the hidden files) + $files = Folder::files('.', '', true, true, array('.svn', 'CVS', '.DS_Store', '__MACOSX'), array('.*~')); $zipArray = array(); // setup the zip array foreach ($files as $file) diff --git a/admin/views/admin_views/view.html.php b/admin/views/admin_views/view.html.php index 7bb4e7d98..9fff10040 100644 --- a/admin/views/admin_views/view.html.php +++ b/admin/views/admin_views/view.html.php @@ -152,10 +152,10 @@ class ComponentbuilderViewAdmin_views extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('admin_views'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('admin_views'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/views/admins_custom_tabs/view.html.php b/admin/views/admins_custom_tabs/view.html.php index b2eb1441b..72148c519 100644 --- a/admin/views/admins_custom_tabs/view.html.php +++ b/admin/views/admins_custom_tabs/view.html.php @@ -137,10 +137,10 @@ class ComponentbuilderViewAdmins_custom_tabs extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('admins_custom_tabs'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('admins_custom_tabs'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/views/admins_fields/view.html.php b/admin/views/admins_fields/view.html.php index 0f9578493..c2b73967c 100644 --- a/admin/views/admins_fields/view.html.php +++ b/admin/views/admins_fields/view.html.php @@ -137,10 +137,10 @@ class ComponentbuilderViewAdmins_fields extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('admins_fields'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('admins_fields'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/views/admins_fields_conditions/view.html.php b/admin/views/admins_fields_conditions/view.html.php index ba4554bdd..fe4de943a 100644 --- a/admin/views/admins_fields_conditions/view.html.php +++ b/admin/views/admins_fields_conditions/view.html.php @@ -137,10 +137,10 @@ class ComponentbuilderViewAdmins_fields_conditions extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('admins_fields_conditions'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('admins_fields_conditions'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/views/admins_fields_relations/view.html.php b/admin/views/admins_fields_relations/view.html.php index 7c6043483..8a175ff8b 100644 --- a/admin/views/admins_fields_relations/view.html.php +++ b/admin/views/admins_fields_relations/view.html.php @@ -137,10 +137,10 @@ class ComponentbuilderViewAdmins_fields_relations extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('admins_fields_relations'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('admins_fields_relations'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/views/class_extendings/view.html.php b/admin/views/class_extendings/view.html.php index 171cb0c7f..427b9fd60 100644 --- a/admin/views/class_extendings/view.html.php +++ b/admin/views/class_extendings/view.html.php @@ -137,10 +137,10 @@ class ComponentbuilderViewClass_extendings extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('class_extendings'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('class_extendings'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/views/class_methods/view.html.php b/admin/views/class_methods/view.html.php index 849778bee..dc003c06c 100644 --- a/admin/views/class_methods/view.html.php +++ b/admin/views/class_methods/view.html.php @@ -147,10 +147,10 @@ class ComponentbuilderViewClass_methods extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('class_methods'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('class_methods'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/views/class_properties/view.html.php b/admin/views/class_properties/view.html.php index 775d7b801..1a24ea13d 100644 --- a/admin/views/class_properties/view.html.php +++ b/admin/views/class_properties/view.html.php @@ -147,10 +147,10 @@ class ComponentbuilderViewClass_properties extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('class_properties'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('class_properties'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/views/compiler/view.html.php b/admin/views/compiler/view.html.php index 1712a2639..207134b80 100644 --- a/admin/views/compiler/view.html.php +++ b/admin/views/compiler/view.html.php @@ -391,10 +391,10 @@ class ComponentbuilderViewCompiler extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('compiler'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('compiler'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/views/componentbuilder/view.html.php b/admin/views/componentbuilder/view.html.php index 9f0d6f782..ad7ebe547 100644 --- a/admin/views/componentbuilder/view.html.php +++ b/admin/views/componentbuilder/view.html.php @@ -63,10 +63,10 @@ class ComponentbuilderViewComponentbuilder extends JViewLegacy JToolBarHelper::title(JText::_('COM_COMPONENTBUILDER_DASHBOARD'), 'grid-2'); // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('componentbuilder'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('componentbuilder'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } if ($canDo->get('core.admin') || $canDo->get('core.options')) diff --git a/admin/views/components_admin_views/view.html.php b/admin/views/components_admin_views/view.html.php index b9aeba7f5..f5d8ab210 100644 --- a/admin/views/components_admin_views/view.html.php +++ b/admin/views/components_admin_views/view.html.php @@ -137,10 +137,10 @@ class ComponentbuilderViewComponents_admin_views extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('components_admin_views'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('components_admin_views'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/views/components_config/view.html.php b/admin/views/components_config/view.html.php index 8694b1266..5be830841 100644 --- a/admin/views/components_config/view.html.php +++ b/admin/views/components_config/view.html.php @@ -137,10 +137,10 @@ class ComponentbuilderViewComponents_config extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('components_config'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('components_config'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/views/components_custom_admin_menus/view.html.php b/admin/views/components_custom_admin_menus/view.html.php index 06de1e62d..3eced497b 100644 --- a/admin/views/components_custom_admin_menus/view.html.php +++ b/admin/views/components_custom_admin_menus/view.html.php @@ -137,10 +137,10 @@ class ComponentbuilderViewComponents_custom_admin_menus extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('components_custom_admin_menus'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('components_custom_admin_menus'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/views/components_custom_admin_views/view.html.php b/admin/views/components_custom_admin_views/view.html.php index 1cd822d6c..035146151 100644 --- a/admin/views/components_custom_admin_views/view.html.php +++ b/admin/views/components_custom_admin_views/view.html.php @@ -137,10 +137,10 @@ class ComponentbuilderViewComponents_custom_admin_views extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('components_custom_admin_views'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('components_custom_admin_views'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/views/components_dashboard/view.html.php b/admin/views/components_dashboard/view.html.php index c44238252..4b2e649a1 100644 --- a/admin/views/components_dashboard/view.html.php +++ b/admin/views/components_dashboard/view.html.php @@ -137,10 +137,10 @@ class ComponentbuilderViewComponents_dashboard extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('components_dashboard'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('components_dashboard'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/views/components_files_folders/view.html.php b/admin/views/components_files_folders/view.html.php index 0dcbaed1b..b9c7207f6 100644 --- a/admin/views/components_files_folders/view.html.php +++ b/admin/views/components_files_folders/view.html.php @@ -137,10 +137,10 @@ class ComponentbuilderViewComponents_files_folders extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('components_files_folders'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('components_files_folders'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/views/components_modules/view.html.php b/admin/views/components_modules/view.html.php index 5a988c10b..995deedb2 100644 --- a/admin/views/components_modules/view.html.php +++ b/admin/views/components_modules/view.html.php @@ -137,10 +137,10 @@ class ComponentbuilderViewComponents_modules extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('components_modules'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('components_modules'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/views/components_mysql_tweaks/view.html.php b/admin/views/components_mysql_tweaks/view.html.php index 3bf7d6d47..70c6a83bf 100644 --- a/admin/views/components_mysql_tweaks/view.html.php +++ b/admin/views/components_mysql_tweaks/view.html.php @@ -137,10 +137,10 @@ class ComponentbuilderViewComponents_mysql_tweaks extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('components_mysql_tweaks'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('components_mysql_tweaks'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/views/components_placeholders/view.html.php b/admin/views/components_placeholders/view.html.php index fc78018d7..0124abac5 100644 --- a/admin/views/components_placeholders/view.html.php +++ b/admin/views/components_placeholders/view.html.php @@ -137,10 +137,10 @@ class ComponentbuilderViewComponents_placeholders extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('components_placeholders'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('components_placeholders'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/views/components_plugins/view.html.php b/admin/views/components_plugins/view.html.php index 6262169ad..5a2a02fb8 100644 --- a/admin/views/components_plugins/view.html.php +++ b/admin/views/components_plugins/view.html.php @@ -137,10 +137,10 @@ class ComponentbuilderViewComponents_plugins extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('components_plugins'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('components_plugins'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/views/components_site_views/view.html.php b/admin/views/components_site_views/view.html.php index fd8b1caf1..c34214081 100644 --- a/admin/views/components_site_views/view.html.php +++ b/admin/views/components_site_views/view.html.php @@ -137,10 +137,10 @@ class ComponentbuilderViewComponents_site_views extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('components_site_views'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('components_site_views'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/views/components_updates/view.html.php b/admin/views/components_updates/view.html.php index bdfd15ce5..6221a98ce 100644 --- a/admin/views/components_updates/view.html.php +++ b/admin/views/components_updates/view.html.php @@ -137,10 +137,10 @@ class ComponentbuilderViewComponents_updates extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('components_updates'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('components_updates'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/views/custom_admin_views/view.html.php b/admin/views/custom_admin_views/view.html.php index e7816d21f..269d6f029 100644 --- a/admin/views/custom_admin_views/view.html.php +++ b/admin/views/custom_admin_views/view.html.php @@ -152,10 +152,10 @@ class ComponentbuilderViewCustom_admin_views extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('custom_admin_views'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('custom_admin_views'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/views/custom_codes/view.html.php b/admin/views/custom_codes/view.html.php index 69cd9495f..8a8cc386b 100644 --- a/admin/views/custom_codes/view.html.php +++ b/admin/views/custom_codes/view.html.php @@ -152,10 +152,10 @@ class ComponentbuilderViewCustom_codes extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('custom_codes'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('custom_codes'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/views/dynamic_gets/view.html.php b/admin/views/dynamic_gets/view.html.php index 6594bbe06..30cbd2c66 100644 --- a/admin/views/dynamic_gets/view.html.php +++ b/admin/views/dynamic_gets/view.html.php @@ -152,10 +152,10 @@ class ComponentbuilderViewDynamic_gets extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('dynamic_gets'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('dynamic_gets'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/views/fields/view.html.php b/admin/views/fields/view.html.php index a0becc03f..59d86d9a6 100644 --- a/admin/views/fields/view.html.php +++ b/admin/views/fields/view.html.php @@ -152,10 +152,10 @@ class ComponentbuilderViewFields extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('fields'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('fields'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/views/fieldtypes/view.html.php b/admin/views/fieldtypes/view.html.php index 1031fefbb..364fbb89b 100644 --- a/admin/views/fieldtypes/view.html.php +++ b/admin/views/fieldtypes/view.html.php @@ -147,10 +147,10 @@ class ComponentbuilderViewFieldtypes extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('fieldtypes'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('fieldtypes'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/views/get_snippets/view.html.php b/admin/views/get_snippets/view.html.php index 0012f51b1..9d237e45b 100644 --- a/admin/views/get_snippets/view.html.php +++ b/admin/views/get_snippets/view.html.php @@ -289,10 +289,10 @@ class ComponentbuilderViewGet_snippets extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('get_snippets'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('get_snippets'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/views/help_documents/view.html.php b/admin/views/help_documents/view.html.php index dd1d4f629..94e4aa451 100644 --- a/admin/views/help_documents/view.html.php +++ b/admin/views/help_documents/view.html.php @@ -147,10 +147,10 @@ class ComponentbuilderViewHelp_documents extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('help_documents'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('help_documents'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/views/import/view.html.php b/admin/views/import/view.html.php index f3cf8eb6e..1be5fdd2a 100644 --- a/admin/views/import/view.html.php +++ b/admin/views/import/view.html.php @@ -85,10 +85,10 @@ class ComponentbuilderViewImport extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('import'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('import'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } } } diff --git a/admin/views/import_joomla_components/view.html.php b/admin/views/import_joomla_components/view.html.php index f7c6a6cbe..7df5f96e1 100644 --- a/admin/views/import_joomla_components/view.html.php +++ b/admin/views/import_joomla_components/view.html.php @@ -450,10 +450,10 @@ class ComponentbuilderViewImport_joomla_components extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('import_joomla_components'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('import_joomla_components'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } } } diff --git a/admin/views/import_language_translations/view.html.php b/admin/views/import_language_translations/view.html.php index 159a0de7f..8fa95880c 100644 --- a/admin/views/import_language_translations/view.html.php +++ b/admin/views/import_language_translations/view.html.php @@ -84,10 +84,10 @@ class ComponentbuilderViewImport_language_translations extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('import_language_translations'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('import_language_translations'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } } } diff --git a/admin/views/joomla_components/view.html.php b/admin/views/joomla_components/view.html.php index 3515b4b24..66a02279e 100644 --- a/admin/views/joomla_components/view.html.php +++ b/admin/views/joomla_components/view.html.php @@ -177,10 +177,10 @@ class ComponentbuilderViewJoomla_components extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('joomla_components'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('joomla_components'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/views/joomla_modules/view.html.php b/admin/views/joomla_modules/view.html.php index 1dfd74f4f..fe9db733c 100644 --- a/admin/views/joomla_modules/view.html.php +++ b/admin/views/joomla_modules/view.html.php @@ -147,10 +147,10 @@ class ComponentbuilderViewJoomla_modules extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('joomla_modules'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('joomla_modules'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/views/joomla_modules_files_folders_urls/view.html.php b/admin/views/joomla_modules_files_folders_urls/view.html.php index 8fb825779..50af7e3b1 100644 --- a/admin/views/joomla_modules_files_folders_urls/view.html.php +++ b/admin/views/joomla_modules_files_folders_urls/view.html.php @@ -137,10 +137,10 @@ class ComponentbuilderViewJoomla_modules_files_folders_urls extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('joomla_modules_files_folders_urls'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('joomla_modules_files_folders_urls'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/views/joomla_modules_updates/view.html.php b/admin/views/joomla_modules_updates/view.html.php index a8ce2ff75..585e582af 100644 --- a/admin/views/joomla_modules_updates/view.html.php +++ b/admin/views/joomla_modules_updates/view.html.php @@ -137,10 +137,10 @@ class ComponentbuilderViewJoomla_modules_updates extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('joomla_modules_updates'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('joomla_modules_updates'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/views/joomla_plugin_groups/view.html.php b/admin/views/joomla_plugin_groups/view.html.php index 1f6bf61a5..4c7d73810 100644 --- a/admin/views/joomla_plugin_groups/view.html.php +++ b/admin/views/joomla_plugin_groups/view.html.php @@ -137,10 +137,10 @@ class ComponentbuilderViewJoomla_plugin_groups extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('joomla_plugin_groups'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('joomla_plugin_groups'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/views/joomla_plugins/view.html.php b/admin/views/joomla_plugins/view.html.php index 44baeaa08..9bd98efe2 100644 --- a/admin/views/joomla_plugins/view.html.php +++ b/admin/views/joomla_plugins/view.html.php @@ -157,10 +157,10 @@ class ComponentbuilderViewJoomla_plugins extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('joomla_plugins'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('joomla_plugins'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/views/joomla_plugins_files_folders_urls/view.html.php b/admin/views/joomla_plugins_files_folders_urls/view.html.php index bdd7c9dfb..cb7d8df4e 100644 --- a/admin/views/joomla_plugins_files_folders_urls/view.html.php +++ b/admin/views/joomla_plugins_files_folders_urls/view.html.php @@ -137,10 +137,10 @@ class ComponentbuilderViewJoomla_plugins_files_folders_urls extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('joomla_plugins_files_folders_urls'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('joomla_plugins_files_folders_urls'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/views/joomla_plugins_updates/view.html.php b/admin/views/joomla_plugins_updates/view.html.php index 0fa952223..ddfe60e81 100644 --- a/admin/views/joomla_plugins_updates/view.html.php +++ b/admin/views/joomla_plugins_updates/view.html.php @@ -137,10 +137,10 @@ class ComponentbuilderViewJoomla_plugins_updates extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('joomla_plugins_updates'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('joomla_plugins_updates'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/views/language_translations/view.html.php b/admin/views/language_translations/view.html.php index e0387a387..100146b15 100644 --- a/admin/views/language_translations/view.html.php +++ b/admin/views/language_translations/view.html.php @@ -147,10 +147,10 @@ class ComponentbuilderViewLanguage_translations extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('language_translations'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('language_translations'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/views/languages/view.html.php b/admin/views/languages/view.html.php index e4bbad60c..84fe993e7 100644 --- a/admin/views/languages/view.html.php +++ b/admin/views/languages/view.html.php @@ -152,10 +152,10 @@ class ComponentbuilderViewLanguages extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('languages'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('languages'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/views/layouts/view.html.php b/admin/views/layouts/view.html.php index f0a16681e..f334157da 100644 --- a/admin/views/layouts/view.html.php +++ b/admin/views/layouts/view.html.php @@ -152,10 +152,10 @@ class ComponentbuilderViewLayouts extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('layouts'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('layouts'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/views/libraries/view.html.php b/admin/views/libraries/view.html.php index be0c92ec7..19fbe74d8 100644 --- a/admin/views/libraries/view.html.php +++ b/admin/views/libraries/view.html.php @@ -142,10 +142,10 @@ class ComponentbuilderViewLibraries extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('libraries'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('libraries'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/views/libraries_config/view.html.php b/admin/views/libraries_config/view.html.php index e937fcf33..4404f192b 100644 --- a/admin/views/libraries_config/view.html.php +++ b/admin/views/libraries_config/view.html.php @@ -137,10 +137,10 @@ class ComponentbuilderViewLibraries_config extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('libraries_config'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('libraries_config'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/views/libraries_files_folders_urls/view.html.php b/admin/views/libraries_files_folders_urls/view.html.php index 8ca23bc1e..414e83dd5 100644 --- a/admin/views/libraries_files_folders_urls/view.html.php +++ b/admin/views/libraries_files_folders_urls/view.html.php @@ -137,10 +137,10 @@ class ComponentbuilderViewLibraries_files_folders_urls extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('libraries_files_folders_urls'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('libraries_files_folders_urls'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/views/placeholders/view.html.php b/admin/views/placeholders/view.html.php index 2f18d3837..2248343b1 100644 --- a/admin/views/placeholders/view.html.php +++ b/admin/views/placeholders/view.html.php @@ -147,10 +147,10 @@ class ComponentbuilderViewPlaceholders extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('placeholders'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('placeholders'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/views/servers/view.html.php b/admin/views/servers/view.html.php index edf56826d..edcabb67d 100644 --- a/admin/views/servers/view.html.php +++ b/admin/views/servers/view.html.php @@ -147,10 +147,10 @@ class ComponentbuilderViewServers extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('servers'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('servers'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/views/site_views/view.html.php b/admin/views/site_views/view.html.php index 578b67025..4ee3f95b9 100644 --- a/admin/views/site_views/view.html.php +++ b/admin/views/site_views/view.html.php @@ -152,10 +152,10 @@ class ComponentbuilderViewSite_views extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('site_views'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('site_views'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/views/snippet_types/view.html.php b/admin/views/snippet_types/view.html.php index 7f57cde84..0af44fd8f 100644 --- a/admin/views/snippet_types/view.html.php +++ b/admin/views/snippet_types/view.html.php @@ -137,10 +137,10 @@ class ComponentbuilderViewSnippet_types extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('snippet_types'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('snippet_types'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/views/snippets/view.html.php b/admin/views/snippets/view.html.php index dad361636..d6ce5bd0f 100644 --- a/admin/views/snippets/view.html.php +++ b/admin/views/snippets/view.html.php @@ -157,10 +157,10 @@ class ComponentbuilderViewSnippets extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('snippets'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('snippets'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/views/templates/view.html.php b/admin/views/templates/view.html.php index 98c83156a..9e4a9ac87 100644 --- a/admin/views/templates/view.html.php +++ b/admin/views/templates/view.html.php @@ -152,10 +152,10 @@ class ComponentbuilderViewTemplates extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('templates'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('templates'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/admin/views/validation_rules/view.html.php b/admin/views/validation_rules/view.html.php index 7b781a7c6..a0101e371 100644 --- a/admin/views/validation_rules/view.html.php +++ b/admin/views/validation_rules/view.html.php @@ -152,10 +152,10 @@ class ComponentbuilderViewValidation_rules extends JViewLegacy } // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('validation_rules'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('validation_rules'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // add the options comp button diff --git a/componentbuilder.xml b/componentbuilder.xml index eb4150402..21174f21d 100644 --- a/componentbuilder.xml +++ b/componentbuilder.xml @@ -1,7 +1,7 @@ COM_COMPONENTBUILDER - 9th February, 2022 + 12th February, 2022 Llewellyn van der Merwe llewellyn@joomlacomponentbuilder.com http://www.joomlacomponentbuilder.com diff --git a/site/helpers/componentbuilder.php b/site/helpers/componentbuilder.php index 4078aa9ed..fb6062b96 100644 --- a/site/helpers/componentbuilder.php +++ b/site/helpers/componentbuilder.php @@ -2820,8 +2820,8 @@ abstract class ComponentbuilderHelper // delete an existing zip file (or use an exclusion parameter in Folder::files() File::delete($filepath); - // get a list of files in the current directory tree - $files = Folder::files('.', '', true, true); + // get a list of files in the current directory tree (also the hidden files) + $files = Folder::files('.', '', true, true, array('.svn', 'CVS', '.DS_Store', '__MACOSX'), array('.*~')); $zipArray = array(); // setup the zip array foreach ($files as $file) diff --git a/site/views/api/view.html.php b/site/views/api/view.html.php index 06e459df6..d5dd20094 100644 --- a/site/views/api/view.html.php +++ b/site/views/api/view.html.php @@ -88,10 +88,10 @@ class ComponentbuilderViewApi extends JViewLegacy { // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('api'); - if (ComponentbuilderHelper::checkString($help_url)) + $this->help_url = ComponentbuilderHelper::getHelpUrl('api'); + if (ComponentbuilderHelper::checkString($this->help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url); } // now initiate the toolbar $this->toolbar = JToolbar::getInstance();