Resolved #9 Layout Issue - Custom Lookup Field.

README.md

@@ -1,12 +1,12 @@
-# Component Builder (2.1.8)
+# Component Builder (2.1.16)
 
 This is a [Joomla 3.x] (http://www.joomla.org/) component.
 
- ![Component Builder image] (https://raw.githubusercontent.com/vdm-io/Joomla-Component-Builder/master/admin/assets/images/component-300.png "The Component Builder")
+ ![Component Builder image] (https://raw.githubusercontent.com/vdm-io/Joomla-Component-Builder/master/admin/assets/images/component-300.jpg "The Component Builder")
 
 The Component Builder for Joomla that is highly advanced, truly able to build extremely complex components in a fraction of the time.
 
-> **You can purchase Component Builder with the following components as demo setup inside Component Builder:**
+> **You can purchase demo content inside Component Builder:**
 
 + **Development Version** ([get this demo set](https://www.vdm.io/joomla-component-builder))
 
@@ -22,9 +22,9 @@ The Component Builder for Joomla that is highly advanced, truly able to build ex
 
     *Training & Help Videos* tutorials in the component included.
 
-# Extra Support
+# gitHub Support
 
-Would you require more help VDM.io has a number of support plans available [visit us today!](https://www.vdm.io/joomla-component-builder).
+Would you require more help please open and issue here on [gitHub today](https://github.com/vdm-io/Joomla-Component-Builder/issues)!
 
 # Build Details
 
@@ -32,38 +32,13 @@ Would you require more help VDM.io has a number of support plans available [visi
 + *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*: 7th May, 2016
-+ *Version*: 2.1.8
++ *Last Build*: 12th July, 2016
++ *Version*: 2.1.16
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-
-## Build Time
-
-**230 Hours** or **29 Eight Hour Days** (actual time the author saved -
-due to [Automated Component Builder] (https://www.vdm.io/joomla-component-builder))
-
-> (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,
-> never making one mistake or taking any coffee break.)
-
-+ *Line count*: **82516**
-+ *File count*: **501**
++ *Line count*: **83187**
++ *File count*: **509**
 + *Folder count*: **98**
 
-**152 Hours** or **19 Eight Hour Days** (the actual time the author spent)
-
-> (with the following break down:
-> **debugging @58hours** = codingtime / 4;
-> **planning @33hours** = codingtime / 7;
-> **mapping @23hours** = codingtime / 10;
-> **office @38hours** = codingtime / 6;)
-
-**382 Hours** or **48 Eight Hour Days**
-(a total of the realistic time frame for this project)
-
-> (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,
-> with the normal everyday realities at the office, that includes the component planning, mapping & debugging.)
-
-Project duration: **9.6 weeks** or **2 months**
-
 > This **component** was build with a Joomla [Automated Component Builder] (https://www.vdm.io/joomla-component-builder).
 > Developed by [Llewellyn van der Merwe] (mailto:joomla@vdm.io)

admin/assets/css/admin.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin.css

admin/assets/css/admin_view.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 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.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_views.css

admin/assets/css/component.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		component.css

admin/assets/css/components.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 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.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 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.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 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.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dashboard.css

admin/assets/css/dynamic_get.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 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.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_gets.css

admin/assets/css/field.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		field.css

admin/assets/css/fields.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields.css

admin/assets/css/fieldtype.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtype.css

admin/assets/css/fieldtypes.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtypes.css

admin/assets/css/help_document.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 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.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help_documents.css

admin/assets/css/layout.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		layout.css

admin/assets/css/layouts.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		layouts.css

admin/assets/css/site_view.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 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.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_views.css

admin/assets/css/snippet.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippet.css

admin/assets/css/snippets.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippets.css

admin/assets/css/template.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		template.css

admin/assets/css/templates.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		templates.css

admin/compiler/giz.txt

@@ -1,17 +0,0 @@
-/*----------------------------------------------------------------------------------|  www.giz.de  |----/
-	###COMPANYNAME### 
-/-------------------------------------------------------------------------------------------------------/
-
-	@version		###VERSION###
-	@build			###BUILDDATE###
-	@created		###CREATIONDATE###
-	@package		###Component_name###
-	@subpackage		###FILENAME###
-	@author			###AUTHOR### <###AUTHORWEBSITE###>	
-	@owner			###COMPANYNAME###
-	@copyright		###COPYRIGHT###
-	@license		###LICENSE###
-	
-/-------------------------------------------------------------------------------------------------------/
-	###SHORT_DESCRIPTION###
-/------------------------------------------------------------------------------------------------------*/

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)));
+		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);
@@ -162,31 +168,33 @@ abstract class ###Component###Helper
 		return false;
 	}
 
-	public static function jsonToString($value, $sperator = ", ")
+	public static function jsonToString($value, $sperator = ", ", $table = null)
 	{
                 // check if string is JSON
                 $result = json_decode($value, true);
-                if (json_last_error() === JSON_ERROR_NONE) {
+                if (json_last_error() === JSON_ERROR_NONE)
+		{
 			// is JSON
 			if (self::checkArray($result))
 			{
-				$value = '';
-				$counter = 0;
-				foreach ($result as $string)
+				if (self::checkString($table))
 				{
-					if ($counter)
+					$names = array();
+					foreach ($result as $val)
 					{
-						$value .= $sperator.$string;
-					}
-					else
+						if ($name = self::getVar($table, $val, 'id', 'name'))
 						{
-						$value .= $string;
+							$names[] = $name;
 						}
-					$counter++;
 					}
-				return $value;
+					if (self::checkArray($names))
+					{
+						return (string) implode($sperator,$names);
 					}	
-                        return json_decode($value);
+				}
+				return (string) implode($sperator,$result);
+			}
+                        return (string) json_decode($value);
                 }
                 return $value;
         }
@@ -478,7 +486,7 @@ abstract class ###Component###Helper
 
 			if (!$asset->check() || !$asset->store())
 			{
-				JError::raiseWarning(500, $asset->getError());
+				JFactory::getApplication()->enqueueMessage($asset->getError(), 'warning');
 				return false;
 			}
 			else

admin/compiler/joomla_3/Helper_email.php

@@ -1,13 +1,25 @@
 <?php
-/**
-*
-*  @version		2.0.0 - September 03, 2014
-*  @package		Component Builder
-*  @author		Llewellyn van de Merwe <http://www.vdm.io>
-*  @copyright		Copyright (C) 2014. All Rights Reserved
-*  @license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-*
-**/
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@package		Component Builder
+	@subpackage		componentbuilder.php
+	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>
+	@my wife		Roline van der Merwe <http://www.vdm.io/>	
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	
+	Builds Complex Joomla Components
+                                                             
+/-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
@@ -222,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
@@ -256,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

@@ -35,30 +35,33 @@ defined('_JEXEC') or die('Restricted access');
 abstract class ###Component###Helper
 {###SITE_GLOBAL_EVENT_HELPER### ###SITE_CUSTOM_HELPER_SCRIPT###
 	
-	public static function jsonToString($value)
+	public static function jsonToString($value, $sperator = ", ", $table = null)
 	{
                 // check if string is JSON
                 $result = json_decode($value, true);
-		if (json_last_error() === JSON_ERROR_NONE) {
+                if (json_last_error() === JSON_ERROR_NONE)
+		{
 			// is JSON
 			if (self::checkArray($result))
 			{
-					$value = '';
-					$counter = 0;
-					foreach ($result as $string)
+				if (self::checkString($table))
 				{
-						if ($counter)
+					$names = array();
+					foreach ($result as $val)
 					{
-							$value .= ", ".$string;
-						}
-						else
+						if ($name = self::getVar($table, $val, 'id', 'name'))
 						{
-							$value .= $string;
-						}
-						$counter++;
+							$names[] = $name;
 						}
 					}
-			return json_decode($value);
+					if (self::checkArray($names))
+					{
+						return (string) implode($sperator,$names);
+					}	
+				}
+				return (string) implode($sperator,$result);
+			}
+                        return (string) json_decode($value);
                 }
                 return $value;
         }
@@ -168,7 +171,7 @@ abstract class ###Component###Helper
 
 			if (!$asset->check() || !$asset->store())
 			{
-				JError::raiseWarning(500, $asset->getError());
+				JFactory::getApplication()->enqueueMessage($asset->getError(), 'warning');
 				return false;
 			}
 			else
@@ -273,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);

admin/compiler/joomla_3/JControllerLegacyAjax.php

@@ -63,9 +63,9 @@ class ###Component###ControllerAjax extends JControllerLegacy
 		}
                 else
                 {
-			if(array_key_exists('callback',$_GET))
+			if($callback = $jinput->get('callback', null, 'CMD'))
                         {
-				echo $_GET['callback']."(".json_encode(false).");";
+				echo $callback."(".json_encode(false).");";
 			}
                         else
                         {

admin/compiler/joomla_3/JControllerLegacyAjaxSite.php

@@ -63,9 +63,9 @@ class ###Component###ControllerAjax extends JControllerLegacy
 		}
                 else
                 {
-			if(array_key_exists('callback',$_GET))
+			if($callback = $jinput->get('callback', null, 'CMD'))
                         {
-				echo $_GET['callback']."(".json_encode(false).");";
+				echo $callback."(".json_encode(false).");";
 			}
                         else
                         {

admin/compiler/joomla_3/JModelItem_custom_admin.php

@@ -97,9 +97,10 @@ class ###Component###Model###SView### extends JModelItem
                 // check if this user has permission to access item
                 if (!$this->user->authorise('###sview###.access', 'com_###component###'))
                 {
-			JError::raiseWarning(500, JText::_('Not authorised!'));
+			$app = JFactory::getApplication();
+			$app->enqueueMessage(JText::_('Not authorised!'), 'error');
 			// redirect away if not a correct (TODO for now we go to default view)
-			JFactory::getApplication()->redirect('index.php?option=com_###component###');
+			$app->redirect('index.php?option=com_###component###');
 			return false;
                 }
 		$this->userId		= $this->user->get('id');
@@ -126,7 +127,7 @@ class ###Component###Model###SView### extends JModelItem
 				if ($e->getCode() == 404)
 				{
 					// Need to go thru the error handler to allow Redirect to work.
-					JError::raiseError(404, $e->getMessage());
+					JError::raiseWaring(404, $e->getMessage());
 				}
 				else
 				{

admin/compiler/joomla_3/JModelItem_site.php

@@ -99,9 +99,10 @@ class ###Component###Model###SView### extends JModelItem
                 // check if this user has permission to access item
                 if (!$this->user->authorise('site.###sview###.access', 'com_###component###'))
                 {
-			JError::raiseWarning(500, JText::_('Not authorised!'));
+			$app = JFactory::getApplication();
+			$app->enqueueMessage(JText::_('Not authorised!'), 'error');
 			// redirect away if not a correct (TODO for now we go to default view)
-			JFactory::getApplication()->redirect(JRoute::_('index.php?option=com_###component###&view=###SITE_DEFAULT_VIEW###'));
+			$app->redirect(JRoute::_('index.php?option=com_###component###&view=###SITE_DEFAULT_VIEW###'));
 			return false;
                 }
 		$this->userId		= $this->user->get('id');
@@ -128,7 +129,7 @@ class ###Component###Model###SView### extends JModelItem
 				if ($e->getCode() == 404)
 				{
 					// Need to go thru the error handler to allow Redirect to work.
-					JError::raiseError(404, $e->getMessage());
+					JError::raiseWaring(404, $e->getMessage());
 				}
 				else
 				{

admin/compiler/joomla_3/JModelLegacy_import.php

@@ -201,7 +201,8 @@ class ###Component###ModelImport extends JModelLegacy
 	protected function _getPackageFromUpload()
 	{		
 		// Get the uploaded file information
-		$input    = JFactory::getApplication()->input;
+		$app	= JFactory::getApplication();
+		$input	= $app->input;
 
 		// Do not change the filter type 'raw'. We need this to let files containing PHP code to upload. See JInputFiles::get.
 		$userfile = $input->files->get('import_package', null, 'raw');
@@ -209,21 +210,21 @@ class ###Component###ModelImport extends JModelLegacy
 		// Make sure that file uploads are enabled in php
 		if (!(bool) ini_get('file_uploads'))
 		{
-			JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_WARNIMPORTFILE'));
+			$app->enqueueMessage(JText::_('COM_###COMPONENT###_IMPORT_MSG_WARNIMPORTFILE'), 'warning');
 			return false;
 		}
 
 		// If there is no uploaded file, we have a problem...
 		if (!is_array($userfile))
 		{
-			JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_NO_FILE_SELECTED'));
+			$app->enqueueMessage(JText::_('COM_###COMPONENT###_IMPORT_MSG_NO_FILE_SELECTED'), 'warning');
 			return false;
 		}
 
 		// Check if there was a problem uploading the file.
 		if ($userfile['error'] || $userfile['size'] < 1)
 		{
-			JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_WARNIMPORTUPLOADERROR'));
+			$app->enqueueMessage(JText::_('COM_###COMPONENT###_IMPORT_MSG_WARNIMPORTUPLOADERROR'), 'warning');
 			return false;
 		}
 
@@ -261,7 +262,8 @@ class ###Component###ModelImport extends JModelLegacy
 	 */
 	protected function _getPackageFromFolder()
 	{
-		$input = JFactory::getApplication()->input;
+		$app	= JFactory::getApplication();
+		$input	= $app->input;
 
 		// Get the path to the package to import
 		$p_dir = $input->getString('import_directory');
@@ -269,7 +271,7 @@ class ###Component###ModelImport extends JModelLegacy
 		// Did you give us a valid path?
 		if (!file_exists($p_dir))
 		{
-			JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_PLEASE_ENTER_A_PACKAGE_DIRECTORY'));
+			$app->enqueueMessage(JText::_('COM_###COMPONENT###_IMPORT_MSG_PLEASE_ENTER_A_PACKAGE_DIRECTORY'), 'warning');
 			return false;
 		}
 
@@ -279,7 +281,7 @@ class ###Component###ModelImport extends JModelLegacy
 		// Did you give us a valid package?
 		if (!$type)
 		{
-			JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_PATH_DOES_NOT_HAVE_A_VALID_PACKAGE'));
+			$app->enqueueMessage(JText::_('COM_###COMPONENT###_IMPORT_MSG_PATH_DOES_NOT_HAVE_A_VALID_PACKAGE'), 'warning');
 		}
 		
 		// check the extention
@@ -290,7 +292,7 @@ class ###Component###ModelImport extends JModelLegacy
 			break;
 			
 			default:
-			JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE'));
+			$app->enqueueMessage(JText::_('COM_###COMPONENT###_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE'), 'warning');
 			return false;
 			break;
 		}
@@ -310,7 +312,8 @@ class ###Component###ModelImport extends JModelLegacy
 	 */
 	protected function _getPackageFromUrl()
 	{
-		$input = JFactory::getApplication()->input;
+		$app	= JFactory::getApplication();
+		$input	= $app->input;
 		
 		// Get the URL of the package to import
 		$url = $input->getString('import_url');
@@ -318,7 +321,7 @@ class ###Component###ModelImport extends JModelLegacy
 		// Did you give us a URL?
 		if (!$url)
 		{
-			JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_ENTER_A_URL'));
+			$app->enqueueMessage(JText::_('COM_###COMPONENT###_IMPORT_MSG_ENTER_A_URL'), 'warning');
 			return false;
 		}
 
@@ -328,7 +331,7 @@ class ###Component###ModelImport extends JModelLegacy
 		// Was the package downloaded?
 		if (!$p_file)
 		{
-			JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_INVALID_URL'));
+			$app->enqueueMessage(JText::_('COM_###COMPONENT###_IMPORT_MSG_INVALID_URL'), 'warning');
 			return false;
 		}
 
@@ -349,6 +352,7 @@ class ###Component###ModelImport extends JModelLegacy
 	 */
 	protected function check($archivename)
 	{
+		$app	= JFactory::getApplication();
 		// Clean the name
 		$archivename = JPath::clean($archivename);
 		
@@ -362,7 +366,7 @@ class ###Component###ModelImport extends JModelLegacy
 			default:
 			// Cleanup the import files
 			$this->remove($archivename);
-			JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE'));
+			$app->enqueueMessage(JText::_('COM_###COMPONENT###_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE'), 'warning');
 			return false;
 			break;
 		}	

admin/compiler/joomla_3/JModelLegacy_import_custom.php

@@ -91,7 +91,8 @@ class ###Component###Model###View### extends JModelLegacy
 	protected function _getPackageFromUpload()
 	{		
 		// Get the uploaded file information
-		$input    = JFactory::getApplication()->input;
+		$app	= JFactory::getApplication();
+		$input	= $app->input;
 
 		// Do not change the filter type 'raw'. We need this to let files containing PHP code to upload. See JInputFiles::get.
 		$userfile = $input->files->get('import_package', null, 'raw');
@@ -99,21 +100,21 @@ class ###Component###Model###View### extends JModelLegacy
 		// Make sure that file uploads are enabled in php
 		if (!(bool) ini_get('file_uploads'))
 		{
-			JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_WARNIMPORTFILE'));
+			$app->enqueueMessage(JText::_('COM_###COMPONENT###_IMPORT_MSG_WARNIMPORTFILE'), 'warning');
 			return false;
 		}
 
 		// If there is no uploaded file, we have a problem...
 		if (!is_array($userfile))
 		{
-			JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_NO_FILE_SELECTED'));
+			$app->enqueueMessage(JText::_('COM_###COMPONENT###_IMPORT_MSG_NO_FILE_SELECTED'), 'warning');
 			return false;
 		}
 
 		// Check if there was a problem uploading the file.
 		if ($userfile['error'] || $userfile['size'] < 1)
 		{
-			JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_WARNIMPORTUPLOADERROR'));
+			$app->enqueueMessage(JText::_('COM_###COMPONENT###_IMPORT_MSG_WARNIMPORTUPLOADERROR'), 'warning');
 			return false;
 		}
 
@@ -151,7 +152,8 @@ class ###Component###Model###View### extends JModelLegacy
 	 */
 	protected function _getPackageFromFolder()
 	{
-		$input = JFactory::getApplication()->input;
+		$app	= JFactory::getApplication();
+		$input	= $app->input;
 
 		// Get the path to the package to import
 		$p_dir = $input->getString('import_directory');
@@ -159,7 +161,7 @@ class ###Component###Model###View### extends JModelLegacy
 		// Did you give us a valid path?
 		if (!file_exists($p_dir))
 		{
-			JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_PLEASE_ENTER_A_PACKAGE_DIRECTORY'));
+			$app->enqueueMessage(JText::_('COM_###COMPONENT###_IMPORT_MSG_PLEASE_ENTER_A_PACKAGE_DIRECTORY'), 'warning');
 			return false;
 		}
 
@@ -169,7 +171,7 @@ class ###Component###Model###View### extends JModelLegacy
 		// Did you give us a valid package?
 		if (!$type)
 		{
-			JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_PATH_DOES_NOT_HAVE_A_VALID_PACKAGE'));
+			$app->enqueueMessage(JText::_('COM_###COMPONENT###_IMPORT_MSG_PATH_DOES_NOT_HAVE_A_VALID_PACKAGE'), 'warning');
 		}
 		
 		// check the extention
@@ -180,7 +182,7 @@ class ###Component###Model###View### extends JModelLegacy
 			break;
 			
 			default:
-			JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE'));
+			$app->enqueueMessage(JText::_('COM_###COMPONENT###_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE'), 'warning');
 			return false;
 			break;
 		}
@@ -200,7 +202,8 @@ class ###Component###Model###View### extends JModelLegacy
 	 */
 	protected function _getPackageFromUrl()
 	{
-		$input = JFactory::getApplication()->input;
+		$app	= JFactory::getApplication();
+		$input	= $app->input;
 
 		// Get the URL of the package to import
 		$url = $input->getString('import_url');
@@ -208,7 +211,7 @@ class ###Component###Model###View### extends JModelLegacy
 		// Did you give us a URL?
 		if (!$url)
 		{
-			JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_ENTER_A_URL'));
+			$app->enqueueMessage(JText::_('COM_###COMPONENT###_IMPORT_MSG_ENTER_A_URL'), 'warning');
 			return false;
 		}
 
@@ -218,7 +221,7 @@ class ###Component###Model###View### extends JModelLegacy
 		// Was the package downloaded?
 		if (!$p_file)
 		{
-			JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_INVALID_URL'));
+			$app->enqueueMessage(JText::_('COM_###COMPONENT###_IMPORT_MSG_INVALID_URL'), 'warning');
 			return false;
 		}
 
@@ -239,6 +242,7 @@ class ###Component###Model###View### extends JModelLegacy
 	 */
 	protected function check($archivename)
 	{
+		$app	= JFactory::getApplication();
 		// Clean the name
 		$archivename = JPath::clean($archivename);
 		
@@ -252,7 +256,7 @@ class ###Component###Model###View### extends JModelLegacy
 			default:
 			// Cleanup the import files
 			$this->remove($archivename);
-			JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE'));
+			$app->enqueueMessage(JText::_('COM_###COMPONENT###_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE'), 'warning');
 			return false;
 			break;
 		}	

admin/compiler/joomla_3/JModelList_custom_admin.php

@@ -81,9 +81,10 @@ class ###Component###Model###SViews### extends JModelList
                 // check if this user has permission to access items
                 if (!$user->authorise('###sviews###.access', 'com_###component###'))
                 {
-			JError::raiseWarning(500, JText::_('Not authorised!'));
+			$app = JFactory::getApplication();
+			$app->enqueueMessage(JText::_('Not authorised!'), 'error');
 			// redirect away if not a correct (TODO for now we go to default view)
-			JFactory::getApplication()->redirect('index.php?option=com_###component###');
+			$app->redirect('index.php?option=com_###component###');
 			return false;
                 }###LICENSE_LOCKED_CHECK### ###CUSTOM_ADMIN_BEFORE_GET_ITEMS###
 		// load parent items

admin/compiler/joomla_3/JModelList_site.php

@@ -81,9 +81,10 @@ class ###Component###Model###SViews### extends JModelList
                 // check if this user has permission to access items
                 if (!$user->authorise('site.###sview###.access', 'com_###component###'))
                 {
-			JError::raiseWarning(500, JText::_('Not authorised!'));
+			$app = JFactory::getApplication();
+			$app->enqueueMessage(JText::_('Not authorised!'), 'error');
 			// redirect away if not a correct (TODO for now we go to default view)
-			JFactory::getApplication()->redirect(JRoute::_('index.php?option=com_###component###&view=###SITE_DEFAULT_VIEW###'));
+			$app->redirect(JRoute::_('index.php?option=com_###component###&view=###SITE_DEFAULT_VIEW###'));
 			return false;
                 }###LICENSE_LOCKED_CHECK### ###SITE_BEFORE_GET_ITEMS###
 		// load parent items

admin/compiler/joomla_3/JViewLegacy_import_custom.php

@@ -36,59 +36,7 @@ jimport('joomla.application.component.view');
  * ###Component### ###View### View
  */
 class ###Component###View###View### extends JViewLegacy
-{
-	protected $headerList;
-	protected $hasPackage = false;
-	protected $headers;
-	protected $hasHeader = 0;
-	protected $dataType;
-
-	public function display($tpl = null)
-	{
-		if ($this->getLayout() !== 'modal')
-		{
-			// Include helper submenu
-			###Component###Helper::addSubmenu('import');
-		}
-
-		// Check for errors.
-		if (count($errors = $this->get('Errors'))){
-			JError::raiseError(500, implode('<br />', $errors));
-			return false;
-		}
-
-		$paths = new stdClass;
-		$paths->first = '';
-		$state = $this->get('state');
-
-		$this->paths = &$paths;
-		$this->state = &$state;
-                // get global action permissions
-		$this->canDo = ###Component###Helper::getActions('import');
-
-		// We don't need toolbar in the modal window.
-		if ($this->getLayout() !== 'modal')
-		{
-			$this->addToolbar();
-			$this->sidebar = JHtmlSidebar::render();
-		}
-
-		// get the session object
-		$session = JFactory::getSession();
-		// check if it has package
-		$this->hasPackage 	= $session->get('hasPackage', false);
-		$this->dataType 	= $session->get('dataType', false);
-		if($this->hasPackage && $this->dataType)
-		{
-			$this->headerList 	= json_decode($session->get($this->dataType.'_VDM_IMPORTHEADERS', false),true);
-			$this->headers 		= ###Component###Helper::getFileHeaders($this->dataType);
-			// clear the data type
-			$session->clear('dataType');
-		}
-
-		// Display the template
-		parent::display($tpl);
-	}
+{###IMPORT_DISPLAY_METHOD_CUSTOM###
 
 	/**
 	 * Setting the toolbar

admin/compiler/joomla_3/ajax.json.php

@@ -55,7 +55,8 @@ class ###Component###ControllerAjax extends JControllerLegacy
 		// Check Token!
 		$token 		= JSession::getFormToken();
 		$call_token	= $jinput->get('token', 0, 'ALNUM');
-		if($user->id != 0 && $token == $call_token){
+		if($user->id != 0 && $token == $call_token)
+		{
 			$task = $this->getTask();
 			switch($task){
 				case 'fieldRequired':
@@ -73,26 +74,37 @@ class ###Component###ControllerAjax extends JControllerLegacy
 						{
 							$result = false;
 						}
-						if(array_key_exists('callback',$_GET)){
-							echo $_GET['callback'] . "(".json_encode($result).");";
-						} else {
+						if($callback = $jinput->get('callback', null, 'CMD'))
+						{
+							echo $callback . "(".json_encode($result).");";
+						}
+						else
+						{
 							echo "(".json_encode($result).");";
 						}
 					}
 					catch(Exception $e)
 					{
-						if(array_key_exists('callback',$_GET)){
-							echo $_GET['callback']."(".json_encode($e).");";
-						} else {
+						if($callback = $jinput->get('callback', null, 'CMD'))
+						{
+							echo $callback."(".json_encode($e).");";
+						}
+						else
+						{
 							echo "(".json_encode($e).");";
 						}
 					}
 				break;
 			}
-		} else {
-			if(array_key_exists('callback',$_GET)){
-				echo $_GET['callback']."(".json_encode(false).");";
-			} else {
+		}
+		else
+		{
+			if($callback = $jinput->get('callback', null, 'CMD'))
+			{
+				echo $callback."(".json_encode(false).");";
+			}
+			else
+			{
 				echo "(".json_encode(false).");";
 			}
 		}

admin/compiler/joomla_3/component_admin.php

@@ -32,7 +32,7 @@ defined('_JEXEC') or die('Restricted access');
 // Access check.
 if (!JFactory::getUser()->authorise('core.manage', 'com_###component###'))
 {
-	return JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR'));
+	return JError::raiseWaring(404, JText::_('JERROR_ALERTNOAUTHOR'));
 };
 
 // Load cms libraries

admin/compiler/joomla_3/default_custom_admin.php

@@ -35,20 +35,9 @@ JHtml::_('behavior.formvalidation');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 ?>
-<?php if ($this->canDo->get('###sview###.access')): ?>
-<script type="text/javascript">
-	Joomla.submitbutton = function(task) {
-		if (task == '###sview###.back') {
-                        parent.history.back();
-			return false;
-                } else {
-			var form = document.getElementById('adminForm');
-			form.task.value = task;
-			form.submit();
-		}
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_costbenefitprojection&view=###sview###&id='.$this->item->id); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<?php if ($this->canDo->get('###sview###.access')): ?>###CUSTOM_ADMIN_SUBMITBUTTON_SCRIPT###
+<?php $urlId = (isset($this->item->id)) ? '&id='. (int) $this->item->id : ''; ?>
+<form action="<?php echo JRoute::_('index.php?option=com_###component###&view=###sview###'.$urlId); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
         <input type="hidden" name="task" value="" />
         <?php echo JHtml::_('form.token'); ?>
 </form>###CUSTOM_ADMIN_BODY###

admin/compiler/joomla_3/default_import.php

@@ -32,6 +32,7 @@ defined('_JEXEC') or die('Restricted access');###LICENSE_LOCKED_DEFINED###
 JHtml::_('jquery.framework');
 JHtml::_('bootstrap.tooltip');
 JHtml::_('script', 'system/core.js', false, true);
+JHtml::_('behavior.keepalive');
 ?>
 <script type="text/javascript">
 <?php if ($this->hasPackage && ###Component###Helper::checkArray($this->headerList)) : ?>

admin/compiler/joomla_3/default_import_custom.php

@@ -32,4 +32,5 @@ defined('_JEXEC') or die('Restricted access');###LICENSE_LOCKED_DEFINED###
 JHtml::_('jquery.framework');
 JHtml::_('bootstrap.tooltip');
 JHtml::_('script', 'system/core.js', false, true);
+JHtml::_('behavior.keepalive');
 ?>###IMPORT_DEFAULT_VIEW_CUSTOM###

admin/compiler/joomla_3/default_list_custom_admin.php

@@ -35,19 +35,7 @@ JHtml::_('behavior.formvalidation');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 ?>
-<?php if ($this->canDo->get('###sview###.access')): ?>
-<script type="text/javascript">
-	Joomla.submitbutton = function(task) {
-		if (task == '###sview###.back') {
-                        parent.history.back();
-			return false;
-                } else {
-			var form = document.getElementById('adminForm');
-			form.task.value = task;
-			form.submit();
-		}
-	}
-</script>
+<?php if ($this->canDo->get('###sview###.access')): ?>###CUSTOM_ADMIN_SUBMITBUTTON_SCRIPT###
 <form action="<?php echo JRoute::_('index.php?option=com_###component###&view=###sviews###'); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
         <input type="hidden" name="task" value="" />###HIDDEN_INPUT_VALUES###
         <?php echo JHtml::_('form.token'); ?>

admin/compiler/joomla_3/default_main.php

@@ -30,7 +30,7 @@ defined('_JEXEC') or die('Restricted access');
 defined('_JEXEC') or die('Restricted access');
 
 ?>
-<?php if(is_array($this->icons['main'])) :?>
+<?php if(isset($this->icons['main']) && is_array($this->icons['main'])) :?>
 	<?php foreach($this->icons['main'] as $icon): ?>
 		<div class="dashboard-wraper">
 			<div class="dashboard-content"> 
@@ -41,5 +41,7 @@ defined('_JEXEC') or die('Restricted access');
 			 </div>
 		</div>
 	<?php endforeach; ?>
-<div class="clearfix"></div>
+	<div class="clearfix"></div>
+<?php else: ?>
+	<div class="alert alert-error"><h4 class="alert-heading"><?php echo JText::_("Permission denied, or not correctly set"); ?></h4><div class="alert-message"><?php echo JText::_("Please notify your System Administrator if result is unexpected."); ?></div></div>
 <?php endif; ?>

admin/compiler/joomla_3/edit.php

@@ -36,7 +36,8 @@ JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 $componentParams = JComponentHelper::getParams('com_###component###');
 ?>
-
+###EDITBODYFADEIN###
 <form action="<?php echo JRoute::_('index.php?option=com_###component###&layout=edit&id='.(int) $this->item->id.$this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 ###EDITBODY###
-</form>###EDITBODYSCRIPT###
+</form>
+</div>###EDITBODYSCRIPT###

admin/compiler/joomla_3/install.mysql.utf8.sql

@@ -1 +1,6 @@
 ###INSTALL###
+
+--
+-- Always insure this column is large enough for all the access control values.
+--
+ALTER TABLE `#__assets` CHANGE `rules` `rules` MEDIUMTEXT NOT NULL COMMENT 'JSON encoded access control.';

admin/componentbuilder.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php
@@ -30,7 +30,7 @@ defined('_JEXEC') or die('Restricted access');
 // Access check.
 if (!JFactory::getUser()->authorise('core.manage', 'com_componentbuilder'))
 {
-	return JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR'));
+	return JError::raiseWaring(404, JText::_('JERROR_ALERTNOAUTHOR'));
 };
 
 // Load cms libraries

admin/controller.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		controller.php

admin/controllers/admin_view.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_view.php

admin/controllers/admin_views.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_views.php

admin/controllers/ajax.json.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		ajax.json.php
@@ -81,9 +81,9 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						{
 							$result = false;
 						}
-						if(array_key_exists('callback',$_GET))
+						if($callback = $jinput->get('callback', null, 'CMD'))
 						{
-							echo $_GET['callback'] . "(".json_encode($result).");";
+							echo $callback . "(".json_encode($result).");";
 						}
 						elseif($returnRaw)
 						{
@@ -96,9 +96,9 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 					}
 					catch(Exception $e)
 					{
-						if(array_key_exists('callback',$_GET))
+						if($callback = $jinput->get('callback', null, 'CMD'))
 						{
-							echo $_GET['callback']."(".json_encode($e).");";
+							echo $callback."(".json_encode($e).");";
 						}
 						else
 						{
@@ -119,9 +119,9 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						{
 							$result = false;
 						}
-						if(array_key_exists('callback',$_GET))
+						if($callback = $jinput->get('callback', null, 'CMD'))
 						{
-							echo $_GET['callback'] . "(".json_encode($result).");";
+							echo $callback . "(".json_encode($result).");";
 						}
 						elseif($returnRaw)
 						{
@@ -134,9 +134,9 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 					}
 					catch(Exception $e)
 					{
-						if(array_key_exists('callback',$_GET))
+						if($callback = $jinput->get('callback', null, 'CMD'))
 						{
-							echo $_GET['callback']."(".json_encode($e).");";
+							echo $callback."(".json_encode($e).");";
 						}
 						else
 						{
@@ -157,9 +157,9 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						{
 							$result = false;
 						}
-						if(array_key_exists('callback',$_GET))
+						if($callback = $jinput->get('callback', null, 'CMD'))
 						{
-							echo $_GET['callback'] . "(".json_encode($result).");";
+							echo $callback . "(".json_encode($result).");";
 						}
 						elseif($returnRaw)
 						{
@@ -172,9 +172,9 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 					}
 					catch(Exception $e)
 					{
-						if(array_key_exists('callback',$_GET))
+						if($callback = $jinput->get('callback', null, 'CMD'))
 						{
-							echo $_GET['callback']."(".json_encode($e).");";
+							echo $callback."(".json_encode($e).");";
 						}
 						else
 						{
@@ -195,9 +195,9 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						{
 							$result = false;
 						}
-						if(array_key_exists('callback',$_GET))
+						if($callback = $jinput->get('callback', null, 'CMD'))
 						{
-							echo $_GET['callback'] . "(".json_encode($result).");";
+							echo $callback . "(".json_encode($result).");";
 						}
 						elseif($returnRaw)
 						{
@@ -210,9 +210,9 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 					}
 					catch(Exception $e)
 					{
-						if(array_key_exists('callback',$_GET))
+						if($callback = $jinput->get('callback', null, 'CMD'))
 						{
-							echo $_GET['callback']."(".json_encode($e).");";
+							echo $callback."(".json_encode($e).");";
 						}
 						else
 						{
@@ -233,9 +233,9 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						{
 							$result = false;
 						}
-						if(array_key_exists('callback',$_GET))
+						if($callback = $jinput->get('callback', null, 'CMD'))
 						{
-							echo $_GET['callback'] . "(".json_encode($result).");";
+							echo $callback . "(".json_encode($result).");";
 						}
 						elseif($returnRaw)
 						{
@@ -248,9 +248,9 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 					}
 					catch(Exception $e)
 					{
-						if(array_key_exists('callback',$_GET))
+						if($callback = $jinput->get('callback', null, 'CMD'))
 						{
-							echo $_GET['callback']."(".json_encode($e).");";
+							echo $callback."(".json_encode($e).");";
 						}
 						else
 						{
@@ -271,9 +271,9 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						{
 							$result = false;
 						}
-						if(array_key_exists('callback',$_GET))
+						if($callback = $jinput->get('callback', null, 'CMD'))
 						{
-							echo $_GET['callback'] . "(".json_encode($result).");";
+							echo $callback . "(".json_encode($result).");";
 						}
 						elseif($returnRaw)
 						{
@@ -286,9 +286,9 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 					}
 					catch(Exception $e)
 					{
-						if(array_key_exists('callback',$_GET))
+						if($callback = $jinput->get('callback', null, 'CMD'))
 						{
-							echo $_GET['callback']."(".json_encode($e).");";
+							echo $callback."(".json_encode($e).");";
 						}
 						else
 						{
@@ -310,9 +310,9 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						{
 							$result = false;
 						}
-						if(array_key_exists('callback',$_GET))
+						if($callback = $jinput->get('callback', null, 'CMD'))
 						{
-							echo $_GET['callback'] . "(".json_encode($result).");";
+							echo $callback . "(".json_encode($result).");";
 						}
 						elseif($returnRaw)
 						{
@@ -325,9 +325,9 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 					}
 					catch(Exception $e)
 					{
-						if(array_key_exists('callback',$_GET))
+						if($callback = $jinput->get('callback', null, 'CMD'))
 						{
-							echo $_GET['callback']."(".json_encode($e).");";
+							echo $callback."(".json_encode($e).");";
 						}
 						else
 						{
@@ -348,9 +348,9 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						{
 							$result = false;
 						}
-						if(array_key_exists('callback',$_GET))
+						if($callback = $jinput->get('callback', null, 'CMD'))
 						{
-							echo $_GET['callback'] . "(".json_encode($result).");";
+							echo $callback . "(".json_encode($result).");";
 						}
 						elseif($returnRaw)
 						{
@@ -363,9 +363,9 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 					}
 					catch(Exception $e)
 					{
-						if(array_key_exists('callback',$_GET))
+						if($callback = $jinput->get('callback', null, 'CMD'))
 						{
-							echo $_GET['callback']."(".json_encode($e).");";
+							echo $callback."(".json_encode($e).");";
 						}
 						else
 						{
@@ -388,9 +388,9 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						{
 							$result = false;
 						}
-						if(array_key_exists('callback',$_GET))
+						if($callback = $jinput->get('callback', null, 'CMD'))
 						{
-							echo $_GET['callback'] . "(".json_encode($result).");";
+							echo $callback . "(".json_encode($result).");";
 						}
 						elseif($returnRaw)
 						{
@@ -403,9 +403,9 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 					}
 					catch(Exception $e)
 					{
-						if(array_key_exists('callback',$_GET))
+						if($callback = $jinput->get('callback', null, 'CMD'))
 						{
-							echo $_GET['callback']."(".json_encode($e).");";
+							echo $callback."(".json_encode($e).");";
 						}
 						else
 						{
@@ -428,9 +428,9 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						{
 							$result = false;
 						}
-						if(array_key_exists('callback',$_GET))
+						if($callback = $jinput->get('callback', null, 'CMD'))
 						{
-							echo $_GET['callback'] . "(".json_encode($result).");";
+							echo $callback . "(".json_encode($result).");";
 						}
 						elseif($returnRaw)
 						{
@@ -443,9 +443,9 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 					}
 					catch(Exception $e)
 					{
-						if(array_key_exists('callback',$_GET))
+						if($callback = $jinput->get('callback', null, 'CMD'))
 						{
-							echo $_GET['callback']."(".json_encode($e).");";
+							echo $callback."(".json_encode($e).");";
 						}
 						else
 						{
@@ -466,9 +466,9 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						{
 							$result = false;
 						}
-						if(array_key_exists('callback',$_GET))
+						if($callback = $jinput->get('callback', null, 'CMD'))
 						{
-							echo $_GET['callback'] . "(".json_encode($result).");";
+							echo $callback . "(".json_encode($result).");";
 						}
 						elseif($returnRaw)
 						{
@@ -481,9 +481,9 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 					}
 					catch(Exception $e)
 					{
-						if(array_key_exists('callback',$_GET))
+						if($callback = $jinput->get('callback', null, 'CMD'))
 						{
-							echo $_GET['callback']."(".json_encode($e).");";
+							echo $callback."(".json_encode($e).");";
 						}
 						else
 						{
@@ -495,9 +495,9 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 		}
                 else
                 {
-			if(array_key_exists('callback',$_GET))
+			if($callback = $jinput->get('callback', null, 'CMD'))
                         {
-				echo $_GET['callback']."(".json_encode(false).");";
+				echo $callback."(".json_encode(false).");";
 			}
                         else
                         {

admin/controllers/compiler.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		compiler.php

admin/controllers/component.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		component.php

admin/controllers/componentbuilder.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php

admin/controllers/components.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		components.php

admin/controllers/custom_admin_view.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 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.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 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.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_get.php

admin/controllers/dynamic_gets.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_gets.php

admin/controllers/field.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		field.php

admin/controllers/fields.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields.php

admin/controllers/fieldtype.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtype.php

admin/controllers/fieldtypes.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtypes.php

admin/controllers/help.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help.php

admin/controllers/help_document.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help_document.php

admin/controllers/help_documents.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help_documents.php

admin/controllers/import.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		import.php

admin/controllers/layout.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		layout.php

admin/controllers/layouts.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		layouts.php

admin/controllers/site_view.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_view.php

admin/controllers/site_views.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_views.php

admin/controllers/snippet.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippet.php

admin/controllers/snippets.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippets.php

admin/controllers/template.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		template.php

admin/controllers/templates.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		templates.php

admin/custom/PHPExcel/Reader/ChunkReadFilter.php

@@ -0,0 +1,49 @@
+<?php
+
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
+                                                             
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
+	/**
+	 * @ignore
+	 */
+	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+class PHPExcel_Reader_chunkReadFilter implements PHPExcel_Reader_IReadFilter
+{
+	private $_startRow	= 0;
+	private $_endRow	= 0;
+
+	/**  Set the list of rows that we want to read  */
+	public function setRows($startRow, $chunkSize)
+	{
+		$this->_startRow	= $startRow;
+		$this->_endRow		= $startRow + $chunkSize;
+	}
+
+	public function readCell($column, $row, $worksheetName = '')
+	{
+		//  Only read the heading row, and the rows that are configured in $this->_startRow and $this->_endRow
+		if (($row == 1) || ($row >= $this->_startRow && $row < $this->_endRow)) {
+			return true;
+		}
+		return false;
+	}
+}

admin/helpers/PHPExcel/Reader/ChunkReadFilter.php

@@ -0,0 +1,49 @@
+<?php
+
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
+                                                             
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
+	/**
+	 * @ignore
+	 */
+	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+class PHPExcel_Reader_chunkReadFilter implements PHPExcel_Reader_IReadFilter
+{
+	private $_startRow	= 0;
+	private $_endRow	= 0;
+
+	/**  Set the list of rows that we want to read  */
+	public function setRows($startRow, $chunkSize)
+	{
+		$this->_startRow	= $startRow;
+		$this->_endRow		= $startRow + $chunkSize;
+	}
+
+	public function readCell($column, $row, $worksheetName = '')
+	{
+		//  Only read the heading row, and the rows that are configured in $this->_startRow and $this->_endRow
+		if (($row == 1) || ($row >= $this->_startRow && $row < $this->_endRow)) {
+			return true;
+		}
+		return false;
+	}
+}

admin/helpers/compiler/a_Get.php

@@ -976,6 +976,15 @@ class Get
 									$view->conditions[$nr]['match_name']	= ComponentbuilderHelper::safeString($name);
 									$view->conditions[$nr]['match_type']	= ComponentbuilderHelper::safeString($type);
 									$view->conditions[$nr]['match_xml']		= $fieldValue['settings']->xml;
+									// if custom field load field being extended
+									if (!ComponentbuilderHelper::typeField($type))
+									{
+										$view->conditions[$nr]['match_extends'] = ComponentbuilderHelper::getBetween($fieldValue['settings']->xml,'extends="','"');
+									}
+									else
+									{
+										$view->conditions[$nr]['match_extends'] = '';
+									}
 									break;
 								}
 							}
@@ -1002,82 +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)
-			{
-				$this->customScriptBuilder['css_view'][$name_single] .= base64_decode($view->css_view);
-				unset($view->css_view);
-			}
-			// add_css_views
-			if ($view->add_css_views == 1)
-			{
-				$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)
 				{
@@ -1089,7 +1068,7 @@ class Get
 			// set custom import scripts
 			if (isset($view->add_custom_import) && $view->add_custom_import == 1)
 			{
-				$addImportArray = array('php_import','php_import_setdata','php_import_save','html_import_view');
+				$addImportArray = array('php_import_display','php_import','php_import_setdata','php_import_save','html_import_view');
 				foreach ($addImportArray as $importScripter)
 				{
 					if (isset($view->$importScripter) && strlen($view->$importScripter) > 0)
@@ -1101,7 +1080,7 @@ class Get
 			}
 			
 			// add_Ajax for this view
-			if ($view->add_php_ajax == 1)
+			if (isset($view->add_php_ajax) && $view->add_php_ajax == 1)
 			{
 				$addAjaxSite = false;
 				if (isset($this->siteEditView[$id]) && $this->siteEditView[$id])
@@ -1128,16 +1107,20 @@ class Get
 							$this->customScriptBuilder['admin']['ajax_controller'][$name_single][$nr][$option] = $value;
 						}
 					}
+					$this->addAjax = true;
+					unset($view->ajax_input);
+				}
+				if (ComponentbuilderHelper::checkString($view->php_ajaxmethod))
+				{
 					if ($addAjaxSite)
 					{
 						$this->customScriptBuilder['site']['ajax_model'][$name_single] = $this->setCustomContentLang(base64_decode($view->php_ajaxmethod));
 					}
 					$this->customScriptBuilder['admin']['ajax_model'][$name_single] = $this->setCustomContentLang(base64_decode($view->php_ajaxmethod));
-					$this->addAjax = true;
-					unset($view->ajax_input);
-				}
 					// unset anyway
 					unset($view->php_ajaxmethod);
+					$this->addAjax = true;
+				}
 			}
 			// add_sql
 			if ($view->add_sql == 1)
@@ -1303,10 +1286,15 @@ class Get
 						$this->customScriptBuilder[$this->target]['ajax_controller'][$view->code][$nr][$option] = $value;
 					}
 				}
-				$this->customScriptBuilder[$this->target]['ajax_model'][$view->code] = $this->setCustomContentLang(base64_decode($view->php_ajaxmethod));
 				$this->addSiteAjax = true;
 				unset($view->ajax_input);
 			}
+			if (ComponentbuilderHelper::checkString($view->php_ajaxmethod))
+			{
+				
+				$this->customScriptBuilder[$this->target]['ajax_model'][$view->code] = $this->setCustomContentLang(base64_decode($view->php_ajaxmethod));
+				$this->addSiteAjax = true;
+			}
 			// unset anyway
 			unset($view->php_ajaxmethod);
 		}
@@ -1368,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();
 
@@ -1408,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));
@@ -1488,6 +1478,11 @@ class Get
 				}
 				$this->_fieldData[$id] = $field;
 			}
+			else
+			{
+				return false;
+			}
+		}
 		// return the found field data
 		return $this->_fieldData[$id];
 	}

