fixed issue that caused some custom code not to export for a JCB packages if found in anther custom code area. Made some corrections to the router helper class. Added return_here value admin views to improve the return values in url redirection. Improved the open valid base64 method to make use of default string. Update many ajax calls to not use jsonp, and infact be more secure.

This commit is contained in:
Llewellyn van der Merwe 2018-12-29 16:56:06 +02:00
parent 17ba6c4a89
commit b7a5cb7285
No known key found for this signature in database
GPG Key ID: CAD7B16D27AF28C5
59 changed files with 245 additions and 127 deletions

View File

@ -144,11 +144,11 @@ TODO
+ *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*: 19th December, 2018 + *Last Build*: 29th December, 2018
+ *Version*: 2.9.8 + *Version*: 2.9.8
+ *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*: **195562** + *Line count*: **195665**
+ *Field count*: **1087** + *Field count*: **1087**
+ *File count*: **1275** + *File count*: **1275**
+ *Folder count*: **201** + *Folder count*: **201**

View File

@ -144,11 +144,11 @@ TODO
+ *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*: 19th December, 2018 + *Last Build*: 29th December, 2018
+ *Version*: 2.9.8 + *Version*: 2.9.8
+ *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*: **195562** + *Line count*: **195665**
+ *Field count*: **1087** + *Field count*: **1087**
+ *File count*: **1275** + *File count*: **1275**
+ *Folder count*: **201** + *Folder count*: **201**

View File

@ -42,6 +42,8 @@ class ###Component###View###Views### extends JViewLegacy
$this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listOrder = $this->escape($this->state->get('list.ordering'));
$this->listDirn = $this->escape($this->state->get('list.direction')); $this->listDirn = $this->escape($this->state->get('list.direction'));
$this->saveOrder = $this->listOrder == 'ordering'; $this->saveOrder = $this->listOrder == 'ordering';
// set the return here value
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
// get global action permissions // get global action permissions
$this->canDo = ###Component###Helper::getActions('###view###');###JVIEWLISTCANDO### $this->canDo = ###Component###Helper::getActions('###view###');###JVIEWLISTCANDO###

View File

@ -157,6 +157,10 @@ abstract class ###Component###HelperRoute
self::$lookup[$language][$view][$item->query['id']] = $item->id; self::$lookup[$language][$view][$item->query['id']] = $item->id;
} }
} }
else
{
self::$lookup[$language][$view][0] = $item->id;
}
} }
} }
} }
@ -167,13 +171,20 @@ abstract class ###Component###HelperRoute
{ {
if (isset(self::$lookup[$language][$view])) if (isset(self::$lookup[$language][$view]))
{ {
foreach ($ids as $id) if (###Component###Helper::checkArray($ids))
{ {
if (isset(self::$lookup[$language][$view][(int) $id])) foreach ($ids as $id)
{ {
return self::$lookup[$language][$view][(int) $id]; if (isset(self::$lookup[$language][$view][(int) $id]))
{
return self::$lookup[$language][$view][(int) $id];
}
} }
} }
elseif (isset(self::$lookup[$language][$view][0]))
{
return self::$lookup[$language][$view][0];
}
} }
} }
} }

View File

@ -5270,8 +5270,10 @@ class Interpretation extends Fields
$routeHelper[] = $this->_t(2) . "else"; $routeHelper[] = $this->_t(2) . "else";
$routeHelper[] = $this->_t(2) . "{"; $routeHelper[] = $this->_t(2) . "{";
$routeHelper[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " Initialize the needel array."; $routeHelper[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " Initialize the needel array.";
$routeHelper[] = $this->_t(3) . "\$needles = array();"; $routeHelper[] = $this->_t(3) . "\$needles = array(";
$routeHelper[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . "Create the link but don't add the id."; $routeHelper[] = $this->_t(4) . "'" . $viewName_single . "' => array()";
$routeHelper[] = $this->_t(3) . ");";
$routeHelper[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " Create the link but don't add the id.";
$routeHelper[] = $this->_t(3) . "\$link = 'index.php?option=com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "&view=" . $viewName_single . "';"; $routeHelper[] = $this->_t(3) . "\$link = 'index.php?option=com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "&view=" . $viewName_single . "';";
$routeHelper[] = $this->_t(2) . "}"; $routeHelper[] = $this->_t(2) . "}";
if ('category' != $viewName_single && 'categories' != $viewName_single) if ('category' != $viewName_single && 'categories' != $viewName_single)
@ -7110,7 +7112,7 @@ class Interpretation extends Fields
$referal = ''; $referal = '';
if (!$ref) if (!$ref)
{ {
$ref = '&ref=' . $viewName_list; $ref = '&return=<?php echo $this->return_here; ?>';
} }
// in linked tab/view so must add ref to default // in linked tab/view so must add ref to default
else else

View File

@ -2356,11 +2356,12 @@ abstract class ComponentbuilderHelper
* *
* @param string $data The base64 string * @param string $data The base64 string
* @param string $key We store the string with that suffix :) * @param string $key We store the string with that suffix :)
* @param string $default The default switch
* *
* @return string The opened string * @return string The opened string
* *
*/ */
public static function openValidBase64($data, $key = '__.o0=base64=Oo.__') public static function openValidBase64($data, $key = '__.o0=base64=Oo.__', $default = 'string')
{ {
// check that we have a string // check that we have a string
if (self::checkString($data)) if (self::checkString($data))
@ -2379,7 +2380,12 @@ abstract class ComponentbuilderHelper
return base64_decode($data); return base64_decode($data);
} }
} }
return $data; // check if we should just return the string
if ('string' === $default)
{
return $data;
}
return $default;
} }

View File

@ -1330,16 +1330,16 @@ function checkAliasField() {
} }
function checkAliasField_server(type){ function checkAliasField_server(type){
var getUrl = "index.php?option=com_componentbuilder&task=ajax.checkAliasField&format=json&vdm="+vastDevMod; var getUrl = "index.php?option=com_componentbuilder&task=ajax.checkAliasField&format=json&raw=true&vdm="+vastDevMod;
if(token.length > 0 && type > 0){ if(token.length > 0 && type > 0){
var request = 'token='+token+'&type=' + type; var request = 'token='+token+'&type=' + type;
} }
return jQuery.ajax({ return jQuery.ajax({
type: 'GET', type: 'GET',
url: getUrl, url: getUrl,
dataType: 'jsonp', dataType: 'json',
data: request, data: request,
jsonp: 'callback' jsonp: false
}); });
} }
@ -1354,16 +1354,16 @@ function getAjaxDisplay(type){
} }
function getAjaxDisplay_server(type){ function getAjaxDisplay_server(type){
var getUrl = "index.php?option=com_componentbuilder&task=ajax.getAjaxDisplay&format=json&vdm="+vastDevMod; var getUrl = "index.php?option=com_componentbuilder&task=ajax.getAjaxDisplay&format=json&raw=true&vdm="+vastDevMod;
if(token.length > 0 && type.length > 0){ if(token.length > 0 && type.length > 0){
var request = 'token='+token+'&type=' + type; var request = 'token='+token+'&type=' + type;
} }
return jQuery.ajax({ return jQuery.ajax({
type: 'GET', type: 'GET',
url: getUrl, url: getUrl,
dataType: 'jsonp', dataType: 'json',
data: request, data: request,
jsonp: 'callback' jsonp: false
}); });
} }
@ -1372,16 +1372,16 @@ function addData(result,where){
} }
function addButtonID_server(type, size){ function addButtonID_server(type, size){
var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getButtonID&format=json&vdm="+vastDevMod); var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getButtonID&format=json&raw=true&vdm="+vastDevMod);
if(token.length > 0 && type.length > 0 && size > 0){ if(token.length > 0 && type.length > 0 && size > 0){
var request = 'token='+token+'&type='+type+'&size='+size; var request = 'token='+token+'&type='+type+'&size='+size;
} }
return jQuery.ajax({ return jQuery.ajax({
type: 'GET', type: 'GET',
url: getUrl, url: getUrl,
dataType: 'jsonp', dataType: 'json',
data: request, data: request,
jsonp: 'callback' jsonp: false
}); });
} }
function addButtonID(type, where, size){ function addButtonID(type, where, size){
@ -1397,16 +1397,16 @@ function addButtonID(type, where, size){
} }
function addButton_server(type, size){ function addButton_server(type, size){
var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getButton&format=json&vdm="+vastDevMod); var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getButton&format=json&raw=true&vdm="+vastDevMod);
if(token.length > 0 && type.length > 0){ if(token.length > 0 && type.length > 0){
var request = 'token='+token+'&type='+type+'&size='+size; var request = 'token='+token+'&type='+type+'&size='+size;
} }
return jQuery.ajax({ return jQuery.ajax({
type: 'GET', type: 'GET',
url: getUrl, url: getUrl,
dataType: 'jsonp', dataType: 'json',
data: request, data: request,
jsonp: 'callback' jsonp: false
}); });
} }
function addButton(type, where, size){ function addButton(type, where, size){
@ -1424,16 +1424,16 @@ function addButton(type, where, size){
} }
function getLinked_server(type){ function getLinked_server(type){
var getUrl = "index.php?option=com_componentbuilder&task=ajax.getLinked&format=json&vdm="+vastDevMod; var getUrl = "index.php?option=com_componentbuilder&task=ajax.getLinked&format=json&raw=true&vdm="+vastDevMod;
if(token.length > 0 && type > 0){ if(token.length > 0 && type > 0){
var request = 'token='+token+'&type='+type; var request = 'token='+token+'&type='+type;
} }
return jQuery.ajax({ return jQuery.ajax({
type: 'GET', type: 'GET',
url: getUrl, url: getUrl,
dataType: 'jsonp', dataType: 'json',
data: request, data: request,
jsonp: 'callback' jsonp: false
}); });
} }
@ -1446,16 +1446,16 @@ function getLinked(){
} }
function getTableColumns_server(tableName){ function getTableColumns_server(tableName){
var getUrl = "index.php?option=com_componentbuilder&task=ajax.tableColumns&format=json&vdm="+vastDevMod; var getUrl = "index.php?option=com_componentbuilder&task=ajax.tableColumns&format=json&raw=true&vdm="+vastDevMod;
if(token.length > 0 && tableName.length > 0){ if(token.length > 0 && tableName.length > 0){
var request = 'token='+token+'&table='+tableName; var request = 'token='+token+'&table='+tableName;
} }
return jQuery.ajax({ return jQuery.ajax({
type: 'GET', type: 'GET',
url: getUrl, url: getUrl,
dataType: 'jsonp', dataType: 'json',
data: request, data: request,
jsonp: 'callback' jsonp: false
}); });
} }
@ -1477,16 +1477,16 @@ function getTableColumns(fieldKey, table_, nr_){
} }
function getDynamicScripts_server(typpe){ function getDynamicScripts_server(typpe){
var getUrl = "index.php?option=com_componentbuilder&task=ajax.getDynamicScripts&format=json&vdm="+vastDevMod; var getUrl = "index.php?option=com_componentbuilder&task=ajax.getDynamicScripts&format=json&raw=true&vdm="+vastDevMod;
if(token.length > 0 && typpe.length > 0){ if(token.length > 0 && typpe.length > 0){
var request = 'token='+token+'&type='+typpe; var request = 'token='+token+'&type='+typpe;
} }
return jQuery.ajax({ return jQuery.ajax({
type: 'GET', type: 'GET',
url: getUrl, url: getUrl,
dataType: 'jsonp', dataType: 'json',
data: request, data: request,
jsonp: 'callback' jsonp: false
}); });
} }

