52
0

Compare commits

..

43 Commits
5.x ... 3.x

Author SHA1 Message Date
fe245fc90e
Update on v1.2.1 (changes towards the next release)
Here's an update on the current version, which includes changes towards the next release still in development.
2024-11-07 10:53:30 +02:00
45f788cbd8
Update on v1.2.1 (changes towards the next release)
Here's an update on the current version, which includes changes towards the next release still in development.
2024-10-13 17:31:08 +02:00
4bae832fe1
Update on v1.2.1 (changes towards the next release)
Here's an update on the current version, which includes changes towards the next release still in development.
2024-10-08 00:31:55 +02:00
818a4a9237
Update on v1.2.1 (changes towards the next release)
Here's an update on the current version, which includes changes towards the next release still in development.
2024-09-30 01:57:29 +02:00
8909fde824
Update on v1.2.1 (changes towards the next release)
Here's an update on the current version, which includes changes towards the next release still in development.
2024-09-20 02:59:16 +02:00
fb7edadb0c
Update on v1.2.1 (changes towards the next release)
Here's an update on the current version, which includes changes towards the next release still in development.
2024-09-19 05:47:28 +02:00
acad771807
Update on v1.2.1 (changes towards the next release)
Here's an update on the current version, which includes changes towards the next release still in development.
2024-09-18 04:38:53 +02:00
616824c352
Update on v1.2.1 (changes towards the next release)
Here's an update on the current version, which includes changes towards the next release still in development.
2024-08-23 18:12:51 +02:00
47ebc5c0fb
Update on v1.2.1 (changes towards the next release)
Here's an update on the current version, which includes changes towards the next release still in development.
2024-08-21 21:34:32 +02:00
332b11d644
Update on v1.2.1 (changes towards the next release)
Here's an update on the current version, which includes changes towards the next release still in development.
2024-08-20 22:32:57 +02:00
368ec6139a
Update on v1.2.1 (changes towards the next release)
Here's an update on the current version, which includes changes towards the next release still in development.
2024-08-16 19:20:22 +02:00
1801eb5977
Release of v1.2.1 2024-08-15 01:37:23 +02:00
cd57598f50
Update on v1.2.0 (changes towards the next release)
Here's an update on the current version, which includes changes towards the next release still in development.
2024-07-27 22:48:41 +02:00
c152276605
Update on v1.2.0 (changes towards the next release)
Here's an update on the current version, which includes changes towards the next release still in development.
2024-07-26 15:33:16 +02:00
1f92d9d44b
Update on v1.2.0 (changes towards the next release)
Here's an update on the current version, which includes changes towards the next release still in development.
2024-07-20 22:39:19 +02:00
b26f64f4c3
Update on v1.2.0 (changes towards the next release)
Here's an update on the current version, which includes changes towards the next release still in development.
2024-07-18 14:57:53 +02:00
622421c531
Update on v1.2.0 (changes towards the next release)
Here's an update on the current version, which includes changes towards the next release still in development.
2024-07-17 02:39:35 +02:00
2f566e06fd
Update on v1.2.0 (changes towards the next release)
Here's an update on the current version, which includes changes towards the next release still in development.
2024-07-08 22:53:46 +02:00
d5c0fca707
Update on v1.2.0 (changes towards the next release)
Here's an update on the current version, which includes changes towards the next release still in development.
2024-06-28 03:48:57 +02:00
9268eb5e5f
Update on v1.2.0 (changes towards the next release)
Here's an update on the current version, which includes changes towards the next release still in development.
2024-06-21 01:32:05 +02:00
0770cf5511
Update on v1.2.0 (changes towards the next release)
Here's an update on the current version, which includes changes towards the next release still in development.
2024-06-07 22:29:57 +02:00
d932a2f9e0
Update on v1.2.0 (changes towards the next release)
Here's an update on the current version, which includes changes towards the next release still in development.
2024-06-05 16:29:28 +02:00
eea6b5d1f0
Update on v1.2.0 (changes towards the next release)
Here's an update on the current version, which includes changes towards the next release still in development.
2024-05-16 15:13:36 +02:00
4c0877e7aa
Update on v1.2.0 (changes towards the next release)
Here's an update on the current version, which includes changes towards the next release still in development.
2024-05-13 12:23:57 +02:00
d63e4a6ea2
Update on v1.2.0 (changes towards the next release)
Here's an update on the current version, which includes changes towards the next release still in development.
2024-05-10 18:07:21 +02:00
8ed3b60d95
Update on v1.2.0 (changes towards the next release)
Here's an update on the current version, which includes changes towards the next release still in development.
2024-05-06 07:40:18 +02:00
22e92e9064
Update on v1.2.0 (changes towards the next release)
Here's an update on the current version, which includes changes towards the next release still in development.
2024-05-03 07:54:09 +02:00
d480b023e6
Update on v1.2.0 (changes towards the next release)
Here's an update on the current version, which includes changes towards the next release still in development.
2024-05-02 16:10:47 +02:00
c3f73a893f
Update on v1.2.0 (changes towards the next release)
Here's an update on the current version, which includes changes towards the next release still in development.
2024-04-30 10:29:24 +02:00
550f34cd31
Update on v1.2.0 (changes towards the next release)
Here's an update on the current version, which includes changes towards the next release still in development.
2024-04-27 15:45:07 +02:00
bf70d406ab
Update on v1.2.0 (changes towards the next release)
Here's an update on the current version, which includes changes towards the next release still in development.
2024-04-24 21:10:42 +02:00
4f9d794de0
Update on v1.2.0 (changes towards the next release)
Here's an update on the current version, which includes changes towards the next release still in development.
2024-04-22 15:32:19 +02:00
c1ebe7ce34
Update on v1.2.0 (changes towards the next release)
Here's an update on the current version, which includes changes towards the next release still in development.
2024-04-22 00:59:42 +02:00
8fa464000d
Update on v1.2.0 (changes towards the next release)
Here's an update on the current version, which includes changes towards the next release still in development.
2024-04-16 19:05:17 +02:00
dfdf245004
Update on v1.2.0 (changes towards the next release)
Here's an update on the current version, which includes changes towards the next release still in development.
2024-04-09 13:07:08 +02:00
620d9225d8
Update on v1.2.0 (changes towards the next release)
Here's an update on the current version, which includes changes towards the next release still in development.
2024-04-06 19:48:58 +02:00
eb10fd630f
Update on v1.2.0 (changes towards the next release)
Here's an update on the current version, which includes changes towards the next release still in development.
2024-03-27 15:04:19 +02:00
73750896ae
Update on v1.2.0 (changes towards the next release)
Here's an update on the current version, which includes changes towards the next release still in development.
2024-03-26 22:30:10 +02:00
bae1c71653
Update on v1.2.0 (changes towards the next release)
Here's an update on the current version, which includes changes towards the next release still in development.
2024-03-20 14:19:16 +02:00
c0c3445e97
Update on v1.2.0 (changes towards the next release)
Here's an update on the current version, which includes changes towards the next release still in development.
2024-03-15 12:00:50 +02:00
3019950beb
Update on v1.2.0 (changes towards the next release)
Here's an update on the current version, which includes changes towards the next release still in development.
2024-03-12 12:40:25 +02:00
2cd4de00ca
Update on v1.2.0 (changes towards the next release)
Here's an update on the current version, which includes changes towards the next release still in development.
2024-03-11 16:56:07 +02:00
b39c9c5355
Update on v1.2.0 (beta for next version)
Here's an update on the current version, which includes changes towards the next release still in beta.
2024-03-10 13:40:49 +02:00
10 changed files with 120 additions and 236 deletions

