From 543fb2b2e2eb8c755993fc851c8c23f64aa1cab7 Mon Sep 17 00:00:00 2001 From: aB0t Date: Wed, 20 Mar 2024 15:35:43 +0200 Subject: [PATCH] Release of v4.0.0-alpha6 Fix [Set String Value] in placeholder table to store the value as a base64 string. --- CHANGELOG.md | 8 +++++-- ComponentbuilderInstallerScript.php | 2 +- README.md | 8 +++---- admin/README.txt | 8 +++---- .../{3.2.0-beta8.sql => 3.2.0-beta9.sql} | 0 admin/sql/updates/mysql/4.0.0-alpha5.sql | 1 + admin/src/Model/PlaceholderModel.php | 12 ++++++++++ admin/src/Model/PlaceholdersModel.php | 4 ++++ componentbuilder.xml | 4 ++-- componentbuilder_update_server.xml | 22 +++++++++++++++++-- .../VDM.Joomla/src/Componentbuilder/Table.php | 2 +- 11 files changed, 55 insertions(+), 16 deletions(-) rename admin/sql/updates/mysql/{3.2.0-beta8.sql => 3.2.0-beta9.sql} (100%) create mode 100644 admin/sql/updates/mysql/4.0.0-alpha5.sql diff --git a/CHANGELOG.md b/CHANGELOG.md index 3fc4cc173..840cc9179 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# v4.0.0-alpha6 + +- Fix [Set String Value] in placeholder table to store the value as a base64 string. + # v4.0.0-alpha5 - Add Factory class to the J5 Event class. #1093 @@ -25,6 +29,6 @@ - First alpha release of Component Builder towards Joomla 4 (very unstable...) -# v3.2.0-beta8 +# v3.2.0-beta9 -- Add Factory class to the J5 Event class. #1093 \ No newline at end of file +- Fix [Set String Value] in placeholder table to store the value as a base64 string. \ No newline at end of file diff --git a/ComponentbuilderInstallerScript.php b/ComponentbuilderInstallerScript.php index 494fb5af5..f8a3b7e91 100644 --- a/ComponentbuilderInstallerScript.php +++ b/ComponentbuilderInstallerScript.php @@ -3165,7 +3165,7 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface echo '
-

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

'; +

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

'; // Add/Update component in the action logs extensions table. $this->setActionLogsExtensions(); diff --git a/README.md b/README.md index cce2ac61d..7a75b0ea7 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 (4.0.0-alpha5) 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 (4.0.0-alpha6) 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) @@ -145,12 +145,12 @@ TODO + *Name*: [Component Builder](https://git.vdm.dev/joomla/Component-Builder) + *First Build*: 30th April, 2015 + *Last Build*: 20th March, 2024 -+ *Version*: 4.0.0-alpha5 ++ *Version*: 4.0.0-alpha6 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt -+ *Line count*: **725003** ++ *Line count*: **725042** + *Field count*: **2078** -+ *File count*: **5119** ++ *File count*: **5120** + *Folder count*: **518** > 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 cce2ac61d..7a75b0ea7 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 (4.0.0-alpha5) 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 (4.0.0-alpha6) 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) @@ -145,12 +145,12 @@ TODO + *Name*: [Component Builder](https://git.vdm.dev/joomla/Component-Builder) + *First Build*: 30th April, 2015 + *Last Build*: 20th March, 2024 -+ *Version*: 4.0.0-alpha5 ++ *Version*: 4.0.0-alpha6 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt -+ *Line count*: **725003** ++ *Line count*: **725042** + *Field count*: **2078** -+ *File count*: **5119** ++ *File count*: **5120** + *Folder count*: **518** > 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/sql/updates/mysql/3.2.0-beta8.sql b/admin/sql/updates/mysql/3.2.0-beta9.sql similarity index 100% rename from admin/sql/updates/mysql/3.2.0-beta8.sql rename to admin/sql/updates/mysql/3.2.0-beta9.sql diff --git a/admin/sql/updates/mysql/4.0.0-alpha5.sql b/admin/sql/updates/mysql/4.0.0-alpha5.sql new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/admin/sql/updates/mysql/4.0.0-alpha5.sql @@ -0,0 +1 @@ + diff --git a/admin/src/Model/PlaceholderModel.php b/admin/src/Model/PlaceholderModel.php index 0f07cae82..7935aa1da 100644 --- a/admin/src/Model/PlaceholderModel.php +++ b/admin/src/Model/PlaceholderModel.php @@ -195,6 +195,12 @@ class PlaceholderModel extends AdminModel $item->metadata = $registry->toArray(); } + if (!empty($item->value)) + { + // base64 Decode value. + $item->value = base64_decode($item->value); + } + if (empty($item->id)) { @@ -946,6 +952,12 @@ class PlaceholderModel 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/src/Model/PlaceholdersModel.php b/admin/src/Model/PlaceholdersModel.php index 0027b30e8..672bd971e 100644 --- a/admin/src/Model/PlaceholdersModel.php +++ b/admin/src/Model/PlaceholdersModel.php @@ -192,6 +192,8 @@ class PlaceholdersModel extends ListModel continue; } + // decode value + $item->value = base64_decode($item->value); } } @@ -358,6 +360,8 @@ class PlaceholdersModel 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/componentbuilder.xml b/componentbuilder.xml index 33ca1a083..d03fedd36 100644 --- a/componentbuilder.xml +++ b/componentbuilder.xml @@ -7,9 +7,9 @@ https://dev.vdm.io Copyright (C) 2015 Vast Development Method. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - 4.0.0-alpha5 + 4.0.0-alpha6 Component Builder (v.4.0.0-alpha5) +

Component Builder (v.4.0.0-alpha6)

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 5e6873f38..8c566dadf 100644 --- a/componentbuilder_update_server.xml +++ b/componentbuilder_update_server.xml @@ -5,10 +5,10 @@ pkg_component_builder package site - 3.2.0-beta8 + 3.2.0-beta9 https://dev.vdm.io - https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v3.2.0-beta8.zip + https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v3.2.0-beta9.zip beta @@ -107,4 +107,22 @@ https://dev.vdm.io + + Component Builder + Builds Complex Joomla Components + pkg_component_builder + package + site + 4.0.0-alpha6 + https://dev.vdm.io + + https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v4.0.0-alpha6.zip + + + alpha + + Llewellyn van der Merwe + https://dev.vdm.io + + \ No newline at end of file diff --git a/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Table.php b/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Table.php index b235f51eb..a69d9af12 100644 --- a/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Table.php +++ b/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Table.php @@ -4059,7 +4059,7 @@ class Table extends BaseTable implements Tableinterface 'type' => 'textarea', 'title' => false, 'list' => 'placeholders', - 'store' => NULL, + 'store' => 'base64', 'tab_name' => 'Details', ], ],