Component Builder (v.3.2.0-beta4)
+ Component Builder (v.3.2.0-beta5)
The Component Builder for [Joomla](https://extensions.joomla.org/extension/component-builder/) is highly advanced tool that is truly able to build extremely complex components in a fraction of the time.
diff --git a/componentbuilder_update_server.xml b/componentbuilder_update_server.xml
index 3e2fa4896..5818eb907 100644
--- a/componentbuilder_update_server.xml
+++ b/componentbuilder_update_server.xml
@@ -1595,4 +1595,22 @@
https://dev.vdm.io
+
+ Component Builder
+ Builds Complex Joomla Components
+ pkg_component_builder
+ package
+ site
+ 3.2.0-beta5
+ https://dev.vdm.io
+
+ https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v3.2.0-beta5.zip
+
+
+ beta
+
+ Llewellyn van der Merwe
+ https://dev.vdm.io
+
+
\ No newline at end of file
diff --git a/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Creator/CustomFieldTypeFile.php b/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Creator/CustomFieldTypeFile.php
index 0226fdfc2..2ec77fed4 100644
--- a/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Creator/CustomFieldTypeFile.php
+++ b/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Creator/CustomFieldTypeFile.php
@@ -645,21 +645,48 @@ final class CustomFieldTypeFile
$core_fields = $this->corefield->get();
$extends = $this->extends;
-
+ $found = null;
foreach ($core_fields as $core_field)
{
$field = strtolower((string) $core_field);
if ($extends === $field)
{
- $this->fieldmap[$extends] = $core_field;
-
- return $core_field;
+ $found = $core_field;
+ break;
}
}
- $this->fieldmap[$extends] = StringHelper::safe($extends, 'F');
+ $extends = $found ?? StringHelper::safe($extends, 'F');
- return $this->fieldmap[$extends];
+ if ($this->config->get('joomla_version', 3) != 3)
+ {
+ $fix = strtolower($extends);
+
+ if ('checkboxes' === $fix)
+ {
+ $extends = 'CheckboxesField';
+ }
+ elseif ('list' === $fix)
+ {
+ $extends = 'FormField';
+ }
+ elseif ('radio' === $fix)
+ {
+ $extends = 'RadioField';
+ }
+ elseif ('combo' === $fix)
+ {
+ $extends = 'ComboField';
+ }
+ elseif (strpos($extends, 'Field') === false)
+ {
+ $extends = StringHelper::safe($extends, 'F') . 'Field';
+ }
+ }
+
+ $this->fieldmap[$this->extends] = $extends;
+
+ return $extends;
}
/**
diff --git a/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Infusion.php b/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Infusion.php
index 4b163f1ad..db37a3e20 100644
--- a/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Infusion.php
+++ b/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Infusion.php
@@ -600,6 +600,13 @@ class Infusion extends Interpretation
)
);
+ // AJAXTOKE <<>>
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|AJAXTOKE',
+ $this->setAjaxToke(
+ $nameSingleCode
+ )
+ );
+
// add css to front end
if (isset($view['edit_create_site_view'])
&& is_numeric($view['edit_create_site_view'])
@@ -681,6 +688,13 @@ class Infusion extends Interpretation
)
);
+ // JQUERY <<>>
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameSingleCode . '|JQUERY',
+ $this->setJquery(
+ $nameSingleCode
+ )
+ );
+
// Trigger Event: jcb_ce_onAfterBuildAdminEditViewContent
CFactory::_('Event')->trigger(
'jcb_ce_onAfterBuildAdminEditViewContent',[&$view, &$nameSingleCode, &$nameListCode]
@@ -1015,6 +1029,13 @@ class Infusion extends Interpretation
)
);
+ // JQUERY <<>>
+ CFactory::_('Compiler.Builder.Content.Multi')->set($nameListCode . '|JQUERY',
+ $this->setJquery(
+ $nameSingleCode
+ )
+ );
+
// Trigger Event: jcb_ce_onAfterBuildAdminListViewContent
CFactory::_('Event')->trigger(
'jcb_ce_onAfterBuildAdminListViewContent', [&$view, &$nameSingleCode, &$nameListCode]
diff --git a/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Interpretation.php b/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Interpretation.php
index 6a9fd36a1..1e11ffa4f 100644
--- a/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Interpretation.php
+++ b/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Interpretation.php
@@ -5654,7 +5654,7 @@ class Interpretation extends Fields
. " Add the needed Javascript to insure that the buttons work.";
$script[] = Indent::_(2) . "Html::_('behavior.framework', true);";
$script[] = Indent::_(2)
- . "\$this->document->addScriptDeclaration(\"Joomla.submitbutton = function(task){if (task == ''){ return false; } else { Joomla.submitform(task); return true; }}\");";
+ . "\$this->getDocument()->addScriptDeclaration(\"Joomla.submitbutton = function(task){if (task == ''){ return false; } else { Joomla.submitform(task); return true; }}\");";
// return the script
return PHP_EOL . implode(PHP_EOL, $script);
@@ -5780,7 +5780,7 @@ class Interpretation extends Fields
$script = PHP_EOL . Indent::_(2) . "//" . Line::_(
__LINE__,__CLASS__
) . " Set the Custom JS script to view" . PHP_EOL
- . Indent::_(2) . '$this->document->addScriptDeclaration("';
+ . Indent::_(2) . '$this->getDocument()->addScriptDeclaration("';
$jsDocument = PHP_EOL . Indent::_(3) . str_replace(
'"', '\"', implode(
PHP_EOL . Indent::_(3),
@@ -17760,6 +17760,19 @@ class Interpretation extends Fields
return $methods;
}
+ public function setJquery(&$view)
+ {
+ $addJQuery = '';
+ if (true) // TODO we just add it everywhere for now.
+ {
+ $addJQuery .= PHP_EOL . Indent::_(2) . "//" . Line::_(__Line__, __Class__)
+ . " Load jQuery";
+ $addJQuery .= PHP_EOL . Indent::_(2) . "Html::_('jquery.framework');";
+ }
+
+ return $addJQuery;
+ }
+
/**
* build filter functions
*
diff --git a/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Power/Database/Load.php b/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Power/Database/Load.php
index 42f5632d8..778fdf1f2 100644
--- a/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Power/Database/Load.php
+++ b/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Power/Database/Load.php
@@ -73,7 +73,7 @@ final class Load
{
return $this->model->value(
$this->load->value(
- ["a.${field}" => $field],
+ ["a.{$field}" => $field],
['a' => 'power'],
$this->prefix($keys)
),
diff --git a/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Search/Database/Insert.php b/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Search/Database/Insert.php
index afce63c7c..89106bf0a 100644
--- a/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Search/Database/Insert.php
+++ b/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Search/Database/Insert.php
@@ -55,10 +55,9 @@ class Insert implements InsertInterface
/**
* Database object to query local DB
*
- * @var \JDatabaseDriver
* @since 3.2.0
**/
- protected \JDatabaseDriver $db;
+ protected $db;
/**
* Constructor
@@ -66,17 +65,16 @@ class Insert implements InsertInterface
* @param Config|null $config The search config object.
* @param Table|null $table The search table object.
* @param Model|null $model The search get model object.
- * @param \JDatabaseDriver|null $db The database object.
*
* @since 3.2.0
*/
public function __construct(?Config $config = null, ?Table $table = null,
- ?Model $model = null, ?\JDatabaseDriver $db = null)
+ ?Model $model = null)
{
$this->config = $config ?: Factory::_('Config');
$this->table = $table ?: Factory::_('Table');
$this->model = $model ?: Factory::_('Insert.Model');
- $this->db = $db ?: JoomlaFactory::getDbo();
+ $this->db = JoomlaFactory::getDbo();
}
/**
diff --git a/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Search/Model/Load.php b/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Search/Model/Load.php
index 07dd04bd4..a1149a26e 100644
--- a/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Search/Model/Load.php
+++ b/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Search/Model/Load.php
@@ -119,13 +119,35 @@ class Load extends Model implements ModelInterface
*/
protected function validateAfter(&$value, ?string $field = null, ?string $table = null): bool
{
+ // Start note to self
+ // Yes we don't search in the field->xml (field) PHP because the xml is messy
+ // first of all we need to change that storage method :((( seriously
+ // and the actual PHP is stored in the xml as base64 with a [__.o0=base64=Oo.__] key in front of it
+ // if I can go back and drag you around by your ear... I will, but okay you did not know better.
+ // Listen you have tried to fix this a few times already (I lost count) and by the time you realize how it works
+ // two hours have been wasted, and you usually only then realize why it's not fixed in the first place... o boy... just walk now!
+ // since unless you have three days don't even look further, this is a huge issue/mess
+ // and while I agree it needs fixing, it will not take a few hours... but days
+ // End note to self
+
// check values
if (StringHelper::check($value) || ArrayHelper::check($value, true))
{
return true;
}
+
// remove empty values
return false;
+
+ // Start another note to self
+ // If you're still here
+ // the problem is not opening the PHP in the xml,
+ // it is storing it with the updated changes... if any are made via the search-update methods
+ // so the only way to fix this is to change the whole way the xml values in the field table is stored.
+ // Yes, that is right... all the way back to the field view... and then to update all places you open that xml values
+ // and get the values out of the xml string and use them, and if you've forgotten, that is nearly everywhere,
+ // and so let the refactoring of the foundation begin... there I saved you another 3 hours.
+ // End another note to self
}
/**
diff --git a/libraries/jcb_powers/VDM.Joomla/src/Utilities/FormHelper.php b/libraries/jcb_powers/VDM.Joomla/src/Utilities/FormHelper.php
index a2f48fd41..b21d71c3c 100644
--- a/libraries/jcb_powers/VDM.Joomla/src/Utilities/FormHelper.php
+++ b/libraries/jcb_powers/VDM.Joomla/src/Utilities/FormHelper.php
@@ -75,24 +75,24 @@ abstract class FormHelper
// element was not returned
return;
}
- switch (get_class($node))
+
+ if ($node instanceof \stdClass)
{
- case 'stdClass':
- if (property_exists($node, 'comment'))
- {
- self::comment($xml, $node->comment);
- }
- if (property_exists($node, 'fieldXML'))
- {
- self::append($xml, $node->fieldXML);
- }
- break;
- case 'SimpleXMLElement':
- $domXML = \dom_import_simplexml($xml);
- $domNode = \dom_import_simplexml($node);
- $domXML->appendChild($domXML->ownerDocument->importNode($domNode, true));
- $xml = \simplexml_import_dom($domXML);
- break;
+ if (property_exists($node, 'comment'))
+ {
+ self::comment($xml, $node->comment);
+ }
+ if (property_exists($node, 'fieldXML'))
+ {
+ self::append($xml, $node->fieldXML);
+ }
+ }
+ elseif ($node instanceof \SimpleXMLElement)
+ {
+ $domXML = \dom_import_simplexml($xml);
+ $domNode = \dom_import_simplexml($node);
+ $domXML->appendChild($domXML->ownerDocument->importNode($domNode, true));
+ $xml = \simplexml_import_dom($domXML);
}
}
@@ -127,7 +127,7 @@ abstract class FormHelper
{
foreach ($attributes as $key => $value)
{
- $xml->addAttribute($key, $value);
+ $xml->addAttribute($key, $value ?? '');
}
}
@@ -145,7 +145,7 @@ abstract class FormHelper
foreach ($options as $key => $value)
{
$addOption = $xml->addChild('option');
- $addOption->addAttribute('value', $key);
+ $addOption->addAttribute('value', $key ?? '');
$addOption[] = $value;
}
}
diff --git a/script.php b/script.php
index 1e5f01245..994e52e31 100644
--- a/script.php
+++ b/script.php
@@ -9618,7 +9618,7 @@ class Com_ComponentbuilderInstallerScript
echo '
-
Upgrade to Version 3.2.0-beta4 Was Successful! Let us know if anything is not working as expected.
';
+ Upgrade to Version 3.2.0-beta5 Was Successful! Let us know if anything is not working as expected.
';
// Set db if not set already.
if (!isset($db))