From 46e1b29b68d97f33f25786d91759554430582621 Mon Sep 17 00:00:00 2001 From: aB0t Date: Thu, 15 Aug 2024 01:35:23 +0200 Subject: [PATCH] Release of v3.0.0 --- componentbuilderfieldorderingtabs.xml | 16 +-- forms/admin_view.xml | 4 +- ...ent_componentbuilderfieldorderingtabs.ini} | 2 +- ...componentbuilderfieldorderingtabs.sys.ini} | 2 +- script.php | 120 +++++++++++++++++- {fields => services}/index.html | 0 services/provider.php | 47 +++++++ .../ComponentbuilderFieldOrderingTabs.php | 13 +- {rules => src/Extension}/index.html | 0 src/Field/index.html | 1 + src/Rule/index.html | 1 + 11 files changed, 185 insertions(+), 21 deletions(-) rename language/en-GB/{en-GB.plg_content_componentbuilderfieldorderingtabs.ini => plg_content_componentbuilderfieldorderingtabs.ini} (97%) rename language/en-GB/{en-GB.plg_content_componentbuilderfieldorderingtabs.sys.ini => plg_content_componentbuilderfieldorderingtabs.sys.ini} (97%) rename {fields => services}/index.html (100%) create mode 100644 services/provider.php rename componentbuilderfieldorderingtabs.php => src/Extension/ComponentbuilderFieldOrderingTabs.php (84%) rename {rules => src/Extension}/index.html (100%) create mode 100644 src/Field/index.html create mode 100644 src/Rule/index.html diff --git a/componentbuilderfieldorderingtabs.xml b/componentbuilderfieldorderingtabs.xml index 5e26128..019a041 100644 --- a/componentbuilderfieldorderingtabs.xml +++ b/componentbuilderfieldorderingtabs.xml @@ -1,13 +1,14 @@ PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS - 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\Content\ComponentbuilderFieldOrderingTabs PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_XML_DESCRIPTION @@ -15,17 +16,16 @@ - en-GB/en-GB.plg_content_componentbuilderfieldorderingtabs.ini - en-GB/en-GB.plg_content_componentbuilderfieldorderingtabs.sys.ini + en-GB/plg_content_componentbuilderfieldorderingtabs.ini + en-GB/plg_content_componentbuilderfieldorderingtabs.sys.ini - componentbuilderfieldorderingtabs.php + services index.html - language - fields forms - rules + services + src \ No newline at end of file diff --git a/forms/admin_view.xml b/forms/admin_view.xml index b7097ea..27397a3 100644 --- a/forms/admin_view.xml +++ b/forms/admin_view.xml @@ -4,8 +4,8 @@
diff --git a/language/en-GB/en-GB.plg_content_componentbuilderfieldorderingtabs.ini b/language/en-GB/plg_content_componentbuilderfieldorderingtabs.ini similarity index 97% rename from language/en-GB/en-GB.plg_content_componentbuilderfieldorderingtabs.ini rename to language/en-GB/plg_content_componentbuilderfieldorderingtabs.ini index 8f6789a..d16bc39 100644 --- a/language/en-GB/en-GB.plg_content_componentbuilderfieldorderingtabs.ini +++ b/language/en-GB/plg_content_componentbuilderfieldorderingtabs.ini @@ -1,6 +1,6 @@ PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS="Content - Componentbuilder Field Ordering Tabs" PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_DESCRIPTION="This plugin is used to set custom ordering to fields in the JCB list views." -PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_XML_DESCRIPTION="

Content - Componentbuilder Field Ordering Tabs (v.2.0.0)

This plugin is used to set custom ordering to fields in the JCB list views.

Created by Llewellyn van der Merwe
Development started 10th March, 2024

" +PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_XML_DESCRIPTION="

Content - Componentbuilder Field Ordering Tabs (v.3.0.0)

This plugin is used to set custom ordering to fields in the JCB list views.

Created by Llewellyn van der Merwe
Development started 10th March, 2024

" PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_FIELD_ORDERING="Field Ordering" PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_ADD_ADMIN_ORDERING_LABEL="Add Admin List View Ordering" PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_ADD_ADMIN_ORDERING_DESCRIPTION="Select the ordering behavior, default is by id, and custom lets you select." diff --git a/language/en-GB/en-GB.plg_content_componentbuilderfieldorderingtabs.sys.ini b/language/en-GB/plg_content_componentbuilderfieldorderingtabs.sys.ini similarity index 97% rename from language/en-GB/en-GB.plg_content_componentbuilderfieldorderingtabs.sys.ini rename to language/en-GB/plg_content_componentbuilderfieldorderingtabs.sys.ini index 8f6789a..d16bc39 100644 --- a/language/en-GB/en-GB.plg_content_componentbuilderfieldorderingtabs.sys.ini +++ b/language/en-GB/plg_content_componentbuilderfieldorderingtabs.sys.ini @@ -1,6 +1,6 @@ PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS="Content - Componentbuilder Field Ordering Tabs" PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_DESCRIPTION="This plugin is used to set custom ordering to fields in the JCB list views." -PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_XML_DESCRIPTION="