View File

@ -8,43 +8,55 @@
* @copyright Copyright (C) 2015 Vast Development Method. All rights reserved. * @copyright Copyright (C) 2015 Vast Development Method. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt * @license GNU General Public License version 2 or later; see LICENSE.txt
*/ */
namespace VDM\Plugin\Extension\ComponentbuilderLanguagePackaging\Extension;
use Joomla\CMS\Application\CMSApplication;
use Joomla\CMS\Plugin\CMSPlugin;
use Joomla\CMS\Filesystem\Folder;
use Joomla\Database\DatabaseAwareTrait;
use VDM\Joomla\Utilities\JsonHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Componentbuilder\Compiler\Factory;
use VDM\Joomla\Utilities\StringHelper;
use VDM\Joomla\Utilities\FileHelper;
use VDM\Joomla\Componentbuilder\Compiler\Utilities\Indent;
use VDM\Joomla\Componentbuilder\Compiler\Utilities\Placefix;
use VDM\Joomla\Utilities\GetHelper;
use Joomla\Event\SubscriberInterface;
// No direct access to this file // No direct access to this file
defined('_JEXEC') or die('Restricted access'); defined('_JEXEC') or die('Restricted access');
JLoader::register('ComponentbuilderHelper', JPATH_ADMINISTRATOR . '/components/com_componentbuilder/helpers/componentbuilder.php');
use Joomla\CMS\Application\CMSApplication;
use Joomla\CMS\Plugin\CMSPlugin;
use VDM\Joomla\Componentbuilder\Compiler\Factory as CFactory;
use VDM\Joomla\Componentbuilder\Compiler\Utilities\Placefix;
use VDM\Joomla\Componentbuilder\Compiler\Utilities\Indent;
use VDM\Joomla\Utilities\JsonHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\StringHelper;
use VDM\Joomla\Utilities\GetHelper;
use Joomla\CMS\Filesystem\Folder;
/** /**
* Extension - Componentbuilder Language Packaging plugin. * Extension - Componentbuilder Language Packaging plugin.
* *
* @package ComponentbuilderLanguagePackaging * @package ComponentbuilderLanguagePackaging
* @since 3.0.0 * @since 1.2.1
*/ */
final class ComponentbuilderLanguagePackaging extends CMSPlugin implements SubscriberInterface class PlgExtensionComponentbuilderLanguagePackaging extends CMSPlugin
{ {
use DatabaseAwareTrait;
/** /**
* Affects constructor behaviour. If true, language files will be loaded automatically. * Affects constructor behavior. If true, language files will be loaded automatically.
* *
* @var boolean * @var boolean
* @since 1.0.0 * @since 1.0.0
*/ */
protected $autoloadLanguage = true; protected $autoloadLanguage = true;
/**
* Database object
*
* @var DatabaseDriver
* @since 1.0.0
*/
protected $db;
/**
* Application object
*
* @var CMSApplication
* @since 1.0.0
*/
protected $app;
/** /**
* The percentage before a language can be added * The percentage before a language can be added
* *
@ -220,7 +232,7 @@ final class ComponentbuilderLanguagePackaging extends CMSPlugin implements Subsc
isset($component->params['language_options']['activate']) && $component->params['language_options']['activate'] == 1) isset($component->params['language_options']['activate']) && $component->params['language_options']['activate'] == 1)
{ {
// load the admin component details // load the admin component details
$this->activeComponents[$component->id] = Factory::_('Config')->component_context; $this->activeComponents[$component->id] = CFactory::_('Config')->component_context;
$this->activeComponentsNames[$component->id] = StringHelper::safe($component->name_code); $this->activeComponentsNames[$component->id] = StringHelper::safe($component->name_code);
$this->activeComponentsRealNames[$component->id] = $component->name; $this->activeComponentsRealNames[$component->id] = $component->name;
// add excluded list of languages // add excluded list of languages
@ -250,12 +262,12 @@ final class ComponentbuilderLanguagePackaging extends CMSPlugin implements Subsc
public function jcb_ce_onAfterGet() public function jcb_ce_onAfterGet()
{ {
// get component id // get component id
$id = (int) Factory::_('Config')->component_id; $id = (int) CFactory::_('Config')->component_id;
// check if there is active // check if there is active
if (ArrayHelper::check($this->activeComponents) if (ArrayHelper::check($this->activeComponents)
&& isset($this->activeComponents[$id]) && $this->percentageLanguageAddOveride != 200) && isset($this->activeComponents[$id]) && $this->percentageLanguageAddOveride != 200)
{ {
Factory::_('Config')->set('percentage_language_add', $this->percentageLanguageAddOveride); CFactory::_('Config')->set('percentage_language_add', $this->percentageLanguageAddOveride);
} }
} }
@ -269,17 +281,17 @@ final class ComponentbuilderLanguagePackaging extends CMSPlugin implements Subsc
public function jcb_ce_onBeforeSetLangFileData() public function jcb_ce_onBeforeSetLangFileData()
{ {
// lets map some arrays to the plugin for later use // lets map some arrays to the plugin for later use
$this->compilerPath = Factory::_('Config')->compiler_path; $this->compilerPath = CFactory::_('Config')->compiler_path;
$this->tempPath = Factory::_('Config')->tmp_path; $this->tempPath = CFactory::_('Config')->tmp_path;
$this->langTag = Factory::_('Config')->lang_tag; $this->langTag = CFactory::_('Config')->lang_tag;
$this->debugLinenr = Factory::_('Config')->get('debug_line_nr', false); $this->debugLinenr = CFactory::_('Config')->get('debug_line_nr', false);
$this->component_version = Factory::_('Config')->get('component_version', '1.0.0'); $this->component_version = CFactory::_('Config')->get('component_version', '1.0.0');
$this->joomlaVersion = Factory::_('Config')->joomla_version; $this->joomlaVersion = CFactory::_('Config')->joomla_version;
$this->percentageLanguageAdd = Factory::_('Config')->percentage_language_add; $this->percentageLanguageAdd = CFactory::_('Config')->percentage_language_add;
$this->removeSiteFolder = Factory::_('Config')->remove_site_folder; $this->removeSiteFolder = CFactory::_('Config')->remove_site_folder;
$this->removeSiteEditFolder = Factory::_('Config')->remove_site_edit_folder; $this->removeSiteEditFolder = CFactory::_('Config')->remove_site_edit_folder;
$this->componentPath = Factory::_('Utilities.Paths')->component_path; $this->componentPath = CFactory::_('Utilities.Paths')->component_path;
$this->componentCodeName = Factory::_('Config')->component_code_name; $this->componentCodeName = CFactory::_('Config')->component_code_name;
} }
/** /**
@ -292,14 +304,14 @@ final class ComponentbuilderLanguagePackaging extends CMSPlugin implements Subsc
public function jcb_ce_onBeforeBuildPluginLangFiles(&$plugin) public function jcb_ce_onBeforeBuildPluginLangFiles(&$plugin)
{ {
// get component id // get component id
$id = (int) Factory::_('Config')->component_id; $id = (int) CFactory::_('Config')->component_id;
// check if there is active // check if there is active
if (ArrayHelper::check($this->activeComponents) && isset($this->activeComponents[$id])) if (ArrayHelper::check($this->activeComponents) && isset($this->activeComponents[$id]))
{ {
// set file name // set file name
$file_name = 'plg_' . strtolower($plugin->group) . '_' . strtolower($plugin->code_name); $file_name = 'plg_' . strtolower($plugin->group) . '_' . strtolower($plugin->code_name);
// extrude the languages that should not remain in the plugin // extrude the languages that should not remain in the plugin
$this->extrudeLanguages($id, 'plugins', Factory::_('Config')->lang_tag, $file_name, 'admin'); $this->extrudeLanguages($id, 'plugins', CFactory::_('Config')->lang_tag, $file_name, 'admin');
} }
} }
@ -313,12 +325,12 @@ final class ComponentbuilderLanguagePackaging extends CMSPlugin implements Subsc
public function jcb_ce_onBeforeBuildModuleLangFiles(&$module) public function jcb_ce_onBeforeBuildModuleLangFiles(&$module)
{ {
// get component id // get component id
$id = (int) Factory::_('Config')->component_id; $id = (int) CFactory::_('Config')->component_id;
// check if there is active // check if there is active
if (ArrayHelper::check($this->activeComponents) && isset($this->activeComponents[$id])) if (ArrayHelper::check($this->activeComponents) && isset($this->activeComponents[$id]))
{ {
// extrude the languages that should not remain in the module // extrude the languages that should not remain in the module
$this->extrudeLanguages($id, 'modules', Factory::_('Config')->lang_tag, $module->file_name, $module->target_client); $this->extrudeLanguages($id, 'modules', CFactory::_('Config')->lang_tag, $module->file_name, $module->target_client);
} }
} }
@ -332,17 +344,17 @@ final class ComponentbuilderLanguagePackaging extends CMSPlugin implements Subsc
public function jcb_ce_onBeforeBuildAllLangFiles($targetArea) public function jcb_ce_onBeforeBuildAllLangFiles($targetArea)
{ {
// get component id // get component id
$id = (int) Factory::_('Config')->component_id; $id = (int) CFactory::_('Config')->component_id;
// check if there is active // check if there is active
if (ArrayHelper::check($this->activeComponents) && isset($this->activeComponents[$id])) if (ArrayHelper::check($this->activeComponents) && isset($this->activeComponents[$id]))
{ {
// set file name // set file name
$file_name = 'com_' . $this->activeComponentsNames[$id]; $file_name = 'com_' . $this->activeComponentsNames[$id];
// extrude the languages that should not remain in the module // extrude the languages that should not remain in the module
$this->extrudeLanguages($id, $targetArea, Factory::_('Config')->lang_tag, $file_name); $this->extrudeLanguages($id, $targetArea, CFactory::_('Config')->lang_tag, $file_name);
} }
// build the language packages // build the language packages
$this->buildLanguages($id, Factory::_('Config')->lang_tag); $this->buildLanguages($id, CFactory::_('Config')->lang_tag);
} }
/** /**
@ -432,26 +444,26 @@ final class ComponentbuilderLanguagePackaging extends CMSPlugin implements Subsc
// set the lang xml name for later // set the lang xml name for later
$langXMLNames[$main_path] = $langCodeName . '_' . $this->activeComponentsNames[$id] ; $langXMLNames[$main_path] = $langCodeName . '_' . $this->activeComponentsNames[$id] ;
// we must check if old folder is found and remove it // we must check if old folder is found and remove it
if (!isset($this->languageTracker[$main_path]) && Folder::exists($main_path)) if (!isset($this->languageTracker[$main_path]) && is_dir($main_path))
{ {
// remove the main folder // remove the main folder
Factory::_('Utilities.Folder')->remove($main_path); ComponentbuilderHelper::removeFolder($main_path);
// do not remove it again // do not remove it again
$this->languageTracker[$main_path] = true; $this->languageTracker[$main_path] = true;
} }
// check if exist and create if not // check if exist and create if not
if (!Folder::exists($main_path)) if (!is_dir($main_path))
{ {
Folder::create($main_path); Folder::create($main_path);
// count the folder created // count the folder created
Factory::_('Utilities.Counter')->folder++; CFactory::_('Utilities.Counter')->folder++;
} }
foreach ($areas as $area => $languageStrings) foreach ($areas as $area => $languageStrings)
{ {
// get the file name // get the file name
$fileName = $this->getLanguageFileName($file_name, $tag, $area); $fileName = $this->getLanguageFileName($file_name, $tag, $area);
// check if language should be added // check if language should be added
if (Factory::_('Language.Translation')->check($tag, $languageStrings, $mainLangLoader[$area], $fileName) && ($actions = $this->getLangActions($file_name, $tag, $area, $target_client)) !== false) if (CFactory::_('Language.Translation')->check($tag, $languageStrings, $mainLangLoader[$area], $fileName) && ($actions = $this->getLangActions($file_name, $tag, $area, $target_client)) !== false)
{ {
// set the language data // set the language data
$lang = array_map( $lang = array_map(
@ -461,7 +473,7 @@ final class ComponentbuilderLanguagePackaging extends CMSPlugin implements Subsc
array_keys($languageStrings) array_keys($languageStrings)
); );
// set the line counter // set the line counter
Factory::_('Utilities.Counter')->line += count( CFactory::_('Utilities.Counter')->line += count(
(array) $lang (array) $lang
); );
// check that the main folder exist // check that the main folder exist
@ -469,18 +481,18 @@ final class ComponentbuilderLanguagePackaging extends CMSPlugin implements Subsc
{ {
$client_path = $main_path . $act['target_client'] . '/'; $client_path = $main_path . $act['target_client'] . '/';
// check if exist and create if not // check if exist and create if not
if (!Folder::exists($client_path)) if (!is_dir($client_path))
{ {
Folder::create($client_path); Folder::create($client_path);
// count the folder created // count the folder created
$this->folderCount++; $this->folderCount++;
} }
// write the language data to a file // write the language data to a file
FileHelper::write( ComponentbuilderHelper::writeFile(
$client_path . $act['file_name'], implode(PHP_EOL, $lang) $client_path . $act['file_name'], implode(PHP_EOL, $lang)
); );
// count the file created // count the file created
Factory::_('Utilities.Counter')->line++; CFactory::_('Utilities.Counter')->line++;
// build xml strings // build xml strings
if (!isset($langXML[$main_path])) if (!isset($langXML[$main_path]))
{ {
@ -510,25 +522,25 @@ final class ComponentbuilderLanguagePackaging extends CMSPlugin implements Subsc
{ {
// get the XML // get the XML
$xml = str_replace( $xml = str_replace(
array_keys(Factory::_('Compiler.Builder.Content.One')->allActive()), array_keys(CFactory::_('Compiler.Builder.Content.One')->allActive()),
array_values(Factory::_('Compiler.Builder.Content.One')->allActive()), array_values(CFactory::_('Compiler.Builder.Content.One')->allActive()),
$this->getLanguageXML($target_clients, $langPackages[$main_path], $langNames[$main_path]) $this->getLanguageXML($target_clients, $langPackages[$main_path], $langNames[$main_path])
); );
// get the XML File Name // get the XML File Name
$xmlFileName = $langXMLNames[$main_path] . '.xml'; $xmlFileName = $langXMLNames[$main_path] . '.xml';
// write the language data to a file // write the language data to a file
FileHelper::write( ComponentbuilderHelper::writeFile(
$main_path . $xmlFileName, $xml $main_path . $xmlFileName, $xml
); );
// set the zip full path // set the zip full path
$zipPath = $this->tempPath . '/' . $langZIPNames[$main_path] . '.zip'; $zipPath = $this->tempPath . '/' . $langZIPNames[$main_path] . '.zip';
// now zip the package // now zip the package
if (FileHelper::zip( if (ComponentbuilderHelper::zip(
$main_path, $zipPath $main_path, $zipPath
)) ))
{ {
// now remove the package // now remove the package
Factory::_('Utilities.Folder')->remove($main_path); ComponentbuilderHelper::removeFolder($main_path);
} }
} }
} }
@ -665,32 +677,13 @@ final class ComponentbuilderLanguagePackaging extends CMSPlugin implements Subsc
* check if a translation should be added * check if a translation should be added
* *
* @return bool * @return bool
* @deprecated 3.4 Use Factory::_('Language.Translation')->check(...); * @deprecated 3.4 Use CFactory::_('Language.Translation')->check(...);
*/ */
protected function shouldLanguageBeAdded(&$tag, &$languageStrings, &$total, &$file_name) protected function shouldLanguageBeAdded(&$tag, &$languageStrings, &$total, &$file_name) {
{
// only log messages for none $this->langTag translations // only log messages for none $this->langTag translations
Factory::_('Language.Translation')->check( CFactory::_('Language.Translation')->check(
$tag, $languageStrings, $total, $file_name $tag, $languageStrings, $total, $file_name
); );
} }
/**
* Returns an array of events this subscriber will listen to.
*
* @return array
*
* @since 5.0.0
*/
public static function getSubscribedEvents(): array
{
return [
'jcb_ce_onBeforeModelComponentData' => 'jcb_ce_onBeforeModelComponentData',
'jcb_ce_onAfterGet' => 'jcb_ce_onAfterGet',
'jcb_ce_onBeforeSetLangFileData' => 'jcb_ce_onBeforeSetLangFileData',
'jcb_ce_onBeforeBuildPluginLangFiles' => 'jcb_ce_onBeforeBuildPluginLangFiles',
'jcb_ce_onBeforeBuildModuleLangFiles' => 'jcb_ce_onBeforeBuildModuleLangFiles',
'jcb_ce_onBeforeBuildAllLangFiles' => 'jcb_ce_onBeforeBuildAllLangFiles'
];
}
} }

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<extension type="plugin" version="5.0" group="extension" method="upgrade"> <extension type="plugin" version="3.10" group="extension" method="upgrade">
<name>PLG_EXTENSION_COMPONENTBUILDERLANGUAGEPACKAGING</name> <name>PLG_EXTENSION_COMPONENTBUILDERLANGUAGEPACKAGING</name>
<creationDate>7th November, 2024</creationDate> <creationDate>7th November, 2024</creationDate>
<author>Llewellyn van der Merwe</author> <author>Llewellyn van der Merwe</author>
@ -7,8 +7,7 @@
<authorUrl>https://dev.vdm.io</authorUrl> <authorUrl>https://dev.vdm.io</authorUrl>
<copyright>Copyright (C) 2015 Vast Development Method. All rights reserved.</copyright> <copyright>Copyright (C) 2015 Vast Development Method. All rights reserved.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license> <license>GNU General Public License version 2 or later; see LICENSE.txt</license>
<version>3.0.0</version> <version>1.2.1</version>
<namespace path="src">VDM\Plugin\Extension\ComponentbuilderLanguagePackaging</namespace>
<description>PLG_EXTENSION_COMPONENTBUILDERLANGUAGEPACKAGING_XML_DESCRIPTION</description> <description>PLG_EXTENSION_COMPONENTBUILDERLANGUAGEPACKAGING_XML_DESCRIPTION</description>
<!-- Scripts to run on installation --> <!-- Scripts to run on installation -->
@ -16,17 +15,16 @@
<!-- Language files --> <!-- Language files -->
<languages folder="language"> <languages folder="language">
<language tag="en-GB">en-GB/plg_extension_componentbuilderlanguagepackaging.ini</language> <language tag="en-GB">en-GB/en-GB.plg_extension_componentbuilderlanguagepackaging.ini</language>
<language tag="en-GB">en-GB/plg_extension_componentbuilderlanguagepackaging.sys.ini</language> <language tag="en-GB">en-GB/en-GB.plg_extension_componentbuilderlanguagepackaging.sys.ini</language>
<language tag="af-ZA">af-ZA/plg_extension_componentbuilderlanguagepackaging.ini</language> <language tag="af-ZA">af-ZA/af-ZA.plg_extension_componentbuilderlanguagepackaging.ini</language>
<language tag="af-ZA">af-ZA/plg_extension_componentbuilderlanguagepackaging.sys.ini</language> <language tag="af-ZA">af-ZA/af-ZA.plg_extension_componentbuilderlanguagepackaging.sys.ini</language>
</languages> </languages>
<!-- Plugin files --> <!-- Plugin files -->
<files> <files>
<folder plugin="componentbuilderlanguagepackaging">services</folder> <filename plugin="componentbuilderlanguagepackaging">componentbuilderlanguagepackaging.php</filename>
<filename>index.html</filename> <filename>index.html</filename>
<folder>services</folder> <folder>language</folder>
<folder>src</folder>
</files> </files>
</extension> </extension>

