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

Added the new placeholder area for global & component level placeholders. Just like customcode you can now with the placeholders generate dynamic behaviour with placeholders all over the JCB custom areas.

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2019-02-16 00:03:21 +02:00
parent d46459301c
commit 25c14b45de
84 changed files with 7147 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,6 +53,13 @@ class Get
*/
public $params;
/**
* The global placeholders
*
* @var array
*/
public $globalPlaceholders = array();
/**
* The placeholders
*
@ -781,6 +788,8 @@ class Get
$this->user = JFactory::getUser();
// Get a db connection.
$this->db = JFactory::getDbo();
// get global placeholders
$this->globalPlaceholders = $this->getGlobalPlaceholders();
// check if this component is install on the current website
if ($paths = $this->getLocalInstallPaths())
{
@ -857,6 +866,36 @@ class Get
return '';
}
/**
* get all System Placeholders
*
* @return array The global placeholders
*
*/
public function getGlobalPlaceholders()
{
// reset bucket
$bucket = array();
// Create a new query object.
$query = $this->db->getQuery(true);
$query->select($this->db->quoteName(array('a.target','a.value')));
// from these tables
$query->from('#__componentbuilder_placeholder AS a');
// Reset the query using our newly populated query object.
$this->db->setQuery($query);
// Load the items
$this->db->execute();
if ($this->db->getNumRows())
{
$bucket = $this->db->loadAssocList('target', 'value');
foreach ($bucket as $key => &$code)
{
$code = base64_decode($code);
}
}
return $bucket;
}
/**
* get all Component Data
*
@ -888,7 +927,8 @@ class Get
'i.php_dashboard_methods',
'f.sql_tweak',
'e.version_update',
'e.id'
'e.id',
'k.addplaceholders'
), array(
'addadmin_views',
'addadmin_views_id',
@ -904,7 +944,8 @@ class Get
'php_dashboard_methods',
'sql_tweak',
'version_update',
'version_update_id'
'version_update_id',
'_placeholders'
)
)
);
@ -919,6 +960,7 @@ class Get
$query->join('LEFT', $this->db->quoteName('#__componentbuilder_component_config', 'h') . ' ON (' . $this->db->quoteName('a.id') . ' = ' . $this->db->quoteName('h.joomla_component') . ')');
$query->join('LEFT', $this->db->quoteName('#__componentbuilder_component_dashboard', 'i') . ' ON (' . $this->db->quoteName('a.id') . ' = ' . $this->db->quoteName('i.joomla_component') . ')');
$query->join('LEFT', $this->db->quoteName('#__componentbuilder_component_files_folders', 'j') . ' ON (' . $this->db->quoteName('a.id') . ' = ' . $this->db->quoteName('j.joomla_component') . ')');
$query->join('LEFT', $this->db->quoteName('#__componentbuilder_component_placeholders', 'k') . ' ON (' . $this->db->quoteName('a.id') . ' = ' . $this->db->quoteName('k.joomla_component') . ')');
$query->where($this->db->quoteName('a.id') . ' = ' . (int) $this->componentID);
// Reset the query using our newly populated query object.
@ -971,6 +1013,26 @@ class Get
$this->placeholders[$this->bbb . 'Component' . $this->ddd] = $this->placeholders[$this->hhh . 'Component' . $this->hhh];
$this->placeholders[$this->bbb . 'COMPONENT' . $this->ddd] = $this->placeholders[$this->hhh . 'COMPONENT' . $this->hhh];
// set the addcustommenus data
$component->_placeholders = (isset($component->_placeholders) && ComponentbuilderHelper::checkJson($component->_placeholders)) ? json_decode($component->_placeholders, true) : null;
if (ComponentbuilderHelper::checkArray($component->_placeholders))
{
foreach($component->_placeholders as $row)
{
$this->globalPlaceholders[$row['target']] = $row['value'];
}
}
unset($component->_placeholders);
// load the global placeholders
if (ComponentbuilderHelper::checkArray($this->globalPlaceholders))
{
foreach ($this->globalPlaceholders as $globalPlaceholder => $gloabalValue)
{
$this->placeholders[$globalPlaceholder] = $gloabalValue;
}
}
// set component sales name
$component->sales_name = ComponentbuilderHelper::safeString($component->system_name);
@ -2810,7 +2872,7 @@ class Get
if (strpos($requeSt_id, '_request_id') !== false || strpos($requeSt_id, '_request_catid') !== false)
{
// keep it then, don't change
$name = $requeSt_id;
$name = $this->setPlaceholders($requeSt_id, $this->placeholders);
}
else
{
@ -2846,7 +2908,7 @@ class Get
else
{
// get value from xml
$xml = ComponentbuilderHelper::safeString(ComponentbuilderHelper::getBetween($field['settings']->xml, 'name="', '"'));
$xml = ComponentbuilderHelper::safeString($this->setPlaceholders(ComponentbuilderHelper::getBetween($field['settings']->xml, 'name="', '"'), $this->placeholders));
// check if a value was found
if (ComponentbuilderHelper::checkString($xml))
{
@ -5662,6 +5724,7 @@ class Get
$placeholders[ComponentbuilderHelper::safeString($this->componentCodeName, 'F') . 'Helper::'] = $this->bbb . 'Component' . $this->ddd . 'Helper::';
$placeholders['COM_' . ComponentbuilderHelper::safeString($this->componentCodeName, 'U')] = 'COM_' . $this->bbb . 'COMPONENT' . $this->ddd;
$placeholders['com_' . $this->componentCodeName] = 'com_' . $this->bbb . 'component' . $this->ddd;
foreach ($paths as $target => $path)
{
// we are changing the working directory to the componet path

10
admin/helpers/compiler/c_Fields.php
View File

@ -2295,7 +2295,7 @@ class Fields extends Structure
else
{
// set the rest of the fields
$xmlValue = (string) ComponentbuilderHelper::getBetween($field['settings']->xml, $property['name'] . '="', '"');
$xmlValue = (string) $this->setPlaceholders(ComponentbuilderHelper::getBetween($field['settings']->xml, $property['name'] . '="', '"'), $placeholders);
}
// check if translatable
@ -2872,6 +2872,14 @@ class Fields extends Structure
// now set the value
$replace[$replacekey] = $replacevalue;
}
// load the global placeholders
if (ComponentbuilderHelper::checkArray($this->globalPlaceholders))
{
foreach ($this->globalPlaceholders as $globalPlaceholder => $gloabalValue)
{
$replace[$globalPlaceholder] = $gloabalValue;
}
}
// start loading the field type
$this->fileContentDynamic['customfield_' . $data['type']] = array();
// Type <<<DYNAMIC>>>

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

@ -13645,10 +13645,26 @@ class Interpretation extends Fields
$component = ComponentbuilderHelper::safeString($this->componentData->name_code);
$viewName = 'config';
$listViewName = 'configs';
$placeholders = array(
$this->hhh . 'component' . $this->hhh => $component,
$this->hhh . 'view' . $this->hhh => $viewName,
$this->hhh . 'views' . $this->hhh => $listViewName);
// set place holders
$placeholders = array();
$placeholders[$this->hhh . 'component' . $this->hhh] = ComponentbuilderHelper::safeString($this->componentData->name_code);
$placeholders[$this->hhh . 'Component' . $this->hhh] = ComponentbuilderHelper::safeString($this->componentData->name_code, 'F');
$placeholders[$this->hhh . 'COMPONENT' . $this->hhh] = ComponentbuilderHelper::safeString($this->componentData->name_code, 'U');
$placeholders[$this->hhh . 'view' . $this->hhh] = $viewName;
$placeholders[$this->hhh . 'views' . $this->hhh] = $listViewName;
$placeholders[$this->bbb . 'component' . $this->ddd] = $placeholders[$this->hhh . 'component' . $this->hhh];
$placeholders[$this->bbb . 'Component' . $this->ddd] = $placeholders[$this->hhh . 'Component' . $this->hhh];
$placeholders[$this->bbb . 'COMPONENT' . $this->ddd] = $placeholders[$this->hhh . 'COMPONENT' . $this->hhh];
$placeholders[$this->bbb . 'view' . $this->ddd] = $viewName;
$placeholders[$this->bbb . 'views' . $this->ddd] = $listViewName;
// load the global placeholders
if (ComponentbuilderHelper::checkArray($this->globalPlaceholders))
{
foreach ($this->globalPlaceholders as $globalPlaceholder => $gloabalValue)
{
$placeholders[$globalPlaceholder] = $gloabalValue;
}
}
$view = '';
$viewType = 0;
// set the custom table key
@ -13676,8 +13692,8 @@ class Interpretation extends Fields
{
$this->configFieldSetsCustomField[$field['tabname']][] = $xmlField;
// set global params to db on install
$fieldName = ComponentbuilderHelper::safeString(ComponentbuilderHelper::getBetween($xmlField, 'name="', '"'));
$fieldDefault = ComponentbuilderHelper::getBetween($xmlField, 'default="', '"');
$fieldName = ComponentbuilderHelper::safeString($this->setPlaceholders(ComponentbuilderHelper::getBetween($xmlField, 'name="', '"'), $placeholders));
$fieldDefault = $this->setPlaceholders(ComponentbuilderHelper::getBetween($xmlField, 'default="', '"'), $placeholders);
if (isset($field['custom_value']) && ComponentbuilderHelper::checkString($field['custom_value']))
{
// add array if found

9
admin/helpers/compiler/f_Infusion.php
View File

@ -213,6 +213,15 @@ class Infusion extends Interpretation
// add the helper emailer if set
$this->fileContentStatic[$this->hhh . 'HELPER_EMAIL' . $this->hhh] = $this->addEmailHelper();
// load the global placeholders
if (ComponentbuilderHelper::checkArray($this->globalPlaceholders))
{
foreach ($this->globalPlaceholders as $globalPlaceholder => $gloabalValue)
{
$this->fileContentStatic[$globalPlaceholder] = $gloabalValue;
}
}
// reset view array
$viewarray = array();
$site_edit_view_array = array();