joomla/Component-Builder
42
28 Fork 13
Code Issues 57 Pull Requests Projects Wiki Activity

Release of v5.1.1-rc1

Browse Source 
Move all banners to GitHub. Adds library phpspreadsheet to JCB. Adds import item example to demo component. Updates the Superpower class with the GetRemote class in the plugin. Ensures the super power autoloader triggers the correct repositories. Adds the ModalSelect fieldtype to Joomla Component Builder - J5. Adds the Data Import Function to the Demo Component. Adds new country related tables and fields to the Demo Component. Resolves the Database Updating issue in the compiler. #1212,#1209. Adds the Component Commands Plugin to the CLI for Import of spreadsheet data-sets. Add edit and create options to the ModalSelect Field (in Joomla 5). Add all needed Powers to the release package, to speed-up the build of the demo component. Refactor initialization flow to accommodate future scalability and integration with all designated areas. Refactor the Creator Builders class. Refactor the FieldString and FieldXML classes. Add JCB new package engine. Enhance operator support in dynamic get system. Relates to issue #1226. Fixes issue with loading the Component Builder Wiki. Adds advanced version update notice to the Component Builder Dashboard. Completely refactors the class that builds the Component Dashboard. #1134. Fix the FieldXML interface mismatch. #1228. Adds Initialize, Reset, and Push functionality to the Repository entities. Completely refactors the SQL tweaks and SQL dump classes. Fix bug in the filter of Languages by linked entities. #1230.
This commit is contained in:
Robot committed 2025-07-02 19:03:37 +00:00
1 parent 1702bd1f0c
commit 087e3a7c19
26 files changed
+795 -980
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