View File

@ -1,3 +1,3 @@
PLG_EXTENSION_COMPONENTBUILDERLANGUAGEPACKAGING="Extension - Componentbuilder Language Packaging" PLG_EXTENSION_COMPONENTBUILDERLANGUAGEPACKAGING="Extension - Componentbuilder Language Packaging"
PLG_EXTENSION_COMPONENTBUILDERLANGUAGEPACKAGING_DESCRIPTION="This plugin is used to add language packaging to JCB. 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." PLG_EXTENSION_COMPONENTBUILDERLANGUAGEPACKAGING_DESCRIPTION="This plugin is used to add language packaging to JCB. 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."
PLG_EXTENSION_COMPONENTBUILDERLANGUAGEPACKAGING_XML_DESCRIPTION="<h1>Extension - Componentbuilder Language Packaging (v.3.0.0)</h1> <div style='clear: both;'></div><p>This plugin is used to add language packaging to JCB. 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.</p><p>Created by <a href='https://dev.vdm.io' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 10th March, 2024</small></p>" PLG_EXTENSION_COMPONENTBUILDERLANGUAGEPACKAGING_XML_DESCRIPTION="<h1>Extension - Componentbuilder Language Packaging (v.1.2.1)</h1> <div style='clear: both;'></div><p>This plugin is used to add language packaging to JCB. 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.</p><p>Created by <a href='https://dev.vdm.io' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 12th October, 2019</small></p>"

