diff --git a/componentbuilderfieldorderingcompiler.xml b/componentbuilderfieldorderingcompiler.xml
index 32f066f..50fbe4a 100644
--- a/componentbuilderfieldorderingcompiler.xml
+++ b/componentbuilderfieldorderingcompiler.xml
@@ -1,13 +1,14 @@
PLG_EXTENSION_COMPONENTBUILDERFIELDORDERINGCOMPILER
- 27th July, 2024
+ 14th August, 2024
Llewellyn van der Merwe
joomla@vdm.io
https://dev.vdm.io
Copyright (C) 2015 Vast Development Method. All rights reserved.
GNU General Public License version 2 or later; see LICENSE.txt
- 2.0.0
+ 3.0.0
+ VDM\Plugin\Extension\ComponentbuilderFieldOrderingCompiler
PLG_EXTENSION_COMPONENTBUILDERFIELDORDERINGCOMPILER_XML_DESCRIPTION
@@ -15,14 +16,17 @@
- en-GB/en-GB.plg_extension_componentbuilderfieldorderingcompiler.ini
- en-GB/en-GB.plg_extension_componentbuilderfieldorderingcompiler.sys.ini
+ en-GB/plg_extension_componentbuilderfieldorderingcompiler.ini
+ en-GB/plg_extension_componentbuilderfieldorderingcompiler.sys.ini
+ af-ZA/plg_extension_componentbuilderfieldorderingcompiler.ini
+ af-ZA/plg_extension_componentbuilderfieldorderingcompiler.sys.ini
- componentbuilderfieldorderingcompiler.php
+ services
index.html
- language
+ services
+ src
\ No newline at end of file
diff --git a/language/af-ZA/plg_extension_componentbuilderfieldorderingcompiler.ini b/language/af-ZA/plg_extension_componentbuilderfieldorderingcompiler.ini
new file mode 100644
index 0000000..a293786
--- /dev/null
+++ b/language/af-ZA/plg_extension_componentbuilderfieldorderingcompiler.ini
@@ -0,0 +1,6 @@
+PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS_YES="Ja"
+PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS_NO="Nee"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_YES="Ja"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_NO="Nee"
+PLG_EXTENSION_COMPONENTBUILDEREXPORTCOMPILER_NO="Nee"
+PLG_EXTENSION_COMPONENTBUILDEREXPORTCOMPILER_YES="Ja"
\ No newline at end of file
diff --git a/language/af-ZA/plg_extension_componentbuilderfieldorderingcompiler.sys.ini b/language/af-ZA/plg_extension_componentbuilderfieldorderingcompiler.sys.ini
new file mode 100644
index 0000000..a293786
--- /dev/null
+++ b/language/af-ZA/plg_extension_componentbuilderfieldorderingcompiler.sys.ini
@@ -0,0 +1,6 @@
+PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS_YES="Ja"
+PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS_NO="Nee"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_YES="Ja"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_NO="Nee"
+PLG_EXTENSION_COMPONENTBUILDEREXPORTCOMPILER_NO="Nee"
+PLG_EXTENSION_COMPONENTBUILDEREXPORTCOMPILER_YES="Ja"
\ No newline at end of file
diff --git a/language/en-GB/en-GB.plg_extension_componentbuilderfieldorderingcompiler.ini b/language/en-GB/plg_extension_componentbuilderfieldorderingcompiler.ini
similarity index 94%
rename from language/en-GB/en-GB.plg_extension_componentbuilderfieldorderingcompiler.ini
rename to language/en-GB/plg_extension_componentbuilderfieldorderingcompiler.ini
index 75fc8be..9201823 100644
--- a/language/en-GB/en-GB.plg_extension_componentbuilderfieldorderingcompiler.ini
+++ b/language/en-GB/plg_extension_componentbuilderfieldorderingcompiler.ini
@@ -1,3 +1,3 @@
PLG_EXTENSION_COMPONENTBUILDERFIELDORDERINGCOMPILER="Extension - Componentbuilder Field Ordering Compiler"
PLG_EXTENSION_COMPONENTBUILDERFIELDORDERINGCOMPILER_DESCRIPTION="This plugin is used to set the ordring for your component views during compilation. To activate it you must first enable it here. Then open your JCB component global options, and under the Global tab, select this plugin in the Activate Compiler Plugins field.Also be sure to set your admin views where you would like to use Field Ordering."
-PLG_EXTENSION_COMPONENTBUILDERFIELDORDERINGCOMPILER_XML_DESCRIPTION="Extension - Componentbuilder Field Ordering Compiler (v.2.0.0)
This plugin is used to set the ordring for your component views during compilation. To activate it you must first enable it here. Then open your JCB component global options, and under the Global tab, select this plugin in the Activate Compiler Plugins field.Also be sure to set your admin views where you would like to use Field Ordering.
Created by Llewellyn van der Merwe
Development started 10th March, 2024
"
\ No newline at end of file
+PLG_EXTENSION_COMPONENTBUILDERFIELDORDERINGCOMPILER_XML_DESCRIPTION="Extension - Componentbuilder Field Ordering Compiler (v.3.0.0)
This plugin is used to set the ordring for your component views during compilation. To activate it you must first enable it here. Then open your JCB component global options, and under the Global tab, select this plugin in the Activate Compiler Plugins field.Also be sure to set your admin views where you would like to use Field Ordering.
Created by Llewellyn van der Merwe
Development started 10th March, 2024
"
\ No newline at end of file
diff --git a/language/en-GB/en-GB.plg_extension_componentbuilderfieldorderingcompiler.sys.ini b/language/en-GB/plg_extension_componentbuilderfieldorderingcompiler.sys.ini
similarity index 94%
rename from language/en-GB/en-GB.plg_extension_componentbuilderfieldorderingcompiler.sys.ini
rename to language/en-GB/plg_extension_componentbuilderfieldorderingcompiler.sys.ini
index 75fc8be..9201823 100644
--- a/language/en-GB/en-GB.plg_extension_componentbuilderfieldorderingcompiler.sys.ini
+++ b/language/en-GB/plg_extension_componentbuilderfieldorderingcompiler.sys.ini
@@ -1,3 +1,3 @@
PLG_EXTENSION_COMPONENTBUILDERFIELDORDERINGCOMPILER="Extension - Componentbuilder Field Ordering Compiler"
PLG_EXTENSION_COMPONENTBUILDERFIELDORDERINGCOMPILER_DESCRIPTION="This plugin is used to set the ordring for your component views during compilation. To activate it you must first enable it here. Then open your JCB component global options, and under the Global tab, select this plugin in the Activate Compiler Plugins field.Also be sure to set your admin views where you would like to use Field Ordering."
-PLG_EXTENSION_COMPONENTBUILDERFIELDORDERINGCOMPILER_XML_DESCRIPTION="Extension - Componentbuilder Field Ordering Compiler (v.2.0.0)
This plugin is used to set the ordring for your component views during compilation. To activate it you must first enable it here. Then open your JCB component global options, and under the Global tab, select this plugin in the Activate Compiler Plugins field.Also be sure to set your admin views where you would like to use Field Ordering.
Created by Llewellyn van der Merwe
Development started 10th March, 2024
"
\ No newline at end of file
+PLG_EXTENSION_COMPONENTBUILDERFIELDORDERINGCOMPILER_XML_DESCRIPTION="Extension - Componentbuilder Field Ordering Compiler (v.3.0.0)
This plugin is used to set the ordring for your component views during compilation. To activate it you must first enable it here. Then open your JCB component global options, and under the Global tab, select this plugin in the Activate Compiler Plugins field.Also be sure to set your admin views where you would like to use Field Ordering.
Created by Llewellyn van der Merwe
Development started 10th March, 2024
"
\ No newline at end of file
diff --git a/script.php b/script.php
index 5ca9da2..14bed7b 100644
--- a/script.php
+++ b/script.php
@@ -13,15 +13,129 @@
defined('_JEXEC') or die('Restricted access');
use Joomla\CMS\Factory;
+use Joomla\CMS\Version;
+use Joomla\CMS\Installer\InstallerAdapter;
use Joomla\CMS\Language\Text;
-use Joomla\CMS\Filesystem\File;
-use Joomla\CMS\Filesystem\Folder;
+use Joomla\Filesystem\File;
+use Joomla\Filesystem\Folder;
/**
* Extension - Componentbuilder Field Ordering Compiler script file.
*
- * @package PlgExtensionComponentbuilderFieldOrderingCompiler
+ * @package ComponentbuilderFieldOrderingCompiler
*/
class plgExtensionComponentbuilderFieldOrderingCompilerInstallerScript
{
+ /**
+ * The CMS Application.
+ *
+ * @since 4.4.2
+ */
+ protected $app;
+
+ /**
+ * A list of files to be deleted
+ *
+ * @var array
+ * @since 3.6
+ */
+ protected array $deleteFiles = [];
+
+ /**
+ * A list of folders to be deleted
+ *
+ * @var array
+ * @since 3.6
+ */
+ protected array $deleteFolders = [];
+
+ /**
+ * Constructor
+ *
+ * @param InstallerAdapter $adapter The object responsible for running this script
+ */
+ public function __construct($adapter)
+ {
+ // get application
+ $this->app = Factory::getApplication();
+
+ if (is_file(JPATH_ROOT . '/plugins/extension/componentbuilderfieldorderingcompiler/componentbuilderfieldorderingcompiler.php'))
+ {
+ $this->deleteFiles[] = '/plugins/extension/componentbuilderfieldorderingcompiler/componentbuilderfieldorderingcompiler.php';
+ }
+ }
+
+ /**
+ * Called before any type of action
+ *
+ * @param string $route Which action is happening (install|uninstall|discover_install|update)
+ * @param InstallerAdapter $adapter The object responsible for running this script
+ *
+ * @return boolean True on success
+ */
+ public function preflight($route, $adapter)
+ {
+ // set application to local method var, just use $this->app in future [we will drop $app in J6]
+ $app = $this->app;
+
+ // the default for both install and update
+ $jversion = new Version();
+ if (!$jversion->isCompatible('5.0.0'))
+ {
+ $app->enqueueMessage('Please upgrade to at least Joomla! 5.0.0 before continuing!', 'error');
+ return false;
+ }
+
+ // remove old files and folders
+ $this->removeFiles();
+
+ return true;
+ }
+
+ /**
+ * Called before any type of action
+ *
+ * @param string $route Which action is happening (install|uninstall|discover_install|update)
+ * @param InstallerAdapter $adapter The object responsible for running this script
+ *
+ * @return boolean True on success
+ */
+ public function postflight($route, $adapter)
+ {
+ // set application to local method var, just use $this->app in future [we will drop $app in J6]
+ $app = $this->app;
+
+ return true;
+ }
+
+ /**
+ * Remove the files and folders in the given array from
+ *
+ * @return void
+ * @since 5.0.2
+ */
+ protected function removeFiles()
+ {
+ if (!empty($this->deleteFiles))
+ {
+ foreach ($this->deleteFiles as $file)
+ {
+ if (is_file(JPATH_ROOT . $file) && !File::delete(JPATH_ROOT . $file))
+ {
+ echo Text::sprintf('JLIB_INSTALLER_ERROR_FILE_FOLDER', $file) . '
';
+ }
+ }
+ }
+
+ if (!empty($this->deleteFolders))
+ {
+ foreach ($this->deleteFolders as $folder)
+ {
+ if (is_dir(JPATH_ROOT . $folder) && !Folder::delete(JPATH_ROOT . $folder))
+ {
+ echo Text::sprintf('JLIB_INSTALLER_ERROR_FILE_FOLDER', $folder) . '
';
+ }
+ }
+ }
+ }
}
diff --git a/services/index.html b/services/index.html
new file mode 100644
index 0000000..fa6d84e
--- /dev/null
+++ b/services/index.html
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/services/provider.php b/services/provider.php
new file mode 100644
index 0000000..7ad1d4d
--- /dev/null
+++ b/services/provider.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');
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\Extension\PluginInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\DI\Container;
+use VDM\Plugin\Extension\ComponentbuilderFieldOrderingCompiler\Extension\ComponentbuilderFieldOrderingCompiler;
+
+return new class () implements ServiceProviderInterface {
+ /**
+ * Registers the service provider with a DI container.
+ *
+ * @param Container $container The DI container.
+ *
+ * @return void
+ * @since 4.3.0
+ */
+ public function register(Container $container)
+ {
+ $container->set(
+ PluginInterface::class,
+ function (Container $container) {
+ $plugin = new ComponentbuilderFieldOrderingCompiler(
+ $container->get(DispatcherInterface::class),
+ (array) PluginHelper::getPlugin('extension', 'componentbuilderfieldorderingcompiler')
+ );
+ $plugin->setApplication(Factory::getApplication());
+
+ return $plugin;
+ }
+ );
+ }
+};
diff --git a/componentbuilderfieldorderingcompiler.php b/src/Extension/ComponentbuilderFieldOrderingCompiler.php
similarity index 76%
rename from componentbuilderfieldorderingcompiler.php
rename to src/Extension/ComponentbuilderFieldOrderingCompiler.php
index c689f94..5952d93 100644
--- a/componentbuilderfieldorderingcompiler.php
+++ b/src/Extension/ComponentbuilderFieldOrderingCompiler.php
@@ -8,9 +8,7 @@
* @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');
+namespace VDM\Plugin\Extension\ComponentbuilderFieldOrderingCompiler\Extension;
use Joomla\CMS\Application\CMSApplication;
use Joomla\CMS\Plugin\CMSPlugin;
@@ -19,13 +17,18 @@ use VDM\Joomla\Utilities\JsonHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
use VDM\Joomla\Componentbuilder\Compiler\Factory;
+use Joomla\Event\SubscriberInterface;
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
/**
* Extension - Componentbuilder Field Ordering Compiler plugin.
*
* @package ComponentbuilderFieldOrderingCompiler
- * @since 2.0.0
+ * @since 3.0.0
*/
-class PlgExtensionComponentbuilderFieldOrderingCompiler extends CMSPlugin
+final class ComponentbuilderFieldOrderingCompiler extends CMSPlugin implements SubscriberInterface
{
/**
* Event Triggered in the compiler [on Before Model View Data]
@@ -50,4 +53,18 @@ class PlgExtensionComponentbuilderFieldOrderingCompiler extends CMSPlugin
}
}
}
+
+ /**
+ * Returns an array of events this subscriber will listen to.
+ *
+ * @return array
+ *
+ * @since 5.0.0
+ */
+ public static function getSubscribedEvents(): array
+ {
+ return [
+ 'jcb_ce_onBeforeModelViewData' => 'jcb_ce_onBeforeModelViewData'
+ ];
+ }
}
diff --git a/src/Extension/index.html b/src/Extension/index.html
new file mode 100644
index 0000000..fa6d84e
--- /dev/null
+++ b/src/Extension/index.html
@@ -0,0 +1 @@
+
\ No newline at end of file