admin/src/Controller/AjaxController.php
+52
View File
@@ -83,6 +83,7 @@ class AjaxController extends BaseController
$this->registerTask('checkRuleName', 'ajax');
$this->registerTask('fieldTypeProperties', 'ajax');
$this->registerTask('getFieldPropertyDesc', 'ajax');
$this->registerTask('exportLanguageTranslations', 'ajax');
$this->registerTask('getCodeGlueOptions', 'ajax');
$this->registerTask('doSearch', 'ajax');
$this->registerTask('replaceAll', 'ajax');
@@ -1803,6 +1804,57 @@ class AjaxController extends BaseController
}
}
break;
case 'exportLanguageTranslations':
try
{
$filter_extensionValue = $jinput->get('filter_extension', NULL, 'STRING');
$filter_translatedValue = $jinput->get('filter_translated', NULL, 'STRING');
$filter_not_translatedValue = $jinput->get('filter_not_translated', NULL, 'STRING');
if($user->id != 0)
{
$ajaxModule = $this->getModel('ajax', 'Administrator');
if ($ajaxModule)
{
$result = $ajaxModule->exportLanguageTranslations($filter_extensionValue, $filter_translatedValue, $filter_not_translatedValue);
}
else
{
$result = ['error' => 'There was an error! [149]'];
}
}
else
{
$result = ['error' => 'There was an error! [149]'];
}
if($callback)
{
echo $callback . "(".json_encode($result).");";
}
elseif($returnRaw)
{
echo json_encode($result);
}
else
{
echo "(".json_encode($result).");";
}
}
catch(\Exception $e)
{
if($callback)
{
echo $callback."(".json_encode($e).");";
}
elseif($returnRaw)
{
echo json_encode($e);
}
else
{
echo "(".json_encode($e).");";
}
}
break;
case 'getCodeGlueOptions':
try
{
admin/src/Field/RepositoriesfiltertypeField.php
+78
View File
@@ -0,0 +1,78 @@
<?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
*/
namespace VDM\Component\Componentbuilder\Administrator\Field;
use Joomla\CMS\Factory;
use Joomla\CMS\Form\Field\ListField;
use Joomla\CMS\Language\Text;
use Joomla\CMS\HTML\HTMLHelper as Html;
use Joomla\CMS\Component\ComponentHelper;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
// No direct access to this file
\defined('_JEXEC') or die;
/**
* Repositoriesfiltertype Form Field class for the Componentbuilder component
*
* @since 1.6
*/
class RepositoriesfiltertypeField extends ListField
{
/**
* The repositoriesfiltertype field type.
*
* @var string
*/
public $type = 'Repositoriesfiltertype';
/**
* Method to get a list of options for a list input.
*
* @return array An array of Html options.
* @since 1.6
*/
protected function getOptions()
{
// Get a db connection.
$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
// Create a new query object.
$query = $db->getQuery(true);
// Select the text.
$query->select($db->quoteName('type'));
$query->from($db->quoteName('#__componentbuilder_repository'));
$query->order($db->quoteName('type') . ' 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_TYPE') . ' -');
if ($_results)
{
// get repositoriesmodel
$_model = ComponentbuilderHelper::getModel('repositories');
$_results = array_unique($_results);
foreach ($_results as $type)
{
// Translate the type selection
$_text = $_model->selectionTranslation($type,'type');
// Now add the type and its text to the options array
$_filter[] = Html::_('select.option', $type, Text::_($_text));
}
}
return $_filter;
}
}
admin/src/Helper/ComponentbuilderEmail.php
+2 -2
View File
@@ -420,7 +420,7 @@ abstract class ComponentbuilderEmail
'<title>' . htmlspecialchars($subject) . '</title>',
'<style type="text/css">',
'#outlook a {padding:0;} .ExternalClass {width:100%;} .ExternalClass, .ExternalClass p, .ExternalClass span, .ExternalClass font, .ExternalClass td, .ExternalClass div {line-height:100%;}',
'p {margin: 0; padding: 0; font-size: 0px; line-height: 0px;}',
// 'p {margin: 0; padding: 0; font-size: 0px; line-height: 0px;}',
'table, table td {border-collapse: collapse;}',
'img {display:block; outline:none; text-decoration:none; -ms-interpolation-mode:bicubic;}',
'a img {border:none;} a {text-decoration:none; color:#000001;} a.phone {pointer-events:auto; cursor:default; color:#000001 !important;}',
@@ -456,7 +456,7 @@ abstract class ComponentbuilderEmail
'<title>' . htmlspecialchars($subject) . '</title>',
'<style type="text/css">',
'#outlook a {padding:0;} .ExternalClass {width:100%;} .ExternalClass, .ExternalClass p, .ExternalClass span, .ExternalClass font, .ExternalClass td, .ExternalClass div {line-height:100%;}',
'p {margin: 0; padding: 0; font-size: 0px; line-height: 0px;}',
// 'p {margin: 0; padding: 0; font-size: 0px; line-height: 0px;}',
'table, table td {border-collapse: collapse;}',
'img {display:block; outline:none; text-decoration:none; -ms-interpolation-mode:bicubic;}',
'a img {border:none;} a {text-decoration:none; color:#000001;} a.phone {pointer-events:auto; cursor:default; color:#000001 !important;}',
admin/src/Helper/ComponentbuilderHelper.php
+25 -613
View File
@@ -38,14 +38,15 @@ use Joomla\Archive\Archive;
use Joomla\Filesystem\Folder;
use Joomla\Filesystem\Path;
use VDM\Joomla\Openai\Factory as OpenaiFactory;
use VDM\Joomla\Utilities\GuidHelper;
use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
use VDM\Joomla\Utilities\GetHelper;
use VDM\Joomla\Data\Factory as DataFactory;
use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
use VDM\Joomla\Utilities\FileHelper;
use VDM\Joomla\Utilities\GuidHelper;
use VDM\Joomla\Utilities\JsonHelper;
use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
use VDM\Joomla\Utilities\ObjectHelper;
use VDM\Joomla\Utilities\FileHelper;
use VDM\Joomla\Utilities\Component\Helper;
use VDM\Joomla\Utilities\GetHelper;
use VDM\Joomla\Utilities\SessionHelper;
use VDM\Joomla\Componentbuilder\Compiler\Utilities\FieldHelper;
use VDM\Joomla\Componentbuilder\Compiler\Factory as CompilerFactory;
@@ -103,12 +104,12 @@ abstract class ComponentbuilderHelper
/**
* Locked Libraries (we can not have these change)
**/
public static $libraryNames = array(1 => 'No Library', 2 => 'Bootstrap v4', 3 => 'Uikit v3', 4 => 'Uikit v2', 5 => 'FooTable v2', 6 => 'FooTable v3');
public static $libraryNames = [1 => 'No Library', 2 => 'Bootstrap v4', 3 => 'Uikit v3', 4 => 'Uikit v2', 5 => 'FooTable v2', 6 => 'FooTable v3'];
/**
* Array of php fields Allowed (16)
**/
public static $phpFieldArray = array('', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'x', 'HEADER');
public static $phpFieldArray = ['', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'x', 'HEADER'];
/**
* The global params
@@ -130,30 +131,6 @@ abstract class ComponentbuilderHelper
**/
protected static $exPowers= array();
/**
* The snippet paths
**/
public static $snippetPath = 'https://raw.githubusercontent.com/vdm-io/Joomla-Component-Builder-Snippets/master/';
public static $snippetsPath = 'https://api.github.com/repos/vdm-io/Joomla-Component-Builder-Snippets/git/trees/master';
/**
* The VDM packages paths
**/
public static $vdmGithubPackageUrl = "https://github.com/vdm-io/JCB-Packages/raw/master/";
public static $vdmGithubPackagesUrl = "https://api.github.com/repos/vdm-io/JCB-Packages/git/trees/master";
/**
* The JCB packages paths
**/
public static $jcbGithubPackageUrl = "https://github.com/vdm-io/JCB-Community-Packages/raw/master/";
public static $jcbGithubPackagesUrl = "https://api.github.com/repos/vdm-io/JCB-Community-Packages/git/trees/master";
/**
* The bolerplate paths
**/
public static $bolerplatePath = 'https://raw.githubusercontent.com/vdm-io/boilerplate/jcb/';
public static $bolerplateAPI = 'https://api.github.com/repos/vdm-io/boilerplate/git/trees/jcb';
/**
* The array of constant paths
*
@@ -206,527 +183,37 @@ abstract class ComponentbuilderHelper
);
/**
* get the class method or property
* Retrieves an associative array of published language tags as headers.
*
* @input mixed The method/property ID|GUID
* @input string The target type
* The returned array is used to build header labels for language translations.
* Includes a default 'source' => 'source' entry.
*
* @returns string on success
* @since 3.0.0
* @return array<string, string> Associative array of language headers
* @since 5.1.1
*/
public static function getClassCode($target, string $type): ?string
public static function getLanguageTranslationsHeaders(): array
{
if ('property' === $type || 'method' === $type)
{
if (GuidHelper::valid($target))
{
$key = 'guid';
}
elseif (is_numeric($target))
{
$key = 'id';
}
else
{
return null;
}
$values = DataFactory::_('Load')->values(
['langtag'], ['language'], ['published' => 1], ['name' => 'ASC']
);
// Get a db connection.
$db = Factory::getDbo();
// Get user object
$user = Factory::getUser();
// Create a new query object.
$query = $db->getQuery(true);
// get method
if ('method' === $type)
{
$query->select($db->quoteName(['a.comment','a.name','a.visibility','a.arguments','a.code']));
}
// get property
elseif ('property' === $type)
{
$query->select($db->quoteName(['a.comment','a.name','a.visibility','a.default']));
}
$query->from($db->quoteName('#__componentbuilder_class_' . $type, 'a'));
$query->where($db->quoteName('a.' . $key) . ' = ' . $db->quote($target));
// Implement View Level Access
if (!$user->authorise('core.options', 'com_componentbuilder'))
{
$columns = $db->getTableColumns('#__componentbuilder_class_' . $type);
if(isset($columns['access']))
{
$groups = implode(',', $user->getAuthorisedViewLevels());
$query->where('a.access IN (' . $groups . ')');
}
}
$db->setQuery($query);
$db->execute();
if ($db->getNumRows())
{
// get the code
$code = $db->loadObject();
// combine method values
$combinded = [];
// add comment if set
if (UtilitiesStringHelper::check($code->comment))
{
$comment = array_map('trim', (array) explode(PHP_EOL, base64_decode($code->comment)));
$combinded[] = "\t" . implode(PHP_EOL . "\t ", $comment);
}
// build method
if ('method' === $type)
{
// set the method signature
if (UtilitiesStringHelper::check($code->arguments))
{
$combinded[] = "\t" . $code->visibility . ' function ' . $code->name . '(' . base64_decode($code->arguments) . ')';
}
else
{
$combinded[] = "\t" . $code->visibility . ' function ' . $code->name . '()';
}
// set the method code
$combinded[] = "\t" . "{";
// add code if set
if (UtilitiesStringHelper::check(trim($code->code)))
{
$combinded[] = base64_decode($code->code);
}
else
{
$combinded[] = "\t\t// add your code here";
}
$combinded[] = "\t" . "}";
}
else
{
if (UtilitiesStringHelper::check($code->default))
{
$code->default = base64_decode($code->default);
if (is_int($code->default))
{
// set the class property
$combinded[] = "\t" . $code->visibility . ' $' . $code->name . ' = ' . (int) $code->default . ';';
}
elseif (is_float($code->default))
{
// set the class property
$combinded[] = "\t" . $code->visibility . ' $' . $code->name . ' = ' . (float) $code->default . ';';
}
elseif (('false' === $code->default || 'true' === $code->default)
|| (UtilitiesStringHelper::check($code->default) && (strpos($code->default, 'array(') !== false || strpos($code->default, '"') !== false)))
{
// set the class property
$combinded[] = "\t" . $code->visibility . ' $' . $code->name . ' = ' . $code->default . ';';
}
elseif (UtilitiesStringHelper::check($code->default) && strpos($code->default, '"') === false)
{
// set the class property
$combinded[] = "\t" . $code->visibility . ' $' . $code->name . ' = "' . $code->default . '";';
}
else
{
// set the class property
$combinded[] = "\t" . $code->visibility . ' $' . $code->name . ';';
}
}
else
{
// set the class property
$combinded[] = "\t" . $code->visibility . ' $' . $code->name . ';';
}
}
// return the code
return implode(PHP_EOL, $combinded);
}
if (empty($values))
{
// return default array
return ['source' => 'source', 'af-ZA' => 'af-ZA', 'nl-NL' => 'nl-NL', 'fr-FR' => 'fr-FR', 'de-DE' => 'de-DE', 'pt-PT' => 'pt-PT', 'ru-RU' => 'ru-RU'];
}
return null;
}
/**
* extract Boilerplate Class Extends
*
* @input string The class as a string
* @input string The type of class/extension
*
* @returns string on success
* @since 3.0.0
*/
public static function extractBoilerplateClassExtends(&$class, $type)
{
if (($strings = GetHelper::allBetween($class, 'class ', '}')) !== false && UtilitiesArrayHelper::check($strings))
{
foreach ($strings as $string)
{
if (($extends = GetHelper::between($string, 'extends ', '{')) !== false && UtilitiesStringHelper::check($extends))
{
return trim($extends);
}
}
}
return false;
}
$headers = ['source' => 'source'];
/**
* extract Boilerplate Class Header
*
* @input string The class as a string
* @input string The class being extended
* @input string The type of class/extension
*
* @returns string on success
* @since 3.0.0
*/
public static function extractBoilerplateClassHeader(&$class, $extends, $type)
{
if (($string = GetHelper::between($class, "defined('_JEXEC')", 'extends ' . $extends)) !== false && UtilitiesStringHelper::check($string))
foreach ($values as $value)
{
$headArray = explode(PHP_EOL, $string);
if (UtilitiesArrayHelper::check($headArray) && count($headArray) > 3)
if (is_string($value) && trim($value) !== '')
{
// remove first since it still has the [or die;] string in it
array_shift($headArray);
// remove the last since it has the class declaration
array_pop($headArray);
// at this point we have the class comment still in as part of the header, lets remove that
$last = count($headArray);
while ($last > 0)
{
$last--;
if (isset($headArray[$last]) && strpos($headArray[$last], '*') !== false)
{
unset($headArray[$last]);
}
else
{
// moment the comment stops, we break out
$last = 0;
}
}
// make sure we only return if we have values
if (UtilitiesArrayHelper::check($headArray))
{
return implode(PHP_EOL, $headArray);
}
$headers[$value] = $value;
}
}
return false;
}
/**
* extract Boilerplate Class Comment
*
* @input string The class as a string
* @input string The class being extended
* @input string The type of class/extension
*
* @returns string on success
* @since 3.0.0
*/
public static function extractBoilerplateClassComment(&$class, $extends, $type)
{
if (($string = GetHelper::between($class, "defined('_JEXEC')", 'extends ' . $extends)) !== false && UtilitiesStringHelper::check($string))
{
$headArray = explode(PHP_EOL, $string);
if (UtilitiesArrayHelper::check($headArray) && count($headArray) > 3)
{
$comment = array();
// remove the last since it has the class declaration
array_pop($headArray);
// at this point we have the class comment still in as part of the header, lets remove that
$last = count($headArray);
while ($last > 0)
{
$last--;
if (isset($headArray[$last]) && strpos($headArray[$last], '*') !== false)
{
$comment[$last] = $headArray[$last];
}
else
{
// moment the comment stops, we break out
$last = 0;
}
}
// make sure we only return if we have values
if (UtilitiesArrayHelper::check($comment))
{
// set the correct order
ksort($comment);
$replace = array('Foo' => '[[[Plugin_name]]]', '[PACKAGE_NAME]' => '[[[Plugin]]]', '1.0.0' => '[[[plugin.version]]]', '1.0' => '[[[plugin.version]]]');
// now update with JCB placeholders
return str_replace(array_keys($replace), array_values($replace), implode(PHP_EOL, $comment));
}
}
}
return false;
}
/**
* extract Boilerplate Class Properties & Methods
*
* @input string The class as a string
* @input string The class being extended
* @input string The type of class/extension
* @input int The plugin groups
*
* @returns string on success
* @since 3.0.0
*/
public static function extractBoilerplateClassPropertiesMethods(&$class, $extends, $type, $plugin_group = null)
{
$bucket = array('property' => array(), 'method' => array());
// get the class code, and remove the head
$codeArrayTmp = explode('extends ' . $extends, $class);
// make sure we have the correct result
if (UtilitiesArrayHelper::check($codeArrayTmp) && count($codeArrayTmp) == 2)
{
// the triggers
$triggers = array('public' => 1, 'protected' => 2, 'private' => 3);
$codeArray = explode(PHP_EOL, $codeArrayTmp[1]);
unset($codeArrayTmp);
// clean the code
self::cleanBoilerplateCode($codeArray);
// temp bucket
$name = null;
$arg = null;
$target = null;
$visibility = null;
$tmp = array();
$comment = array();
// load method
$loadCode = function (&$bucket, &$target, &$name, &$arg, &$visibility, &$tmp, &$comment) use($type, $plugin_group){
$_tmp = array(
'name' => $name,
'visibility' => $visibility,
'extension_type' => $type
);
// build filter
$filters = array('extension_type' => $type);
// add more data based on target
if ('method' === $target && UtilitiesArrayHelper::check($tmp))
{
// clean the code
self::cleanBoilerplateCode($tmp);
// only load if there are values
if (UtilitiesArrayHelper::check($tmp, true))
{
$_tmp['code'] = implode(PHP_EOL, $tmp);
}
else
{
$_tmp['code'] = '';
}
// load arguments only if set
if (UtilitiesStringHelper::check($arg))
{
$_tmp['arguments'] = $arg;
}
}
elseif ('property' === $target)
{
// load default only if set
if (UtilitiesStringHelper::check($arg))
{
$_tmp['default'] = $arg;
}
}
// load comment only if set
if (UtilitiesArrayHelper::check($comment, true))
{
$_tmp['comment'] = implode(PHP_EOL, $comment);
}
// load the group target
if ($plugin_group)
{
$_tmp['joomla_plugin_group'] = $plugin_group;
$filters['joomla_plugin_group'] = $plugin_group;
}
// load the local values
if (($locals = self::getLocalBoilerplate($name, $target, $type, $filters)) !== false)
{
foreach ($locals as $key => $value)
{
$_tmp[$key] = $value;
}
}
else
{
$_tmp['id'] = 0;
$_tmp['published'] = 1;
$_tmp['version'] = 1;
}
// store the data based on target
$bucket[$target][] = $_tmp;
};
// now we start loading
foreach($codeArray as $line)
{
if ($visibility && $target && $name && strpos($line, '/**') !== false)
{
$loadCode($bucket, $target, $name, $arg, $visibility, $tmp, $comment);
// reset loop buckets
$name = null;
$arg = null;
$target = null;
$visibility = null;
$tmp = array();
$comment = array();
}
// load the comment before method/property
if (!$visibility && !$target && !$name && strpos($line, '*') !== false)
{
$comment[] = rtrim($line);
}
else
{
if (!$visibility && !$target && !$name)
{
// get the line values
$lineArray = array_values(array_map('trim', preg_split('/\s+/', trim($line))));
// check if we are at the main line
if (isset($lineArray[0]) && isset($triggers[$lineArray[0]]))
{
$visibility = $lineArray[0];
if (strpos($line, 'function') !== false)
{
$target = 'method';
// get the name
$name = trim(GetHelper::between($line, 'function ', '('));
// get the arguments
$arg = trim(GetHelper::between($line, ' ' . $name . '(', ')'));
}
else
{
$target = 'property';
if (strpos($line, '=') !== false)
{
// get the name
$name = trim(GetHelper::between($line, '$', '='));
// get the default
$arg = trim(GetHelper::between($line, '=', ';'));
}
else
{
// get the name
$name = trim(GetHelper::between($line, '$', ';'));
}
}
}
}
else
{
$tmp[] = rtrim($line);
}
}
}
// check if a last method is still around
if ($visibility && $target && $name)
{
$loadCode($bucket, $target, $name, $arg, $visibility, $tmp, $comment);
// reset loop buckets
$name = null;
$arg = null;
$target = null;
$visibility = null;
$tmp = array();
$comment = array();
}
return $bucket;
}
return false;
}
protected static function getLocalBoilerplate($name, $table, $extension_type, $filters = array())
{
if ('property' === $table || 'method' === $table)
{
// Get a db connection.
$db = Factory::getDbo();
// Create a new query object.
$query = $db->getQuery(true);
// get method
$query->select($db->quoteName(array('a.id','a.published','a.version')));
$query->from($db->quoteName('#__componentbuilder_class_' . $table,'a'));
$query->where($db->quoteName('a.name') . ' = ' . $db->quote($name));
$query->where($db->quoteName('a.extension_type') . ' = ' . $db->quote($extension_type));
// add more filters
if (UtilitiesArrayHelper::check($filters))
{
foreach($filters as $where => $value)
{
if (is_numeric($value))
{
$query->where($db->quoteName('a.' . $where) . ' = ' . $value);
}
else
{
$query->where($db->quoteName('a.' . $where) . ' = ' . $db->quote($value));
}
}
}
$db->setQuery($query);
$db->execute();
if ($db->getNumRows())
{
// get the code
return $db->loadAssoc();
}
}
return false;
}
protected static function cleanBoilerplateCode(&$code)
{
// remove the first lines until a { is found
$key = 0;
$found = false;
while (!$found)
{
if (isset($code[$key]))
{
if (strpos($code[$key], '{') !== false)
{
unset($code[$key]);
// only remove the first } found
$found = true;
}
// remove empty lines
elseif (!UtilitiesStringHelper::check(trim($code[$key])))
{
unset($code[$key]);
}
}
// check next line
$key++;
// stop loop at line 30 (really this should never happen)
if ($key > 30)
{
$found = true;
}
}
// reset all keys
$code = array_values($code);
// remove last lines until }
$last = count($code);
while ($last > 0)
{
$last--;
if (isset($code[$last]))
{
if (strpos($code[$last], '}') !== false)
{
unset($code[$last]);
// only remove the first } found
$last = 0;
}
// remove empty lines
elseif (!UtilitiesStringHelper::check(trim($code[$last])))
{
unset($code[$last]);
}
}
}
return $headers;
}
/**
@@ -797,81 +284,6 @@ abstract class ComponentbuilderHelper
return is_array($items) ? $items : null;
}
/**
* Get the snippet contributor details
*
* @param string $filename The file name
* @param string $type The type of file
*
* @return array On success the contributor details
* @since 3.0.0
*/
public static function getContributorDetails(string $filename, string $type = 'snippet'): ?array
{
// start loading the contributor details
$contributor = [];
// get the path & content
switch ($type)
{
case 'snippet':
$path = self::$snippetPath.$filename;
// get the file if available
$content = FileHelper::getContent($path);
if (JsonHelper::check($content))
{
$content = json_decode($content, true);
}
break;
default:
// only allow types that are being targeted
return null;
break;
}
// see if we have content and all needed details
if (isset($content) && UtilitiesArrayHelper::check($content)
&& isset($content['contributor_company'])
&& isset($content['contributor_name'])
&& isset($content['contributor_email'])
&& isset($content['contributor_website']))
{
// got the details from file
return [
'contributor_company' => $content['contributor_company'] ,
'contributor_name' => $content['contributor_name'],
'contributor_email' => $content['contributor_email'],
'contributor_website' => $content['contributor_website'],
'origin' => 'file'
];
}
// get the global settings
if (!ObjectHelper::check(self::$params))
{
self::$params = ComponentHelper::getParams('com_componentbuilder');
}
// get the global company details
if (!UtilitiesArrayHelper::check(self::$localCompany))
{
// Set the person sharing information (default VDM ;)
self::$localCompany['company'] = self::$params->get('export_company', 'Vast Development Method');
self::$localCompany['owner'] = self::$params->get('export_owner', 'Llewellyn van der Merwe');
self::$localCompany['email'] = self::$params->get('export_email', 'joomla@vdm.io');
self::$localCompany['website'] = self::$params->get('export_website', 'https://www.vdm.io/');
}
// default global
return [
'contributor_company' => self::$localCompany['company'],
'contributor_name' => self::$localCompany['owner'],
'contributor_email' => self::$localCompany['email'],
'contributor_website' => self::$localCompany['website'],
'origin' => 'global'
];
}
/**
* Get the library files
*
admin/src/Model/AjaxModel.php
+233
View File
@@ -42,6 +42,8 @@ use VDM\Joomla\Utilities\Base64Helper;
use VDM\Joomla\Componentbuilder\Table\Search;
use VDM\Joomla\Componentbuilder\Compiler\Utilities\FieldHelper;
use VDM\Joomla\Utilities\FormHelper;
use VDM\Joomla\Componentbuilder\Utilities\FilterHelper;
use VDM\Joomla\Data\Factory as DataFactory;
use VDM\Joomla\Componentbuilder\Package\Factory as PackageFactory;
use VDM\Joomla\Componentbuilder\Fieldtype\Factory as FieldtypeFactory;
use VDM\Joomla\Componentbuilder\JoomlaPower\Factory as JoomlaPowerFactory;
@@ -4872,6 +4874,237 @@ class AjaxModel extends ListModel
return $xml;
}
// Used in language_translation
/**
* Export language translation data by filtering records based on extension, translated, and untranslated tags.
*
* This method loads translation records from the database and structures them into an array
* with language-tagged headers (e.g., `en-GB`, `de-DE`). It supports filtering for a specific
* extension, already translated languages, and missing translations. All matching records are
* padded with empty values for missing languages, and returned with a size count or errors.
*
* @param string $extension The extension identifier in format "type__name" (e.g., "com_example__field").
* @param string $translated Comma-separated list of language tags that must have translations.
* @param string $notTranslated Comma-separated list of language tags that must not yet have translations.
*
* @return array<string, mixed> Returns an array with:
* - 'data' (array<int, array<string, string>>): The exportable translation rows.
* - 'size' (int): Number of rows (if successful).
* - 'errors' (string): Error message (if an error occurred).
*
* @throws \Throwable If any unexpected exception occurs during data fetching or parsing.
* @since 5.1.1
*/
public function exportLanguageTranslations(string $extension, string $translated, string $notTranslated): array
{
try {
$ids = $this->resolveLanguageTranslationFilterIds($extension, $translated, $notTranslated);
$where = $this->buildLanguageTranslationWhereClause($ids);
$records = $this->loadLanguageTranslationRows($where);
$headers = $this->getLanguageTranslationHeaders();
if (empty($records))
{
return $this->errorLanguageTranslationResponse(Text::_('COM_COMPONENTBUILDER_NO_LANGUAGE_STRINGS_FOUND'));
}
$data = $this->normalizeLanguageTranslationData($records, $headers);
return [
'data' => $data,
'size' => count($data),
];
} catch (\Throwable $e) {
return $this->errorLanguageTranslationResponse($e->getMessage());
}
}
/**
* Resolve all relevant record IDs from the given filters.
*
* @param string $extension Extension string in format "type__name".
* @param string $translated Comma-separated list of translated language tags.
* @param string $notTranslated Comma-separated list of untranslated language tags.
*
* @return array<int>|null Array of record IDs, or empty array to load all or null to force a skip all.
* @since 5.1.1
*/
protected function resolveLanguageTranslationFilterIds(string $extension, string $translated, string $notTranslated): ?array
{
$ids = [];
$forceEmpty = false;
// Extension IDs
if (!empty($extension) && strpos($extension, '__') !== false)
{
[$type, $name] = explode('__', $extension, 2);
$extIds = FilterHelper::translation($name, $type);
if (!empty($extIds))
{
$ids = array_merge($ids, $extIds);
}
else
{
$forceEmpty = true;
}
}
// Translated IDs
if (!empty($translated))
{
$trIds = FilterHelper::translations($translated);
if (!empty($trIds))
{
$ids = array_merge($ids, $trIds);
}
else
{
$forceEmpty = true;
}
}
// Not translated IDs
if (!empty($notTranslated))
{
$untrIds = FilterHelper::translations($notTranslated, false);
if (!empty($untrIds))
{
$ids = array_merge($ids, $untrIds);
}
else
{
$forceEmpty = true;
}
}
if ($ids === [] && !$forceEmpty)
{
return [];
}
return $forceEmpty ? null : array_unique($ids);
}
/**
* Build a SQL WHERE clause using resolved IDs.
*
* @param array<int>|null $ids The record IDs to include in the query.
*
* @return array<string, array<string, mixed>> A structured WHERE clause.
* @since 5.1.1
*/
protected function buildLanguageTranslationWhereClause(?array $ids): array
{
if ($ids === [])
{
// return all published
return ['published' => ['value' => 1, 'operator' => '=', 'quote' => false]];
}
elseif ($ids === null)
{
// return none
return ['id' => ['value' => 0, 'operator' => '=', 'quote' => false]];
}
// return selected and published
return [
'id' => ['value' => $ids, 'operator' => 'IN', 'quote' => false],
'published' => ['value' => 1, 'operator' => '=', 'quote' => false]
];
}
/**
* Load translation rows from the database based on the given WHERE clause.
*
* @param array<string, array<string, mixed>>|null $where Optional WHERE clause.
*
* @return array<int, array<string, mixed>> Loaded records with 'source' and 'translation' keys.
* @since 5.1.1
*/
protected function loadLanguageTranslationRows(?array $where): array
{
return DataFactory::_('Load')->rows(
['source', 'translation'],
['language_translation'],
$where,
['source' => 'ASC']
);
}
/**
* Get the list of available language headers (e.g., ['en-GB' => 'en-GB']).
*
* This includes a default 'source' => 'source' entry.
*
* @return array<string, string> Associative list of language tags.
* @since 5.1.1
*/
protected function getLanguageTranslationHeaders(): array
{
return ComponentbuilderHelper::getLanguageTranslationsHeaders() ?? ['source' => 'source'];
}
/**
* Normalize translation records by mapping language keys and padding missing headers.
*
* @param array<int, array<string, mixed>> $rows Raw translation rows from the database.
* @param array<string, string> $headers Valid language header list.
*
* @return array<int, array<string, string>> Structured translation data ready for export.
* @since 5.1.1
*/
protected function normalizeLanguageTranslationData(array $rows, array $headers): array
{
$normalized = [];
foreach ($rows as $row)
{
$translations = json_decode($row['translation'] ?? '[]', true) ?: [];
unset($row['translation']);
// Pad all expected language headers
foreach ($headers as $lang => $_)
{
if ($lang === 'source')
{
continue;
}
$row[$lang] = '';
}
foreach ($translations as $entry)
{
$lang = $entry['language'] ?? '';
$text = trim(($entry['translation'] ?? ''));
if (isset($headers[$lang]) && trim($text) !== '')
{
$row[$lang] = $text;
}
}
$normalized[] = $row;
}
return $normalized;
}
/**
* Build a standardized error response with message.
*
* @param string $message Error message to return.
*
* @return array<string, mixed> Error response with 'data' as empty array and 'errors' as message.
* @since 5.1.1
*/
protected function errorLanguageTranslationResponse(string $message): array
{
return [
'data' => [],
'errors' => $message,
];
}
// Used in admin_fields_relations
public function getCodeGlueOptions($listfield, $joinfields, $type, $area)
{
admin/src/Model/Language_translationModel.php
-91
View File
@@ -29,10 +29,7 @@ use Joomla\Utilities\ArrayHelper;
use Joomla\Input\Input;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use Joomla\CMS\Helper\TagsHelper;
use VDM\Joomla\Utilities\SessionHelper;
use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
use VDM\Joomla\Utilities\ObjectHelper;
use VDM\Joomla\Utilities\GuidHelper;
use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
// No direct access to this file
@@ -118,62 +115,6 @@ class Language_translationModel extends AdminModel
return parent::getTable($type, $prefix, $config);
}
/**
* Retrieves or generates a Vast Development Method (VDM) key for the current item.
*
* This function performs the following operations:
* 1. Checks if the VDM key is already set. If not, it proceeds to generate or retrieve one.
* 2. Determines the item ID based on the presence of a specific argument.
* 3. Attempts to retrieve an existing VDM key from a helper method using the item ID.
* 4. If a VDM key is not found, it generates a new random VDM key.
* 5. Stores the VDM key and associates it with the item ID in a helper method.
* 6. Optionally, stores return and GUID values if available.
* 7. Returns the VDM key.
*
* @return string The VDM key for the current item.
*/
public function getVDM()
{
if (!isset($this->vastDevMod))
{
$_id = 0; // new item probably (since it was not set in the getItem method)
if (empty($_id))
{
$id = 0;
}
else
{
$id = $_id;
}
// set the id and view name to session
if (($vdm = SessionHelper::get('language_translation__'.$id)) !== null)
{
$this->vastDevMod = $vdm;
}
else
{
// set the vast development method key
$this->vastDevMod = UtilitiesStringHelper::random(50);
SessionHelper::set($this->vastDevMod, 'language_translation__'.$id);
SessionHelper::set('language_translation__'.$id, $this->vastDevMod);
// set a return value if found
$jinput = Factory::getApplication()->input;
$return = $jinput->get('return', null, 'base64');
SessionHelper::set($this->vastDevMod . '__return', $return);
// set a GUID value if found
if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
&& GuidHelper::valid($item->guid))
{
SessionHelper::set($this->vastDevMod . '__guid', $item->guid);
}
}
}
return $this->vastDevMod;
}
/**
* Method to get a single record.
*
@@ -233,38 +174,6 @@ class Language_translationModel extends AdminModel
$translation->loadString($item->translation);
$item->translation = $translation->toArray();
}
if (empty($item->id))
{
$id = 0;
}
else
{
$id = $item->id;
}
// set the id and view name to session
if (($vdm = SessionHelper::get('language_translation__'.$id)) !== null)
{
$this->vastDevMod = $vdm;
}
else
{
// set the vast development method key
$this->vastDevMod = UtilitiesStringHelper::random(50);
SessionHelper::set($this->vastDevMod, 'language_translation__'.$id);
SessionHelper::set('language_translation__'.$id, $this->vastDevMod);
// set a return value if found
$jinput = Factory::getApplication()->input;
$return = $jinput->get('return', null, 'base64');
SessionHelper::set($this->vastDevMod . '__return', $return);
// set a GUID value if found
if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
&& GuidHelper::valid($item->guid))
{
SessionHelper::set($this->vastDevMod . '__guid', $item->guid);
}
}
}
return $item;
admin/src/Model/Language_translationsModel.php
-100
View File
@@ -28,7 +28,6 @@ use VDM\Joomla\Componentbuilder\Utilities\FilterHelper as JCBFilterHelper;
use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
use VDM\Joomla\Utilities\ObjectHelper;
use VDM\Joomla\Utilities\StringHelper;
use VDM\Joomla\Utilities\JsonHelper;
use Joomla\CMS\Form\Form;
// No direct access to this file
@@ -282,55 +281,6 @@ class Language_translationsModel extends ListModel
}
}
}
// prep the lang strings for export
if (isset($_export) && $_export && UtilitiesArrayHelper::check($items))
{
// insure we have the same order in the languages
$languages = ComponentbuilderHelper::getVars('language', 1, 'published', 'langtag');
foreach ($items as $nr => &$item)
{
// remove some values completely
unset($item->components);
unset($item->modules);
unset($item->plugins);
unset($item->params);
unset($item->published);
unset($item->created_by);
unset($item->modified_by);
unset($item->created);
unset($item->modified);
unset($item->version);
unset($item->hits);
unset($item->access);
unset($item->ordering);
// set the lang order
if ($nr != 0)
{
foreach ($languages as $lanTag)
{
$item->{$lanTag} = '';
}
// now adapt the source
if (isset($item->translation) && JsonHelper::check($item->translation))
{
$translations = json_decode($item->translation, true);
if (UtilitiesArrayHelper::check($translations))
{
foreach ($translations as $language)
{
if (isset($language['translation']) && StringHelper::check($language['translation'])
&& isset($language['language']) && StringHelper::check($language['language']))
{
$item->{$language['language']} = $language['translation'];
}
}
}
}
}
// remove translation
unset($item->translation);
}
}
// return items
return $items;
@@ -606,56 +556,6 @@ class Language_translationsModel extends ListModel
{
array_unshift($items,$headers);
}
// prep the lang strings for export
if (isset($_export) && $_export && UtilitiesArrayHelper::check($items))
{
// insure we have the same order in the languages
$languages = ComponentbuilderHelper::getVars('language', 1, 'published', 'langtag');
foreach ($items as $nr => &$item)
{
// remove some values completely
unset($item->components);
unset($item->modules);
unset($item->plugins);
unset($item->params);
unset($item->published);
unset($item->created_by);
unset($item->modified_by);
unset($item->created);
unset($item->modified);
unset($item->version);
unset($item->hits);
unset($item->access);
unset($item->ordering);
// set the lang order
if ($nr != 0)
{
foreach ($languages as $lanTag)
{
$item->{$lanTag} = '';
}
// now adapt the source
if (isset($item->translation) && JsonHelper::check($item->translation))
{
$translations = json_decode($item->translation, true);
if (UtilitiesArrayHelper::check($translations))
{
foreach ($translations as $language)
{
if (isset($language['translation']) && StringHelper::check($language['translation'])
&& isset($language['language']) && StringHelper::check($language['language']))
{
$item->{$language['language']} = $language['translation'];
}
}
}
}
}
// remove translation
unset($item->translation);
}
}
return $items;
}
}
admin/src/Model/RepositoriesModel.php
+116 -10
View File
@@ -23,9 +23,11 @@ use Joomla\Utilities\ArrayHelper;
use Joomla\Input\Input;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use Joomla\CMS\Helper\TagsHelper;
use VDM\Joomla\Utilities\FormHelper;
use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
use VDM\Joomla\Utilities\ObjectHelper;
use VDM\Joomla\Utilities\StringHelper;
use Joomla\CMS\Form\Form;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -89,8 +91,8 @@ class RepositoriesModel extends ListModel
'a.organisation','organisation',
'a.repository','repository',
'a.target','target',
'a.base','base',
'a.type','type'
'a.type','type',
'a.base','base'
);
}
@@ -99,6 +101,48 @@ class RepositoriesModel extends ListModel
$this->app ??= Factory::getApplication();
}
/**
* Get the filter form - Override the parent method
*
* @param array $data data
* @param boolean $loadData load current data
*
* @return Form|boolean The Form object or false on error
*
* @since JCB 2.12.5
*/
public function getFilterForm($data = array(), $loadData = true)
{
// load form from the parent class
$form = parent::getFilterForm($data, $loadData);
// Create the "read write branch" filter
$attributes = array(
'name' => 'branch',
'type' => 'list',
'onchange' => 'this.form.submit();',
);
$options = [
'' => '- ' . Text::_('COM_COMPONENTBUILDER_SELECT_BRANCH_STATE') . ' -',
'write' => Text::_('COM_COMPONENTBUILDER_WRITE_BRANCH_SET'),
'no_write' => Text::_('COM_COMPONENTBUILDER_NO_WRITE_BRANCH_SET'),
'read' => Text::_('COM_COMPONENTBUILDER_READ_BRANCH_SET'),
'no_read' => Text::_('COM_COMPONENTBUILDER_NO_READ_BRANCH_SET'),
'both' => Text::_('COM_COMPONENTBUILDER_BOTH_BRANCHES_SET'),
'none' => Text::_('COM_COMPONENTBUILDER_NO_BRANCHES_SET')
];
$form->setField(FormHelper::xml($attributes, $options),'filter');
$form->setValue(
'branch',
'filter',
$this->state->get("filter.branch")
);
array_push($this->filter_fields, 'branch');
return $form;
}
/**
* Method to auto-populate the model state.
*
@@ -166,13 +210,6 @@ class RepositoriesModel extends ListModel
$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)
{
@@ -180,6 +217,13 @@ class RepositoriesModel extends ListModel
$this->setState('filter.type', $type);
}
$base = $this->getUserStateFromRequest($this->context . '.filter.base', 'filter_base');
if ($formSubmited)
{
$base = $app->input->post->get('base');
$this->setState('filter.base', $base);
}
// List state information.
parent::populateState($ordering, $direction);
}
@@ -298,6 +342,51 @@ class RepositoriesModel extends ListModel
// From the componentbuilder_item table
$query->from($db->quoteName('#__componentbuilder_repository', 'a'));
// Filtering by "branch"
$filterBranch = $this->state->get('filter.branch');
// Ensure the filter value is a string and not empty
if (is_string($filterBranch) && $filterBranch !== '')
{
$readBranch = 'CHAR_LENGTH(TRIM(' . $db->quoteName('a.read_branch') . '))';
$writeBranch = 'CHAR_LENGTH(TRIM(' . $db->quoteName('a.write_branch') . '))';
switch ($filterBranch)
{
case 'both':
// Both read_branch and write_branch must be set
$query->where("{$readBranch} > 1");
$query->where("{$writeBranch} > 1");
break;
case 'none':
// Neither read_branch nor write_branch must be set
$query->where("{$readBranch} = 0");
$query->where("{$writeBranch} = 0");
break;
case 'read':
// Only read_branch must be set
$query->where("{$readBranch} > 1");
break;
case 'write':
// Only write_branch must be set
$query->where("{$writeBranch} > 1");
break;
case 'no_read':
// Only read_branch must NOT be set
$query->where("{$readBranch} = 0");
break;
case 'no_write':
// Only write_branch must NOT be set
$query->where("{$writeBranch} = 0");
break;
}
}
// Filter by published state
$published = $this->getState('filter.published');
if (is_numeric($published))
@@ -397,6 +486,23 @@ class RepositoriesModel extends ListModel
{
$query->where('a.target = ' . $db->quote($db->escape($_target)));
}
// Filter by Type.
$_type = $this->getState('filter.type');
if (is_numeric($_type))
{
if (is_float($_type))
{
$query->where('a.type = ' . (float) $_type);
}
else
{
$query->where('a.type = ' . (int) $_type);
}
}
elseif (StringHelper::check($_type))
{
$query->where('a.type = ' . $db->quote($db->escape($_type)));
}
// Filter by Base.
$_base = $this->getState('filter.base');
if (is_numeric($_base))
@@ -458,8 +564,8 @@ class RepositoriesModel extends ListModel
$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');
$id .= ':' . $this->getState('filter.base');
return parent::getStoreId($id);
}
admin/src/View/Language_translation/HtmlView.php
+1 -9
View File
@@ -403,14 +403,6 @@ class HtmlView extends BaseHtmlView
{
Html::_('script', $script, ['version' => 'auto']);
}
// add JavaScripts
Html::_('script', 'media/com_componentbuilder/uikit-v2/js/uikit.min.js', ['version' => 'auto']);
Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/lightbox.min.js', ['version' => 'auto']);
Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/notify.min.js', ['version' => 'auto']);
// add the style sheets
Html::_('stylesheet', 'media/com_componentbuilder/uikit-v2/css/uikit.gradient.min.css', ['version' => 'auto']);
Html::_('stylesheet', 'media/com_componentbuilder/uikit-v2/css/components/notify.gradient.min.css', ['version' => 'auto']);
// add var key
$this->getDocument()->addScriptDeclaration("var vastDevMod = '".$this->get('VDM')."';");
// LayoutHelper::render('exportlanguagetranslations', []); // to ensure that the layout gets loaded
}
}