View File

@ -1,3 +1,3 @@
PLG_EXTENSION_COMPONENTBUILDERLANGUAGEPACKAGING="Extension - Componentbuilder Language Packaging" PLG_EXTENSION_COMPONENTBUILDERLANGUAGEPACKAGING="Extension - Componentbuilder Language Packaging"
PLG_EXTENSION_COMPONENTBUILDERLANGUAGEPACKAGING_DESCRIPTION="This plugin is used to add language packaging to JCB. 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." PLG_EXTENSION_COMPONENTBUILDERLANGUAGEPACKAGING_DESCRIPTION="This plugin is used to add language packaging to JCB. 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."
PLG_EXTENSION_COMPONENTBUILDERLANGUAGEPACKAGING_XML_DESCRIPTION="<h1>Extension - Componentbuilder Language Packaging (v.3.0.0)</h1> <div style='clear: both;'></div><p>This plugin is used to add language packaging to JCB. 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.</p><p>Created by <a href='https://dev.vdm.io' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 10th March, 2024</small></p>" PLG_EXTENSION_COMPONENTBUILDERLANGUAGEPACKAGING_XML_DESCRIPTION="<h1>Extension - Componentbuilder Language Packaging (v.1.2.1)</h1> <div style='clear: both;'></div><p>This plugin is used to add language packaging to JCB. 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.</p><p>Created by <a href='https://dev.vdm.io' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 12th October, 2019</small></p>"