View File

@ -443,16 +443,16 @@ jQuery(document).ready(function()
}); });
function getLinked_server(type){ function getLinked_server(type){
var getUrl = "index.php?option=com_componentbuilder&task=ajax.getLinked&format=json&vdm="+vastDevMod; var getUrl = "index.php?option=com_componentbuilder&task=ajax.getLinked&format=json&raw=true&vdm="+vastDevMod;
if(token.length > 0 && type > 0){ if(token.length > 0 && type > 0){
var request = 'token='+token+'&type='+type; var request = 'token='+token+'&type='+type;
} }
return jQuery.ajax({ return jQuery.ajax({
type: 'GET', type: 'GET',
url: getUrl, url: getUrl,
dataType: 'jsonp', dataType: 'json',
data: request, data: request,
jsonp: 'callback' jsonp: false
}); });
} }
@ -610,16 +610,16 @@ jQuery(document).ready(function($)
}); });
function getSnippets_server(libraries){ function getSnippets_server(libraries){
var getUrl = "index.php?option=com_componentbuilder&task=ajax.getSnippets&format=json"; var getUrl = "index.php?option=com_componentbuilder&task=ajax.getSnippets&raw=true&format=json";
if(token.length > 0 && libraries.length > 0){ if(token.length > 0 && libraries.length > 0){
var request = 'token='+token+'&libraries='+JSON.stringify(libraries); var request = 'token='+token+'&libraries='+JSON.stringify(libraries);
} }
return jQuery.ajax({ return jQuery.ajax({
type: 'GET', type: 'GET',
url: getUrl, url: getUrl,
dataType: 'jsonp', dataType: 'json',
data: request, data: request,
jsonp: 'callback' jsonp: false
}); });
} }
function getSnippets(){ function getSnippets(){

View File

@ -1485,16 +1485,16 @@ jQuery(document).ready(function()
}); });
function getLinked_server(type){ function getLinked_server(type){
var getUrl = "index.php?option=com_componentbuilder&task=ajax.getLinked&format=json&vdm="+vastDevMod; var getUrl = "index.php?option=com_componentbuilder&task=ajax.getLinked&format=json&raw=true&vdm="+vastDevMod;
if(token.length > 0 && type > 0){ if(token.length > 0 && type > 0){
var request = 'token='+token+'&type='+type; var request = 'token='+token+'&type='+type;
} }
return jQuery.ajax({ return jQuery.ajax({
type: 'GET', type: 'GET',
url: getUrl, url: getUrl,
dataType: 'jsonp', dataType: 'json',
data: request, data: request,
jsonp: 'callback' jsonp: false
}); });
} }
@ -1508,7 +1508,7 @@ function getLinked(){
function getViewTableColumns_server(viewId,asKey,rowType) function getViewTableColumns_server(viewId,asKey,rowType)
{ {
var getUrl = "index.php?option=com_componentbuilder&task=ajax.viewTableColumns&format=json"; var getUrl = "index.php?option=com_componentbuilder&task=ajax.viewTableColumns&format=json&raw=true";
if (token.length > 0 && viewId > 0 && asKey.length > 0) if (token.length > 0 && viewId > 0 && asKey.length > 0)
{ {
var request = 'token='+token+'&as='+asKey+'&type='+rowType+'&id='+viewId; var request = 'token='+token+'&as='+asKey+'&type='+rowType+'&id='+viewId;
@ -1516,9 +1516,9 @@ function getViewTableColumns_server(viewId,asKey,rowType)
return jQuery.ajax({ return jQuery.ajax({
type: 'GET', type: 'GET',
url: getUrl, url: getUrl,
dataType: 'jsonp', dataType: 'json',
data: request, data: request,
jsonp: 'callback' jsonp: false
}); });
} }
@ -1538,7 +1538,7 @@ function getViewTableColumns(id,asKey,key,rowType,main, table_, nr_)
function getDbTableColumns_server(name,asKey,rowType) function getDbTableColumns_server(name,asKey,rowType)
{ {
var getUrl = "index.php?option=com_componentbuilder&task=ajax.dbTableColumns&format=json"; var getUrl = "index.php?option=com_componentbuilder&task=ajax.dbTableColumns&format=json&raw=true";
if (token.length > 0 && name.length > 0 && asKey.length > 0) if (token.length > 0 && name.length > 0 && asKey.length > 0)
{ {
var request = 'token='+token+'&as='+asKey+'&type='+rowType+'&name='+name; var request = 'token='+token+'&as='+asKey+'&type='+rowType+'&name='+name;
@ -1546,9 +1546,9 @@ function getDbTableColumns_server(name,asKey,rowType)
return jQuery.ajax({ return jQuery.ajax({
type: 'GET', type: 'GET',
url: getUrl, url: getUrl,
dataType: 'jsonp', dataType: 'json',
data: request, data: request,
jsonp: 'callback' jsonp: false
}); });
} }
@ -1628,16 +1628,16 @@ function updateSubItems(fieldName, fieldNr, table_, nr_){
} }
function getDynamicScripts_server(typpe){ function getDynamicScripts_server(typpe){
var getUrl = "index.php?option=com_componentbuilder&task=ajax.getDynamicScripts&format=json&vdm="+vastDevMod; var getUrl = "index.php?option=com_componentbuilder&task=ajax.getDynamicScripts&format=json&raw=true&vdm="+vastDevMod;
if(token.length > 0 && typpe.length > 0){ if(token.length > 0 && typpe.length > 0){
var request = 'token='+token+'&type='+typpe; var request = 'token='+token+'&type='+typpe;
} }
return jQuery.ajax({ return jQuery.ajax({
type: 'GET', type: 'GET',
url: getUrl, url: getUrl,
dataType: 'jsonp', dataType: 'json',
data: request, data: request,
jsonp: 'callback' jsonp: false
}); });
} }

View File

@ -522,16 +522,16 @@ jQuery(document).ready(function()
}); });
function getLinked_server(type){ function getLinked_server(type){
var getUrl = "index.php?option=com_componentbuilder&task=ajax.getLinked&format=json&vdm="+vastDevMod; var getUrl = "index.php?option=com_componentbuilder&task=ajax.getLinked&format=json&raw=true&vdm="+vastDevMod;
if(token.length > 0 && type > 0){ if(token.length > 0 && type > 0){
var request = 'token='+token+'&type='+type; var request = 'token='+token+'&type='+type;
} }
return jQuery.ajax({ return jQuery.ajax({
type: 'GET', type: 'GET',
url: getUrl, url: getUrl,
dataType: 'jsonp', dataType: 'json',
data: request, data: request,
jsonp: 'callback' jsonp: false
}); });
} }
@ -544,16 +544,16 @@ function getLinked(){
} }
function addButton_server(type, size){ function addButton_server(type, size){
var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getButton&format=json&vdm="+vastDevMod); var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getButton&format=json&raw=true&vdm="+vastDevMod);
if(token.length > 0 && type.length > 0){ if(token.length > 0 && type.length > 0){
var request = 'token='+token+'&type='+type+'&size='+size; var request = 'token='+token+'&type='+type+'&size='+size;
} }
return jQuery.ajax({ return jQuery.ajax({
type: 'GET', type: 'GET',
url: getUrl, url: getUrl,
dataType: 'jsonp', dataType: 'json',
data: request, data: request,
jsonp: 'callback' jsonp: false
}); });
} }
function addButton(type, where, size){ function addButton(type, where, size){
@ -574,16 +574,16 @@ function addButton(type, where, size){
var rowIdKey = 'properties'; var rowIdKey = 'properties';
function getFieldOptions_server(fieldtype){ function getFieldOptions_server(fieldtype){
var getUrl = "index.php?option=com_componentbuilder&task=ajax.fieldOptions&format=json&vdm="+vastDevMod; var getUrl = "index.php?option=com_componentbuilder&task=ajax.fieldOptions&format=json&raw=true&vdm="+vastDevMod;
if(token.length > 0 && fieldtype > 0){ if(token.length > 0 && fieldtype > 0){
var request = 'token='+token+'&id='+fieldtype; var request = 'token='+token+'&id='+fieldtype;
} }
return jQuery.ajax({ return jQuery.ajax({
type: 'GET', type: 'GET',
url: getUrl, url: getUrl,
dataType: 'jsonp', dataType: 'json',
data: request, data: request,
jsonp: 'callback' jsonp: false
}); });
} }
@ -734,31 +734,31 @@ function propertyIsSet(prop, id, targetForm) {
} }
function getFieldPropertyDesc_server(fieldtype, property){ function getFieldPropertyDesc_server(fieldtype, property){
var getUrl = "index.php?option=com_componentbuilder&task=ajax.getFieldPropertyDesc&format=json&vdm="+vastDevMod; var getUrl = "index.php?option=com_componentbuilder&task=ajax.getFieldPropertyDesc&format=json&raw=true&vdm="+vastDevMod;
if(token.length > 0 && (fieldtype > 0 || fieldtype.length > 0)&& property.length > 0){ if(token.length > 0 && (fieldtype > 0 || fieldtype.length > 0)&& property.length > 0){
var request = 'token='+token+'&fieldtype='+fieldtype+'&property='+property; var request = 'token='+token+'&fieldtype='+fieldtype+'&property='+property;
} }
return jQuery.ajax({ return jQuery.ajax({
type: 'GET', type: 'GET',
url: getUrl, url: getUrl,
dataType: 'jsonp', dataType: 'json',
data: request, data: request,
jsonp: 'callback' jsonp: false
}); });
} }
function getValidationRulesTable_server(){ function getValidationRulesTable_server(){
var getUrl = "index.php?option=com_componentbuilder&task=ajax.getValidationRulesTable&format=json&vdm="+vastDevMod; var getUrl = "index.php?option=com_componentbuilder&task=ajax.getValidationRulesTable&format=json&raw=true&vdm="+vastDevMod;
if(token.length > 0){ if(token.length > 0){
var request = 'token='+token+'&id=1'; var request = 'token='+token+'&id=1';
} }
return jQuery.ajax({ return jQuery.ajax({
type: 'GET', type: 'GET',
url: getUrl, url: getUrl,
dataType: 'jsonp', dataType: 'json',
data: request, data: request,
jsonp: 'callback' jsonp: false
}); });
} }

View File

@ -979,16 +979,16 @@ function getAjaxDisplay(type){
} }
function getAjaxDisplay_server(type){ function getAjaxDisplay_server(type){
var getUrl = "index.php?option=com_componentbuilder&task=ajax.getAjaxDisplay&format=json&vdm="+vastDevMod; var getUrl = "index.php?option=com_componentbuilder&task=ajax.getAjaxDisplay&format=json&raw=true&vdm="+vastDevMod;
if(token.length > 0 && type.length > 0){ if(token.length > 0 && type.length > 0){
var request = 'token='+token+'&type=' + type; var request = 'token='+token+'&type=' + type;
} }
return jQuery.ajax({ return jQuery.ajax({
type: 'GET', type: 'GET',
url: getUrl, url: getUrl,
dataType: 'jsonp', dataType: 'json',
data: request, data: request,
jsonp: 'callback' jsonp: false
}); });
} }
@ -1012,16 +1012,16 @@ function dasboardSwitch(value){
function addButtonID_server(type, size){ function addButtonID_server(type, size){
var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getButtonID&format=json&vdm="+vastDevMod); var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getButtonID&format=json&raw=true&vdm="+vastDevMod);
if(token.length > 0 && type.length > 0 && size > 0){ if(token.length > 0 && type.length > 0 && size > 0){
var request = 'token='+token+'&type='+type+'&size='+size; var request = 'token='+token+'&type='+type+'&size='+size;
} }
return jQuery.ajax({ return jQuery.ajax({
type: 'GET', type: 'GET',
url: getUrl, url: getUrl,
dataType: 'jsonp', dataType: 'json',
data: request, data: request,
jsonp: 'callback' jsonp: false
}); });
} }
function addButtonID(type, where, size){ function addButtonID(type, where, size){
@ -1037,16 +1037,16 @@ function addButtonID(type, where, size){
} }
function addButton_server(type, size){ function addButton_server(type, size){
var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getButton&format=json&vdm="+vastDevMod); var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getButton&format=json&raw=true&vdm="+vastDevMod);
if(token.length > 0 && type.length > 0){ if(token.length > 0 && type.length > 0){
var request = 'token='+token+'&type='+type+'&size='+size; var request = 'token='+token+'&type='+type+'&size='+size;
} }
return jQuery.ajax({ return jQuery.ajax({
type: 'GET', type: 'GET',
url: getUrl, url: getUrl,
dataType: 'jsonp', dataType: 'json',
data: request, data: request,
jsonp: 'callback' jsonp: false
}); });
} }
function addButton(type, where, size){ function addButton(type, where, size){
@ -1062,4 +1062,3 @@ function addButton(type, where, size){
} }
}) })
} }

