From d36410281d4dafb781fce4e4b7babf677b459416 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Sat, 26 Dec 2020 22:28:36 +0200 Subject: [PATCH] Added more header options and renamed the header method in the compiler. --- README.md | 14 ++-- admin/README.txt | 14 ++-- admin/compiler/joomla_3/Helper.php | 5 +- admin/compiler/joomla_3/Helper_site.php | 5 +- admin/compiler/joomla_3/component_admin.php | 3 +- admin/compiler/joomla_3/component_site.php | 5 +- admin/componentbuilder.php | 1 + admin/helpers/compiler/a_Get.php | 3 +- admin/helpers/compiler/e_Interpretation.php | 65 +++++++++------ admin/helpers/compiler/f_Infusion.php | 90 ++++++++++++--------- admin/helpers/componentbuilder.php | 6 +- componentbuilder.xml | 6 +- componentbuilder_update_server.xml | 6 +- script.php | 2 +- site/componentbuilder.php | 3 +- site/helpers/componentbuilder.php | 6 +- 16 files changed, 132 insertions(+), 102 deletions(-) diff --git a/README.md b/README.md index 5445542ac..dcffd2914 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will save you lots of time and money. A real must have! -You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.12.3) with **ALL** its features and **ALL** concepts totally open-source and free! +You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.12.4) with **ALL** its features and **ALL** concepts totally open-source and free! > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45) @@ -143,14 +143,14 @@ 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*: 25th December, 2020 -+ *Version*: 2.12.3 ++ *Last Build*: 26th December, 2020 ++ *Version*: 2.12.4 + *Copyright*: Copyright (C) 2015 - 2021 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt -+ *Line count*: **290893** -+ *Field count*: **1601** -+ *File count*: **1923** -+ *Folder count*: **316** ++ *Line count*: **291286** ++ *Field count*: **1609** ++ *File count*: **1933** ++ *Folder count*: **322** > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](http://joomlacomponentbuilder.com). > Developed by [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) diff --git a/admin/README.txt b/admin/README.txt index 5445542ac..dcffd2914 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -12,7 +12,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will save you lots of time and money. A real must have! -You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.12.3) with **ALL** its features and **ALL** concepts totally open-source and free! +You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.12.4) with **ALL** its features and **ALL** concepts totally open-source and free! > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45) @@ -143,14 +143,14 @@ 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*: 25th December, 2020 -+ *Version*: 2.12.3 ++ *Last Build*: 26th December, 2020 ++ *Version*: 2.12.4 + *Copyright*: Copyright (C) 2015 - 2021 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt -+ *Line count*: **290893** -+ *Field count*: **1601** -+ *File count*: **1923** -+ *Folder count*: **316** ++ *Line count*: **291286** ++ *Field count*: **1609** ++ *File count*: **1933** ++ *Folder count*: **322** > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](http://joomlacomponentbuilder.com). > Developed by [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) diff --git a/admin/compiler/joomla_3/Helper.php b/admin/compiler/joomla_3/Helper.php index 5d0f8e464..c6bc0a246 100644 --- a/admin/compiler/joomla_3/Helper.php +++ b/admin/compiler/joomla_3/Helper.php @@ -17,10 +17,7 @@ defined('_JEXEC') or die('Restricted access'); // No direct access to this file defined('_JEXEC') or die('Restricted access'); -use Joomla\CMS\Language\Language; -use Joomla\Registry\Registry; -use Joomla\String\StringHelper; -use Joomla\Utilities\ArrayHelper;###ADMIN_HELPER_CLASS_HEADER### +###ADMIN_HELPER_CLASS_HEADER### /** * ###Component### component helper. diff --git a/admin/compiler/joomla_3/Helper_site.php b/admin/compiler/joomla_3/Helper_site.php index c3e36bd54..74253b4f5 100644 --- a/admin/compiler/joomla_3/Helper_site.php +++ b/admin/compiler/joomla_3/Helper_site.php @@ -17,10 +17,7 @@ defined('_JEXEC') or die('Restricted access'); // No direct access to this file defined('_JEXEC') or die('Restricted access'); -use Joomla\CMS\Language\Language; -use Joomla\Registry\Registry; -use Joomla\String\StringHelper; -use Joomla\Utilities\ArrayHelper;###SITE_HELPER_CLASS_HEADER### +###SITE_HELPER_CLASS_HEADER### /** * ###Component### component helper diff --git a/admin/compiler/joomla_3/component_admin.php b/admin/compiler/joomla_3/component_admin.php index 9042de527..cc087fc90 100644 --- a/admin/compiler/joomla_3/component_admin.php +++ b/admin/compiler/joomla_3/component_admin.php @@ -16,7 +16,8 @@ defined('_JEXEC') or die('Restricted access'); // No direct access to this file defined('_JEXEC') or die('Restricted access'); -JHtml::_('behavior.tabstate'); + +###ADMIN_COMPONENT_HEADER### // Access check. if (!JFactory::getUser()->authorise('core.manage', 'com_###component###')) diff --git a/admin/compiler/joomla_3/component_site.php b/admin/compiler/joomla_3/component_site.php index 5c71c50ac..96dd8a93d 100644 --- a/admin/compiler/joomla_3/component_site.php +++ b/admin/compiler/joomla_3/component_site.php @@ -16,7 +16,8 @@ defined('_JEXEC') or die('Restricted access'); // No direct access to this file defined('_JEXEC') or die('Restricted access'); -JHtml::_('behavior.tabstate'); + +###SITE_COMPONENT_HEADER### // Set the component css/js $document = JFactory::getDocument(); @@ -24,7 +25,7 @@ $document->addStyleSheet('components/com_###component###/assets/css/site.css'); $document->addScript('components/com_###component###/assets/js/site.js'); // Require helper files -JLoader::register('###Component###Helper', __DIR__ . '/helpers/###component###.php'); ###HELPER_EMAIL### +JLoader::register('###Component###Helper', __DIR__ . '/helpers/###component###.php');###HELPER_EMAIL### JLoader::register('###Component###HelperRoute', __DIR__ . '/helpers/route.php');###LICENSE_LOCKED_INT### ###SITE_GLOBAL_EVENT### // Get an instance of the controller prefixed by ###Component### diff --git a/admin/componentbuilder.php b/admin/componentbuilder.php index 7a21a8b8a..406f397a7 100644 --- a/admin/componentbuilder.php +++ b/admin/componentbuilder.php @@ -11,6 +11,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); + JHtml::_('behavior.tabstate'); // Access check. diff --git a/admin/helpers/compiler/a_Get.php b/admin/helpers/compiler/a_Get.php index 7da842db6..e6463e52d 100644 --- a/admin/helpers/compiler/a_Get.php +++ b/admin/helpers/compiler/a_Get.php @@ -6496,7 +6496,8 @@ class Get public function setLang($string) { // this is there to insure we dont break already added Language strings - if (ComponentbuilderHelper::safeString($string, 'U', '_', false, false) === $string) + if (ComponentbuilderHelper::safeString($string, 'U', '_', false, false) + === $string) { return false; } diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php index 2e646ae60..4f9c46522 100644 --- a/admin/helpers/compiler/e_Interpretation.php +++ b/admin/helpers/compiler/e_Interpretation.php @@ -466,27 +466,6 @@ class Interpretation extends Fields return implode(PHP_EOL, $bool); } - /** - * set Helper Dynamic Headers - * - * @param string $target_client - * - * @return string - */ - public function setHelperClassHeader($target_client) - { - $header = ''; - // add only to admin client - if ('admin' === $target_client && $this->addEximport) - { - $header .= PHP_EOL . 'use PhpOffice\PhpSpreadsheet\IOFactory;'; - $header .= PHP_EOL . 'use PhpOffice\PhpSpreadsheet\Spreadsheet;'; - $header .= PHP_EOL . 'use PhpOffice\PhpSpreadsheet\Writer\Xlsx;'; - } - - return $header; - } - /** * set Helper License Lock * @@ -8524,7 +8503,8 @@ class Interpretation extends Fields if ($this->addAssetsTableFix == 2) { // get the type we will convert to - $data_type = ($this->accessWorseCase > 64000) ? "MEDIUMTEXT" : "TEXT"; + $data_type = ($this->accessWorseCase > 64000) ? "MEDIUMTEXT" + : "TEXT"; // the if statement about $rule_length $codeIF = "\$rule_length <= " . $this->accessWorseCase; // fix column size @@ -8534,7 +8514,8 @@ class Interpretation extends Fields $script[] = $this->_t(5) . '$fix_rules_size = "ALTER TABLE `#__assets` CHANGE `rules` `rules` ' . $data_type - . ' NOT NULL COMMENT \'JSON encoded access control. Enlarged to ' . $data_type . ' by JCB\';";'; + . ' NOT NULL COMMENT \'JSON encoded access control. Enlarged to ' + . $data_type . ' by JCB\';";'; $script[] = $this->_t(5) . "\$db->setQuery(\$fix_rules_size);"; $script[] = $this->_t(5) . "\$db->execute();"; $codeA = implode(PHP_EOL, $script); @@ -22117,7 +22098,7 @@ class Interpretation extends Fields } /** - * Build headers for the model/view/controller headers + * Build headers for the various files * * @param string $context The name of the context * @param string $viewsCodeName The view or views name @@ -22125,12 +22106,25 @@ class Interpretation extends Fields * @return string The php to place in the header * */ - public function setClassHeaders($context, $viewsCodeName) + public function setFileHeader($context, $viewsCodeName) { // set the defaults $headers = array(); switch ($context) { + case 'admin.component': + case 'site.component': + $headers[] = 'JHtml::_(\'behavior.tabstate\');'; + break; + case 'admin.helper': + case 'site.helper': + $headers[] = 'use Joomla\CMS\Language\Language;'; + $headers[] = 'use Joomla\Registry\Registry;'; + $headers[] = 'use Joomla\String\StringHelper;'; + $headers[] = 'use Joomla\Utilities\ArrayHelper;'; + // load the internal custom headers + $this->setHelperClassHeader($headers, $viewsCodeName); + break; case 'admin.view.model': case 'site.admin.view.model': $headers[] = 'use Joomla\Registry\Registry;'; @@ -22185,6 +22179,25 @@ class Interpretation extends Fields return ''; } + /** + * set Helper Dynamic Headers + * + * @param array $headers The headers array + * @param string $target_client + * + * @return void + */ + protected function setHelperClassHeader(&$headers, $target_client) + { + // add only to admin client + if ('admin' === $target_client && $this->addEximport) + { + $headers[] = 'use PhpOffice\PhpSpreadsheet\IOFactory;'; + $headers[] = 'use PhpOffice\PhpSpreadsheet\Spreadsheet;'; + $headers[] = 'use PhpOffice\PhpSpreadsheet\Writer\Xlsx;'; + } + } + /** * Build chosen multi selection headers for the view * @@ -27189,7 +27202,7 @@ function vdm_dkim() { { // get the worse case column size required (can be worse I know) // access/action size x 20 characters x 8 groups - $character_length = (int) ComponentbuilderHelper::bcmath( + $character_length = (int) ComponentbuilderHelper::bcmath( 'mul', $this->accessSize, 20, 0 ); $this->accessWorseCase = (int) ComponentbuilderHelper::bcmath( diff --git a/admin/helpers/compiler/f_Infusion.php b/admin/helpers/compiler/f_Infusion.php index b3de13c1c..f6893f3b5 100644 --- a/admin/helpers/compiler/f_Infusion.php +++ b/admin/helpers/compiler/f_Infusion.php @@ -634,21 +634,21 @@ class Infusion extends Interpretation // SITE_ADMIN_VIEW_CONTROLLER_HEADER <<>> add the header details for the controller $this->fileContentDynamic[$nameSingleCode][$this->hhh . 'SITE_ADMIN_VIEW_CONTROLLER_HEADER' . $this->hhh] - = $this->setClassHeaders( + = $this->setFileHeader( 'site.admin.view.controller', $nameSingleCode ); // SITE_ADMIN_VIEW_MODEL_HEADER <<>> add the header details for the model $this->fileContentDynamic[$nameSingleCode][$this->hhh . 'SITE_ADMIN_VIEW_MODEL_HEADER' . $this->hhh] - = $this->setClassHeaders( + = $this->setFileHeader( 'site.admin.view.model', $nameSingleCode ); // SITE_ADMIN_VIEW_HEADER <<>> add the header details for the view $this->fileContentDynamic[$nameSingleCode][$this->hhh . 'SITE_ADMIN_VIEW_HEADER' . $this->hhh] - = $this->setClassHeaders( + = $this->setFileHeader( 'site.admin.view', $nameSingleCode ); @@ -664,20 +664,20 @@ class Infusion extends Interpretation // ADMIN_VIEW_CONTROLLER_HEADER <<>> add the header details for the controller $this->fileContentDynamic[$nameSingleCode][$this->hhh . 'ADMIN_VIEW_CONTROLLER_HEADER' . $this->hhh] - = $this->setClassHeaders( + = $this->setFileHeader( 'admin.view.controller', $nameSingleCode ); // ADMIN_VIEW_MODEL_HEADER <<>> add the header details for the model $this->fileContentDynamic[$nameSingleCode][$this->hhh . 'ADMIN_VIEW_MODEL_HEADER' . $this->hhh] - = $this->setClassHeaders( + = $this->setFileHeader( 'admin.view.model', $nameSingleCode ); // ADMIN_VIEW_HEADER <<>> add the header details for the view $this->fileContentDynamic[$nameSingleCode][$this->hhh . 'ADMIN_VIEW_HEADER' . $this->hhh] - = $this->setClassHeaders( + = $this->setFileHeader( 'admin.view', $nameSingleCode ); @@ -1036,20 +1036,20 @@ class Infusion extends Interpretation // ADMIN_VIEWS_CONTROLLER_HEADER <<>> add the header details for the controller $this->fileContentDynamic[$nameListCode][$this->hhh . 'ADMIN_VIEWS_CONTROLLER_HEADER' . $this->hhh] - = $this->setClassHeaders( + = $this->setFileHeader( 'admin.views.controller', $nameListCode ); // ADMIN_VIEWS_MODEL_HEADER <<>> add the header details for the model $this->fileContentDynamic[$nameListCode][$this->hhh . 'ADMIN_VIEWS_MODEL_HEADER' . $this->hhh] - = $this->setClassHeaders( + = $this->setFileHeader( 'admin.views.model', $nameListCode ); // ADMIN_VIEWS_HEADER <<>> add the header details for the views $this->fileContentDynamic[$nameListCode][$this->hhh . 'ADMIN_VIEWS_HEADER' . $this->hhh] - = $this->setClassHeaders( + = $this->setFileHeader( 'admin.views', $nameListCode ); @@ -1264,21 +1264,6 @@ class Infusion extends Interpretation // setup the layouts $this->setCustomViewLayouts(); - // ADMIN_HELPER_CLASS_HEADER - $this->fileContentStatic[$this->hhh . 'ADMIN_HELPER_CLASS_HEADER' - . $this->hhh] - = $this->setHelperClassHeader('admin'); - - // SITE_HELPER_CLASS_HEADER - $this->fileContentStatic[$this->hhh . 'SITE_HELPER_CLASS_HEADER' - . $this->hhh] - = $this->setHelperClassHeader('site'); - - // HELPER_EXEL - $this->fileContentStatic[$this->hhh . 'HELPER_EXEL' - . $this->hhh] - = $this->setHelperExelMethods(); - // setup custom_admin_views and all needed stuff for the site if (isset($this->componentData->custom_admin_views) && ComponentbuilderHelper::checkArray( @@ -1512,20 +1497,20 @@ class Infusion extends Interpretation // CUSTOM_ADMIN_VIEW_CONTROLLER_HEADER <<>> add the header details for the controller $this->fileContentDynamic[$view['settings']->code][$this->hhh . 'CUSTOM_ADMIN_VIEW_CONTROLLER_HEADER' . $this->hhh] - = $this->setClassHeaders( + = $this->setFileHeader( 'custom.admin.view.controller', $view['settings']->code ); // CUSTOM_ADMIN_VIEW_MODEL_HEADER <<>> add the header details for the model $this->fileContentDynamic[$view['settings']->code][$this->hhh . 'CUSTOM_ADMIN_VIEW_MODEL_HEADER' . $this->hhh] - = $this->setClassHeaders( + = $this->setFileHeader( 'custom.admin.view.model', $view['settings']->code ); // CUSTOM_ADMIN_VIEW_HEADER <<>> add the header details for the view $this->fileContentDynamic[$view['settings']->code][$this->hhh . 'CUSTOM_ADMIN_VIEW_HEADER' . $this->hhh] - = $this->setClassHeaders( + = $this->setFileHeader( 'custom.admin.view', $view['settings']->code ); } @@ -1534,20 +1519,20 @@ class Infusion extends Interpretation // CUSTOM_ADMIN_VIEWS_CONTROLLER_HEADER <<>> add the header details for the controller $this->fileContentDynamic[$view['settings']->code][$this->hhh . 'CUSTOM_ADMIN_VIEWS_CONTROLLER_HEADER' . $this->hhh] - = $this->setClassHeaders( + = $this->setFileHeader( 'custom.admin.views.controller', $view['settings']->code ); // CUSTOM_ADMIN_VIEWS_MODEL_HEADER <<>> add the header details for the model $this->fileContentDynamic[$view['settings']->code][$this->hhh . 'CUSTOM_ADMIN_VIEWS_MODEL_HEADER' . $this->hhh] - = $this->setClassHeaders( + = $this->setFileHeader( 'custom.admin.views.model', $view['settings']->code ); // CUSTOM_ADMIN_VIEWS_HEADER <<>> add the header details for the view $this->fileContentDynamic[$view['settings']->code][$this->hhh . 'CUSTOM_ADMIN_VIEWS_HEADER' . $this->hhh] - = $this->setClassHeaders( + = $this->setFileHeader( 'custom.admin.views', $view['settings']->code ); } @@ -1567,6 +1552,39 @@ class Infusion extends Interpretation $this->setCustomViewLayouts(); } + // ADMIN_HELPER_CLASS_HEADER + $this->fileContentStatic[$this->hhh . 'ADMIN_HELPER_CLASS_HEADER' + . $this->hhh] + = $this->setFileHeader( + 'admin.helper', 'admin' + ); + + // ADMIN_COMPONENT_HEADER + $this->fileContentStatic[$this->hhh . 'ADMIN_COMPONENT_HEADER' + . $this->hhh] + = $this->setFileHeader( + 'admin.component', 'admin' + ); + + // SITE_HELPER_CLASS_HEADER + $this->fileContentStatic[$this->hhh . 'SITE_HELPER_CLASS_HEADER' + . $this->hhh] + = $this->setFileHeader( + 'site.helper', 'site' + ); + + // SITE_COMPONENT_HEADER + $this->fileContentStatic[$this->hhh . 'SITE_COMPONENT_HEADER' + . $this->hhh] + = $this->setFileHeader( + 'site.component', 'site' + ); + + // HELPER_EXEL + $this->fileContentStatic[$this->hhh . 'HELPER_EXEL' + . $this->hhh] + = $this->setHelperExelMethods(); + // VIEWARRAY $this->fileContentStatic[$this->hhh . 'VIEWARRAY' . $this->hhh] = PHP_EOL . implode("," . PHP_EOL, $viewarray); @@ -1995,20 +2013,20 @@ class Infusion extends Interpretation // SITE_VIEW_CONTROLLER_HEADER <<>> add the header details for the model $this->fileContentDynamic[$view['settings']->code][$this->hhh . 'SITE_VIEW_CONTROLLER_HEADER' . $this->hhh] - = $this->setClassHeaders( + = $this->setFileHeader( 'site.view.controller', $view['settings']->code ); } // SITE_VIEW_MODEL_HEADER <<>> add the header details for the model $this->fileContentDynamic[$view['settings']->code][$this->hhh . 'SITE_VIEW_MODEL_HEADER' . $this->hhh] - = $this->setClassHeaders( + = $this->setFileHeader( 'site.view.model', $view['settings']->code ); // SITE_VIEW_HEADER <<>> add the header details for the view $this->fileContentDynamic[$view['settings']->code][$this->hhh . 'SITE_VIEW_HEADER' . $this->hhh] - = $this->setClassHeaders( + = $this->setFileHeader( 'site.view', $view['settings']->code ); } @@ -2023,20 +2041,20 @@ class Infusion extends Interpretation // SITE_VIEW_CONTROLLER_HEADER <<>> add the header details for the model $this->fileContentDynamic[$view['settings']->code][$this->hhh . 'SITE_VIEW_CONTROLLER_HEADER' . $this->hhh] - = $this->setClassHeaders( + = $this->setFileHeader( 'site.views.controller', $view['settings']->code ); } // SITE_VIEWS_MODEL_HEADER <<>> add the header details for the model $this->fileContentDynamic[$view['settings']->code][$this->hhh . 'SITE_VIEWS_MODEL_HEADER' . $this->hhh] - = $this->setClassHeaders( + = $this->setFileHeader( 'site.views.model', $view['settings']->code ); // SITE_VIEWS_HEADER <<>> add the header details for the view $this->fileContentDynamic[$view['settings']->code][$this->hhh . 'SITE_VIEWS_HEADER' . $this->hhh] - = $this->setClassHeaders( + = $this->setFileHeader( 'site.views', $view['settings']->code ); } diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php index a711f945b..f7daa91fe 100644 --- a/admin/helpers/componentbuilder.php +++ b/admin/helpers/componentbuilder.php @@ -12,9 +12,9 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -use Joomla\CMS\Language\Language; -use Joomla\Registry\Registry; -use Joomla\String\StringHelper; +use Joomla\CMS\Language\Language; +use Joomla\Registry\Registry; +use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; use PhpOffice\PhpSpreadsheet\IOFactory; use PhpOffice\PhpSpreadsheet\Spreadsheet; diff --git a/componentbuilder.xml b/componentbuilder.xml index 7f60efd09..6cab4435a 100644 --- a/componentbuilder.xml +++ b/componentbuilder.xml @@ -1,15 +1,15 @@ COM_COMPONENTBUILDER - 25th December, 2020 + 26th December, 2020 Llewellyn van der Merwe llewellyn@joomlacomponentbuilder.com http://www.joomlacomponentbuilder.com Copyright (C) 2015 - 2021 Vast Development Method. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - 2.12.3 + 2.12.4 Component Builder (v.2.12.3) +

Component Builder (v.2.12.4)

The Component Builder for [Joomla](https://extensions.joomla.org/extension/component-builder/) is highly advanced tool that is truly able to build extremely complex components in a fraction of the time. diff --git a/componentbuilder_update_server.xml b/componentbuilder_update_server.xml index 7a1ba48f1..38a19473d 100644 --- a/componentbuilder_update_server.xml +++ b/componentbuilder_update_server.xml @@ -993,7 +993,7 @@ 2.12.1 http://www.joomlacomponentbuilder.com - https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.12.3/JCB_v2.12.3.zip + https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.12.4/JCB_v2.12.4.zip stable @@ -1007,10 +1007,10 @@ Builds Complex Joomla Components com_componentbuilder component - 2.12.3 + 2.12.4 http://www.joomlacomponentbuilder.com - https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.12.3/JCB_v2.12.3.zip + https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.12.4/JCB_v2.12.4.zip stable diff --git a/script.php b/script.php index 0fa89fe2a..cc1b57111 100644 --- a/script.php +++ b/script.php @@ -9250,7 +9250,7 @@ class com_componentbuilderInstallerScript echo ' -

Upgrade to Version 2.12.3 Was Successful! Let us know if anything is not working as expected.

'; +

Upgrade to Version 2.12.4 Was Successful! Let us know if anything is not working as expected.

'; // Set db if not set already. if (!isset($db)) diff --git a/site/componentbuilder.php b/site/componentbuilder.php index 728862c39..e0e6f10c1 100644 --- a/site/componentbuilder.php +++ b/site/componentbuilder.php @@ -11,6 +11,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); + JHtml::_('behavior.tabstate'); // Set the component css/js @@ -19,7 +20,7 @@ $document->addStyleSheet('components/com_componentbuilder/assets/css/site.css'); $document->addScript('components/com_componentbuilder/assets/js/site.js'); // Require helper files -JLoader::register('ComponentbuilderHelper', __DIR__ . '/helpers/componentbuilder.php'); +JLoader::register('ComponentbuilderHelper', __DIR__ . '/helpers/componentbuilder.php'); JLoader::register('ComponentbuilderEmail', JPATH_COMPONENT_ADMINISTRATOR . '/helpers/componentbuilderemail.php'); JLoader::register('ComponentbuilderHelperRoute', __DIR__ . '/helpers/route.php'); diff --git a/site/helpers/componentbuilder.php b/site/helpers/componentbuilder.php index 0ebe91e25..3792da2a9 100644 --- a/site/helpers/componentbuilder.php +++ b/site/helpers/componentbuilder.php @@ -12,9 +12,9 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -use Joomla\CMS\Language\Language; -use Joomla\Registry\Registry; -use Joomla\String\StringHelper; +use Joomla\CMS\Language\Language; +use Joomla\Registry\Registry; +use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /**