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

README.md

@@ -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
++ *Last Build*: 23rd June, 2016
-+ *Version*: 2.1.12
++ *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**
++ *Line count*: **83183**
-+ *File count*: **505**
++ *File count*: **506**
 + *Folder count*: **98**
 
 > This **component** was build with a Joomla [Automated Component Builder] (https://www.vdm.io/joomla-component-builder).

admin/assets/css/admin.css

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

admin/assets/css/admin_view.css

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

admin/assets/css/admin_views.css

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

admin/assets/css/component.css

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

admin/assets/css/components.css

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

admin/assets/css/custom_admin_view.css

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

admin/assets/css/custom_admin_views.css

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

admin/assets/css/dashboard.css

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

admin/assets/css/dynamic_get.css

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

admin/assets/css/dynamic_gets.css

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

admin/assets/css/field.css

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

admin/assets/css/fields.css

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

admin/assets/css/fieldtype.css

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

admin/assets/css/fieldtypes.css

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

admin/assets/css/help_document.css

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

admin/assets/css/help_documents.css

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

admin/assets/css/layout.css

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

admin/assets/css/layouts.css

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

admin/assets/css/site_view.css

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

admin/assets/css/site_views.css

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

admin/assets/css/snippet.css

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

admin/assets/css/snippets.css

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

admin/assets/css/template.css

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

admin/assets/css/templates.css

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

admin/compiler/joomla_3/Helper.php

@@ -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)));
-		$query->from($db->quoteName('#__'.$main.'_'.$table));
+		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);

admin/compiler/joomla_3/Helper_email.php

@@ -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;
 	}
 }

admin/compiler/joomla_3/Helper_site.php

@@ -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)));		
-		$query->select($db->quoteName(array($what)));
+		if (empty($table))
-		$query->from($db->quoteName('#__'.$main.'_'.$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);

admin/componentbuilder.php

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

admin/controller.php

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

admin/controllers/admin_view.php

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

admin/controllers/admin_views.php

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

admin/controllers/ajax.json.php

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

admin/controllers/compiler.php

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

admin/controllers/component.php

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

admin/controllers/componentbuilder.php

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

admin/controllers/components.php

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

admin/controllers/custom_admin_view.php

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

admin/controllers/custom_admin_views.php

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

admin/controllers/dynamic_get.php

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

admin/controllers/dynamic_gets.php

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

admin/controllers/field.php

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

admin/controllers/fields.php

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

admin/controllers/fieldtype.php

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

admin/controllers/fieldtypes.php

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

admin/controllers/help.php

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

admin/controllers/help_document.php

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

admin/controllers/help_documents.php

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

admin/controllers/import.php

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

admin/controllers/layout.php

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

admin/controllers/layouts.php

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

admin/controllers/site_view.php

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

admin/controllers/site_views.php

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

admin/controllers/snippet.php

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

admin/controllers/snippets.php

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

admin/controllers/template.php

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

admin/controllers/templates.php

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

admin/helpers/compiler/a_Get.php

@@ -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
+			// set the lang target
-			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);
-			}
-
 			$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');
+			// add_javascript
-			foreach ($addArray as $scripter)
+			$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,125 +1356,132 @@ class Get
 
 			// Reset the query using our newly populated query object.
 			$db->setQuery($query);
