joomla/Component-Builder
joomla/Component-Builder
38
23
Fork 11
Code Issues 81 Pull Requests Projects 4 Wiki Activity

Made some improvements to the compiler and extended the email helper features.

Browse Source
This commit is contained in:
Llewellyn van der Merwe 2016-06-23 16:05:37 +01:00
parent d82d4aeb22
commit 2004b8d91c
369 changed files with 1019 additions and 1013 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.12)
# Component Builder (2.1.13)
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*: 3rd June, 2016
+ *Version*: 2.1.12
+ *Last Build*: 23rd June, 2016
+ *Version*: 2.1.13
+ *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*: **83152**
+ *File count*: **505**
+ *Line count*: **83183**
+ *File count*: **506**
+ *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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 2016
@created 30th April, 2015
@package Component Builder
@subpackage templates.css

8
admin/compiler/joomla_3/Helper.php
View File

@ -102,9 +102,15 @@ abstract class ###Component###Helper
$db = JFactory::getDbo();
// Create a new query object.
$query = $db->getQuery(true);
$query->select($db->quoteName(array($what)));
if (empty($table))
{
$query->from($db->quoteName('#__'.$main));
}
else
{
$query->from($db->quoteName('#__'.$main.'_'.$table));
}
if (is_numeric($where))
{
$query->where($db->quoteName($whereString) . ' '.$operator.' '.(int) $where);

10
admin/compiler/joomla_3/Helper_email.php
View File

@ -234,13 +234,13 @@ abstract class ###Component###Email
$numReplyTo = count($mailreply);
for ($i=0; $i < $numReplyTo; $i++)
{
$mail->addReplyTo( array($mailreply[$i], $replyname[$i]) );
$mail->addReplyTo($mailreply[$i], $replyname[$i]);
}
}
elseif (!empty($mailreply))
{
$mail->ClearReplyTos();
$mail->addReplyTo( array( $mailreply, $replyname ) );
$mail->addReplyTo($mailreply, $replyname);
}
// check if we can add the DKIM to email
@ -268,6 +268,12 @@ abstract class ###Component###Email
@unlink($tmp);
}
if (method_exists('###Component###Helper','storeMessage'))
{
// store the massage if the method is set
###Component###Helper::storeMessage($sendmail, $recipient, $subject, $body, $textonly, $mode, 'email');
}
return $sendmail;
}
}

8
admin/compiler/joomla_3/Helper_site.php
View File

