From 91df280520e272dd7894a38a666199fd698de687 Mon Sep 17 00:00:00 2001 From: aB0t Date: Wed, 20 Mar 2024 14:19:16 +0200 Subject: [PATCH] Release of v3.2.0-beta8 Add Factory class to the J5 Event class. #1093. --- CHANGELOG.md | 4 ++++ README.md | 10 +++++----- admin/README.txt | 10 +++++----- admin/models/fields/customfilelist.php | 15 ++++++--------- admin/models/forms/component_placeholders.xml | 15 ++++++++------- admin/models/forms/placeholder.xml | 15 ++++++++------- admin/models/placeholder.php | 12 ------------ admin/models/placeholders.php | 4 ---- admin/sql/updates/mysql/3.2.0-beta7.sql | 1 + admin/views/field/view.html.php | 4 ++-- componentbuilder.xml | 6 +++--- componentbuilder_update_server.xml | 18 ++++++++++++++++++ .../Compiler/JoomlaFive/Event.php | 1 + .../VDM.Joomla/src/Componentbuilder/Table.php | 4 ++-- script.php | 2 +- 15 files changed, 64 insertions(+), 57 deletions(-) create mode 100644 admin/sql/updates/mysql/3.2.0-beta7.sql diff --git a/CHANGELOG.md b/CHANGELOG.md index 71b6961cc..4fcbabbc6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# v3.2.0-beta8 + +- Add Factory class to the J5 Event class. #1093 + # v3.2.0-beta7 - Fix plugin field selection diff --git a/README.md b/README.md index 3aa4607c1..7dd323cf1 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,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 [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (3.2.0-beta7) with **ALL** its features and **ALL** concepts totally open-source and free! +You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (3.2.0-beta8) 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) @@ -144,13 +144,13 @@ TODO + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Component Builder](https://git.vdm.dev/joomla/Component-Builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 15th March, 2024 -+ *Version*: 3.2.0-beta7 ++ *Last Build*: 20th March, 2024 ++ *Version*: 3.2.0-beta8 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt -+ *Line count*: **738854** ++ *Line count*: **738862** + *Field count*: **2078** -+ *File count*: **5201** ++ *File count*: **5202** + *Folder count*: **459** > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](https://www.joomlacomponentbuilder.com). diff --git a/admin/README.txt b/admin/README.txt index 3aa4607c1..7dd323cf1 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -9,7 +9,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 [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (3.2.0-beta7) with **ALL** its features and **ALL** concepts totally open-source and free! +You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (3.2.0-beta8) 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) @@ -144,13 +144,13 @@ TODO + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Component Builder](https://git.vdm.dev/joomla/Component-Builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 15th March, 2024 -+ *Version*: 3.2.0-beta7 ++ *Last Build*: 20th March, 2024 ++ *Version*: 3.2.0-beta8 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt -+ *Line count*: **738854** ++ *Line count*: **738862** + *Field count*: **2078** -+ *File count*: **5201** ++ *File count*: **5202** + *Folder count*: **459** > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](https://www.joomlacomponentbuilder.com). diff --git a/admin/models/fields/customfilelist.php b/admin/models/fields/customfilelist.php index 3ea1c9436..f499158b8 100644 --- a/admin/models/fields/customfilelist.php +++ b/admin/models/fields/customfilelist.php @@ -40,24 +40,21 @@ class JFormFieldCustomfilelist extends JFormFieldList protected function getOptions() { // get custom folder files - $localfolder = JComponentHelper::getParams('com_componentbuilder')->get('custom_folder_path', JPATH_COMPONENT_ADMINISTRATOR.'/custom'); + $localfolder = \JComponentHelper::getParams('com_componentbuilder')->get('custom_folder_path', JPATH_COMPONENT_ADMINISTRATOR . '/custom'); // set the default - $options[] = JHtml::_('select.option', '', JText::sprintf('COM_COMPONENTBUILDER_PLEASE_ADD_FILES_TO_S',$localfolder)); - // inport all needed classes - jimport('joomla.filesystem.file'); - jimport('joomla.filesystem.folder'); + $options[] = Html::_('select.option', '', Text::sprintf('COM_COMPONENTBUILDER_PLEASE_ADD_FILES_TO_S',$localfolder)); // setup the folder if it does not exist - if (!JFolder::exists($localfolder)) + if (!\JFolder::exists($localfolder)) { - JFolder::create($localfolder); + \JFolder::create($localfolder); } // now check if there are files in the folder - if ($files = JFolder::files($localfolder)) + if ($files = \JFolder::files($localfolder)) { $options = array(); foreach ($files as $file) { - $options[] = JHtml::_('select.option', $file, $file); + $options[] = Html::_('select.option', $file, $file); } } return $options; diff --git a/admin/models/forms/component_placeholders.xml b/admin/models/forms/component_placeholders.xml index ad13fea30..15bd404ee 100644 --- a/admin/models/forms/component_placeholders.xml +++ b/admin/models/forms/component_placeholders.xml @@ -145,19 +145,20 @@ hint="COM_COMPONENTBUILDER_COMPONENT_PLACEHOLDERS_TARGET_HINT" autocomplete="off" /> - + diff --git a/admin/models/forms/placeholder.xml b/admin/models/forms/placeholder.xml index 297138b1b..f5f32f54b 100644 --- a/admin/models/forms/placeholder.xml +++ b/admin/models/forms/placeholder.xml @@ -110,19 +110,20 @@ hint="COM_COMPONENTBUILDER_PLACEHOLDER_TARGET_HINT" autocomplete="off" /> - + diff --git a/admin/models/placeholder.php b/admin/models/placeholder.php index 936c497ba..a7d4787b6 100644 --- a/admin/models/placeholder.php +++ b/admin/models/placeholder.php @@ -163,12 +163,6 @@ class ComponentbuilderModelPlaceholder extends AdminModel $item->metadata = $registry->toArray(); } - if (!empty($item->value)) - { - // base64 Decode value. - $item->value = base64_decode($item->value); - } - if (empty($item->id)) { @@ -899,12 +893,6 @@ class ComponentbuilderModelPlaceholder extends AdminModel // add the padding (needed) $data['target'] = '[[[' . trim($data['target']) . ']]]'; - // Set the value string to base64 string. - if (isset($data['value'])) - { - $data['value'] = base64_encode($data['value']); - } - // Set the Params Items to data if (isset($data['params']) && is_array($data['params'])) { diff --git a/admin/models/placeholders.php b/admin/models/placeholders.php index c3b7e8931..20dd854db 100644 --- a/admin/models/placeholders.php +++ b/admin/models/placeholders.php @@ -142,8 +142,6 @@ class ComponentbuilderModelPlaceholders extends ListModel continue; } - // decode value - $item->value = base64_decode($item->value); } } @@ -309,8 +307,6 @@ class ComponentbuilderModelPlaceholders extends ListModel continue; } - // decode value - $item->value = base64_decode($item->value); // unset the values we don't want exported. unset($item->asset_id); unset($item->checked_out); diff --git a/admin/sql/updates/mysql/3.2.0-beta7.sql b/admin/sql/updates/mysql/3.2.0-beta7.sql new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/admin/sql/updates/mysql/3.2.0-beta7.sql @@ -0,0 +1 @@ + diff --git a/admin/views/field/view.html.php b/admin/views/field/view.html.php index ff1604ebd..1b225e3d0 100644 --- a/admin/views/field/view.html.php +++ b/admin/views/field/view.html.php @@ -219,8 +219,8 @@ class ComponentbuilderViewField extends HtmlView // add return_here $this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) \JUri::getInstance())) . "';"); // add the libs for subform (since not adding it via xml but ajax) - Html::_('jquery.ui', array('core', 'sortable')); - Html::_('script', 'system/subform-repeatable.js', array('version' => 'auto', 'relative' => true)); + Html::_('jquery.ui', array('core', 'sortable')); + Html::_('script', 'system/subform-repeatable.js', array('version' => 'auto', 'relative' => true)); // set some lang Text::script('COM_COMPONENTBUILDER_PROPERTY_ALREADY_SELECTED_TRY_ANOTHER'); Text::script('COM_COMPONENTBUILDER_TYPE_OR_SELECT_SOME_OPTIONS'); diff --git a/componentbuilder.xml b/componentbuilder.xml index 6357bd1a8..671b93fed 100644 --- a/componentbuilder.xml +++ b/componentbuilder.xml @@ -1,15 +1,15 @@ COM_COMPONENTBUILDER - 15th March, 2024 + 20th March, 2024 Llewellyn van der Merwe joomla@vdm.io https://dev.vdm.io Copyright (C) 2015 Vast Development Method. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - 3.2.0-beta7 + 3.2.0-beta8 Component Builder (v.3.2.0-beta7) +