admin/helpers/compiler/c_Fields.php

@@ -307,6 +307,34 @@ class Fields extends Structure
 	 */
 	public $setGroupControl = array();
 	
+	/**
+	 * Set Field Names
+	 * 
+	 * @var    array
+	 */
+	public $fieldsNames = array();
+	
+	/**
+	 * Default Fields
+	 * 
+	 * @var    array
+	 */
+	public $defaultFields = array('created', 'created_by', 'modified', 'modified_by', 'published', 'ordering', 'access', 'version', 'hits', 'id');
+	
+	/**
+	 * Default Fields set to publishing
+	 * 
+	 * @var    array
+	 */
+	public $newPublishingFields = array();
+	
+	/**
+	 * Default Fields set to publishing
+	 * 
+	 * @var    array
+	 */
+	public $movedPublishingFields = array();
+
 	/**
 	 * set the Field set of a view
 	 * 
@@ -338,7 +366,7 @@ class Fields extends Structure
 			$readOnly = "";
 			if ($view['settings']->type == 2)
 			{
-				$readOnly = "\n\t\t\t" . 'readonly="true"' . "\n\t\t\t" . 'disabled="true"';
+				$readOnly = "\t\t\t" . 'readonly="true"' . "\n\t\t\t" . 'disabled="true"';
 			}
 			// main lang prefix
 			$langView = $this->langPrefix . '_' . ComponentbuilderHelper::safeString($view['settings']->name_single, 'U');
@@ -370,129 +398,22 @@ class Fields extends Structure
 			$this->langContent[$this->lang][$langViews . '_BATCH_TIP'] = "All changes will be applied to all selected " . $view['settings']->name_list;
 			// set some basic defaults
 			$this->langContent[$this->lang][$langView . '_ERROR_UNIQUE_ALIAS'] = "Another " . $view['settings']->name_single . " has the same alias.";
-			$this->langContent[$this->lang][$langView . '_CREATED_DATE_LABEL'] = "Created date";
-			$this->langContent[$this->lang][$langView . '_CREATED_DATE_DESC'] = "The date " . $view['settings']->name_single . " was created.";
-			$this->langContent[$this->lang][$langView . '_CREATED_BY_LABEL'] = "Created by";
-			$this->langContent[$this->lang][$langView . '_CREATED_BY_DESC'] = "The user that created the " . $view['settings']->name_single . ".";
+			$this->langContent[$this->lang][$langView . '_CREATED_DATE_LABEL'] = "Created Date";
+			$this->langContent[$this->lang][$langView . '_CREATED_DATE_DESC'] = "The date this " . $view['settings']->name_single . " was created.";
+			$this->langContent[$this->lang][$langView . '_MODIFIED_DATE_LABEL'] = "Modified Date";
+			$this->langContent[$this->lang][$langView . '_MODIFIED_DATE_DESC'] = "The date this " . $view['settings']->name_single . " was modified.";
+			$this->langContent[$this->lang][$langView . '_CREATED_BY_LABEL'] = "Created By";
+			$this->langContent[$this->lang][$langView . '_CREATED_BY_DESC'] = "The user that created this " . $view['settings']->name_single . ".";
+			$this->langContent[$this->lang][$langView . '_MODIFIED_BY_LABEL'] = "Modified By";
+			$this->langContent[$this->lang][$langView . '_MODIFIED_BY_DESC'] = "The last user that modified this " . $view['settings']->name_single . ".";
 			$this->langContent[$this->lang][$langView . '_ORDERING_LABEL'] = "Ordering";
 			$this->langContent[$this->lang][$langView . '_VERSION_LABEL'] = "Revision";
 			$this->langContent[$this->lang][$langView . '_VERSION_DESC'] = "A count of the number of times this " . $view['settings']->name_single . " has been revised.";
 			$this->langContent[$this->lang][$langView . '_SAVE_WARNING'] = "Alias already existed so a number was added at the end. You can re-edit the " . $view['settings']->name_single . " to customise the alias.";
-			// set the defautl fields
-			$fieldSet = '<fieldset name="details">';
-			$fieldSet .= "\n\t\t<!--" . $this->setLine(__LINE__) . " Default Fields. -->";
-			$fieldSet .= "\n\t\t<!--" . $this->setLine(__LINE__) . " Id Field. Type: Text (joomla) -->";
-			$fieldSet .= "\n\t\t<field";
-			$fieldSet .= "\n\t\t\tname=" . '"id"';
-			$fieldSet .= "\n\t\t\t" . 'type="text" class="readonly" label="JGLOBAL_FIELD_ID_LABEL"';
-			$fieldSet .= "\n\t\t\t" . 'description ="JGLOBAL_FIELD_ID_DESC" size="10" default="0"';
-			$fieldSet .= "\n\t\t\t" . 'readonly="true"';
-			$fieldSet .= "\n\t\t/>";
-			$fieldSet .= "\n\t\t<!--" . $this->setLine(__LINE__) . " Date Created Field. Type: Calendar (joomla) -->";
-			$fieldSet .= "\n\t\t<field";
-			$fieldSet .= "\n\t\t\tname=" . '"created"';
-			$fieldSet .= "\n\t\t\ttype=" . '"calendar"';
-			$fieldSet .= "\n\t\t\tlabel=" . '"' . $langView . '_CREATED_DATE_LABEL"';
-			$fieldSet .= "\n\t\t\tdescription=" . '"' . $langView . '_CREATED_DATE_DESC"';
-			$fieldSet .= "\n\t\t\tsize=" . '"22"';
-			$fieldSet .= $readOnly;
-			$fieldSet .= "\n\t\t\tformat=" . '"%Y-%m-%d %H:%M:%S"';
-			$fieldSet .= "\n\t\t\tfilter=" . '"user_utc"';
-			$fieldSet .= "\n\t\t/>";
-			$fieldSet .= "\n\t\t<!--" . $this->setLine(__LINE__) . " User Created Field. Type: User (joomla) -->";
-			$fieldSet .= "\n\t\t<field";
-			$fieldSet .= "\n\t\t\tname=" . '"created_by"';
-			$fieldSet .= "\n\t\t\ttype=" . '"user"';
-			$fieldSet .= "\n\t\t\tlabel=" . '"' . $langView . '_CREATED_BY_LABEL"';
-			$fieldSet .= $readOnly;
-			$fieldSet .= "\n\t\t\tdescription=" . '"' . $langView . '_CREATED_BY_DESC"';
-			$fieldSet .= "\n\t\t/>";
-			$fieldSet .= "\n\t\t<!--" . $this->setLine(__LINE__) . " Published Field. Type: List (joomla) -->";
-			$fieldSet .= "\n\t\t<field name=" . '"published" type="list" label="JSTATUS"';
-			$fieldSet .= "\n\t\t\tdescription=" . '"JFIELD_PUBLISHED_DESC" class="chzn-color-state"';
-			$fieldSet .= $readOnly;
-			$fieldSet .= "\n\t\t\tfilter=" . '"intval" size="1" default="1" >';
 			
-			$fieldSet .= "\n\t\t\t<option value=" . '"1">';
-			$fieldSet .= "\n\t\t\t\tJPUBLISHED</option>";
-			$fieldSet .= "\n\t\t\t<option value=" . '"0">';
-			$fieldSet .= "\n\t\t\t\tJUNPUBLISHED</option>";
-			$fieldSet .= "\n\t\t\t<option value=" . '"2">';
-			$fieldSet .= "\n\t\t\t\tJARCHIVED</option>";
-			$fieldSet .= "\n\t\t\t<option value=" . '"-2">';
-			$fieldSet .= "\n\t\t\t\tJTRASHED</option>";
-			$fieldSet .= "\n\t\t</field>";
-			$fieldSet .= "\n\t\t<!--" . $this->setLine(__LINE__) . " Date Modified Field. Type: Calendar (joomla) -->";
-			$fieldSet .= "\n\t\t" . '<field name="modified" type="calendar" class="readonly"';
-			$fieldSet .= "\n\t\t\t" . 'label="JGLOBAL_FIELD_MODIFIED_LABEL" description="COM_CONTENT_FIELD_MODIFIED_DESC"';
-			$fieldSet .= "\n\t\t\t" . 'size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />';
-			$fieldSet .= "\n\t\t<!--" . $this->setLine(__LINE__) . " User Modified Field. Type: User (joomla) -->";
-			$fieldSet .= "\n\t\t" . '<field name="modified_by" type="user"';
-			$fieldSet .= "\n\t\t\t" . 'label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"';
-			$fieldSet .= "\n\t\t\t" . 'class="readonly"';
-			$fieldSet .= "\n\t\t\t" . 'readonly="true"';
-			$fieldSet .= "\n\t\t\t" . 'filter="unset"';
-			$fieldSet .= "\n\t\t/>";
-			// check if view has access
-			if (isset($this->accessBuilder[$viewName]) && ComponentbuilderHelper::checkString($this->accessBuilder[$viewName]))
-			{
-				$fieldSet .= "\n\t\t<!--" . $this->setLine(__LINE__) . " Access Field. Type: Accesslevel (joomla) -->";
-				$fieldSet .= "\n\t\t" . '<field name="access"';
-				$fieldSet .= "\n\t\t\t" . 'type="accesslevel"';
-				$fieldSet .= "\n\t\t\t" . 'label="JFIELD_ACCESS_LABEL"';
-				$fieldSet .= "\n\t\t\t" . 'description="JFIELD_ACCESS_DESC"';
-				$fieldSet .= "\n\t\t\t" . 'default="1"';
-				$fieldSet .= $readOnly;
-				$fieldSet .= "\n\t\t\t" . 'required="false"';
-				$fieldSet .= "\n\t\t/>";
-			}
-			$fieldSet .= "\n\t\t<!--" . $this->setLine(__LINE__) . " Ordering Field. Type: Numbers (joomla) -->";
-			$fieldSet .= "\n\t\t<field";
-			$fieldSet .= "\n\t\t\t" . 'name="ordering"';
-			$fieldSet .= "\n\t\t\t" . 'type="number"';
-			$fieldSet .= "\n\t\t\t" . 'class="inputbox validate-ordering"';
-			$fieldSet .= "\n\t\t\t" . 'label="' . $langView . '_ORDERING_LABEL' . '"';
-			$fieldSet .= "\n\t\t\t" . 'description=""';
-			$fieldSet .= "\n\t\t\t" . 'default="0"';
-			$fieldSet .= "\n\t\t\t" . 'size="6"';
-			$fieldSet .= $readOnly;
-			$fieldSet .= "\n\t\t\t" . 'required="false"';
-			$fieldSet .= "\n\t\t/>";
-			$fieldSet .= "\n\t\t<!--" . $this->setLine(__LINE__) . " Version Field. Type: Text (joomla) -->";
-			$fieldSet .= "\n\t\t<field";
-			$fieldSet .= "\n\t\t\t" . 'name="version"';
-			$fieldSet .= "\n\t\t\t" . 'type="text"';
-			$fieldSet .= "\n\t\t\t" . 'class="readonly"';
-			$fieldSet .= "\n\t\t\t" . 'label="' . $langView . '_VERSION_LABEL"';
-			$fieldSet .= "\n\t\t\t" . 'description="' . $langView . '_VERSION_DESC"';
-			$fieldSet .= "\n\t\t\t" . 'size="6"';
-			$fieldSet .= "\n\t\t\t" . 'readonly="true"';
-			$fieldSet .= "\n\t\t\t" . 'filter="unset"';
-			$fieldSet .= "\n\t\t/>";
-			// check if metadata is added to this view
-			if (isset($this->metadataBuilder[$viewName]) && ComponentbuilderHelper::checkString($this->metadataBuilder[$viewName]))
-			{
-				$fieldSet .= "\n\t\t<!--" . $this->setLine(__LINE__) . " Metakey Field. Type: Textarea (joomla) -->";
-				$fieldSet .= "\n\t\t<field";
-				$fieldSet .= "\n\t\t\t" . 'name="metakey"';
-				$fieldSet .= "\n\t\t\t" . 'type="textarea"';
-				$fieldSet .= "\n\t\t\t" . 'label="JFIELD_META_KEYWORDS_LABEL"';
-				$fieldSet .= "\n\t\t\t" . 'description="JFIELD_META_KEYWORDS_DESC"';
-				$fieldSet .= "\n\t\t\t" . 'rows="3"';
-				$fieldSet .= "\n\t\t\t" . 'cols="30"';
-				$fieldSet .= "\n\t\t/>";
-				$fieldSet .= "\n\t\t<!--" . $this->setLine(__LINE__) . " Metadesc Field. Type: Textarea (joomla) -->";
-				$fieldSet .= "\n\t\t<field";
-				$fieldSet .= "\n\t\t\t" . 'name="metadesc"';
-				$fieldSet .= "\n\t\t\t" . 'type="textarea"';
-				$fieldSet .= "\n\t\t\t" . 'label="JFIELD_META_DESCRIPTION_LABEL"';
-				$fieldSet .= "\n\t\t\t" . 'description="JFIELD_META_DESCRIPTION_DESC"';
-				$fieldSet .= "\n\t\t\t" . 'rows="3"';
-				$fieldSet .= "\n\t\t\t" . 'cols="30"';
-				$fieldSet .= "\n\t\t/>";
-			}
-			$fieldSet .= "\n\t\t<!--" . $this->setLine(__LINE__) . " Dynamic Fields. -->";
 			// start adding dynamc fields
+			$dynamcfields = '';
+			// place holders
 			$placeholders = array(
 			    '###component###' => $component,
 			    '###view###' => $viewName,
@@ -503,48 +424,218 @@ class Fields extends Structure
 			// TODO we should add the global and local view switch if field for front end
 			foreach ($view['settings']->fields as $field)
 			{
-				$fieldSet .= $this->setDynamicField($field, $view, $view['settings']->type, $langView, $viewName, $listViewName, $spacerCounter, $placeholders, $dbkey, true);
+				$dynamcfields .= $this->setDynamicField($field, $view, $view['settings']->type, $langView, $viewName, $listViewName, $spacerCounter, $placeholders, $dbkey, true);
 			}
 			
-			$fieldSet .= "\n\t</fieldset>";
+			// set the defautl fields
+			$fieldSet = array();
+			$fieldSet[] = '<fieldset name="details">';
+			$fieldSet[] = "\t\t<!--" . $this->setLine(__LINE__) . " Default Fields. -->";
+			$fieldSet[] = "\t\t<!--" . $this->setLine(__LINE__) . " Id Field. Type: Text (joomla) -->";
+			// if id is not set
+			if (!isset($this->fieldsNames[$viewName]['id']))
+			{
+				$fieldSet[] = "\t\t<field";
+				$fieldSet[] = "\t\t\tname=" . '"id"';
+				$fieldSet[] = "\t\t\t" . 'type="text" class="readonly" label="JGLOBAL_FIELD_ID_LABEL"';
+				$fieldSet[] = "\t\t\t" . 'description ="JGLOBAL_FIELD_ID_DESC" size="10" default="0"';
+				$fieldSet[] = "\t\t\t" . 'readonly="true"';
+				$fieldSet[] = "\t\t/>";
+			}
+			// if created is not set
+			if (!isset($this->fieldsNames[$viewName]['created']))
+			{
+				$fieldSet[] = "\t\t<!--" . $this->setLine(__LINE__) . " Date Created Field. Type: Calendar (joomla) -->";
+				$fieldSet[] = "\t\t<field";
+				$fieldSet[] = "\t\t\tname=" . '"created"';
+				$fieldSet[] = "\t\t\ttype=" . '"calendar"';
+				$fieldSet[] = "\t\t\tlabel=" . '"' . $langView . '_CREATED_DATE_LABEL"';
+				$fieldSet[] = "\t\t\tdescription=" . '"' . $langView . '_CREATED_DATE_DESC"';
+				$fieldSet[] = "\t\t\tsize=" . '"22"';
+				$fieldSet[] = $readOnly;
+				$fieldSet[] = "\t\t\tformat=" . '"%Y-%m-%d %H:%M:%S"';
+				$fieldSet[] = "\t\t\tfilter=" . '"user_utc"';
+				$fieldSet[] = "\t\t/>";
+			}
+			// if created_by is not set
+			if (!isset($this->fieldsNames[$viewName]['created_by']))
+			{
+				$fieldSet[] = "\t\t<!--" . $this->setLine(__LINE__) . " User Created Field. Type: User (joomla) -->";
+				$fieldSet[] = "\t\t<field";
+				$fieldSet[] = "\t\t\tname=" . '"created_by"';
+				$fieldSet[] = "\t\t\ttype=" . '"user"';
+				$fieldSet[] = "\t\t\tlabel=" . '"' . $langView . '_CREATED_BY_LABEL"';
+				$fieldSet[] = $readOnly;
+				$fieldSet[] = "\t\t\tdescription=" . '"' . $langView . '_CREATED_BY_DESC"';
+				$fieldSet[] = "\t\t/>";
+			}
+			// if published is not set
+			if (!isset($this->fieldsNames[$viewName]['published']))
+			{
+				$fieldSet[] = "\t\t<!--" . $this->setLine(__LINE__) . " Published Field. Type: List (joomla) -->";
+				$fieldSet[] = "\t\t<field name=" . '"published" type="list" label="JSTATUS"';
+				$fieldSet[] = "\t\t\tdescription=" . '"JFIELD_PUBLISHED_DESC" class="chzn-color-state"';
+				$fieldSet[] = $readOnly;
+				$fieldSet[] = "\t\t\tfilter=" . '"intval" size="1" default="1" >';
+				$fieldSet[] = "\t\t\t<option value=" . '"1">';
+				$fieldSet[] = "\t\t\t\tJPUBLISHED</option>";
+				$fieldSet[] = "\t\t\t<option value=" . '"0">';
+				$fieldSet[] = "\t\t\t\tJUNPUBLISHED</option>";
+				$fieldSet[] = "\t\t\t<option value=" . '"2">';
+				$fieldSet[] = "\t\t\t\tJARCHIVED</option>";
+				$fieldSet[] = "\t\t\t<option value=" . '"-2">';
+				$fieldSet[] = "\t\t\t\tJTRASHED</option>";
+				$fieldSet[] = "\t\t</field>";
+			}
+			// if modified is not set
+			if (!isset($this->fieldsNames[$viewName]['modified']))
+			{
+				$fieldSet[] = "\t\t<!--" . $this->setLine(__LINE__) . " Date Modified Field. Type: Calendar (joomla) -->";
+				$fieldSet[] = "\t\t" . '<field name="modified" type="calendar" class="readonly"';
+				$fieldSet[] = "\t\t\t" . 'label="' . $langView . '_MODIFIED_DATE_LABEL" description="' . $langView . '_MODIFIED_DATE_DESC"';
+				$fieldSet[] = "\t\t\t" . 'size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />';
+			}
+			// if modified_by is not set
+			if (!isset($this->fieldsNames[$viewName]['modified_by']))
+			{
+				$fieldSet[] = "\t\t<!--" . $this->setLine(__LINE__) . " User Modified Field. Type: User (joomla) -->";
+				$fieldSet[] = "\t\t" . '<field name="modified_by" type="user"';
+				$fieldSet[] = "\t\t\t" . 'label="' . $langView . '_MODIFIED_BY_LABEL"';
+				$fieldSet[] = "\t\t\tdescription=" . '"' . $langView . '_MODIFIED_BY_DESC"';
+				$fieldSet[] = "\t\t\t" . 'class="readonly"';
+				$fieldSet[] = "\t\t\t" . 'readonly="true"';
+				$fieldSet[] = "\t\t\t" . 'filter="unset"';
+				$fieldSet[] = "\t\t/>";
+			}
+			// check if view has access
+			if (isset($this->accessBuilder[$viewName]) && ComponentbuilderHelper::checkString($this->accessBuilder[$viewName]) && !isset($this->fieldsNames[$viewName]['access']))
+			{
+				$fieldSet[] = "\t\t<!--" . $this->setLine(__LINE__) . " Access Field. Type: Accesslevel (joomla) -->";
+				$fieldSet[] = "\t\t" . '<field name="access"';
+				$fieldSet[] = "\t\t\t" . 'type="accesslevel"';
+				$fieldSet[] = "\t\t\t" . 'label="JFIELD_ACCESS_LABEL"';
+				$fieldSet[] = "\t\t\t" . 'description="JFIELD_ACCESS_DESC"';
+				$fieldSet[] = "\t\t\t" . 'default="1"';
+				$fieldSet[] = $readOnly;
+				$fieldSet[] = "\t\t\t" . 'required="false"';
+				$fieldSet[] = "\t\t/>";
+			}
+			// if ordering is not set
+			if (!isset($this->fieldsNames[$viewName]['ordering']))
+			{
+				$fieldSet[] = "\t\t<!--" . $this->setLine(__LINE__) . " Ordering Field. Type: Numbers (joomla) -->";
+				$fieldSet[] = "\t\t<field";
+				$fieldSet[] = "\t\t\t" . 'name="ordering"';
+				$fieldSet[] = "\t\t\t" . 'type="number"';
+				$fieldSet[] = "\t\t\t" . 'class="inputbox validate-ordering"';
+				$fieldSet[] = "\t\t\t" . 'label="' . $langView . '_ORDERING_LABEL' . '"';
+				$fieldSet[] = "\t\t\t" . 'description=""';
+				$fieldSet[] = "\t\t\t" . 'default="0"';
+				$fieldSet[] = "\t\t\t" . 'size="6"';
+				$fieldSet[] = $readOnly;
+				$fieldSet[] = "\t\t\t" . 'required="false"';
+				$fieldSet[] = "\t\t/>";
+			}
+			// if version is not set
+			if (!isset($this->fieldsNames[$viewName]['version']))
+			{
+				$fieldSet[] = "\t\t<!--" . $this->setLine(__LINE__) . " Version Field. Type: Text (joomla) -->";
+				$fieldSet[] = "\t\t<field";
+				$fieldSet[] = "\t\t\t" . 'name="version"';
+				$fieldSet[] = "\t\t\t" . 'type="text"';
+				$fieldSet[] = "\t\t\t" . 'class="readonly"';
+				$fieldSet[] = "\t\t\t" . 'label="' . $langView . '_VERSION_LABEL"';
+				$fieldSet[] = "\t\t\t" . 'description="' . $langView . '_VERSION_DESC"';
+				$fieldSet[] = "\t\t\t" . 'size="6"';
+				$fieldSet[] = "\t\t\t" . 'readonly="true"';
+				$fieldSet[] = "\t\t\t" . 'filter="unset"';
+				$fieldSet[] = "\t\t/>";
+			}
 			// check if metadata is added to this view
 			if (isset($this->metadataBuilder[$viewName]) && ComponentbuilderHelper::checkString($this->metadataBuilder[$viewName]))
 			{
-				$fieldSet .= "\n\n\t<!--" . $this->setLine(__LINE__) . " Metadata Fields. -->";
-				$fieldSet .= "\n\t<fields" . ' name="metadata" label="JGLOBAL_FIELDSET_METADATA_OPTIONS">';
-				$fieldSet .= "\n\t\t" . '<fieldset name="vdmmetadata"';
-				$fieldSet .= "\n\t\t\t" . 'label="JGLOBAL_FIELDSET_METADATA_OPTIONS">';
-				$fieldSet .= "\n\t\t\t<!--" . $this->setLine(__LINE__) . " Robots Field. Type: List (joomla) -->";
-				$fieldSet .= "\n\t\t\t" . '<field name="robots"';
-				$fieldSet .= "\n\t\t\t\t" . 'type="list"';
-				$fieldSet .= "\n\t\t\t\t" . 'label="JFIELD_METADATA_ROBOTS_LABEL"';
-				$fieldSet .= "\n\t\t\t\t" . 'description="JFIELD_METADATA_ROBOTS_DESC" >';
-				$fieldSet .= "\n\t\t\t\t" . '<option value="">JGLOBAL_USE_GLOBAL</option>';
-				$fieldSet .= "\n\t\t\t\t" . '<option value="index, follow">JGLOBAL_INDEX_FOLLOW</option>';
-				$fieldSet .= "\n\t\t\t\t" . '<option value="noindex, follow">JGLOBAL_NOINDEX_FOLLOW</option>';
-				$fieldSet .= "\n\t\t\t\t" . '<option value="index, nofollow">JGLOBAL_INDEX_NOFOLLOW</option>';
-				$fieldSet .= "\n\t\t\t\t" . '<option value="noindex, nofollow">JGLOBAL_NOINDEX_NOFOLLOW</option>';
-				$fieldSet .= "\n\t\t\t" . '</field>';
-				$fieldSet .= "\n\t\t\t<!--" . $this->setLine(__LINE__) . " Author Field. Type: Text (joomla) -->";
-				$fieldSet .= "\n\t\t\t" . '<field name="author"';
-				$fieldSet .= "\n\t\t\t\t" . 'type="text"';
-				$fieldSet .= "\n\t\t\t\t" . 'label="JAUTHOR" description="JFIELD_METADATA_AUTHOR_DESC"';
-				$fieldSet .= "\n\t\t\t\t" . 'size="20"';
-				$fieldSet .= "\n\t\t\t/>";
-				$fieldSet .= "\n\t\t\t<!--" . $this->setLine(__LINE__) . " Rights Field. Type: Textarea (joomla) -->";
-				$fieldSet .= "\n\t\t\t" . '<field name="rights" type="textarea" label="JFIELD_META_RIGHTS_LABEL"';
-				$fieldSet .= "\n\t\t\t\t" . 'description="JFIELD_META_RIGHTS_DESC" required="false" filter="string"';
-				$fieldSet .= "\n\t\t\t\t" . 'cols="30" rows="2"';
-				$fieldSet .= "\n\t\t\t/>";
-				$fieldSet .= "\n\t\t</fieldset>";
-				$fieldSet .= "\n\t</fields>";
+				// metakey
+				$fieldSet[] = "\t\t<!--" . $this->setLine(__LINE__) . " Metakey Field. Type: Textarea (joomla) -->";
+				$fieldSet[] = "\t\t<field";
+				$fieldSet[] = "\t\t\t" . 'name="metakey"';
+				$fieldSet[] = "\t\t\t" . 'type="textarea"';
+				$fieldSet[] = "\t\t\t" . 'label="JFIELD_META_KEYWORDS_LABEL"';
+				$fieldSet[] = "\t\t\t" . 'description="JFIELD_META_KEYWORDS_DESC"';
+				$fieldSet[] = "\t\t\t" . 'rows="3"';
+				$fieldSet[] = "\t\t\t" . 'cols="30"';
+				$fieldSet[] = "\t\t/>";
+				// metadesc
+				$fieldSet[] = "\t\t<!--" . $this->setLine(__LINE__) . " Metadesc Field. Type: Textarea (joomla) -->";
+				$fieldSet[] = "\t\t<field";
+				$fieldSet[] = "\t\t\t" . 'name="metadesc"';
+				$fieldSet[] = "\t\t\t" . 'type="textarea"';
+				$fieldSet[] = "\t\t\t" . 'label="JFIELD_META_DESCRIPTION_LABEL"';
+				$fieldSet[] = "\t\t\t" . 'description="JFIELD_META_DESCRIPTION_DESC"';
+				$fieldSet[] = "\t\t\t" . 'rows="3"';
+				$fieldSet[] = "\t\t\t" . 'cols="30"';
+				$fieldSet[] = "\t\t/>";
+			}
+			// load the dynamic fields now
+			if (ComponentbuilderHelper::checkString($dynamcfields))
+			{
+				$fieldSet[] = "\t\t<!--" . $this->setLine(__LINE__) . " Dynamic Fields. -->" . $dynamcfields;
+			}
+			// close fieldset
+			$fieldSet[] = "\t</fieldset>";
+			// check if metadata is added to this view
+			if (isset($this->metadataBuilder[$viewName]) && ComponentbuilderHelper::checkString($this->metadataBuilder[$viewName]))
+			{
+				$fieldSet[] = "\n\t<!--" . $this->setLine(__LINE__) . " Metadata Fields. -->";
+				$fieldSet[] = "\t<fields" . ' name="metadata" label="JGLOBAL_FIELDSET_METADATA_OPTIONS">';
+				$fieldSet[] = "\t\t" . '<fieldset name="vdmmetadata"';
+				$fieldSet[] = "\t\t\t" . 'label="JGLOBAL_FIELDSET_METADATA_OPTIONS">';
+				// robots
+				$fieldSet[] = "\t\t\t<!--" . $this->setLine(__LINE__) . " Robots Field. Type: List (joomla) -->";
+				$fieldSet[] = "\t\t\t" . '<field name="robots"';
+				$fieldSet[] = "\t\t\t\t" . 'type="list"';
+				$fieldSet[] = "\t\t\t\t" . 'label="JFIELD_METADATA_ROBOTS_LABEL"';
+				$fieldSet[] = "\t\t\t\t" . 'description="JFIELD_METADATA_ROBOTS_DESC" >';
+				$fieldSet[] = "\t\t\t\t" . '<option value="">JGLOBAL_USE_GLOBAL</option>';
+				$fieldSet[] = "\t\t\t\t" . '<option value="index, follow">JGLOBAL_INDEX_FOLLOW</option>';
+				$fieldSet[] = "\t\t\t\t" . '<option value="noindex, follow">JGLOBAL_NOINDEX_FOLLOW</option>';
+				$fieldSet[] = "\t\t\t\t" . '<option value="index, nofollow">JGLOBAL_INDEX_NOFOLLOW</option>';
+				$fieldSet[] = "\t\t\t\t" . '<option value="noindex, nofollow">JGLOBAL_NOINDEX_NOFOLLOW</option>';
+				$fieldSet[] = "\t\t\t" . '</field>';
+				// author
+				$fieldSet[] = "\t\t\t<!--" . $this->setLine(__LINE__) . " Author Field. Type: Text (joomla) -->";
+				$fieldSet[] = "\t\t\t" . '<field name="author"';
+				$fieldSet[] = "\t\t\t\t" . 'type="text"';
+				$fieldSet[] = "\t\t\t\t" . 'label="JAUTHOR" description="JFIELD_METADATA_AUTHOR_DESC"';
+				$fieldSet[] = "\t\t\t\t" . 'size="20"';
+				$fieldSet[] = "\t\t\t/>";
+				// rights
+				$fieldSet[] = "\t\t\t<!--" . $this->setLine(__LINE__) . " Rights Field. Type: Textarea (joomla) -->";
+				$fieldSet[] = "\t\t\t" . '<field name="rights" type="textarea" label="JFIELD_META_RIGHTS_LABEL"';
+				$fieldSet[] = "\t\t\t\t" . 'description="JFIELD_META_RIGHTS_DESC" required="false" filter="string"';
+				$fieldSet[] = "\t\t\t\t" . 'cols="30" rows="2"';
+				$fieldSet[] = "\t\t\t/>";
+				$fieldSet[] = "\t\t</fieldset>";
+				$fieldSet[] = "\t</fields>";
 			}
 			// retunr the set
-			return $fieldSet;
+			return implode("\n", $fieldSet);
 		}
 		return '';
 	}
 		
+	/**
+	 * set Field Names
+	 * 
+	 * @param   string   $view    View the field belongs to
+	 * @param   string    $name    The name of the field
+	 *
+	 * 
+	 */
+	public function setFieldsNames(&$view, &$name)
+	{
+		$this->fieldsNames[$view][$name] = $name;
+	}
+
 	/**
 	 * set Dynamic field
 	 * 
@@ -563,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);
@@ -575,6 +668,9 @@ class Fields extends Structure
 			// check if values were set
 			if (ComponentbuilderHelper::checkArray($fieldAttributes))
 			{
+				// set the array of field names
+				$this->setFieldsNames($viewName,$fieldAttributes['name']);
+
 				if ($this->defaultField($typeName, 'option'))
 				{
 					//reset options array
@@ -607,6 +703,11 @@ class Fields extends Structure
 						{
 							$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
@@ -651,6 +752,8 @@ class Fields extends Structure
 			}
 			return $fieldSet;
 		}
+		return '';
+	}
 
 	/**
 	 * set a field
@@ -908,7 +1011,7 @@ class Fields extends Structure
 	 */
 	public function setLayoutBuilder(&$viewName,&$tabName,&$name,&$field)
 	{
-		if (ComponentbuilderHelper::checkString($tabName))
+		if (ComponentbuilderHelper::checkString($tabName) && $tabName != 'publishing')
 		{
 			$this->tabCounter[$viewName][(int) $field['tab']] = $tabName;
 			if (isset($this->layoutBuilder[$viewName][$tabName][(int) $field['alignment']][(int) $field['order_edit']]))
@@ -920,6 +1023,27 @@ class Fields extends Structure
 			{
 				$this->layoutBuilder[$viewName][$tabName][(int) $field['alignment']][(int) $field['order_edit']] = $name;
 			}
+			// check if publishing fields were over written
+			if (in_array($name, $this->defaultFields))
+			{
+				// just to eliminate
+				$this->movedPublishingFields[$viewName][$name] = $name;
+			}
+		}
+		elseif ($tabName == 'publishing')
+		{
+			if (!in_array($name, $this->defaultFields))
+			{
+				if (isset($this->newPublishingFields[$viewName][(int) $field['alignment']][(int) $field['order_edit']]))
+				{
+					$size = count($this->newPublishingFields[$viewName][(int) $field['alignment']][(int) $field['order_edit']]) + 1;
+					$this->newPublishingFields[$viewName][(int) $field['alignment']][$size] = $name;
+				}
+				else
+				{
+					$this->newPublishingFields[$viewName][(int) $field['alignment']][(int) $field['order_edit']] = $name;
+				}
+			}
 		}
 		else
 		{
@@ -933,6 +1057,12 @@ class Fields extends Structure
 			{
 				$this->layoutBuilder[$viewName]['Details'][(int) $field['alignment']][(int) $field['order_edit']] = $name;
 			}
+			// check if publishing fields were over written
+			if (in_array($name, $this->defaultFields))
+			{
+				// just to eliminate
+				$this->movedPublishingFields[$viewName][$name] = $name;
+			}
 		}
 	}
 