@ -276,9 +276,15 @@ abstract class ###Component###Helper
$db = JFactory::getDbo();
// Create a new query object.
$query = $db->getQuery(true);
$query->select($db->quoteName(array($what)));
if (empty($table))
{
$query->from($db->quoteName('#__'.$main));
}
else
{
$query->from($db->quoteName('#__'.$main.'_'.$table));
}
if (is_numeric($where))
{
$query->where($db->quoteName($whereString) . ' '.$operator.' '.(int) $where);

4
admin/componentbuilder.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 2016
@created 30th April, 2015
@package Component Builder
@subpackage componentbuilder.php

4
admin/controller.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 2016
@created 30th April, 2015
@package Component Builder
@subpackage templates.php

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

@ -1011,90 +1011,52 @@ class Get
// setup linked views to global data sets
$this->linkedAdminViews[$name_single] = $linked_views_sorted;
unset($linked_views_sorted);
// add_javascript_view_file
if ($view->add_javascript_view_file == 1)
{
$view->javascript_view_file = base64_decode($view->javascript_view_file);
$this->customScriptBuilder['view_file'][$name_single] = $view->javascript_view_file;
if (strpos($view->javascript_view_file,"token") !== false && strpos($view->javascript_view_file,"task=ajax") !== false)
{
if (!$this->customScriptBuilder['token'][$name_single])
{
$this->customScriptBuilder['token'][$name_single] = true;
}
}
unset($view->javascript_view_file);
}
// add_javascript_view_footer
if ($view->add_javascript_view_footer == 1)
{
$view->javascript_view_footer = base64_decode($view->javascript_view_footer);
if (!isset($this->customScriptBuilder['view_footer'][$name_single]))
{
$this->customScriptBuilder['view_footer'][$name_single] = '';
}
$this->customScriptBuilder['view_footer'][$name_single] .= $view->javascript_view_footer;
if (strpos($view->javascript_view_footer,"token") !== false && strpos($view->javascript_view_footer,"task=ajax") !== false)
{
if (!$this->customScriptBuilder['token'][$name_single])
{
$this->customScriptBuilder['token'][$name_single] = true;
}
}
unset($view->javascript_view_footer);
}
// add_javascript_view_file
if ($view->add_javascript_views_file == 1)
{
$view->javascript_views_file = base64_decode($view->javascript_views_file);
$this->customScriptBuilder['views_file'][$name_list] = $view->javascript_views_file;
if (strpos($view->javascript_views_file,"token") !== false && strpos($view->javascript_views_file,"task=ajax") !== false)
{
if (!$this->customScriptBuilder['token'][$name_list])
{
$this->customScriptBuilder['token'][$name_list] = true;
}
}
unset($view->javascript_views_file);
}
// add_javascript_views_footer
if ($view->add_javascript_views_footer == 1)
{
$view->javascript_views_footer = base64_decode($view->javascript_views_footer);
$this->customScriptBuilder['views_footer'][$name_list] .= $view->javascript_views_footer;
if (strpos($view->javascript_views_footer,"token") !== false && strpos($view->javascript_views_footer,"task=ajax") !== false)
{
if (!$this->customScriptBuilder['token'][$name_list])
{
$this->customScriptBuilder['token'][$name_list] = true;
}
}
unset($view->javascript_views_footer);
}
// add_css_view
if ($view->add_css_view == 1)
{
if (!isset($this->customScriptBuilder['css_view'][$name_single]))
{
$this->customScriptBuilder['css_view'][$name_single] = '';
}
$this->customScriptBuilder['css_view'][$name_single] .= base64_decode($view->css_view);
unset($view->css_view);
}
// add_css_views
if ($view->add_css_views == 1)
{
if (!isset($this->customScriptBuilder['css_views'][$name_single]))
{
$this->customScriptBuilder['css_views'][$name_single] = '';
}
$this->customScriptBuilder['css_views'][$name_list] .= base64_decode($view->css_views);
unset($view->css_views);
}
// set the lang target
$this->lang = 'admin';
$addArray = 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');
foreach ($addArray as $scripter)
// add_javascript
$addArrayJ = array('javascript_view_file','javascript_view_footer','javascript_views_file','javascript_views_footer');
foreach ($addArrayJ as $scripter)
{
if (isset($view->{'add_'.$scripter}) && $view->{'add_'.$scripter} == 1)
{
$view->$scripter = $this->setCustomContentLang(base64_decode($view->$scripter));
$scripter_target = str_replace('javascript_', '', $scripter);
if (!isset($this->customScriptBuilder[$scripter_target][$name_single]))
{
if (!isset($this->customScriptBuilder[$scripter_target]))
{
$this->customScriptBuilder[$scripter_target] = array();
}
$this->customScriptBuilder[$scripter_target][$name_single] = '';
}
$this->customScriptBuilder[$scripter_target][$name_single] .= $view->$scripter;
if (strpos($view->$scripter,"token") !== false && strpos($view->$scripter,"task=ajax") !== false)
{
if (!$this->customScriptBuilder['token'][$name_single])
{
$this->customScriptBuilder['token'][$name_single] = true;
}
}
unset($view->$scripter);
}
}
// add_css
$addArrayC = array('css_view', 'css_views');
foreach ($addArrayC as $scripter)
{
if (isset($view->{'add_'.$scripter}) && $view->{'add_'.$scripter} == 1)
{
if (!isset($this->customScriptBuilder[$scripter][$name_single]))
{
$this->customScriptBuilder[$scripter][$name_single] = '';
}
$this->customScriptBuilder[$scripter][$name_single] .= base64_decode($view->$scripter);
unset($view->$scripter);
}
}
// 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');
foreach ($addArrayP as $scripter)
{
if (isset($view->{'add_'.$scripter}) && $view->{'add_'.$scripter} == 1)
{
@ -1394,7 +1356,9 @@ class Get
// Reset the query using our newly populated query object.
$db->setQuery($query);
$db->execute();
if ($db->getNumRows())
{
// Load the results as a list of stdClass objects (see later for more options on retrieving data).
$field = $db->loadObject();
@ -1434,13 +1398,13 @@ class Get
{
// add_javascript_view_footer
if ($field->add_javascript_view_footer == 1)
{
if (!isset($this->customScriptBuilder['view_footer'][$name_single]))
{
if(!isset($this->customScriptBuilder['view_footer']))
{
$this->customScriptBuilder['view_footer'] = array();
}
if (!isset($this->customScriptBuilder['view_footer'][$name_single]))
{
$this->customScriptBuilder['view_footer'][$name_single] = '';
}
$this->customScriptBuilder['view_footer'][$name_single] .= "\n".$this->setCustomContentLang(base64_decode($field->javascript_view_footer));
@ -1514,6 +1478,11 @@ class Get
}
$this->_fieldData[$id] = $field;
}
else
{
return false;
}
}
// return the found field data
return $this->_fieldData[$id];
}

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

@ -654,6 +654,8 @@ class Fields extends Structure
*
*/
public function setDynamicField(&$field, &$view, &$viewType, &$langView, &$viewName, &$listViewName, &$spacerCounter, &$placeholders, &$dbkey, $build)
{
if (isset($field['settings']) && ComponentbuilderHelper::checkObject($field['settings']))
{
$name = ComponentbuilderHelper::safeString($field['settings']->name);
$typeName = ComponentbuilderHelper::safeString($field['settings']->type_name);
@ -750,6 +752,8 @@ class Fields extends Structure
}
return $fieldSet;
}
return '';
}
/**
* set a field

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

@ -2306,7 +2306,7 @@ class Interpretation extends Fields
$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'][$view['settings']->code]);
unset($this->customScriptBuilder[$this->target.'_php_getlistquery'][$code]);
}
// set main get query
$getItem .= $this->setCustomViewQuery($get->main_get,$code);
@ -7519,12 +7519,10 @@ class Interpretation extends Fields
return '';
}
public function buildTheViewScript($viewArray, $component)
public function buildTheViewScript($viewArray)
{
// set the view name
$viewName = ComponentbuilderHelper::safeString($viewArray['settings']->name_single);
// setup the str_replace values
$placeholders = array('[[[component]]]' => $component, '[[[view]]]' => $viewName);
// add conditions to this view
if (isset($viewArray['settings']->conditions) && ComponentbuilderHelper::checkArray($viewArray['settings']->conditions))
{
@ -7851,12 +7849,12 @@ class Interpretation extends Fields
{
$fileScript = '';
}
$fileScript .= "\n\n".str_replace(array_keys($placeholders),array_values($placeholders),$this->customScriptBuilder['view_file'][$viewName]);
$fileScript .= "\n\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['view_file'][$viewName]);
}
// add custom script to footer
if (isset($this->customScriptBuilder['view_footer'][$viewName]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['view_footer'][$viewName]))
{
$customFooterScript = "\n\n".str_replace(array_keys($placeholders),array_values($placeholders),$this->customScriptBuilder['view_footer'][$viewName]);
$customFooterScript = "\n\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['view_footer'][$viewName]);
if (strpos($customFooterScript,'<?php') === false)
{
// only add now if no php is added to the footer script

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

@ -241,7 +241,7 @@ class Infusion extends Interpretation
$this->fileContentDynamic[$viewName_single]['###ADDTOOLBAR###'] = $this->setAddToolBar($view);
// set the script for this view
$this->buildTheViewScript($view, $this->fileContentStatic['###component###']);
$this->buildTheViewScript($view);
// ###VIEW_SCRIPT###
$this->fileContentDynamic[$viewName_single]['###VIEW_SCRIPT###'] = $this->setViewScript($viewName_single);
@ -477,6 +477,9 @@ class Infusion extends Interpretation
// ###MODEL_BATCH_MOVE### <<<DYNAMIC>>>
$this->fileContentDynamic[$viewName_single]['###MODEL_BATCH_MOVE###'] = $this->setBatchMove($viewName_single);
// ###BATCH_ONCLICK_CANCEL_SCRIPT### <<<DYNAMIC>>>
$this->fileContentDynamic[$viewName_list]['###BATCH_ONCLICK_CANCEL_SCRIPT###'] = ''; // TODO <-- must still be build
// ###JCONTROLLERFORM_ALLOWADD### <<<DYNAMIC>>>
$this->fileContentDynamic[$viewName_single]['###JCONTROLLERFORM_ALLOWADD###'] = $this->setJcontrollerAllowAdd($viewName_single,$viewName_list);

12
admin/helpers/componentbuilder.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 2016
@created 30th April, 2015
@package Component Builder
@subpackage componentbuilder.php
@ -657,9 +657,15 @@ abstract class ComponentbuilderHelper
$db = JFactory::getDbo();
// Create a new query object.
$query = $db->getQuery(true);
$query->select($db->quoteName(array($what)));
if (empty($table))
{
$query->from($db->quoteName('#__'.$main));
}
else
{
$query->from($db->quoteName('#__'.$main.'_'.$table));
}
if (is_numeric($where))
{
$query->where($db->quoteName($whereString) . ' '.$operator.' '.(int) $where);

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

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 2016
@created 30th April, 2015
@package Component Builder
@subpackage minify.php

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

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 2016
@created 30th April, 2015
@package Component Builder
@subpackage custom_import_fullwidth.php

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

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 2016
@created 30th April, 2015
@package Component Builder
@subpackage fields_fullwidth.php

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

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 2016
@created 30th April, 2015
@package Component Builder
@subpackage mysql_left.php

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

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 2016
@created 30th April, 2015
@package Component Builder
@subpackage php_fullwidth.php

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

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 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.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 2016
@created 30th April, 2015
@package Component Builder
@subpackage details_fullwidth.php

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

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.12
@build 3rd June, 2016
@version 2.1.13
@build 23rd June, 2016
@created 30th April, 2015
@package Component Builder
@subpackage details_left.php

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