stutteringp0et/Component-Builder
1
0
Fork 0
forked from joomla/Component-Builder
Code Pull Requests Activity

Added another PHP field to the admin views, improved the custom code methods in the compiler, and fixed some permissional errors.

Browse Source
This commit is contained in:
Llewellyn van der Merwe 2016-09-03 22:44:47 +01:00
parent 675ecece84
commit a7e641b499
No known key found for this signature in database
GPG Key ID: CAD7B16D27AF28C5
380 changed files with 3508 additions and 3130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
README.md
View File

@ -1,4 +1,4 @@
# Component Builder (2.1.16)
# Component Builder (2.1.17)
This is a [Joomla 3.x] (http://www.joomla.org/) component.
@ -32,12 +32,12 @@ Would you require more help please open and issue here on [gitHub today](https:/
+ *Author*: [Llewellyn van der Merwe] (mailto:info@vdm.io)
+ *Name*: [Component Builder] (https://www.vdm.io/joomla-component-builder)
+ *First Build*: 30th April, 2015
+ *Last Build*: 29th August, 2016
+ *Version*: 2.1.16
+ *Last Build*: 3rd September, 2016
+ *Version*: 2.1.17
+ *Copyright*: Copyright (C) 2015. All Rights Reserved
+ *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
+ *Line count*: **83199**
+ *File count*: **509**
+ *Line count*: **83550**
+ *File count*: **510**
+ *Folder count*: **98**
> This **component** was build with a Joomla [Automated Component Builder] (https://www.vdm.io/joomla-component-builder).

4
admin/assets/css/admin.css
View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage admin.css

4
admin/assets/css/admin_view.css
View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage admin_view.css

4
admin/assets/css/admin_views.css
View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage admin_views.css

4
admin/assets/css/component.css
View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage component.css

4
admin/assets/css/components.css
View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage components.css

4
admin/assets/css/custom_admin_view.css
View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage custom_admin_view.css

4
admin/assets/css/custom_admin_views.css
View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage custom_admin_views.css

4
admin/assets/css/dashboard.css
View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage dashboard.css

4
admin/assets/css/dynamic_get.css
View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage dynamic_get.css

4
admin/assets/css/dynamic_gets.css
View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage dynamic_gets.css

4
admin/assets/css/field.css
View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage field.css

4
admin/assets/css/fields.css
View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage fields.css

4
admin/assets/css/fieldtype.css
View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage fieldtype.css

4
admin/assets/css/fieldtypes.css
View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage fieldtypes.css

4
admin/assets/css/help_document.css
View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage help_document.css

4
admin/assets/css/help_documents.css
View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage help_documents.css

4
admin/assets/css/layout.css
View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage layout.css

4
admin/assets/css/layouts.css
View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage layouts.css

4
admin/assets/css/site_view.css
View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage site_view.css

4
admin/assets/css/site_views.css
View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage site_views.css

4
admin/assets/css/snippet.css
View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage snippet.css

4
admin/assets/css/snippets.css
View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage snippets.css

4
admin/assets/css/template.css
View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage template.css

4
admin/assets/css/templates.css
View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage templates.css

2
admin/compiler/joomla_3/JModelList.php
View File

@ -95,7 +95,7 @@ class ###Component###Model###Views### extends JModelList
public function getItems()
{###LICENSE_LOCKED_CHECK### ###CHECKINCALL###
// load parent items
$items = parent::getItems();###GET_ITEMS_METHOD_STRING_FIX### ###SELECTIONTRANSLATIONFIX###
$items = parent::getItems();###GET_ITEMS_METHOD_STRING_FIX### ###SELECTIONTRANSLATIONFIX### ###GET_ITEMS_METHOD_AFTER_ALL###
// return items
return $items;

4
admin/componentbuilder.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage componentbuilder.php

4
admin/controller.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage controller.php

4
admin/controllers/admin_view.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage admin_view.php

4
admin/controllers/admin_views.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage admin_views.php

4
admin/controllers/ajax.json.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage ajax.json.php

4
admin/controllers/compiler.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage compiler.php

4
admin/controllers/component.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage component.php

4
admin/controllers/componentbuilder.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage componentbuilder.php

4
admin/controllers/components.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage components.php

4
admin/controllers/custom_admin_view.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage custom_admin_view.php

4
admin/controllers/custom_admin_views.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage custom_admin_views.php

4
admin/controllers/dynamic_get.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage dynamic_get.php

4
admin/controllers/dynamic_gets.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage dynamic_gets.php

4
admin/controllers/field.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage field.php

4
admin/controllers/fields.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage fields.php

4
admin/controllers/fieldtype.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage fieldtype.php

4
admin/controllers/fieldtypes.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage fieldtypes.php

4
admin/controllers/help.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage help.php

4
admin/controllers/help_document.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage help_document.php

4
admin/controllers/help_documents.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage help_documents.php

4
admin/controllers/import.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage import.php

4
admin/controllers/layout.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage layout.php

4
admin/controllers/layouts.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage layouts.php

4
admin/controllers/site_view.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage site_view.php

4
admin/controllers/site_views.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage site_views.php

4
admin/controllers/snippet.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage snippet.php

4
admin/controllers/snippets.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage snippets.php

4
admin/controllers/template.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage template.php

4
admin/controllers/templates.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage templates.php

17
admin/helpers/compiler.php
View File

@ -83,6 +83,23 @@ class Compiler extends Infusion
return false;
}
/**
* Set the line number in comments
*
* @param int $nr The line number
*
* @return void
*
*/
private function setLine($nr)
{
if ($this->loadLineNr)
{
return ' [Compiler '.$nr.']';
}
return '';
}
protected function updateFiles()
{
if (isset($this->newFiles['static']) && ComponentbuilderHelper::checkArray($this->newFiles['static']) && isset($this->newFiles['dynamic']) && ComponentbuilderHelper::checkArray($this->newFiles['dynamic']))

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

@ -332,6 +332,23 @@ class Get
return false;
}
/**
* Set the line number in comments
*
* @param int $nr The line number
*
* @return void
*
*/
private function setLine($nr)
{
if ($this->loadLineNr)
{
return ' [Get '.$nr.']';
}
return '';
}
/**
* get all Component Data
*
@ -1055,7 +1072,7 @@ class Get
}
}
// add_php
$addArrayP = array('php_getitem','php_save','php_postsavehook','php_getitems','php_getlistquery','php_allowedit','php_before_delete','php_after_delete','php_batchcopy','php_batchmove','php_document');
$addArrayP = array('php_getitem','php_save','php_postsavehook','php_getitems','php_getitems_after_all','php_getlistquery','php_allowedit','php_before_delete','php_after_delete','php_batchcopy','php_batchmove','php_document');
foreach ($addArrayP as $scripter)
{
if (isset($view->{'add_'.$scripter}) && $view->{'add_'.$scripter} == 1)

17
admin/helpers/compiler/b_Structure.php
View File

@ -189,6 +189,23 @@ class Structure extends Get
return false;
}
/**
* Set the line number in comments
*
* @param int $nr The line number
*
* @return void
*
*/
private function setLine($nr)
{
if ($this->loadLineNr)
{
return ' [Structure '.$nr.']';
}
return '';
}
/**
* Build the Initial Folders
*

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

@ -335,6 +335,23 @@ class Fields extends Structure
*/
public $movedPublishingFields = array();
/**
* Set the line number in comments
*
* @param int $nr The line number
*
* @return void
*
*/
private function setLine($nr)
{
if ($this->loadLineNr)
{
return ' [Fields '.$nr.']';
}
return '';
}
/**
* set the Field set of a view
*
@ -657,12 +674,14 @@ class Fields extends Structure
{
if (isset($field['settings']) && ComponentbuilderHelper::checkObject($field['settings']))
{
// reset some values
$name = ComponentbuilderHelper::safeString($field['settings']->name);
$typeName = ComponentbuilderHelper::safeString($field['settings']->type_name);
$multiple = false;
$langLabel = '';
$taber = '';
$fieldSet = '';
$fieldAttributes = array();
// set field attributes
$fieldAttributes = $this->setFieldAttributes($field, $viewType, $name, $typeName, $multiple, $langLabel, $langView, $spacerCounter, $listViewName, $viewName, $placeholders);
// check if values were set
@ -928,6 +947,7 @@ class Fields extends Structure
foreach ($fieldsSets as $fieldId)
{
// get the field data
$fieldData = array();
$fieldData['settings'] = $this->getFieldData($fieldId, $viewName);
if (ComponentbuilderHelper::checkObject($fieldData['settings']))
{
@ -935,8 +955,6 @@ class Fields extends Structure
$r_typeName = ComponentbuilderHelper::safeString($fieldData['settings']->type_name);
$r_multiple = false;
$r_langLabel = '';
// make sure that these fields are not required
$fieldData['settings']->xml = str_replace('required="', 'requirenot="', $fieldData['settings']->xml);
// add the tabs needed
$taber = "\t\t\t";
// get field values
@ -1308,6 +1326,11 @@ class Fields extends Structure
// dont load the button to repeatable
$xmlValue = 'false';
}
elseif ($property['name'] == 'required' && $repeatable)
{
// dont load the required to repeatable
$xmlValue = 'false';
}
elseif ($viewType == 2 && ($property['name'] == 'readonly' || $property['name'] == 'disabled'))
{
// set read only
@ -1315,7 +1338,7 @@ class Fields extends Structure
}
elseif ($property['name'] == 'multiple')
{
$xmlValue = ComponentbuilderHelper::getBetween($field['settings']->xml, $property['name'] . '="', '"');
$xmlValue = (string) ComponentbuilderHelper::getBetween($field['settings']->xml, $property['name'] . '="', '"');
// add the multipal
if ('true' == $xmlValue)
{
@ -1342,7 +1365,7 @@ class Fields extends Structure
else
{
// set the rest of the fields
$xmlValue = ComponentbuilderHelper::getBetween($field['settings']->xml, $property['name'] . '="', '"');
$xmlValue = (string) ComponentbuilderHelper::getBetween($field['settings']->xml, $property['name'] . '="', '"');
}
// check if translatable
@ -1471,23 +1494,29 @@ class Fields extends Structure
$field['settings']->datadefault = '0';
}
}
// build the query values
$this->queryBuilder[$viewName][$name] = array(
'type' => $field['settings']->datatype,
'lenght' => $field['settings']->datalenght,
'lenght_other' => $field['settings']->datalenght_other,
'default' => $field['settings']->datadefault,
'other' => $field['settings']->datadefault_other,
'null_switch' => $field['settings']->null_switch);
// don't use these as index or uniqe keys
$notKeys = array('TEXT', 'TINYTEXT', 'MEDIUMTEXT', 'LONGTEXT', 'BLOB', 'TINYBLOB', 'MEDIUMBLOB', 'LONGBLOB');
$textKeys = array('TEXT', 'TINYTEXT', 'MEDIUMTEXT', 'LONGTEXT', 'BLOB', 'TINYBLOB', 'MEDIUMBLOB', 'LONGBLOB');
// build the query values
$this->queryBuilder[$viewName][$name]['type'] = $field['settings']->datatype;
if (!in_array($field['settings']->datatype, $textKeys))
{
$this->queryBuilder[$viewName][$name]['lenght'] = $field['settings']->datalenght;
$this->queryBuilder[$viewName][$name]['lenght_other'] = $field['settings']->datalenght_other;
$this->queryBuilder[$viewName][$name]['default'] = $field['settings']->datadefault;
$this->queryBuilder[$viewName][$name]['other'] = $field['settings']->datadefault_other;
}
else
{
$this->queryBuilder[$viewName][$name]['default'] = 'EMPTY';
}
$this->queryBuilder[$viewName][$name]['null_switch'] = $field['settings']->null_switch;
// set index types
if ($field['settings']->indexes == 1 && !in_array($field['settings']->datatype, $notKeys))
if ($field['settings']->indexes == 1 && !in_array($field['settings']->datatype, $textKeys))
{
// build unique keys of this view for db
$this->dbUniqueKeys[$viewName][] = $name;
}
elseif (($field['settings']->indexes == 2 || $field['alias'] || $field['title'] || $typeName == 'category') && !in_array($field['settings']->datatype, $notKeys))
elseif (($field['settings']->indexes == 2 || $field['alias'] || $field['title'] || $typeName == 'category') && !in_array($field['settings']->datatype, $textKeys))
{
// build keys of this view for db
$this->dbKeys[$viewName][] = $name;

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

@ -81,11 +81,11 @@ class Interpretation extends Fields
* @return void
*
*/
public function setLine($nr)
private function setLine($nr)
{
if ($this->loadLineNr)
{
return ' ['.__CLASS__.' '.$nr.']';
return ' [Interpretation '.$nr.']';
}
return '';
}
@ -2285,6 +2285,32 @@ class Interpretation extends Fields
return $method;
}
public function getCustomScriptBuilder($first, $second, $prefix = '', $note = null, $unset = null, $default = null, $sufix = '')
{
// check if there is any custom script
$script = '';
if (isset($this->customScriptBuilder[$first][$second]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$first][$second]))
{
// add not if set
if ($note)
{
$script .= $note;
}
$script .= $prefix . str_replace( array_keys($this->placeholders), array_values($this->placeholders), $this->customScriptBuilder[$first][$second]) . $sufix;
// clear some memory
if ($unset)
{
unset($this->customScriptBuilder[$first][$second]);
}
}
// if not found return default
if ($default)
{
return $default;
}
return $script;
}
public function setCustomViewListQuery(&$get,$code,$return = true)
{
if (ComponentbuilderHelper::checkObject($get))
@ -2303,13 +2329,7 @@ class Interpretation extends Fields
$getItem .= "\n\n\t\t//".$this->setLine(__LINE__)." Create a new query object.";
$getItem .= "\n\t\t\$query = \$db->getQuery(true);";
// check if there is any custom script
if (isset($this->customScriptBuilder[$this->target.'_php_getlistquery'][$code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_getlistquery'][$code]))
{
$getItem .= "\n\n\t\t//".$this->setLine(__LINE__)." Filtering.";
$getItem .= str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_getlistquery'][$code]);
// clear some memory
unset($this->customScriptBuilder[$this->target.'_php_getlistquery'][$code]);
}
$getItem .= $this->getCustomScriptBuilder($this->target.'_php_getlistquery', $code, '', "\n\n\t\t//".$this->setLine(__LINE__)." Filtering.", true);
// set main get query
$getItem .= $this->setCustomViewQuery($get->main_get,$code);
// setup filters
@ -3352,10 +3372,7 @@ class Interpretation extends Fields
}
// add custom php to getitem method
if (isset($this->customScriptBuilder['php_getitem'][$view]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['php_getitem'][$view]))
{
$script .= "\n\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_getitem'][$view]);
}
$script .= $this->getCustomScriptBuilder('php_getitem', $view, "\n\n");
return $script;
}
@ -3459,44 +3476,10 @@ class Interpretation extends Fields
}
}
// add custom PHP to the save method
if(isset($this->customScriptBuilder['php_save'][$view]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['php_save'][$view]))
{
$script .= "\n\n" . str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_save'][$view]);
}
$script .= $this->getCustomScriptBuilder('php_save', $view, "\n\n");
return $script;
}
public function setJmodelAdminBeforeDelete($view)
{
// add custom PHP to the delete Method
if(isset($this->customScriptBuilder['php_before_delete'][$view]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['php_before_delete'][$view]))
{
return "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_before_delete'][$view]);
}
return "";
}
public function setJmodelAdminAfterDelete($view)
{
// add custom PHP to the delete Method
if(isset($this->customScriptBuilder['php_after_delete'][$view]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['php_after_delete'][$view]))
{
return "\n\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_after_delete'][$view]);
}
return "";
}
public function setPostSaveHook($view)
{
// add custom PHP to the post save hook Method
if(isset($this->customScriptBuilder['php_postsavehook'][$view]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['php_postsavehook'][$view]))
{
return "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_postsavehook'][$view])."\n\n\t\treturn;";
}
return "\n\t\treturn;";
}
public function setJtableConstructor($view)
{
// reset
@ -4068,14 +4051,7 @@ class Interpretation extends Fields
$title = $this->titleBuilder[$viewName_single];
}
// prepare custom script
if (isset($this->customScriptBuilder['php_batchmove'][$viewName_single]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['php_batchmove'][$viewName_single]))
{
$customScript = "\n\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_batchmove'][$viewName_single]);
}
else
{
$customScript = '';
}
$customScript = $this->getCustomScriptBuilder('php_batchmove', $viewName_single, "\n\n", null, true);
$batchmove[] = "\n\t/**";
$batchmove[] = "\t * Batch move items to a new category";
@ -4265,14 +4241,7 @@ class Interpretation extends Fields
$title = $this->titleBuilder[$viewName_single];
}
// prepare custom script
if (isset($this->customScriptBuilder['php_batchcopy'][$viewName_single]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['php_batchcopy'][$viewName_single]))
{
$customScript = "\n\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_batchcopy'][$viewName_single]);
}
else
{
$customScript = '';
}
$customScript = $this->getCustomScriptBuilder('php_batchcopy', $viewName_single, "\n\n", null, true);
$batchcopy[] = "\n\t/**";
$batchcopy[] = "\t * Batch copy items to a new category or current.";
@ -4672,7 +4641,11 @@ class Interpretation extends Fields
{
$default = $data['other'];
}
if ($default == 'DATETIME' || $default == 'CURRENT_TIMESTAMP')
if ($default == 'EMPTY')
{
$default = $data['null_switch'];
}
elseif ($default == 'DATETIME' || $default == 'CURRENT_TIMESTAMP')
{
$default = $default.' '.$data['null_switch'];
}
@ -4690,7 +4663,7 @@ class Interpretation extends Fields
}
// set the lenght
$lenght = '';
if ($data['lenght'] == 'Other' && isset($data['lenght_other']) && $data['lenght_other'] > 0)
if (isset($data['lenght']) && $data['lenght'] == 'Other' && isset($data['lenght_other']) && $data['lenght_other'] > 0)
{
$lenght = '('.$data['lenght_other'].')';
}
@ -4704,7 +4677,7 @@ class Interpretation extends Fields
// check if default field was over written
if (!isset($this->fieldsNames[$view]['params']))
{
$db .= "\n\t`params` TEXT NOT NULL DEFAULT '',";
$db .= "\n\t`params` TEXT NOT NULL,";
}
// check if default field was over written
if (!isset($this->fieldsNames[$view]['published']))
@ -5250,7 +5223,7 @@ class Interpretation extends Fields
$coreLoadLink = true;
}
// check if the item has permissions.
if ($coreLoadLink && isset($this->permissionBuilder[$coreLink['core.edit']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder[$coreLink['core.edit']]) && in_array($item['custom']['view'],$this->permissionBuilder[$coreLink['core.edit']]))
if ($coreLoadLink && (isset($coreLink['core.edit']) && isset($this->permissionBuilder[$coreLink['core.edit']])) && ComponentbuilderHelper::checkArray($this->permissionBuilder[$coreLink['core.edit']]) && in_array($item['custom']['view'],$this->permissionBuilder[$coreLink['core.edit']]))
{
$accessCheck = "\$this->user->authorise('".$coreLink['core.edit']."', 'com_".$this->fileContentStatic['###component###'].".".$item['custom']['view'].".' . (int)\$item->".$item['id'].")";
}
@ -6690,10 +6663,7 @@ class Interpretation extends Fields
$query .= "\n\t\t\$query->join('LEFT', \$db->quoteName('#__categories', 'c') . ' ON (' . \$db->quoteName('a.".$categoryCodeName."') . ' = ' . \$db->quoteName('c.id') . ')');";
}
// add custom filtering php
if (isset($this->customScriptBuilder['php_getlistquery'][$viewName_single]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['php_getlistquery'][$viewName_single]))
{
$query .= "\n\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_getlistquery'][$viewName_single]);
}
$query .= $this->getCustomScriptBuilder('php_getlistquery', $viewName_single, "\n\n");
// add the custom fields query
$query .= $this->setCustomQuery($viewName_list, $viewName_single);
if ($key && strpos($key,'-R>') === false && strpos($key,'-A>') === false && strpos($parentKey,'-R>') === false && strpos($parentKey,'-A>') === false)
@ -6742,7 +6712,6 @@ class Interpretation extends Fields
$query .= $this->setGetItemsMethodStringFix($viewName_single,$this->fileContentStatic['###Component###'],"\t");
// ###SELECTIONTRANSLATIONFIX### <<<DYNAMIC>>>
$query .= $this->setSelectionTranslationFix($viewName_list,$this->fileContentStatic['###Component###'],"\t");
// filter by child repetable field values
if ($key && strpos($key,'-R>') !== false && strpos($key,'-A>') === false)
{
@ -6846,6 +6815,8 @@ class Interpretation extends Fields
$query .= "\n\t\t\t\treturn false;";
$query .= "\n\t\t\t}";
}
// add custom php to getitems method after all
$query .= $this->getCustomScriptBuilder('php_getitems_after_all', $viewName_single, "\n\n\t");
$query .= "\n\t\t\treturn \$items;";
$query .= "\n\t\t}";
@ -6972,10 +6943,8 @@ class Interpretation extends Fields
$query .= "\n\t\t\t\$query->from(\$db->quoteName('#__".$this->fileContentStatic['###component###']."_".$viewName_single."', 'a'));";
$query .= "\n\t\t\t\$query->where('a.id IN (' . implode(',',\$pks) . ')');";
// add custom filtering php
if (isset($this->customScriptBuilder['php_getlistquery'][$viewName_single]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['php_getlistquery'][$viewName_single]))
{
$query .= "\n\n\t".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_getlistquery'][$viewName_single]);
}
$query .= $this->getCustomScriptBuilder('php_getlistquery', $viewName_single, "\n\n\t");
if (isset($this->accessBuilder[$viewName_single]) && ComponentbuilderHelper::checkString($this->accessBuilder[$viewName_single]))
{
$query .= "\n\t\t\t//".$this->setLine(__LINE__)." Implement View Level Access";
@ -6994,6 +6963,8 @@ class Interpretation extends Fields
$query .= "\n\t\t\t{";
$query .= "\n\t\t\t\t\$items = \$db->loadObjectList();";
$query .= $this->setGetItemsMethodStringFix($viewName_single,$this->fileContentStatic['###Component###'],"\t\t",true);
// add custom php to getitems method after all
$query .= $this->getCustomScriptBuilder('php_getitems_after_all', $viewName_single, "\n\n\t\t");
$query .= "\n\t\t\t\treturn \$items;";
$query .= "\n\t\t\t}";
$query .= "\n\t\t}";
@ -7169,36 +7140,17 @@ class Interpretation extends Fields
$target = array('admin' => 'import_'.$viewName_list);
$this->buildDynamique($target,'customimport');
// load the custom script to the files
if (isset($this->customScriptBuilder['php_import_display']['import_'.$viewName_list]))
{
// ###IMPORT_DISPLAY_METHOD_CUSTOM### <<<DYNAMIC>>>
$this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_DISPLAY_METHOD_CUSTOM###'] = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_import_display']['import_'.$viewName_list]);
unset($this->customScriptBuilder['php_import_display']['import_'.$viewName_list]);
}
if (isset($this->customScriptBuilder['php_import_setdata']['import_'.$viewName_list]))
{
// ###IMPORT_SETDATE_METHOD_CUSTOM### <<<DYNAMIC>>>
$this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_SETDATE_METHOD_CUSTOM###'] = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_import_setdata']['import_'.$viewName_list]);
unset($this->customScriptBuilder['php_import_setdata']['import_'.$viewName_list]);
}
if (isset($this->customScriptBuilder['php_import']['import_'.$viewName_list]))
{
// ###IMPORT_METHOD_CUSTOM### <<<DYNAMIC>>>
$this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_METHOD_CUSTOM###'] = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_import']['import_'.$viewName_list]);
unset($this->customScriptBuilder['php_import']['import_'.$viewName_list]);
}
if (isset($this->customScriptBuilder['php_import_save']['import_'.$viewName_list]))
{
// ###IMPORT_SAVE_METHOD_CUSTOM### <<<DYNAMIC>>>
$this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_SAVE_METHOD_CUSTOM###'] = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_import_save']['import_'.$viewName_list]);
unset($this->customScriptBuilder['php_import_save']['import_'.$viewName_list]);
}
if (isset($this->customScriptBuilder['html_import_view']['import_'.$viewName_list]))
{
// ###IMPORT_DEFAULT_VIEW_CUSTOM### <<<DYNAMIC>>>
$this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_DEFAULT_VIEW_CUSTOM###'] = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['html_import_view']['import_'.$viewName_list]);
unset($this->customScriptBuilder['html_import_view']['import_'.$viewName_list]);
}
// ###IMPORT_DISPLAY_METHOD_CUSTOM### <<<DYNAMIC>>>
$this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_DISPLAY_METHOD_CUSTOM###'] = $this->getCustomScriptBuilder('php_import_display', 'import_'.$viewName_list, "\n", null, true);
// ###IMPORT_SETDATE_METHOD_CUSTOM### <<<DYNAMIC>>>
$this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_SETDATE_METHOD_CUSTOM###'] = $this->getCustomScriptBuilder('php_import_setdata', 'import_'.$viewName_list, "\n", null, true);
// ###IMPORT_METHOD_CUSTOM### <<<DYNAMIC>>>
$this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_METHOD_CUSTOM###'] = $this->getCustomScriptBuilder('php_import', 'import_'.$viewName_list, "\n", null, true);
// ###IMPORT_SAVE_METHOD_CUSTOM### <<<DYNAMIC>>>
$this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_SAVE_METHOD_CUSTOM###'] = $this->getCustomScriptBuilder('php_import_save', 'import_'.$viewName_list, "\n", null, true);
// ###IMPORT_DEFAULT_VIEW_CUSTOM### <<<DYNAMIC>>>
$this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_DEFAULT_VIEW_CUSTOM###'] = $this->getCustomScriptBuilder('html_import_view', 'import_'.$viewName_list, "\n", null, true);
// insure we have the view placeholders setup
$this->fileContentDynamic['import_'.$viewName_list]['###VIEW###'] = 'IMPORT_'.$this->placeholders['###VIEWS###'];
$this->fileContentDynamic['import_'.$viewName_list]['###View###'] = 'Import_'.$this->placeholders['###views###'];
@ -7241,10 +7193,7 @@ class Interpretation extends Fields
$query .= "\n\t\t\$query->join('LEFT', \$db->quoteName('#__categories', 'c') . ' ON (' . \$db->quoteName('a.".$categoryCodeName."') . ' = ' . \$db->quoteName('c.id') . ')');";
}
// add custom filtering php
if (isset($this->customScriptBuilder['php_getlistquery'][$viewName_single]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['php_getlistquery'][$viewName_single]))
{
$query .= "\n\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_getlistquery'][$viewName_single]);
}
$query .= $this->getCustomScriptBuilder('php_getlistquery', $viewName_single, "\n\n");
// add the custom fields query
$query .= $this->setCustomQuery($viewName_list, $viewName_single);
$query .= "\n\n\t\t//".$this->setLine(__LINE__)." Filter by published state";
@ -9133,14 +9082,7 @@ class Interpretation extends Fields
// set component name
$component = ComponentbuilderHelper::safeString($this->componentData->name_code);
// prepare custom permission script
if (isset($this->customScriptBuilder['php_allowedit'][$viewName_single]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['php_allowedit'][$viewName_single]))
{
$customAllow = str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_allowedit'][$viewName_single]);
}
else
{
$customAllow = '';
}
$customAllow = $this->getCustomScriptBuilder('php_allowedit', $viewName_single, null, true);
// setup correct core target
$coreLoad = false;
if (isset($this->permissionCore[$viewName_single]))
@ -9565,14 +9507,7 @@ class Interpretation extends Fields
// set component name
$component = ComponentbuilderHelper::safeString($this->componentData->name_code);
// prepare custom permission script
if (isset($this->customScriptBuilder['php_allowedit'][$viewName_single]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['php_allowedit'][$viewName_single]))
{
$customAllow = "\t\t\$recordId\t= (int) isset(\$data[\$key]) ? \$data[\$key] : 0;\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_allowedit'][$viewName_single]);
}
else
{
$customAllow = '';
}
$customAllow = $this->getCustomScriptBuilder('php_allowedit', $viewName_single, "\t\t\$recordId\t= (int) isset(\$data[\$key]) ? \$data[\$key] : 0;\n");
// setup correct core target
$coreLoad = false;
if (isset($this->permissionCore[$viewName_single]))
@ -9668,7 +9603,7 @@ class Interpretation extends Fields
$allow[] = "\t\t\t\treturn;";
$allow[] = "\t\t\t}";
// check if the item has permissions.
if ($coreLoad && isset($this->permissionBuilder[$core['core.delete']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder[$core['core.delete']]) && in_array($viewName_single,$this->permissionBuilder[$core['core.delete']]))
if ($coreLoad && (isset($core['core.delete']) && isset($this->permissionBuilder[$core['core.delete']])) && ComponentbuilderHelper::checkArray($this->permissionBuilder[$core['core.delete']]) && in_array($viewName_single,$this->permissionBuilder[$core['core.delete']]))
{
$allow[] = "\n\t\t\t\$user = JFactory::getUser();";
$allow[] = "\t\t\t//".$this->setLine(__LINE__)." The record has been set. Check the record permissions.";
@ -10163,14 +10098,28 @@ class Interpretation extends Fields
$toolBar .= "\n\t\t\t\t\t\tJToolBarHelper::custom('".$viewName.".save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);";
$toolBar .= "\n\t\t\t\t\t}";
$toolBar .= "\n\t\t\t\t}";
if ($coreLoad && isset($this->historyBuilder[$viewName]) && ComponentbuilderHelper::checkString($this->historyBuilder[$viewName]))
{
$toolBar .= "\n\t\t\t\t\$canVersion = (\$this->canDo->get('core.version') && \$this->canDo->get('".$core['core.version']."'));";
$toolBar .= "\n\t\t\t\tif (\$this->state->params->get('save_history', 1) && \$this->canDo->get('".$core['core.edit']."') && \$canVersion)";
$toolBar .= "\n\t\t\t\t{";
$toolBar .= "\n\t\t\t\t\tJToolbarHelper::versions('com_".$this->fileContentStatic['###component###'].".".$viewName."', \$this->item->id);";
$toolBar .= "\n\t\t\t\t}";
}
if ($coreLoad && isset($core['core.edit']) && isset($this->permissionBuilder['global'][$core['core.edit']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.edit']]) && in_array($viewName,$this->permissionBuilder['global'][$core['core.edit']]))
{
if ($coreLoad && isset($this->historyBuilder[$viewName]) && ComponentbuilderHelper::checkString($this->historyBuilder[$viewName]))
{
$toolBar .= "\n\t\t\t\t\$canVersion = (\$this->canDo->get('core.version') && \$this->canDo->get('".$core['core.version']."'));";
$toolBar .= "\n\t\t\t\tif (\$this->state->params->get('save_history', 1) && \$this->canDo->get('".$core['core.edit']."') && \$canVersion)";
$toolBar .= "\n\t\t\t\t{";
$toolBar .= "\n\t\t\t\t\tJToolbarHelper::versions('com_".$this->fileContentStatic['###component###'].".".$viewName."', \$this->item->id);";
$toolBar .= "\n\t\t\t\t}";
}
}
else
{
if ($coreLoad && isset($this->historyBuilder[$viewName]) && ComponentbuilderHelper::checkString($this->historyBuilder[$viewName]))
{
$toolBar .= "\n\t\t\t\t\$canVersion = (\$this->canDo->get('core.version') && \$this->canDo->get('".$core['core.version']."'));";
$toolBar .= "\n\t\t\t\tif (\$this->state->params->get('save_history', 1) && \$this->canDo->get('core.edit') && \$canVersion)";
$toolBar .= "\n\t\t\t\t{";
$toolBar .= "\n\t\t\t\t\tJToolbarHelper::versions('com_".$this->fileContentStatic['###component###'].".".$viewName."', \$this->item->id);";
$toolBar .= "\n\t\t\t\t}";
}
}
if ($coreLoad && isset($core['core.create']) && isset($this->permissionBuilder['global'][$core['core.create']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.create']]) && in_array($viewName,$this->permissionBuilder['global'][$core['core.create']]))
{
$toolBar .= "\n\t\t\t\tif (\$this->canDo->get('".$core['core.create']."'))";
@ -10662,10 +10611,7 @@ class Interpretation extends Fields
}
// add custom php to getitems method
if (isset($this->customScriptBuilder['php_getitems'][$view]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['php_getitems'][$view]))
{
$fix .= "\n\n".$tab."".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_getitems'][$view]);
}
$fix .= $this->getCustomScriptBuilder('php_getitems', $view, "\n\n".$tab);
if ($basicCrypt)
{
@ -12756,7 +12702,7 @@ for developing fast and powerful web interfaces. For more info visit <a href=\"h
// menucontroller
$menucontrollerView['action'] = $targetView_.$menuController;
$menucontrollerView['implementation'] = '2';
if (ComponentbuilderHelper::checkArray($view['settings']->permissions))
if (isset($view['settings']->permissions) && ComponentbuilderHelper::checkArray($view['settings']->permissions))
{
array_push($view['settings']->permissions,$menucontrollerView);
}

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

@ -50,6 +50,23 @@ class Infusion extends Interpretation
return false;
}
/**
* Set the line number in comments
*
* @param int $nr The line number
*
* @return void
*
*/
private function setLine($nr)
{
if ($this->loadLineNr)
{
return ' [Infusion '.$nr.']';
}
return '';
}
/**
* Build the content for the structure
*
@ -293,10 +310,10 @@ class Infusion extends Interpretation
$this->fileContentDynamic[$viewName_single]['###LINKEDVIEWMETHODS###'] = '';
// ###JMODELADMIN_BEFORE_DELETE### <<<DYNAMIC>>>
$this->fileContentDynamic[$viewName_single]['###JMODELADMIN_BEFORE_DELETE###'] = $this->setJmodelAdminBeforeDelete($viewName_single);
$this->fileContentDynamic[$viewName_single]['###JMODELADMIN_BEFORE_DELETE###'] = $this->getCustomScriptBuilder('php_before_delete', $viewName_single, "\n");
// ###JMODELADMIN_AFTER_DELETE### <<<DYNAMIC>>>
$this->fileContentDynamic[$viewName_single]['###JMODELADMIN_AFTER_DELETE###'] = $this->setJmodelAdminAfterDelete($viewName_single);
$this->fileContentDynamic[$viewName_single]['###JMODELADMIN_AFTER_DELETE###'] = $this->getCustomScriptBuilder('php_after_delete', $viewName_single, "\n\n");
// ###CHECKBOX_SAVE### <<<DYNAMIC>>>
$this->fileContentDynamic[$viewName_single]['###CHECKBOX_SAVE###'] = $this->setCheckboxSave($viewName_single);
@ -305,7 +322,7 @@ class Infusion extends Interpretation
$this->fileContentDynamic[$viewName_single]['###METHOD_ITEM_SAVE###'] = $this->setMethodItemSave($viewName_single);
// ###POSTSAVEHOOK### <<<DYNAMIC>>>
$this->fileContentDynamic[$viewName_single]['###POSTSAVEHOOK###'] = $this->setPostSaveHook($viewName_single);
$this->fileContentDynamic[$viewName_single]['###POSTSAVEHOOK###'] = $this->getCustomScriptBuilder('php_postsavehook', $viewName_single, "\n", null, true, "\n\t\treturn;", "\n\n\t\treturn;");
if (isset($this->customScriptBuilder['css_view'][$viewName_single]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['css_view'][$viewName_single]))
{
@ -383,9 +400,12 @@ class Infusion extends Interpretation
$this->fileContentDynamic[$viewName_list]['###CHECKINCALL###'] = '';
}
// ###STORE_METHOD_FIX### <<<DYNAMIC>>>
// ###GET_ITEMS_METHOD_STRING_FIX### <<<DYNAMIC>>>
$this->fileContentDynamic[$viewName_list]['###GET_ITEMS_METHOD_STRING_FIX###'] = $this->setGetItemsMethodStringFix($viewName_single,$this->fileContentStatic['###Component###']);
// ###GET_ITEMS_METHOD_AFTER_ALL### <<<DYNAMIC>>>
$this->fileContentDynamic[$viewName_list]['###GET_ITEMS_METHOD_AFTER_ALL###'] = $this->getCustomScriptBuilder('php_getitems_after_all', $viewName_single, "\n");
// ###SELECTIONTRANSLATIONFIX### <<<DYNAMIC>>>
$this->fileContentDynamic[$viewName_list]['###SELECTIONTRANSLATIONFIX###'] = $this->setSelectionTranslationFix($viewName_list,$this->fileContentStatic['###Component###']);

4
admin/helpers/componentbuilder.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage componentbuilder.php

4
admin/helpers/html/batch_.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage batch_.php

4
admin/helpers/indenter.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage indenter.php

4
admin/helpers/js.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage js.php

4
admin/helpers/minify.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage minify.php

8
admin/language/en-GB/en-GB.com_componentbuilder.ini
View File

@ -103,7 +103,9 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_DOCUMENT="Add Php Document"
COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_DOCUMENT_LABEL="Add PHP (custom document script)"
COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEM="Add Php Getitem"
COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEMS="Add Php Getitems"
COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEMS_LABEL="Add PHP (getItems Method)"
COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEMS_AFTER_ALL="Add Php Getitems After All"
COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEMS_AFTER_ALL_LABEL="Add PHP (getItems Method - after all)"
COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEMS_LABEL="Add PHP (getItems Method - before translation fix & decryption)"
COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEM_LABEL="Add PHP (getItem Method)"
COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETLISTQUERY="Add Php Getlistquery"
COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETLISTQUERY_LABEL="Add PHP (getListQuery - JModelList)"
@ -312,6 +314,10 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_DOCUMENT_HINT="// add custom PHP script to t
COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_DOCUMENT_LABEL="Custom Script (Document)"
COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEM="Php Getitem"
COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS="Php Getitems"
COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS_AFTER_ALL="Php Getitems After All"
COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS_AFTER_ALL_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS_AFTER_ALL_HINT="// PHP Here that should run in the getItems Method (array) $items is where all values are"
COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS_AFTER_ALL_LABEL="PHP"
COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS_HINT="// PHP Here that should run in the getItems Method (array) $items is where all values are"
COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS_LABEL="PHP"

4
admin/layouts/admin_view/css_fullwidth.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage css_fullwidth.php

4
admin/layouts/admin_view/custom_import_fullwidth.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage custom_import_fullwidth.php

6
admin/layouts/admin_view/fields_fullwidth.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage fields_fullwidth.php
@ -29,7 +29,7 @@
defined('_JEXEC') or die('Restricted access');
// set the defaults
$items = $displayData->vxffields;
$items = $displayData->vxgfields;
$user = JFactory::getUser();
$id = $displayData->item->id;
$edit = "index.php?option=com_componentbuilder&view=fields&task=field.edit";

4
admin/layouts/admin_view/javascript_fullwidth.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage javascript_fullwidth.php

4
admin/layouts/admin_view/mysql_fullwidth.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage mysql_fullwidth.php

4
admin/layouts/admin_view/mysql_left.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage mysql_left.php

6
admin/layouts/admin_view/php_fullwidth.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage php_fullwidth.php
@ -38,6 +38,8 @@ $fields = $displayData->get('fields') ?: array(
'php_getitem',
'add_php_getitems',
'php_getitems',
'add_php_getitems_after_all',
'php_getitems_after_all',
'add_php_getlistquery',
'php_getlistquery',
'add_php_save',

4
admin/layouts/admin_view/publishing.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage publishing.php

4
admin/layouts/admin_view/publlshing.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage publlshing.php

4
admin/layouts/admin_view/settings_above.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage settings_above.php

4
admin/layouts/admin_view/settings_left.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage settings_left.php

4
admin/layouts/admin_view/settings_right.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage settings_right.php

4
admin/layouts/admin_view/settings_under.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage settings_under.php

4
admin/layouts/batchselection.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage batchselection.php

4
admin/layouts/component/admin_views_fullwidth.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage admin_views_fullwidth.php

4
admin/layouts/component/details_above.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage details_above.php

4
admin/layouts/component/details_left.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage details_left.php

4
admin/layouts/component/details_right.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage details_right.php

4
admin/layouts/component/details_under.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage details_under.php

4
admin/layouts/component/ftp_servers_fullwidth.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage ftp_servers_fullwidth.php

4
admin/layouts/component/publishing.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage publishing.php

4
admin/layouts/component/publlshing.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage publlshing.php

4
admin/layouts/component/readme_left.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage readme_left.php

4
admin/layouts/component/readme_right.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage readme_right.php

4
admin/layouts/component/scripts_fullwidth.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage scripts_fullwidth.php

4
admin/layouts/component/settings_left.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage settings_left.php

4
admin/layouts/component/settings_right.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage settings_right.php

4
admin/layouts/component/site_views_fullwidth.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage site_views_fullwidth.php

4
admin/layouts/custom_admin_view/custom_buttons_fullwidth.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage custom_buttons_fullwidth.php

4
admin/layouts/custom_admin_view/custom_buttons_left.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage custom_buttons_left.php

4
admin/layouts/custom_admin_view/custom_script_fullwidth.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage custom_script_fullwidth.php

4
admin/layouts/custom_admin_view/details_above.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage details_above.php

4
admin/layouts/custom_admin_view/details_fullwidth.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.16
@build 29th August, 2016
@version 2.1.17
@build 3rd September, 2016
@created 30th April, 2015
@package Component Builder
@subpackage details_fullwidth.php

Some files were not shown because too many files have changed in this diff Show More