diff --git a/language/en-GB/en-GB.plg_content_componentbuilderlanguagetabs.ini b/language/en-GB/plg_content_componentbuilderlanguagetabs.ini
similarity index 97%
rename from language/en-GB/en-GB.plg_content_componentbuilderlanguagetabs.ini
rename to language/en-GB/plg_content_componentbuilderlanguagetabs.ini
index 8a67c13..99aa6ec 100644
--- a/language/en-GB/en-GB.plg_content_componentbuilderlanguagetabs.ini
+++ b/language/en-GB/plg_content_componentbuilderlanguagetabs.ini
@@ -1,6 +1,6 @@
PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS="Content - Componentbuilder Language Tabs"
PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS_DESCRIPTION="This plugin is used to link your components to the language packaging and extending options, so you can set all the required details for the integration."
-PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS_XML_DESCRIPTION="Content - Componentbuilder Language Tabs (v.2.0.0)
This plugin is used to link your components to the language packaging and extending options, so you can set all the required details for the integration.
Created by Llewellyn van der Merwe
Development started 10th March, 2024
"
+PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS_XML_DESCRIPTION="Content - Componentbuilder Language Tabs (v.3.0.0)
This plugin is used to link your components to the language packaging and extending options, so you can set all the required details for the integration.
Created by Llewellyn van der Merwe
Development started 10th March, 2024
"
PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS_LANGUAGE_OPTIONS="Language Options"
PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS_NOTE_LANGUAGE_NOTE_LABEL="Would you like to move languages to their own packages?"
PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS_NOTE_LANGUAGE_NOTE_DESCRIPTION="Adding all your translations to your component can increase its size dramatically, so now you are able to move each extra language translation to its own installing package, leaving just your main language in the component.
Please note that this is only relevant if you actually have added extra translations to your component in the Language Translations area of JCB.
"
diff --git a/language/en-GB/en-GB.plg_content_componentbuilderlanguagetabs.sys.ini b/language/en-GB/plg_content_componentbuilderlanguagetabs.sys.ini
similarity index 97%
rename from language/en-GB/en-GB.plg_content_componentbuilderlanguagetabs.sys.ini
rename to language/en-GB/plg_content_componentbuilderlanguagetabs.sys.ini
index 8a67c13..99aa6ec 100644
--- a/language/en-GB/en-GB.plg_content_componentbuilderlanguagetabs.sys.ini
+++ b/language/en-GB/plg_content_componentbuilderlanguagetabs.sys.ini
@@ -1,6 +1,6 @@
PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS="Content - Componentbuilder Language Tabs"
PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS_DESCRIPTION="This plugin is used to link your components to the language packaging and extending options, so you can set all the required details for the integration."
-PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS_XML_DESCRIPTION="Content - Componentbuilder Language Tabs (v.2.0.0)
This plugin is used to link your components to the language packaging and extending options, so you can set all the required details for the integration.
Created by Llewellyn van der Merwe
Development started 10th March, 2024
"
+PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS_XML_DESCRIPTION="Content - Componentbuilder Language Tabs (v.3.0.0)
This plugin is used to link your components to the language packaging and extending options, so you can set all the required details for the integration.
Created by Llewellyn van der Merwe
Development started 10th March, 2024
"
PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS_LANGUAGE_OPTIONS="Language Options"
PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS_NOTE_LANGUAGE_NOTE_LABEL="Would you like to move languages to their own packages?"
PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS_NOTE_LANGUAGE_NOTE_DESCRIPTION="Adding all your translations to your component can increase its size dramatically, so now you are able to move each extra language translation to its own installing package, leaving just your main language in the component.
Please note that this is only relevant if you actually have added extra translations to your component in the Language Translations area of JCB.
"
diff --git a/script.php b/script.php
index b301c03..8fc5e4d 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 Language Tabs script file.
*
- * @package PlgContentComponentbuilderLanguageTabs
+ * @package ComponentbuilderLanguageTabs
*/
class plgContentComponentbuilderLanguageTabsInstallerScript
{
+ /**
+ * 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/componentbuilderlanguagetabs/componentbuilderlanguagetabs.php'))
+ {
+ $this->deleteFiles[] = '/plugins/content/componentbuilderlanguagetabs/componentbuilderlanguagetabs.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..62fcf6f
--- /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\ComponentbuilderLanguageTabs\Extension\ComponentbuilderLanguageTabs;
+
+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 ComponentbuilderLanguageTabs(
+ $container->get(DispatcherInterface::class),
+ (array) PluginHelper::getPlugin('content', 'componentbuilderlanguagetabs')
+ );
+ $plugin->setApplication(Factory::getApplication());
+
+ return $plugin;
+ }
+ );
+ }
+};
diff --git a/componentbuilderlanguagetabs.php b/src/Extension/ComponentbuilderLanguageTabs.php
similarity index 85%
rename from componentbuilderlanguagetabs.php
rename to src/Extension/ComponentbuilderLanguageTabs.php
index 0903d5f..2838b6b 100644
--- a/componentbuilderlanguagetabs.php
+++ b/src/Extension/ComponentbuilderLanguageTabs.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\ComponentbuilderLanguageTabs\Extension;
+
+use Joomla\CMS\Plugin\CMSPlugin;
+use Joomla\CMS\Form\Form;
// No direct access to this file
defined('_JEXEC') or die('Restricted access');
-use Joomla\CMS\Plugin\CMSPlugin;
-use Joomla\CMS\Form\Form;
-
/**
* Content - Componentbuilder Language Tabs plugin.
*
* @package ComponentbuilderLanguageTabs
- * @since 2.0.0
+ * @since 3.0.0
*/
-class PlgContentComponentbuilderLanguageTabs extends CMSPlugin
+final class ComponentbuilderLanguageTabs extends CMSPlugin
{
/**
* Affects constructor behaviour. If true, language files will be loaded automatically.
@@ -49,7 +50,7 @@ class PlgContentComponentbuilderLanguageTabs extends CMSPlugin
if (strpos($context, 'com_componentbuilder.joomla_component') === 0)
{
// Add the forms path
- Form::addFormPath(__DIR__ . '/forms');
+ Form::addFormPath(__DIR__ . '/../../forms');
// add the admin view params for privacy integration
$form->loadFile('joomla_component');
}
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