From 7a680bb734846e4938897ba97302c083610a7c0a Mon Sep 17 00:00:00 2001
From: aB0t
Date: Fri, 21 Jun 2024 01:32:05 +0200
Subject: [PATCH] Release of v3.2.2-alpha5
Add repositories for better integration with gitea. Refactored the Data classes. Add new Data classes.
---
CHANGELOG.md | 9 +-
README.md | 14 +-
admin/README.txt | 14 +-
admin/access.xml | 23 +
admin/assets/css/repositories.css | 13 +
admin/assets/css/repository.css | 13 +
admin/assets/images/icons/repositories.png | Bin 0 -> 20768 bytes
admin/config.xml | 139 +-
admin/controller.php | 1 +
admin/controllers/repositories.php | 50 +
admin/controllers/repository.php | 329 ++++
admin/helpers/componentbuilder.php | 4 +
.../en-GB/en-GB.com_componentbuilder.ini | 188 +-
.../en-GB/en-GB.com_componentbuilder.sys.ini | 24 +
admin/layouts/field/database_right.php | 1 -
admin/layouts/fieldtype/fields_fullwidth.php | 2 +-
.../joomla_component/details_right.php | 6 -
admin/layouts/repository/details_above.php | 46 +
admin/layouts/repository/details_left.php | 45 +
admin/layouts/repository/details_right.php | 45 +
.../layouts/repository}/index.html | 0
admin/layouts/repository/publishing.php | 47 +
admin/layouts/repository/publlshing.php | 47 +
admin/models/componentbuilder.php | 7 +-
admin/models/field.php | 61 +-
admin/models/fields.php | 13 +-
.../models/fields/repositoriesfilterbase.php | 71 +
.../fields/repositoriesfilterorganisation.php | 71 +
.../fields/repositoriesfilterrepository.php | 71 +
.../fields/repositoriesfiltertarget.php | 75 +
admin/models/fields/superpowerpaths.php | 83 +-
admin/models/fieldtype.php | 13 +-
admin/models/forms/field.xml | 100 +-
admin/models/forms/fieldtype.xml | 2 -
admin/models/forms/filter_repositories.xml | 103 +
admin/models/forms/joomla_component.xml | 1553 +++++++--------
admin/models/forms/repository.xml | 302 +++
admin/models/joomla_component.php | 312 ++-
admin/models/joomla_components.php | 65 +-
admin/models/powers.php | 70 +-
admin/models/repositories.php | 464 +++++
admin/models/repository.php | 916 +++++++++
admin/sql/install.mysql.utf8.sql | 114 +-
admin/sql/uninstall.mysql.utf8.sql | 1 +
admin/tables/repository.php | 336 ++++
admin/views/admin_view/tmpl/edit.php | 368 ++--
admin/views/class_method/tmpl/edit.php | 10 +-
admin/views/class_property/tmpl/edit.php | 10 +-
admin/views/custom_admin_view/tmpl/edit.php | 100 +-
admin/views/custom_code/tmpl/edit.php | 144 +-
admin/views/dynamic_get/tmpl/edit.php | 454 ++---
admin/views/field/tmpl/edit.php | 118 +-
admin/views/fieldtype/tmpl/edit.php | 378 ++--
admin/views/fieldtype/view.html.php | 2 +-
admin/views/help_document/tmpl/edit.php | 90 +-
admin/views/joomla_component/tmpl/edit.php | 178 +-
admin/views/joomla_module/tmpl/edit.php | 174 +-
admin/views/joomla_plugin/tmpl/edit.php | 212 +-
admin/views/layout/tmpl/edit.php | 10 +-
admin/views/library/tmpl/edit.php | 176 +-
admin/views/power/tmpl/edit.php | 10 +-
admin/views/power/view.html.php | 2 +-
.../views/repositories}/index.html | 0
admin/views/repositories/tmpl/default.php | 74 +
.../repositories/tmpl/default_batch_body.php | 21 +
.../tmpl/default_batch_footer.php | 25 +
.../views/repositories/tmpl/default_body.php | 110 ++
.../views/repositories/tmpl/default_foot.php | 18 +
.../views/repositories/tmpl/default_head.php | 65 +
.../repositories/tmpl/default_toolbar.php | 48 +
.../views/repositories/tmpl}/index.html | 0
admin/views/repositories/view.html.php | 328 ++++
admin/views/repository/submitbutton.js | 25 +
admin/views/repository/tmpl/edit.php | 105 +
.../views/repository/tmpl}/index.html | 0
admin/views/repository/view.html.php | 215 ++
admin/views/server/tmpl/edit.php | 86 +-
admin/views/site_view/tmpl/edit.php | 110 +-
admin/views/template/tmpl/edit.php | 10 +-
componentbuilder.xml | 6 +-
componentbuilder_update_server.xml | 6 +-
.../VDM.Joomla/src/Abstraction/Grep.php | 16 +-
.../VDM.Joomla/src/Abstraction/Model.php | 106 +-
.../src/Componentbuilder/Compiler/Config.php | 196 +-
.../src/Componentbuilder/Compiler/Factory.php | 6 +-
.../src/Componentbuilder/Compiler/Power.php | 56 +-
.../Compiler/Service/JoomlaPower.php | 62 +-
.../Compiler/Service/Power.php | 95 +-
.../Interfaces/SuperInterface.php | 52 -
.../Componentbuilder/JoomlaPower/Config.php | 69 +-
.../JoomlaPower/Database/Insert.php | 34 -
.../JoomlaPower/Database/Load.php | 34 -
.../JoomlaPower/Database/Update.php | 34 -
.../Componentbuilder/JoomlaPower/Factory.php | 8 +-
.../src/Componentbuilder/JoomlaPower/Grep.php | 33 +-
.../JoomlaPower/Model/Load.php | 37 -
.../JoomlaPower/Model/Upsert.php | 38 -
.../JoomlaPower/Service/Database.php | 135 --
.../JoomlaPower/Service/JoomlaPower.php | 3 +-
.../Componentbuilder/JoomlaPower/Super.php | 6 +-
.../src/Componentbuilder/Power/Config.php | 148 +-
.../src/Componentbuilder/Power/Factory.php | 8 +-
.../Power/Generator/Search.php | 6 +-
.../src/Componentbuilder/Power/Grep.php | 54 +-
.../Power/Service/Database.php | 135 --
.../Power/Service/Generator.php | 2 +-
.../Componentbuilder/Power/Service/Power.php | 3 +-
.../src/Componentbuilder/Power/Super.php | 168 +-
.../VDM.Joomla/src/Componentbuilder/Table.php | 1746 +++++++++--------
.../Utilities/FilterHelper.php | 36 +
.../Componentbuilder/Utilities/RepoHelper.php | 78 +
.../VDM.Joomla/src/Data/Action/Delete.php | 112 ++
.../Power/Database => Data/Action}/Insert.php | 66 +-
.../Power/Database => Data/Action}/Load.php | 66 +-
.../Power/Database => Data/Action}/Update.php | 88 +-
.../Power/Model => Data/Action}/index.html | 0
.../vendor_jcb/VDM.Joomla/src/Data/Item.php | 254 +++
.../vendor_jcb/VDM.Joomla/src/Data/Items.php | 351 ++++
.../vendor_jcb/VDM.Joomla/src/Data/Remote.php | 169 ++
.../VDM.Joomla/src/Database/Delete.php | 132 ++
.../VDM.Joomla/src/Database/Load.php | 46 +-
.../src/Interfaces/Data/DeleteInterface.php | 60 +
.../Data}/InsertInterface.php | 25 +-
.../src/Interfaces/Data/ItemInterface.php | 86 +
.../src/Interfaces/Data/ItemsInterface.php | 85 +
.../Data}/LoadInterface.php | 31 +-
.../src/Interfaces/Data/RemoteInterface.php | 69 +
.../Data}/UpdateInterface.php | 36 +-
.../VDM.Joomla/src/Interfaces/Data/index.html | 1 +
.../src/Interfaces/DeleteInterface.php | 43 +
.../src/Interfaces/ModelInterface.php | 40 +-
.../Power => }/Model/Load.php | 29 +-
.../Power => }/Model/Upsert.php | 28 +-
.../VDM.Joomla/src/Model/index.html | 1 +
.../VDM.Joomla/src/Service/Data.php | 162 ++
.../Service/Database.php | 19 +-
.../VDM.Joomla/src/Service/Model.php | 75 +
.../VDM.Joomla/src/Service/index.html | 1 +
media/js/admin_view.js | 400 ++--
media/js/class_method.js | 38 +-
media/js/class_property.js | 38 +-
media/js/custom_admin_view.js | 100 +-
media/js/custom_code.js | 84 +-
media/js/dynamic_get.js | 1374 ++++++-------
media/js/field.js | 287 ++-
media/js/fieldtype.js | 826 ++++----
media/js/help_document.js | 304 +--
media/js/joomla_component.js | 219 +--
media/js/joomla_module.js | 166 +-
media/js/joomla_plugin.js | 214 +-
media/js/layout.js | 10 +-
media/js/library.js | 432 ++--
media/js/power.js | 10 +-
media/js/repository.js | 11 +
media/js/server.js | 546 +++---
media/js/site_view.js | 128 +-
media/js/template.js | 10 +-
script.php | 221 ++-
.../en-GB/en-GB.com_componentbuilder.ini | 1 +
159 files changed, 12830 insertions(+), 7619 deletions(-)
create mode 100644 admin/assets/css/repositories.css
create mode 100644 admin/assets/css/repository.css
create mode 100644 admin/assets/images/icons/repositories.png
create mode 100644 admin/controllers/repositories.php
create mode 100644 admin/controllers/repository.php
create mode 100644 admin/layouts/repository/details_above.php
create mode 100644 admin/layouts/repository/details_left.php
create mode 100644 admin/layouts/repository/details_right.php
rename {libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Interfaces/Database => admin/layouts/repository}/index.html (100%)
create mode 100644 admin/layouts/repository/publishing.php
create mode 100644 admin/layouts/repository/publlshing.php
create mode 100644 admin/models/fields/repositoriesfilterbase.php
create mode 100644 admin/models/fields/repositoriesfilterorganisation.php
create mode 100644 admin/models/fields/repositoriesfilterrepository.php
create mode 100644 admin/models/fields/repositoriesfiltertarget.php
create mode 100644 admin/models/forms/filter_repositories.xml
create mode 100644 admin/models/forms/repository.xml
create mode 100644 admin/models/repositories.php
create mode 100644 admin/models/repository.php
create mode 100644 admin/tables/repository.php
rename {libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/JoomlaPower/Database => admin/views/repositories}/index.html (100%)
create mode 100644 admin/views/repositories/tmpl/default.php
create mode 100644 admin/views/repositories/tmpl/default_batch_body.php
create mode 100644 admin/views/repositories/tmpl/default_batch_footer.php
create mode 100644 admin/views/repositories/tmpl/default_body.php
create mode 100644 admin/views/repositories/tmpl/default_foot.php
create mode 100644 admin/views/repositories/tmpl/default_head.php
create mode 100644 admin/views/repositories/tmpl/default_toolbar.php
rename {libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/JoomlaPower/Model => admin/views/repositories/tmpl}/index.html (100%)
create mode 100644 admin/views/repositories/view.html.php
create mode 100644 admin/views/repository/submitbutton.js
create mode 100644 admin/views/repository/tmpl/edit.php
rename {libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Power/Database => admin/views/repository/tmpl}/index.html (100%)
create mode 100644 admin/views/repository/view.html.php
delete mode 100644 libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Interfaces/SuperInterface.php
delete mode 100644 libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/JoomlaPower/Database/Insert.php
delete mode 100644 libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/JoomlaPower/Database/Load.php
delete mode 100644 libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/JoomlaPower/Database/Update.php
delete mode 100644 libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/JoomlaPower/Model/Load.php
delete mode 100644 libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/JoomlaPower/Model/Upsert.php
delete mode 100644 libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/JoomlaPower/Service/Database.php
delete mode 100644 libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Power/Service/Database.php
create mode 100644 libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Utilities/RepoHelper.php
create mode 100644 libraries/vendor_jcb/VDM.Joomla/src/Data/Action/Delete.php
rename libraries/vendor_jcb/VDM.Joomla/src/{Componentbuilder/Power/Database => Data/Action}/Insert.php (66%)
rename libraries/vendor_jcb/VDM.Joomla/src/{Componentbuilder/Power/Database => Data/Action}/Load.php (70%)
rename libraries/vendor_jcb/VDM.Joomla/src/{Componentbuilder/Power/Database => Data/Action}/Update.php (53%)
rename libraries/vendor_jcb/VDM.Joomla/src/{Componentbuilder/Power/Model => Data/Action}/index.html (100%)
create mode 100644 libraries/vendor_jcb/VDM.Joomla/src/Data/Item.php
create mode 100644 libraries/vendor_jcb/VDM.Joomla/src/Data/Items.php
create mode 100644 libraries/vendor_jcb/VDM.Joomla/src/Data/Remote.php
create mode 100644 libraries/vendor_jcb/VDM.Joomla/src/Database/Delete.php
create mode 100644 libraries/vendor_jcb/VDM.Joomla/src/Interfaces/Data/DeleteInterface.php
rename libraries/vendor_jcb/VDM.Joomla/src/{Componentbuilder/Interfaces/Database => Interfaces/Data}/InsertInterface.php (80%)
create mode 100644 libraries/vendor_jcb/VDM.Joomla/src/Interfaces/Data/ItemInterface.php
create mode 100644 libraries/vendor_jcb/VDM.Joomla/src/Interfaces/Data/ItemsInterface.php
rename libraries/vendor_jcb/VDM.Joomla/src/{Componentbuilder/Power/Database => Interfaces/Data}/LoadInterface.php (78%)
create mode 100644 libraries/vendor_jcb/VDM.Joomla/src/Interfaces/Data/RemoteInterface.php
rename libraries/vendor_jcb/VDM.Joomla/src/{Componentbuilder/Interfaces/Database => Interfaces/Data}/UpdateInterface.php (65%)
create mode 100644 libraries/vendor_jcb/VDM.Joomla/src/Interfaces/Data/index.html
create mode 100644 libraries/vendor_jcb/VDM.Joomla/src/Interfaces/DeleteInterface.php
rename libraries/vendor_jcb/VDM.Joomla/src/{Componentbuilder/Power => }/Model/Load.php (84%)
rename libraries/vendor_jcb/VDM.Joomla/src/{Componentbuilder/Power => }/Model/Upsert.php (86%)
create mode 100644 libraries/vendor_jcb/VDM.Joomla/src/Model/index.html
create mode 100644 libraries/vendor_jcb/VDM.Joomla/src/Service/Data.php
rename libraries/vendor_jcb/VDM.Joomla/src/{Componentbuilder => }/Service/Database.php (79%)
create mode 100644 libraries/vendor_jcb/VDM.Joomla/src/Service/Model.php
create mode 100644 libraries/vendor_jcb/VDM.Joomla/src/Service/index.html
create mode 100644 media/js/repository.js
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47d658998..c33b83af7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +1,15 @@
-# v3.2.2-alpha4
+# v3.2.2-alpha5
-- Update the Schema class to also update null mismatching if needed
+- Add repositories for better integration with gitea
+- Refactored the Data classes
+- Add new Data classes
# v3.2.2-alpha
- Fix auto build from SQL in Joomla 4 and 5.
- Fix permission issue for admin views.
-- Add extending options to interfaces.
+- Add extending options to interfaces.
+- Update the Schema class to also update null mismatching if needed
# v3.2.1
diff --git a/README.md b/README.md
index b8c6bfd2d..983eed31a 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.2-alpha4) 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.2-alpha5) 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,14 +144,14 @@ 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*: 7th June, 2024
-+ *Version*: 3.2.2-alpha4
++ *Last Build*: 20th June, 2024
++ *Version*: 3.2.2-alpha5
+ *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
+ *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **765384**
-+ *Field count*: **2100**
-+ *File count*: **5304**
-+ *Folder count*: **471**
++ *Line count*: **773763**
++ *Field count*: **2104**
++ *File count*: **5362**
++ *Folder count*: **474**
> This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](https://www.joomlacomponentbuilder.com).
> Developed by [Llewellyn van der Merwe](mailto:joomla@vdm.io)
diff --git a/admin/README.txt b/admin/README.txt
index b8c6bfd2d..983eed31a 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.2-alpha4) 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.2-alpha5) 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,14 +144,14 @@ 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*: 7th June, 2024
-+ *Version*: 3.2.2-alpha4
++ *Last Build*: 20th June, 2024
++ *Version*: 3.2.2-alpha5
+ *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
+ *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **765384**
-+ *Field count*: **2100**
-+ *File count*: **5304**
-+ *Folder count*: **471**
++ *Line count*: **773763**
++ *Field count*: **2104**
++ *File count*: **5362**
++ *Folder count*: **474**
> This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](https://www.joomlacomponentbuilder.com).
> Developed by [Llewellyn van der Merwe](mailto:joomla@vdm.io)
diff --git a/admin/access.xml b/admin/access.xml
index 8bc3e282b..eb7688b8b 100644
--- a/admin/access.xml
+++ b/admin/access.xml
@@ -521,6 +521,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -814,6 +826,17 @@
+
diff --git a/admin/assets/css/repositories.css b/admin/assets/css/repositories.css
new file mode 100644
index 000000000..2731fc5aa
--- /dev/null
+++ b/admin/assets/css/repositories.css
@@ -0,0 +1,13 @@
+/**
+ * @package Joomla.Component.Builder
+ *
+ * @created 30th April, 2015
+ * @author Llewellyn van der Merwe
+ * @git Joomla Component Builder
+ * @copyright Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/* CSS Document */
+
+
diff --git a/admin/assets/css/repository.css b/admin/assets/css/repository.css
new file mode 100644
index 000000000..2731fc5aa
--- /dev/null
+++ b/admin/assets/css/repository.css
@@ -0,0 +1,13 @@
+/**
+ * @package Joomla.Component.Builder
+ *
+ * @created 30th April, 2015
+ * @author Llewellyn van der Merwe
+ * @git Joomla Component Builder
+ * @copyright Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/* CSS Document */
+
+
diff --git a/admin/assets/images/icons/repositories.png b/admin/assets/images/icons/repositories.png
new file mode 100644
index 0000000000000000000000000000000000000000..32d7a05590e4b488e1fbf2628fbdfd605f211714
GIT binary patch
literal 20768
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
-
-
-
-
-
+
@@ -832,88 +777,6 @@
autocomplete="on"
showon="powers_repository:1"
/>
-
-
-
-
- COM_COMPONENTBUILDER_CONFIG_GITVDMDEV
-
- COM_COMPONENTBUILDER_CONFIG_CUSTOMGITEA
-
-
-
-
-
-
-
-
-
-
-
-
-
'language_translations',
'language' => 'languages',
'server' => 'servers',
+ 'repository' => 'repositories',
'help_document' => 'help_documents',
'admin_fields' => 'admins_fields',
'admin_fields_conditions' => 'admins_fields_conditions',
diff --git a/admin/controllers/repositories.php b/admin/controllers/repositories.php
new file mode 100644
index 000000000..b0b833035
--- /dev/null
+++ b/admin/controllers/repositories.php
@@ -0,0 +1,50 @@
+
+ * @git Joomla Component Builder
+ * @copyright Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\Controller\AdminController;
+use Joomla\Utilities\ArrayHelper;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Session\Session;
+
+/**
+ * Repositories Admin Controller
+ */
+class ComponentbuilderControllerRepositories extends AdminController
+{
+ /**
+ * The prefix to use with controller messages.
+ *
+ * @var string
+ * @since 1.6
+ */
+ protected $text_prefix = 'COM_COMPONENTBUILDER_REPOSITORIES';
+
+ /**
+ * Method to get a model object, loading it if required.
+ *
+ * @param string $name The model name. Optional.
+ * @param string $prefix The class prefix. Optional.
+ * @param array $config Configuration array for model. Optional.
+ *
+ * @return JModelLegacy The model.
+ *
+ * @since 1.6
+ */
+ public function getModel($name = 'Repository', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
+ {
+ return parent::getModel($name, $prefix, $config);
+ }
+}
\ No newline at end of file
diff --git a/admin/controllers/repository.php b/admin/controllers/repository.php
new file mode 100644
index 000000000..443abb954
--- /dev/null
+++ b/admin/controllers/repository.php
@@ -0,0 +1,329 @@
+
+ * @git Joomla Component Builder
+ * @copyright Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\Controller\FormController;
+use Joomla\CMS\MVC\Model\BaseDatabaseModel;
+use Joomla\Utilities\ArrayHelper;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\Uri\Uri;
+
+/**
+ * Repository Form Controller
+ */
+class ComponentbuilderControllerRepository extends FormController
+{
+ /**
+ * Current or most recently performed task.
+ *
+ * @var string
+ * @since 12.2
+ * @note Replaces _task.
+ */
+ protected $task;
+
+ /**
+ * Class constructor.
+ *
+ * @param array $config A named array of configuration variables.
+ *
+ * @since 1.6
+ */
+ public function __construct($config = [])
+ {
+ $this->view_list = 'Repositories'; // safeguard for setting the return view listing to the main view.
+ parent::__construct($config);
+ }
+
+ /**
+ * Method override to check if you can add a new record.
+ *
+ * @param array $data An array of input data.
+ *
+ * @return boolean
+ *
+ * @since 1.6
+ */
+ protected function allowAdd($data = [])
+ {
+ // Get user object.
+ $user = Factory::getUser();
+ // Access check.
+ $access = $user->authorise('repository.access', 'com_componentbuilder');
+ if (!$access)
+ {
+ return false;
+ }
+
+ // In the absence of better information, revert to the component permissions.
+ return $user->authorise('repository.create', $this->option);
+ }
+
+ /**
+ * Method override to check if you can edit an existing record.
+ *
+ * @param array $data An array of input data.
+ * @param string $key The name of the key for the primary key.
+ *
+ * @return boolean
+ *
+ * @since 1.6
+ */
+ protected function allowEdit($data = [], $key = 'id')
+ {
+ // get user object.
+ $user = Factory::getUser();
+ // get record id.
+ $recordId = (int) isset($data[$key]) ? $data[$key] : 0;
+
+
+ // Access check.
+ $access = ($user->authorise('repository.access', 'com_componentbuilder.repository.' . (int) $recordId) && $user->authorise('repository.access', 'com_componentbuilder'));
+ if (!$access)
+ {
+ return false;
+ }
+
+ if ($recordId)
+ {
+ // The record has been set. Check the record permissions.
+ $permission = $user->authorise('repository.edit', 'com_componentbuilder.repository.' . (int) $recordId);
+ if (!$permission)
+ {
+ if ($user->authorise('repository.edit.own', 'com_componentbuilder.repository.' . $recordId))
+ {
+ // Now test the owner is the user.
+ $ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
+ if (empty($ownerId))
+ {
+ // Need to do a lookup from the model.
+ $record = $this->getModel()->getItem($recordId);
+
+ if (empty($record))
+ {
+ return false;
+ }
+ $ownerId = $record->created_by;
+ }
+
+ // If the owner matches 'me' then allow.
+ if ($ownerId == $user->id)
+ {
+ if ($user->authorise('repository.edit.own', 'com_componentbuilder'))
+ {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+ }
+ // Since there is no permission, revert to the component permissions.
+ return $user->authorise('repository.edit', $this->option);
+ }
+
+ /**
+ * Gets the URL arguments to append to an item redirect.
+ *
+ * @param integer $recordId The primary key id for the item.
+ * @param string $urlVar The name of the URL variable for the id.
+ *
+ * @return string The arguments to append to the redirect URL.
+ *
+ * @since 1.6
+ */
+ protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
+ {
+ // get the referral options (old method use return instead see parent)
+ $ref = $this->input->get('ref', 0, 'string');
+ $refid = $this->input->get('refid', 0, 'int');
+
+ // get redirect info.
+ $append = parent::getRedirectToItemAppend($recordId, $urlVar);
+
+ // set the referral options
+ if ($refid && $ref)
+ {
+ $append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
+ }
+ elseif ($ref)
+ {
+ $append = '&ref='. (string) $ref . $append;
+ }
+
+ return $append;
+ }
+
+ /**
+ * Method to run batch operations.
+ *
+ * @param object $model The model.
+ *
+ * @return boolean True if successful, false otherwise and internal error is set.
+ *
+ * @since 2.5
+ */
+ public function batch($model = null)
+ {
+ Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+
+ // Set the model
+ $model = $this->getModel('Repository', '', []);
+
+ // Preset the redirect
+ $this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=repositories' . $this->getRedirectToListAppend(), false));
+
+ return parent::batch($model);
+ }
+
+ /**
+ * Method to cancel an edit.
+ *
+ * @param string $key The name of the primary key of the URL variable.
+ *
+ * @return boolean True if access level checks pass, false otherwise.
+ *
+ * @since 12.2
+ */
+ public function cancel($key = null)
+ {
+ // get the referral options
+ $this->ref = $this->input->get('ref', 0, 'word');
+ $this->refid = $this->input->get('refid', 0, 'int');
+
+ // Check if there is a return value
+ $return = $this->input->get('return', null, 'base64');
+
+ $cancel = parent::cancel($key);
+
+ if (!is_null($return) && Uri::isInternal(base64_decode($return)))
+ {
+ $redirect = base64_decode($return);
+
+ // Redirect to the return value.
+ $this->setRedirect(
+ Route::_(
+ $redirect, false
+ )
+ );
+ }
+ elseif ($this->refid && $this->ref)
+ {
+ $redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+
+ // Redirect to the item screen.
+ $this->setRedirect(
+ Route::_(
+ 'index.php?option=' . $this->option . $redirect, false
+ )
+ );
+ }
+ elseif ($this->ref)
+ {
+ $redirect = '&view='.(string)$this->ref;
+
+ // Redirect to the list screen.
+ $this->setRedirect(
+ Route::_(
+ 'index.php?option=' . $this->option . $redirect, false
+ )
+ );
+ }
+ return $cancel;
+ }
+
+ /**
+ * Method to save a record.
+ *
+ * @param string $key The name of the primary key of the URL variable.
+ * @param string $urlVar The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
+ *
+ * @return boolean True if successful, false otherwise.
+ *
+ * @since 12.2
+ */
+ public function save($key = null, $urlVar = null)
+ {
+ // get the referral options
+ $this->ref = $this->input->get('ref', 0, 'word');
+ $this->refid = $this->input->get('refid', 0, 'int');
+
+ // Check if there is a return value
+ $return = $this->input->get('return', null, 'base64');
+ $canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));
+
+ if ($this->ref || $this->refid || $canReturn)
+ {
+ // to make sure the item is checkedin on redirect
+ $this->task = 'save';
+ }
+
+ $saved = parent::save($key, $urlVar);
+
+ // This is not needed since parent save already does this
+ // Due to the ref and refid implementation we need to add this
+ if ($canReturn)
+ {
+ $redirect = base64_decode($return);
+
+ // Redirect to the return value.
+ $this->setRedirect(
+ Route::_(
+ $redirect, false
+ )
+ );
+ }
+ elseif ($this->refid && $this->ref)
+ {
+ $redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;
+
+ // Redirect to the item screen.
+ $this->setRedirect(
+ Route::_(
+ 'index.php?option=' . $this->option . $redirect, false
+ )
+ );
+ }
+ elseif ($this->ref)
+ {
+ $redirect = '&view=' . (string) $this->ref;
+
+ // Redirect to the list screen.
+ $this->setRedirect(
+ Route::_(
+ 'index.php?option=' . $this->option . $redirect, false
+ )
+ );
+ }
+ return $saved;
+ }
+
+ /**
+ * Function that allows child controller access to model data
+ * after the data has been saved.
+ *
+ * @param BaseDatabaseModel &$model The data model object.
+ * @param array $validData The validated data.
+ *
+ * @return void
+ *
+ * @since 11.1
+ */
+ protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
+ {
+ return;
+ }
+}
diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php
index 620e4d854..b64b0bc00 100644
--- a/admin/helpers/componentbuilder.php
+++ b/admin/helpers/componentbuilder.php
@@ -6173,6 +6173,10 @@ abstract class ComponentbuilderHelper
{
\JHtmlSidebar::addEntry(Text::_('COM_COMPONENTBUILDER_SUBMENU_SERVERS'), 'index.php?option=com_componentbuilder&view=servers', $submenu === 'servers');
}
+ if ($user->authorise('repository.access', 'com_componentbuilder') && $user->authorise('repository.submenu', 'com_componentbuilder'))
+ {
+ \JHtmlSidebar::addEntry(Text::_('COM_COMPONENTBUILDER_SUBMENU_REPOSITORIES'), 'index.php?option=com_componentbuilder&view=repositories', $submenu === 'repositories');
+ }
if ($user->authorise('help_document.access', 'com_componentbuilder') && $user->authorise('help_document.submenu', 'com_componentbuilder'))
{
\JHtmlSidebar::addEntry(Text::_('COM_COMPONENTBUILDER_SUBMENU_HELP_DOCUMENTS'), 'index.php?option=com_componentbuilder&view=help_documents', $submenu === 'help_documents');
diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini
index fd6f12b8a..0c89a55eb 100644
--- a/admin/language/en-GB/en-GB.com_componentbuilder.ini
+++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini
@@ -3292,8 +3292,6 @@ COM_COMPONENTBUILDER_COMPONENT_UPDATES_YES="Yes"
COM_COMPONENTBUILDER_CONCATENATE="Concatenate"
COM_COMPONENTBUILDER_CONDITIONS="Conditions"
COM_COMPONENTBUILDER_CONFIG_ACTIVE="Active"
-COM_COMPONENTBUILDER_CONFIG_ADD_CUSTOM_GITEA_URL_DESCRIPTION="Switch to set your own Gitea url."
-COM_COMPONENTBUILDER_CONFIG_ADD_CUSTOM_GITEA_URL_LABEL="Target Gitea URL"
COM_COMPONENTBUILDER_CONFIG_ADD_MENU_PREFIX_DESCRIPTION="Would you like to add a prefix to the Joomla menu name of your components"
COM_COMPONENTBUILDER_CONFIG_ADD_MENU_PREFIX_LABEL="Add Menu Prefix"
COM_COMPONENTBUILDER_CONFIG_ADD_PLACEHOLDERS_DESCRIPTION="Should JCB insert the custom code placeholders? This is only applicable if this component has custom code."
@@ -3307,7 +3305,6 @@ COM_COMPONENTBUILDER_CONFIG_ALPHANUMERIC="Alphanumeric"
COM_COMPONENTBUILDER_CONFIG_ALPHANUMERICDOT="Alphanumeric+dot"
COM_COMPONENTBUILDER_CONFIG_API_DESCRIPTION="This User will be used to log the API call."
COM_COMPONENTBUILDER_CONFIG_API_LABEL="API User"
-COM_COMPONENTBUILDER_CONFIG_APPROVED_PATHS_LABEL="Super Powers Repository Paths"
COM_COMPONENTBUILDER_CONFIG_ASSETS_TABLE_FIX_DESCRIPTION="How to apply the assets table fix in JCB. SQL (add&remove) this is the default which adds the SQL fix and removes it once the component is uninstalled. Intelligent (add&remove+if) same as default, but on uninstall will only remove this fix if no other component needs it. Note that this option will only work with other components that also use the intelligent path ."
COM_COMPONENTBUILDER_CONFIG_ASSETS_TABLE_FIX_LABEL="Assets Table Fix"
COM_COMPONENTBUILDER_CONFIG_AUTHOR="Author Info"
@@ -3337,8 +3334,6 @@ COM_COMPONENTBUILDER_CONFIG_BASIC_KEY_DESC="Set the basic local key here."
COM_COMPONENTBUILDER_CONFIG_BASIC_KEY_LABEL="Basic Key"
COM_COMPONENTBUILDER_CONFIG_BASIC_KEY_NOTE_DESC="When using the basic encryption please use set a 32 character passphrase. Never change this passphrase once it is set! DATA WILL GET CORRUPTED IF YOU DO! "
COM_COMPONENTBUILDER_CONFIG_BASIC_KEY_NOTE_LABEL="Basic Encryption"
-COM_COMPONENTBUILDER_CONFIG_BRANCH_HINT="[branch]"
-COM_COMPONENTBUILDER_CONFIG_BRANCH_LABEL="Branch"
COM_COMPONENTBUILDER_CONFIG_BUILDER_GIF_SIZE_DESCRIPTION="Select the artwork you would like to show during compilation of your projects in the compiler area."
COM_COMPONENTBUILDER_CONFIG_BUILDER_GIF_SIZE_LABEL="Compiler Artwork Options"
COM_COMPONENTBUILDER_CONFIG_CHECK_TIMER_DESC="Set the intervals for the auto checkin fuction of tables that checks out the items to an user."
@@ -3375,18 +3370,10 @@ COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_SERVER_DESCRIPTION="Select your backu
COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_SERVER_LABEL="Cronjob Backup Server"
COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_TYPE_DESCRIPTION="Select how you would like to backup JCB"
COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_TYPE_LABEL="Cronjob Backup type"
-COM_COMPONENTBUILDER_CONFIG_CUSTOMGITEA="custom.gitea"
COM_COMPONENTBUILDER_CONFIG_CUSTOM_FOLDER_PATH_DESCRIPTION="Here you can set the path to the custom folder"
COM_COMPONENTBUILDER_CONFIG_CUSTOM_FOLDER_PATH_HINT="/home/user/custom"
COM_COMPONENTBUILDER_CONFIG_CUSTOM_FOLDER_PATH_LABEL="Custom Folder Path"
COM_COMPONENTBUILDER_CONFIG_CUSTOM_FOLDER_PATH_MESSAGE="Error! Please add folder path here."
-COM_COMPONENTBUILDER_CONFIG_CUSTOM_GITEA_TOKEN_DESCRIPTION="This token is used to access private repositories as needed to get the super powers."
-COM_COMPONENTBUILDER_CONFIG_CUSTOM_GITEA_TOKEN_HINT="Gitea Access Tokens"
-COM_COMPONENTBUILDER_CONFIG_CUSTOM_GITEA_TOKEN_LABEL="Gitea Access TokenGet token from your Gitea at: /user/settings/applications. "
-COM_COMPONENTBUILDER_CONFIG_CUSTOM_GITEA_URL_DESCRIPTION="Enter Gitea Address"
-COM_COMPONENTBUILDER_CONFIG_CUSTOM_GITEA_URL_HINT="https://git.vdm.dev"
-COM_COMPONENTBUILDER_CONFIG_CUSTOM_GITEA_URL_LABEL="Gitea URL"
-COM_COMPONENTBUILDER_CONFIG_CUSTOM_GITEA_URL_MESSAGE="Error! Please add website here."
COM_COMPONENTBUILDER_CONFIG_DEFAULT="Default"
COM_COMPONENTBUILDER_CONFIG_DEVELOPMENT_METHOD="Development Method"
COM_COMPONENTBUILDER_CONFIG_DEVELOPMENT_METHOD_DESCRIPTION="Select what development method you would like to use."
@@ -3494,7 +3481,6 @@ COM_COMPONENTBUILDER_CONFIG_GITEA_USERNAME_MESSAGE="Error! Please add token here
COM_COMPONENTBUILDER_CONFIG_GITHUB_ACCESS_TOKEN_DESCRIPTION="This is only needed when you are on a shared IP or/and have reached the public free limit of API queries to gitHub. So unless you have seen some kind of error that directed you here to add an access token you can just ignore this field."
COM_COMPONENTBUILDER_CONFIG_GITHUB_ACCESS_TOKEN_HINT="OAUTH-TOKEN"
COM_COMPONENTBUILDER_CONFIG_GITHUB_ACCESS_TOKEN_LABEL="gitHub Access TokenCheck https://developer.github.com/v3/#authentication for more info. "
-COM_COMPONENTBUILDER_CONFIG_GITVDMDEV="git.vdm.dev"
COM_COMPONENTBUILDER_CONFIG_GIT_FOLDER_PATH_DESCRIPTION="Here you can set the path to the git folder."
COM_COMPONENTBUILDER_CONFIG_GIT_FOLDER_PATH_HINT="/home/user/git"
COM_COMPONENTBUILDER_CONFIG_GIT_FOLDER_PATH_LABEL="Git Folder Path"
@@ -3558,8 +3544,6 @@ COM_COMPONENTBUILDER_CONFIG_NOTE_COMPILER_FOLDER_PATH_DESCRIPTION="The compiler
COM_COMPONENTBUILDER_CONFIG_NOTE_COMPILER_FOLDER_PATH_LABEL="Moving The Compiler Folder"
COM_COMPONENTBUILDER_CONFIG_NOTE_CUSTOM_FOLDER_PATH_DESCRIPTION="The custom folder is where all files and folders that you would like to include in your components are stored, the default location is [administrator/components/com_componentbuilder/custom]. You can move this folder by adding your own path here. Remember to move the content of the default custom folder to this new location."
COM_COMPONENTBUILDER_CONFIG_NOTE_CUSTOM_FOLDER_PATH_LABEL="Moving The Custom Folder"
-COM_COMPONENTBUILDER_CONFIG_NOTE_CUSTOM_GITEA_URL_DESCRIPTION="Each JCB system can only target one Gitea system at a time. Setting your own Gitea URL means you are decoupling from the git.vdm.dev system and will no longer be loading your super powers from the git.vdm.dev system!
This will affect the [layers:all], so JCB will not search for any Powers on the git.vdm.dev system at all.
This option is ideal for managing your own Core Super Powers and your own private Super Powers on your own, or another Gitea System, and allows you to use the Super Power integration completely independent from VDM. Our hope is that this gives you enough freedom and liberty to use our system or your own. Let's decentralize our systems so that we can start focusing on what we are building, and not be worried that some large conglomerate is stealing our ideas and building their empires on our hard work.
"
-COM_COMPONENTBUILDER_CONFIG_NOTE_CUSTOM_GITEA_URL_LABEL="Decentralize Super Powers, Yea!"
COM_COMPONENTBUILDER_CONFIG_NOTE_DEVELOPMENT_METHOD_DEFAULT_DESCRIPTION="This method is basically the way JCB has always worked by default.
So once you have made changes, you go to the compiler view and compile your component. Then you have the option to install and/or distribute the Joomla installation package.
This option will always be active to those with permission to access the compiler. You can change this permission in the Permissions tab with the option called Compiler Access .
"
COM_COMPONENTBUILDER_CONFIG_NOTE_DEVELOPMENT_METHOD_DEFAULT_LABEL="Default Development Method"
COM_COMPONENTBUILDER_CONFIG_NOTE_DEVELOPMENT_METHOD_EXPANSION_DESCRIPTION="This method adds easy compile and install of multiple components to the current Joomla system. This automated action is called expansion .
Expansion can be achieved in two ways.
Button Expansion Option The first and most common way is to click on any of the Run Expansion buttons found at the top of some of the JCB admin views.
Cronjob Expansion Option The second is by running a cronjob as explained bellow the area of selection in this tab. So you do not need to manually compile and install the selected components any more, the system does all that automatically for you. The latency of the workflow is based on your cronjob frequency and the size of your component.
Expansion is pause for a component in a few ways, one by actually checking out/opening the Joomla Component view of the component in JCB, or changing the state to unpublish, archive or trashed, or simply remove if from the list below.
The Expansion method is there to speedup development testing. Below you should set the behaviour of a selected set of components that will be auto build and installed when the expansion module is run.
"
@@ -3574,15 +3558,13 @@ COM_COMPONENTBUILDER_CONFIG_NOTE_POWERS_REPOSITORY_PATH_DESCRIPTION="The powers
COM_COMPONENTBUILDER_CONFIG_NOTE_POWERS_REPOSITORY_PATH_LABEL="Local Powers Repository Path"
COM_COMPONENTBUILDER_CONFIG_NOTE_SUPER_POWERS_DESCRIPTION="Joomla Component Builder (JCB), has super powers . Which is another way of saying it now allows for powers to be pulled in from a global array of areas, over which you have full control. This allows for easy sharing of your powers between your JCB instances with your own power repositories on https://git.vdm.dev/[username]/my-powers. While at the same time be able to use the JCB core powers where needed.
Let's explain: This feature called super-powers , manages powers by use of layers, events, tasks, methods, switches, and algorithms that all work in combination of different ways to achieve super powers.
The [powers] are:
[guid] => Each power has a global unique identifier used to control the power global identity. This [power:guid] looks like this: b836c1b1-b6b1-44f7-b8a2-9a763a4185b1 [code] => The actual code of the power that is found in a PHP file [settings] => The settings define the power details, relationships, and more. They are stored in a Json formatted file in [layer:repo] and/or [layer:local] and/or as column values in the [layer:database] The [layers] are:[database] This JCB instance's Database [repo] The https://git.vdm.dev/ git website that holds all repos, and which is managed by Vast Development Method [core] The core super-power repo of JCB https://git.vdm.dev/joomla/super-powers (this target can be changed in global options) [own] Your own super-powers repos https://git.vdm.dev/[username]/my-powers (sub-paths) [local] Local path, and its sub-paths that hold [core] and [own] repositories. The [events] are:[compile] Compilation of a component [sync] Synchronisation of selected powers with [algorithm:cascading] [init] Uploads all powers from all active [layers] into [layer:database] if not already exist in [layer:database] [reset] Force synchronisation of selected powers with [layer:core] The [tasks] are:[get] To get powers from any of the layers [set] To set powers to database or local paths The [methods] are:[auto] When JCB automatically does this for you [manual] When you must manually do something The [switches] are:[activate] This switch activates super-powers, and allows for [layer:local] path to be set [token] This is the VDM access token from the global tab. [super] This switch allows for [layer:own] paths to be set [approved] This switch allows a power to be added to a [layer:core] or [layer:own] paths
The [algorithms] are:[cascading] The is the way in which JCB [task:get] a power during the [events] so that it can use the power in your component, and store in [layer:database]
These terminologies and ideas are what you need to remember whenever you read any of the comments and other information about super-powers in JCB.
JCB uses powers as the foundation of all it builds. You can build things with JCB without knowing how to use or work with powers. But JCB cannot build anything without powers. That means JCB needs to load powers from the [layer:core] and usually will do this whenever an [event] is triggered based on the [algorithm:cascading].
All these events can possibly move powers into your [layer:database]. These [events] have the [method:auto] behaviour, and therefore we make use of the [algorithm:cascading] that allows for overriding any power in any way you like. Beware that divergence from the core powers may have side effects and therefore should only be done with knowledge and full understanding on your part.
Let's Explain the [algorithm:cascading] During [events] we must [auto] load powers, and so there is a search path for each event.
The [event:compile] when building your component, here is the [algorithm:cascading] :
[layer:database] [layer:local IF switch:activate AND switch:approved] [layer:own IF switch:token AND switch:activate AND switch:super AND switch:approved] [layer:core] This means, that if JCB gets a [power:guid] in the [layer:database] it stops the search and uses that found power. But if not, it will continue until it finds the power, or it will show an error that the power could not be found. Once it finds the power, it will make sure that the power is in [layer:database], and if [layer:local] is active, it will update those as well as determined by the approved path selection of each power.
The [event:sync] when the sync button is clicked, here is the [algorithm:cascading] :
[layer:own IF switch:token AND switch:activate AND switch:super AND switch:approved] [layer:local IF switch:activate AND switch:approved] [layer:core] This means, that if JCB gets a [power:guid] in any of the targeted [layer:own] it stops the search for that power at the first instance it finds that power. Then JCB will update your [layer:database] with the found power, irrespective of modify or creation date. The [power:guid] is used as the key, and should JCB therefore have a power in any of your [layer:own] it will override the [layer:core] and [layer:local] version of any power, and update the [layer:database].
The [event:reset] when the reset button is clicked, will update [layer:database] with [layer:core] version of the selected powers if found in [layer:core], irrespective of modify or creation date.
The [event:init] when the init button is clicked, will initialise [layer:database] with all [layers] powers not found in [layer:database]. Should you have the same power in multiple of the layers, here is the [algorithm:cascading] :
[layer:own IF switch:token AND switch:activate AND switch:super AND switch:approved] [layer:local IF switch:activate] [layer:core IF_NOT layer:database] This means, that if JCB gets a [power:guid] in any of the targeted [layer:own] it will not use any of the other [layers] versions. JCB will add this first found power to your [layer:database] unless it's already in [layer:database], in which case it will be ignored. Use [event:sync] or [event:reset] should you like to update [layer:database] existing powers.
"
COM_COMPONENTBUILDER_CONFIG_NOTE_SUPER_POWERS_LABEL="Super Powers"
-COM_COMPONENTBUILDER_CONFIG_NOTE_SUPER_POWERS_REPOSITORIES_DESCRIPTION="Add the paths to those repositories you would like to target with this instance of JCB.
You only need to add the path , so if your repository is located here: https://git.vdm.dev/Llewellyn/workshop. Then the path will be: Llewellyn/workshop
We will use these paths in all [events] based on the [algorithm:cascading]
"
+COM_COMPONENTBUILDER_CONFIG_NOTE_SUPER_POWERS_REPOSITORIES_DESCRIPTION="We have moved this whole area to the new Repositories area in JCB.
Check it out right under the Servers menu, the Repositories menu can be found.
"
COM_COMPONENTBUILDER_CONFIG_NOTE_SUPER_POWERS_REPOSITORIES_LABEL="Super Powers Repositories [layer:local:own]"
COM_COMPONENTBUILDER_CONFIG_OFF="Off"
COM_COMPONENTBUILDER_CONFIG_ON="On"
COM_COMPONENTBUILDER_CONFIG_ONLY_BOOLEAN="Only Boolean"
COM_COMPONENTBUILDER_CONFIG_ONLY_EXTRA="Only Extra"
COM_COMPONENTBUILDER_CONFIG_ORIGINAL_VDM="Original (VDM)"
-COM_COMPONENTBUILDER_CONFIG_OWNER_HINT="[owner]"
-COM_COMPONENTBUILDER_CONFIG_OWNER_LABEL="Owner"
COM_COMPONENTBUILDER_CONFIG_PACKAGE_NAME_PLAEHOLDERS_DESCRIPTION="[YEAR]
[MONTH]
[DAY]
[HOUR]
[MINUTE]
"
COM_COMPONENTBUILDER_CONFIG_PACKAGE_NAME_PLAEHOLDERS_LABEL="Package Name Placeholders"
COM_COMPONENTBUILDER_CONFIG_PERCENTAGELANGUAGEADD_DESCRIPTION="Select percentage any language should be translated before the system should add the language to the component during compilation."
@@ -3599,8 +3581,6 @@ COM_COMPONENTBUILDER_CONFIG_REPLYNAME_HINT="Reply Name Here"
COM_COMPONENTBUILDER_CONFIG_REPLYNAME_LABEL="Reply to Name"
COM_COMPONENTBUILDER_CONFIG_REPOSITORY_DESCRIPTION="Should the component be moved to your local repository folder?"
COM_COMPONENTBUILDER_CONFIG_REPOSITORY_LABEL="Add to Repository Folder"
-COM_COMPONENTBUILDER_CONFIG_REPO_HINT="[repo]"
-COM_COMPONENTBUILDER_CONFIG_REPO_LABEL="Repo"
COM_COMPONENTBUILDER_CONFIG_RETURN_OPTIONS_BUILD_DESCRIPTION="Should the system return the build info/messages, or simply 1 for success and 0 for failure."
COM_COMPONENTBUILDER_CONFIG_RETURN_OPTIONS_BUILD_LABEL="Return Options for Build"
COM_COMPONENTBUILDER_CONFIG_SENDMAIL="Sendmail"
@@ -3636,13 +3616,6 @@ COM_COMPONENTBUILDER_CONFIG_STRING_MANIPULATION="String Manipulation"
COM_COMPONENTBUILDER_CONFIG_SUBFORM_LAYOUTS_DESCRIPTION="Select the sub-form layouts you would like to use."
COM_COMPONENTBUILDER_CONFIG_SUBFORM_LAYOUTS_LABEL="Sub-form Layouts"
COM_COMPONENTBUILDER_CONFIG_SUPER_POWER="Super Power"
-COM_COMPONENTBUILDER_CONFIG_SUPER_POWERS_CORE_HINT="joomla/super-powers"
-COM_COMPONENTBUILDER_CONFIG_SUPER_POWERS_CORE_LABEL="Super Powers Core"
-COM_COMPONENTBUILDER_CONFIG_SUPER_POWERS_CORE_ORGANISATION_DESCRIPTION="Set the organisation on your Gitea system where all the JCB core super powers repositories can be found."
-COM_COMPONENTBUILDER_CONFIG_SUPER_POWERS_CORE_ORGANISATION_HINT="joomla"
-COM_COMPONENTBUILDER_CONFIG_SUPER_POWERS_CORE_ORGANISATION_LABEL="Gitea Core Organisation"
-COM_COMPONENTBUILDER_CONFIG_SUPER_POWERS_CORE_ORGANISATION_NOTE_DESCRIPTION="The organisation on your Gitea system where all the core super powers repositories can be found. Example: https://your.gitea.system.com/[core-org] /super-powers
These are the core super powers: https://git.vdm.dev/joomla/super-powers (required) https://git.vdm.dev/joomla/phpseclib (encryption) https://git.vdm.dev/joomla/fof (legacy encryption) https://git.vdm.dev/joomla/gitea (Easy Gitea classes) https://git.vdm.dev/joomla/openai (Easy Openai classes) https://git.vdm.dev/joomla/minify (not usually required) https://git.vdm.dev/joomla/psr (not usually required) https://git.vdm.dev/joomla/jcb-compiler (not usually required) https://git.vdm.dev/joomla/jcb-packager (not usually required) https://git.vdm.dev/joomla/search (not usually required) You should mirror theses repositories to your Gitea system. Depending on your extension setup JCB may need these repositories to effectively build your extension.
"
-COM_COMPONENTBUILDER_CONFIG_SUPER_POWERS_CORE_ORGANISATION_NOTE_LABEL="Gitea Core Organisation"
COM_COMPONENTBUILDER_CONFIG_SUPER_POWERS_DOCUMENTATION_DESCRIPTION="Switch to show or hide the documentation of super powers."
COM_COMPONENTBUILDER_CONFIG_SUPER_POWERS_DOCUMENTATION_LABEL="Documentation"
COM_COMPONENTBUILDER_CONFIG_SUPER_POWERS_REPOSITORIES_DESCRIPTION="Do you have your own repositories on https://git.vdm.dev/ with super powers?"
@@ -4254,6 +4227,7 @@ COM_COMPONENTBUILDER_DASHBOARD_LIBRARIES="Libraries "
COM_COMPONENTBUILDER_DASHBOARD_LIST_OF_RECORDS="Dashboard (list of records)"
COM_COMPONENTBUILDER_DASHBOARD_PLACEHOLDERS="Placeholders "
COM_COMPONENTBUILDER_DASHBOARD_POWERS="Powers "
+COM_COMPONENTBUILDER_DASHBOARD_REPOSITORIES="Repositories "
COM_COMPONENTBUILDER_DASHBOARD_SEARCH="Search "
COM_COMPONENTBUILDER_DASHBOARD_SERVERS="Servers "
COM_COMPONENTBUILDER_DASHBOARD_SITE_VIEWS="Site Views "
@@ -4852,7 +4826,6 @@ COM_COMPONENTBUILDER_FIELDTYPE_UNIQUE_KEY="UNIQUE KEY"
COM_COMPONENTBUILDER_FIELDTYPE_VARCHAR="VARCHAR"
COM_COMPONENTBUILDER_FIELDTYPE_VERSION_DESC="A count of the number of times this Fieldtype has been revised."
COM_COMPONENTBUILDER_FIELDTYPE_VERSION_LABEL="Version"
-COM_COMPONENTBUILDER_FIELDTYPE_WHMCSKEY_ENCRYPTION="WHMCS-key Encryption"
COM_COMPONENTBUILDER_FIELDTYPE_YES="Yes"
COM_COMPONENTBUILDER_FIELDTYPE_ZERO="0"
COM_COMPONENTBUILDER_FIELD_ADD_CSS_VIEWS_LABEL="Add CSS (views)"
@@ -4956,8 +4929,6 @@ COM_COMPONENTBUILDER_FIELD_NOTE_NO_DATABASE_SETTINGS_NEEDED_DESCRIPTION="This fi
COM_COMPONENTBUILDER_FIELD_NOTE_NO_DATABASE_SETTINGS_NEEDED_LABEL="No Database Require"
COM_COMPONENTBUILDER_FIELD_NOTE_SELECT_FIELD_TYPE_DESCRIPTION="Please select a field type that you would like to build."
COM_COMPONENTBUILDER_FIELD_NOTE_SELECT_FIELD_TYPE_LABEL="Building a field"
-COM_COMPONENTBUILDER_FIELD_NOTE_WHMCS_ENCRYPTION_DESCRIPTION="When using the WHMCS encryption you need to get a WHMCS key from:https://www.vdm.io , or your own WHMCS install.
Please note that you will need to enable the add-on in the Joomla Component area (Add WHMCS)->Yes.
You can get more info about the WHMCS licensing add-on at the following links.
Helpful Links: https://www.whmcs.com/software-licensing/ http://docs.whmcs.com/Licensing_Addon/
Support JCB and use our affiliate link (https://www.whmcs.com/members/aff.php?aff=37513 ) to sign-up with WHMCS .
"
-COM_COMPONENTBUILDER_FIELD_NOTE_WHMCS_ENCRYPTION_LABEL="The WHMCS Encryption"
COM_COMPONENTBUILDER_FIELD_NOT_NULL="NOT NULL"
COM_COMPONENTBUILDER_FIELD_NOT_REQUIRED="Not Required"
COM_COMPONENTBUILDER_FIELD_NULL="NULL"
@@ -4998,7 +4969,6 @@ COM_COMPONENTBUILDER_FIELD_UNIQUE_KEY="UNIQUE KEY"
COM_COMPONENTBUILDER_FIELD_VARCHAR="VARCHAR"
COM_COMPONENTBUILDER_FIELD_VERSION_DESC="A count of the number of times this Field has been revised."
COM_COMPONENTBUILDER_FIELD_VERSION_LABEL="Version"
-COM_COMPONENTBUILDER_FIELD_WHMCSKEY_ENCRYPTION="WHMCS-key Encryption"
COM_COMPONENTBUILDER_FIELD_XML="Xml"
COM_COMPONENTBUILDER_FIELD_YES="Yes"
COM_COMPONENTBUILDER_FIELD_ZERO="0"
@@ -5013,6 +4983,8 @@ COM_COMPONENTBUILDER_FILTER_ADD_TYPE_ASCENDING="Add Type ascending"
COM_COMPONENTBUILDER_FILTER_ADD_TYPE_DESCENDING="Add Type descending"
COM_COMPONENTBUILDER_FILTER_ADMIN_VIEWS_ASCENDING="Admin Views ascending"
COM_COMPONENTBUILDER_FILTER_ADMIN_VIEWS_DESCENDING="Admin Views descending"
+COM_COMPONENTBUILDER_FILTER_BASE_URL_ASCENDING="Base URL ascending"
+COM_COMPONENTBUILDER_FILTER_BASE_URL_DESCENDING="Base URL descending"
COM_COMPONENTBUILDER_FILTER_COMMENT_TYPE_USED_IN_PLACEHOLDER_ASCENDING="Comment Type (used in placeholder) ascending"
COM_COMPONENTBUILDER_FILTER_COMMENT_TYPE_USED_IN_PLACEHOLDER_DESCENDING="Comment Type (used in placeholder) descending"
COM_COMPONENTBUILDER_FILTER_COMPANY_NAME_ASCENDING="Company Name ascending"
@@ -5071,6 +5043,8 @@ COM_COMPONENTBUILDER_FILTER_NAME_SINGLE_RECORDNAMING_CONVENTIONS_ASCENDING="Name
COM_COMPONENTBUILDER_FILTER_NAME_SINGLE_RECORDNAMING_CONVENTIONS_DESCENDING="Name (single record)Naming Conventions descending"
COM_COMPONENTBUILDER_FILTER_NULL_SWITCH_ASCENDING="Null Switch ascending"
COM_COMPONENTBUILDER_FILTER_NULL_SWITCH_DESCENDING="Null Switch descending"
+COM_COMPONENTBUILDER_FILTER_ORGANISATION_ASCENDING="Organisation ascending"
+COM_COMPONENTBUILDER_FILTER_ORGANISATION_DESCENDING="Organisation descending"
COM_COMPONENTBUILDER_FILTER_PROTOCOL_ASCENDING="Protocol ascending"
COM_COMPONENTBUILDER_FILTER_PROTOCOL_DESCENDING="Protocol descending"
COM_COMPONENTBUILDER_FILTER_PUBLISHED="Status"
@@ -5118,12 +5092,15 @@ COM_COMPONENTBUILDER_FILTER_PUBLISHED_LIBRARIES_CONFIG="Status options for libra
COM_COMPONENTBUILDER_FILTER_PUBLISHED_LIBRARIES_FILES_FOLDERS_URLS="Status options for libraries files folders urls"
COM_COMPONENTBUILDER_FILTER_PUBLISHED_PLACEHOLDERS="Status options for placeholders"
COM_COMPONENTBUILDER_FILTER_PUBLISHED_POWERS="Status options for powers"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED_REPOSITORIES="Status options for repositories"
COM_COMPONENTBUILDER_FILTER_PUBLISHED_SERVERS="Status options for servers"
COM_COMPONENTBUILDER_FILTER_PUBLISHED_SITE_VIEWS="Status options for site views"
COM_COMPONENTBUILDER_FILTER_PUBLISHED_SNIPPETS="Status options for snippets"
COM_COMPONENTBUILDER_FILTER_PUBLISHED_SNIPPET_TYPES="Status options for snippet types"
COM_COMPONENTBUILDER_FILTER_PUBLISHED_TEMPLATES="Status options for templates"
COM_COMPONENTBUILDER_FILTER_PUBLISHED_VALIDATION_RULES="Status options for validation rules"
+COM_COMPONENTBUILDER_FILTER_REPOSITORY_ASCENDING="Repository ascending"
+COM_COMPONENTBUILDER_FILTER_REPOSITORY_DESCENDING="Repository descending"
COM_COMPONENTBUILDER_FILTER_SEARCH="Searchjoomla components"
COM_COMPONENTBUILDER_FILTER_SEARCH_ADMINS_CUSTOM_TABS="Search the admin custom tabs items. Prefix with ID: to search for an item by ID."
COM_COMPONENTBUILDER_FILTER_SEARCH_ADMINS_FIELDS="Search the admin fields items. Prefix with ID: to search for an item by ID."
@@ -5169,6 +5146,7 @@ COM_COMPONENTBUILDER_FILTER_SEARCH_LIBRARIES_CONFIG="Search the library config i
COM_COMPONENTBUILDER_FILTER_SEARCH_LIBRARIES_FILES_FOLDERS_URLS="Search the library files folders urls items. Prefix with ID: to search for an item by ID."
COM_COMPONENTBUILDER_FILTER_SEARCH_PLACEHOLDERS="Search the placeholder items. Prefix with ID: to search for an item by ID."
COM_COMPONENTBUILDER_FILTER_SEARCH_POWERS="Search the power items. Prefix with ID: to search for an item by ID."
+COM_COMPONENTBUILDER_FILTER_SEARCH_REPOSITORIES="Search the repository items. Prefix with ID: to search for an item by ID."
COM_COMPONENTBUILDER_FILTER_SEARCH_SERVERS="Search the server items. Prefix with ID: to search for an item by ID."
COM_COMPONENTBUILDER_FILTER_SEARCH_SITE_VIEWS="Search the site view items. Prefix with ID: to search for an item by ID."
COM_COMPONENTBUILDER_FILTER_SEARCH_SNIPPETS="Search the snippet items. Prefix with ID: to search for an item by ID."
@@ -5183,6 +5161,7 @@ COM_COMPONENTBUILDER_FILTER_SELECT_ADD_PHP_CUSTOM_VIEW_SCRIPT="Select Add PHP (c
COM_COMPONENTBUILDER_FILTER_SELECT_ADD_TYPE="Select Add Type"
COM_COMPONENTBUILDER_FILTER_SELECT_ADMIN_VIEWS="Select Admin Views"
COM_COMPONENTBUILDER_FILTER_SELECT_AUTHOR="Select Author"
+COM_COMPONENTBUILDER_FILTER_SELECT_BASE_URL="Select Base URL"
COM_COMPONENTBUILDER_FILTER_SELECT_COMMENT_TYPE_USED_IN_PLACEHOLDER="Select Comment Type (used in placeholder)"
COM_COMPONENTBUILDER_FILTER_SELECT_COMPANY_NAME="Select Company Name"
COM_COMPONENTBUILDER_FILTER_SELECT_COMPONENT="Select Component"
@@ -5203,7 +5182,9 @@ COM_COMPONENTBUILDER_FILTER_SELECT_MAIN_SOURCE="Select Main Source"
COM_COMPONENTBUILDER_FILTER_SELECT_MODELLING_METHOD="Select Modelling Method"
COM_COMPONENTBUILDER_FILTER_SELECT_NAME="Select Name"
COM_COMPONENTBUILDER_FILTER_SELECT_NULL_SWITCH="Select Null Switch"
+COM_COMPONENTBUILDER_FILTER_SELECT_ORGANISATION="Select Organisation"
COM_COMPONENTBUILDER_FILTER_SELECT_PROTOCOL="Select Protocol"
+COM_COMPONENTBUILDER_FILTER_SELECT_REPOSITORY="Select Repository"
COM_COMPONENTBUILDER_FILTER_SELECT_ROUTER_MODECONSTRUCTOR_AFTER_PARENT="Select Router Mode[constructor_after_parent]"
COM_COMPONENTBUILDER_FILTER_SELECT_ROUTER_MODECONSTRUCTOR_BEFORE_PARENT="Select Router Mode[constructor_before_parent]"
COM_COMPONENTBUILDER_FILTER_SELECT_ROUTER_MODEMETHODS="Select Router Mode[methods]"
@@ -5211,6 +5192,7 @@ COM_COMPONENTBUILDER_FILTER_SELECT_SITE_VIEWS="Select Site Views"
COM_COMPONENTBUILDER_FILTER_SELECT_SUPER_POWER="Select Super Power"
COM_COMPONENTBUILDER_FILTER_SELECT_TARGET="Select Target"
COM_COMPONENTBUILDER_FILTER_SELECT_TARGET_AREA="Select Target Area"
+COM_COMPONENTBUILDER_FILTER_SELECT_TARGET_CONTENT="Select Target Content"
COM_COMPONENTBUILDER_FILTER_SELECT_TARGET_FOLDER="Select Target Folder"
COM_COMPONENTBUILDER_FILTER_SELECT_TYPE="Select Type"
COM_COMPONENTBUILDER_FILTER_SELECT_TYPE_BEHAVIOR="Select Type Behavior"
@@ -5227,6 +5209,8 @@ COM_COMPONENTBUILDER_FILTER_SOURCE_STRING_DESCENDING="Source String descending"
COM_COMPONENTBUILDER_FILTER_SYSTEM_NAME_ASCENDING="System Name ascending"
COM_COMPONENTBUILDER_FILTER_SYSTEM_NAME_DESCENDING="System Name descending"
COM_COMPONENTBUILDER_FILTER_TARGET_ASCENDING="Target ascending"
+COM_COMPONENTBUILDER_FILTER_TARGET_CONTENT_ASCENDING="Target Content ascending"
+COM_COMPONENTBUILDER_FILTER_TARGET_CONTENT_DESCENDING="Target Content descending"
COM_COMPONENTBUILDER_FILTER_TARGET_DESCENDING="Target descending"
COM_COMPONENTBUILDER_FILTER_TARGET_FOLDER_ASCENDING="Target Folder ascending"
COM_COMPONENTBUILDER_FILTER_TARGET_FOLDER_DESCENDING="Target Folder descending"
@@ -5649,8 +5633,6 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_GIT_FOLDER_PATH_LABEL="Git Folder Path
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_JAVASCRIPT_LABEL="Add Javascript"
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_JCB_POWERS_PATH_DESCRIPTION="Would you like to override the global jcb powers path for this component?"
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_JCB_POWERS_PATH_LABEL="JCB Powers Path"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_LICENSE_DESCRIPTION="Add the option to use the whmcs license add-on in the component."
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_LICENSE_LABEL="Add WHMCS(license add-on) "
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_MENU_PREFIX_DESCRIPTION="Would you like to add a prefix to the Joomla menu name of this component"
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_MENU_PREFIX_LABEL="Add Menu Prefix"
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_NAMESPACE_PREFIX_DESCRIPTION="Override the namespace prefix, or use the global value found under the component builder global option under the compiler tab."
@@ -5739,7 +5721,6 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_ADMIN_LABEL="CSS (admin)"
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_SITE_DESCRIPTION="Add CSS for the entire front-end of your component. Do not add the style tags."
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_SITE_LABEL="CSS (site)"
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CUSTOM_ADMIN_VIEWS="Custom Admin Views"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CUSTOM_USED_IN_CUSTOM_CODE="Custom (used in custom code)"
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DASHBOARD_DESCRIPTION="Select a custom admin view that is already linked to this component as a dynamic dashboard."
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DASHBOARD_LABEL="Dynamic Dashboard(admin or custom admin view) "
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DASHBOARD_TYPE_DESCRIPTION="Select the type of dashboard you would like to use."
@@ -5807,9 +5788,6 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_LIBS_HELPERS="Libs & Helpers"
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_LICENSE_DESCRIPTION="Add License Here"
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_LICENSE_HINT="Add License Here"
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_LICENSE_LABEL="License"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_LICENSE_TYPE_DESCRIPTION="How should the license be implemented."
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_LICENSE_TYPE_LABEL="Implementation"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_LOCK_DOWN_USE_USED_TO_VERIFY_OWNERSHIP="Lock Down Use (used to verify ownership)"
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_MENU_PREFIX_DESCRIPTION="Add the prefix you would like to use. Make sure that it is HTML Character Entities since it is being used in XML."
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_MENU_PREFIX_HINT="»"
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_MENU_PREFIX_LABEL="PrefixCheck out these lists:Char-ref or Emoji "
@@ -5882,8 +5860,6 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_UPDATE_SERVER_NOTE_ZIP_LABEL="The ZIP
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_VERSION_OPTIONS_1_DESCRIPTION="Use the modified date, and version number of the view/fields instead of the global version in related files."
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_VERSION_OPTIONS_2_DESCRIPTION="Use only the first two numbers from your global version. This is useful if you are using git. Since all document will not then be updated, with version change, with each compilation when only a minor update is made."
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_VERSION_OPTIONS_3_DESCRIPTION="Use only the first numbers from your global version. This is useful if you are using git. Since all document will not then be updated, with version change, with each compilation when major or minor updates are made."
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_WHMCS_LISENCING_NOTE_DESCRIPTION="You can use WHMCS licensing addon in your componentHelpful Links https://www.whmcs.com/software-licensing/ http://docs.whmcs.com/Licensing_Addon Support JCB and use our affiliate link (https://www.whmcs.com/members/aff.php?aff=37513 ) to sign-up with WHMCS ."
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_WHMCS_LISENCING_NOTE_LABEL="Licensing addon module for WHMCS"
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOT_REQUIRED="Not Required"
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NUMBER_LABEL="Number"
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ORDERING_LABEL="Ordering"
@@ -5954,7 +5930,6 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TOIGNORE_LABEL="Repository Folders or File
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TO_IGNORE_NOTE_DESCRIPTION="During compilation JCB deletes all files and folders from the repository folder, and then adds the newly created files and folders back into the repository folder. Yet there may be files or folders you may not want deleted, like the .git folder, since JCB does not dynamically create that folder and so it will not be placed back, but simply delete it, unless you add it in this text field below, so that it will be ignored, and therefore not deleted in the first place. You can add multiple folders and files, separated by commas. Like: .git, .hg
"
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TO_IGNORE_NOTE_LABEL="Repository Folders or Files to Ignore"
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TRANSLATION_TOOL_LABEL="Translation Tool"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATES_NOT_READY="Updates (NOT READY!)"
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATE_SERVER_DESCRIPTION="Select your update server for this component."
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATE_SERVER_LABEL="Update Server"
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATE_SERVER_TARGET_DESCRIPTION="Select the type of way you would like the update server to be set."
@@ -5977,19 +5952,6 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_DESCRIPTION="Enter website address
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_HINT="http://www.example.com"
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_LABEL="Author Website"
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_MESSAGE="Error! Please add website here."
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_BUY_LINK_DESCRIPTION="Enter link where your WHMCS License key can be bought."
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_BUY_LINK_HINT="http://www.example.com/buy-whmcs-key"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_BUY_LINK_LABEL="Buy Link(to get WHMCS License Key) "
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_BUY_LINK_MESSAGE="Error! Please add link here."
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_ENCRYPTION_ONLY_TO_LOCK_DATAFIELDS="WHMCS encryption (only to lock data/fields)"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_KEY_DESCRIPTION="Add your WHMCS Secret Key here that is needed for this license"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_KEY_HINT="Secret Key"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_KEY_LABEL="WHMCS Secret Key(encrypted field) "
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_KEY_MESSAGE="Error! Please add some secret key here."
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_URL_DESCRIPTION="Enter whmcs address"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_URL_HINT="http://www.yoursite.com/whmcs"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_URL_LABEL="URL to your WHMCS install"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_URL_MESSAGE="Error! Please add website here."
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES="Yes"
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ZIP="ZIP"
COM_COMPONENTBUILDER_JOOMLA_FIELDS="Joomla fields"
@@ -7643,6 +7605,7 @@ COM_COMPONENTBUILDER_NOT_SAVED="Not saved!"
COM_COMPONENTBUILDER_NOT_SET="not set"
COM_COMPONENTBUILDER_NOT_TRANSLATED_IN="Not translated in"
COM_COMPONENTBUILDER_NO_ACCESS_GRANTED="No Access Granted!"
+COM_COMPONENTBUILDER_NO_ACTIVE_REPOSITORIES_FOUND="No Active Repositories Found"
COM_COMPONENTBUILDER_NO_ADMIN_VIEWS_FOUND="No Admin Views Found"
COM_COMPONENTBUILDER_NO_COMPONENTS_FOUND="No Components Found"
COM_COMPONENTBUILDER_NO_COMPONENTS_WERE_SELECTED_PLEASE_MAKE_A_SELECTION_AND_TRY_AGAIN="No components were selected, please make a selection and try again!"
@@ -7929,7 +7892,7 @@ COM_COMPONENTBUILDER_POWER_NAME_LABEL="Name"
COM_COMPONENTBUILDER_POWER_NAME_MESSAGE="Error! Please add name here."
COM_COMPONENTBUILDER_POWER_NEW="A New Power"
COM_COMPONENTBUILDER_POWER_NO="No"
-COM_COMPONENTBUILDER_POWER_NOTE_APPROVED_PATHS_DESCRIPTION="Select the sub paths inside the local path where you would like to add this power. The default is the core JCB path which is joomla/super-powers (this can be changed in the global options)
To set the local path , and to add more sub paths , open the JCB global options, and look for the super power tab, there you will find all the instructions needed.
"
+COM_COMPONENTBUILDER_POWER_NOTE_APPROVED_PATHS_DESCRIPTION="Select the sub paths inside the local path where you would like to add this power.
To add more sub paths , go to the repositories view under servers.
"
COM_COMPONENTBUILDER_POWER_NOTE_APPROVED_PATHS_LABEL="Super Powers Repositories"
COM_COMPONENTBUILDER_POWER_NOTE_LINKED_TO_NOTICE_DESCRIPTION="Searching the database.
"
COM_COMPONENTBUILDER_POWER_NOTE_LINKED_TO_NOTICE_LABEL="Linked To"
@@ -7979,6 +7942,7 @@ COM_COMPONENTBUILDER_PROPERTY="Property"
COM_COMPONENTBUILDER_PROPERTY_ALREADY_SELECTED_TRY_ANOTHER="Property already selected, try another."
COM_COMPONENTBUILDER_PROPERTY_NAME="Property Name"
COM_COMPONENTBUILDER_PROPERTY_VALUE="Property Value"
+COM_COMPONENTBUILDER_PSUPER_POWERB_REPOSITORY_AT_BHTTPSGITVDMDEVSB_CAN_BE_USED_TO_OVERRIDE_ANY_POWERBR_BUT_HAS_NOT_YET_BEEN_SET_IN_YOUR_ACCOUNT_AT_HTTPSGITVDMDEVSBR_SMALLTHIS_IS_AND_OPTIONAL_FEATURESMALL="Super Power repository at https://git.vdm.dev/%s can be used to override any power! But has not yet been set in your account at https://git.vdm.dev/%sThis is and optional feature. "
COM_COMPONENTBUILDER_PSUPER_POWERB_REPOSITORY_AT_BSSB_GAVE_THE_FOLLOWING_ERRORBR_SP="
Super Power repository at %s/%s gave the following error! %s
"
COM_COMPONENTBUILDER_PS_NAMING_MISMATCH_ERROR_SPPTHE_S_NAME_IS_BSB_AND_THE_ENDING_FILE_NAME_IN_THE_NAMESPACE_IS_BSB_THIS_IS_BAD_CONVENTION_PLEASE_SEE_A_HREFS_PSRFOURA_FOR_MORE_INFOPPA_HREFSCLICK_HEREA_TO_FIX_THIS_ISSUEP="%s naming mismatch error (%s)
The %s name is %s and the ending file name in the namespace is %s . This is bad convention, please see psr-4 for more info.
Click here to fix this issue.
"
COM_COMPONENTBUILDER_PUBLIC_ACCESS="Public Access"
@@ -7995,6 +7959,118 @@ COM_COMPONENTBUILDER_REPLACE="Replace"
COM_COMPONENTBUILDER_REPLACED_WITH="replaced with"
COM_COMPONENTBUILDER_REPLACE_PROCESS_COMPLETE="replace process complete"
COM_COMPONENTBUILDER_REPORT_AN_ISSUE_BSB="Report an issue: %s "
+COM_COMPONENTBUILDER_REPOSITORIES="Repositories"
+COM_COMPONENTBUILDER_REPOSITORIES_ACCESS="Repositories Access"
+COM_COMPONENTBUILDER_REPOSITORIES_ACCESS_DESC="Allows the users in this group to access access repositories"
+COM_COMPONENTBUILDER_REPOSITORIES_BATCH_OPTIONS="Batch process the selected Repositories"
+COM_COMPONENTBUILDER_REPOSITORIES_BATCH_TIP="All changes will be applied to all selected Repositories"
+COM_COMPONENTBUILDER_REPOSITORIES_BATCH_USE="Repositories Batch Use"
+COM_COMPONENTBUILDER_REPOSITORIES_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch repositories"
+COM_COMPONENTBUILDER_REPOSITORIES_CREATE="Repositories Create"
+COM_COMPONENTBUILDER_REPOSITORIES_CREATE_DESC="Allows the users in this group to create create repositories"
+COM_COMPONENTBUILDER_REPOSITORIES_DASHBOARD_LIST="Repositories Dashboard List"
+COM_COMPONENTBUILDER_REPOSITORIES_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of repository"
+COM_COMPONENTBUILDER_REPOSITORIES_DELETE="Repositories Delete"
+COM_COMPONENTBUILDER_REPOSITORIES_DELETE_DESC="Allows the users in this group to delete delete repositories"
+COM_COMPONENTBUILDER_REPOSITORIES_EDIT="Repositories Edit"
+COM_COMPONENTBUILDER_REPOSITORIES_EDIT_CREATED_BY="Repositories Edit Created By"
+COM_COMPONENTBUILDER_REPOSITORIES_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by repositories"
+COM_COMPONENTBUILDER_REPOSITORIES_EDIT_CREATED_DATE="Repositories Edit Created Date"
+COM_COMPONENTBUILDER_REPOSITORIES_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created repositories"
+COM_COMPONENTBUILDER_REPOSITORIES_EDIT_DESC="Allows the users in this group to edit the repository"
+COM_COMPONENTBUILDER_REPOSITORIES_EDIT_OWN="Repositories Edit Own"
+COM_COMPONENTBUILDER_REPOSITORIES_EDIT_OWN_DESC="Allows the users in this group to edit edit own repositories created by them"
+COM_COMPONENTBUILDER_REPOSITORIES_EDIT_STATE="Repositories Edit State"
+COM_COMPONENTBUILDER_REPOSITORIES_EDIT_STATE_DESC="Allows the users in this group to update the state of the repository"
+COM_COMPONENTBUILDER_REPOSITORIES_EDIT_VERSION="Repositories Edit Version"
+COM_COMPONENTBUILDER_REPOSITORIES_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version repositories"
+COM_COMPONENTBUILDER_REPOSITORIES_N_ITEMS_ARCHIVED="%s Repositories archived."
+COM_COMPONENTBUILDER_REPOSITORIES_N_ITEMS_ARCHIVED_1="%s Repository archived."
+COM_COMPONENTBUILDER_REPOSITORIES_N_ITEMS_CHECKED_IN_0="No Repository successfully checked in."
+COM_COMPONENTBUILDER_REPOSITORIES_N_ITEMS_CHECKED_IN_1="%d Repository successfully checked in."
+COM_COMPONENTBUILDER_REPOSITORIES_N_ITEMS_CHECKED_IN_MORE="%d Repositories successfully checked in."
+COM_COMPONENTBUILDER_REPOSITORIES_N_ITEMS_DELETED="%s Repositories deleted."
+COM_COMPONENTBUILDER_REPOSITORIES_N_ITEMS_DELETED_1="%s Repository deleted."
+COM_COMPONENTBUILDER_REPOSITORIES_N_ITEMS_FAILED_PUBLISHING="%s Repositories failed publishing."
+COM_COMPONENTBUILDER_REPOSITORIES_N_ITEMS_FAILED_PUBLISHING_1="%s Repository failed publishing."
+COM_COMPONENTBUILDER_REPOSITORIES_N_ITEMS_FEATURED="%s Repositories featured."
+COM_COMPONENTBUILDER_REPOSITORIES_N_ITEMS_FEATURED_1="%s Repository featured."
+COM_COMPONENTBUILDER_REPOSITORIES_N_ITEMS_PUBLISHED="%s Repositories published."
+COM_COMPONENTBUILDER_REPOSITORIES_N_ITEMS_PUBLISHED_1="%s Repository published."
+COM_COMPONENTBUILDER_REPOSITORIES_N_ITEMS_TRASHED="%s Repositories trashed."
+COM_COMPONENTBUILDER_REPOSITORIES_N_ITEMS_TRASHED_1="%s Repository trashed."
+COM_COMPONENTBUILDER_REPOSITORIES_N_ITEMS_UNFEATURED="%s Repositories unfeatured."
+COM_COMPONENTBUILDER_REPOSITORIES_N_ITEMS_UNFEATURED_1="%s Repository unfeatured."
+COM_COMPONENTBUILDER_REPOSITORIES_N_ITEMS_UNPUBLISHED="%s Repositories unpublished."
+COM_COMPONENTBUILDER_REPOSITORIES_N_ITEMS_UNPUBLISHED_1="%s Repository unpublished."
+COM_COMPONENTBUILDER_REPOSITORIES_SUBMENU="Repositories Submenu"
+COM_COMPONENTBUILDER_REPOSITORIES_SUBMENU_DESC="Allows the users in this group to submenu of repository"
+COM_COMPONENTBUILDER_REPOSITORY="Repository"
+COM_COMPONENTBUILDER_REPOSITORY_ACCESS_REPO_DESCRIPTION="Set the access options to this repository"
+COM_COMPONENTBUILDER_REPOSITORY_ACCESS_REPO_LABEL="Access"
+COM_COMPONENTBUILDER_REPOSITORY_BASE_DESCRIPTION="Enter Base URL"
+COM_COMPONENTBUILDER_REPOSITORY_BASE_HINT="https://git.vdm.dev"
+COM_COMPONENTBUILDER_REPOSITORY_BASE_LABEL="Base URL"
+COM_COMPONENTBUILDER_REPOSITORY_BASE_MESSAGE="Error! Please add website here."
+COM_COMPONENTBUILDER_REPOSITORY_CREATED_BY_DESC="The user that created this Repository."
+COM_COMPONENTBUILDER_REPOSITORY_CREATED_BY_LABEL="Created By"
+COM_COMPONENTBUILDER_REPOSITORY_CREATED_DATE_DESC="The date this Repository was created."
+COM_COMPONENTBUILDER_REPOSITORY_CREATED_DATE_LABEL="Created Date"
+COM_COMPONENTBUILDER_REPOSITORY_DETAILS="Details"
+COM_COMPONENTBUILDER_REPOSITORY_EDIT="Editing the Repository"
+COM_COMPONENTBUILDER_REPOSITORY_ERROR_UNIQUE_ALIAS="Another Repository has the same alias."
+COM_COMPONENTBUILDER_REPOSITORY_ERROR_UNIQUE_ALIAS_TRASHED="A trashed Repository has the same alias ."
+COM_COMPONENTBUILDER_REPOSITORY_GITEA="Gitea"
+COM_COMPONENTBUILDER_REPOSITORY_GLOBAL="Global"
+COM_COMPONENTBUILDER_REPOSITORY_GUID_DESCRIPTION="Globally Unique Identifier"
+COM_COMPONENTBUILDER_REPOSITORY_GUID_HINT="Auto Generated"
+COM_COMPONENTBUILDER_REPOSITORY_GUID_LABEL="GUID"
+COM_COMPONENTBUILDER_REPOSITORY_ID="Id"
+COM_COMPONENTBUILDER_REPOSITORY_JOOMLA_POWER="Joomla Power"
+COM_COMPONENTBUILDER_REPOSITORY_MODIFIED_BY_DESC="The last user that modified this Repository."
+COM_COMPONENTBUILDER_REPOSITORY_MODIFIED_BY_LABEL="Modified By"
+COM_COMPONENTBUILDER_REPOSITORY_MODIFIED_DATE_DESC="The date this Repository was modified."
+COM_COMPONENTBUILDER_REPOSITORY_MODIFIED_DATE_LABEL="Modified Date"
+COM_COMPONENTBUILDER_REPOSITORY_NEW="A New Repository"
+COM_COMPONENTBUILDER_REPOSITORY_ORDERING_LABEL="Ordering"
+COM_COMPONENTBUILDER_REPOSITORY_ORGANISATION_DESCRIPTION="Enter the name of the owner of this repository."
+COM_COMPONENTBUILDER_REPOSITORY_ORGANISATION_HINT="[org]"
+COM_COMPONENTBUILDER_REPOSITORY_ORGANISATION_LABEL="Organisation"
+COM_COMPONENTBUILDER_REPOSITORY_ORGANISATION_MESSAGE="Error! Please add organisation here."
+COM_COMPONENTBUILDER_REPOSITORY_OVERRIDE="Override"
+COM_COMPONENTBUILDER_REPOSITORY_PERMISSION="Permissions"
+COM_COMPONENTBUILDER_REPOSITORY_PUBLISHING="Publishing"
+COM_COMPONENTBUILDER_REPOSITORY_READ_BRANCH_DESCRIPTION="The read branch to use in the API calls."
+COM_COMPONENTBUILDER_REPOSITORY_READ_BRANCH_HINT="[master]"
+COM_COMPONENTBUILDER_REPOSITORY_READ_BRANCH_LABEL="Read Branch"
+COM_COMPONENTBUILDER_REPOSITORY_READ_BRANCH_MESSAGE="Error! Please add read branch here."
+COM_COMPONENTBUILDER_REPOSITORY_REPOSITORY_HINT="[repo]"
+COM_COMPONENTBUILDER_REPOSITORY_REPOSITORY_LABEL="Repository"
+COM_COMPONENTBUILDER_REPOSITORY_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Repository to customise the alias."
+COM_COMPONENTBUILDER_REPOSITORY_SELECT_AN_OPTION="Select an option"
+COM_COMPONENTBUILDER_REPOSITORY_STATUS="Status"
+COM_COMPONENTBUILDER_REPOSITORY_SUPER_POWER="Super Power"
+COM_COMPONENTBUILDER_REPOSITORY_SYSTEM_NAME_DESCRIPTION="Used only in the system."
+COM_COMPONENTBUILDER_REPOSITORY_SYSTEM_NAME_HINT="The System Name Here"
+COM_COMPONENTBUILDER_REPOSITORY_SYSTEM_NAME_LABEL="System Name"
+COM_COMPONENTBUILDER_REPOSITORY_SYSTEM_NAME_MESSAGE="Error! Please add some text here."
+COM_COMPONENTBUILDER_REPOSITORY_TARGET_DESCRIPTION="The target content this repository holds."
+COM_COMPONENTBUILDER_REPOSITORY_TARGET_LABEL="Target Content"
+COM_COMPONENTBUILDER_REPOSITORY_TOKEN_DESCRIPTION="This token is used to access the api."
+COM_COMPONENTBUILDER_REPOSITORY_TOKEN_HINT="Access Tokens"
+COM_COMPONENTBUILDER_REPOSITORY_TOKEN_LABEL="Access Token"
+COM_COMPONENTBUILDER_REPOSITORY_TYPE_DESCRIPTION="The type of git system is this repository hosted on."
+COM_COMPONENTBUILDER_REPOSITORY_TYPE_LABEL="Type"
+COM_COMPONENTBUILDER_REPOSITORY_USERNAME_DESCRIPTION="The username to use in the API calls."
+COM_COMPONENTBUILDER_REPOSITORY_USERNAME_HINT="Username"
+COM_COMPONENTBUILDER_REPOSITORY_USERNAME_LABEL="Username"
+COM_COMPONENTBUILDER_REPOSITORY_USERNAME_MESSAGE="Error! Please add username here."
+COM_COMPONENTBUILDER_REPOSITORY_VERSION_DESC="A count of the number of times this Repository has been revised."
+COM_COMPONENTBUILDER_REPOSITORY_VERSION_LABEL="Version"
+COM_COMPONENTBUILDER_REPOSITORY_WRITE_BRANCH_DESCRIPTION="The write branch to use in the API calls. This can be the same as the read branch."
+COM_COMPONENTBUILDER_REPOSITORY_WRITE_BRANCH_HINT="[dev]"
+COM_COMPONENTBUILDER_REPOSITORY_WRITE_BRANCH_LABEL="Write Branch"
+COM_COMPONENTBUILDER_REPOSITORY_WRITE_BRANCH_MESSAGE="Error! Please add write branch here."
COM_COMPONENTBUILDER_REQUIRED_FIELDS_MISSING_IN_THE_BMYSQL_TABLES_SOURCE_MAPB_SELECTIONBR_S="Required fields missing in the MySQL -> Tables -> Source Map selection: %s"
COM_COMPONENTBUILDER_REQUIRES_THE_VALUE_ENTERED_BE_ONE_OF_THE_OPTIONS_IN_AN_ELEMENT_OF_TYPEQUOTLISTQUOT_THAT_IS_THAT_THE_ELEMENT_IS_A_SELECT_LIST="Requires the value entered be one of the options in an element of type="list": that is, that the element is a select list."
COM_COMPONENTBUILDER_REQUIRES_THE_VALUE_TO_BE_A_TELEPHONE_NUMBER_COMPLYING_WITH_THE_STANDARDS_OF_NANPA_ITUT_TRECEONE_HUNDRED_AND_SIXTY_FOUR_OR_IETF_RFCFOUR_THOUSAND_NINE_HUNDRED_AND_THIRTY_THREE="Requires the value to be a Telephone number complying with the standards of nanpa, ITU-T T-REC-E.164 or ietf rfc4933."
@@ -8840,6 +8916,7 @@ COM_COMPONENTBUILDER_SUBMENU_LAYOUTS="Layouts"
COM_COMPONENTBUILDER_SUBMENU_LIBRARIES="Libraries"
COM_COMPONENTBUILDER_SUBMENU_PLACEHOLDERS="Placeholders"
COM_COMPONENTBUILDER_SUBMENU_POWERS="Powers"
+COM_COMPONENTBUILDER_SUBMENU_REPOSITORIES="Repositories"
COM_COMPONENTBUILDER_SUBMENU_SEARCH="Search"
COM_COMPONENTBUILDER_SUBMENU_SERVERS="Servers"
COM_COMPONENTBUILDER_SUBMENU_SITE_VIEWS="Site Views"
@@ -9155,6 +9232,7 @@ COM_COMPONENTBUILDER_TYPE_NAME="Type - Name"
COM_COMPONENTBUILDER_TYPE_OR_SELECT_SOME_OPTIONS="Type or select some options"
COM_COMPONENTBUILDER_TYPE_PLACEHOLDER="Placeholder"
COM_COMPONENTBUILDER_TYPE_POWER="Power"
+COM_COMPONENTBUILDER_TYPE_REPOSITORY="Repository"
COM_COMPONENTBUILDER_TYPE_SERVER="Server"
COM_COMPONENTBUILDER_TYPE_SITE_VIEW="Site View"
COM_COMPONENTBUILDER_TYPE_SNIPPET="Snippet"
diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini b/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini
index fb8c2120f..fdcc753da 100644
--- a/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini
+++ b/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini
@@ -1065,6 +1065,30 @@ COM_COMPONENTBUILDER_POWER_RESET_BUTTON_ACCESS="Power Reset Button Access"
COM_COMPONENTBUILDER_POWER_RESET_BUTTON_ACCESS_DESC="Allows the users in this group to access the reset button."
COM_COMPONENTBUILDER_POWER_RUN_EXPANSION_BUTTON_ACCESS="Power Run Expansion Button Access"
COM_COMPONENTBUILDER_POWER_RUN_EXPANSION_BUTTON_ACCESS_DESC="Allows the users in this group to access the run expansion button."
+COM_COMPONENTBUILDER_REPOSITORIES_ACCESS="Repositories Access"
+COM_COMPONENTBUILDER_REPOSITORIES_ACCESS_DESC="Allows the users in this group to access access repositories"
+COM_COMPONENTBUILDER_REPOSITORIES_BATCH_USE="Repositories Batch Use"
+COM_COMPONENTBUILDER_REPOSITORIES_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch repositories"
+COM_COMPONENTBUILDER_REPOSITORIES_CREATE="Repositories Create"
+COM_COMPONENTBUILDER_REPOSITORIES_CREATE_DESC="Allows the users in this group to create create repositories"
+COM_COMPONENTBUILDER_REPOSITORIES_DASHBOARD_LIST="Repositories Dashboard List"
+COM_COMPONENTBUILDER_REPOSITORIES_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of repository"
+COM_COMPONENTBUILDER_REPOSITORIES_DELETE="Repositories Delete"
+COM_COMPONENTBUILDER_REPOSITORIES_DELETE_DESC="Allows the users in this group to delete delete repositories"
+COM_COMPONENTBUILDER_REPOSITORIES_EDIT="Repositories Edit"
+COM_COMPONENTBUILDER_REPOSITORIES_EDIT_CREATED_BY="Repositories Edit Created By"
+COM_COMPONENTBUILDER_REPOSITORIES_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by repositories"
+COM_COMPONENTBUILDER_REPOSITORIES_EDIT_CREATED_DATE="Repositories Edit Created Date"
+COM_COMPONENTBUILDER_REPOSITORIES_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created repositories"
+COM_COMPONENTBUILDER_REPOSITORIES_EDIT_DESC="Allows the users in this group to edit the repository"
+COM_COMPONENTBUILDER_REPOSITORIES_EDIT_OWN="Repositories Edit Own"
+COM_COMPONENTBUILDER_REPOSITORIES_EDIT_OWN_DESC="Allows the users in this group to edit edit own repositories created by them"
+COM_COMPONENTBUILDER_REPOSITORIES_EDIT_STATE="Repositories Edit State"
+COM_COMPONENTBUILDER_REPOSITORIES_EDIT_STATE_DESC="Allows the users in this group to update the state of the repository"
+COM_COMPONENTBUILDER_REPOSITORIES_EDIT_VERSION="Repositories Edit Version"
+COM_COMPONENTBUILDER_REPOSITORIES_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version repositories"
+COM_COMPONENTBUILDER_REPOSITORIES_SUBMENU="Repositories Submenu"
+COM_COMPONENTBUILDER_REPOSITORIES_SUBMENU_DESC="Allows the users in this group to submenu of repository"
COM_COMPONENTBUILDER_SEARCH_ACCESS="Search Access"
COM_COMPONENTBUILDER_SEARCH_ACCESS_DESC="Allows the users in this group to access search."
COM_COMPONENTBUILDER_SEARCH_COMPILER_BUTTON_ACCESS="Search Compiler Button Access"
diff --git a/admin/layouts/field/database_right.php b/admin/layouts/field/database_right.php
index 13a86167b..a0f319fba 100644
--- a/admin/layouts/field/database_right.php
+++ b/admin/layouts/field/database_right.php
@@ -31,7 +31,6 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
'store',
'medium_encryption_note',
'basic_encryption_note',
- 'note_whmcs_encryption',
'note_expert_field_save_mode',
'initiator_on_save_model',
'initiator_on_get_model',
diff --git a/admin/layouts/fieldtype/fields_fullwidth.php b/admin/layouts/fieldtype/fields_fullwidth.php
index 12843da04..3daa2097b 100644
--- a/admin/layouts/fieldtype/fields_fullwidth.php
+++ b/admin/layouts/fieldtype/fields_fullwidth.php
@@ -19,7 +19,7 @@ use VDM\Joomla\Utilities\StringHelper;
use VDM\Joomla\Utilities\ArrayHelper;
// set the defaults
-$items = $displayData->vxtfields;
+$items = $displayData->vxsfields;
$user = Factory::getUser();
$id = $displayData->item->id;
// set the edit URL
diff --git a/admin/layouts/joomla_component/details_right.php b/admin/layouts/joomla_component/details_right.php
index 72051362e..dd6004ad4 100644
--- a/admin/layouts/joomla_component/details_right.php
+++ b/admin/layouts/joomla_component/details_right.php
@@ -30,12 +30,6 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
'author',
'email',
'website',
- 'add_license',
- 'license_type',
- 'note_whmcs_lisencing_note',
- 'whmcs_key',
- 'whmcs_url',
- 'whmcs_buy_link',
'license',
'bom',
'image',
diff --git a/admin/layouts/repository/details_above.php b/admin/layouts/repository/details_above.php
new file mode 100644
index 000000000..09f0f562f
--- /dev/null
+++ b/admin/layouts/repository/details_above.php
@@ -0,0 +1,46 @@
+
+ * @git Joomla Component Builder
+ * @copyright Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// get the form
+$form = $displayData->getForm();
+
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
+ 'system_name',
+ 'target',
+ 'access_repo'
+);
+
+$hiddenFields = $displayData->get('hidden_fields') ?: [];
+
+?>
+
+
+
diff --git a/admin/layouts/repository/details_left.php b/admin/layouts/repository/details_left.php
new file mode 100644
index 000000000..141403d4a
--- /dev/null
+++ b/admin/layouts/repository/details_left.php
@@ -0,0 +1,45 @@
+
+ * @git Joomla Component Builder
+ * @copyright Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// get the form
+$form = $displayData->getForm();
+
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
+ 'type',
+ 'base',
+ 'username',
+ 'token'
+);
+
+$hiddenFields = $displayData->get('hidden_fields') ?: [];
+
+?>
+
+
+
+ setFieldAttribute($field, 'type', 'hidden'); ?>
+
+ renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+
+
diff --git a/admin/layouts/repository/details_right.php b/admin/layouts/repository/details_right.php
new file mode 100644
index 000000000..6be795313
--- /dev/null
+++ b/admin/layouts/repository/details_right.php
@@ -0,0 +1,45 @@
+
+ * @git Joomla Component Builder
+ * @copyright Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// get the form
+$form = $displayData->getForm();
+
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
+ 'organisation',
+ 'repository',
+ 'read_branch',
+ 'write_branch'
+);
+
+$hiddenFields = $displayData->get('hidden_fields') ?: [];
+
+?>
+
+
+
+ setFieldAttribute($field, 'type', 'hidden'); ?>
+
+ renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+
+
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Interfaces/Database/index.html b/admin/layouts/repository/index.html
similarity index 100%
rename from libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Interfaces/Database/index.html
rename to admin/layouts/repository/index.html
diff --git a/admin/layouts/repository/publishing.php b/admin/layouts/repository/publishing.php
new file mode 100644
index 000000000..865bcf382
--- /dev/null
+++ b/admin/layouts/repository/publishing.php
@@ -0,0 +1,47 @@
+
+ * @git Joomla Component Builder
+ * @copyright Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// get the form
+$form = $displayData->getForm();
+
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
+ 'guid',
+ 'title',
+ 'created',
+ 'created_by',
+ 'modified',
+ 'modified_by'
+);
+
+$hiddenFields = $displayData->get('hidden_fields') ?: [];
+
+?>
+
+
+
+ setFieldAttribute($field, 'type', 'hidden'); ?>
+
+ renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+
+
diff --git a/admin/layouts/repository/publlshing.php b/admin/layouts/repository/publlshing.php
new file mode 100644
index 000000000..9b1e77c16
--- /dev/null
+++ b/admin/layouts/repository/publlshing.php
@@ -0,0 +1,47 @@
+
+ * @git Joomla Component Builder
+ * @copyright Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// get the form
+$form = $displayData->getForm();
+
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
+ 'published',
+ 'ordering',
+ 'access',
+ 'version',
+ 'hits',
+ 'id'
+);
+
+$hiddenFields = $displayData->get('hidden_fields') ?: [];
+
+?>
+
+
+
+ setFieldAttribute($field, 'type', 'hidden'); ?>
+
+ renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+
+
diff --git a/admin/models/componentbuilder.php b/admin/models/componentbuilder.php
index 60f02288f..be431d449 100644
--- a/admin/models/componentbuilder.php
+++ b/admin/models/componentbuilder.php
@@ -37,7 +37,7 @@ class ComponentbuilderModelComponentbuilder extends ListModel
$icons = [];
// view groups array
$viewGroups = array(
- 'main' => array('png.compiler', 'png.joomla_components', 'png.joomla_modules', 'png.joomla_plugins', 'png.powers', 'png.search', 'png||importjcbpackages||index.php?option=com_componentbuilder&view=joomla_components&task=joomla_components.smartImport', 'png.admin_views', 'png.custom_admin_views', 'png.site_views', 'png.template.add', 'png.templates', 'png.layouts', 'png.dynamic_get.add', 'png.dynamic_gets', 'png.custom_codes', 'png.placeholders', 'png.libraries', 'png.snippets', 'png.get_snippets', 'png.validation_rules', 'png.field.add', 'png.fields', 'png.fields.catid_qpo0O0oqp_com_componentbuilder_po0O0oq_field', 'png.fieldtypes', 'png.fieldtypes.catid_qpo0O0oqp_com_componentbuilder_po0O0oq_fieldtype', 'png.language_translations', 'png.servers', 'png.help_documents')
+ 'main' => array('png.compiler', 'png.joomla_components', 'png.joomla_modules', 'png.joomla_plugins', 'png.powers', 'png.search', 'png||importjcbpackages||index.php?option=com_componentbuilder&view=joomla_components&task=joomla_components.smartImport', 'png.admin_views', 'png.custom_admin_views', 'png.site_views', 'png.template.add', 'png.templates', 'png.layouts', 'png.dynamic_get.add', 'png.dynamic_gets', 'png.custom_codes', 'png.placeholders', 'png.libraries', 'png.snippets', 'png.get_snippets', 'png.validation_rules', 'png.field.add', 'png.fields', 'png.fields.catid_qpo0O0oqp_com_componentbuilder_po0O0oq_field', 'png.fieldtypes', 'png.fieldtypes.catid_qpo0O0oqp_com_componentbuilder_po0O0oq_fieldtype', 'png.language_translations', 'png.servers', 'png.repositories', 'png.help_documents')
);
// view access array
$viewAccess = [
@@ -155,6 +155,11 @@ class ComponentbuilderModelComponentbuilder extends ListModel
'server.access' => 'server.access',
'servers.submenu' => 'server.submenu',
'servers.dashboard_list' => 'server.dashboard_list',
+ 'repository.create' => 'repository.create',
+ 'repositories.access' => 'repository.access',
+ 'repository.access' => 'repository.access',
+ 'repositories.submenu' => 'repository.submenu',
+ 'repositories.dashboard_list' => 'repository.dashboard_list',
'help_document.create' => 'help_document.create',
'help_documents.access' => 'help_document.access',
'help_document.access' => 'help_document.access',
diff --git a/admin/models/field.php b/admin/models/field.php
index ff79c7d31..6646be4d9 100644
--- a/admin/models/field.php
+++ b/admin/models/field.php
@@ -71,7 +71,6 @@ class ComponentbuilderModelField extends AdminModel
'store',
'medium_encryption_note',
'basic_encryption_note',
- 'note_whmcs_encryption',
'note_expert_field_save_mode',
'initiator_on_save_model',
'initiator_on_get_model',
@@ -215,6 +214,12 @@ class ComponentbuilderModelField extends AdminModel
$item->metadata = $registry->toArray();
}
+ if (!empty($item->on_get_model_field))
+ {
+ // base64 Decode on_get_model_field.
+ $item->on_get_model_field = base64_decode($item->on_get_model_field);
+ }
+
if (!empty($item->on_save_model_field))
{
// base64 Decode on_save_model_field.
@@ -227,10 +232,10 @@ class ComponentbuilderModelField extends AdminModel
$item->initiator_on_get_model = base64_decode($item->initiator_on_get_model);
}
- if (!empty($item->initiator_on_save_model))
+ if (!empty($item->javascript_view_footer))
{
- // base64 Decode initiator_on_save_model.
- $item->initiator_on_save_model = base64_decode($item->initiator_on_save_model);
+ // base64 Decode javascript_view_footer.
+ $item->javascript_view_footer = base64_decode($item->javascript_view_footer);
}
if (!empty($item->css_views))
@@ -245,24 +250,18 @@ class ComponentbuilderModelField extends AdminModel
$item->css_view = base64_decode($item->css_view);
}
- if (!empty($item->on_get_model_field))
- {
- // base64 Decode on_get_model_field.
- $item->on_get_model_field = base64_decode($item->on_get_model_field);
- }
-
- if (!empty($item->javascript_view_footer))
- {
- // base64 Decode javascript_view_footer.
- $item->javascript_view_footer = base64_decode($item->javascript_view_footer);
- }
-
if (!empty($item->javascript_views_footer))
{
// base64 Decode javascript_views_footer.
$item->javascript_views_footer = base64_decode($item->javascript_views_footer);
}
+ if (!empty($item->initiator_on_save_model))
+ {
+ // base64 Decode initiator_on_save_model.
+ $item->initiator_on_save_model = base64_decode($item->initiator_on_save_model);
+ }
+
if (!empty($item->xml))
{
// JSON Decode xml.
@@ -1172,6 +1171,12 @@ class ComponentbuilderModelField extends AdminModel
$data['xml'] = (string) json_encode($data['xml']);
}
+ // Set the on_get_model_field string to base64 string.
+ if (isset($data['on_get_model_field']))
+ {
+ $data['on_get_model_field'] = base64_encode($data['on_get_model_field']);
+ }
+
// Set the on_save_model_field string to base64 string.
if (isset($data['on_save_model_field']))
{
@@ -1184,10 +1189,10 @@ class ComponentbuilderModelField extends AdminModel
$data['initiator_on_get_model'] = base64_encode($data['initiator_on_get_model']);
}
- // Set the initiator_on_save_model string to base64 string.
- if (isset($data['initiator_on_save_model']))
+ // Set the javascript_view_footer string to base64 string.
+ if (isset($data['javascript_view_footer']))
{
- $data['initiator_on_save_model'] = base64_encode($data['initiator_on_save_model']);
+ $data['javascript_view_footer'] = base64_encode($data['javascript_view_footer']);
}
// Set the css_views string to base64 string.
@@ -1202,24 +1207,18 @@ class ComponentbuilderModelField extends AdminModel
$data['css_view'] = base64_encode($data['css_view']);
}
- // Set the on_get_model_field string to base64 string.
- if (isset($data['on_get_model_field']))
- {
- $data['on_get_model_field'] = base64_encode($data['on_get_model_field']);
- }
-
- // Set the javascript_view_footer string to base64 string.
- if (isset($data['javascript_view_footer']))
- {
- $data['javascript_view_footer'] = base64_encode($data['javascript_view_footer']);
- }
-
// Set the javascript_views_footer string to base64 string.
if (isset($data['javascript_views_footer']))
{
$data['javascript_views_footer'] = base64_encode($data['javascript_views_footer']);
}
+ // Set the initiator_on_save_model string to base64 string.
+ if (isset($data['initiator_on_save_model']))
+ {
+ $data['initiator_on_save_model'] = base64_encode($data['initiator_on_save_model']);
+ }
+
// Set the Params Items to data
if (isset($data['params']) && is_array($data['params']))
{
diff --git a/admin/models/fields.php b/admin/models/fields.php
index 73e50b632..090708588 100644
--- a/admin/models/fields.php
+++ b/admin/models/fields.php
@@ -346,7 +346,6 @@ class ComponentbuilderModelFields extends ListModel
2 => 'COM_COMPONENTBUILDER_FIELD_BASE64',
3 => 'COM_COMPONENTBUILDER_FIELD_BASIC_ENCRYPTION_LOCALDBKEY',
5 => 'COM_COMPONENTBUILDER_FIELD_MEDIUM_ENCRYPTION_LOCALFILEKEY',
- 4 => 'COM_COMPONENTBUILDER_FIELD_WHMCSKEY_ENCRYPTION',
6 => 'COM_COMPONENTBUILDER_FIELD_EXPERT_MODE_CUSTOM'
);
// Now check if value is found in this array
@@ -721,22 +720,22 @@ class ComponentbuilderModelFields extends ListModel
continue;
}
+ // decode on_get_model_field
+ $item->on_get_model_field = base64_decode($item->on_get_model_field);
// decode on_save_model_field
$item->on_save_model_field = base64_decode($item->on_save_model_field);
// decode initiator_on_get_model
$item->initiator_on_get_model = base64_decode($item->initiator_on_get_model);
- // decode initiator_on_save_model
- $item->initiator_on_save_model = base64_decode($item->initiator_on_save_model);
+ // decode javascript_view_footer
+ $item->javascript_view_footer = base64_decode($item->javascript_view_footer);
// decode css_views
$item->css_views = base64_decode($item->css_views);
// decode css_view
$item->css_view = base64_decode($item->css_view);
- // decode on_get_model_field
- $item->on_get_model_field = base64_decode($item->on_get_model_field);
- // decode javascript_view_footer
- $item->javascript_view_footer = base64_decode($item->javascript_view_footer);
// decode javascript_views_footer
$item->javascript_views_footer = base64_decode($item->javascript_views_footer);
+ // decode initiator_on_save_model
+ $item->initiator_on_save_model = base64_decode($item->initiator_on_save_model);
// unset the values we don't want exported.
unset($item->asset_id);
unset($item->checked_out);
diff --git a/admin/models/fields/repositoriesfilterbase.php b/admin/models/fields/repositoriesfilterbase.php
new file mode 100644
index 000000000..c9ff87043
--- /dev/null
+++ b/admin/models/fields/repositoriesfilterbase.php
@@ -0,0 +1,71 @@
+
+ * @git Joomla Component Builder
+ * @copyright Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Repositoriesfilterbase Form Field class for the Componentbuilder component
+ */
+class JFormFieldRepositoriesfilterbase extends JFormFieldList
+{
+ /**
+ * The repositoriesfilterbase field type.
+ *
+ * @var string
+ */
+ public $type = 'repositoriesfilterbase';
+
+ /**
+ * Method to get a list of options for a list input.
+ *
+ * @return array An array of Html options.
+ */
+ protected function getOptions()
+ {
+ // Get a db connection.
+ $db = Factory::getDbo();
+
+ // Create a new query object.
+ $query = $db->getQuery(true);
+
+ // Select the text.
+ $query->select($db->quoteName('base'));
+ $query->from($db->quoteName('#__componentbuilder_repository'));
+ $query->order($db->quoteName('base') . ' ASC');
+
+ // Reset the query using our newly populated query object.
+ $db->setQuery($query);
+
+ $_results = $db->loadColumn();
+ $_filter = [];
+ $_filter[] = Html::_('select.option', '', '- ' . Text::_('COM_COMPONENTBUILDER_FILTER_SELECT_BASE_URL') . ' -');
+
+ if ($_results)
+ {
+ $_results = array_unique($_results);
+ foreach ($_results as $base)
+ {
+ // Now add the base and its text to the options array
+ $_filter[] = Html::_('select.option', $base, $base);
+ }
+ }
+ return $_filter;
+ }
+}
diff --git a/admin/models/fields/repositoriesfilterorganisation.php b/admin/models/fields/repositoriesfilterorganisation.php
new file mode 100644
index 000000000..0c4f6f864
--- /dev/null
+++ b/admin/models/fields/repositoriesfilterorganisation.php
@@ -0,0 +1,71 @@
+
+ * @git Joomla Component Builder
+ * @copyright Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Repositoriesfilterorganisation Form Field class for the Componentbuilder component
+ */
+class JFormFieldRepositoriesfilterorganisation extends JFormFieldList
+{
+ /**
+ * The repositoriesfilterorganisation field type.
+ *
+ * @var string
+ */
+ public $type = 'repositoriesfilterorganisation';
+
+ /**
+ * Method to get a list of options for a list input.
+ *
+ * @return array An array of Html options.
+ */
+ protected function getOptions()
+ {
+ // Get a db connection.
+ $db = Factory::getDbo();
+
+ // Create a new query object.
+ $query = $db->getQuery(true);
+
+ // Select the text.
+ $query->select($db->quoteName('organisation'));
+ $query->from($db->quoteName('#__componentbuilder_repository'));
+ $query->order($db->quoteName('organisation') . ' ASC');
+
+ // Reset the query using our newly populated query object.
+ $db->setQuery($query);
+
+ $_results = $db->loadColumn();
+ $_filter = [];
+ $_filter[] = Html::_('select.option', '', '- ' . Text::_('COM_COMPONENTBUILDER_FILTER_SELECT_ORGANISATION') . ' -');
+
+ if ($_results)
+ {
+ $_results = array_unique($_results);
+ foreach ($_results as $organisation)
+ {
+ // Now add the organisation and its text to the options array
+ $_filter[] = Html::_('select.option', $organisation, $organisation);
+ }
+ }
+ return $_filter;
+ }
+}
diff --git a/admin/models/fields/repositoriesfilterrepository.php b/admin/models/fields/repositoriesfilterrepository.php
new file mode 100644
index 000000000..ca51b0366
--- /dev/null
+++ b/admin/models/fields/repositoriesfilterrepository.php
@@ -0,0 +1,71 @@
+
+ * @git Joomla Component Builder
+ * @copyright Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Repositoriesfilterrepository Form Field class for the Componentbuilder component
+ */
+class JFormFieldRepositoriesfilterrepository extends JFormFieldList
+{
+ /**
+ * The repositoriesfilterrepository field type.
+ *
+ * @var string
+ */
+ public $type = 'repositoriesfilterrepository';
+
+ /**
+ * Method to get a list of options for a list input.
+ *
+ * @return array An array of Html options.
+ */
+ protected function getOptions()
+ {
+ // Get a db connection.
+ $db = Factory::getDbo();
+
+ // Create a new query object.
+ $query = $db->getQuery(true);
+
+ // Select the text.
+ $query->select($db->quoteName('repository'));
+ $query->from($db->quoteName('#__componentbuilder_repository'));
+ $query->order($db->quoteName('repository') . ' ASC');
+
+ // Reset the query using our newly populated query object.
+ $db->setQuery($query);
+
+ $_results = $db->loadColumn();
+ $_filter = [];
+ $_filter[] = Html::_('select.option', '', '- ' . Text::_('COM_COMPONENTBUILDER_FILTER_SELECT_REPOSITORY') . ' -');
+
+ if ($_results)
+ {
+ $_results = array_unique($_results);
+ foreach ($_results as $repository)
+ {
+ // Now add the repository and its text to the options array
+ $_filter[] = Html::_('select.option', $repository, $repository);
+ }
+ }
+ return $_filter;
+ }
+}
diff --git a/admin/models/fields/repositoriesfiltertarget.php b/admin/models/fields/repositoriesfiltertarget.php
new file mode 100644
index 000000000..ddc9802f4
--- /dev/null
+++ b/admin/models/fields/repositoriesfiltertarget.php
@@ -0,0 +1,75 @@
+
+ * @git Joomla Component Builder
+ * @copyright Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Repositoriesfiltertarget Form Field class for the Componentbuilder component
+ */
+class JFormFieldRepositoriesfiltertarget extends JFormFieldList
+{
+ /**
+ * The repositoriesfiltertarget field type.
+ *
+ * @var string
+ */
+ public $type = 'repositoriesfiltertarget';
+
+ /**
+ * Method to get a list of options for a list input.
+ *
+ * @return array An array of Html options.
+ */
+ protected function getOptions()
+ {
+ // Get a db connection.
+ $db = Factory::getDbo();
+
+ // Create a new query object.
+ $query = $db->getQuery(true);
+
+ // Select the text.
+ $query->select($db->quoteName('target'));
+ $query->from($db->quoteName('#__componentbuilder_repository'));
+ $query->order($db->quoteName('target') . ' ASC');
+
+ // Reset the query using our newly populated query object.
+ $db->setQuery($query);
+
+ $_results = $db->loadColumn();
+ $_filter = [];
+ $_filter[] = Html::_('select.option', '', '- ' . Text::_('COM_COMPONENTBUILDER_FILTER_SELECT_TARGET_CONTENT') . ' -');
+
+ if ($_results)
+ {
+ // get repositoriesmodel
+ $_model = ComponentbuilderHelper::getModel('repositories');
+ $_results = array_unique($_results);
+ foreach ($_results as $target)
+ {
+ // Translate the target selection
+ $_text = $_model->selectionTranslation($target,'target');
+ // Now add the target and its text to the options array
+ $_filter[] = Html::_('select.option', $target, Text::_($_text));
+ }
+ }
+ return $_filter;
+ }
+}
diff --git a/admin/models/fields/superpowerpaths.php b/admin/models/fields/superpowerpaths.php
index 692d55a65..872d379a5 100644
--- a/admin/models/fields/superpowerpaths.php
+++ b/admin/models/fields/superpowerpaths.php
@@ -15,7 +15,6 @@ defined('_JEXEC') or die('Restricted access');
use Joomla\CMS\Factory;
use Joomla\CMS\Language\Text;
use Joomla\CMS\HTML\HTMLHelper as Html;
-use VDM\Joomla\Utilities\Component\Helper;
jimport('joomla.form.helper');
\JFormHelper::loadFieldClass('checkboxes');
@@ -33,69 +32,41 @@ class JFormFieldSuperpowerpaths extends JFormFieldCheckboxes
// A DynamicCheckboxes@ Field
/**
- * Method to get the data to be passed to the layout for rendering.
+ * Method to get the field options.
*
- * @return array
+ * @return array The field option objects.
*
- * @since 3.5
+ * @since 3.7.0
*/
- protected function getLayoutData()
+ protected function getOptions()
{
- $data = parent::getLayoutData();
-
- // True if the field has 'value' set. In other words, it has been stored, don't use the default values.
- $hasValue = (isset($this->value) && !empty($this->value));
-
- // If a value has been stored, use it. Otherwise, use the defaults.
- $checkedOptions = $hasValue ? $this->value : $this->checkedOptions;
-
- // get the form options
+ // Get the databse object.
+ $db = Factory::getDBO();
+ $query = $db->getQuery(true);
+ $query->select($db->quoteName(array('a.repository', 'a.organisation')))
+ ->from($db->quoteName('#__componentbuilder_repository', 'a'))
+ ->where($db->quoteName('a.published') . ' >= 1')
+ ->where($db->quoteName('a.target') . ' = 1') // super powers
+ ->order($db->quoteName('a.ordering') . ' ASC');
+ $db->setQuery((string)$query);
+ $items = $db->loadObjectList();
$options = [];
-
- // get the component params
- $params = Helper::getParams();
- $activate = $params->get('super_powers_repositories', 0);
-
- // set the default
- $default = $params->get('super_powers_core', 'joomla/super-powers');
-
- // must have one / in the path
- if (strpos($default, '/') !== false)
+ if ($items)
{
- $tmp = new \stdClass;
- $tmp->text = $tmp->value = trim($default);
- $tmp->checked = false;
- $options[$tmp->value] = $tmp;
- }
-
- if ($activate == 1)
- {
- $subform = $params->get($this->fieldname);
-
- // add the paths found in global settings
- if (is_object($subform))
+ if ($this->multiple === false)
{
- foreach ($subform as $value)
- {
- if (isset($value->owner) && strlen($value->owner) > 1 &&
- isset($value->repo) && strlen($value->repo) > 1)
- {
- $tmp = new \stdClass;
- $tmp->text = $tmp->value = trim($value->owner) . '/' . trim($value->repo);
- $tmp->checked = false;
-
- $options[$tmp->value] = $tmp;
- }
- }
+ $options[] = Html::_('select.option', '', Text::_('COM_COMPONENTBUILDER_SELECT_AN_OPTION'));
+ }
+ foreach($items as $item)
+ {
+ $path = $item->organisation . '/' . $item->repository;
+ $options[] = Html::_('select.option', $path, $path);
}
}
-
- $extraData = array(
- 'checkedOptions' => is_array($checkedOptions) ? $checkedOptions : explode(',', (string) $checkedOptions),
- 'hasValue' => $hasValue,
- 'options' => array_values($options)
- );
-
- return array_merge($data, $extraData);
+ else
+ {
+ $options[] = Html::_('select.option', '', Text::_('COM_COMPONENTBUILDER_NO_ACTIVE_REPOSITORIES_FOUND'));
+ }
+ return $options;
}
}
diff --git a/admin/models/fieldtype.php b/admin/models/fieldtype.php
index 07df37b8b..f8f7ab619 100644
--- a/admin/models/fieldtype.php
+++ b/admin/models/fieldtype.php
@@ -257,7 +257,7 @@ class ComponentbuilderModelFieldtype extends AdminModel
*
* @return mixed An array of data items on success, false on failure.
*/
- public function getVxtfields()
+ public function getVxsfields()
{
// Get the user object.
$user = Factory::getUser();
@@ -399,13 +399,13 @@ class ComponentbuilderModelFieldtype extends AdminModel
foreach ($items as $nr => &$item)
{
// convert datatype
- $item->datatype = $this->selectionTranslationVxtfields($item->datatype, 'datatype');
+ $item->datatype = $this->selectionTranslationVxsfields($item->datatype, 'datatype');
// convert indexes
- $item->indexes = $this->selectionTranslationVxtfields($item->indexes, 'indexes');
+ $item->indexes = $this->selectionTranslationVxsfields($item->indexes, 'indexes');
// convert null_switch
- $item->null_switch = $this->selectionTranslationVxtfields($item->null_switch, 'null_switch');
+ $item->null_switch = $this->selectionTranslationVxsfields($item->null_switch, 'null_switch');
// convert store
- $item->store = $this->selectionTranslationVxtfields($item->store, 'store');
+ $item->store = $this->selectionTranslationVxsfields($item->store, 'store');
}
}
@@ -419,7 +419,7 @@ class ComponentbuilderModelFieldtype extends AdminModel
*
* @return string The translatable string.
*/
- public function selectionTranslationVxtfields($value,$name)
+ public function selectionTranslationVxsfields($value,$name)
{
// Array of datatype language strings
if ($name === 'datatype')
@@ -487,7 +487,6 @@ class ComponentbuilderModelFieldtype extends AdminModel
2 => 'COM_COMPONENTBUILDER_FIELD_BASE64',
3 => 'COM_COMPONENTBUILDER_FIELD_BASIC_ENCRYPTION_LOCALDBKEY',
5 => 'COM_COMPONENTBUILDER_FIELD_MEDIUM_ENCRYPTION_LOCALFILEKEY',
- 4 => 'COM_COMPONENTBUILDER_FIELD_WHMCSKEY_ENCRYPTION',
6 => 'COM_COMPONENTBUILDER_FIELD_EXPERT_MODE_CUSTOM'
);
// Now check if value is found in this array
diff --git a/admin/models/forms/field.xml b/admin/models/forms/field.xml
index 645cb6a71..25cf143ac 100644
--- a/admin/models/forms/field.xml
+++ b/admin/models/forms/field.xml
@@ -226,8 +226,6 @@
COM_COMPONENTBUILDER_FIELD_BASIC_ENCRYPTION_LOCALDBKEY
COM_COMPONENTBUILDER_FIELD_MEDIUM_ENCRYPTION_LOCALFILEKEY
-
- COM_COMPONENTBUILDER_FIELD_WHMCSKEY_ENCRYPTION
COM_COMPONENTBUILDER_FIELD_EXPERT_MODE_CUSTOM
@@ -240,6 +238,21 @@
description="COM_COMPONENTBUILDER_FIELD_CATID_DESCRIPTION"
class="inputbox"
/>
+
+
+
+
-
-
@@ -324,8 +324,22 @@
COM_COMPONENTBUILDER_FIELD_OTHER
-
-
+
+
-
-
-
-
-
-
+
+
COM_COMPONENTBUILDER_FIELD_NO
-
-
-
-
+
+
+
+
COM_COMPONENTBUILDER_FIELDTYPE_MEDIUM_ENCRYPTION_LOCALFILEKEY
-
- COM_COMPONENTBUILDER_FIELDTYPE_WHMCSKEY_ENCRYPTION
COM_COMPONENTBUILDER_FIELDTYPE_EXPERT_MODE_CUSTOM
diff --git a/admin/models/forms/filter_repositories.xml b/admin/models/forms/filter_repositories.xml
new file mode 100644
index 000000000..becf7a110
--- /dev/null
+++ b/admin/models/forms/filter_repositories.xml
@@ -0,0 +1,103 @@
+
+
\ No newline at end of file
diff --git a/admin/models/forms/joomla_component.xml b/admin/models/forms/joomla_component.xml
index d428b658d..1c6559adc 100644
--- a/admin/models/forms/joomla_component.xml
+++ b/admin/models/forms/joomla_component.xml
@@ -157,121 +157,70 @@
message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_COMPANYNAME_MESSAGE"
hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_COMPANYNAME_HINT"
/>
-
+
-
+
-
-
-
-
-
-
-
+
-
-
-
-
- COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES
-
- COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO
-
-
+
+
+
-
+
+
+
-
-
-
-
- COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES
-
- COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO
-
@@ -325,28 +276,12 @@
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_USE_ONLY_FIRST_NUMBER_OF_GLOBAL_VERSION_1XX
-
-
-
+
@@ -356,27 +291,6 @@
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO
-
-
-
-
-
-
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO
-
-
-
-
-
-
-
-
-
-
-
-
- COM_COMPONENTBUILDER_JOOMLA_COMPONENT_GLOBAL
-
- COM_COMPONENTBUILDER_JOOMLA_COMPONENT_OVERRIDE
-
-
-
-
-
-
-
- COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NONE
-
- COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CROWDIN
-
-
-
-
-
- COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES
-
- COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO
-
-
-
-
-
-
-
- COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_ENCRYPTION_ONLY_TO_LOCK_DATAFIELDS
-
- COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATES_NOT_READY
-
- COM_COMPONENTBUILDER_JOOMLA_COMPONENT_LOCK_DOWN_USE_USED_TO_VERIFY_OWNERSHIP
-
- COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CUSTOM_USED_IN_CUSTOM_CODE
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES
+
+ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO
+
+
+
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
+
-
-
- COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES
-
- COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO
-
-
-
-
-
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO
-
-
-
+
-
-
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_OVERRIDE
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
-
-
-
+
+
+
+
+
+
+
+ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES
+
+ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO
+
+
+
+
+
+
+
+
+
+
+
@@ -906,54 +710,96 @@
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_GLOBAL
+
+ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_OVERRIDE
+
+
+
+
+
+
+
+
+
+
+
+ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NONE
+
+ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CROWDIN
+
-
+
-
-
- COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES
-
- COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO
-
+ type="text"
+ name="crowdin_username"
+ label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CROWDIN_USERNAME_LABEL"
+ size="50"
+ maxlength="150"
+ description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CROWDIN_USERNAME_DESCRIPTION"
+ class="text_area"
+ required="true"
+ filter="CMD"
+ message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CROWDIN_USERNAME_MESSAGE"
+ autocomplete="off"
+ />
-
+
-
-
- COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES
-
- COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO
-
+ type="textarea"
+ name="buildcompsql"
+ label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BUILDCOMPSQL_LABEL"
+ rows="30"
+ cols="15"
+ description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BUILDCOMPSQL_DESCRIPTION"
+ class="text_area span12"
+ filter="raw"
+ hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BUILDCOMPSQL_HINT"
+ required="true"
+ />
-
-
-
-
- COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES
-
- COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO
-
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_OVERRIDE
-
-
-
-
- COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES
-
- COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO
-
-
+
@@ -1015,11 +847,11 @@
-
+
@@ -1045,20 +877,19 @@
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO
-
+
- COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DEFAULT
-
- COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DYNAMIC
+ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES
+
+ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO
-
-
-
-
-
+
+
+
+ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES
+
+ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO
+
+
+
+
+
@@ -1105,19 +939,20 @@
-
+
- COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES
-
- COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO
+ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DEFAULT
+
+ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DYNAMIC
-
+
-
-
- COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES
-
- COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO
-
+ type="dynamicdashboard"
+ name="dashboard"
+ label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DASHBOARD_LABEL"
+ description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DASHBOARD_DESCRIPTION"
+ class="fieldMedium"
+ layout="joomla.form.field.list-fancy-select"
+ multiple="false"
+ default=""
+ />
-
+
@@ -1165,11 +997,11 @@
-
+
@@ -1193,11 +1025,11 @@
message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_KEY_MESSAGE"
hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_KEY_HINT"
/>
-
+
@@ -1223,11 +1055,11 @@
message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JOOMLA_SOURCE_LINK_MESSAGE"
hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JOOMLA_SOURCE_LINK_HINT"
/>
-
+
@@ -1253,11 +1085,11 @@
message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_BUY_LINK_MESSAGE"
hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_BUY_LINK_HINT"
/>
-
+
@@ -1269,40 +1101,36 @@
-
+
+ type="radio"
+ name="add_php_method_install"
+ label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_PHP_METHOD_INSTALL_LABEL"
+ class="btn-group btn-group-yesno"
+ default="0"
+ required="true">
-
- COM_COMPONENTBUILDER_JOOMLA_COMPONENT_USE_GLOBAL
-
- COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DO_NOT_ADD_FIX_EVER
- COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SQL_ADDREMOVE
-
- COM_COMPONENTBUILDER_JOOMLA_COMPONENT_INTELLIGENT_ADDREMOVEIF
+ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES
+
+ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO
-
+
+ type="radio"
+ name="add_sql"
+ label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_SQL_LABEL"
+ class="btn-group btn-group-yesno"
+ default="0"
+ required="true">
+
+
+ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES
+
+ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO
+
-
+
@@ -1442,6 +1270,67 @@
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO
+
+
+
+
+ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_USE_GLOBAL
+
+ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DO_NOT_ADD_FIX_EVER
+
+ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SQL_ADDREMOVE
+
+ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_INTELLIGENT_ADDREMOVEIF
+
+
+
+
+
+
+
+
+
+
+
+ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES
+
+ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO
+
+
+
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_OTHER
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
- COM_COMPONENTBUILDER_JOOMLA_COMPONENT_GLOBAL
-
- COM_COMPONENTBUILDER_JOOMLA_COMPONENT_OVERRIDE
-
-
-
-
-
-
-
+
+
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO
-
-
+
+
+
+
+ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_GLOBAL
+
+ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_OVERRIDE
+
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_UIKIT_V3
-
+
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_FOOTABLE_V2
+
+
+
+
+
+
+ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES
+
+ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO
+
+
+
+
+
+
+
+ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES
+
+ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO
+
+
+
+
+
-
+
@@ -1666,20 +1585,23 @@
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO
-
+
-
-
- COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES
-
- COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO
-
+ type="editor"
+ name="php_helper_admin"
+ label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_ADMIN_LABEL"
+ description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_ADMIN_DESCRIPTION"
+ width="100%"
+ height="550px"
+ cols="15"
+ rows="80"
+ buttons="no"
+ syntax="php"
+ editor="codemirror|none"
+ filter="raw"
+ validate="code"
+ showon="add_php_helper_admin:1"
+ />
-
+
+ type="radio"
+ name="add_admin_event"
+ label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_ADMIN_EVENT_LABEL"
+ class="btn-group btn-group-yesno"
+ default="0"
+ required="true">
+
+
+ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES
+
+ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO
+
+
\ No newline at end of file
diff --git a/admin/models/joomla_component.php b/admin/models/joomla_component.php
index 8ef9f3208..382b1f135 100644
--- a/admin/models/joomla_component.php
+++ b/admin/models/joomla_component.php
@@ -64,12 +64,6 @@ class ComponentbuilderModelJoomla_component extends AdminModel
'author',
'email',
'website',
- 'add_license',
- 'license_type',
- 'note_whmcs_lisencing_note',
- 'whmcs_key',
- 'whmcs_url',
- 'whmcs_buy_link',
'license',
'bom',
'image',
@@ -84,30 +78,6 @@ class ComponentbuilderModelJoomla_component extends AdminModel
'not_required'
)
),
- 'libs_helpers' => array(
- 'fullwidth' => array(
- 'creatuserhelper',
- 'adduikit',
- 'addfootable',
- 'add_email_helper',
- 'add_php_helper_both',
- 'php_helper_both',
- 'add_php_helper_admin',
- 'php_helper_admin',
- 'add_admin_event',
- 'php_admin_event',
- 'add_php_helper_site',
- 'php_helper_site',
- 'add_site_event',
- 'php_site_event',
- 'add_javascript',
- 'javascript',
- 'add_css_admin',
- 'css_admin',
- 'add_css_site',
- 'css_site'
- )
- ),
'dynamic_integration' => array(
'left' => array(
'add_update_server',
@@ -137,6 +107,15 @@ class ComponentbuilderModelJoomla_component extends AdminModel
'crowdin_account_api_key'
)
),
+ 'mysql' => array(
+ 'fullwidth' => array(
+ 'add_sql',
+ 'sql',
+ 'add_sql_uninstall',
+ 'sql_uninstall',
+ 'assets_table_fix'
+ )
+ ),
'dash_install' => array(
'left' => array(
'dashboard_type'
@@ -161,6 +140,30 @@ class ComponentbuilderModelJoomla_component extends AdminModel
'php_method_install'
)
),
+ 'libs_helpers' => array(
+ 'fullwidth' => array(
+ 'creatuserhelper',
+ 'adduikit',
+ 'addfootable',
+ 'add_email_helper',
+ 'add_php_helper_both',
+ 'php_helper_both',
+ 'add_php_helper_admin',
+ 'php_helper_admin',
+ 'add_admin_event',
+ 'php_admin_event',
+ 'add_php_helper_site',
+ 'php_helper_site',
+ 'add_site_event',
+ 'php_site_event',
+ 'add_javascript',
+ 'javascript',
+ 'add_css_admin',
+ 'css_admin',
+ 'add_css_site',
+ 'css_site'
+ )
+ ),
'readme' => array(
'left' => array(
'addreadme',
@@ -170,15 +173,6 @@ class ComponentbuilderModelJoomla_component extends AdminModel
'note_readme'
)
),
- 'mysql' => array(
- 'fullwidth' => array(
- 'add_sql',
- 'sql',
- 'add_sql_uninstall',
- 'sql_uninstall',
- 'assets_table_fix'
- )
- ),
'dynamic_build' => array(
'fullwidth' => array(
'note_buildcomp_dynamic_mysql',
@@ -371,58 +365,22 @@ class ComponentbuilderModelJoomla_component extends AdminModel
$item->metadata = $registry->toArray();
}
- if (!empty($item->php_site_event))
+ if (!empty($item->sql_uninstall))
{
- // base64 Decode php_site_event.
- $item->php_site_event = base64_decode($item->php_site_event);
+ // base64 Decode sql_uninstall.
+ $item->sql_uninstall = base64_decode($item->sql_uninstall);
}
- if (!empty($item->php_admin_event))
+ if (!empty($item->php_postflight_update))
{
- // base64 Decode php_admin_event.
- $item->php_admin_event = base64_decode($item->php_admin_event);
+ // base64 Decode php_postflight_update.
+ $item->php_postflight_update = base64_decode($item->php_postflight_update);
}
- if (!empty($item->php_preflight_install))
+ if (!empty($item->css_site))
{
- // base64 Decode php_preflight_install.
- $item->php_preflight_install = base64_decode($item->php_preflight_install);
- }
-
- if (!empty($item->php_method_uninstall))
- {
- // base64 Decode php_method_uninstall.
- $item->php_method_uninstall = base64_decode($item->php_method_uninstall);
- }
-
- if (!empty($item->css_admin))
- {
- // base64 Decode css_admin.
- $item->css_admin = base64_decode($item->css_admin);
- }
-
- if (!empty($item->php_postflight_install))
- {
- // base64 Decode php_postflight_install.
- $item->php_postflight_install = base64_decode($item->php_postflight_install);
- }
-
- if (!empty($item->sql))
- {
- // base64 Decode sql.
- $item->sql = base64_decode($item->sql);
- }
-
- if (!empty($item->buildcompsql))
- {
- // base64 Decode buildcompsql.
- $item->buildcompsql = base64_decode($item->buildcompsql);
- }
-
- if (!empty($item->php_helper_admin))
- {
- // base64 Decode php_helper_admin.
- $item->php_helper_admin = base64_decode($item->php_helper_admin);
+ // base64 Decode css_site.
+ $item->css_site = base64_decode($item->css_site);
}
if (!empty($item->php_helper_site))
@@ -437,10 +395,28 @@ class ComponentbuilderModelJoomla_component extends AdminModel
$item->javascript = base64_decode($item->javascript);
}
- if (!empty($item->css_site))
+ if (!empty($item->php_method_install))
{
- // base64 Decode css_site.
- $item->css_site = base64_decode($item->css_site);
+ // base64 Decode php_method_install.
+ $item->php_method_install = base64_decode($item->php_method_install);
+ }
+
+ if (!empty($item->php_admin_event))
+ {
+ // base64 Decode php_admin_event.
+ $item->php_admin_event = base64_decode($item->php_admin_event);
+ }
+
+ if (!empty($item->php_site_event))
+ {
+ // base64 Decode php_site_event.
+ $item->php_site_event = base64_decode($item->php_site_event);
+ }
+
+ if (!empty($item->css_admin))
+ {
+ // base64 Decode css_admin.
+ $item->css_admin = base64_decode($item->css_admin);
}
if (!empty($item->php_preflight_update))
@@ -449,22 +425,34 @@ class ComponentbuilderModelJoomla_component extends AdminModel
$item->php_preflight_update = base64_decode($item->php_preflight_update);
}
- if (!empty($item->php_postflight_update))
+ if (!empty($item->php_preflight_install))
{
- // base64 Decode php_postflight_update.
- $item->php_postflight_update = base64_decode($item->php_postflight_update);
+ // base64 Decode php_preflight_install.
+ $item->php_preflight_install = base64_decode($item->php_preflight_install);
}
- if (!empty($item->php_method_install))
+ if (!empty($item->php_postflight_install))
{
- // base64 Decode php_method_install.
- $item->php_method_install = base64_decode($item->php_method_install);
+ // base64 Decode php_postflight_install.
+ $item->php_postflight_install = base64_decode($item->php_postflight_install);
}
- if (!empty($item->sql_uninstall))
+ if (!empty($item->php_method_uninstall))
{
- // base64 Decode sql_uninstall.
- $item->sql_uninstall = base64_decode($item->sql_uninstall);
+ // base64 Decode php_method_uninstall.
+ $item->php_method_uninstall = base64_decode($item->php_method_uninstall);
+ }
+
+ if (!empty($item->sql))
+ {
+ // base64 Decode sql.
+ $item->sql = base64_decode($item->sql);
+ }
+
+ if (!empty($item->buildcompsql))
+ {
+ // base64 Decode buildcompsql.
+ $item->buildcompsql = base64_decode($item->buildcompsql);
}
if (!empty($item->readme))
@@ -479,6 +467,12 @@ class ComponentbuilderModelJoomla_component extends AdminModel
$item->php_helper_both = base64_decode($item->php_helper_both);
}
+ if (!empty($item->php_helper_admin))
+ {
+ // base64 Decode php_helper_admin.
+ $item->php_helper_admin = base64_decode($item->php_helper_admin);
+ }
+
// Get the basic encryption.
$basickey = ComponentbuilderHelper::getCryptKey('basic');
// Get the encryption object.
@@ -490,12 +484,6 @@ class ComponentbuilderModelJoomla_component extends AdminModel
$item->crowdin_username = rtrim($basic->decryptString($item->crowdin_username), "\0");
}
- if (!empty($item->whmcs_key) && $basickey && !is_numeric($item->whmcs_key) && $item->whmcs_key === base64_encode(base64_decode($item->whmcs_key, true)))
- {
- // basic decrypt data whmcs_key.
- $item->whmcs_key = rtrim($basic->decryptString($item->whmcs_key), "\0");
- }
-
if (!empty($item->export_key) && $basickey && !is_numeric($item->export_key) && $item->export_key === base64_encode(base64_decode($item->export_key, true)))
{
// basic decrypt data export_key.
@@ -1449,58 +1437,22 @@ class ComponentbuilderModelJoomla_component extends AdminModel
$data['addcontributors'] = '';
}
- // Set the php_site_event string to base64 string.
- if (isset($data['php_site_event']))
+ // Set the sql_uninstall string to base64 string.
+ if (isset($data['sql_uninstall']))
{
- $data['php_site_event'] = base64_encode($data['php_site_event']);
+ $data['sql_uninstall'] = base64_encode($data['sql_uninstall']);
}
- // Set the php_admin_event string to base64 string.
- if (isset($data['php_admin_event']))
+ // Set the php_postflight_update string to base64 string.
+ if (isset($data['php_postflight_update']))
{
- $data['php_admin_event'] = base64_encode($data['php_admin_event']);
+ $data['php_postflight_update'] = base64_encode($data['php_postflight_update']);
}
- // Set the php_preflight_install string to base64 string.
- if (isset($data['php_preflight_install']))
+ // Set the css_site string to base64 string.
+ if (isset($data['css_site']))
{
- $data['php_preflight_install'] = base64_encode($data['php_preflight_install']);
- }
-
- // Set the php_method_uninstall string to base64 string.
- if (isset($data['php_method_uninstall']))
- {
- $data['php_method_uninstall'] = base64_encode($data['php_method_uninstall']);
- }
-
- // Set the css_admin string to base64 string.
- if (isset($data['css_admin']))
- {
- $data['css_admin'] = base64_encode($data['css_admin']);
- }
-
- // Set the php_postflight_install string to base64 string.
- if (isset($data['php_postflight_install']))
- {
- $data['php_postflight_install'] = base64_encode($data['php_postflight_install']);
- }
-
- // Set the sql string to base64 string.
- if (isset($data['sql']))
- {
- $data['sql'] = base64_encode($data['sql']);
- }
-
- // Set the buildcompsql string to base64 string.
- if (isset($data['buildcompsql']))
- {
- $data['buildcompsql'] = base64_encode($data['buildcompsql']);
- }
-
- // Set the php_helper_admin string to base64 string.
- if (isset($data['php_helper_admin']))
- {
- $data['php_helper_admin'] = base64_encode($data['php_helper_admin']);
+ $data['css_site'] = base64_encode($data['css_site']);
}
// Set the php_helper_site string to base64 string.
@@ -1515,10 +1467,28 @@ class ComponentbuilderModelJoomla_component extends AdminModel
$data['javascript'] = base64_encode($data['javascript']);
}
- // Set the css_site string to base64 string.
- if (isset($data['css_site']))
+ // Set the php_method_install string to base64 string.
+ if (isset($data['php_method_install']))
{
- $data['css_site'] = base64_encode($data['css_site']);
+ $data['php_method_install'] = base64_encode($data['php_method_install']);
+ }
+
+ // Set the php_admin_event string to base64 string.
+ if (isset($data['php_admin_event']))
+ {
+ $data['php_admin_event'] = base64_encode($data['php_admin_event']);
+ }
+
+ // Set the php_site_event string to base64 string.
+ if (isset($data['php_site_event']))
+ {
+ $data['php_site_event'] = base64_encode($data['php_site_event']);
+ }
+
+ // Set the css_admin string to base64 string.
+ if (isset($data['css_admin']))
+ {
+ $data['css_admin'] = base64_encode($data['css_admin']);
}
// Set the php_preflight_update string to base64 string.
@@ -1527,22 +1497,34 @@ class ComponentbuilderModelJoomla_component extends AdminModel
$data['php_preflight_update'] = base64_encode($data['php_preflight_update']);
}
- // Set the php_postflight_update string to base64 string.
- if (isset($data['php_postflight_update']))
+ // Set the php_preflight_install string to base64 string.
+ if (isset($data['php_preflight_install']))
{
- $data['php_postflight_update'] = base64_encode($data['php_postflight_update']);
+ $data['php_preflight_install'] = base64_encode($data['php_preflight_install']);
}
- // Set the php_method_install string to base64 string.
- if (isset($data['php_method_install']))
+ // Set the php_postflight_install string to base64 string.
+ if (isset($data['php_postflight_install']))
{
- $data['php_method_install'] = base64_encode($data['php_method_install']);
+ $data['php_postflight_install'] = base64_encode($data['php_postflight_install']);
}
- // Set the sql_uninstall string to base64 string.
- if (isset($data['sql_uninstall']))
+ // Set the php_method_uninstall string to base64 string.
+ if (isset($data['php_method_uninstall']))
{
- $data['sql_uninstall'] = base64_encode($data['sql_uninstall']);
+ $data['php_method_uninstall'] = base64_encode($data['php_method_uninstall']);
+ }
+
+ // Set the sql string to base64 string.
+ if (isset($data['sql']))
+ {
+ $data['sql'] = base64_encode($data['sql']);
+ }
+
+ // Set the buildcompsql string to base64 string.
+ if (isset($data['buildcompsql']))
+ {
+ $data['buildcompsql'] = base64_encode($data['buildcompsql']);
}
// Set the readme string to base64 string.
@@ -1557,6 +1539,12 @@ class ComponentbuilderModelJoomla_component extends AdminModel
$data['php_helper_both'] = base64_encode($data['php_helper_both']);
}
+ // Set the php_helper_admin string to base64 string.
+ if (isset($data['php_helper_admin']))
+ {
+ $data['php_helper_admin'] = base64_encode($data['php_helper_admin']);
+ }
+
// Get the basic encryption key.
$basickey = ComponentbuilderHelper::getCryptKey('basic');
// Get the encryption object
@@ -1568,12 +1556,6 @@ class ComponentbuilderModelJoomla_component extends AdminModel
$data['crowdin_username'] = $basic->encryptString($data['crowdin_username']);
}
- // Encrypt data whmcs_key.
- if (isset($data['whmcs_key']) && $basickey)
- {
- $data['whmcs_key'] = $basic->encryptString($data['whmcs_key']);
- }
-
// Encrypt data export_key.
if (isset($data['export_key']) && $basickey)
{
diff --git a/admin/models/joomla_components.php b/admin/models/joomla_components.php
index 1968aa8e6..c38433fb9 100644
--- a/admin/models/joomla_components.php
+++ b/admin/models/joomla_components.php
@@ -2694,48 +2694,41 @@ class ComponentbuilderModelJoomla_components extends ListModel
continue;
}
- // decode php_site_event
- $item->php_site_event = base64_decode($item->php_site_event);
+ // decode sql_uninstall
+ $item->sql_uninstall = base64_decode($item->sql_uninstall);
+ // decode php_postflight_update
+ $item->php_postflight_update = base64_decode($item->php_postflight_update);
+ // decode css_site
+ $item->css_site = base64_decode($item->css_site);
+ // decode php_helper_site
+ $item->php_helper_site = base64_decode($item->php_helper_site);
+ // decode javascript
+ $item->javascript = base64_decode($item->javascript);
+ // decode php_method_install
+ $item->php_method_install = base64_decode($item->php_method_install);
// decode php_admin_event
$item->php_admin_event = base64_decode($item->php_admin_event);
+ // decode php_site_event
+ $item->php_site_event = base64_decode($item->php_site_event);
+ // decode css_admin
+ $item->css_admin = base64_decode($item->css_admin);
+ // decode php_preflight_update
+ $item->php_preflight_update = base64_decode($item->php_preflight_update);
+ // decode php_preflight_install
+ $item->php_preflight_install = base64_decode($item->php_preflight_install);
+ // decode php_postflight_install
+ $item->php_postflight_install = base64_decode($item->php_postflight_install);
+ // decode php_method_uninstall
+ $item->php_method_uninstall = base64_decode($item->php_method_uninstall);
+ // decode sql
+ $item->sql = base64_decode($item->sql);
if ($basickey && !is_numeric($item->crowdin_username) && $item->crowdin_username === base64_encode(base64_decode($item->crowdin_username, true)))
{
// decrypt crowdin_username
$item->crowdin_username = $basic->decryptString($item->crowdin_username);
}
- // decode php_preflight_install
- $item->php_preflight_install = base64_decode($item->php_preflight_install);
- // decode php_method_uninstall
- $item->php_method_uninstall = base64_decode($item->php_method_uninstall);
- // decode css_admin
- $item->css_admin = base64_decode($item->css_admin);
- // decode php_postflight_install
- $item->php_postflight_install = base64_decode($item->php_postflight_install);
- // decode sql
- $item->sql = base64_decode($item->sql);
// decode buildcompsql
$item->buildcompsql = base64_decode($item->buildcompsql);
- // decode php_helper_admin
- $item->php_helper_admin = base64_decode($item->php_helper_admin);
- // decode php_helper_site
- $item->php_helper_site = base64_decode($item->php_helper_site);
- if ($basickey && !is_numeric($item->whmcs_key) && $item->whmcs_key === base64_encode(base64_decode($item->whmcs_key, true)))
- {
- // decrypt whmcs_key
- $item->whmcs_key = $basic->decryptString($item->whmcs_key);
- }
- // decode javascript
- $item->javascript = base64_decode($item->javascript);
- // decode css_site
- $item->css_site = base64_decode($item->css_site);
- // decode php_preflight_update
- $item->php_preflight_update = base64_decode($item->php_preflight_update);
- // decode php_postflight_update
- $item->php_postflight_update = base64_decode($item->php_postflight_update);
- // decode php_method_install
- $item->php_method_install = base64_decode($item->php_method_install);
- // decode sql_uninstall
- $item->sql_uninstall = base64_decode($item->sql_uninstall);
if ($basickey && !is_numeric($item->export_key) && $item->export_key === base64_encode(base64_decode($item->export_key, true)))
{
// decrypt export_key
@@ -2748,13 +2741,15 @@ class ComponentbuilderModelJoomla_components extends ListModel
// decrypt crowdin_project_api_key
$item->crowdin_project_api_key = $basic->decryptString($item->crowdin_project_api_key);
}
+ // decode php_helper_both
+ $item->php_helper_both = base64_decode($item->php_helper_both);
if ($basickey && !is_numeric($item->crowdin_account_api_key) && $item->crowdin_account_api_key === base64_encode(base64_decode($item->crowdin_account_api_key, true)))
{
// decrypt crowdin_account_api_key
$item->crowdin_account_api_key = $basic->decryptString($item->crowdin_account_api_key);
}
- // decode php_helper_both
- $item->php_helper_both = base64_decode($item->php_helper_both);
+ // decode php_helper_admin
+ $item->php_helper_admin = base64_decode($item->php_helper_admin);
// unset the values we don't want exported.
unset($item->asset_id);
unset($item->checked_out);
diff --git a/admin/models/powers.php b/admin/models/powers.php
index ca6b4077c..a7efae981 100644
--- a/admin/models/powers.php
+++ b/admin/models/powers.php
@@ -19,7 +19,6 @@ use Joomla\CMS\MVC\Model\ListModel;
use Joomla\CMS\Plugin\PluginHelper;
use Joomla\Utilities\ArrayHelper;
use Joomla\CMS\Helper\TagsHelper;
-use VDM\Joomla\Utilities\Component\Helper as JCBHelper;
use VDM\Joomla\Componentbuilder\Utilities\FilterHelper as JCBFilterHelper;
use VDM\Joomla\Utilities\FormHelper as JCBFormHelper;
use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
@@ -68,7 +67,7 @@ class ComponentbuilderModelPowers extends ListModel
// load form from the parent class
$form = parent::getFilterForm($data, $loadData);
- // Create the "admin_view" filter
+ // Create the "namegroup" filter
$attributes = array(
'name' => 'namegroup',
'type' => 'list',
@@ -77,7 +76,7 @@ class ComponentbuilderModelPowers extends ListModel
$options = array(
'' => '- ' . Text::_('COM_COMPONENTBUILDER_NO_NAMESPACE_FOUND') . ' -'
);
- // check if we have namespace (and limit to an extension if it is set)
+ // check if we have namespace
if (($namespaces = JCBFilterHelper::namespaces()) !== null)
{
$options = array(
@@ -95,54 +94,33 @@ class ComponentbuilderModelPowers extends ListModel
);
array_push($this->filter_fields, 'namegroup');
- // get the component params
- $params = JCBHelper::getParams();
- $activate = $params->get('super_powers_repositories', 0);
- if ($activate == 1)
+ // Create the "approved_paths" filter
+ $attributes = array(
+ 'name' => 'approved_paths',
+ 'type' => 'list',
+ 'onchange' => 'this.form.submit();',
+ );
+ $options = array(
+ '' => '- ' . Text::_('COM_COMPONENTBUILDER_NO_PATHS_FOUND') . ' -'
+ );
+ // check if we have approved_paths = 1
+ if (($approvedpaths = JCBFilterHelper::repositories(1)) !== null)
{
- $subform = $params->get('approved_paths', null);
-
- // create approved paths filter
- $attributes = array(
- 'name' => 'approved_paths',
- 'type' => 'list',
- 'onchange' => 'this.form.submit();',
- );
$options = array(
- '' => '- ' . Text::_('COM_COMPONENTBUILDER_NO_PATHS_FOUND') . ' -'
+ '' => '- ' . Text::_('COM_COMPONENTBUILDER_SELECT_APPROVED_PATH') . ' -'
);
-
- // add the paths found in global settings
- if (is_object($subform))
- {
- $core = $params->get('super_powers_core', 'joomla/super-powers');
-
- $options = array(
- '' => '- ' . Text::_('COM_COMPONENTBUILDER_SELECT_APPROVED_PATH') . ' -',
- $core => $core
- );
-
- foreach ($subform as $value)
- {
- if (isset($value->owner) && strlen($value->owner) > 1 &&
- isset($value->repo) && strlen($value->repo) > 1)
- {
- $value = trim($value->owner) . '/' . trim($value->repo);
-
- $options[$value] = $value;
- }
- }
- }
-
- $form->setField(JCBFormHelper::xml($attributes, $options), 'filter');
- $form->setValue(
- 'approved_paths',
- 'filter',
- $this->state->get("filter.approved_paths")
- );
- array_push($this->filter_fields, 'approved_paths');
+ // make sure we do not lose the key values in normal merge
+ $options = $options + $approvedpaths;
}
+ $form->setField(JCBFormHelper::xml($attributes, $options),'filter');
+ $form->setValue(
+ 'approved_paths',
+ 'filter',
+ $this->state->get("filter.approved_paths")
+ );
+ array_push($this->filter_fields, 'approved_paths');
+
return $form;
}
diff --git a/admin/models/repositories.php b/admin/models/repositories.php
new file mode 100644
index 000000000..dc404fb61
--- /dev/null
+++ b/admin/models/repositories.php
@@ -0,0 +1,464 @@
+
+ * @git Joomla Component Builder
+ * @copyright Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\MVC\Model\ListModel;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\Utilities\ArrayHelper;
+use Joomla\CMS\Helper\TagsHelper;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\StringHelper;
+
+/**
+ * Repositories List Model
+ */
+class ComponentbuilderModelRepositories extends ListModel
+{
+ public function __construct($config = [])
+ {
+ if (empty($config['filter_fields']))
+ {
+ $config['filter_fields'] = array(
+ 'a.id','id',
+ 'a.published','published',
+ 'a.access','access',
+ 'a.ordering','ordering',
+ 'a.created_by','created_by',
+ 'a.modified_by','modified_by',
+ 'a.organisation','organisation',
+ 'a.repository','repository',
+ 'a.target','target',
+ 'a.base','base',
+ 'a.type','type'
+ );
+ }
+
+ parent::__construct($config);
+ }
+
+ /**
+ * Method to auto-populate the model state.
+ *
+ * Note. Calling getState in this method will result in recursion.
+ *
+ * @param string $ordering An optional ordering field.
+ * @param string $direction An optional direction (asc|desc).
+ *
+ * @return void
+ *
+ */
+ protected function populateState($ordering = null, $direction = null)
+ {
+ $app = Factory::getApplication();
+
+ // Adjust the context to support modal layouts.
+ if ($layout = $app->input->get('layout'))
+ {
+ $this->context .= '.' . $layout;
+ }
+
+ // Check if the form was submitted
+ $formSubmited = $app->input->post->get('form_submited');
+
+ $access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
+ if ($formSubmited)
+ {
+ $access = $app->input->post->get('access');
+ $this->setState('filter.access', $access);
+ }
+
+ $published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
+ $this->setState('filter.published', $published);
+
+ $created_by = $this->getUserStateFromRequest($this->context . '.filter.created_by', 'filter_created_by', '');
+ $this->setState('filter.created_by', $created_by);
+
+ $created = $this->getUserStateFromRequest($this->context . '.filter.created', 'filter_created');
+ $this->setState('filter.created', $created);
+
+ $sorting = $this->getUserStateFromRequest($this->context . '.filter.sorting', 'filter_sorting', 0, 'int');
+ $this->setState('filter.sorting', $sorting);
+
+ $search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search');
+ $this->setState('filter.search', $search);
+
+ $organisation = $this->getUserStateFromRequest($this->context . '.filter.organisation', 'filter_organisation');
+ if ($formSubmited)
+ {
+ $organisation = $app->input->post->get('organisation');
+ $this->setState('filter.organisation', $organisation);
+ }
+
+ $repository = $this->getUserStateFromRequest($this->context . '.filter.repository', 'filter_repository');
+ if ($formSubmited)
+ {
+ $repository = $app->input->post->get('repository');
+ $this->setState('filter.repository', $repository);
+ }
+
+ $target = $this->getUserStateFromRequest($this->context . '.filter.target', 'filter_target');
+ if ($formSubmited)
+ {
+ $target = $app->input->post->get('target');
+ $this->setState('filter.target', $target);
+ }
+
+ $base = $this->getUserStateFromRequest($this->context . '.filter.base', 'filter_base');
+ if ($formSubmited)
+ {
+ $base = $app->input->post->get('base');
+ $this->setState('filter.base', $base);
+ }
+
+ $type = $this->getUserStateFromRequest($this->context . '.filter.type', 'filter_type');
+ if ($formSubmited)
+ {
+ $type = $app->input->post->get('type');
+ $this->setState('filter.type', $type);
+ }
+
+ // List state information.
+ parent::populateState($ordering, $direction);
+ }
+
+ /**
+ * Method to get an array of data items.
+ *
+ * @return mixed An array of data items on success, false on failure.
+ */
+ public function getItems()
+ {
+ // Check in items
+ $this->checkInNow();
+
+ // load parent items
+ $items = parent::getItems();
+
+ // Set values to display correctly.
+ if (UtilitiesArrayHelper::check($items))
+ {
+ // Get the user object if not set.
+ if (!isset($user) || !ObjectHelper::check($user))
+ {
+ $user = Factory::getUser();
+ }
+ foreach ($items as $nr => &$item)
+ {
+ // Remove items the user can't access.
+ $access = ($user->authorise('repository.access', 'com_componentbuilder.repository.' . (int) $item->id) && $user->authorise('repository.access', 'com_componentbuilder'));
+ if (!$access)
+ {
+ unset($items[$nr]);
+ continue;
+ }
+
+ }
+ }
+
+ // set selection value to a translatable value
+ if (UtilitiesArrayHelper::check($items))
+ {
+ foreach ($items as $nr => &$item)
+ {
+ // convert target
+ $item->target = $this->selectionTranslation($item->target, 'target');
+ // convert type
+ $item->type = $this->selectionTranslation($item->type, 'type');
+ }
+ }
+
+
+ // return items
+ return $items;
+ }
+
+ /**
+ * Method to convert selection values to translatable string.
+ *
+ * @return string The translatable string.
+ */
+ public function selectionTranslation($value,$name)
+ {
+ // Array of target language strings
+ if ($name === 'target')
+ {
+ $targetArray = array(
+ 0 => 'COM_COMPONENTBUILDER_REPOSITORY_SELECT_AN_OPTION',
+ 1 => 'COM_COMPONENTBUILDER_REPOSITORY_SUPER_POWER',
+ 2 => 'COM_COMPONENTBUILDER_REPOSITORY_JOOMLA_POWER'
+ );
+ // Now check if value is found in this array
+ if (isset($targetArray[$value]) && StringHelper::check($targetArray[$value]))
+ {
+ return $targetArray[$value];
+ }
+ }
+ // Array of type language strings
+ if ($name === 'type')
+ {
+ $typeArray = array(
+ 0 => 'COM_COMPONENTBUILDER_REPOSITORY_SELECT_AN_OPTION',
+ 1 => 'COM_COMPONENTBUILDER_REPOSITORY_GITEA'
+ );
+ // Now check if value is found in this array
+ if (isset($typeArray[$value]) && StringHelper::check($typeArray[$value]))
+ {
+ return $typeArray[$value];
+ }
+ }
+ return $value;
+ }
+
+ /**
+ * Method to build an SQL query to load the list data.
+ *
+ * @return string An SQL query
+ */
+ protected function getListQuery()
+ {
+ // Get the user object.
+ $user = Factory::getUser();
+ // Create a new query object.
+ $db = Factory::getDBO();
+ $query = $db->getQuery(true);
+
+ // Select some fields
+ $query->select('a.*');
+
+ // From the componentbuilder_item table
+ $query->from($db->quoteName('#__componentbuilder_repository', 'a'));
+
+ // Filter by published state
+ $published = $this->getState('filter.published');
+ if (is_numeric($published))
+ {
+ $query->where('a.published = ' . (int) $published);
+ }
+ elseif ($published === '')
+ {
+ $query->where('(a.published = 0 OR a.published = 1)');
+ }
+
+ // Join over the asset groups.
+ $query->select('ag.title AS access_level');
+ $query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
+ // Filter by access level.
+ $_access = $this->getState('filter.access');
+ if ($_access && is_numeric($_access))
+ {
+ $query->where('a.access = ' . (int) $_access);
+ }
+ elseif (UtilitiesArrayHelper::check($_access))
+ {
+ // Secure the array for the query
+ $_access = ArrayHelper::toInteger($_access);
+ // Filter by the Access Array.
+ $query->where('a.access IN (' . implode(',', $_access) . ')');
+ }
+ // Implement View Level Access
+ if (!$user->authorise('core.options', 'com_componentbuilder'))
+ {
+ $groups = implode(',', $user->getAuthorisedViewLevels());
+ $query->where('a.access IN (' . $groups . ')');
+ }
+ // Filter by search.
+ $search = $this->getState('filter.search');
+ if (!empty($search))
+ {
+ if (stripos($search, 'id:') === 0)
+ {
+ $query->where('a.id = ' . (int) substr($search, 3));
+ }
+ else
+ {
+ $search = $db->quote('%' . $db->escape($search) . '%');
+ $query->where('(a.organisation LIKE '.$search.' OR a.repository LIKE '.$search.' OR a.target LIKE '.$search.' OR a.type LIKE '.$search.' OR a.base LIKE '.$search.' OR a.guid LIKE '.$search.' OR a.username LIKE '.$search.')');
+ }
+ }
+
+ // Filter by Organisation.
+ $_organisation = $this->getState('filter.organisation');
+ if (is_numeric($_organisation))
+ {
+ if (is_float($_organisation))
+ {
+ $query->where('a.organisation = ' . (float) $_organisation);
+ }
+ else
+ {
+ $query->where('a.organisation = ' . (int) $_organisation);
+ }
+ }
+ elseif (StringHelper::check($_organisation))
+ {
+ $query->where('a.organisation = ' . $db->quote($db->escape($_organisation)));
+ }
+ // Filter by Repository.
+ $_repository = $this->getState('filter.repository');
+ if (is_numeric($_repository))
+ {
+ if (is_float($_repository))
+ {
+ $query->where('a.repository = ' . (float) $_repository);
+ }
+ else
+ {
+ $query->where('a.repository = ' . (int) $_repository);
+ }
+ }
+ elseif (StringHelper::check($_repository))
+ {
+ $query->where('a.repository = ' . $db->quote($db->escape($_repository)));
+ }
+ // Filter by Target.
+ $_target = $this->getState('filter.target');
+ if (is_numeric($_target))
+ {
+ if (is_float($_target))
+ {
+ $query->where('a.target = ' . (float) $_target);
+ }
+ else
+ {
+ $query->where('a.target = ' . (int) $_target);
+ }
+ }
+ elseif (StringHelper::check($_target))
+ {
+ $query->where('a.target = ' . $db->quote($db->escape($_target)));
+ }
+ // Filter by Base.
+ $_base = $this->getState('filter.base');
+ if (is_numeric($_base))
+ {
+ if (is_float($_base))
+ {
+ $query->where('a.base = ' . (float) $_base);
+ }
+ else
+ {
+ $query->where('a.base = ' . (int) $_base);
+ }
+ }
+ elseif (StringHelper::check($_base))
+ {
+ $query->where('a.base = ' . $db->quote($db->escape($_base)));
+ }
+
+ // Add the list ordering clause.
+ $orderCol = $this->getState('list.ordering', 'a.id');
+ $orderDirn = $this->getState('list.direction', 'desc');
+ if ($orderCol != '')
+ {
+ // Check that the order direction is valid encase we have a field called direction as part of filers.
+ $orderDirn = (is_string($orderDirn) && in_array(strtolower($orderDirn), ['asc', 'desc'])) ? $orderDirn : 'desc';
+ $query->order($db->escape($orderCol . ' ' . $orderDirn));
+ }
+
+ return $query;
+ }
+
+ /**
+ * Method to get a store id based on model configuration state.
+ *
+ * @return string A store id.
+ *
+ */
+ protected function getStoreId($id = '')
+ {
+ // Compile the store id.
+ $id .= ':' . $this->getState('filter.id');
+ $id .= ':' . $this->getState('filter.search');
+ $id .= ':' . $this->getState('filter.published');
+ // Check if the value is an array
+ $_access = $this->getState('filter.access');
+ if (UtilitiesArrayHelper::check($_access))
+ {
+ $id .= ':' . implode(':', $_access);
+ }
+ // Check if this is only an number or string
+ elseif (is_numeric($_access)
+ || StringHelper::check($_access))
+ {
+ $id .= ':' . $_access;
+ }
+ $id .= ':' . $this->getState('filter.ordering');
+ $id .= ':' . $this->getState('filter.created_by');
+ $id .= ':' . $this->getState('filter.modified_by');
+ $id .= ':' . $this->getState('filter.organisation');
+ $id .= ':' . $this->getState('filter.repository');
+ $id .= ':' . $this->getState('filter.target');
+ $id .= ':' . $this->getState('filter.base');
+ $id .= ':' . $this->getState('filter.type');
+
+ return parent::getStoreId($id);
+ }
+
+ /**
+ * Build an SQL query to checkin all items left checked out longer then a set time.
+ *
+ * @return bool
+ * @since 3.2.0
+ */
+ protected function checkInNow(): bool
+ {
+ // Get set check in time
+ $time = ComponentHelper::getParams('com_componentbuilder')->get('check_in');
+
+ if ($time)
+ {
+ // Get a db connection.
+ $db = Factory::getDbo();
+ // Reset query.
+ $query = $db->getQuery(true);
+ $query->select('*');
+ $query->from($db->quoteName('#__componentbuilder_repository'));
+ // Only select items that are checked out.
+ $query->where($db->quoteName('checked_out') . '!=0');
+ $db->setQuery($query, 0, 1);
+ $db->execute();
+ if ($db->getNumRows())
+ {
+ // Get Yesterdays date.
+ $date = Factory::getDate()->modify($time)->toSql();
+ // Reset query.
+ $query = $db->getQuery(true);
+
+ // Fields to update.
+ $fields = array(
+ $db->quoteName('checked_out_time') . '=\'0000-00-00 00:00:00\'',
+ $db->quoteName('checked_out') . '=0'
+ );
+
+ // Conditions for which records should be updated.
+ $conditions = array(
+ $db->quoteName('checked_out') . '!=0',
+ $db->quoteName('checked_out_time') . '<\''.$date.'\''
+ );
+
+ // Check table.
+ $query->update($db->quoteName('#__componentbuilder_repository'))->set($fields)->where($conditions);
+
+ $db->setQuery($query);
+
+ return $db->execute();
+ }
+ }
+
+ return false;
+ }
+}
diff --git a/admin/models/repository.php b/admin/models/repository.php
new file mode 100644
index 000000000..92a15f092
--- /dev/null
+++ b/admin/models/repository.php
@@ -0,0 +1,916 @@
+
+ * @git Joomla Component Builder
+ * @copyright Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Filter\InputFilter;
+use Joomla\CMS\Filter\OutputFilter;
+use Joomla\CMS\MVC\Model\AdminModel;
+use Joomla\CMS\Table\Table;
+use Joomla\CMS\UCM\UCMType;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
+use Joomla\Utilities\ArrayHelper;
+use Joomla\CMS\Helper\TagsHelper;
+use VDM\Joomla\Utilities\GuidHelper;
+use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\GetHelper;
+
+/**
+ * Componentbuilder Repository Admin Model
+ */
+class ComponentbuilderModelRepository extends AdminModel
+{
+ /**
+ * The tab layout fields array.
+ *
+ * @var array
+ */
+ protected $tabLayoutFields = array(
+ 'details' => array(
+ 'left' => array(
+ 'type',
+ 'base',
+ 'username',
+ 'token'
+ ),
+ 'right' => array(
+ 'organisation',
+ 'repository',
+ 'read_branch',
+ 'write_branch'
+ ),
+ 'above' => array(
+ 'system_name',
+ 'target',
+ 'access_repo'
+ )
+ )
+ );
+
+ /**
+ * @var string The prefix to use with controller messages.
+ * @since 1.6
+ */
+ protected $text_prefix = 'COM_COMPONENTBUILDER';
+
+ /**
+ * The type alias for this content type.
+ *
+ * @var string
+ * @since 3.2
+ */
+ public $typeAlias = 'com_componentbuilder.repository';
+
+ /**
+ * Returns a Table object, always creating it
+ *
+ * @param type $type The table type to instantiate
+ * @param string $prefix A prefix for the table class name. Optional.
+ * @param array $config Configuration array for model. Optional.
+ *
+ * @return Table A database object
+ *
+ * @since 1.6
+ */
+ public function getTable($type = 'repository', $prefix = 'ComponentbuilderTable', $config = [])
+ {
+ // add table path for when model gets used from other component
+ $this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_componentbuilder/tables');
+ // get instance of the table
+ return Table::getInstance($type, $prefix, $config);
+ }
+
+ /**
+ * Method to get a single record.
+ *
+ * @param integer $pk The id of the primary key.
+ *
+ * @return mixed Object on success, false on failure.
+ *
+ * @since 1.6
+ */
+ public function getItem($pk = null)
+ {
+ if ($item = parent::getItem($pk))
+ {
+ if (!empty($item->params) && !is_array($item->params))
+ {
+ // Convert the params field to an array.
+ $registry = new Registry;
+ $registry->loadString($item->params);
+ $item->params = $registry->toArray();
+ }
+
+ if (!empty($item->metadata))
+ {
+ // Convert the metadata field to an array.
+ $registry = new Registry;
+ $registry->loadString($item->metadata);
+ $item->metadata = $registry->toArray();
+ }
+ }
+
+ return $item;
+ }
+
+ /**
+ * Method to get the record form.
+ *
+ * @param array $data Data for the form.
+ * @param boolean $loadData True if the form is to load its own data (default case), false if not.
+ * @param array $options Optional array of options for the form creation.
+ *
+ * @return mixed A JForm object on success, false on failure
+ *
+ * @since 1.6
+ */
+ public function getForm($data = [], $loadData = true, $options = array('control' => 'jform'))
+ {
+ // set load data option
+ $options['load_data'] = $loadData;
+ // check if xpath was set in options
+ $xpath = false;
+ if (isset($options['xpath']))
+ {
+ $xpath = $options['xpath'];
+ unset($options['xpath']);
+ }
+ // check if clear form was set in options
+ $clear = false;
+ if (isset($options['clear']))
+ {
+ $clear = $options['clear'];
+ unset($options['clear']);
+ }
+
+ // Get the form.
+ $form = $this->loadForm('com_componentbuilder.repository', 'repository', $options, $clear, $xpath);
+
+ if (empty($form))
+ {
+ return false;
+ }
+
+ $jinput = Factory::getApplication()->input;
+
+ // The front end calls this model and uses a_id to avoid id clashes so we need to check for that first.
+ if ($jinput->get('a_id'))
+ {
+ $id = $jinput->get('a_id', 0, 'INT');
+ }
+ // The back end uses id so we use that the rest of the time and set it to 0 by default.
+ else
+ {
+ $id = $jinput->get('id', 0, 'INT');
+ }
+
+ $user = Factory::getUser();
+
+ // Check for existing item.
+ // Modify the form based on Edit State access controls.
+ if ($id != 0 && (!$user->authorise('repository.edit.state', 'com_componentbuilder.repository.' . (int) $id))
+ || ($id == 0 && !$user->authorise('repository.edit.state', 'com_componentbuilder')))
+ {
+ // Disable fields for display.
+ $form->setFieldAttribute('ordering', 'disabled', 'true');
+ $form->setFieldAttribute('published', 'disabled', 'true');
+ // Disable fields while saving.
+ $form->setFieldAttribute('ordering', 'filter', 'unset');
+ $form->setFieldAttribute('published', 'filter', 'unset');
+ }
+ // If this is a new item insure the greated by is set.
+ if (0 == $id)
+ {
+ // Set the created_by to this user
+ $form->setValue('created_by', null, $user->id);
+ }
+ // Modify the form based on Edit Creaded By access controls.
+ if ($id != 0 && (!$user->authorise('repository.edit.created_by', 'com_componentbuilder.repository.' . (int) $id))
+ || ($id == 0 && !$user->authorise('repository.edit.created_by', 'com_componentbuilder')))
+ {
+ // Disable fields for display.
+ $form->setFieldAttribute('created_by', 'disabled', 'true');
+ // Disable fields for display.
+ $form->setFieldAttribute('created_by', 'readonly', 'true');
+ // Disable fields while saving.
+ $form->setFieldAttribute('created_by', 'filter', 'unset');
+ }
+ // Modify the form based on Edit Creaded Date access controls.
+ if ($id != 0 && (!$user->authorise('repository.edit.created', 'com_componentbuilder.repository.' . (int) $id))
+ || ($id == 0 && !$user->authorise('repository.edit.created', 'com_componentbuilder')))
+ {
+ // Disable fields for display.
+ $form->setFieldAttribute('created', 'disabled', 'true');
+ // Disable fields while saving.
+ $form->setFieldAttribute('created', 'filter', 'unset');
+ }
+ // Only load these values if no id is found
+ if (0 == $id)
+ {
+ // Set redirected view name
+ $redirectedView = $jinput->get('ref', null, 'STRING');
+ // Set field name (or fall back to view name)
+ $redirectedField = $jinput->get('field', $redirectedView, 'STRING');
+ // Set redirected view id
+ $redirectedId = $jinput->get('refid', 0, 'INT');
+ // Set field id (or fall back to redirected view id)
+ $redirectedValue = $jinput->get('field_id', $redirectedId, 'INT');
+ if (0 != $redirectedValue && $redirectedField)
+ {
+ // Now set the local-redirected field default value
+ $form->setValue($redirectedField, null, $redirectedValue);
+ }
+ }
+
+ // Only load the GUID if new item (or empty)
+ if (0 == $id || !($val = $form->getValue('guid')))
+ {
+ $form->setValue('guid', null, GuidHelper::get());
+ }
+
+ return $form;
+ }
+
+ /**
+ * Method to get the script that have to be included on the form
+ *
+ * @return string script files
+ */
+ public function getScript()
+ {
+ return 'media/com_componentbuilder/js/repository.js';
+ }
+
+ /**
+ * Method to test whether a record can be deleted.
+ *
+ * @param object $record A record object.
+ *
+ * @return boolean True if allowed to delete the record. Defaults to the permission set in the component.
+ *
+ * @since 1.6
+ */
+ protected function canDelete($record)
+ {
+ if (!empty($record->id))
+ {
+ if ($record->published != -2)
+ {
+ return;
+ }
+
+ $user = Factory::getUser();
+ // The record has been set. Check the record permissions.
+ return $user->authorise('repository.delete', 'com_componentbuilder.repository.' . (int) $record->id);
+ }
+ return false;
+ }
+
+ /**
+ * Method to test whether a record can have its state edited.
+ *
+ * @param object $record A record object.
+ *
+ * @return boolean True if allowed to change the state of the record. Defaults to the permission set in the component.
+ *
+ * @since 1.6
+ */
+ protected function canEditState($record)
+ {
+ $user = Factory::getUser();
+ $recordId = $record->id ?? 0;
+
+ if ($recordId)
+ {
+ // The record has been set. Check the record permissions.
+ $permission = $user->authorise('repository.edit.state', 'com_componentbuilder.repository.' . (int) $recordId);
+ if (!$permission && !is_null($permission))
+ {
+ return false;
+ }
+ }
+ // In the absence of better information, revert to the component permissions.
+ return $user->authorise('repository.edit.state', 'com_componentbuilder');
+ }
+
+ /**
+ * Method override to check if you can edit an existing record.
+ *
+ * @param array $data An array of input data.
+ * @param string $key The name of the key for the primary key.
+ *
+ * @return boolean
+ * @since 2.5
+ */
+ protected function allowEdit($data = [], $key = 'id')
+ {
+ // Check specific edit permission then general edit permission.
+ $user = Factory::getUser();
+
+ return $user->authorise('repository.edit', 'com_componentbuilder.repository.'. ((int) isset($data[$key]) ? $data[$key] : 0)) or $user->authorise('repository.edit', 'com_componentbuilder');
+ }
+
+ /**
+ * Prepare and sanitise the table data prior to saving.
+ *
+ * @param Table $table A Table object.
+ *
+ * @return void
+ *
+ * @since 1.6
+ */
+ protected function prepareTable($table)
+ {
+ $date = Factory::getDate();
+ $user = Factory::getUser();
+
+ if (isset($table->name))
+ {
+ $table->name = htmlspecialchars_decode($table->name, ENT_QUOTES);
+ }
+
+ if (isset($table->alias) && empty($table->alias))
+ {
+ $table->generateAlias();
+ }
+
+ if (empty($table->id))
+ {
+ $table->created = $date->toSql();
+ // set the user
+ if ($table->created_by == 0 || empty($table->created_by))
+ {
+ $table->created_by = $user->id;
+ }
+ // Set ordering to the last item if not set
+ if (empty($table->ordering))
+ {
+ $db = Factory::getDbo();
+ $query = $db->getQuery(true)
+ ->select('MAX(ordering)')
+ ->from($db->quoteName('#__componentbuilder_repository'));
+ $db->setQuery($query);
+ $max = $db->loadResult();
+
+ $table->ordering = $max + 1;
+ }
+ }
+ else
+ {
+ $table->modified = $date->toSql();
+ $table->modified_by = $user->id;
+ }
+
+ if (!empty($table->id))
+ {
+ // Increment the items version number.
+ $table->version++;
+ }
+ }
+
+ /**
+ * Method to get the data that should be injected in the form.
+ *
+ * @return mixed The data for the form.
+ *
+ * @since 1.6
+ */
+ protected function loadFormData()
+ {
+ // Check the session for previously entered form data.
+ $data = Factory::getApplication()->getUserState('com_componentbuilder.edit.repository.data', []);
+
+ if (empty($data))
+ {
+ $data = $this->getItem();
+ // run the perprocess of the data
+ $this->preprocessData('com_componentbuilder.repository', $data);
+ }
+
+ return $data;
+ }
+
+ /**
+ * Method to get the unique fields of this table.
+ *
+ * @return mixed An array of field names, boolean false if none is set.
+ *
+ * @since 3.0
+ */
+ protected function getUniqueFields()
+ {
+ return array('guid');
+ }
+
+ /**
+ * Method to delete one or more records.
+ *
+ * @param array &$pks An array of record primary keys.
+ *
+ * @return boolean True if successful, false if an error occurs.
+ *
+ * @since 12.2
+ */
+ public function delete(&$pks)
+ {
+ if (!parent::delete($pks))
+ {
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * Method to change the published state of one or more records.
+ *
+ * @param array &$pks A list of the primary keys to change.
+ * @param integer $value The value of the published state.
+ *
+ * @return boolean True on success.
+ *
+ * @since 12.2
+ */
+ public function publish(&$pks, $value = 1)
+ {
+ if (!parent::publish($pks, $value))
+ {
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * Method to perform batch operations on an item or a set of items.
+ *
+ * @param array $commands An array of commands to perform.
+ * @param array $pks An array of item ids.
+ * @param array $contexts An array of item contexts.
+ *
+ * @return boolean Returns true on success, false on failure.
+ *
+ * @since 12.2
+ */
+ public function batch($commands, $pks, $contexts)
+ {
+ // Sanitize ids.
+ $pks = array_unique($pks);
+ ArrayHelper::toInteger($pks);
+
+ // Remove any values of zero.
+ if (array_search(0, $pks, true))
+ {
+ unset($pks[array_search(0, $pks, true)]);
+ }
+
+ if (empty($pks))
+ {
+ $this->setError(Text::_('JGLOBAL_NO_ITEM_SELECTED'));
+ return false;
+ }
+
+ $done = false;
+
+ // Set some needed variables.
+ $this->user = Factory::getUser();
+ $this->table = $this->getTable();
+ $this->tableClassName = get_class($this->table);
+ $this->contentType = new UCMType;
+ $this->type = $this->contentType->getTypeByTable($this->tableClassName);
+ $this->canDo = ComponentbuilderHelper::getActions('repository');
+ $this->batchSet = true;
+
+ if (!$this->canDo->get('core.batch'))
+ {
+ $this->setError(Text::_('JLIB_APPLICATION_ERROR_INSUFFICIENT_BATCH_INFORMATION'));
+ return false;
+ }
+
+ if ($this->type == false)
+ {
+ $type = new UCMType;
+ $this->type = $type->getTypeByAlias($this->typeAlias);
+ }
+
+ $this->tagsObserver = $this->table->getObserverOfClass('JTableObserverTags');
+
+ if (!empty($commands['move_copy']))
+ {
+ $cmd = ArrayHelper::getValue($commands, 'move_copy', 'c');
+
+ if ($cmd == 'c')
+ {
+ $result = $this->batchCopy($commands, $pks, $contexts);
+
+ if (is_array($result))
+ {
+ foreach ($result as $old => $new)
+ {
+ $contexts[$new] = $contexts[$old];
+ }
+ $pks = array_values($result);
+ }
+ else
+ {
+ return false;
+ }
+ }
+ elseif ($cmd == 'm' && !$this->batchMove($commands, $pks, $contexts))
+ {
+ return false;
+ }
+
+ $done = true;
+ }
+
+ if (!$done)
+ {
+ $this->setError(Text::_('JLIB_APPLICATION_ERROR_INSUFFICIENT_BATCH_INFORMATION'));
+ return false;
+ }
+
+ // Clear the cache
+ $this->cleanCache();
+
+ return true;
+ }
+
+ /**
+ * Batch copy items to a new category or current.
+ *
+ * @param integer $values The new values.
+ * @param array $pks An array of row IDs.
+ * @param array $contexts An array of item contexts.
+ *
+ * @return mixed An array of new IDs on success, boolean false on failure.
+ *
+ * @since 12.2
+ */
+ protected function batchCopy($values, $pks, $contexts)
+ {
+ if (empty($this->batchSet))
+ {
+ // Set some needed variables.
+ $this->user = Factory::getUser();
+ $this->table = $this->getTable();
+ $this->tableClassName = get_class($this->table);
+ $this->canDo = ComponentbuilderHelper::getActions('repository');
+ }
+
+ if (!$this->canDo->get('repository.create') && !$this->canDo->get('repository.batch'))
+ {
+ return false;
+ }
+
+ // get list of unique fields
+ $uniqueFields = $this->getUniqueFields();
+ // remove move_copy from array
+ unset($values['move_copy']);
+
+ // make sure published is set
+ if (!isset($values['published']))
+ {
+ $values['published'] = 0;
+ }
+ elseif (isset($values['published']) && !$this->canDo->get('repository.edit.state'))
+ {
+ $values['published'] = 0;
+ }
+
+ $newIds = [];
+ // Parent exists so let's proceed
+ while (!empty($pks))
+ {
+ // Pop the first ID off the stack
+ $pk = array_shift($pks);
+
+ $this->table->reset();
+
+ // only allow copy if user may edit this item.
+ if (!$this->user->authorise('repository.edit', $contexts[$pk]))
+ {
+ // Not fatal error
+ $this->setError(Text::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
+ continue;
+ }
+
+ // Check that the row actually exists
+ if (!$this->table->load($pk))
+ {
+ if ($error = $this->table->getError())
+ {
+ // Fatal error
+ $this->setError($error);
+ return false;
+ }
+ else
+ {
+ // Not fatal error
+ $this->setError(Text::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
+ continue;
+ }
+ }
+
+ // Only for strings
+ if (UtilitiesStringHelper::check($this->table->system_name) && !is_numeric($this->table->system_name))
+ {
+ $this->table->system_name = $this->generateUnique('system_name',$this->table->system_name);
+ }
+
+ // insert all set values
+ if (UtilitiesArrayHelper::check($values))
+ {
+ foreach ($values as $key => $value)
+ {
+ if (strlen($value) > 0 && isset($this->table->$key))
+ {
+ $this->table->$key = $value;
+ }
+ }
+ }
+
+ // update all unique fields
+ if (UtilitiesArrayHelper::check($uniqueFields))
+ {
+ foreach ($uniqueFields as $uniqueField)
+ {
+ $this->table->$uniqueField = $this->generateUnique($uniqueField,$this->table->$uniqueField);
+ }
+ }
+
+ // Reset the ID because we are making a copy
+ $this->table->id = 0;
+
+ // TODO: Deal with ordering?
+ // $this->table->ordering = 1;
+
+ // Check the row.
+ if (!$this->table->check())
+ {
+ $this->setError($this->table->getError());
+
+ return false;
+ }
+
+ if (!empty($this->type))
+ {
+ $this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
+ }
+
+ // Store the row.
+ if (!$this->table->store())
+ {
+ $this->setError($this->table->getError());
+
+ return false;
+ }
+
+ // Get the new item ID
+ $newId = $this->table->get('id');
+
+ // Add the new ID to the array
+ $newIds[$pk] = $newId;
+ }
+
+ // Clean the cache
+ $this->cleanCache();
+
+ return $newIds;
+ }
+
+ /**
+ * Batch move items to a new category
+ *
+ * @param integer $value The new category ID.
+ * @param array $pks An array of row IDs.
+ * @param array $contexts An array of item contexts.
+ *
+ * @return boolean True if successful, false otherwise and internal error is set.
+ *
+ * @since 12.2
+ */
+ protected function batchMove($values, $pks, $contexts)
+ {
+ if (empty($this->batchSet))
+ {
+ // Set some needed variables.
+ $this->user = Factory::getUser();
+ $this->table = $this->getTable();
+ $this->tableClassName = get_class($this->table);
+ $this->canDo = ComponentbuilderHelper::getActions('repository');
+ }
+
+ if (!$this->canDo->get('repository.edit') && !$this->canDo->get('repository.batch'))
+ {
+ $this->setError(Text::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT'));
+ return false;
+ }
+
+ // make sure published only updates if user has the permission.
+ if (isset($values['published']) && !$this->canDo->get('repository.edit.state'))
+ {
+ unset($values['published']);
+ }
+ // remove move_copy from array
+ unset($values['move_copy']);
+
+ // Parent exists so we proceed
+ foreach ($pks as $pk)
+ {
+ if (!$this->user->authorise('repository.edit', $contexts[$pk]))
+ {
+ $this->setError(Text::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT'));
+ return false;
+ }
+
+ // Check that the row actually exists
+ if (!$this->table->load($pk))
+ {
+ if ($error = $this->table->getError())
+ {
+ // Fatal error
+ $this->setError($error);
+ return false;
+ }
+ else
+ {
+ // Not fatal error
+ $this->setError(Text::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
+ continue;
+ }
+ }
+
+ // insert all set values.
+ if (UtilitiesArrayHelper::check($values))
+ {
+ foreach ($values as $key => $value)
+ {
+ // Do special action for access.
+ if ('access' === $key && strlen($value) > 0)
+ {
+ $this->table->$key = $value;
+ }
+ elseif (strlen($value) > 0 && isset($this->table->$key))
+ {
+ $this->table->$key = $value;
+ }
+ }
+ }
+
+
+ // Check the row.
+ if (!$this->table->check())
+ {
+ $this->setError($this->table->getError());
+
+ return false;
+ }
+
+ if (!empty($this->type))
+ {
+ $this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
+ }
+
+ // Store the row.
+ if (!$this->table->store())
+ {
+ $this->setError($this->table->getError());
+
+ return false;
+ }
+ }
+
+ // Clean the cache
+ $this->cleanCache();
+
+ return true;
+ }
+
+ /**
+ * Method to save the form data.
+ *
+ * @param array $data The form data.
+ *
+ * @return boolean True on success.
+ *
+ * @since 1.6
+ */
+ public function save($data)
+ {
+ $input = Factory::getApplication()->input;
+ $filter = InputFilter::getInstance();
+
+ // set the metadata to the Item Data
+ if (isset($data['metadata']) && isset($data['metadata']['author']))
+ {
+ $data['metadata']['author'] = $filter->clean($data['metadata']['author'], 'TRIM');
+
+ $metadata = new Registry;
+ $metadata->loadArray($data['metadata']);
+ $data['metadata'] = (string) $metadata;
+ }
+
+
+ // Set the GUID if empty or not valid
+ if (empty($data['guid']) && $data['id'] > 0)
+ {
+ // get the existing one
+ $data['guid'] = (string) GetHelper::var('repository', $data['id'], 'id', 'guid');
+ }
+
+ // Set the GUID if empty or not valid
+ while (!GuidHelper::valid($data['guid'], "repository", $data['id']))
+ {
+ // must always be set
+ $data['guid'] = (string) GuidHelper::get();
+ }
+
+ // Set the Params Items to data
+ if (isset($data['params']) && is_array($data['params']))
+ {
+ $params = new Registry;
+ $params->loadArray($data['params']);
+ $data['params'] = (string) $params;
+ }
+
+ // Alter the unique field for save as copy
+ if ($input->get('task') === 'save2copy')
+ {
+ // Automatic handling of other unique fields
+ $uniqueFields = $this->getUniqueFields();
+ if (UtilitiesArrayHelper::check($uniqueFields))
+ {
+ foreach ($uniqueFields as $uniqueField)
+ {
+ $data[$uniqueField] = $this->generateUnique($uniqueField,$data[$uniqueField]);
+ }
+ }
+ }
+
+ if (parent::save($data))
+ {
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Method to generate a unique value.
+ *
+ * @param string $field name.
+ * @param string $value data.
+ *
+ * @return string New value.
+ *
+ * @since 3.0
+ */
+ protected function generateUnique($field,$value)
+ {
+ // set field value unique
+ $table = $this->getTable();
+
+ while ($table->load(array($field => $value)))
+ {
+ $value = StringHelper::increment($value);
+ }
+
+ return $value;
+ }
+
+ /**
+ * Method to change the title
+ *
+ * @param string $title The title.
+ *
+ * @return array Contains the modified title and alias.
+ *
+ */
+ protected function _generateNewTitle($title)
+ {
+
+ // Alter the title
+ $table = $this->getTable();
+
+ while ($table->load(['title' => $title]))
+ {
+ $title = StringHelper::increment($title);
+ }
+
+ return $title;
+ }
+}
diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql
index 20f5d6aee..548d37491 100644
--- a/admin/sql/install.mysql.utf8.sql
+++ b/admin/sql/install.mysql.utf8.sql
@@ -9,7 +9,6 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_component` (
`add_git_folder_path` TINYINT(1) NOT NULL DEFAULT 0,
`add_javascript` TINYINT(1) NOT NULL DEFAULT 0,
`add_jcb_powers_path` TINYINT(1) NOT NULL DEFAULT 0,
- `add_license` TINYINT(1) NOT NULL DEFAULT 0,
`add_menu_prefix` CHAR(1) NOT NULL DEFAULT '',
`add_namespace_prefix` CHAR(1) NOT NULL DEFAULT '',
`add_php_helper_admin` TINYINT(1) NOT NULL DEFAULT 0,
@@ -64,7 +63,6 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_component` (
`jcb_powers_path` VARCHAR(255) NOT NULL DEFAULT '',
`joomla_source_link` VARCHAR(255) NOT NULL DEFAULT '',
`license` VARCHAR(255) NOT NULL DEFAULT '',
- `license_type` TINYINT(1) NOT NULL DEFAULT 0,
`menu_prefix` VARCHAR(100) NOT NULL DEFAULT '',
`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
`mvc_versiondate` TINYINT(1) NOT NULL DEFAULT 0,
@@ -97,9 +95,6 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_component` (
`update_server_target` TINYINT(1) NOT NULL DEFAULT 0,
`update_server_url` VARCHAR(255) NOT NULL DEFAULT '',
`website` CHAR(255) NOT NULL DEFAULT '',
- `whmcs_buy_link` VARCHAR(255) NOT NULL DEFAULT '',
- `whmcs_key` VARCHAR(255) NOT NULL DEFAULT '',
- `whmcs_url` VARCHAR(255) NOT NULL DEFAULT '',
`params` TEXT NULL,
`published` TINYINT(3) NOT NULL DEFAULT 1,
`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
@@ -116,29 +111,25 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_component` (
PRIMARY KEY (`id`),
KEY `idx_system_name` (`system_name`),
KEY `idx_name_code` (`name_code`),
- KEY `idx_remove_line_breaks` (`remove_line_breaks`),
- KEY `idx_debug_linenr` (`debug_linenr`),
KEY `idx_mvc_versiondate` (`mvc_versiondate`),
- KEY `idx_addreadme` (`addreadme`),
+ KEY `idx_remove_line_breaks` (`remove_line_breaks`),
KEY `idx_add_placeholders` (`add_placeholders`),
- KEY `idx_add_backup_folder_path` (`add_backup_folder_path`),
- KEY `idx_translation_tool` (`translation_tool`),
- KEY `idx_add_license` (`add_license`),
- KEY `idx_license_type` (`license_type`),
- KEY `idx_add_powers` (`add_powers`),
+ KEY `idx_debug_linenr` (`debug_linenr`),
KEY `idx_add_sales_server` (`add_sales_server`),
KEY `idx_add_jcb_powers_path` (`add_jcb_powers_path`),
- KEY `idx_add_php_helper_admin` (`add_php_helper_admin`),
- KEY `idx_add_admin_event` (`add_admin_event`),
+ KEY `idx_add_powers` (`add_powers`),
+ KEY `idx_addreadme` (`addreadme`),
+ KEY `idx_add_backup_folder_path` (`add_backup_folder_path`),
+ KEY `idx_translation_tool` (`translation_tool`),
+ KEY `idx_add_namespace_prefix` (`add_namespace_prefix`),
+ KEY `idx_namespace_prefix` (`namespace_prefix`),
KEY `idx_add_php_helper_site` (`add_php_helper_site`),
KEY `idx_add_site_event` (`add_site_event`),
- KEY `idx_add_namespace_prefix` (`add_namespace_prefix`),
+ KEY `idx_add_menu_prefix` (`add_menu_prefix`),
KEY `idx_add_javascript` (`add_javascript`),
- KEY `idx_namespace_prefix` (`namespace_prefix`),
+ KEY `idx_menu_prefix` (`menu_prefix`),
KEY `idx_add_css_admin` (`add_css_admin`),
KEY `idx_add_css_site` (`add_css_site`),
- KEY `idx_add_menu_prefix` (`add_menu_prefix`),
- KEY `idx_menu_prefix` (`menu_prefix`),
KEY `idx_add_php_preflight_install` (`add_php_preflight_install`),
KEY `idx_add_php_preflight_update` (`add_php_preflight_update`),
KEY `idx_add_php_postflight_install` (`add_php_postflight_install`),
@@ -147,17 +138,19 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_component` (
KEY `idx_add_php_method_install` (`add_php_method_install`),
KEY `idx_add_sql` (`add_sql`),
KEY `idx_add_sql_uninstall` (`add_sql_uninstall`),
+ KEY `idx_emptycontributors` (`emptycontributors`),
KEY `idx_assets_table_fix` (`assets_table_fix`),
KEY `idx_add_update_server` (`add_update_server`),
- KEY `idx_emptycontributors` (`emptycontributors`),
KEY `idx_update_server_target` (`update_server_target`),
- KEY `idx_add_git_folder_path` (`add_git_folder_path`),
KEY `idx_creatuserhelper` (`creatuserhelper`),
+ KEY `idx_add_git_folder_path` (`add_git_folder_path`),
KEY `idx_adduikit` (`adduikit`),
KEY `idx_addfootable` (`addfootable`),
KEY `idx_add_email_helper` (`add_email_helper`),
KEY `idx_add_php_helper_both` (`add_php_helper_both`),
+ KEY `idx_add_php_helper_admin` (`add_php_helper_admin`),
KEY `idx_guid` (`guid`),
+ KEY `idx_add_admin_event` (`add_admin_event`),
KEY `idx_access` (`access`),
KEY `idx_checkout` (`checked_out`),
KEY `idx_createdby` (`created_by`),
@@ -1302,6 +1295,52 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_server` (
KEY `idx_state` (`published`)
) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE IF NOT EXISTS `#__componentbuilder_repository` (
+ `id` INT(11) NOT NULL AUTO_INCREMENT,
+ `asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
+ `access_repo` TINYINT(1) NOT NULL DEFAULT 0,
+ `base` VARCHAR(255) NOT NULL DEFAULT '',
+ `guid` VARCHAR(36) NOT NULL DEFAULT '',
+ `organisation` VARCHAR(255) NOT NULL DEFAULT '',
+ `read_branch` VARCHAR(255) NULL DEFAULT '',
+ `repository` VARCHAR(255) NOT NULL DEFAULT '',
+ `system_name` VARCHAR(255) NOT NULL DEFAULT '',
+ `target` TINYINT(7) NOT NULL DEFAULT 1,
+ `token` VARCHAR(255) NULL DEFAULT '',
+ `type` TINYINT(1) NOT NULL DEFAULT 1,
+ `username` VARCHAR(255) NULL DEFAULT '',
+ `write_branch` VARCHAR(255) NULL DEFAULT '',
+ `params` TEXT NULL,
+ `published` TINYINT(3) NOT NULL DEFAULT 1,
+ `created_by` INT(10) unsigned NOT NULL DEFAULT 0,
+ `modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
+ `created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
+ `modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
+ `checked_out` int(11) unsigned NOT NULL DEFAULT 0,
+ `checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
+ `version` INT(10) unsigned NOT NULL DEFAULT 1,
+ `hits` INT(10) unsigned NOT NULL DEFAULT 0,
+ `access` INT(10) unsigned NOT NULL DEFAULT 0,
+ `ordering` INT(11) NOT NULL DEFAULT 0,
+ PRIMARY KEY (`id`),
+ KEY `idx_system_name` (`system_name`),
+ KEY `idx_organisation` (`organisation`),
+ KEY `idx_repository` (`repository`),
+ KEY `idx_target` (`target`),
+ KEY `idx_type` (`type`),
+ KEY `idx_guid` (`guid`),
+ KEY `idx_access_repo` (`access_repo`),
+ KEY `idx_write_branch` (`write_branch`),
+ KEY `idx_read_branch` (`read_branch`),
+ KEY `idx_token` (`token`),
+ KEY `idx_username` (`username`),
+ KEY `idx_access` (`access`),
+ KEY `idx_checkout` (`checked_out`),
+ KEY `idx_createdby` (`created_by`),
+ KEY `idx_modifiedby` (`modified_by`),
+ KEY `idx_state` (`published`)
+) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
+
CREATE TABLE IF NOT EXISTS `#__componentbuilder_help_document` (
`id` INT(11) NOT NULL AUTO_INCREMENT,
`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
@@ -2046,8 +2085,8 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_plugin_files_folders_urls
-- Dumping data for table `#__componentbuilder_joomla_component`
--
-INSERT INTO `#__componentbuilder_joomla_component` (`id`, `add_admin_event`, `add_backup_folder_path`, `add_css_admin`, `add_css_site`, `add_email_helper`, `add_git_folder_path`, `add_javascript`, `add_license`, `add_menu_prefix`, `add_namespace_prefix`, `add_php_helper_admin`, `add_php_helper_both`, `add_php_helper_site`, `add_php_method_uninstall`, `add_php_postflight_install`, `add_php_postflight_update`, `add_php_preflight_install`, `add_php_preflight_update`, `add_placeholders`, `add_powers`, `add_sales_server`, `add_site_event`, `add_sql`, `add_sql_uninstall`, `add_update_server`, `addcontributors`, `addfootable`, `addreadme`, `adduikit`, `assets_table_fix`, `author`, `backup_folder_path`, `bom`, `buildcomp`, `buildcompsql`, `companyname`, `component_version`, `copyright`, `created`, `creatuserhelper`, `crowdin_account_api_key`, `crowdin_project_api_key`, `crowdin_project_identifier`, `crowdin_username`, `css_admin`, `css_site`, `dashboard`, `dashboard_type`, `debug_linenr`, `description`, `email`, `emptycontributors`, `export_buy_link`, `export_key`, `git_folder_path`, `guid`, `image`, `javascript`, `joomla_source_link`, `license`, `license_type`, `menu_prefix`, `modified`, `mvc_versiondate`, `name`, `name_code`, `namespace_prefix`, `number`, `php_admin_event`, `php_helper_admin`, `php_helper_both`, `php_helper_site`, `php_method_uninstall`, `php_postflight_install`, `php_postflight_update`, `php_preflight_install`, `php_preflight_update`, `php_site_event`, `readme`, `remove_line_breaks`, `sales_server`, `short_description`, `sql`, `sql_uninstall`, `system_name`, `toignore`, `translation_tool`, `update_server`, `update_server_target`, `update_server_url`, `website`, `whmcs_buy_link`, `whmcs_key`, `whmcs_url`, `params`, `published`, `version`, `hits`, `access`, `ordering`) VALUES
-(25, '', '', '', '', '', '', '', '', 1, '', '', '', 1, '', 1, '', '', '', '', 1, '', '', '', '', 1, '{}', '', 1, 1, 3, 'Llewellyn van der Merwe', '', 'default.txt', '', '', 'Vast Development Method', '2.1.0', 'Copyright (C) 2015. All Rights Reserved', '2016-10-18 11:44:09', '', 'mvVkzmHCEIoBhzD3gR3uTzXRGwNVNRWw8Hr1vrXxb+I=', 'BbloLSYT6Yup6v3I/YNmrdOwzjbI4BGfDvJSB82N9DU=', '', 'VtSt2RMz+AHCrwc7jk1G70t83ZwZsNp2upqfzMyaVHE=', '', '', '', 1, '', 'Just a basic demo of the most basic implementations of the [Joomla](http://www.joomla.org) Component Builder\'s ability.', 'joomla@vdm.io', '', '', 'nZDegSPK87rXA4KMC6P8I6zEldjVIJpPYGRPZlKBI+U=', '', 'efde995e-60aa-4b39-b644-44349dfb660d', 'images/vdm/demo500.jpg', '', 'https://github.com/Llewellynvdm/Joomla-Demo-Component', 'GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html', 1, '»', '2024-01-19 11:57:08', '', 'Demo', 'demo', 'JCB', 4, '', '', '', 'CS8qKg0KCSAqCUNoYW5nZSB0byBuaWNlIGZhbmN5IGRhdGUNCgkgKi8NCglwdWJsaWMgc3RhdGljIGZ1bmN0aW9uIGZhbmN5RGF0ZSgkZGF0ZSkNCgl7DQoJCWlmICghc2VsZjo6aXNWYWxpZFRpbWVTdGFtcCgkZGF0ZSkpDQoJCXsNCgkJCSRkYXRlID0gc3RydG90aW1lKCRkYXRlKTsNCgkJfQ0KCQlyZXR1cm4gZGF0ZSgnalMgXG9cZiBGIFknLCRkYXRlKTsNCgl9DQoNCgkvKioNCgkgKglDaGFuZ2UgdG8gbmljZSBmYW5jeSB0aW1lIGFuZCBkYXRlDQoJICovDQoJcHVibGljIHN0YXRpYyBmdW5jdGlvbiBmYW5jeURhdGVUaW1lKCR0aW1lKQ0KCXsNCgkJaWYgKCFzZWxmOjppc1ZhbGlkVGltZVN0YW1wKCR0aW1lKSkNCgkJew0KCQkJJHRpbWUgPSBzdHJ0b3RpbWUoJHRpbWUpOw0KCQl9DQoJCXJldHVybiBkYXRlKCcoRzppKSBqUyBcb1xmIEYgWScsJHRpbWUpOw0KCX0NCg0KCS8qKg0KCSAqCUNoYW5nZSB0byBuaWNlIGhvdXI6bWludXRlcyB0aW1lDQoJICovDQoJcHVibGljIHN0YXRpYyBmdW5jdGlvbiBmYW5jeVRpbWUoJHRpbWUpDQoJew0KCQlpZiAoIXNlbGY6OmlzVmFsaWRUaW1lU3RhbXAoJHRpbWUpKQ0KCQl7DQoJCQkkdGltZSA9IHN0cnRvdGltZSgkdGltZSk7DQoJCX0NCgkJcmV0dXJuIGRhdGUoJ0c6aScsJHRpbWUpOw0KCX0NCg0KCS8qKg0KCSAqCUNoZWNrIGlmIHN0cmluZyBpcyBhIHZhbGlkIHRpbWUgc3RhbXANCgkgKi8NCglwdWJsaWMgc3RhdGljIGZ1bmN0aW9uIGlzVmFsaWRUaW1lU3RhbXAoJHRpbWVzdGFtcCkNCgl7DQoJCXJldHVybiAoKGludCkgJHRpbWVzdGFtcCA9PT0gJHRpbWVzdGFtcCkNCgkJJiYgKCR0aW1lc3RhbXAgPD0gUEhQX0lOVF9NQVgpDQoJCSYmICgkdGltZXN0YW1wID49IH5QSFBfSU5UX01BWCk7DQoJfQ0K', '', 'CQkvLyBHZXQgQXBwbGljYXRpb24gb2JqZWN0DQoJCSRhcHAgPSBGYWN0b3J5OjpnZXRBcHBsaWNhdGlvbigpOw0KCQkkYXBwLT5lbnF1ZXVlTWVzc2FnZSgnVGhpcyBpcyBhIGRlbW8gY29tcG9uZW50IGRldmVsb3BlZCBpbiA8YSBocmVmPSJodHRwOi8vdmRtLmJ6L2NvbXBvbmVudC1idWlsZGVyIiB0YWdldD0iX2JhbG5rIiB0aXRsZT0iSm9vbWxhIENvbXBvbmVudCBCdWlsZGVyIj5KQ0I8L2E+ISBZb3UgY2FuIGJ1aWxkIG1vcmUgY29tcG9uZW50cyBsaWtlIHRoaXMgd2l0aCBKQ0IsIGNoZWNrb3V0IG91ciBwYWdlIG9uIDxhIGhyZWY9Imh0dHBzOi8vZ2l0aHViLmNvbS92ZG0taW8vSm9vbWxhLUNvbXBvbmVudC1CdWlsZGVyIiB0YWdldD0iX2JhbG5rIiB0aXRsZT0iSm9vbWxhIENvbXBvbmVudCBCdWlsZGVyIj5naXRodWI8L2E+IGZvciBtb3JlIGluZm8uIFRoZSBmdXR1cmUgb2YgPGEgaHJlZj0iaHR0cDovL3ZkbS5iei9jb21wb25lbnQtYnVpbGRlciIgdGFnZXQ9Il9iYWxuayIgdGl0bGU9Ikpvb21sYSBDb21wb25lbnQgQnVpbGRlciI+Sm9vbWxhIENvbXBvbmVudCBEZXZlbG9wbWVudDwvYT4gaXMgSGVyZSEnLCAnSW5mbycpOw==', '', '', '', '', 'IyAjIyNDb21wb25lbnRfbmFtZSMjIyAoIyMjVkVSU0lPTiMjIykNCg0KIVsjIyNDb21wb25lbnRfbmFtZSMjIyBpbWFnZV0oaHR0cHM6Ly9yYXcuZ2l0aHVidXNlcmNvbnRlbnQuY29tL25hbWliaWEvZGVtby1qb29tbGEtMy1jb21wb25lbnQvbWFzdGVyL2FkbWluL2Fzc2V0cy9pbWFnZXMvdmRtLWNvbXBvbmVudC5qcGcgIlRoZSAjIyNDb21wb25lbnRfbmFtZSMjIyIpDQoNCiMjI0RFU0NSSVBUSU9OIyMjDQoNCiMgQnVpbGQgRGV0YWlscw0KDQorICpDb21wYW55KjogWyMjI0NPTVBBTllOQU1FIyMjXSgjIyNBVVRIT1JXRUJTSVRFIyMjKQ0KKyAqQXV0aG9yKjogWyMjI0FVVEhPUiMjI10obWFpbHRvOiMjI0FVVEhPUkVNQUlMIyMjKQ0KKyAqTmFtZSo6IFsjIyNDb21wb25lbnRfbmFtZSMjI10oIyMjQVVUSE9SV0VCU0lURSMjIykNCisgKkZpcnN0IEJ1aWxkKjogIyMjQ1JFQVRJT05EQVRFIyMjDQorICpMYXN0IEJ1aWxkKjogIyMjQlVJTEREQVRFIyMjDQorICpWZXJzaW9uKjogIyMjVkVSU0lPTiMjIw0KKyAqQ29weXJpZ2h0KjogIyMjQ09QWVJJR0hUIyMjDQorICpMaWNlbnNlKjogIyMjTElDRU5TRSMjIw0KDQojIyBCdWlsZCBUaW1lDQoNCioqIyMjdG90YWxIb3VycyMjIyBIb3VycyoqIG9yICoqIyMjdG90YWxEYXlzIyMjIEVpZ2h0IEhvdXIgRGF5cyoqIChhY3R1YWwgdGltZSB0aGUgYXV0aG9yIHNhdmVkIC0NCmR1ZSB0byBbQXV0b21hdGVkIENvbXBvbmVudCBCdWlsZGVyXShodHRwczovL3d3dy52ZG0uaW8vam9vbWxhLWNvbXBvbmVudC1idWlsZGVyKSkNCg0KPiAoaWYgY3JlYXRpbmcgYSBmb2xkZXIgYW5kIGZpbGUgdG9vayAqKjUgc2Vjb25kcyoqIGFuZCB3cml0aW5nIG9uZSBsaW5lIG9mIGNvZGUgdG9vayAqKjEwIHNlY29uZHMqKiwNCj4gbmV2ZXIgbWFraW5nIG9uZSBtaXN0YWtlIG9yIHRha2luZyBhbnkgY29mZmVlIGJyZWFrLikNCg0KKyAqTGluZSBjb3VudCo6ICoqIyMjTElORV9DT1VOVCMjIyoqDQorICpGaWxlIGNvdW50KjogKiojIyNGSUxFX0NPVU5UIyMjKioNCisgKkZvbGRlciBjb3VudCo6ICoqIyMjRk9MREVSX0NPVU5UIyMjKioNCg0KKiojIyNhY3R1YWxIb3Vyc1NwZW50IyMjIEhvdXJzKiogb3IgKiojIyNhY3R1YWxEYXlzU3BlbnQjIyMgRWlnaHQgSG91ciBEYXlzKiogKHRoZSBhY3R1YWwgdGltZSB0aGUgYXV0aG9yIHNwZW50KQ0KDQo+ICh3aXRoIHRoZSBmb2xsb3dpbmcgYnJlYWsgZG93bjoNCj4gKipkZWJ1Z2dpbmcgQCMjI2RlYnVnZ2luZ0hvdXJzIyMjaG91cnMqKiA9IGNvZGluZ3RpbWUgLyA0Ow0KPiAqKnBsYW5uaW5nIEAjIyNwbGFubmluZ0hvdXJzIyMjaG91cnMqKiA9IGNvZGluZ3RpbWUgLyA3Ow0KPiAqKm1hcHBpbmcgQCMjI21hcHBpbmdIb3VycyMjI2hvdXJzKiogPSBjb2Rpbmd0aW1lIC8gMTA7DQo+ICoqb2ZmaWNlIEAjIyNvZmZpY2VIb3VycyMjI2hvdXJzKiogPSBjb2Rpbmd0aW1lIC8gNjspDQoNCioqIyMjYWN0dWFsVG90YWxIb3VycyMjIyBIb3VycyoqIG9yICoqIyMjYWN0dWFsVG90YWxEYXlzIyMjIEVpZ2h0IEhvdXIgRGF5cyoqDQooYSB0b3RhbCBvZiB0aGUgcmVhbGlzdGljIHRpbWUgZnJhbWUgZm9yIHRoaXMgcHJvamVjdCkNCg0KPiAoaWYgY3JlYXRpbmcgYSBmb2xkZXIgYW5kIGZpbGUgdG9vayAqKjUgc2Vjb25kcyoqIGFuZCB3cml0aW5nIG9uZSBsaW5lIG9mIGNvZGUgdG9vayAqKjEwIHNlY29uZHMqKiwNCj4gd2l0aCB0aGUgbm9ybWFsIGV2ZXJ5ZGF5IHJlYWxpdGllcyBhdCB0aGUgb2ZmaWNlLCB0aGF0IGluY2x1ZGVzIHRoZSBjb21wb25lbnQgcGxhbm5pbmcsIG1hcHBpbmcgJiBkZWJ1Z2dpbmcuKQ0KDQpQcm9qZWN0IGR1cmF0aW9uOiAqKiMjI3Byb2plY3RXZWVrVGltZSMjIyB3ZWVrcyoqIG9yICoqIyMjcHJvamVjdE1vbnRoVGltZSMjIyBtb250aHMqKg0KDQo+IFRoaXMgKipjb21wb25lbnQqKiB3YXMgYnVpbGQgd2l0aCBhIEpvb21sYSBbQXV0b21hdGVkIENvbXBvbmVudCBCdWlsZGVyXShodHRwczovL3d3dy52ZG0uaW8vam9vbWxhLWNvbXBvbmVudC1idWlsZGVyKS4NCj4gRGV2ZWxvcGVkIGJ5IFtMbGV3ZWxseW4gdmFuIGRlciBNZXJ3ZV0obWFpbHRvOmpvb21sYUB2ZG0uaW8pDQoNCltDVVNUT01DT0RFPXJlYWRNRWNvbnRyaWJ1dG9yc10=', '', '', 'Demo Component', '', '', 'Demo (public)', '.git', '', '', 2, 'https://raw.githubusercontent.com/namibia/demo-joomla-3-component/master/demo_updateserver.xml', 'https://www.vdm.io/', '', '6GeGhXcYZEQosGCi0ZXeuAj3oXBwARl7OnRm9h3rxPQ=', '', '{\"language_options\":{\"activate\":\"0\",\"use_percentagelanguageadd\":\"1\",\"percentagelanguageadd\":\"50\"},\"joomla_component_headers\":{\"add_admin_component\":\"0\",\"admin_component\":\"\",\"power_admin_component\":[],\"add_site_component\":\"0\",\"site_component\":\"\",\"power_site_component\":[],\"add_admin_helper\":\"0\",\"admin_helper\":\"\",\"power_admin_helper\":[],\"add_site_helper\":\"0\",\"site_helper\":\"\",\"power_site_helper\":[]}}', 1, 54, '', 1, 10);
+INSERT INTO `#__componentbuilder_joomla_component` (`id`, `add_admin_event`, `add_backup_folder_path`, `add_css_admin`, `add_css_site`, `add_email_helper`, `add_git_folder_path`, `add_javascript`, `add_menu_prefix`, `add_namespace_prefix`, `add_php_helper_admin`, `add_php_helper_both`, `add_php_helper_site`, `add_php_method_uninstall`, `add_php_postflight_install`, `add_php_postflight_update`, `add_php_preflight_install`, `add_php_preflight_update`, `add_placeholders`, `add_powers`, `add_sales_server`, `add_site_event`, `add_sql`, `add_sql_uninstall`, `add_update_server`, `addcontributors`, `addfootable`, `addreadme`, `adduikit`, `assets_table_fix`, `author`, `backup_folder_path`, `bom`, `buildcomp`, `buildcompsql`, `companyname`, `component_version`, `copyright`, `created`, `creatuserhelper`, `crowdin_account_api_key`, `crowdin_project_api_key`, `crowdin_project_identifier`, `crowdin_username`, `css_admin`, `css_site`, `dashboard`, `dashboard_type`, `debug_linenr`, `description`, `email`, `emptycontributors`, `export_buy_link`, `export_key`, `git_folder_path`, `guid`, `image`, `javascript`, `joomla_source_link`, `license`, `menu_prefix`, `modified`, `mvc_versiondate`, `name`, `name_code`, `namespace_prefix`, `number`, `php_admin_event`, `php_helper_admin`, `php_helper_both`, `php_helper_site`, `php_method_uninstall`, `php_postflight_install`, `php_postflight_update`, `php_preflight_install`, `php_preflight_update`, `php_site_event`, `php_method_install`, `readme`, `remove_line_breaks`, `sales_server`, `short_description`, `sql`, `sql_uninstall`, `system_name`, `toignore`, `translation_tool`, `update_server`, `update_server_target`, `update_server_url`, `website`, `params`, `published`, `version`, `hits`, `access`, `ordering`) VALUES
+(25, '', '', '', '', '', '', '', 1, '', '', '', 1, '', 1, '', '', '', '', 1, '', '', '', '', 1, '{}', '', 1, 1, 3, 'Llewellyn van der Merwe', '', 'default.txt', '', '', 'Vast Development Method', '2.1.0', 'Copyright (C) 2015. All Rights Reserved', '2016-10-18 11:44:09', '', 'mvVkzmHCEIoBhzD3gR3uTzXRGwNVNRWw8Hr1vrXxb+I=', 'BbloLSYT6Yup6v3I/YNmrdOwzjbI4BGfDvJSB82N9DU=', '', 'VtSt2RMz+AHCrwc7jk1G70t83ZwZsNp2upqfzMyaVHE=', '', '', '', 1, '', 'Just a basic demo of the most basic implementations of the [Joomla](http://www.joomla.org) Component Builder\'s ability.', 'joomla@vdm.io', '', '', 'nZDegSPK87rXA4KMC6P8I6zEldjVIJpPYGRPZlKBI+U=', '', 'efde995e-60aa-4b39-b644-44349dfb660d', 'images/vdm/demo500.jpg', '', 'https://github.com/Llewellynvdm/Joomla-Demo-Component', 'GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html', '»', '2024-01-19 11:57:08', '', 'Demo', 'demo', 'JCB', 4, '', '', '', 'CS8qKg0KCSAqCUNoYW5nZSB0byBuaWNlIGZhbmN5IGRhdGUNCgkgKi8NCglwdWJsaWMgc3RhdGljIGZ1bmN0aW9uIGZhbmN5RGF0ZSgkZGF0ZSkNCgl7DQoJCWlmICghc2VsZjo6aXNWYWxpZFRpbWVTdGFtcCgkZGF0ZSkpDQoJCXsNCgkJCSRkYXRlID0gc3RydG90aW1lKCRkYXRlKTsNCgkJfQ0KCQlyZXR1cm4gZGF0ZSgnalMgXG9cZiBGIFknLCRkYXRlKTsNCgl9DQoNCgkvKioNCgkgKglDaGFuZ2UgdG8gbmljZSBmYW5jeSB0aW1lIGFuZCBkYXRlDQoJICovDQoJcHVibGljIHN0YXRpYyBmdW5jdGlvbiBmYW5jeURhdGVUaW1lKCR0aW1lKQ0KCXsNCgkJaWYgKCFzZWxmOjppc1ZhbGlkVGltZVN0YW1wKCR0aW1lKSkNCgkJew0KCQkJJHRpbWUgPSBzdHJ0b3RpbWUoJHRpbWUpOw0KCQl9DQoJCXJldHVybiBkYXRlKCcoRzppKSBqUyBcb1xmIEYgWScsJHRpbWUpOw0KCX0NCg0KCS8qKg0KCSAqCUNoYW5nZSB0byBuaWNlIGhvdXI6bWludXRlcyB0aW1lDQoJICovDQoJcHVibGljIHN0YXRpYyBmdW5jdGlvbiBmYW5jeVRpbWUoJHRpbWUpDQoJew0KCQlpZiAoIXNlbGY6OmlzVmFsaWRUaW1lU3RhbXAoJHRpbWUpKQ0KCQl7DQoJCQkkdGltZSA9IHN0cnRvdGltZSgkdGltZSk7DQoJCX0NCgkJcmV0dXJuIGRhdGUoJ0c6aScsJHRpbWUpOw0KCX0NCg0KCS8qKg0KCSAqCUNoZWNrIGlmIHN0cmluZyBpcyBhIHZhbGlkIHRpbWUgc3RhbXANCgkgKi8NCglwdWJsaWMgc3RhdGljIGZ1bmN0aW9uIGlzVmFsaWRUaW1lU3RhbXAoJHRpbWVzdGFtcCkNCgl7DQoJCXJldHVybiAoKGludCkgJHRpbWVzdGFtcCA9PT0gJHRpbWVzdGFtcCkNCgkJJiYgKCR0aW1lc3RhbXAgPD0gUEhQX0lOVF9NQVgpDQoJCSYmICgkdGltZXN0YW1wID49IH5QSFBfSU5UX01BWCk7DQoJfQ0K', '', 'CQkvLyBHZXQgQXBwbGljYXRpb24gb2JqZWN0DQoJCSRhcHAgPSBGYWN0b3J5OjpnZXRBcHBsaWNhdGlvbigpOw0KCQkkYXBwLT5lbnF1ZXVlTWVzc2FnZSgnVGhpcyBpcyBhIGRlbW8gY29tcG9uZW50IGRldmVsb3BlZCBpbiA8YSBocmVmPSJodHRwOi8vdmRtLmJ6L2NvbXBvbmVudC1idWlsZGVyIiB0YWdldD0iX2JhbG5rIiB0aXRsZT0iSm9vbWxhIENvbXBvbmVudCBCdWlsZGVyIj5KQ0I8L2E+ISBZb3UgY2FuIGJ1aWxkIG1vcmUgY29tcG9uZW50cyBsaWtlIHRoaXMgd2l0aCBKQ0IsIGNoZWNrb3V0IG91ciBwYWdlIG9uIDxhIGhyZWY9Imh0dHBzOi8vZ2l0aHViLmNvbS92ZG0taW8vSm9vbWxhLUNvbXBvbmVudC1CdWlsZGVyIiB0YWdldD0iX2JhbG5rIiB0aXRsZT0iSm9vbWxhIENvbXBvbmVudCBCdWlsZGVyIj5naXRodWI8L2E+IGZvciBtb3JlIGluZm8uIFRoZSBmdXR1cmUgb2YgPGEgaHJlZj0iaHR0cDovL3ZkbS5iei9jb21wb25lbnQtYnVpbGRlciIgdGFnZXQ9Il9iYWxuayIgdGl0bGU9Ikpvb21sYSBDb21wb25lbnQgQnVpbGRlciI+Sm9vbWxhIENvbXBvbmVudCBEZXZlbG9wbWVudDwvYT4gaXMgSGVyZSEnLCAnSW5mbycpOw==', '', '', '', '', '', 'IyAjIyNDb21wb25lbnRfbmFtZSMjIyAoIyMjVkVSU0lPTiMjIykNCg0KIVsjIyNDb21wb25lbnRfbmFtZSMjIyBpbWFnZV0oaHR0cHM6Ly9yYXcuZ2l0aHVidXNlcmNvbnRlbnQuY29tL25hbWliaWEvZGVtby1qb29tbGEtMy1jb21wb25lbnQvbWFzdGVyL2FkbWluL2Fzc2V0cy9pbWFnZXMvdmRtLWNvbXBvbmVudC5qcGcgIlRoZSAjIyNDb21wb25lbnRfbmFtZSMjIyIpDQoNCiMjI0RFU0NSSVBUSU9OIyMjDQoNCiMgQnVpbGQgRGV0YWlscw0KDQorICpDb21wYW55KjogWyMjI0NPTVBBTllOQU1FIyMjXSgjIyNBVVRIT1JXRUJTSVRFIyMjKQ0KKyAqQXV0aG9yKjogWyMjI0FVVEhPUiMjI10obWFpbHRvOiMjI0FVVEhPUkVNQUlMIyMjKQ0KKyAqTmFtZSo6IFsjIyNDb21wb25lbnRfbmFtZSMjI10oIyMjQVVUSE9SV0VCU0lURSMjIykNCisgKkZpcnN0IEJ1aWxkKjogIyMjQ1JFQVRJT05EQVRFIyMjDQorICpMYXN0IEJ1aWxkKjogIyMjQlVJTEREQVRFIyMjDQorICpWZXJzaW9uKjogIyMjVkVSU0lPTiMjIw0KKyAqQ29weXJpZ2h0KjogIyMjQ09QWVJJR0hUIyMjDQorICpMaWNlbnNlKjogIyMjTElDRU5TRSMjIw0KDQojIyBCdWlsZCBUaW1lDQoNCioqIyMjdG90YWxIb3VycyMjIyBIb3VycyoqIG9yICoqIyMjdG90YWxEYXlzIyMjIEVpZ2h0IEhvdXIgRGF5cyoqIChhY3R1YWwgdGltZSB0aGUgYXV0aG9yIHNhdmVkIC0NCmR1ZSB0byBbQXV0b21hdGVkIENvbXBvbmVudCBCdWlsZGVyXShodHRwczovL3d3dy52ZG0uaW8vam9vbWxhLWNvbXBvbmVudC1idWlsZGVyKSkNCg0KPiAoaWYgY3JlYXRpbmcgYSBmb2xkZXIgYW5kIGZpbGUgdG9vayAqKjUgc2Vjb25kcyoqIGFuZCB3cml0aW5nIG9uZSBsaW5lIG9mIGNvZGUgdG9vayAqKjEwIHNlY29uZHMqKiwNCj4gbmV2ZXIgbWFraW5nIG9uZSBtaXN0YWtlIG9yIHRha2luZyBhbnkgY29mZmVlIGJyZWFrLikNCg0KKyAqTGluZSBjb3VudCo6ICoqIyMjTElORV9DT1VOVCMjIyoqDQorICpGaWxlIGNvdW50KjogKiojIyNGSUxFX0NPVU5UIyMjKioNCisgKkZvbGRlciBjb3VudCo6ICoqIyMjRk9MREVSX0NPVU5UIyMjKioNCg0KKiojIyNhY3R1YWxIb3Vyc1NwZW50IyMjIEhvdXJzKiogb3IgKiojIyNhY3R1YWxEYXlzU3BlbnQjIyMgRWlnaHQgSG91ciBEYXlzKiogKHRoZSBhY3R1YWwgdGltZSB0aGUgYXV0aG9yIHNwZW50KQ0KDQo+ICh3aXRoIHRoZSBmb2xsb3dpbmcgYnJlYWsgZG93bjoNCj4gKipkZWJ1Z2dpbmcgQCMjI2RlYnVnZ2luZ0hvdXJzIyMjaG91cnMqKiA9IGNvZGluZ3RpbWUgLyA0Ow0KPiAqKnBsYW5uaW5nIEAjIyNwbGFubmluZ0hvdXJzIyMjaG91cnMqKiA9IGNvZGluZ3RpbWUgLyA3Ow0KPiAqKm1hcHBpbmcgQCMjI21hcHBpbmdIb3VycyMjI2hvdXJzKiogPSBjb2Rpbmd0aW1lIC8gMTA7DQo+ICoqb2ZmaWNlIEAjIyNvZmZpY2VIb3VycyMjI2hvdXJzKiogPSBjb2Rpbmd0aW1lIC8gNjspDQoNCioqIyMjYWN0dWFsVG90YWxIb3VycyMjIyBIb3VycyoqIG9yICoqIyMjYWN0dWFsVG90YWxEYXlzIyMjIEVpZ2h0IEhvdXIgRGF5cyoqDQooYSB0b3RhbCBvZiB0aGUgcmVhbGlzdGljIHRpbWUgZnJhbWUgZm9yIHRoaXMgcHJvamVjdCkNCg0KPiAoaWYgY3JlYXRpbmcgYSBmb2xkZXIgYW5kIGZpbGUgdG9vayAqKjUgc2Vjb25kcyoqIGFuZCB3cml0aW5nIG9uZSBsaW5lIG9mIGNvZGUgdG9vayAqKjEwIHNlY29uZHMqKiwNCj4gd2l0aCB0aGUgbm9ybWFsIGV2ZXJ5ZGF5IHJlYWxpdGllcyBhdCB0aGUgb2ZmaWNlLCB0aGF0IGluY2x1ZGVzIHRoZSBjb21wb25lbnQgcGxhbm5pbmcsIG1hcHBpbmcgJiBkZWJ1Z2dpbmcuKQ0KDQpQcm9qZWN0IGR1cmF0aW9uOiAqKiMjI3Byb2plY3RXZWVrVGltZSMjIyB3ZWVrcyoqIG9yICoqIyMjcHJvamVjdE1vbnRoVGltZSMjIyBtb250aHMqKg0KDQo+IFRoaXMgKipjb21wb25lbnQqKiB3YXMgYnVpbGQgd2l0aCBhIEpvb21sYSBbQXV0b21hdGVkIENvbXBvbmVudCBCdWlsZGVyXShodHRwczovL3d3dy52ZG0uaW8vam9vbWxhLWNvbXBvbmVudC1idWlsZGVyKS4NCj4gRGV2ZWxvcGVkIGJ5IFtMbGV3ZWxseW4gdmFuIGRlciBNZXJ3ZV0obWFpbHRvOmpvb21sYUB2ZG0uaW8pDQoNCltDVVNUT01DT0RFPXJlYWRNRWNvbnRyaWJ1dG9yc10=', '', '', 'Demo Component', '', '', 'Demo (public)', '.git', '', '', 2, 'https://raw.githubusercontent.com/namibia/demo-joomla-3-component/master/demo_updateserver.xml', 'https://www.vdm.io/', '{\"language_options\":{\"activate\":\"0\",\"use_percentagelanguageadd\":\"1\",\"percentagelanguageadd\":\"50\"},\"joomla_component_headers\":{\"add_admin_component\":\"0\",\"admin_component\":\"\",\"power_admin_component\":[],\"add_site_component\":\"0\",\"site_component\":\"\",\"power_site_component\":[],\"add_admin_helper\":\"0\",\"admin_helper\":\"\",\"power_admin_helper\":[],\"add_site_helper\":\"0\",\"site_helper\":\"\",\"power_site_helper\":[]}}', 1, 54, '', 1, 10);
--
-- Dumping data for table `#__componentbuilder_joomla_plugin`
@@ -2564,6 +2603,13 @@ INSERT INTO `#__componentbuilder_site_view` (`id`, `add_css_document`, `add_css`
(23, '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 'looks', '', '', '', 'PHRhYmxlIGNsYXNzPSJ1ay10YWJsZSB1ay10YWJsZS1ob3ZlciI+DQogICAgPGNhcHRpb24+PD9waHAgZWNobyBUZXh0OjpfKCdMaXN0IG9mIGFsbCBsb29rcycpOyA/PjwvY2FwdGlvbj4NCiAgICA8dGhlYWQ+DQogICAgICAgIDx0cj4NCiAgICAgICAgICAgIDx0aD48P3BocCBlY2hvIFRleHQ6Ol8oJ05hbWUnKTsgPz48L3RoPg0KICAgICAgICAgICAgPHRoPjw/cGhwIGVjaG8gVGV4dDo6XygnRGVzY3JpcHRpb24nKTsgPz48L3RoPg0KICAgICAgICA8L3RyPg0KICAgIDwvdGhlYWQ+DQogICAgPHRib2R5Pg0KICAgICAgICA8P3BocCBmb3JlYWNoICgkdGhpcy0+aXRlbXMgYXMgJGl0ZW0pOiA/Pg0KICAgICAgICA8dHI+DQogICAgICAgICAgICA8dGQ+PGEgaHJlZj0iPD9waHAgZWNobyAgW1tbQ29tcG9uZW50XV1dSGVscGVyUm91dGU6OmdldExvb2tpbmdSb3V0ZSgkaXRlbS0+c2x1Zyk7ID8+IiA+PD9waHAgZWNobyAkaXRlbS0+bmFtZTsgPz48L2E+PC90ZD4NCiAgICAgICAgICAgIDx0ZD48P3BocCBlY2hvICR0aGlzLT5lc2NhcGUoJGl0ZW0tPmRlc2NyaXB0aW9uLCB0cnVlLCAxMjApOyA/Pjw/cGhwIGVjaG8gJGl0ZW0tPmVkaXRMaW5rOyA/PjwvdGQ+DQogICAgICAgIDwvdHI+DQogICAgICAgIDw/cGhwIGVuZGZvcmVhY2g7ID8+DQogICAgPC90Ym9keT4NCjwvdGFibGU+', 'The List of all published looks', 36, '', 36, 'Looks', 'Looks', '', '', '', '', '', '', '', '', 1, '2016-04-05 14:31:59', '2016-10-20 15:57:24', 9, '', 14, 'b2dce59e-e3b8-4467-bcb5-8f2df4bdfeb7'),
(25, '', '', '', '', 1, 1, '', '', '', '', 1, '', '', '', '', 'looking', '', '', '', 'PGFydGljbGUgY2xhc3M9InVrLWNvbW1lbnQiPg0KICAgIDxoZWFkZXIgY2xhc3M9InVrLWNvbW1lbnQtaGVhZGVyIj4NCiAgICAgICAgPGltZyBjbGFzcz0idWstY29tbWVudC1hdmF0YXIiIHNyYz0ie2ltYWdldXJsfSIgYWx0PSIiPg0KICAgICAgICA8aDQgY2xhc3M9InVrLWNvbW1lbnQtdGl0bGUiPjw/cGhwIGVjaG8gJHRoaXMtPmVzY2FwZSgkdGhpcy0+aXRlbS0+bmFtZSk7ID8+PC9oND4NCiAgICAgICAgPGRpdiBjbGFzcz0idWstY29tbWVudC1tZXRhIj48P3BocCBlY2hvIFRleHQ6Ol8oJ0hpdHMnKTsgPz46IDw/cGhwIGVjaG8gJHRoaXMtPml0ZW0tPmhpdHM7ID8+PC9kaXY+DQogICAgPC9oZWFkZXI+DQogICAgPGRpdiBjbGFzcz0idWstY29tbWVudC1ib2R5Ij4NCiAgICAgICAgPD9waHAgZWNobyAkdGhpcy0+aXRlbS0+ZGVzY3JpcHRpb247ID8+DQogICAgICAgIDw/cGhwIGlmICgkdGhpcy0+aXRlbS0+YWRkKTogPz4NCiAgICAgICAgICAgIDxiciAvPg0KICAgICAgICAgICAgPCEtLSBUaGlzIGlzIGEgYnV0dG9uIHRvZ2dsaW5nIHRoZSBtb2RhbCAtLT4NCiAgICAgICAgICAgIDxidXR0b24gY2xhc3M9InVrLWJ1dHRvbiIgZGF0YS11ay1tb2RhbD0ie3RhcmdldDonI21vcmUtZGV0YWlscy0wOTAnfSI+PD9waHAgZWNobyBUZXh0OjpfKCdNb3JlIERldGFpbHMnKTsgPz48L2J1dHRvbj4NCiAgICAgICAgPD9waHAgZW5kaWY7ID8+DQogICAgPC9kaXY+DQo8L2FydGljbGU+DQo8P3BocCBpZiAoJHRoaXMtPml0ZW0tPmFkZCk6ID8+DQo8IS0tIFRoaXMgaXMgdGhlIG1vZGFsIC0tPg0KPGRpdiBpZD0ibW9yZS1kZXRhaWxzLTA5MCIgY2xhc3M9InVrLW1vZGFsIj4NCiAgICA8ZGl2IGNsYXNzPSJ1ay1tb2RhbC1kaWFsb2ciPg0KICAgICAgICA8YSBjbGFzcz0idWstbW9kYWwtY2xvc2UgdWstY2xvc2UiPjwvYT4NCiAgICAgICAgPGRsIGNsYXNzPSJ1ay1kZXNjcmlwdGlvbi1saXN0LWhvcml6b250YWwiPg0KICAgICAgICA8P3BocCBpZiAoU3VwZXJfX18xZjI4Y2I1M182MGQ5XzRkYjFfYjUxN18zYzdkYzZiNDI5ZWZfX19Qb3dlcjo6Y2hlY2soJHRoaXMtPml0ZW0tPmRhdGVvZmJpcnRoKSk6ID8+DQogICAgICAgICAgICA8ZHQ+PD9waHAgZWNobyBUZXh0OjpfKCdCaXJ0aCBkYXknKTsgPz48L2R0PjxkZD48P3BocCBlY2hvIFtbW0NvbXBvbmVudF1dXUhlbHBlcjo6ZmFuY3lEYXRlKCR0aGlzLT5lc2NhcGUoJHRoaXMtPml0ZW0tPmRhdGVvZmJpcnRoKSk7ID8+PC9kZD4NCiAgICAgICAgPD9waHAgZW5kaWY7ID8+DQogICAgICAgIDw/cGhwIGlmIChTdXBlcl9fXzFmMjhjYjUzXzYwZDlfNGRiMV9iNTE3XzNjN2RjNmI0MjllZl9fX1Bvd2VyOjpjaGVjaygkdGhpcy0+aXRlbS0+ZW1haWwpKTogPz4NCiAgICAgICAgICAgIDxkdD48P3BocCBlY2hvIFRleHQ6Ol8oJ0VtYWlsJyk7ID8+PC9kdD48ZGQ+PD9waHAgZWNobyAkdGhpcy0+ZXNjYXBlKCR0aGlzLT5pdGVtLT5lbWFpbCk7ID8+PC9kZD4NCiAgICAgICAgPD9waHAgZW5kaWY7ID8+DQogICAgICAgIDw/cGhwIGlmIChTdXBlcl9fXzFmMjhjYjUzXzYwZDlfNGRiMV9iNTE3XzNjN2RjNmI0MjllZl9fX1Bvd2VyOjpjaGVjaygkdGhpcy0+aXRlbS0+bW9iaWxlX3Bob25lKSk6ID8+DQogICAgICAgICAgICA8ZHQ+PD9waHAgZWNobyBUZXh0OjpfKCdNb2JpbGUnKTsgPz48L2R0PjxkZD48P3BocCBlY2hvICR0aGlzLT5lc2NhcGUoJHRoaXMtPml0ZW0tPm1vYmlsZV9waG9uZSk7ID8+PC9kZD4NCiAgICAgICAgPD9waHAgZW5kaWY7ID8+DQogICAgICAgIDw/cGhwIGlmIChTdXBlcl9fXzFmMjhjYjUzXzYwZDlfNGRiMV9iNTE3XzNjN2RjNmI0MjllZl9fX1Bvd2VyOjpjaGVjaygkdGhpcy0+aXRlbS0+d2Vic2l0ZSkpOiA/Pg0KICAgICAgICAgICAgPGR0Pjw/cGhwIGVjaG8gVGV4dDo6XygnV2Vic2l0ZScpOyA/PjwvZHQ+PGRkPjw/cGhwIGVjaG8gJHRoaXMtPmVzY2FwZSgkdGhpcy0+aXRlbS0+d2Vic2l0ZSk7ID8+PC9kZD4NCiAgICAgICAgPD9waHAgZW5kaWY7ID8+DQogICAgICAgIDwvZGw+DQogICAgPC9kaXY+DQo8L2Rpdj4NCjw/cGhwIGVuZGlmOyA/Pg==', 'Looking at a look', 39, '', 39, 'Looking', 'Looking', '', 'CSAvKioNCgkgKiBJbmNyZW1lbnQgdGhlIGhpdCBjb3VudGVyIGZvciB0aGUgcHJlYWNoZXIuDQoJICoNCgkgKiBAcGFyYW0gICBpbnRlZ2VyICAkcGsgIFByaW1hcnkga2V5IG9mIHRoZSBwcmVhY2hlciB0byBpbmNyZW1lbnQuDQoJICoNCgkgKiBAcmV0dXJuICBib29sZWFuICBUcnVlIGlmIHN1Y2Nlc3NmdWw7DQoJICovDQoJcHVibGljIGZ1bmN0aW9uIGhpdCgkcGsgPSAwKQ0KCXsNCgkJaWYgKCRwaykNCgkJew0KCQkJJGRiID0gRmFjdG9yeTo6Z2V0RGJvKCk7DQoJCQkkcXVlcnkgPSAkZGItPmdldFF1ZXJ5KHRydWUpOw0KDQoJCQkvLyBGaWVsZHMgdG8gdXBkYXRlLg0KCQkJJGZpZWxkcyA9IGFycmF5KA0KCQkJICAgICRkYi0+cXVvdGVOYW1lKCdoaXRzJykgLiAnID0gJy4kZGItPnF1b3RlTmFtZSgnaGl0cycpLicgKyAxJw0KCQkJKTsNCg0KCQkJLy8gQ29uZGl0aW9ucyBmb3Igd2hpY2ggcmVjb3JkcyBzaG91bGQgYmUgdXBkYXRlZC4NCgkJCSRjb25kaXRpb25zID0gYXJyYXkoDQoJCQkgICAgJGRiLT5xdW90ZU5hbWUoJ2lkJykgLiAnID0gJyAuICRwaw0KCQkJKTsNCg0KCQkJJHF1ZXJ5LT51cGRhdGUoJGRiLT5xdW90ZU5hbWUoJyNfX1tbW2NvbXBvbmVudF1dXV9sb29rJykpLT5zZXQoJGZpZWxkcyktPndoZXJlKCRjb25kaXRpb25zKTsNCg0KCQkJJGRiLT5zZXRRdWVyeSgkcXVlcnkpOw0KCQkJcmV0dXJuICRkYi0+ZXhlY3V0ZSgpOw0KCQl9DQoJCXJldHVybiBmYWxzZTsNCgl9', 'Ly8gYWRkIGEgaGl0IHRvIHRoZSBsb29rDQppZiAoJHRoaXMtPmhpdCgkdGhpcy0+aXRlbS0+aWQpKQ0Kew0KCSR0aGlzLT5pdGVtLT5oaXRzKys7DQp9', '', '', '', '', '', 1, '2016-10-20 15:11:29', '2016-10-20 17:10:58', 16, '', 14, '851ed44e-5431-4951-876f-4b62a4c56ad2');
+--
+-- Dumping data for table `#__componentbuilder_layout`
+--
+
+INSERT INTO `#__componentbuilder_layout` (`id`, `add_php_view`, `alias`, `description`, `dynamic_get`, `layout`, `name`, `php_view`, `snippet`, `params`, `published`, `version`, `hits`, `ordering`, `libraries`) VALUES
+(97, '', 'trashhelper', 'Trash Helper Layout', '', 'PD9waHAgaWYgKCRkaXNwbGF5RGF0YS0+c3RhdGUtPmdldCgnZmlsdGVyLnB1Ymxpc2hlZCcpID09IC0yICYmICgkZGlzcGxheURhdGEtPmNhblN0YXRlICYmICRkaXNwbGF5RGF0YS0+Y2FuRGVsZXRlKSkgOiA/Pg0KCTxzY3JpcHQ+DQoJCS8vIGNoYW5nZSB0aGUgY2xhc3Mgb2YgdGhlIGRlbGV0ZSBidXR0b24NCgkJalF1ZXJ5KCIjdG9vbGJhci1kZWxldGUgYnV0dG9uIikudG9nZ2xlQ2xhc3MoImJ0bi1kYW5nZXIiKTsNCgkJLy8gZnVuY3Rpb24gdG8gZW1wdHkgdGhlIHRyYXNoDQoJCWZ1bmN0aW9uIGVtcHR5VHJhc2goKSB7DQoJCQlpZiAoZG9jdW1lbnQuYWRtaW5Gb3JtLmJveGNoZWNrZWQudmFsdWUgPT0gMCkgew0KCQkJCS8vIHNlbGVjdCBhbGwgdGhlIGl0ZW1zIHZpc2FibGUNCgkJCQlkb2N1bWVudC5hZG1pbkZvcm0uZWxlbWVudHNbJ2NoZWNrYWxsLXRvZ2dsZSddLmNoZWNrZWQ9MTsNCgkJCQlKb29tbGEuY2hlY2tBbGwoZG9jdW1lbnQuYWRtaW5Gb3JtLmVsZW1lbnRzWydjaGVja2FsbC10b2dnbGUnXSk7DQoJCQkJLy8gY2hlY2sgdG8gY29uZmlybSB0aGUgZGVsZXRpb24NCgkJCQlpZihjb25maXJtKCc8Pz0gVGV4dDo6XygiQXJlIHlvdSBzdXJlIHlvdSB3YW50IHRvIGRlbGV0ZT8gQ29uZmlybWluZyB3aWxsIHBlcm1hbmVudGx5IGRlbGV0ZSB0aGUgc2VsZWN0ZWQgaXRlbShzKSEiKSA/PicpKSB7DQoJCQkJCUpvb21sYS5zdWJtaXRidXR0b24oJzw/PSAkZGlzcGxheURhdGEtPmdldCgibmFtZSIpID8+LmRlbGV0ZScpOw0KCQkJCX0gZWxzZSB7DQoJCQkJCWRvY3VtZW50LmFkbWluRm9ybS5lbGVtZW50c1snY2hlY2thbGwtdG9nZ2xlJ10uY2hlY2tlZD0wOw0KCQkJCQlKb29tbGEuY2hlY2tBbGwoZG9jdW1lbnQuYWRtaW5Gb3JtLmVsZW1lbnRzWydjaGVja2FsbC10b2dnbGUnXSk7DQoJCQkJfQ0KCQkJfSBlbHNlIHsNCgkJCQkvLyBjb25maXJtIGRlbGV0aW9uIG9mIHRob3NlIHNlbGVjdGVkDQoJCQkJaWYgKGNvbmZpcm0oJzw/PSBUZXh0OjpfKCJBcmUgeW91IHN1cmUgeW91IHdhbnQgdG8gZGVsZXRlPyBDb25maXJtaW5nIHdpbGwgcGVybWFuZW50bHkgZGVsZXRlIHRoZSBzZWxlY3RlZCBpdGVtKHMpISIpID8+JykpIHsNCgkJCQkJSm9vbWxhLnN1Ym1pdGJ1dHRvbignPD89ICRkaXNwbGF5RGF0YS0+Z2V0KCJuYW1lIikgPz4uZGVsZXRlJyk7DQoJCQkJfTsNCgkJCX0NCgkJCXJldHVybiBmYWxzZTsNCgkJfQ0KCQkvLyBmdW5jdGlvbiB0byBleGl0IHRoZSB0YXNoIHN0YXRlDQoJCWZ1bmN0aW9uIGV4aXRUcmFzaCgpIHsNCgkJCWRvY3VtZW50LmFkbWluRm9ybS5maWx0ZXJfcHVibGlzaGVkLnNlbGVjdGVkSW5kZXggPSAwOw0KCQkJZG9jdW1lbnQuYWRtaW5Gb3JtLnN1Ym1pdCgpOw0KCQkJcmV0dXJuIGZhbHNlOw0KCQl9DQoJPC9zY3JpcHQ+DQoJPGRpdiBjbGFzcz0iYWxlcnQgYWxlcnQtZXJyb3IiPg0KCQk8P3BocCBpZiAoZW1wdHkoJGRpc3BsYXlEYXRhLT5pdGVtcykpOiA/Pg0KCQkJPGg0IGNsYXNzPSJhbGVydC1oZWFkaW5nIj4NCgkJCQk8c3BhbiBjbGFzcz0iaWNvbi10cmFzaCI+PC9zcGFuPg0KCQkJCTw/PSBUZXh0OjpfKCJUcmFzaCBBcmVhIikgPz4NCgkJCTwvaDQ+DQoJCQk8cD48Pz0gVGV4dDo6XygiWW91IGFyZSBjdXJyZW50bHkgdmlld2luZyB0aGUgdHJhc2ggYXJlYSwgYW5kIHlvdSBkb24ndCBoYXZlIGFueSBpdGVtcyBpbiB0cmFzaCBhdCB0aGUgbW9tZW50ISIpID8+PC9wPg0KCQk8P3BocCBlbHNlOiA/Pg0KCQkJPGg0IGNsYXNzPSJhbGVydC1oZWFkaW5nIj4NCgkJCQk8c3BhbiBjbGFzcz0iaWNvbi10cmFzaCI+PC9zcGFuPg0KCQkJCTw/PSBUZXh0OjpfKCJUcmFzaGVkIGl0ZW1zIikgPz4NCgkJCTwvaDQ+DQoJCQk8cD48Pz0gVGV4dDo6XygiWW91IGFyZSBjdXJyZW50bHkgdmlld2luZyB0aGUgdHJhc2hlZCBpdGVtcy4iKSA/PjwvcD4NCgkJCTxidXR0b24gb25jbGljaz0iZW1wdHlUcmFzaCgpOyIgY2xhc3M9ImJ0biBidG4tc21hbGwgYnRuLWRhbmdlciI+DQoJCQkJPHNwYW4gY2xhc3M9Imljb24tZGVsZXRlIiBhcmlhLWhpZGRlbj0idHJ1ZSI+PC9zcGFuPg0KCQkJCTw/PSBUZXh0OjpfKCJFbXB0eSB0cmFzaCIpID8+DQoJCQk8L2J1dHRvbj4NCgkJPD9waHAgZW5kaWY7ID8+DQoJCTxidXR0b24gb25jbGljaz0iZXhpdFRyYXNoKCk7IiBjbGFzcz0iYnRuIGJ0bi1zbWFsbCI+DQoJCQk8c3BhbiBjbGFzcz0iaWNvbi1iYWNrIiBhcmlhLWhpZGRlbj0idHJ1ZSI+PC9zcGFuPg0KCQkJPD89IFRleHQ6Ol8oIkV4aXQgdHJhc2giKSA/Pg0KCQk8L2J1dHRvbj4NCgk8L2Rpdj4NCjw/cGhwIGVuZGlmOyA/Pg==', 'Trash Helper', '', '', '', 1, 8, '', 27, '');
+
--
-- Dumping data for table `#__componentbuilder_dynamic_get`
--
@@ -2741,7 +2787,11 @@ INSERT INTO `#__componentbuilder_validation_rule` (`id`, `name`, `php`, `short_d
(3, 'uniquefield', 'CS8qKg0KCSAqIE1ldGhvZCB0byB0ZXN0IHRoZSBmaWVsZCB2YWx1ZSBmb3IgdW5pcXVlbmVzcy4NCgkgKg0KCSAqIEBwYXJhbSAgIFxTaW1wbGVYTUxFbGVtZW50ICAkZWxlbWVudCAgVGhlIFNpbXBsZVhNTEVsZW1lbnQgb2JqZWN0IHJlcHJlc2VudGluZyB0aGUgYDxmaWVsZD5gIHRhZyBmb3IgdGhlIGZvcm0gZmllbGQgb2JqZWN0Lg0KCSAqIEBwYXJhbSAgIG1peGVkICAgICAgICAgICAgICAkdmFsdWUgICAgVGhlIGZvcm0gZmllbGQgdmFsdWUgdG8gdmFsaWRhdGUuDQoJICogQHBhcmFtICAgc3RyaW5nICAgICAgICAgICAgICRncm91cCAgICBUaGUgZmllbGQgbmFtZSBncm91cCBjb250cm9sIHZhbHVlLiBUaGlzIGFjdHMgYXMgYW4gYXJyYXkgY29udGFpbmVyIGZvciB0aGUgZmllbGQuDQoJICogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBGb3IgZXhhbXBsZSBpZiB0aGUgZmllbGQgaGFzIG5hbWU9ImZvbyIgYW5kIHRoZSBncm91cCB2YWx1ZSBpcyBzZXQgdG8gImJhciIgdGhlbiB0aGUNCgkgKiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZ1bGwgZmllbGQgbmFtZSB3b3VsZCBlbmQgdXAgYmVpbmcgImJhcltmb29dIi4NCgkgKiBAcGFyYW0gICBSZWdpc3RyeSAgICAgICAgICAgJGlucHV0ICAgIEFuIG9wdGlvbmFsIFJlZ2lzdHJ5IG9iamVjdCB3aXRoIHRoZSBlbnRpcmUgZGF0YSBzZXQgdG8gdmFsaWRhdGUgYWdhaW5zdCB0aGUgZW50aXJlIGZvcm0uDQoJICogQHBhcmFtICAgRm9ybSAgICAgICAgICAgICAgICRmb3JtICAgICBUaGUgZm9ybSBvYmplY3QgZm9yIHdoaWNoIHRoZSBmaWVsZCBpcyBiZWluZyB0ZXN0ZWQuDQoJICoNCgkgKiBAcmV0dXJuICBib29sZWFuICBUcnVlIGlmIHRoZSB2YWx1ZSBpcyB2YWxpZCwgZmFsc2Ugb3RoZXJ3aXNlLg0KCSAqDQoJICogQHNpbmNlICAgMTEuMQ0KCSAqLw0KCXB1YmxpYyBmdW5jdGlvbiB0ZXN0KFxTaW1wbGVYTUxFbGVtZW50ICRlbGVtZW50LCAkdmFsdWUsICRncm91cCA9IG51bGwsIFJlZ2lzdHJ5ICRpbnB1dCA9IG51bGwsIEZvcm0gJGZvcm0gPSBudWxsKQ0KCXsNCgkJLy8gR2V0IHRoZSBkYXRhYmFzZSBvYmplY3QgYW5kIGEgbmV3IHF1ZXJ5IG9iamVjdC4NCgkJJGRiID0gRmFjdG9yeTo6Z2V0RGJvKCk7DQoJCSRxdWVyeSA9ICRkYi0+Z2V0UXVlcnkodHJ1ZSk7DQoNCgkJLy8gR2V0IHRoZSBleHRyYSBmaWVsZCBjaGVjayBhdHRyaWJ1dGUuDQoJCSRpZCA9ICgkaW5wdXQgaW5zdGFuY2VvZiBSZWdpc3RyeSkgPyAkaW5wdXQtPmdldCgnaWQnLCBudWxsKSA6IG51bGw7DQoNCgkJLy8gZ2V0IHRoZSBjb21wb25lbnQgJiB0YWJsZSBuYW1lDQoJCSR0YWJsZSA9ICgkZm9ybSBpbnN0YW5jZW9mIEZvcm0pID8gJGZvcm0tPmdldE5hbWUoKSA6ICcnOw0KDQoJCS8vIGdldCB0aGUgY29sdW1uIG5hbWUNCgkJJG5hbWUgPSAoYXJyYXkpICRlbGVtZW50LT5hdHRyaWJ1dGVzKCktPnsnbmFtZSd9Ow0KCQkkY29sdW1uID0gKHN0cmluZykgdHJpbSgkbmFtZVswXSk7DQoJCQ0KCQkvLyBjaGVjayB0aGF0IHdlIGhhdmUgYSB2YWx1ZQ0KCQlpZiAoc3RybGVuKCR2YWx1ZSkgJiYgc3RybGVuKCR0YWJsZSkgPiAzICYmIHN0cnBvcygkdGFibGUsICdbW1tjb21wb25lbnRdXV0uJykgIT09IGZhbHNlKQ0KCQl7DQoJCQkvLyBub3cgZ2V0IHRoZSB0YWJsZSBuYW1lDQoJCQkkdGFibGVBcnJheSA9IGV4cGxvZGUoJy4nLCAkdGFibGUpOw0KCQkJLy8gZG8gd2UgaGF2ZSB0d28gdmFsdWVzDQoJCQlpZiAoY291bnQoIChhcnJheSkgJHRhYmxlQXJyYXkpID09IDIpDQoJCQl7DQoJCQkJLy8gQnVpbGQgdGhlIHF1ZXJ5Lg0KCQkJCSRxdWVyeS0+c2VsZWN0KCdDT1VOVCgqKScpDQoJCQkJCS0+ZnJvbSgnI19fW1tbY29tcG9uZW50XV1dXycgLiAoc3RyaW5nKSAkdGFibGVBcnJheVsxXSkNCgkJCQkJLT53aGVyZSgkZGItPnF1b3RlTmFtZSgkY29sdW1uKSAuICcgPSAnIC4gJGRiLT5xdW90ZSgkdmFsdWUpKTsNCg0KCQkJCS8vIHJlbW92ZSB0aGlzIGl0ZW0gZnJvbSB0aGUgbGlzdA0KCQkJCWlmICgkaWQgPiAwKQ0KCQkJCXsNCgkJCQkJJHF1ZXJ5LT53aGVyZSgkZGItPnF1b3RlTmFtZSgnaWQnKSAuICcgPD4gJyAuIChpbnQpICRpZCk7DQoJCQkJfQ0KDQoJCQkJLy8gU2V0IGFuZCBxdWVyeSB0aGUgZGF0YWJhc2UuDQoJCQkJJGRiLT5zZXRRdWVyeSgkcXVlcnkpOw0KCQkJCSRkdXBsaWNhdGUgPSAoYm9vbCkgJGRiLT5sb2FkUmVzdWx0KCk7DQoNCgkJCQlpZiAoJGR1cGxpY2F0ZSkNCgkJCQl7DQoJCQkJCXJldHVybiBmYWxzZTsNCgkJCQl9DQoJCQl9DQoJCX0NCg0KCQlyZXR1cm4gdHJ1ZTsNCgl9', 'unique field value', 1, '2018-07-21 06:06:42', ''),
(4, 'memberloginname', 'CS8qKg0KCSAqIE1ldGhvZCB0byB0ZXN0IHRoZSB1c2VybmFtZSBmb3IgdW5pcXVlbmVzcy4NCgkgKg0KCSAqIEBwYXJhbSAgIFxTaW1wbGVYTUxFbGVtZW50ICAkZWxlbWVudCAgVGhlIFNpbXBsZVhNTEVsZW1lbnQgb2JqZWN0IHJlcHJlc2VudGluZyB0aGUgYDxmaWVsZD5gIHRhZyBmb3IgdGhlIGZvcm0gZmllbGQgb2JqZWN0Lg0KCSAqIEBwYXJhbSAgIG1peGVkICAgICAgICAgICAgICAkdmFsdWUgICAgVGhlIGZvcm0gZmllbGQgdmFsdWUgdG8gdmFsaWRhdGUuDQoJICogQHBhcmFtICAgc3RyaW5nICAgICAgICAgICAgICRncm91cCAgICBUaGUgZmllbGQgbmFtZSBncm91cCBjb250cm9sIHZhbHVlLiBUaGlzIGFjdHMgYXMgYW4gYXJyYXkgY29udGFpbmVyIGZvciB0aGUgZmllbGQuDQoJICogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBGb3IgZXhhbXBsZSBpZiB0aGUgZmllbGQgaGFzIG5hbWU9ImZvbyIgYW5kIHRoZSBncm91cCB2YWx1ZSBpcyBzZXQgdG8gImJhciIgdGhlbiB0aGUNCgkgKiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZ1bGwgZmllbGQgbmFtZSB3b3VsZCBlbmQgdXAgYmVpbmcgImJhcltmb29dIi4NCgkgKiBAcGFyYW0gICBSZWdpc3RyeSAgICAgICAgICAgJGlucHV0ICAgIEFuIG9wdGlvbmFsIFJlZ2lzdHJ5IG9iamVjdCB3aXRoIHRoZSBlbnRpcmUgZGF0YSBzZXQgdG8gdmFsaWRhdGUgYWdhaW5zdCB0aGUgZW50aXJlIGZvcm0uDQoJICogQHBhcmFtICAgRm9ybSAgICAgICAgICAgICAgICRmb3JtICAgICBUaGUgZm9ybSBvYmplY3QgZm9yIHdoaWNoIHRoZSBmaWVsZCBpcyBiZWluZyB0ZXN0ZWQuDQoJICoNCgkgKiBAcmV0dXJuICBib29sZWFuICBUcnVlIGlmIHRoZSB2YWx1ZSBpcyB2YWxpZCwgZmFsc2Ugb3RoZXJ3aXNlLg0KCSAqDQoJICogQHNpbmNlICAgMTEuMQ0KCSAqLw0KCXB1YmxpYyBmdW5jdGlvbiB0ZXN0KFxTaW1wbGVYTUxFbGVtZW50ICRlbGVtZW50LCAkdmFsdWUsICRncm91cCA9IG51bGwsIFJlZ2lzdHJ5ICRpbnB1dCA9IG51bGwsIEZvcm0gJGZvcm0gPSBudWxsKQ0KCXsNCgkJLy8gR2V0IHRoZSBkYXRhYmFzZSBvYmplY3QgYW5kIGEgbmV3IHF1ZXJ5IG9iamVjdC4NCgkJJGRiID0gRmFjdG9yeTo6Z2V0RGJvKCk7DQoJCSRxdWVyeSA9ICRkYi0+Z2V0UXVlcnkodHJ1ZSk7DQoNCgkJLy8gQnVpbGQgdGhlIHF1ZXJ5Lg0KCQkkcXVlcnktPnNlbGVjdCgnQ09VTlQoKiknKQ0KCQkJLT5mcm9tKCcjX191c2VycycpDQoJCQktPndoZXJlKCd1c2VybmFtZSA9ICcgLiAkZGItPnF1b3RlKCR2YWx1ZSkpOw0KDQoJCS8vIEdldCB0aGUgdXNlciBJRCBpZiBzZXQuDQoJCSR1c2VySWQgPSAoJGZvcm0gaW5zdGFuY2VvZiBGb3JtICYmICgkdXNlcklkID0gJGZvcm0tPmdldFZhbHVlKCd1c2VyJykpKSA/ICR1c2VySWQgOiAoKCRpbnB1dCBpbnN0YW5jZW9mIFJlZ2lzdHJ5ICYmICgkdXNlcklkID0gJGlucHV0LT5nZXQoJ3VzZXInKSkpID8gJHVzZXJJZCA6IDApOw0KCQkvLyBpZiBzdGlsbCBub3QgdXNlciBpcyBmb3VuZCBnZXQgbWVtYmVyIGlkDQoJCWlmICgkdXNlcklkID09IDApDQoJCXsNCgkJCSRtZW1iZXJJZCA9ICgkZm9ybSBpbnN0YW5jZW9mIEZvcm0gJiYgKCRtZW1iZXJJZCA9ICRmb3JtLT5nZXRWYWx1ZSgnaWQnKSkpID8gJG1lbWJlcklkIDogKCgkaW5wdXQgaW5zdGFuY2VvZiBSZWdpc3RyeSAmJiAoJG1lbWJlcklkID0gJGlucHV0LT5nZXQoJ2lkJykpKSA/ICRtZW1iZXJJZCA6IDApOw0KCQl9DQoJCS8vIGdldCBhY2NvdW50IHR5cGUgaWYgbmVlZGVkDQoJCWlmICgkdXNlcklkID09IDAgJiYgJG1lbWJlcklkID4gMCkNCgkJew0KCQkJJGFjY291bnRJZCA9ICgkZm9ybSBpbnN0YW5jZW9mIEZvcm0gJiYgKCRhY2NvdW50SWQgPSAkZm9ybS0+Z2V0VmFsdWUoJ2FjY291bnQnKSkpID8gJGFjY291bnRJZCA6ICgoJGlucHV0IGluc3RhbmNlb2YgUmVnaXN0cnkgJiYgKCRhY2NvdW50SWQgPSAkaW5wdXQtPmdldCgnYWNjb3VudCcpKSkgPyAkYWNjb3VudElkIDogMCk7DQoJCQkvLyBtYWtlIHN1cmUgdGhlc2UgYWNjb3VudCBpcyBzZXQNCgkJCWlmICgkYWNjb3VudElkID09IDApDQoJCQl7DQoJCQkJJGFjY291bnRJZCA9IFN1cGVyX19fZGI4N2MzMzlfNWJiNl80MjkxX2E3ZWZfMmM0OGVhMWIwNmJjX19fUG93ZXI6OnZhcignbWVtYmVyJywgJG1lbWJlcklkLCAnaWQnLCAnYWNjb3VudCcpOw0KCQkJfQ0KCQl9DQoJCS8vIGdldCB1c2VyIHZhbHVlIGlmIG5vdCBzZXQgKGR1ZSB0byBwZXJtaXNzaW9ucykNCgkJaWYgKCR1c2VySWQgPT0gMCAmJiAkbWVtYmVySWQgPiAwICYmICRhY2NvdW50SWQgPiAwICYmICgxID09ICRhY2NvdW50SWQgfHwgNCA9PSAkYWNjb3VudElkKSkNCgkJew0KCQkJJHVzZXJJZCA9IFN1cGVyX19fZGI4N2MzMzlfNWJiNl80MjkxX2E3ZWZfMmM0OGVhMWIwNmJjX19fUG93ZXI6OnZhcignbWVtYmVyJywgJG1lbWJlcklkLCAnaWQnLCAndXNlcicpOw0KCQl9DQoJCSRxdWVyeS0+d2hlcmUoJGRiLT5xdW90ZU5hbWUoJ2lkJykgLiAnIDw+ICcgLiAoaW50KSAkdXNlcklkKTsNCg0KCQkvLyBTZXQgYW5kIHF1ZXJ5IHRoZSBkYXRhYmFzZS4NCgkJJGRiLT5zZXRRdWVyeSgkcXVlcnkpOw0KCQkkZHVwbGljYXRlID0gKGJvb2wpICRkYi0+bG9hZFJlc3VsdCgpOw0KDQoJCWlmICgkZHVwbGljYXRlKQ0KCQl7DQoJCQlyZXR1cm4gZmFsc2U7DQoJCX0NCg0KCQlyZXR1cm4gdHJ1ZTsNCgl9', 'Validate the member username', 1, '2018-09-16 00:42:59', ''),
(5, 'memberuseremail', 'CS8qKg0KCSAqIFRoZSByZWd1bGFyIGV4cHJlc3Npb24gdG8gdXNlIGluIHRlc3RpbmcgYSBmb3JtIGZpZWxkIHZhbHVlLg0KCSAqDQoJICogQHZhciAgICBzdHJpbmcNCgkgKiBAc2luY2UgIDExLjENCgkgKiBAbGluayAgIGh0dHA6Ly93d3cudzMub3JnL1RSL2h0bWwtbWFya3VwL2lucHV0LmVtYWlsLmh0bWwNCgkgKi8NCglwcm90ZWN0ZWQgJHJlZ2V4ID0gIl5bYS16QS1aMC05LiEjJCUmJyorLz0/Xl9ge3x9fi1dK0BbYS16QS1aMC05LV0rKD86XC5bYS16QS1aMC05LV0rKSokIjsNCg0KCS8qKg0KCSAqIE1ldGhvZCB0byB0ZXN0IHRoZSBlbWFpbCBhZGRyZXNzIGFuZCBvcHRpb25hbGx5IGNoZWNrIGZvciB1bmlxdWVuZXNzLg0KCSAqDQoJICogQHBhcmFtICAgXFNpbXBsZVhNTEVsZW1lbnQgICRlbGVtZW50ICBUaGUgU2ltcGxlWE1MRWxlbWVudCBvYmplY3QgcmVwcmVzZW50aW5nIHRoZSBgPGZpZWxkPmAgdGFnIGZvciB0aGUgZm9ybSBmaWVsZCBvYmplY3QuDQoJICogQHBhcmFtICAgbWl4ZWQgICAgICAgICAgICAgICR2YWx1ZSAgICBUaGUgZm9ybSBmaWVsZCB2YWx1ZSB0byB2YWxpZGF0ZS4NCgkgKiBAcGFyYW0gICBzdHJpbmcgICAgICAgICAgICAgJGdyb3VwICAgIFRoZSBmaWVsZCBuYW1lIGdyb3VwIGNvbnRyb2wgdmFsdWUuIFRoaXMgYWN0cyBhcyBhbiBhcnJheSBjb250YWluZXIgZm9yIHRoZSBmaWVsZC4NCgkgKiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEZvciBleGFtcGxlIGlmIHRoZSBmaWVsZCBoYXMgbmFtZT0iZm9vIiBhbmQgdGhlIGdyb3VwIHZhbHVlIGlzIHNldCB0byAiYmFyIiB0aGVuIHRoZQ0KCSAqICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZnVsbCBmaWVsZCBuYW1lIHdvdWxkIGVuZCB1cCBiZWluZyAiYmFyW2Zvb10iLg0KCSAqIEBwYXJhbSAgIFJlZ2lzdHJ5ICAgICAgICAgICAkaW5wdXQgICAgQW4gb3B0aW9uYWwgUmVnaXN0cnkgb2JqZWN0IHdpdGggdGhlIGVudGlyZSBkYXRhIHNldCB0byB2YWxpZGF0ZSBhZ2FpbnN0IHRoZSBlbnRpcmUgZm9ybS4NCgkgKiBAcGFyYW0gICBGb3JtICAgICAgICAgICAgICAgJGZvcm0gICAgIFRoZSBmb3JtIG9iamVjdCBmb3Igd2hpY2ggdGhlIGZpZWxkIGlzIGJlaW5nIHRlc3RlZC4NCgkgKg0KCSAqIEByZXR1cm4gIGJvb2xlYW4gIFRydWUgaWYgdGhlIHZhbHVlIGlzIHZhbGlkLCBmYWxzZSBvdGhlcndpc2UuDQoJICoNCgkgKiBAc2luY2UgICAxMS4xDQoJICovDQoJcHVibGljIGZ1bmN0aW9uIHRlc3QoXFNpbXBsZVhNTEVsZW1lbnQgJGVsZW1lbnQsICR2YWx1ZSwgJGdyb3VwID0gbnVsbCwgUmVnaXN0cnkgJGlucHV0ID0gbnVsbCwgRm9ybSAkZm9ybSA9IG51bGwpDQoJew0KCQkvLyBJZiB0aGUgZmllbGQgaXMgZW1wdHkgYW5kIG5vdCByZXF1aXJlZCwgdGhlIGZpZWxkIGlzIHZhbGlkLg0KCQkkcmVxdWlyZWQgPSAoKHN0cmluZykgJGVsZW1lbnRbJ3JlcXVpcmVkJ10gPT0gJ3RydWUnIHx8IChzdHJpbmcpICRlbGVtZW50WydyZXF1aXJlZCddID09ICdyZXF1aXJlZCcpOw0KDQoJCWlmICghJHJlcXVpcmVkICYmIGVtcHR5KCR2YWx1ZSkpDQoJCXsNCgkJCXJldHVybiB0cnVlOw0KCQl9DQoNCgkJLy8gSWYgdGhlIHRsZCBhdHRyaWJ1dGUgaXMgcHJlc2VudCwgY2hhbmdlIHRoZSByZWd1bGFyIGV4cHJlc3Npb24gdG8gcmVxdWlyZSBhdCBsZWFzdCAyIGNoYXJhY3RlcnMgZm9yIGl0Lg0KCQkkdGxkID0gKChzdHJpbmcpICRlbGVtZW50Wyd0bGQnXSA9PSAndGxkJyB8fCAoc3RyaW5nKSAkZWxlbWVudFsndGxkJ10gPT0gJ3JlcXVpcmVkJyk7DQoNCgkJaWYgKCR0bGQpDQoJCXsNCgkJCSR0aGlzLT5yZWdleCA9ICJeW2EtekEtWjAtOS4hIyQlJicqKy89P15fYHt8fX4tXStAW2EtekEtWjAtOV0oPzpbYS16QS1aMC05LV17MCw2MX1bYS16QS1aMC05XSkiDQoJCQkJLiAnPyg/OlwuW2EtekEtWjAtOV0oPzpbYS16QS1aMC05LV17MCw2MX1bYS16QS1aMC05XSk/KSskJzsNCgkJfQ0KDQoJCS8vIERldGVybWluZSBpZiB0aGUgbXVsdGlwbGUgYXR0cmlidXRlIGlzIHByZXNlbnQNCgkJJG11bHRpcGxlID0gKChzdHJpbmcpICRlbGVtZW50WydtdWx0aXBsZSddID09ICd0cnVlJyB8fCAoc3RyaW5nKSAkZWxlbWVudFsnbXVsdGlwbGUnXSA9PSAnbXVsdGlwbGUnKTsNCg0KCQlpZiAoISRtdWx0aXBsZSkNCgkJew0KCQkJLy8gSGFuZGxlIGlkbiBlbWFpbCBhZGRyZXNzZXMgYnkgY29udmVydGluZyB0byBwdW55Y29kZS4NCgkJCSR2YWx1ZSA9IFxKU3RyaW5nUHVueWNvZGU6OmVtYWlsVG9QdW55Y29kZSgkdmFsdWUpOw0KDQoJCQkvLyBUZXN0IHRoZSB2YWx1ZSBhZ2FpbnN0IHRoZSByZWd1bGFyIGV4cHJlc3Npb24uDQoJCQlpZiAoIXBhcmVudDo6dGVzdCgkZWxlbWVudCwgJHZhbHVlLCAkZ3JvdXAsICRpbnB1dCwgJGZvcm0pKQ0KCQkJew0KCQkJCXJldHVybiBmYWxzZTsNCgkJCX0NCgkJfQ0KCQllbHNlDQoJCXsNCgkJCSR2YWx1ZXMgPSBleHBsb2RlKCcsJywgJHZhbHVlKTsNCg0KCQkJZm9yZWFjaCAoJHZhbHVlcyBhcyAkdmFsdWUpDQoJCQl7DQoJCQkJLy8gSGFuZGxlIGlkbiBlbWFpbCBhZGRyZXNzZXMgYnkgY29udmVydGluZyB0byBwdW55Y29kZS4NCgkJCQkkdmFsdWUgPSBcSlN0cmluZ1B1bnljb2RlOjplbWFpbFRvUHVueWNvZGUoJHZhbHVlKTsNCg0KCQkJCS8vIFRlc3QgdGhlIHZhbHVlIGFnYWluc3QgdGhlIHJlZ3VsYXIgZXhwcmVzc2lvbi4NCgkJCQlpZiAoIXBhcmVudDo6dGVzdCgkZWxlbWVudCwgJHZhbHVlLCAkZ3JvdXAsICRpbnB1dCwgJGZvcm0pKQ0KCQkJCXsNCgkJCQkJcmV0dXJuIGZhbHNlOw0KCQkJCX0NCgkJCX0NCgkJfQ0KDQoJCS8vIENoZWNrIGlmIHdlIHNob3VsZCB0ZXN0IGZvciB1bmlxdWVuZXNzLiBUaGlzIG9ubHkgY2FuIGJlIHVzZWQgaWYgbXVsdGlwbGUgaXMgbm90IHRydWUNCgkJJHVuaXF1ZSA9ICgoc3RyaW5nKSAkZWxlbWVudFsndW5pcXVlJ10gPT0gJ3RydWUnIHx8IChzdHJpbmcpICRlbGVtZW50Wyd1bmlxdWUnXSA9PSAndW5pcXVlJyk7DQoNCgkJaWYgKCR1bmlxdWUgJiYgISRtdWx0aXBsZSkNCgkJew0KCQkJLy8gR2V0IHRoZSBkYXRhYmFzZSBvYmplY3QgYW5kIGEgbmV3IHF1ZXJ5IG9iamVjdC4NCgkJCSRkYiA9IEZhY3Rvcnk6OmdldERibygpOw0KCQkJJHF1ZXJ5ID0gJGRiLT5nZXRRdWVyeSh0cnVlKTsNCg0KCQkJLy8gQnVpbGQgdGhlIHF1ZXJ5Lg0KCQkJJHF1ZXJ5LT5zZWxlY3QoJ0NPVU5UKCopJykNCgkJCQktPmZyb20oJyNfX3VzZXJzJykNCgkJCQktPndoZXJlKCdlbWFpbCA9ICcgLiAkZGItPnF1b3RlKCR2YWx1ZSkpOw0KDQoJCQkvLyBHZXQgdGhlIHVzZXIgSUQgaWYgc2V0Lg0KCQkJJHVzZXJJZCA9ICgkZm9ybSBpbnN0YW5jZW9mIEZvcm0gJiYgKCR1c2VySWQgPSAkZm9ybS0+Z2V0VmFsdWUoJ3VzZXInKSkpID8gJHVzZXJJZCA6ICgoJGlucHV0IGluc3RhbmNlb2YgUmVnaXN0cnkgJiYgKCR1c2VySWQgPSAkaW5wdXQtPmdldCgndXNlcicpKSkgPyAkdXNlcklkIDogMCk7DQoJCQkvLyBpZiBzdGlsbCBub3QgdXNlciBpcyBmb3VuZCBnZXQgbWVtYmVyIGlkDQoJCQlpZiAoJHVzZXJJZCA9PSAwKQ0KCQkJew0KCQkJCSRtZW1iZXJJZCA9ICgkZm9ybSBpbnN0YW5jZW9mIEZvcm0gJiYgKCRtZW1iZXJJZCA9ICRmb3JtLT5nZXRWYWx1ZSgnaWQnKSkpID8gJG1lbWJlcklkIDogKCgkaW5wdXQgaW5zdGFuY2VvZiBSZWdpc3RyeSAmJiAoJG1lbWJlcklkID0gJGlucHV0LT5nZXQoJ2lkJykpKSA/ICRtZW1iZXJJZCA6IDApOw0KCQkJfQ0KCQkJLy8gZ2V0IGFjY291bnQgdHlwZSBpZiBuZWVkZWQNCgkJCWlmICgkdXNlcklkID09IDAgJiYgJG1lbWJlcklkID4gMCkNCgkJCXsNCgkJCQkkYWNjb3VudElkID0gKCRmb3JtIGluc3RhbmNlb2YgRm9ybSAmJiAoJGFjY291bnRJZCA9ICRmb3JtLT5nZXRWYWx1ZSgnYWNjb3VudCcpKSkgPyAkYWNjb3VudElkIDogKCgkaW5wdXQgaW5zdGFuY2VvZiBSZWdpc3RyeSAmJiAoJGFjY291bnRJZCA9ICRpbnB1dC0+Z2V0KCdhY2NvdW50JykpKSA/ICRhY2NvdW50SWQgOiAwKTsNCgkJCQkvLyBtYWtlIHN1cmUgdGhlc2UgYWNjb3VudCBpcyBzZXQNCgkJCQlpZiAoJGFjY291bnRJZCA9PSAwKQ0KCQkJCXsNCgkJCQkJJGFjY291bnRJZCA9IFN1cGVyX19fZGI4N2MzMzlfNWJiNl80MjkxX2E3ZWZfMmM0OGVhMWIwNmJjX19fUG93ZXI6OnZhcignbWVtYmVyJywgJG1lbWJlcklkLCAnaWQnLCAnYWNjb3VudCcpOw0KCQkJCX0NCgkJCX0NCgkJCS8vIGdldCB1c2VyIHZhbHVlIGlmIG5vdCBzZXQgKGR1ZSB0byBwZXJtaXNzaW9ucykNCgkJCWlmICgkdXNlcklkID09IDAgJiYgJG1lbWJlcklkID4gMCAmJiAkYWNjb3VudElkID4gMCAmJiAoMSA9PSAkYWNjb3VudElkIHx8IDQgPT0gJGFjY291bnRJZCkpDQoJCQl7DQoJCQkJJHVzZXJJZCA9IFN1cGVyX19fZGI4N2MzMzlfNWJiNl80MjkxX2E3ZWZfMmM0OGVhMWIwNmJjX19fUG93ZXI6OnZhcignbWVtYmVyJywgJG1lbWJlcklkLCAnaWQnLCAndXNlcicpOw0KCQkJfQ0KCQkJJHF1ZXJ5LT53aGVyZSgkZGItPnF1b3RlTmFtZSgnaWQnKSAuICcgPD4gJyAuIChpbnQpICR1c2VySWQpOw0KDQoJCQkvLyBTZXQgYW5kIHF1ZXJ5IHRoZSBkYXRhYmFzZS4NCgkJCSRkYi0+c2V0UXVlcnkoJHF1ZXJ5KTsNCgkJCSRkdXBsaWNhdGUgPSAoYm9vbCkgJGRiLT5sb2FkUmVzdWx0KCk7DQoNCgkJCWlmICgkZHVwbGljYXRlKQ0KCQkJew0KCQkJCXJldHVybiBmYWxzZTsNCgkJCX0NCgkJfQ0KDQoJCXJldHVybiB0cnVlOw0KCX0=', 'Validate the member useremail', 1, '2018-09-16 00:43:44', ''),
-(6, 'iban', '	/**
	* Method to check if IBAN is valid.
	*
	* @param   \SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
	* @param   mixed              $value    The form field value to validate.
	* @param   string             $group    The field name group control value. This acts as an array container for the field.
	*                                       For example if the field has name="foo" and the group value is set to "bar" then the
	*                                       full field name would end up being "bar[foo]".
	* @param   Registry           $input    An optional Registry object with the entire data set to validate against the entire form.
	* @param   Form               $form     The form object for which the field is being tested.
	*
	* @return  boolean  True if the value is valid, false otherwise.
	*
	* @since   3.9.0
	*/
	public function test(\SimpleXMLElement $element, $value, $group = null, Registry $input = null, Form $form = null)
	{
		$countryCodeOffset = 0; // COUNTRY_CODE_OFFSET
		$countryCodeLength = 2; //COUNTRY_CODE_LENGTH
		$checksumOffset = 2; //CHECKSUM_OFFSET
		$checksumLength = 2; //CHECKSUM_LENGTH
		$instituteIdentificationOffset = 4; //INSTITUTE_IDENTIFICATION_OFFSET

		/**
		* @var array Country code to size, regex format for each country that supports IBAN
		*/
		$ibanFormatMap = array(
			'AA' => array(12, '^[A-Z0-9]{12}$'),
			'AD' => array(20, '^[0-9]{4}[0-9]{4}[A-Z0-9]{12}$'),
			'AE' => array(19, '^[0-9]{3}[0-9]{16}$'),
			'AL' => array(24, '^[0-9]{8}[A-Z0-9]{16}$'),
			'AO' => array(21, '^[0-9]{21}$'),
			'AT' => array(16, '^[0-9]{5}[0-9]{11}$'),
			'AX' => array(14, '^[0-9]{6}[0-9]{7}[0-9]{1}$'),
			'AZ' => array(24, '^[A-Z]{4}[A-Z0-9]{20}$'),
			'BA' => array(16, '^[0-9]{3}[0-9]{3}[0-9]{8}[0-9]{2}$'),
			'BE' => array(12, '^[0-9]{3}[0-9]{7}[0-9]{2}$'),
			'BF' => array(23, '^[0-9]{23}$'),
			'BG' => array(18, '^[A-Z]{4}[0-9]{4}[0-9]{2}[A-Z0-9]{8}$'),
			'BH' => array(18, '^[A-Z]{4}[A-Z0-9]{14}$'),
			'BI' => array(12, '^[0-9]{12}$'),
			'BJ' => array(24, '^[A-Z]{1}[0-9]{23}$'),
			'BL' => array(23, '^[0-9]{5}[0-9]{5}[A-Z0-9]{11}[0-9]{2}$'),
			'BR' => array(25, '^[0-9]{8}[0-9]{5}[0-9]{10}[A-Z]{1}[A-Z0-9]{1}$'),
			'CH' => array(17, '^[0-9]{5}[A-Z0-9]{12}$'),
			'CI' => array(24, '^[A-Z]{1}[0-9]{23}$'),
			'CM' => array(23, '^[0-9]{23}$'),
			'CR' => array(17, '^[0-9]{4}[0-9]{13}$'),
			'CV' => array(21, '^[0-9]{21}$'),
			'CY' => array(24, '^[0-9]{3}[0-9]{5}[A-Z0-9]{16}$'),
			'CZ' => array(20, '^[0-9]{4}[0-9]{6}[0-9]{10}$'),
			'DE' => array(18, '^[0-9]{8}[0-9]{10}$'),
			'DK' => array(14, '^[0-9]{4}[0-9]{9}[0-9]{1}$'),
			'DO' => array(24, '^[A-Z0-9]{4}[0-9]{20}$'),
			'DZ' => array(20, '^[0-9]{20}$'),
			'EE' => array(16, '^[0-9]{2}[0-9]{2}[0-9]{11}[0-9]{1}$'),
			'ES' => array(20, '^[0-9]{4}[0-9]{4}[0-9]{1}[0-9]{1}[0-9]{10}$'),
			'FI' => array(14, '^[0-9]{6}[0-9]{7}[0-9]{1}$'),
			'FO' => array(14, '^[0-9]{4}[0-9]{9}[0-9]{1}$'),
			'FR' => array(23, '^[0-9]{5}[0-9]{5}[A-Z0-9]{11}[0-9]{2}$'),
			'GB' => array(18, '^[A-Z]{4}[0-9]{6}[0-9]{8}$'),
			'GE' => array(18, '^[A-Z]{2}[0-9]{16}$'),
			'GF' => array(23, '^[0-9]{5}[0-9]{5}[A-Z0-9]{11}[0-9]{2}$'),
			'GI' => array(19, '^[A-Z]{4}[A-Z0-9]{15}$'),
			'GL' => array(14, '^[0-9]{4}[0-9]{9}[0-9]{1}$'),
			'GP' => array(23, '^[0-9]{5}[0-9]{5}[A-Z0-9]{11}[0-9]{2}$'),
			'GR' => array(23, '^[0-9]{3}[0-9]{4}[A-Z0-9]{16}$'),
			'GT' => array(24, '^[A-Z0-9]{4}[A-Z0-9]{20}$'),
			'HR' => array(17, '^[0-9]{7}[0-9]{10}$'),
			'HU' => array(24, '^[0-9]{3}[0-9]{4}[0-9]{1}[0-9]{15}[0-9]{1}$'),
			'IE' => array(18, '^[A-Z]{4}[0-9]{6}[0-9]{8}$'),
			'IL' => array(19, '^[0-9]{3}[0-9]{3}[0-9]{13}$'),
			'IR' => array(22, '^[0-9]{22}$'),
			'IS' => array(22, '^[0-9]{4}[0-9]{2}[0-9]{6}[0-9]{10}$'),
			'IT' => array(23, '^[A-Z]{1}[0-9]{5}[0-9]{5}[A-Z0-9]{12}$'),
			'JO' => array(26, '^[A-Z]{4}[0-9]{4}[A-Z0-9]{18}$'),
			'KW' => array(26, '^[A-Z]{4}[A-Z0-9]{22}$'),
			'KZ' => array(16, '^[0-9]{3}[A-Z0-9]{13}$'),
			'LB' => array(24, '^[0-9]{4}[A-Z0-9]{20}$'),
			'LC' => array(28, '^[A-Z]{4}[A-Z0-9]{24}$'),
			'LI' => array(17, '^[0-9]{5}[A-Z0-9]{12}$'),
			'LT' => array(16, '^[0-9]{5}[0-9]{11}$'),
			'LU' => array(16, '^[0-9]{3}[A-Z0-9]{13}$'),
			'LV' => array(17, '^[A-Z]{4}[A-Z0-9]{13}$'),
			'MC' => array(23, '^[0-9]{5}[0-9]{5}[A-Z0-9]{11}[0-9]{2}$'),
			'MD' => array(20, '^[A-Z0-9]{2}[A-Z0-9]{18}$'),
			'ME' => array(18, '^[0-9]{3}[0-9]{13}[0-9]{2}$'),
			'MF' => array(23, '^[0-9]{5}[0-9]{5}[A-Z0-9]{11}[0-9]{2}$'),
			'MG' => array(23, '^[0-9]{23}$'),
			'MK' => array(15, '^[0-9]{3}[A-Z0-9]{10}[0-9]{2}$'),
			'ML' => array(24, '^[A-Z]{1}[0-9]{23}$'),
			'MQ' => array(23, '^[0-9]{5}[0-9]{5}[A-Z0-9]{11}[0-9]{2}$'),
			'MR' => array(23, '^[0-9]{5}[0-9]{5}[0-9]{11}[0-9]{2}$'),
			'MT' => array(27, '^[A-Z]{4}[0-9]{5}[A-Z0-9]{18}$'),
			'MU' => array(26, '^[A-Z]{4}[0-9]{2}[0-9]{2}[0-9]{12}[0-9]{3}[A-Z]{3}$'),
			'MZ' => array(21, '^[0-9]{21}$'),
			'NC' => array(23, '^[0-9]{5}[0-9]{5}[A-Z0-9]{11}[0-9]{2}$'),
			'NL' => array(14, '^[A-Z]{4}[0-9]{10}$'),
			'NO' => array(11, '^[0-9]{4}[0-9]{6}[0-9]{1}$'),
			'PF' => array(23, '^[0-9]{5}[0-9]{5}[A-Z0-9]{11}[0-9]{2}$'),
			'PK' => array(20, '^[A-Z]{4}[A-Z0-9]{16}$'),
			'PL' => array(24, '^[0-9]{8}[0-9]{16}$'),
			'PM' => array(23, '^[0-9]{5}[0-9]{5}[A-Z0-9]{11}[0-9]{2}$'),
			'PS' => array(25, '^[A-Z]{4}[A-Z0-9]{21}$'),
			'PT' => array(21, '^[0-9]{4}[0-9]{4}[0-9]{11}[0-9]{2}$'),
			'QA' => array(25, '^[A-Z]{4}[0-9]{4}[A-Z0-9]{17}$'),
			'RE' => array(23, '^[0-9]{5}[0-9]{5}[A-Z0-9]{11}[0-9]{2}$'),
			'RO' => array(20, '^[A-Z]{4}[A-Z0-9]{16}$'),
			'RS' => array(18, '^[0-9]{3}[0-9]{13}[0-9]{2}$'),
			'SA' => array(20, '^[0-9]{2}[A-Z0-9]{18}$'),
			'SC' => array(27, '^[A-Z]{4}[0-9]{4}[0-9]{16}[A-Z]{3}$'),
			'SE' => array(20, '^[0-9]{3}[0-9]{16}[0-9]{1}$'),
			'SI' => array(15, '^[0-9]{5}[0-9]{8}[0-9]{2}$'),
			'SK' => array(20, '^[0-9]{4}[0-9]{6}[0-9]{10}$'),
			'SM' => array(23, '^[A-Z]{1}[0-9]{5}[0-9]{5}[A-Z0-9]{12}$'),
			'SN' => array(24, '^[A-Z]{1}[0-9]{23}$'),
			'ST' => array(21, '^[0-9]{8}[0-9]{11}[0-9]{2}$'),
			'TF' => array(23, '^[0-9]{5}[0-9]{5}[A-Z0-9]{11}[0-9]{2}$'),
			'TL' => array(19, '^[0-9]{3}[0-9]{14}[0-9]{2}$'),
			'TN' => array(20, '^[0-9]{2}[0-9]{3}[0-9]{13}[0-9]{2}$'),
			'TR' => array(22, '^[0-9]{5}[0-9]{1}[A-Z0-9]{16}$'),
			'UA' => array(25, '^[0-9]{6}[A-Z0-9]{19}$'),
			'VG' => array(20, '^[A-Z]{4}[0-9]{16}$'),
			'WF' => array(23, '^[0-9]{5}[0-9]{5}[A-Z0-9]{11}[0-9]{2}$'),
			'XK' => array(16, '^[0-9]{4}[0-9]{10}[0-9]{2}$'),
			'YT' => array(23, '^[0-9]{5}[0-9]{5}[A-Z0-9]{11}[0-9]{2}$')
		);

		// CLEAN UP IBAN
		$iban = preg_replace('/[^a-z0-9]+/i', '', trim(strtoupper($value)));

		// CHECK Country Code
		$countryCode = substr($iban, $countryCodeOffset, $countryCodeLength);
		$isCountryCodeValid = !(isset($ibanFormatMap[$countryCode]) === false);

		$validLength = $countryCodeLength + $checksumLength + $ibanFormatMap[$countryCode][0];
		$isLengthValid = strlen($iban) === $validLength;

		$accountIdentification = substr($iban, $instituteIdentificationOffset);
		$isFormatValid = !(preg_match('/' . $ibanFormatMap[$countryCode][1] . '/', $accountIdentification) !== 1);

		$checksum = substr($iban, $checksumOffset, $checksumLength);
		$accountIdentification = substr($iban, $instituteIdentificationOffset);

		// GET NUMERIC COUNTRY CODE
		$numericRepresentation = '';
		$letterRepresentation = $countryCode;
		foreach (str_split($letterRepresentation) as $char)
		{
			$ord = ord($char);
			if ($ord >= 65 && $ord <= 90)
			{
				$numericRepresentation .= (string) ($ord - 55);
			}
			elseif ($ord >= 48 && $ord <= 57)
			{
				$numericRepresentation .= (string) ($ord - 48);
			}
		}
		$numericCountryCode = $numericRepresentation;

		$numericRepresentation = '';
		$letterRepresentation = $accountIdentification;
		foreach (str_split($letterRepresentation) as $char)
		{
			$ord = ord($char);
			if ($ord >= 65 && $ord <= 90)
			{
				$numericRepresentation .= (string) ($ord - 55);
			}
			elseif ($ord >= 48 && $ord <= 57)
			{
				$numericRepresentation .= (string) ($ord - 48);
			}
		}
		$numericAccountIdentification = $numericRepresentation;
		$invertedIban = $numericAccountIdentification . $numericCountryCode . $checksum;

		// CHECKSUM BCMOD
		$x = $invertedIban;
		$y = 97;
		if (!function_exists('bcmod'))
		{
			$take = 5;
			$mod = '';
			do {
				$a = (int)$mod . substr($x, 0, $take);
				$x = substr($x, $take);
				$mod = $a % $y;
			} while (strlen($x));
			$bcmod = (string)$mod;
		}
		else
		{
			$bcmod = bcmod($x, $y);
		}

		$isChecksumValid = $bcmod === '1';

		if (!$isCountryCodeValid || !$isLengthValid || !$isFormatValid || !$isChecksumValid)
		{
			return false;
		}
		else
		{
		    return true;
		}
	}', 'IBAN validation', 1, '2019-02-12 23:14:43', '');
+(6, 'iban', '	/**
	* Method to check if IBAN is valid.
	*
	* @param   \SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
	* @param   mixed              $value    The form field value to validate.
	* @param   string             $group    The field name group control value. This acts as an array container for the field.
	*                                       For example if the field has name="foo" and the group value is set to "bar" then the
	*                                       full field name would end up being "bar[foo]".
	* @param   Registry           $input    An optional Registry object with the entire data set to validate against the entire form.
	* @param   Form               $form     The form object for which the field is being tested.
	*
	* @return  boolean  True if the value is valid, false otherwise.
	*
	* @since   3.9.0
	*/
	public function test(\SimpleXMLElement $element, $value, $group = null, Registry $input = null, Form $form = null)
	{
		$countryCodeOffset = 0; // COUNTRY_CODE_OFFSET
		$countryCodeLength = 2; //COUNTRY_CODE_LENGTH
		$checksumOffset = 2; //CHECKSUM_OFFSET
		$checksumLength = 2; //CHECKSUM_LENGTH
		$instituteIdentificationOffset = 4; //INSTITUTE_IDENTIFICATION_OFFSET

		/**
		* @var array Country code to size, regex format for each country that supports IBAN
		*/
		$ibanFormatMap = array(
			'AA' => array(12, '^[A-Z0-9]{12}$'),
			'AD' => array(20, '^[0-9]{4}[0-9]{4}[A-Z0-9]{12}$'),
			'AE' => array(19, '^[0-9]{3}[0-9]{16}$'),
			'AL' => array(24, '^[0-9]{8}[A-Z0-9]{16}$'),
			'AO' => array(21, '^[0-9]{21}$'),
			'AT' => array(16, '^[0-9]{5}[0-9]{11}$'),
			'AX' => array(14, '^[0-9]{6}[0-9]{7}[0-9]{1}$'),
			'AZ' => array(24, '^[A-Z]{4}[A-Z0-9]{20}$'),
			'BA' => array(16, '^[0-9]{3}[0-9]{3}[0-9]{8}[0-9]{2}$'),
			'BE' => array(12, '^[0-9]{3}[0-9]{7}[0-9]{2}$'),
			'BF' => array(23, '^[0-9]{23}$'),
			'BG' => array(18, '^[A-Z]{4}[0-9]{4}[0-9]{2}[A-Z0-9]{8}$'),
			'BH' => array(18, '^[A-Z]{4}[A-Z0-9]{14}$'),
			'BI' => array(12, '^[0-9]{12}$'),
			'BJ' => array(24, '^[A-Z]{1}[0-9]{23}$'),
			'BL' => array(23, '^[0-9]{5}[0-9]{5}[A-Z0-9]{11}[0-9]{2}$'),
			'BR' => array(25, '^[0-9]{8}[0-9]{5}[0-9]{10}[A-Z]{1}[A-Z0-9]{1}$'),
			'CH' => array(17, '^[0-9]{5}[A-Z0-9]{12}$'),
			'CI' => array(24, '^[A-Z]{1}[0-9]{23}$'),
			'CM' => array(23, '^[0-9]{23}$'),
			'CR' => array(17, '^[0-9]{4}[0-9]{13}$'),
			'CV' => array(21, '^[0-9]{21}$'),
			'CY' => array(24, '^[0-9]{3}[0-9]{5}[A-Z0-9]{16}$'),
			'CZ' => array(20, '^[0-9]{4}[0-9]{6}[0-9]{10}$'),
			'DE' => array(18, '^[0-9]{8}[0-9]{10}$'),
			'DK' => array(14, '^[0-9]{4}[0-9]{9}[0-9]{1}$'),
			'DO' => array(24, '^[A-Z0-9]{4}[0-9]{20}$'),
			'DZ' => array(20, '^[0-9]{20}$'),
			'EE' => array(16, '^[0-9]{2}[0-9]{2}[0-9]{11}[0-9]{1}$'),
			'ES' => array(20, '^[0-9]{4}[0-9]{4}[0-9]{1}[0-9]{1}[0-9]{10}$'),
			'FI' => array(14, '^[0-9]{6}[0-9]{7}[0-9]{1}$'),
			'FO' => array(14, '^[0-9]{4}[0-9]{9}[0-9]{1}$'),
			'FR' => array(23, '^[0-9]{5}[0-9]{5}[A-Z0-9]{11}[0-9]{2}$'),
			'GB' => array(18, '^[A-Z]{4}[0-9]{6}[0-9]{8}$'),
			'GE' => array(18, '^[A-Z]{2}[0-9]{16}$'),
			'GF' => array(23, '^[0-9]{5}[0-9]{5}[A-Z0-9]{11}[0-9]{2}$'),
			'GI' => array(19, '^[A-Z]{4}[A-Z0-9]{15}$'),
			'GL' => array(14, '^[0-9]{4}[0-9]{9}[0-9]{1}$'),
			'GP' => array(23, '^[0-9]{5}[0-9]{5}[A-Z0-9]{11}[0-9]{2}$'),
			'GR' => array(23, '^[0-9]{3}[0-9]{4}[A-Z0-9]{16}$'),
			'GT' => array(24, '^[A-Z0-9]{4}[A-Z0-9]{20}$'),
			'HR' => array(17, '^[0-9]{7}[0-9]{10}$'),
			'HU' => array(24, '^[0-9]{3}[0-9]{4}[0-9]{1}[0-9]{15}[0-9]{1}$'),
			'IE' => array(18, '^[A-Z]{4}[0-9]{6}[0-9]{8}$'),
			'IL' => array(19, '^[0-9]{3}[0-9]{3}[0-9]{13}$'),
			'IR' => array(22, '^[0-9]{22}$'),
			'IS' => array(22, '^[0-9]{4}[0-9]{2}[0-9]{6}[0-9]{10}$'),
			'IT' => array(23, '^[A-Z]{1}[0-9]{5}[0-9]{5}[A-Z0-9]{12}$'),
			'JO' => array(26, '^[A-Z]{4}[0-9]{4}[A-Z0-9]{18}$'),
			'KW' => array(26, '^[A-Z]{4}[A-Z0-9]{22}$'),
			'KZ' => array(16, '^[0-9]{3}[A-Z0-9]{13}$'),
			'LB' => array(24, '^[0-9]{4}[A-Z0-9]{20}$'),
			'LC' => array(28, '^[A-Z]{4}[A-Z0-9]{24}$'),
			'LI' => array(17, '^[0-9]{5}[A-Z0-9]{12}$'),
			'LT' => array(16, '^[0-9]{5}[0-9]{11}$'),
			'LU' => array(16, '^[0-9]{3}[A-Z0-9]{13}$'),
			'LV' => array(17, '^[A-Z]{4}[A-Z0-9]{13}$'),
			'MC' => array(23, '^[0-9]{5}[0-9]{5}[A-Z0-9]{11}[0-9]{2}$'),
			'MD' => array(20, '^[A-Z0-9]{2}[A-Z0-9]{18}$'),
			'ME' => array(18, '^[0-9]{3}[0-9]{13}[0-9]{2}$'),
			'MF' => array(23, '^[0-9]{5}[0-9]{5}[A-Z0-9]{11}[0-9]{2}$'),
			'MG' => array(23, '^[0-9]{23}$'),
			'MK' => array(15, '^[0-9]{3}[A-Z0-9]{10}[0-9]{2}$'),
			'ML' => array(24, '^[A-Z]{1}[0-9]{23}$'),
			'MQ' => array(23, '^[0-9]{5}[0-9]{5}[A-Z0-9]{11}[0-9]{2}$'),
			'MR' => array(23, '^[0-9]{5}[0-9]{5}[0-9]{11}[0-9]{2}$'),
			'MT' => array(27, '^[A-Z]{4}[0-9]{5}[A-Z0-9]{18}$'),
			'MU' => array(26, '^[A-Z]{4}[0-9]{2}[0-9]{2}[0-9]{12}[0-9]{3}[A-Z]{3}$'),
			'MZ' => array(21, '^[0-9]{21}$'),
			'NC' => array(23, '^[0-9]{5}[0-9]{5}[A-Z0-9]{11}[0-9]{2}$'),
			'NL' => array(14, '^[A-Z]{4}[0-9]{10}$'),
			'NO' => array(11, '^[0-9]{4}[0-9]{6}[0-9]{1}$'),
			'PF' => array(23, '^[0-9]{5}[0-9]{5}[A-Z0-9]{11}[0-9]{2}$'),
			'PK' => array(20, '^[A-Z]{4}[A-Z0-9]{16}$'),
			'PL' => array(24, '^[0-9]{8}[0-9]{16}$'),
			'PM' => array(23, '^[0-9]{5}[0-9]{5}[A-Z0-9]{11}[0-9]{2}$'),
			'PS' => array(25, '^[A-Z]{4}[A-Z0-9]{21}$'),
			'PT' => array(21, '^[0-9]{4}[0-9]{4}[0-9]{11}[0-9]{2}$'),
			'QA' => array(25, '^[A-Z]{4}[0-9]{4}[A-Z0-9]{17}$'),
			'RE' => array(23, '^[0-9]{5}[0-9]{5}[A-Z0-9]{11}[0-9]{2}$'),
			'RO' => array(20, '^[A-Z]{4}[A-Z0-9]{16}$'),
			'RS' => array(18, '^[0-9]{3}[0-9]{13}[0-9]{2}$'),
			'SA' => array(20, '^[0-9]{2}[A-Z0-9]{18}$'),
			'SC' => array(27, '^[A-Z]{4}[0-9]{4}[0-9]{16}[A-Z]{3}$'),
			'SE' => array(20, '^[0-9]{3}[0-9]{16}[0-9]{1}$'),
			'SI' => array(15, '^[0-9]{5}[0-9]{8}[0-9]{2}$'),
			'SK' => array(20, '^[0-9]{4}[0-9]{6}[0-9]{10}$'),
			'SM' => array(23, '^[A-Z]{1}[0-9]{5}[0-9]{5}[A-Z0-9]{12}$'),
			'SN' => array(24, '^[A-Z]{1}[0-9]{23}$'),
			'ST' => array(21, '^[0-9]{8}[0-9]{11}[0-9]{2}$'),
			'TF' => array(23, '^[0-9]{5}[0-9]{5}[A-Z0-9]{11}[0-9]{2}$'),
			'TL' => array(19, '^[0-9]{3}[0-9]{14}[0-9]{2}$'),
			'TN' => array(20, '^[0-9]{2}[0-9]{3}[0-9]{13}[0-9]{2}$'),
			'TR' => array(22, '^[0-9]{5}[0-9]{1}[A-Z0-9]{16}$'),
			'UA' => array(25, '^[0-9]{6}[A-Z0-9]{19}$'),
			'VG' => array(20, '^[A-Z]{4}[0-9]{16}$'),
			'WF' => array(23, '^[0-9]{5}[0-9]{5}[A-Z0-9]{11}[0-9]{2}$'),
			'XK' => array(16, '^[0-9]{4}[0-9]{10}[0-9]{2}$'),
			'YT' => array(23, '^[0-9]{5}[0-9]{5}[A-Z0-9]{11}[0-9]{2}$')
		);

		// CLEAN UP IBAN
		$iban = preg_replace('/[^a-z0-9]+/i', '', trim(strtoupper($value)));

		// CHECK Country Code
		$countryCode = substr($iban, $countryCodeOffset, $countryCodeLength);
		$isCountryCodeValid = !(isset($ibanFormatMap[$countryCode]) === false);

		$validLength = $countryCodeLength + $checksumLength + $ibanFormatMap[$countryCode][0];
		$isLengthValid = strlen($iban) === $validLength;

		$accountIdentification = substr($iban, $instituteIdentificationOffset);
		$isFormatValid = !(preg_match('/' . $ibanFormatMap[$countryCode][1] . '/', $accountIdentification) !== 1);

		$checksum = substr($iban, $checksumOffset, $checksumLength);
		$accountIdentification = substr($iban, $instituteIdentificationOffset);

		// GET NUMERIC COUNTRY CODE
		$numericRepresentation = '';
		$letterRepresentation = $countryCode;
		foreach (str_split($letterRepresentation) as $char)
		{
			$ord = ord($char);
			if ($ord >= 65 && $ord <= 90)
			{
				$numericRepresentation .= (string) ($ord - 55);
			}
			elseif ($ord >= 48 && $ord <= 57)
			{
				$numericRepresentation .= (string) ($ord - 48);
			}
		}
		$numericCountryCode = $numericRepresentation;

		$numericRepresentation = '';
		$letterRepresentation = $accountIdentification;
		foreach (str_split($letterRepresentation) as $char)
		{
			$ord = ord($char);
			if ($ord >= 65 && $ord <= 90)
			{
				$numericRepresentation .= (string) ($ord - 55);
			}
			elseif ($ord >= 48 && $ord <= 57)
			{
				$numericRepresentation .= (string) ($ord - 48);
			}
		}
		$numericAccountIdentification = $numericRepresentation;
		$invertedIban = $numericAccountIdentification . $numericCountryCode . $checksum;

		// CHECKSUM BCMOD
		$x = $invertedIban;
		$y = 97;
		if (!function_exists('bcmod'))
		{
			$take = 5;
			$mod = '';
			do {
				$a = (int)$mod . substr($x, 0, $take);
				$x = substr($x, $take);
				$mod = $a % $y;
			} while (strlen($x));
			$bcmod = (string)$mod;
		}
		else
		{
			$bcmod = bcmod($x, $y);
		}

		$isChecksumValid = $bcmod === '1';

		if (!$isCountryCodeValid || !$isLengthValid || !$isFormatValid || !$isChecksumValid)
		{
			return false;
		}
		else
		{
		    return true;
		}
	}', 'IBAN validation', 1, '2019-02-12 23:14:43', ''),
+(8, 'int', 'CS8qKg0KCSAqIE1ldGhvZCB0byB0ZXN0IHRoYXQgYW4gaW50ZWdlciB2YWx1ZSB3YXMgYWRkZWQuDQoJICoNCgkgKiBAcGFyYW0gICBcU2ltcGxlWE1MRWxlbWVudCAgJGVsZW1lbnQgIFRoZSBTaW1wbGVYTUxFbGVtZW50IG9iamVjdCByZXByZXNlbnRpbmcgdGhlIGA8ZmllbGQ+YCB0YWcgZm9yIHRoZSBmb3JtIGZpZWxkIG9iamVjdC4NCgkgKiBAcGFyYW0gICBtaXhlZCAgICAgICAgICAgICAgJHZhbHVlICAgIFRoZSBmb3JtIGZpZWxkIHZhbHVlIHRvIHZhbGlkYXRlLg0KCSAqIEBwYXJhbSAgIHN0cmluZyAgICAgICAgICAgICAkZ3JvdXAgICAgVGhlIGZpZWxkIG5hbWUgZ3JvdXAgY29udHJvbCB2YWx1ZS4gVGhpcyBhY3RzIGFzIGFuIGFycmF5IGNvbnRhaW5lciBmb3IgdGhlIGZpZWxkLg0KCSAqICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgRm9yIGV4YW1wbGUgaWYgdGhlIGZpZWxkIGhhcyBuYW1lPSJmb28iIGFuZCB0aGUgZ3JvdXAgdmFsdWUgaXMgc2V0IHRvICJiYXIiIHRoZW4gdGhlDQoJICogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBmdWxsIGZpZWxkIG5hbWUgd291bGQgZW5kIHVwIGJlaW5nICJiYXJbZm9vXSIuDQoJICogQHBhcmFtICAgUmVnaXN0cnkgICAgICAgICAgICRpbnB1dCAgICBBbiBvcHRpb25hbCBSZWdpc3RyeSBvYmplY3Qgd2l0aCB0aGUgZW50aXJlIGRhdGEgc2V0IHRvIHZhbGlkYXRlIGFnYWluc3QgdGhlIGVudGlyZSBmb3JtLg0KCSAqIEBwYXJhbSAgIEZvcm0gICAgICAgICAgICAgICAkZm9ybSAgICAgVGhlIGZvcm0gb2JqZWN0IGZvciB3aGljaCB0aGUgZmllbGQgaXMgYmVpbmcgdGVzdGVkLg0KCSAqDQoJICogQHJldHVybiAgYm9vbGVhbiAgVHJ1ZSBpZiB0aGUgdmFsdWUgaXMgdmFsaWQgaW50ZWdlciwgZmFsc2Ugb3RoZXJ3aXNlLg0KCSAqDQoJICovDQoJcHVibGljIGZ1bmN0aW9uIHRlc3QoXFNpbXBsZVhNTEVsZW1lbnQgJGVsZW1lbnQsICR2YWx1ZSwgJGdyb3VwID0gbnVsbCwgUmVnaXN0cnkgJGlucHV0ID0gbnVsbCwgRm9ybSAkZm9ybSA9IG51bGwpDQoJew0KCQkvLyBDaGVjayBpZiB0aGUgZmllbGQgaXMgcmVxdWlyZWQuDQoJCSRyZXF1aXJlZCA9ICgoc3RyaW5nKSAkZWxlbWVudFsncmVxdWlyZWQnXSA9PSAndHJ1ZScgfHwgKHN0cmluZykgJGVsZW1lbnRbJ3JlcXVpcmVkJ10gPT0gJ3JlcXVpcmVkJyk7DQoNCgkJLy8gSWYgdGhlIHZhbHVlIGlzIGVtcHR5IGFuZCB0aGUgZmllbGQgaXMgbm90IHJlcXVpcmVkIHJldHVybiBUcnVlLg0KCQlpZiAoKCR2YWx1ZSA9PT0gJycgfHwgJHZhbHVlID09PSBudWxsKSAmJiAhICRyZXF1aXJlZCkNCgkJew0KCQkJcmV0dXJuIHRydWU7DQoJCX0NCg0KCQkvLyBub3cgdmFsaWRhdGUgdGhlIHZhbHVlIHRvIGJlIGFuIGludGVnZXINCgkJLy8gd2UgbmVlZCB0byB2YWxpZGF0ZSBhIHN0cmluZyB3aXRoIHRoZSBpbnRlZ2VyIGluIGl0DQoJCS8vIHNpbmNlIHRoaXMgaXMgaG93IEpvb21sYSBwYXNzZXMgdGhlIHZhbHVlIHRvIHRoZSB0ZXN0IG1ldGhvZA0KCQkvLyBzbyB3ZSB1c2UgdHlwZSBjb2VyY2lvbiBhbG9uZyB3aXRoIGlzX251bWVyaWMNCgkJcmV0dXJuIGlzX251bWVyaWMoJHZhbHVlKSAmJiBpc19pbnQoKyR2YWx1ZSk7DQoJCS8vIGlmIHlvdSBoYXZlIGEgYmV0dGVyIGlkZWEuLi4gbGV0cyBoZWFyIGl0Lg0KCX0=', 'To validate and integer', 1, '2019-07-18 14:29:14', ''),
+(9, 'guid', 'CS8qKgoJICogTWV0aG9kIHRvIHRlc3QgZm9yIGEgR2xvYmFsbHkgVW5pcXVlIElkZW50aWZpZXIuCgkgKgoJICogQHBhcmFtICAgXFNpbXBsZVhNTEVsZW1lbnQgICRlbGVtZW50ICBUaGUgU2ltcGxlWE1MRWxlbWVudCBvYmplY3QgcmVwcmVzZW50aW5nIHRoZSBgPGZpZWxkPmAgdGFnIGZvciB0aGUgZm9ybSBmaWVsZCBvYmplY3QuCgkgKiBAcGFyYW0gICBtaXhlZCAgICAgICAgICAgICAgJHZhbHVlICAgIFRoZSBmb3JtIGZpZWxkIHZhbHVlIHRvIHZhbGlkYXRlLgoJICogQHBhcmFtICAgc3RyaW5nICAgICAgICAgICAgICRncm91cCAgICBUaGUgZmllbGQgbmFtZSBncm91cCBjb250cm9sIHZhbHVlLiBUaGlzIGFjdHMgYXMgYW4gYXJyYXkgY29udGFpbmVyIGZvciB0aGUgZmllbGQuCgkgKiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEZvciBleGFtcGxlIGlmIHRoZSBmaWVsZCBoYXMgbmFtZT0iZm9vIiBhbmQgdGhlIGdyb3VwIHZhbHVlIGlzIHNldCB0byAiYmFyIiB0aGVuIHRoZQoJICogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBmdWxsIGZpZWxkIG5hbWUgd291bGQgZW5kIHVwIGJlaW5nICJiYXJbZm9vXSIuCgkgKiBAcGFyYW0gICBSZWdpc3RyeSAgICAgICAgICAgJGlucHV0ICAgIEFuIG9wdGlvbmFsIFJlZ2lzdHJ5IG9iamVjdCB3aXRoIHRoZSBlbnRpcmUgZGF0YSBzZXQgdG8gdmFsaWRhdGUgYWdhaW5zdCB0aGUgZW50aXJlIGZvcm0uCgkgKiBAcGFyYW0gICBGb3JtICAgICAgICAgICAgICAgJGZvcm0gICAgIFRoZSBmb3JtIG9iamVjdCBmb3Igd2hpY2ggdGhlIGZpZWxkIGlzIGJlaW5nIHRlc3RlZC4KCSAqCgkgKiBAcmV0dXJuICBib29sZWFuICBUcnVlIGlmIHRoZSB2YWx1ZSBpcyB2YWxpZCwgZmFsc2Ugb3RoZXJ3aXNlLgoJICoKCSAqLwoJcHVibGljIGZ1bmN0aW9uIHRlc3QoXFNpbXBsZVhNTEVsZW1lbnQgJGVsZW1lbnQsICR2YWx1ZSwgJGdyb3VwID0gbnVsbCwgUmVnaXN0cnkgJGlucHV0ID0gbnVsbCwgRm9ybSAkZm9ybSA9IG51bGwpCgl7CgkJJHZhbHVlID0gdHJpbSgkdmFsdWUpOwoKCQkvLyBJZiB0aGUgZmllbGQgaXMgZW1wdHkgYW5kIG5vdCByZXF1aXJlZCwgdGhlIGZpZWxkIGlzIHZhbGlkLgoJCSRyZXF1aXJlZCA9ICgoc3RyaW5nKSAkZWxlbWVudFsncmVxdWlyZWQnXSA9PSAndHJ1ZScgfHwgKHN0cmluZykgJGVsZW1lbnRbJ3JlcXVpcmVkJ10gPT0gJ3JlcXVpcmVkJyk7CgoJCWlmICghJHJlcXVpcmVkICYmIGVtcHR5KCR2YWx1ZSkpCgkJewoJCQlyZXR1cm4gdHJ1ZTsKCQl9CgoJCS8vIHRoYW5rcyB0byBMZXdpZSBodHRwczovL3N0YWNrb3ZlcmZsb3cuY29tL2EvMTUxNTQ1Ni8xNDI5Njc3CgkJcmV0dXJuIHByZWdfbWF0Y2goIi9eKFx7KT9bYS1mXGRdezh9KC1bYS1mXGRdezR9KXs0fVthLWZcZF17OH0oPygxKVx9KSQvaSIsICR2YWx1ZSk7Cgl9Cg==', 'Globally Unique Identifier', 1, '2019-10-10 23:13:41', ''),
+(10, 'uniquetoken', 'CS8qKg0KCSAqIE1ldGhvZCB0byB0ZXN0IHRoZSBmaWVsZCB2YWx1ZSBmb3IgdW5pcXVlbmVzcy4NCgkgKg0KCSAqIEBwYXJhbSAgIFxTaW1wbGVYTUxFbGVtZW50ICAkZWxlbWVudCAgVGhlIFNpbXBsZVhNTEVsZW1lbnQgb2JqZWN0IHJlcHJlc2VudGluZyB0aGUgYDxmaWVsZD5gIHRhZyBmb3IgdGhlIGZvcm0gZmllbGQgb2JqZWN0Lg0KCSAqIEBwYXJhbSAgIG1peGVkICAgICAgICAgICAgICAkdmFsdWUgICAgVGhlIGZvcm0gZmllbGQgdmFsdWUgdG8gdmFsaWRhdGUuDQoJICogQHBhcmFtICAgc3RyaW5nICAgICAgICAgICAgICRncm91cCAgICBUaGUgZmllbGQgbmFtZSBncm91cCBjb250cm9sIHZhbHVlLiBUaGlzIGFjdHMgYXMgYW4gYXJyYXkgY29udGFpbmVyIGZvciB0aGUgZmllbGQuDQoJICogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBGb3IgZXhhbXBsZSBpZiB0aGUgZmllbGQgaGFzIG5hbWU9ImZvbyIgYW5kIHRoZSBncm91cCB2YWx1ZSBpcyBzZXQgdG8gImJhciIgdGhlbiB0aGUNCgkgKiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZ1bGwgZmllbGQgbmFtZSB3b3VsZCBlbmQgdXAgYmVpbmcgImJhcltmb29dIi4NCgkgKiBAcGFyYW0gICBSZWdpc3RyeSAgICAgICAgICAgJGlucHV0ICAgIEFuIG9wdGlvbmFsIFJlZ2lzdHJ5IG9iamVjdCB3aXRoIHRoZSBlbnRpcmUgZGF0YSBzZXQgdG8gdmFsaWRhdGUgYWdhaW5zdCB0aGUgZW50aXJlIGZvcm0uDQoJICogQHBhcmFtICAgRm9ybSAgICAgICAgICAgICAgICRmb3JtICAgICBUaGUgZm9ybSBvYmplY3QgZm9yIHdoaWNoIHRoZSBmaWVsZCBpcyBiZWluZyB0ZXN0ZWQuDQoJICoNCgkgKiBAcmV0dXJuICBib29sZWFuICBUcnVlIGlmIHRoZSB2YWx1ZSBpcyB2YWxpZCwgZmFsc2Ugb3RoZXJ3aXNlLg0KCSAqDQoJICogQHNpbmNlICAgMTEuMQ0KCSAqLw0KCXB1YmxpYyBmdW5jdGlvbiB0ZXN0KFxTaW1wbGVYTUxFbGVtZW50ICRlbGVtZW50LCAkdmFsdWUsICRncm91cCA9IG51bGwsIFJlZ2lzdHJ5ICRpbnB1dCA9IG51bGwsIEZvcm0gJGZvcm0gPSBudWxsKQ0KCXsNCgkJLy8gR2V0IHRoZSBkYXRhYmFzZSBvYmplY3QgYW5kIGEgbmV3IHF1ZXJ5IG9iamVjdC4NCgkJJGRiID0gRmFjdG9yeTo6Z2V0RGJvKCk7DQoJCSRxdWVyeSA9ICRkYi0+Z2V0UXVlcnkodHJ1ZSk7DQoNCgkJLy8gR2V0IHRoZSBleHRyYSBmaWVsZCBjaGVjayBhdHRyaWJ1dGUuDQoJCSRpZCA9ICgkaW5wdXQgaW5zdGFuY2VvZiBSZWdpc3RyeSkgPyAkaW5wdXQtPmdldCgnaWQnLCBudWxsKSA6IG51bGw7DQoNCgkJLy8gZ2V0IHRoZSBjb21wb25lbnQgJiB0YWJsZSBuYW1lDQoJCSR0YWJsZSA9ICgkZm9ybSBpbnN0YW5jZW9mIEZvcm0pID8gJGZvcm0tPmdldE5hbWUoKSA6ICcnOw0KDQoJCS8vIGdldCB0aGUgY29sdW1uIG5hbWUNCgkJJG5hbWUgPSAoYXJyYXkpICRlbGVtZW50LT5hdHRyaWJ1dGVzKCktPnsnbmFtZSd9Ow0KCQkkY29sdW1uID0gKHN0cmluZykgdHJpbSgkbmFtZVswXSk7DQoJCQ0KCQkvLyBjaGVjayB0aGF0IHdlIGhhdmUgYSB2YWx1ZQ0KCQlpZiAoc3RybGVuKCR2YWx1ZSkgJiYgc3RybGVuKCR0YWJsZSkgPiAzICYmIHN0cnBvcygkdGFibGUsICdbW1tjb21wb25lbnRdXV0uJykgIT09IGZhbHNlKQ0KCQl7DQoJCQkvLyBub3cgZ2V0IHRoZSB0YWJsZSBuYW1lDQoJCQkkdGFibGVBcnJheSA9IGV4cGxvZGUoJy4nLCAkdGFibGUpOw0KCQkJLy8gZG8gd2UgaGF2ZSB0d28gdmFsdWVzDQoJCQlpZiAoY291bnQoIChhcnJheSkgJHRhYmxlQXJyYXkpID09IDIpDQoJCQl7DQoJCQkJLy8gQnVpbGQgdGhlIHF1ZXJ5Lg0KCQkJCSRxdWVyeS0+c2VsZWN0KCdDT1VOVCgqKScpDQoJCQkJCS0+ZnJvbSgnI19fW1tbY29tcG9uZW50XV1dXycgLiAoc3RyaW5nKSAkdGFibGVBcnJheVsxXSkNCgkJCQkJLT53aGVyZSgkZGItPnF1b3RlTmFtZSgkY29sdW1uKSAuICcgPSAnIC4gJGRiLT5xdW90ZSgkdmFsdWUpKTsNCg0KCQkJCS8vIHJlbW92ZSB0aGlzIGl0ZW0gZnJvbSB0aGUgbGlzdA0KCQkJCWlmICgkaWQgPiAwKQ0KCQkJCXsNCgkJCQkJJHF1ZXJ5LT53aGVyZSgkZGItPnF1b3RlTmFtZSgnaWQnKSAuICcgPD4gJyAuIChpbnQpICRpZCk7DQoJCQkJfQ0KDQoJCQkJLy8gU2V0IGFuZCBxdWVyeSB0aGUgZGF0YWJhc2UuDQoJCQkJJGRiLT5zZXRRdWVyeSgkcXVlcnkpOw0KCQkJCSRkdXBsaWNhdGUgPSAoYm9vbCkgJGRiLT5sb2FkUmVzdWx0KCk7DQoNCgkJCQlpZiAoJGR1cGxpY2F0ZSkNCgkJCQl7DQoJCQkJCXJldHVybiBmYWxzZTsNCgkJCQl9DQoJCQl9DQoJCX0NCgkJcmV0dXJuIHRydWU7DQoJfQ==', 'unique token value', 1, '2020-05-02 13:31:14', ''),
+(11, 'onlypastdate', 'CS8qKg0KCSAqIE1ldGhvZCB0byB0ZXN0IHRoZSBjYWxlbmRhciB2YWx1ZSBmb3IgYSB2YWxpZCBwYXJ0cy4NCgkgKg0KCSAqIEBwYXJhbSAgIFxTaW1wbGVYTUxFbGVtZW50ICAkZWxlbWVudCAgVGhlIFNpbXBsZVhNTEVsZW1lbnQgb2JqZWN0IHJlcHJlc2VudGluZyB0aGUgYDxmaWVsZD5gIHRhZyBmb3IgdGhlIGZvcm0gZmllbGQgb2JqZWN0Lg0KCSAqIEBwYXJhbSAgIG1peGVkICAgICAgICAgICAgICAkdmFsdWUgICAgVGhlIGZvcm0gZmllbGQgdmFsdWUgdG8gdmFsaWRhdGUuDQoJICogQHBhcmFtICAgc3RyaW5nICAgICAgICAgICAgICRncm91cCAgICBUaGUgZmllbGQgbmFtZSBncm91cCBjb250cm9sIHZhbHVlLiBUaGlzIGFjdHMgYXMgYW4gYXJyYXkgY29udGFpbmVyIGZvciB0aGUgZmllbGQuDQoJICogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBGb3IgZXhhbXBsZSBpZiB0aGUgZmllbGQgaGFzIG5hbWU9ImZvbyIgYW5kIHRoZSBncm91cCB2YWx1ZSBpcyBzZXQgdG8gImJhciIgdGhlbiB0aGUNCgkgKiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZ1bGwgZmllbGQgbmFtZSB3b3VsZCBlbmQgdXAgYmVpbmcgImJhcltmb29dIi4NCgkgKiBAcGFyYW0gICBSZWdpc3RyeSAgICAgICAgICAgJGlucHV0ICAgIEFuIG9wdGlvbmFsIFJlZ2lzdHJ5IG9iamVjdCB3aXRoIHRoZSBlbnRpcmUgZGF0YSBzZXQgdG8gdmFsaWRhdGUgYWdhaW5zdCB0aGUgZW50aXJlIGZvcm0uDQoJICogQHBhcmFtICAgRm9ybSAgICAgICAgICAgICAgICRmb3JtICAgICBUaGUgZm9ybSBvYmplY3QgZm9yIHdoaWNoIHRoZSBmaWVsZCBpcyBiZWluZyB0ZXN0ZWQuDQoJICoNCgkgKiBAcmV0dXJuICBib29sZWFuICBUcnVlIGlmIHRoZSB2YWx1ZSBpcyB2YWxpZCwgZmFsc2Ugb3RoZXJ3aXNlLg0KCSAqDQoJICogQHNpbmNlICAgMy43LjANCgkgKi8NCglwdWJsaWMgZnVuY3Rpb24gdGVzdChcU2ltcGxlWE1MRWxlbWVudCAkZWxlbWVudCwgJHZhbHVlLCAkZ3JvdXAgPSBudWxsLCBSZWdpc3RyeSAkaW5wdXQgPSBudWxsLCBGb3JtICRmb3JtID0gbnVsbCkNCgl7DQoJCS8vIElmIHRoZSBmaWVsZCBpcyBlbXB0eSBhbmQgbm90IHJlcXVpcmVkLCB0aGUgZmllbGQgaXMgdmFsaWQuDQoJCSRyZXF1aXJlZCA9ICgoc3RyaW5nKSAkZWxlbWVudFsncmVxdWlyZWQnXSA9PSAndHJ1ZScgfHwgKHN0cmluZykgJGVsZW1lbnRbJ3JlcXVpcmVkJ10gPT0gJ3JlcXVpcmVkJyk7DQoNCgkJaWYgKCEkcmVxdWlyZWQgJiYgZW1wdHkoJHZhbHVlKSkNCgkJew0KCQkJcmV0dXJuIHRydWU7DQoJCX0NCg0KCQl0cnkNCgkJew0KCQkJLy8gbWFrZSBzdXJlIHdlIGFyZSBpbiBBdXN0cmFsaWENCgkJCWRhdGVfZGVmYXVsdF90aW1lem9uZV9zZXQoJ0F1c3RyYWxpYS9TeWRuZXknKTsNCgkJCWlmIChzdHJwb3MoJHZhbHVlLCAnLycpICE9PSBmYWxzZSkNCgkJCXsNCgkJCQkkdmFsdWUgPSBpbXBsb2RlKCctJywgZXhwbG9kZSgnLycsICR2YWx1ZSkpOw0KCQkJfQ0KCQkJJHZhbHVlID0gc3RydG90aW1lKCR2YWx1ZSk7DQoJCQkvLyB3ZSBjaGVjayB0aGF0IHRoaXMgZGF0ZSBpcyBub3QgaW4gdGhlIGZ1dHVyZQ0KCQkJaWYgKCR2YWx1ZSA8PSB0aW1lKCkpDQoJCQl7DQoJCQkJcmV0dXJuIHRydWU7DQoJCQl9DQoJCX0NCgkJY2F0Y2ggKFxFeGNlcHRpb24gJGUpDQoJCXsNCgkJCXJldHVybiBmYWxzZTsNCgkJfQ0KCQlyZXR1cm4gZmFsc2U7DQoJfQ==', 'Only allow dates in the past', 1, '2020-06-27 15:36:56', '');
--
-- Dumping data for table `#__componentbuilder_field`
@@ -2891,6 +2941,22 @@ INSERT INTO `#__componentbuilder_language` (`id`, `langtag`, `name`, `params`, `
(77, 'lt-LT', 'Lithuanian', '', 2, '2018-09-14 10:39:11', '2023-12-26 07:40:20', 4, '', 2),
(78, 'kk-KZ', 'Kazakh', '', 2, '2020-03-19 13:41:00', '2023-12-26 07:40:20', 3, '', 3);
+--
+-- Dumping data for table `#__componentbuilder_repository`
+--
+
+INSERT INTO `#__componentbuilder_repository` (`id`, `system_name`, `organisation`, `repository`, `target`, `type`, `base`, `guid`, `read_branch`, `access`, `ordering`, `published`, `modified`, `created`, `params`) VALUES
+(1, 'Super Powers', 'joomla', 'super-powers', 1, 1, 'https://git.vdm.dev', '1a1b6f3d-f16c-431a-b270-7a8a80cc7f56', 'master', 1, 1, 1, '2024-06-10 11:13:46', '2024-06-10 10:59:35', ''),
+(2, 'JCB Compiler', 'joomla', 'jcb-compiler', 1, 1, 'https://git.vdm.dev', 'd12c7672-7b75-4a59-a5f3-c33f1a2f929b', 'master', 1, 2, 1, '2024-06-15 17:43:09', '2024-06-10 11:01:06', ''),
+(3, 'JCB Packager', 'joomla', 'jcb-packager', 1, 1, 'https://git.vdm.dev', 'd8155014-5734-4fb5-9ccb-6bb33367ef78', 'master', 1, 3, 1, '2024-06-15 17:43:09', '2024-06-10 11:01:35', ''),
+(4, 'PHP Seclib', 'joomla', 'phpseclib', 1, 1, 'https://git.vdm.dev', 'e63d916c-81c1-4a56-a73f-584174b36c87', 'master', 1, 4, 1, '2024-06-15 17:43:09', '2024-06-10 11:02:03', ''),
+(5, 'JCB Search', 'joomla', 'search', 1, 1, 'https://git.vdm.dev', '6e57dc23-a17d-4937-bdbf-639ae1b8409f', 'master', 1, 5, 1, '2024-06-15 17:43:09', '2024-06-10 11:02:43', ''),
+(6, 'Gitea', 'joomla', 'gitea', 1, 1, 'https://git.vdm.dev', 'a0cbfb8a-b427-48eb-b493-a02b34854019', 'master', 1, 6, 1, '2024-06-15 17:43:09', '2024-06-10 11:03:09', ''),
+(7, 'Openai', 'joomla', 'openai', 1, 1, 'https://git.vdm.dev', 'c736a46f-0880-428a-8837-02627fdbd38d', 'master', 1, 7, 1, '2024-06-15 17:43:09', '2024-06-10 11:03:19', ''),
+(8, 'Minify', 'joomla', 'minify', 1, 1, 'https://git.vdm.dev', '6c741f48-a192-4e17-a932-df552164cffb', 'master', 1, 8, 1, '2024-06-15 17:43:09', '2024-06-10 11:03:30', ''),
+(9, 'psr', 'joomla', 'psr', 1, 1, 'https://git.vdm.dev', 'bfaa857a-df24-4d8c-97c3-1da4167a2bc8', 'master', 1, 9, 1, '2024-06-15 17:43:09', '2024-06-10 11:03:41', ''),
+(10, 'fof', 'joomla', 'fof', 1, 1, 'https://git.vdm.dev', 'dd591247-1215-4faf-8a00-1f294768ba13', 'master', 1, 10, 1, '2024-06-15 17:43:09', '2024-06-10 11:03:47', '');
+
--
-- Dumping data for table `#__componentbuilder_help_document`
--
diff --git a/admin/sql/uninstall.mysql.utf8.sql b/admin/sql/uninstall.mysql.utf8.sql
index df379941b..5daf8f0e3 100644
--- a/admin/sql/uninstall.mysql.utf8.sql
+++ b/admin/sql/uninstall.mysql.utf8.sql
@@ -21,6 +21,7 @@ DROP TABLE IF EXISTS `#__componentbuilder_fieldtype`;
DROP TABLE IF EXISTS `#__componentbuilder_language_translation`;
DROP TABLE IF EXISTS `#__componentbuilder_language`;
DROP TABLE IF EXISTS `#__componentbuilder_server`;
+DROP TABLE IF EXISTS `#__componentbuilder_repository`;
DROP TABLE IF EXISTS `#__componentbuilder_help_document`;
DROP TABLE IF EXISTS `#__componentbuilder_admin_fields`;
DROP TABLE IF EXISTS `#__componentbuilder_admin_fields_conditions`;
diff --git a/admin/tables/repository.php b/admin/tables/repository.php
new file mode 100644
index 000000000..ef2d91a18
--- /dev/null
+++ b/admin/tables/repository.php
@@ -0,0 +1,336 @@
+
+ * @git Joomla Component Builder
+ * @copyright Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Table\Table;
+use Joomla\CMS\Access\Access as AccessRules;
+use Joomla\CMS\Access\Rules;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
+use Joomla\Utilities\ArrayHelper;
+use Joomla\CMS\String\PunycodeHelper;
+use Joomla\CMS\Table\Observer\Tags as TableObserverTags;
+use Joomla\CMS\Table\Observer\ContentHistory as TableObserverContenthistory;
+use Joomla\CMS\Application\ApplicationHelper;
+
+/**
+ * Repositories Table class
+ */
+class ComponentbuilderTableRepository extends Table
+{
+ /**
+ * Ensure the params and metadata in json encoded in the bind method
+ *
+ * @var array
+ * @since 3.3
+ */
+ protected $_jsonEncode = array('params', 'metadata');
+
+ /**
+ * Constructor
+ *
+ * @param object Database connector object
+ */
+ function __construct(&$db)
+ {
+ parent::__construct('#__componentbuilder_repository', 'id', $db);
+
+ // Adding History Options
+ TableObserverContenthistory::createObserver($this, array('typeAlias' => 'com_componentbuilder.repository'));
+ }
+
+ public function bind($array, $ignore = '')
+ {
+
+ if (isset($array['params']) && is_array($array['params']))
+ {
+ $registry = new Registry;
+ $registry->loadArray($array['params']);
+ $array['params'] = (string) $registry;
+ }
+
+ if (isset($array['metadata']) && is_array($array['metadata']))
+ {
+ $registry = new Registry;
+ $registry->loadArray($array['metadata']);
+ $array['metadata'] = (string) $registry;
+ }
+
+ // Bind the rules.
+ if (isset($array['rules']) && is_array($array['rules']))
+ {
+ $rules = new AccessRules($array['rules']);
+ $this->setRules($rules);
+ }
+ return parent::bind($array, $ignore);
+ }
+
+ /**
+ * Overload the store method for the Repository table.
+ *
+ * @param boolean Toggle whether null values should be updated.
+ * @return boolean True on success, false on failure.
+ * @since 1.6
+ */
+ public function store($updateNulls = false)
+ {
+ $date = Factory::getDate();
+ $user = Factory::getUser();
+
+ if ($this->id)
+ {
+ // Existing item
+ $this->modified = $date->toSql();
+ $this->modified_by = $user->get('id');
+ }
+ else
+ {
+ // New repository. A repository created and created_by field can be set by the user,
+ // so we don't touch either of these if they are set.
+ if (!(int) $this->created)
+ {
+ $this->created = $date->toSql();
+ }
+ if (empty($this->created_by))
+ {
+ $this->created_by = $user->get('id');
+ }
+ }
+
+ if (isset($this->alias))
+ {
+ // Verify that the alias is unique
+ $table = Table::getInstance('repository', 'ComponentbuilderTable');
+
+ if ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0))
+ {
+ $this->setError(Text::_('COM_COMPONENTBUILDER_REPOSITORY_ERROR_UNIQUE_ALIAS'));
+
+ if ($table->published === -2)
+ {
+ $this->setError(Text::_('COM_COMPONENTBUILDER_REPOSITORY_ERROR_UNIQUE_ALIAS_TRASHED'));
+ }
+ return false;
+ }
+ }
+
+ if (isset($this->url))
+ {
+ // Convert IDN urls to punycode
+ $this->url = PunycodeHelper::urlToPunycode($this->url);
+ }
+ if (isset($this->website))
+ {
+ // Convert IDN urls to punycode
+ $this->website = PunycodeHelper::urlToPunycode($this->website);
+ }
+
+ return parent::store($updateNulls);
+ }
+
+ /**
+ * Overloaded check method to ensure data integrity.
+ *
+ * @return boolean True on success.
+ */
+ public function check()
+ {
+ if (isset($this->alias))
+ {
+ // Generate a valid alias
+ $this->generateAlias();
+
+ $table = Table::getInstance('repository', 'componentbuilderTable');
+
+ while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0))
+ {
+ $this->alias = StringHelper::increment($this->alias, 'dash');
+ }
+ }
+
+ /*
+ * Clean up keywords -- eliminate extra spaces between phrases
+ * and cr (\r) and lf (\n) characters from string.
+ * Only process if not empty.
+ */
+ if (!empty($this->metakey))
+ {
+ // Array of characters to remove.
+ $bad_characters = array("\n", "\r", "\"", "<", ">");
+
+ // Remove bad characters.
+ $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey);
+
+ // Create array using commas as delimiter.
+ $keys = explode(',', $after_clean);
+ $clean_keys = [];
+
+ foreach ($keys as $key)
+ {
+ // Ignore blank keywords.
+ if (trim($key))
+ {
+ $clean_keys[] = trim($key);
+ }
+ }
+
+ // Put array back together delimited by ", "
+ $this->metakey = implode(", ", $clean_keys);
+ }
+
+ // Clean up description -- eliminate quotes and <> brackets
+ if (!empty($this->metadesc))
+ {
+ // Only process if not empty
+ $bad_characters = array("\"", "<", ">");
+ $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc);
+ }
+
+ // If we don't have any access rules set at this point just use an empty AccessRules class
+ if (!$this->getRules())
+ {
+ $rules = $this->getDefaultAssetValues('com_componentbuilder.repository.'.$this->id);
+ $this->setRules($rules);
+ }
+
+ // Set ordering
+ if ($this->published < 0)
+ {
+ // Set ordering to 0 if state is archived or trashed
+ $this->ordering = 0;
+ }
+
+ return true;
+ }
+
+ /**
+ * Gets the default asset values for a component.
+ *
+ * @param $string $component The component asset name to search for
+ *
+ * @return AccessRules The AccessRules object for the asset
+ */
+ protected function getDefaultAssetValues($component, $try = true)
+ {
+ // Need to find the asset id by the name of the component.
+ $db = Factory::getDbo();
+ $query = $db->getQuery(true)
+ ->select($db->quoteName('id'))
+ ->from($db->quoteName('#__assets'))
+ ->where($db->quoteName('name') . ' = ' . $db->quote($component));
+ $db->setQuery($query);
+ $db->execute();
+ if ($db->loadRowList())
+ {
+ // asset already set so use saved rules
+ $assetId = (int) $db->loadResult();
+ return AccessRules::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed.
+ }
+ // try again
+ elseif ($try)
+ {
+ $try = explode('.',$component);
+ $result = $this->getDefaultAssetValues($try[0], false);
+ if ($result instanceof AccessRules)
+ {
+ if (isset($try[1]))
+ {
+ $_result = (string) $result;
+ $_result = json_decode($_result);
+ foreach ($_result as $name => &$rule)
+ {
+ $v = explode('.', $name);
+ if ($try[1] !== $v[0])
+ {
+ // remove since it is not part of this view
+ unset($_result->$name);
+ }
+ else
+ {
+ // clear the value since we inherit
+ $rule = [];
+ }
+ }
+ // check if there are any view values remaining
+ if (count( (array) $_result))
+ {
+ $_result = json_encode($_result);
+ $_result = array($_result);
+ // Instantiate and return the AccessRules object for the asset rules.
+ $rules = new AccessRules;
+ $rules->mergeCollection($_result);
+
+ return $rules;
+ }
+ }
+ return $result;
+ }
+ }
+ return AccessRules::getAssetRules(0);
+ }
+
+ /**
+ * Method to compute the default name of the asset.
+ * The default name is in the form 'table_name.id'
+ * where id is the value of the primary key of the table.
+ *
+ * @return string
+ * @since 2.5
+ */
+ protected function _getAssetName()
+ {
+ $k = $this->_tbl_key;
+ return 'com_componentbuilder.repository.'.(int) $this->$k;
+ }
+
+ /**
+ * Method to return the title to use for the asset table.
+ *
+ * @return string
+ * @since 2.5
+ */
+ protected function _getAssetTitle()
+ {
+ if (isset($this->title))
+ {
+ return $this->title;
+ }
+ return '';
+ }
+
+ /**
+ * Get the parent asset id for the record
+ *
+ * @return int
+ * @since 2.5
+ */
+ protected function _getAssetParentId(?Table $table = null, $id = null)
+ {
+ $asset = Table::getInstance('Asset');
+ $asset->loadByName('com_componentbuilder');
+
+ return $asset->id;
+ }
+
+ /**
+ * This view does not actually have an alias
+ *
+ * @return bool
+ */
+ public function generateAlias()
+ {
+ return false;
+ }
+
+}
diff --git a/admin/views/admin_view/tmpl/edit.php b/admin/views/admin_view/tmpl/edit.php
index a683af364..c22a06e30 100644
--- a/admin/views/admin_view/tmpl/edit.php
+++ b/admin/views/admin_view/tmpl/edit.php
@@ -206,408 +206,442 @@ $componentParams = $this->params; // will be removed just use $this->params inst
+
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Power/Database/index.html b/admin/views/repository/tmpl/index.html
similarity index 100%
rename from libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Power/Database/index.html
rename to admin/views/repository/tmpl/index.html
diff --git a/admin/views/repository/view.html.php b/admin/views/repository/view.html.php
new file mode 100644
index 000000000..16a48a5dc
--- /dev/null
+++ b/admin/views/repository/view.html.php
@@ -0,0 +1,215 @@
+
+ * @git Joomla Component Builder
+ * @copyright Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Form\FormHelper;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\Uri\Uri;
+use Joomla\CMS\Toolbar\Toolbar;
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\FileLayout;
+use Joomla\CMS\MVC\View\HtmlView;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\Toolbar\ToolbarHelper;
+use VDM\Joomla\Utilities\StringHelper;
+
+/**
+ * Repository Html View class
+ */
+class ComponentbuilderViewRepository extends HtmlView
+{
+ /**
+ * display method of View
+ * @return void
+ */
+ public function display($tpl = null)
+ {
+ // set params
+ $this->params = ComponentHelper::getParams('com_componentbuilder');
+ // Assign the variables
+ $this->form = $this->get('Form');
+ $this->item = $this->get('Item');
+ $this->script = $this->get('Script');
+ $this->state = $this->get('State');
+ // get action permissions
+ $this->canDo = ComponentbuilderHelper::getActions('repository', $this->item);
+ // get input
+ $jinput = Factory::getApplication()->input;
+ $this->ref = $jinput->get('ref', 0, 'word');
+ $this->refid = $jinput->get('refid', 0, 'int');
+ $return = $jinput->get('return', null, 'base64');
+ // set the referral string
+ $this->referral = '';
+ if ($this->refid && $this->ref)
+ {
+ // return to the item that referred to this item
+ $this->referral = '&ref=' . (string)$this->ref . '&refid=' . (int)$this->refid;
+ }
+ elseif($this->ref)
+ {
+ // return to the list view that referred to this item
+ $this->referral = '&ref=' . (string)$this->ref;
+ }
+ // check return value
+ if (!is_null($return))
+ {
+ // add the return value
+ $this->referral .= '&return=' . (string)$return;
+ }
+
+ // Set the toolbar
+ $this->addToolBar();
+
+ // Check for errors.
+ if (count($errors = $this->get('Errors')))
+ {
+ throw new Exception(implode("\n", $errors), 500);
+ }
+
+ // Display the template
+ parent::display($tpl);
+
+ // Set the document
+ $this->setDocument();
+ }
+
+
+ /**
+ * Setting the toolbar
+ */
+ protected function addToolBar()
+ {
+ Factory::getApplication()->input->set('hidemainmenu', true);
+ $user = Factory::getUser();
+ $userId = $user->id;
+ $isNew = $this->item->id == 0;
+
+ ToolbarHelper::title( Text::_($isNew ? 'COM_COMPONENTBUILDER_REPOSITORY_NEW' : 'COM_COMPONENTBUILDER_REPOSITORY_EDIT'), 'pencil-2 article-add');
+ // Built the actions for new and existing records.
+ if (StringHelper::check($this->referral))
+ {
+ if ($this->canDo->get('repository.create') && $isNew)
+ {
+ // We can create the record.
+ ToolbarHelper::save('repository.save', 'JTOOLBAR_SAVE');
+ }
+ elseif ($this->canDo->get('repository.edit'))
+ {
+ // We can save the record.
+ ToolbarHelper::save('repository.save', 'JTOOLBAR_SAVE');
+ }
+ if ($isNew)
+ {
+ // Do not creat but cancel.
+ ToolbarHelper::cancel('repository.cancel', 'JTOOLBAR_CANCEL');
+ }
+ else
+ {
+ // We can close it.
+ ToolbarHelper::cancel('repository.cancel', 'JTOOLBAR_CLOSE');
+ }
+ }
+ else
+ {
+ if ($isNew)
+ {
+ // For new records, check the create permission.
+ if ($this->canDo->get('repository.create'))
+ {
+ ToolbarHelper::apply('repository.apply', 'JTOOLBAR_APPLY');
+ ToolbarHelper::save('repository.save', 'JTOOLBAR_SAVE');
+ ToolbarHelper::custom('repository.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+ };
+ ToolbarHelper::cancel('repository.cancel', 'JTOOLBAR_CANCEL');
+ }
+ else
+ {
+ if ($this->canDo->get('repository.edit'))
+ {
+ // We can save the new record
+ ToolbarHelper::apply('repository.apply', 'JTOOLBAR_APPLY');
+ ToolbarHelper::save('repository.save', 'JTOOLBAR_SAVE');
+ // We can save this record, but check the create permission to see
+ // if we can return to make a new one.
+ if ($this->canDo->get('repository.create'))
+ {
+ ToolbarHelper::custom('repository.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+ }
+ }
+ $canVersion = ($this->canDo->get('core.version') && $this->canDo->get('repository.version'));
+ if ($this->state->params->get('save_history', 1) && $this->canDo->get('repository.edit') && $canVersion)
+ {
+ ToolbarHelper::versions('com_componentbuilder.repository', $this->item->id);
+ }
+ if ($this->canDo->get('repository.create'))
+ {
+ ToolbarHelper::custom('repository.save2copy', 'save-copy.png', 'save-copy_f2.png', 'JTOOLBAR_SAVE_AS_COPY', false);
+ }
+ ToolbarHelper::cancel('repository.cancel', 'JTOOLBAR_CLOSE');
+ }
+ }
+ ToolbarHelper::divider();
+ // set help url for this view if found
+ $this->help_url = ComponentbuilderHelper::getHelpUrl('repository');
+ if (StringHelper::check($this->help_url))
+ {
+ ToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url);
+ }
+ }
+
+ /**
+ * Escapes a value for output in a view script.
+ *
+ * @param mixed $var The output to escape.
+ *
+ * @return mixed The escaped value.
+ */
+ public function escape($var)
+ {
+ if(strlen($var) > 30)
+ {
+ // use the helper htmlEscape method instead and shorten the string
+ return StringHelper::html($var, $this->_charset, true, 30);
+ }
+ // use the helper htmlEscape method instead.
+ return StringHelper::html($var, $this->_charset);
+ }
+
+ /**
+ * Method to set up the document properties
+ *
+ * @return void
+ */
+ protected function setDocument()
+ {
+ $isNew = ($this->item->id < 1);
+ $this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_REPOSITORY_NEW' : 'COM_COMPONENTBUILDER_REPOSITORY_EDIT'));
+ Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/repository.css", ['version' => 'auto']);
+ Html::_('script', $this->script, ['version' => 'auto']);
+ Html::_('script', "administrator/components/com_componentbuilder/views/repository/submitbutton.js", ['version' => 'auto']);
+ Text::script('view not acceptable. Error');
+ }
+
+ /**
+ * Get the Document (helper method toward Joomla 4 and 5)
+ */
+ public function getDocument()
+ {
+ $this->document ??= JFactory::getDocument();
+
+ return $this->document;
+ }
+}
diff --git a/admin/views/server/tmpl/edit.php b/admin/views/server/tmpl/edit.php
index b35565308..9db781dfb 100644
--- a/admin/views/server/tmpl/edit.php
+++ b/admin/views/server/tmpl/edit.php
@@ -111,33 +111,67 @@ $componentParams = $this->params; // will be removed just use $this->params inst
diff --git a/admin/views/site_view/tmpl/edit.php b/admin/views/site_view/tmpl/edit.php
index 66f78dd6c..96fd299f7 100644
--- a/admin/views/site_view/tmpl/edit.php
+++ b/admin/views/site_view/tmpl/edit.php
@@ -165,168 +165,168 @@ $componentParams = $this->params; // will be removed just use $this->params inst