View File

@ -21,16 +21,16 @@ function addData(result,where){
} }
function addButton_server(type, size){ function addButton_server(type, size){
var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getButton&format=json&vdm="+vastDevMod); var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getButton&format=json&raw=true&vdm="+vastDevMod);
if(token.length > 0 && type.length > 0){ if(token.length > 0 && type.length > 0){
var request = 'token='+token+'&type='+type+'&size='+size; var request = 'token='+token+'&type='+type+'&size='+size;
} }
return jQuery.ajax({ return jQuery.ajax({
type: 'GET', type: 'GET',
url: getUrl, url: getUrl,
dataType: 'jsonp', dataType: 'json',
data: request, data: request,
jsonp: 'callback' jsonp: false
}); });
} }
function addButton(type, where, size){ function addButton(type, where, size){

View File

@ -208,16 +208,16 @@ jQuery(document).ready(function($)
}); });
function getSnippets_server(libraries){ function getSnippets_server(libraries){
var getUrl = "index.php?option=com_componentbuilder&task=ajax.getSnippets&format=json"; var getUrl = "index.php?option=com_componentbuilder&task=ajax.getSnippets&raw=true&format=json";
if(token.length > 0 && libraries.length > 0){ if(token.length > 0 && libraries.length > 0){
var request = 'token='+token+'&libraries='+JSON.stringify(libraries); var request = 'token='+token+'&libraries='+JSON.stringify(libraries);
} }
return jQuery.ajax({ return jQuery.ajax({
type: 'GET', type: 'GET',
url: getUrl, url: getUrl,
dataType: 'jsonp', dataType: 'json',
data: request, data: request,
jsonp: 'callback' jsonp: false
}); });
} }
function getSnippets(){ function getSnippets(){

View File

@ -417,16 +417,16 @@ function addData(result,where){
} }
function addButtonID_server(type, size){ function addButtonID_server(type, size){
var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getButtonID&format=json&vdm="+vastDevMod); var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getButtonID&format=json&raw=true&vdm="+vastDevMod);
if(token.length > 0 && type.length > 0 && size > 0){ if(token.length > 0 && type.length > 0 && size > 0){
var request = 'token='+token+'&type='+type+'&size='+size; var request = 'token='+token+'&type='+type+'&size='+size;
} }
return jQuery.ajax({ return jQuery.ajax({
type: 'GET', type: 'GET',
url: getUrl, url: getUrl,
dataType: 'jsonp', dataType: 'json',
data: request, data: request,
jsonp: 'callback' jsonp: false
}); });
} }
function addButtonID(type, where, size){ function addButtonID(type, where, size){
@ -442,16 +442,16 @@ function addButtonID(type, where, size){
} }
function addButton_server(type, size){ function addButton_server(type, size){
var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getButton&format=json&vdm="+vastDevMod); var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getButton&format=json&raw=true&vdm="+vastDevMod);
if(token.length > 0 && type.length > 0){ if(token.length > 0 && type.length > 0){
var request = 'token='+token+'&type='+type+'&size='+size; var request = 'token='+token+'&type='+type+'&size='+size;
} }
return jQuery.ajax({ return jQuery.ajax({
type: 'GET', type: 'GET',
url: getUrl, url: getUrl,
dataType: 'jsonp', dataType: 'json',
data: request, data: request,
jsonp: 'callback' jsonp: false
}); });
} }
function addButton(type, where, size){ function addButton(type, where, size){
@ -469,16 +469,16 @@ function addButton(type, where, size){
} }
function getLinked_server(type){ function getLinked_server(type){
var getUrl = "index.php?option=com_componentbuilder&task=ajax.getLinked&format=json&vdm="+vastDevMod; var getUrl = "index.php?option=com_componentbuilder&task=ajax.getLinked&format=json&raw=true&vdm="+vastDevMod;
if(token.length > 0 && type > 0){ if(token.length > 0 && type > 0){
var request = 'token='+token+'&type='+type; var request = 'token='+token+'&type='+type;
} }
return jQuery.ajax({ return jQuery.ajax({
type: 'GET', type: 'GET',
url: getUrl, url: getUrl,
dataType: 'jsonp', dataType: 'json',
data: request, data: request,
jsonp: 'callback' jsonp: false
}); });
} }
@ -501,30 +501,30 @@ function getAjaxDisplay(type){
} }
function getAjaxDisplay_server(type){ function getAjaxDisplay_server(type){
var getUrl = "index.php?option=com_componentbuilder&task=ajax.getAjaxDisplay&format=json&vdm="+vastDevMod; var getUrl = "index.php?option=com_componentbuilder&task=ajax.getAjaxDisplay&format=json&raw=true&vdm="+vastDevMod;
if (token.length > 0 && type.length > 0) { if (token.length > 0 && type.length > 0) {
var request = 'token='+token+'&type=' + type; var request = 'token='+token+'&type=' + type;
} }
return jQuery.ajax({ return jQuery.ajax({
type: 'GET', type: 'GET',
url: getUrl, url: getUrl,
dataType: 'jsonp', dataType: 'json',
data: request, data: request,
jsonp: 'callback' jsonp: false
}); });
} }
function getFieldSelectOptions_server(fieldId){ function getFieldSelectOptions_server(fieldId){
var getUrl = "index.php?option=com_componentbuilder&task=ajax.fieldSelectOptions&format=json"; var getUrl = "index.php?option=com_componentbuilder&task=ajax.fieldSelectOptions&format=json&raw=true";
if (token.length > 0 && fieldId > 0) { if (token.length > 0 && fieldId > 0) {
var request = 'token='+token+'&id='+fieldId; var request = 'token='+token+'&id='+fieldId;
} }
return jQuery.ajax({ return jQuery.ajax({
type: 'GET', type: 'GET',
url: getUrl, url: getUrl,
dataType: 'jsonp', dataType: 'json',
data: request, data: request,
jsonp: 'callback' jsonp: false
}); });
} }

