joomla/Component-Builder
joomla/Component-Builder
39
23
Fork 11
Code Issues 80 Pull Requests Projects 4 Wiki Activity

Added a fix to prefent language strings colliding on compilation. Added the option to use []+, in the custom code arg values. Added easy debug option for the setDynamicValues method in the compiler. Fixed the editor issue in the fields view.

Browse Source
This commit is contained in:
Llewellyn van der Merwe 2018-08-02 07:36:47 +02:00
parent df65ca3456
commit f5c6fa899d
No known key found for this signature in database
GPG Key ID: CAD7B16D27AF28C5
11 changed files with 154 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -125,11 +125,11 @@ Watch the [proposed development workflow](https://vdm.bz/proposed-development-wo
+ *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
+ *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
+ *First Build*: 30th April, 2015
+ *Last Build*: 31st July, 2018
+ *Last Build*: 2nd August, 2018
+ *Version*: 2.8.5
+ *Copyright*: Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved.
+ *License*: GNU General Public License version 2 or later; see LICENSE.txt
+ *Line count*: **186347**
+ *Line count*: **186364**
+ *Field count*: **1059**
+ *File count*: **1239**
+ *Folder count*: **197**

4
admin/README.txt
View File

@ -125,11 +125,11 @@ Watch the [proposed development workflow](https://vdm.bz/proposed-development-wo
+ *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
+ *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
+ *First Build*: 30th April, 2015
+ *Last Build*: 31st July, 2018
+ *Last Build*: 2nd August, 2018
+ *Version*: 2.8.5
+ *Copyright*: Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved.
+ *License*: GNU General Public License version 2 or later; see LICENSE.txt
+ *Line count*: **186347**
+ *Line count*: **186364**
+ *Field count*: **1059**
+ *File count*: **1239**
+ *Folder count*: **197**

6
admin/compiler/joomla_3/Helper.php
View File

@ -763,10 +763,10 @@ abstract class ###Component###Helper
* @return object
*
*/
public static function getFieldObject($attributes, $default = '', $options = null)
public static function getFieldObject(&$attributes, $default = '', $options = null)
{
// make sure we have a type
if (isset($attributes['type']))
// make sure we have attributes and a type value
if (self::checkArray($attributes) && isset($attributes['type']))
{
// make sure the form helper class is loaded
if (!method_exists('JFormHelper', 'loadFieldType'))

4
admin/compiler/joomla_3/Helper_site.php
View File

@ -411,8 +411,8 @@ abstract class ###Component###Helper
*/
public static function getFieldObject($attributes, $default = '', $options = null)
{
// make sure we have a type
if (isset($attributes['type']))
// make sure we have attributes and a type value
if (self::checkArray($attributes) && isset($attributes['type']))
{
// make sure the form helper class is loaded
if (!method_exists('JFormHelper', 'loadFieldType'))

126
admin/helpers/compiler/a_Get.php
View File

@ -74,6 +74,18 @@ class Get
*/
public $addPlaceholders = false;
/**
* The placeholders for custom code keys
*
* @var array
*/
protected $customCodeKeyPlacholders = array(
'[' => '[',
']' => ']',
',' => ',',
'+' => '+'
);
/**
* The Component data
*
@ -2817,7 +2829,7 @@ class Get
case 3:
// set custom script
$result->main_get[0]['selection'] = array(
'select' => base64_decode($result->php_custom_get),
'select' => $this->setDynamicValues(base64_decode($result->php_custom_get)),
'from' => '', 'table' => '', 'type' => '');
break;
}
@ -3840,6 +3852,8 @@ class Get
{
$langOnly[] = ComponentbuilderHelper::getAllBetween($content, "JustTEXT:" . ":_('", "')");
$langOnly[] = ComponentbuilderHelper::getAllBetween($content, 'JustTEXT:' . ':_("', '")');
// merge lang only
$langOnly = ComponentbuilderHelper::mergeArrays($langOnly);
}
// set language data
foreach ($langStringTargets as $langStringTarget)
@ -3865,6 +3879,11 @@ class Get
// load the language targets
foreach ($langStringTargets as $langStringTarget)
{
// need some special treatment here
if ($langStringTarget === 'JustTEXT:' . ':_(')
{
continue;
}
$langHolders[$langStringTarget . "'" . $string . "'"] = $langStringTarget . "'" . $keyLang . "'";
$langHolders[$langStringTarget . '"' . $string . '"'] = $langStringTarget . '"' . $keyLang . '"';
}
@ -3874,7 +3893,6 @@ class Get
// the uppercase loading only (for arrays and other tricks)
if (ComponentbuilderHelper::checkArray($langOnly))
{
$langOnly = ComponentbuilderHelper::mergeArrays($langOnly);
foreach ($langOnly as $string)
{
if ($keyLang = $this->setLang($string))
@ -4331,15 +4349,23 @@ class Get
* Set the dynamic values in strings here
*
* @param string $string The content to check
* @param int $debug The switch to debug the update
* We can now at any time debug the
* dynamic build values if it gets broken
*
* @return string
*
*/
public function setDynamicValues($string)
public function setDynamicValues($string, $debug = 0)
{
if (ComponentbuilderHelper::checkString($string))
{
return $this->setLangStrings($this->setCustomCodeData($this->setExternalCodeString($string)));
$string = $this->setLangStrings($this->setCustomCodeData($this->setExternalCodeString($string, $debug), $debug));
}
// if debug
if ($debug)
{
jexit();
}
return $string;
}
@ -4348,15 +4374,22 @@ class Get
* Set the external code string & load it in to string
*
* @param string $string The content to check
* @param int $debug The switch to debug the update
*
* @return string
*
*/
public function setExternalCodeString($string)
public function setExternalCodeString($string, $debug = 0)
{
// check if content has custom code place holder
if (strpos($string, '[EXTERNA' . 'LCODE=') !== false)
{
// if debug
if ($debug)
{
echo 'External Code String:';
var_dump($string);
}
// target content
$bucket = array();
$found = ComponentbuilderHelper::getAllBetween($string, '[EXTERNA' . 'LCODE=', ']');
@ -4402,6 +4435,12 @@ class Get
$string = $this->setPlaceholders($string, $bucket);
}
}
// if debug
if ($debug)
{
echo 'External Code String After Update:';
var_dump($string);
}
}
return $string;
}
@ -4481,17 +4520,24 @@ class Get
* We start set the custom code data & can load it in to string
*
* @param string $string The content to check
* @param int $debug The switch to debug the update
*
* @return string
*
*/
public function setCustomCodeData($string)
public function setCustomCodeData($string, $debug = 0)
{
// insure the code is loaded
$loaded = false;
// check if content has custom code place holder
if (strpos($string, '[CUSTO' . 'MCODE=') !== false)
{
// if debug
if ($debug)
{
echo 'Custom Code String:';
var_dump($string);
}
// the ids found in this content
$bucket = array();
$found = ComponentbuilderHelper::getAllBetween($string, '[CUSTO' . 'MCODE=', ']');
@ -4499,6 +4545,12 @@ class Get
{
foreach ($found as $key)
{
// if debug
if ($debug)
{
echo '$key before update:';
var_dump($key);
}
// check if we have args
if (is_numeric($key))
{
@ -4554,12 +4606,16 @@ class Get
{
if (strpos($array[1], ',') !== false)
{
$this->customCodeData[$id]['args'][$key] = explode(',', $array[1]);
// update the function values with the custom code key placholdres (this allow the use of [] + and , in the values)
$this->customCodeData[$id]['args'][$key] = array_map(function($_key) {
return $this->setPlaceholders($_key, $this->customCodeKeyPlacholders);
}, (array) explode(',', $array[1]));
}
elseif (ComponentbuilderHelper::checkString($array[1]))
{
$this->customCodeData[$id]['args'][$key] = array();
$this->customCodeData[$id]['args'][$key][] = $array[1];
// update the function values with the custom code key placholdres (this allow the use of [] + and , in the values)
$this->customCodeData[$id]['args'][$key][] = $this->setPlaceholders($array[1], $this->customCodeKeyPlacholders);
}
}
}
@ -4571,6 +4627,12 @@ class Get
$bucket[$id] = $id;
}
}
// if debug
if ($debug)
{
echo 'Bucket:';
var_dump($bucket);
}
// check if any custom code placeholders where found
if (ComponentbuilderHelper::checkArray($bucket))
{
@ -4582,10 +4644,22 @@ class Get
// revert lang to current setting
$this->lang = $_tmpLang;
}
// if debug
if ($debug)
{
echo 'Loaded:';
var_dump($loaded);
}
// when the custom code is loaded
if ($loaded === true)
{
$string = $this->insertCustomCode($string);
$string = $this->insertCustomCode($string, $debug);
}
// if debug
if ($debug)
{
echo 'Custom Code String After Update:';
var_dump($string);
}
}
return $string;
@ -4595,16 +4669,31 @@ class Get
* Insert the custom code into the string
*
* @param string $string The content to check
* @param int $debug The switch to debug the update
*
* @return string on success
*
*/
protected function insertCustomCode($string)
protected function insertCustomCode($string, $debug = 0)
{
$code = array();
// if debug
if ($debug)
{
echo '$this->customCode:';
var_dump($this->customCode);
}
foreach ($this->customCode as $item)
{
$this->buildCustomCodePlaceholders($item, $code);
$this->buildCustomCodePlaceholders($item, $code, $debug);
}
// if debug
if ($debug)
{
echo 'Place holders to Update String:';
var_dump($code);
echo 'Custom Code String Before Update:';
var_dump($string);
}
// now update the string
return $this->setPlaceholders($string, $code);
@ -4614,21 +4703,34 @@ class Get
* Insert the custom code into the string
*
* @param string $string The content to check
* @param int $debug The switch to debug the update
*
* @return string on success
*
*/
protected function buildCustomCodePlaceholders($item, &$code)
protected function buildCustomCodePlaceholders($item, &$code, $debug = 0)
{
// check if there is args for this code
if (isset($this->customCodeData[$item['id']]['args']) && ComponentbuilderHelper::checkArray($this->customCodeData[$item['id']]['args']))
{
// since we have args we cant update this code via IDE (TODO)
$placeholder = $this->getPlaceHolder(3, null);
// if debug
if ($debug)
{
echo 'Custom Code Placeholders:';
var_dump($placeholder);
}
// we have args and so need to load each
foreach ($this->customCodeData[$item['id']]['args'] as $key => $args)
{
$this->setThesePlaceHolders('arg', $args);
// if debug
if ($debug)
{
echo 'Custom Code Global Placholders:';
var_dump($this->placeholders);
}
$code['[CUSTOM' . 'CODE=' . $key . ']'] = $placeholder['start'] . PHP_EOL . $this->setPlaceholders($item['code'], $this->placeholders) . $placeholder['end'];
}
// always clear the args

11
admin/helpers/compiler/e_Interpretation.php
View File

@ -1578,16 +1578,19 @@ class Interpretation extends Fields
{
// load this unuiqe key
$this->customViewQueryChecker[$this->target][] = $checker;
if (ComponentbuilderHelper::checkString($the_get['selection']['type']))
if (isset($the_get['selection']['type']) && ComponentbuilderHelper::checkString($the_get['selection']['type']))
{
$getItem = PHP_EOL . PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "//" . $this->setLine(__LINE__) . " Get from " . $the_get['selection']['table'] . " as " . $the_get['as'];
// set the selection
$getItem .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . $the_get['selection']['select'];
}
else
{
$getItem = PHP_EOL . PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "//" . $this->setLine(__LINE__) . " Get data";
// set the selection
$getItem .= PHP_EOL . $this->setPlaceholders($the_get['selection']['select'], $this->placeholders);
}
// set the selection
$getItem .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . $the_get['selection']['select'];
// load the from selection
if (($nr == 0 && (!isset($the_get['join_field']) || !ComponentbuilderHelper::checkString($the_get['join_field'])) && (isset($the_get['selection']['type']) && ComponentbuilderHelper::checkString($the_get['selection']['type']))) ||
($type === 'custom' && (isset($the_get['selection']['type']) && ComponentbuilderHelper::checkString($the_get['selection']['type']))))
{
@ -5108,7 +5111,7 @@ class Interpretation extends Fields
{
foreach ($viewArray['settings']->main_get->main_get as $get)
{
if ($get['as'] === 'a')
if (isset($get['as']) && $get['as'] === 'a')
{
if (isset($get['selection']) && ComponentbuilderHelper::checkArray($get['selection']) && isset($get['selection']['select_gets']) && ComponentbuilderHelper::checkArray($get['selection']['select_gets']))
{

6
admin/helpers/componentbuilder.php
View File

@ -4741,10 +4741,10 @@ abstract class ComponentbuilderHelper
* @return object
*
*/
public static function getFieldObject($attributes, $default = '', $options = null)
public static function getFieldObject(&$attributes, $default = '', $options = null)
{
// make sure we have a type
if (isset($attributes['type']))
// make sure we have attributes and a type value
if (self::checkArray($attributes) && isset($attributes['type']))
{
// make sure the form helper class is loaded
if (!method_exists('JFormHelper', 'loadFieldType'))

17
admin/models/field.php
View File

@ -231,6 +231,23 @@ class ComponentbuilderModelField extends JModelAdmin
$form->setValue($redirectedField, null, $redirectedValue);
}
}
// update all editors to use this components global editor
$global_editor = JComponentHelper::getParams('com_componentbuilder')->get('editor', 'none');
// now get all the editor fields
$editors = $form->getXml()->xpath("//field[@type='editor']");
// check if we found any
if (ComponentbuilderHelper::checkArray($editors))
{
foreach ($editors as $editor)
{
// get the field names
$name = (string) $editor['name'];
// set the field editor value (with none as fallback)
$form->setFieldAttribute($name, 'editor', $global_editor . '|none');
}
}
return $form;
}

2
admin/models/fields/aliasbuilder.php
View File

@ -35,7 +35,7 @@ class JFormFieldAliasbuilder extends JFormFieldList
*/
public function getOptions()
{
// load the db opbject
// load the db object
$db = JFactory::getDBO();
// get the input from url
$jinput = JFactory::getApplication()->input;

2
componentbuilder.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<extension type="component" version="3.2" method="upgrade">
<name>COM_COMPONENTBUILDER</name>
<creationDate>31st July, 2018</creationDate>
<creationDate>2nd August, 2018</creationDate>
<author>Llewellyn van der Merwe</author>
<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>

4
site/helpers/componentbuilder.php
View File

@ -4029,8 +4029,8 @@ abstract class ComponentbuilderHelper
*/
public static function getFieldObject($attributes, $default = '', $options = null)
{
// make sure we have a type
if (isset($attributes['type']))
// make sure we have attributes and a type value
if (self::checkArray($attributes) && isset($attributes['type']))
{
// make sure the form helper class is loaded
if (!method_exists('JFormHelper', 'loadFieldType'))