-
+			$db->execute();
-			// Load the results as a list of stdClass objects (see later for more options on retrieving data).
+			if ($db->getNumRows())
-			$field = $db->loadObject();
-			
-			// adding a fix for the changed name of type to fieldtype
-			$field->type = $field->fieldtype;
-
-			// load the values form params
-			$field->xml = json_decode($field->xml);
-
-			// load the type values form type params
-			$properties = json_decode($field->type_properties,true);
-			unset($field->type_properties);
-
-			if (ComponentbuilderHelper::checkArray($properties))
 			{
-				foreach ($properties as $option => $values)
+				// Load the results as a list of stdClass objects (see later for more options on retrieving data).
+				$field = $db->loadObject();
+
+				// adding a fix for the changed name of type to fieldtype
+				$field->type = $field->fieldtype;
+
+				// load the values form params
+				$field->xml = json_decode($field->xml);
+
+				// load the type values form type params
+				$properties = json_decode($field->type_properties,true);
+				unset($field->type_properties);
+
+				if (ComponentbuilderHelper::checkArray($properties))
 				{
-					foreach ($values as $nr => $value)
+					foreach ($properties as $option => $values)
 					{
-						$field->properties[$nr][$option] = $value;
+						foreach ($values as $nr => $value)
-					}
-				}
-			}
-			// check if we have advanced encryption
-			if (4 == $field->store &&  (!isset($this->advancedEncryption) || !$this->advancedEncryption))
-			{
-				 $this->advancedEncryption = true;
-			}
-			// check if we have basic encryption
-			elseif (3 == $field->store &&  (!isset($this->basicEncryption) || !$this->basicEncryption))
-			{
-				 $this->basicEncryption = true;
-			}
-
-			// check if we should load scripts for single view
-			if (ComponentbuilderHelper::checkString($name_single) && !isset($this->customFieldScript[$name_single][$id]))
-			{
-				// add_javascript_view_footer
-				if ($field->add_javascript_view_footer == 1)
-				{
-					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));
-					if (strpos($field->javascript_view_footer,"token") !== false && strpos($field->javascript_view_footer,"task=ajax") !== false)
-					{
-						if (!isset($this->customScriptBuilder['token'][$name_single]) || !$this->customScriptBuilder['token'][$name_single])
 						{
-							if(!isset($this->customScriptBuilder['token']))
+							$field->properties[$nr][$option] = $value;
-							{
-								$this->customScriptBuilder['token'] = array();
-							}
-							$this->customScriptBuilder['token'][$name_single] = true;
 						}
 					}
-					unset($field->javascript_view_footer);
+				}
+				// check if we have advanced encryption
+				if (4 == $field->store &&  (!isset($this->advancedEncryption) || !$this->advancedEncryption))
+				{
+					 $this->advancedEncryption = true;
+				}
+				// check if we have basic encryption
+				elseif (3 == $field->store &&  (!isset($this->basicEncryption) || !$this->basicEncryption))
+				{
+					 $this->basicEncryption = true;
 				}
 
-				// add_css_view
+				// check if we should load scripts for single view
-				if ($field->add_css_view == 1)
+				if (ComponentbuilderHelper::checkString($name_single) && !isset($this->customFieldScript[$name_single][$id]))
 				{
-					if (!isset($this->customScriptBuilder['css_view'][$name_single]))
+					// add_javascript_view_footer
+					if ($field->add_javascript_view_footer == 1)
 					{
-						$this->customScriptBuilder['css_view'][$name_single] = '';
+						if (!isset($this->customScriptBuilder['view_footer'][$name_single]))
+						{
+							if(!isset($this->customScriptBuilder['view_footer']))
+							{
+								$this->customScriptBuilder['view_footer'] = array();
+							}
+							$this->customScriptBuilder['view_footer'][$name_single] = '';
+						}
+						$this->customScriptBuilder['view_footer'][$name_single] .= "\n".$this->setCustomContentLang(base64_decode($field->javascript_view_footer));
+						if (strpos($field->javascript_view_footer,"token") !== false && strpos($field->javascript_view_footer,"task=ajax") !== false)
+						{
+							if (!isset($this->customScriptBuilder['token'][$name_single]) || !$this->customScriptBuilder['token'][$name_single])
+							{
+								if(!isset($this->customScriptBuilder['token']))
+								{
+									$this->customScriptBuilder['token'] = array();
+								}
+								$this->customScriptBuilder['token'][$name_single] = true;
+							}
+						}
+						unset($field->javascript_view_footer);
 					}
-					$this->customScriptBuilder['css_view'][$name_single] .= "\n".base64_decode($field->css_view);
+
+					// add_css_view
+					if ($field->add_css_view == 1)
+					{
+						if (!isset($this->customScriptBuilder['css_view'][$name_single]))
+						{
+							$this->customScriptBuilder['css_view'][$name_single] = '';
+						}
+						$this->customScriptBuilder['css_view'][$name_single] .= "\n".base64_decode($field->css_view);
+						unset($field->css_view);
+					}
+
+					// add this only once to view.
+					$this->customFieldScript[$name_single][$id] = true;
+				}
+				else
+				{
+					// unset if not needed
+					unset($field->javascript_view_footer);
 					unset($field->css_view);
 				}