Component Builder (v.3.2.0-beta8)

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 394e8a76a..784eaacfa 100644 --- a/componentbuilder_update_server.xml +++ b/componentbuilder_update_server.xml @@ -1649,4 +1649,22 @@ https://dev.vdm.io + + Component Builder + Builds Complex Joomla Components + pkg_component_builder + package + site + 3.2.0-beta8 + https://dev.vdm.io + + https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v3.2.0-beta8.zip + + + beta + + Llewellyn van der Merwe + https://dev.vdm.io + + \ No newline at end of file diff --git a/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/JoomlaFive/Event.php b/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/JoomlaFive/Event.php index 232fb6221..f38ac5e2d 100644 --- a/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/JoomlaFive/Event.php +++ b/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/JoomlaFive/Event.php @@ -12,6 +12,7 @@ namespace VDM\Joomla\Componentbuilder\Compiler\JoomlaFive; +use Joomla\CMS\Factory; use Joomla\Registry\Registry; use Joomla\CMS\Plugin\PluginHelper; use VDM\Joomla\Utilities\Component\Helper; diff --git a/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Table.php b/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Table.php index 23626f62e..b235f51eb 100644 --- a/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Table.php +++ b/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Table.php @@ -4056,10 +4056,10 @@ class Table extends BaseTable implements Tableinterface 'value' => [ 'name' => 'value', 'label' => 'COM_COMPONENTBUILDER_PLACEHOLDER_VALUE_LABEL', - 'type' => 'text', + 'type' => 'textarea', 'title' => false, 'list' => 'placeholders', - 'store' => 'base64', + 'store' => NULL, 'tab_name' => 'Details', ], ], diff --git a/script.php b/script.php index 7f0faac88..852dda463 100644 --- a/script.php +++ b/script.php @@ -9618,7 +9618,7 @@ class Com_ComponentbuilderInstallerScript echo '

-

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

'; +

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

'; // Set db if not set already. if (!isset($db))