Fixed some collusion issue in the dynamic get build process when custom query is used. Fixed the issue found in the import of JCB packages that caused custom code to be imported in duplication, also added the option to turn off (unpublish) custom code no longer in use.
This commit is contained in:
parent
be0d61ceae
commit
b3c4414320
@ -125,11 +125,11 @@ Watch the [proposed development workflow](https://vdm.bz/proposed-development-wo
|
|||||||
+ *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
|
+ *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
|
||||||
+ *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
|
+ *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
|
||||||
+ *First Build*: 30th April, 2015
|
+ *First Build*: 30th April, 2015
|
||||||
+ *Last Build*: 25th August, 2018
|
+ *Last Build*: 30th August, 2018
|
||||||
+ *Version*: 2.9.0
|
+ *Version*: 2.9.0
|
||||||
+ *Copyright*: Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved.
|
+ *Copyright*: Copyright (C) 2015 - 2018 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
|
||||||
+ *Line count*: **192685**
|
+ *Line count*: **192775**
|
||||||
+ *Field count*: **1081**
|
+ *Field count*: **1081**
|
||||||
+ *File count*: **1273**
|
+ *File count*: **1273**
|
||||||
+ *Folder count*: **201**
|
+ *Folder count*: **201**
|
||||||
|
|||||||
@ -125,11 +125,11 @@ Watch the [proposed development workflow](https://vdm.bz/proposed-development-wo
|
|||||||
+ *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
|
+ *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
|
||||||
+ *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
|
+ *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
|
||||||
+ *First Build*: 30th April, 2015
|
+ *First Build*: 30th April, 2015
|
||||||
+ *Last Build*: 25th August, 2018
|
+ *Last Build*: 30th August, 2018
|
||||||
+ *Version*: 2.9.0
|
+ *Version*: 2.9.0
|
||||||
+ *Copyright*: Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved.
|
+ *Copyright*: Copyright (C) 2015 - 2018 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
|
||||||
+ *Line count*: **192685**
|
+ *Line count*: **192775**
|
||||||
+ *Field count*: **1081**
|
+ *Field count*: **1081**
|
||||||
+ *File count*: **1273**
|
+ *File count*: **1273**
|
||||||
+ *Folder count*: **201**
|
+ *Folder count*: **201**
|
||||||
|
|||||||
@ -1554,7 +1554,7 @@ class Get
|
|||||||
// set the view name
|
// set the view name
|
||||||
$tab['view'] = $name_single;
|
$tab['view'] = $name_single;
|
||||||
// load the dynamic data
|
// load the dynamic data
|
||||||
$tab['html'] = $this->setDynamicValues($tab['html']);
|
$tab['html'] = $this->setPlaceholders($this->setDynamicValues($tab['html']), $this->placeholders);
|
||||||
// set the tab name
|
// set the tab name
|
||||||
$tab['name'] = (isset($tab['name']) && ComponentbuilderHelper::checkString($tab['name'])) ? $tab['name'] : 'Tab';
|
$tab['name'] = (isset($tab['name']) && ComponentbuilderHelper::checkString($tab['name'])) ? $tab['name'] : 'Tab';
|
||||||
// set lang
|
// set lang
|
||||||
@ -2927,10 +2927,30 @@ class Get
|
|||||||
unset($result->db_selection);
|
unset($result->db_selection);
|
||||||
break;
|
break;
|
||||||
case 3:
|
case 3:
|
||||||
|
// get the custom query
|
||||||
|
$customQueryString = $this->setDynamicValues(base64_decode($result->php_custom_get));
|
||||||
|
// get the table name
|
||||||
|
$_searchQuery = ComponentbuilderHelper::getBetween($customQueryString, '$query->from(', ')');
|
||||||
|
if (ComponentbuilderHelper::checkString($_searchQuery) && strpos($_searchQuery, '#__') !== false)
|
||||||
|
{
|
||||||
|
$_queryName = ComponentbuilderHelper::getBetween($_searchQuery, '#__', "'");
|
||||||
|
if (!ComponentbuilderHelper::checkString($_queryName))
|
||||||
|
{
|
||||||
|
$_queryName = ComponentbuilderHelper::getBetween($_searchQuery, '#__', '"');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// set to blank if not found
|
||||||
|
if (!isset($_queryName) || !ComponentbuilderHelper::checkString($_queryName))
|
||||||
|
{
|
||||||
|
$_queryName = '';
|
||||||
|
}
|
||||||
// set custom script
|
// set custom script
|
||||||
$result->main_get[0]['selection'] = array(
|
$result->main_get[0]['selection'] = array(
|
||||||
'select' => $this->setDynamicValues(base64_decode($result->php_custom_get)),
|
'select' => $customQueryString,
|
||||||
'from' => '', 'table' => '', 'type' => '');
|
'from' => '', 'table' => '', 'type' => '', 'name' => $_queryName);
|
||||||
|
$result->main_get[0]['as'] = 'a';
|
||||||
|
$result->main_get[0]['key'] = $result->key;
|
||||||
|
$result->main_get[0]['context'] = $context;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
// set join_view_table details
|
// set join_view_table details
|
||||||
|
|||||||
@ -1608,20 +1608,22 @@ class Interpretation extends Fields
|
|||||||
}
|
}
|
||||||
|
|
||||||
// set the method defaults
|
// set the method defaults
|
||||||
$default = $this->setCustomViewMethodDefaults($the_get, $code);
|
if (($default = $this->setCustomViewMethodDefaults($the_get, $code)) !== false)
|
||||||
if (isset($this->siteDynamicGet[$this->target][$default['code']][$default['as']][$default['join_field']]) && ComponentbuilderHelper::checkString($this->siteDynamicGet[$this->target][$default['code']][$default['as']][$default['join_field']]) && !in_array($check, $mainAsArray))
|
|
||||||
{
|
{
|
||||||
// load to other query
|
if (isset($this->siteDynamicGet[$this->target][$default['code']][$default['as']][$default['join_field']]) && ComponentbuilderHelper::checkString($this->siteDynamicGet[$this->target][$default['code']][$default['as']][$default['join_field']]) && !in_array($check, $mainAsArray))
|
||||||
if (!isset($this->otherQuery[$this->target][$default['code']][$this->siteDynamicGet[$this->target][$default['code']][$default['as']][$default['join_field']]][$default['valueName']]))
|
|
||||||
{
|
{
|
||||||
$this->otherQuery[$this->target][$default['code']][$this->siteDynamicGet[$this->target][$default['code']][$default['as']][$default['join_field']]][$default['valueName']] = '';
|
// load to other query
|
||||||
|
if (!isset($this->otherQuery[$this->target][$default['code']][$this->siteDynamicGet[$this->target][$default['code']][$default['as']][$default['join_field']]][$default['valueName']]))
|
||||||
|
{
|
||||||
|
$this->otherQuery[$this->target][$default['code']][$this->siteDynamicGet[$this->target][$default['code']][$default['as']][$default['join_field']]][$default['valueName']] = '';
|
||||||
|
}
|
||||||
|
$this->otherQuery[$this->target][$default['code']][$this->siteDynamicGet[$this->target][$default['code']][$default['as']][$default['join_field']]][$default['valueName']] .= $getItem;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$mainAsArray[] = $default['as'];
|
||||||
|
$query .= $getItem;
|
||||||
}
|
}
|
||||||
$this->otherQuery[$this->target][$default['code']][$this->siteDynamicGet[$this->target][$default['code']][$default['as']][$default['join_field']]][$default['valueName']] .= $getItem;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
$mainAsArray[] = $default['as'];
|
|
||||||
$query .= $getItem;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1886,24 +1888,26 @@ class Interpretation extends Fields
|
|||||||
foreach ($gets as $get)
|
foreach ($gets as $get)
|
||||||
{
|
{
|
||||||
// set the value name $default
|
// set the value name $default
|
||||||
$default = $this->setCustomViewMethodDefaults($get, $code);
|
if (($default = $this->setCustomViewMethodDefaults($get, $code)) !== false)
|
||||||
if ($this->checkJoint($default, $get, $asBucket))
|
|
||||||
{
|
{
|
||||||
// build custom join string
|
if ($this->checkJoint($default, $get, $asBucket))
|
||||||
$otherJoin = PHP_EOL . $this->_t(1) . $this->hhh . "TAB" . $this->hhh . $this->_t(1) . "//" . $this->setLine(__LINE__) . " set " . $default['valueName'] . " to the " . $this->hhh . "STRING" . $this->hhh . " object.";
|
|
||||||
$otherJoin .= PHP_EOL . $this->_t(1) . $this->hhh . "TAB" . $this->hhh . $this->_t(1) . $this->hhh . "STRING" . $this->hhh . "->" . $default['valueName'] . " = \$this->get" . $default['methodName'] . "(" . $this->hhh . "STRING" . $this->hhh . "->" . $this->getAsLookup[$get['key']][$get['on_field']] . ");";
|
|
||||||
// load to other join
|
|
||||||
if (!isset($this->otherJoin[$this->target][$default['code']][$this->siteDynamicGet[$this->target][$default['code']][$default['as']][$default['join_field']]][$default['valueName']]))
|
|
||||||
{
|
{
|
||||||
$this->otherJoin[$this->target][$default['code']][$this->siteDynamicGet[$this->target][$default['code']][$default['as']][$default['join_field']]][$default['valueName']] = '';
|
// build custom join string
|
||||||
|
$otherJoin = PHP_EOL . $this->_t(1) . $this->hhh . "TAB" . $this->hhh . $this->_t(1) . "//" . $this->setLine(__LINE__) . " set " . $default['valueName'] . " to the " . $this->hhh . "STRING" . $this->hhh . " object.";
|
||||||
|
$otherJoin .= PHP_EOL . $this->_t(1) . $this->hhh . "TAB" . $this->hhh . $this->_t(1) . $this->hhh . "STRING" . $this->hhh . "->" . $default['valueName'] . " = \$this->get" . $default['methodName'] . "(" . $this->hhh . "STRING" . $this->hhh . "->" . $this->getAsLookup[$get['key']][$get['on_field']] . ");";
|
||||||
|
// load to other join
|
||||||
|
if (!isset($this->otherJoin[$this->target][$default['code']][$this->siteDynamicGet[$this->target][$default['code']][$default['as']][$default['join_field']]][$default['valueName']]))
|
||||||
|
{
|
||||||
|
$this->otherJoin[$this->target][$default['code']][$this->siteDynamicGet[$this->target][$default['code']][$default['as']][$default['join_field']]][$default['valueName']] = '';
|
||||||
|
}
|
||||||
|
$this->otherJoin[$this->target][$default['code']][$this->siteDynamicGet[$this->target][$default['code']][$default['as']][$default['join_field']]][$default['valueName']] .= $otherJoin;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// build custom join string
|
||||||
|
$customJoin .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "//" . $this->setLine(__LINE__) . " set " . $default['valueName'] . " to the " . $string . " object.";
|
||||||
|
$customJoin .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . $string . "->" . $default['valueName'] . " = \$this->get" . $default['methodName'] . "(" . $string . "->" . $this->getAsLookup[$get['key']][$get['on_field']] . ");";
|
||||||
}
|
}
|
||||||
$this->otherJoin[$this->target][$default['code']][$this->siteDynamicGet[$this->target][$default['code']][$default['as']][$default['join_field']]][$default['valueName']] .= $otherJoin;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// build custom join string
|
|
||||||
$customJoin .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "//" . $this->setLine(__LINE__) . " set " . $default['valueName'] . " to the " . $string . " object.";
|
|
||||||
$customJoin .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . $string . "->" . $default['valueName'] . " = \$this->get" . $default['methodName'] . "(" . $string . "->" . $this->getAsLookup[$get['key']][$get['on_field']] . ");";
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return $customJoin;
|
return $customJoin;
|
||||||
@ -2350,46 +2354,49 @@ class Interpretation extends Fields
|
|||||||
$asBucket = array();
|
$asBucket = array();
|
||||||
foreach ($get->main_get as $main_get)
|
foreach ($get->main_get as $main_get)
|
||||||
{
|
{
|
||||||
if (isset($this->siteFieldData['decode'][$code][$main_get['key']][$main_get['as']]))
|
if (isset($main_get['key']) && isset($main_get['as']))
|
||||||
{
|
{
|
||||||
$decodeChecker = $this->siteFieldData['decode'][$code][$main_get['key']][$main_get['as']];
|
if (isset($this->siteFieldData['decode'][$code][$main_get['key']][$main_get['as']]))
|
||||||
if (ComponentbuilderHelper::checkArray($decodeChecker))
|
|
||||||
{
|
{
|
||||||
// set decoding of needed fields
|
$decodeChecker = $this->siteFieldData['decode'][$code][$main_get['key']][$main_get['as']];
|
||||||
$getItem .= $this->setCustomViewFieldDecode($main_get, $decodeChecker, '$data', $code, $tab);
|
if (ComponentbuilderHelper::checkArray($decodeChecker))
|
||||||
|
{
|
||||||
|
// set decoding of needed fields
|
||||||
|
$getItem .= $this->setCustomViewFieldDecode($main_get, $decodeChecker, '$data', $code, $tab);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (isset($this->siteFieldDecodeFilter[$this->target][$code][$main_get['key']][$main_get['as']]))
|
if (isset($this->siteFieldDecodeFilter[$this->target][$code][$main_get['key']][$main_get['as']]))
|
||||||
{
|
|
||||||
$decodeFilter = $this->siteFieldDecodeFilter[$this->target][$code][$main_get['key']][$main_get['as']];
|
|
||||||
if (ComponentbuilderHelper::checkArray($decodeFilter))
|
|
||||||
{
|
{
|
||||||
// also filter fields if needed
|
$decodeFilter = $this->siteFieldDecodeFilter[$this->target][$code][$main_get['key']][$main_get['as']];
|
||||||
$getItem .= $this->setCustomViewFieldDecodeFilter($main_get, $decodeFilter, '$data', '$data', $code, $tab);
|
if (ComponentbuilderHelper::checkArray($decodeFilter))
|
||||||
|
{
|
||||||
|
// also filter fields if needed
|
||||||
|
$getItem .= $this->setCustomViewFieldDecodeFilter($main_get, $decodeFilter, '$data', '$data', $code, $tab);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (isset($this->siteFieldData['textareas'][$code][$main_get['key']][$main_get['as']]))
|
if (isset($this->siteFieldData['textareas'][$code][$main_get['key']][$main_get['as']]))
|
||||||
{
|
|
||||||
$contentprepareChecker = $this->siteFieldData['textareas'][$code][$main_get['key']][$main_get['as']];
|
|
||||||
if (ComponentbuilderHelper::checkArray($contentprepareChecker))
|
|
||||||
{
|
{
|
||||||
// set contentprepare checkers on needed fields
|
$contentprepareChecker = $this->siteFieldData['textareas'][$code][$main_get['key']][$main_get['as']];
|
||||||
$getItem .= $this->setCustomViewFieldonContentPrepareChecker($main_get, $contentprepareChecker, '$data', $code, $tab);
|
if (ComponentbuilderHelper::checkArray($contentprepareChecker))
|
||||||
|
{
|
||||||
|
// set contentprepare checkers on needed fields
|
||||||
|
$getItem .= $this->setCustomViewFieldonContentPrepareChecker($main_get, $contentprepareChecker, '$data', $code, $tab);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (isset($this->siteFieldData['uikit'][$code][$main_get['key']][$main_get['as']]))
|
if (isset($this->siteFieldData['uikit'][$code][$main_get['key']][$main_get['as']]))
|
||||||
{
|
|
||||||
$uikitChecker = $this->siteFieldData['uikit'][$code][$main_get['key']][$main_get['as']];
|
|
||||||
if (ComponentbuilderHelper::checkArray($uikitChecker))
|
|
||||||
{
|
{
|
||||||
// set uikit checkers on needed fields
|
$uikitChecker = $this->siteFieldData['uikit'][$code][$main_get['key']][$main_get['as']];
|
||||||
$getItem .= $this->setCustomViewFieldUikitChecker($main_get, $uikitChecker, '$data', $code, $tab);
|
if (ComponentbuilderHelper::checkArray($uikitChecker))
|
||||||
|
{
|
||||||
|
// set uikit checkers on needed fields
|
||||||
|
$getItem .= $this->setCustomViewFieldUikitChecker($main_get, $uikitChecker, '$data', $code, $tab);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
$asBucket[] = $main_get['as'];
|
||||||
}
|
}
|
||||||
$asBucket[] = $main_get['as'];
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// set the scripts
|
// set the scripts
|
||||||
@ -2705,199 +2712,204 @@ class Interpretation extends Fields
|
|||||||
$this->siteDecrypt[$cryptionType][$code] = false;
|
$this->siteDecrypt[$cryptionType][$code] = false;
|
||||||
}
|
}
|
||||||
// set the method defaults
|
// set the method defaults
|
||||||
$default = $this->setCustomViewMethodDefaults($get, $code);
|
if (($default = $this->setCustomViewMethodDefaults($get, $code)) !== false)
|
||||||
// build custom method
|
|
||||||
$methods .= PHP_EOL . PHP_EOL . $this->_t(1) . "/**";
|
|
||||||
$methods .= PHP_EOL . $this->_t(1) . " * Method to get an array of " . $default['name'] . " Objects.";
|
|
||||||
$methods .= PHP_EOL . $this->_t(1) . " *";
|
|
||||||
$methods .= PHP_EOL . $this->_t(1) . " * @return mixed An array of " . $default['name'] . " Objects on success, false on failure.";
|
|
||||||
$methods .= PHP_EOL . $this->_t(1) . " *";
|
|
||||||
$methods .= PHP_EOL . $this->_t(1) . " */";
|
|
||||||
$methods .= PHP_EOL . $this->_t(1) . "public function get" . $default['methodName'] . "(\$" . $default['on_field'] . ")";
|
|
||||||
$methods .= PHP_EOL . $this->_t(1) . "{" . $this->hhh . "CRYPT" . $this->hhh;
|
|
||||||
$methods .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Get a db connection.";
|
|
||||||
$methods .= PHP_EOL . $this->_t(2) . "\$db = JFactory::getDbo();";
|
|
||||||
$methods .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Create a new query object.";
|
|
||||||
$methods .= PHP_EOL . $this->_t(2) . "\$query = \$db->getQuery(true);";
|
|
||||||
$methods .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Get from " . $get['selection']['table'] . " as " . $default['as'];
|
|
||||||
$methods .= PHP_EOL . $this->_t(2) . $get['selection']['select'];
|
|
||||||
$methods .= PHP_EOL . $this->_t(2) . '$query->from(' . $get['selection']['from'] . ');';
|
|
||||||
// set the string
|
|
||||||
if ($get['operator'] === 'IN' || $get['operator'] === 'NOT IN')
|
|
||||||
{
|
{
|
||||||
$methods .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Check if \$" . $default['on_field'] . " is an array with values.";
|
// build custom method
|
||||||
$methods .= PHP_EOL . $this->_t(2) . "\$array = \$" . $default['on_field'] . ";";
|
$methods .= PHP_EOL . PHP_EOL . $this->_t(1) . "/**";
|
||||||
$methods .= PHP_EOL . $this->_t(2) . "if (isset(\$array) && " . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::checkArray(\$array, true))";
|
$methods .= PHP_EOL . $this->_t(1) . " * Method to get an array of " . $default['name'] . " Objects.";
|
||||||
|
$methods .= PHP_EOL . $this->_t(1) . " *";
|
||||||
|
$methods .= PHP_EOL . $this->_t(1) . " * @return mixed An array of " . $default['name'] . " Objects on success, false on failure.";
|
||||||
|
$methods .= PHP_EOL . $this->_t(1) . " *";
|
||||||
|
$methods .= PHP_EOL . $this->_t(1) . " */";
|
||||||
|
$methods .= PHP_EOL . $this->_t(1) . "public function get" . $default['methodName'] . "(\$" . $default['on_field'] . ")";
|
||||||
|
$methods .= PHP_EOL . $this->_t(1) . "{" . $this->hhh . "CRYPT" . $this->hhh;
|
||||||
|
$methods .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Get a db connection.";
|
||||||
|
$methods .= PHP_EOL . $this->_t(2) . "\$db = JFactory::getDbo();";
|
||||||
|
$methods .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Create a new query object.";
|
||||||
|
$methods .= PHP_EOL . $this->_t(2) . "\$query = \$db->getQuery(true);";
|
||||||
|
$methods .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Get from " . $get['selection']['table'] . " as " . $default['as'];
|
||||||
|
$methods .= PHP_EOL . $this->_t(2) . $get['selection']['select'];
|
||||||
|
$methods .= PHP_EOL . $this->_t(2) . '$query->from(' . $get['selection']['from'] . ');';
|
||||||
|
// set the string
|
||||||
|
if ($get['operator'] === 'IN' || $get['operator'] === 'NOT IN')
|
||||||
|
{
|
||||||
|
$methods .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Check if \$" . $default['on_field'] . " is an array with values.";
|
||||||
|
$methods .= PHP_EOL . $this->_t(2) . "\$array = \$" . $default['on_field'] . ";";
|
||||||
|
$methods .= PHP_EOL . $this->_t(2) . "if (isset(\$array) && " . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::checkArray(\$array, true))";
|
||||||
|
$methods .= PHP_EOL . $this->_t(2) . "{";
|
||||||
|
$methods .= PHP_EOL . $this->_t(3) . "\$query->where('" . $get['join_field'] . " " . $get['operator'] . " (' . implode(',', \$array) . ')');";
|
||||||
|
$methods .= PHP_EOL . $this->_t(2) . "}";
|
||||||
|
$methods .= PHP_EOL . $this->_t(2) . "else";
|
||||||
|
$methods .= PHP_EOL . $this->_t(2) . "{";
|
||||||
|
$methods .= PHP_EOL . $this->_t(3) . "return false;";
|
||||||
|
$methods .= PHP_EOL . $this->_t(2) . "}";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$methods .= PHP_EOL . $this->_t(2) . "\$query->where('" . $get['join_field'] . " " . $get['operator'] . " ' . \$db->quote(\$" . $default['on_field'] . "));";
|
||||||
|
}
|
||||||
|
// check if other queries should be loaded
|
||||||
|
$queryChecker = (isset($this->otherQuery[$this->target][$default['code']][$default['as']]) && ComponentbuilderHelper::checkArray($this->otherQuery[$this->target][$default['code']][$default['as']])) ? $this->otherQuery[$this->target][$default['code']][$default['as']] : '';
|
||||||
|
if (ComponentbuilderHelper::checkArray($queryChecker))
|
||||||
|
{
|
||||||
|
foreach ($queryChecker as $query)
|
||||||
|
{
|
||||||
|
$methods .= $query;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// add any other filter that was set
|
||||||
|
if (isset($this->otherFilter[$this->target][$default['code']][$default['as']]) && ComponentbuilderHelper::checkArray($this->otherFilter[$this->target][$default['code']][$default['as']]))
|
||||||
|
{
|
||||||
|
foreach ($this->otherFilter[$this->target][$default['code']][$default['as']] as $field => $string)
|
||||||
|
{
|
||||||
|
$methods .= $string;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// add any other where that was set
|
||||||
|
if (isset($this->otherWhere[$this->target][$default['code']][$default['as']]) && ComponentbuilderHelper::checkArray($this->otherWhere[$this->target][$default['code']][$default['as']]))
|
||||||
|
{
|
||||||
|
foreach ($this->otherWhere[$this->target][$default['code']][$default['as']] as $field => $string)
|
||||||
|
{
|
||||||
|
$methods .= $string;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// add any other order that was set
|
||||||
|
if (isset($this->otherOrder[$this->target][$default['code']][$default['as']]) && ComponentbuilderHelper::checkArray($this->otherOrder[$this->target][$default['code']][$default['as']]))
|
||||||
|
{
|
||||||
|
foreach ($this->otherOrder[$this->target][$default['code']][$default['as']] as $field => $string)
|
||||||
|
{
|
||||||
|
$methods .= $string;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
$methods .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Reset the query using our newly populated query object.";
|
||||||
|
$methods .= PHP_EOL . $this->_t(2) . "\$db->setQuery(\$query);";
|
||||||
|
$methods .= PHP_EOL . $this->_t(2) . "\$db->execute();";
|
||||||
|
$methods .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " check if there was data returned";
|
||||||
|
$methods .= PHP_EOL . $this->_t(2) . "if (\$db->getNumRows())";
|
||||||
$methods .= PHP_EOL . $this->_t(2) . "{";
|
$methods .= PHP_EOL . $this->_t(2) . "{";
|
||||||
$methods .= PHP_EOL . $this->_t(3) . "\$query->where('" . $get['join_field'] . " " . $get['operator'] . " (' . implode(',', \$array) . ')');";
|
// set dispatcher placeholder
|
||||||
$methods .= PHP_EOL . $this->_t(2) . "}";
|
$methods .= $this->hhh . "DISPATCHER" . $this->hhh;
|
||||||
$methods .= PHP_EOL . $this->_t(2) . "else";
|
// set decoding of needed fields
|
||||||
$methods .= PHP_EOL . $this->_t(2) . "{";
|
if (isset($this->siteFieldData['decode'][$default['code']][$get['key']][$default['as']]))
|
||||||
$methods .= PHP_EOL . $this->_t(3) . "return false;";
|
|
||||||
$methods .= PHP_EOL . $this->_t(2) . "}";
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
$methods .= PHP_EOL . $this->_t(2) . "\$query->where('" . $get['join_field'] . " " . $get['operator'] . " ' . \$db->quote(\$" . $default['on_field'] . "));";
|
|
||||||
}
|
|
||||||
// check if other queries should be loaded
|
|
||||||
$queryChecker = (isset($this->otherQuery[$this->target][$default['code']][$default['as']]) && ComponentbuilderHelper::checkArray($this->otherQuery[$this->target][$default['code']][$default['as']])) ? $this->otherQuery[$this->target][$default['code']][$default['as']] : '';
|
|
||||||
if (ComponentbuilderHelper::checkArray($queryChecker))
|
|
||||||
{
|
|
||||||
foreach ($queryChecker as $query)
|
|
||||||
{
|
{
|
||||||
$methods .= $query;
|
$decodeChecker = $this->siteFieldData['decode'][$default['code']][$get['key']][$default['as']];
|
||||||
}
|
}
|
||||||
}
|
// also filter fields if needed
|
||||||
// add any other filter that was set
|
if (isset($this->siteFieldDecodeFilter[$this->target][$default['code']][$get['key']][$default['as']]))
|
||||||
if (isset($this->otherFilter[$this->target][$default['code']][$default['as']]) && ComponentbuilderHelper::checkArray($this->otherFilter[$this->target][$default['code']][$default['as']]))
|
|
||||||
{
|
|
||||||
foreach ($this->otherFilter[$this->target][$default['code']][$default['as']] as $field => $string)
|
|
||||||
{
|
{
|
||||||
$methods .= $string;
|
$decodeFilter = $this->siteFieldDecodeFilter[$this->target][$default['code']][$get['key']][$default['as']];
|
||||||
}
|
}
|
||||||
}
|
// set uikit checkers on needed fields
|
||||||
// add any other where that was set
|
if (isset($this->siteFieldData['uikit'][$default['code']][$get['key']][$default['as']]))
|
||||||
if (isset($this->otherWhere[$this->target][$default['code']][$default['as']]) && ComponentbuilderHelper::checkArray($this->otherWhere[$this->target][$default['code']][$default['as']]))
|
|
||||||
{
|
|
||||||
foreach ($this->otherWhere[$this->target][$default['code']][$default['as']] as $field => $string)
|
|
||||||
{
|
{
|
||||||
$methods .= $string;
|
$uikitChecker = $this->siteFieldData['uikit'][$default['code']][$get['key']][$default['as']];
|
||||||
}
|
}
|
||||||
}
|
// set contnetprepare on needed fields
|
||||||
// add any other order that was set
|
if (isset($this->siteFieldData['textareas'][$default['code']][$get['key']][$default['as']]))
|
||||||
if (isset($this->otherOrder[$this->target][$default['code']][$default['as']]) && ComponentbuilderHelper::checkArray($this->otherOrder[$this->target][$default['code']][$default['as']]))
|
|
||||||
{
|
|
||||||
foreach ($this->otherOrder[$this->target][$default['code']][$default['as']] as $field => $string)
|
|
||||||
{
|
{
|
||||||
$methods .= $string;
|
$contentprepareChecker = $this->siteFieldData['textareas'][$default['code']][$get['key']][$default['as']];
|
||||||
}
|
}
|
||||||
}
|
// set joined values
|
||||||
$methods .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Reset the query using our newly populated query object.";
|
$placeholders = array($this->hhh . 'TAB' . $this->hhh => $this->_t(2), $this->hhh . 'STRING' . $this->hhh => '$item');
|
||||||
$methods .= PHP_EOL . $this->_t(2) . "\$db->setQuery(\$query);";
|
$joinedChecker = (isset($this->otherJoin[$this->target][$default['code']][$default['as']]) && ComponentbuilderHelper::checkArray($this->otherJoin[$this->target][$default['code']][$default['as']])) ? $this->otherJoin[$this->target][$default['code']][$default['as']] : '';
|
||||||
$methods .= PHP_EOL . $this->_t(2) . "\$db->execute();";
|
if ((isset($decodeChecker) && ComponentbuilderHelper::checkArray($decodeChecker)) ||
|
||||||
$methods .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " check if there was data returned";
|
(isset($uikitChecker) && ComponentbuilderHelper::checkArray($uikitChecker)) ||
|
||||||
$methods .= PHP_EOL . $this->_t(2) . "if (\$db->getNumRows())";
|
(isset($decodeFilter) && ComponentbuilderHelper::checkArray($decodeFilter)) ||
|
||||||
$methods .= PHP_EOL . $this->_t(2) . "{";
|
(isset($contentprepareChecker) && ComponentbuilderHelper::checkArray($contentprepareChecker)) ||
|
||||||
// set dispatcher placeholder
|
ComponentbuilderHelper::checkArray($joinedChecker))
|
||||||
$methods .= $this->hhh . "DISPATCHER" . $this->hhh;
|
|
||||||
// set decoding of needed fields
|
|
||||||
if (isset($this->siteFieldData['decode'][$default['code']][$get['key']][$default['as']]))
|
|
||||||
{
|
|
||||||
$decodeChecker = $this->siteFieldData['decode'][$default['code']][$get['key']][$default['as']];
|
|
||||||
}
|
|
||||||
// also filter fields if needed
|
|
||||||
if (isset($this->siteFieldDecodeFilter[$this->target][$default['code']][$get['key']][$default['as']]))
|
|
||||||
{
|
|
||||||
$decodeFilter = $this->siteFieldDecodeFilter[$this->target][$default['code']][$get['key']][$default['as']];
|
|
||||||
}
|
|
||||||
// set uikit checkers on needed fields
|
|
||||||
if (isset($this->siteFieldData['uikit'][$default['code']][$get['key']][$default['as']]))
|
|
||||||
{
|
|
||||||
$uikitChecker = $this->siteFieldData['uikit'][$default['code']][$get['key']][$default['as']];
|
|
||||||
}
|
|
||||||
// set contnetprepare on needed fields
|
|
||||||
if (isset($this->siteFieldData['textareas'][$default['code']][$get['key']][$default['as']]))
|
|
||||||
{
|
|
||||||
$contentprepareChecker = $this->siteFieldData['textareas'][$default['code']][$get['key']][$default['as']];
|
|
||||||
}
|
|
||||||
// set joined values
|
|
||||||
$placeholders = array($this->hhh . 'TAB' . $this->hhh => $this->_t(2), $this->hhh . 'STRING' . $this->hhh => '$item');
|
|
||||||
$joinedChecker = (isset($this->otherJoin[$this->target][$default['code']][$default['as']]) && ComponentbuilderHelper::checkArray($this->otherJoin[$this->target][$default['code']][$default['as']])) ? $this->otherJoin[$this->target][$default['code']][$default['as']] : '';
|
|
||||||
if ((isset($decodeChecker) && ComponentbuilderHelper::checkArray($decodeChecker)) ||
|
|
||||||
(isset($uikitChecker) && ComponentbuilderHelper::checkArray($uikitChecker)) ||
|
|
||||||
(isset($decodeFilter) && ComponentbuilderHelper::checkArray($decodeFilter)) ||
|
|
||||||
(isset($contentprepareChecker) && ComponentbuilderHelper::checkArray($contentprepareChecker)) ||
|
|
||||||
ComponentbuilderHelper::checkArray($joinedChecker))
|
|
||||||
{
|
|
||||||
$decoder = '';
|
|
||||||
if (isset($decodeChecker) && ComponentbuilderHelper::checkArray($decodeChecker))
|
|
||||||
{
|
{
|
||||||
// also filter fields if needed
|
$decoder = '';
|
||||||
$decoder = $this->setCustomViewFieldDecode($get, $decodeChecker, '$item', $default['code'], $this->_t(2));
|
if (isset($decodeChecker) && ComponentbuilderHelper::checkArray($decodeChecker))
|
||||||
}
|
|
||||||
$decoder_filter = '';
|
|
||||||
if (isset($decodeFilter) && ComponentbuilderHelper::checkArray($decodeFilter))
|
|
||||||
{
|
|
||||||
$decoder_filter = $this->setCustomViewFieldDecodeFilter($get, $decodeFilter, '$item', '$items[$nr]', $default['code'], $this->_t(2));
|
|
||||||
}
|
|
||||||
$contentprepare = '';
|
|
||||||
if (isset($contentprepareChecker) && ComponentbuilderHelper::checkArray($contentprepareChecker))
|
|
||||||
{
|
|
||||||
$contentprepare = $this->setCustomViewFieldonContentPrepareChecker($get, $contentprepareChecker, '$item', $default['code'], $this->_t(2));
|
|
||||||
}
|
|
||||||
$uikit = '';
|
|
||||||
if (isset($uikitChecker) && ComponentbuilderHelper::checkArray($uikitChecker))
|
|
||||||
{
|
|
||||||
$uikit = $this->setCustomViewFieldUikitChecker($get, $uikitChecker, '$item', $default['code'], $this->_t(2));
|
|
||||||
}
|
|
||||||
$joine = '';
|
|
||||||
if (ComponentbuilderHelper::checkArray($joinedChecker))
|
|
||||||
{
|
|
||||||
foreach ($joinedChecker as $joinedString)
|
|
||||||
{
|
{
|
||||||
$joine .= $this->setPlaceholders($joinedString, $placeholders);
|
// also filter fields if needed
|
||||||
|
$decoder = $this->setCustomViewFieldDecode($get, $decodeChecker, '$item', $default['code'], $this->_t(2));
|
||||||
}
|
}
|
||||||
}
|
$decoder_filter = '';
|
||||||
if (ComponentbuilderHelper::checkString($decoder) || ComponentbuilderHelper::checkString($contentprepare) || ComponentbuilderHelper::checkString($uikit) || ComponentbuilderHelper::checkString($decoder_filter) || ComponentbuilderHelper::checkString($joine))
|
if (isset($decodeFilter) && ComponentbuilderHelper::checkArray($decodeFilter))
|
||||||
{
|
|
||||||
$methods .= PHP_EOL . $this->_t(3) . "\$items = \$db->loadObjectList();";
|
|
||||||
$methods .= PHP_EOL . PHP_EOL . $this->_t(3) . "//" . $this->setLine(__LINE__) . " Convert the parameter fields into objects.";
|
|
||||||
$methods .= PHP_EOL . $this->_t(3) . "foreach (\$items as \$nr => &\$item)";
|
|
||||||
$methods .= PHP_EOL . $this->_t(3) . "{";
|
|
||||||
if (ComponentbuilderHelper::checkString($decoder))
|
|
||||||
{
|
{
|
||||||
$methods .= $decoder;
|
$decoder_filter = $this->setCustomViewFieldDecodeFilter($get, $decodeFilter, '$item', '$items[$nr]', $default['code'], $this->_t(2));
|
||||||
}
|
}
|
||||||
if (ComponentbuilderHelper::checkString($decoder_filter))
|
$contentprepare = '';
|
||||||
|
if (isset($contentprepareChecker) && ComponentbuilderHelper::checkArray($contentprepareChecker))
|
||||||
{
|
{
|
||||||
$methods .= $decoder_filter;
|
$contentprepare = $this->setCustomViewFieldonContentPrepareChecker($get, $contentprepareChecker, '$item', $default['code'], $this->_t(2));
|
||||||
}
|
}
|
||||||
if (ComponentbuilderHelper::checkString($contentprepare))
|
$uikit = '';
|
||||||
|
if (isset($uikitChecker) && ComponentbuilderHelper::checkArray($uikitChecker))
|
||||||
{
|
{
|
||||||
$methods .= $contentprepare;
|
$uikit = $this->setCustomViewFieldUikitChecker($get, $uikitChecker, '$item', $default['code'], $this->_t(2));
|
||||||
}
|
}
|
||||||
if (ComponentbuilderHelper::checkString($uikit))
|
$joine = '';
|
||||||
|
if (ComponentbuilderHelper::checkArray($joinedChecker))
|
||||||
{
|
{
|
||||||
$methods .= $uikit;
|
foreach ($joinedChecker as $joinedString)
|
||||||
|
{
|
||||||
|
$joine .= $this->setPlaceholders($joinedString, $placeholders);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (ComponentbuilderHelper::checkString($joine))
|
if (ComponentbuilderHelper::checkString($decoder) || ComponentbuilderHelper::checkString($contentprepare) || ComponentbuilderHelper::checkString($uikit) || ComponentbuilderHelper::checkString($decoder_filter) || ComponentbuilderHelper::checkString($joine))
|
||||||
{
|
{
|
||||||
$methods .= $joine;
|
$methods .= PHP_EOL . $this->_t(3) . "\$items = \$db->loadObjectList();";
|
||||||
|
$methods .= PHP_EOL . PHP_EOL . $this->_t(3) . "//" . $this->setLine(__LINE__) . " Convert the parameter fields into objects.";
|
||||||
|
$methods .= PHP_EOL . $this->_t(3) . "foreach (\$items as \$nr => &\$item)";
|
||||||
|
$methods .= PHP_EOL . $this->_t(3) . "{";
|
||||||
|
if (ComponentbuilderHelper::checkString($decoder))
|
||||||
|
{
|
||||||
|
$methods .= $decoder;
|
||||||
|
}
|
||||||
|
if (ComponentbuilderHelper::checkString($decoder_filter))
|
||||||
|
{
|
||||||
|
$methods .= $decoder_filter;
|
||||||
|
}
|
||||||
|
if (ComponentbuilderHelper::checkString($contentprepare))
|
||||||
|
{
|
||||||
|
$methods .= $contentprepare;
|
||||||
|
}
|
||||||
|
if (ComponentbuilderHelper::checkString($uikit))
|
||||||
|
{
|
||||||
|
$methods .= $uikit;
|
||||||
|
}
|
||||||
|
if (ComponentbuilderHelper::checkString($joine))
|
||||||
|
{
|
||||||
|
$methods .= $joine;
|
||||||
|
}
|
||||||
|
$methods .= PHP_EOL . $this->_t(3) . "}";
|
||||||
|
$methods .= PHP_EOL . $this->_t(3) . "return \$items;";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$methods .= PHP_EOL . $this->_t(3) . "return \$db->loadObjectList();";
|
||||||
}
|
}
|
||||||
$methods .= PHP_EOL . $this->_t(3) . "}";
|
|
||||||
$methods .= PHP_EOL . $this->_t(3) . "return \$items;";
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$methods .= PHP_EOL . $this->_t(3) . "return \$db->loadObjectList();";
|
$methods .= PHP_EOL . $this->_t(3) . "return \$db->loadObjectList();";
|
||||||
}
|
}
|
||||||
}
|
$methods .= PHP_EOL . $this->_t(2) . "}";
|
||||||
else
|
$methods .= PHP_EOL . $this->_t(2) . "return false;";
|
||||||
{
|
$methods .= PHP_EOL . $this->_t(1) . "}";
|
||||||
$methods .= PHP_EOL . $this->_t(3) . "return \$db->loadObjectList();";
|
|
||||||
}
|
|
||||||
$methods .= PHP_EOL . $this->_t(2) . "}";
|
|
||||||
$methods .= PHP_EOL . $this->_t(2) . "return false;";
|
|
||||||
$methods .= PHP_EOL . $this->_t(1) . "}";
|
|
||||||
|
|
||||||
// set the script if it was found
|
// set the script if it was found
|
||||||
$Component = $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh];
|
$Component = $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh];
|
||||||
$script = '';
|
$script = '';
|
||||||
foreach ($this->cryptionTypes as $cryptionType)
|
foreach ($this->cryptionTypes as $cryptionType)
|
||||||
{
|
|
||||||
if (isset($this->siteDecrypt[$cryptionType][$code]) && $this->siteDecrypt[$cryptionType][$code])
|
|
||||||
{
|
{
|
||||||
$script .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Get the " . $cryptionType . " encryption.";
|
if (isset($this->siteDecrypt[$cryptionType][$code]) && $this->siteDecrypt[$cryptionType][$code])
|
||||||
$script .= PHP_EOL . $this->_t(2) . "\$" . $cryptionType . "key = " . $Component . "Helper::getCryptKey('" . $cryptionType . "');";
|
{
|
||||||
$script .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Get the encryption object.";
|
$script .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Get the " . $cryptionType . " encryption.";
|
||||||
$script .= PHP_EOL . $this->_t(2) . "\$" . $cryptionType . " = new FOFEncryptAes(\$" . $cryptionType . "key);" . PHP_EOL;
|
$script .= PHP_EOL . $this->_t(2) . "\$" . $cryptionType . "key = " . $Component . "Helper::getCryptKey('" . $cryptionType . "');";
|
||||||
|
$script .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Get the encryption object.";
|
||||||
|
$script .= PHP_EOL . $this->_t(2) . "\$" . $cryptionType . " = new FOFEncryptAes(\$" . $cryptionType . "key);" . PHP_EOL;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
$methods = str_replace($this->hhh . 'CRYPT' . $this->hhh, $script, $methods);
|
||||||
}
|
}
|
||||||
$methods = str_replace($this->hhh . 'CRYPT' . $this->hhh, $script, $methods);
|
|
||||||
}
|
}
|
||||||
// insure the crypt placeholder is removed
|
// insure the crypt placeholder is removed
|
||||||
$methods = str_replace($this->hhh . 'CRYPT' . $this->hhh, '', $methods);
|
if (ComponentbuilderHelper::checkString($methods))
|
||||||
|
{
|
||||||
|
$methods = str_replace($this->hhh . 'CRYPT' . $this->hhh, '', $methods);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// only update if dispacher placholder is found
|
// only update if dispacher placholder is found
|
||||||
@ -2910,23 +2922,32 @@ class Interpretation extends Fields
|
|||||||
}
|
}
|
||||||
$methods = str_replace(array_keys($this->JEventDispatcher), array_values($this->JEventDispatcher), $methods);
|
$methods = str_replace(array_keys($this->JEventDispatcher), array_values($this->JEventDispatcher), $methods);
|
||||||
}
|
}
|
||||||
return $methods . PHP_EOL;
|
// insure the crypt placeholder is removed
|
||||||
|
if (ComponentbuilderHelper::checkString($methods))
|
||||||
|
{
|
||||||
|
return $methods . PHP_EOL;
|
||||||
|
}
|
||||||
|
return '';
|
||||||
}
|
}
|
||||||
|
|
||||||
public function setCustomViewMethodDefaults($get, $code)
|
public function setCustomViewMethodDefaults($get, $code)
|
||||||
{
|
{
|
||||||
$key = substr(ComponentbuilderHelper::safeString(preg_replace('/[0-9]+/', '', md5($get['key'])), 'F'), 0, 4);
|
if (isset($get['key']) && isset($get['as']))
|
||||||
$method['on_field'] = (isset($get['on_field'])) ? $this->removeAsDot($get['on_field']) : null;
|
{
|
||||||
$method['join_field'] = (isset($get['join_field'])) ? ComponentbuilderHelper::safeString($this->removeAsDot($get['join_field'])) : null;
|
$key = substr(ComponentbuilderHelper::safeString(preg_replace('/[0-9]+/', '', md5($get['key'])), 'F'), 0, 4);
|
||||||
$method['Join_field'] = (isset($method['join_field'])) ? ComponentbuilderHelper::safeString($method['join_field'], 'F') : null;
|
$method['on_field'] = (isset($get['on_field'])) ? $this->removeAsDot($get['on_field']) : null;
|
||||||
$method['name'] = ComponentbuilderHelper::safeString($get['selection']['name'], 'F');
|
$method['join_field'] = (isset($get['join_field'])) ? ComponentbuilderHelper::safeString($this->removeAsDot($get['join_field'])) : null;
|
||||||
$method['code'] = ComponentbuilderHelper::safeString($code);
|
$method['Join_field'] = (isset($method['join_field'])) ? ComponentbuilderHelper::safeString($method['join_field'], 'F') : null;
|
||||||
$method['AS'] = ComponentbuilderHelper::safeString($get['as'], 'U');
|
$method['name'] = ComponentbuilderHelper::safeString($get['selection']['name'], 'F');
|
||||||
$method['as'] = ComponentbuilderHelper::safeString($get['as']);
|
$method['code'] = ComponentbuilderHelper::safeString($code);
|
||||||
$method['valueName'] = $method['on_field'] . $method['Join_field'] . $method['name'] . $method['AS'];
|
$method['AS'] = ComponentbuilderHelper::safeString($get['as'], 'U');
|
||||||
$method['methodName'] = ComponentbuilderHelper::safeString($method['on_field'], 'F') . $method['Join_field'] . $method['name'] . $key . '_' . $method['AS'];
|
$method['as'] = ComponentbuilderHelper::safeString($get['as']);
|
||||||
// return
|
$method['valueName'] = $method['on_field'] . $method['Join_field'] . $method['name'] . $method['AS'];
|
||||||
return $method;
|
$method['methodName'] = ComponentbuilderHelper::safeString($method['on_field'], 'F') . $method['Join_field'] . $method['name'] . $key . '_' . $method['AS'];
|
||||||
|
// return
|
||||||
|
return $method;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -2228,7 +2228,7 @@ abstract class ComponentbuilderHelper
|
|||||||
}
|
}
|
||||||
$display[] = '</ul>';
|
$display[] = '</ul>';
|
||||||
// if we have a source link we add it
|
// if we have a source link we add it
|
||||||
if (isset($info['joomla_source_link']) && self::checkArray($info['joomla_source_link']) && self::checkString($info['joomla_source_link'][$key]))
|
if (isset($info['joomla_source_link']) && self::checkArray($info['joomla_source_link']) && isset($info['joomla_source_link'][$key]) && self::checkString($info['joomla_source_link'][$key]))
|
||||||
{
|
{
|
||||||
$display[] = '<a class="uk-button uk-button-mini uk-width-1-1 uk-margin-small-bottom " href="'.$info['joomla_source_link'][$key].'" target="_blank" title="Source Code for Joomla Component ('.$name.')">source code</a>';
|
$display[] = '<a class="uk-button uk-button-mini uk-width-1-1 uk-margin-small-bottom " href="'.$info['joomla_source_link'][$key].'" target="_blank" title="Source Code for Joomla Component ('.$name.')">source code</a>';
|
||||||
}
|
}
|
||||||
@ -3686,6 +3686,44 @@ abstract class ComponentbuilderHelper
|
|||||||
return self::$CRYPT[$TYPE];
|
return self::$CRYPT[$TYPE];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* set subform type table
|
||||||
|
*
|
||||||
|
* @param array $head The header names
|
||||||
|
* @param array $rows The row values
|
||||||
|
* @param string $idName The prefix to the table id
|
||||||
|
*
|
||||||
|
* @return string
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
public static function setSubformTable($head, $rows, $idName)
|
||||||
|
{
|
||||||
|
$table[] = "<div class=\"row-fluid\" id=\"vdm_table_display_".$idName."\">";
|
||||||
|
$table[] = "\t<div class=\"subform-repeatable-wrapper subform-table-layout subform-table-sublayout-section-byfieldsets\">";
|
||||||
|
$table[] = "\t\t<div class=\"subform-repeatable\">";
|
||||||
|
$table[] = "\t\t\t<table class=\"adminlist table table-striped table-bordered\">";
|
||||||
|
$table[] = "\t\t\t\t<thead>";
|
||||||
|
$table[] = "\t\t\t\t\t<tr>";
|
||||||
|
$table[] = "\t\t\t\t\t\t<th>" . implode("</th><th>", $head) . "</th>";
|
||||||
|
$table[] = "\t\t\t\t\t</tr>";
|
||||||
|
$table[] = "\t\t\t\t</thead>";
|
||||||
|
$table[] = "\t\t\t\t<tbody>";
|
||||||
|
foreach ($rows as $row)
|
||||||
|
{
|
||||||
|
$table[] = "\t\t\t\t\t<tr class=\"subform-repeatable-group\">";
|
||||||
|
$table[] = "\t\t\t\t\t\t" . $row;
|
||||||
|
$table[] = "\t\t\t\t\t</tr>";
|
||||||
|
}
|
||||||
|
$table[] = "\t\t\t\t</tbody>";
|
||||||
|
$table[] = "\t\t\t</table>";
|
||||||
|
$table[] = "\t\t</div>";
|
||||||
|
$table[] = "\t</div>";
|
||||||
|
$table[] = "</div>";
|
||||||
|
// return the table
|
||||||
|
return implode("\n", $table);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Load the Component xml manifest.
|
* Load the Component xml manifest.
|
||||||
**/
|
**/
|
||||||
|
|||||||
@ -594,39 +594,12 @@ class ComponentbuilderModelAjax extends JModelList
|
|||||||
// set the number of rows
|
// set the number of rows
|
||||||
$this->rowNumber = count($rows);
|
$this->rowNumber = count($rows);
|
||||||
// return the table
|
// return the table
|
||||||
return $this->setSubformTable($head, $rows, $idName);
|
return ComponentbuilderHelper::setSubformTable($head, $rows, $idName);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function setSubformTable($head, $rows, $idName)
|
|
||||||
{
|
|
||||||
$table[] = "<div class=\"row-fluid\" id=\"vdm_table_display_".$idName."\">";
|
|
||||||
$table[] = "\t<div class=\"subform-repeatable-wrapper subform-table-layout subform-table-sublayout-section-byfieldsets\">";
|
|
||||||
$table[] = "\t\t<div class=\"subform-repeatable\">";
|
|
||||||
$table[] = "\t\t\t<table class=\"adminlist table table-striped table-bordered\">";
|
|
||||||
$table[] = "\t\t\t\t<thead>";
|
|
||||||
$table[] = "\t\t\t\t\t<tr>";
|
|
||||||
$table[] = "\t\t\t\t\t\t<th>" . implode("</th><th>", $head) . "</th>";
|
|
||||||
$table[] = "\t\t\t\t\t</tr>";
|
|
||||||
$table[] = "\t\t\t\t</thead>";
|
|
||||||
$table[] = "\t\t\t\t<tbody>";
|
|
||||||
foreach ($rows as $row)
|
|
||||||
{
|
|
||||||
$table[] = "\t\t\t\t\t<tr class=\"subform-repeatable-group\">";
|
|
||||||
$table[] = "\t\t\t\t\t\t" . $row;
|
|
||||||
$table[] = "\t\t\t\t\t</tr>";
|
|
||||||
}
|
|
||||||
$table[] = "\t\t\t\t</tbody>";
|
|
||||||
$table[] = "\t\t\t</table>";
|
|
||||||
$table[] = "\t\t</div>";
|
|
||||||
$table[] = "\t</div>";
|
|
||||||
$table[] = "</div>";
|
|
||||||
// return the table
|
|
||||||
return implode("\n", $table);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected function setSubformValue($header, $value)
|
protected function setSubformValue($header, $value)
|
||||||
{
|
{
|
||||||
if (array_key_exists($header, $this->functionArray) && method_exists($this, $this->functionArray[$header]))
|
if (array_key_exists($header, $this->functionArray) && method_exists($this, $this->functionArray[$header]))
|
||||||
|
|||||||
@ -119,7 +119,6 @@ class ComponentbuilderModelCompiler extends JModelList
|
|||||||
return $items;
|
return $items;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the uikit needed components
|
* Get the uikit needed components
|
||||||
*
|
*
|
||||||
|
|||||||
@ -115,7 +115,6 @@ class ComponentbuilderModelGet_snippets extends JModelList
|
|||||||
return $items;
|
return $items;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the uikit needed components
|
* Get the uikit needed components
|
||||||
*
|
*
|
||||||
|
|||||||
@ -749,6 +749,8 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
|
|||||||
{
|
{
|
||||||
if (isset($this->data[$table]) && ComponentbuilderHelper::checkArray($this->data[$table]))
|
if (isset($this->data[$table]) && ComponentbuilderHelper::checkArray($this->data[$table]))
|
||||||
{
|
{
|
||||||
|
// add pre import event
|
||||||
|
$this->preImportEvent($table);
|
||||||
// get global action permissions
|
// get global action permissions
|
||||||
$canDo = ComponentbuilderHelper::getActions($table);
|
$canDo = ComponentbuilderHelper::getActions($table);
|
||||||
$canEdit = $canDo->get('core.edit');
|
$canEdit = $canDo->get('core.edit');
|
||||||
@ -836,6 +838,38 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if this table needs some house cleaning before we import the data
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*
|
||||||
|
**/
|
||||||
|
protected function preImportEvent($table)
|
||||||
|
{
|
||||||
|
// if this is custom code table
|
||||||
|
// remove all custom code linked to these components
|
||||||
|
// since some code may have been removed and changed
|
||||||
|
// best unpublish all and let the import publish those still active
|
||||||
|
if ('custom_code' === $table && isset($this->newID['joomla_component']) && ComponentbuilderHelper::checkArray($this->newID['joomla_component']))
|
||||||
|
{
|
||||||
|
$query = $this->_db->getQuery(true);
|
||||||
|
// Field to update.
|
||||||
|
$fields = array(
|
||||||
|
$this->_db->quoteName('published') . ' = 0'
|
||||||
|
);
|
||||||
|
|
||||||
|
// Conditions for which records should be updated.
|
||||||
|
$conditions = array(
|
||||||
|
$this->_db->quoteName('component') . ' IN (' . implode(', ', array_values($this->newID['joomla_component'])) . ')'
|
||||||
|
);
|
||||||
|
|
||||||
|
$query->update($this->_db->quoteName('#__componentbuilder_custom_code'))->set($fields)->where($conditions);
|
||||||
|
|
||||||
|
$this->_db->setQuery($query);
|
||||||
|
$this->_db->execute();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check if we should allow merge for this table
|
* Check if we should allow merge for this table
|
||||||
*
|
*
|
||||||
@ -2706,28 +2740,38 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
|
|||||||
case 'custom_code':
|
case 'custom_code':
|
||||||
// search for custom code
|
// search for custom code
|
||||||
$getter = array('comment_type', 'target');
|
$getter = array('comment_type', 'target');
|
||||||
// add some more advanced search
|
$this->specialValue = array();
|
||||||
if (isset($item->path) && ComponentbuilderHelper::checkString($item->path))
|
// search for Hash (automation)
|
||||||
|
if (isset($item->target) && $item->target == 1)
|
||||||
{
|
{
|
||||||
$getter[] = 'path';
|
$getter[] = 'path';
|
||||||
|
$getter[] = 'hashtarget';
|
||||||
|
$getter[] = 'component';
|
||||||
|
// Yet if diverged it makes sense that the ID is updated.
|
||||||
|
if ($diverged)
|
||||||
|
{
|
||||||
|
// set a special value
|
||||||
|
$this->specialValue['component'] = (int) $item->component;
|
||||||
|
}
|
||||||
|
elseif (isset($this->newID['joomla_component'][(int) $item->component]))
|
||||||
|
{
|
||||||
|
// set a special value
|
||||||
|
$this->specialValue['component'] = $this->newID['joomla_component'][(int) $item->component];
|
||||||
|
}
|
||||||
|
// (TODO) I have seen this happen, seems dangerous!
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
// add function name search
|
// search for JCB (manual)
|
||||||
if (isset($item->function_name) && ComponentbuilderHelper::checkString($item->function_name))
|
elseif (isset($item->target) && $item->target == 2)
|
||||||
{
|
{
|
||||||
$getter[] = 'function_name';
|
$getter[] = 'function_name';
|
||||||
// remove path
|
|
||||||
if (($key = array_search('path', $getter)) !== false) {
|
|
||||||
unset($getter[$key]);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
// add hash target search
|
else
|
||||||
elseif (isset($item->hashtarget) && ComponentbuilderHelper::checkString($item->hashtarget))
|
|
||||||
{
|
{
|
||||||
$getter[] = 'hashtarget';
|
return false;
|
||||||
// remove function name
|
|
||||||
if (($key = array_search('function_name', $getter)) !== false) {
|
|
||||||
unset($getter[$key]);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 'dynamic_get':
|
case 'dynamic_get':
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<extension type="component" version="3.2" method="upgrade">
|
<extension type="component" version="3.2" method="upgrade">
|
||||||
<name>COM_COMPONENTBUILDER</name>
|
<name>COM_COMPONENTBUILDER</name>
|
||||||
<creationDate>25th August, 2018</creationDate>
|
<creationDate>30th August, 2018</creationDate>
|
||||||
<author>Llewellyn van der Merwe</author>
|
<author>Llewellyn van der Merwe</author>
|
||||||
<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
|
<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
|
||||||
<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>
|
<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>
|
||||||
|
|||||||
@ -2228,7 +2228,7 @@ abstract class ComponentbuilderHelper
|
|||||||
}
|
}
|
||||||
$display[] = '</ul>';
|
$display[] = '</ul>';
|
||||||
// if we have a source link we add it
|
// if we have a source link we add it
|
||||||
if (isset($info['joomla_source_link']) && self::checkArray($info['joomla_source_link']) && self::checkString($info['joomla_source_link'][$key]))
|
if (isset($info['joomla_source_link']) && self::checkArray($info['joomla_source_link']) && isset($info['joomla_source_link'][$key]) && self::checkString($info['joomla_source_link'][$key]))
|
||||||
{
|
{
|
||||||
$display[] = '<a class="uk-button uk-button-mini uk-width-1-1 uk-margin-small-bottom " href="'.$info['joomla_source_link'][$key].'" target="_blank" title="Source Code for Joomla Component ('.$name.')">source code</a>';
|
$display[] = '<a class="uk-button uk-button-mini uk-width-1-1 uk-margin-small-bottom " href="'.$info['joomla_source_link'][$key].'" target="_blank" title="Source Code for Joomla Component ('.$name.')">source code</a>';
|
||||||
}
|
}
|
||||||
@ -3686,6 +3686,44 @@ abstract class ComponentbuilderHelper
|
|||||||
return self::$CRYPT[$TYPE];
|
return self::$CRYPT[$TYPE];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* set subform type table
|
||||||
|
*
|
||||||
|
* @param array $head The header names
|
||||||
|
* @param array $rows The row values
|
||||||
|
* @param string $idName The prefix to the table id
|
||||||
|
*
|
||||||
|
* @return string
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
public static function setSubformTable($head, $rows, $idName)
|
||||||
|
{
|
||||||
|
$table[] = "<div class=\"row-fluid\" id=\"vdm_table_display_".$idName."\">";
|
||||||
|
$table[] = "\t<div class=\"subform-repeatable-wrapper subform-table-layout subform-table-sublayout-section-byfieldsets\">";
|
||||||
|
$table[] = "\t\t<div class=\"subform-repeatable\">";
|
||||||
|
$table[] = "\t\t\t<table class=\"adminlist table table-striped table-bordered\">";
|
||||||
|
$table[] = "\t\t\t\t<thead>";
|
||||||
|
$table[] = "\t\t\t\t\t<tr>";
|
||||||
|
$table[] = "\t\t\t\t\t\t<th>" . implode("</th><th>", $head) . "</th>";
|
||||||
|
$table[] = "\t\t\t\t\t</tr>";
|
||||||
|
$table[] = "\t\t\t\t</thead>";
|
||||||
|
$table[] = "\t\t\t\t<tbody>";
|
||||||
|
foreach ($rows as $row)
|
||||||
|
{
|
||||||
|
$table[] = "\t\t\t\t\t<tr class=\"subform-repeatable-group\">";
|
||||||
|
$table[] = "\t\t\t\t\t\t" . $row;
|
||||||
|
$table[] = "\t\t\t\t\t</tr>";
|
||||||
|
}
|
||||||
|
$table[] = "\t\t\t\t</tbody>";
|
||||||
|
$table[] = "\t\t\t</table>";
|
||||||
|
$table[] = "\t\t</div>";
|
||||||
|
$table[] = "\t</div>";
|
||||||
|
$table[] = "</div>";
|
||||||
|
// return the table
|
||||||
|
return implode("\n", $table);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public static function jsonToString($value, $sperator = ", ", $table = null, $id = 'id', $name = 'name')
|
public static function jsonToString($value, $sperator = ", ", $table = null, $id = 'id', $name = 'name')
|
||||||
{
|
{
|
||||||
|
|||||||
@ -141,7 +141,6 @@ class ComponentbuilderModelApi extends JModelItem
|
|||||||
return $this->_item[$pk];
|
return $this->_item[$pk];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the uikit needed components
|
* Get the uikit needed components
|
||||||
*
|
*
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user