-
+				// check if we should load scripts for list views
-				// add this only once to view.
+				if (ComponentbuilderHelper::checkString($name_list))
-				$this->customFieldScript[$name_single][$id] = true;
-			}
-			else
-			{
-				// unset if not needed
-				unset($field->javascript_view_footer);
-				unset($field->css_view);
-			}
-			// check if we should load scripts for list views
-			if (ComponentbuilderHelper::checkString($name_list))
-			{
-				// add_javascript_views_footer
-				if ($field->add_javascript_views_footer == 1)
 				{
-					$this->customScriptBuilder['views_footer'][$name_list] .= $this->setCustomContentLang(base64_decode($field->javascript_views_footer));
+					// add_javascript_views_footer
-					if (strpos($field->javascript_views_footer,"token") !== false && strpos($field->javascript_views_footer,"task=ajax") !== false)
+					if ($field->add_javascript_views_footer == 1)
 					{
-						if (!$this->customScriptBuilder['token'][$name_list])
+						$this->customScriptBuilder['views_footer'][$name_list] .= $this->setCustomContentLang(base64_decode($field->javascript_views_footer));
+						if (strpos($field->javascript_views_footer,"token") !== false && strpos($field->javascript_views_footer,"task=ajax") !== false)
 						{
-							$this->customScriptBuilder['token'][$name_list] = true;
+							if (!$this->customScriptBuilder['token'][$name_list])
+							{
+								$this->customScriptBuilder['token'][$name_list] = true;
+							}
 						}
+						unset($field->javascript_views_footer);
 					}
-					unset($field->javascript_views_footer);
+					// add_css_views
-				}
+					if ($field->add_css_views == 1)
-				// add_css_views
-				if ($field->add_css_views == 1)
-				{
-					if (!isset($this->customScriptBuilder['css_views'][$name_list]))
 					{
-						$this->customScriptBuilder['css_views'][$name_list] = '';
+						if (!isset($this->customScriptBuilder['css_views'][$name_list]))
+						{
+							$this->customScriptBuilder['css_views'][$name_list] = '';
+						}
+						$this->customScriptBuilder['css_views'][$name_list] .= base64_decode($field->css_views);
+						unset($field->css_views);
 					}
-					$this->customScriptBuilder['css_views'][$name_list] .= base64_decode($field->css_views);
-					unset($field->css_views);
 				}
+				else
+				{
+					// unset if not needed
+					unset($field->javascript_views_footer);
+					unset($field->css_views);
+
+				}
+				$this->_fieldData[$id] = $field;
 			}
 			else
 			{
-				// unset if not needed
+				return false;
-				unset($field->javascript_views_footer);
-				unset($field->css_views);
-
 			}
-			$this->_fieldData[$id] = $field;
 		}
 		// return the found field data
 		return $this->_fieldData[$id];

admin/helpers/compiler/c_Fields.php