@@ -1340,6 +1470,7 @@ class Fields extends Structure
 			$this->queryBuilder[$viewName][$name] = array(
 			    'type' => $field['settings']->datatype,
 			    'lenght' => $field['settings']->datalenght,
+			    'lenght_other' => $field['settings']->datalenght_other,
 			    'default' => $field['settings']->datadefault,
 			    'other' => $field['settings']->datadefault_other,
 			    'null_switch' => $field['settings']->null_switch);
@@ -1413,6 +1544,7 @@ class Fields extends Structure
 			    'link' => ($field['link']) ? true : false,
 			    'sort' => ($field['sort']) ? true : false,
 			    'custom' => $custom,
+			    'multiple' => $multiple,
 			    'options' => $options);
 
 			$this->customBuilderList[$listViewName][] = $name;
@@ -1436,7 +1568,7 @@ class Fields extends Structure
 			$this->intFieldsBuilder[$viewName] .= ',"' . $name . '"';
 		}
 		// set all dynamic field of this view
-		if ($typeName != 'category' && $typeName != 'repeatable')
+		if ($typeName != 'category' && $typeName != 'repeatable' && !in_array($name, $this->defaultFields))
 		{
 			if (!isset($this->dynamicfieldsBuilder[$viewName]))
 			{
@@ -1498,7 +1630,7 @@ class Fields extends Structure
 			$this->catCodeBuilder[$viewName] = array('code' => $name, 'views' => $otherViews, 'view' => $otherView);
 		}
 		// setup checkbox for this view
-		if ($typeName == 'checkbox')
+		if ($typeName == 'checkbox' || (ComponentbuilderHelper::checkArray($custom) && isset($custom['extends']) && $custom['extends'] == 'checkboxes'))
 		{
 			$this->checkboxBuilder[$viewName][] = $name;
 		}
@@ -1592,6 +1724,11 @@ class Fields extends Structure
 		{
 			$tabName = $view['settings']->tabs[(int) $field['tab']];
 		}
+		elseif ((int) $field['tab'] == 15)
+		{
+			// set to publishing tab
+			$tabName = 'publishing';
+		}
 		$this->setLayoutBuilder($viewName, $tabName, $name, $field);
 	}
 	