View File

@ -13,129 +13,72 @@
defined('_JEXEC') or die('Restricted access'); defined('_JEXEC') or die('Restricted access');
use Joomla\CMS\Factory; use Joomla\CMS\Factory;
use Joomla\CMS\Version;
use Joomla\CMS\Installer\InstallerAdapter;
use Joomla\CMS\Language\Text; use Joomla\CMS\Language\Text;
use Joomla\Filesystem\File; use Joomla\CMS\Filesystem\File;
use Joomla\Filesystem\Folder; use Joomla\CMS\Filesystem\Folder;
/** /**
* Extension - Componentbuilder Language Packaging script file. * Extension - Componentbuilder Language Packaging script file.
* *
* @package ComponentbuilderLanguagePackaging * @package PlgExtensionComponentbuilderLanguagePackaging
*/ */
class plgExtensionComponentbuilderLanguagePackagingInstallerScript class plgExtensionComponentbuilderLanguagePackagingInstallerScript
{ {
/**
* 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/componentbuilderlanguagepackaging/componentbuilderlanguagepackaging.php'))
{
$this->deleteFiles[] = '/plugins/extension/componentbuilderlanguagepackaging/componentbuilderlanguagepackaging.php';
}
}
/** /**
* Called before any type of action * Called before any type of action
* *
* @param string $route Which action is happening (install|uninstall|discover_install|update) * @param string $route Which action is happening (install|uninstall|discover_install|update)
* @param InstallerAdapter $adapter The object responsible for running this script * @param Joomla\CMS\Installer\InstallerAdapter $adapter The object responsible for running this script
* *
* @return boolean True on success * @return boolean True on success
*/ */
public function preflight($route, $adapter) public function preflight($route, $adapter)
{ {
// set application to local method var, just use $this->app in future [we will drop $app in J6] // get application
$app = $this->app; $app = Factory::getApplication();
// the default for both install and update // the default for both install and update
$jversion = new Version(); $jversion = new JVersion();
if (!$jversion->isCompatible('5.0.0')) if (!$jversion->isCompatible('3.8.0'))
{ {
$app->enqueueMessage('Please upgrade to at least Joomla! 5.0.0 before continuing!', 'error'); $app->enqueueMessage('Please upgrade to at least Joomla! 3.8.0 before continuing!', 'error');
return false; return false;
} }
// remove old files and folders if ('install' === $route)
$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) // check that componentbuilder is installed
$pathToCore = JPATH_ADMINISTRATOR . '/components/com_componentbuilder/helpers/componentbuilder.php';
if (!is_file($pathToCore))
{ {
if (is_file(JPATH_ROOT . $file) && !File::delete(JPATH_ROOT . $file)) $app->enqueueMessage('Joomla Component Builder must first be installed from <a href="https://www.joomlacomponentbuilder.com/ " target="_blank">Joomla Component Builder</a>.', 'error');
return false;
}
// load the helper class
JLoader::register('ComponentbuilderHelper', JPATH_ADMINISTRATOR . '/components/com_componentbuilder/helpers/componentbuilder.php');
// block install
$blockInstall = true;
// check the version of JCB
$manifest = ComponentbuilderHelper::manifest();
if (isset($manifest->version) && strpos($manifest->version, '.') !== false)
{
// get the version
$jcbVersion = explode('.', $manifest->version);
// check that we have JCB 2.10.13 or higher installed
if (count($jcbVersion) == 3 && (($jcbVersion[0] == 2 && $jcbVersion[1] >= 10 && (($jcbVersion[1] == 10 && $jcbVersion[2] >= 13) || ($jcbVersion[1] > 10))) || $jcbVersion[0] >= 3))
{ {
echo Text::sprintf('JLIB_INSTALLER_ERROR_FILE_FOLDER', $file) . '<br>'; $blockInstall = false;
} }
} }
// allow install if all conditions are met
if ($blockInstall)
{
$app->enqueueMessage('Please upgrade to JCB 2.10.13 or higher before installing this plugin.', 'error');
return false;
}
} }
if (!empty($this->deleteFolders)) return true;
{
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) . '<br>';
}
}
}
} }
} }

View File

@ -1 +0,0 @@
<html><body bgcolor="#FFFFFF"></body></html>

View File

@ -1,48 +0,0 @@
<?php
/**
* @package Joomla.Component.Builder
*
* @created 30th April, 2015
* @author Llewellyn van der Merwe <https://dev.vdm.io>
* @git Joomla Component Builder <https://git.vdm.dev/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\ComponentbuilderLanguagePackaging\Extension\ComponentbuilderLanguagePackaging;
use Joomla\Database\DatabaseInterface;
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 ComponentbuilderLanguagePackaging(
$container->get(DispatcherInterface::class),
(array) PluginHelper::getPlugin('extension', 'componentbuilderlanguagepackaging')
);
$plugin->setApplication(Factory::getApplication());
$plugin->setDatabase($container->get(DatabaseInterface::class));
return $plugin;
}
);
}
};

View File

@ -1 +0,0 @@
<html><body bgcolor="#FFFFFF"></body></html>