View File

@ -484,16 +484,16 @@ jQuery(document).ready(function()
}); });
function getLinked_server(type){ function getLinked_server(type){
var getUrl = "index.php?option=com_componentbuilder&task=ajax.getLinked&format=json&vdm="+vastDevMod; var getUrl = "index.php?option=com_componentbuilder&task=ajax.getLinked&format=json&raw=true&vdm="+vastDevMod;
if(token.length > 0 && type > 0){ if(token.length > 0 && type > 0){
var request = 'token='+token+'&type='+type; var request = 'token='+token+'&type='+type;
} }
return jQuery.ajax({ return jQuery.ajax({
type: 'GET', type: 'GET',
url: getUrl, url: getUrl,
dataType: 'jsonp', dataType: 'json',
data: request, data: request,
jsonp: 'callback' jsonp: false
}); });
} }
@ -651,16 +651,16 @@ jQuery(document).ready(function($)
}); });
function getSnippets_server(libraries){ function getSnippets_server(libraries){
var getUrl = "index.php?option=com_componentbuilder&task=ajax.getSnippets&format=json"; var getUrl = "index.php?option=com_componentbuilder&task=ajax.getSnippets&raw=true&format=json";
if(token.length > 0 && libraries.length > 0){ if(token.length > 0 && libraries.length > 0){
var request = 'token='+token+'&libraries='+JSON.stringify(libraries); var request = 'token='+token+'&libraries='+JSON.stringify(libraries);
} }
return jQuery.ajax({ return jQuery.ajax({
type: 'GET', type: 'GET',
url: getUrl, url: getUrl,
dataType: 'jsonp', dataType: 'json',
data: request, data: request,
jsonp: 'callback' jsonp: false
}); });
} }
function getSnippets(){ function getSnippets(){

View File

@ -234,16 +234,16 @@ jQuery(document).ready(function($)
}); });
function getSnippets_server(libraries){ function getSnippets_server(libraries){
var getUrl = "index.php?option=com_componentbuilder&task=ajax.getSnippets&format=json"; var getUrl = "index.php?option=com_componentbuilder&task=ajax.getSnippets&raw=true&format=json";
if(token.length > 0 && libraries.length > 0){ if(token.length > 0 && libraries.length > 0){
var request = 'token='+token+'&libraries='+JSON.stringify(libraries); var request = 'token='+token+'&libraries='+JSON.stringify(libraries);
} }
return jQuery.ajax({ return jQuery.ajax({
type: 'GET', type: 'GET',
url: getUrl, url: getUrl,
dataType: 'jsonp', dataType: 'json',
data: request, data: request,
jsonp: 'callback' jsonp: false
}); });
} }
function getSnippets(){ function getSnippets(){

View File

@ -350,6 +350,15 @@ class ComponentbuilderModelJoomla_components extends JModelList
{ {
$this->setData('custom_code', array_values($this->smartIDs['custom_code']), 'id'); $this->setData('custom_code', array_values($this->smartIDs['custom_code']), 'id');
} }
// set limiter
$limit = 0;
// and add those custom codes found in custom codes
while (isset($this->smartIDs['custom_code']) && ComponentbuilderHelper::checkArray($this->smartIDs['custom_code']) && $limit < 100)
{
$this->setData('custom_code', array_values($this->smartIDs['custom_code']), 'id');
// make sure we break
$limit++; // just in case (should not be needed)
}
} }
} }
@ -604,6 +613,10 @@ class ComponentbuilderModelJoomla_components extends JModelList
{ {
$this->smartIDs['layout'] = array(); $this->smartIDs['layout'] = array();
} }
elseif ('custom_code' === $table && 'id' === $key)
{
$this->smartIDs['custom_code'] = array();
}
// start loading the data // start loading the data
if (!isset($this->smartBox[$table])) if (!isset($this->smartBox[$table]))
{ {

View File

@ -37,6 +37,8 @@ class ComponentbuilderViewAdmin_views extends JViewLegacy
$this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listOrder = $this->escape($this->state->get('list.ordering'));
$this->listDirn = $this->escape($this->state->get('list.direction')); $this->listDirn = $this->escape($this->state->get('list.direction'));
$this->saveOrder = $this->listOrder == 'ordering'; $this->saveOrder = $this->listOrder == 'ordering';
// set the return here value
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
// get global action permissions // get global action permissions
$this->canDo = ComponentbuilderHelper::getActions('admin_view'); $this->canDo = ComponentbuilderHelper::getActions('admin_view');
$this->canEdit = $this->canDo->get('admin_view.edit'); $this->canEdit = $this->canDo->get('admin_view.edit');

View File

@ -37,6 +37,8 @@ class ComponentbuilderViewAdmins_custom_tabs extends JViewLegacy
$this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listOrder = $this->escape($this->state->get('list.ordering'));
$this->listDirn = $this->escape($this->state->get('list.direction')); $this->listDirn = $this->escape($this->state->get('list.direction'));
$this->saveOrder = $this->listOrder == 'ordering'; $this->saveOrder = $this->listOrder == 'ordering';
// set the return here value
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
// get global action permissions // get global action permissions
$this->canDo = ComponentbuilderHelper::getActions('admin_custom_tabs'); $this->canDo = ComponentbuilderHelper::getActions('admin_custom_tabs');
$this->canEdit = $this->canDo->get('admin_custom_tabs.edit'); $this->canEdit = $this->canDo->get('admin_custom_tabs.edit');

View File

@ -37,6 +37,8 @@ class ComponentbuilderViewAdmins_fields extends JViewLegacy
$this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listOrder = $this->escape($this->state->get('list.ordering'));
$this->listDirn = $this->escape($this->state->get('list.direction')); $this->listDirn = $this->escape($this->state->get('list.direction'));
$this->saveOrder = $this->listOrder == 'ordering'; $this->saveOrder = $this->listOrder == 'ordering';
// set the return here value
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
// get global action permissions // get global action permissions
$this->canDo = ComponentbuilderHelper::getActions('admin_fields'); $this->canDo = ComponentbuilderHelper::getActions('admin_fields');
$this->canEdit = $this->canDo->get('admin_fields.edit'); $this->canEdit = $this->canDo->get('admin_fields.edit');

View File

@ -37,6 +37,8 @@ class ComponentbuilderViewAdmins_fields_conditions extends JViewLegacy
$this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listOrder = $this->escape($this->state->get('list.ordering'));
$this->listDirn = $this->escape($this->state->get('list.direction')); $this->listDirn = $this->escape($this->state->get('list.direction'));
$this->saveOrder = $this->listOrder == 'ordering'; $this->saveOrder = $this->listOrder == 'ordering';
// set the return here value
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
// get global action permissions // get global action permissions
$this->canDo = ComponentbuilderHelper::getActions('admin_fields_conditions'); $this->canDo = ComponentbuilderHelper::getActions('admin_fields_conditions');
$this->canEdit = $this->canDo->get('admin_fields_conditions.edit'); $this->canEdit = $this->canDo->get('admin_fields_conditions.edit');

View File

@ -37,6 +37,8 @@ class ComponentbuilderViewAdmins_fields_relations extends JViewLegacy
$this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listOrder = $this->escape($this->state->get('list.ordering'));
$this->listDirn = $this->escape($this->state->get('list.direction')); $this->listDirn = $this->escape($this->state->get('list.direction'));
$this->saveOrder = $this->listOrder == 'ordering'; $this->saveOrder = $this->listOrder == 'ordering';
// set the return here value
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
// get global action permissions // get global action permissions
$this->canDo = ComponentbuilderHelper::getActions('admin_fields_relations'); $this->canDo = ComponentbuilderHelper::getActions('admin_fields_relations');
$this->canEdit = $this->canDo->get('admin_fields_relations.edit'); $this->canEdit = $this->canDo->get('admin_fields_relations.edit');

View File

@ -37,6 +37,8 @@ class ComponentbuilderViewComponents_admin_views extends JViewLegacy
$this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listOrder = $this->escape($this->state->get('list.ordering'));
$this->listDirn = $this->escape($this->state->get('list.direction')); $this->listDirn = $this->escape($this->state->get('list.direction'));
$this->saveOrder = $this->listOrder == 'ordering'; $this->saveOrder = $this->listOrder == 'ordering';
// set the return here value
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
// get global action permissions // get global action permissions
$this->canDo = ComponentbuilderHelper::getActions('component_admin_views'); $this->canDo = ComponentbuilderHelper::getActions('component_admin_views');
$this->canEdit = $this->canDo->get('component_admin_views.edit'); $this->canEdit = $this->canDo->get('component_admin_views.edit');

View File

@ -37,6 +37,8 @@ class ComponentbuilderViewComponents_config extends JViewLegacy
$this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listOrder = $this->escape($this->state->get('list.ordering'));
$this->listDirn = $this->escape($this->state->get('list.direction')); $this->listDirn = $this->escape($this->state->get('list.direction'));
$this->saveOrder = $this->listOrder == 'ordering'; $this->saveOrder = $this->listOrder == 'ordering';
// set the return here value
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
// get global action permissions // get global action permissions
$this->canDo = ComponentbuilderHelper::getActions('component_config'); $this->canDo = ComponentbuilderHelper::getActions('component_config');
$this->canEdit = $this->canDo->get('component_config.edit'); $this->canEdit = $this->canDo->get('component_config.edit');

View File

@ -37,6 +37,8 @@ class ComponentbuilderViewComponents_custom_admin_menus extends JViewLegacy
$this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listOrder = $this->escape($this->state->get('list.ordering'));
$this->listDirn = $this->escape($this->state->get('list.direction')); $this->listDirn = $this->escape($this->state->get('list.direction'));
$this->saveOrder = $this->listOrder == 'ordering'; $this->saveOrder = $this->listOrder == 'ordering';
// set the return here value
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
// get global action permissions // get global action permissions
$this->canDo = ComponentbuilderHelper::getActions('component_custom_admin_menus'); $this->canDo = ComponentbuilderHelper::getActions('component_custom_admin_menus');
$this->canEdit = $this->canDo->get('component_custom_admin_menus.edit'); $this->canEdit = $this->canDo->get('component_custom_admin_menus.edit');

View File

@ -37,6 +37,8 @@ class ComponentbuilderViewComponents_custom_admin_views extends JViewLegacy
$this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listOrder = $this->escape($this->state->get('list.ordering'));
$this->listDirn = $this->escape($this->state->get('list.direction')); $this->listDirn = $this->escape($this->state->get('list.direction'));
$this->saveOrder = $this->listOrder == 'ordering'; $this->saveOrder = $this->listOrder == 'ordering';
// set the return here value
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
// get global action permissions // get global action permissions
$this->canDo = ComponentbuilderHelper::getActions('component_custom_admin_views'); $this->canDo = ComponentbuilderHelper::getActions('component_custom_admin_views');
$this->canEdit = $this->canDo->get('component_custom_admin_views.edit'); $this->canEdit = $this->canDo->get('component_custom_admin_views.edit');

View File

@ -37,6 +37,8 @@ class ComponentbuilderViewComponents_dashboard extends JViewLegacy
$this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listOrder = $this->escape($this->state->get('list.ordering'));
$this->listDirn = $this->escape($this->state->get('list.direction')); $this->listDirn = $this->escape($this->state->get('list.direction'));
$this->saveOrder = $this->listOrder == 'ordering'; $this->saveOrder = $this->listOrder == 'ordering';
// set the return here value
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
// get global action permissions // get global action permissions
$this->canDo = ComponentbuilderHelper::getActions('component_dashboard'); $this->canDo = ComponentbuilderHelper::getActions('component_dashboard');
$this->canEdit = $this->canDo->get('component_dashboard.edit'); $this->canEdit = $this->canDo->get('component_dashboard.edit');

View File

@ -37,6 +37,8 @@ class ComponentbuilderViewComponents_files_folders extends JViewLegacy
$this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listOrder = $this->escape($this->state->get('list.ordering'));
$this->listDirn = $this->escape($this->state->get('list.direction')); $this->listDirn = $this->escape($this->state->get('list.direction'));
$this->saveOrder = $this->listOrder == 'ordering'; $this->saveOrder = $this->listOrder == 'ordering';
// set the return here value
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
// get global action permissions // get global action permissions
$this->canDo = ComponentbuilderHelper::getActions('component_files_folders'); $this->canDo = ComponentbuilderHelper::getActions('component_files_folders');
$this->canEdit = $this->canDo->get('component_files_folders.edit'); $this->canEdit = $this->canDo->get('component_files_folders.edit');

View File

@ -37,6 +37,8 @@ class ComponentbuilderViewComponents_mysql_tweaks extends JViewLegacy
$this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listOrder = $this->escape($this->state->get('list.ordering'));
$this->listDirn = $this->escape($this->state->get('list.direction')); $this->listDirn = $this->escape($this->state->get('list.direction'));
$this->saveOrder = $this->listOrder == 'ordering'; $this->saveOrder = $this->listOrder == 'ordering';
// set the return here value
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
// get global action permissions // get global action permissions
$this->canDo = ComponentbuilderHelper::getActions('component_mysql_tweaks'); $this->canDo = ComponentbuilderHelper::getActions('component_mysql_tweaks');
$this->canEdit = $this->canDo->get('component_mysql_tweaks.edit'); $this->canEdit = $this->canDo->get('component_mysql_tweaks.edit');

View File

@ -37,6 +37,8 @@ class ComponentbuilderViewComponents_site_views extends JViewLegacy
$this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listOrder = $this->escape($this->state->get('list.ordering'));
$this->listDirn = $this->escape($this->state->get('list.direction')); $this->listDirn = $this->escape($this->state->get('list.direction'));
$this->saveOrder = $this->listOrder == 'ordering'; $this->saveOrder = $this->listOrder == 'ordering';
// set the return here value
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
// get global action permissions // get global action permissions
$this->canDo = ComponentbuilderHelper::getActions('component_site_views'); $this->canDo = ComponentbuilderHelper::getActions('component_site_views');
$this->canEdit = $this->canDo->get('component_site_views.edit'); $this->canEdit = $this->canDo->get('component_site_views.edit');

View File

@ -37,6 +37,8 @@ class ComponentbuilderViewComponents_updates extends JViewLegacy
$this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listOrder = $this->escape($this->state->get('list.ordering'));
$this->listDirn = $this->escape($this->state->get('list.direction')); $this->listDirn = $this->escape($this->state->get('list.direction'));
$this->saveOrder = $this->listOrder == 'ordering'; $this->saveOrder = $this->listOrder == 'ordering';
// set the return here value
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
// get global action permissions // get global action permissions
$this->canDo = ComponentbuilderHelper::getActions('component_updates'); $this->canDo = ComponentbuilderHelper::getActions('component_updates');
$this->canEdit = $this->canDo->get('component_updates.edit'); $this->canEdit = $this->canDo->get('component_updates.edit');

View File

@ -97,7 +97,7 @@ $edit = "index.php?option=com_componentbuilder&view=custom_admin_views&task=cust
<td class="nowrap"> <td class="nowrap">
<div class="name"> <div class="name">
<?php if ($this->user->authorise('dynamic_get.edit', 'com_componentbuilder.dynamic_get.' . (int)$item->main_get)): ?> <?php if ($this->user->authorise('dynamic_get.edit', 'com_componentbuilder.dynamic_get.' . (int)$item->main_get)): ?>
<a href="index.php?option=com_componentbuilder&view=dynamic_gets&task=dynamic_get.edit&id=<?php echo $item->main_get; ?>&ref=custom_admin_views"><?php echo $this->escape($item->main_get_name); ?></a> <a href="index.php?option=com_componentbuilder&view=dynamic_gets&task=dynamic_get.edit&id=<?php echo $item->main_get; ?>&return=<?php echo $this->return_here; ?>"><?php echo $this->escape($item->main_get_name); ?></a>
<?php else: ?> <?php else: ?>
<?php echo $this->escape($item->main_get_name); ?> <?php echo $this->escape($item->main_get_name); ?>
<?php endif; ?> <?php endif; ?>

View File

@ -37,6 +37,8 @@ class ComponentbuilderViewCustom_admin_views extends JViewLegacy
$this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listOrder = $this->escape($this->state->get('list.ordering'));
$this->listDirn = $this->escape($this->state->get('list.direction')); $this->listDirn = $this->escape($this->state->get('list.direction'));
$this->saveOrder = $this->listOrder == 'ordering'; $this->saveOrder = $this->listOrder == 'ordering';
// set the return here value
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
// get global action permissions // get global action permissions
$this->canDo = ComponentbuilderHelper::getActions('custom_admin_view'); $this->canDo = ComponentbuilderHelper::getActions('custom_admin_view');
$this->canEdit = $this->canDo->get('core.edit'); $this->canEdit = $this->canDo->get('core.edit');

View File

@ -37,6 +37,8 @@ class ComponentbuilderViewCustom_codes extends JViewLegacy
$this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listOrder = $this->escape($this->state->get('list.ordering'));
$this->listDirn = $this->escape($this->state->get('list.direction')); $this->listDirn = $this->escape($this->state->get('list.direction'));
$this->saveOrder = $this->listOrder == 'ordering'; $this->saveOrder = $this->listOrder == 'ordering';
// set the return here value
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
// get global action permissions // get global action permissions
$this->canDo = ComponentbuilderHelper::getActions('custom_code'); $this->canDo = ComponentbuilderHelper::getActions('custom_code');
$this->canEdit = $this->canDo->get('custom_code.edit'); $this->canEdit = $this->canDo->get('custom_code.edit');

View File

@ -37,6 +37,8 @@ class ComponentbuilderViewDynamic_gets extends JViewLegacy
$this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listOrder = $this->escape($this->state->get('list.ordering'));
$this->listDirn = $this->escape($this->state->get('list.direction')); $this->listDirn = $this->escape($this->state->get('list.direction'));
$this->saveOrder = $this->listOrder == 'ordering'; $this->saveOrder = $this->listOrder == 'ordering';
// set the return here value
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
// get global action permissions // get global action permissions
$this->canDo = ComponentbuilderHelper::getActions('dynamic_get'); $this->canDo = ComponentbuilderHelper::getActions('dynamic_get');
$this->canEdit = $this->canDo->get('dynamic_get.edit'); $this->canEdit = $this->canDo->get('dynamic_get.edit');

View File

@ -75,7 +75,7 @@ $edit = "index.php?option=com_componentbuilder&view=fields&task=field.edit";
<td class="nowrap"> <td class="nowrap">
<div class="name"> <div class="name">
<?php if ($this->user->authorise('fieldtype.edit', 'com_componentbuilder.fieldtype.' . (int)$item->fieldtype)): ?> <?php if ($this->user->authorise('fieldtype.edit', 'com_componentbuilder.fieldtype.' . (int)$item->fieldtype)): ?>
<a href="index.php?option=com_componentbuilder&view=fieldtypes&task=fieldtype.edit&id=<?php echo $item->fieldtype; ?>&ref=fields"><?php echo $this->escape($item->fieldtype_name); ?></a> <a href="index.php?option=com_componentbuilder&view=fieldtypes&task=fieldtype.edit&id=<?php echo $item->fieldtype; ?>&return=<?php echo $this->return_here; ?>"><?php echo $this->escape($item->fieldtype_name); ?></a>
<?php else: ?> <?php else: ?>
<?php echo $this->escape($item->fieldtype_name); ?> <?php echo $this->escape($item->fieldtype_name); ?>
<?php endif; ?> <?php endif; ?>

View File

@ -37,6 +37,8 @@ class ComponentbuilderViewFields extends JViewLegacy
$this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listOrder = $this->escape($this->state->get('list.ordering'));
$this->listDirn = $this->escape($this->state->get('list.direction')); $this->listDirn = $this->escape($this->state->get('list.direction'));
$this->saveOrder = $this->listOrder == 'ordering'; $this->saveOrder = $this->listOrder == 'ordering';
// set the return here value
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
// get global action permissions // get global action permissions
$this->canDo = ComponentbuilderHelper::getActions('field'); $this->canDo = ComponentbuilderHelper::getActions('field');
$this->canEdit = $this->canDo->get('field.edit'); $this->canEdit = $this->canDo->get('field.edit');

View File

@ -37,6 +37,8 @@ class ComponentbuilderViewFieldtypes extends JViewLegacy
$this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listOrder = $this->escape($this->state->get('list.ordering'));
$this->listDirn = $this->escape($this->state->get('list.direction')); $this->listDirn = $this->escape($this->state->get('list.direction'));
$this->saveOrder = $this->listOrder == 'ordering'; $this->saveOrder = $this->listOrder == 'ordering';
// set the return here value
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
// get global action permissions // get global action permissions
$this->canDo = ComponentbuilderHelper::getActions('fieldtype'); $this->canDo = ComponentbuilderHelper::getActions('fieldtype');
$this->canEdit = $this->canDo->get('fieldtype.edit'); $this->canEdit = $this->canDo->get('fieldtype.edit');

View File

@ -37,6 +37,8 @@ class ComponentbuilderViewHelp_documents extends JViewLegacy
$this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listOrder = $this->escape($this->state->get('list.ordering'));
$this->listDirn = $this->escape($this->state->get('list.direction')); $this->listDirn = $this->escape($this->state->get('list.direction'));
$this->saveOrder = $this->listOrder == 'ordering'; $this->saveOrder = $this->listOrder == 'ordering';
// set the return here value
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
// get global action permissions // get global action permissions
$this->canDo = ComponentbuilderHelper::getActions('help_document'); $this->canDo = ComponentbuilderHelper::getActions('help_document');
$this->canEdit = $this->canDo->get('help_document.edit'); $this->canEdit = $this->canDo->get('help_document.edit');

View File

@ -37,6 +37,8 @@ class ComponentbuilderViewJoomla_components extends JViewLegacy
$this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listOrder = $this->escape($this->state->get('list.ordering'));
$this->listDirn = $this->escape($this->state->get('list.direction')); $this->listDirn = $this->escape($this->state->get('list.direction'));
$this->saveOrder = $this->listOrder == 'ordering'; $this->saveOrder = $this->listOrder == 'ordering';
// set the return here value
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
// get global action permissions // get global action permissions
$this->canDo = ComponentbuilderHelper::getActions('joomla_component'); $this->canDo = ComponentbuilderHelper::getActions('joomla_component');
$this->canEdit = $this->canDo->get('joomla_component.edit'); $this->canEdit = $this->canDo->get('joomla_component.edit');

View File

@ -37,6 +37,8 @@ class ComponentbuilderViewLanguage_translations extends JViewLegacy
$this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listOrder = $this->escape($this->state->get('list.ordering'));
$this->listDirn = $this->escape($this->state->get('list.direction')); $this->listDirn = $this->escape($this->state->get('list.direction'));
$this->saveOrder = $this->listOrder == 'ordering'; $this->saveOrder = $this->listOrder == 'ordering';
// set the return here value
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
// get global action permissions // get global action permissions
$this->canDo = ComponentbuilderHelper::getActions('language_translation'); $this->canDo = ComponentbuilderHelper::getActions('language_translation');
$this->canEdit = $this->canDo->get('language_translation.edit'); $this->canEdit = $this->canDo->get('language_translation.edit');

View File

@ -37,6 +37,8 @@ class ComponentbuilderViewLanguages extends JViewLegacy
$this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listOrder = $this->escape($this->state->get('list.ordering'));
$this->listDirn = $this->escape($this->state->get('list.direction')); $this->listDirn = $this->escape($this->state->get('list.direction'));
$this->saveOrder = $this->listOrder == 'ordering'; $this->saveOrder = $this->listOrder == 'ordering';
// set the return here value
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
// get global action permissions // get global action permissions
$this->canDo = ComponentbuilderHelper::getActions('language'); $this->canDo = ComponentbuilderHelper::getActions('language');
$this->canEdit = $this->canDo->get('language.edit'); $this->canEdit = $this->canDo->get('language.edit');

View File

@ -85,7 +85,7 @@ $edit = "index.php?option=com_componentbuilder&view=layouts&task=layout.edit";
<td class="nowrap"> <td class="nowrap">
<div class="name"> <div class="name">
<?php if ($this->user->authorise('dynamic_get.edit', 'com_componentbuilder.dynamic_get.' . (int)$item->dynamic_get)): ?> <?php if ($this->user->authorise('dynamic_get.edit', 'com_componentbuilder.dynamic_get.' . (int)$item->dynamic_get)): ?>
<a href="index.php?option=com_componentbuilder&view=dynamic_gets&task=dynamic_get.edit&id=<?php echo $item->dynamic_get; ?>&ref=layouts"><?php echo $this->escape($item->dynamic_get_name); ?></a> <a href="index.php?option=com_componentbuilder&view=dynamic_gets&task=dynamic_get.edit&id=<?php echo $item->dynamic_get; ?>&return=<?php echo $this->return_here; ?>"><?php echo $this->escape($item->dynamic_get_name); ?></a>
<?php else: ?> <?php else: ?>
<?php echo $this->escape($item->dynamic_get_name); ?> <?php echo $this->escape($item->dynamic_get_name); ?>
<?php endif; ?> <?php endif; ?>

View File

@ -37,6 +37,8 @@ class ComponentbuilderViewLayouts extends JViewLegacy
$this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listOrder = $this->escape($this->state->get('list.ordering'));
$this->listDirn = $this->escape($this->state->get('list.direction')); $this->listDirn = $this->escape($this->state->get('list.direction'));
$this->saveOrder = $this->listOrder == 'ordering'; $this->saveOrder = $this->listOrder == 'ordering';
// set the return here value
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
// get global action permissions // get global action permissions
$this->canDo = ComponentbuilderHelper::getActions('layout'); $this->canDo = ComponentbuilderHelper::getActions('layout');
$this->canEdit = $this->canDo->get('core.edit'); $this->canEdit = $this->canDo->get('core.edit');

View File

@ -37,6 +37,8 @@ class ComponentbuilderViewLibraries extends JViewLegacy
$this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listOrder = $this->escape($this->state->get('list.ordering'));
$this->listDirn = $this->escape($this->state->get('list.direction')); $this->listDirn = $this->escape($this->state->get('list.direction'));
$this->saveOrder = $this->listOrder == 'ordering'; $this->saveOrder = $this->listOrder == 'ordering';
// set the return here value
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
// get global action permissions // get global action permissions
$this->canDo = ComponentbuilderHelper::getActions('library'); $this->canDo = ComponentbuilderHelper::getActions('library');
$this->canEdit = $this->canDo->get('library.edit'); $this->canEdit = $this->canDo->get('library.edit');

View File

@ -37,6 +37,8 @@ class ComponentbuilderViewLibraries_config extends JViewLegacy
$this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listOrder = $this->escape($this->state->get('list.ordering'));
$this->listDirn = $this->escape($this->state->get('list.direction')); $this->listDirn = $this->escape($this->state->get('list.direction'));
$this->saveOrder = $this->listOrder == 'ordering'; $this->saveOrder = $this->listOrder == 'ordering';
// set the return here value
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
// get global action permissions // get global action permissions
$this->canDo = ComponentbuilderHelper::getActions('library_config'); $this->canDo = ComponentbuilderHelper::getActions('library_config');
$this->canEdit = $this->canDo->get('library_config.edit'); $this->canEdit = $this->canDo->get('library_config.edit');

View File

@ -37,6 +37,8 @@ class ComponentbuilderViewLibraries_files_folders_urls extends JViewLegacy
$this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listOrder = $this->escape($this->state->get('list.ordering'));
$this->listDirn = $this->escape($this->state->get('list.direction')); $this->listDirn = $this->escape($this->state->get('list.direction'));
$this->saveOrder = $this->listOrder == 'ordering'; $this->saveOrder = $this->listOrder == 'ordering';
// set the return here value
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
// get global action permissions // get global action permissions
$this->canDo = ComponentbuilderHelper::getActions('library_files_folders_urls'); $this->canDo = ComponentbuilderHelper::getActions('library_files_folders_urls');
$this->canEdit = $this->canDo->get('library_files_folders_urls.edit'); $this->canEdit = $this->canDo->get('library_files_folders_urls.edit');

View File

@ -37,6 +37,8 @@ class ComponentbuilderViewServers extends JViewLegacy
$this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listOrder = $this->escape($this->state->get('list.ordering'));
$this->listDirn = $this->escape($this->state->get('list.direction')); $this->listDirn = $this->escape($this->state->get('list.direction'));
$this->saveOrder = $this->listOrder == 'ordering'; $this->saveOrder = $this->listOrder == 'ordering';
// set the return here value
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
// get global action permissions // get global action permissions
$this->canDo = ComponentbuilderHelper::getActions('server'); $this->canDo = ComponentbuilderHelper::getActions('server');
$this->canEdit = $this->canDo->get('server.edit'); $this->canEdit = $this->canDo->get('server.edit');

View File

@ -97,7 +97,7 @@ $edit = "index.php?option=com_componentbuilder&view=site_views&task=site_view.ed
<td class="nowrap"> <td class="nowrap">
<div class="name"> <div class="name">
<?php if ($this->user->authorise('dynamic_get.edit', 'com_componentbuilder.dynamic_get.' . (int)$item->main_get)): ?> <?php if ($this->user->authorise('dynamic_get.edit', 'com_componentbuilder.dynamic_get.' . (int)$item->main_get)): ?>
<a href="index.php?option=com_componentbuilder&view=dynamic_gets&task=dynamic_get.edit&id=<?php echo $item->main_get; ?>&ref=site_views"><?php echo $this->escape($item->main_get_name); ?></a> <a href="index.php?option=com_componentbuilder&view=dynamic_gets&task=dynamic_get.edit&id=<?php echo $item->main_get; ?>&return=<?php echo $this->return_here; ?>"><?php echo $this->escape($item->main_get_name); ?></a>
<?php else: ?> <?php else: ?>
<?php echo $this->escape($item->main_get_name); ?> <?php echo $this->escape($item->main_get_name); ?>
<?php endif; ?> <?php endif; ?>

View File

@ -37,6 +37,8 @@ class ComponentbuilderViewSite_views extends JViewLegacy
$this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listOrder = $this->escape($this->state->get('list.ordering'));
$this->listDirn = $this->escape($this->state->get('list.direction')); $this->listDirn = $this->escape($this->state->get('list.direction'));
$this->saveOrder = $this->listOrder == 'ordering'; $this->saveOrder = $this->listOrder == 'ordering';
// set the return here value
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
// get global action permissions // get global action permissions
$this->canDo = ComponentbuilderHelper::getActions('site_view'); $this->canDo = ComponentbuilderHelper::getActions('site_view');
$this->canEdit = $this->canDo->get('core.edit'); $this->canEdit = $this->canDo->get('core.edit');

View File

@ -37,6 +37,8 @@ class ComponentbuilderViewSnippet_types extends JViewLegacy
$this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listOrder = $this->escape($this->state->get('list.ordering'));
$this->listDirn = $this->escape($this->state->get('list.direction')); $this->listDirn = $this->escape($this->state->get('list.direction'));
$this->saveOrder = $this->listOrder == 'ordering'; $this->saveOrder = $this->listOrder == 'ordering';
// set the return here value
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
// get global action permissions // get global action permissions
$this->canDo = ComponentbuilderHelper::getActions('snippet_type'); $this->canDo = ComponentbuilderHelper::getActions('snippet_type');
$this->canEdit = $this->canDo->get('snippet_type.edit'); $this->canEdit = $this->canDo->get('snippet_type.edit');

View File

@ -84,7 +84,7 @@ $edit = "index.php?option=com_componentbuilder&view=snippets&task=snippet.edit";
<td class="nowrap"> <td class="nowrap">
<div class="name"> <div class="name">
<?php if ($this->user->authorise('library.edit', 'com_componentbuilder.library.' . (int)$item->library)): ?> <?php if ($this->user->authorise('library.edit', 'com_componentbuilder.library.' . (int)$item->library)): ?>
<a href="index.php?option=com_componentbuilder&view=libraries&task=library.edit&id=<?php echo $item->library; ?>&ref=snippets"><?php echo $this->escape($item->library_name); ?></a> <a href="index.php?option=com_componentbuilder&view=libraries&task=library.edit&id=<?php echo $item->library; ?>&return=<?php echo $this->return_here; ?>"><?php echo $this->escape($item->library_name); ?></a>
<?php else: ?> <?php else: ?>
<?php echo $this->escape($item->library_name); ?> <?php echo $this->escape($item->library_name); ?>
<?php endif; ?> <?php endif; ?>

View File

@ -37,6 +37,8 @@ class ComponentbuilderViewSnippets extends JViewLegacy
$this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listOrder = $this->escape($this->state->get('list.ordering'));
$this->listDirn = $this->escape($this->state->get('list.direction')); $this->listDirn = $this->escape($this->state->get('list.direction'));
$this->saveOrder = $this->listOrder == 'ordering'; $this->saveOrder = $this->listOrder == 'ordering';
// set the return here value
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
// get global action permissions // get global action permissions
$this->canDo = ComponentbuilderHelper::getActions('snippet'); $this->canDo = ComponentbuilderHelper::getActions('snippet');
$this->canEdit = $this->canDo->get('core.edit'); $this->canEdit = $this->canDo->get('core.edit');

View File

@ -85,7 +85,7 @@ $edit = "index.php?option=com_componentbuilder&view=templates&task=template.edit
<td class="nowrap"> <td class="nowrap">
<div class="name"> <div class="name">
<?php if ($this->user->authorise('dynamic_get.edit', 'com_componentbuilder.dynamic_get.' . (int)$item->dynamic_get)): ?> <?php if ($this->user->authorise('dynamic_get.edit', 'com_componentbuilder.dynamic_get.' . (int)$item->dynamic_get)): ?>
<a href="index.php?option=com_componentbuilder&view=dynamic_gets&task=dynamic_get.edit&id=<?php echo $item->dynamic_get; ?>&ref=templates"><?php echo $this->escape($item->dynamic_get_name); ?></a> <a href="index.php?option=com_componentbuilder&view=dynamic_gets&task=dynamic_get.edit&id=<?php echo $item->dynamic_get; ?>&return=<?php echo $this->return_here; ?>"><?php echo $this->escape($item->dynamic_get_name); ?></a>
<?php else: ?> <?php else: ?>
<?php echo $this->escape($item->dynamic_get_name); ?> <?php echo $this->escape($item->dynamic_get_name); ?>
<?php endif; ?> <?php endif; ?>

View File

@ -37,6 +37,8 @@ class ComponentbuilderViewTemplates extends JViewLegacy
$this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listOrder = $this->escape($this->state->get('list.ordering'));
$this->listDirn = $this->escape($this->state->get('list.direction')); $this->listDirn = $this->escape($this->state->get('list.direction'));
$this->saveOrder = $this->listOrder == 'ordering'; $this->saveOrder = $this->listOrder == 'ordering';
// set the return here value
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
// get global action permissions // get global action permissions
$this->canDo = ComponentbuilderHelper::getActions('template'); $this->canDo = ComponentbuilderHelper::getActions('template');
$this->canEdit = $this->canDo->get('core.edit'); $this->canEdit = $this->canDo->get('core.edit');

View File

@ -37,6 +37,8 @@ class ComponentbuilderViewValidation_rules extends JViewLegacy
$this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listOrder = $this->escape($this->state->get('list.ordering'));
$this->listDirn = $this->escape($this->state->get('list.direction')); $this->listDirn = $this->escape($this->state->get('list.direction'));
$this->saveOrder = $this->listOrder == 'ordering'; $this->saveOrder = $this->listOrder == 'ordering';
// set the return here value
$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
// get global action permissions // get global action permissions
$this->canDo = ComponentbuilderHelper::getActions('validation_rule'); $this->canDo = ComponentbuilderHelper::getActions('validation_rule');
$this->canEdit = $this->canDo->get('validation_rule.edit'); $this->canEdit = $this->canDo->get('validation_rule.edit');

View File

@ -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>19th December, 2018</creationDate> <creationDate>29th December, 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>

View File

@ -2356,11 +2356,12 @@ abstract class ComponentbuilderHelper
* *
* @param string $data The base64 string * @param string $data The base64 string
* @param string $key We store the string with that suffix :) * @param string $key We store the string with that suffix :)
* @param string $default The default switch
* *
* @return string The opened string * @return string The opened string
* *
*/ */
public static function openValidBase64($data, $key = '__.o0=base64=Oo.__') public static function openValidBase64($data, $key = '__.o0=base64=Oo.__', $default = 'string')
{ {
// check that we have a string // check that we have a string
if (self::checkString($data)) if (self::checkString($data))
@ -2379,7 +2380,12 @@ abstract class ComponentbuilderHelper
return base64_decode($data); return base64_decode($data);
} }
} }
return $data; // check if we should just return the string
if ('string' === $default)
{
return $data;
}
return $default;
} }