admin/helpers/compiler/e_Interpretation.php

@@ -161,8 +161,9 @@ class Interpretation extends Fields
 	{
 		$statment[] = "\n\t\tif (!\$this->isHonest())";
 		$statment[] = "\t\t{";
-		$statment[] = "\t\t\tJError::raiseWarning(500, JText::_('NIE_REG_NIE'));";
-		$statment[] = "\t\t\tJFactory::getApplication()->redirect('index.php');";
+		$statment[] = "\t\t\t\$app = JFactory::getApplication();";
+		$statment[] = "\t\t\t\$app->enqueueMessage(JText::_('NIE_REG_NIE'), 'error');";
+		$statment[] = "\t\t\t\$app->redirect('index.php');";
 		$statment[] = "\t\t\treturn false;";
 		$statment[] = "\t\t}";
 		// return the genuine mentod statement
@@ -854,18 +855,27 @@ class Interpretation extends Fields
 			$exel[] = "\t*/";
 			$exel[] = "\tpublic static function getFileHeaders(\$dataType)";
 			$exel[] = "\t{\t\t";
-			$exel[] = "\t\t//".$this->setLine(__LINE__)." make sure the file is loaded\t\t";
+			$exel[] = "\t\t//".$this->setLine(__LINE__)." make sure these files are loaded\t\t";
 			$exel[] = "\t\tJLoader::import('PHPExcel', JPATH_COMPONENT_ADMINISTRATOR . '/helpers');";
+			$exel[] = "\t\tJLoader::import('ChunkReadFilter', JPATH_COMPONENT_ADMINISTRATOR . '/helpers/PHPExcel/Reader');";
 			$exel[] = "\t\t//".$this->setLine(__LINE__)." get session object";
-			$exel[] = "\t\t\$session \t= JFactory::getSession();";
+			$exel[] = "\t\t\$session\t= JFactory::getSession();";
 			$exel[] = "\t\t\$package\t= \$session->get('package', null);";
 			$exel[] = "\t\t\$package\t= json_decode(\$package, true);";
 			$exel[] = "\t\t//".$this->setLine(__LINE__)." set the headers";
 			$exel[] = "\t\tif(isset(\$package['dir']))";
 			$exel[] = "\t\t{";
+			$exel[] = "\t\t\t\$chunkFilter = new PHPExcel_Reader_chunkReadFilter();";
+			$exel[] = "\t\t\t//".$this->setLine(__LINE__)." only load first three rows";
+			$exel[] = "\t\t\t\$chunkFilter->setRows(2,1);";
+			$exel[] = "\t\t\t//".$this->setLine(__LINE__)." identify the file type";
 			$exel[] = "\t\t\t\$inputFileType = PHPExcel_IOFactory::identify(\$package['dir']);";
+			$exel[] = "\t\t\t//".$this->setLine(__LINE__)." create the reader for this file type";
 			$exel[] = "\t\t\t\$excelReader = PHPExcel_IOFactory::createReader(\$inputFileType);";
+			$exel[] = "\t\t\t//".$this->setLine(__LINE__)." load the limiting filter";
+			$exel[] = "\t\t\t\$excelReader->setReadFilter(\$chunkFilter);";
 			$exel[] = "\t\t\t\$excelReader->setReadDataOnly(true);";
+			$exel[] = "\t\t\t//".$this->setLine(__LINE__)." load the rows (only first three)";
 			$exel[] = "\t\t\t\$excelObj = \$excelReader->load(\$package['dir']);";
 			$exel[] = "\t\t\t\$headers = array();";
 			$exel[] = "\t\t\tforeach (\$excelObj->getActiveSheet()->getRowIterator() as \$row)";
@@ -1723,20 +1733,21 @@ class Interpretation extends Fields
 			$getItem .= "\n\t".$tab."\t{";
 			if ($type == 'main')
 			{
+				$getItem .= "\n\t".$tab."\t\t\$app = JFactory::getApplication();";
 				$langKeyWord = $this->langPrefix.'_'.ComponentbuilderHelper::safeString('Not found or access denied','U');
 				if (!isset($this->langContent[$this->lang][$langKeyWord]))
 				{
 					$this->langContent[$this->lang][$langKeyWord] = 'Not found, or access denied.';
 				}
 				$getItem .= "\n\t".$tab."\t\t//".$this->setLine(__LINE__)." If no data is found redirect to default page and show warning.";
-				$getItem .= "\n\t".$tab."\t\tJError::raiseWarning(500, JText::_('".$langKeyWord."'));";
+				$getItem .= "\n\t".$tab."\t\t\$app->enqueueMessage(JText::_('".$langKeyWord."'), 'warning');";
 				if ('site' == $this->target)
 				{
-					$getItem .= "\n\t".$tab."\t\tJFactory::getApplication()->redirect('index.php?option=com_".$this->fileContentStatic['###component###']."&view=".$this->fileContentStatic['###SITE_DEFAULT_VIEW###']."');";
+					$getItem .= "\n\t".$tab."\t\t\$app->redirect('index.php?option=com_".$this->fileContentStatic['###component###']."&view=".$this->fileContentStatic['###SITE_DEFAULT_VIEW###']."');";
 				}
 				else
 				{
-					$getItem .= "\n\t".$tab."\t\tJFactory::getApplication()->redirect('index.php?option=com_".$this->fileContentStatic['###component###']."');";
+					$getItem .= "\n\t".$tab."\t\t\$app->redirect('index.php?option=com_".$this->fileContentStatic['###component###']."');";
 				}
 				$getItem .= "\n\t".$tab."\t\treturn false;";
 			}
@@ -2297,7 +2308,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);
@@ -2460,7 +2471,7 @@ class Interpretation extends Fields
 			$method .= "\n\n\t\t//".$this->setLine(__LINE__)." Check for errors.";
 			$method .= "\n\t\tif (count(\$errors = \$this->get('Errors')))";
 			$method .= "\n\t\t{";