Content - Componentbuilder Field Ordering Tabs (v.2.0.0)

This plugin is used to set custom ordering to fields in the JCB list views.

Created by Llewellyn van der Merwe
Development started 10th March, 2024

" +PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_XML_DESCRIPTION="

Content - Componentbuilder Field Ordering Tabs (v.3.0.0)

This plugin is used to set custom ordering to fields in the JCB list views.

Created by Llewellyn van der Merwe
Development started 10th March, 2024

" PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_FIELD_ORDERING="Field Ordering" PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_ADD_ADMIN_ORDERING_LABEL="Add Admin List View Ordering" PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_ADD_ADMIN_ORDERING_DESCRIPTION="Select the ordering behavior, default is by id, and custom lets you select." diff --git a/script.php b/script.php index fd473b0..eaddd5c 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; /** * Content - Componentbuilder Field Ordering Tabs script file. * - * @package PlgContentComponentbuilderFieldOrderingTabs + * @package ComponentbuilderFieldOrderingTabs */ class plgContentComponentbuilderFieldOrderingTabsInstallerScript { + /** + * 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/content/componentbuilderfieldorderingtabs/componentbuilderfieldorderingtabs.php')) + { + $this->deleteFiles[] = '/plugins/content/componentbuilderfieldorderingtabs/componentbuilderfieldorderingtabs.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/fields/index.html b/services/index.html similarity index 100% rename from fields/index.html rename to services/index.html diff --git a/services/provider.php b/services/provider.php new file mode 100644 index 0000000..6ec7725 --- /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\Content\ComponentbuilderFieldOrderingTabs\Extension\ComponentbuilderFieldOrderingTabs; + +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 ComponentbuilderFieldOrderingTabs( + $container->get(DispatcherInterface::class), + (array) PluginHelper::getPlugin('content', 'componentbuilderfieldorderingtabs') + ); + $plugin->setApplication(Factory::getApplication()); + + return $plugin; + } + ); + } +}; diff --git a/componentbuilderfieldorderingtabs.php b/src/Extension/ComponentbuilderFieldOrderingTabs.php similarity index 84% rename from componentbuilderfieldorderingtabs.php rename to src/Extension/ComponentbuilderFieldOrderingTabs.php index 5dc06e3..4cb3e83 100644 --- a/componentbuilderfieldorderingtabs.php +++ b/src/Extension/ComponentbuilderFieldOrderingTabs.php @@ -8,20 +8,21 @@ * @copyright Copyright (C) 2015 Vast Development Method. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ +namespace VDM\Plugin\Content\ComponentbuilderFieldOrderingTabs\Extension; + +use Joomla\CMS\Form\Form; +use Joomla\CMS\Plugin\CMSPlugin; // No direct access to this file defined('_JEXEC') or die('Restricted access'); -use Joomla\CMS\Form\Form; -use Joomla\CMS\Plugin\CMSPlugin; - /** * Content - Componentbuilder Field Ordering Tabs plugin. * * @package ComponentbuilderFieldOrderingTabs - * @since 2.0.0 + * @since 3.0.0 */ -class PlgContentComponentbuilderFieldOrderingTabs extends CMSPlugin +final class ComponentbuilderFieldOrderingTabs extends CMSPlugin { /** * Affects constructor behaviour. If true, language files will be loaded automatically. @@ -49,7 +50,7 @@ class PlgContentComponentbuilderFieldOrderingTabs extends CMSPlugin if (strpos($context, 'com_componentbuilder.admin_view') === 0) { // Add the forms path - Form::addFormPath(__DIR__ . '/forms'); + Form::addFormPath(__DIR__ . '/../../forms'); // add the admin view params for privacy integration $form->loadFile('admin_view'); } diff --git a/rules/index.html b/src/Extension/index.html similarity index 100% rename from rules/index.html rename to src/Extension/index.html diff --git a/src/Field/index.html b/src/Field/index.html new file mode 100644 index 0000000..fa6d84e --- /dev/null +++ b/src/Field/index.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/Rule/index.html b/src/Rule/index.html new file mode 100644 index 0000000..fa6d84e --- /dev/null +++ b/src/Rule/index.html @@ -0,0 +1 @@ + \ No newline at end of file