Major upgrade, with new filter system, and many bug fixes. #618
@ -144,11 +144,11 @@ TODO
|
||||
+ *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*: 29th November, 2020
|
||||
+ *Last Build*: 30th November, 2020
|
||||
+ *Version*: 2.11.7
|
||||
+ *Copyright*: Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
|
||||
+ *License*: GNU General Public License version 2 or later; see LICENSE.txt
|
||||
+ *Line count*: **284144**
|
||||
+ *Line count*: **284720**
|
||||
+ *Field count*: **1537**
|
||||
+ *File count*: **1799**
|
||||
+ *Folder count*: **304**
|
||||
|
@ -144,11 +144,11 @@ TODO
|
||||
+ *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*: 29th November, 2020
|
||||
+ *Last Build*: 30th November, 2020
|
||||
+ *Version*: 2.11.7
|
||||
+ *Copyright*: Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
|
||||
+ *License*: GNU General Public License version 2 or later; see LICENSE.txt
|
||||
+ *Line count*: **284144**
|
||||
+ *Line count*: **284720**
|
||||
+ *Field count*: **1537**
|
||||
+ *File count*: **1799**
|
||||
+ *Folder count*: **304**
|
||||
|
@ -4143,6 +4143,98 @@ class Get
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* get the list default ordering values
|
||||
*
|
||||
* @param string $nameListCode The list view name
|
||||
*
|
||||
* @return array
|
||||
*
|
||||
*/
|
||||
public function getListViewDefaultOrdering(&$nameListCode)
|
||||
{
|
||||
if (isset($this->viewsDefaultOrdering[$nameListCode])
|
||||
&& $this->viewsDefaultOrdering[$nameListCode]['add_admin_ordering'] == 1)
|
||||
{
|
||||
foreach (
|
||||
$this->viewsDefaultOrdering[$nameListCode]['admin_ordering_fields']
|
||||
as $order_field
|
||||
)
|
||||
{
|
||||
if (($order_field_name = $this->getFieldDatabaseName(
|
||||
$nameListCode, $order_field['field']
|
||||
)) !== false)
|
||||
{
|
||||
// just the first field is the based ordering state
|
||||
return array(
|
||||
'name' => $order_field_name,
|
||||
'direction' => $order_field['direction']
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
// the default
|
||||
return array(
|
||||
'name' => 'a.id',
|
||||
'direction' => 'DESC'
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* get the field database name and AS prefix
|
||||
*
|
||||
* @param string $nameListCode The list view name
|
||||
* @param int $fieldId The field ID
|
||||
* @param string $targetArea The area being targeted
|
||||
*
|
||||
* @return string
|
||||
*
|
||||
*/
|
||||
public function getFieldDatabaseName($nameListCode, int $fieldId,
|
||||
$targetArea = 'listBuilder'
|
||||
) {
|
||||
if (isset($this->{$targetArea}[$nameListCode]))
|
||||
{
|
||||
if ($fieldId < 0)
|
||||
{
|
||||
switch ($fieldId)
|
||||
{
|
||||
case -1:
|
||||
return 'a.id';
|
||||
case -2:
|
||||
return 'a.ordering';
|
||||
case -3:
|
||||
return 'a.published';
|
||||
}
|
||||
}
|
||||
foreach ($this->{$targetArea}[$nameListCode] as $field)
|
||||
{
|
||||
if ($field['id'] == $fieldId)
|
||||
{
|
||||
// now check if this is a category
|
||||
if ($field['type'] === 'category')
|
||||
{
|
||||
return 'c.title';
|
||||
}
|
||||
// set the custom code
|
||||
elseif (ComponentbuilderHelper::checkArray(
|
||||
$field['custom']
|
||||
))
|
||||
{
|
||||
return $field['custom']['db'] . "."
|
||||
. $field['custom']['text'];
|
||||
}
|
||||
else
|
||||
{
|
||||
return 'a.' . $field['code'];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the field's actual type
|
||||
*
|
||||
|
@ -4559,10 +4559,11 @@ class Fields extends Structure
|
||||
// set lang
|
||||
$listLangName = $langView . '_'
|
||||
. ComponentbuilderHelper::safeFieldName($tempName, true);
|
||||
// set field name
|
||||
$listFieldName = ComponentbuilderHelper::safeString($tempName, 'W');
|
||||
// add to lang array
|
||||
$this->setLangContent(
|
||||
$this->lang, $listLangName,
|
||||
ComponentbuilderHelper::safeString($tempName, 'W')
|
||||
$this->lang, $listLangName, $listFieldName
|
||||
);
|
||||
}
|
||||
else
|
||||
@ -4570,10 +4571,11 @@ class Fields extends Structure
|
||||
// set lang (just in case)
|
||||
$listLangName = $langView . '_'
|
||||
. ComponentbuilderHelper::safeFieldName($name, true);
|
||||
// set field name
|
||||
$listFieldName = ComponentbuilderHelper::safeString($name, 'W');
|
||||
// add to lang array
|
||||
$this->setLangContent(
|
||||
$this->lang, $listLangName,
|
||||
ComponentbuilderHelper::safeString($name, 'W')
|
||||
$this->lang, $listLangName, $listFieldName
|
||||
);
|
||||
// if label was set use instead
|
||||
if (ComponentbuilderHelper::checkString($langLabel))
|
||||
@ -4971,6 +4973,8 @@ class Fields extends Structure
|
||||
$this->selectionTranslationFixBuilder[$nameListCode][$name]
|
||||
= $options;
|
||||
}
|
||||
// main lang filter prefix
|
||||
$lang_filter_ = $this->langPrefix . '_FILTER_';
|
||||
// build the sort values
|
||||
if ($dbSwitch && (isset($field['sort']) && $field['sort'] == 1)
|
||||
&& ($listSwitch || $listJoin)
|
||||
@ -4979,9 +4983,38 @@ class Fields extends Structure
|
||||
&& $typeName != 'repeatable'
|
||||
&& $typeName != 'subform'))
|
||||
{
|
||||
// add the language only for new filter option
|
||||
$filter_name_asc_lang = '';
|
||||
$filter_name_desc_lang = '';
|
||||
if (isset($this->adminFilterType[$nameListCode])
|
||||
&& $this->adminFilterType[$nameListCode] == 2)
|
||||
{
|
||||
// set the language strings for ascending
|
||||
$filter_name_asc = $listFieldName . ' ascending';
|
||||
$filter_name_asc_lang = $lang_filter_
|
||||
. ComponentbuilderHelper::safeString(
|
||||
$filter_name_asc, 'U'
|
||||
);
|
||||
// and to translation
|
||||
$this->setLangContent(
|
||||
$this->lang, $filter_name_asc_lang, $filter_name_asc
|
||||
);
|
||||
// set the language strings for descending
|
||||
$filter_name_desc = $listFieldName . ' descending';
|
||||
$filter_name_desc_lang = $lang_filter_
|
||||
. ComponentbuilderHelper::safeString(
|
||||
$filter_name_desc, 'U'
|
||||
);
|
||||
// and to translation
|
||||
$this->setLangContent(
|
||||
$this->lang, $filter_name_desc_lang, $filter_name_desc
|
||||
);
|
||||
}
|
||||
$this->sortBuilder[$nameListCode][] = array('type' => $typeName,
|
||||
'code' => $name,
|
||||
'lang' => $listLangName,
|
||||
'lang_asc' => $filter_name_asc_lang,
|
||||
'lang_desc' => $filter_name_desc_lang,
|
||||
'custom' => $custom,
|
||||
'options' => $options);
|
||||
}
|
||||
@ -5011,6 +5044,23 @@ class Fields extends Structure
|
||||
$filter_function_name = ComponentbuilderHelper::safeString(
|
||||
$name, 'F'
|
||||
);
|
||||
// add the language only for new filter option
|
||||
$filter_name_select_lang = '';
|
||||
if (isset($this->adminFilterType[$nameListCode])
|
||||
&& $this->adminFilterType[$nameListCode] == 2)
|
||||
{
|
||||
// set the language strings for selection
|
||||
$filter_name_select = 'Select ' . $listFieldName;
|
||||
$filter_name_select_lang = $lang_filter_
|
||||
. ComponentbuilderHelper::safeString(
|
||||
$filter_name_select, 'U'
|
||||
);
|
||||
// and to translation
|
||||
$this->setLangContent(
|
||||
$this->lang, $filter_name_select_lang, $filter_name_select
|
||||
);
|
||||
}
|
||||
|
||||
// add the filter details
|
||||
$this->filterBuilder[$nameListCode][] = array(
|
||||
'id' => (int) $field['field'],
|
||||
@ -5019,6 +5069,7 @@ class Fields extends Structure
|
||||
'code' => $name,
|
||||
'label' => $langLabel,
|
||||
'lang' => $listLangName,
|
||||
'lang_select' => $filter_name_select_lang,
|
||||
'database' => $nameSingleCode,
|
||||
'function' => $filter_function_name,
|
||||
'custom' => $custom,
|
||||
@ -5498,17 +5549,29 @@ class Fields extends Structure
|
||||
{
|
||||
// check if this is the above/new filter option
|
||||
if (isset($this->adminFilterType[$nameListCode])
|
||||
&& $this->adminFilterType[$nameListCode] == 2
|
||||
&& isset($this->filterBuilder[$nameListCode])
|
||||
&& ComponentbuilderHelper::checkArray(
|
||||
$this->filterBuilder[$nameListCode]
|
||||
))
|
||||
&& $this->adminFilterType[$nameListCode] == 2)
|
||||
{
|
||||
// we first create the file
|
||||
$target = array('admin' => 'filter_' . $nameListCode);
|
||||
$this->buildDynamique(
|
||||
$target, 'filter'
|
||||
);
|
||||
// the search language string
|
||||
$lang_search = $this->langPrefix . '_FILTER_SEARCH';
|
||||
// and to translation
|
||||
$this->setLangContent(
|
||||
$this->lang, $lang_search, 'Search'
|
||||
. ComponentbuilderHelper::safeString($nameListCode, 'w')
|
||||
);
|
||||
// the search description language string
|
||||
$lang_search_desc = $this->langPrefix . '_FILTER_SEARCH_'
|
||||
. strtoupper($nameListCode);
|
||||
// and to translation
|
||||
$this->setLangContent(
|
||||
$this->lang, $lang_search_desc, 'Search the '
|
||||
. ComponentbuilderHelper::safeString($nameSingleCode, 'w')
|
||||
. ' items. Prefix with ID: to search for an item by ID.'
|
||||
);
|
||||
// now build the XML
|
||||
$field_filter_sets = array();
|
||||
$field_filter_sets[] = $this->_t(1) . '<fields name="filter">';
|
||||
@ -5518,21 +5581,35 @@ class Fields extends Structure
|
||||
$field_filter_sets[] = $this->_t(3) . 'name="search"';
|
||||
$field_filter_sets[] = $this->_t(3) . 'inputmode="search"';
|
||||
$field_filter_sets[] = $this->_t(3)
|
||||
. 'label="COM_CONTENT_FILTER_SEARCH_LABEL"';
|
||||
. 'label="' . $lang_search . '"';
|
||||
$field_filter_sets[] = $this->_t(3)
|
||||
. 'description="COM_CONTENT_FILTER_SEARCH_DESC"';
|
||||
. 'description="' . $lang_search_desc . '"';
|
||||
$field_filter_sets[] = $this->_t(3) . 'hint="JSEARCH_FILTER"';
|
||||
$field_filter_sets[] = $this->_t(2) . '/>';
|
||||
// add the published filter if published is not set
|
||||
if (!isset($this->fieldsNames[$nameSingleCode]['published']))
|
||||
{
|
||||
// the published language string
|
||||
$lang_published = $this->langPrefix . '_FILTER_PUBLISHED';
|
||||
// and to translation
|
||||
$this->setLangContent(
|
||||
$this->lang, $lang_published, 'Status'
|
||||
);
|
||||
// the published description language string
|
||||
$lang_published_desc = $this->langPrefix . '_FILTER_PUBLISHED_'
|
||||
. strtoupper($nameListCode);
|
||||
// and to translation
|
||||
$this->setLangContent(
|
||||
$this->lang, $lang_published_desc, 'Status options for '
|
||||
. ComponentbuilderHelper::safeString($nameListCode, 'w')
|
||||
);
|
||||
$field_filter_sets[] = $this->_t(2) . '<field';
|
||||
$field_filter_sets[] = $this->_t(3) . 'type="status"';
|
||||
$field_filter_sets[] = $this->_t(3) . 'name="published"';
|
||||
$field_filter_sets[] = $this->_t(3)
|
||||
. 'label="COM_CONTENT_FILTER_PUBLISHED"';
|
||||
. 'label="' . $lang_published . '"';
|
||||
$field_filter_sets[] = $this->_t(3)
|
||||
. 'description="COM_CONTENT_FILTER_PUBLISHED_DESC"';
|
||||
. 'description="' . $lang_published_desc . '"';
|
||||
$field_filter_sets[] = $this->_t(3)
|
||||
. 'onchange="this.form.submit();"';
|
||||
$field_filter_sets[] = $this->_t(2) . '>';
|
||||
@ -5563,6 +5640,11 @@ class Fields extends Structure
|
||||
$field_filter_sets[] = $this->_t(2) . '/>';
|
||||
}
|
||||
// now add the dynamic fields
|
||||
if (isset($this->filterBuilder[$nameListCode])
|
||||
&& ComponentbuilderHelper::checkArray(
|
||||
$this->filterBuilder[$nameListCode]
|
||||
))
|
||||
{
|
||||
foreach ($this->filterBuilder[$nameListCode] as $r => &$filter)
|
||||
{
|
||||
if ($filter['type'] != 'category')
|
||||
@ -5594,9 +5676,11 @@ class Fields extends Structure
|
||||
// if this is a multi field
|
||||
if ($filter['multi'] == 2)
|
||||
{
|
||||
$field_filter_sets[] = $this->_t(3) . 'class="multiple'
|
||||
$field_filter_sets[] = $this->_t(3)
|
||||
. 'class="multiple'
|
||||
. $filter['class'] . '"';
|
||||
$field_filter_sets[] = $this->_t(3) . 'multiple="true"';
|
||||
$field_filter_sets[] = $this->_t(3)
|
||||
. 'multiple="true"';
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -5608,6 +5692,7 @@ class Fields extends Structure
|
||||
$field_filter_sets[] = $this->_t(2) . '/>';
|
||||
}
|
||||
}
|
||||
}
|
||||
$field_filter_sets[] = $this->_t(2)
|
||||
. '<input type="hidden" name="form_submited" value="1"/>';
|
||||
$field_filter_sets[] = $this->_t(1) . '</fields>';
|
||||
@ -5630,7 +5715,119 @@ class Fields extends Structure
|
||||
*/
|
||||
public function setFieldFilterListSet(&$nameSingleCode, &$nameListCode)
|
||||
{
|
||||
// soon we will add this TODO
|
||||
// check if this is the above/new filter option
|
||||
if (isset($this->adminFilterType[$nameListCode])
|
||||
&& $this->adminFilterType[$nameListCode] == 2)
|
||||
{
|
||||
// keep track of all fields already added
|
||||
$donelist = array('ordering' => true, 'id' => true);
|
||||
// now build the XML
|
||||
$list_sets = array();
|
||||
$list_sets[] = $this->_t(1) . '<fields name="list">';
|
||||
$list_sets[] = $this->_t(2) . '<field';
|
||||
$list_sets[] = $this->_t(3) . 'name="fullordering"';
|
||||
$list_sets[] = $this->_t(3) . 'type="list"';
|
||||
$list_sets[] = $this->_t(3)
|
||||
. 'label="COM_CONTENT_LIST_FULL_ORDERING"';
|
||||
$list_sets[] = $this->_t(3)
|
||||
. 'description="COM_CONTENT_LIST_FULL_ORDERING_DESC"';
|
||||
$list_sets[] = $this->_t(3) . 'onchange="this.form.submit();"';
|
||||
// add dynamic ordering (Admin view)
|
||||
$default_ordering = $this->getListViewDefaultOrdering(
|
||||
$nameListCode
|
||||
);
|
||||
// set the default ordering
|
||||
$list_sets[] = $this->_t(3) . 'default="'
|
||||
. $default_ordering['name'] . ' '
|
||||
. $default_ordering['direction'] . '"';
|
||||
$list_sets[] = $this->_t(3) . 'validate="options"';
|
||||
$list_sets[] = $this->_t(2) . '>';
|
||||
$list_sets[] = $this->_t(3)
|
||||
. '<option value="">JGLOBAL_SORT_BY</option>';
|
||||
$list_sets[] = $this->_t(3)
|
||||
. '<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>';
|
||||
$list_sets[] = $this->_t(3)
|
||||
. '<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>';
|
||||
// add the published filter if published is not set
|
||||
if (!isset($this->fieldsNames[$nameSingleCode]['published']))
|
||||
{
|
||||
// add to done list
|
||||
$donelist['published'] = true;
|
||||
// add to xml :)
|
||||
$list_sets[] = $this->_t(3)
|
||||
. '<option value="a.published ASC">JSTATUS_ASC</option>';
|
||||
$list_sets[] = $this->_t(3)
|
||||
. '<option value="a.published DESC">JSTATUS_DESC</option>';
|
||||
}
|
||||
|
||||
// add the rest of the set filters
|
||||
if (isset($this->sortBuilder[$nameListCode])
|
||||
&& ComponentbuilderHelper::checkArray(
|
||||
$this->sortBuilder[$nameListCode]
|
||||
))
|
||||
{
|
||||
foreach ($this->sortBuilder[$nameListCode] as $filter)
|
||||
{
|
||||
if (!isset($donelist[$filter['code']]))
|
||||
{
|
||||
if ($filter['type'] === 'category')
|
||||
{
|
||||
$list_sets[] = $this->_t(3)
|
||||
. '<option value="category_title ASC">'
|
||||
. $filter['lang_asc'] . '</option>';
|
||||
$list_sets[] = $this->_t(3)
|
||||
. '<option value="category_title DESC">'
|
||||
. $filter['lang_desc'] . '</option>';
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkArray(
|
||||
$filter['custom']
|
||||
))
|
||||
{
|
||||
$list_sets[] = $this->_t(3) . '<option value="'
|
||||
. $filter['custom']['db'] . '.'
|
||||
. $filter['custom']['text'] . ' ASC">'
|
||||
. $filter['lang_asc'] . '</option>';
|
||||
$list_sets[] = $this->_t(3) . '<option value="'
|
||||
. $filter['custom']['db'] . '.'
|
||||
. $filter['custom']['text'] . ' DESC">'
|
||||
. $filter['lang_desc'] . '</option>';
|
||||
}
|
||||
else
|
||||
{
|
||||
$list_sets[] = $this->_t(3) . '<option value="a.'
|
||||
. $filter['code'] . ' ASC">'
|
||||
. $filter['lang_asc'] . '</option>';
|
||||
$list_sets[] = $this->_t(3) . '<option value="a.'
|
||||
. $filter['code'] . ' DESC">'
|
||||
. $filter['lang_desc'] . '</option>';
|
||||
}
|
||||
// do not add again
|
||||
$donelist[$filter['code']] = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$list_sets[] = $this->_t(3)
|
||||
. '<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>';
|
||||
$list_sets[] = $this->_t(3)
|
||||
. '<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>';
|
||||
$list_sets[] = $this->_t(2) . '</field>' . PHP_EOL;
|
||||
|
||||
$list_sets[] = $this->_t(2) . '<field';
|
||||
$list_sets[] = $this->_t(3) . 'name="limit"';
|
||||
$list_sets[] = $this->_t(3) . 'type="limitbox"';
|
||||
$list_sets[] = $this->_t(3) . 'label="COM_CONTENT_LIST_LIMIT"';
|
||||
$list_sets[] = $this->_t(3)
|
||||
. 'description="COM_CONTENT_LIST_LIMIT_DESC"';
|
||||
$list_sets[] = $this->_t(3) . 'class="input-mini"';
|
||||
$list_sets[] = $this->_t(3) . 'default="25"';
|
||||
$list_sets[] = $this->_t(3) . 'onchange="this.form.submit();"';
|
||||
$list_sets[] = $this->_t(2) . '/>';
|
||||
$list_sets[] = $this->_t(1) . '</fields>';
|
||||
|
||||
return implode(PHP_EOL, $list_sets);
|
||||
}
|
||||
|
||||
return '';
|
||||
}
|
||||
|
||||
|
@ -5121,49 +5121,19 @@ class Interpretation extends Fields
|
||||
$script .= PHP_EOL . $this->_t(2) . "\$this->activeFilters "
|
||||
. "= \$this->get('ActiveFilters');";
|
||||
}
|
||||
// add the custom ordering if set
|
||||
if (isset($this->viewsDefaultOrdering[$nameListCode])
|
||||
&& $this->viewsDefaultOrdering[$nameListCode]['add_admin_ordering']
|
||||
== 1)
|
||||
{
|
||||
// the first is from the state
|
||||
$order_first = true;
|
||||
foreach (
|
||||
$this->viewsDefaultOrdering[$nameListCode]['admin_ordering_fields']
|
||||
as $order_field
|
||||
)
|
||||
{
|
||||
if ($order_first
|
||||
&& ($order_field_name = $this->getFieldDatabaseName(
|
||||
$nameListCode, $order_field['field']
|
||||
)) !== false)
|
||||
{
|
||||
// just the first field is based on state
|
||||
$order_first = false;
|
||||
// get the default ordering values
|
||||
$default_ordering = $this->getListViewDefaultOrdering($nameListCode);
|
||||
// now add the default ordering
|
||||
$script .= PHP_EOL . $this->_t(2) . "//"
|
||||
. $this->setLine(
|
||||
__LINE__
|
||||
) . " Add the list ordering clause.";
|
||||
$script .= PHP_EOL . $this->_t(2)
|
||||
. "\$this->listOrder = \$this->escape(\$this->state->get('list.ordering', '"
|
||||
. $order_field_name . "'));";
|
||||
. $default_ordering['name'] . "'));";
|
||||
$script .= PHP_EOL . $this->_t(2)
|
||||
. "\$this->listDirn = \$this->escape(\$this->state->get('list.direction', '"
|
||||
. $order_field['direction'] . "'));";
|
||||
}
|
||||
}
|
||||
}
|
||||
// if no ordering is added we must add default
|
||||
if (!ComponentbuilderHelper::checkString($script))
|
||||
{
|
||||
$script .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(
|
||||
__LINE__
|
||||
) . " Add the list ordering clause.";
|
||||
$script .= PHP_EOL . $this->_t(2)
|
||||
. "\$this->listOrder = \$this->escape(\$this->state->get('list.ordering', 'a.id'));";
|
||||
$script .= PHP_EOL . $this->_t(2)
|
||||
. "\$this->listDirn = \$this->escape(\$this->state->get('list.direction', 'asc'));";
|
||||
}
|
||||
. $default_ordering['direction'] . "'));";
|
||||
|
||||
return $script;
|
||||
}
|
||||
@ -15507,57 +15477,6 @@ class Interpretation extends Fields
|
||||
return $query;
|
||||
}
|
||||
|
||||
/**
|
||||
* get the field database name and AS prefix
|
||||
*
|
||||
* @return string
|
||||
*
|
||||
*/
|
||||
protected function getFieldDatabaseName($nameListCode, int $fieldId,
|
||||
$targetArea = 'listBuilder'
|
||||
) {
|
||||
if (isset($this->{$targetArea}[$nameListCode]))
|
||||
{
|
||||
if ($fieldId < 0)
|
||||
{
|
||||
switch ($fieldId)
|
||||
{
|
||||
case -1:
|
||||
return 'a.id';
|
||||
case -2:
|
||||
return 'a.ordering';
|
||||
case -3:
|
||||
return 'a.published';
|
||||
}
|
||||
}
|
||||
foreach ($this->{$targetArea}[$nameListCode] as $field)
|
||||
{
|
||||
if ($field['id'] == $fieldId)
|
||||
{
|
||||
// now check if this is a category
|
||||
if ($field['type'] === 'category')
|
||||
{
|
||||
return 'c.title';
|
||||
}
|
||||
// set the custom code
|
||||
elseif (ComponentbuilderHelper::checkArray(
|
||||
$field['custom']
|
||||
))
|
||||
{
|
||||
return $field['custom']['db'] . "."
|
||||
. $field['custom']['text'];
|
||||
}
|
||||
else
|
||||
{
|
||||
return 'a.' . $field['code'];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
public function setSearchQuery($nameListCode)
|
||||
{
|
||||
if (isset($this->searchBuilder[$nameListCode])
|
||||
@ -15739,7 +15658,7 @@ class Interpretation extends Fields
|
||||
else
|
||||
{
|
||||
$filterQuery .= $this->setSingleFilterQuery(
|
||||
$filter
|
||||
$filter, $Helper
|
||||
);
|
||||
}
|
||||
}
|
||||
@ -15755,21 +15674,40 @@ class Interpretation extends Fields
|
||||
* build single filter query
|
||||
*
|
||||
* @param array $filter The field/filter
|
||||
* @param string $Helper The helper name of the component being build
|
||||
* @param string $a The db table target name (a)
|
||||
*
|
||||
* @return string The php to place in model to filter this field
|
||||
*
|
||||
*/
|
||||
protected function setSingleFilterQuery($filter, $a = "a")
|
||||
protected function setSingleFilterQuery($filter, $Helper, $a = "a")
|
||||
{
|
||||
$filterQuery = PHP_EOL . $this->_t(2) . "if (\$"
|
||||
$filterQuery = PHP_EOL . $this->_t(2) . "\$_"
|
||||
. $filter['code'] . " = \$this->getState('filter."
|
||||
. $filter['code'] . "'))";
|
||||
. $filter['code'] . "');";
|
||||
$filterQuery .= PHP_EOL . $this->_t(2) . "if (is_numeric(\$_"
|
||||
. $filter['code'] . "))";
|
||||
$filterQuery .= PHP_EOL . $this->_t(2) . "{";
|
||||
$filterQuery .= PHP_EOL . $this->_t(3) . "if (is_float(\$_"
|
||||
. $filter['code'] . "))";
|
||||
$filterQuery .= PHP_EOL . $this->_t(3) . "{";
|
||||
$filterQuery .= PHP_EOL . $this->_t(4)
|
||||
. "\$query->where('" . $a . "." . $filter['code']
|
||||
. " = ' . (float) \$_" . $filter['code'] . ");";
|
||||
$filterQuery .= PHP_EOL . $this->_t(3) . "}";
|
||||
$filterQuery .= PHP_EOL . $this->_t(3) . "else";
|
||||
$filterQuery .= PHP_EOL . $this->_t(3) . "{";
|
||||
$filterQuery .= PHP_EOL . $this->_t(4)
|
||||
. "\$query->where('" . $a . "." . $filter['code']
|
||||
. " = ' . (int) \$_" . $filter['code'] . ");";
|
||||
$filterQuery .= PHP_EOL . $this->_t(3) . "}";
|
||||
$filterQuery .= PHP_EOL . $this->_t(2) . "}";
|
||||
$filterQuery .= PHP_EOL . $this->_t(2) . "elseif ("
|
||||
. $Helper . "::checkString(\$_" . $filter['code'] . "))";
|
||||
$filterQuery .= PHP_EOL . $this->_t(2) . "{";
|
||||
$filterQuery .= PHP_EOL . $this->_t(3)
|
||||
. "\$query->where('" . $a . "." . $filter['code']
|
||||
. " = ' . \$db->quote(\$db->escape(\$"
|
||||
. $filter['code']
|
||||
. " = ' . \$db->quote(\$db->escape(\$_" . $filter['code']
|
||||
. ")));";
|
||||
$filterQuery .= PHP_EOL . $this->_t(2) . "}";
|
||||
|
||||
@ -17637,6 +17575,13 @@ class Interpretation extends Fields
|
||||
$function[] = $this->_t(2) . "{";
|
||||
$function[] = $this->_t(3) . "\$filter = array();";
|
||||
$function[] = $this->_t(3) . "\$batch = array();";
|
||||
// if this is not a multi field
|
||||
if (!$funtion_path && $filter['multi'] == 1)
|
||||
{
|
||||
$function[] = $this->_t(4)
|
||||
. "\$filter[] = JHtml::_('select.option', '', '- Select ' . JText:"
|
||||
. ":_('" . $filter['lang'] . "') . ' -');";
|
||||
}
|
||||
$function[] = $this->_t(3)
|
||||
. "foreach (\$results as \$result)";
|
||||
$function[] = $this->_t(3) . "{";
|
||||
@ -17802,6 +17747,13 @@ class Interpretation extends Fields
|
||||
. "\$results = array_unique(\$results);";
|
||||
}
|
||||
$function[] = $this->_t(3) . "\$_filter = array();";
|
||||
// if this is not a multi field
|
||||
if (!$funtion_path && $filter['multi'] == 1)
|
||||
{
|
||||
$function[] = $this->_t(3)
|
||||
. "\$_filter[] = JHtml::_('select.option', '', '- Select ' . JText:"
|
||||
. ":_('" . $filter['lang'] . "') . ' -');";
|
||||
}
|
||||
$function[] = $this->_t(3) . "foreach (\$results as \$"
|
||||
. $filter['code'] . ")";
|
||||
$function[] = $this->_t(3) . "{";
|
||||
@ -17878,8 +17830,6 @@ class Interpretation extends Fields
|
||||
&& $filter['multi'] == 2
|
||||
&& ComponentbuilderHelper::checkArray($filter['custom']))
|
||||
{
|
||||
//var_dump($filter);
|
||||
//jexit();
|
||||
// get the field code
|
||||
$field_code = $this->getCustomFieldCode(
|
||||
$filter['custom']
|
||||
@ -21873,30 +21823,18 @@ class Interpretation extends Fields
|
||||
$this->filterBuilder[$nameListCode]
|
||||
))
|
||||
{
|
||||
// main lang prefix
|
||||
$lang_ = $this->langPrefix . '_FILTER_';
|
||||
foreach ($this->filterBuilder[$nameListCode] as $filter)
|
||||
{
|
||||
// we need this only for filters that are multi
|
||||
if (isset($filter['multi'])
|
||||
&& $filter['multi'] == 2)
|
||||
{
|
||||
// set the selection string (not ideal)
|
||||
$select_name = "Select " . strip_tags($filter['name']);
|
||||
// set the language
|
||||
$select_lang = $lang_ . ComponentbuilderHelper::safeString(
|
||||
$select_name, 'U'
|
||||
);
|
||||
// set selection lang
|
||||
$this->setLangContent(
|
||||
$this->lang, $select_lang, $select_name
|
||||
);
|
||||
// add the header
|
||||
$headers[]
|
||||
= 'JHtml::_(\'formbehavior.chosen\', \'.multiple'
|
||||
. $filter['class']
|
||||
. '\', null, array(\'placeholder_text_multiple\' => JText::_(\''
|
||||
. $select_lang . '\')));';
|
||||
. '\', null, array(\'placeholder_text_multiple\' => \'- \' . JText::_(\''
|
||||
. $filter['lang_select'] . '\') . \' -\'));';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1486,7 +1486,6 @@ class Infusion extends Interpretation
|
||||
. 'CUSTOM_ADMIN_SUBMITBUTTON_SCRIPT' . $this->hhh]
|
||||
= $this->setCustomViewSubmitButtonScript($view);
|
||||
|
||||
|
||||
// setup the templates
|
||||
$this->setCustomViewTemplateBody($view);
|
||||
|
||||
|
@ -302,29 +302,89 @@ class ComponentbuilderModelAdmin_views extends JModelList
|
||||
}
|
||||
|
||||
// Filter by Add_fadein.
|
||||
if ($add_fadein = $this->getState('filter.add_fadein'))
|
||||
$_add_fadein = $this->getState('filter.add_fadein');
|
||||
if (is_numeric($_add_fadein))
|
||||
{
|
||||
$query->where('a.add_fadein = ' . $db->quote($db->escape($add_fadein)));
|
||||
if (is_float($_add_fadein))
|
||||
{
|
||||
$query->where('a.add_fadein = ' . (float) $_add_fadein);
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->where('a.add_fadein = ' . (int) $_add_fadein);
|
||||
}
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkString($_add_fadein))
|
||||
{
|
||||
$query->where('a.add_fadein = ' . $db->quote($db->escape($_add_fadein)));
|
||||
}
|
||||
// Filter by Type.
|
||||
if ($type = $this->getState('filter.type'))
|
||||
$_type = $this->getState('filter.type');
|
||||
if (is_numeric($_type))
|
||||
{
|
||||
$query->where('a.type = ' . $db->quote($db->escape($type)));
|
||||
if (is_float($_type))
|
||||
{
|
||||
$query->where('a.type = ' . (float) $_type);
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->where('a.type = ' . (int) $_type);
|
||||
}
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkString($_type))
|
||||
{
|
||||
$query->where('a.type = ' . $db->quote($db->escape($_type)));
|
||||
}
|
||||
// Filter by Add_custom_button.
|
||||
if ($add_custom_button = $this->getState('filter.add_custom_button'))
|
||||
$_add_custom_button = $this->getState('filter.add_custom_button');
|
||||
if (is_numeric($_add_custom_button))
|
||||
{
|
||||
$query->where('a.add_custom_button = ' . $db->quote($db->escape($add_custom_button)));
|
||||
if (is_float($_add_custom_button))
|
||||
{
|
||||
$query->where('a.add_custom_button = ' . (float) $_add_custom_button);
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->where('a.add_custom_button = ' . (int) $_add_custom_button);
|
||||
}
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkString($_add_custom_button))
|
||||
{
|
||||
$query->where('a.add_custom_button = ' . $db->quote($db->escape($_add_custom_button)));
|
||||
}
|
||||
// Filter by Add_php_ajax.
|
||||
if ($add_php_ajax = $this->getState('filter.add_php_ajax'))
|
||||
$_add_php_ajax = $this->getState('filter.add_php_ajax');
|
||||
if (is_numeric($_add_php_ajax))
|
||||
{
|
||||
$query->where('a.add_php_ajax = ' . $db->quote($db->escape($add_php_ajax)));
|
||||
if (is_float($_add_php_ajax))
|
||||
{
|
||||
$query->where('a.add_php_ajax = ' . (float) $_add_php_ajax);
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->where('a.add_php_ajax = ' . (int) $_add_php_ajax);
|
||||
}
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkString($_add_php_ajax))
|
||||
{
|
||||
$query->where('a.add_php_ajax = ' . $db->quote($db->escape($_add_php_ajax)));
|
||||
}
|
||||
// Filter by Add_custom_import.
|
||||
if ($add_custom_import = $this->getState('filter.add_custom_import'))
|
||||
$_add_custom_import = $this->getState('filter.add_custom_import');
|
||||
if (is_numeric($_add_custom_import))
|
||||
{
|
||||
$query->where('a.add_custom_import = ' . $db->quote($db->escape($add_custom_import)));
|
||||
if (is_float($_add_custom_import))
|
||||
{
|
||||
$query->where('a.add_custom_import = ' . (float) $_add_custom_import);
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->where('a.add_custom_import = ' . (int) $_add_custom_import);
|
||||
}
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkString($_add_custom_import))
|
||||
{
|
||||
$query->where('a.add_custom_import = ' . $db->quote($db->escape($_add_custom_import)));
|
||||
}
|
||||
|
||||
// Add the list ordering clause.
|
||||
|
@ -220,9 +220,21 @@ class ComponentbuilderModelClass_extendings extends JModelList
|
||||
}
|
||||
|
||||
// Filter by Extension_type.
|
||||
if ($extension_type = $this->getState('filter.extension_type'))
|
||||
$_extension_type = $this->getState('filter.extension_type');
|
||||
if (is_numeric($_extension_type))
|
||||
{
|
||||
$query->where('a.extension_type = ' . $db->quote($db->escape($extension_type)));
|
||||
if (is_float($_extension_type))
|
||||
{
|
||||
$query->where('a.extension_type = ' . (float) $_extension_type);
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->where('a.extension_type = ' . (int) $_extension_type);
|
||||
}
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkString($_extension_type))
|
||||
{
|
||||
$query->where('a.extension_type = ' . $db->quote($db->escape($_extension_type)));
|
||||
}
|
||||
|
||||
// Add the list ordering clause.
|
||||
|
@ -244,14 +244,38 @@ class ComponentbuilderModelClass_methods extends JModelList
|
||||
}
|
||||
|
||||
// Filter by Visibility.
|
||||
if ($visibility = $this->getState('filter.visibility'))
|
||||
$_visibility = $this->getState('filter.visibility');
|
||||
if (is_numeric($_visibility))
|
||||
{
|
||||
$query->where('a.visibility = ' . $db->quote($db->escape($visibility)));
|
||||
if (is_float($_visibility))
|
||||
{
|
||||
$query->where('a.visibility = ' . (float) $_visibility);
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->where('a.visibility = ' . (int) $_visibility);
|
||||
}
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkString($_visibility))
|
||||
{
|
||||
$query->where('a.visibility = ' . $db->quote($db->escape($_visibility)));
|
||||
}
|
||||
// Filter by Extension_type.
|
||||
if ($extension_type = $this->getState('filter.extension_type'))
|
||||
$_extension_type = $this->getState('filter.extension_type');
|
||||
if (is_numeric($_extension_type))
|
||||
{
|
||||
$query->where('a.extension_type = ' . $db->quote($db->escape($extension_type)));
|
||||
if (is_float($_extension_type))
|
||||
{
|
||||
$query->where('a.extension_type = ' . (float) $_extension_type);
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->where('a.extension_type = ' . (int) $_extension_type);
|
||||
}
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkString($_extension_type))
|
||||
{
|
||||
$query->where('a.extension_type = ' . $db->quote($db->escape($_extension_type)));
|
||||
}
|
||||
|
||||
// Add the list ordering clause.
|
||||
|
@ -244,14 +244,38 @@ class ComponentbuilderModelClass_properties extends JModelList
|
||||
}
|
||||
|
||||
// Filter by Visibility.
|
||||
if ($visibility = $this->getState('filter.visibility'))
|
||||
$_visibility = $this->getState('filter.visibility');
|
||||
if (is_numeric($_visibility))
|
||||
{
|
||||
$query->where('a.visibility = ' . $db->quote($db->escape($visibility)));
|
||||
if (is_float($_visibility))
|
||||
{
|
||||
$query->where('a.visibility = ' . (float) $_visibility);
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->where('a.visibility = ' . (int) $_visibility);
|
||||
}
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkString($_visibility))
|
||||
{
|
||||
$query->where('a.visibility = ' . $db->quote($db->escape($_visibility)));
|
||||
}
|
||||
// Filter by Extension_type.
|
||||
if ($extension_type = $this->getState('filter.extension_type'))
|
||||
$_extension_type = $this->getState('filter.extension_type');
|
||||
if (is_numeric($_extension_type))
|
||||
{
|
||||
$query->where('a.extension_type = ' . $db->quote($db->escape($extension_type)));
|
||||
if (is_float($_extension_type))
|
||||
{
|
||||
$query->where('a.extension_type = ' . (float) $_extension_type);
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->where('a.extension_type = ' . (int) $_extension_type);
|
||||
}
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkString($_extension_type))
|
||||
{
|
||||
$query->where('a.extension_type = ' . $db->quote($db->escape($_extension_type)));
|
||||
}
|
||||
|
||||
// Add the list ordering clause.
|
||||
|
@ -253,19 +253,55 @@ class ComponentbuilderModelCustom_admin_views extends JModelList
|
||||
}
|
||||
|
||||
// Filter by Main_get.
|
||||
if ($main_get = $this->getState('filter.main_get'))
|
||||
$_main_get = $this->getState('filter.main_get');
|
||||
if (is_numeric($_main_get))
|
||||
{
|
||||
$query->where('a.main_get = ' . $db->quote($db->escape($main_get)));
|
||||
if (is_float($_main_get))
|
||||
{
|
||||
$query->where('a.main_get = ' . (float) $_main_get);
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->where('a.main_get = ' . (int) $_main_get);
|
||||
}
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkString($_main_get))
|
||||
{
|
||||
$query->where('a.main_get = ' . $db->quote($db->escape($_main_get)));
|
||||
}
|
||||
// Filter by Add_php_ajax.
|
||||
if ($add_php_ajax = $this->getState('filter.add_php_ajax'))
|
||||
$_add_php_ajax = $this->getState('filter.add_php_ajax');
|
||||
if (is_numeric($_add_php_ajax))
|
||||
{
|
||||
$query->where('a.add_php_ajax = ' . $db->quote($db->escape($add_php_ajax)));
|
||||
if (is_float($_add_php_ajax))
|
||||
{
|
||||
$query->where('a.add_php_ajax = ' . (float) $_add_php_ajax);
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->where('a.add_php_ajax = ' . (int) $_add_php_ajax);
|
||||
}
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkString($_add_php_ajax))
|
||||
{
|
||||
$query->where('a.add_php_ajax = ' . $db->quote($db->escape($_add_php_ajax)));
|
||||
}
|
||||
// Filter by Add_custom_button.
|
||||
if ($add_custom_button = $this->getState('filter.add_custom_button'))
|
||||
$_add_custom_button = $this->getState('filter.add_custom_button');
|
||||
if (is_numeric($_add_custom_button))
|
||||
{
|
||||
$query->where('a.add_custom_button = ' . $db->quote($db->escape($add_custom_button)));
|
||||
if (is_float($_add_custom_button))
|
||||
{
|
||||
$query->where('a.add_custom_button = ' . (float) $_add_custom_button);
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->where('a.add_custom_button = ' . (int) $_add_custom_button);
|
||||
}
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkString($_add_custom_button))
|
||||
{
|
||||
$query->where('a.add_custom_button = ' . $db->quote($db->escape($_add_custom_button)));
|
||||
}
|
||||
|
||||
// Add the list ordering clause.
|
||||
|
@ -281,24 +281,72 @@ class ComponentbuilderModelCustom_codes extends JModelList
|
||||
}
|
||||
|
||||
// Filter by Component.
|
||||
if ($component = $this->getState('filter.component'))
|
||||
$_component = $this->getState('filter.component');
|
||||
if (is_numeric($_component))
|
||||
{
|
||||
$query->where('a.component = ' . $db->quote($db->escape($component)));
|
||||
if (is_float($_component))
|
||||
{
|
||||
$query->where('a.component = ' . (float) $_component);
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->where('a.component = ' . (int) $_component);
|
||||
}
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkString($_component))
|
||||
{
|
||||
$query->where('a.component = ' . $db->quote($db->escape($_component)));
|
||||
}
|
||||
// Filter by Target.
|
||||
if ($target = $this->getState('filter.target'))
|
||||
$_target = $this->getState('filter.target');
|
||||
if (is_numeric($_target))
|
||||
{
|
||||
$query->where('a.target = ' . $db->quote($db->escape($target)));
|
||||
if (is_float($_target))
|
||||
{
|
||||
$query->where('a.target = ' . (float) $_target);
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->where('a.target = ' . (int) $_target);
|
||||
}
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkString($_target))
|
||||
{
|
||||
$query->where('a.target = ' . $db->quote($db->escape($_target)));
|
||||
}
|
||||
// Filter by Type.
|
||||
if ($type = $this->getState('filter.type'))
|
||||
$_type = $this->getState('filter.type');
|
||||
if (is_numeric($_type))
|
||||
{
|
||||
$query->where('a.type = ' . $db->quote($db->escape($type)));
|
||||
if (is_float($_type))
|
||||
{
|
||||
$query->where('a.type = ' . (float) $_type);
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->where('a.type = ' . (int) $_type);
|
||||
}
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkString($_type))
|
||||
{
|
||||
$query->where('a.type = ' . $db->quote($db->escape($_type)));
|
||||
}
|
||||
// Filter by Comment_type.
|
||||
if ($comment_type = $this->getState('filter.comment_type'))
|
||||
$_comment_type = $this->getState('filter.comment_type');
|
||||
if (is_numeric($_comment_type))
|
||||
{
|
||||
$query->where('a.comment_type = ' . $db->quote($db->escape($comment_type)));
|
||||
if (is_float($_comment_type))
|
||||
{
|
||||
$query->where('a.comment_type = ' . (float) $_comment_type);
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->where('a.comment_type = ' . (int) $_comment_type);
|
||||
}
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkString($_comment_type))
|
||||
{
|
||||
$query->where('a.comment_type = ' . $db->quote($db->escape($_comment_type)));
|
||||
}
|
||||
|
||||
// Add the list ordering clause.
|
||||
|
@ -241,14 +241,38 @@ class ComponentbuilderModelDynamic_gets extends JModelList
|
||||
}
|
||||
|
||||
// Filter by Main_source.
|
||||
if ($main_source = $this->getState('filter.main_source'))
|
||||
$_main_source = $this->getState('filter.main_source');
|
||||
if (is_numeric($_main_source))
|
||||
{
|
||||
$query->where('a.main_source = ' . $db->quote($db->escape($main_source)));
|
||||
if (is_float($_main_source))
|
||||
{
|
||||
$query->where('a.main_source = ' . (float) $_main_source);
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->where('a.main_source = ' . (int) $_main_source);
|
||||
}
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkString($_main_source))
|
||||
{
|
||||
$query->where('a.main_source = ' . $db->quote($db->escape($_main_source)));
|
||||
}
|
||||
// Filter by Gettype.
|
||||
if ($gettype = $this->getState('filter.gettype'))
|
||||
$_gettype = $this->getState('filter.gettype');
|
||||
if (is_numeric($_gettype))
|
||||
{
|
||||
$query->where('a.gettype = ' . $db->quote($db->escape($gettype)));
|
||||
if (is_float($_gettype))
|
||||
{
|
||||
$query->where('a.gettype = ' . (float) $_gettype);
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->where('a.gettype = ' . (int) $_gettype);
|
||||
}
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkString($_gettype))
|
||||
{
|
||||
$query->where('a.gettype = ' . $db->quote($db->escape($_gettype)));
|
||||
}
|
||||
|
||||
// Add the list ordering clause.
|
||||
|
@ -320,29 +320,89 @@ class ComponentbuilderModelFields extends JModelList
|
||||
}
|
||||
|
||||
// Filter by Fieldtype.
|
||||
if ($fieldtype = $this->getState('filter.fieldtype'))
|
||||
$_fieldtype = $this->getState('filter.fieldtype');
|
||||
if (is_numeric($_fieldtype))
|
||||
{
|
||||
$query->where('a.fieldtype = ' . $db->quote($db->escape($fieldtype)));
|
||||
if (is_float($_fieldtype))
|
||||
{
|
||||
$query->where('a.fieldtype = ' . (float) $_fieldtype);
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->where('a.fieldtype = ' . (int) $_fieldtype);
|
||||
}
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkString($_fieldtype))
|
||||
{
|
||||
$query->where('a.fieldtype = ' . $db->quote($db->escape($_fieldtype)));
|
||||
}
|
||||
// Filter by Datatype.
|
||||
if ($datatype = $this->getState('filter.datatype'))
|
||||
$_datatype = $this->getState('filter.datatype');
|
||||
if (is_numeric($_datatype))
|
||||
{
|
||||
$query->where('a.datatype = ' . $db->quote($db->escape($datatype)));
|
||||
if (is_float($_datatype))
|
||||
{
|
||||
$query->where('a.datatype = ' . (float) $_datatype);
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->where('a.datatype = ' . (int) $_datatype);
|
||||
}
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkString($_datatype))
|
||||
{
|
||||
$query->where('a.datatype = ' . $db->quote($db->escape($_datatype)));
|
||||
}
|
||||
// Filter by Indexes.
|
||||
if ($indexes = $this->getState('filter.indexes'))
|
||||
$_indexes = $this->getState('filter.indexes');
|
||||
if (is_numeric($_indexes))
|
||||
{
|
||||
$query->where('a.indexes = ' . $db->quote($db->escape($indexes)));
|
||||
if (is_float($_indexes))
|
||||
{
|
||||
$query->where('a.indexes = ' . (float) $_indexes);
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->where('a.indexes = ' . (int) $_indexes);
|
||||
}
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkString($_indexes))
|
||||
{
|
||||
$query->where('a.indexes = ' . $db->quote($db->escape($_indexes)));
|
||||
}
|
||||
// Filter by Null_switch.
|
||||
if ($null_switch = $this->getState('filter.null_switch'))
|
||||
$_null_switch = $this->getState('filter.null_switch');
|
||||
if (is_numeric($_null_switch))
|
||||
{
|
||||
$query->where('a.null_switch = ' . $db->quote($db->escape($null_switch)));
|
||||
if (is_float($_null_switch))
|
||||
{
|
||||
$query->where('a.null_switch = ' . (float) $_null_switch);
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->where('a.null_switch = ' . (int) $_null_switch);
|
||||
}
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkString($_null_switch))
|
||||
{
|
||||
$query->where('a.null_switch = ' . $db->quote($db->escape($_null_switch)));
|
||||
}
|
||||
// Filter by Store.
|
||||
if ($store = $this->getState('filter.store'))
|
||||
$_store = $this->getState('filter.store');
|
||||
if (is_numeric($_store))
|
||||
{
|
||||
$query->where('a.store = ' . $db->quote($db->escape($store)));
|
||||
if (is_float($_store))
|
||||
{
|
||||
$query->where('a.store = ' . (float) $_store);
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->where('a.store = ' . (int) $_store);
|
||||
}
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkString($_store))
|
||||
{
|
||||
$query->where('a.store = ' . $db->quote($db->escape($_store)));
|
||||
}
|
||||
|
||||
// Filter by a single or group of categories.
|
||||
|
@ -243,24 +243,72 @@ class ComponentbuilderModelHelp_documents extends JModelList
|
||||
}
|
||||
|
||||
// Filter by Type.
|
||||
if ($type = $this->getState('filter.type'))
|
||||
$_type = $this->getState('filter.type');
|
||||
if (is_numeric($_type))
|
||||
{
|
||||
$query->where('a.type = ' . $db->quote($db->escape($type)));
|
||||
if (is_float($_type))
|
||||
{
|
||||
$query->where('a.type = ' . (float) $_type);
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->where('a.type = ' . (int) $_type);
|
||||
}
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkString($_type))
|
||||
{
|
||||
$query->where('a.type = ' . $db->quote($db->escape($_type)));
|
||||
}
|
||||
// Filter by Location.
|
||||
if ($location = $this->getState('filter.location'))
|
||||
$_location = $this->getState('filter.location');
|
||||
if (is_numeric($_location))
|
||||
{
|
||||
$query->where('a.location = ' . $db->quote($db->escape($location)));
|
||||
if (is_float($_location))
|
||||
{
|
||||
$query->where('a.location = ' . (float) $_location);
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->where('a.location = ' . (int) $_location);
|
||||
}
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkString($_location))
|
||||
{
|
||||
$query->where('a.location = ' . $db->quote($db->escape($_location)));
|
||||
}
|
||||
// Filter by Admin_view.
|
||||
if ($admin_view = $this->getState('filter.admin_view'))
|
||||
$_admin_view = $this->getState('filter.admin_view');
|
||||
if (is_numeric($_admin_view))
|
||||
{
|
||||
$query->where('a.admin_view = ' . $db->quote($db->escape($admin_view)));
|
||||
if (is_float($_admin_view))
|
||||
{
|
||||
$query->where('a.admin_view = ' . (float) $_admin_view);
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->where('a.admin_view = ' . (int) $_admin_view);
|
||||
}
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkString($_admin_view))
|
||||
{
|
||||
$query->where('a.admin_view = ' . $db->quote($db->escape($_admin_view)));
|
||||
}
|
||||
// Filter by Site_view.
|
||||
if ($site_view = $this->getState('filter.site_view'))
|
||||
$_site_view = $this->getState('filter.site_view');
|
||||
if (is_numeric($_site_view))
|
||||
{
|
||||
$query->where('a.site_view = ' . $db->quote($db->escape($site_view)));
|
||||
if (is_float($_site_view))
|
||||
{
|
||||
$query->where('a.site_view = ' . (float) $_site_view);
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->where('a.site_view = ' . (int) $_site_view);
|
||||
}
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkString($_site_view))
|
||||
{
|
||||
$query->where('a.site_view = ' . $db->quote($db->escape($_site_view)));
|
||||
}
|
||||
|
||||
// Add the list ordering clause.
|
||||
|
@ -2232,14 +2232,38 @@ class ComponentbuilderModelJoomla_components extends JModelList
|
||||
}
|
||||
|
||||
// Filter by Companyname.
|
||||
if ($companyname = $this->getState('filter.companyname'))
|
||||
$_companyname = $this->getState('filter.companyname');
|
||||
if (is_numeric($_companyname))
|
||||
{
|
||||
$query->where('a.companyname = ' . $db->quote($db->escape($companyname)));
|
||||
if (is_float($_companyname))
|
||||
{
|
||||
$query->where('a.companyname = ' . (float) $_companyname);
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->where('a.companyname = ' . (int) $_companyname);
|
||||
}
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkString($_companyname))
|
||||
{
|
||||
$query->where('a.companyname = ' . $db->quote($db->escape($_companyname)));
|
||||
}
|
||||
// Filter by Author.
|
||||
if ($author = $this->getState('filter.author'))
|
||||
$_author = $this->getState('filter.author');
|
||||
if (is_numeric($_author))
|
||||
{
|
||||
$query->where('a.author = ' . $db->quote($db->escape($author)));
|
||||
if (is_float($_author))
|
||||
{
|
||||
$query->where('a.author = ' . (float) $_author);
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->where('a.author = ' . (int) $_author);
|
||||
}
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkString($_author))
|
||||
{
|
||||
$query->where('a.author = ' . $db->quote($db->escape($_author)));
|
||||
}
|
||||
|
||||
// Add the list ordering clause.
|
||||
|
@ -222,9 +222,21 @@ class ComponentbuilderModelJoomla_modules extends JModelList
|
||||
}
|
||||
|
||||
// Filter by Target.
|
||||
if ($target = $this->getState('filter.target'))
|
||||
$_target = $this->getState('filter.target');
|
||||
if (is_numeric($_target))
|
||||
{
|
||||
$query->where('a.target = ' . $db->quote($db->escape($target)));
|
||||
if (is_float($_target))
|
||||
{
|
||||
$query->where('a.target = ' . (float) $_target);
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->where('a.target = ' . (int) $_target);
|
||||
}
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkString($_target))
|
||||
{
|
||||
$query->where('a.target = ' . $db->quote($db->escape($_target)));
|
||||
}
|
||||
|
||||
// Add the list ordering clause.
|
||||
|
@ -167,9 +167,21 @@ class ComponentbuilderModelJoomla_plugin_groups extends JModelList
|
||||
}
|
||||
|
||||
// Filter by Class_extends.
|
||||
if ($class_extends = $this->getState('filter.class_extends'))
|
||||
$_class_extends = $this->getState('filter.class_extends');
|
||||
if (is_numeric($_class_extends))
|
||||
{
|
||||
$query->where('a.class_extends = ' . $db->quote($db->escape($class_extends)));
|
||||
if (is_float($_class_extends))
|
||||
{
|
||||
$query->where('a.class_extends = ' . (float) $_class_extends);
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->where('a.class_extends = ' . (int) $_class_extends);
|
||||
}
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkString($_class_extends))
|
||||
{
|
||||
$query->where('a.class_extends = ' . $db->quote($db->escape($_class_extends)));
|
||||
}
|
||||
|
||||
// Add the list ordering clause.
|
||||
|
@ -366,14 +366,38 @@ class ComponentbuilderModelJoomla_plugins extends JModelList
|
||||
}
|
||||
|
||||
// Filter by Class_extends.
|
||||
if ($class_extends = $this->getState('filter.class_extends'))
|
||||
$_class_extends = $this->getState('filter.class_extends');
|
||||
if (is_numeric($_class_extends))
|
||||
{
|
||||
$query->where('a.class_extends = ' . $db->quote($db->escape($class_extends)));
|
||||
if (is_float($_class_extends))
|
||||
{
|
||||
$query->where('a.class_extends = ' . (float) $_class_extends);
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->where('a.class_extends = ' . (int) $_class_extends);
|
||||
}
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkString($_class_extends))
|
||||
{
|
||||
$query->where('a.class_extends = ' . $db->quote($db->escape($_class_extends)));
|
||||
}
|
||||
// Filter by Joomla_plugin_group.
|
||||
if ($joomla_plugin_group = $this->getState('filter.joomla_plugin_group'))
|
||||
$_joomla_plugin_group = $this->getState('filter.joomla_plugin_group');
|
||||
if (is_numeric($_joomla_plugin_group))
|
||||
{
|
||||
$query->where('a.joomla_plugin_group = ' . $db->quote($db->escape($joomla_plugin_group)));
|
||||
if (is_float($_joomla_plugin_group))
|
||||
{
|
||||
$query->where('a.joomla_plugin_group = ' . (float) $_joomla_plugin_group);
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->where('a.joomla_plugin_group = ' . (int) $_joomla_plugin_group);
|
||||
}
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkString($_joomla_plugin_group))
|
||||
{
|
||||
$query->where('a.joomla_plugin_group = ' . $db->quote($db->escape($_joomla_plugin_group)));
|
||||
}
|
||||
|
||||
// Add the list ordering clause.
|
||||
|
@ -230,14 +230,38 @@ class ComponentbuilderModelLayouts extends JModelList
|
||||
}
|
||||
|
||||
// Filter by Dynamic_get.
|
||||
if ($dynamic_get = $this->getState('filter.dynamic_get'))
|
||||
$_dynamic_get = $this->getState('filter.dynamic_get');
|
||||
if (is_numeric($_dynamic_get))
|
||||
{
|
||||
$query->where('a.dynamic_get = ' . $db->quote($db->escape($dynamic_get)));
|
||||
if (is_float($_dynamic_get))
|
||||
{
|
||||
$query->where('a.dynamic_get = ' . (float) $_dynamic_get);
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->where('a.dynamic_get = ' . (int) $_dynamic_get);
|
||||
}
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkString($_dynamic_get))
|
||||
{
|
||||
$query->where('a.dynamic_get = ' . $db->quote($db->escape($_dynamic_get)));
|
||||
}
|
||||
// Filter by Add_php_view.
|
||||
if ($add_php_view = $this->getState('filter.add_php_view'))
|
||||
$_add_php_view = $this->getState('filter.add_php_view');
|
||||
if (is_numeric($_add_php_view))
|
||||
{
|
||||
$query->where('a.add_php_view = ' . $db->quote($db->escape($add_php_view)));
|
||||
if (is_float($_add_php_view))
|
||||
{
|
||||
$query->where('a.add_php_view = ' . (float) $_add_php_view);
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->where('a.add_php_view = ' . (int) $_add_php_view);
|
||||
}
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkString($_add_php_view))
|
||||
{
|
||||
$query->where('a.add_php_view = ' . $db->quote($db->escape($_add_php_view)));
|
||||
}
|
||||
|
||||
// Add the list ordering clause.
|
||||
|
@ -267,19 +267,55 @@ class ComponentbuilderModelLibraries extends JModelList
|
||||
}
|
||||
|
||||
// Filter by Target.
|
||||
if ($target = $this->getState('filter.target'))
|
||||
$_target = $this->getState('filter.target');
|
||||
if (is_numeric($_target))
|
||||
{
|
||||
$query->where('a.target = ' . $db->quote($db->escape($target)));
|
||||
if (is_float($_target))
|
||||
{
|
||||
$query->where('a.target = ' . (float) $_target);
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->where('a.target = ' . (int) $_target);
|
||||
}
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkString($_target))
|
||||
{
|
||||
$query->where('a.target = ' . $db->quote($db->escape($_target)));
|
||||
}
|
||||
// Filter by How.
|
||||
if ($how = $this->getState('filter.how'))
|
||||
$_how = $this->getState('filter.how');
|
||||
if (is_numeric($_how))
|
||||
{
|
||||
$query->where('a.how = ' . $db->quote($db->escape($how)));
|
||||
if (is_float($_how))
|
||||
{
|
||||
$query->where('a.how = ' . (float) $_how);
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->where('a.how = ' . (int) $_how);
|
||||
}
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkString($_how))
|
||||
{
|
||||
$query->where('a.how = ' . $db->quote($db->escape($_how)));
|
||||
}
|
||||
// Filter by Type.
|
||||
if ($type = $this->getState('filter.type'))
|
||||
$_type = $this->getState('filter.type');
|
||||
if (is_numeric($_type))
|
||||
{
|
||||
$query->where('a.type = ' . $db->quote($db->escape($type)));
|
||||
if (is_float($_type))
|
||||
{
|
||||
$query->where('a.type = ' . (float) $_type);
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->where('a.type = ' . (int) $_type);
|
||||
}
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkString($_type))
|
||||
{
|
||||
$query->where('a.type = ' . $db->quote($db->escape($_type)));
|
||||
}
|
||||
|
||||
// Add the list ordering clause.
|
||||
|
@ -219,14 +219,38 @@ class ComponentbuilderModelServers extends JModelList
|
||||
}
|
||||
|
||||
// Filter by Name.
|
||||
if ($name = $this->getState('filter.name'))
|
||||
$_name = $this->getState('filter.name');
|
||||
if (is_numeric($_name))
|
||||
{
|
||||
$query->where('a.name = ' . $db->quote($db->escape($name)));
|
||||
if (is_float($_name))
|
||||
{
|
||||
$query->where('a.name = ' . (float) $_name);
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->where('a.name = ' . (int) $_name);
|
||||
}
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkString($_name))
|
||||
{
|
||||
$query->where('a.name = ' . $db->quote($db->escape($_name)));
|
||||
}
|
||||
// Filter by Protocol.
|
||||
if ($protocol = $this->getState('filter.protocol'))
|
||||
$_protocol = $this->getState('filter.protocol');
|
||||
if (is_numeric($_protocol))
|
||||
{
|
||||
$query->where('a.protocol = ' . $db->quote($db->escape($protocol)));
|
||||
if (is_float($_protocol))
|
||||
{
|
||||
$query->where('a.protocol = ' . (float) $_protocol);
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->where('a.protocol = ' . (int) $_protocol);
|
||||
}
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkString($_protocol))
|
||||
{
|
||||
$query->where('a.protocol = ' . $db->quote($db->escape($_protocol)));
|
||||
}
|
||||
|
||||
// Add the list ordering clause.
|
||||
|
@ -257,19 +257,55 @@ class ComponentbuilderModelSite_views extends JModelList
|
||||
}
|
||||
|
||||
// Filter by Main_get.
|
||||
if ($main_get = $this->getState('filter.main_get'))
|
||||
$_main_get = $this->getState('filter.main_get');
|
||||
if (is_numeric($_main_get))
|
||||
{
|
||||
$query->where('a.main_get = ' . $db->quote($db->escape($main_get)));
|
||||
if (is_float($_main_get))
|
||||
{
|
||||
$query->where('a.main_get = ' . (float) $_main_get);
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->where('a.main_get = ' . (int) $_main_get);
|
||||
}
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkString($_main_get))
|
||||
{
|
||||
$query->where('a.main_get = ' . $db->quote($db->escape($_main_get)));
|
||||
}
|
||||
// Filter by Add_php_ajax.
|
||||
if ($add_php_ajax = $this->getState('filter.add_php_ajax'))
|
||||
$_add_php_ajax = $this->getState('filter.add_php_ajax');
|
||||
if (is_numeric($_add_php_ajax))
|
||||
{
|
||||
$query->where('a.add_php_ajax = ' . $db->quote($db->escape($add_php_ajax)));
|
||||
if (is_float($_add_php_ajax))
|
||||
{
|
||||
$query->where('a.add_php_ajax = ' . (float) $_add_php_ajax);
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->where('a.add_php_ajax = ' . (int) $_add_php_ajax);
|
||||
}
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkString($_add_php_ajax))
|
||||
{
|
||||
$query->where('a.add_php_ajax = ' . $db->quote($db->escape($_add_php_ajax)));
|
||||
}
|
||||
// Filter by Add_custom_button.
|
||||
if ($add_custom_button = $this->getState('filter.add_custom_button'))
|
||||
$_add_custom_button = $this->getState('filter.add_custom_button');
|
||||
if (is_numeric($_add_custom_button))
|
||||
{
|
||||
$query->where('a.add_custom_button = ' . $db->quote($db->escape($add_custom_button)));
|
||||
if (is_float($_add_custom_button))
|
||||
{
|
||||
$query->where('a.add_custom_button = ' . (float) $_add_custom_button);
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->where('a.add_custom_button = ' . (int) $_add_custom_button);
|
||||
}
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkString($_add_custom_button))
|
||||
{
|
||||
$query->where('a.add_custom_button = ' . $db->quote($db->escape($_add_custom_button)));
|
||||
}
|
||||
|
||||
// Add the list ordering clause.
|
||||
|
@ -318,14 +318,38 @@ class ComponentbuilderModelSnippets extends JModelList
|
||||
}
|
||||
|
||||
// Filter by Type.
|
||||
if ($type = $this->getState('filter.type'))
|
||||
$_type = $this->getState('filter.type');
|
||||
if (is_numeric($_type))
|
||||
{
|
||||
$query->where('a.type = ' . $db->quote($db->escape($type)));
|
||||
if (is_float($_type))
|
||||
{
|
||||
$query->where('a.type = ' . (float) $_type);
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->where('a.type = ' . (int) $_type);
|
||||
}
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkString($_type))
|
||||
{
|
||||
$query->where('a.type = ' . $db->quote($db->escape($_type)));
|
||||
}
|
||||
// Filter by Library.
|
||||
if ($library = $this->getState('filter.library'))
|
||||
$_library = $this->getState('filter.library');
|
||||
if (is_numeric($_library))
|
||||
{
|
||||
$query->where('a.library = ' . $db->quote($db->escape($library)));
|
||||
if (is_float($_library))
|
||||
{
|
||||
$query->where('a.library = ' . (float) $_library);
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->where('a.library = ' . (int) $_library);
|
||||
}
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkString($_library))
|
||||
{
|
||||
$query->where('a.library = ' . $db->quote($db->escape($_library)));
|
||||
}
|
||||
|
||||
// Add the list ordering clause.
|
||||
|
@ -230,14 +230,38 @@ class ComponentbuilderModelTemplates extends JModelList
|
||||
}
|
||||
|
||||
// Filter by Dynamic_get.
|
||||
if ($dynamic_get = $this->getState('filter.dynamic_get'))
|
||||
$_dynamic_get = $this->getState('filter.dynamic_get');
|
||||
if (is_numeric($_dynamic_get))
|
||||
{
|
||||
$query->where('a.dynamic_get = ' . $db->quote($db->escape($dynamic_get)));
|
||||
if (is_float($_dynamic_get))
|
||||
{
|
||||
$query->where('a.dynamic_get = ' . (float) $_dynamic_get);
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->where('a.dynamic_get = ' . (int) $_dynamic_get);
|
||||
}
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkString($_dynamic_get))
|
||||
{
|
||||
$query->where('a.dynamic_get = ' . $db->quote($db->escape($_dynamic_get)));
|
||||
}
|
||||
// Filter by Add_php_view.
|
||||
if ($add_php_view = $this->getState('filter.add_php_view'))
|
||||
$_add_php_view = $this->getState('filter.add_php_view');
|
||||
if (is_numeric($_add_php_view))
|
||||
{
|
||||
$query->where('a.add_php_view = ' . $db->quote($db->escape($add_php_view)));
|
||||
if (is_float($_add_php_view))
|
||||
{
|
||||
$query->where('a.add_php_view = ' . (float) $_add_php_view);
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->where('a.add_php_view = ' . (int) $_add_php_view);
|
||||
}
|
||||
}
|
||||
elseif (ComponentbuilderHelper::checkString($_add_php_view))
|
||||
{
|
||||
$query->where('a.add_php_view = ' . $db->quote($db->escape($_add_php_view)));
|
||||
}
|
||||
|
||||
// Add the list ordering clause.
|
||||
|
File diff suppressed because one or more lines are too long
@ -36,7 +36,7 @@ class ComponentbuilderViewAdmins_custom_tabs extends JViewLegacy
|
||||
$this->user = JFactory::getUser();
|
||||
// Add the list ordering clause.
|
||||
$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'asc'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'DESC'));
|
||||
$this->saveOrder = $this->listOrder == 'a.ordering';
|
||||
// set the return here value
|
||||
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
|
||||
|
@ -36,7 +36,7 @@ class ComponentbuilderViewAdmins_fields extends JViewLegacy
|
||||
$this->user = JFactory::getUser();
|
||||
// Add the list ordering clause.
|
||||
$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'asc'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'DESC'));
|
||||
$this->saveOrder = $this->listOrder == 'a.ordering';
|
||||
// set the return here value
|
||||
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
|
||||
|
@ -36,7 +36,7 @@ class ComponentbuilderViewAdmins_fields_conditions extends JViewLegacy
|
||||
$this->user = JFactory::getUser();
|
||||
// Add the list ordering clause.
|
||||
$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'asc'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'DESC'));
|
||||
$this->saveOrder = $this->listOrder == 'a.ordering';
|
||||
// set the return here value
|
||||
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
|
||||
|
@ -36,7 +36,7 @@ class ComponentbuilderViewAdmins_fields_relations extends JViewLegacy
|
||||
$this->user = JFactory::getUser();
|
||||
// Add the list ordering clause.
|
||||
$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'asc'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'DESC'));
|
||||
$this->saveOrder = $this->listOrder == 'a.ordering';
|
||||
// set the return here value
|
||||
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
|
||||
|
@ -36,7 +36,7 @@ class ComponentbuilderViewClass_extendings extends JViewLegacy
|
||||
$this->user = JFactory::getUser();
|
||||
// Add the list ordering clause.
|
||||
$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'asc'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'DESC'));
|
||||
$this->saveOrder = $this->listOrder == 'a.ordering';
|
||||
// set the return here value
|
||||
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
|
||||
|
@ -36,7 +36,7 @@ class ComponentbuilderViewComponents_admin_views extends JViewLegacy
|
||||
$this->user = JFactory::getUser();
|
||||
// Add the list ordering clause.
|
||||
$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'asc'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'DESC'));
|
||||
$this->saveOrder = $this->listOrder == 'a.ordering';
|
||||
// set the return here value
|
||||
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
|
||||
|
@ -36,7 +36,7 @@ class ComponentbuilderViewComponents_config extends JViewLegacy
|
||||
$this->user = JFactory::getUser();
|
||||
// Add the list ordering clause.
|
||||
$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'asc'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'DESC'));
|
||||
$this->saveOrder = $this->listOrder == 'a.ordering';
|
||||
// set the return here value
|
||||
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
|
||||
|
@ -36,7 +36,7 @@ class ComponentbuilderViewComponents_custom_admin_menus extends JViewLegacy
|
||||
$this->user = JFactory::getUser();
|
||||
// Add the list ordering clause.
|
||||
$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'asc'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'DESC'));
|
||||
$this->saveOrder = $this->listOrder == 'a.ordering';
|
||||
// set the return here value
|
||||
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
|
||||
|
@ -36,7 +36,7 @@ class ComponentbuilderViewComponents_custom_admin_views extends JViewLegacy
|
||||
$this->user = JFactory::getUser();
|
||||
// Add the list ordering clause.
|
||||
$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'asc'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'DESC'));
|
||||
$this->saveOrder = $this->listOrder == 'a.ordering';
|
||||
// set the return here value
|
||||
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
|
||||
|
@ -36,7 +36,7 @@ class ComponentbuilderViewComponents_dashboard extends JViewLegacy
|
||||
$this->user = JFactory::getUser();
|
||||
// Add the list ordering clause.
|
||||
$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'asc'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'DESC'));
|
||||
$this->saveOrder = $this->listOrder == 'a.ordering';
|
||||
// set the return here value
|
||||
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
|
||||
|
@ -36,7 +36,7 @@ class ComponentbuilderViewComponents_files_folders extends JViewLegacy
|
||||
$this->user = JFactory::getUser();
|
||||
// Add the list ordering clause.
|
||||
$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'asc'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'DESC'));
|
||||
$this->saveOrder = $this->listOrder == 'a.ordering';
|
||||
// set the return here value
|
||||
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
|
||||
|
@ -36,7 +36,7 @@ class ComponentbuilderViewComponents_modules extends JViewLegacy
|
||||
$this->user = JFactory::getUser();
|
||||
// Add the list ordering clause.
|
||||
$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'asc'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'DESC'));
|
||||
$this->saveOrder = $this->listOrder == 'a.ordering';
|
||||
// set the return here value
|
||||
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
|
||||
|
@ -36,7 +36,7 @@ class ComponentbuilderViewComponents_mysql_tweaks extends JViewLegacy
|
||||
$this->user = JFactory::getUser();
|
||||
// Add the list ordering clause.
|
||||
$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'asc'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'DESC'));
|
||||
$this->saveOrder = $this->listOrder == 'a.ordering';
|
||||
// set the return here value
|
||||
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
|
||||
|
@ -36,7 +36,7 @@ class ComponentbuilderViewComponents_placeholders extends JViewLegacy
|
||||
$this->user = JFactory::getUser();
|
||||
// Add the list ordering clause.
|
||||
$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'asc'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'DESC'));
|
||||
$this->saveOrder = $this->listOrder == 'a.ordering';
|
||||
// set the return here value
|
||||
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
|
||||
|
@ -36,7 +36,7 @@ class ComponentbuilderViewComponents_plugins extends JViewLegacy
|
||||
$this->user = JFactory::getUser();
|
||||
// Add the list ordering clause.
|
||||
$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'asc'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'DESC'));
|
||||
$this->saveOrder = $this->listOrder == 'a.ordering';
|
||||
// set the return here value
|
||||
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
|
||||
|
@ -36,7 +36,7 @@ class ComponentbuilderViewComponents_site_views extends JViewLegacy
|
||||
$this->user = JFactory::getUser();
|
||||
// Add the list ordering clause.
|
||||
$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'asc'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'DESC'));
|
||||
$this->saveOrder = $this->listOrder == 'a.ordering';
|
||||
// set the return here value
|
||||
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
|
||||
|
@ -36,7 +36,7 @@ class ComponentbuilderViewComponents_updates extends JViewLegacy
|
||||
$this->user = JFactory::getUser();
|
||||
// Add the list ordering clause.
|
||||
$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'asc'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'DESC'));
|
||||
$this->saveOrder = $this->listOrder == 'a.ordering';
|
||||
// set the return here value
|
||||
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
|
||||
|
@ -36,7 +36,7 @@ class ComponentbuilderViewFieldtypes extends JViewLegacy
|
||||
$this->user = JFactory::getUser();
|
||||
// Add the list ordering clause.
|
||||
$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'asc'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'DESC'));
|
||||
$this->saveOrder = $this->listOrder == 'a.ordering';
|
||||
// set the return here value
|
||||
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
|
||||
|
@ -36,7 +36,7 @@ class ComponentbuilderViewHelp_documents extends JViewLegacy
|
||||
$this->user = JFactory::getUser();
|
||||
// Add the list ordering clause.
|
||||
$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'asc'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'DESC'));
|
||||
$this->saveOrder = $this->listOrder == 'a.ordering';
|
||||
// set the return here value
|
||||
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
|
||||
|
@ -36,7 +36,7 @@ class ComponentbuilderViewJoomla_modules_files_folders_urls extends JViewLegacy
|
||||
$this->user = JFactory::getUser();
|
||||
// Add the list ordering clause.
|
||||
$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'asc'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'DESC'));
|
||||
$this->saveOrder = $this->listOrder == 'a.ordering';
|
||||
// set the return here value
|
||||
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
|
||||
|
@ -36,7 +36,7 @@ class ComponentbuilderViewJoomla_modules_updates extends JViewLegacy
|
||||
$this->user = JFactory::getUser();
|
||||
// Add the list ordering clause.
|
||||
$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'asc'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'DESC'));
|
||||
$this->saveOrder = $this->listOrder == 'a.ordering';
|
||||
// set the return here value
|
||||
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
|
||||
|
@ -36,7 +36,7 @@ class ComponentbuilderViewJoomla_plugin_groups extends JViewLegacy
|
||||
$this->user = JFactory::getUser();
|
||||
// Add the list ordering clause.
|
||||
$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'asc'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'DESC'));
|
||||
$this->saveOrder = $this->listOrder == 'a.ordering';
|
||||
// set the return here value
|
||||
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
|
||||
|
@ -36,7 +36,7 @@ class ComponentbuilderViewJoomla_plugins_files_folders_urls extends JViewLegacy
|
||||
$this->user = JFactory::getUser();
|
||||
// Add the list ordering clause.
|
||||
$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'asc'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'DESC'));
|
||||
$this->saveOrder = $this->listOrder == 'a.ordering';
|
||||
// set the return here value
|
||||
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
|
||||
|
@ -36,7 +36,7 @@ class ComponentbuilderViewJoomla_plugins_updates extends JViewLegacy
|
||||
$this->user = JFactory::getUser();
|
||||
// Add the list ordering clause.
|
||||
$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'asc'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'DESC'));
|
||||
$this->saveOrder = $this->listOrder == 'a.ordering';
|
||||
// set the return here value
|
||||
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
|
||||
|
@ -36,7 +36,7 @@ class ComponentbuilderViewLanguage_translations extends JViewLegacy
|
||||
$this->user = JFactory::getUser();
|
||||
// Add the list ordering clause.
|
||||
$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'asc'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'DESC'));
|
||||
$this->saveOrder = $this->listOrder == 'a.ordering';
|
||||
// set the return here value
|
||||
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
|
||||
|
@ -36,7 +36,7 @@ class ComponentbuilderViewLanguages extends JViewLegacy
|
||||
$this->user = JFactory::getUser();
|
||||
// Add the list ordering clause.
|
||||
$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'asc'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'DESC'));
|
||||
$this->saveOrder = $this->listOrder == 'a.ordering';
|
||||
// set the return here value
|
||||
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
|
||||
|
@ -36,7 +36,7 @@ class ComponentbuilderViewLibraries_config extends JViewLegacy
|
||||
$this->user = JFactory::getUser();
|
||||
// Add the list ordering clause.
|
||||
$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'asc'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'DESC'));
|
||||
$this->saveOrder = $this->listOrder == 'a.ordering';
|
||||
// set the return here value
|
||||
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
|
||||
|
@ -36,7 +36,7 @@ class ComponentbuilderViewLibraries_files_folders_urls extends JViewLegacy
|
||||
$this->user = JFactory::getUser();
|
||||
// Add the list ordering clause.
|
||||
$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'asc'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'DESC'));
|
||||
$this->saveOrder = $this->listOrder == 'a.ordering';
|
||||
// set the return here value
|
||||
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
|
||||
|
@ -36,7 +36,7 @@ class ComponentbuilderViewServers extends JViewLegacy
|
||||
$this->user = JFactory::getUser();
|
||||
// Add the list ordering clause.
|
||||
$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'asc'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'DESC'));
|
||||
$this->saveOrder = $this->listOrder == 'a.ordering';
|
||||
// set the return here value
|
||||
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
|
||||
|
@ -36,7 +36,7 @@ class ComponentbuilderViewSnippet_types extends JViewLegacy
|
||||
$this->user = JFactory::getUser();
|
||||
// Add the list ordering clause.
|
||||
$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'asc'));
|
||||
$this->listDirn = $this->escape($this->state->get('list.direction', 'DESC'));
|
||||
$this->saveOrder = $this->listOrder == 'a.ordering';
|
||||
// set the return here value
|
||||
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<extension type="component" version="3.2" method="upgrade">
|
||||
<name>COM_COMPONENTBUILDER</name>
|
||||
<creationDate>29th November, 2020</creationDate>
|
||||
<creationDate>30th November, 2020</creationDate>
|
||||
<author>Llewellyn van der Merwe</author>
|
||||
<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
|
||||
<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>
|
||||
|
Loading…
Reference in New Issue
Block a user