-			$method .= "\n\t\t\tJError::raiseWarning(500, ".'implode("\n", $errors));';
+			$method .= "\n\t\t\tJError::raiseError(500, ".'implode("\n", $errors));';
 			$method .= "\n\t\t\treturn false;";
 			$method .= "\n\t\t}";
 			// add custom script
@@ -3080,6 +3091,34 @@ class Interpretation extends Fields
 		return '';
 	}
 
+	public function setCustomViewSubmitButtonScript(&$view)
+	{
+		if (ComponentbuilderHelper::checkString($view['settings']->default))
+		{
+			// add the script only if there is none set
+			if (strpos($view['settings']->default, 'Joomla.submitbutton = function(task)') === false)
+			{
+				$script = array();
+				$script[] = "\n<script type=\"text/javascript\">";
+				$script[] = "\tJoomla.submitbutton = function(task) {";
+				$script[] = "\t\tif (task == '".$view['settings']->code.".back') {";
+				$script[] = "\t\t\tparent.history.back();";
+				$script[] = "\t\t\treturn false;";
+				$script[] = "\t\t} else {";
+				$script[] = "\t\t\tvar form = document.getElementById('adminForm');";
+				$script[] = "\t\t\tform.task.value = task;";
+				$script[] = "\t\t\tform.submit();";
+				$script[] = "\t\t}";
+				$script[] = "\t}";
+				$script[] = "</script>";
+				
+				return implode("\n", $script);
+			}
+			
+		}
+		return '';
+	}
+
 	public function setCustomViewCodeBody(&$view)
 	{
 		if ($view['settings']->add_php_view == 1)
@@ -4379,7 +4418,7 @@ class Interpretation extends Fields
 		{
 			$batchcopy[] = "\n\t\t\tlist(\$this->table->".$title.", \$this->table->".$alias.") = \$this->_generateNewTitle(\$this->table->".$alias.", \$this->table->".$title.");";
 		}
-		elseif (!$category && !$alias && $title && $title != 'user')
+		elseif (!$category && !$alias && $title && $title != 'user' && $title != 'jobnumber') // TODO [jobnumber] just for one project (not ideal)
 		{
 			$batchcopy[] = "\n\t\t\t\$this->table->".$title." = \$this->generateUniqe('".$title."',\$this->table->".$title.");";
 		}
@@ -4618,7 +4657,11 @@ class Interpretation extends Fields
 
 				// setup the tables
 				$db .= "CREATE TABLE IF NOT EXISTS `#__".$component."_".$view."` (";
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['id']))
+				{
 					$db .= "\n\t`id` int(11) NOT NULL AUTO_INCREMENT,";
+				}
 				$db .= "\n\t`asset_id` INT(255) UNSIGNED NOT NULL DEFAULT '0',";
 				ksort($fields);
 				foreach ($fields as $field => $data)
@@ -4647,29 +4690,77 @@ class Interpretation extends Fields
 					}
 					// set the lenght
 					$lenght = '';
-					if (isset($data['lenght']) && $data['lenght'] > 0)
+					if ($data['lenght'] == 'Other' && isset($data['lenght_other']) && $data['lenght_other'] > 0)
+					{
+						$lenght = '('.$data['lenght_other'].')';
+					}
+					elseif (isset($data['lenght']) && $data['lenght'] > 0)
 					{
 						$lenght = '('.$data['lenght'].')';
 					}
 					// set the field to db
 					$db .= "\n\t`".$field."` ".$data['type'].$lenght." ".$default.",";
 				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['params']))
+				{
 					$db .= "\n\t`params` TEXT NOT NULL DEFAULT '',";
+				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['published']))
+				{
 					$db .= "\n\t`published` tinyint(1) NOT NULL DEFAULT '1',";
+				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['created_by']))
+				{
 					$db .= "\n\t`created_by` int(11) NOT NULL DEFAULT '0',";
+				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['modified_by']))
+				{
 					$db .= "\n\t`modified_by` int(11) NOT NULL DEFAULT '0',";
+				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['created']))
+				{
 					$db .= "\n\t`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',";
+				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['modified']))
+				{
 					$db .= "\n\t`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',";
+				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['checked_out']))
+				{
 					$db .= "\n\t`checked_out` int(11) NOT NULL,";
+				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['checked_out_time']))
+				{
 					$db .= "\n\t`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',";
+				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['version']))
+				{
 					$db .= "\n\t`version` int(11) NOT NULL DEFAULT '1',";
+				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['hits']))
+				{
 					$db .= "\n\t`hits` int(11) NOT NULL DEFAULT '0',";
+				}
 				// check if view has access
 				if (isset($this->accessBuilder[$view]) && ComponentbuilderHelper::checkString($this->accessBuilder[$view]))
 				{
 					$db .= "\n\t`access` int(11) DEFAULT NULL,";
 				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['ordering']))
+				{
 					$db .= "\n\t`ordering` int(11) NOT NULL DEFAULT '0',";
+				}
 				// check if metadata is added to this view
 				if (isset($this->metadataBuilder[$view]) && ComponentbuilderHelper::checkString($this->metadataBuilder[$view]))
 				{
@@ -4690,10 +4781,26 @@ class Interpretation extends Fields
 				{
 					$db .= ",\n\tKEY `idx_access` (`access`)";
 				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['checked_out']))