@@ -655,100 +655,104 @@ class Fields extends Structure
 	 */
 	public function setDynamicField(&$field, &$view, &$viewType, &$langView, &$viewName, &$listViewName, &$spacerCounter, &$placeholders, &$dbkey, $build)
 	{
-		$name = ComponentbuilderHelper::safeString($field['settings']->name);
+		if (isset($field['settings']) && ComponentbuilderHelper::checkObject($field['settings']))
-		$typeName = ComponentbuilderHelper::safeString($field['settings']->type_name);
-		$multiple = false;
-		$langLabel = '';
-		$taber = '';
-		$fieldSet = '';
-		// set field attributes
-		$fieldAttributes = $this->setFieldAttributes($field, $viewType, $name, $typeName, $multiple, $langLabel, $langView, $spacerCounter, $listViewName, $viewName, $placeholders);
-		// check if values were set
-		if (ComponentbuilderHelper::checkArray($fieldAttributes))
 		{
-			// set the array of field names
+			$name = ComponentbuilderHelper::safeString($field['settings']->name);
-			$this->setFieldsNames($viewName,$fieldAttributes['name']);
+			$typeName = ComponentbuilderHelper::safeString($field['settings']->type_name);
-			
+			$multiple = false;
-			if ($this->defaultField($typeName, 'option'))
+			$langLabel = '';
+			$taber = '';
+			$fieldSet = '';
+			// set field attributes
+			$fieldAttributes = $this->setFieldAttributes($field, $viewType, $name, $typeName, $multiple, $langLabel, $langView, $spacerCounter, $listViewName, $viewName, $placeholders);
+			// check if values were set
+			if (ComponentbuilderHelper::checkArray($fieldAttributes))
 			{
-				//reset options array
+				// set the array of field names
-				$optionArray = array();
+				$this->setFieldsNames($viewName,$fieldAttributes['name']);
-				// now add to the field set
+
-				$fieldSet .= $this->setField('option', $taber, $fieldAttributes, $name, $typeName, $langView, $viewName, $listViewName, $placeholders, $optionArray);
+				if ($this->defaultField($typeName, 'option'))
-				if ($build)
 				{
-					// set builders
+					//reset options array
-					$this->setBuilders($langLabel, $langView, $viewName, $listViewName, $name, $view, $field, $typeName, $multiple, false, $optionArray);
+					$optionArray = array();
-				}
+					// now add to the field set
-			}
+					$fieldSet .= $this->setField('option', $taber, $fieldAttributes, $name, $typeName, $langView, $viewName, $listViewName, $placeholders, $optionArray);
-			elseif ($this->defaultField($typeName, 'plain'))
+					if ($build)
-			{
-				if ($build)
-				{
-					// set builders
-					$this->setBuilders($langLabel, $langView, $viewName, $listViewName, $name, $view, $field, $typeName, $multiple);
-				}
-				// now add to the field set
-				$fieldSet .= $this->setField('plain', $taber, $fieldAttributes, $name, $typeName, $langView, $viewName, $listViewName, $placeholders, $optionArray);
-			}
-			elseif ($this->defaultField($typeName, 'spacer'))
-			{
-				if ($build)
-				{
-					// make sure spacers gets loaded to layout
-					$tabName = '';
-					if (isset($view['settings']->tabs) && isset($view['settings']->tabs[(int) $field['tab']]))
 					{
-						$tabName = $view['settings']->tabs[(int) $field['tab']];
+						// set builders
+						$this->setBuilders($langLabel, $langView, $viewName, $listViewName, $name, $view, $field, $typeName, $multiple, false, $optionArray);
 					}
-					elseif ((int) $field['tab'] == 15)
-					{
-						// set to publishing tab
-						$tabName = 'publishing';
-					}
-					$this->setLayoutBuilder($viewName, $tabName, $name, $field);
 				}
-				// now add to the field set
+				elseif ($this->defaultField($typeName, 'plain'))
-				$fieldSet .= $this->setField('spacer', $taber, $fieldAttributes, $name, $typeName, $langView, $viewName, $listViewName, $placeholders, $optionArray);
-				// increment spacer counter
-				if ($typeName == 'spacer')
-				{
-					$spacerCounter++;
-				}
-			}
-			elseif ($this->defaultField($typeName, 'special'))
-			{
-				// set the repeatable field
-				if ($typeName == 'repeatable')
 				{
 					if ($build)
 					{
 						// set builders
-						$this->setBuilders($langLabel, $langView, $viewName, $listViewName, $name, $view, $field, $typeName, $multiple, false);
+						$this->setBuilders($langLabel, $langView, $viewName, $listViewName, $name, $view, $field, $typeName, $multiple);
 					}
 					// now add to the field set
-					$fieldSet .= $this->setField('special', $taber, $fieldAttributes, $name, $typeName, $langView, $viewName, $listViewName, $placeholders, $optionArray);
+					$fieldSet .= $this->setField('plain', $taber, $fieldAttributes, $name, $typeName, $langView, $viewName, $listViewName, $placeholders, $optionArray);
 				}
-			}
+				elseif ($this->defaultField($typeName, 'spacer'))
-			elseif (ComponentbuilderHelper::checkArray($fieldAttributes['custom']))
-			{
-				// set the custom array
-				$custom = $fieldAttributes['custom'];
-				unset($fieldAttributes['custom']);
-				// set db key
-				$custom['db'] = $dbkey;
-				// increment the db key
-				$dbkey++;
-				if ($build)
 				{
-					// set builders
+					if ($build)
-					$this->setBuilders($langLabel, $langView, $viewName, $listViewName, $name, $view, $field, $typeName, $multiple, $custom);
+					{
+						// make sure spacers gets loaded to layout
+						$tabName = '';
+						if (isset($view['settings']->tabs) && isset($view['settings']->tabs[(int) $field['tab']]))
+						{
+							$tabName = $view['settings']->tabs[(int) $field['tab']];
+						}
+						elseif ((int) $field['tab'] == 15)
+						{
+							// set to publishing tab
+							$tabName = 'publishing';
+						}
+						$this->setLayoutBuilder($viewName, $tabName, $name, $field);
+					}
+					// now add to the field set
+					$fieldSet .= $this->setField('spacer', $taber, $fieldAttributes, $name, $typeName, $langView, $viewName, $listViewName, $placeholders, $optionArray);
+					// increment spacer counter
+					if ($typeName == 'spacer')
+					{
+						$spacerCounter++;
+					}
+				}
+				elseif ($this->defaultField($typeName, 'special'))
+				{
+					// set the repeatable field
+					if ($typeName == 'repeatable')
+					{
+						if ($build)
+						{
+							// set builders
+							$this->setBuilders($langLabel, $langView, $viewName, $listViewName, $name, $view, $field, $typeName, $multiple, false);
+						}
+						// now add to the field set
+						$fieldSet .= $this->setField('special', $taber, $fieldAttributes, $name, $typeName, $langView, $viewName, $listViewName, $placeholders, $optionArray);
+					}
+				}
+				elseif (ComponentbuilderHelper::checkArray($fieldAttributes['custom']))
+				{
+					// set the custom array
+					$custom = $fieldAttributes['custom'];
+					unset($fieldAttributes['custom']);
+					// set db key
+					$custom['db'] = $dbkey;
+					// increment the db key
+					$dbkey++;
+					if ($build)
+					{
+						// set builders
+						$this->setBuilders($langLabel, $langView, $viewName, $listViewName, $name, $view, $field, $typeName, $multiple, $custom);
+					}
+					// now add to the field set
+					$fieldSet .= $this->setField('custom', $taber, $fieldAttributes, $name, $typeName, $langView, $viewName, $listViewName, $placeholders, $optionArray);
 				}
-				// now add to the field set
-				$fieldSet .= $this->setField('custom', $taber, $fieldAttributes, $name, $typeName, $langView, $viewName, $listViewName, $placeholders, $optionArray);
 			}
+			return $fieldSet;
 		}
-		return $fieldSet;
+		return '';
 	}
 
 	/**

admin/helpers/compiler/e_Interpretation.php

@@ -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

admin/helpers/compiler/f_Infusion.php

@@ -45,7 +45,7 @@ class Infusion extends Interpretation
 		if (parent::__construct($config))
 		{
 			// infuse the data into the structure
-			return $this->buildFileContent();		
+			return $this->buildFileContent();
 		}
 		return false;
 	}
@@ -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);
@@ -476,6 +476,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);

admin/helpers/componentbuilder.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.12
+	@version		2.1.13
-	@build			3rd June, 2016
+	@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)));
-		$query->from($db->quoteName('#__'.$main.'_'.$table));
+		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);

admin/helpers/html/batch_.php

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

admin/helpers/indenter.php

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

admin/helpers/js.php

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

admin/helpers/minify.php

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

admin/layouts/admin_view/css_fullwidth.php

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

admin/layouts/admin_view/custom_import_fullwidth.php

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

admin/layouts/admin_view/fields_fullwidth.php

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

admin/layouts/admin_view/javascript_fullwidth.php

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

admin/layouts/admin_view/mysql_fullwidth.php

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

admin/layouts/admin_view/mysql_left.php

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

admin/layouts/admin_view/php_fullwidth.php

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

admin/layouts/admin_view/publishing.php

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

admin/layouts/admin_view/publlshing.php

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

admin/layouts/admin_view/settings_above.php

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

admin/layouts/admin_view/settings_left.php

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

admin/layouts/admin_view/settings_right.php

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

admin/layouts/admin_view/settings_under.php

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

admin/layouts/batchselection.php

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

admin/layouts/component/admin_views_fullwidth.php

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

admin/layouts/component/details_above.php

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

admin/layouts/component/details_left.php

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

admin/layouts/component/details_right.php

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

admin/layouts/component/details_under.php

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

admin/layouts/component/ftp_servers_fullwidth.php

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

admin/layouts/component/publishing.php

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

admin/layouts/component/publlshing.php

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

admin/layouts/component/readme_left.php

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

admin/layouts/component/readme_right.php

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

admin/layouts/component/scripts_fullwidth.php

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

admin/layouts/component/settings_left.php

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

admin/layouts/component/settings_right.php

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

admin/layouts/component/site_views_fullwidth.php

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

admin/layouts/custom_admin_view/custom_buttons_fullwidth.php

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

admin/layouts/custom_admin_view/custom_buttons_left.php

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

admin/layouts/custom_admin_view/custom_script_fullwidth.php

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

admin/layouts/custom_admin_view/details_above.php

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

admin/layouts/custom_admin_view/details_fullwidth.php

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

admin/layouts/custom_admin_view/details_left.php

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