View File

@ -36,8 +36,10 @@ abstract class ComponentbuilderHelperRoute
else else
{ {
// Initialize the needel array. // Initialize the needel array.
$needles = array(); $needles = array(
//Create the link but don't add the id. 'api' => array()
);
// Create the link but don't add the id.
$link = 'index.php?option=com_componentbuilder&view=api'; $link = 'index.php?option=com_componentbuilder&view=api';
} }
if ($catid > 1) if ($catid > 1)
@ -195,6 +197,10 @@ abstract class ComponentbuilderHelperRoute
self::$lookup[$language][$view][$item->query['id']] = $item->id; self::$lookup[$language][$view][$item->query['id']] = $item->id;
} }
} }
else
{
self::$lookup[$language][$view][0] = $item->id;
}
} }
} }
} }
@ -205,13 +211,20 @@ abstract class ComponentbuilderHelperRoute
{ {
if (isset(self::$lookup[$language][$view])) if (isset(self::$lookup[$language][$view]))
{ {
foreach ($ids as $id) if (ComponentbuilderHelper::checkArray($ids))
{ {
if (isset(self::$lookup[$language][$view][(int) $id])) foreach ($ids as $id)
{ {
return self::$lookup[$language][$view][(int) $id]; if (isset(self::$lookup[$language][$view][(int) $id]))
{
return self::$lookup[$language][$view][(int) $id];
}
} }
} }
elseif (isset(self::$lookup[$language][$view][0]))
{
return self::$lookup[$language][$view][0];
}
} }
} }
} }