+				{
 					$db .= ",\n\tKEY `idx_checkout` (`checked_out`)";
+				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['created_by']))
+				{
 					$db .= ",\n\tKEY `idx_createdby` (`created_by`)";
+				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['modified_by']))
+				{
 					$db .= ",\n\tKEY `idx_modifiedby` (`modified_by`)";
+				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['published']))
+				{
 					$db .= ",\n\tKEY `idx_state` (`published`)";
+				}
 				if (isset($this->dbKeys[$view]) && ComponentbuilderHelper::checkArray($this->dbKeys[$view]))
 				{
 					foreach ($this->dbKeys[$view] as $nr => $key)
@@ -4998,6 +5105,9 @@ class Interpretation extends Fields
 			$body .= "\n\t\t\$canDo = ".$Helper."::getActions('".$viewName_single."',\$item,'".$viewName_list."');";
 			$body .= "\n\t?>";
 			$body .= "\n\t".'<tr class="row<?php echo $i % 2; ?>">';
+			// only load if not over written
+			if (!isset($this->fieldsNames[$viewName_single]['ordering']))
+			{
 				$body .= "\n\t\t".'<td class="order nowrap center hidden-phone">';
 				// check if the item has permissions.
 				if ($coreLoad && isset($core['core.edit.state']) && isset($this->permissionBuilder['global'][$core['core.edit.state']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.edit.state']]) && in_array($viewName_single,$this->permissionBuilder['global'][$core['core.edit.state']]))
@@ -5029,6 +5139,7 @@ class Interpretation extends Fields
 				$body .= "\n\t\t\t&#8942;";
 				$body .= "\n\t\t<?php endif; ?>";
 				$body .= "\n\t\t</td>";
+			}
 			$body .= "\n\t\t".'<td class="nowrap center">';
 			// check if the item has permissions.
 			if ($coreLoad && isset($core['core.edit']) && isset($this->permissionBuilder['global'][$core['core.edit']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.edit']]) && in_array($viewName_single,$this->permissionBuilder['global'][$core['core.edit']]))
@@ -5065,8 +5176,11 @@ class Interpretation extends Fields
 				if (isset($item['custom']) && ComponentbuilderHelper::checkArray($item['custom']))
 				{
 					$item['id'] = $item['code'];
+					if (!$item['multiple'])
+					{
 						$item['code'] = $item['code'].'_'.$item['custom']['text'];
 					}
+				}
 				// check if translated vlaue is used
 				if (isset($this->selectionTranslationFixBuilder[$viewName_list]) && ComponentbuilderHelper::checkArray($this->selectionTranslationFixBuilder[$viewName_list])
 					&& array_key_exists($item['code'],$this->selectionTranslationFixBuilder[$viewName_list]))
@@ -5112,12 +5226,12 @@ class Interpretation extends Fields
 					elseif ($item['type'] == 'user' && !$item['title'])
 					{
 						// user and linked
-						$body .= "\n\t\t<?php \$itemUser = JFactory::getUser(\$item->user); ?>";
+						$body .= "\n\t\t<?php \$".$item['code']."User = JFactory::getUser(\$item->".$item['code']."); ?>";
 						$body .= "\n\t\t".'<td class="nowrap">';
 						$body .= "\n\t\t\t<?php if (\$this->user->authorise('core.edit', 'com_users')): ?>";
-						$body .= "\n\t\t\t\t".'<a href="index.php?option=com_users&task=user.edit&id=<?php echo (int) $item->user ?>"><?php echo $itemUser->name; ?></a>';
+						$body .= "\n\t\t\t\t".'<a href="index.php?option=com_users&task=user.edit&id=<?php echo (int) $item->'.$item['code'].' ?>"><?php echo $'.$item['code'].'User->name; ?></a>';
 						$body .= "\n\t\t\t<?php else: ?>";
-						$body .= "\n\t\t\t\t<?php echo \$itemUser->name; ?>";
+						$body .= "\n\t\t\t\t<?php echo \$".$item['code']."User->name; ?>";
 						$body .= "\n\t\t\t<?php endif; ?>";
 						$body .= "\n\t\t</td>";
 					}
@@ -5237,6 +5351,14 @@ class Interpretation extends Fields
 						$body .= "\n\t\t\t<?php endif; ?>";
 						$body .= "\n\t\t</td>";
 					}
+					elseif ($item['type'] == 'user')
+					{
+						// user name only
+						$body .= "\n\t\t<?php \$".$item['code']."User = JFactory::getUser(\$item->".$item['code']."); ?>";
+						$body .= "\n\t\t".'<td class="nowrap">';
+						$body .= "\n\t\t\t<?php echo \$".$item['code']."User->name; ?>";
+						$body .= "\n\t\t</td>";
+					}
 					else
 					{
 						// normal not linked
@@ -5247,6 +5369,8 @@ class Interpretation extends Fields
 				}
 			}
 			// add the defaults
+			if (!isset($this->fieldsNames[$viewName_single]['published']))
+			{
 				$body .= "\n\t\t".'<td class="center">';
 				// check if the item has permissions.
 				if ($coreLoad && isset($core['core.edit.state']) && isset($this->permissionBuilder['global'][$core['core.edit.state']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.edit.state']]) && in_array($viewName_single,$this->permissionBuilder['global'][$core['core.edit.state']]))
@@ -5270,9 +5394,13 @@ class Interpretation extends Fields
 				$body .= "\n\t\t\t<?php echo JHtml::_('jgrid.published', \$item->published, \$i, '".$viewName_list.".', false, 'cb'); ?>";
 				$body .= "\n\t\t<?php endif; ?>";
 				$body .= "\n\t\t</td>";
+			}	
+			if (!isset($this->fieldsNames[$viewName_single]['id']))
+			{
 				$body .= "\n\t\t".'<td class="nowrap center hidden-phone">';
 				$body .= "\n\t\t\t<?php echo \$item->id; ?>";
 				$body .= "\n\t\t</td>";
+			}
 			$body .= "\n\t</tr>";
 			$body .= "\n<?php endforeach; ?>";
 			// return the build
@@ -5304,9 +5432,12 @@ class Interpretation extends Fields
 			// set default
 			$head = '<tr>';
 			$head .= "\n\t<?php if (\$this->canEdit&& \$this->canState): ?>";
+			if (!isset($this->fieldsNames[$viewName_single]['ordering']))
+			{
 				$head .= "\n\t\t".'<th width="1%" class="nowrap center hidden-phone">';
 				$head .= "\n\t\t\t<?php echo JHtml::_('grid.sort', '".'<i class="icon-menu-2"></i>'."', 'ordering', \$this->listDirn, \$this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>";
 				$head .= "\n\t\t</th>";
+			}
 			$head .= "\n\t\t".'<th width="20" class="nowrap center">';
 			$head .= "\n\t\t\t<?php echo JHtml::_('grid.checkall'); ?>";
 			$head .= "\n\t\t</th>";
@@ -5343,6 +5474,8 @@ class Interpretation extends Fields
 				$this->listColnrBuilder[$viewName_list]++;
 			}
 			// set default
+			if (!isset($this->fieldsNames[$viewName_single]['published']))
+			{
 				$head .= "\n\t<?php if (\$this->canState): ?>";
 				$head .= "\n\t\t".'<th width="10" class="nowrap center" >';
 				$head .= "\n\t\t\t<?php echo JHtml::_('grid.sort', '".$statusLangName."', 'published', \$this->listDirn, \$this->listOrder); ?>";
@@ -5352,9 +5485,13 @@ class Interpretation extends Fields
 				$head .= "\n\t\t\t<?php echo JText::_('".$statusLangName."'); ?>";
 				$head .= "\n\t\t</th>";
 				$head .= "\n\t<?php endif; ?>";
+			}
+			if (!isset($this->fieldsNames[$viewName_single]['id']))
+			{
 				$head .= "\n\t".'<th width="5" class="nowrap center hidden-phone" >';
 				$head .= "\n\t\t\t<?php echo JHtml::_('grid.sort', '".$idLangName."', 'id', \$this->listDirn, \$this->listOrder); ?>";
 				$head .= "\n\t</th>";
+			}
  			$head .= "\n</tr>";
 
 			return $head;
@@ -5695,14 +5832,23 @@ class Interpretation extends Fields
 			{
 				$this->langContent[$this->lang][$tabLangName] = 'Publishing';
 			}
-			// check if access is added to this view
-			if (isset($this->accessBuilder[$viewName_single]) && ComponentbuilderHelper::checkString($this->accessBuilder[$viewName_single]))
+			// TODO add new publishing fields <-- nice to have, but no time now to do this
+			// $this->newPublishingFields[$viewName_single]
+			// the default publishing items
+			$items = array();
+			foreach ($this->defaultFields as $defaultField)
 			{
-				$addAccess = ",\n\t'access'";
+				if (!isset($this->movedPublishingFields[$viewName_single][$defaultField]))
+				{
+					if ($defaultField != 'access')
+					{
+						$items[] = $defaultField;
 					}
-			else
+					elseif ($defaultField == 'access' && isset($this->accessBuilder[$viewName_single]) && ComponentbuilderHelper::checkString($this->accessBuilder[$viewName_single]))
 					{
-				$addAccess = "";
+						$items[] = $defaultField;
+					}
+				}
 			}
 			// check if metadata is added to this view
 			if (isset($this->metadataBuilder[$viewName_single]) && ComponentbuilderHelper::checkString($this->metadataBuilder[$viewName_single]))
@@ -5711,10 +5857,21 @@ class Interpretation extends Fields
 				$tabCodeNameLeft = 'publishing';
 				$tabCodeNameRight = 'metadata';
 				// the default publishing tiems
-				$items = "'created',\n\t'created_by',\n\t'modified',\n\t'modified_by',\n\t'published',\n\t'ordering'".$addAccess.",\n\t'version',\n\t'hits',\n\t'id'";
+				if (ComponentbuilderHelper::checkArray($items))
+				{
+					// load all items
+					$items_one = "'". implode("',\n\t'", $items)."'";
 					// set the publishing layout
-				$this->setLayout($viewName_single, $tabCodeNameLeft, $items, 'layoutpublished');
+					$this->setLayout($viewName_single, $tabCodeNameLeft, $items_one, 'layoutpublished');
+					$items_one = true;
+				}
+				else
+				{
+					$items_one = false;				
+				}
+				// set the metadata layout
 				$this->setLayout($viewName_single, $tabCodeNameRight, false, 'layoutmetadata');	
+				$items_two = true;
 			}
 			else
 			{
@@ -5722,12 +5879,62 @@ class Interpretation extends Fields
 				$tabCodeNameLeft = 'publishing';
 				$tabCodeNameRight = 'publlshing';
 				// the default publishing tiems
-				$items_one = "'created',\n\t'created_by',\n\t'modified',\n\t'modified_by'";
-				$items_two = "'published',\n\t'ordering'".$addAccess.",\n\t'version',\n\t'hits',\n\t'id'";
+				if (ComponentbuilderHelper::checkArray($items))
+				{
+					
+					$items_one = array('created', 'created_by', 'modified', 'modified_by');
+					$items_two = array('published', 'ordering', 'access', 'version', 'hits', 'id');
+					// check all items
+					foreach ($items_one as $key_one => $item_one)
+					{
+						if (!in_array($item_one, $items))
+						{
+							unset($items_one[$key_one]);
+						}
+					}
+					foreach ($items_two as $key_two => $item_two)
+					{
+						if (!in_array($item_two, $items))
+						{
+							unset($items_two[$key_two]);
+						}
+					}
+					// load all items that remain
+					if (ComponentbuilderHelper::checkArray($items_one))
+					{
+						// load all items
+						$items_one = "'". implode("',\n\t'", $items_one)."'";
 						// set the publishing layout
 						$this->setLayout($viewName_single, $tabCodeNameLeft, $items_one, 'layoutpublished');
-				$this->setLayout($viewName_single, $tabCodeNameRight, $items_two, 'layoutpublished');
+						$items_one = true;
 					}
+					// load all items that remain
+					if (ComponentbuilderHelper::checkArray($items_two))
+					{
+						// load all items
+						$items_two = "'". implode("',\n\t'", $items_two)."'";
+						// set the publishing layout
+						$this->setLayout($viewName_single, $tabCodeNameRight, $items_two, 'layoutpublished');
+						$items_two = true;
+					}
+				}
+				else
+				{
+					$items_one = false;
+					$items_two = false;					
+				}
+			}
+			if ($items_one && $items_two)
+			{
+				$classs = "span6";
+			}
+			elseif ($items_one || $items_two)
+			{
+				$classs = "span12";
+			}
+			// only load this if needed
+			if ($items_one || $items_two)
+			{
 				// check if the item has permissions.
 				$publishingPer = array();
 				$allToBeChekced = array('core.delete','core.edit.created_by','core.edit.state','core.edit.created');
@@ -5748,15 +5955,22 @@ class Interpretation extends Fields
 				// set the default publishing tab
 				$body .= "\n\t<?php echo JHtml::_('bootstrap.addTab', '".$viewName_single."Tab', '".$tabCodeNameLeft."', JText::_('".$tabLangName."', true)); ?>";
 				$body .= "\n\t\t".'<div class="row-fluid form-horizontal-desktop">';
-			$body .= "\n\t\t\t".'<div class="span6">';
+				if ($items_one)
+				{
+					$body .= "\n\t\t\t".'<div class="'.$classs.'">';
 					$body .= "\n\t\t\t\t<?php echo JLayoutHelper::render('".$viewName_single.".".$tabCodeNameLeft."', \$this); ?>";
 					$body .= "\n\t\t\t</div>";
-			$body .= "\n\t\t\t".'<div class="span6">';
+				}
+				if ($items_two)
+				{
+					$body .= "\n\t\t\t".'<div class="'.$classs.'">';
 					$body .= "\n\t\t\t\t<?php echo JLayoutHelper::render('".$viewName_single.".".$tabCodeNameRight."', \$this); ?>";
 					$body .= "\n\t\t\t</div>";
+				}
 				$body .= "\n\t\t</div>";
 				$body .= "\n\t<?php echo JHtml::_('bootstrap.endTab'); ?>";
 				$body .= "\n\t<?php endif; ?>";
+			}
 			// make sure we dont load it to a view with the name component
 			if ($viewName_single != 'component')
 			{
@@ -5820,6 +6034,41 @@ class Interpretation extends Fields
 		return '';
 	}
 	
+	public function setFadeInEfect(&$view)
+	{
+		// check if we should load the fade in affect
+		if ($view['settings']->add_fadein == 1)
+		{
+			// set view name
+			$fadein[] = "<script type=\"text/javascript\">";
+			$fadein[] = "\t// waiting spinner";
+			$fadein[] = "\tvar outerDiv = jQuery('body');";
+			$fadein[] = "\tjQuery('<div id=\"loading\"></div>')";
+			$fadein[] = "\t\t.css(\"background\", \"rgba(255, 255, 255, .8) url('components/com_".$this->fileContentStatic['###component###']."/assets/images/import.gif') 50% 15% no-repeat\")";
+			$fadein[] = "\t\t.css(\"top\", outerDiv.position().top - jQuery(window).scrollTop())";
+			$fadein[] = "\t\t.css(\"left\", outerDiv.position().left - jQuery(window).scrollLeft())";
+			$fadein[] = "\t\t.css(\"width\", outerDiv.width())";
+			$fadein[] = "\t\t.css(\"height\", outerDiv.height())";
+			$fadein[] = "\t\t.css(\"position\", \"fixed\")";
+			$fadein[] = "\t\t.css(\"opacity\", \"0.80\")";
+			$fadein[] = "\t\t.css(\"-ms-filter\", \"progid:DXImageTransform.Microsoft.Alpha(Opacity = 80)\")";
+			$fadein[] = "\t\t.css(\"filter\", \"alpha(opacity = 80)\")";
+			$fadein[] = "\t\t.css(\"display\", \"none\")";
+			$fadein[] = "\t\t.appendTo(outerDiv);";
+			$fadein[] = "\tjQuery('#loading').show();";
+			$fadein[] = "\t// when page is ready remove and show";
+			$fadein[] = "\tjQuery(window).load(function() {";
+			$fadein[] = "\t\tjQuery('#".$this->fileContentStatic['###component###']."_loader').fadeIn('fast');";
+			$fadein[] = "\t\tjQuery('#loading').hide();";
+			$fadein[] = "\t});";
+			$fadein[] = "</script>";
+			$fadein[] = "<div id=\"".$this->fileContentStatic['###component###']."_loader\" style=\"display: none;\">";
+
+			return implode("\n", $fadein);
+		}
+		return "<div id=\"".$this->fileContentStatic['###component###']."_loader\">";
+	}
+
 	/**
 	 * @param $viewName_single
 	 * @param $layoutName
@@ -6019,8 +6268,11 @@ class Interpretation extends Fields
 				if (isset($item['custom']) && ComponentbuilderHelper::checkArray($item['custom']))
 				{
 					$item['id'] = $item['code'];
+					if (!$item['multiple'])
+					{
 						$item['code'] = $item['code'].'_'.$item['custom']['text'];
 					}
+				}
 				// check if translated vlaue is used
 				if (isset($this->selectionTranslationFixBuilder[$viewName_list]) && ComponentbuilderHelper::checkArray($this->selectionTranslationFixBuilder[$viewName_list])
 					&& array_key_exists($item['code'],$this->selectionTranslationFixBuilder[$viewName_list]))
@@ -6067,12 +6319,12 @@ class Interpretation extends Fields
 					elseif ($item['type'] == 'user' && !$item['title'])
 					{
 						// user and linked
-						$body .= "\n\t\t<?php \$itemUser = JFactory::getUser(\$item->user); ?>";
+						$body .= "\n\t\t<?php \$".$item['code']."User = JFactory::getUser(\$item->".$item['code']."); ?>";
 						$body .= "\n\t\t".'<td class="nowrap">';
 						$body .= "\n\t\t\t<?php if (\$user->authorise('core.edit', 'com_users')): ?>";
-						$body .= "\n\t\t\t\t".'<a href="index.php?option=com_users&task=user.edit&id=<?php echo (int) $item->user ?>"><?php echo $itemUser->name; ?></a>';
+						$body .= "\n\t\t\t\t".'<a href="index.php?option=com_users&task=user.edit&id=<?php echo (int) $item->'.$item['code'].' ?>"><?php echo $'.$item['code'].'User->name; ?></a>';
 						$body .= "\n\t\t\t<?php else: ?>";
-						$body .= "\n\t\t\t\t<?php echo \$itemUser->name; ?>";
+						$body .= "\n\t\t\t\t<?php echo \$".$item['code']."User->name; ?>";
 						$body .= "\n\t\t\t<?php endif; ?>";
 						$body .= "\n\t\t</td>";
 					}
@@ -6203,6 +6455,14 @@ class Interpretation extends Fields
 						$body .= "\n\t\t\t<?php endif; ?>";
 						$body .= "\n\t\t</td>";
 					}
+					elseif ($item['type'] == 'user')
+					{
+						// user name only
+						$body .= "\n\t\t<?php \$".$item['code']."User = JFactory::getUser(\$item->".$item['code']."); ?>";
+						$body .= "\n\t\t".'<td class="nowrap">';
+						$body .= "\n\t\t\t<?php echo \$".$item['code']."User->name; ?>";
+						$body .= "\n\t\t</td>";
+					}
 					else
 					{
 						// normal not linked
@@ -6699,6 +6959,8 @@ class Interpretation extends Fields
 			$query .= "\n\t\t//".$this->setLine(__LINE__)." setup the query";
 			$query .= "\n\t\tif (".$this->fileContentStatic['###Component###']."Helper::checkArray(\$pks))";
 			$query .= "\n\t\t{";
+			$query .= "\n\t\t\t//".$this->setLine(__LINE__)." Set a value to know this is exporting method.";
+			$query .= "\n\t\t\t\$_export = true;";
 			$query .= "\n\t\t\t//".$this->setLine(__LINE__)." Get the user object.";
 			$query .= "\n\t\t\t\$user = JFactory::getUser();";
 			$query .= "\n\t\t\t//".$this->setLine(__LINE__)." Create a new query object.";
@@ -6907,6 +7169,12 @@ class Interpretation extends Fields
 		$target = array('admin' => 'import_'.$viewName_list);
 		$this->buildDynamique($target,'customimport');
 		// load the custom script to the files
+		if (isset($this->customScriptBuilder['php_import_display']['import_'.$viewName_list]))
+		{
+			// ###IMPORT_DISPLAY_METHOD_CUSTOM### <<<DYNAMIC>>>
+			$this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_DISPLAY_METHOD_CUSTOM###'] = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_import_display']['import_'.$viewName_list]);
+			unset($this->customScriptBuilder['php_import_display']['import_'.$viewName_list]);
+		}
 		if (isset($this->customScriptBuilder['php_import_setdata']['import_'.$viewName_list]))
 		{
 			// ###IMPORT_SETDATE_METHOD_CUSTOM### <<<DYNAMIC>>>
@@ -7175,7 +7443,12 @@ class Interpretation extends Fields
 		}
 		$addButton[] = "\t\t\t{";
 		$addButton[] = "\t\t\t\t//".$this->setLine(__LINE__)." build Create button";
-		$addButton[] = "\t\t\t\t\$button[] = '<a id=\"'.\$buttonName.'Create\" class=\"btn btn-small btn-success hasTooltip\" title=\"'.JText::sprintf('".$this->langPrefix."_CREATE_NEW_S', ".$this->fileContentStatic['###Component###']."Helper::safeString(\$buttonName, 'W')).'\" style=\"border-radius: 0px 4px 4px 0px; padding: 4px 4px 4px 7px;\"";
+		$addButton[] = "\t\t\t\t\$buttonNamee = trim(\$buttonName);";
+                $addButton[] = "\t\t\t\t\$buttonNamee = preg_replace('/_+/', ' ', \$buttonNamee);";
+                $addButton[] = "\t\t\t\t\$buttonNamee = preg_replace('/\s+/', ' ', \$buttonNamee);";
+                $addButton[] = "\t\t\t\t\$buttonNamee = preg_replace(\"/[^A-Za-z ]/\", '', \$buttonNamee);";
+		$addButton[] = "\t\t\t\t\$buttonNamee = ucfirst(strtolower(\$buttonNamee));";
+		$addButton[] = "\t\t\t\t\$button[] = '<a id=\"'.\$buttonName.'Create\" class=\"btn btn-small btn-success hasTooltip\" title=\"'.JText::sprintf('".$this->langPrefix."_CREATE_NEW_S', \$buttonNamee).'\" style=\"border-radius: 0px 4px 4px 0px; padding: 4px 4px 4px 7px;\"";
 		$addButton[] = "\t\t\t\t\thref=\"index.php?option=com_" . $this->fileContentStatic['###component###'] . "&amp;view=" . $targetView . "&amp;layout=edit'.\$ref.'\" >";
 		$addButton[] = "\t\t\t\t\t<span class=\"icon-new icon-white\"></span></a>';";
 		$addButton[] = "\t\t\t}";
@@ -7191,7 +7464,12 @@ class Interpretation extends Fields
 		}
 		$addButton[] = "\t\t\t{";
 		$addButton[] = "\t\t\t\t//".$this->setLine(__LINE__)." build edit button";
-		$addButton[] = "\t\t\t\t\$button[] = '<a id=\"'.\$buttonName.'Edit\" class=\"btn btn-small hasTooltip\" title=\"'.JText::sprintf('".$this->langPrefix."_EDIT_S', ".$this->fileContentStatic['###Component###']."Helper::safeString(\$buttonName, 'W')).'\" style=\"display: none; padding: 4px 4px 4px 7px;\" href=\"#\" >";
+		$addButton[] = "\t\t\t\t\$buttonNamee = trim(\$buttonName);";
+                $addButton[] = "\t\t\t\t\$buttonNamee = preg_replace('/_+/', ' ', \$buttonNamee);";
+                $addButton[] = "\t\t\t\t\$buttonNamee = preg_replace('/\s+/', ' ', \$buttonNamee);";
+                $addButton[] = "\t\t\t\t\$buttonNamee = preg_replace(\"/[^A-Za-z ]/\", '', \$buttonNamee);";
+		$addButton[] = "\t\t\t\t\$buttonNamee = ucfirst(strtolower(\$buttonNamee));";
+		$addButton[] = "\t\t\t\t\$button[] = '<a id=\"'.\$buttonName.'Edit\" class=\"btn btn-small hasTooltip\" title=\"'.JText::sprintf('".$this->langPrefix."_EDIT_S', \$buttonNamee).'\" style=\"display: none; padding: 4px 4px 4px 7px;\" href=\"#\" >";
 		$addButton[] = "\t\t\t\t\t<span class=\"icon-edit\"></span></a>';";
 		$addButton[] = "\t\t\t\t//".$this->setLine(__LINE__)." build script";
 		$addButton[] = "\t\t\t\t\$script[] = \"";
@@ -7221,18 +7499,13 @@ class Interpretation extends Fields
 		$addButton[] = "\t\t\t\t\t}\";";
 		$addButton[] = "\t\t\t}";
 		$addButton[] = "\t\t\t//".$this->setLine(__LINE__)." check if button was created for " . $targetView ." field.";
-		$addButton[] = "\t\t\tif (".$this->fileContentStatic['###Component###']."Helper::checkArray(\$button))";
+		$addButton[] = "\t\t\tif (is_array(\$button) && count(\$button) > 0)";
 		$addButton[] = "\t\t\t{";
-		$addButton[] = "\t\t\t\t//".$this->setLine(__LINE__)." Add some final script";
-		$addButton[] = "\t\t\t\t\$script[] = \"";
-		$addButton[] = "\t\t\t\t\tjQuery(document).ready(function() {";
-		$addButton[] = "\t\t\t\t\t\tjQuery('#jform_\".\$buttonName.\"').closest('.control-group').addClass('input-append');";
-		$addButton[] = "\t\t\t\t\t});\";";
 		$addButton[] = "\t\t\t\t//".$this->setLine(__LINE__)." Load the needed script.";
 		$addButton[] = "\t\t\t\t\$document = JFactory::getDocument();";
 		$addButton[] = "\t\t\t\t\$document->addScriptDeclaration(implode(' ',\$script));";
 		$addButton[] = "\t\t\t\t//".$this->setLine(__LINE__)." return the button attached to input field.";
-		$addButton[] = "\t\t\t\treturn \$html . implode('',\$button);";
+		$addButton[] = "\t\t\t\treturn '<div class=\"input-append\">' .\$html . implode('',\$button).'</div>';";
 		$addButton[] = "\t\t\t}";
 		$addButton[] = "\t\t}";
 		$addButton[] = "\t\treturn \$html;";
@@ -7271,12 +7544,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))
 		{
@@ -7312,7 +7583,7 @@ class Interpretation extends Fields
 							$functions[$uniqueVar][0]	= $matchName;
 							$matchNames[$matchName]		= $condition['match_name'];
 							// get the select value
-							$getValue[$matchName]		= $this->getValueScript($condition['match_type'],$condition['match_name'],$uniqueVar);
+							$getValue[$matchName]		= $this->getValueScript($condition['match_type'],$condition['match_name'],$condition['match_extends'],$uniqueVar);
 							// get the options
 							$options			= $this->getOptionsScript($condition['match_type'],$condition['match_options']);
 							// set the if values
@@ -7333,7 +7604,7 @@ class Interpretation extends Fields
 									$matchNames[$relationName]	= $relation['match_name'];
 									// get the relation option
 									$relationOptions		= $this->getOptionsScript($relation['match_type'],$relation['match_options']);
-									$getValue[$relationName]	= $this->getValueScript($relation['match_type'],$relation['match_name'],$uniqueVar);
+									$getValue[$relationName]	= $this->getValueScript($relation['match_type'],$relation['match_name'],$condition['match_extends'],$uniqueVar);
 									$ifValue[$relationName]		= $this->ifValueScript($relationName,$relation['match_behavior'],$relation['match_type'],$relationOptions);
 								}
 							}
@@ -7350,7 +7621,7 @@ class Interpretation extends Fields
 						$functions[$uniqueVar][0]	= $matchName;
 						$matchNames[$matchName]		= $condition['match_name'];
 						// get the select value
-						$getValue[$matchName]		= $this->getValueScript($condition['match_type'],$condition['match_name'],$uniqueVar);
+						$getValue[$matchName]		= $this->getValueScript($condition['match_type'],$condition['match_name'],$condition['match_extends'],$uniqueVar);
 						// get the options
 						$options			= $this->getOptionsScript($condition['match_type'],$condition['match_options']);
 						// set the if values
@@ -7603,12 +7874,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
@@ -8180,12 +8451,12 @@ class Interpretation extends Fields
 		return $buket;
 	}
 
-	public function getValueScript($type,$name,$unique)
+	public function getValueScript($type,$name,$extends,$unique)
 	{
 		$select		= '';
 		$isArray	= false;
 		$keyName	= $name.'_'.$unique;
-		if ($type == 'checkboxes')
+		if ($type == 'checkboxes' || $extends == 'checkboxes')
 		{
 			$select =  "var ".$keyName." = [];\n\tjQuery('#jform_".$name." input[type=checkbox]').each(function()\n\t{\n\t\tif (jQuery(this).is(':checked'))\n\t\t{\n\t\t\t".$keyName.".push(jQuery(this).prop('value'));\n\t\t}\n\t});";
 			$isArray = true;
@@ -8386,9 +8657,9 @@ class Interpretation extends Fields
 					$cases .= "\n\t\t\t\t\t\t{";
 					$cases .= "\n\t\t\t\t\t\t\t\$result = false;";
 					$cases .= "\n\t\t\t\t\t\t}";
-					$cases .= "\n\t\t\t\t\t\tif(array_key_exists('callback',\$_GET))";
+					$cases .= "\n\t\t\t\t\t\tif(\$callback = \$jinput->get('callback', null, 'CMD'))";
 					$cases .= "\n\t\t\t\t\t\t{";
-					$cases .= "\n\t\t\t\t\t\t\techo \$_GET['callback'] . \"(\".json_encode(\$result).\");\";";
+					$cases .= "\n\t\t\t\t\t\t\techo \$callback . \"(\".json_encode(\$result).\");\";";
 					$cases .= "\n\t\t\t\t\t\t}";
 					$cases .= "\n\t\t\t\t\t\telseif(\$returnRaw)";
 					$cases .= "\n\t\t\t\t\t\t{";
@@ -8401,9 +8672,9 @@ class Interpretation extends Fields
 					$cases .= "\n\t\t\t\t\t}";
 					$cases .= "\n\t\t\t\t\tcatch(Exception \$e)";
 					$cases .= "\n\t\t\t\t\t{";
-					$cases .= "\n\t\t\t\t\t\tif(array_key_exists('callback',\$_GET))";
+					$cases .= "\n\t\t\t\t\t\tif(\$callback = \$jinput->get('callback', null, 'CMD'))";
 					$cases .= "\n\t\t\t\t\t\t{";
-					$cases .= "\n\t\t\t\t\t\t\techo \$_GET['callback'].\"(\".json_encode(\$e).\");\";";
+					$cases .= "\n\t\t\t\t\t\t\techo \$callback.\"(\".json_encode(\$e).\");\";";
 					$cases .= "\n\t\t\t\t\t\t}";
 					$cases .= "\n\t\t\t\t\t\telse";
 					$cases .= "\n\t\t\t\t\t\t{";
@@ -8557,6 +8828,11 @@ class Interpretation extends Fields
 						$function[] = "\t\t\t\t//".$this->setLine(__LINE__)." Now add the ".$filter['code']." and its text to the options array";
 						$function[] = "\t\t\t\t\$filter[] = JHtml::_('select.option', \$".$filter['code'].", JText::_(\$text));";
 					}
+					elseif ($filter['type'] == 'user')
+					{
+						$function[] = "\t\t\t\t//".$this->setLine(__LINE__)." Now add the ".$filter['code']." and its text to the options array";
+						$function[] = "\t\t\t\t\$filter[] = JHtml::_('select.option', \$".$filter['code'].", JFactory::getUser(\$".$filter['code'].")->name);";
+					}
 					else
 					{
 						$function[] = "\t\t\t\t//".$this->setLine(__LINE__)." Now add the ".$filter['code']." and its text to the options array";
@@ -10036,6 +10312,8 @@ class Interpretation extends Fields
 
 	public function setSortFields($view)
 	{
+		// keep track of all fields already added
+		$donelist = array('sorting','published');
 		// set the default first
 		$fields = "return array(";
 		$fields .= "\n\t\t\t'a.sorting' => JText::_('JGRID_HEADING_ORDERING')";
@@ -10045,6 +10323,8 @@ class Interpretation extends Fields
 		if (isset($this->sortBuilder[$view]) && ComponentbuilderHelper::checkArray($this->sortBuilder[$view]))
 		{
 			foreach ($this->sortBuilder[$view] as $filter)
+			{
+				if (!in_array($filter['code'], $donelist))
 				{
 					if ($filter['type'] == 'category')
 					{
@@ -10060,6 +10340,7 @@ class Interpretation extends Fields
 					}
 				}
 			}
+		}
 		$fields .= ",\n\t\t\t'a.id' => JText::_('JGRID_HEADING_ID')";
 		$fields .= "\n\t\t);";
 		// return fields
@@ -10327,11 +10608,17 @@ class Interpretation extends Fields
 							$fix .= "\n\t".$tab."\t\t\t\t}";
 							$fix .= "\n\t".$tab."\t\t\t}";
 						}
+						elseif ($item['method'] == 1 && !$export)
+						{
+							// TODO we check if this works well.
+							$fix .= "\n\t".$tab."\t\t\t//".$this->setLine(__LINE__)." convert ".$item['name'];
+							$fix .= "\n\t".$tab."\t\t\t\$item->".$item['name']." = ".$Component."Helper::jsonToString(\$item->".$item['name'].", ', ', '".$item['name']."');";
+						}
 						else
 						{
 							if (!$export)
 							{
-								// TODO we must add options for multi custom selection.
+								// For thos we have not cached yet.
 								$fix .= "\n\t".$tab."\t\t\t//".$this->setLine(__LINE__)." convert ".$item['name'];
 								$fix .= "\n\t".$tab."\t\t\t\$item->".$item['name']." = ".$Component."Helper::jsonToString(\$item->".$item['name'].");";
 							}
@@ -10818,11 +11105,70 @@ class Interpretation extends Fields
 
 	public function addCustomDashboardIcons(&$view,&$counter)
 	{
+		$icon = '';
+		if (isset($this->componentData->custom_admin_views) && ComponentbuilderHelper::checkArray($this->componentData->custom_admin_views))
+		{
+			foreach ($this->componentData->custom_admin_views as $nr => $menu)
+			{
+				if (!isset($this->customAdminAdded[$menu['settings']->code]) && $menu['dashboard_list'] == 1 && $menu['before'] == $view['adminview'])
+				{
+					$type = ComponentbuilderHelper::imageInfo($menu['settings']->icon);
+					if ($type)
+					{
+						$type = $type.".";
+						// icon builder loader
+						$this->iconBuilder[$type.$menu['settings']->code] = $menu['settings']->icon;
+					}
+					else
+					{
+						$type = 'png.';
+					}
+					// build lang
+					$langName	= $menu['settings']->name.'<br /><br />';
+					$langKey	= $this->langPrefix.'_DASHBOARD_'.$menu['settings']->CODE;
+					// add to lang
+					$this->langContent[$this->lang][$langKey] = $langName;
+					// set icon
+					if ($counter == 0)
+					{
+						$counter++;
+						$icon .= "'".$type.$menu['settings']->code."'";
+					}
+					else
+					{
+						$counter++;
+						$icon .= ", '".$type.$menu['settings']->code."'";
+					}
+				}
+				elseif(!isset($this->customAdminAdded[$menu['settings']->code]) && $menu['dashboard_list'] == 1 && empty($menu['before']))
+				{
+					$type = ComponentbuilderHelper::imageInfo($menu['settings']->icon);
+					if ($type)
+					{
+						$type = $type.".";
+						// icon builder loader
+						$this->iconBuilder[$type.$menu['settings']->code] = $menu['settings']->icon;
+					}
+					else
+					{
+						$type = 'png.';
+					}
+					// build lang
+					$langName	= $menu['settings']->name.'<br /><br />';
+					$langKey	= $this->langPrefix.'_DASHBOARD_'.$menu['settings']->CODE;
+					// add to lang
+					$this->langContent[$this->lang][$langKey] = $langName;
+					// set icon
+					$this->lastCustomDashboardIcon[$nr] = ", '".$type.$menu['settings']->code."'";
+				}
+			}
+		}
 		// see if we should have custom menus
 		if (isset($this->componentData->custommenus) && ComponentbuilderHelper::checkArray($this->componentData->custommenus))
 		{
 			foreach ($this->componentData->custommenus as $nr => $menu)
 			{
+				$nr		= $nr + 100;
 				$nameList	= ComponentbuilderHelper::safeString($menu['name_code']);
 				$nameUpper	= ComponentbuilderHelper::safeString($menu['name_code'], 'U');
 				if ($menu['dashboard_list'] == 1 && $view['adminview'] == $menu['before'])
@@ -10854,12 +11200,12 @@ class Interpretation extends Fields
 						if ($counter == 0)
 						{
 							$counter++;
-							return "'".$type.$nameList."'";
+							$icon .= "'".$type.$nameList."'";
 						}
 						else
 						{
 							$counter++;
-							return ", '".$type.$nameList."'";
+							$icon .= ", '".$type.$nameList."'";
 						}
 					}
 				}
@@ -10894,7 +11240,7 @@ class Interpretation extends Fields
 				}
 			}
 		}
-		return '';
+		return $icon;
 	}
 
 	public function setSubMenus()
@@ -11151,11 +11497,35 @@ class Interpretation extends Fields
 
 	public function addCustomMainMenu(&$view,&$codeName,&$lang)
 	{
+		$customMenu = '';
+		// see if we should have custom admin views
+		if (isset($this->componentData->custom_admin_views) && ComponentbuilderHelper::checkArray($this->componentData->custom_admin_views))
+		{
+			foreach ($this->componentData->custom_admin_views as $nr => $menu)
+			{
+				if (!isset($this->customAdminAdded[$menu['settings']->code]))
+				{
+					if ($menu['mainmenu'] == 1 && $view['adminview'] == $menu['before'])
+					{
+						$this->langContent['adminsys'][$lang.'_'.$menu['settings']->CODE] = $menu['settings']->name;
+						// add custom menu
+						$customMenu .= "\n\t\t\t".'<menu option="com_'.$codeName.'" view="'.$menu['settings']->code.'">'.$lang.'_'.$menu['settings']->CODE.'</menu>';
+					}
+					elseif($menu['mainmenu'] == 1 && empty($menu['before']))
+					{
+						$this->langContent['adminsys'][$lang.'_'.$menu['settings']->CODE] = $menu['settings']->name;
+						// add custom menu
+						$this->lastCustomMainMenu[$nr] = "\n\t\t\t".'<menu option="com_'.$codeName.'" view="'.$menu['settings']->code.'">'.$lang.'_'.$menu['settings']->CODE.'</menu>';
+					}
+				}
+			}
+		}
 		// see if we should have custom menus
 		if (isset($this->componentData->custommenus) && ComponentbuilderHelper::checkArray($this->componentData->custommenus))
 		{
 			foreach ($this->componentData->custommenus as $nr => $menu)
 			{
+				$nr = $nr + 100;
 				if ($menu['mainmenu'] == 1 && $view['adminview'] == $menu['before'])
 				{
 					if (isset($menu['link']) && ComponentbuilderHelper::checkString($menu['link']))
@@ -11164,7 +11534,7 @@ class Interpretation extends Fields
 						$nameUpper	= ComponentbuilderHelper::safeString($menu['name'], 'U');
 						$this->langContent['adminsys'][$lang.'_'.$nameUpper] = $menu['name'];
 						// add custom menu
-						return "\n\t\t\t".'<menu link="'.$menu['link'].'">'.$lang.'_'.$nameUpper.'</menu>';
+						$customMenu .= "\n\t\t\t".'<menu link="'.$menu['link'].'">'.$lang.'_'.$nameUpper.'</menu>';
 					}
 					else
 					{
@@ -11172,7 +11542,7 @@ class Interpretation extends Fields
 						$nameUpper	= ComponentbuilderHelper::safeString($menu['name_code'], 'U');
 						$this->langContent['adminsys'][$lang.'_'.$nameUpper] = $menu['name'];
 						// add custom menu
-						return "\n\t\t\t".'<menu option="com_'.$codeName.'" view="'.$nameList.'">'.$lang.'_'.$nameUpper.'</menu>';
+						$customMenu .= "\n\t\t\t".'<menu option="com_'.$codeName.'" view="'.$nameList.'">'.$lang.'_'.$nameUpper.'</menu>';
 					}
 				}
 				elseif($menu['mainmenu'] == 1 && empty($menu['before']))
@@ -11196,7 +11566,7 @@ class Interpretation extends Fields
 				}
 			}
 		}
-		return '';
+		return $customMenu;
 
 	}
 
@@ -12431,12 +12801,16 @@ for developing fast and powerful web interfaces. For more info visit <a href=\"h
 										$view['settings']->permissions = array();
 										$view['settings']->permissions[] = $fieldView;
 									}
+									// insure that no default field get loaded
+									if (!in_array($fieldName, $this->defaultFields))
+									{
 										// load to global field permission set
 										$this->permissionFields[$nameView][$fieldName] = $fieldType;
 									}
 								}
 							}
 						}
+					}
 					$this->buildPermissions($view, $nameView, $nameViews, $menuControllers);
 				}
 			}

admin/helpers/compiler/f_Infusion.php

@@ -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);
@@ -274,6 +274,9 @@ class Infusion extends Interpretation
 						// ###EDITBODY### <<<DYNAMIC>>>
 						$this->fileContentDynamic[$viewName_single]['###EDITBODY###'] = $this->setEditBody($view);
 						
+						// ###EDITBODY### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$viewName_single]['###EDITBODYFADEIN###'] = $this->setFadeInEfect($view);
+
 						// ###JTABLECONSTRUCTOR### <<<DYNAMIC>>>
 						$this->fileContentDynamic[$viewName_single]['###JTABLECONSTRUCTOR###'] = $this->setJtableConstructor($viewName_single);
 
@@ -474,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);
 
@@ -672,6 +678,8 @@ class Infusion extends Interpretation
 						$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_CODE_BODY###'] = $this->setCustomViewCodeBody($view);
 						// ###CUSTOM_ADMIN_BODY### <<<DYNAMIC>>>
 						$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_BODY###'] = $this->setCustomViewBody($view);
+						// ###CUSTOM_ADMIN_SUBMITBUTTON_SCRIPT### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_SUBMITBUTTON_SCRIPT###'] = $this->setCustomViewSubmitButtonScript($view);
 
 						// setup the templates
 						$this->setCustomViewTemplateBody($view);

admin/helpers/componentbuilder.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php
@@ -75,11 +75,9 @@ abstract class ComponentbuilderHelper
 	{
 		// set image
 		$image = JPATH_SITE.'/'.$path;
-		// chack if exists
-		if (file_exists($image))
+		// check if exists
+		if (file_exists($image) && $result = @getimagesize($image))
 		{
-			// get image info
-			$result = getimagesize($image);
 			// return type request
 			switch ($request)
 			{
@@ -603,8 +601,9 @@ abstract class ComponentbuilderHelper
 	*/
 	public static function getFileHeaders($dataType)
 	{		
-		// make sure the file is loaded		
+		// make sure these files are loaded		
 		JLoader::import('PHPExcel', JPATH_COMPONENT_ADMINISTRATOR . '/helpers');
+		JLoader::import('ChunkReadFilter', JPATH_COMPONENT_ADMINISTRATOR . '/helpers/PHPExcel/Reader');
 		// get session object
 		$session	= JFactory::getSession();
 		$package	= $session->get('package', null);
@@ -612,9 +611,17 @@ abstract class ComponentbuilderHelper
 		// set the headers
 		if(isset($package['dir']))
 		{
+			$chunkFilter = new PHPExcel_Reader_chunkReadFilter();
+			// only load first three rows
+			$chunkFilter->setRows(2,1);
+			// identify the file type
 			$inputFileType = PHPExcel_IOFactory::identify($package['dir']);
+			// create the reader for this file type
 			$excelReader = PHPExcel_IOFactory::createReader($inputFileType);
+			// load the limiting filter
+			$excelReader->setReadFilter($chunkFilter);
 			$excelReader->setReadDataOnly(true);
+			// load the rows (only first three)
 			$excelObj = $excelReader->load($package['dir']);
 			$headers = array();
 			foreach ($excelObj->getActiveSheet()->getRowIterator() as $row)
@@ -650,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);
@@ -710,31 +723,33 @@ abstract class ComponentbuilderHelper
 		return false;
 	}
 
-	public static function jsonToString($value, $sperator = ", ")
+	public static function jsonToString($value, $sperator = ", ", $table = null)
 	{
                 // check if string is JSON
                 $result = json_decode($value, true);
-                if (json_last_error() === JSON_ERROR_NONE) {
+                if (json_last_error() === JSON_ERROR_NONE)
+		{
 			// is JSON
 			if (self::checkArray($result))
 			{
-				$value = '';
-				$counter = 0;
-				foreach ($result as $string)
+				if (self::checkString($table))
 				{
-					if ($counter)
+					$names = array();
+					foreach ($result as $val)
 					{
-						$value .= $sperator.$string;
-					}
-					else
+						if ($name = self::getVar($table, $val, 'id', 'name'))
 						{
-						$value .= $string;
+							$names[] = $name;
 						}
-					$counter++;
 					}
-				return $value;
+					if (self::checkArray($names))
+					{
+						return (string) implode($sperator,$names);
 					}	
-                        return json_decode($value);
+				}
+				return (string) implode($sperator,$result);
+			}
+                        return (string) json_decode($value);
                 }
                 return $value;
         }
@@ -1026,7 +1041,7 @@ abstract class ComponentbuilderHelper
 
 			if (!$asset->check() || !$asset->store())
 			{
-				JError::raiseWarning(500, $asset->getError());
+				JFactory::getApplication()->enqueueMessage($asset->getError(), 'warning');
 				return false;
 			}
 			else

admin/helpers/html/batch_.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		batch_.php

admin/helpers/indenter.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		indenter.php

admin/helpers/js.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		js.php

admin/helpers/minify.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		minify.php

admin/language/en-GB/en-GB.com_componentbuilder.ini

@@ -50,6 +50,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ABOVE_TABS="Above Tabs"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ACTION_DESCRIPTION="Enter Action Name Here"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ACTION_LABEL="Action Name"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ACTIVE_ONLY_FOUR_TEXT_FIELD="Active (only 4 text_field)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ADD="Add"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADDCONDITIONS="Addconditions"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADDCONDITIONS_DESCRIPTION="Conditional setup for the above fields."
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADDCONDITIONS_SELECT="Add"
@@ -75,6 +76,9 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CSS_VIEW_LABEL="Add CSS (view)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_IMPORT="Add Custom Import"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_IMPORT_DESCRIPTION="Override the default import methods."
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_IMPORT_LABEL="Add Custom Import"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_FADEIN="Add Fadein"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_FADEIN_DESCRIPTION="Should the fade in affect be added to the admin edit view."
+COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_FADEIN_LABEL="Fade In Affect"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_JAVASCRIPT_VIEWS_FILE="Add Javascript Views File"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_JAVASCRIPT_VIEWS_FILE_LABEL="Add JavaScript (views-file)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_JAVASCRIPT_VIEWS_FOOTER="Add Javascript Views Footer"
@@ -133,10 +137,10 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_COREEDITCREATED="core.edit.created"
 COM_COMPONENTBUILDER_ADMIN_VIEW_COREEDITCREATED_BY="core.edit.created_by"
 COM_COMPONENTBUILDER_ADMIN_VIEW_COREEDITOWN="core.edit.own"
 COM_COMPONENTBUILDER_ADMIN_VIEW_COREEDITSTATE="core.edit.state"
-COM_COMPONENTBUILDER_ADMIN_VIEW_CREATED_BY_DESC="The user that created the Admin View."
-COM_COMPONENTBUILDER_ADMIN_VIEW_CREATED_BY_LABEL="Created by"
-COM_COMPONENTBUILDER_ADMIN_VIEW_CREATED_DATE_DESC="The date Admin View was created."
-COM_COMPONENTBUILDER_ADMIN_VIEW_CREATED_DATE_LABEL="Created date"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CREATED_BY_DESC="The user that created this Admin View."
+COM_COMPONENTBUILDER_ADMIN_VIEW_CREATED_BY_LABEL="Created By"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CREATED_DATE_DESC="The date this Admin View was created."
+COM_COMPONENTBUILDER_ADMIN_VIEW_CREATED_DATE_LABEL="Created Date"
 COM_COMPONENTBUILDER_ADMIN_VIEW_CSS="CSS"
 COM_COMPONENTBUILDER_ADMIN_VIEW_CSS_VIEW="Css View"
 COM_COMPONENTBUILDER_ADMIN_VIEW_CSS_VIEWS="Css Views"
@@ -234,6 +238,10 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_METHOD_NAME_DESCRIPTION="Enter method name."
 COM_COMPONENTBUILDER_ADMIN_VIEW_METHOD_NAME_HINT="Method Name Here"
 COM_COMPONENTBUILDER_ADMIN_VIEW_METHOD_NAME_LABEL="Method Name"
 COM_COMPONENTBUILDER_ADMIN_VIEW_MIN_LENGTH_ONLY_FOUR_TEXT_FIELD="Min Length (only 4 text_field)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_MODIFIED_BY_DESC="The last user that modified this Admin View."
+COM_COMPONENTBUILDER_ADMIN_VIEW_MODIFIED_BY_LABEL="Modified By"
+COM_COMPONENTBUILDER_ADMIN_VIEW_MODIFIED_DATE_DESC="The date this Admin View was modified."
+COM_COMPONENTBUILDER_ADMIN_VIEW_MODIFIED_DATE_LABEL="Modified Date"
 COM_COMPONENTBUILDER_ADMIN_VIEW_MYSQL="MySQL"
 COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_DESCRIPTION="Enter Name Here"
 COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_HINT="Name Here"
@@ -316,6 +324,10 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETLISTQUERY_HINT="// PHP Here that should r
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETLISTQUERY_LABEL="PHP"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT="Php Import"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DISPLAY="Php Import Display"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DISPLAY_DESCRIPTION="Add your PHP here!"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DISPLAY_HINT="// The display method for the view.html.php file."
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DISPLAY_LABEL="PHP (display)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HINT="// PHP Here that should run in the import Method."
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_LABEL="Import Method PHP"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE="Php Import Save"
@@ -338,6 +350,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_PUBLISHING="Publishing"
 COM_COMPONENTBUILDER_ADMIN_VIEW_RAW="RAW"
 COM_COMPONENTBUILDER_ADMIN_VIEW_READONLY="readonly"
 COM_COMPONENTBUILDER_ADMIN_VIEW_READWRITE="read/write"
+COM_COMPONENTBUILDER_ADMIN_VIEW_REMOVE="Remove"
 COM_COMPONENTBUILDER_ADMIN_VIEW_RIGHT_IN_TAB="Right in Tab"
 COM_COMPONENTBUILDER_ADMIN_VIEW_RIGHT_OF_TABS="Right of Tabs"
 COM_COMPONENTBUILDER_ADMIN_VIEW_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Admin View to customise the alias."
@@ -465,6 +478,9 @@ COM_COMPONENTBUILDER_COMPONENT_ADD_ADMIN_EVENT="Add Admin Event"
 COM_COMPONENTBUILDER_COMPONENT_ADD_ADMIN_EVENT_LABEL="Add Global Admin Event"
 COM_COMPONENTBUILDER_COMPONENT_ADD_CSS="Add Css"
 COM_COMPONENTBUILDER_COMPONENT_ADD_CSS_LABEL="Add CSS"
+COM_COMPONENTBUILDER_COMPONENT_ADD_EMAIL_HELPER="Add Email Helper"
+COM_COMPONENTBUILDER_COMPONENT_ADD_EMAIL_HELPER_DESCRIPTION="Adding the email helper class, that can be used to send emails."
+COM_COMPONENTBUILDER_COMPONENT_ADD_EMAIL_HELPER_LABEL="Add Email Helper"
 COM_COMPONENTBUILDER_COMPONENT_ADD_LICENSE="Add License"
 COM_COMPONENTBUILDER_COMPONENT_ADD_LICENSE_DESCRIPTION="Add the option to use a license in the component."
 COM_COMPONENTBUILDER_COMPONENT_ADD_LICENSE_LABEL="Add License (whmcs)"
@@ -574,10 +590,10 @@ COM_COMPONENTBUILDER_COMPONENT_COPYRIGHT="Copyright"
 COM_COMPONENTBUILDER_COMPONENT_COPYRIGHT_DESCRIPTION="Add Copyright Here"
 COM_COMPONENTBUILDER_COMPONENT_COPYRIGHT_HINT="Add Copyright Here"
 COM_COMPONENTBUILDER_COMPONENT_COPYRIGHT_LABEL="Copyright"
-COM_COMPONENTBUILDER_COMPONENT_CREATED_BY_DESC="The user that created the Component."
-COM_COMPONENTBUILDER_COMPONENT_CREATED_BY_LABEL="Created by"
-COM_COMPONENTBUILDER_COMPONENT_CREATED_DATE_DESC="The date Component was created."
-COM_COMPONENTBUILDER_COMPONENT_CREATED_DATE_LABEL="Created date"
+COM_COMPONENTBUILDER_COMPONENT_CREATED_BY_DESC="The user that created this Component."
+COM_COMPONENTBUILDER_COMPONENT_CREATED_BY_LABEL="Created By"
+COM_COMPONENTBUILDER_COMPONENT_CREATED_DATE_DESC="The date this Component was created."
+COM_COMPONENTBUILDER_COMPONENT_CREATED_DATE_LABEL="Created Date"
 COM_COMPONENTBUILDER_COMPONENT_CREATUSERHELPER="Creatuserhelper"
 COM_COMPONENTBUILDER_COMPONENT_CREATUSERHELPER_LABEL="Add Create User Helper Method"
 COM_COMPONENTBUILDER_COMPONENT_CREDIT="Credit"
@@ -618,9 +634,9 @@ COM_COMPONENTBUILDER_COMPONENT_EDIT="Editing the Component"
 COM_COMPONENTBUILDER_COMPONENT_EDIT_CREATE_SITE_VIEW_DESCRIPTION="add site edit & create view for this admin view"
 COM_COMPONENTBUILDER_COMPONENT_EDIT_CREATE_SITE_VIEW_LABEL="Edit/Create Site View"
 COM_COMPONENTBUILDER_COMPONENT_EMAIL="Email"
-COM_COMPONENTBUILDER_COMPONENT_EMAIL_DESCRIPTION="Enter Email"
-COM_COMPONENTBUILDER_COMPONENT_EMAIL_HINT="demo@example.com"
-COM_COMPONENTBUILDER_COMPONENT_EMAIL_LABEL="Email"
+COM_COMPONENTBUILDER_COMPONENT_EMAIL_DESCRIPTION="Enter Author Email"
+COM_COMPONENTBUILDER_COMPONENT_EMAIL_HINT="Author Email Here"
+COM_COMPONENTBUILDER_COMPONENT_EMAIL_LABEL="Author Email"
 COM_COMPONENTBUILDER_COMPONENT_EMPTYCONTRIBUTORS="Emptycontributors"
 COM_COMPONENTBUILDER_COMPONENT_EMPTYCONTRIBUTORS_DESCRIPTION="Set if a list of empty contributor fields should be added."
 COM_COMPONENTBUILDER_COMPONENT_EMPTYCONTRIBUTORS_LABEL="Empty Contributor Fields"
@@ -730,6 +746,10 @@ COM_COMPONENTBUILDER_COMPONENT_METADATA_LABEL="Has Metadata"
 COM_COMPONENTBUILDER_COMPONENT_MINUS="Minus"
 COM_COMPONENTBUILDER_COMPONENT_MINUS_SIGN="Minus Sign"
 COM_COMPONENTBUILDER_COMPONENT_MOBILE="Mobile"
+COM_COMPONENTBUILDER_COMPONENT_MODIFIED_BY_DESC="The last user that modified this Component."
+COM_COMPONENTBUILDER_COMPONENT_MODIFIED_BY_LABEL="Modified By"
+COM_COMPONENTBUILDER_COMPONENT_MODIFIED_DATE_DESC="The date this Component was modified."
+COM_COMPONENTBUILDER_COMPONENT_MODIFIED_DATE_LABEL="Modified Date"
 COM_COMPONENTBUILDER_COMPONENT_MOVE="Move"
 COM_COMPONENTBUILDER_COMPONENT_MUSIC="Music"
 COM_COMPONENTBUILDER_COMPONENT_MYSQL_DESCRIPTION="Update Dump"
@@ -991,7 +1011,7 @@ COM_COMPONENTBUILDER_COMPONENT_WARNING_CIRCLE="Warning Circle"
 COM_COMPONENTBUILDER_COMPONENT_WEBSITE="Website"
 COM_COMPONENTBUILDER_COMPONENT_WEBSITE_DESCRIPTION="Enter website address"
 COM_COMPONENTBUILDER_COMPONENT_WEBSITE_HINT="http://www.example.com"
-COM_COMPONENTBUILDER_COMPONENT_WEBSITE_LABEL="Website"
+COM_COMPONENTBUILDER_COMPONENT_WEBSITE_LABEL="Author Website"
 COM_COMPONENTBUILDER_COMPONENT_WHMCS_KEY="Whmcs Key"
 COM_COMPONENTBUILDER_COMPONENT_WHMCS_KEY_DESCRIPTION="Add your WHMCS Secret Key here that is needed for this license"
 COM_COMPONENTBUILDER_COMPONENT_WHMCS_KEY_HINT="Secret Key"
@@ -1218,10 +1238,10 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_COMMENTS_TWO="Comments 2"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_COMPASS="Compass"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CONTRACT="Contract"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CONTRACT_TWO="Contract 2"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CREATED_BY_DESC="The user that created the Custom Admin View."
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CREATED_BY_LABEL="Created by"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CREATED_DATE_DESC="The date Custom Admin View was created."
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CREATED_DATE_LABEL="Created date"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CREATED_BY_DESC="The user that created this Custom Admin View."
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CREATED_BY_LABEL="Created By"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CREATED_DATE_DESC="The date this Custom Admin View was created."
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CREATED_DATE_LABEL="Created Date"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CREDIT="Credit"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CREDIT_TWO="Credit 2"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS="Css"
@@ -1301,6 +1321,9 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_HOME="Home"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_HOME_TWO="Home 2"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ICOMOON_DESCRIPTION="Joomla Standard Icomoon Fonts"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ICOMOON_LABEL="Icon"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ICON="Icon"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ICON_DESCRIPTION="Must be 128px x 128px and a png format."
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ICON_LABEL="Icon"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ID="Id"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_IMAGE="Image"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_IMAGES="Images"
@@ -1332,6 +1355,10 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_METHOD_LABEL="Target Controller Method"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MINUS="Minus"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MINUS_SIGN="Minus Sign"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MOBILE="Mobile"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MODIFIED_BY_DESC="The last user that modified this Custom Admin View."
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MODIFIED_BY_LABEL="Modified By"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MODIFIED_DATE_DESC="The date this Custom Admin View was modified."
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MODIFIED_DATE_LABEL="Modified Date"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MOVE="Move"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MUSIC="Music"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NAME="Name"
@@ -1573,10 +1600,10 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_BB="bb"
 COM_COMPONENTBUILDER_DYNAMIC_GET_C="c"
 COM_COMPONENTBUILDER_DYNAMIC_GET_CATEGORIES="Categories"
 COM_COMPONENTBUILDER_DYNAMIC_GET_CC="cc"
-COM_COMPONENTBUILDER_DYNAMIC_GET_CREATED_BY_DESC="The user that created the Dynamic Get."
-COM_COMPONENTBUILDER_DYNAMIC_GET_CREATED_BY_LABEL="Created by"
-COM_COMPONENTBUILDER_DYNAMIC_GET_CREATED_DATE_DESC="The date Dynamic Get was created."
-COM_COMPONENTBUILDER_DYNAMIC_GET_CREATED_DATE_LABEL="Created date"
+COM_COMPONENTBUILDER_DYNAMIC_GET_CREATED_BY_DESC="The user that created this Dynamic Get."
+COM_COMPONENTBUILDER_DYNAMIC_GET_CREATED_BY_LABEL="Created By"
+COM_COMPONENTBUILDER_DYNAMIC_GET_CREATED_DATE_DESC="The date this Dynamic Get was created."
+COM_COMPONENTBUILDER_DYNAMIC_GET_CREATED_DATE_LABEL="Created Date"
 COM_COMPONENTBUILDER_DYNAMIC_GET_CUSTOM="Custom"
 COM_COMPONENTBUILDER_DYNAMIC_GET_CUSTOM_SCRIPT="Custom Script"
 COM_COMPONENTBUILDER_DYNAMIC_GET_D="d"
@@ -1663,6 +1690,10 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_MAIN_SOURCE="Main Source"
 COM_COMPONENTBUILDER_DYNAMIC_GET_MAIN_SOURCE_DESCRIPTION="Select the main source of this dynamic get method."
 COM_COMPONENTBUILDER_DYNAMIC_GET_MAIN_SOURCE_LABEL="Main Source"
 COM_COMPONENTBUILDER_DYNAMIC_GET_MM="mm"
+COM_COMPONENTBUILDER_DYNAMIC_GET_MODIFIED_BY_DESC="The last user that modified this Dynamic Get."
+COM_COMPONENTBUILDER_DYNAMIC_GET_MODIFIED_BY_LABEL="Modified By"
+COM_COMPONENTBUILDER_DYNAMIC_GET_MODIFIED_DATE_DESC="The date this Dynamic Get was modified."
+COM_COMPONENTBUILDER_DYNAMIC_GET_MODIFIED_DATE_LABEL="Modified Date"
 COM_COMPONENTBUILDER_DYNAMIC_GET_MULTIPLE="Multiple"
 COM_COMPONENTBUILDER_DYNAMIC_GET_N="n"
 COM_COMPONENTBUILDER_DYNAMIC_GET_NAME="Name"
@@ -1895,10 +1926,10 @@ COM_COMPONENTBUILDER_FIELDTYPE_ADJUSTABLE_DESCRIPTION="Select if the value is ad
 COM_COMPONENTBUILDER_FIELDTYPE_ADJUSTABLE_LABEL="Adjustable"
 COM_COMPONENTBUILDER_FIELDTYPE_CATID_DESCRIPTION="select one of the following categories"
 COM_COMPONENTBUILDER_FIELDTYPE_CATID_LABEL="Category"
-COM_COMPONENTBUILDER_FIELDTYPE_CREATED_BY_DESC="The user that created the Fieldtype."
-COM_COMPONENTBUILDER_FIELDTYPE_CREATED_BY_LABEL="Created by"
-COM_COMPONENTBUILDER_FIELDTYPE_CREATED_DATE_DESC="The date Fieldtype was created."
-COM_COMPONENTBUILDER_FIELDTYPE_CREATED_DATE_LABEL="Created date"
+COM_COMPONENTBUILDER_FIELDTYPE_CREATED_BY_DESC="The user that created this Fieldtype."
+COM_COMPONENTBUILDER_FIELDTYPE_CREATED_BY_LABEL="Created By"
+COM_COMPONENTBUILDER_FIELDTYPE_CREATED_DATE_DESC="The date this Fieldtype was created."
+COM_COMPONENTBUILDER_FIELDTYPE_CREATED_DATE_LABEL="Created Date"
 COM_COMPONENTBUILDER_FIELDTYPE_DESCRIPTION="Description"
 COM_COMPONENTBUILDER_FIELDTYPE_DESCRIPTION_DESCRIPTION="Add Description Here"
 COM_COMPONENTBUILDER_FIELDTYPE_DESCRIPTION_HINT="Add Description Here"
@@ -1913,6 +1944,10 @@ COM_COMPONENTBUILDER_FIELDTYPE_FIELDTYPE_CATEGORY="Fieldtype Category"
 COM_COMPONENTBUILDER_FIELDTYPE_ID="Id"
 COM_COMPONENTBUILDER_FIELDTYPE_MANDATORY_DESCRIPTION="Select if the property is mandatory."
 COM_COMPONENTBUILDER_FIELDTYPE_MANDATORY_LABEL="Mandatory"
+COM_COMPONENTBUILDER_FIELDTYPE_MODIFIED_BY_DESC="The last user that modified this Fieldtype."
+COM_COMPONENTBUILDER_FIELDTYPE_MODIFIED_BY_LABEL="Modified By"
+COM_COMPONENTBUILDER_FIELDTYPE_MODIFIED_DATE_DESC="The date this Fieldtype was modified."
+COM_COMPONENTBUILDER_FIELDTYPE_MODIFIED_DATE_LABEL="Modified Date"
 COM_COMPONENTBUILDER_FIELDTYPE_NAME="Name"
 COM_COMPONENTBUILDER_FIELDTYPE_NAME_DESCRIPTION="Enter Name Here"
 COM_COMPONENTBUILDER_FIELDTYPE_NAME_HINT="Name Here"
@@ -1953,10 +1988,10 @@ COM_COMPONENTBUILDER_FIELD_BIGINT="BIGINT"
 COM_COMPONENTBUILDER_FIELD_CATID_DESCRIPTION="select one of the following categories"
 COM_COMPONENTBUILDER_FIELD_CATID_LABEL="Category"
 COM_COMPONENTBUILDER_FIELD_CHAR="CHAR"
-COM_COMPONENTBUILDER_FIELD_CREATED_BY_DESC="The user that created the Field."
-COM_COMPONENTBUILDER_FIELD_CREATED_BY_LABEL="Created by"
-COM_COMPONENTBUILDER_FIELD_CREATED_DATE_DESC="The date Field was created."
-COM_COMPONENTBUILDER_FIELD_CREATED_DATE_LABEL="Created date"
+COM_COMPONENTBUILDER_FIELD_CREATED_BY_DESC="The user that created this Field."
+COM_COMPONENTBUILDER_FIELD_CREATED_BY_LABEL="Created By"
+COM_COMPONENTBUILDER_FIELD_CREATED_DATE_DESC="The date this Field was created."
+COM_COMPONENTBUILDER_FIELD_CREATED_DATE_LABEL="Created Date"
 COM_COMPONENTBUILDER_FIELD_CSS_VIEW="Css View"
 COM_COMPONENTBUILDER_FIELD_CSS_VIEWS="Css Views"
 COM_COMPONENTBUILDER_FIELD_CSS_VIEWS_DESCRIPTION="Add your CSS here! [Do not add the style tags]"
@@ -2015,6 +2050,10 @@ COM_COMPONENTBUILDER_FIELD_JSON="JSON"
 COM_COMPONENTBUILDER_FIELD_KEY="KEY"
 COM_COMPONENTBUILDER_FIELD_LONGTEXT="LONGTEXT"
 COM_COMPONENTBUILDER_FIELD_MEDIUMTEXT="MEDIUMTEXT"
+COM_COMPONENTBUILDER_FIELD_MODIFIED_BY_DESC="The last user that modified this Field."
+COM_COMPONENTBUILDER_FIELD_MODIFIED_BY_LABEL="Modified By"
+COM_COMPONENTBUILDER_FIELD_MODIFIED_DATE_DESC="The date this Field was modified."
+COM_COMPONENTBUILDER_FIELD_MODIFIED_DATE_LABEL="Modified Date"
 COM_COMPONENTBUILDER_FIELD_NAME="Name"
 COM_COMPONENTBUILDER_FIELD_NAME_DESCRIPTION="Enter Name Here"
 COM_COMPONENTBUILDER_FIELD_NAME_HINT="Name Here"
@@ -2139,10 +2178,10 @@ COM_COMPONENTBUILDER_HELP_DOCUMENT_ARTICLE="Article"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_ARTICLE_LABEL="Article"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_CONTENT="Content"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_CONTENT_LABEL="Content"
-COM_COMPONENTBUILDER_HELP_DOCUMENT_CREATED_BY_DESC="The user that created the Help Document."
-COM_COMPONENTBUILDER_HELP_DOCUMENT_CREATED_BY_LABEL="Created by"
-COM_COMPONENTBUILDER_HELP_DOCUMENT_CREATED_DATE_DESC="The date Help Document was created."
-COM_COMPONENTBUILDER_HELP_DOCUMENT_CREATED_DATE_LABEL="Created date"
+COM_COMPONENTBUILDER_HELP_DOCUMENT_CREATED_BY_DESC="The user that created this Help Document."
+COM_COMPONENTBUILDER_HELP_DOCUMENT_CREATED_BY_LABEL="Created By"
+COM_COMPONENTBUILDER_HELP_DOCUMENT_CREATED_DATE_DESC="The date this Help Document was created."
+COM_COMPONENTBUILDER_HELP_DOCUMENT_CREATED_DATE_LABEL="Created Date"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_DETAILS="Details"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_EDIT="Editing the Help Document"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_ERROR_UNIQUE_ALIAS="Another Help Document has the same alias."
@@ -2154,6 +2193,10 @@ COM_COMPONENTBUILDER_HELP_DOCUMENT_JOOMLA_ARTICLE="Joomla Article"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_LOCATION="Location"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_LOCATION_DESCRIPTION="Select the help target location."
 COM_COMPONENTBUILDER_HELP_DOCUMENT_LOCATION_LABEL="Location"
+COM_COMPONENTBUILDER_HELP_DOCUMENT_MODIFIED_BY_DESC="The last user that modified this Help Document."
+COM_COMPONENTBUILDER_HELP_DOCUMENT_MODIFIED_BY_LABEL="Modified By"
+COM_COMPONENTBUILDER_HELP_DOCUMENT_MODIFIED_DATE_DESC="The date this Help Document was modified."
+COM_COMPONENTBUILDER_HELP_DOCUMENT_MODIFIED_DATE_LABEL="Modified Date"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_NEW="A New Help Document"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_NOT_REQUIRED="Not Required"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_ORDERING_LABEL="Ordering"
@@ -2287,10 +2330,10 @@ COM_COMPONENTBUILDER_LAYOUT_ALIAS="Alias"
 COM_COMPONENTBUILDER_LAYOUT_ALIAS_DESCRIPTION="Add Name in Code Here"
 COM_COMPONENTBUILDER_LAYOUT_ALIAS_HINT="codename"
 COM_COMPONENTBUILDER_LAYOUT_ALIAS_LABEL="Name in Code"
-COM_COMPONENTBUILDER_LAYOUT_CREATED_BY_DESC="The user that created the Layout."
-COM_COMPONENTBUILDER_LAYOUT_CREATED_BY_LABEL="Created by"
-COM_COMPONENTBUILDER_LAYOUT_CREATED_DATE_DESC="The date Layout was created."
-COM_COMPONENTBUILDER_LAYOUT_CREATED_DATE_LABEL="Created date"
+COM_COMPONENTBUILDER_LAYOUT_CREATED_BY_DESC="The user that created this Layout."
+COM_COMPONENTBUILDER_LAYOUT_CREATED_BY_LABEL="Created By"
+COM_COMPONENTBUILDER_LAYOUT_CREATED_DATE_DESC="The date this Layout was created."
+COM_COMPONENTBUILDER_LAYOUT_CREATED_DATE_LABEL="Created Date"
 COM_COMPONENTBUILDER_LAYOUT_CUSTOM_SCRIPT="Custom Script"
 COM_COMPONENTBUILDER_LAYOUT_DESCRIPTION="Description"
 COM_COMPONENTBUILDER_LAYOUT_DESCRIPTION_DESCRIPTION="Enter some description"
@@ -2308,6 +2351,10 @@ COM_COMPONENTBUILDER_LAYOUT_ID="Id"
 COM_COMPONENTBUILDER_LAYOUT_LAYOUT="Layout"
 COM_COMPONENTBUILDER_LAYOUT_LAYOUT_HINT="// Add the layout code here. $displayData is the Object that is used inside the layout file to build displayed output"
 COM_COMPONENTBUILDER_LAYOUT_LAYOUT_LABEL="Layout"
+COM_COMPONENTBUILDER_LAYOUT_MODIFIED_BY_DESC="The last user that modified this Layout."
+COM_COMPONENTBUILDER_LAYOUT_MODIFIED_BY_LABEL="Modified By"
+COM_COMPONENTBUILDER_LAYOUT_MODIFIED_DATE_DESC="The date this Layout was modified."
+COM_COMPONENTBUILDER_LAYOUT_MODIFIED_DATE_LABEL="Modified Date"
 COM_COMPONENTBUILDER_LAYOUT_NAME="Name"
 COM_COMPONENTBUILDER_LAYOUT_NAME_DESCRIPTION="Enter Name Here"
 COM_COMPONENTBUILDER_LAYOUT_NAME_HINT="Name Here"
@@ -2475,10 +2522,10 @@ COM_COMPONENTBUILDER_SITE_VIEW_COMMENTS_TWO="Comments 2"
 COM_COMPONENTBUILDER_SITE_VIEW_COMPASS="Compass"
 COM_COMPONENTBUILDER_SITE_VIEW_CONTRACT="Contract"
 COM_COMPONENTBUILDER_SITE_VIEW_CONTRACT_TWO="Contract 2"
-COM_COMPONENTBUILDER_SITE_VIEW_CREATED_BY_DESC="The user that created the Site View."
-COM_COMPONENTBUILDER_SITE_VIEW_CREATED_BY_LABEL="Created by"
-COM_COMPONENTBUILDER_SITE_VIEW_CREATED_DATE_DESC="The date Site View was created."
-COM_COMPONENTBUILDER_SITE_VIEW_CREATED_DATE_LABEL="Created date"
+COM_COMPONENTBUILDER_SITE_VIEW_CREATED_BY_DESC="The user that created this Site View."
+COM_COMPONENTBUILDER_SITE_VIEW_CREATED_BY_LABEL="Created By"
+COM_COMPONENTBUILDER_SITE_VIEW_CREATED_DATE_DESC="The date this Site View was created."
+COM_COMPONENTBUILDER_SITE_VIEW_CREATED_DATE_LABEL="Created Date"
 COM_COMPONENTBUILDER_SITE_VIEW_CREDIT="Credit"
 COM_COMPONENTBUILDER_SITE_VIEW_CREDIT_TWO="Credit 2"
 COM_COMPONENTBUILDER_SITE_VIEW_CSS="Css"
@@ -2601,6 +2648,10 @@ COM_COMPONENTBUILDER_SITE_VIEW_METHOD_NAME_LABEL="Method Name"
 COM_COMPONENTBUILDER_SITE_VIEW_MINUS="Minus"
 COM_COMPONENTBUILDER_SITE_VIEW_MINUS_SIGN="Minus Sign"
 COM_COMPONENTBUILDER_SITE_VIEW_MOBILE="Mobile"
+COM_COMPONENTBUILDER_SITE_VIEW_MODIFIED_BY_DESC="The last user that modified this Site View."
+COM_COMPONENTBUILDER_SITE_VIEW_MODIFIED_BY_LABEL="Modified By"
+COM_COMPONENTBUILDER_SITE_VIEW_MODIFIED_DATE_DESC="The date this Site View was modified."
+COM_COMPONENTBUILDER_SITE_VIEW_MODIFIED_DATE_LABEL="Modified Date"
 COM_COMPONENTBUILDER_SITE_VIEW_MOVE="Move"
 COM_COMPONENTBUILDER_SITE_VIEW_MUSIC="Music"
 COM_COMPONENTBUILDER_SITE_VIEW_NAME="Name"
@@ -2813,10 +2864,10 @@ COM_COMPONENTBUILDER_SNIPPETS_SUBMENU="Snippets Submenu"
 COM_COMPONENTBUILDER_SNIPPETS_SUBMENU_DESC="Allows the users in this group to update the submenu of the snippet"
 COM_COMPONENTBUILDER_SNIPPET_CHARTS="Charts"
 COM_COMPONENTBUILDER_SNIPPET_COMMON="Common"
-COM_COMPONENTBUILDER_SNIPPET_CREATED_BY_DESC="The user that created the Snippet."
-COM_COMPONENTBUILDER_SNIPPET_CREATED_BY_LABEL="Created by"
-COM_COMPONENTBUILDER_SNIPPET_CREATED_DATE_DESC="The date Snippet was created."
-COM_COMPONENTBUILDER_SNIPPET_CREATED_DATE_LABEL="Created date"
+COM_COMPONENTBUILDER_SNIPPET_CREATED_BY_DESC="The user that created this Snippet."
+COM_COMPONENTBUILDER_SNIPPET_CREATED_BY_LABEL="Created By"
+COM_COMPONENTBUILDER_SNIPPET_CREATED_DATE_DESC="The date this Snippet was created."
+COM_COMPONENTBUILDER_SNIPPET_CREATED_DATE_LABEL="Created Date"
 COM_COMPONENTBUILDER_SNIPPET_DESCRIPTION="Description"
 COM_COMPONENTBUILDER_SNIPPET_DESCRIPTION_DESCRIPTION="Add Description Here"
 COM_COMPONENTBUILDER_SNIPPET_DESCRIPTION_HINT="Add Description Here"
@@ -2832,6 +2883,10 @@ COM_COMPONENTBUILDER_SNIPPET_HEADING_LABEL="Heading"
 COM_COMPONENTBUILDER_SNIPPET_ID="Id"
 COM_COMPONENTBUILDER_SNIPPET_JAVASCRIPT="JavaScript"
 COM_COMPONENTBUILDER_SNIPPET_LAYOUT="Layout"
+COM_COMPONENTBUILDER_SNIPPET_MODIFIED_BY_DESC="The last user that modified this Snippet."
+COM_COMPONENTBUILDER_SNIPPET_MODIFIED_BY_LABEL="Modified By"
+COM_COMPONENTBUILDER_SNIPPET_MODIFIED_DATE_DESC="The date this Snippet was modified."
+COM_COMPONENTBUILDER_SNIPPET_MODIFIED_DATE_LABEL="Modified Date"
 COM_COMPONENTBUILDER_SNIPPET_NAME="Name"
 COM_COMPONENTBUILDER_SNIPPET_NAME_DESCRIPTION="Enter Name Here"
 COM_COMPONENTBUILDER_SNIPPET_NAME_HINT="Name Here"
@@ -2925,10 +2980,10 @@ COM_COMPONENTBUILDER_TEMPLATE_ALIAS="Alias"
 COM_COMPONENTBUILDER_TEMPLATE_ALIAS_DESCRIPTION="Add Name in Code Here"
 COM_COMPONENTBUILDER_TEMPLATE_ALIAS_HINT="codename"
 COM_COMPONENTBUILDER_TEMPLATE_ALIAS_LABEL="Name in Code"
-COM_COMPONENTBUILDER_TEMPLATE_CREATED_BY_DESC="The user that created the Template."
-COM_COMPONENTBUILDER_TEMPLATE_CREATED_BY_LABEL="Created by"
-COM_COMPONENTBUILDER_TEMPLATE_CREATED_DATE_DESC="The date Template was created."
-COM_COMPONENTBUILDER_TEMPLATE_CREATED_DATE_LABEL="Created date"
+COM_COMPONENTBUILDER_TEMPLATE_CREATED_BY_DESC="The user that created this Template."
+COM_COMPONENTBUILDER_TEMPLATE_CREATED_BY_LABEL="Created By"
+COM_COMPONENTBUILDER_TEMPLATE_CREATED_DATE_DESC="The date this Template was created."
+COM_COMPONENTBUILDER_TEMPLATE_CREATED_DATE_LABEL="Created Date"
 COM_COMPONENTBUILDER_TEMPLATE_CUSTOM_SCRIPT="Custom Script"
 COM_COMPONENTBUILDER_TEMPLATE_DESCRIPTION="Description"
 COM_COMPONENTBUILDER_TEMPLATE_DESCRIPTION_DESCRIPTION="Enter some description"
@@ -2943,6 +2998,10 @@ COM_COMPONENTBUILDER_TEMPLATE_DYNAMIC_VALUES_LABEL="Dynamic Values"
 COM_COMPONENTBUILDER_TEMPLATE_EDIT="Editing the Template"
 COM_COMPONENTBUILDER_TEMPLATE_ERROR_UNIQUE_ALIAS="Another Template has the same alias."
 COM_COMPONENTBUILDER_TEMPLATE_ID="Id"
+COM_COMPONENTBUILDER_TEMPLATE_MODIFIED_BY_DESC="The last user that modified this Template."
+COM_COMPONENTBUILDER_TEMPLATE_MODIFIED_BY_LABEL="Modified By"
+COM_COMPONENTBUILDER_TEMPLATE_MODIFIED_DATE_DESC="The date this Template was modified."
+COM_COMPONENTBUILDER_TEMPLATE_MODIFIED_DATE_LABEL="Modified Date"
 COM_COMPONENTBUILDER_TEMPLATE_NAME="Name"
 COM_COMPONENTBUILDER_TEMPLATE_NAME_DESCRIPTION="Enter Name Here"
 COM_COMPONENTBUILDER_TEMPLATE_NAME_HINT="Name Here"

admin/layouts/admin_view/css_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 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.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_import_fullwidth.php
@@ -34,6 +34,7 @@ $fields = $displayData->get('fields') ?: array(
 	'note_beginner_import',
 	'note_advanced_import',
 	'add_custom_import',
+	'php_import_display',
 	'html_import_view',
 	'php_import',
 	'php_import_setdata',

admin/layouts/admin_view/fields_fullwidth.php

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

admin/layouts/admin_view/javascript_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 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.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 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.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 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.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 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.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php

admin/layouts/admin_view/publlshing.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 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.8
-	@build			7th May, 2016
+	@version		2.1.16
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_above.php