Stable Release of version 2.10.5

README.md

@@ -1,8 +1,7 @@
 # Joomla Component Builder ([JCB](http://joomlacomponentbuilder.com))
 [![GitHub release](https://img.shields.io/github/release/vdm-io/Joomla-Component-Builder.svg)](https://github.com/vdm-io/Joomla-Component-Builder/releases)
 [![Total Downloads](https://img.shields.io/github/downloads/vdm-io/Joomla-Component-Builder/total.svg)](https://github.com/vdm-io/Joomla-Component-Builder/releases)
-[![Backers on Open Collective](https://opencollective.com/Joomla-Component-Builder/backers/badge.svg)](#backers)
-[![Sponsors on Open Collective](https://opencollective.com/Joomla-Component-Builder/sponsors/badge.svg)](#sponsors)
+[![JCB Pro Members](https://opencollective.com/joomla-component-builder/tiers/jcb-pro/badge.svg?label=JCB+Pro&color=brightgreen)](#sponsors)
 
 This is a [Joomla 3.x](https://extensions.joomla.org/extension/component-builder/) component. [__See In Action__](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
 
@@ -12,7 +11,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.10.0) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.10.5) with **ALL** its features and **ALL** concepts totally open-source and free! 
 
 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
 
@@ -110,8 +109,6 @@ Where can you get support and help?
 + [Report a Security Issue](http://joomlacomponentbuilder.com/report-security-issues)
 + [Community Complaint](http://joomlacomponentbuilder.com/community-complaint)
 + [Open Issue On Github](https://github.com/vdm-io/Joomla-Component-Builder/issues) ^^
-+ [Telegram Group](https://t.me/jcb_group)
-+ [JCB IRC Channel](https://vdm.bz/jcb-irc)
 
 Since [JCB](http://joomlacomponentbuilder.com) has [become a community](https://github.com/vdm-io/Joomla-Component-Builder/blob/staging/.github/SUPPORT.md) project [VDM.io](https://www.vdm.io/) is **no longer solely responsible** for support.
 
@@ -146,14 +143,14 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 14th August, 2019
-+ *Version*: 2.10.0
++ *Last Build*: 9th November, 2019
++ *Version*: 2.10.5
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **246448**
-+ *Field count*: **1319**
-+ *File count*: **1595**
-+ *Folder count*: **244**
++ *Line count*: **255982**
++ *Field count*: **1351**
++ *File count*: **1614**
++ *Folder count*: **256**
 
 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](http://joomlacomponentbuilder.com).
 > Developed by [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)

admin/README.txt

@@ -1,8 +1,7 @@
 # Joomla Component Builder ([JCB](http://joomlacomponentbuilder.com))
 [![GitHub release](https://img.shields.io/github/release/vdm-io/Joomla-Component-Builder.svg)](https://github.com/vdm-io/Joomla-Component-Builder/releases)
 [![Total Downloads](https://img.shields.io/github/downloads/vdm-io/Joomla-Component-Builder/total.svg)](https://github.com/vdm-io/Joomla-Component-Builder/releases)
-[![Backers on Open Collective](https://opencollective.com/Joomla-Component-Builder/backers/badge.svg)](#backers)
-[![Sponsors on Open Collective](https://opencollective.com/Joomla-Component-Builder/sponsors/badge.svg)](#sponsors)
+[![JCB Pro Members](https://opencollective.com/joomla-component-builder/tiers/jcb-pro/badge.svg?label=JCB+Pro&color=brightgreen)](#sponsors)
 
 This is a [Joomla 3.x](https://extensions.joomla.org/extension/component-builder/) component. [__See In Action__](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
 
@@ -12,7 +11,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.10.0) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.10.5) with **ALL** its features and **ALL** concepts totally open-source and free! 
 
 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
 
@@ -110,8 +109,6 @@ Where can you get support and help?
 + [Report a Security Issue](http://joomlacomponentbuilder.com/report-security-issues)
 + [Community Complaint](http://joomlacomponentbuilder.com/community-complaint)
 + [Open Issue On Github](https://github.com/vdm-io/Joomla-Component-Builder/issues) ^^
-+ [Telegram Group](https://t.me/jcb_group)
-+ [JCB IRC Channel](https://vdm.bz/jcb-irc)
 
 Since [JCB](http://joomlacomponentbuilder.com) has [become a community](https://github.com/vdm-io/Joomla-Component-Builder/blob/staging/.github/SUPPORT.md) project [VDM.io](https://www.vdm.io/) is **no longer solely responsible** for support.
 
@@ -146,14 +143,14 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 14th August, 2019
-+ *Version*: 2.10.0
++ *Last Build*: 9th November, 2019
++ *Version*: 2.10.5
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **246448**
-+ *Field count*: **1319**
-+ *File count*: **1595**
-+ *Folder count*: **244**
++ *Line count*: **255982**
++ *Field count*: **1351**
++ *File count*: **1614**
++ *Folder count*: **256**
 
 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](http://joomlacomponentbuilder.com).
 > Developed by [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)

admin/compiler/joomla_3/Helper.php

@@ -17,11 +17,22 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\Language\Language;
+use Joomla\String\StringHelper;
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * ###Component### component helper.
  */
 abstract class ###Component###Helper
-{###ADMIN_GLOBAL_EVENT_HELPER######CUSTOM_HELPER_SCRIPT######BOTH_CUSTOM_HELPER_SCRIPT###
+{
+	/**
+	 * The Main Active Language
+	 * 
+	 * @var      string
+	 */
+	public static $langTag;###ADMIN_GLOBAL_EVENT_HELPER######CUSTOM_HELPER_SCRIPT######BOTH_CUSTOM_HELPER_SCRIPT###
+
 	/**
 	* Load the Component xml manifest.
 	**/
@@ -198,7 +209,15 @@ abstract class ###Component###Helper
 			{
 				$query->from($db->quoteName('#_'.$main.'_'.$table));
 			}
-			$query->where($db->quoteName($whereString) . ' '.$operator.' (' . implode(',',$where) . ')');
+			// add strings to array search
+			if ('IN_STRINGS' === $operator || 'NOT IN_STRINGS' === $operator)
+			{
+				$query->where($db->quoteName($whereString) . ' ' . str_replace('_STRINGS', '', $operator) . ' ("' . implode('","',$where) . '")');
+			}
+			else
+			{
+				$query->where($db->quoteName($whereString) . ' ' . $operator . ' (' . implode(',',$where) . ')');
+			}
 			$db->setQuery($query);
 			$db->execute();
 			if ($db->getNumRows())
@@ -308,14 +327,19 @@ abstract class ###Component###Helper
 	* @param  string   $views       The related list view name
 	* @param  mixed    $target      Only get this permission (like edit, create, delete)
 	* @param  string   $component   The target component
+	* @param  object   $user        The user whose permissions we are loading
 	*
 	* @return  object   The JObject of permission/authorised actions
 	* 
 	**/
-	public static function getActions($view, &$record = null, $views = null, $target = null, $component = '###component###')
+	public static function getActions($view, &$record = null, $views = null, $target = null, $component = '###component###', $user = 'null')
 	{
-		// get the user object
-		$user = JFactory::getUser();
+		// load the user if not given
+		if (!self::checkObject($user))
+		{
+			// get the user object
+			$user = JFactory::getUser();
+		}
 		// load the JObject
 		$result = new JObject;
 		// make view name safe (just incase)
@@ -649,7 +673,7 @@ abstract class ###Component###Helper
 				}
 			}
 			// check if there are any view values remaining
-			if (count($_result))
+			if (count((array) $_result))
 			{
 				$_result = json_encode($_result);
 				$_result = array($_result);
@@ -774,7 +798,31 @@ abstract class ###Component###Helper
 				jimport('joomla.form.form');
 			}
 			// get field type
-			$field = JFormHelper::loadFieldType($attributes['type'],true);
+			$field = JFormHelper::loadFieldType($attributes['type'], true);
+			// get field xml
+			$XML = self::getFieldXML($attributes, $options);
+			// setup the field
+			$field->setup($XML, $default);
+			// return the field object
+			return $field;
+		}
+		return false;
+	}
+
+	/**
+	 * get the field xml
+	 *
+	 * @param   array      $attributes   The array of attributes
+	 * @param   array      $options      The options to apply to the XML element
+	 *
+	 * @return  object
+	 *
+	 */
+	public static function getFieldXML(&$attributes, $options = null)
+	{
+		// make sure we have attributes and a type value
+		if (self::checkArray($attributes))
+		{
 			// start field xml
 			$XML = new SimpleXMLElement('<field/>');
 			// load the attributes
@@ -785,10 +833,8 @@ abstract class ###Component###Helper
 				// load the options
 				self::xmlAddOptions($XML, $options);
 			}
-			// setup the field
-			$field->setup($XML, $default);
-			// return the field object
-			return $field;
+			// return the field xml
+			return $XML;
 		}
 		return false;
 	}
@@ -1036,6 +1082,8 @@ abstract class ###Component###Helper
 			$string = trim($string);
 			$string = preg_replace('/'.$spacer.'+/', ' ', $string);
 			$string = preg_replace('/\s+/', ' ', $string);
+			// Transliterate string
+			$string = self::transliterate($string);
 			// remove all and keep only characters
 			if ($keepOnlyCharacters)
 			{
@@ -1104,6 +1152,19 @@ abstract class ###Component###Helper
 		return '';
 	}
 
+	public static function transliterate($string)
+	{
+		// set tag only once
+		if (!self::checkString(self::$langTag))
+		{
+			// get global value
+			self::$langTag = JComponentHelper::getParams('com_###component###')->get('language', 'en-GB');
+		}
+		// Transliterate on the language requested
+		$lang = Language::getInstance(self::$langTag);
+		return $lang->transliterate($string);
+	}
+
 	public static function htmlEscape($var, $charset = 'UTF-8', $shorten = false, $length = 40)
 	{
 		if (self::checkString($var))

admin/compiler/joomla_3/Helper_site.php

@@ -17,12 +17,22 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\Language\Language;
+use Joomla\String\StringHelper;
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * ###Component### component helper
  */
 abstract class ###Component###Helper
-{###SITE_GLOBAL_EVENT_HELPER######SITE_CUSTOM_HELPER_SCRIPT######BOTH_CUSTOM_HELPER_SCRIPT###
-	
+{
+	/**
+	 * The Main Active Language
+	 * 
+	 * @var      string
+	 */
+	public static $langTag;###SITE_GLOBAL_EVENT_HELPER######SITE_CUSTOM_HELPER_SCRIPT######BOTH_CUSTOM_HELPER_SCRIPT###
+
 	public static function jsonToString($value, $sperator = ", ", $table = null, $id = 'id', $name = 'name')
 	{
 		// do some table foot work
@@ -292,7 +302,7 @@ abstract class ###Component###Helper
 				}
 			}
 			// check if there are any view values remaining
-			if (count($_result))
+			if (count((array) $_result))
 			{
 				$_result = json_encode($_result);
 				$_result = array($_result);
@@ -406,7 +416,7 @@ abstract class ###Component###Helper
 	 * @return  object
 	 *
 	 */
-	public static function getFieldObject($attributes, $default = '', $options = null)
+	public static function getFieldObject(&$attributes, $default = '', $options = null)
 	{
 		// make sure we have attributes and a type value
 		if (self::checkArray($attributes) && isset($attributes['type']))
@@ -417,7 +427,31 @@ abstract class ###Component###Helper
 				jimport('joomla.form.form');
 			}
 			// get field type
-			$field = JFormHelper::loadFieldType($attributes['type'],true);
+			$field = JFormHelper::loadFieldType($attributes['type'], true);
+			// get field xml
+			$XML = self::getFieldXML($attributes, $options);
+			// setup the field
+			$field->setup($XML, $default);
+			// return the field object
+			return $field;
+		}
+		return false;
+	}
+
+	/**
+	 * get the field xml
+	 *
+	 * @param   array      $attributes   The array of attributes
+	 * @param   array      $options      The options to apply to the XML element
+	 *
+	 * @return  object
+	 *
+	 */
+	public static function getFieldXML(&$attributes, $options = null)
+	{
+		// make sure we have attributes and a type value
+		if (self::checkArray($attributes))
+		{
 			// start field xml
 			$XML = new SimpleXMLElement('<field/>');
 			// load the attributes
@@ -428,10 +462,8 @@ abstract class ###Component###Helper
 				// load the options
 				self::xmlAddOptions($XML, $options);
 			}
-			// setup the field
-			$field->setup($XML, $default);
-			// return the field object
-			return $field;
+			// return the field xml
+			return $XML;
 		}
 		return false;
 	}
@@ -570,7 +602,15 @@ abstract class ###Component###Helper
 			{
 				$query->from($db->quoteName('#_'.$main.'_'.$table));
 			}
-			$query->where($db->quoteName($whereString) . ' '.$operator.' (' . implode(',',$where) . ')');
+			// add strings to array search
+			if ('IN_STRINGS' === $operator || 'NOT IN_STRINGS' === $operator)
+			{
+				$query->where($db->quoteName($whereString) . ' ' . str_replace('_STRINGS', '', $operator) . ' ("' . implode('","',$where) . '")');
+			}
+			else
+			{
+				$query->where($db->quoteName($whereString) . ' ' . $operator . ' (' . implode(',',$where) . ')');
+			}
 			$db->setQuery($query);
 			$db->execute();
 			if ($db->getNumRows())
@@ -632,14 +672,19 @@ abstract class ###Component###Helper
 	* @param  string   $views       The related list view name
 	* @param  mixed    $target      Only get this permission (like edit, create, delete)
 	* @param  string   $component   The target component
+	* @param  object   $user        The user whose permissions we are loading
 	*
 	* @return  object   The JObject of permission/authorised actions
 	* 
 	**/
-	public static function getActions($view, &$record = null, $views = null, $target = null, $component = '###component###')
+	public static function getActions($view, &$record = null, $views = null, $target = null, $component = '###component###', $user = 'null')
 	{
-		// get the user object
-		$user = JFactory::getUser();
+		// load the user if not given
+		if (!self::checkObject($user))
+		{
+			// get the user object
+			$user = JFactory::getUser();
+		}
 		// load the JObject
 		$result = new JObject;
 		// make view name safe (just incase)
@@ -1026,6 +1071,8 @@ abstract class ###Component###Helper
 			$string = trim($string);
 			$string = preg_replace('/'.$spacer.'+/', ' ', $string);
 			$string = preg_replace('/\s+/', ' ', $string);
+			// Transliterate string
+			$string = self::transliterate($string);
 			// remove all and keep only characters
 			if ($keepOnlyCharacters)
 			{
@@ -1094,6 +1141,19 @@ abstract class ###Component###Helper
 		return '';
 	}
 
+	public static function transliterate($string)
+	{
+		// set tag only once
+		if (!self::checkString(self::$langTag))
+		{
+			// get global value
+			self::$langTag = JComponentHelper::getParams('com_###component###')->get('language', 'en-GB');
+		}
+		// Transliterate on the language requested
+		$lang = Language::getInstance(self::$langTag);
+		return $lang->transliterate($string);
+	}
+
 	public static function htmlEscape($var, $charset = 'UTF-8', $shorten = false, $length = 40)
 	{
 		if (self::checkString($var))

admin/compiler/joomla_3/JModelAdmin.php

@@ -242,6 +242,8 @@ class ###Component###Model###View### extends JModelAdmin
 		if (empty($data))
 		{
 			$data = $this->getItem();
+			// run the perprocess of the data
+			$this->preprocessData('com_###component###.###view###', $data);
 		}
 
 		return $data;

admin/compiler/joomla_3/JModelAdmin_site.php

@@ -242,6 +242,8 @@ class ###Component###Model###View### extends JModelAdmin
 		if (empty($data))
 		{
 			$data = $this->getItem();
+			// run the perprocess of the data
+			$this->preprocessData('com_###component###.###view###', $data);
 		}
 
 		return $data;

admin/compiler/joomla_3/settings.json

@@ -212,6 +212,12 @@
 				"path": "c0mp0n3nt/site/helpers",
 				"rename": false,
 				"type": "file"
+			},
+			"import.gif": {
+				"naam": "import.gif",
+				"path": "c0mp0n3nt/admin/assets/images",
+				"rename": false,
+				"type": "file"
 			}
 		},
 		"dynamic": {
@@ -461,11 +467,6 @@
 					"newName": "default.php",
 					"type": "import"
 				},
-				"import.gif": {
-					"path": "c0mp0n3nt/admin/assets/images",
-					"rename": false,
-					"type": "import"
-				},
 				"JControllerLegacy_import_custom.php": {
 					"path": "c0mp0n3nt/admin/controllers",
 					"rename": "JControllerLegacy_import_custom",

admin/config.xml

@@ -67,6 +67,21 @@
 			folder="extension"
 			filter="cmd"
 		/>
+		<!-- Github_access_token Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="github_access_token"
+			label="COM_COMPONENTBUILDER_CONFIG_GITHUB_ACCESS_TOKEN_LABEL"
+			size="128"
+			maxlength="128"
+			description="COM_COMPONENTBUILDER_CONFIG_GITHUB_ACCESS_TOKEN_DESCRIPTION"
+			class="text_area full-width"
+			required="false"
+			filter="STRING"
+			message="COM_COMPONENTBUILDER_CONFIG_GITHUB_ACCESS_TOKEN_MESSAGE"
+			hint="COM_COMPONENTBUILDER_CONFIG_GITHUB_ACCESS_TOKEN_HINT"
+			autocomplete="off"
+		/>
 		<!-- Spacer_hr_one Field. Type: Spacer. A None Database Field. (joomla) -->
 		<field type="spacer" name="spacer_hr_one" hr="true" class="spacer_hr_one" />
 		<!-- Manage_jcb_package_directories Field. Type: Radio. (joomla) -->

admin/controllers/ajax.json.php

@@ -271,7 +271,7 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
 						$identifierValue = $jinput->get('identifier', NULL, 'CMD');
 						$keyValue = $jinput->get('key', NULL, 'ALNUM');
-						if($identifierValue && $keyValue && $user->id != 0)
+						if($identifierValue && $user->id != 0 && $keyValue)
 						{
 							$result = $this->getModel('ajax')->getCrowdinDetails($identifierValue, $keyValue);
 						}
@@ -310,7 +310,7 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
 						$idValue = $jinput->get('id', NULL, 'INT');
 						$typeValue = $jinput->get('type', NULL, 'WORD');
-						if($idValue && $typeValue && $user->id != 0)
+						if($idValue && $user->id != 0 && $typeValue)
 						{
 							$result = $this->getModel('ajax')->getClassCode($idValue, $typeValue);
 						}
@@ -349,7 +349,7 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
 						$idValue = $jinput->get('id', NULL, 'INT');
 						$typeValue = $jinput->get('type', NULL, 'WORD');
-						if($idValue && $typeValue && $user->id != 0)
+						if($idValue && $user->id != 0 && $typeValue)
 						{
 							$result = $this->getModel('ajax')->getClassCodeIds($idValue, $typeValue);
 						}
@@ -388,7 +388,7 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
 						$idValue = $jinput->get('id', NULL, 'INT');
 						$typeValue = $jinput->get('type', NULL, 'WORD');
-						if($idValue && $typeValue && $user->id != 0)
+						if($idValue && $user->id != 0 && $typeValue)
 						{
 							$result = $this->getModel('ajax')->getClassHeaderCode($idValue, $typeValue);
 						}
@@ -541,7 +541,7 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
 						$typeValue = $jinput->get('type', NULL, 'WORD');
 						$sizeValue = $jinput->get('size', NULL, 'INT');
-						if($typeValue && $sizeValue && $user->id != 0)
+						if($typeValue && $user->id != 0 && $sizeValue)
 						{
 							$result = $this->getModel('ajax')->getButton($typeValue, $sizeValue);
 						}
@@ -580,7 +580,7 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
 						$typeValue = $jinput->get('type', NULL, 'WORD');
 						$sizeValue = $jinput->get('size', NULL, 'INT');
-						if($typeValue && $sizeValue && $user->id != 0)
+						if($typeValue && $user->id != 0 && $sizeValue)
 						{
 							$result = $this->getModel('ajax')->getButtonID($typeValue, $sizeValue);
 						}
@@ -810,7 +810,7 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						$nameValue = $jinput->get('name', NULL, 'WORD');
 						$asValue = $jinput->get('as', NULL, 'WORD');
 						$typeValue = $jinput->get('type', NULL, 'INT');
-						if($nameValue && $asValue && $typeValue && $user->id != 0)
+						if($nameValue && $user->id != 0 && $asValue && $typeValue)
 						{
 							$result = $this->getModel('ajax')->getDbTableColumns($nameValue, $asValue, $typeValue);
 						}
@@ -850,7 +850,7 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						$idValue = $jinput->get('id', NULL, 'INT');
 						$asValue = $jinput->get('as', NULL, 'WORD');
 						$typeValue = $jinput->get('type', NULL, 'INT');
-						if($idValue && $asValue && $typeValue && $user->id != 0)
+						if($idValue && $user->id != 0 && $asValue && $typeValue)
 						{
 							$result = $this->getModel('ajax')->getViewTableColumns($idValue, $asValue, $typeValue);
 						}
@@ -889,7 +889,7 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
 						$idValue = $jinput->get('id', NULL, 'INT');
 						$viewValue = $jinput->get('view', NULL, 'WORD');
-						if($idValue && $viewValue && $user->id != 0)
+						if($idValue && $user->id != 0 && $viewValue)
 						{
 							$result = $this->getModel('ajax')->getDynamicValues($idValue, $viewValue);
 						}
@@ -928,7 +928,7 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
 						$functioNameValue = $jinput->get('functioName', NULL, 'STRING');
 						$idValue = $jinput->get('id', NULL, 'INT');
-						if($functioNameValue && $idValue && $user->id != 0)
+						if($functioNameValue && $user->id != 0 && $idValue)
 						{
 							$result = $this->getModel('ajax')->checkFunctionName($functioNameValue, $idValue);
 						}
@@ -968,7 +968,7 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						$functioNameValue = $jinput->get('functioName', NULL, 'WORD');
 						$idValue = $jinput->get('id', NULL, 'INT');
 						$targetValue = $jinput->get('target', NULL, 'WORD');
-						if($functioNameValue && $idValue && $targetValue && $user->id != 0)
+						if($functioNameValue && $user->id != 0 && $idValue && $targetValue)
 						{
 							$result = $this->getModel('ajax')->usedin($functioNameValue, $idValue, $targetValue);
 						}
@@ -1046,7 +1046,7 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						$placeholderValue = $jinput->get('placeholder', NULL, 'WORD');
 						$idValue = $jinput->get('id', NULL, 'INT');
 						$targetValue = $jinput->get('target', NULL, 'WORD');
-						if($placeholderValue && $idValue && $targetValue && $user->id != 0)
+						if($placeholderValue && $user->id != 0 && $idValue && $targetValue)
 						{
 							$result = $this->getModel('ajax')->placedin($placeholderValue, $idValue, $targetValue);
 						}
@@ -1085,7 +1085,7 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
 						$idValue = $jinput->get('id', NULL, 'INT');
 						$placeholderNameValue = $jinput->get('placeholderName', NULL, 'STRING');
-						if($idValue && $placeholderNameValue && $user->id != 0)
+						if($idValue && $user->id != 0 && $placeholderNameValue)
 						{
 							$result = $this->getModel('ajax')->checkPlaceholderName($idValue, $placeholderNameValue);
 						}
@@ -1200,7 +1200,7 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
 						$nameValue = $jinput->get('name', NULL, 'STRING');
 						$idValue = $jinput->get('id', NULL, 'INT');
-						if($nameValue && $idValue && $user->id != 0)
+						if($nameValue && $user->id != 0 && $idValue)
 						{
 							$result = $this->getModel('ajax')->checkRuleName($nameValue, $idValue);
 						}
@@ -1277,7 +1277,7 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
 						$propertyValue = $jinput->get('property', NULL, 'WORD');
 						$fieldtypeValue = $jinput->get('fieldtype', NULL, 'ALNUM');
-						if($propertyValue && $fieldtypeValue && $user->id != 0)
+						if($propertyValue && $user->id != 0 && $fieldtypeValue)
 						{
 							$result = $this->getModel('ajax')->getFieldPropertyDesc($propertyValue, $fieldtypeValue);
 						}
@@ -1318,7 +1318,7 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						$joinfieldsValue = $jinput->get('joinfields', NULL, 'STRING');
 						$typeValue = $jinput->get('type', NULL, 'INT');
 						$areaValue = $jinput->get('area', NULL, 'INT');
-						if($listfieldValue && $joinfieldsValue && $typeValue && $areaValue && $user->id != 0)
+						if($listfieldValue && $user->id != 0 && $joinfieldsValue && $typeValue && $areaValue)
 						{
 							$result = $this->getModel('ajax')->getCodeGlueOptions($listfieldValue, $joinfieldsValue, $typeValue, $areaValue);
 						}
@@ -1395,7 +1395,7 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
 						$pathValue = $jinput->get('path', NULL, 'STRING');
 						$statusValue = $jinput->get('status', NULL, 'WORD');
-						if($pathValue && $statusValue && $user->id != 0)
+						if($pathValue && $user->id != 0 && $statusValue)
 						{
 							$result = $this->getModel('ajax')->setSnippetGithub($pathValue, $statusValue);
 						}

admin/controllers/compiler.php

@@ -288,7 +288,7 @@ class ComponentbuilderControllerCompiler extends JControllerAdmin
 				$pluginId = $jinput->post->get('install_item_id', 0, 'INT');
 				if ($pluginId > 0 && isset($fileNames[$pluginId]) && $this->installExtension($fileNames[$pluginId]))
 				{
-					$message = JText::sprintf('COM_COMPONENTBUILDER_ONLY_SZIP_FILE_WAS_REMOVED_THE_FROM_TMP_FOLDER_DURING_INSTALLATION', $fileName);
+					$message = JText::sprintf('COM_COMPONENTBUILDER_ONLY_SZIP_FILE_WAS_REMOVED_THE_FROM_TMP_FOLDER_DURING_INSTALLATION', $fileNames[$pluginId]);
 					$this->setRedirect($redirect_url, $message, 'message');
 					return true;
 				}

admin/helpers/compiler.php

@@ -20,25 +20,25 @@ ComponentbuilderHelper::autoLoader();
  */
 class Compiler extends Infusion
 {
-	/*
+	/**
 	 * The Temp path
-	 * 
+	 *
 	 * @var      string
 	 */
 	private $tempPath;
 
-	/*
+	/**
 	 * The timer
-	 * 
+	 *
 	 * @var      string
 	 */
 	private $time_start;
 	private $time_end;
 	public $secondsCompiled;
 
-	/*
+	/**
 	 * The file path array
-	 * 
+	 *
 	 * @var      string
 	 */
 	public $filepath = array(
@@ -93,16 +93,25 @@ class Compiler extends Infusion
 				$componentXML = str_replace(array('<files folder="site">' . $textToSite . "</files>", '<languages folder="site">' . $textToSiteLang . "</languages>"), array('', ''), $componentXML);
 				$this->writeFile($xmlPath, $componentXML);
 			}
+			// Trigger Event: jcb_ce_onBeforeUpdateFiles
+			$this->triggerEvent('jcb_ce_onBeforeUpdateFiles', array(&$this->componentContext, $this));
 			// now update the files
 			if (!$this->updateFiles())
 			{
 				return false;
 			}
+			// Trigger Event: jcb_ce_onBeforeGetCustomCode
+			$this->triggerEvent('jcb_ce_onBeforeGetCustomCode', array(&$this->componentContext, $this));
 			// now insert into the new files
 			if ($this->getCustomCode())
 			{
+				// Trigger Event: jcb_ce_onBeforeAddCustomCode
+				$this->triggerEvent('jcb_ce_onBeforeAddCustomCode', array(&$this->componentContext, $this));
+
 				$this->addCustomCode();
 			}
+			// Trigger Event: jcb_ce_onBeforeSetLangFileData
+			$this->triggerEvent('jcb_ce_onBeforeSetLangFileData', array(&$this->componentContext, $this));
 			// set the lang data now
 			$this->setLangFileData();
 			// set the language notice if it was set
@@ -165,7 +174,7 @@ class Compiler extends Infusion
 				if (isset($mismatch) && ComponentbuilderHelper::checkArray($mismatch))
 				{
 					$this->app->enqueueMessage(JText::_('<hr /><h3>Language Warning</h3>'), 'Warning');
-					if (count($mismatch) > 1)
+					if (count((array) $mismatch) > 1)
 					{
 						$this->app->enqueueMessage(JText::_('<h3>Please check the following mismatching Joomla.JText language constants.</h3>'), 'Warning');
 					}
@@ -203,11 +212,11 @@ class Compiler extends Infusion
 
 	/**
 	 * Set the line number in comments
-	 * 
+	 *
 	 * @param   int   $nr  The line number
-	 * 
+	 *
 	 * @return  void
-	 * 
+	 *
 	 */
 	private function setLine($nr)
 	{
@@ -260,12 +269,48 @@ class Compiler extends Infusion
 			// free up some memory
 			unset($this->newFiles['dynamic']);
 			// do plugins if found
-			if (ComponentbuilderHelper::checkArray($this->componentData->joomla_plugins))
+			if (ComponentbuilderHelper::checkArray($this->joomlaPlugins))
 			{
-				foreach ($this->componentData->joomla_plugins as $plugin)
+				foreach ($this->joomlaPlugins as $plugin)
 				{
 					if (ComponentbuilderHelper::checkObject($plugin) && isset($this->newFiles[$plugin->key]) && ComponentbuilderHelper::checkArray($this->newFiles[$plugin->key]))
 					{
+						// move field or rule if needed
+						if (isset($plugin->fields_rules_paths) && $plugin->fields_rules_paths == 2)
+						{
+							// check the config fields
+							if (isset($plugin->config_fields) && ComponentbuilderHelper::checkArray($plugin->config_fields))
+							{
+								foreach ($plugin->config_fields as $field_name => $fieldsets)
+								{
+									foreach ($fieldsets as $fieldset => $fields)
+									{
+										foreach ($fields as $field)
+										{
+											$this->moveFieldsRules($field, $plugin->folder_path);
+										}
+									}
+								}
+							}
+							// check the fieldsets
+							if (isset($plugin->form_files) && ComponentbuilderHelper::checkArray($plugin->form_files))
+							{
+								foreach($plugin->form_files as $file => $files)
+								{
+									foreach ($files as $field_name => $fieldsets)
+									{
+										foreach ($fieldsets as $fieldset => $fields)
+										{
+											foreach ($fields as $field)
+											{
+												$this->moveFieldsRules($field, $plugin->folder_path);
+											}
+										}
+									}
+								}
+							}
+						}
+						// now move the files
 						foreach ($this->newFiles[$plugin->key] as $plugin_file)
 						{
 							if (JFile::exists($plugin_file['path']))
@@ -355,9 +400,9 @@ class Compiler extends Infusion
 			}
 		}
 		// move the plugins update server to host
-		if (ComponentbuilderHelper::checkArray($this->componentData->joomla_plugins))
+		if (ComponentbuilderHelper::checkArray($this->joomlaPlugins))
 		{
-			foreach ($this->componentData->joomla_plugins as $plugin)
+			foreach ($this->joomlaPlugins as $plugin)
 			{
 				if (ComponentbuilderHelper::checkObject($plugin)
 					&& isset($plugin->add_update_server) && $plugin->add_update_server == 1
@@ -528,9 +573,9 @@ class Compiler extends Infusion
 			$this->triggerEvent('jcb_ce_onAfterUpdateRepo', array(&$this->componentContext, &$this->componentPath, &$repoFullPath, &$this->componentData));
 
 			// move the plugins to local folder repos
-			if (ComponentbuilderHelper::checkArray($this->componentData->joomla_plugins))
+			if (ComponentbuilderHelper::checkArray($this->joomlaPlugins))
 			{
-				foreach ($this->componentData->joomla_plugins as $plugin)
+				foreach ($this->joomlaPlugins as $plugin)
 				{
 					if (ComponentbuilderHelper::checkObject($plugin) && isset($plugin->file_name))
 					{
@@ -596,9 +641,9 @@ class Compiler extends Infusion
 
 	private function zipPlugins()
 	{
-		if (ComponentbuilderHelper::checkArray($this->componentData->joomla_plugins))
+		if (ComponentbuilderHelper::checkArray($this->joomlaPlugins))
 		{
-			foreach ($this->componentData->joomla_plugins as $plugin)
+			foreach ($this->joomlaPlugins as $plugin)
 			{
 				if (ComponentbuilderHelper::checkObject($plugin) && isset($plugin->zip_name)
 					&& ComponentbuilderHelper::checkString($plugin->zip_name)
@@ -697,7 +742,7 @@ class Compiler extends Infusion
 							// we musk keep last three lines to dynamic find target entry
 							$fingerPrint[$lineNumber] = trim($lineContent);
 							// check lines each time if it fits our target
-							if (count($fingerPrint) === $sizeEnd && !$foundEnd)
+							if (count((array) $fingerPrint) === $sizeEnd && !$foundEnd)
 							{
 								$fingerTest = md5(implode('', $fingerPrint));
 								if ($fingerTest === $hashEnd)
@@ -721,7 +766,7 @@ class Compiler extends Infusion
 						// we musk keep last three lines to dynamic find target entry
 						$fingerPrint[$lineNumber] = trim($lineContent);
 						// check lines each time if it fits our target
-						if (count($fingerPrint) === $size && !$found)
+						if (count((array) $fingerPrint) === $size && !$found)
 						{
 							$fingerTest = md5(implode('', $fingerPrint));
 							if ($fingerTest === $hash)
@@ -761,7 +806,7 @@ class Compiler extends Infusion
 							// Load escaped code since the target endhash has changed
 							$this->loadEscapedCode($file, $target, $lineBites);
 							$this->app->enqueueMessage(JText::_('<hr /><h3>Custom Code Warning</h3>'), 'Warning');
-							$this->app->enqueueMessage(JText::sprintf('Custom code could not be added to <b>%s</b> please review the file at <b>line %s</b>. This could be due to a change to lines below the custom code.', $target['path'], $target['from_line']), 'Warning');
+							$this->app->enqueueMessage(JText::sprintf('Custom code %s could not be added to <b>%s</b> please review the file after install at <b>line %s</b> and reposition the code, remove the comments and recompile to fix the issue. The issue could be due to a change to <b>lines below</b> the custom code.', '<a href="index.php?option=com_componentbuilder&view=custom_codes&task=custom_code.edit&id=' . $target['id'] . '" target="_blank">#' . $target['id'] . '</a>', $target['path'], $target['from_line']), 'Warning');
 						}
 					}
 					else
@@ -769,7 +814,7 @@ class Compiler extends Infusion
 						// Load escaped code since the target hash has changed
 						$this->loadEscapedCode($file, $target, $lineBites);
 						$this->app->enqueueMessage(JText::_('<hr /><h3>Custom Code Warning</h3>'), 'Warning');
-						$this->app->enqueueMessage(JText::sprintf('Custom code could not be added to <b>%s</b> please review the file at <b>line %s</b>. This could be due to a change to lines above the custom code.', $target['path'], $target['from_line']), 'Warning');
+						$this->app->enqueueMessage(JText::sprintf('Custom code %s could not be added to <b>%s</b> please review the file after install at <b>line %s</b> and reposition the code, remove the comments and recompile to fix the issue. The issue could be due to a change to <b>lines above</b> the custom code.', '<a href="index.php?option=com_componentbuilder&view=custom_codes&task=custom_code.edit&id=' . $target['id'] . '" target="_blank">#' . $target['id'] . '</a>', $target['path'], $target['from_line']), 'Warning');
 					}
 				}
 				else

admin/helpers/compiler/b_Structure.php

@@ -372,7 +372,7 @@ class Structure extends Get
 			// load the libraries files/folders and url's
 			$this->setLibraries();
 			// load the plugin files/folders and url's
-			$this->setPlugins();
+			$this->buildPlugins();
 			// set the Joomla Version Data
 			$this->joomlaVersionData = $this->setJoomlaVersionData();
 			// Trigger Event: jcb_ce_onAfterSetJoomlaVersionData
@@ -422,13 +422,13 @@ class Structure extends Get
 	 * @return  void
 	 * 
 	 */
-	private function setPlugins()
+	private function buildPlugins()
 	{
-		if (ComponentbuilderHelper::checkArray($this->componentData->joomla_plugins))
+		if (ComponentbuilderHelper::checkArray($this->joomlaPlugins))
 		{
 			// Trigger Event: jcb_ce_onBeforeSetPlugins
-			$this->triggerEvent('jcb_ce_onBeforeSetPlugins', array(&$this->componentContext, &$this->componentData->joomla_plugins));
-			foreach ($this->componentData->joomla_plugins as $plugin)
+			$this->triggerEvent('jcb_ce_onBeforeBuildPlugins', array(&$this->componentContext, &$this->joomlaPlugins));
+			foreach ($this->joomlaPlugins as $plugin)
 			{
 				if (ComponentbuilderHelper::checkObject($plugin) && isset($plugin->folder_name)
 					&& ComponentbuilderHelper::checkString($plugin->folder_name))
@@ -491,6 +491,110 @@ class Structure extends Get
 						// count the file created
 						$this->fileCount++;
 					}
+					// set fields & rules folders if needed
+					if (isset($plugin->fields_rules_paths) && $plugin->fields_rules_paths == 2)
+					{
+						// create fields folder
+						if (!JFolder::exists($plugin->folder_path . '/fields'))
+						{
+							JFolder::create($plugin->folder_path . '/fields');
+							// count the folder created
+							$this->folderCount++;
+							$this->indexHTML($plugin->folder_name . '/fields', $this->compilerPath);
+						}
+						// create rules folder
+						if (!JFolder::exists($plugin->folder_path . '/rules'))
+						{
+							JFolder::create($plugin->folder_path . '/rules');
+							// count the folder created
+							$this->folderCount++;
+							$this->indexHTML($plugin->folder_name . '/rules', $this->compilerPath);
+						}
+					}
+					// set forms folder if needed
+					if (isset($plugin->form_files) && ComponentbuilderHelper::checkArray($plugin->form_files))
+					{
+						// create forms folder
+						if (!JFolder::exists($plugin->folder_path . '/forms'))
+						{
+							JFolder::create($plugin->folder_path . '/forms');
+							// count the folder created
+							$this->folderCount++;
+							$this->indexHTML($plugin->folder_name . '/forms', $this->compilerPath);
+						}
+						// set the template files
+						foreach($plugin->form_files as $file => $fields)
+						{
+							// set file details
+							$fileDetails = array('path' => $plugin->folder_path . '/forms/' . $file . '.xml',
+								'name' => $file . '.xml', 'zip' => 'forms/' . $file . '.xml');
+							// biuld basic XML
+							$xml = '<?xml version="1.0" encoding="utf-8"?>';
+							$xml .= PHP_EOL . '<!--' . $this->setLine(__LINE__) . ' default paths of ' . $file . ' form points to ' . $this->componentCodeName . ' -->';
+							$xml .= PHP_EOL . '<form';
+							$xml .= PHP_EOL . $this->_t(1) . 'addrulepath="/administrator/components/com_' . $this->componentCodeName . '/models/rules"';
+							$xml .= PHP_EOL . $this->_t(1) . 'addfieldpath="/administrator/components/com_' . $this->componentCodeName . '/models/fields"';
+							$xml .= PHP_EOL . '>';
+							foreach ($fields as $field_name => $fieldsets)
+							{
+								// check if we have an double fields naming set
+								$field_name_inner = '';
+								$field_name_outer = $field_name;
+								if (strpos($field_name, '.') !== false)
+								{
+									$field_names = explode('.', $field_name);
+									if (count((array) $field_names) == 2)
+									{
+										$field_name_outer = $field_names[0];
+										$field_name_inner = $field_names[1];
+									}
+								}
+								$xml .= PHP_EOL . $this->_t(1) . '<fields name="' . $field_name_outer . '">';
+								foreach ($fieldsets as $fieldset => $field)
+								{
+									// default to the field set name
+									$label = $fieldset;
+									if (isset($plugin->fieldsets_label[$file.$field_name.$fieldset]))
+									{
+										$label = $plugin->fieldsets_label[$file.$field_name.$fieldset];
+									}
+									// add path to plugin rules and custom fields
+									if (isset($plugin->fieldsets_paths[$file.$field_name.$fieldset]) && $plugin->fieldsets_paths[$file.$field_name.$fieldset] == 2)
+									{
+										$xml .= PHP_EOL . $this->_t(1) . '<!--' . $this->setLine(__LINE__) . ' default paths of ' . $fieldset . ' fieldset points to the plugin -->';
+										$xml .= PHP_EOL . $this->_t(1) . '<fieldset name="' . $fieldset . '" label="' . $label . '"';
+										$xml .= PHP_EOL . $this->_t(2) . 'addrulepath="/plugins/' . strtolower($plugin->group) . '/' . strtolower($plugin->code_name) . '/rules"';
+										$xml .= PHP_EOL . $this->_t(2) . 'addfieldpath="/plugins/' . strtolower($plugin->group) . '/' . strtolower($plugin->code_name) . '/fields"';
+										$xml .= PHP_EOL . $this->_t(1) . '>';
+									}
+									else
+									{
+										$xml .= PHP_EOL . $this->_t(1) . '<fieldset name="' . $fieldset . '" label="' . $label . '">';
+									}
+									// check if we have an inner field set
+									if (ComponentbuilderHelper::checkString($field_name_inner))
+									{
+										$xml .= PHP_EOL . $this->_t(1) . '<fields name="' . $field_name_inner . '">';
+									}
+									// add the placeholder of the fields
+									$xml .= $this->hhh . 'FIELDSET_' . $file.$field_name.$fieldset . $this->hhh;
+									// check if we have an inner field set
+									if (ComponentbuilderHelper::checkString($field_name_inner))
+									{
+										$xml .= PHP_EOL . $this->_t(1) . '</fields>';
+									}
+									$xml .= PHP_EOL . $this->_t(1) . '</fieldset>';
+								}
+								$xml .= PHP_EOL . $this->_t(1) . '</fields>';
+							}
+							$xml .= PHP_EOL . '</form>';
+							// add xml to file
+							$this->writeFile($fileDetails['path'], $xml);
+							$this->newFiles[$plugin->key][] = $fileDetails;
+							// count the file created
+							$this->fileCount++;
+						}
+					}
 					// set SQL stuff if needed
 					if ($plugin->add_sql || $plugin->add_sql_uninstall)
 					{
@@ -761,7 +865,7 @@ class Structure extends Get
 		{
 			// set the default view
 			$getter = explode('_', $this->componentData->dashboard);
-			if (count($getter) == 2 && is_numeric($getter[1]))
+			if (count((array) $getter) == 2 && is_numeric($getter[1]))
 			{
 				// the pointers
 				$t = ComponentbuilderHelper::safeString($getter[0], 'U');
@@ -1130,7 +1234,7 @@ class Structure extends Get
 							$this->app->enqueueMessage(JText::sprintf('A method (setDynamicF0ld3rs) was added to the install <b>script.php</b> of this package to insure that the folder/s are copied into the correct place when this componet is installed!'), 'Notice');
 						}
 					}
-					elseif (count($checker) == 2 && ComponentbuilderHelper::checkString($checker[0]))
+					elseif (count((array) $checker) == 2 && ComponentbuilderHelper::checkString($checker[0]))
 					{
 						$add_to_extra = false;
 						// set the target
@@ -1279,13 +1383,50 @@ class Structure extends Get
 		return false;
 	}
 
+	/**
+	 * move the fields and Rules
+	 *
+	 * @param   array   $field  The field data
+	 * @param   string  $path   The path to move to
+	 *
+	 * @return void
+	 *
+	 */
+	public function moveFieldsRules($field, $path)
+	{
+		// check if this is a custom field that should be moved
+		if (isset($this->extentionCustomfields[$field['type_name']]))
+		{
+			// check files exist
+			if (JFile::exists($this->componentPath . '/admin/models/fields/' . $field['type_name'] . '.php'))
+			{
+				// move the custom field
+				JFile::copy($this->componentPath . '/admin/models/fields/' . $field['type_name'] . '.php', $path . '/fields/' . $field['type_name'] . '.php');
+			}
+			// do this just once
+			unset($this->extentionCustomfields[$field['type_name']]);
+		}
+		// check if this has validation that should be moved
+		if (isset($this->validationLinkedFields[$field['field']]))
+		{
+			// check files exist
+			if (JFile::exists($this->componentPath . '/admin/models/rules/' . $this->validationLinkedFields[$field['field']] . '.php'))
+			{
+				// move the custom field
+				JFile::copy($this->componentPath . '/admin/models/rules/' . $this->validationLinkedFields[$field['field']] . '.php', $path . '/rules/' . $this->validationLinkedFields[$field['field']] . '.php');
+			}
+			// do this just once
+			unset($this->validationLinkedFields[$field['field']]);
+		}
+	}
+
 	/**
 	 * get the created date of the (view)
-	 *  
+	 *
 	 * @param   array   $view  The view values
-	 * 
+	 *
 	 * @return  string Last Modified Date
-	 * 
+	 *
 	 */
 	public function getCreatedDate($view)
 	{
@@ -1304,11 +1445,11 @@ class Structure extends Get
 
 	/**
 	 * get the last modified date of a MVC (view)
-	 *  
+	 *
 	 * @param   array   $view  The view values
-	 * 
+	 *
 	 * @return  string Last Modified Date
-	 * 
+	 *
 	 */
 	public function getLastModifiedDate($view)
 	{
@@ -1487,10 +1628,9 @@ class Structure extends Get
 
 	/**
 	 * set the Joomla Version Data
-	 * 
 	 *
 	 * @return  oject The version data
-	 * 
+	 *
 	 */
 	private function setJoomlaVersionData()
 	{
@@ -1722,11 +1862,11 @@ class Structure extends Get
 
 	/**
 	 * set the index.html file in a folder path
-	 * 
+	 *
 	 * @param   string   $path  The path to place the index.html file in
 	 *
 	 * @return  void
-	 * 
+	 *
 	 */
 	private function indexHTML($path, $root = 'component')
 	{

admin/helpers/compiler/c_Fields.php

@@ -20,252 +20,266 @@ class Fields extends Structure
 
 	/**
 	 * Metadate Switch
-	 * 
+	 *
 	 * @var    array
 	 */
 	public $metadataBuilder = array();
 
 	/**
 	 * View access Switch
-	 * 
+	 *
 	 * @var    array
 	 */
 	public $accessBuilder = array();
 
 	/**
 	 * edit view tabs counter
-	 * 
+	 *
 	 * @var    array
 	 */
 	public $tabCounter = array();
 
 	/**
 	 * layout builder
-	 * 
+	 *
 	 * @var    array
 	 */
 	public $layoutBuilder = array();
 
 	/**
 	 * used to fix the zero order
-	 * 
+	 *
 	 * @var    array
 	 */
 	private $zeroOrderFix = array();
 
 	/**
 	 * Site field data
-	 * 
+	 *
 	 * @var    array
 	 */
 	public $siteFieldData = array();
 
 	/**
 	 * list of fields that are not being escaped
-	 * 
+	 *
 	 * @var    array
 	 */
 	public $doNotEscape = array();
 
 	/**
 	 * list of classes used in the list view for the fields
-	 * 
+	 *
 	 * @var    array
 	 */
 	public $listFieldClass = array();
 
 	/**
 	 * tags builder
-	 * 
+	 *
 	 * @var    array
 	 */
 	public $tagsBuilder = array();
 
 	/**
 	 * query builder
-	 * 
+	 *
 	 * @var    array
 	 */
 	public $queryBuilder = array();
 
 	/**
 	 * unique keys for database field
-	 * 
+	 *
 	 * @var    array
 	 */
 	public $dbUniqueKeys = array();
 
 	/**
 	 * keys for database field
-	 * 
+	 *
 	 * @var    array
 	 */
 	public $dbKeys = array();
 
 	/**
 	 * history builder
-	 * 
+	 *
 	 * @var    array
 	 */
 	public $historyBuilder = array();
 
 	/**
 	 * alias builder
-	 * 
+	 *
 	 * @var    array
 	 */
 	public $aliasBuilder = array();
 
 	/**
 	 * title builder
-	 * 
+	 *
 	 * @var    array
 	 */
 	public $titleBuilder = array();
 
 	/**
 	 * list builder
-	 * 
+	 *
 	 * @var    array
 	 */
 	public $listBuilder = array();
 
 	/**
 	 * custom Builder List
-	 * 
+	 *
 	 * @var    array
 	 */
 	public $customBuilderList = array();
 
 	/**
 	 * Hidden Fields Builder
-	 * 
+	 *
 	 * @var    array
 	 */
 	public $hiddenFieldsBuilder = array();
 
 	/**
 	 * INT Field Builder
-	 * 
+	 *
 	 * @var    array
 	 */
 	public $intFieldsBuilder = array();
 
 	/**
 	 * Dynamic Fields Builder
-	 * 
+	 *
 	 * @var    array
 	 */
 	public $dynamicfieldsBuilder = array();
 
 	/**
 	 * Main text Builder
-	 * 
+	 *
 	 * @var    array
 	 */
 	public $maintextBuilder = array();
 
 	/**
 	 * Custom Builder
-	 * 
+	 *
 	 * @var    array
 	 */
 	public $customBuilder = array();
 
 	/**
 	 * Custom Field Links Builder
-	 * 
+	 *
 	 * @var    array
 	 */
 	public $customFieldLinksBuilder = array();
 
 	/**
 	 * Set Script for User Switch
-	 * 
+	 *
 	 * @var    array
 	 */
 	public $setScriptUserSwitch = array();
 
 	/**
 	 * Set Script for Media Switch
-	 * 
+	 *
 	 * @var    array
 	 */
 	public $setScriptMediaSwitch = array();
 
 	/**
 	 * Category builder
-	 * 
+	 *
 	 * @var    array
 	 */
 	public $categoryBuilder = array();
 
 	/**
 	 * Category Code builder
-	 * 
+	 *
 	 * @var    array
 	 */
 	public $catCodeBuilder = array();
 
 	/**
 	 * Check Box builder
-	 * 
+	 *
 	 * @var    array
 	 */
 	public $checkboxBuilder = array();
 
 	/**
 	 * Json String Builder
-	 * 
+	 *
 	 * @var    array
 	 */
 	public $jsonStringBuilder = array();
 
 	/**
 	 * Json String Builder for return values to array
-	 * 
+	 *
 	 * @var    array
 	 */
 	public $jsonItemBuilderArray = array();
 
 	/**
 	 * Json Item Builder
-	 * 
+	 *
 	 * @var    array
 	 */
 	public $jsonItemBuilder = array();
 
 	/**
 	 * Base 64 Builder
-	 * 
+	 *
 	 * @var    array
 	 */
 	public $base64Builder = array();
 
 	/**
-	 * Basic Encryption Builder
-	 * 
+	 * Basic Encryption Field Modeling
+	 *
 	 * @var    array
 	 */
-	public $basicEncryptionBuilder = array();
+	public $basicFieldModeling = array();
 
 	/**
-	 * WHMCS Encryption Builder
-	 * 
+	 * WHMCS Encryption Field Modeling
+	 *
 	 * @var    array
 	 */
-	public $whmcsEncryptionBuilder = array();
+	public $whmcsFieldModeling = array();
 
 	/**
-	 * Medium Encryption Builder
-	 * 
+	 * Medium Encryption Field Modeling
+	 *
 	 * @var    array
 	 */
-	public $mediumEncryptionBuilder = array();
+	public $mediumFieldModeling = array();
+
+	/**
+	 * Expert Field Modeling
+	 *
+	 * @var    array
+	 */
+	public $expertFieldModeling = array();
+
+	/**
+	 * Expert Mode Initiator
+	 *
+	 * @var    array
+	 */
+	public $expertFieldModelInitiator = array();
 
 	/**
 	 * Get Items Method List String Fix Builder
-	 * 
+	 *
 	 * @var    array
 	 */
 	public $getItemsMethodListStringFixBuilder = array();
@@ -333,6 +347,13 @@ class Fields extends Structure
 	 */
 	public $movedPublishingFields = array();
 
+	/**
+	 * Extention Custom Fields
+	 * 
+	 * @var    array
+	 */
+	public $extentionCustomfields = array();
+
 	/**
 	 * Set the line number in comments
 	 * 
@@ -413,7 +434,7 @@ class Fields extends Structure
 			$this->setLangContent($this->lang, $langView . '_MODIFIED_BY_LABEL', "Modified By");
 			$this->setLangContent($this->lang, $langView . '_MODIFIED_BY_DESC', "The last user that modified this " . $view['settings']->name_single . ".");
 			$this->setLangContent($this->lang, $langView . '_ORDERING_LABEL', "Ordering");
-			$this->setLangContent($this->lang, $langView . '_VERSION_LABEL', "Revision");
+			$this->setLangContent($this->lang, $langView . '_VERSION_LABEL', "Version");
 			$this->setLangContent($this->lang, $langView . '_VERSION_DESC', "A count of the number of times this " . $view['settings']->name_single . " has been revised.");
 			$this->setLangContent($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.");
 			// check what type of field builder to use
@@ -626,29 +647,35 @@ class Fields extends Structure
 		if (isset($this->metadataBuilder[$view_name_single]) && ComponentbuilderHelper::checkString($this->metadataBuilder[$view_name_single]))
 		{
 			// metakey
-			$fieldSet[] = $this->_t(2) . "<!--" . $this->setLine(__LINE__) . " Metakey Field. Type: Textarea (joomla) -->";
-			$fieldSet[] = $this->_t(2) . "<field";
-			$fieldSet[] = $this->_t(3) . 'name="metakey"';
-			$fieldSet[] = $this->_t(3) . 'type="textarea"';
-			$fieldSet[] = $this->_t(3) . 'label="JFIELD_META_KEYWORDS_LABEL"';
-			$fieldSet[] = $this->_t(3) . 'description="JFIELD_META_KEYWORDS_DESC"';
-			$fieldSet[] = $this->_t(3) . 'rows="3"';
-			$fieldSet[] = $this->_t(3) . 'cols="30"';
-			$fieldSet[] = $this->_t(2) . "/>";
-			// count the static field created
-			$this->fieldCount++;
+			if (!isset($this->fieldsNames[$view_name_single]['metakey']))
+			{
+				$fieldSet[] = $this->_t(2) . "<!--" . $this->setLine(__LINE__) . " Metakey Field. Type: Textarea (joomla) -->";
+				$fieldSet[] = $this->_t(2) . "<field";
+				$fieldSet[] = $this->_t(3) . 'name="metakey"';
+				$fieldSet[] = $this->_t(3) . 'type="textarea"';
+				$fieldSet[] = $this->_t(3) . 'label="JFIELD_META_KEYWORDS_LABEL"';
+				$fieldSet[] = $this->_t(3) . 'description="JFIELD_META_KEYWORDS_DESC"';
+				$fieldSet[] = $this->_t(3) . 'rows="3"';
+				$fieldSet[] = $this->_t(3) . 'cols="30"';
+				$fieldSet[] = $this->_t(2) . "/>";
+				// count the static field created
+				$this->fieldCount++;
+			}
 			// metadesc
-			$fieldSet[] = $this->_t(2) . "<!--" . $this->setLine(__LINE__) . " Metadesc Field. Type: Textarea (joomla) -->";
-			$fieldSet[] = $this->_t(2) . "<field";
-			$fieldSet[] = $this->_t(3) . 'name="metadesc"';
-			$fieldSet[] = $this->_t(3) . 'type="textarea"';
-			$fieldSet[] = $this->_t(3) . 'label="JFIELD_META_DESCRIPTION_LABEL"';
-			$fieldSet[] = $this->_t(3) . 'description="JFIELD_META_DESCRIPTION_DESC"';
-			$fieldSet[] = $this->_t(3) . 'rows="3"';
-			$fieldSet[] = $this->_t(3) . 'cols="30"';
-			$fieldSet[] = $this->_t(2) . "/>";
-			// count the static field created
-			$this->fieldCount++;
+			if (!isset($this->fieldsNames[$view_name_single]['metadesc']))
+			{
+				$fieldSet[] = $this->_t(2) . "<!--" . $this->setLine(__LINE__) . " Metadesc Field. Type: Textarea (joomla) -->";
+				$fieldSet[] = $this->_t(2) . "<field";
+				$fieldSet[] = $this->_t(3) . 'name="metadesc"';
+				$fieldSet[] = $this->_t(3) . 'type="textarea"';
+				$fieldSet[] = $this->_t(3) . 'label="JFIELD_META_DESCRIPTION_LABEL"';
+				$fieldSet[] = $this->_t(3) . 'description="JFIELD_META_DESCRIPTION_DESC"';
+				$fieldSet[] = $this->_t(3) . 'rows="3"';
+				$fieldSet[] = $this->_t(3) . 'cols="30"';
+				$fieldSet[] = $this->_t(2) . "/>";
+				// count the static field created
+				$this->fieldCount++;
+			}
 		}
 		// load the dynamic fields now
 		if (ComponentbuilderHelper::checkString($dynamicFields))
@@ -660,43 +687,57 @@ class Fields extends Structure
 		// check if metadata is added to this view
 		if (isset($this->metadataBuilder[$view_name_single]) && ComponentbuilderHelper::checkString($this->metadataBuilder[$view_name_single]))
 		{
-			$fieldSet[] = PHP_EOL . $this->_t(1) . "<!--" . $this->setLine(__LINE__) . " Metadata Fields. -->";
-			$fieldSet[] = $this->_t(1) . "<fields" . ' name="metadata" label="JGLOBAL_FIELDSET_METADATA_OPTIONS">';
-			$fieldSet[] = $this->_t(2) . '<fieldset name="vdmmetadata"';
-			$fieldSet[] = $this->_t(3) . 'label="JGLOBAL_FIELDSET_METADATA_OPTIONS">';
-			// robots
-			$fieldSet[] = $this->_t(3) . "<!--" . $this->setLine(__LINE__) . " Robots Field. Type: List (joomla) -->";
-			$fieldSet[] = $this->_t(3) . '<field name="robots"';
-			$fieldSet[] = $this->_t(4) . 'type="list"';
-			$fieldSet[] = $this->_t(4) . 'label="JFIELD_METADATA_ROBOTS_LABEL"';
-			$fieldSet[] = $this->_t(4) . 'description="JFIELD_METADATA_ROBOTS_DESC" >';
-			$fieldSet[] = $this->_t(4) . '<option value="">JGLOBAL_USE_GLOBAL</option>';
-			$fieldSet[] = $this->_t(4) . '<option value="index, follow">JGLOBAL_INDEX_FOLLOW</option>';
-			$fieldSet[] = $this->_t(4) . '<option value="noindex, follow">JGLOBAL_NOINDEX_FOLLOW</option>';
-			$fieldSet[] = $this->_t(4) . '<option value="index, nofollow">JGLOBAL_INDEX_NOFOLLOW</option>';
-			$fieldSet[] = $this->_t(4) . '<option value="noindex, nofollow">JGLOBAL_NOINDEX_NOFOLLOW</option>';
-			$fieldSet[] = $this->_t(3) . '</field>';
-			// count the static field created
-			$this->fieldCount++;
-			// author
-			$fieldSet[] = $this->_t(3) . "<!--" . $this->setLine(__LINE__) . " Author Field. Type: Text (joomla) -->";
-			$fieldSet[] = $this->_t(3) . '<field name="author"';
-			$fieldSet[] = $this->_t(4) . 'type="text"';
-			$fieldSet[] = $this->_t(4) . 'label="JAUTHOR" description="JFIELD_METADATA_AUTHOR_DESC"';
-			$fieldSet[] = $this->_t(4) . 'size="20"';
-			$fieldSet[] = $this->_t(3) . "/>";
-			// count the static field created
-			$this->fieldCount++;
-			// rights
-			$fieldSet[] = $this->_t(3) . "<!--" . $this->setLine(__LINE__) . " Rights Field. Type: Textarea (joomla) -->";
-			$fieldSet[] = $this->_t(3) . '<field name="rights" type="textarea" label="JFIELD_META_RIGHTS_LABEL"';
-			$fieldSet[] = $this->_t(4) . 'description="JFIELD_META_RIGHTS_DESC" required="false" filter="string"';
-			$fieldSet[] = $this->_t(4) . 'cols="30" rows="2"';
-			$fieldSet[] = $this->_t(3) . "/>";
-			// count the static field created
-			$this->fieldCount++;
-			$fieldSet[] = $this->_t(2) . "</fieldset>";
-			$fieldSet[] = $this->_t(1) . "</fields>";
+			if (!isset($this->fieldsNames[$view_name_single]['robots'])
+				|| !isset($this->fieldsNames[$view_name_single]['rights'])
+				|| !isset($this->fieldsNames[$view_name_single]['author']))
+			{
+				$fieldSet[] = PHP_EOL . $this->_t(1) . "<!--" . $this->setLine(__LINE__) . " Metadata Fields. -->";
+				$fieldSet[] = $this->_t(1) . "<fields" . ' name="metadata" label="JGLOBAL_FIELDSET_METADATA_OPTIONS">';
+				$fieldSet[] = $this->_t(2) . '<fieldset name="vdmmetadata"';
+				$fieldSet[] = $this->_t(3) . 'label="JGLOBAL_FIELDSET_METADATA_OPTIONS">';
+				// robots
+				if (!isset($this->fieldsNames[$view_name_single]['robots']))
+				{
+					$fieldSet[] = $this->_t(3) . "<!--" . $this->setLine(__LINE__) . " Robots Field. Type: List (joomla) -->";
+					$fieldSet[] = $this->_t(3) . '<field name="robots"';
+					$fieldSet[] = $this->_t(4) . 'type="list"';
+					$fieldSet[] = $this->_t(4) . 'label="JFIELD_METADATA_ROBOTS_LABEL"';
+					$fieldSet[] = $this->_t(4) . 'description="JFIELD_METADATA_ROBOTS_DESC" >';
+					$fieldSet[] = $this->_t(4) . '<option value="">JGLOBAL_USE_GLOBAL</option>';
+					$fieldSet[] = $this->_t(4) . '<option value="index, follow">JGLOBAL_INDEX_FOLLOW</option>';
+					$fieldSet[] = $this->_t(4) . '<option value="noindex, follow">JGLOBAL_NOINDEX_FOLLOW</option>';
+					$fieldSet[] = $this->_t(4) . '<option value="index, nofollow">JGLOBAL_INDEX_NOFOLLOW</option>';
+					$fieldSet[] = $this->_t(4) . '<option value="noindex, nofollow">JGLOBAL_NOINDEX_NOFOLLOW</option>';
+					$fieldSet[] = $this->_t(3) . '</field>';
+					// count the static field created
+					$this->fieldCount++;
+				}
+				// author
+				if (!isset($this->fieldsNames[$view_name_single]['author']))
+				{
+					$fieldSet[] = $this->_t(3) . "<!--" . $this->setLine(__LINE__) . " Author Field. Type: Text (joomla) -->";
+					$fieldSet[] = $this->_t(3) . '<field name="author"';
+					$fieldSet[] = $this->_t(4) . 'type="text"';
+					$fieldSet[] = $this->_t(4) . 'label="JAUTHOR" description="JFIELD_METADATA_AUTHOR_DESC"';
+					$fieldSet[] = $this->_t(4) . 'size="20"';
+					$fieldSet[] = $this->_t(3) . "/>";
+					// count the static field created
+					$this->fieldCount++;
+				}
+				// rights
+				if (!isset($this->fieldsNames[$view_name_single]['rights']))
+				{
+					$fieldSet[] = $this->_t(3) . "<!--" . $this->setLine(__LINE__) . " Rights Field. Type: Textarea (joomla) -->";
+					$fieldSet[] = $this->_t(3) . '<field name="rights" type="textarea" label="JFIELD_META_RIGHTS_LABEL"';
+					$fieldSet[] = $this->_t(4) . 'description="JFIELD_META_RIGHTS_DESC" required="false" filter="string"';
+					$fieldSet[] = $this->_t(4) . 'cols="30" rows="2"';
+					$fieldSet[] = $this->_t(3) . "/>";
+					// count the static field created
+					$this->fieldCount++;
+				}
+				$fieldSet[] = $this->_t(2) . "</fieldset>";
+				$fieldSet[] = $this->_t(1) . "</fields>";
+			}
 		}
 		// retunr the set
 		return implode(PHP_EOL, $fieldSet);
@@ -916,31 +957,37 @@ class Fields extends Structure
 		if (isset($this->metadataBuilder[$view_name_single]) && ComponentbuilderHelper::checkString($this->metadataBuilder[$view_name_single]))
 		{
 			// metakey
-			$attributes = array(
-				'name' => 'metakey',
-				'type' => 'textarea',
-				'label' => 'JFIELD_META_KEYWORDS_LABEL',
-				'description' => 'JFIELD_META_KEYWORDS_DESC',
-				'rows' => 3,
-				'cols' => 30
-			);
-			ComponentbuilderHelper::xmlComment($fieldSetXML, $this->setLine(__LINE__) . " Metakey Field. Type: Textarea (joomla)");
-			$fieldXML = $fieldSetXML->addChild('field');
-			ComponentbuilderHelper::xmlAddAttributes($fieldXML, $attributes);
-			// count the static field created
-			$this->fieldCount++;
+			if (!isset($this->fieldsNames[$view_name_single]['metakey']))
+			{
+				$attributes = array(
+					'name' => 'metakey',
+					'type' => 'textarea',
+					'label' => 'JFIELD_META_KEYWORDS_LABEL',
+					'description' => 'JFIELD_META_KEYWORDS_DESC',
+					'rows' => 3,
+					'cols' => 30
+				);
+				ComponentbuilderHelper::xmlComment($fieldSetXML, $this->setLine(__LINE__) . " Metakey Field. Type: Textarea (joomla)");
+				$fieldXML = $fieldSetXML->addChild('field');
+				ComponentbuilderHelper::xmlAddAttributes($fieldXML, $attributes);
+				// count the static field created
+				$this->fieldCount++;
+			}
 			// metadesc
-			$attributes['name'] = 'metadesc';
-			$attributes['label'] = 'JFIELD_META_DESCRIPTION_LABEL';
-			$attributes['description'] = 'JFIELD_META_DESCRIPTION_DESC';
-			ComponentbuilderHelper::xmlComment($fieldSetXML, $this->setLine(__LINE__) . " Metadesc Field. Type: Textarea (joomla)");
-			$fieldXML = $fieldSetXML->addChild('field');
-			ComponentbuilderHelper::xmlAddAttributes($fieldXML, $attributes);
-			// count the static field created
-			$this->fieldCount++;
+			if (!isset($this->fieldsNames[$view_name_single]['metadesc']))
+			{
+				$attributes['name'] = 'metadesc';
+				$attributes['label'] = 'JFIELD_META_DESCRIPTION_LABEL';
+				$attributes['description'] = 'JFIELD_META_DESCRIPTION_DESC';
+				ComponentbuilderHelper::xmlComment($fieldSetXML, $this->setLine(__LINE__) . " Metadesc Field. Type: Textarea (joomla)");
+				$fieldXML = $fieldSetXML->addChild('field');
+				ComponentbuilderHelper::xmlAddAttributes($fieldXML, $attributes);
+				// count the static field created
+				$this->fieldCount++;
+			}
 		}
 		// load the dynamic fields now
-		if (count($dynamicFieldsXML))
+		if (count((array) $dynamicFieldsXML))
 		{
 			ComponentbuilderHelper::xmlComment($fieldSetXML, $this->setLine(__LINE__) . " Dynamic Fields.");
 			foreach ($dynamicFieldsXML as $dynamicfield)
@@ -951,67 +998,81 @@ class Fields extends Structure
 		// check if metadata is added to this view
 		if (isset($this->metadataBuilder[$view_name_single]) && ComponentbuilderHelper::checkString($this->metadataBuilder[$view_name_single]))
 		{
-			ComponentbuilderHelper::xmlComment($fieldSetXML, $this->setLine(__LINE__) . " Metadata Fields");
-			$fieldsXML = $fieldSetXML->addChild('fields');
-			$fieldsXML->addAttribute('name', 'metadata');
-			$fieldsXML->addAttribute('label', 'JGLOBAL_FIELDSET_METADATA_OPTIONS');
-			$fieldsFieldSetXML = $fieldsXML->addChild('fieldset');
-			$fieldsFieldSetXML->addAttribute('name', 'vdmmetadata');
-			$fieldsFieldSetXML->addAttribute('label', 'JGLOBAL_FIELDSET_METADATA_OPTIONS');
-			// robots
-			ComponentbuilderHelper::xmlComment($fieldsFieldSetXML, $this->setLine(__LINE__) . " Robots Field. Type: List (joomla)");
-			$robots = $fieldsFieldSetXML->addChild('field');
-			$attributes = array(
-				'name' => 'robots',
-				'type' => 'list',
-				'label' => 'JFIELD_METADATA_ROBOTS_LABEL',
-				'description' => 'JFIELD_METADATA_ROBOTS_DESC'
-			);
-			ComponentbuilderHelper::xmlAddAttributes($robots, $attributes);
-			// count the static field created
-			$this->fieldCount++;
-			$options = array(
-				'JGLOBAL_USE_GLOBAL' => '',
-				'JGLOBAL_INDEX_FOLLOW' => 'index, follow',
-				'JGLOBAL_NOINDEX_FOLLOW' => 'noindex, follow',
-				'JGLOBAL_INDEX_NOFOLLOW' => 'index, nofollow',
-				'JGLOBAL_NOINDEX_NOFOLLOW' => 'noindex, nofollow',
-			);
-			foreach ($options as $text => $value)
+			if (!isset($this->fieldsNames[$view_name_single]['robots'])
+				|| !isset($this->fieldsNames[$view_name_single]['author'])
+				|| !isset($this->fieldsNames[$view_name_single]['rights']))
 			{
-				$option = $robots->addChild('option');
-				$option->addAttribute('value', $value);
-				$option[] = $text;
+				ComponentbuilderHelper::xmlComment($fieldSetXML, $this->setLine(__LINE__) . " Metadata Fields");
+				$fieldsXML = $fieldSetXML->addChild('fields');
+				$fieldsXML->addAttribute('name', 'metadata');
+				$fieldsXML->addAttribute('label', 'JGLOBAL_FIELDSET_METADATA_OPTIONS');
+				$fieldsFieldSetXML = $fieldsXML->addChild('fieldset');
+				$fieldsFieldSetXML->addAttribute('name', 'vdmmetadata');
+				$fieldsFieldSetXML->addAttribute('label', 'JGLOBAL_FIELDSET_METADATA_OPTIONS');
+				// robots
+				if (!isset($this->fieldsNames[$view_name_single]['robots']))
+				{
+					ComponentbuilderHelper::xmlComment($fieldsFieldSetXML, $this->setLine(__LINE__) . " Robots Field. Type: List (joomla)");
+					$robots = $fieldsFieldSetXML->addChild('field');
+					$attributes = array(
+						'name' => 'robots',
+						'type' => 'list',
+						'label' => 'JFIELD_METADATA_ROBOTS_LABEL',
+						'description' => 'JFIELD_METADATA_ROBOTS_DESC'
+					);
+					ComponentbuilderHelper::xmlAddAttributes($robots, $attributes);
+					// count the static field created
+					$this->fieldCount++;
+					$options = array(
+						'JGLOBAL_USE_GLOBAL' => '',
+						'JGLOBAL_INDEX_FOLLOW' => 'index, follow',
+						'JGLOBAL_NOINDEX_FOLLOW' => 'noindex, follow',
+						'JGLOBAL_INDEX_NOFOLLOW' => 'index, nofollow',
+						'JGLOBAL_NOINDEX_NOFOLLOW' => 'noindex, nofollow',
+					);
+					foreach ($options as $text => $value)
+					{
+						$option = $robots->addChild('option');
+						$option->addAttribute('value', $value);
+						$option[] = $text;
+					}
+				}
+				// author
+				if (!isset($this->fieldsNames[$view_name_single]['author']))
+				{
+					ComponentbuilderHelper::xmlComment($fieldsFieldSetXML, $this->setLine(__LINE__) . " Author Field. Type: Text (joomla)");
+					$author = $fieldsFieldSetXML->addChild('field');
+					$attributes = array(
+						'name' => 'author',
+						'type' => 'text',
+						'label' => 'JAUTHOR',
+						'description' => 'JFIELD_METADATA_AUTHOR_DESC',
+						'size' => 20
+					);
+					ComponentbuilderHelper::xmlAddAttributes($author, $attributes);
+					// count the static field created
+					$this->fieldCount++;
+				}
+				// rights
+				if (!isset($this->fieldsNames[$view_name_single]['rights']))
+				{
+					ComponentbuilderHelper::xmlComment($fieldsFieldSetXML, $this->setLine(__LINE__) . " Rights Field. Type: Textarea (joomla)");
+					$rights = $fieldsFieldSetXML->addChild('field');
+					$attributes = array(
+						'name' => 'rights',
+						'type' => 'textarea',
+						'label' => 'JFIELD_META_RIGHTS_LABEL',
+						'description' => 'JFIELD_META_RIGHTS_DESC',
+						'required' => 'false',
+						'filter' => 'string',
+						'cols' => 30,
+						'rows' => 2
+					);
+					ComponentbuilderHelper::xmlAddAttributes($rights, $attributes);
+					// count the static field created
+					$this->fieldCount++;
+				}
 			}
-			// author
-			ComponentbuilderHelper::xmlComment($fieldsFieldSetXML, $this->setLine(__LINE__) . " Author Field. Type: Text (joomla)");
-			$author = $fieldsFieldSetXML->addChild('field');
-			$attributes = array(
-				'name' => 'author',
-				'type' => 'text',
-				'label' => 'JAUTHOR',
-				'description' => 'JFIELD_METADATA_AUTHOR_DESC',
-				'size' => 20
-			);
-			ComponentbuilderHelper::xmlAddAttributes($author, $attributes);
-			// count the static field created
-			$this->fieldCount++;
-			// rights
-			ComponentbuilderHelper::xmlComment($fieldsFieldSetXML, $this->setLine(__LINE__) . " Rights Field. Type: Textarea (joomla)");
-			$rights = $fieldsFieldSetXML->addChild('field');
-			$attributes = array(
-				'name' => 'rights',
-				'type' => 'textarea',
-				'label' => 'JFIELD_META_RIGHTS_LABEL',
-				'description' => 'JFIELD_META_RIGHTS_DESC',
-				'required' => 'false',
-				'filter' => 'string',
-				'cols' => 30,
-				'rows' => 2
-			);
-			ComponentbuilderHelper::xmlAddAttributes($rights, $attributes);
-			// count the static field created
-			$this->fieldCount++;
 		}
 		// return the set
 		return $this->xmlPrettyPrint($XML, 'fieldset');
@@ -1659,7 +1720,8 @@ class Fields extends Structure
 			}
 			$field .= PHP_EOL . $this->_t(2) . $taber . "/>";
 			// incase the field is in the config and has not been set
-			if ('config' === $view_name_single && 'configs' === $view_name_list)
+			if ('config' === $view_name_single && 'configs' === $view_name_list||
+				strpos($view_name_single, 'P|uG!n') !== false)
 			{
 				// set lang (just incase)
 				$listLangName = $langView . '_' . ComponentbuilderHelper::safeString($name, 'U');
@@ -1767,7 +1829,7 @@ class Fields extends Structure
 								// add to lang array
 								$this->setLangContent($this->lang, $langValue, $option);
 								// now add to option set
-								$grouped_['option'][$option] = array('value' => $valueKeyArray[0], 'text' => $langValue);
+								$grouped_['option'][$option] = array('value' => $option, 'text' => $langValue);
 								$optionArray[$option] = $langValue;
 								// set order
 								$order_['option' . $option] = $option;
@@ -1792,7 +1854,7 @@ class Fields extends Structure
 
 								foreach ($grouped_[$key_][$_id] as $option_)
 								{
-									$groupOptionXML = $groupXML->fieldXML->addChild('option');
+									$groupOptionXML = $groupXML->addChild('option');
 									$groupOptionXML->addAttribute('value', $option_['value']);
 									$groupOptionXML[] = $option_['text'];
 								}
@@ -2144,8 +2206,9 @@ class Fields extends Structure
 					$field->fieldXML->addAttribute($property, $value);
 				}
 			}
-			// incase the field is in the config and has not been set
-			if ('config' === $view_name_single && 'configs' === $view_name_list)
+			// incase the field is in the config and has not been set (or is part of a plugin or module)
+			if (('config' === $view_name_single && 'configs' === $view_name_list) ||
+				strpos($view_name_single, 'P|uG!n') !== false)
 			{
 				// set lang (just incase)
 				$listLangName = $langView . '_' . ComponentbuilderHelper::safeString($name, 'U');
@@ -2271,7 +2334,7 @@ class Fields extends Structure
 	 */
 	public function buildSiteFieldData($view, $field, $set, $type)
 	{
-		$decode = array('json', 'base64', 'basic_encryption', 'whmcs_encryption', 'medium_encryption');
+		$decode = array('json', 'base64', 'basic_encryption', 'whmcs_encryption', 'medium_encryption', 'expert_mode');
 		$textareas = array('textarea', 'editor');
 		if (isset($this->siteFields[$view][$field]) && ComponentbuilderHelper::checkArray($this->siteFields[$view][$field]))
 		{
@@ -2294,7 +2357,7 @@ class Fields extends Structure
 					}
 					else
 					{
-						$this->siteFieldData['decode'][$array['site']][$code][$array['as']][$array['key']] = array('decode' => array($set), 'type' => $type);
+						$this->siteFieldData['decode'][$array['site']][$code][$array['as']][$array['key']] = array('decode' => array($set), 'type' => $type, 'admin_view' => $view);
 					}
 				}
 				// set the uikit checker
@@ -2322,7 +2385,7 @@ class Fields extends Structure
 	 * @param   string   $langLabel         The language string for field label
 	 * @param   string   $langView          The language string of the view
 	 * @param   string   $view_name_list    The list view name
-	 * @param   string   $view_name_single  The singel view name
+	 * @param   string   $view_name_single  The single view name
 	 * @param   array    $placeholders      The place holder and replace values
 	 * @param   boolean  $repeatable        The repeatable field switch
 	 *
@@ -2648,7 +2711,7 @@ class Fields extends Structure
 	 *
 	 * @param   string   $langLabel         The language string for field label
 	 * @param   string   $langView          The language string of the view
-	 * @param   string   $view_name_single  The singel view name
+	 * @param   string   $view_name_single  The single view name
 	 * @param   string   $view_name_list    The list view name
 	 * @param   string   $name              The field name
 	 * @param   array    $view              The view data
@@ -2751,7 +2814,7 @@ class Fields extends Structure
 			}
 			else
 			{
-				$tempName = $view_name_single . ' category';
+				$tempName = $view_name_list . ' categories';
 			}
 			// set lang
 			$listLangName = $langView . '_' . ComponentbuilderHelper::safeFieldName($tempName, true);
@@ -2939,22 +3002,41 @@ class Fields extends Structure
 					break;
 				case 3:
 					// BASIC_ENCRYPTION_LOCALKEY
-					$this->basicEncryptionBuilder[$view_name_single][] = $name;
+					$this->basicFieldModeling[$view_name_single][] = $name;
 					// Site settings of each field if needed
 					$this->buildSiteFieldData($view_name_single, $name, 'basic_encryption', $typeName);
 					break;
 				case 4:
 					// WHMCS_ENCRYPTION_VDMKEY
-					$this->whmcsEncryptionBuilder[$view_name_single][] = $name;
+					$this->whmcsFieldModeling[$view_name_single][] = $name;
 					// Site settings of each field if needed
 					$this->buildSiteFieldData($view_name_single, $name, 'whmcs_encryption', $typeName);
 					break;
 				case 5:
 					// MEDIUM_ENCRYPTION_LOCALFILE
-					$this->mediumEncryptionBuilder[$view_name_single][] = $name;
+					$this->mediumFieldModeling[$view_name_single][] = $name;
 					// Site settings of each field if needed
 					$this->buildSiteFieldData($view_name_single, $name, 'medium_encryption', $typeName);
 					break;
+				case 6:
+					// EXPERT_MODE
+					if(isset($field['settings']->model_field))
+					{
+						if (isset($field['settings']->initiator_save_key))
+						{
+							$this->expertFieldModelInitiator[$view_name_single]['save'][$field['settings']->initiator_save_key]
+								= $field['settings']->initiator_save;
+						}
+						if (isset($field['settings']->initiator_get_key))
+						{
+							$this->expertFieldModelInitiator[$view_name_single]['get'][$field['settings']->initiator_get_key]
+								= $field['settings']->initiator_get;
+						}
+						$this->expertFieldModeling[$view_name_single][$name] = $field['settings']->model_field;
+						// Site settings of each field if needed
+						$this->buildSiteFieldData($view_name_single, $name, 'expert_mode', $typeName);
+					}
+					break;
 				default:
 					// JSON_ARRAY_ENCODE
 					$this->jsonItemBuilder[$view_name_single][] = $name;
@@ -2970,8 +3052,8 @@ class Fields extends Structure
 				$this->buildSiteFieldData($view_name_single, $name, 'json', $typeName);
 			}
 
-			// load the json list display fix
-			if (($listSwitch || $listJoin) && $typeName != 'repeatable' && $typeName != 'subform')
+			// load the model list display fix
+			if (($listSwitch || $listJoin) && (($typeName != 'repeatable' && $typeName != 'subform') || $field['settings']->store == 6))
 			{
 				if (ComponentbuilderHelper::checkArray($options))
 				{
@@ -3064,7 +3146,7 @@ class Fields extends Structure
 				// so we have name spacing in custom field type name
 				$dotTypeArray = explode('.', $data['type']);
 				// set the J prefix
-				if (count($dotTypeArray) > 1)
+				if (count((array) $dotTypeArray) > 1)
 				{
 					$jprefix = strtoupper(array_shift($dotTypeArray));
 				}
@@ -3241,6 +3323,12 @@ class Fields extends Structure
 				$this->fileContentDynamic['customfield_' . $data['type']][$this->hhh . 'ADD_BUTTON' . $this->hhh] = $this->setAddButtonToListField($data['custom']);
 			}
 		}
+		// if this field gets used in plugin or module we should track it so if needed we can copy it over
+		if (strpos($view_name_single, 'P|uG!n') !== false &&
+			isset($data['custom']) && isset($data['custom']['type']))
+		{
+			$this->extentionCustomfields[$data['type']] = $data['custom']['type'];
+		}
 	}
 
 	/**

admin/helpers/compiler/f_Infusion.php

@@ -224,7 +224,6 @@ class Infusion extends Interpretation
 					$this->fileContentStatic[$globalPlaceholder] = $gloabalValue;
 				}
 			}
-
 			// reset view array
 			$viewarray = array();
 			$site_edit_view_array = array();
@@ -313,7 +312,6 @@ class Infusion extends Interpretation
 					{
 						$this->fileContentDynamic[$viewName_single][$this->hhh . 'DOCUMENT_CUSTOM_PHP' . $this->hhh] = '';
 					}
-
 					// LINKEDVIEWTABLESCRIPTS <<<DYNAMIC>>>
 					$this->fileContentDynamic[$viewName_single][$this->hhh . 'LINKEDVIEWTABLESCRIPTS' . $this->hhh] = '';
 
@@ -475,7 +473,7 @@ class Infusion extends Interpretation
 					$this->fileContentDynamic[$viewName_list][$this->hhh . 'LISTQUERY' . $this->hhh] = $this->setListQuery($viewName_single, $viewName_list);
 
 					// MODELEXPORTMETHOD <<<DYNAMIC>>>
-					$this->fileContentDynamic[$viewName_list][$this->hhh . 'MODELEXPORTMETHOD' . $this->hhh] = $this->setModelExportMethod($viewName_single, $viewName_list);
+					$this->fileContentDynamic[$viewName_list][$this->hhh . 'MODELEXPORTMETHOD' . $this->hhh] = $this->setGetItemsModelMethod($viewName_single, $viewName_list);
 
 					// MODELEXIMPORTMETHOD <<<DYNAMIC>>>
 					$this->fileContentDynamic[$viewName_list][$this->hhh . 'CONTROLLEREXIMPORTMETHOD' . $this->hhh] = $this->setControllerEximportMethod($viewName_single, $viewName_list);
@@ -606,7 +604,6 @@ class Infusion extends Interpretation
 				}
 				// HELPER_EXEL
 				$this->fileContentStatic[$this->hhh . 'HELPER_EXEL' . $this->hhh] = $this->setExelHelperMethods();
-
 				// Trigger Event: jcb_ce_onAfterBuildAdminViewContent
 				$this->triggerEvent('jcb_ce_onAfterBuildAdminViewContent', array(&$this->componentContext, &$view, &$viewName_single, &$viewName_list, &$this->fileContentStatic, &$this->fileContentDynamic, &$this->placeholders, &$this->hhh));
 			}
@@ -1033,12 +1030,19 @@ class Infusion extends Interpretation
 			}
 
 			// infuze plugin data if set
-			if (ComponentbuilderHelper::checkArray($this->componentData->joomla_plugins))
+			if (ComponentbuilderHelper::checkArray($this->joomlaPlugins))
 			{
-				foreach ($this->componentData->joomla_plugins as $plugin)
+				foreach ($this->joomlaPlugins as $plugin)
 				{
 					if (ComponentbuilderHelper::checkObject($plugin))
 					{
+						// tweak system to set stuff to the plugin domain
+						$_backup_target = $this->target;
+						$_backup_lang = $this->lang;
+						$_backup_langPrefix = $this->langPrefix;
+						$this->target = $plugin->key;
+						$this->lang = $plugin->key;
+						$this->langPrefix = $plugin->lang_prefix;
 						// MAINCLASS
 						$this->fileContentDynamic[$plugin->key][$this->hhh . 'MAINCLASS' . $this->hhh] = $this->getPluginMainClass($plugin);
 						// only add install script if needed
@@ -1047,8 +1051,28 @@ class Infusion extends Interpretation
 							// INSTALLCLASS
 							$this->fileContentDynamic[$plugin->key][$this->hhh . 'INSTALLCLASS' . $this->hhh] = $this->getPluginInstallClass($plugin);
 						}
+						// FIELDSET
+						if (isset($plugin->form_files) && ComponentbuilderHelper::checkArray($plugin->form_files))
+						{
+							foreach($plugin->form_files as $file => $files)
+							{
+								foreach ($files as $field_name => $fieldsets)
+								{
+									foreach ($fieldsets as $fieldset => $fields)
+									{
+										// FIELDSET_ . $file.$field_name.$fieldset
+										$this->fileContentDynamic[$plugin->key][$this->hhh . 'FIELDSET_' . $file.$field_name.$fieldset . $this->hhh] = 
+											$this->getPluginFieldsetXML($plugin, $fields);
+									}
+								}
+							}
+						}
 						// MAINXML
 						$this->fileContentDynamic[$plugin->key][$this->hhh . 'MAINXML' . $this->hhh] = $this->getPluginMainXML($plugin);
+						// rest globals
+						$this->target = $_backup_target;
+						$this->lang = $_backup_lang;
+						$this->langPrefix = $_backup_langPrefix;
 					}
 				}
 			}
@@ -1145,6 +1169,7 @@ class Infusion extends Interpretation
 	 */
 	public function setLangFileData()
 	{
+		// reset values
 		$values = array();
 		$mainLangLoader = array();
 		// check the admin lang is set

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

@@ -189,11 +189,7 @@ COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_CREATED_DATE_DESC="The date this Admin Cu
 COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_CREATED_DATE_LABEL="Created Date"
 COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_EDIT="Editing the Admin Custom Tabs"
 COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_ERROR_UNIQUE_ALIAS="Another Admin Custom Tabs has the same alias."
-COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_HTML_HINT="// Add the tab HTML here.
-// To access php values <?php echo $this->MethodName->value; ?>
-// Note the convention, if in the PHP area above you added a method called getMethodName()
-// Then [MethodName] becomes a class variable called $this->MethodName
-// Which will hold the value/s your method returned."
+COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_HTML_HINT="// Add the tab HTML here. To access php values <?php echo $this->methodname->value; ?>"
 COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_HTML_LABEL="HTML"
 COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_ID="Id"
 COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_MODIFIED_BY_DESC="The last user that modified this Admin Custom Tabs."
@@ -221,7 +217,7 @@ COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_TABS_LABEL="Tabs"
 COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_TAB_DESCRIPTION="Select the correct tab."
 COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_TAB_LABEL="Admin Tabs"
 COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_VERSION_DESC="A count of the number of times this Admin Custom Tabs has been revised."
-COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_VERSION_LABEL="Version"
 COM_COMPONENTBUILDER_ADMIN_FIELDS="Admin Fields"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_ABOVE_TABS="Above Tabs"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_ACCESS="Access"
@@ -295,7 +291,7 @@ COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_TARGET_RELATION_DESCRIPTION="Select
 COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_TARGET_RELATION_LABEL="Target Relation"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_UNACTIVE_ONLY_FOUR_TEXT_FIELD="Unactive (only 4 text_field)"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_VERSION_DESC="A count of the number of times this Admin Fields Conditions has been revised."
-COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_VERSION_LABEL="Version"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_CREATED_BY_DESC="The user that created this Admin Fields."
 COM_COMPONENTBUILDER_ADMIN_FIELDS_CREATED_BY_LABEL="Created By"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_CREATED_DATE_DESC="The date this Admin Fields was created."
@@ -384,7 +380,7 @@ COM_COMPONENTBUILDER_ADMIN_FIELDS_RELATIONS_SET_HINT="Glue/Code"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_RELATIONS_SET_LABEL="Set"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_RELATIONS_STATUS="Status"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_RELATIONS_VERSION_DESC="A count of the number of times this Admin Fields Relations has been revised."
-COM_COMPONENTBUILDER_ADMIN_FIELDS_RELATIONS_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_ADMIN_FIELDS_RELATIONS_VERSION_LABEL="Version"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_RELATIONS_VIEW="View"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_RIGHT_IN_TAB="Right in Tab"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_RIGHT_OF_TABS="Right of Tabs"
@@ -402,7 +398,7 @@ COM_COMPONENTBUILDER_ADMIN_FIELDS_TITLE_DESCRIPTION="Select if the field is the
 COM_COMPONENTBUILDER_ADMIN_FIELDS_TITLE_LABEL="Title"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_UNDERNEATH_TABS="Underneath Tabs"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_VERSION_DESC="A count of the number of times this Admin Fields has been revised."
-COM_COMPONENTBUILDER_ADMIN_FIELDS_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_ADMIN_FIELDS_VERSION_LABEL="Version"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_VIEW="View"
 COM_COMPONENTBUILDER_ADMIN_VIEW="Admin View"
 COM_COMPONENTBUILDER_ADMIN_VIEWS="Admin Views"
@@ -1343,7 +1339,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_VALUE_NAME_LABEL="Value Name"
 COM_COMPONENTBUILDER_ADMIN_VIEW_VALUE_NAME_MESSAGE="Error! Please add value name here."
 COM_COMPONENTBUILDER_ADMIN_VIEW_VCARD="Vcard"
 COM_COMPONENTBUILDER_ADMIN_VIEW_VERSION_DESC="A count of the number of times this Admin View has been revised."
-COM_COMPONENTBUILDER_ADMIN_VIEW_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_ADMIN_VIEW_VERSION_LABEL="Version"
 COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWACCESS="view.access"
 COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWCREATE="view.create"
 COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWDELETE="view.delete"
@@ -1519,7 +1515,7 @@ COM_COMPONENTBUILDER_CLASS_EXTENDS_SAVE_WARNING="Alias already existed so a numb
 COM_COMPONENTBUILDER_CLASS_EXTENDS_SELECT_AN_OPTION="Select an option"
 COM_COMPONENTBUILDER_CLASS_EXTENDS_STATUS="Status"
 COM_COMPONENTBUILDER_CLASS_EXTENDS_VERSION_DESC="A count of the number of times this Class Extends has been revised."
-COM_COMPONENTBUILDER_CLASS_EXTENDS_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_CLASS_EXTENDS_VERSION_LABEL="Version"
 COM_COMPONENTBUILDER_CLASS_METHOD="Class Method"
 COM_COMPONENTBUILDER_CLASS_METHODS="Class Methods"
 COM_COMPONENTBUILDER_CLASS_METHODS_ACCESS="Class Methods Access"
@@ -1617,7 +1613,7 @@ COM_COMPONENTBUILDER_CLASS_METHOD_SAVE_WARNING="Alias already existed so a numbe
 COM_COMPONENTBUILDER_CLASS_METHOD_SELECT_AN_OPTION="Select an option"
 COM_COMPONENTBUILDER_CLASS_METHOD_STATUS="Status"
 COM_COMPONENTBUILDER_CLASS_METHOD_VERSION_DESC="A count of the number of times this Class Method has been revised."
-COM_COMPONENTBUILDER_CLASS_METHOD_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_CLASS_METHOD_VERSION_LABEL="Version"
 COM_COMPONENTBUILDER_CLASS_METHOD_VISIBILITY="Visibility"
 COM_COMPONENTBUILDER_CLASS_METHOD_VISIBILITY_DESCRIPTION="The visibility of a function/method or property can be defined by prefixing the declaration with the keywords public, protected or private."
 COM_COMPONENTBUILDER_CLASS_METHOD_VISIBILITY_LABEL="Visibility"
@@ -1716,7 +1712,7 @@ COM_COMPONENTBUILDER_CLASS_PROPERTY_SAVE_WARNING="Alias already existed so a num
 COM_COMPONENTBUILDER_CLASS_PROPERTY_SELECT_AN_OPTION="Select an option"
 COM_COMPONENTBUILDER_CLASS_PROPERTY_STATUS="Status"
 COM_COMPONENTBUILDER_CLASS_PROPERTY_VERSION_DESC="A count of the number of times this Class Property has been revised."
-COM_COMPONENTBUILDER_CLASS_PROPERTY_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_CLASS_PROPERTY_VERSION_LABEL="Version"
 COM_COMPONENTBUILDER_CLASS_PROPERTY_VISIBILITY="Visibility"
 COM_COMPONENTBUILDER_CLASS_PROPERTY_VISIBILITY_DESCRIPTION="The visibility of a function/method or property can be defined by prefixing the declaration with the keywords public, protected or private."
 COM_COMPONENTBUILDER_CLASS_PROPERTY_VISIBILITY_LABEL="Visibility"
@@ -2446,7 +2442,7 @@ COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_USER="User"
 COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_USERS="Users"
 COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_VCARD="Vcard"
 COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_VERSION_DESC="A count of the number of times this Component Admin Views has been revised."
-COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_VERSION_LABEL="Version"
 COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_VIEWS="Views"
 COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_WAND="Wand"
 COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_WARNING="Warning"
@@ -2492,7 +2488,7 @@ COM_COMPONENTBUILDER_COMPONENT_CONFIG_TABNAME_LABEL="Tab Name"
 COM_COMPONENTBUILDER_COMPONENT_CONFIG_TABNAME_MESSAGE="Error! Please add tab name here."
 COM_COMPONENTBUILDER_COMPONENT_CONFIG_TWEAKS="Tweaks"
 COM_COMPONENTBUILDER_COMPONENT_CONFIG_VERSION_DESC="A count of the number of times this Component Config has been revised."
-COM_COMPONENTBUILDER_COMPONENT_CONFIG_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_COMPONENT_CONFIG_VERSION_LABEL="Version"
 COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS="Component Custom Admin Menus"
 COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_ADDCUSTOMMENUS="Addcustommenus"
 COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_ADDCUSTOMMENUS_LABEL="Custom Admin Menus"
@@ -2541,7 +2537,7 @@ COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_SUBMENU_DESCRIPTION="Select if
 COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_SUBMENU_LABEL="Submenu"
 COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_TWEAKS="Tweaks"
 COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_VERSION_DESC="A count of the number of times this Component Custom Admin Menus has been revised."
-COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_VERSION_LABEL="Version"
 COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS="Component Custom Admin Views"
 COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_ACCESS_DESCRIPTION="Select if this view<br />should use access."
 COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_ACCESS_LABEL="Add Access"
@@ -2791,7 +2787,7 @@ COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_USER="User"
 COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_USERS="Users"
 COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_VCARD="Vcard"
 COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_VERSION_DESC="A count of the number of times this Component Custom Admin Views has been revised."
-COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_VERSION_LABEL="Version"
 COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_VIEWS="Views"
 COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_WAND="Wand"
 COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_WARNING="Warning"
@@ -2816,9 +2812,9 @@ COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_HEADER_HINT="Header Here"
 COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_HEADER_LABEL="Header"
 COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_HEADER_MESSAGE="Error! Please add header here."
 COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_HTML_HINT="// Add the tab HTML here.
-// To access php values <?php echo $this->MethodName->value; ?>
+// To access php values <?php echo $this->methodname->value; ?>
 // Note the convention, if in the PHP area above you added a method called getMethodName()
-// Then [MethodName] becomes a class variable called $this->MethodName
+// Then [MethodName] becomes a class variable called $this->methodname
 // Which will hold the value/s your method returned."
 COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_HTML_LABEL="HTML"
 COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_ID="Id"
@@ -2845,7 +2841,7 @@ COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_PUBLISHING="Publishing"
 COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Component Dashboard to customise the alias."
 COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_STATUS="Status"
 COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_VERSION_DESC="A count of the number of times this Component Dashboard has been revised."
-COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_VERSION_LABEL="Version"
 COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS="Component Files & Folders"
 COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_ADDFILES="Addfiles"
 COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_ADDFILESFULLPATH="Addfilesfullpath"
@@ -2948,7 +2944,7 @@ COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_RENAME_LABEL="Rename"
 COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Component Files & Folders to customise the alias."
 COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_STATUS="Status"
 COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_VERSION_DESC="A count of the number of times this Component Files & Folders has been revised."
-COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_VERSION_LABEL="Version"
 COM_COMPONENTBUILDER_COMPONENT_GLOBAL_SETTINGS="Component Global Settings"
 COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS="Component mysql Tweaks"
 COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_ADD_SQL_DESCRIPTION="if set in view"
@@ -2990,7 +2986,7 @@ COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_SQL_TWEAK_LABEL="MySql (tweak)"
 COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_STATUS="Status"
 COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_TWEAKS="Tweaks"
 COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_VERSION_DESC="A count of the number of times this Component mysql Tweaks has been revised."
-COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_VERSION_LABEL="Version"
 COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_YES_INCLUDE_BASED_ON_OPTIONS="Yes include based on options"
 COM_COMPONENTBUILDER_COMPONENT_PLACEHOLDERS="Component Placeholders"
 COM_COMPONENTBUILDER_COMPONENT_PLACEHOLDERS_ADDPLACEHOLDERS="Addplaceholders"
@@ -3026,17 +3022,20 @@ COM_COMPONENTBUILDER_COMPONENT_PLACEHOLDERS_VALUE_HINT="membersmanager"
 COM_COMPONENTBUILDER_COMPONENT_PLACEHOLDERS_VALUE_LABEL="Set String Value"
 COM_COMPONENTBUILDER_COMPONENT_PLACEHOLDERS_VALUE_MESSAGE="Error! Please add some set target value here."
 COM_COMPONENTBUILDER_COMPONENT_PLACEHOLDERS_VERSION_DESC="A count of the number of times this Component Placeholders has been revised."
-COM_COMPONENTBUILDER_COMPONENT_PLACEHOLDERS_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_COMPONENT_PLACEHOLDERS_VERSION_LABEL="Version"
 COM_COMPONENTBUILDER_COMPONENT_PLUGINS="Component Plugins"
 COM_COMPONENTBUILDER_COMPONENT_PLUGINS_ADDJOOMLA_PLUGINS="Addjoomla Plugins"
 COM_COMPONENTBUILDER_COMPONENT_PLUGINS_ADDJOOMLA_PLUGINS_DESCRIPTION="Setup the Joomla plugins for this component."
 COM_COMPONENTBUILDER_COMPONENT_PLUGINS_ADDJOOMLA_PLUGINS_LABEL="Joomla Plugins"
+COM_COMPONENTBUILDER_COMPONENT_PLUGINS_COMPILE_AMP_EXPORT="Compile &amp; Export"
+COM_COMPONENTBUILDER_COMPONENT_PLUGINS_COMPILE_ONLY="Compile (only)"
 COM_COMPONENTBUILDER_COMPONENT_PLUGINS_CREATED_BY_DESC="The user that created this Component Plugins."
 COM_COMPONENTBUILDER_COMPONENT_PLUGINS_CREATED_BY_LABEL="Created By"
 COM_COMPONENTBUILDER_COMPONENT_PLUGINS_CREATED_DATE_DESC="The date this Component Plugins was created."
 COM_COMPONENTBUILDER_COMPONENT_PLUGINS_CREATED_DATE_LABEL="Created Date"
 COM_COMPONENTBUILDER_COMPONENT_PLUGINS_EDIT="Editing the Component Plugins"
 COM_COMPONENTBUILDER_COMPONENT_PLUGINS_ERROR_UNIQUE_ALIAS="Another Component Plugins has the same alias."
+COM_COMPONENTBUILDER_COMPONENT_PLUGINS_EXPORT_ONLY="Export (only)"
 COM_COMPONENTBUILDER_COMPONENT_PLUGINS_ID="Id"
 COM_COMPONENTBUILDER_COMPONENT_PLUGINS_JOOMLA_COMPONENT="Joomla Component"
 COM_COMPONENTBUILDER_COMPONENT_PLUGINS_JOOMLA_COMPONENT_DESCRIPTION="Select a Joomla Component"
@@ -3056,8 +3055,10 @@ COM_COMPONENTBUILDER_COMPONENT_PLUGINS_PLUGIN_LABEL="Plugins"
 COM_COMPONENTBUILDER_COMPONENT_PLUGINS_PUBLISHING="Publishing"
 COM_COMPONENTBUILDER_COMPONENT_PLUGINS_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Component Plugins to customise the alias."
 COM_COMPONENTBUILDER_COMPONENT_PLUGINS_STATUS="Status"
+COM_COMPONENTBUILDER_COMPONENT_PLUGINS_TARGET_DESCRIPTION="Association"
+COM_COMPONENTBUILDER_COMPONENT_PLUGINS_TARGET_LABEL="Target"
 COM_COMPONENTBUILDER_COMPONENT_PLUGINS_VERSION_DESC="A count of the number of times this Component Plugins has been revised."
-COM_COMPONENTBUILDER_COMPONENT_PLUGINS_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_COMPONENT_PLUGINS_VERSION_LABEL="Version"
 COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS="Component Site Views"
 COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_ACCESS_DESCRIPTION="Select if this view<br />should use access."
 COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_ACCESS_LABEL="Add Access"
@@ -3098,7 +3099,7 @@ COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_SITEVIEW_DESCRIPTION="Select a site vi
 COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_SITEVIEW_LABEL="View"
 COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_STATUS="Status"
 COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_VERSION_DESC="A count of the number of times this Component Site Views has been revised."
-COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_VERSION_LABEL="Version"
 COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_VIEWS="Views"
 COM_COMPONENTBUILDER_COMPONENT_SUCCESSFULLY_LINKED="Component Successfully Linked"
 COM_COMPONENTBUILDER_COMPONENT_UPDATES="Component Updates"
@@ -3133,7 +3134,7 @@ COM_COMPONENTBUILDER_COMPONENT_UPDATES_URL_MESSAGE="Error! Please add url here."
 COM_COMPONENTBUILDER_COMPONENT_UPDATES_VERSION_DESC="A count of the number of times this Component Updates has been revised."
 COM_COMPONENTBUILDER_COMPONENT_UPDATES_VERSION_DESCRIPTION="1.0.0"
 COM_COMPONENTBUILDER_COMPONENT_UPDATES_VERSION_HINT="1.0.0"
-COM_COMPONENTBUILDER_COMPONENT_UPDATES_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_COMPONENT_UPDATES_VERSION_LABEL="Version"
 COM_COMPONENTBUILDER_COMPONENT_UPDATES_VERSION_MESSAGE="Error! Please add some text here."
 COM_COMPONENTBUILDER_COMPONENT_UPDATES_VERSION_UPDATE="Version Update"
 COM_COMPONENTBUILDER_COMPONENT_UPDATES_VERSION_UPDATE_DESCRIPTION="Add Version Updates Here!"
@@ -3375,6 +3376,10 @@ COM_COMPONENTBUILDER_CONFIG_FORCE_LOAD="Force"
 COM_COMPONENTBUILDER_CONFIG_FROMNAME_DESCRIPTION="Text displayed in the header &quot;From:&quot; field when sending a site email. Usually the site name."
 COM_COMPONENTBUILDER_CONFIG_FROMNAME_HINT="From Name Here"
 COM_COMPONENTBUILDER_CONFIG_FROMNAME_LABEL="From Name"
+COM_COMPONENTBUILDER_CONFIG_GITHUB_ACCESS_TOKEN_DESCRIPTION="This is only needed when you are on a shared IP or/and have reached the public free limit of API queries to gitHub. So unless you have seen some kind of error that directed you here to add an <b>access token</b> you can just ignore this field."
+COM_COMPONENTBUILDER_CONFIG_GITHUB_ACCESS_TOKEN_HINT="OAUTH-TOKEN"
+COM_COMPONENTBUILDER_CONFIG_GITHUB_ACCESS_TOKEN_LABEL="gitHub Access Token<br /><small>Check <a href='https://developer.github.com/v3/#authentication' target='_blank'>https://developer.github.com/v3/#authentication</a> for more info.</small>"
+COM_COMPONENTBUILDER_CONFIG_GITHUB_ACCESS_TOKEN_MESSAGE="Error! Please add token here."
 COM_COMPONENTBUILDER_CONFIG_GIT_FOLDER_PATH_DESCRIPTION="Here you can set the path to the git folder."
 COM_COMPONENTBUILDER_CONFIG_GIT_FOLDER_PATH_HINT="/home/user/git"
 COM_COMPONENTBUILDER_CONFIG_GIT_FOLDER_PATH_LABEL="Git Folder Path"
@@ -3793,8 +3798,8 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_KEY="Key"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LAMP="Lamp"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LAST="Last"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LIBRARIES="Libraries"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LIBRARIES_DESCRIPTION="Select the libraries you want to use here."
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LIBRARIES_LABEL="Libraries"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LIBRARIES_DESCRIPTION="Select the media libraries you want to use here."
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LIBRARIES_LABEL="Media Libraries"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LINK="Link"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LINKED_COMPONENTS="Linked - Components"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LIST="List"
@@ -3978,7 +3983,7 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_VALUE_NAME_LABEL="Value Name"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_VALUE_NAME_MESSAGE="Error! Please add value name here."
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_VCARD="Vcard"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_VERSION_DESC="A count of the number of times this Custom Admin View has been revised."
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_VERSION_LABEL="Version"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_WAND="Wand"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_WARNING="Warning"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_WARNING_CIRCLE="Warning Circle"
@@ -4237,7 +4242,7 @@ COM_COMPONENTBUILDER_CUSTOM_CODE_TYPE="Type"
 COM_COMPONENTBUILDER_CUSTOM_CODE_TYPE_DESCRIPTION="How To Add the Code to the file"
 COM_COMPONENTBUILDER_CUSTOM_CODE_TYPE_LABEL="Add Type"
 COM_COMPONENTBUILDER_CUSTOM_CODE_VERSION_DESC="A count of the number of times this Custom Code has been revised."
-COM_COMPONENTBUILDER_CUSTOM_CODE_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_CUSTOM_CODE_VERSION_LABEL="Version"
 COM_COMPONENTBUILDER_CUSTOM_IMPORT="Custom Import"
 COM_COMPONENTBUILDER_CUSTOM_PHP="Custom PHP"
 COM_COMPONENTBUILDER_CUSTOM_SCRIPT="Custom Script"
@@ -4253,9 +4258,9 @@ COM_COMPONENTBUILDER_DASHBOARD_CUSTOM_CODES="Custom Codes<br /><br />"
 COM_COMPONENTBUILDER_DASHBOARD_DYNAMIC_GETS="Dynamic Gets<br /><br />"
 COM_COMPONENTBUILDER_DASHBOARD_DYNAMIC_GET_ADD="Add&nbsp;Dynamic Get<br /><br />"
 COM_COMPONENTBUILDER_DASHBOARD_FIELDS="Fields<br /><br />"
-COM_COMPONENTBUILDER_DASHBOARD_FIELDS_CATID="Category &nbsp;For<br />Fields"
+COM_COMPONENTBUILDER_DASHBOARD_FIELDS_CATID="Categories&nbsp;For<br />Fields"
 COM_COMPONENTBUILDER_DASHBOARD_FIELDTYPES="Fieldtypes<br /><br />"
-COM_COMPONENTBUILDER_DASHBOARD_FIELDTYPES_CATID="Category &nbsp;For<br />Fieldtypes"
+COM_COMPONENTBUILDER_DASHBOARD_FIELDTYPES_CATID="Categories&nbsp;For<br />Fieldtypes"
 COM_COMPONENTBUILDER_DASHBOARD_FIELD_ADD="Add&nbsp;Field<br /><br />"
 COM_COMPONENTBUILDER_DASHBOARD_GET_SNIPPETS="Get Snippets<br /><br />"
 COM_COMPONENTBUILDER_DASHBOARD_HELP_DOCUMENTS="Help Documents<br /><br />"
@@ -4588,7 +4593,7 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_VALUE_KEY_HINT="b.field or $this->fieldvalue"
 COM_COMPONENTBUILDER_DYNAMIC_GET_VALUE_KEY_LABEL="Value Key"
 COM_COMPONENTBUILDER_DYNAMIC_GET_VALUE_KEY_MESSAGE="Error! Please add value key here."
 COM_COMPONENTBUILDER_DYNAMIC_GET_VERSION_DESC="A count of the number of times this Dynamic Get has been revised."
-COM_COMPONENTBUILDER_DYNAMIC_GET_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_DYNAMIC_GET_VERSION_LABEL="Version"
 COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_SELECTION="View Selection"
 COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_SELECTION_DESCRIPTION="Fields to be selected from table."
 COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_SELECTION_HINT="a.field AS field"
@@ -4763,18 +4768,18 @@ COM_COMPONENTBUILDER_FIELDTYPE_DATADEFAULT="Datadefault"
 COM_COMPONENTBUILDER_FIELDTYPE_DATADEFAULT_DESCRIPTION="The data default value for mysql"
 COM_COMPONENTBUILDER_FIELDTYPE_DATADEFAULT_LABEL="Data Default"
 COM_COMPONENTBUILDER_FIELDTYPE_DATADEFAULT_OTHER="Datadefault Other"
-COM_COMPONENTBUILDER_FIELDTYPE_DATADEFAULT_OTHER_DESCRIPTION="The other default data for mysql"
+COM_COMPONENTBUILDER_FIELDTYPE_DATADEFAULT_OTHER_DESCRIPTION="The other default data for selected data type"
 COM_COMPONENTBUILDER_FIELDTYPE_DATADEFAULT_OTHER_HINT="Other Default Here"
 COM_COMPONENTBUILDER_FIELDTYPE_DATADEFAULT_OTHER_LABEL="Other Default"
 COM_COMPONENTBUILDER_FIELDTYPE_DATADEFAULT_OTHER_MESSAGE="Error! Please add other default here."
 COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT="Datalenght"
-COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_DESCRIPTION="The data length or value for mysql (size)"
-COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_LABEL="Data Length/Values"
+COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_DESCRIPTION="The data length for selected data type (size)"
+COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_LABEL="Data Length"
 COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_OTHER="Datalenght Other"
-COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_OTHER_DESCRIPTION="The other data length/values for mysql"
+COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_OTHER_DESCRIPTION="The other data length for selected data type"
 COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_OTHER_HINT="Other Here"
-COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_OTHER_LABEL="Other"
-COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_OTHER_MESSAGE="Error! Please add other data length/values here."
+COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_OTHER_LABEL="Other Length"
+COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_OTHER_MESSAGE="Error! Please add other data length here."
 COM_COMPONENTBUILDER_FIELDTYPE_DATATYPE="Datatype"
 COM_COMPONENTBUILDER_FIELDTYPE_DATATYPE_DESCRIPTION="The data type for mysql"
 COM_COMPONENTBUILDER_FIELDTYPE_DATATYPE_LABEL="Data Type"
@@ -4795,8 +4800,9 @@ COM_COMPONENTBUILDER_FIELDTYPE_EXAMPLE_DESCRIPTION="Text Area"
 COM_COMPONENTBUILDER_FIELDTYPE_EXAMPLE_HINT="Value/Example Here"
 COM_COMPONENTBUILDER_FIELDTYPE_EXAMPLE_LABEL="Value/Example"
 COM_COMPONENTBUILDER_FIELDTYPE_EXAMPLE_MESSAGE="Error! Please add value/example here."
+COM_COMPONENTBUILDER_FIELDTYPE_EXPERT_MODE_CUSTOM="Expert Mode - Custom"
 COM_COMPONENTBUILDER_FIELDTYPE_FIELDS="Fields"
-COM_COMPONENTBUILDER_FIELDTYPE_FIELDTYPE_CATEGORY="Fieldtype Category"
+COM_COMPONENTBUILDER_FIELDTYPE_FIELDTYPES_CATEGORIES="Fieldtypes Categories"
 COM_COMPONENTBUILDER_FIELDTYPE_FIFTY="50"
 COM_COMPONENTBUILDER_FIELDTYPE_FLOAT="FLOAT"
 COM_COMPONENTBUILDER_FIELDTYPE_HAS_DEFAULTS="Has Defaults"
@@ -4860,8 +4866,8 @@ COM_COMPONENTBUILDER_FIELDTYPE_SHORT_DESCRIPTION_MESSAGE="Error! Please add some
 COM_COMPONENTBUILDER_FIELDTYPE_SIXTY_FOUR="64"
 COM_COMPONENTBUILDER_FIELDTYPE_STATUS="Status"
 COM_COMPONENTBUILDER_FIELDTYPE_STORE="Store"
-COM_COMPONENTBUILDER_FIELDTYPE_STORE_DESCRIPTION="How should the data be stored."
-COM_COMPONENTBUILDER_FIELDTYPE_STORE_LABEL="Store Method"
+COM_COMPONENTBUILDER_FIELDTYPE_STORE_DESCRIPTION="How should the field value be modeled during saving and getting of the value. <b>Default</b> is the Joomla basic normal storing way of dealing with this field type."
+COM_COMPONENTBUILDER_FIELDTYPE_STORE_LABEL="Field Modeling Method<br /><small>Store Method</small>"
 COM_COMPONENTBUILDER_FIELDTYPE_TEN="10"
 COM_COMPONENTBUILDER_FIELDTYPE_TEXT="TEXT"
 COM_COMPONENTBUILDER_FIELDTYPE_TIME="TIME"
@@ -4874,7 +4880,7 @@ COM_COMPONENTBUILDER_FIELDTYPE_TWO_THOUSAND_AND_FORTY_EIGHT="2048"
 COM_COMPONENTBUILDER_FIELDTYPE_UNIQUE_KEY="UNIQUE KEY"
 COM_COMPONENTBUILDER_FIELDTYPE_VARCHAR="VARCHAR"
 COM_COMPONENTBUILDER_FIELDTYPE_VERSION_DESC="A count of the number of times this Fieldtype has been revised."
-COM_COMPONENTBUILDER_FIELDTYPE_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_FIELDTYPE_VERSION_LABEL="Version"
 COM_COMPONENTBUILDER_FIELDTYPE_WHMCSKEY_ENCRYPTION="WHMCS-key Encryption"
 COM_COMPONENTBUILDER_FIELDTYPE_YES="Yes"
 COM_COMPONENTBUILDER_FIELDTYPE_ZERO="0"
@@ -4910,18 +4916,18 @@ COM_COMPONENTBUILDER_FIELD_DATADEFAULT="Datadefault"
 COM_COMPONENTBUILDER_FIELD_DATADEFAULT_DESCRIPTION="The data default value for mysql"
 COM_COMPONENTBUILDER_FIELD_DATADEFAULT_LABEL="Data Default"
 COM_COMPONENTBUILDER_FIELD_DATADEFAULT_OTHER="Datadefault Other"
-COM_COMPONENTBUILDER_FIELD_DATADEFAULT_OTHER_DESCRIPTION="The other default data for mysql"
+COM_COMPONENTBUILDER_FIELD_DATADEFAULT_OTHER_DESCRIPTION="The other default data for selected data type"
 COM_COMPONENTBUILDER_FIELD_DATADEFAULT_OTHER_HINT="Other Default Here"
 COM_COMPONENTBUILDER_FIELD_DATADEFAULT_OTHER_LABEL="Other Default"
 COM_COMPONENTBUILDER_FIELD_DATADEFAULT_OTHER_MESSAGE="Error! Please add other default here."
 COM_COMPONENTBUILDER_FIELD_DATALENGHT="Datalenght"
-COM_COMPONENTBUILDER_FIELD_DATALENGHT_DESCRIPTION="The data length or value for mysql (size)"
-COM_COMPONENTBUILDER_FIELD_DATALENGHT_LABEL="Data Length/Values"
+COM_COMPONENTBUILDER_FIELD_DATALENGHT_DESCRIPTION="The data length for selected data type (size)"
+COM_COMPONENTBUILDER_FIELD_DATALENGHT_LABEL="Data Length"
 COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER="Datalenght Other"
-COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_DESCRIPTION="The other data length/values for mysql"
+COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_DESCRIPTION="The other data length for selected data type"
 COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_HINT="Other Here"
-COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_LABEL="Other"
-COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_MESSAGE="Error! Please add other data length/values here."
+COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_LABEL="Other Length"
+COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_MESSAGE="Error! Please add other data length here."
 COM_COMPONENTBUILDER_FIELD_DATATYPE="Datatype"
 COM_COMPONENTBUILDER_FIELD_DATATYPE_DESCRIPTION="The data type for mysql"
 COM_COMPONENTBUILDER_FIELD_DATATYPE_LABEL="Data Type"
@@ -4933,16 +4939,31 @@ COM_COMPONENTBUILDER_FIELD_DOUBLE="DOUBLE"
 COM_COMPONENTBUILDER_FIELD_EDIT="Editing the Field"
 COM_COMPONENTBUILDER_FIELD_ELEVEN="11"
 COM_COMPONENTBUILDER_FIELD_ERROR_UNIQUE_ALIAS="Another Field has the same alias."
+COM_COMPONENTBUILDER_FIELD_EXPERT_MODE_CUSTOM="Expert Mode - Custom"
+COM_COMPONENTBUILDER_FIELD_FIELDS_CATEGORIES="Fields Categories"
 COM_COMPONENTBUILDER_FIELD_FIELDTYPE="Fieldtype"
 COM_COMPONENTBUILDER_FIELD_FIELDTYPE_DESCRIPTION="Set the field type"
 COM_COMPONENTBUILDER_FIELD_FIELDTYPE_LABEL="Type"
-COM_COMPONENTBUILDER_FIELD_FIELD_CATEGORY="Field Category"
 COM_COMPONENTBUILDER_FIELD_FIFTY="50"
 COM_COMPONENTBUILDER_FIELD_FLOAT="FLOAT"
 COM_COMPONENTBUILDER_FIELD_HELPNOTE_LABEL="Field Information"
 COM_COMPONENTBUILDER_FIELD_ID="Id"
 COM_COMPONENTBUILDER_FIELD_INDEXES="Indexes"
 COM_COMPONENTBUILDER_FIELD_INDEXES_LABEL="Indexes Type"
+COM_COMPONENTBUILDER_FIELD_INITIATOR_ON_GET_MODEL="Initiator On Get Model"
+COM_COMPONENTBUILDER_FIELD_INITIATOR_ON_GET_MODEL_DESCRIPTION="The initiator to on get model this field. If JCB finds that there is more then one field with the same initiator code in one view it will only load it once. You could also leave this blank if you already have the on get model initiator set in another field of the same admin_view."
+COM_COMPONENTBUILDER_FIELD_INITIATOR_ON_GET_MODEL_HINT="// Get the medium decryption.
+$mediumkey = ComponentbuilderHelper::getCryptKey('medium');
+// Get the encryption object.
+$medium = new FOFEncryptAes($mediumkey);"
+COM_COMPONENTBUILDER_FIELD_INITIATOR_ON_GET_MODEL_LABEL="Initiator<br /><small>on get model</small>"
+COM_COMPONENTBUILDER_FIELD_INITIATOR_ON_SAVE_MODEL="Initiator On Save Model"
+COM_COMPONENTBUILDER_FIELD_INITIATOR_ON_SAVE_MODEL_DESCRIPTION="The initiator to on save model this field. If JCB finds that there is more then one field with the same initiator code in one view it will only load it once. You could also leave this blank if you already have the on save model initiator set in another field of the same admin_view."
+COM_COMPONENTBUILDER_FIELD_INITIATOR_ON_SAVE_MODEL_HINT="// Get the medium encryption.
+$mediumkey = ComponentbuilderHelper::getCryptKey('medium');
+// Get the encryption object.
+$medium = new FOFEncryptAes($mediumkey);"
+COM_COMPONENTBUILDER_FIELD_INITIATOR_ON_SAVE_MODEL_LABEL="Initiator<br /><small>on save model</small>"
 COM_COMPONENTBUILDER_FIELD_INT="INT"
 COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEWS_FOOTER="Javascript Views Footer"
 COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEWS_FOOTER_DESCRIPTION="Add JavaScript for the list view that is loaded in the footer inside script tags. Do not add the script tags."
@@ -4972,6 +4993,9 @@ COM_COMPONENTBUILDER_FIELD_NONE="None"
 COM_COMPONENTBUILDER_FIELD_NONE_SET="None Set"
 COM_COMPONENTBUILDER_FIELD_NOTE_DATABASE_SETTINGS_NEEDED_DESCRIPTION="<p>Set the database column for this field here. The column will have the same name as the field. Please take care to select these settings in the correct relationship. The nature of this area is to give you as much freedom/power as you would like, but with that comes responsibility.</p><p>You therefore need to insure that you know what the correct values should be. A great way to learn, is to look at the Joomla core components fields and the corresponding mySql columns.</p>"
 COM_COMPONENTBUILDER_FIELD_NOTE_DATABASE_SETTINGS_NEEDED_LABEL="Database Settings"
+COM_COMPONENTBUILDER_FIELD_NOTE_EXPERT_FIELD_SAVE_MODE_DESCRIPTION="<p>When using the EXPERT mode you need to be that expert.</p>
+<p>Bellow you must add the required code to <b>on save model</b> and <b>on get model</b> the set value. Usually if we start modeling values, we first load the needed classes, so for that purpose you have the <b>initiator</b> input areas.</p>"
+COM_COMPONENTBUILDER_FIELD_NOTE_EXPERT_FIELD_SAVE_MODE_LABEL="The Expert Mode"
 COM_COMPONENTBUILDER_FIELD_NOTE_FILTER_INFORMATION_DESCRIPTION="<div class='form-horizontal'>
 	<div class='span4'>
 	<h1>Filter Information</h1>
@@ -5075,6 +5099,18 @@ COM_COMPONENTBUILDER_FIELD_NULL_SWITCH_LABEL="Null Switch"
 COM_COMPONENTBUILDER_FIELD_ONE="1"
 COM_COMPONENTBUILDER_FIELD_ONE_HUNDRED="100"
 COM_COMPONENTBUILDER_FIELD_ONE_THOUSAND_AND_TWENTY_FOUR="1024"
+COM_COMPONENTBUILDER_FIELD_ON_GET_MODEL_FIELD="On Get Model Field"
+COM_COMPONENTBUILDER_FIELD_ON_GET_MODEL_FIELD_DESCRIPTION="To on get model the field value"
+COM_COMPONENTBUILDER_FIELD_ON_GET_MODEL_FIELD_HINT="if (!empty([[[field]]]) && $mediumkey && !is_numeric([[[field]]]) && [[[field]]] === base64_encode(base64_decode([[[field]]], true)))
+{
+		// medium decrypt field
+		[[[field]]] = rtrim($medium->decryptString([[[field]]]), &quot;\0&quot;);
+}"
+COM_COMPONENTBUILDER_FIELD_ON_GET_MODEL_FIELD_LABEL="On Get Model"
+COM_COMPONENTBUILDER_FIELD_ON_SAVE_MODEL_FIELD="On Save Model Field"
+COM_COMPONENTBUILDER_FIELD_ON_SAVE_MODEL_FIELD_DESCRIPTION="To on save model the field value"
+COM_COMPONENTBUILDER_FIELD_ON_SAVE_MODEL_FIELD_HINT="[[[field]]] = $medium->encryptString([[[field]]]);"
+COM_COMPONENTBUILDER_FIELD_ON_SAVE_MODEL_FIELD_LABEL="On Save Model"
 COM_COMPONENTBUILDER_FIELD_ORDERING_LABEL="Ordering"
 COM_COMPONENTBUILDER_FIELD_OTHER="Other"
 COM_COMPONENTBUILDER_FIELD_PERMISSION="Permissions"
@@ -5089,8 +5125,8 @@ COM_COMPONENTBUILDER_FIELD_SEVEN="7"
 COM_COMPONENTBUILDER_FIELD_SIXTY_FOUR="64"
 COM_COMPONENTBUILDER_FIELD_STATUS="Status"
 COM_COMPONENTBUILDER_FIELD_STORE="Store"
-COM_COMPONENTBUILDER_FIELD_STORE_DESCRIPTION="How should the data be stored."
-COM_COMPONENTBUILDER_FIELD_STORE_LABEL="Store Method"
+COM_COMPONENTBUILDER_FIELD_STORE_DESCRIPTION="How should the field value be modeled during saving and getting of the value. <b>Default</b> is the Joomla basic normal storing way of dealing with this field type."
+COM_COMPONENTBUILDER_FIELD_STORE_LABEL="Field Modeling Method<br /><small>Store Method</small>"
 COM_COMPONENTBUILDER_FIELD_TEN="10"
 COM_COMPONENTBUILDER_FIELD_TEXT="TEXT"
 COM_COMPONENTBUILDER_FIELD_TIME="TIME"
@@ -5102,7 +5138,7 @@ COM_COMPONENTBUILDER_FIELD_TYPE_INFO="Type Info"
 COM_COMPONENTBUILDER_FIELD_UNIQUE_KEY="UNIQUE KEY"
 COM_COMPONENTBUILDER_FIELD_VARCHAR="VARCHAR"
 COM_COMPONENTBUILDER_FIELD_VERSION_DESC="A count of the number of times this Field has been revised."
-COM_COMPONENTBUILDER_FIELD_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_FIELD_VERSION_LABEL="Version"
 COM_COMPONENTBUILDER_FIELD_WHMCSKEY_ENCRYPTION="WHMCS-key Encryption"
 COM_COMPONENTBUILDER_FIELD_XML="Xml"
 COM_COMPONENTBUILDER_FIELD_YES="Yes"
@@ -5265,7 +5301,7 @@ COM_COMPONENTBUILDER_HELP_DOCUMENT_URL_HINT="http://www.example.com"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_URL_LABEL="URL"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_URL_MESSAGE="Error! Please add url here."
 COM_COMPONENTBUILDER_HELP_DOCUMENT_VERSION_DESC="A count of the number of times this Help Document has been revised."
-COM_COMPONENTBUILDER_HELP_DOCUMENT_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_HELP_DOCUMENT_VERSION_LABEL="Version"
 COM_COMPONENTBUILDER_HELP_MANAGER="Help"
 COM_COMPONENTBUILDER_HFOUR_CLASSNAVHEADERCOPYRIGHTHFOURPSP="<h4 class="nav-header">Copyright</h4><p>%s</p>"
 COM_COMPONENTBUILDER_HFOUR_CLASSNAVHEADERLICENSEHFOURPSP="<h4 class="nav-header">License</h4><p>%s</p>"
@@ -5837,7 +5873,7 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_USE_ONLY_FIRST_NUMBER_OF_GLOBAL_VERSION_ON
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_USE_ONLY_FIRST_TWO_NUMBER_OF_GLOBAL_VERSION_ONEZEROX="Use Only First 2 Number of Global Version (1.0.x)"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_USE_VIEW_VERSION_DATE="Use View Version & Date"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_VERSION_DESC="A count of the number of times this Joomla Component has been revised."
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_VERSION_LABEL="Version"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE="Website"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_DESCRIPTION="Enter website address"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_HINT="http://www.example.com"
@@ -6017,7 +6053,7 @@ COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADD_UPDATE_SERVER_LABEL="Add Update Server"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_CLASS_EXTENDS="Class Extends"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_CLASS_EXTENDS_LABEL="Extends"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_CODE="Code"
-COM_COMPONENTBUILDER_JOOMLA_PLUGIN_CONFIGPARAMS="Config/Params"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_COMPONENT="Component"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_CREATED_BY_DESC="The user that created this Joomla Plugin."
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_CREATED_BY_LABEL="Created By"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_CREATED_DATE_DESC="The date this Joomla Plugin was created."
@@ -6034,7 +6070,16 @@ COM_COMPONENTBUILDER_JOOMLA_PLUGIN_EDIT="Editing the Joomla Plugin"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ERROR_UNIQUE_ALIAS="Another Joomla Plugin has the same alias."
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELD="Field"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELDS="Fields"
-COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELDS_LABEL="Fields"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELDSET_DESCRIPTION="Leave default if you don't know what this should be"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELDSET_HINT="basic"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELDSET_LABEL="Fieldset Name"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELDS_DESCRIPTION="All the field that belong to this form."
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELDS_LABEL="Related Forms"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELDS_NAME_DESCRIPTION="Leave default if you don't know what this should be."
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELDS_NAME_HINT="params"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELDS_NAME_LABEL="Fields Name"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELDS_RULES_PATHS_DESCRIPTION="Where should the <b>custom</b> fields and rules be placed."
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELDS_RULES_PATHS_LABEL="Fields & Rules Paths"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELD_DESCRIPTION="Select a field"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELD_LABEL="Field"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FILES_FOLDERS_URLS="Joomla Plugin Files, Folders & URLs"
@@ -6152,7 +6197,11 @@ COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FILES_FOLDERS_URLS_URL_HINT="http://www.examp
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FILES_FOLDERS_URLS_URL_LABEL="URL"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FILES_FOLDERS_URLS_URL_MESSAGE="Error! Please add url here."
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FILES_FOLDERS_URLS_VERSION_DESC="A count of the number of times this Joomla Plugin Files, Folders & URLs has been revised."
-COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FILES_FOLDERS_URLS_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FILES_FOLDERS_URLS_VERSION_LABEL="Version"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FILE_DESCRIPTION="Leave default if you don't know what this should be. This field is ignored if this form belongs to the plugin config area."
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FILE_HINT="config"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FILE_LABEL="File Name"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FORMS_FIELDS="Forms & Fields"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GET_BOILERPLATE_BUTTON_ACCESS="Joomla Plugin Get Boilerplate Button Access"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GET_BOILERPLATE_BUTTON_ACCESS_DESC="Allows the users in this group to access the get boilerplate button."
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GROUP="Joomla Plugin Group"
@@ -6208,13 +6257,16 @@ COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GROUP_PUBLISHING="Publishing"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GROUP_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Joomla Plugin Group to customise the alias."
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GROUP_STATUS="Status"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GROUP_VERSION_DESC="A count of the number of times this Joomla Plugin Group has been revised."
-COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GROUP_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GROUP_VERSION_LABEL="Version"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_HEAD="Head"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_HEAD_DESCRIPTION="The class head, where JLoader, namespace and use is added, so that class being extended will work."
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_HEAD_LABEL="Class Head"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ID="Id"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_JOOMLA_PLUGIN_GROUP="Joomla Plugin Group"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_JOOMLA_PLUGIN_GROUP_LABEL="Joomla Plugin Group"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_LABEL_DESCRIPTION="Not mandatory, used to Label the Fieldset"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_LABEL_HINT="Name"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_LABEL_LABEL="Label"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_MAIN_CLASS_CODE="Main Class Code"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_MAIN_CLASS_CODE_DESCRIPTION="Add the class properties & methods here."
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_MAIN_CLASS_CODE_LABEL="Class Properties & Methods"
@@ -6272,6 +6324,9 @@ COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PHP_PREFLIGHT_UPDATE_LABEL="PHP Preflight (up
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PHP_SCRIPT_CONSTRUCT="Php Script Construct"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PHP_SCRIPT_CONSTRUCT_DESCRIPTION="PHP script that should run in  __construct of script."
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PHP_SCRIPT_CONSTRUCT_LABEL="PHP Script Construct"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PLUGIN="Plugin"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PLUGIN_DESCRIPTION="Add this form the the Plugin Config area."
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PLUGIN_LABEL="Add to Plugin Config"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PLUGIN_VERSION="Plugin Version"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PLUGIN_VERSION_DESCRIPTION="Add Version Number Here"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PLUGIN_VERSION_HINT="1.0.0"
@@ -6340,7 +6395,7 @@ COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_URL_MESSAGE="Error! Please add url he
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_VERSION_DESC="A count of the number of times this Joomla Plugin Updates has been revised."
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_VERSION_DESCRIPTION="1.0.0"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_VERSION_HINT="1.0.0"
-COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_VERSION_LABEL="Version"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_VERSION_MESSAGE="Error! Please add some text here."
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_VERSION_UPDATE="Version Update"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_VERSION_UPDATE_DESCRIPTION="Add Version Updates Here!"
@@ -6357,7 +6412,7 @@ COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATE_SERVER_URL_HINT="http://www.example.co
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATE_SERVER_URL_LABEL="Update Server"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATE_SERVER_URL_MESSAGE="Error! Please add url here."
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_VERSION_DESC="A count of the number of times this Joomla Plugin has been revised."
-COM_COMPONENTBUILDER_JOOMLA_PLUGIN_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_VERSION_LABEL="Version"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_YES="Yes"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ZIP="ZIP"
 COM_COMPONENTBUILDER_JUST_GET_ALL_SNIPPETS="Just Get All Snippets"
@@ -6521,9 +6576,9 @@ COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_TRANSLATION_HINT="Translated String He
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_TRANSLATION_LABEL="Translation"
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_TRANSLATION_MESSAGE="Error! Please add translated string here."
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_VERSION_DESC="A count of the number of times this Language Translation has been revised."
-COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_VERSION_LABEL="Version"
 COM_COMPONENTBUILDER_LANGUAGE_VERSION_DESC="A count of the number of times this Language has been revised."
-COM_COMPONENTBUILDER_LANGUAGE_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_LANGUAGE_VERSION_LABEL="Version"
 COM_COMPONENTBUILDER_LAST_FEW_RELEASES_FROM_GITHUB_IS_LOADING="Last few releases from Github is loading"
 COM_COMPONENTBUILDER_LATEST_RELEASE="Latest Release"
 COM_COMPONENTBUILDER_LAYOUT="Layout"
@@ -6608,8 +6663,8 @@ COM_COMPONENTBUILDER_LAYOUT_LAYOUT="Layout"
 COM_COMPONENTBUILDER_LAYOUT_LAYOUT_DESCRIPTION="Add the layout code here."
 COM_COMPONENTBUILDER_LAYOUT_LAYOUT_LABEL="Layout<br /><small>$displayData is the Object that is used inside the layout file to build displayed output</small>"
 COM_COMPONENTBUILDER_LAYOUT_LIBRARIES="Libraries"
-COM_COMPONENTBUILDER_LAYOUT_LIBRARIES_DESCRIPTION="Select the libraries you want to use here."
-COM_COMPONENTBUILDER_LAYOUT_LIBRARIES_LABEL="Libraries"
+COM_COMPONENTBUILDER_LAYOUT_LIBRARIES_DESCRIPTION="Select the media libraries you want to use here."
+COM_COMPONENTBUILDER_LAYOUT_LIBRARIES_LABEL="Media Libraries"
 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."
@@ -6640,7 +6695,7 @@ COM_COMPONENTBUILDER_LAYOUT_SNIPPET_DESCRIPTION="Select a snippet you would like
 COM_COMPONENTBUILDER_LAYOUT_SNIPPET_LABEL="Select a Snippet"
 COM_COMPONENTBUILDER_LAYOUT_STATUS="Status"
 COM_COMPONENTBUILDER_LAYOUT_VERSION_DESC="A count of the number of times this Layout has been revised."
-COM_COMPONENTBUILDER_LAYOUT_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_LAYOUT_VERSION_LABEL="Version"
 COM_COMPONENTBUILDER_LAYOUT_YES="Yes"
 COM_COMPONENTBUILDER_LEFT_IN_TAB="Left in Tab"
 COM_COMPONENTBUILDER_LEFT_OF_TABS="Left of Tabs"
@@ -6809,7 +6864,7 @@ COM_COMPONENTBUILDER_LIBRARY_CONFIG_TABNAME_LABEL="Tab Name"
 COM_COMPONENTBUILDER_LIBRARY_CONFIG_TABNAME_MESSAGE="Error! Please add tab name here."
 COM_COMPONENTBUILDER_LIBRARY_CONFIG_TWEAKS="Tweaks"
 COM_COMPONENTBUILDER_LIBRARY_CONFIG_VERSION_DESC="A count of the number of times this Library Config has been revised."
-COM_COMPONENTBUILDER_LIBRARY_CONFIG_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_LIBRARY_CONFIG_VERSION_LABEL="Version"
 COM_COMPONENTBUILDER_LIBRARY_CREATED_BY_DESC="The user that created this Library."
 COM_COMPONENTBUILDER_LIBRARY_CREATED_BY_LABEL="Created By"
 COM_COMPONENTBUILDER_LIBRARY_CREATED_DATE_DESC="The date this Library was created."
@@ -6942,7 +6997,7 @@ COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_URL_HINT="http://www.example.com
 COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_URL_LABEL="URL"
 COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_URL_MESSAGE="Error! Please add url here."
 COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_VERSION_DESC="A count of the number of times this Library Files, Folders & URLs has been revised."
-COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_VERSION_LABEL="Version"
 COM_COMPONENTBUILDER_LIBRARY_FILE_DESCRIPTION="to library"
 COM_COMPONENTBUILDER_LIBRARY_FILE_LABEL="Target File Linked"
 COM_COMPONENTBUILDER_LIBRARY_GET_SNIPPETS_BUTTON_ACCESS="Library Get Snippets Button Access"
@@ -6961,10 +7016,11 @@ COM_COMPONENTBUILDER_LIBRARY_KEY_WORD_ANY_CASEINSENSITIVE_ONLY_FOUR_TEXT_FIELD="
 COM_COMPONENTBUILDER_LIBRARY_KEY_WORD_ANY_CASESENSITIVE_ONLY_FOUR_TEXT_FIELD="Key Word Any case-sensitive (only 4 text_field)"
 COM_COMPONENTBUILDER_LIBRARY_LIBRARIES="Libraries"
 COM_COMPONENTBUILDER_LIBRARY_LIBRARIES_DESCRIPTION="Select the libraries you want to bundle here."
-COM_COMPONENTBUILDER_LIBRARY_LIBRARIES_LABEL="Libraries"
+COM_COMPONENTBUILDER_LIBRARY_LIBRARIES_LABEL="Media Libraries"
 COM_COMPONENTBUILDER_LIBRARY_LINKED="Linked"
 COM_COMPONENTBUILDER_LIBRARY_MAIN="Main"
 COM_COMPONENTBUILDER_LIBRARY_MAX_LENGTH_ONLY_FOUR_TEXT_FIELD="Max Length (only 4 text_field)"
+COM_COMPONENTBUILDER_LIBRARY_MEDIA="Media"
 COM_COMPONENTBUILDER_LIBRARY_MIN_LENGTH_ONLY_FOUR_TEXT_FIELD="Min Length (only 4 text_field)"
 COM_COMPONENTBUILDER_LIBRARY_MODIFIED_BY_DESC="The last user that modified this Library."
 COM_COMPONENTBUILDER_LIBRARY_MODIFIED_BY_LABEL="Modified By"
@@ -6994,6 +7050,8 @@ COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_THREE_DESCRIPTION="There is no be
 COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_THREE_LABEL="No Behaviour"
 COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_TWO_DESCRIPTION="There is no behaviour set for this library. This means JCB will not add any files unless you custom code it in somewhere."
 COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_TWO_LABEL="No Behaviour"
+COM_COMPONENTBUILDER_LIBRARY_NOTE_YES_BEHAVIOUR_LIBRARY_DESCRIPTION="We are working on this feature it is not yet ready, but soon enough you will be able to build real Joomla library integration here."
+COM_COMPONENTBUILDER_LIBRARY_NOTE_YES_BEHAVIOUR_LIBRARY_LABEL="Set Behaviour"
 COM_COMPONENTBUILDER_LIBRARY_NOTE_YES_BEHAVIOUR_ONE_DESCRIPTION="All the library files linked to this library will always be added to a view if linked to the view."
 COM_COMPONENTBUILDER_LIBRARY_NOTE_YES_BEHAVIOUR_ONE_LABEL="Set Behaviour"
 COM_COMPONENTBUILDER_LIBRARY_NOTE_YES_BEHAVIOUR_TWO_DESCRIPTION="All the library files linked to this library will always be added to a view if linked to the view."
@@ -7013,16 +7071,19 @@ COM_COMPONENTBUILDER_LIBRARY_PHP_SETDOCUMENT_LABEL="PHP - setDocument()"
 COM_COMPONENTBUILDER_LIBRARY_PUBLISHING="Publishing"
 COM_COMPONENTBUILDER_LIBRARY_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Library to customise the alias."
 COM_COMPONENTBUILDER_LIBRARY_STATUS="Status"
+COM_COMPONENTBUILDER_LIBRARY_TARGET="Target"
 COM_COMPONENTBUILDER_LIBRARY_TARGET_BEHAVIOR_DESCRIPTION="Select the target behavior."
 COM_COMPONENTBUILDER_LIBRARY_TARGET_BEHAVIOR_LABEL="Target Behavior"
+COM_COMPONENTBUILDER_LIBRARY_TARGET_DESCRIPTION="Select what target folder this library belongs to. <b>Media</b> is used mostly for CSS and JavaScript type libraries, and <b>Libraries</b> are for PHP libraries."
+COM_COMPONENTBUILDER_LIBRARY_TARGET_LABEL="Target Folder"
 COM_COMPONENTBUILDER_LIBRARY_TARGET_RELATION_DESCRIPTION="Select the target file/s relation to other of the same target file/s."
 COM_COMPONENTBUILDER_LIBRARY_TARGET_RELATION_LABEL="Target Relation"
 COM_COMPONENTBUILDER_LIBRARY_TYPE="Type"
-COM_COMPONENTBUILDER_LIBRARY_TYPE_DESCRIPTION="Select what type of library this should be."
-COM_COMPONENTBUILDER_LIBRARY_TYPE_LABEL="Type"
+COM_COMPONENTBUILDER_LIBRARY_TYPE_DESCRIPTION="Select what type of library behavior this should be."
+COM_COMPONENTBUILDER_LIBRARY_TYPE_LABEL="Type Behavior"
 COM_COMPONENTBUILDER_LIBRARY_UNACTIVE_ONLY_FOUR_TEXT_FIELD="Unactive (only 4 text_field)"
 COM_COMPONENTBUILDER_LIBRARY_VERSION_DESC="A count of the number of times this Library has been revised."
-COM_COMPONENTBUILDER_LIBRARY_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_LIBRARY_VERSION_LABEL="Version"
 COM_COMPONENTBUILDER_LICENSE="License"
 COM_COMPONENTBUILDER_LICENSE_S="License: %s"
 COM_COMPONENTBUILDER_LINK="Link"
@@ -7081,6 +7142,7 @@ COM_COMPONENTBUILDER_NO_S_FOUND="No %s Found"
 COM_COMPONENTBUILDER_NO_S_HAVE_BEEN_LINKED_TO_THIS_VIEW_SOON_AS_THIS_IS_DONE_IT_WILL_BE_DISPLAYED_HERE="No %s have been linked to this view. Soon as this is done it will be displayed here."
 COM_COMPONENTBUILDER_NO_TYPE="No Type"
 COM_COMPONENTBUILDER_NO_VALIDATION_RULES_FOUND="No validation rules found."
+COM_COMPONENTBUILDER_NO_VALID_MODE_HAS_BEEN_SPECIFIED="No valid mode has been specified!"
 COM_COMPONENTBUILDER_OFFICIAL_VDM_PACKAGES="Official VDM Packages"
 COM_COMPONENTBUILDER_ONLY_IN_ADMIN_LIST_VIEW="Only in Admin List View"
 COM_COMPONENTBUILDER_ONLY_IN_LINKED_LIST_VIEWS="Only in Linked List Views"
@@ -7215,7 +7277,7 @@ COM_COMPONENTBUILDER_PLACEHOLDER_VALUE_HINT="membersmanager"
 COM_COMPONENTBUILDER_PLACEHOLDER_VALUE_LABEL="Set String Value"
 COM_COMPONENTBUILDER_PLACEHOLDER_VALUE_MESSAGE="Error! Please add some set target value here."
 COM_COMPONENTBUILDER_PLACEHOLDER_VERSION_DESC="A count of the number of times this Placeholder has been revised."
-COM_COMPONENTBUILDER_PLACEHOLDER_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_PLACEHOLDER_VERSION_LABEL="Version"
 COM_COMPONENTBUILDER_PLACES_ACROSS_JCB_WHERE_THIS_S_IS_LINKED="Places across JCB where this %s is linked."
 COM_COMPONENTBUILDER_PLEASE_ADD_FILES_TO_S="Please add files to (%s)"
 COM_COMPONENTBUILDER_PLEASE_ADD_FOLDERS_TO_S="Please add folders to (%s)"
@@ -7250,7 +7312,7 @@ COM_COMPONENTBUILDER_RIGHT_OF_TABS="Right of Tabs"
 COM_COMPONENTBUILDER_RUN_EXPANSION="Run Expansion"
 COM_COMPONENTBUILDER_SAVE_SUCCESS="Great! Item successfully saved."
 COM_COMPONENTBUILDER_SAVE_WARNING="The value already existed so please select another."
-COM_COMPONENTBUILDER_SBR_YOU_CAN_ADD_AN_BACCESS_TOKENB_TO_GETBIBLE_GLOBAL_OPTIONS_TO_MAKE_AUTHENTICATED_REQUESTS_AN_ACCESS_TOKEN_WITH_ONLY_PUBLIC_ACCESS_WILL_DO="%s<br />You can add an <b>access token<b/> to getBible global options to make authenticated requests. An access token with only public access will do."
+COM_COMPONENTBUILDER_SBR_YOU_CAN_ADD_A_BGITHUB_ACCESS_TOKENB_TO_COMPONENTBUILDER_GLOBAL_OPTIONS_TO_MAKE_AUTHENTICATED_REQUESTS_TO_GITHUB_AN_ACCESS_TOKEN_WITH_ONLY_PUBLIC_ACCESS_WILL_DO_TO_RETRIEVE_S="%s<br />You can add a <b>gitHub Access Token</b> to Componentbuilder global options to make authenticated requests to gitHub. An access token with only public access will do to retrieve %s."
 COM_COMPONENTBUILDER_SEARCHABLE="Searchable"
 COM_COMPONENTBUILDER_SEE_ALL_IMPORT_INFO="See All Import Info"
 COM_COMPONENTBUILDER_SELECTION="selection"
@@ -7406,7 +7468,7 @@ COM_COMPONENTBUILDER_SERVER_USERNAME_HINT="root"
 COM_COMPONENTBUILDER_SERVER_USERNAME_LABEL="Username<br /><small>(encrypted field)</small>"
 COM_COMPONENTBUILDER_SERVER_USERNAME_MESSAGE="Error! Please add the username here."
 COM_COMPONENTBUILDER_SERVER_VERSION_DESC="A count of the number of times this Server has been revised."
-COM_COMPONENTBUILDER_SERVER_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_SERVER_VERSION_LABEL="Version"
 COM_COMPONENTBUILDER_SET_A_CLASS_VALUE_FOR_THE_LIST_VIEW_OF_THIS_FIELD="Set a class value for the list view of this field."
 COM_COMPONENTBUILDER_SHARE_SNIPPETS="Share Snippets"
 COM_COMPONENTBUILDER_SHOULD_JCB_INSERT_THE_CUSTOM_CODE_PLACEHOLDERS_THIS_IS_ONLY_APPLICABLE_IF_THIS_COMPONENT_HAS_CUSTOM_CODE="Should JCB insert the custom code placeholders? This is only applicable if this component has custom code."
@@ -7682,8 +7744,8 @@ COM_COMPONENTBUILDER_SITE_VIEW_KEY="Key"
 COM_COMPONENTBUILDER_SITE_VIEW_LAMP="Lamp"
 COM_COMPONENTBUILDER_SITE_VIEW_LAST="Last"
 COM_COMPONENTBUILDER_SITE_VIEW_LIBRARIES="Libraries"
-COM_COMPONENTBUILDER_SITE_VIEW_LIBRARIES_DESCRIPTION="Select the libraries you want to use here."
-COM_COMPONENTBUILDER_SITE_VIEW_LIBRARIES_LABEL="Libraries"
+COM_COMPONENTBUILDER_SITE_VIEW_LIBRARIES_DESCRIPTION="Select the media libraries you want to use here."
+COM_COMPONENTBUILDER_SITE_VIEW_LIBRARIES_LABEL="Media Libraries"
 COM_COMPONENTBUILDER_SITE_VIEW_LINK="Link"
 COM_COMPONENTBUILDER_SITE_VIEW_LINKED_COMPONENTS="Linked - Components"
 COM_COMPONENTBUILDER_SITE_VIEW_LIST="List"
@@ -7871,7 +7933,7 @@ COM_COMPONENTBUILDER_SITE_VIEW_VALUE_NAME_LABEL="Value Name"
 COM_COMPONENTBUILDER_SITE_VIEW_VALUE_NAME_MESSAGE="Error! Please add value name here."
 COM_COMPONENTBUILDER_SITE_VIEW_VCARD="Vcard"
 COM_COMPONENTBUILDER_SITE_VIEW_VERSION_DESC="A count of the number of times this Site View has been revised."
-COM_COMPONENTBUILDER_SITE_VIEW_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_SITE_VIEW_VERSION_LABEL="Version"
 COM_COMPONENTBUILDER_SITE_VIEW_WAND="Wand"
 COM_COMPONENTBUILDER_SITE_VIEW_WARNING="Warning"
 COM_COMPONENTBUILDER_SITE_VIEW_WARNING_CIRCLE="Warning Circle"
@@ -8062,7 +8124,7 @@ COM_COMPONENTBUILDER_SNIPPET_TYPE_PUBLISHING="Publishing"
 COM_COMPONENTBUILDER_SNIPPET_TYPE_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Snippet Type to customise the alias."
 COM_COMPONENTBUILDER_SNIPPET_TYPE_STATUS="Status"
 COM_COMPONENTBUILDER_SNIPPET_TYPE_VERSION_DESC="A count of the number of times this Snippet Type has been revised."
-COM_COMPONENTBUILDER_SNIPPET_TYPE_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_SNIPPET_TYPE_VERSION_LABEL="Version"
 COM_COMPONENTBUILDER_SNIPPET_URL="Url"
 COM_COMPONENTBUILDER_SNIPPET_URL_DESCRIPTION="Enter url"
 COM_COMPONENTBUILDER_SNIPPET_URL_HINT="http://www.example.com"
@@ -8073,7 +8135,7 @@ COM_COMPONENTBUILDER_SNIPPET_USAGE_DESCRIPTION="Add Usage Here"
 COM_COMPONENTBUILDER_SNIPPET_USAGE_HINT="Add Usage Here"
 COM_COMPONENTBUILDER_SNIPPET_USAGE_LABEL="Usage"
 COM_COMPONENTBUILDER_SNIPPET_VERSION_DESC="A count of the number of times this Snippet has been revised."
-COM_COMPONENTBUILDER_SNIPPET_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_SNIPPET_VERSION_LABEL="Version"
 COM_COMPONENTBUILDER_SOME_BCUSTOM_FILESB_WERE_MOVED_TO_BSB="Some <b>Custom files</b> were moved to <b>%s</b>"
 COM_COMPONENTBUILDER_SOME_BIMAGESB_WERE_MOVED_TO_BSB="Some <b>Images</b> were moved to <b>%s</b>"
 COM_COMPONENTBUILDER_SORRY_THIS_FUNCTION_NAME_IS_ALREADY_IN_USE="Sorry this function name is already in use!"
@@ -8198,8 +8260,8 @@ COM_COMPONENTBUILDER_TEMPLATE_GET_SNIPPETS_BUTTON_ACCESS="Template Get Snippets
 COM_COMPONENTBUILDER_TEMPLATE_GET_SNIPPETS_BUTTON_ACCESS_DESC="Allows the users in this group to access the get snippets button."
 COM_COMPONENTBUILDER_TEMPLATE_ID="Id"
 COM_COMPONENTBUILDER_TEMPLATE_LIBRARIES="Libraries"
-COM_COMPONENTBUILDER_TEMPLATE_LIBRARIES_DESCRIPTION="Select the libraries you want to use here."
-COM_COMPONENTBUILDER_TEMPLATE_LIBRARIES_LABEL="Libraries"
+COM_COMPONENTBUILDER_TEMPLATE_LIBRARIES_DESCRIPTION="Select the media libraries you want to use here."
+COM_COMPONENTBUILDER_TEMPLATE_LIBRARIES_LABEL="Media Libraries"
 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."
@@ -8233,7 +8295,7 @@ COM_COMPONENTBUILDER_TEMPLATE_TEMPLATE="Template"
 COM_COMPONENTBUILDER_TEMPLATE_TEMPLATE_DESCRIPTION="Add the Template code here."
 COM_COMPONENTBUILDER_TEMPLATE_TEMPLATE_LABEL="Template"
 COM_COMPONENTBUILDER_TEMPLATE_VERSION_DESC="A count of the number of times this Template has been revised."
-COM_COMPONENTBUILDER_TEMPLATE_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_TEMPLATE_VERSION_LABEL="Version"
 COM_COMPONENTBUILDER_TEMPLATE_YES="Yes"
 COM_COMPONENTBUILDER_THAT_MEANS_ANYONE_WHO_HAS_THIS_PACKAGE_CAN_INSTALL_IT_INTO_JCB_TO_ADD_AN_EXPORT_KEY_SIMPLY_OPEN_THE_COMPONENT_GO_TO_THE_TAB_CALLED_BSETTINGSB_BOTTOM_RIGHT_THERE_IS_A_FIELD_CALLED_BEXPORT_KEYB="That means anyone who has this package can install it into JCB. To add an export key simply open the component, go to the tab called <b>settings</b>, bottom right there is a field called <b>Export Key</b>."
 COM_COMPONENTBUILDER_THAT_MEANS_ANYONE_WHO_HAS_THIS_PACKAGE_CAN_INSTALL_IT_INTO_JCB_TO_ADD_AN_EXPORT_KEY_SIMPLY_OPEN_THE_COMPONENT_GO_TO_THE_TAB_CALLED_SETTINGS_BOTTOM_RIGHT_THERE_IS_A_FIELD_CALLED_EXPORT_KEY="That means anyone who has this package can install it into JCB. To add an export key simply open the component, go to the tab called settings, bottom right there is a field called Export Key."
@@ -8260,7 +8322,7 @@ COM_COMPONENTBUILDER_THE_BONLY_IN_LINKED_LIST_VIEWSB_OPTION_WILL_ONLY_ADD_THIS_F
 COM_COMPONENTBUILDER_THE_BPHPSECLIBNETSFTPB_LIBRARYCLASS_IS_NOT_AVAILABLE_THIS_LIBRARYCLASS_SHOULD_HAVE_BEEN_ADDED_TO_YOUR_BLIBRARIESVDM_IOVENDORB_FOLDER_PLEASE_CONTACT_YOUR_SYSTEM_ADMINISTRATOR_FOR_MORE_INFO="The <b>phpseclib\NET\SFTP</b> library\class is not available! This library\class should have been added to your <b>libraries/vdm_io/vendor</b> folder. Please contact your system administrator for more info"
 COM_COMPONENTBUILDER_THE_BSB_FILE_COULD_NOT_BE_MOVED_TO_BSB_PATH_ON_BSB_SERVER="The <b>%s</b> file could not be moved to <b>%s</b> path on <b>%s</b> server."
 COM_COMPONENTBUILDER_THE_BSB_FILE_COULD_NOT_BE_MOVED_TO_BSB_SERVER="The <b>%s</b> file could not be moved to <b>%s</b> server."
-COM_COMPONENTBUILDER_THE_BSB_LIBRARYCLASS_IS_NOT_AVAILABLE_THIS_LIBRARYCLASS_SHOULD_HAVE_BEEN_ADDED_TO_YOUR_BLIBRARIESVDM_IOVENDORB_FOLDER_PLEASE_CONTACT_YOUR_SYSTEM_ADMINISTRATOR_FOR_MORE_INFO="The <b>%s</b> library\class is not available! This library\class should have been added to your <b>libraries/vdm_io/vendor</b> folder. Please contact your system administrator for more info!"
+COM_COMPONENTBUILDER_THE_BSB_LIBRARYCLASS_IS_NOT_AVAILABLE_THIS_LIBRARYCLASS_SHOULD_HAVE_BEEN_ADDED_TO_YOUR_BLIBRARIESPHPSECLIBVENDORB_FOLDER_PLEASE_CONTACT_YOUR_SYSTEM_ADMINISTRATOR_FOR_MORE_INFO="The <b>%s</b> library\class is not available! This library\class should have been added to your <b>libraries/phpseclib/vendor</b> folder. Please contact your system administrator for more info!"
 COM_COMPONENTBUILDER_THE_BSB_LIBRARY_CAN_NOT_BE_DELETED_OR_THINGS_WILL_BREAK="The <b>%s</b> library can not be deleted, or things will break."
 COM_COMPONENTBUILDER_THE_BSHOW_IN_ALL_LIST_VIEWSB_OPTION_WILL_ADD_THIS_FIELD_TO_ALL_LIST_VIEWS_ADMIN_AMP_LINKED="The <b>Show in All List Views</b> option will Add this field to all list views, admin &amp; linked."
 COM_COMPONENTBUILDER_THE_COMPONENT_ADMIN_VIEWS="The component admin views"
@@ -8294,7 +8356,10 @@ COM_COMPONENTBUILDER_THE_SEARCH_FOR_THE_SNIPPETS_ARE_CASE_SENSITIVE_SO_IF_YOU_CH
 COM_COMPONENTBUILDER_THE_SERVER_DETAILS_FOR_BID_SB_COULD_NOT_BE_RETRIEVED="The server details for <b>(ID: %s)</b> could not be retrieved!"
 COM_COMPONENTBUILDER_THE_SNIPPETS_WERE_SUCCESSFULLY_EXPORTED="The Snippets Were Successfully Exported!"
 COM_COMPONENTBUILDER_THE_SNIPPET_WAS_SUCCESSFULLY_EXPORTED="The Snippet Was Successfully Exported!"
+COM_COMPONENTBUILDER_THE_URL_S_SET_TO_RETRIEVE_THE_PACKAGES_DID_NOT_RETURN_S_DATA="The url (%s) set to retrieve the packages did not return %s data!"
+COM_COMPONENTBUILDER_THE_URL_S_SET_TO_RETRIEVE_THE_PACKAGES_DID_NOT_RETURN_VALID_DATA="The url (%s) set to retrieve the packages did not return valid data!"
 COM_COMPONENTBUILDER_THE_URL_S_SET_TO_RETRIEVE_THE_PACKAGES_DOES_NOT_EXIST="The url (%s) set to retrieve the packages does not exist!"
+COM_COMPONENTBUILDER_THE_URL_S_SET_TO_RETRIEVE_THE_PACKAGES_DOES_NOT_RETURN_ANY_DATA="The url (%s) set to retrieve the packages does not return any data!"
 COM_COMPONENTBUILDER_THE_WIKI_IS_LOADING="The wiki is loading"
 COM_COMPONENTBUILDER_THIS_BSB_IS_NOT_LINKED_TO_ANY_OTHER_AREAS_OF_JCB_AT_THIS_TIME="This <b>%s</b> is not linked to any other areas of JCB at this time!"
 COM_COMPONENTBUILDER_THIS_PACKAGE_BPASSEDB_THE_CHECKSUM_VALIDATIONBR_BR_SMALLMANUALLY_ALSO_VALIDATE_THAT_THE_CORRECT_CHECKSUM_WAS_USEDSMALLBR_THIS_CHECKSUM_BSB_MUST_BE_THE_SAME_AS_THE_ONE_FOUND_A_S_SA="This package <b>PASSED</b> the checksum validation!<br /><br /><small>Manually also validate that the correct checksum was used.</small><br />This checksum: <b>%s</b> must be the same as the one found @ <a %s %s</a>"
@@ -8313,11 +8378,54 @@ COM_COMPONENTBUILDER_TRASHED="Trashed"
 COM_COMPONENTBUILDER_TUTORIAL_ON_FORKING_JCB_SNIPPETS_BSB="Tutorial on forking JCB snippets: <b>%s</b>"
 COM_COMPONENTBUILDER_TUTORIAL_ON_MAKING_A_PULL_REQUEST_BSB="Tutorial on making a pull request: <b>%s</b>"
 COM_COMPONENTBUILDER_TYPE="Type"
+COM_COMPONENTBUILDER_TYPE_ADMIN_CUSTOM_TABS="Admin Custom Tabs"
+COM_COMPONENTBUILDER_TYPE_ADMIN_FIELDS="Admin Fields"
+COM_COMPONENTBUILDER_TYPE_ADMIN_FIELDS_CONDITIONS="Admin Fields Conditions"
+COM_COMPONENTBUILDER_TYPE_ADMIN_FIELDS_RELATIONS="Admin Fields Relations"
+COM_COMPONENTBUILDER_TYPE_ADMIN_VIEW="Admin View"
 COM_COMPONENTBUILDER_TYPE_ASC="Type (Asc)"
+COM_COMPONENTBUILDER_TYPE_CLASS_EXTENDS="Class Extends"
+COM_COMPONENTBUILDER_TYPE_CLASS_METHOD="Class Method"
+COM_COMPONENTBUILDER_TYPE_CLASS_PROPERTY="Class Property"
+COM_COMPONENTBUILDER_TYPE_COMPONENT_ADMIN_VIEWS="Component Admin Views"
+COM_COMPONENTBUILDER_TYPE_COMPONENT_CONFIG="Component Config"
+COM_COMPONENTBUILDER_TYPE_COMPONENT_CUSTOM_ADMIN_MENUS="Component Custom Admin Menus"
+COM_COMPONENTBUILDER_TYPE_COMPONENT_CUSTOM_ADMIN_VIEWS="Component Custom Admin Views"
+COM_COMPONENTBUILDER_TYPE_COMPONENT_DASHBOARD="Component Dashboard"
+COM_COMPONENTBUILDER_TYPE_COMPONENT_FILES_FOLDERS="Component Files & Folders"
+COM_COMPONENTBUILDER_TYPE_COMPONENT_MYSQL_TWEAKS="Component mysql Tweaks"
+COM_COMPONENTBUILDER_TYPE_COMPONENT_PLACEHOLDERS="Component Placeholders"
+COM_COMPONENTBUILDER_TYPE_COMPONENT_PLUGINS="Component Plugins"
+COM_COMPONENTBUILDER_TYPE_COMPONENT_SITE_VIEWS="Component Site Views"
+COM_COMPONENTBUILDER_TYPE_COMPONENT_UPDATES="Component Updates"
+COM_COMPONENTBUILDER_TYPE_CUSTOM_ADMIN_VIEW="Custom Admin View"
+COM_COMPONENTBUILDER_TYPE_CUSTOM_CODE="Custom Code"
 COM_COMPONENTBUILDER_TYPE_DESC="Type (Desc)"
+COM_COMPONENTBUILDER_TYPE_DYNAMIC_GET="Dynamic Get"
 COM_COMPONENTBUILDER_TYPE_ERROR="Type Error"
+COM_COMPONENTBUILDER_TYPE_FIELD="Field"
+COM_COMPONENTBUILDER_TYPE_FIELDTYPE="Fieldtype"
+COM_COMPONENTBUILDER_TYPE_HELP_DOCUMENT="Help Document"
+COM_COMPONENTBUILDER_TYPE_JOOMLA_COMPONENT="Joomla Component"
+COM_COMPONENTBUILDER_TYPE_JOOMLA_PLUGIN="Joomla Plugin"
+COM_COMPONENTBUILDER_TYPE_JOOMLA_PLUGIN_FILES_FOLDERS_URLS="Joomla Plugin Files, Folders & URLs"
+COM_COMPONENTBUILDER_TYPE_JOOMLA_PLUGIN_GROUP="Joomla Plugin Group"
+COM_COMPONENTBUILDER_TYPE_JOOMLA_PLUGIN_UPDATES="Joomla Plugin Updates"
+COM_COMPONENTBUILDER_TYPE_LANGUAGE="Language"
+COM_COMPONENTBUILDER_TYPE_LANGUAGE_TRANSLATION="Language Translation"
+COM_COMPONENTBUILDER_TYPE_LAYOUT="Layout"
+COM_COMPONENTBUILDER_TYPE_LIBRARY="Library"
+COM_COMPONENTBUILDER_TYPE_LIBRARY_CONFIG="Library Config"
+COM_COMPONENTBUILDER_TYPE_LIBRARY_FILES_FOLDERS_URLS="Library Files, Folders & URLs"
 COM_COMPONENTBUILDER_TYPE_NAME="Type - Name"
 COM_COMPONENTBUILDER_TYPE_OR_SELECT_SOME_OPTIONS="Type or select some options"
+COM_COMPONENTBUILDER_TYPE_PLACEHOLDER="Placeholder"
+COM_COMPONENTBUILDER_TYPE_SERVER="Server"
+COM_COMPONENTBUILDER_TYPE_SITE_VIEW="Site View"
+COM_COMPONENTBUILDER_TYPE_SNIPPET="Snippet"
+COM_COMPONENTBUILDER_TYPE_SNIPPET_TYPE="Snippet Type"
+COM_COMPONENTBUILDER_TYPE_TEMPLATE="Template"
+COM_COMPONENTBUILDER_TYPE_VALIDATION_RULE="Validation Rule"
 COM_COMPONENTBUILDER_UNACTIVE_ONLY_FOUR_TEXT_FIELD="Unactive (only 4 text_field)"
 COM_COMPONENTBUILDER_UNDERNEATH_TABS="Underneath Tabs"
 COM_COMPONENTBUILDER_UPDATE="Update"
@@ -8414,7 +8522,7 @@ COM_COMPONENTBUILDER_VALIDATION_RULE_SHORT_DESCRIPTION_LABEL="Short Description"
 COM_COMPONENTBUILDER_VALIDATION_RULE_SHORT_DESCRIPTION_MESSAGE="Error! Please add some short description here."
 COM_COMPONENTBUILDER_VALIDATION_RULE_STATUS="Status"
 COM_COMPONENTBUILDER_VALIDATION_RULE_VERSION_DESC="A count of the number of times this Validation Rule has been revised."
-COM_COMPONENTBUILDER_VALIDATION_RULE_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_VALIDATION_RULE_VERSION_LABEL="Version"
 COM_COMPONENTBUILDER_VALUE="Value"
 COM_COMPONENTBUILDER_VDM_NOTICE_BOARD="VDM Notice Board"
 COM_COMPONENTBUILDER_VDM_PACKAGES="VDM Packages"

admin/layouts/field/database_right.php

@@ -29,7 +29,12 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'indexes',
 	'null_switch',
 	'store',
-	'note_whmcs_encryption'
+	'note_whmcs_encryption',
+	'note_expert_field_save_mode',
+	'initiator_on_save_model',
+	'initiator_on_get_model',
+	'on_save_model_field',
+	'on_get_model_field'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();

admin/layouts/fieldtype/fields_fullwidth.php

@@ -13,7 +13,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items = $displayData->vxwfields;
+$items = $displayData->vyifields;
 $user = JFactory::getUser();
 $id = $displayData->item->id;
 // set the edit URL
@@ -74,7 +74,7 @@ $can = ComponentbuilderHelper::getActions('field');
 			<?php echo JText::_('COM_COMPONENTBUILDER_FIELD_STORE_LABEL'); ?>
 		</th>
 		<th data-breakpoints="all" data-type="html" data-sort-use="text">
-			<?php echo JText::_('COM_COMPONENTBUILDER_FIELD_FIELD_CATEGORY'); ?>
+			<?php echo JText::_('COM_COMPONENTBUILDER_FIELD_FIELDS_CATEGORIES'); ?>
 		</th>
 		<th width="10" data-breakpoints="xs sm md">
 			<?php echo JText::_('COM_COMPONENTBUILDER_FIELD_STATUS'); ?>

admin/layouts/library/behaviour_above.php

@@ -27,6 +27,7 @@ $fields_tab_layout = 'fields_' . $layout_path_array[1];
 // get the fields
 $fields = $displayData->get($fields_tab_layout) ?: array(
 	'name',
+	'target',
 	'how',
 	'type'
 );

admin/layouts/library/behaviour_fullwidth.php

@@ -29,6 +29,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'note_no_behaviour_one',
 	'note_yes_behaviour_one',
 	'note_build_in_behaviour_one',
+	'note_yes_behaviour_library',
 	'addconditions',
 	'php_setdocument'
 );

admin/layouts/server/linked_components_fullwidth.php

@@ -13,7 +13,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items = $displayData->vyglinked_components;
+$items = $displayData->vyslinked_components;
 $user = JFactory::getUser();
 $id = $displayData->item->id;
 // set the edit URL
@@ -84,6 +84,11 @@ else
 				- <?php echo $this->escape($item->component_version); ?>
 			</div>
 			<?php
+				// always make sure the $this->return_here is set
+				if (!isset($this->return_here))
+				{
+					$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
+				}
 				// setup the buttons
 				if (!isset($_buttons) || !ComponentbuilderHelper::checkArray($_buttons))
 				{

admin/models/admin_custom_tabs.php

@@ -130,8 +130,23 @@ class ComponentbuilderModelAdmin_custom_tabs extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
+		// // check if xpath was set in options
+		$xpath = false;
+		if (isset($options['xpath']))
+		{
+			$xpath = $options['xpath'];
+			unset($options['xpath']);
+		}
+		// // check if clear form was set in options
+		$clear = false;
+		if (isset($options['clear']))
+		{
+			$clear = $options['clear'];
+			unset($options['clear']);
+		}
+
 		// Get the form.
-		$form = $this->loadForm('com_componentbuilder.admin_custom_tabs', 'admin_custom_tabs', $options);
+		$form = $this->loadForm('com_componentbuilder.admin_custom_tabs', 'admin_custom_tabs', $options, $clear, $xpath);
 
 		if (empty($form))
 		{
@@ -363,6 +378,8 @@ class ComponentbuilderModelAdmin_custom_tabs extends JModelAdmin
 		if (empty($data))
 		{
 			$data = $this->getItem();
+			// run the perprocess of the data
+			$this->preprocessData('com_componentbuilder.admin_custom_tabs', $data);
 		}
 
 		return $data;

admin/models/admin_fields.php

@@ -151,8 +151,23 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
+		// // check if xpath was set in options
+		$xpath = false;
+		if (isset($options['xpath']))
+		{
+			$xpath = $options['xpath'];
+			unset($options['xpath']);
+		}
+		// // check if clear form was set in options
+		$clear = false;
+		if (isset($options['clear']))
+		{
+			$clear = $options['clear'];
+			unset($options['clear']);
+		}
+
 		// Get the form.
-		$form = $this->loadForm('com_componentbuilder.admin_fields', 'admin_fields', $options);
+		$form = $this->loadForm('com_componentbuilder.admin_fields', 'admin_fields', $options, $clear, $xpath);
 
 		if (empty($form))
 		{
@@ -384,6 +399,8 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin
 		if (empty($data))
 		{
 			$data = $this->getItem();
+			// run the perprocess of the data
+			$this->preprocessData('com_componentbuilder.admin_fields', $data);
 		}
 
 		return $data;

admin/models/admin_fields_conditions.php

@@ -151,8 +151,23 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
+		// // check if xpath was set in options
+		$xpath = false;
+		if (isset($options['xpath']))
+		{
+			$xpath = $options['xpath'];
+			unset($options['xpath']);
+		}
+		// // check if clear form was set in options
+		$clear = false;
+		if (isset($options['clear']))
+		{
+			$clear = $options['clear'];
+			unset($options['clear']);
+		}
+
 		// Get the form.
-		$form = $this->loadForm('com_componentbuilder.admin_fields_conditions', 'admin_fields_conditions', $options);
+		$form = $this->loadForm('com_componentbuilder.admin_fields_conditions', 'admin_fields_conditions', $options, $clear, $xpath);
 
 		if (empty($form))
 		{
@@ -384,6 +399,8 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin
 		if (empty($data))
 		{
 			$data = $this->getItem();
+			// run the perprocess of the data
+			$this->preprocessData('com_componentbuilder.admin_fields_conditions', $data);
 		}
 
 		return $data;

admin/models/admin_fields_relations.php

@@ -69,10 +69,54 @@ class ComponentbuilderModelAdmin_fields_relations extends JModelAdmin
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
+
+	/**
+	 * get VDM internal session key
+	 *
+	 * @return  string  the session key
+	 *
+	 */
 	public function getVDM()
 	{
+		if (!isset($this->vastDevMod))
+		{
+			$_id = 0; // new item probably (since it was not set in the getItem method)
+
+			if (empty($_id))
+			{
+				$id = 0;
+			}
+			else
+			{
+				$id = $_id;
+			}
+			// set the id and view name to session
+			if ($vdm = ComponentbuilderHelper::get('admin_fields_relations__'.$id))
+			{
+				$this->vastDevMod = $vdm;
+			}
+			else
+			{
+				// set the vast development method key
+				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				ComponentbuilderHelper::set($this->vastDevMod, 'admin_fields_relations__'.$id);
+				ComponentbuilderHelper::set('admin_fields_relations__'.$id, $this->vastDevMod);
+				// set a return value if found
+				$jinput = JFactory::getApplication()->input;
+				$return = $jinput->get('return', null, 'base64');
+				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				// set a GUID value if found
+				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+					&& method_exists('ComponentbuilderHelper', 'validGUID')
+					&& ComponentbuilderHelper::validGUID($item->guid))
+				{
+					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+				}
+			}
+		}
 		return $this->vastDevMod;
 	}
+
     
 	/**
 	 * Method to get a single record.
@@ -135,6 +179,13 @@ class ComponentbuilderModelAdmin_fields_relations extends JModelAdmin
 				$jinput = JFactory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
 				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				// set a GUID value if found
+				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+					&& method_exists('ComponentbuilderHelper', 'validGUID')
+					&& ComponentbuilderHelper::validGUID($item->guid))
+				{
+					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+				}
 			}
 			
 			if (!empty($item->id))
@@ -162,8 +213,23 @@ class ComponentbuilderModelAdmin_fields_relations extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
+		// // check if xpath was set in options
+		$xpath = false;
+		if (isset($options['xpath']))
+		{
+			$xpath = $options['xpath'];
+			unset($options['xpath']);
+		}
+		// // check if clear form was set in options
+		$clear = false;
+		if (isset($options['clear']))
+		{
+			$clear = $options['clear'];
+			unset($options['clear']);
+		}
+
 		// Get the form.
-		$form = $this->loadForm('com_componentbuilder.admin_fields_relations', 'admin_fields_relations', $options);
+		$form = $this->loadForm('com_componentbuilder.admin_fields_relations', 'admin_fields_relations', $options, $clear, $xpath);
 
 		if (empty($form))
 		{
@@ -395,6 +461,8 @@ class ComponentbuilderModelAdmin_fields_relations extends JModelAdmin
 		if (empty($data))
 		{
 			$data = $this->getItem();
+			// run the perprocess of the data
+			$this->preprocessData('com_componentbuilder.admin_fields_relations', $data);
 		}
 
 		return $data;

admin/models/admin_view.php

@@ -215,14 +215,51 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
+
 	/**
-	 * get VDM session key
+	 * get VDM internal session key
 	 *
 	 * @return  string  the session key
 	 *
 	 */
 	public function getVDM()
 	{
+		if (!isset($this->vastDevMod))
+		{
+			$_id = 0; // new item probably (since it was not set in the getItem method)
+
+			if (empty($_id))
+			{
+				$id = 0;
+			}
+			else
+			{
+				$id = $_id;
+			}
+			// set the id and view name to session
+			if ($vdm = ComponentbuilderHelper::get('admin_view__'.$id))
+			{
+				$this->vastDevMod = $vdm;
+			}
+			else
+			{
+				// set the vast development method key
+				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				ComponentbuilderHelper::set($this->vastDevMod, 'admin_view__'.$id);
+				ComponentbuilderHelper::set('admin_view__'.$id, $this->vastDevMod);
+				// set a return value if found
+				$jinput = JFactory::getApplication()->input;
+				$return = $jinput->get('return', null, 'base64');
+				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				// set a GUID value if found
+				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+					&& method_exists('ComponentbuilderHelper', 'validGUID')
+					&& ComponentbuilderHelper::validGUID($item->guid))
+				{
+					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+				}
+			}
+		}
 		return $this->vastDevMod;
 	}
 
@@ -540,6 +577,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->ajax_input = $ajax_input->toArray();
 			}
 
+
 			if (empty($item->id))
 			{
 				$id = 0;
@@ -563,8 +601,14 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$jinput = JFactory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
 				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				// set a GUID value if found
+				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+					&& method_exists('ComponentbuilderHelper', 'validGUID')
+					&& ComponentbuilderHelper::validGUID($item->guid))
+				{
+					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+				}
 			}
-
 			// update the fields
 			$objectUpdate = new stdClass();
 			$objectUpdate->id = (int) $item->id;
@@ -643,8 +687,23 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
+		// // check if xpath was set in options
+		$xpath = false;
+		if (isset($options['xpath']))
+		{
+			$xpath = $options['xpath'];
+			unset($options['xpath']);
+		}
+		// // check if clear form was set in options
+		$clear = false;
+		if (isset($options['clear']))
+		{
+			$clear = $options['clear'];
+			unset($options['clear']);
+		}
+
 		// Get the form.
-		$form = $this->loadForm('com_componentbuilder.admin_view', 'admin_view', $options);
+		$form = $this->loadForm('com_componentbuilder.admin_view', 'admin_view', $options, $clear, $xpath);
 
 		if (empty($form))
 		{
@@ -893,6 +952,8 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 		if (empty($data))
 		{
 			$data = $this->getItem();
+			// run the perprocess of the data
+			$this->preprocessData('com_componentbuilder.admin_view', $data);
 		}
 
 		return $data;

admin/models/admin_views.php

@@ -114,12 +114,18 @@ class ComponentbuilderModelAdmin_views extends JModelList
 		// load parent items
 		$items = parent::getItems();
 
-		// set values to display correctly.
+		// Set values to display correctly.
 		if (ComponentbuilderHelper::checkArray($items))
 		{
+			// Get the user object if not set.
+			if (!isset($user) || !ComponentbuilderHelper::checkObject($user))
+			{
+				$user = JFactory::getUser();
+			}
 			foreach ($items as $nr => &$item)
 			{
-				$access = (JFactory::getUser()->authorise('admin_view.access', 'com_componentbuilder.admin_view.' . (int) $item->id) && JFactory::getUser()->authorise('admin_view.access', 'com_componentbuilder'));
+				// Remove items the user can't access.
+				$access = ($user->authorise('admin_view.access', 'com_componentbuilder.admin_view.' . (int) $item->id) && $user->authorise('admin_view.access', 'com_componentbuilder'));
 				if (!$access)
 				{
 					unset($items[$nr]);
@@ -326,17 +332,23 @@ class ComponentbuilderModelAdmin_views extends JModelList
 	/**
 	 * Method to get list export data.
 	 *
+	 * @param   array  $pks  The ids of the items to get
+	 * @param   JUser  $user  The user making the request
+	 *
 	 * @return mixed  An array of data items on success, false on failure.
 	 */
-	public function getExportData($pks)
+	public function getExportData($pks, $user = null)
 	{
 		// setup the query
 		if (ComponentbuilderHelper::checkArray($pks))
 		{
-			// Set a value to know this is exporting method.
+			// Set a value to know this is export method. (USE IN CUSTOM CODE TO ALTER OUTCOME)
 			$_export = true;
-			// Get the user object.
-			$user = JFactory::getUser();
+			// Get the user object if not set.
+			if (!isset($user) || !ComponentbuilderHelper::checkObject($user))
+			{
+				$user = JFactory::getUser();
+			}
 			// Create a new query object.
 			$db = JFactory::getDBO();
 			$query = $db->getQuery(true);
@@ -364,12 +376,13 @@ class ComponentbuilderModelAdmin_views extends JModelList
 			{
 				$items = $db->loadObjectList();
 
-				// set values to display correctly.
+				// Set values to display correctly.
 				if (ComponentbuilderHelper::checkArray($items))
 				{
 					foreach ($items as $nr => &$item)
 					{
-						$access = (JFactory::getUser()->authorise('admin_view.access', 'com_componentbuilder.admin_view.' . (int) $item->id) && JFactory::getUser()->authorise('admin_view.access', 'com_componentbuilder'));
+						// Remove items the user can't access.
+						$access = ($user->authorise('admin_view.access', 'com_componentbuilder.admin_view.' . (int) $item->id) && $user->authorise('admin_view.access', 'com_componentbuilder'));
 						if (!$access)
 						{
 							unset($items[$nr]);

admin/models/admins_custom_tabs.php

@@ -84,12 +84,18 @@ class ComponentbuilderModelAdmins_custom_tabs extends JModelList
 		// load parent items
 		$items = parent::getItems();
 
-		// set values to display correctly.
+		// Set values to display correctly.
 		if (ComponentbuilderHelper::checkArray($items))
 		{
+			// Get the user object if not set.
+			if (!isset($user) || !ComponentbuilderHelper::checkObject($user))
+			{
+				$user = JFactory::getUser();
+			}
 			foreach ($items as $nr => &$item)
 			{
-				$access = (JFactory::getUser()->authorise('admin_custom_tabs.access', 'com_componentbuilder.admin_custom_tabs.' . (int) $item->id) && JFactory::getUser()->authorise('admin_custom_tabs.access', 'com_componentbuilder'));
+				// Remove items the user can't access.
+				$access = ($user->authorise('admin_custom_tabs.access', 'com_componentbuilder.admin_custom_tabs.' . (int) $item->id) && $user->authorise('admin_custom_tabs.access', 'com_componentbuilder'));
 				if (!$access)
 				{
 					unset($items[$nr]);

admin/models/admins_fields.php

@@ -84,12 +84,18 @@ class ComponentbuilderModelAdmins_fields extends JModelList
 		// load parent items
 		$items = parent::getItems();
 
-		// set values to display correctly.
+		// Set values to display correctly.
 		if (ComponentbuilderHelper::checkArray($items))
 		{
+			// Get the user object if not set.
+			if (!isset($user) || !ComponentbuilderHelper::checkObject($user))
+			{
+				$user = JFactory::getUser();
+			}
 			foreach ($items as $nr => &$item)
 			{
-				$access = (JFactory::getUser()->authorise('admin_fields.access', 'com_componentbuilder.admin_fields.' . (int) $item->id) && JFactory::getUser()->authorise('admin_fields.access', 'com_componentbuilder'));
+				// Remove items the user can't access.
+				$access = ($user->authorise('admin_fields.access', 'com_componentbuilder.admin_fields.' . (int) $item->id) && $user->authorise('admin_fields.access', 'com_componentbuilder'));
 				if (!$access)
 				{
 					unset($items[$nr]);

admin/models/admins_fields_conditions.php

@@ -84,12 +84,18 @@ class ComponentbuilderModelAdmins_fields_conditions extends JModelList
 		// load parent items
 		$items = parent::getItems();
 
-		// set values to display correctly.
+		// Set values to display correctly.
 		if (ComponentbuilderHelper::checkArray($items))
 		{
+			// Get the user object if not set.
+			if (!isset($user) || !ComponentbuilderHelper::checkObject($user))
+			{
+				$user = JFactory::getUser();
+			}
 			foreach ($items as $nr => &$item)
 			{
-				$access = (JFactory::getUser()->authorise('admin_fields_conditions.access', 'com_componentbuilder.admin_fields_conditions.' . (int) $item->id) && JFactory::getUser()->authorise('admin_fields_conditions.access', 'com_componentbuilder'));
+				// Remove items the user can't access.
+				$access = ($user->authorise('admin_fields_conditions.access', 'com_componentbuilder.admin_fields_conditions.' . (int) $item->id) && $user->authorise('admin_fields_conditions.access', 'com_componentbuilder'));
 				if (!$access)
 				{
 					unset($items[$nr]);

admin/models/admins_fields_relations.php

@@ -84,12 +84,18 @@ class ComponentbuilderModelAdmins_fields_relations extends JModelList
 		// load parent items
 		$items = parent::getItems();
 
-		// set values to display correctly.
+		// Set values to display correctly.
 		if (ComponentbuilderHelper::checkArray($items))
 		{
+			// Get the user object if not set.
+			if (!isset($user) || !ComponentbuilderHelper::checkObject($user))
+			{
+				$user = JFactory::getUser();
+			}
 			foreach ($items as $nr => &$item)
 			{
-				$access = (JFactory::getUser()->authorise('admin_fields_relations.access', 'com_componentbuilder.admin_fields_relations.' . (int) $item->id) && JFactory::getUser()->authorise('admin_fields_relations.access', 'com_componentbuilder'));
+				// Remove items the user can't access.
+				$access = ($user->authorise('admin_fields_relations.access', 'com_componentbuilder.admin_fields_relations.' . (int) $item->id) && $user->authorise('admin_fields_relations.access', 'com_componentbuilder'));
 				if (!$access)
 				{
 					unset($items[$nr]);

admin/models/class_extendings.php

@@ -90,12 +90,18 @@ class ComponentbuilderModelClass_extendings extends JModelList
 		// load parent items
 		$items = parent::getItems();
 
-		// set values to display correctly.
+		// Set values to display correctly.
 		if (ComponentbuilderHelper::checkArray($items))
 		{
+			// Get the user object if not set.
+			if (!isset($user) || !ComponentbuilderHelper::checkObject($user))
+			{
+				$user = JFactory::getUser();
+			}
 			foreach ($items as $nr => &$item)
 			{
-				$access = (JFactory::getUser()->authorise('class_extends.access', 'com_componentbuilder.class_extends.' . (int) $item->id) && JFactory::getUser()->authorise('class_extends.access', 'com_componentbuilder'));
+				// Remove items the user can't access.
+				$access = ($user->authorise('class_extends.access', 'com_componentbuilder.class_extends.' . (int) $item->id) && $user->authorise('class_extends.access', 'com_componentbuilder'));
 				if (!$access)
 				{
 					unset($items[$nr]);

admin/models/class_extends.php

@@ -72,14 +72,51 @@ class ComponentbuilderModelClass_extends extends JModelAdmin
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
+
 	/**
-	 * get VDM session key
+	 * get VDM internal session key
 	 *
 	 * @return  string  the session key
 	 *
 	 */
 	public function getVDM()
 	{
+		if (!isset($this->vastDevMod))
+		{
+			$_id = 0; // new item probably (since it was not set in the getItem method)
+
+			if (empty($_id))
+			{
+				$id = 0;
+			}
+			else
+			{
+				$id = $_id;
+			}
+			// set the id and view name to session
+			if ($vdm = ComponentbuilderHelper::get('class_extends__'.$id))
+			{
+				$this->vastDevMod = $vdm;
+			}
+			else
+			{
+				// set the vast development method key
+				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				ComponentbuilderHelper::set($this->vastDevMod, 'class_extends__'.$id);
+				ComponentbuilderHelper::set('class_extends__'.$id, $this->vastDevMod);
+				// set a return value if found
+				$jinput = JFactory::getApplication()->input;
+				$return = $jinput->get('return', null, 'base64');
+				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				// set a GUID value if found
+				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+					&& method_exists('ComponentbuilderHelper', 'validGUID')
+					&& ComponentbuilderHelper::validGUID($item->guid))
+				{
+					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+				}
+			}
+		}
 		return $this->vastDevMod;
 	}
 
@@ -149,6 +186,13 @@ class ComponentbuilderModelClass_extends extends JModelAdmin
 				$jinput = JFactory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
 				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				// set a GUID value if found
+				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+					&& method_exists('ComponentbuilderHelper', 'validGUID')
+					&& ComponentbuilderHelper::validGUID($item->guid))
+				{
+					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+				}
 			}
 			
 			if (!empty($item->id))
@@ -176,8 +220,23 @@ class ComponentbuilderModelClass_extends extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
+		// // check if xpath was set in options
+		$xpath = false;
+		if (isset($options['xpath']))
+		{
+			$xpath = $options['xpath'];
+			unset($options['xpath']);
+		}
+		// // check if clear form was set in options
+		$clear = false;
+		if (isset($options['clear']))
+		{
+			$clear = $options['clear'];
+			unset($options['clear']);
+		}
+
 		// Get the form.
-		$form = $this->loadForm('com_componentbuilder.class_extends', 'class_extends', $options);
+		$form = $this->loadForm('com_componentbuilder.class_extends', 'class_extends', $options, $clear, $xpath);
 
 		if (empty($form))
 		{
@@ -426,6 +485,8 @@ class ComponentbuilderModelClass_extends extends JModelAdmin
 		if (empty($data))
 		{
 			$data = $this->getItem();
+			// run the perprocess of the data
+			$this->preprocessData('com_componentbuilder.class_extends', $data);
 		}
 
 		return $data;

admin/models/class_method.php

@@ -75,14 +75,51 @@ class ComponentbuilderModelClass_method extends JModelAdmin
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
+
 	/**
-	 * get VDM session key
+	 * get VDM internal session key
 	 *
 	 * @return  string  the session key
 	 *
 	 */
 	public function getVDM()
 	{
+		if (!isset($this->vastDevMod))
+		{
+			$_id = 0; // new item probably (since it was not set in the getItem method)
+
+			if (empty($_id))
+			{
+				$id = 0;
+			}
+			else
+			{
+				$id = $_id;
+			}
+			// set the id and view name to session
+			if ($vdm = ComponentbuilderHelper::get('class_method__'.$id))
+			{
+				$this->vastDevMod = $vdm;
+			}
+			else
+			{
+				// set the vast development method key
+				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				ComponentbuilderHelper::set($this->vastDevMod, 'class_method__'.$id);
+				ComponentbuilderHelper::set('class_method__'.$id, $this->vastDevMod);
+				// set a return value if found
+				$jinput = JFactory::getApplication()->input;
+				$return = $jinput->get('return', null, 'base64');
+				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				// set a GUID value if found
+				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+					&& method_exists('ComponentbuilderHelper', 'validGUID')
+					&& ComponentbuilderHelper::validGUID($item->guid))
+				{
+					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+				}
+			}
+		}
 		return $this->vastDevMod;
 	}
 
@@ -158,6 +195,13 @@ class ComponentbuilderModelClass_method extends JModelAdmin
 				$jinput = JFactory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
 				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				// set a GUID value if found
+				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+					&& method_exists('ComponentbuilderHelper', 'validGUID')
+					&& ComponentbuilderHelper::validGUID($item->guid))
+				{
+					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+				}
 			}
 			
 			if (!empty($item->id))
@@ -185,8 +229,23 @@ class ComponentbuilderModelClass_method extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
+		// // check if xpath was set in options
+		$xpath = false;
+		if (isset($options['xpath']))
+		{
+			$xpath = $options['xpath'];
+			unset($options['xpath']);
+		}
+		// // check if clear form was set in options
+		$clear = false;
+		if (isset($options['clear']))
+		{
+			$clear = $options['clear'];
+			unset($options['clear']);
+		}
+
 		// Get the form.
-		$form = $this->loadForm('com_componentbuilder.class_method', 'class_method', $options);
+		$form = $this->loadForm('com_componentbuilder.class_method', 'class_method', $options, $clear, $xpath);
 
 		if (empty($form))
 		{
@@ -435,6 +494,8 @@ class ComponentbuilderModelClass_method extends JModelAdmin
 		if (empty($data))
 		{
 			$data = $this->getItem();
+			// run the perprocess of the data
+			$this->preprocessData('com_componentbuilder.class_method', $data);
 		}
 
 		return $data;

admin/models/class_methods.php

@@ -94,12 +94,18 @@ class ComponentbuilderModelClass_methods extends JModelList
 		// load parent items
 		$items = parent::getItems();
 
-		// set values to display correctly.
+		// Set values to display correctly.
 		if (ComponentbuilderHelper::checkArray($items))
 		{
+			// Get the user object if not set.
+			if (!isset($user) || !ComponentbuilderHelper::checkObject($user))
+			{
+				$user = JFactory::getUser();
+			}
 			foreach ($items as $nr => &$item)
 			{
-				$access = (JFactory::getUser()->authorise('class_method.access', 'com_componentbuilder.class_method.' . (int) $item->id) && JFactory::getUser()->authorise('class_method.access', 'com_componentbuilder'));
+				// Remove items the user can't access.
+				$access = ($user->authorise('class_method.access', 'com_componentbuilder.class_method.' . (int) $item->id) && $user->authorise('class_method.access', 'com_componentbuilder'));
 				if (!$access)
 				{
 					unset($items[$nr]);
@@ -253,17 +259,23 @@ class ComponentbuilderModelClass_methods extends JModelList
 	/**
 	 * Method to get list export data.
 	 *
+	 * @param   array  $pks  The ids of the items to get
+	 * @param   JUser  $user  The user making the request
+	 *
 	 * @return mixed  An array of data items on success, false on failure.
 	 */
-	public function getExportData($pks)
+	public function getExportData($pks, $user = null)
 	{
 		// setup the query
 		if (ComponentbuilderHelper::checkArray($pks))
 		{
-			// Set a value to know this is exporting method.
+			// Set a value to know this is export method. (USE IN CUSTOM CODE TO ALTER OUTCOME)
 			$_export = true;
-			// Get the user object.
-			$user = JFactory::getUser();
+			// Get the user object if not set.
+			if (!isset($user) || !ComponentbuilderHelper::checkObject($user))
+			{
+				$user = JFactory::getUser();
+			}
 			// Create a new query object.
 			$db = JFactory::getDBO();
 			$query = $db->getQuery(true);
@@ -291,12 +303,13 @@ class ComponentbuilderModelClass_methods extends JModelList
 			{
 				$items = $db->loadObjectList();
 
-				// set values to display correctly.
+				// Set values to display correctly.
 				if (ComponentbuilderHelper::checkArray($items))
 				{
 					foreach ($items as $nr => &$item)
 					{
-						$access = (JFactory::getUser()->authorise('class_method.access', 'com_componentbuilder.class_method.' . (int) $item->id) && JFactory::getUser()->authorise('class_method.access', 'com_componentbuilder'));
+						// Remove items the user can't access.
+						$access = ($user->authorise('class_method.access', 'com_componentbuilder.class_method.' . (int) $item->id) && $user->authorise('class_method.access', 'com_componentbuilder'));
 						if (!$access)
 						{
 							unset($items[$nr]);

admin/models/class_properties.php

@@ -94,12 +94,18 @@ class ComponentbuilderModelClass_properties extends JModelList
 		// load parent items
 		$items = parent::getItems();
 
-		// set values to display correctly.
+		// Set values to display correctly.
 		if (ComponentbuilderHelper::checkArray($items))
 		{
+			// Get the user object if not set.
+			if (!isset($user) || !ComponentbuilderHelper::checkObject($user))
+			{
+				$user = JFactory::getUser();
+			}
 			foreach ($items as $nr => &$item)
 			{
-				$access = (JFactory::getUser()->authorise('class_property.access', 'com_componentbuilder.class_property.' . (int) $item->id) && JFactory::getUser()->authorise('class_property.access', 'com_componentbuilder'));
+				// Remove items the user can't access.
+				$access = ($user->authorise('class_property.access', 'com_componentbuilder.class_property.' . (int) $item->id) && $user->authorise('class_property.access', 'com_componentbuilder'));
 				if (!$access)
 				{
 					unset($items[$nr]);
@@ -253,17 +259,23 @@ class ComponentbuilderModelClass_properties extends JModelList
 	/**
 	 * Method to get list export data.
 	 *
+	 * @param   array  $pks  The ids of the items to get
+	 * @param   JUser  $user  The user making the request
+	 *
 	 * @return mixed  An array of data items on success, false on failure.
 	 */
-	public function getExportData($pks)
+	public function getExportData($pks, $user = null)
 	{
 		// setup the query
 		if (ComponentbuilderHelper::checkArray($pks))
 		{
-			// Set a value to know this is exporting method.
+			// Set a value to know this is export method. (USE IN CUSTOM CODE TO ALTER OUTCOME)
 			$_export = true;
-			// Get the user object.
-			$user = JFactory::getUser();
+			// Get the user object if not set.
+			if (!isset($user) || !ComponentbuilderHelper::checkObject($user))
+			{
+				$user = JFactory::getUser();
+			}
 			// Create a new query object.
 			$db = JFactory::getDBO();
 			$query = $db->getQuery(true);
@@ -291,12 +303,13 @@ class ComponentbuilderModelClass_properties extends JModelList
 			{
 				$items = $db->loadObjectList();
 
-				// set values to display correctly.
+				// Set values to display correctly.
 				if (ComponentbuilderHelper::checkArray($items))
 				{
 					foreach ($items as $nr => &$item)
 					{
-						$access = (JFactory::getUser()->authorise('class_property.access', 'com_componentbuilder.class_property.' . (int) $item->id) && JFactory::getUser()->authorise('class_property.access', 'com_componentbuilder'));
+						// Remove items the user can't access.
+						$access = ($user->authorise('class_property.access', 'com_componentbuilder.class_property.' . (int) $item->id) && $user->authorise('class_property.access', 'com_componentbuilder'));
 						if (!$access)
 						{
 							unset($items[$nr]);

admin/models/class_property.php

@@ -72,14 +72,51 @@ class ComponentbuilderModelClass_property extends JModelAdmin
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
+
 	/**
-	 * get VDM session key
+	 * get VDM internal session key
 	 *
 	 * @return  string  the session key
 	 *
 	 */
 	public function getVDM()
 	{
+		if (!isset($this->vastDevMod))
+		{
+			$_id = 0; // new item probably (since it was not set in the getItem method)
+
+			if (empty($_id))
+			{
+				$id = 0;
+			}
+			else
+			{
+				$id = $_id;
+			}
+			// set the id and view name to session
+			if ($vdm = ComponentbuilderHelper::get('class_property__'.$id))
+			{
+				$this->vastDevMod = $vdm;
+			}
+			else
+			{
+				// set the vast development method key
+				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				ComponentbuilderHelper::set($this->vastDevMod, 'class_property__'.$id);
+				ComponentbuilderHelper::set('class_property__'.$id, $this->vastDevMod);
+				// set a return value if found
+				$jinput = JFactory::getApplication()->input;
+				$return = $jinput->get('return', null, 'base64');
+				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				// set a GUID value if found
+				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+					&& method_exists('ComponentbuilderHelper', 'validGUID')
+					&& ComponentbuilderHelper::validGUID($item->guid))
+				{
+					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+				}
+			}
+		}
 		return $this->vastDevMod;
 	}
 
@@ -149,6 +186,13 @@ class ComponentbuilderModelClass_property extends JModelAdmin
 				$jinput = JFactory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
 				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				// set a GUID value if found
+				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+					&& method_exists('ComponentbuilderHelper', 'validGUID')
+					&& ComponentbuilderHelper::validGUID($item->guid))
+				{
+					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+				}
 			}
 			
 			if (!empty($item->id))
@@ -176,8 +220,23 @@ class ComponentbuilderModelClass_property extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
+		// // check if xpath was set in options
+		$xpath = false;
+		if (isset($options['xpath']))
+		{
+			$xpath = $options['xpath'];
+			unset($options['xpath']);
+		}
+		// // check if clear form was set in options
+		$clear = false;
+		if (isset($options['clear']))
+		{
+			$clear = $options['clear'];
+			unset($options['clear']);
+		}
+
 		// Get the form.
-		$form = $this->loadForm('com_componentbuilder.class_property', 'class_property', $options);
+		$form = $this->loadForm('com_componentbuilder.class_property', 'class_property', $options, $clear, $xpath);
 
 		if (empty($form))
 		{
@@ -426,6 +485,8 @@ class ComponentbuilderModelClass_property extends JModelAdmin
 		if (empty($data))
 		{
 			$data = $this->getItem();
+			// run the perprocess of the data
+			$this->preprocessData('com_componentbuilder.class_property', $data);
 		}
 
 		return $data;

admin/models/component_admin_views.php

@@ -162,8 +162,23 @@ class ComponentbuilderModelComponent_admin_views extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
+		// // check if xpath was set in options
+		$xpath = false;
+		if (isset($options['xpath']))
+		{
+			$xpath = $options['xpath'];
+			unset($options['xpath']);
+		}
+		// // check if clear form was set in options
+		$clear = false;
+		if (isset($options['clear']))
+		{
+			$clear = $options['clear'];
+			unset($options['clear']);
+		}
+
 		// Get the form.
-		$form = $this->loadForm('com_componentbuilder.component_admin_views', 'component_admin_views', $options);
+		$form = $this->loadForm('com_componentbuilder.component_admin_views', 'component_admin_views', $options, $clear, $xpath);
 
 		if (empty($form))
 		{
@@ -395,6 +410,8 @@ class ComponentbuilderModelComponent_admin_views extends JModelAdmin
 		if (empty($data))
 		{
 			$data = $this->getItem();
+			// run the perprocess of the data
+			$this->preprocessData('com_componentbuilder.component_admin_views', $data);
 		}
 
 		return $data;

admin/models/component_config.php

@@ -161,8 +161,23 @@ class ComponentbuilderModelComponent_config extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
+		// // check if xpath was set in options
+		$xpath = false;
+		if (isset($options['xpath']))
+		{
+			$xpath = $options['xpath'];
+			unset($options['xpath']);
+		}
+		// // check if clear form was set in options
+		$clear = false;
+		if (isset($options['clear']))
+		{
+			$clear = $options['clear'];
+			unset($options['clear']);
+		}
+
 		// Get the form.
-		$form = $this->loadForm('com_componentbuilder.component_config', 'component_config', $options);
+		$form = $this->loadForm('com_componentbuilder.component_config', 'component_config', $options, $clear, $xpath);
 
 		if (empty($form))
 		{
@@ -394,6 +409,8 @@ class ComponentbuilderModelComponent_config extends JModelAdmin
 		if (empty($data))
 		{
 			$data = $this->getItem();
+			// run the perprocess of the data
+			$this->preprocessData('com_componentbuilder.component_config', $data);
 		}
 
 		return $data;

admin/models/component_custom_admin_menus.php

@@ -161,8 +161,23 @@ class ComponentbuilderModelComponent_custom_admin_menus extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
+		// // check if xpath was set in options
+		$xpath = false;
+		if (isset($options['xpath']))
+		{
+			$xpath = $options['xpath'];
+			unset($options['xpath']);
+		}
+		// // check if clear form was set in options
+		$clear = false;
+		if (isset($options['clear']))
+		{
+			$clear = $options['clear'];
+			unset($options['clear']);
+		}
+
 		// Get the form.
-		$form = $this->loadForm('com_componentbuilder.component_custom_admin_menus', 'component_custom_admin_menus', $options);
+		$form = $this->loadForm('com_componentbuilder.component_custom_admin_menus', 'component_custom_admin_menus', $options, $clear, $xpath);
 
 		if (empty($form))
 		{
@@ -394,6 +409,8 @@ class ComponentbuilderModelComponent_custom_admin_menus extends JModelAdmin
 		if (empty($data))
 		{
 			$data = $this->getItem();
+			// run the perprocess of the data
+			$this->preprocessData('com_componentbuilder.component_custom_admin_menus', $data);
 		}
 
 		return $data;

admin/models/component_custom_admin_views.php

@@ -162,8 +162,23 @@ class ComponentbuilderModelComponent_custom_admin_views extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
+		// // check if xpath was set in options
+		$xpath = false;
+		if (isset($options['xpath']))
+		{
+			$xpath = $options['xpath'];
+			unset($options['xpath']);
+		}
+		// // check if clear form was set in options
+		$clear = false;
+		if (isset($options['clear']))
+		{
+			$clear = $options['clear'];
+			unset($options['clear']);
+		}
+
 		// Get the form.
-		$form = $this->loadForm('com_componentbuilder.component_custom_admin_views', 'component_custom_admin_views', $options);
+		$form = $this->loadForm('com_componentbuilder.component_custom_admin_views', 'component_custom_admin_views', $options, $clear, $xpath);
 
 		if (empty($form))
 		{
@@ -395,6 +410,8 @@ class ComponentbuilderModelComponent_custom_admin_views extends JModelAdmin
 		if (empty($data))
 		{
 			$data = $this->getItem();
+			// run the perprocess of the data
+			$this->preprocessData('com_componentbuilder.component_custom_admin_views', $data);
 		}
 
 		return $data;

admin/models/component_dashboard.php

@@ -70,10 +70,54 @@ class ComponentbuilderModelComponent_dashboard extends JModelAdmin
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
+
+	/**
+	 * get VDM internal session key
+	 *
+	 * @return  string  the session key
+	 *
+	 */
 	public function getVDM()
 	{
+		if (!isset($this->vastDevMod))
+		{
+			$_id = 0; // new item probably (since it was not set in the getItem method)
+
+			if (empty($_id))
+			{
+				$id = 0;
+			}
+			else
+			{
+				$id = $_id;
+			}
+			// set the id and view name to session
+			if ($vdm = ComponentbuilderHelper::get('component_dashboard__'.$id))
+			{
+				$this->vastDevMod = $vdm;
+			}
+			else
+			{
+				// set the vast development method key
+				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				ComponentbuilderHelper::set($this->vastDevMod, 'component_dashboard__'.$id);
+				ComponentbuilderHelper::set('component_dashboard__'.$id, $this->vastDevMod);
+				// set a return value if found
+				$jinput = JFactory::getApplication()->input;
+				$return = $jinput->get('return', null, 'base64');
+				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				// set a GUID value if found
+				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+					&& method_exists('ComponentbuilderHelper', 'validGUID')
+					&& ComponentbuilderHelper::validGUID($item->guid))
+				{
+					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+				}
+			}
+		}
 		return $this->vastDevMod;
 	}
+
     
 	/**
 	 * Method to get a single record.
@@ -128,7 +172,7 @@ class ComponentbuilderModelComponent_dashboard extends JModelAdmin
 				$id = $item->id;
 			}
 			// set the id and view name to session
-			if ($vdm = ComponentbuilderHelper::get('components_dashboard__'.$id))
+			if ($vdm = ComponentbuilderHelper::get('component_dashboard__'.$id))
 			{
 				$this->vastDevMod = $vdm;
 			}
@@ -136,12 +180,19 @@ class ComponentbuilderModelComponent_dashboard extends JModelAdmin
 			{
 				// set the vast development method key
 				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
-				ComponentbuilderHelper::set($this->vastDevMod, 'components_dashboard__'.$id);
-				ComponentbuilderHelper::set('components_dashboard__'.$id, $this->vastDevMod);
+				ComponentbuilderHelper::set($this->vastDevMod, 'component_dashboard__'.$id);
+				ComponentbuilderHelper::set('component_dashboard__'.$id, $this->vastDevMod);
 				// set a return value if found
 				$jinput = JFactory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
 				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				// set a GUID value if found
+				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+					&& method_exists('ComponentbuilderHelper', 'validGUID')
+					&& ComponentbuilderHelper::validGUID($item->guid))
+				{
+					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+				}
 			}
 			// update the fields
 			$objectUpdate = new stdClass();
@@ -199,8 +250,23 @@ class ComponentbuilderModelComponent_dashboard extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
+		// // check if xpath was set in options
+		$xpath = false;
+		if (isset($options['xpath']))
+		{
+			$xpath = $options['xpath'];
+			unset($options['xpath']);
+		}
+		// // check if clear form was set in options
+		$clear = false;
+		if (isset($options['clear']))
+		{
+			$clear = $options['clear'];
+			unset($options['clear']);
+		}
+
 		// Get the form.
-		$form = $this->loadForm('com_componentbuilder.component_dashboard', 'component_dashboard', $options);
+		$form = $this->loadForm('com_componentbuilder.component_dashboard', 'component_dashboard', $options, $clear, $xpath);
 
 		if (empty($form))
 		{
@@ -432,6 +498,8 @@ class ComponentbuilderModelComponent_dashboard extends JModelAdmin
 		if (empty($data))
 		{
 			$data = $this->getItem();
+			// run the perprocess of the data
+			$this->preprocessData('com_componentbuilder.component_dashboard', $data);
 		}
 
 		return $data;

admin/models/component_files_folders.php

@@ -198,8 +198,23 @@ class ComponentbuilderModelComponent_files_folders extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
+		// // check if xpath was set in options
+		$xpath = false;
+		if (isset($options['xpath']))
+		{
+			$xpath = $options['xpath'];
+			unset($options['xpath']);
+		}
+		// // check if clear form was set in options
+		$clear = false;
+		if (isset($options['clear']))
+		{
+			$clear = $options['clear'];
+			unset($options['clear']);
+		}
+
 		// Get the form.
-		$form = $this->loadForm('com_componentbuilder.component_files_folders', 'component_files_folders', $options);
+		$form = $this->loadForm('com_componentbuilder.component_files_folders', 'component_files_folders', $options, $clear, $xpath);
 
 		if (empty($form))
 		{
@@ -431,6 +446,8 @@ class ComponentbuilderModelComponent_files_folders extends JModelAdmin
 		if (empty($data))
 		{
 			$data = $this->getItem();
+			// run the perprocess of the data
+			$this->preprocessData('com_componentbuilder.component_files_folders', $data);
 		}
 
 		return $data;

admin/models/component_mysql_tweaks.php

@@ -161,8 +161,23 @@ class ComponentbuilderModelComponent_mysql_tweaks extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
+		// // check if xpath was set in options
+		$xpath = false;
+		if (isset($options['xpath']))
+		{
+			$xpath = $options['xpath'];
+			unset($options['xpath']);
+		}
+		// // check if clear form was set in options
+		$clear = false;
+		if (isset($options['clear']))
+		{
+			$clear = $options['clear'];
+			unset($options['clear']);
+		}
+
 		// Get the form.
-		$form = $this->loadForm('com_componentbuilder.component_mysql_tweaks', 'component_mysql_tweaks', $options);
+		$form = $this->loadForm('com_componentbuilder.component_mysql_tweaks', 'component_mysql_tweaks', $options, $clear, $xpath);
 
 		if (empty($form))
 		{
@@ -394,6 +409,8 @@ class ComponentbuilderModelComponent_mysql_tweaks extends JModelAdmin
 		if (empty($data))
 		{
 			$data = $this->getItem();
+			// run the perprocess of the data
+			$this->preprocessData('com_componentbuilder.component_mysql_tweaks', $data);
 		}
 
 		return $data;

admin/models/component_placeholders.php

@@ -130,8 +130,23 @@ class ComponentbuilderModelComponent_placeholders extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
+		// // check if xpath was set in options
+		$xpath = false;
+		if (isset($options['xpath']))
+		{
+			$xpath = $options['xpath'];
+			unset($options['xpath']);
+		}
+		// // check if clear form was set in options
+		$clear = false;
+		if (isset($options['clear']))
+		{
+			$clear = $options['clear'];
+			unset($options['clear']);
+		}
+
 		// Get the form.
-		$form = $this->loadForm('com_componentbuilder.component_placeholders', 'component_placeholders', $options);
+		$form = $this->loadForm('com_componentbuilder.component_placeholders', 'component_placeholders', $options, $clear, $xpath);
 
 		if (empty($form))
 		{
@@ -363,6 +378,8 @@ class ComponentbuilderModelComponent_placeholders extends JModelAdmin
 		if (empty($data))
 		{
 			$data = $this->getItem();
+			// run the perprocess of the data
+			$this->preprocessData('com_componentbuilder.component_placeholders', $data);
 		}
 
 		return $data;

admin/models/component_plugins.php

@@ -131,8 +131,23 @@ class ComponentbuilderModelComponent_plugins extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
+		// // check if xpath was set in options
+		$xpath = false;
+		if (isset($options['xpath']))
+		{
+			$xpath = $options['xpath'];
+			unset($options['xpath']);
+		}
+		// // check if clear form was set in options
+		$clear = false;
+		if (isset($options['clear']))
+		{
+			$clear = $options['clear'];
+			unset($options['clear']);
+		}
+
 		// Get the form.
-		$form = $this->loadForm('com_componentbuilder.component_plugins', 'component_plugins', $options);
+		$form = $this->loadForm('com_componentbuilder.component_plugins', 'component_plugins', $options, $clear, $xpath);
 
 		if (empty($form))
 		{
@@ -364,6 +379,8 @@ class ComponentbuilderModelComponent_plugins extends JModelAdmin
 		if (empty($data))
 		{
 			$data = $this->getItem();
+			// run the perprocess of the data
+			$this->preprocessData('com_componentbuilder.component_plugins', $data);
 		}
 
 		return $data;

admin/models/component_site_views.php

@@ -162,8 +162,23 @@ class ComponentbuilderModelComponent_site_views extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
+		// // check if xpath was set in options
+		$xpath = false;
+		if (isset($options['xpath']))
+		{
+			$xpath = $options['xpath'];
+			unset($options['xpath']);
+		}
+		// // check if clear form was set in options
+		$clear = false;
+		if (isset($options['clear']))
+		{
+			$clear = $options['clear'];
+			unset($options['clear']);
+		}
+
 		// Get the form.
-		$form = $this->loadForm('com_componentbuilder.component_site_views', 'component_site_views', $options);
+		$form = $this->loadForm('com_componentbuilder.component_site_views', 'component_site_views', $options, $clear, $xpath);
 
 		if (empty($form))
 		{
@@ -395,6 +410,8 @@ class ComponentbuilderModelComponent_site_views extends JModelAdmin
 		if (empty($data))
 		{
 			$data = $this->getItem();
+			// run the perprocess of the data
+			$this->preprocessData('com_componentbuilder.component_site_views', $data);
 		}
 
 		return $data;

admin/models/component_updates.php

@@ -161,8 +161,23 @@ class ComponentbuilderModelComponent_updates extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
+		// // check if xpath was set in options
+		$xpath = false;
+		if (isset($options['xpath']))
+		{
+			$xpath = $options['xpath'];
+			unset($options['xpath']);
+		}
+		// // check if clear form was set in options
+		$clear = false;
+		if (isset($options['clear']))
+		{
+			$clear = $options['clear'];
+			unset($options['clear']);
+		}
+
 		// Get the form.
-		$form = $this->loadForm('com_componentbuilder.component_updates', 'component_updates', $options);
+		$form = $this->loadForm('com_componentbuilder.component_updates', 'component_updates', $options, $clear, $xpath);
 
 		if (empty($form))
 		{
@@ -394,6 +409,8 @@ class ComponentbuilderModelComponent_updates extends JModelAdmin
 		if (empty($data))
 		{
 			$data = $this->getItem();
+			// run the perprocess of the data
+			$this->preprocessData('com_componentbuilder.component_updates', $data);
 		}
 
 		return $data;

admin/models/componentbuilder.php

@@ -547,18 +547,19 @@ class ComponentbuilderModelComponentbuilder extends JModelList
 				jsonp: "callback"
 			});
 		}
-		// nice little dot trick :)
-		jQuery(document).ready( function($) {
-			var x=0;
-			setInterval(function() {
-				var dots = "";
-				x++;
-				for (var y=0; y < x%8; y++) {
-					dots+=".";
-				}
-				$(".loading-dots").text(dots);
-			} , 500);
-		});');
+		
+// nice little dot trick :)
+jQuery(document).ready( function($) {
+  var x=0;
+  setInterval(function() {
+	var dots = "";
+	x++;
+	for (var y=0; y < x%8; y++) {
+		dots+=".";
+	}
+	$(".loading-dots").text(dots);
+  } , 500);
+});');
 
 		return '<div id="noticeboard-md">'.JText::_('COM_COMPONENTBUILDER_THE_NOTICE_BOARD_IS_LOADING').'.<span class="loading-dots">.</span></small></div>';
 	}

admin/models/components_admin_views.php

@@ -84,12 +84,18 @@ class ComponentbuilderModelComponents_admin_views extends JModelList
 		// load parent items
 		$items = parent::getItems();
 
-		// set values to display correctly.
+		// Set values to display correctly.
 		if (ComponentbuilderHelper::checkArray($items))
 		{
+			// Get the user object if not set.
+			if (!isset($user) || !ComponentbuilderHelper::checkObject($user))
+			{
+				$user = JFactory::getUser();
+			}
 			foreach ($items as $nr => &$item)
 			{
-				$access = (JFactory::getUser()->authorise('component_admin_views.access', 'com_componentbuilder.component_admin_views.' . (int) $item->id) && JFactory::getUser()->authorise('component_admin_views.access', 'com_componentbuilder'));
+				// Remove items the user can't access.
+				$access = ($user->authorise('component_admin_views.access', 'com_componentbuilder.component_admin_views.' . (int) $item->id) && $user->authorise('component_admin_views.access', 'com_componentbuilder'));
 				if (!$access)
 				{
 					unset($items[$nr]);

admin/models/components_config.php

@@ -84,12 +84,18 @@ class ComponentbuilderModelComponents_config extends JModelList
 		// load parent items
 		$items = parent::getItems();
 
-		// set values to display correctly.
+		// Set values to display correctly.
 		if (ComponentbuilderHelper::checkArray($items))
 		{
+			// Get the user object if not set.
+			if (!isset($user) || !ComponentbuilderHelper::checkObject($user))
+			{
+				$user = JFactory::getUser();
+			}
 			foreach ($items as $nr => &$item)
 			{
-				$access = (JFactory::getUser()->authorise('component_config.access', 'com_componentbuilder.component_config.' . (int) $item->id) && JFactory::getUser()->authorise('component_config.access', 'com_componentbuilder'));
+				// Remove items the user can't access.
+				$access = ($user->authorise('component_config.access', 'com_componentbuilder.component_config.' . (int) $item->id) && $user->authorise('component_config.access', 'com_componentbuilder'));
 				if (!$access)
 				{
 					unset($items[$nr]);

admin/models/components_custom_admin_menus.php

@@ -84,12 +84,18 @@ class ComponentbuilderModelComponents_custom_admin_menus extends JModelList
 		// load parent items
 		$items = parent::getItems();
 
-		// set values to display correctly.
+		// Set values to display correctly.
 		if (ComponentbuilderHelper::checkArray($items))
 		{
+			// Get the user object if not set.
+			if (!isset($user) || !ComponentbuilderHelper::checkObject($user))
+			{
+				$user = JFactory::getUser();
+			}
 			foreach ($items as $nr => &$item)
 			{
-				$access = (JFactory::getUser()->authorise('component_custom_admin_menus.access', 'com_componentbuilder.component_custom_admin_menus.' . (int) $item->id) && JFactory::getUser()->authorise('component_custom_admin_menus.access', 'com_componentbuilder'));
+				// Remove items the user can't access.
+				$access = ($user->authorise('component_custom_admin_menus.access', 'com_componentbuilder.component_custom_admin_menus.' . (int) $item->id) && $user->authorise('component_custom_admin_menus.access', 'com_componentbuilder'));
 				if (!$access)
 				{
 					unset($items[$nr]);

admin/models/components_custom_admin_views.php

@@ -84,12 +84,18 @@ class ComponentbuilderModelComponents_custom_admin_views extends JModelList
 		// load parent items
 		$items = parent::getItems();
 
-		// set values to display correctly.
+		// Set values to display correctly.
 		if (ComponentbuilderHelper::checkArray($items))
 		{
+			// Get the user object if not set.
+			if (!isset($user) || !ComponentbuilderHelper::checkObject($user))
+			{
+				$user = JFactory::getUser();
+			}
 			foreach ($items as $nr => &$item)
 			{
-				$access = (JFactory::getUser()->authorise('component_custom_admin_views.access', 'com_componentbuilder.component_custom_admin_views.' . (int) $item->id) && JFactory::getUser()->authorise('component_custom_admin_views.access', 'com_componentbuilder'));
+				// Remove items the user can't access.
+				$access = ($user->authorise('component_custom_admin_views.access', 'com_componentbuilder.component_custom_admin_views.' . (int) $item->id) && $user->authorise('component_custom_admin_views.access', 'com_componentbuilder'));
 				if (!$access)
 				{
 					unset($items[$nr]);

admin/models/components_dashboard.php

@@ -84,12 +84,18 @@ class ComponentbuilderModelComponents_dashboard extends JModelList
 		// load parent items
 		$items = parent::getItems();
 
-		// set values to display correctly.
+		// Set values to display correctly.
 		if (ComponentbuilderHelper::checkArray($items))
 		{
+			// Get the user object if not set.
+			if (!isset($user) || !ComponentbuilderHelper::checkObject($user))
+			{
+				$user = JFactory::getUser();
+			}
 			foreach ($items as $nr => &$item)
 			{
-				$access = (JFactory::getUser()->authorise('component_dashboard.access', 'com_componentbuilder.component_dashboard.' . (int) $item->id) && JFactory::getUser()->authorise('component_dashboard.access', 'com_componentbuilder'));
+				// Remove items the user can't access.
+				$access = ($user->authorise('component_dashboard.access', 'com_componentbuilder.component_dashboard.' . (int) $item->id) && $user->authorise('component_dashboard.access', 'com_componentbuilder'));
 				if (!$access)
 				{
 					unset($items[$nr]);

admin/models/components_files_folders.php

@@ -84,12 +84,18 @@ class ComponentbuilderModelComponents_files_folders extends JModelList
 		// load parent items
 		$items = parent::getItems();
 
-		// set values to display correctly.
+		// Set values to display correctly.
 		if (ComponentbuilderHelper::checkArray($items))
 		{
+			// Get the user object if not set.
+			if (!isset($user) || !ComponentbuilderHelper::checkObject($user))
+			{
+				$user = JFactory::getUser();
+			}
 			foreach ($items as $nr => &$item)
 			{
-				$access = (JFactory::getUser()->authorise('component_files_folders.access', 'com_componentbuilder.component_files_folders.' . (int) $item->id) && JFactory::getUser()->authorise('component_files_folders.access', 'com_componentbuilder'));
+				// Remove items the user can't access.
+				$access = ($user->authorise('component_files_folders.access', 'com_componentbuilder.component_files_folders.' . (int) $item->id) && $user->authorise('component_files_folders.access', 'com_componentbuilder'));
 				if (!$access)
 				{
 					unset($items[$nr]);

admin/models/components_mysql_tweaks.php

@@ -84,12 +84,18 @@ class ComponentbuilderModelComponents_mysql_tweaks extends JModelList
 		// load parent items
 		$items = parent::getItems();
 
-		// set values to display correctly.
+		// Set values to display correctly.
 		if (ComponentbuilderHelper::checkArray($items))
 		{
+			// Get the user object if not set.
+			if (!isset($user) || !ComponentbuilderHelper::checkObject($user))
+			{
+				$user = JFactory::getUser();
+			}
 			foreach ($items as $nr => &$item)
 			{
-				$access = (JFactory::getUser()->authorise('component_mysql_tweaks.access', 'com_componentbuilder.component_mysql_tweaks.' . (int) $item->id) && JFactory::getUser()->authorise('component_mysql_tweaks.access', 'com_componentbuilder'));
+				// Remove items the user can't access.
+				$access = ($user->authorise('component_mysql_tweaks.access', 'com_componentbuilder.component_mysql_tweaks.' . (int) $item->id) && $user->authorise('component_mysql_tweaks.access', 'com_componentbuilder'));
 				if (!$access)
 				{
 					unset($items[$nr]);

admin/models/components_placeholders.php

@@ -84,12 +84,18 @@ class ComponentbuilderModelComponents_placeholders extends JModelList
 		// load parent items
 		$items = parent::getItems();
 
-		// set values to display correctly.
+		// Set values to display correctly.
 		if (ComponentbuilderHelper::checkArray($items))
 		{
+			// Get the user object if not set.
+			if (!isset($user) || !ComponentbuilderHelper::checkObject($user))
+			{
+				$user = JFactory::getUser();
+			}
 			foreach ($items as $nr => &$item)
 			{
-				$access = (JFactory::getUser()->authorise('component_placeholders.access', 'com_componentbuilder.component_placeholders.' . (int) $item->id) && JFactory::getUser()->authorise('component_placeholders.access', 'com_componentbuilder'));
+				// Remove items the user can't access.
+				$access = ($user->authorise('component_placeholders.access', 'com_componentbuilder.component_placeholders.' . (int) $item->id) && $user->authorise('component_placeholders.access', 'com_componentbuilder'));
 				if (!$access)
 				{
 					unset($items[$nr]);

admin/models/components_plugins.php

@@ -84,12 +84,18 @@ class ComponentbuilderModelComponents_plugins extends JModelList
 		// load parent items
 		$items = parent::getItems();
 
-		// set values to display correctly.
+		// Set values to display correctly.
 		if (ComponentbuilderHelper::checkArray($items))
 		{
+			// Get the user object if not set.
+			if (!isset($user) || !ComponentbuilderHelper::checkObject($user))
+			{
+				$user = JFactory::getUser();
+			}
 			foreach ($items as $nr => &$item)
 			{
-				$access = (JFactory::getUser()->authorise('component_plugins.access', 'com_componentbuilder.component_plugins.' . (int) $item->id) && JFactory::getUser()->authorise('component_plugins.access', 'com_componentbuilder'));
+				// Remove items the user can't access.
+				$access = ($user->authorise('component_plugins.access', 'com_componentbuilder.component_plugins.' . (int) $item->id) && $user->authorise('component_plugins.access', 'com_componentbuilder'));
 				if (!$access)
 				{
 					unset($items[$nr]);

admin/models/components_site_views.php

@@ -84,12 +84,18 @@ class ComponentbuilderModelComponents_site_views extends JModelList
 		// load parent items
 		$items = parent::getItems();
 
-		// set values to display correctly.
+		// Set values to display correctly.
 		if (ComponentbuilderHelper::checkArray($items))
 		{
+			// Get the user object if not set.
+			if (!isset($user) || !ComponentbuilderHelper::checkObject($user))
+			{
+				$user = JFactory::getUser();
+			}
 			foreach ($items as $nr => &$item)
 			{
-				$access = (JFactory::getUser()->authorise('component_site_views.access', 'com_componentbuilder.component_site_views.' . (int) $item->id) && JFactory::getUser()->authorise('component_site_views.access', 'com_componentbuilder'));
+				// Remove items the user can't access.
+				$access = ($user->authorise('component_site_views.access', 'com_componentbuilder.component_site_views.' . (int) $item->id) && $user->authorise('component_site_views.access', 'com_componentbuilder'));
 				if (!$access)
 				{
 					unset($items[$nr]);

admin/models/components_updates.php

@@ -84,12 +84,18 @@ class ComponentbuilderModelComponents_updates extends JModelList
 		// load parent items
 		$items = parent::getItems();
 
-		// set values to display correctly.
+		// Set values to display correctly.
 		if (ComponentbuilderHelper::checkArray($items))
 		{
+			// Get the user object if not set.
+			if (!isset($user) || !ComponentbuilderHelper::checkObject($user))
+			{
+				$user = JFactory::getUser();
+			}
 			foreach ($items as $nr => &$item)
 			{
-				$access = (JFactory::getUser()->authorise('component_updates.access', 'com_componentbuilder.component_updates.' . (int) $item->id) && JFactory::getUser()->authorise('component_updates.access', 'com_componentbuilder'));
+				// Remove items the user can't access.
+				$access = ($user->authorise('component_updates.access', 'com_componentbuilder.component_updates.' . (int) $item->id) && $user->authorise('component_updates.access', 'com_componentbuilder'));
 				if (!$access)
 				{
 					unset($items[$nr]);

admin/models/custom_admin_view.php

@@ -134,14 +134,51 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
+
 	/**
-	 * get VDM session key
+	 * get VDM internal session key
 	 *
 	 * @return  string  the session key
 	 *
 	 */
 	public function getVDM()
 	{
+		if (!isset($this->vastDevMod))
+		{
+			$_id = 0; // new item probably (since it was not set in the getItem method)
+
+			if (empty($_id))
+			{
+				$id = 0;
+			}
+			else
+			{
+				$id = $_id;
+			}
+			// set the id and view name to session
+			if ($vdm = ComponentbuilderHelper::get('custom_admin_view__'.$id))
+			{
+				$this->vastDevMod = $vdm;
+			}
+			else
+			{
+				// set the vast development method key
+				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				ComponentbuilderHelper::set($this->vastDevMod, 'custom_admin_view__'.$id);
+				ComponentbuilderHelper::set('custom_admin_view__'.$id, $this->vastDevMod);
+				// set a return value if found
+				$jinput = JFactory::getApplication()->input;
+				$return = $jinput->get('return', null, 'base64');
+				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				// set a GUID value if found
+				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+					&& method_exists('ComponentbuilderHelper', 'validGUID')
+					&& ComponentbuilderHelper::validGUID($item->guid))
+				{
+					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+				}
+			}
+		}
 		return $this->vastDevMod;
 	}
 
@@ -303,6 +340,13 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 				$jinput = JFactory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
 				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				// set a GUID value if found
+				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+					&& method_exists('ComponentbuilderHelper', 'validGUID')
+					&& ComponentbuilderHelper::validGUID($item->guid))
+				{
+					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+				}
 			}
 
 			// check what type of custom_button array we have here (should be subform... but just incase)
@@ -351,8 +395,23 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
+		// // check if xpath was set in options
+		$xpath = false;
+		if (isset($options['xpath']))
+		{
+			$xpath = $options['xpath'];
+			unset($options['xpath']);
+		}
+		// // check if clear form was set in options
+		$clear = false;
+		if (isset($options['clear']))
+		{
+			$clear = $options['clear'];
+			unset($options['clear']);
+		}
+
 		// Get the form.
-		$form = $this->loadForm('com_componentbuilder.custom_admin_view', 'custom_admin_view', $options);
+		$form = $this->loadForm('com_componentbuilder.custom_admin_view', 'custom_admin_view', $options, $clear, $xpath);
 
 		if (empty($form))
 		{
@@ -599,6 +658,8 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 		if (empty($data))
 		{
 			$data = $this->getItem();
+			// run the perprocess of the data
+			$this->preprocessData('com_componentbuilder.custom_admin_view', $data);
 		}
 
 		return $data;

admin/models/custom_admin_views.php

@@ -106,12 +106,18 @@ class ComponentbuilderModelCustom_admin_views extends JModelList
 		// load parent items
 		$items = parent::getItems();
 
-		// set values to display correctly.
+		// Set values to display correctly.
 		if (ComponentbuilderHelper::checkArray($items))
 		{
+			// Get the user object if not set.
+			if (!isset($user) || !ComponentbuilderHelper::checkObject($user))
+			{
+				$user = JFactory::getUser();
+			}
 			foreach ($items as $nr => &$item)
 			{
-				$access = (JFactory::getUser()->authorise('custom_admin_view.access', 'com_componentbuilder.custom_admin_view.' . (int) $item->id) && JFactory::getUser()->authorise('custom_admin_view.access', 'com_componentbuilder'));
+				// Remove items the user can't access.
+				$access = ($user->authorise('custom_admin_view.access', 'com_componentbuilder.custom_admin_view.' . (int) $item->id) && $user->authorise('custom_admin_view.access', 'com_componentbuilder'));
 				if (!$access)
 				{
 					unset($items[$nr]);
@@ -267,17 +273,23 @@ class ComponentbuilderModelCustom_admin_views extends JModelList
 	/**
 	 * Method to get list export data.
 	 *
+	 * @param   array  $pks  The ids of the items to get
+	 * @param   JUser  $user  The user making the request
+	 *
 	 * @return mixed  An array of data items on success, false on failure.
 	 */
-	public function getExportData($pks)
+	public function getExportData($pks, $user = null)
 	{
 		// setup the query
 		if (ComponentbuilderHelper::checkArray($pks))
 		{
-			// Set a value to know this is exporting method.
+			// Set a value to know this is export method. (USE IN CUSTOM CODE TO ALTER OUTCOME)
 			$_export = true;
-			// Get the user object.
-			$user = JFactory::getUser();
+			// Get the user object if not set.
+			if (!isset($user) || !ComponentbuilderHelper::checkObject($user))
+			{
+				$user = JFactory::getUser();
+			}
 			// Create a new query object.
 			$db = JFactory::getDBO();
 			$query = $db->getQuery(true);
@@ -305,12 +317,13 @@ class ComponentbuilderModelCustom_admin_views extends JModelList
 			{
 				$items = $db->loadObjectList();
 
-				// set values to display correctly.
+				// Set values to display correctly.
 				if (ComponentbuilderHelper::checkArray($items))
 				{
 					foreach ($items as $nr => &$item)
 					{
-						$access = (JFactory::getUser()->authorise('custom_admin_view.access', 'com_componentbuilder.custom_admin_view.' . (int) $item->id) && JFactory::getUser()->authorise('custom_admin_view.access', 'com_componentbuilder'));
+						// Remove items the user can't access.
+						$access = ($user->authorise('custom_admin_view.access', 'com_componentbuilder.custom_admin_view.' . (int) $item->id) && $user->authorise('custom_admin_view.access', 'com_componentbuilder'));
 						if (!$access)
 						{
 							unset($items[$nr]);

admin/models/custom_code.php

@@ -87,14 +87,51 @@ class ComponentbuilderModelCustom_code extends JModelAdmin
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
+
 	/**
-	 * get VDM session key
+	 * get VDM internal session key
 	 *
 	 * @return  string  the session key
 	 *
 	 */
 	public function getVDM()
 	{
+		if (!isset($this->vastDevMod))
+		{
+			$_id = 0; // new item probably (since it was not set in the getItem method)
+
+			if (empty($_id))
+			{
+				$id = 0;
+			}
+			else
+			{
+				$id = $_id;
+			}
+			// set the id and view name to session
+			if ($vdm = ComponentbuilderHelper::get('custom_code__'.$id))
+			{
+				$this->vastDevMod = $vdm;
+			}
+			else
+			{
+				// set the vast development method key
+				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				ComponentbuilderHelper::set($this->vastDevMod, 'custom_code__'.$id);
+				ComponentbuilderHelper::set('custom_code__'.$id, $this->vastDevMod);
+				// set a return value if found
+				$jinput = JFactory::getApplication()->input;
+				$return = $jinput->get('return', null, 'base64');
+				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				// set a GUID value if found
+				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+					&& method_exists('ComponentbuilderHelper', 'validGUID')
+					&& ComponentbuilderHelper::validGUID($item->guid))
+				{
+					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+				}
+			}
+		}
 		return $this->vastDevMod;
 	}
 
@@ -158,6 +195,13 @@ class ComponentbuilderModelCustom_code extends JModelAdmin
 				$jinput = JFactory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
 				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				// set a GUID value if found
+				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+					&& method_exists('ComponentbuilderHelper', 'validGUID')
+					&& ComponentbuilderHelper::validGUID($item->guid))
+				{
+					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+				}
 			}
 			
 			if (!empty($item->id))
@@ -185,8 +229,23 @@ class ComponentbuilderModelCustom_code extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
+		// // check if xpath was set in options
+		$xpath = false;
+		if (isset($options['xpath']))
+		{
+			$xpath = $options['xpath'];
+			unset($options['xpath']);
+		}
+		// // check if clear form was set in options
+		$clear = false;
+		if (isset($options['clear']))
+		{
+			$clear = $options['clear'];
+			unset($options['clear']);
+		}
+
 		// Get the form.
-		$form = $this->loadForm('com_componentbuilder.custom_code', 'custom_code', $options);
+		$form = $this->loadForm('com_componentbuilder.custom_code', 'custom_code', $options, $clear, $xpath);
 
 		if (empty($form))
 		{
@@ -435,6 +494,8 @@ class ComponentbuilderModelCustom_code extends JModelAdmin
 		if (empty($data))
 		{
 			$data = $this->getItem();
+			// run the perprocess of the data
+			$this->preprocessData('com_componentbuilder.custom_code', $data);
 		}
 
 		return $data;

admin/models/custom_codes.php

@@ -102,12 +102,18 @@ class ComponentbuilderModelCustom_codes extends JModelList
 		// load parent items
 		$items = parent::getItems();
 
-		// set values to display correctly.
+		// Set values to display correctly.
 		if (ComponentbuilderHelper::checkArray($items))
 		{
+			// Get the user object if not set.
+			if (!isset($user) || !ComponentbuilderHelper::checkObject($user))
+			{
+				$user = JFactory::getUser();
+			}
 			foreach ($items as $nr => &$item)
 			{
-				$access = (JFactory::getUser()->authorise('custom_code.access', 'com_componentbuilder.custom_code.' . (int) $item->id) && JFactory::getUser()->authorise('custom_code.access', 'com_componentbuilder'));
+				// Remove items the user can't access.
+				$access = ($user->authorise('custom_code.access', 'com_componentbuilder.custom_code.' . (int) $item->id) && $user->authorise('custom_code.access', 'com_componentbuilder'));
 				if (!$access)
 				{
 					unset($items[$nr]);
@@ -300,17 +306,23 @@ class ComponentbuilderModelCustom_codes extends JModelList
 	/**
 	 * Method to get list export data.
 	 *
+	 * @param   array  $pks  The ids of the items to get
+	 * @param   JUser  $user  The user making the request
+	 *
 	 * @return mixed  An array of data items on success, false on failure.
 	 */
-	public function getExportData($pks)
+	public function getExportData($pks, $user = null)
 	{
 		// setup the query
 		if (ComponentbuilderHelper::checkArray($pks))
 		{
-			// Set a value to know this is exporting method.
+			// Set a value to know this is export method. (USE IN CUSTOM CODE TO ALTER OUTCOME)
 			$_export = true;
-			// Get the user object.
-			$user = JFactory::getUser();
+			// Get the user object if not set.
+			if (!isset($user) || !ComponentbuilderHelper::checkObject($user))
+			{
+				$user = JFactory::getUser();
+			}
 			// Create a new query object.
 			$db = JFactory::getDBO();
 			$query = $db->getQuery(true);
@@ -338,12 +350,13 @@ class ComponentbuilderModelCustom_codes extends JModelList
 			{
 				$items = $db->loadObjectList();
 
-				// set values to display correctly.
+				// Set values to display correctly.
 				if (ComponentbuilderHelper::checkArray($items))
 				{
 					foreach ($items as $nr => &$item)
 					{
-						$access = (JFactory::getUser()->authorise('custom_code.access', 'com_componentbuilder.custom_code.' . (int) $item->id) && JFactory::getUser()->authorise('custom_code.access', 'com_componentbuilder'));
+						// Remove items the user can't access.
+						$access = ($user->authorise('custom_code.access', 'com_componentbuilder.custom_code.' . (int) $item->id) && $user->authorise('custom_code.access', 'com_componentbuilder'));
 						if (!$access)
 						{
 							unset($items[$nr]);

admin/models/dynamic_get.php

@@ -127,14 +127,51 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
+
 	/**
-	 * get VDM session key
+	 * get VDM internal session key
 	 *
 	 * @return  string  the session key
 	 *
 	 */
 	public function getVDM()
 	{
+		if (!isset($this->vastDevMod))
+		{
+			$_id = 0; // new item probably (since it was not set in the getItem method)
+
+			if (empty($_id))
+			{
+				$id = 0;
+			}
+			else
+			{
+				$id = $_id;
+			}
+			// set the id and view name to session
+			if ($vdm = ComponentbuilderHelper::get('dynamic_get__'.$id))
+			{
+				$this->vastDevMod = $vdm;
+			}
+			else
+			{
+				// set the vast development method key
+				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				ComponentbuilderHelper::set($this->vastDevMod, 'dynamic_get__'.$id);
+				ComponentbuilderHelper::set('dynamic_get__'.$id, $this->vastDevMod);
+				// set a return value if found
+				$jinput = JFactory::getApplication()->input;
+				$return = $jinput->get('return', null, 'base64');
+				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				// set a GUID value if found
+				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+					&& method_exists('ComponentbuilderHelper', 'validGUID')
+					&& ComponentbuilderHelper::validGUID($item->guid))
+				{
+					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+				}
+			}
+		}
 		return $this->vastDevMod;
 	}
 
@@ -302,6 +339,13 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 				$jinput = JFactory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
 				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				// set a GUID value if found
+				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+					&& method_exists('ComponentbuilderHelper', 'validGUID')
+					&& ComponentbuilderHelper::validGUID($item->guid))
+				{
+					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+				}
 			}
 
 			// update the fields
@@ -365,8 +409,23 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
+		// // check if xpath was set in options
+		$xpath = false;
+		if (isset($options['xpath']))
+		{
+			$xpath = $options['xpath'];
+			unset($options['xpath']);
+		}
+		// // check if clear form was set in options
+		$clear = false;
+		if (isset($options['clear']))
+		{
+			$clear = $options['clear'];
+			unset($options['clear']);
+		}
+
 		// Get the form.
-		$form = $this->loadForm('com_componentbuilder.dynamic_get', 'dynamic_get', $options);
+		$form = $this->loadForm('com_componentbuilder.dynamic_get', 'dynamic_get', $options, $clear, $xpath);
 
 		if (empty($form))
 		{
@@ -613,6 +672,8 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 		if (empty($data))
 		{
 			$data = $this->getItem();
+			// run the perprocess of the data
+			$this->preprocessData('com_componentbuilder.dynamic_get', $data);
 		}
 
 		return $data;

admin/models/dynamic_gets.php

@@ -94,12 +94,18 @@ class ComponentbuilderModelDynamic_gets extends JModelList
 		// load parent items
 		$items = parent::getItems();
 
-		// set values to display correctly.
+		// Set values to display correctly.
 		if (ComponentbuilderHelper::checkArray($items))
 		{
+			// Get the user object if not set.
+			if (!isset($user) || !ComponentbuilderHelper::checkObject($user))
+			{
+				$user = JFactory::getUser();
+			}
 			foreach ($items as $nr => &$item)
 			{
-				$access = (JFactory::getUser()->authorise('dynamic_get.access', 'com_componentbuilder.dynamic_get.' . (int) $item->id) && JFactory::getUser()->authorise('dynamic_get.access', 'com_componentbuilder'));
+				// Remove items the user can't access.
+				$access = ($user->authorise('dynamic_get.access', 'com_componentbuilder.dynamic_get.' . (int) $item->id) && $user->authorise('dynamic_get.access', 'com_componentbuilder'));
 				if (!$access)
 				{
 					unset($items[$nr]);
@@ -250,17 +256,23 @@ class ComponentbuilderModelDynamic_gets extends JModelList
 	/**
 	 * Method to get list export data.
 	 *
+	 * @param   array  $pks  The ids of the items to get
+	 * @param   JUser  $user  The user making the request
+	 *
 	 * @return mixed  An array of data items on success, false on failure.
 	 */
-	public function getExportData($pks)
+	public function getExportData($pks, $user = null)
 	{
 		// setup the query
 		if (ComponentbuilderHelper::checkArray($pks))
 		{
-			// Set a value to know this is exporting method.
+			// Set a value to know this is export method. (USE IN CUSTOM CODE TO ALTER OUTCOME)
 			$_export = true;
-			// Get the user object.
-			$user = JFactory::getUser();
+			// Get the user object if not set.
+			if (!isset($user) || !ComponentbuilderHelper::checkObject($user))
+			{
+				$user = JFactory::getUser();
+			}
 			// Create a new query object.
 			$db = JFactory::getDBO();
 			$query = $db->getQuery(true);
@@ -288,12 +300,13 @@ class ComponentbuilderModelDynamic_gets extends JModelList
 			{
 				$items = $db->loadObjectList();
 
-				// set values to display correctly.
+				// Set values to display correctly.
 				if (ComponentbuilderHelper::checkArray($items))
 				{
 					foreach ($items as $nr => &$item)
 					{
-						$access = (JFactory::getUser()->authorise('dynamic_get.access', 'com_componentbuilder.dynamic_get.' . (int) $item->id) && JFactory::getUser()->authorise('dynamic_get.access', 'com_componentbuilder'));
+						// Remove items the user can't access.
+						$access = ($user->authorise('dynamic_get.access', 'com_componentbuilder.dynamic_get.' . (int) $item->id) && $user->authorise('dynamic_get.access', 'com_componentbuilder'));
 						if (!$access)
 						{
 							unset($items[$nr]);

admin/models/field.php

@@ -51,7 +51,12 @@ class ComponentbuilderModelField extends JModelAdmin
 				'indexes',
 				'null_switch',
 				'store',
-				'note_whmcs_encryption'
+				'note_whmcs_encryption',
+				'note_expert_field_save_mode',
+				'initiator_on_save_model',
+				'initiator_on_get_model',
+				'on_save_model_field',
+				'on_get_model_field'
 			),
 			'fullwidth' => array(
 				'note_no_database_settings_needed',
@@ -113,14 +118,51 @@ class ComponentbuilderModelField extends JModelAdmin
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
+
 	/**
-	 * get VDM session key
+	 * get VDM internal session key
 	 *
 	 * @return  string  the session key
 	 *
 	 */
 	public function getVDM()
 	{
+		if (!isset($this->vastDevMod))
+		{
+			$_id = 0; // new item probably (since it was not set in the getItem method)
+
+			if (empty($_id))
+			{
+				$id = 0;
+			}
+			else
+			{
+				$id = $_id;
+			}
+			// set the id and view name to session
+			if ($vdm = ComponentbuilderHelper::get('field__'.$id))
+			{
+				$this->vastDevMod = $vdm;
+			}
+			else
+			{
+				// set the vast development method key
+				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				ComponentbuilderHelper::set($this->vastDevMod, 'field__'.$id);
+				ComponentbuilderHelper::set('field__'.$id, $this->vastDevMod);
+				// set a return value if found
+				$jinput = JFactory::getApplication()->input;
+				$return = $jinput->get('return', null, 'base64');
+				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				// set a GUID value if found
+				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+					&& method_exists('ComponentbuilderHelper', 'validGUID')
+					&& ComponentbuilderHelper::validGUID($item->guid))
+				{
+					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+				}
+			}
+		}
 		return $this->vastDevMod;
 	}
 
@@ -154,10 +196,22 @@ class ComponentbuilderModelField extends JModelAdmin
 				$item->metadata = $registry->toArray();
 			}
 
-			if (!empty($item->css_views))
+			if (!empty($item->on_get_model_field))
 			{
-				// base64 Decode css_views.
-				$item->css_views = base64_decode($item->css_views);
+				// base64 Decode on_get_model_field.
+				$item->on_get_model_field = base64_decode($item->on_get_model_field);
+			}
+
+			if (!empty($item->on_save_model_field))
+			{
+				// base64 Decode on_save_model_field.
+				$item->on_save_model_field = base64_decode($item->on_save_model_field);
+			}
+
+			if (!empty($item->initiator_on_get_model))
+			{
+				// base64 Decode initiator_on_get_model.
+				$item->initiator_on_get_model = base64_decode($item->initiator_on_get_model);
 			}
 
 			if (!empty($item->css_view))
@@ -166,6 +220,12 @@ class ComponentbuilderModelField extends JModelAdmin
 				$item->css_view = base64_decode($item->css_view);
 			}
 
+			if (!empty($item->css_views))
+			{
+				// base64 Decode css_views.
+				$item->css_views = base64_decode($item->css_views);
+			}
+
 			if (!empty($item->javascript_view_footer))
 			{
 				// base64 Decode javascript_view_footer.
@@ -178,6 +238,12 @@ class ComponentbuilderModelField extends JModelAdmin
 				$item->javascript_views_footer = base64_decode($item->javascript_views_footer);
 			}
 
+			if (!empty($item->initiator_on_save_model))
+			{
+				// base64 Decode initiator_on_save_model.
+				$item->initiator_on_save_model = base64_decode($item->initiator_on_save_model);
+			}
+
 			if (!empty($item->xml))
 			{
 				// JSON Decode xml.
@@ -208,6 +274,13 @@ class ComponentbuilderModelField extends JModelAdmin
 				$jinput = JFactory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
 				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				// set a GUID value if found
+				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+					&& method_exists('ComponentbuilderHelper', 'validGUID')
+					&& ComponentbuilderHelper::validGUID($item->guid))
+				{
+					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+				}
 			}
 			
 			if (!empty($item->id))
@@ -235,8 +308,23 @@ class ComponentbuilderModelField extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
+		// // check if xpath was set in options
+		$xpath = false;
+		if (isset($options['xpath']))
+		{
+			$xpath = $options['xpath'];
+			unset($options['xpath']);
+		}
+		// // check if clear form was set in options
+		$clear = false;
+		if (isset($options['clear']))
+		{
+			$clear = $options['clear'];
+			unset($options['clear']);
+		}
+
 		// Get the form.
-		$form = $this->loadForm('com_componentbuilder.field', 'field', $options);
+		$form = $this->loadForm('com_componentbuilder.field', 'field', $options, $clear, $xpath);
 
 		if (empty($form))
 		{
@@ -483,6 +571,8 @@ class ComponentbuilderModelField extends JModelAdmin
 		if (empty($data))
 		{
 			$data = $this->getItem();
+			// run the perprocess of the data
+			$this->preprocessData('com_componentbuilder.field', $data);
 		}
 
 		return $data;
@@ -1050,10 +1140,22 @@ class ComponentbuilderModelField extends JModelAdmin
 			$data['xml'] = (string) json_encode($data['xml']);
 		}
 
-		// Set the css_views string to base64 string.
-		if (isset($data['css_views']))
+		// Set the on_get_model_field string to base64 string.
+		if (isset($data['on_get_model_field']))
 		{
-			$data['css_views'] = base64_encode($data['css_views']);
+			$data['on_get_model_field'] = base64_encode($data['on_get_model_field']);
+		}
+
+		// Set the on_save_model_field string to base64 string.
+		if (isset($data['on_save_model_field']))
+		{
+			$data['on_save_model_field'] = base64_encode($data['on_save_model_field']);
+		}
+
+		// Set the initiator_on_get_model string to base64 string.
+		if (isset($data['initiator_on_get_model']))
+		{
+			$data['initiator_on_get_model'] = base64_encode($data['initiator_on_get_model']);
 		}
 
 		// Set the css_view string to base64 string.
@@ -1062,6 +1164,12 @@ class ComponentbuilderModelField extends JModelAdmin
 			$data['css_view'] = base64_encode($data['css_view']);
 		}
 
+		// Set the css_views string to base64 string.
+		if (isset($data['css_views']))
+		{
+			$data['css_views'] = base64_encode($data['css_views']);
+		}
+
 		// Set the javascript_view_footer string to base64 string.
 		if (isset($data['javascript_view_footer']))
 		{
@@ -1072,6 +1180,12 @@ class ComponentbuilderModelField extends JModelAdmin
 		if (isset($data['javascript_views_footer']))
 		{
 			$data['javascript_views_footer'] = base64_encode($data['javascript_views_footer']);
+		}
+
+		// Set the initiator_on_save_model string to base64 string.
+		if (isset($data['initiator_on_save_model']))
+		{
+			$data['initiator_on_save_model'] = base64_encode($data['initiator_on_save_model']);
 		}
         
 		// Set the Params Items to data

admin/models/fields.php

@@ -118,12 +118,18 @@ class ComponentbuilderModelFields extends JModelList
 		// load parent items
 		$items = parent::getItems();
 
-		// set values to display correctly.
+		// Set values to display correctly.
 		if (ComponentbuilderHelper::checkArray($items))
 		{
+			// Get the user object if not set.
+			if (!isset($user) || !ComponentbuilderHelper::checkObject($user))
+			{
+				$user = JFactory::getUser();
+			}
 			foreach ($items as $nr => &$item)
 			{
-				$access = (JFactory::getUser()->authorise('field.access', 'com_componentbuilder.field.' . (int) $item->id) && JFactory::getUser()->authorise('field.access', 'com_componentbuilder'));
+				// Remove items the user can't access.
+				$access = ($user->authorise('field.access', 'com_componentbuilder.field.' . (int) $item->id) && $user->authorise('field.access', 'com_componentbuilder'));
 				if (!$access)
 				{
 					unset($items[$nr]);
@@ -227,7 +233,8 @@ class ComponentbuilderModelFields extends JModelList
 				2 => 'COM_COMPONENTBUILDER_FIELD_BASESIXTY_FOUR',
 				3 => 'COM_COMPONENTBUILDER_FIELD_BASIC_ENCRYPTION_LOCALDBKEY',
 				5 => 'COM_COMPONENTBUILDER_FIELD_MEDIUM_ENCRYPTION_LOCALFILEKEY',
-				4 => 'COM_COMPONENTBUILDER_FIELD_WHMCSKEY_ENCRYPTION'
+				4 => 'COM_COMPONENTBUILDER_FIELD_WHMCSKEY_ENCRYPTION',
+				6 => 'COM_COMPONENTBUILDER_FIELD_EXPERT_MODE_CUSTOM'
 			);
 			// Now check if value is found in this array
 			if (isset($storeArray[$value]) && ComponentbuilderHelper::checkString($storeArray[$value]))
@@ -365,17 +372,23 @@ class ComponentbuilderModelFields extends JModelList
 	/**
 	 * Method to get list export data.
 	 *
+	 * @param   array  $pks  The ids of the items to get
+	 * @param   JUser  $user  The user making the request
+	 *
 	 * @return mixed  An array of data items on success, false on failure.
 	 */
-	public function getExportData($pks)
+	public function getExportData($pks, $user = null)
 	{
 		// setup the query
 		if (ComponentbuilderHelper::checkArray($pks))
 		{
-			// Set a value to know this is exporting method.
+			// Set a value to know this is export method. (USE IN CUSTOM CODE TO ALTER OUTCOME)
 			$_export = true;
-			// Get the user object.
-			$user = JFactory::getUser();
+			// Get the user object if not set.
+			if (!isset($user) || !ComponentbuilderHelper::checkObject($user))
+			{
+				$user = JFactory::getUser();
+			}
 			// Create a new query object.
 			$db = JFactory::getDBO();
 			$query = $db->getQuery(true);
@@ -403,26 +416,35 @@ class ComponentbuilderModelFields extends JModelList
 			{
 				$items = $db->loadObjectList();
 
-				// set values to display correctly.
+				// Set values to display correctly.
 				if (ComponentbuilderHelper::checkArray($items))
 				{
 					foreach ($items as $nr => &$item)
 					{
-						$access = (JFactory::getUser()->authorise('field.access', 'com_componentbuilder.field.' . (int) $item->id) && JFactory::getUser()->authorise('field.access', 'com_componentbuilder'));
+						// Remove items the user can't access.
+						$access = ($user->authorise('field.access', 'com_componentbuilder.field.' . (int) $item->id) && $user->authorise('field.access', 'com_componentbuilder'));
 						if (!$access)
 						{
 							unset($items[$nr]);
 							continue;
 						}
 
-						// decode css_views
-						$item->css_views = base64_decode($item->css_views);
+						// decode on_get_model_field
+						$item->on_get_model_field = base64_decode($item->on_get_model_field);
+						// decode on_save_model_field
+						$item->on_save_model_field = base64_decode($item->on_save_model_field);
+						// decode initiator_on_get_model
+						$item->initiator_on_get_model = base64_decode($item->initiator_on_get_model);
 						// decode css_view
 						$item->css_view = base64_decode($item->css_view);
+						// decode css_views
+						$item->css_views = base64_decode($item->css_views);
 						// decode javascript_view_footer
 						$item->javascript_view_footer = base64_decode($item->javascript_view_footer);
 						// decode javascript_views_footer
 						$item->javascript_views_footer = base64_decode($item->javascript_views_footer);
+						// decode initiator_on_save_model
+						$item->initiator_on_save_model = base64_decode($item->initiator_on_save_model);
 						// unset the values we don't want exported.
 						unset($item->asset_id);
 						unset($item->checked_out);

admin/models/fields/fields.php

@@ -36,24 +36,26 @@ class JFormFieldFields extends JFormFieldList
 	protected function getOptions()
 	{
 		$db = JFactory::getDBO();
-$query = $db->getQuery(true);
-$query->select($db->quoteName(array('a.id','a.name','b.name'),array('id','field_name','type')));
-$query->from($db->quoteName('#__componentbuilder_field', 'a'));
+		$query = $db->getQuery(true);
+		$query->select($db->quoteName(array('a.id', 'a.name', 'a.xml', 'b.name'), array('id', 'field_name', 'xml', 'type')));
+		$query->from($db->quoteName('#__componentbuilder_field', 'a'));
 		$query->join('LEFT', '#__componentbuilder_fieldtype AS b ON b.id = a.fieldtype');
-$query->where($db->quoteName('a.published') . ' >= 1');
-$query->order('a.name ASC');
-$db->setQuery((string)$query);
-$items = $db->loadObjectList();
-$options = array();
-if ($items)
-{
-	$options[] = JHtml::_('select.option', '', 'Select an option');
-	foreach($items as $item)
-	{
-		$options[] = JHtml::_('select.option', $item->id, $item->field_name . ' [' . $item->type . ']');
-	}
-}
+		$query->where($db->quoteName('a.published') . ' >= 1');
+		$query->order('a.name ASC');
+		$db->setQuery((string) $query);
+		$items = $db->loadObjectList();
+		$options = array();
+		if ($items)
+		{
+			$options[] = JHtml::_('select.option', '', 'Select an option');
+			foreach($items as $item)
+			{
+				// get the field name (TODO this could slow down the system so we will need to improve on this)
+				$field_name = ComponentbuilderHelper::safeFieldName(ComponentbuilderHelper::getBetween(json_decode($item->xml),'name="','"'));
+				$options[] = JHtml::_('select.option', $item->id, $item->field_name . ' [ ' . $field_name . ' - ' . $item->type . ' ]');
+			}
+		}
 
-return $options;
+		return $options;
 	}
 }

admin/models/fields/joomlaplugins.php

@@ -26,7 +26,111 @@ class JFormFieldJoomlaplugins extends JFormFieldList
 	 *
 	 * @var		string
 	 */
-	public $type = 'joomlaplugins';
+	public $type = 'joomlaplugins';
+
+	/**
+	 * Override to add new button
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   3.2
+	 */
+	protected function getInput()
+	{
+		// see if we should add buttons
+		$set_button = $this->getAttribute('button');
+		// get html
+		$html = parent::getInput();
+		// if true set button
+		if ($set_button === 'true')
+		{
+			$button = array();
+			$script = array();
+			$button_code_name = $this->getAttribute('name');
+			// get the input from url
+			$app = JFactory::getApplication();
+			$jinput = $app->input;
+			// get the view name & id
+			$values = $jinput->getArray(array(
+				'id' => 'int',
+				'view' => 'word'
+			));
+			// check if new item
+			$ref = '';
+			$refJ = '';
+			if (!is_null($values['id']) && strlen($values['view']))
+			{
+				// only load referral if not new item.
+				$ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
+				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
+				// get the return value.
+				$_uri = (string) JUri::getInstance();
+				$_return = urlencode(base64_encode($_uri));
+				// load return value.
+				$ref .= '&return=' . $_return;
+				$refJ .= '&return=' . $_return;
+			}
+			// get button label
+			$button_label = trim($button_code_name);
+			$button_label = preg_replace('/_+/', ' ', $button_label);
+			$button_label = preg_replace('/\s+/', ' ', $button_label);
+			$button_label = preg_replace("/[^A-Za-z ]/", '', $button_label);
+			$button_label = ucfirst(strtolower($button_label));
+			// get user object
+			$user = JFactory::getUser();
+			// only add if user allowed to create joomla_plugin
+			if ($user->authorise('joomla_plugin.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
+			{
+				// build Create button
+				$button[] = '<a id="'.$button_code_name.'Create" class="btn btn-small btn-success hasTooltip" title="'.JText::sprintf('PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_CREATE_NEW_S', $button_label).'" style="border-radius: 0px 4px 4px 0px; padding: 4px 4px 4px 7px;"
+					href="index.php?option=com_componentbuilder&amp;view=joomla_plugin&amp;layout=edit'.$ref.'" >
+					<span class="icon-new icon-white"></span></a>';
+			}
+			// only add if user allowed to edit joomla_plugin
+			if ($user->authorise('joomla_plugin.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
+			{
+				// build edit button
+				$button[] = '<a id="'.$button_code_name.'Edit" class="btn btn-small hasTooltip" title="'.JText::sprintf('PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_EDIT_S', $button_label).'" style="display: none; padding: 4px 4px 4px 7px;" href="#" >
+					<span class="icon-edit"></span></a>';
+				// build script
+				$script[] = "
+					jQuery(document).ready(function() {
+						jQuery('#adminForm').on('change', '#jform_".$button_code_name."',function (e) {
+							e.preventDefault();
+							var ".$button_code_name."Value = jQuery('#jform_".$button_code_name."').val();
+							".$button_code_name."Button(".$button_code_name."Value);
+						});
+						var ".$button_code_name."Value = jQuery('#jform_".$button_code_name."').val();
+						".$button_code_name."Button(".$button_code_name."Value);
+					});
+					function ".$button_code_name."Button(value) {
+						if (value > 0) {
+							// hide the create button
+							jQuery('#".$button_code_name."Create').hide();
+							// show edit button
+							jQuery('#".$button_code_name."Edit').show();
+							var url = 'index.php?option=com_componentbuilder&view=joomla_plugins&task=joomla_plugin.edit&id='+value+'".$refJ."';
+							jQuery('#".$button_code_name."Edit').attr('href', url);
+						} else {
+							// show the create button
+							jQuery('#".$button_code_name."Create').show();
+							// hide edit button
+							jQuery('#".$button_code_name."Edit').hide();
+						}
+					}";
+			}
+			// check if button was created for joomla_plugin field.
+			if (is_array($button) && count($button) > 0)
+			{
+				// Load the needed script.
+				$document = JFactory::getDocument();
+				$document->addScriptDeclaration(implode(' ',$script));
+				// return the button attached to input field.
+				return '<div class="input-append">' .$html . implode('',$button).'</div>';
+			}
+		}
+		return $html;
+	}
 
 	/**
 	 * Method to get a list of options for a list input.

admin/models/fields/libraries.php

@@ -139,22 +139,24 @@ class JFormFieldLibraries extends JFormFieldList
 	 */
 	protected function getOptions()
 	{
-		$db = JFactory::getDBO();
-		$query = $db->getQuery(true);
-		$query->select($db->quoteName(array('a.id','a.name'),array('id','libraries_name')));
-		$query->from($db->quoteName('#__componentbuilder_library', 'a'));
-		$query->where($db->quoteName('a.published') . ' >= 1');
-		$query->order('a.name ASC');
-		$db->setQuery((string)$query);
-		$items = $db->loadObjectList();
-		$options = array();
-		if ($items)
-		{
-			foreach($items as $item)
-			{
-				$options[] = JHtml::_('select.option', $item->id, $item->libraries_name);
-			}
-		}
+		$db = JFactory::getDBO();
+		$query = $db->getQuery(true);
+		$query->select($db->quoteName(array('a.id','a.name'),array('id','libraries_name')));
+		$query->from($db->quoteName('#__componentbuilder_library', 'a'));
+		$query->where($db->quoteName('a.published') . ' >= 1');
+		$query->where($db->quoteName('a.target') . ' = 1');
+		$query->order('a.name ASC');
+		$db->setQuery((string)$query);
+		$items = $db->loadObjectList();
+		$options = array();
+		if ($items)
+		{
+			foreach($items as $item)
+			{
+				$options[] = JHtml::_('select.option', $item->id, $item->libraries_name);
+			}
+		}
+
 		return $options;
 	}
 }

admin/models/fields/librariesx.php

@@ -139,30 +139,32 @@ class JFormFieldLibrariesx extends JFormFieldList
 	 */
 	protected function getOptions()
 	{
-		// get the input from url
-		$jinput = JFactory::getApplication()->input;
-		// get the library id
-		$libID = $jinput->getInt('id', 0);
-		$db = JFactory::getDBO();
-		$query = $db->getQuery(true);
-		$query->select($db->quoteName(array('a.id','a.name'),array('id','libraries_name')));
-		$query->from($db->quoteName('#__componentbuilder_library', 'a'));
+		// get the input from url
+		$jinput = JFactory::getApplication()->input;
+		// get the library id
+		$libID = $jinput->getInt('id', 0);
+		$db = JFactory::getDBO();
+		$query = $db->getQuery(true);
+		$query->select($db->quoteName(array('a.id','a.name'),array('id','libraries_name')));
+		$query->from($db->quoteName('#__componentbuilder_library', 'a'));
 		$query->where($db->quoteName('a.published') . ' >= 1');
+		$query->where($db->quoteName('a.target') . ' = 1');
 		if ($libID > 0)
 		{
 			$query->where($db->quoteName('a.id') . ' != ' . (int) $libID);
-		}
-		$query->order('a.name ASC');
-		$db->setQuery((string)$query);
-		$items = $db->loadObjectList();
-		$options = array();
-		if ($items)
-		{
-			foreach($items as $item)
-			{
-				$options[] = JHtml::_('select.option', $item->id, $item->libraries_name);
-			}
-		}
+		}
+		$query->order('a.name ASC');
+		$db->setQuery((string)$query);
+		$items = $db->loadObjectList();
+		$options = array();
+		if ($items)
+		{
+			foreach($items as $item)
+			{
+				$options[] = JHtml::_('select.option', $item->id, $item->libraries_name);
+			}
+		}
+
 		return $options;
 	}
 }

admin/models/fields/library.php

@@ -139,24 +139,25 @@ class JFormFieldLibrary extends JFormFieldList
 	 */
 	protected function getOptions()
 	{
-		$db = JFactory::getDBO();
-		$query = $db->getQuery(true);
-		$query->select($db->quoteName(array('a.id','a.name'),array('id','library_name')));
-		$query->from($db->quoteName('#__componentbuilder_library', 'a'));
+		$db = JFactory::getDBO();
+		$query = $db->getQuery(true);
+		$query->select($db->quoteName(array('a.id','a.name'),array('id','library_name')));
+		$query->from($db->quoteName('#__componentbuilder_library', 'a'));
 		$query->where($db->quoteName('a.published') . ' >= 1');
-		$query->where($db->quoteName('a.type') . ' = 1');
-		$query->order('a.name ASC');
-		$db->setQuery((string)$query);
-		$items = $db->loadObjectList();
-		$options = array();
-		if ($items)
-		{
-			$options[] = JHtml::_('select.option', '', 'Select an option');
-			foreach($items as $item)
-			{
-				$options[] = JHtml::_('select.option', $item->id, $item->library_name);
-			}
-		}
+		$query->where($db->quoteName('a.type') . ' = 1');
+		$query->order('a.name ASC');
+		$db->setQuery((string)$query);
+		$items = $db->loadObjectList();
+		$options = array();
+		if ($items)
+		{
+			$options[] = JHtml::_('select.option', '', 'Select an option');
+			foreach($items as $item)
+			{
+				$options[] = JHtml::_('select.option', $item->id, $item->library_name);
+			}
+		}
+
 		return $options;
 	}
 }

admin/models/fields/targetfields.php

@@ -41,19 +41,26 @@ class JFormFieldTargetfields extends JFormFieldList
 		$jinput = JFactory::getApplication()->input;
 		// get the id
 		$ID = $jinput->getInt('id', 0);
+		// get the view name
+		$VIEW = $jinput->get('view', null, 'WORD');
 		// rest the fields ids
 		$fieldIds = array();
-		if (is_numeric($ID) && $ID >= 1)
+		// if this is an actual admin view then we are done
+		if ('admin_view'  === $VIEW && is_numeric($ID) && $ID >= 1)
+		{
+			$adminView = $ID;
+		}
+		elseif (is_numeric($ID) && $ID >= 1)
 		{
 			// get the admin view ID
 			$adminView = ComponentbuilderHelper::getVar('admin_fields_conditions', (int) $ID, 'id', 'admin_view');
 		}
-		else
+		elseif ('admin_view'  !== $VIEW)
 		{
 			// get the admin view ID
 			$adminView = $jinput->getInt('refid', 0);
 		}
-		if (is_numeric($adminView) && $adminView >= 1)
+		if (isset($adminView) && is_numeric($adminView) && $adminView >= 1)
 		{
 			// get all the fields linked to the admin view
 			if ($addFields = ComponentbuilderHelper::getVar('admin_fields', (int) $adminView, 'admin_view', 'addfields'))

admin/models/fieldtype.php

@@ -93,14 +93,51 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
+
 	/**
-	 * get VDM session key
+	 * get VDM internal session key
 	 *
 	 * @return  string  the session key
 	 *
 	 */
 	public function getVDM()
 	{
+		if (!isset($this->vastDevMod))
+		{
+			$_id = 0; // new item probably (since it was not set in the getItem method)
+
+			if (empty($_id))
+			{
+				$id = 0;
+			}
+			else
+			{
+				$id = $_id;
+			}
+			// set the id and view name to session
+			if ($vdm = ComponentbuilderHelper::get('fieldtype__'.$id))
+			{
+				$this->vastDevMod = $vdm;
+			}
+			else
+			{
+				// set the vast development method key
+				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				ComponentbuilderHelper::set($this->vastDevMod, 'fieldtype__'.$id);
+				ComponentbuilderHelper::set('fieldtype__'.$id, $this->vastDevMod);
+				// set a return value if found
+				$jinput = JFactory::getApplication()->input;
+				$return = $jinput->get('return', null, 'base64');
+				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				// set a GUID value if found
+				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+					&& method_exists('ComponentbuilderHelper', 'validGUID')
+					&& ComponentbuilderHelper::validGUID($item->guid))
+				{
+					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+				}
+			}
+		}
 		return $this->vastDevMod;
 	}
 
@@ -166,6 +203,13 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 				$jinput = JFactory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
 				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				// set a GUID value if found
+				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+					&& method_exists('ComponentbuilderHelper', 'validGUID')
+					&& ComponentbuilderHelper::validGUID($item->guid))
+				{
+					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+				}
 			}
 			// check what type of properties array we have here (should be subform... but just incase)
 			// This could happen due to huge data sets
@@ -203,7 +247,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 	 *
 	 * @return mixed  An array of data items on success, false on failure.
 	 */
-	public function getVxwfields()
+	public function getVyifields()
 	{
 		// Get the user object.
 		$user = JFactory::getUser();
@@ -264,12 +308,18 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 		{
 			$items = $db->loadObjectList();
 
-			// set values to display correctly.
+			// Set values to display correctly.
 			if (ComponentbuilderHelper::checkArray($items))
 			{
+				// Get the user object if not set.
+				if (!isset($user) || !ComponentbuilderHelper::checkObject($user))
+				{
+					$user = JFactory::getUser();
+				}
 				foreach ($items as $nr => &$item)
 				{
-					$access = (JFactory::getUser()->authorise('field.access', 'com_componentbuilder.field.' . (int) $item->id) && JFactory::getUser()->authorise('field.access', 'com_componentbuilder'));
+					// Remove items the user can't access.
+					$access = ($user->authorise('field.access', 'com_componentbuilder.field.' . (int) $item->id) && $user->authorise('field.access', 'com_componentbuilder'));
 					if (!$access)
 					{
 						unset($items[$nr]);
@@ -285,13 +335,13 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 				foreach ($items as $nr => &$item)
 				{
 					// convert datatype
-					$item->datatype = $this->selectionTranslationVxwfields($item->datatype, 'datatype');
+					$item->datatype = $this->selectionTranslationVyifields($item->datatype, 'datatype');
 					// convert indexes
-					$item->indexes = $this->selectionTranslationVxwfields($item->indexes, 'indexes');
+					$item->indexes = $this->selectionTranslationVyifields($item->indexes, 'indexes');
 					// convert null_switch
-					$item->null_switch = $this->selectionTranslationVxwfields($item->null_switch, 'null_switch');
+					$item->null_switch = $this->selectionTranslationVyifields($item->null_switch, 'null_switch');
 					// convert store
-					$item->store = $this->selectionTranslationVxwfields($item->store, 'store');
+					$item->store = $this->selectionTranslationVyifields($item->store, 'store');
 				}
 			}
 
@@ -305,7 +355,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 	 *
 	 * @return translatable string
 	 */
-	public function selectionTranslationVxwfields($value,$name)
+	public function selectionTranslationVyifields($value,$name)
 	{
 		// Array of datatype language strings
 		if ($name === 'datatype')
@@ -373,7 +423,8 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 				2 => 'COM_COMPONENTBUILDER_FIELD_BASESIXTY_FOUR',
 				3 => 'COM_COMPONENTBUILDER_FIELD_BASIC_ENCRYPTION_LOCALDBKEY',
 				5 => 'COM_COMPONENTBUILDER_FIELD_MEDIUM_ENCRYPTION_LOCALFILEKEY',
-				4 => 'COM_COMPONENTBUILDER_FIELD_WHMCSKEY_ENCRYPTION'
+				4 => 'COM_COMPONENTBUILDER_FIELD_WHMCSKEY_ENCRYPTION',
+				6 => 'COM_COMPONENTBUILDER_FIELD_EXPERT_MODE_CUSTOM'
 			);
 			// Now check if value is found in this array
 			if (isset($storeArray[$value]) && ComponentbuilderHelper::checkString($storeArray[$value]))
@@ -399,8 +450,23 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
+		// // check if xpath was set in options
+		$xpath = false;
+		if (isset($options['xpath']))
+		{
+			$xpath = $options['xpath'];
+			unset($options['xpath']);
+		}
+		// // check if clear form was set in options
+		$clear = false;
+		if (isset($options['clear']))
+		{
+			$clear = $options['clear'];
+			unset($options['clear']);
+		}
+
 		// Get the form.
-		$form = $this->loadForm('com_componentbuilder.fieldtype', 'fieldtype', $options);
+		$form = $this->loadForm('com_componentbuilder.fieldtype', 'fieldtype', $options, $clear, $xpath);
 
 		if (empty($form))
 		{
@@ -630,6 +696,8 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 		if (empty($data))
 		{
 			$data = $this->getItem();
+			// run the perprocess of the data
+			$this->preprocessData('com_componentbuilder.fieldtype', $data);
 		}
 
 		return $data;

admin/models/fieldtypes.php

@@ -102,12 +102,18 @@ class ComponentbuilderModelFieldtypes extends JModelList
 		// load parent items
 		$items = parent::getItems();
 
-		// set values to display correctly.
+		// Set values to display correctly.
 		if (ComponentbuilderHelper::checkArray($items))
 		{
+			// Get the user object if not set.
+			if (!isset($user) || !ComponentbuilderHelper::checkObject($user))
+			{
+				$user = JFactory::getUser();
+			}
 			foreach ($items as $nr => &$item)
 			{
-				$access = (JFactory::getUser()->authorise('fieldtype.access', 'com_componentbuilder.fieldtype.' . (int) $item->id) && JFactory::getUser()->authorise('fieldtype.access', 'com_componentbuilder'));
+				// Remove items the user can't access.
+				$access = ($user->authorise('fieldtype.access', 'com_componentbuilder.fieldtype.' . (int) $item->id) && $user->authorise('fieldtype.access', 'com_componentbuilder'));
 				if (!$access)
 				{
 					unset($items[$nr]);
@@ -219,17 +225,23 @@ class ComponentbuilderModelFieldtypes extends JModelList
 	/**
 	 * Method to get list export data.
 	 *
+	 * @param   array  $pks  The ids of the items to get
+	 * @param   JUser  $user  The user making the request
+	 *
 	 * @return mixed  An array of data items on success, false on failure.
 	 */
-	public function getExportData($pks)
+	public function getExportData($pks, $user = null)
 	{
 		// setup the query
 		if (ComponentbuilderHelper::checkArray($pks))
 		{
-			// Set a value to know this is exporting method.
+			// Set a value to know this is export method. (USE IN CUSTOM CODE TO ALTER OUTCOME)
 			$_export = true;
-			// Get the user object.
-			$user = JFactory::getUser();
+			// Get the user object if not set.
+			if (!isset($user) || !ComponentbuilderHelper::checkObject($user))
+			{
+				$user = JFactory::getUser();
+			}
 			// Create a new query object.
 			$db = JFactory::getDBO();
 			$query = $db->getQuery(true);
@@ -257,12 +269,13 @@ class ComponentbuilderModelFieldtypes extends JModelList
 			{
 				$items = $db->loadObjectList();
 
-				// set values to display correctly.
+				// Set values to display correctly.
 				if (ComponentbuilderHelper::checkArray($items))
 				{
 					foreach ($items as $nr => &$item)
 					{
-						$access = (JFactory::getUser()->authorise('fieldtype.access', 'com_componentbuilder.fieldtype.' . (int) $item->id) && JFactory::getUser()->authorise('fieldtype.access', 'com_componentbuilder'));
+						// Remove items the user can't access.
+						$access = ($user->authorise('fieldtype.access', 'com_componentbuilder.fieldtype.' . (int) $item->id) && $user->authorise('fieldtype.access', 'com_componentbuilder'));
 						if (!$access)
 						{
 							unset($items[$nr]);

admin/models/forms/admin_fields.xml

@@ -118,7 +118,6 @@
 					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_FIELD_DESCRIPTION"
 					class="list_class fieldFull"
 					multiple="false"
-					default=""
 					required="true"
 					button="false"
 				/>

admin/models/forms/component_config.xml

@@ -117,7 +117,6 @@
 					description="COM_COMPONENTBUILDER_COMPONENT_CONFIG_FIELD_DESCRIPTION"
 					class="list_class fieldFull"
 					multiple="false"
-					default=""
 					required="true"
 					button="false"
 				/>

admin/models/forms/component_plugins.xml

@@ -120,6 +120,23 @@
 					default="0"
 					button="false"
 				/>
+				<!-- Target Field. Type: List. (joomla) -->
+				<field
+					type="list"
+					name="target"
+					label="COM_COMPONENTBUILDER_COMPONENT_PLUGINS_TARGET_LABEL"
+					description="COM_COMPONENTBUILDER_COMPONENT_PLUGINS_TARGET_DESCRIPTION"
+					class="list_class"
+					multiple="false"
+					default="0">
+					<!-- Option Set. -->
+					<option value="1">
+						COM_COMPONENTBUILDER_COMPONENT_PLUGINS_COMPILE_ONLY</option>
+					<option value="2">
+						COM_COMPONENTBUILDER_COMPONENT_PLUGINS_EXPORT_ONLY</option>
+					<option value="0">
+						COM_COMPONENTBUILDER_COMPONENT_PLUGINS_COMPILE_AMP_EXPORT</option>
+				</field>
 			</form>
 		</field>
 		<!-- Note_on_joomla_plugins Field. Type: Note. A None Database Field. (joomla) -->

admin/models/forms/custom_code.js

@@ -345,7 +345,7 @@ function usedin(functioName, ide) {
 function usedin_server(functioName, ide, target){
 	var getUrl = "index.php?option=com_componentbuilder&task=ajax.usedin&format=json";
 	if(token.length > 0){
-		var request = 'token='+token+'&functioName='+functioName+'&id='+ide+'&target='+target+'&raw=true&return_here='+return_here;
+		var request = token+'=1&functioName='+functioName+'&id='+ide+'&target='+target+'&raw=true&return_here='+return_here;
 	}
 	return jQuery.ajax({
 		type: 'GET',

admin/models/forms/field.js

@@ -9,57 +9,77 @@
  */
 
 // Some Global Values
-jform_vvvvwbtvxl_required = false;
-jform_vvvvwbuvxm_required = false;
-jform_vvvvwbvvxn_required = false;
-jform_vvvvwbwvxo_required = false;
+jform_vvvvwcdvxn_required = false;
+jform_vvvvwcevxo_required = false;
+jform_vvvvwcfvxp_required = false;
+jform_vvvvwcgvxq_required = false;
+jform_vvvvwchvxr_required = false;
+jform_vvvvwckvxs_required = false;
+jform_vvvvwckvxt_required = false;
+jform_vvvvwckvxu_required = false;
+jform_vvvvwckvxv_required = false;
+jform_vvvvwclvxw_required = false;
+jform_vvvvwclvxx_required = false;
+jform_vvvvwclvxy_required = false;
+jform_vvvvwclvxz_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var datalenght_vvvvwbt = jQuery("#jform_datalenght").val();
-	vvvvwbt(datalenght_vvvvwbt);
+	var datalenght_vvvvwcd = jQuery("#jform_datalenght").val();
+	vvvvwcd(datalenght_vvvvwcd);
 
-	var datadefault_vvvvwbu = jQuery("#jform_datadefault").val();
-	vvvvwbu(datadefault_vvvvwbu);
+	var datadefault_vvvvwce = jQuery("#jform_datadefault").val();
+	vvvvwce(datadefault_vvvvwce);
 
-	var datatype_vvvvwbv = jQuery("#jform_datatype").val();
-	vvvvwbv(datatype_vvvvwbv);
+	var datatype_vvvvwcf = jQuery("#jform_datatype").val();
+	vvvvwcf(datatype_vvvvwcf);
 
-	var datatype_vvvvwbw = jQuery("#jform_datatype").val();
-	vvvvwbw(datatype_vvvvwbw);
+	var datatype_vvvvwcg = jQuery("#jform_datatype").val();
+	vvvvwcg(datatype_vvvvwcg);
 
-	var store_vvvvwbx = jQuery("#jform_store").val();
-	var datatype_vvvvwbx = jQuery("#jform_datatype").val();
-	vvvvwbx(store_vvvvwbx,datatype_vvvvwbx);
+	var datatype_vvvvwch = jQuery("#jform_datatype").val();
+	vvvvwch(datatype_vvvvwch);
 
-	var add_css_view_vvvvwbz = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvwbz(add_css_view_vvvvwbz);
+	var store_vvvvwci = jQuery("#jform_store").val();
+	var datatype_vvvvwci = jQuery("#jform_datatype").val();
+	vvvvwci(store_vvvvwci,datatype_vvvvwci);
 
-	var add_css_views_vvvvwca = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvwca(add_css_views_vvvvwca);
+	var store_vvvvwck = jQuery("#jform_store").val();
+	var datatype_vvvvwck = jQuery("#jform_datatype").val();
+	vvvvwck(store_vvvvwck,datatype_vvvvwck);
 
-	var add_javascript_view_footer_vvvvwcb = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvwcb(add_javascript_view_footer_vvvvwcb);
+	var datatype_vvvvwcl = jQuery("#jform_datatype").val();
+	var store_vvvvwcl = jQuery("#jform_store").val();
+	vvvvwcl(datatype_vvvvwcl,store_vvvvwcl);
 
-	var add_javascript_views_footer_vvvvwcc = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
-	vvvvwcc(add_javascript_views_footer_vvvvwcc);
+	var add_css_view_vvvvwcm = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	vvvvwcm(add_css_view_vvvvwcm);
+
+	var add_css_views_vvvvwcn = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	vvvvwcn(add_css_views_vvvvwcn);
+
+	var add_javascript_view_footer_vvvvwco = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	vvvvwco(add_javascript_view_footer_vvvvwco);
+
+	var add_javascript_views_footer_vvvvwcp = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	vvvvwcp(add_javascript_views_footer_vvvvwcp);
 });
 
-// the vvvvwbt function
-function vvvvwbt(datalenght_vvvvwbt)
+// the vvvvwcd function
+function vvvvwcd(datalenght_vvvvwcd)
 {
-	if (isSet(datalenght_vvvvwbt) && datalenght_vvvvwbt.constructor !== Array)
+	if (isSet(datalenght_vvvvwcd) && datalenght_vvvvwcd.constructor !== Array)
 	{
-		var temp_vvvvwbt = datalenght_vvvvwbt;
-		var datalenght_vvvvwbt = [];
-		datalenght_vvvvwbt.push(temp_vvvvwbt);
+		var temp_vvvvwcd = datalenght_vvvvwcd;
+		var datalenght_vvvvwcd = [];
+		datalenght_vvvvwcd.push(temp_vvvvwcd);
 	}
-	else if (!isSet(datalenght_vvvvwbt))
+	else if (!isSet(datalenght_vvvvwcd))
 	{
-		var datalenght_vvvvwbt = [];
+		var datalenght_vvvvwcd = [];
 	}
-	var datalenght = datalenght_vvvvwbt.some(datalenght_vvvvwbt_SomeFunc);
+	var datalenght = datalenght_vvvvwcd.some(datalenght_vvvvwcd_SomeFunc);
 
 
 	// set this function logic
@@ -67,55 +87,55 @@ function vvvvwbt(datalenght_vvvvwbt)
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').show();
 		// add required attribute to datalenght_other field
-		if (jform_vvvvwbtvxl_required)
+		if (jform_vvvvwcdvxn_required)
 		{
 			updateFieldRequired('datalenght_other',0);
 			jQuery('#jform_datalenght_other').prop('required','required');
 			jQuery('#jform_datalenght_other').attr('aria-required',true);
 			jQuery('#jform_datalenght_other').addClass('required');
-			jform_vvvvwbtvxl_required = false;
+			jform_vvvvwcdvxn_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').hide();
 		// remove required attribute from datalenght_other field
-		if (!jform_vvvvwbtvxl_required)
+		if (!jform_vvvvwcdvxn_required)
 		{
 			updateFieldRequired('datalenght_other',1);
 			jQuery('#jform_datalenght_other').removeAttr('required');
 			jQuery('#jform_datalenght_other').removeAttr('aria-required');
 			jQuery('#jform_datalenght_other').removeClass('required');
-			jform_vvvvwbtvxl_required = true;
+			jform_vvvvwcdvxn_required = true;
 		}
 	}
 }
 
-// the vvvvwbt Some function
-function datalenght_vvvvwbt_SomeFunc(datalenght_vvvvwbt)
+// the vvvvwcd Some function
+function datalenght_vvvvwcd_SomeFunc(datalenght_vvvvwcd)
 {
 	// set the function logic
-	if (datalenght_vvvvwbt == 'Other')
+	if (datalenght_vvvvwcd == 'Other')
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbu function
-function vvvvwbu(datadefault_vvvvwbu)
+// the vvvvwce function
+function vvvvwce(datadefault_vvvvwce)
 {
-	if (isSet(datadefault_vvvvwbu) && datadefault_vvvvwbu.constructor !== Array)
+	if (isSet(datadefault_vvvvwce) && datadefault_vvvvwce.constructor !== Array)
 	{
-		var temp_vvvvwbu = datadefault_vvvvwbu;
-		var datadefault_vvvvwbu = [];
-		datadefault_vvvvwbu.push(temp_vvvvwbu);
+		var temp_vvvvwce = datadefault_vvvvwce;
+		var datadefault_vvvvwce = [];
+		datadefault_vvvvwce.push(temp_vvvvwce);
 	}
-	else if (!isSet(datadefault_vvvvwbu))
+	else if (!isSet(datadefault_vvvvwce))
 	{
-		var datadefault_vvvvwbu = [];
+		var datadefault_vvvvwce = [];
 	}
-	var datadefault = datadefault_vvvvwbu.some(datadefault_vvvvwbu_SomeFunc);
+	var datadefault = datadefault_vvvvwce.some(datadefault_vvvvwce_SomeFunc);
 
 
 	// set this function logic
@@ -123,115 +143,169 @@ function vvvvwbu(datadefault_vvvvwbu)
 	{
 		jQuery('#jform_datadefault_other').closest('.control-group').show();
 		// add required attribute to datadefault_other field
-		if (jform_vvvvwbuvxm_required)
+		if (jform_vvvvwcevxo_required)
 		{
 			updateFieldRequired('datadefault_other',0);
 			jQuery('#jform_datadefault_other').prop('required','required');
 			jQuery('#jform_datadefault_other').attr('aria-required',true);
 			jQuery('#jform_datadefault_other').addClass('required');
-			jform_vvvvwbuvxm_required = false;
+			jform_vvvvwcevxo_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_datadefault_other').closest('.control-group').hide();
 		// remove required attribute from datadefault_other field
-		if (!jform_vvvvwbuvxm_required)
+		if (!jform_vvvvwcevxo_required)
 		{
 			updateFieldRequired('datadefault_other',1);
 			jQuery('#jform_datadefault_other').removeAttr('required');
 			jQuery('#jform_datadefault_other').removeAttr('aria-required');
 			jQuery('#jform_datadefault_other').removeClass('required');
-			jform_vvvvwbuvxm_required = true;
+			jform_vvvvwcevxo_required = true;
 		}
 	}
 }
 
-// the vvvvwbu Some function
-function datadefault_vvvvwbu_SomeFunc(datadefault_vvvvwbu)
+// the vvvvwce Some function
+function datadefault_vvvvwce_SomeFunc(datadefault_vvvvwce)
 {
 	// set the function logic
-	if (datadefault_vvvvwbu == 'Other')
+	if (datadefault_vvvvwce == 'Other')
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbv function
-function vvvvwbv(datatype_vvvvwbv)
+// the vvvvwcf function
+function vvvvwcf(datatype_vvvvwcf)
 {
-	if (isSet(datatype_vvvvwbv) && datatype_vvvvwbv.constructor !== Array)
+	if (isSet(datatype_vvvvwcf) && datatype_vvvvwcf.constructor !== Array)
 	{
-		var temp_vvvvwbv = datatype_vvvvwbv;
-		var datatype_vvvvwbv = [];
-		datatype_vvvvwbv.push(temp_vvvvwbv);
+		var temp_vvvvwcf = datatype_vvvvwcf;
+		var datatype_vvvvwcf = [];
+		datatype_vvvvwcf.push(temp_vvvvwcf);
 	}
-	else if (!isSet(datatype_vvvvwbv))
+	else if (!isSet(datatype_vvvvwcf))
 	{
-		var datatype_vvvvwbv = [];
+		var datatype_vvvvwcf = [];
 	}
-	var datatype = datatype_vvvvwbv.some(datatype_vvvvwbv_SomeFunc);
+	var datatype = datatype_vvvvwcf.some(datatype_vvvvwcf_SomeFunc);
 
 
 	// set this function logic
 	if (datatype)
 	{
 		jQuery('#jform_datadefault').closest('.control-group').show();
-		jQuery('#jform_datalenght').closest('.control-group').show();
 		jQuery('#jform_indexes').closest('.control-group').show();
 		// add required attribute to indexes field
-		if (jform_vvvvwbvvxn_required)
+		if (jform_vvvvwcfvxp_required)
 		{
 			updateFieldRequired('indexes',0);
 			jQuery('#jform_indexes').prop('required','required');
 			jQuery('#jform_indexes').attr('aria-required',true);
 			jQuery('#jform_indexes').addClass('required');
-			jform_vvvvwbvvxn_required = false;
+			jform_vvvvwcfvxp_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_datadefault').closest('.control-group').hide();
-		jQuery('#jform_datalenght').closest('.control-group').hide();
 		jQuery('#jform_indexes').closest('.control-group').hide();
 		// remove required attribute from indexes field
-		if (!jform_vvvvwbvvxn_required)
+		if (!jform_vvvvwcfvxp_required)
 		{
 			updateFieldRequired('indexes',1);
 			jQuery('#jform_indexes').removeAttr('required');
 			jQuery('#jform_indexes').removeAttr('aria-required');
 			jQuery('#jform_indexes').removeClass('required');
-			jform_vvvvwbvvxn_required = true;
+			jform_vvvvwcfvxp_required = true;
 		}
 	}
 }
 
-// the vvvvwbv Some function
-function datatype_vvvvwbv_SomeFunc(datatype_vvvvwbv)
+// the vvvvwcf Some function
+function datatype_vvvvwcf_SomeFunc(datatype_vvvvwcf)
 {
 	// set the function logic
-	if (datatype_vvvvwbv == 'CHAR' || datatype_vvvvwbv == 'VARCHAR' || datatype_vvvvwbv == 'DATETIME' || datatype_vvvvwbv == 'DATE' || datatype_vvvvwbv == 'TIME' || datatype_vvvvwbv == 'INT' || datatype_vvvvwbv == 'TINYINT' || datatype_vvvvwbv == 'BIGINT' || datatype_vvvvwbv == 'FLOAT' || datatype_vvvvwbv == 'DECIMAL' || datatype_vvvvwbv == 'DOUBLE')
+	if (datatype_vvvvwcf == 'CHAR' || datatype_vvvvwcf == 'VARCHAR' || datatype_vvvvwcf == 'DATETIME' || datatype_vvvvwcf == 'DATE' || datatype_vvvvwcf == 'TIME' || datatype_vvvvwcf == 'INT' || datatype_vvvvwcf == 'TINYINT' || datatype_vvvvwcf == 'BIGINT' || datatype_vvvvwcf == 'FLOAT' || datatype_vvvvwcf == 'DECIMAL' || datatype_vvvvwcf == 'DOUBLE')
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbw function
-function vvvvwbw(datatype_vvvvwbw)
+// the vvvvwcg function
+function vvvvwcg(datatype_vvvvwcg)
 {
-	if (isSet(datatype_vvvvwbw) && datatype_vvvvwbw.constructor !== Array)
+	if (isSet(datatype_vvvvwcg) && datatype_vvvvwcg.constructor !== Array)
 	{
-		var temp_vvvvwbw = datatype_vvvvwbw;
-		var datatype_vvvvwbw = [];
-		datatype_vvvvwbw.push(temp_vvvvwbw);
+		var temp_vvvvwcg = datatype_vvvvwcg;
+		var datatype_vvvvwcg = [];
+		datatype_vvvvwcg.push(temp_vvvvwcg);
 	}
-	else if (!isSet(datatype_vvvvwbw))
+	else if (!isSet(datatype_vvvvwcg))
 	{
-		var datatype_vvvvwbw = [];
+		var datatype_vvvvwcg = [];
 	}
-	var datatype = datatype_vvvvwbw.some(datatype_vvvvwbw_SomeFunc);
+	var datatype = datatype_vvvvwcg.some(datatype_vvvvwcg_SomeFunc);
+
+
+	// set this function logic
+	if (datatype)
+	{
+		jQuery('#jform_datalenght').closest('.control-group').show();
+		// add required attribute to datalenght field
+		if (jform_vvvvwcgvxq_required)
+		{
+			updateFieldRequired('datalenght',0);
+			jQuery('#jform_datalenght').prop('required','required');
+			jQuery('#jform_datalenght').attr('aria-required',true);
+			jQuery('#jform_datalenght').addClass('required');
+			jform_vvvvwcgvxq_required = false;
+		}
+	}
+	else
+	{
+		jQuery('#jform_datalenght').closest('.control-group').hide();
+		// remove required attribute from datalenght field
+		if (!jform_vvvvwcgvxq_required)
+		{
+			updateFieldRequired('datalenght',1);
+			jQuery('#jform_datalenght').removeAttr('required');
+			jQuery('#jform_datalenght').removeAttr('aria-required');
+			jQuery('#jform_datalenght').removeClass('required');
+			jform_vvvvwcgvxq_required = true;
+		}
+	}
+}
+
+// the vvvvwcg Some function
+function datatype_vvvvwcg_SomeFunc(datatype_vvvvwcg)
+{
+	// set the function logic
+	if (datatype_vvvvwcg == 'CHAR' || datatype_vvvvwcg == 'VARCHAR' || datatype_vvvvwcg == 'INT' || datatype_vvvvwcg == 'TINYINT' || datatype_vvvvwcg == 'BIGINT' || datatype_vvvvwcg == 'FLOAT' || datatype_vvvvwcg == 'DECIMAL' || datatype_vvvvwcg == 'DOUBLE')
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwch function
+function vvvvwch(datatype_vvvvwch)
+{
+	if (isSet(datatype_vvvvwch) && datatype_vvvvwch.constructor !== Array)
+	{
+		var temp_vvvvwch = datatype_vvvvwch;
+		var datatype_vvvvwch = [];
+		datatype_vvvvwch.push(temp_vvvvwch);
+	}
+	else if (!isSet(datatype_vvvvwch))
+	{
+		var datatype_vvvvwch = [];
+	}
+	var datatype = datatype_vvvvwch.some(datatype_vvvvwch_SomeFunc);
 
 
 	// set this function logic
@@ -239,67 +313,67 @@ function vvvvwbw(datatype_vvvvwbw)
 	{
 		jQuery('#jform_store').closest('.control-group').show();
 		// add required attribute to store field
-		if (jform_vvvvwbwvxo_required)
+		if (jform_vvvvwchvxr_required)
 		{
 			updateFieldRequired('store',0);
 			jQuery('#jform_store').prop('required','required');
 			jQuery('#jform_store').attr('aria-required',true);
 			jQuery('#jform_store').addClass('required');
-			jform_vvvvwbwvxo_required = false;
+			jform_vvvvwchvxr_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_store').closest('.control-group').hide();
 		// remove required attribute from store field
-		if (!jform_vvvvwbwvxo_required)
+		if (!jform_vvvvwchvxr_required)
 		{
 			updateFieldRequired('store',1);
 			jQuery('#jform_store').removeAttr('required');
 			jQuery('#jform_store').removeAttr('aria-required');
 			jQuery('#jform_store').removeClass('required');
-			jform_vvvvwbwvxo_required = true;
+			jform_vvvvwchvxr_required = true;
 		}
 	}
 }
 
-// the vvvvwbw Some function
-function datatype_vvvvwbw_SomeFunc(datatype_vvvvwbw)
+// the vvvvwch Some function
+function datatype_vvvvwch_SomeFunc(datatype_vvvvwch)
 {
 	// set the function logic
-	if (datatype_vvvvwbw == 'CHAR' || datatype_vvvvwbw == 'VARCHAR' || datatype_vvvvwbw == 'TEXT' || datatype_vvvvwbw == 'MEDIUMTEXT' || datatype_vvvvwbw == 'LONGTEXT' || datatype_vvvvwbw == 'BLOB' || datatype_vvvvwbw == 'TINYBLOB' || datatype_vvvvwbw == 'MEDIUMBLOB' || datatype_vvvvwbw == 'LONGBLOB')
+	if (datatype_vvvvwch == 'CHAR' || datatype_vvvvwch == 'VARCHAR' || datatype_vvvvwch == 'TEXT' || datatype_vvvvwch == 'MEDIUMTEXT' || datatype_vvvvwch == 'LONGTEXT' || datatype_vvvvwch == 'BLOB' || datatype_vvvvwch == 'TINYBLOB' || datatype_vvvvwch == 'MEDIUMBLOB' || datatype_vvvvwch == 'LONGBLOB')
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbx function
-function vvvvwbx(store_vvvvwbx,datatype_vvvvwbx)
+// the vvvvwci function
+function vvvvwci(store_vvvvwci,datatype_vvvvwci)
 {
-	if (isSet(store_vvvvwbx) && store_vvvvwbx.constructor !== Array)
+	if (isSet(store_vvvvwci) && store_vvvvwci.constructor !== Array)
 	{
-		var temp_vvvvwbx = store_vvvvwbx;
-		var store_vvvvwbx = [];
-		store_vvvvwbx.push(temp_vvvvwbx);
+		var temp_vvvvwci = store_vvvvwci;
+		var store_vvvvwci = [];
+		store_vvvvwci.push(temp_vvvvwci);
 	}
-	else if (!isSet(store_vvvvwbx))
+	else if (!isSet(store_vvvvwci))
 	{
-		var store_vvvvwbx = [];
+		var store_vvvvwci = [];
 	}
-	var store = store_vvvvwbx.some(store_vvvvwbx_SomeFunc);
+	var store = store_vvvvwci.some(store_vvvvwci_SomeFunc);
 
-	if (isSet(datatype_vvvvwbx) && datatype_vvvvwbx.constructor !== Array)
+	if (isSet(datatype_vvvvwci) && datatype_vvvvwci.constructor !== Array)
 	{
-		var temp_vvvvwbx = datatype_vvvvwbx;
-		var datatype_vvvvwbx = [];
-		datatype_vvvvwbx.push(temp_vvvvwbx);
+		var temp_vvvvwci = datatype_vvvvwci;
+		var datatype_vvvvwci = [];
+		datatype_vvvvwci.push(temp_vvvvwci);
 	}
-	else if (!isSet(datatype_vvvvwbx))
+	else if (!isSet(datatype_vvvvwci))
 	{
-		var datatype_vvvvwbx = [];
+		var datatype_vvvvwci = [];
 	}
-	var datatype = datatype_vvvvwbx.some(datatype_vvvvwbx_SomeFunc);
+	var datatype = datatype_vvvvwci.some(datatype_vvvvwci_SomeFunc);
 
 
 	// set this function logic
@@ -313,33 +387,315 @@ function vvvvwbx(store_vvvvwbx,datatype_vvvvwbx)
 	}
 }
 
-// the vvvvwbx Some function
-function store_vvvvwbx_SomeFunc(store_vvvvwbx)
+// the vvvvwci Some function
+function store_vvvvwci_SomeFunc(store_vvvvwci)
 {
 	// set the function logic
-	if (store_vvvvwbx == 4)
+	if (store_vvvvwci == 4)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbx Some function
-function datatype_vvvvwbx_SomeFunc(datatype_vvvvwbx)
+// the vvvvwci Some function
+function datatype_vvvvwci_SomeFunc(datatype_vvvvwci)
 {
 	// set the function logic
-	if (datatype_vvvvwbx == 'CHAR' || datatype_vvvvwbx == 'VARCHAR' || datatype_vvvvwbx == 'TEXT' || datatype_vvvvwbx == 'MEDIUMTEXT' || datatype_vvvvwbx == 'LONGTEXT' || datatype_vvvvwbx == 'BLOB' || datatype_vvvvwbx == 'TINYBLOB' || datatype_vvvvwbx == 'MEDIUMBLOB' || datatype_vvvvwbx == 'LONGBLOB')
+	if (datatype_vvvvwci == 'CHAR' || datatype_vvvvwci == 'VARCHAR' || datatype_vvvvwci == 'TEXT' || datatype_vvvvwci == 'MEDIUMTEXT' || datatype_vvvvwci == 'LONGTEXT' || datatype_vvvvwci == 'BLOB' || datatype_vvvvwci == 'TINYBLOB' || datatype_vvvvwci == 'MEDIUMBLOB' || datatype_vvvvwci == 'LONGBLOB')
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbz function
-function vvvvwbz(add_css_view_vvvvwbz)
+// the vvvvwck function
+function vvvvwck(store_vvvvwck,datatype_vvvvwck)
+{
+	if (isSet(store_vvvvwck) && store_vvvvwck.constructor !== Array)
+	{
+		var temp_vvvvwck = store_vvvvwck;
+		var store_vvvvwck = [];
+		store_vvvvwck.push(temp_vvvvwck);
+	}
+	else if (!isSet(store_vvvvwck))
+	{
+		var store_vvvvwck = [];
+	}
+	var store = store_vvvvwck.some(store_vvvvwck_SomeFunc);
+
+	if (isSet(datatype_vvvvwck) && datatype_vvvvwck.constructor !== Array)
+	{
+		var temp_vvvvwck = datatype_vvvvwck;
+		var datatype_vvvvwck = [];
+		datatype_vvvvwck.push(temp_vvvvwck);
+	}
+	else if (!isSet(datatype_vvvvwck))
+	{
+		var datatype_vvvvwck = [];
+	}
+	var datatype = datatype_vvvvwck.some(datatype_vvvvwck_SomeFunc);
+
+
+	// set this function logic
+	if (store && datatype)
+	{
+		jQuery('#jform_initiator_on_get_model').closest('.control-group').show();
+		// add required attribute to initiator_on_get_model field
+		if (jform_vvvvwckvxs_required)
+		{
+			updateFieldRequired('initiator_on_get_model',0);
+			jQuery('#jform_initiator_on_get_model').prop('required','required');
+			jQuery('#jform_initiator_on_get_model').attr('aria-required',true);
+			jQuery('#jform_initiator_on_get_model').addClass('required');
+			jform_vvvvwckvxs_required = false;
+		}
+		jQuery('#jform_initiator_on_save_model').closest('.control-group').show();
+		// add required attribute to initiator_on_save_model field
+		if (jform_vvvvwckvxt_required)
+		{
+			updateFieldRequired('initiator_on_save_model',0);
+			jQuery('#jform_initiator_on_save_model').prop('required','required');
+			jQuery('#jform_initiator_on_save_model').attr('aria-required',true);
+			jQuery('#jform_initiator_on_save_model').addClass('required');
+			jform_vvvvwckvxt_required = false;
+		}
+		jQuery('#jform_on_save_model_field').closest('.control-group').show();
+		// add required attribute to on_save_model_field field
+		if (jform_vvvvwckvxu_required)
+		{
+			updateFieldRequired('on_save_model_field',0);
+			jQuery('#jform_on_save_model_field').prop('required','required');
+			jQuery('#jform_on_save_model_field').attr('aria-required',true);
+			jQuery('#jform_on_save_model_field').addClass('required');
+			jform_vvvvwckvxu_required = false;
+		}
+		jQuery('.note_expert_field_save_mode').closest('.control-group').show();
+		jQuery('#jform_on_get_model_field').closest('.control-group').show();
+		// add required attribute to on_get_model_field field
+		if (jform_vvvvwckvxv_required)
+		{
+			updateFieldRequired('on_get_model_field',0);
+			jQuery('#jform_on_get_model_field').prop('required','required');
+			jQuery('#jform_on_get_model_field').attr('aria-required',true);
+			jQuery('#jform_on_get_model_field').addClass('required');
+			jform_vvvvwckvxv_required = false;
+		}
+	}
+	else
+	{
+		jQuery('#jform_initiator_on_get_model').closest('.control-group').hide();
+		// remove required attribute from initiator_on_get_model field
+		if (!jform_vvvvwckvxs_required)
+		{
+			updateFieldRequired('initiator_on_get_model',1);
+			jQuery('#jform_initiator_on_get_model').removeAttr('required');
+			jQuery('#jform_initiator_on_get_model').removeAttr('aria-required');
+			jQuery('#jform_initiator_on_get_model').removeClass('required');
+			jform_vvvvwckvxs_required = true;
+		}
+		jQuery('#jform_initiator_on_save_model').closest('.control-group').hide();
+		// remove required attribute from initiator_on_save_model field
+		if (!jform_vvvvwckvxt_required)
+		{
+			updateFieldRequired('initiator_on_save_model',1);
+			jQuery('#jform_initiator_on_save_model').removeAttr('required');
+			jQuery('#jform_initiator_on_save_model').removeAttr('aria-required');
+			jQuery('#jform_initiator_on_save_model').removeClass('required');
+			jform_vvvvwckvxt_required = true;
+		}
+		jQuery('#jform_on_save_model_field').closest('.control-group').hide();
+		// remove required attribute from on_save_model_field field
+		if (!jform_vvvvwckvxu_required)
+		{
+			updateFieldRequired('on_save_model_field',1);
+			jQuery('#jform_on_save_model_field').removeAttr('required');
+			jQuery('#jform_on_save_model_field').removeAttr('aria-required');
+			jQuery('#jform_on_save_model_field').removeClass('required');
+			jform_vvvvwckvxu_required = true;
+		}
+		jQuery('.note_expert_field_save_mode').closest('.control-group').hide();
+		jQuery('#jform_on_get_model_field').closest('.control-group').hide();
+		// remove required attribute from on_get_model_field field
+		if (!jform_vvvvwckvxv_required)
+		{
+			updateFieldRequired('on_get_model_field',1);
+			jQuery('#jform_on_get_model_field').removeAttr('required');
+			jQuery('#jform_on_get_model_field').removeAttr('aria-required');
+			jQuery('#jform_on_get_model_field').removeClass('required');
+			jform_vvvvwckvxv_required = true;
+		}
+	}
+}
+
+// the vvvvwck Some function
+function store_vvvvwck_SomeFunc(store_vvvvwck)
 {
 	// set the function logic
-	if (add_css_view_vvvvwbz == 1)
+	if (store_vvvvwck == 6)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwck Some function
+function datatype_vvvvwck_SomeFunc(datatype_vvvvwck)
+{
+	// set the function logic
+	if (datatype_vvvvwck == 'CHAR' || datatype_vvvvwck == 'VARCHAR' || datatype_vvvvwck == 'TEXT' || datatype_vvvvwck == 'MEDIUMTEXT' || datatype_vvvvwck == 'LONGTEXT' || datatype_vvvvwck == 'BLOB' || datatype_vvvvwck == 'TINYBLOB' || datatype_vvvvwck == 'MEDIUMBLOB' || datatype_vvvvwck == 'LONGBLOB')
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwcl function
+function vvvvwcl(datatype_vvvvwcl,store_vvvvwcl)
+{
+	if (isSet(datatype_vvvvwcl) && datatype_vvvvwcl.constructor !== Array)
+	{
+		var temp_vvvvwcl = datatype_vvvvwcl;
+		var datatype_vvvvwcl = [];
+		datatype_vvvvwcl.push(temp_vvvvwcl);
+	}
+	else if (!isSet(datatype_vvvvwcl))
+	{
+		var datatype_vvvvwcl = [];
+	}
+	var datatype = datatype_vvvvwcl.some(datatype_vvvvwcl_SomeFunc);
+
+	if (isSet(store_vvvvwcl) && store_vvvvwcl.constructor !== Array)
+	{
+		var temp_vvvvwcl = store_vvvvwcl;
+		var store_vvvvwcl = [];
+		store_vvvvwcl.push(temp_vvvvwcl);
+	}
+	else if (!isSet(store_vvvvwcl))
+	{
+		var store_vvvvwcl = [];
+	}
+	var store = store_vvvvwcl.some(store_vvvvwcl_SomeFunc);
+
+
+	// set this function logic
+	if (datatype && store)
+	{
+		jQuery('#jform_initiator_on_get_model').closest('.control-group').show();
+		// add required attribute to initiator_on_get_model field
+		if (jform_vvvvwclvxw_required)
+		{
+			updateFieldRequired('initiator_on_get_model',0);
+			jQuery('#jform_initiator_on_get_model').prop('required','required');
+			jQuery('#jform_initiator_on_get_model').attr('aria-required',true);
+			jQuery('#jform_initiator_on_get_model').addClass('required');
+			jform_vvvvwclvxw_required = false;
+		}
+		jQuery('#jform_initiator_on_save_model').closest('.control-group').show();
+		// add required attribute to initiator_on_save_model field
+		if (jform_vvvvwclvxx_required)
+		{
+			updateFieldRequired('initiator_on_save_model',0);
+			jQuery('#jform_initiator_on_save_model').prop('required','required');
+			jQuery('#jform_initiator_on_save_model').attr('aria-required',true);
+			jQuery('#jform_initiator_on_save_model').addClass('required');
+			jform_vvvvwclvxx_required = false;
+		}
+		jQuery('#jform_on_save_model_field').closest('.control-group').show();
+		// add required attribute to on_save_model_field field
+		if (jform_vvvvwclvxy_required)
+		{
+			updateFieldRequired('on_save_model_field',0);
+			jQuery('#jform_on_save_model_field').prop('required','required');
+			jQuery('#jform_on_save_model_field').attr('aria-required',true);
+			jQuery('#jform_on_save_model_field').addClass('required');
+			jform_vvvvwclvxy_required = false;
+		}
+		jQuery('.note_expert_field_save_mode').closest('.control-group').show();
+		jQuery('#jform_on_get_model_field').closest('.control-group').show();
+		// add required attribute to on_get_model_field field
+		if (jform_vvvvwclvxz_required)
+		{
+			updateFieldRequired('on_get_model_field',0);
+			jQuery('#jform_on_get_model_field').prop('required','required');
+			jQuery('#jform_on_get_model_field').attr('aria-required',true);
+			jQuery('#jform_on_get_model_field').addClass('required');
+			jform_vvvvwclvxz_required = false;
+		}
+	}
+	else
+	{
+		jQuery('#jform_initiator_on_get_model').closest('.control-group').hide();
+		// remove required attribute from initiator_on_get_model field
+		if (!jform_vvvvwclvxw_required)
+		{
+			updateFieldRequired('initiator_on_get_model',1);
+			jQuery('#jform_initiator_on_get_model').removeAttr('required');
+			jQuery('#jform_initiator_on_get_model').removeAttr('aria-required');
+			jQuery('#jform_initiator_on_get_model').removeClass('required');
+			jform_vvvvwclvxw_required = true;
+		}
+		jQuery('#jform_initiator_on_save_model').closest('.control-group').hide();
+		// remove required attribute from initiator_on_save_model field
+		if (!jform_vvvvwclvxx_required)
+		{
+			updateFieldRequired('initiator_on_save_model',1);
+			jQuery('#jform_initiator_on_save_model').removeAttr('required');
+			jQuery('#jform_initiator_on_save_model').removeAttr('aria-required');
+			jQuery('#jform_initiator_on_save_model').removeClass('required');
+			jform_vvvvwclvxx_required = true;
+		}
+		jQuery('#jform_on_save_model_field').closest('.control-group').hide();
+		// remove required attribute from on_save_model_field field
+		if (!jform_vvvvwclvxy_required)
+		{
+			updateFieldRequired('on_save_model_field',1);
+			jQuery('#jform_on_save_model_field').removeAttr('required');
+			jQuery('#jform_on_save_model_field').removeAttr('aria-required');
+			jQuery('#jform_on_save_model_field').removeClass('required');
+			jform_vvvvwclvxy_required = true;
+		}
+		jQuery('.note_expert_field_save_mode').closest('.control-group').hide();
+		jQuery('#jform_on_get_model_field').closest('.control-group').hide();
+		// remove required attribute from on_get_model_field field
+		if (!jform_vvvvwclvxz_required)
+		{
+			updateFieldRequired('on_get_model_field',1);
+			jQuery('#jform_on_get_model_field').removeAttr('required');
+			jQuery('#jform_on_get_model_field').removeAttr('aria-required');
+			jQuery('#jform_on_get_model_field').removeClass('required');
+			jform_vvvvwclvxz_required = true;
+		}
+	}
+}
+
+// the vvvvwcl Some function
+function datatype_vvvvwcl_SomeFunc(datatype_vvvvwcl)
+{
+	// set the function logic
+	if (datatype_vvvvwcl == 'CHAR' || datatype_vvvvwcl == 'VARCHAR' || datatype_vvvvwcl == 'TEXT' || datatype_vvvvwcl == 'MEDIUMTEXT' || datatype_vvvvwcl == 'LONGTEXT' || datatype_vvvvwcl == 'BLOB' || datatype_vvvvwcl == 'TINYBLOB' || datatype_vvvvwcl == 'MEDIUMBLOB' || datatype_vvvvwcl == 'LONGBLOB')
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwcl Some function
+function store_vvvvwcl_SomeFunc(store_vvvvwcl)
+{
+	// set the function logic
+	if (store_vvvvwcl == 6)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwcm function
+function vvvvwcm(add_css_view_vvvvwcm)
+{
+	// set the function logic
+	if (add_css_view_vvvvwcm == 1)
 	{
 		jQuery('#jform_css_view-lbl').closest('.control-group').show();
 	}
@@ -349,11 +705,11 @@ function vvvvwbz(add_css_view_vvvvwbz)
 	}
 }
 
-// the vvvvwca function
-function vvvvwca(add_css_views_vvvvwca)
+// the vvvvwcn function
+function vvvvwcn(add_css_views_vvvvwcn)
 {
 	// set the function logic
-	if (add_css_views_vvvvwca == 1)
+	if (add_css_views_vvvvwcn == 1)
 	{
 		jQuery('#jform_css_views-lbl').closest('.control-group').show();
 	}
@@ -363,11 +719,11 @@ function vvvvwca(add_css_views_vvvvwca)
 	}
 }
 
-// the vvvvwcb function
-function vvvvwcb(add_javascript_view_footer_vvvvwcb)
+// the vvvvwco function
+function vvvvwco(add_javascript_view_footer_vvvvwco)
 {
 	// set the function logic
-	if (add_javascript_view_footer_vvvvwcb == 1)
+	if (add_javascript_view_footer_vvvvwco == 1)
 	{
 		jQuery('#jform_javascript_view_footer-lbl').closest('.control-group').show();
 	}
@@ -377,11 +733,11 @@ function vvvvwcb(add_javascript_view_footer_vvvvwcb)
 	}
 }
 
-// the vvvvwcc function
-function vvvvwcc(add_javascript_views_footer_vvvvwcc)
+// the vvvvwcp function
+function vvvvwcp(add_javascript_views_footer_vvvvwcp)
 {
 	// set the function logic
-	if (add_javascript_views_footer_vvvvwcc == 1)
+	if (add_javascript_views_footer_vvvvwcp == 1)
 	{
 		jQuery('#jform_javascript_views_footer-lbl').closest('.control-group').show();
 	}
@@ -499,33 +855,42 @@ function getFieldOptions(fieldtype, db){
 				jQuery('#jform_datatype').val(result.database.datatype);
 				jQuery('#jform_datatype').trigger("liszt:updated");
 				jQuery('#jform_datatype').trigger("change");
+				// be sure to remove from no required
+				updateFieldRequired('datatype', 0);
 				// update datalenght
 				jQuery('#jform_datalenght').val(result.database.datalenght);
 				jQuery('#jform_datalenght').trigger("liszt:updated");
 				jQuery('#jform_datalenght').trigger("change");
+				// be sure to remove from no required
+				updateFieldRequired('datalenght', 0);
 				// load the datalenght_other if needed
-				if ('Other' == result.database.datalenght){
+				if ('Other' === result.database.datalenght){
 					jQuery('#jform_datalenght_other').val(result.database.datalenght_other);
+					// be sure to remove from no required
+					updateFieldRequired('datalenght_other', 0);
 				}
 				// update datadefault
 				jQuery('#jform_datadefault').val(result.database.datadefault);
 				jQuery('#jform_datadefault').trigger("liszt:updated");
 				jQuery('#jform_datadefault').trigger("change");
 				// load the datadefault_other if needed
-				if ('Other' == result.database.datadefault){
+				if ('Other' === result.database.datadefault){
 					jQuery('#jform_datadefault_other').val(result.database.datadefault_other);
+					// be sure to remove from no required
+					updateFieldRequired('datadefault_other', 0);
 				}
 				// update indexes
 				jQuery('#jform_indexes').val(result.database.indexes);
 				jQuery('#jform_indexes').trigger("liszt:updated");
 				jQuery('#jform_indexes').trigger("change");
+				// be sure to remove from no required
+				updateFieldRequired('indexes', 0);
 				// update store
 				jQuery('#jform_store').val(result.database.store);
 				jQuery('#jform_store').trigger("liszt:updated");
 				jQuery('#jform_store').trigger("change");
-				// update null_switch (hmmm)
-				// jQuery('#jform_null_switch').val(result.database.null_switch);
-				// jQuery('#jform_null_switch').trigger("change");
+				// be sure to remove from no required
+				updateFieldRequired('store', 0);
 			}
 		}
 	})

admin/models/forms/field.xml

@@ -219,6 +219,8 @@
 				COM_COMPONENTBUILDER_FIELD_MEDIUM_ENCRYPTION_LOCALFILEKEY</option>
 			<option value="4">
 				COM_COMPONENTBUILDER_FIELD_WHMCSKEY_ENCRYPTION</option>
+			<option value="6">
+				COM_COMPONENTBUILDER_FIELD_EXPERT_MODE_CUSTOM</option>
 		</field>
 		<!-- Catid Field. Type: Category. (joomla) -->
 		<field
@@ -230,68 +232,51 @@
 			description="COM_COMPONENTBUILDER_FIELD_CATID_DESCRIPTION"
 			class="inputbox"
 		/>
-		<!-- Css_views Field. Type: Editor. (joomla) -->
-		<field
-			type="editor"
-			name="css_views"
-			label="COM_COMPONENTBUILDER_FIELD_CSS_VIEWS_LABEL"
-			description="COM_COMPONENTBUILDER_FIELD_CSS_VIEWS_DESCRIPTION"
-			width="100%"
-			height="450px"
-			cols="15"
-			rows="30"
-			buttons="no"
-			syntax="css"
-			editor="codemirror|none"
-			filter="raw"
-			validate="code"
-		/>
-		<!-- Add_css_views Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_css_views"
-			label="COM_COMPONENTBUILDER_FIELD_ADD_CSS_VIEWS_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_FIELD_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_FIELD_NO</option>
-		</field>
-		<!-- Css_view Field. Type: Editor. (joomla) -->
-		<field
-			type="editor"
-			name="css_view"
-			label="COM_COMPONENTBUILDER_FIELD_CSS_VIEW_LABEL"
-			description="COM_COMPONENTBUILDER_FIELD_CSS_VIEW_DESCRIPTION"
-			width="100%"
-			height="450px"
-			cols="15"
-			rows="30"
-			buttons="no"
-			syntax="css"
-			editor="codemirror|none"
-			filter="raw"
-			validate="code"
-		/>
-		<!-- Add_css_view Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_css_view"
-			label="COM_COMPONENTBUILDER_FIELD_ADD_CSS_VIEW_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_FIELD_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_FIELD_NO</option>
-		</field>
 		<!-- Note_database_settings_needed Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_database_settings_needed" label="COM_COMPONENTBUILDER_FIELD_NOTE_DATABASE_SETTINGS_NEEDED_LABEL" description="COM_COMPONENTBUILDER_FIELD_NOTE_DATABASE_SETTINGS_NEEDED_DESCRIPTION" heading="h4" class="alert alert-info note_database_settings_needed" />
+		<!-- Note_no_database_settings_needed Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_no_database_settings_needed" label="COM_COMPONENTBUILDER_FIELD_NOTE_NO_DATABASE_SETTINGS_NEEDED_LABEL" description="COM_COMPONENTBUILDER_FIELD_NOTE_NO_DATABASE_SETTINGS_NEEDED_DESCRIPTION" heading="h4" class="alert alert-info note_no_database_settings_needed" />
+		<!-- On_get_model_field Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="on_get_model_field"
+			label="COM_COMPONENTBUILDER_FIELD_ON_GET_MODEL_FIELD_LABEL"
+			rows="5"
+			cols="10"
+			description="COM_COMPONENTBUILDER_FIELD_ON_GET_MODEL_FIELD_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_FIELD_ON_GET_MODEL_FIELD_HINT"
+			required="true"
+		/>
+		<!-- On_save_model_field Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="on_save_model_field"
+			label="COM_COMPONENTBUILDER_FIELD_ON_SAVE_MODEL_FIELD_LABEL"
+			rows="3"
+			cols="10"
+			description="COM_COMPONENTBUILDER_FIELD_ON_SAVE_MODEL_FIELD_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_FIELD_ON_SAVE_MODEL_FIELD_HINT"
+			required="true"
+		/>
+		<!-- Initiator_on_get_model Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="initiator_on_get_model"
+			label="COM_COMPONENTBUILDER_FIELD_INITIATOR_ON_GET_MODEL_LABEL"
+			rows="5"
+			cols="10"
+			description="COM_COMPONENTBUILDER_FIELD_INITIATOR_ON_GET_MODEL_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_FIELD_INITIATOR_ON_GET_MODEL_HINT"
+			required="false"
+		/>
+		<!-- Note_filter_information Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_filter_information" description="COM_COMPONENTBUILDER_FIELD_NOTE_FILTER_INFORMATION_DESCRIPTION" class="note_filter_information" />
 		<!-- Datalenght Field. Type: List. (joomla) -->
 		<field
 			type="list"
@@ -300,6 +285,7 @@
 			description="COM_COMPONENTBUILDER_FIELD_DATALENGHT_DESCRIPTION"
 			class="btn-group"
 			multiple="false"
+			required="true"
 			default="">
 			<!-- Option Set. -->
 			<option value="">
@@ -341,10 +327,34 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_FIELD_NO</option>
 		</field>
-		<!-- Note_filter_information Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_filter_information" description="COM_COMPONENTBUILDER_FIELD_NOTE_FILTER_INFORMATION_DESCRIPTION" class="note_filter_information" />
-		<!-- Helpnote Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="helpnote" label="COM_COMPONENTBUILDER_FIELD_HELPNOTE_LABEL" class="helpNote helpnote" />
+		<!-- Add_javascript_view_footer Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_javascript_view_footer"
+			label="COM_COMPONENTBUILDER_FIELD_ADD_JAVASCRIPT_VIEW_FOOTER_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_FIELD_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_FIELD_NO</option>
+		</field>
+		<!-- Add_css_views Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_css_views"
+			label="COM_COMPONENTBUILDER_FIELD_ADD_CSS_VIEWS_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_FIELD_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_FIELD_NO</option>
+		</field>
 		<!-- Datadefault_other Field. Type: Text. (joomla) -->
 		<field
 			type="text"
@@ -393,18 +403,16 @@
 			maxlength="50"
 			description="COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_DESCRIPTION"
 			class="text_area"
-			readonly="false"
-			disabled="false"
 			required="true"
-			filter="STRING"
+			filter="INT"
 			message="COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_MESSAGE"
 			hint="COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_HINT"
 		/>
-		<!-- Add_javascript_view_footer Field. Type: Radio. (joomla) -->
+		<!-- Add_css_view Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_javascript_view_footer"
-			label="COM_COMPONENTBUILDER_FIELD_ADD_JAVASCRIPT_VIEW_FOOTER_LABEL"
+			name="add_css_view"
+			label="COM_COMPONENTBUILDER_FIELD_ADD_CSS_VIEW_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -414,6 +422,46 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_FIELD_NO</option>
 		</field>
+		<!-- Helpnote Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="helpnote" label="COM_COMPONENTBUILDER_FIELD_HELPNOTE_LABEL" class="helpNote helpnote" />
+		<!-- Css_view Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="css_view"
+			label="COM_COMPONENTBUILDER_FIELD_CSS_VIEW_LABEL"
+			description="COM_COMPONENTBUILDER_FIELD_CSS_VIEW_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="css"
+			editor="codemirror|none"
+			filter="raw"
+			validate="code"
+		/>
+		<!-- Not_required Field. Type: Hidden. (joomla) -->
+		<field
+			type="hidden"
+			name="not_required"
+			default="[]"
+		/>
+		<!-- Css_views Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="css_views"
+			label="COM_COMPONENTBUILDER_FIELD_CSS_VIEWS_LABEL"
+			description="COM_COMPONENTBUILDER_FIELD_CSS_VIEWS_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="css"
+			editor="codemirror|none"
+			filter="raw"
+			validate="code"
+		/>
 		<!-- Note_whmcs_encryption Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_whmcs_encryption" label="COM_COMPONENTBUILDER_FIELD_NOTE_WHMCS_ENCRYPTION_LABEL" description="COM_COMPONENTBUILDER_FIELD_NOTE_WHMCS_ENCRYPTION_DESCRIPTION" heading="h4" class="alert alert-success note_whmcs_encryption" />
 		<!-- Javascript_view_footer Field. Type: Editor. (joomla) -->
@@ -432,8 +480,8 @@
 			filter="raw"
 			validate="code"
 		/>
-		<!-- Note_no_database_settings_needed Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_no_database_settings_needed" label="COM_COMPONENTBUILDER_FIELD_NOTE_NO_DATABASE_SETTINGS_NEEDED_LABEL" description="COM_COMPONENTBUILDER_FIELD_NOTE_NO_DATABASE_SETTINGS_NEEDED_DESCRIPTION" heading="h4" class="alert alert-info note_no_database_settings_needed" />
+		<!-- Note_expert_field_save_mode Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_expert_field_save_mode" label="COM_COMPONENTBUILDER_FIELD_NOTE_EXPERT_FIELD_SAVE_MODE_LABEL" description="COM_COMPONENTBUILDER_FIELD_NOTE_EXPERT_FIELD_SAVE_MODE_DESCRIPTION" heading="h4" class="alert alert-success note_expert_encryption note_expert_field_save_mode" />
 		<!-- Javascript_views_footer Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
@@ -450,11 +498,18 @@
 			filter="raw"
 			validate="code"
 		/>
-		<!-- Not_required Field. Type: Hidden. (joomla) -->
+		<!-- Initiator_on_save_model Field. Type: Textarea. (joomla) -->
 		<field
-			type="hidden"
-			name="not_required"
-			default="[]"
+			type="textarea"
+			name="initiator_on_save_model"
+			label="COM_COMPONENTBUILDER_FIELD_INITIATOR_ON_SAVE_MODEL_LABEL"
+			rows="5"
+			cols="10"
+			description="COM_COMPONENTBUILDER_FIELD_INITIATOR_ON_SAVE_MODEL_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_FIELD_INITIATOR_ON_SAVE_MODEL_HINT"
+			required="false"
 		/>
 		<!-- Xml Field. Type: Hidden. (joomla) -->
 		<field

admin/models/forms/fieldtype.xml

@@ -181,10 +181,8 @@
 			maxlength="50"
 			description="COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_OTHER_DESCRIPTION"
 			class="text_area"
-			readonly="false"
-			disabled="false"
 			required="true"
-			filter="STRING"
+			filter="INT"
 			message="COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_OTHER_MESSAGE"
 			hint="COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_OTHER_HINT"
 		/>
@@ -196,6 +194,7 @@
 			description="COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_DESCRIPTION"
 			class="btn-group"
 			multiple="false"
+			required="true"
 			default="">
 			<!-- Option Set. -->
 			<option value="">
@@ -376,6 +375,8 @@
 				COM_COMPONENTBUILDER_FIELDTYPE_MEDIUM_ENCRYPTION_LOCALFILEKEY</option>
 			<option value="4">
 				COM_COMPONENTBUILDER_FIELDTYPE_WHMCSKEY_ENCRYPTION</option>
+			<option value="6">
+				COM_COMPONENTBUILDER_FIELDTYPE_EXPERT_MODE_CUSTOM</option>
 		</field>
 		<!-- Datatype Field. Type: List. (joomla) -->
 		<field

admin/models/forms/help_document.js

@@ -9,112 +9,112 @@
  */
 
 // Some Global Values
-jform_vvvvwczvyh_required = false;
-jform_vvvvwdavyi_required = false;
-jform_vvvvwdbvyj_required = false;
-jform_vvvvwdcvyk_required = false;
-jform_vvvvwdevyl_required = false;
+jform_vvvvwdovyt_required = false;
+jform_vvvvwdpvyu_required = false;
+jform_vvvvwdqvyv_required = false;
+jform_vvvvwdrvyw_required = false;
+jform_vvvvwdtvyx_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var location_vvvvwcz = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwcz(location_vvvvwcz);
+	var location_vvvvwdo = jQuery("#jform_location input[type='radio']:checked").val();
+	vvvvwdo(location_vvvvwdo);
 
-	var location_vvvvwda = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwda(location_vvvvwda);
+	var location_vvvvwdp = jQuery("#jform_location input[type='radio']:checked").val();
+	vvvvwdp(location_vvvvwdp);
 
-	var type_vvvvwdb = jQuery("#jform_type").val();
-	vvvvwdb(type_vvvvwdb);
+	var type_vvvvwdq = jQuery("#jform_type").val();
+	vvvvwdq(type_vvvvwdq);
 
-	var type_vvvvwdc = jQuery("#jform_type").val();
-	vvvvwdc(type_vvvvwdc);
+	var type_vvvvwdr = jQuery("#jform_type").val();
+	vvvvwdr(type_vvvvwdr);
 
-	var type_vvvvwdd = jQuery("#jform_type").val();
-	vvvvwdd(type_vvvvwdd);
+	var type_vvvvwds = jQuery("#jform_type").val();
+	vvvvwds(type_vvvvwds);
 
-	var target_vvvvwde = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwde(target_vvvvwde);
+	var target_vvvvwdt = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwdt(target_vvvvwdt);
 });
 
-// the vvvvwcz function
-function vvvvwcz(location_vvvvwcz)
+// the vvvvwdo function
+function vvvvwdo(location_vvvvwdo)
 {
 	// set the function logic
-	if (location_vvvvwcz == 1)
+	if (location_vvvvwdo == 1)
 	{
 		jQuery('#jform_admin_view').closest('.control-group').show();
 		// add required attribute to admin_view field
-		if (jform_vvvvwczvyh_required)
+		if (jform_vvvvwdovyt_required)
 		{
 			updateFieldRequired('admin_view',0);
 			jQuery('#jform_admin_view').prop('required','required');
 			jQuery('#jform_admin_view').attr('aria-required',true);
 			jQuery('#jform_admin_view').addClass('required');
-			jform_vvvvwczvyh_required = false;
+			jform_vvvvwdovyt_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_admin_view').closest('.control-group').hide();
 		// remove required attribute from admin_view field
-		if (!jform_vvvvwczvyh_required)
+		if (!jform_vvvvwdovyt_required)
 		{
 			updateFieldRequired('admin_view',1);
 			jQuery('#jform_admin_view').removeAttr('required');
 			jQuery('#jform_admin_view').removeAttr('aria-required');
 			jQuery('#jform_admin_view').removeClass('required');
-			jform_vvvvwczvyh_required = true;
+			jform_vvvvwdovyt_required = true;
 		}
 	}
 }
 
-// the vvvvwda function
-function vvvvwda(location_vvvvwda)
+// the vvvvwdp function
+function vvvvwdp(location_vvvvwdp)
 {
 	// set the function logic
-	if (location_vvvvwda == 2)
+	if (location_vvvvwdp == 2)
 	{
 		jQuery('#jform_site_view').closest('.control-group').show();
 		// add required attribute to site_view field
-		if (jform_vvvvwdavyi_required)
+		if (jform_vvvvwdpvyu_required)
 		{
 			updateFieldRequired('site_view',0);
 			jQuery('#jform_site_view').prop('required','required');
 			jQuery('#jform_site_view').attr('aria-required',true);
 			jQuery('#jform_site_view').addClass('required');
-			jform_vvvvwdavyi_required = false;
+			jform_vvvvwdpvyu_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_site_view').closest('.control-group').hide();
 		// remove required attribute from site_view field
-		if (!jform_vvvvwdavyi_required)
+		if (!jform_vvvvwdpvyu_required)
 		{
 			updateFieldRequired('site_view',1);
 			jQuery('#jform_site_view').removeAttr('required');
 			jQuery('#jform_site_view').removeAttr('aria-required');
 			jQuery('#jform_site_view').removeClass('required');
-			jform_vvvvwdavyi_required = true;
+			jform_vvvvwdpvyu_required = true;
 		}
 	}
 }
 
-// the vvvvwdb function
-function vvvvwdb(type_vvvvwdb)
+// the vvvvwdq function
+function vvvvwdq(type_vvvvwdq)
 {
-	if (isSet(type_vvvvwdb) && type_vvvvwdb.constructor !== Array)
+	if (isSet(type_vvvvwdq) && type_vvvvwdq.constructor !== Array)
 	{
-		var temp_vvvvwdb = type_vvvvwdb;
-		var type_vvvvwdb = [];
-		type_vvvvwdb.push(temp_vvvvwdb);
+		var temp_vvvvwdq = type_vvvvwdq;
+		var type_vvvvwdq = [];
+		type_vvvvwdq.push(temp_vvvvwdq);
 	}
-	else if (!isSet(type_vvvvwdb))
+	else if (!isSet(type_vvvvwdq))
 	{
-		var type_vvvvwdb = [];
+		var type_vvvvwdq = [];
 	}
-	var type = type_vvvvwdb.some(type_vvvvwdb_SomeFunc);
+	var type = type_vvvvwdq.some(type_vvvvwdq_SomeFunc);
 
 
 	// set this function logic
@@ -122,55 +122,55 @@ function vvvvwdb(type_vvvvwdb)
 	{
 		jQuery('#jform_url').closest('.control-group').show();
 		// add required attribute to url field
-		if (jform_vvvvwdbvyj_required)
+		if (jform_vvvvwdqvyv_required)
 		{
 			updateFieldRequired('url',0);
 			jQuery('#jform_url').prop('required','required');
 			jQuery('#jform_url').attr('aria-required',true);
 			jQuery('#jform_url').addClass('required');
-			jform_vvvvwdbvyj_required = false;
+			jform_vvvvwdqvyv_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_url').closest('.control-group').hide();
 		// remove required attribute from url field
-		if (!jform_vvvvwdbvyj_required)
+		if (!jform_vvvvwdqvyv_required)
 		{
 			updateFieldRequired('url',1);
 			jQuery('#jform_url').removeAttr('required');
 			jQuery('#jform_url').removeAttr('aria-required');
 			jQuery('#jform_url').removeClass('required');
-			jform_vvvvwdbvyj_required = true;
+			jform_vvvvwdqvyv_required = true;
 		}
 	}
 }
 
-// the vvvvwdb Some function
-function type_vvvvwdb_SomeFunc(type_vvvvwdb)
+// the vvvvwdq Some function
+function type_vvvvwdq_SomeFunc(type_vvvvwdq)
 {
 	// set the function logic
-	if (type_vvvvwdb == 3)
+	if (type_vvvvwdq == 3)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwdc function
-function vvvvwdc(type_vvvvwdc)
+// the vvvvwdr function
+function vvvvwdr(type_vvvvwdr)
 {
-	if (isSet(type_vvvvwdc) && type_vvvvwdc.constructor !== Array)
+	if (isSet(type_vvvvwdr) && type_vvvvwdr.constructor !== Array)
 	{
-		var temp_vvvvwdc = type_vvvvwdc;
-		var type_vvvvwdc = [];
-		type_vvvvwdc.push(temp_vvvvwdc);
+		var temp_vvvvwdr = type_vvvvwdr;
+		var type_vvvvwdr = [];
+		type_vvvvwdr.push(temp_vvvvwdr);
 	}
-	else if (!isSet(type_vvvvwdc))
+	else if (!isSet(type_vvvvwdr))
 	{
-		var type_vvvvwdc = [];
+		var type_vvvvwdr = [];
 	}
-	var type = type_vvvvwdc.some(type_vvvvwdc_SomeFunc);
+	var type = type_vvvvwdr.some(type_vvvvwdr_SomeFunc);
 
 
 	// set this function logic
@@ -178,55 +178,55 @@ function vvvvwdc(type_vvvvwdc)
 	{
 		jQuery('#jform_article').closest('.control-group').show();
 		// add required attribute to article field
-		if (jform_vvvvwdcvyk_required)
+		if (jform_vvvvwdrvyw_required)
 		{
 			updateFieldRequired('article',0);
 			jQuery('#jform_article').prop('required','required');
 			jQuery('#jform_article').attr('aria-required',true);
 			jQuery('#jform_article').addClass('required');
-			jform_vvvvwdcvyk_required = false;
+			jform_vvvvwdrvyw_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_article').closest('.control-group').hide();
 		// remove required attribute from article field
-		if (!jform_vvvvwdcvyk_required)
+		if (!jform_vvvvwdrvyw_required)
 		{
 			updateFieldRequired('article',1);
 			jQuery('#jform_article').removeAttr('required');
 			jQuery('#jform_article').removeAttr('aria-required');
 			jQuery('#jform_article').removeClass('required');
-			jform_vvvvwdcvyk_required = true;
+			jform_vvvvwdrvyw_required = true;
 		}
 	}
 }
 
-// the vvvvwdc Some function
-function type_vvvvwdc_SomeFunc(type_vvvvwdc)
+// the vvvvwdr Some function
+function type_vvvvwdr_SomeFunc(type_vvvvwdr)
 {
 	// set the function logic
-	if (type_vvvvwdc == 1)
+	if (type_vvvvwdr == 1)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwdd function
-function vvvvwdd(type_vvvvwdd)
+// the vvvvwds function
+function vvvvwds(type_vvvvwds)
 {
-	if (isSet(type_vvvvwdd) && type_vvvvwdd.constructor !== Array)
+	if (isSet(type_vvvvwds) && type_vvvvwds.constructor !== Array)
 	{
-		var temp_vvvvwdd = type_vvvvwdd;
-		var type_vvvvwdd = [];
-		type_vvvvwdd.push(temp_vvvvwdd);
+		var temp_vvvvwds = type_vvvvwds;
+		var type_vvvvwds = [];
+		type_vvvvwds.push(temp_vvvvwds);
 	}
-	else if (!isSet(type_vvvvwdd))
+	else if (!isSet(type_vvvvwds))
 	{
-		var type_vvvvwdd = [];
+		var type_vvvvwds = [];
 	}
-	var type = type_vvvvwdd.some(type_vvvvwdd_SomeFunc);
+	var type = type_vvvvwds.some(type_vvvvwds_SomeFunc);
 
 
 	// set this function logic
@@ -240,45 +240,45 @@ function vvvvwdd(type_vvvvwdd)
 	}
 }
 
-// the vvvvwdd Some function
-function type_vvvvwdd_SomeFunc(type_vvvvwdd)
+// the vvvvwds Some function
+function type_vvvvwds_SomeFunc(type_vvvvwds)
 {
 	// set the function logic
-	if (type_vvvvwdd == 2)
+	if (type_vvvvwds == 2)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwde function
-function vvvvwde(target_vvvvwde)
+// the vvvvwdt function
+function vvvvwdt(target_vvvvwdt)
 {
 	// set the function logic
-	if (target_vvvvwde == 1)
+	if (target_vvvvwdt == 1)
 	{
 		jQuery('#jform_groups').closest('.control-group').show();
 		// add required attribute to groups field
-		if (jform_vvvvwdevyl_required)
+		if (jform_vvvvwdtvyx_required)
 		{
 			updateFieldRequired('groups',0);
 			jQuery('#jform_groups').prop('required','required');
 			jQuery('#jform_groups').attr('aria-required',true);
 			jQuery('#jform_groups').addClass('required');
-			jform_vvvvwdevyl_required = false;
+			jform_vvvvwdtvyx_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_groups').closest('.control-group').hide();
 		// remove required attribute from groups field
-		if (!jform_vvvvwdevyl_required)
+		if (!jform_vvvvwdtvyx_required)
 		{
 			updateFieldRequired('groups',1);
 			jQuery('#jform_groups').removeAttr('required');
 			jQuery('#jform_groups').removeAttr('aria-required');
 			jQuery('#jform_groups').removeClass('required');
-			jform_vvvvwdevyl_required = true;
+			jform_vvvvwdtvyx_required = true;
 		}
 	}
 }

admin/models/forms/joomla_component.xml

@@ -1487,12 +1487,6 @@
 				<option value="index, nofollow">JGLOBAL_INDEX_NOFOLLOW</option>
 				<option value="noindex, nofollow">JGLOBAL_NOINDEX_NOFOLLOW</option>
 			</field>
-			<!-- Author Field. Type: Text (joomla) -->
-			<field name="author"
-				type="text"
-				label="JAUTHOR" description="JFIELD_METADATA_AUTHOR_DESC"
-				size="20"
-			/>
 			<!-- Rights Field. Type: Textarea (joomla) -->
 			<field name="rights" type="textarea" label="JFIELD_META_RIGHTS_LABEL"
 				description="JFIELD_META_RIGHTS_DESC" required="false" filter="string"

admin/models/forms/joomla_plugin.xml

@@ -409,38 +409,133 @@
 			type="subform"
 			name="fields"
 			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELDS_LABEL"
-			layout="joomla.form.field.subform.repeatable-table"
+			layout="joomla.form.field.subform.repeatable"
 			multiple="true"
 			buttons="add,remove,move"
 			icon="list"
-			max="50">
+			max="10">
 			<form hidden="true" name="list_fields_modal" repeat="true">
-				<!-- Field Field. Type: Fields. (custom) -->
+				<!-- Plugin Field. Type: Checkbox. (joomla) -->
 				<field
-					type="fields"
-					name="field"
-					label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELD_LABEL"
-					description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELD_DESCRIPTION"
-					class="list_class fieldFull"
-					multiple="false"
-					default=""
-					required="true"
-					button="false"
+					type="checkbox"
+					name="plugin"
+					label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PLUGIN_LABEL"
+					value="1"
+					default="1"
+					description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PLUGIN_DESCRIPTION"
+					class="inputbox"
 				/>
-				<!-- Custom_value Field. Type: Textarea. (joomla) -->
+				<!-- File Field. Type: Text. (joomla) -->
 				<field
-					type="textarea"
-					name="custom_value"
-					label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_CUSTOM_VALUE_LABEL"
-					rows="2"
-					cols="4"
-					description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_CUSTOM_VALUE_DESCRIPTION"
+					type="text"
+					name="file"
+					label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FILE_LABEL"
+					size="10"
+					maxlength="50"
+					default="config"
+					description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FILE_DESCRIPTION"
 					class="text_area"
-					hint="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_CUSTOM_VALUE_HINT"
-					required="false"
-					readonly="false"
-					disabled="false"
+					filter="WORD"
+					hint="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FILE_HINT"
+					autocomplete="on"
 				/>
+				<!-- Fields_name Field. Type: Text. (joomla) -->
+				<field
+					type="text"
+					name="fields_name"
+					label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELDS_NAME_LABEL"
+					size="10"
+					maxlength="50"
+					default="params"
+					description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELDS_NAME_DESCRIPTION"
+					class="text_area"
+					filter="CMD"
+					hint="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELDS_NAME_HINT"
+					autocomplete="on"
+				/>
+				<!-- Fieldset Field. Type: Text. (joomla) -->
+				<field
+					type="text"
+					name="fieldset"
+					label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELDSET_LABEL"
+					size="10"
+					maxlength="50"
+					default="basic"
+					description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELDSET_DESCRIPTION"
+					class="text_area"
+					filter="WORD"
+					hint="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELDSET_HINT"
+					autocomplete="on"
+				/>
+				<!-- Label Field. Type: Text. (joomla) -->
+				<field
+					type="text"
+					name="label"
+					label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_LABEL_LABEL"
+					size="10"
+					maxlength="50"
+					description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_LABEL_DESCRIPTION"
+					class="text_area"
+					filter="String"
+					hint="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_LABEL_HINT"
+					autocomplete="on"
+				/>
+				<!-- Fields_rules_paths Field. Type: List. (joomla) -->
+				<field
+					type="list"
+					name="fields_rules_paths"
+					label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELDS_RULES_PATHS_LABEL"
+					description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELDS_RULES_PATHS_DESCRIPTION"
+					class="list_class"
+					multiple="false"
+					validate="number"
+					default="1">
+					<!-- Option Set. -->
+					<option value="1">
+						COM_COMPONENTBUILDER_JOOMLA_PLUGIN_COMPONENT</option>
+					<option value="2">
+						COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PLUGIN</option>
+				</field>
+				<!-- Fields Field. Type: Subform. (joomla) -->
+				<field
+					type="subform"
+					name="fields"
+					label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELDS_LABEL"
+					layout="joomla.form.field.subform.repeatable-table"
+					multiple="true"
+					buttons="add,remove,move"
+					description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELDS_DESCRIPTION"
+					icon="list"
+					max="50"
+					nested_depth="1">
+					<form hidden="true" name="list_fields_modal" repeat="true">
+						<!-- Field Field. Type: Fields. (custom) -->
+						<field
+							type="fields"
+							name="field"
+							label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELD_LABEL"
+							description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELD_DESCRIPTION"
+							class="list_class fieldFull"
+							multiple="false"
+							required="true"
+							button="false"
+						/>
+						<!-- Custom_value Field. Type: Textarea. (joomla) -->
+						<field
+							type="textarea"
+							name="custom_value"
+							label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_CUSTOM_VALUE_LABEL"
+							rows="2"
+							cols="4"
+							description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_CUSTOM_VALUE_DESCRIPTION"
+							class="text_area"
+							hint="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_CUSTOM_VALUE_HINT"
+							required="false"
+							readonly="false"
+							disabled="false"
+						/>
+					</form>
+				</field>
 			</form>
 		</field>
 		<!-- Add_php_method_uninstall Field. Type: Radio. (joomla) -->

admin/models/forms/library.js

@@ -9,39 +9,67 @@
  */
 
 // Some Global Values
-jform_vvvvwbmvxj_required = false;
-jform_vvvvwbsvxk_required = false;
+jform_vvvvwbnvxj_required = false;
+jform_vvvvwbzvxk_required = false;
+jform_vvvvwcbvxl_required = false;
+jform_vvvvwcbvxm_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
 	var how_vvvvwbl = jQuery("#jform_how").val();
-	vvvvwbl(how_vvvvwbl);
-
-	var how_vvvvwbm = jQuery("#jform_how").val();
-	vvvvwbm(how_vvvvwbm);
+	var target_vvvvwbl = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbl(how_vvvvwbl,target_vvvvwbl);
 
 	var how_vvvvwbn = jQuery("#jform_how").val();
-	vvvvwbn(how_vvvvwbn);
-
-	var how_vvvvwbo = jQuery("#jform_how").val();
-	vvvvwbo(how_vvvvwbo);
+	var target_vvvvwbn = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbn(how_vvvvwbn,target_vvvvwbn);
 
 	var how_vvvvwbp = jQuery("#jform_how").val();
-	vvvvwbp(how_vvvvwbp);
-
-	var how_vvvvwbq = jQuery("#jform_how").val();
-	vvvvwbq(how_vvvvwbq);
+	var target_vvvvwbp = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbp(how_vvvvwbp,target_vvvvwbp);
 
 	var how_vvvvwbr = jQuery("#jform_how").val();
-	vvvvwbr(how_vvvvwbr);
+	var target_vvvvwbr = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbr(how_vvvvwbr,target_vvvvwbr);
 
-	var type_vvvvwbs = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwbs(type_vvvvwbs);
+	var how_vvvvwbt = jQuery("#jform_how").val();
+	var target_vvvvwbt = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbt(how_vvvvwbt,target_vvvvwbt);
+
+	var target_vvvvwbu = jQuery("#jform_target input[type='radio']:checked").val();
+	var how_vvvvwbu = jQuery("#jform_how").val();
+	vvvvwbu(target_vvvvwbu,how_vvvvwbu);
+
+	var how_vvvvwbv = jQuery("#jform_how").val();
+	var target_vvvvwbv = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbv(how_vvvvwbv,target_vvvvwbv);
+
+	var target_vvvvwbw = jQuery("#jform_target input[type='radio']:checked").val();
+	var how_vvvvwbw = jQuery("#jform_how").val();
+	vvvvwbw(target_vvvvwbw,how_vvvvwbw);
+
+	var how_vvvvwbx = jQuery("#jform_how").val();
+	var target_vvvvwbx = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbx(how_vvvvwbx,target_vvvvwbx);
+
+	var target_vvvvwby = jQuery("#jform_target input[type='radio']:checked").val();
+	var how_vvvvwby = jQuery("#jform_how").val();
+	vvvvwby(target_vvvvwby,how_vvvvwby);
+
+	var target_vvvvwbz = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvwbz = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwbz(target_vvvvwbz,type_vvvvwbz);
+
+	var target_vvvvwcb = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwcb(target_vvvvwcb);
+
+	var target_vvvvwcc = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwcc(target_vvvvwcc);
 });
 
 // the vvvvwbl function
-function vvvvwbl(how_vvvvwbl)
+function vvvvwbl(how_vvvvwbl,target_vvvvwbl)
 {
 	if (isSet(how_vvvvwbl) && how_vvvvwbl.constructor !== Array)
 	{
@@ -55,9 +83,21 @@ function vvvvwbl(how_vvvvwbl)
 	}
 	var how = how_vvvvwbl.some(how_vvvvwbl_SomeFunc);
 
+	if (isSet(target_vvvvwbl) && target_vvvvwbl.constructor !== Array)
+	{
+		var temp_vvvvwbl = target_vvvvwbl;
+		var target_vvvvwbl = [];
+		target_vvvvwbl.push(temp_vvvvwbl);
+	}
+	else if (!isSet(target_vvvvwbl))
+	{
+		var target_vvvvwbl = [];
+	}
+	var target = target_vvvvwbl.some(target_vvvvwbl_SomeFunc);
+
 
 	// set this function logic
-	if (how)
+	if (how && target)
 	{
 		jQuery('#jform_addconditions-lbl').closest('.control-group').show();
 	}
@@ -78,56 +118,11 @@ function how_vvvvwbl_SomeFunc(how_vvvvwbl)
 	return false;
 }
 
-// the vvvvwbm function
-function vvvvwbm(how_vvvvwbm)
-{
-	if (isSet(how_vvvvwbm) && how_vvvvwbm.constructor !== Array)
-	{
-		var temp_vvvvwbm = how_vvvvwbm;
-		var how_vvvvwbm = [];
-		how_vvvvwbm.push(temp_vvvvwbm);
-	}
-	else if (!isSet(how_vvvvwbm))
-	{
-		var how_vvvvwbm = [];
-	}
-	var how = how_vvvvwbm.some(how_vvvvwbm_SomeFunc);
-
-
-	// set this function logic
-	if (how)
-	{
-		jQuery('#jform_php_setdocument').closest('.control-group').show();
-		// add required attribute to php_setdocument field
-		if (jform_vvvvwbmvxj_required)
-		{
-			updateFieldRequired('php_setdocument',0);
-			jQuery('#jform_php_setdocument').prop('required','required');
-			jQuery('#jform_php_setdocument').attr('aria-required',true);
-			jQuery('#jform_php_setdocument').addClass('required');
-			jform_vvvvwbmvxj_required = false;
-		}
-	}
-	else
-	{
-		jQuery('#jform_php_setdocument').closest('.control-group').hide();
-		// remove required attribute from php_setdocument field
-		if (!jform_vvvvwbmvxj_required)
-		{
-			updateFieldRequired('php_setdocument',1);
-			jQuery('#jform_php_setdocument').removeAttr('required');
-			jQuery('#jform_php_setdocument').removeAttr('aria-required');
-			jQuery('#jform_php_setdocument').removeClass('required');
-			jform_vvvvwbmvxj_required = true;
-		}
-	}
-}
-
-// the vvvvwbm Some function
-function how_vvvvwbm_SomeFunc(how_vvvvwbm)
+// the vvvvwbl Some function
+function target_vvvvwbl_SomeFunc(target_vvvvwbl)
 {
 	// set the function logic
-	if (how_vvvvwbm == 3)
+	if (target_vvvvwbl == 1)
 	{
 		return true;
 	}
@@ -135,7 +130,7 @@ function how_vvvvwbm_SomeFunc(how_vvvvwbm)
 }
 
 // the vvvvwbn function
-function vvvvwbn(how_vvvvwbn)
+function vvvvwbn(how_vvvvwbn,target_vvvvwbn)
 {
 	if (isSet(how_vvvvwbn) && how_vvvvwbn.constructor !== Array)
 	{
@@ -149,15 +144,45 @@ function vvvvwbn(how_vvvvwbn)
 	}
 	var how = how_vvvvwbn.some(how_vvvvwbn_SomeFunc);
 
+	if (isSet(target_vvvvwbn) && target_vvvvwbn.constructor !== Array)
+	{
+		var temp_vvvvwbn = target_vvvvwbn;
+		var target_vvvvwbn = [];
+		target_vvvvwbn.push(temp_vvvvwbn);
+	}
+	else if (!isSet(target_vvvvwbn))
+	{
+		var target_vvvvwbn = [];
+	}
+	var target = target_vvvvwbn.some(target_vvvvwbn_SomeFunc);
+
 
 	// set this function logic
-	if (how)
+	if (how && target)
 	{
-		jQuery('.note_display_library_config').closest('.control-group').show();
+		jQuery('#jform_php_setdocument').closest('.control-group').show();
+		// add required attribute to php_setdocument field
+		if (jform_vvvvwbnvxj_required)
+		{
+			updateFieldRequired('php_setdocument',0);
+			jQuery('#jform_php_setdocument').prop('required','required');
+			jQuery('#jform_php_setdocument').attr('aria-required',true);
+			jQuery('#jform_php_setdocument').addClass('required');
+			jform_vvvvwbnvxj_required = false;
+		}
 	}
 	else
 	{
-		jQuery('.note_display_library_config').closest('.control-group').hide();
+		jQuery('#jform_php_setdocument').closest('.control-group').hide();
+		// remove required attribute from php_setdocument field
+		if (!jform_vvvvwbnvxj_required)
+		{
+			updateFieldRequired('php_setdocument',1);
+			jQuery('#jform_php_setdocument').removeAttr('required');
+			jQuery('#jform_php_setdocument').removeAttr('aria-required');
+			jQuery('#jform_php_setdocument').removeClass('required');
+			jform_vvvvwbnvxj_required = true;
+		}
 	}
 }
 
@@ -165,45 +190,18 @@ function vvvvwbn(how_vvvvwbn)
 function how_vvvvwbn_SomeFunc(how_vvvvwbn)
 {
 	// set the function logic
-	if (how_vvvvwbn == 2 || how_vvvvwbn == 3)
+	if (how_vvvvwbn == 3)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbo function
-function vvvvwbo(how_vvvvwbo)
-{
-	if (isSet(how_vvvvwbo) && how_vvvvwbo.constructor !== Array)
-	{
-		var temp_vvvvwbo = how_vvvvwbo;
-		var how_vvvvwbo = [];
-		how_vvvvwbo.push(temp_vvvvwbo);
-	}
-	else if (!isSet(how_vvvvwbo))
-	{
-		var how_vvvvwbo = [];
-	}
-	var how = how_vvvvwbo.some(how_vvvvwbo_SomeFunc);
-
-
-	// set this function logic
-	if (how)
-	{
-		jQuery('.note_display_library_files_folders_urls').closest('.control-group').show();
-	}
-	else
-	{
-		jQuery('.note_display_library_files_folders_urls').closest('.control-group').hide();
-	}
-}
-
-// the vvvvwbo Some function
-function how_vvvvwbo_SomeFunc(how_vvvvwbo)
+// the vvvvwbn Some function
+function target_vvvvwbn_SomeFunc(target_vvvvwbn)
 {
 	// set the function logic
-	if (how_vvvvwbo == 1 || how_vvvvwbo == 2 || how_vvvvwbo == 3)
+	if (target_vvvvwbn == 1)
 	{
 		return true;
 	}
@@ -211,7 +209,7 @@ function how_vvvvwbo_SomeFunc(how_vvvvwbo)
 }
 
 // the vvvvwbp function
-function vvvvwbp(how_vvvvwbp)
+function vvvvwbp(how_vvvvwbp,target_vvvvwbp)
 {
 	if (isSet(how_vvvvwbp) && how_vvvvwbp.constructor !== Array)
 	{
@@ -225,19 +223,27 @@ function vvvvwbp(how_vvvvwbp)
 	}
 	var how = how_vvvvwbp.some(how_vvvvwbp_SomeFunc);
 
+	if (isSet(target_vvvvwbp) && target_vvvvwbp.constructor !== Array)
+	{
+		var temp_vvvvwbp = target_vvvvwbp;
+		var target_vvvvwbp = [];
+		target_vvvvwbp.push(temp_vvvvwbp);
+	}
+	else if (!isSet(target_vvvvwbp))
+	{
+		var target_vvvvwbp = [];
+	}
+	var target = target_vvvvwbp.some(target_vvvvwbp_SomeFunc);
+
 
 	// set this function logic
-	if (how)
+	if (how && target)
 	{
-		jQuery('.note_no_behaviour_one').closest('.control-group').show();
-		jQuery('.note_no_behaviour_three').closest('.control-group').show();
-		jQuery('.note_no_behaviour_two').closest('.control-group').show();
+		jQuery('.note_display_library_config').closest('.control-group').show();
 	}
 	else
 	{
-		jQuery('.note_no_behaviour_one').closest('.control-group').hide();
-		jQuery('.note_no_behaviour_three').closest('.control-group').hide();
-		jQuery('.note_no_behaviour_two').closest('.control-group').hide();
+		jQuery('.note_display_library_config').closest('.control-group').hide();
 	}
 }
 
@@ -245,47 +251,18 @@ function vvvvwbp(how_vvvvwbp)
 function how_vvvvwbp_SomeFunc(how_vvvvwbp)
 {
 	// set the function logic
-	if (how_vvvvwbp == 0)
+	if (how_vvvvwbp == 2 || how_vvvvwbp == 3)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbq function
-function vvvvwbq(how_vvvvwbq)
-{
-	if (isSet(how_vvvvwbq) && how_vvvvwbq.constructor !== Array)
-	{
-		var temp_vvvvwbq = how_vvvvwbq;
-		var how_vvvvwbq = [];
-		how_vvvvwbq.push(temp_vvvvwbq);
-	}
-	else if (!isSet(how_vvvvwbq))
-	{
-		var how_vvvvwbq = [];
-	}
-	var how = how_vvvvwbq.some(how_vvvvwbq_SomeFunc);
-
-
-	// set this function logic
-	if (how)
-	{
-		jQuery('.note_yes_behaviour_one').closest('.control-group').show();
-		jQuery('.note_yes_behaviour_two').closest('.control-group').show();
-	}
-	else
-	{
-		jQuery('.note_yes_behaviour_one').closest('.control-group').hide();
-		jQuery('.note_yes_behaviour_two').closest('.control-group').hide();
-	}
-}
-
-// the vvvvwbq Some function
-function how_vvvvwbq_SomeFunc(how_vvvvwbq)
+// the vvvvwbp Some function
+function target_vvvvwbp_SomeFunc(target_vvvvwbp)
 {
 	// set the function logic
-	if (how_vvvvwbq == 1)
+	if (target_vvvvwbp == 1)
 	{
 		return true;
 	}
@@ -293,7 +270,7 @@ function how_vvvvwbq_SomeFunc(how_vvvvwbq)
 }
 
 // the vvvvwbr function
-function vvvvwbr(how_vvvvwbr)
+function vvvvwbr(how_vvvvwbr,target_vvvvwbr)
 {
 	if (isSet(how_vvvvwbr) && how_vvvvwbr.constructor !== Array)
 	{
@@ -307,9 +284,338 @@ function vvvvwbr(how_vvvvwbr)
 	}
 	var how = how_vvvvwbr.some(how_vvvvwbr_SomeFunc);
 
+	if (isSet(target_vvvvwbr) && target_vvvvwbr.constructor !== Array)
+	{
+		var temp_vvvvwbr = target_vvvvwbr;
+		var target_vvvvwbr = [];
+		target_vvvvwbr.push(temp_vvvvwbr);
+	}
+	else if (!isSet(target_vvvvwbr))
+	{
+		var target_vvvvwbr = [];
+	}
+	var target = target_vvvvwbr.some(target_vvvvwbr_SomeFunc);
+
 
 	// set this function logic
-	if (how)
+	if (how && target)
+	{
+		jQuery('.note_display_library_files_folders_urls').closest('.control-group').show();
+	}
+	else
+	{
+		jQuery('.note_display_library_files_folders_urls').closest('.control-group').hide();
+	}
+}
+
+// the vvvvwbr Some function
+function how_vvvvwbr_SomeFunc(how_vvvvwbr)
+{
+	// set the function logic
+	if (how_vvvvwbr == 1 || how_vvvvwbr == 2 || how_vvvvwbr == 3)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwbr Some function
+function target_vvvvwbr_SomeFunc(target_vvvvwbr)
+{
+	// set the function logic
+	if (target_vvvvwbr == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwbt function
+function vvvvwbt(how_vvvvwbt,target_vvvvwbt)
+{
+	if (isSet(how_vvvvwbt) && how_vvvvwbt.constructor !== Array)
+	{
+		var temp_vvvvwbt = how_vvvvwbt;
+		var how_vvvvwbt = [];
+		how_vvvvwbt.push(temp_vvvvwbt);
+	}
+	else if (!isSet(how_vvvvwbt))
+	{
+		var how_vvvvwbt = [];
+	}
+	var how = how_vvvvwbt.some(how_vvvvwbt_SomeFunc);
+
+	if (isSet(target_vvvvwbt) && target_vvvvwbt.constructor !== Array)
+	{
+		var temp_vvvvwbt = target_vvvvwbt;
+		var target_vvvvwbt = [];
+		target_vvvvwbt.push(temp_vvvvwbt);
+	}
+	else if (!isSet(target_vvvvwbt))
+	{
+		var target_vvvvwbt = [];
+	}
+	var target = target_vvvvwbt.some(target_vvvvwbt_SomeFunc);
+
+
+	// set this function logic
+	if (how && target)
+	{
+		jQuery('.note_no_behaviour_one').closest('.control-group').show();
+		jQuery('.note_no_behaviour_three').closest('.control-group').show();
+		jQuery('.note_no_behaviour_two').closest('.control-group').show();
+	}
+	else
+	{
+		jQuery('.note_no_behaviour_one').closest('.control-group').hide();
+		jQuery('.note_no_behaviour_three').closest('.control-group').hide();
+		jQuery('.note_no_behaviour_two').closest('.control-group').hide();
+	}
+}
+
+// the vvvvwbt Some function
+function how_vvvvwbt_SomeFunc(how_vvvvwbt)
+{
+	// set the function logic
+	if (how_vvvvwbt == 0)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwbt Some function
+function target_vvvvwbt_SomeFunc(target_vvvvwbt)
+{
+	// set the function logic
+	if (target_vvvvwbt == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwbu function
+function vvvvwbu(target_vvvvwbu,how_vvvvwbu)
+{
+	if (isSet(target_vvvvwbu) && target_vvvvwbu.constructor !== Array)
+	{
+		var temp_vvvvwbu = target_vvvvwbu;
+		var target_vvvvwbu = [];
+		target_vvvvwbu.push(temp_vvvvwbu);
+	}
+	else if (!isSet(target_vvvvwbu))
+	{
+		var target_vvvvwbu = [];
+	}
+	var target = target_vvvvwbu.some(target_vvvvwbu_SomeFunc);
+
+	if (isSet(how_vvvvwbu) && how_vvvvwbu.constructor !== Array)
+	{
+		var temp_vvvvwbu = how_vvvvwbu;
+		var how_vvvvwbu = [];
+		how_vvvvwbu.push(temp_vvvvwbu);
+	}
+	else if (!isSet(how_vvvvwbu))
+	{
+		var how_vvvvwbu = [];
+	}
+	var how = how_vvvvwbu.some(how_vvvvwbu_SomeFunc);
+
+
+	// set this function logic
+	if (target && how)
+	{
+		jQuery('.note_no_behaviour_one').closest('.control-group').show();
+		jQuery('.note_no_behaviour_three').closest('.control-group').show();
+		jQuery('.note_no_behaviour_two').closest('.control-group').show();
+	}
+	else
+	{
+		jQuery('.note_no_behaviour_one').closest('.control-group').hide();
+		jQuery('.note_no_behaviour_three').closest('.control-group').hide();
+		jQuery('.note_no_behaviour_two').closest('.control-group').hide();
+	}
+}
+
+// the vvvvwbu Some function
+function target_vvvvwbu_SomeFunc(target_vvvvwbu)
+{
+	// set the function logic
+	if (target_vvvvwbu == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwbu Some function
+function how_vvvvwbu_SomeFunc(how_vvvvwbu)
+{
+	// set the function logic
+	if (how_vvvvwbu == 0)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwbv function
+function vvvvwbv(how_vvvvwbv,target_vvvvwbv)
+{
+	if (isSet(how_vvvvwbv) && how_vvvvwbv.constructor !== Array)
+	{
+		var temp_vvvvwbv = how_vvvvwbv;
+		var how_vvvvwbv = [];
+		how_vvvvwbv.push(temp_vvvvwbv);
+	}
+	else if (!isSet(how_vvvvwbv))
+	{
+		var how_vvvvwbv = [];
+	}
+	var how = how_vvvvwbv.some(how_vvvvwbv_SomeFunc);
+
+	if (isSet(target_vvvvwbv) && target_vvvvwbv.constructor !== Array)
+	{
+		var temp_vvvvwbv = target_vvvvwbv;
+		var target_vvvvwbv = [];
+		target_vvvvwbv.push(temp_vvvvwbv);
+	}
+	else if (!isSet(target_vvvvwbv))
+	{
+		var target_vvvvwbv = [];
+	}
+	var target = target_vvvvwbv.some(target_vvvvwbv_SomeFunc);
+
+
+	// set this function logic
+	if (how && target)
+	{
+		jQuery('.note_yes_behaviour_one').closest('.control-group').show();
+		jQuery('.note_yes_behaviour_two').closest('.control-group').show();
+	}
+	else
+	{
+		jQuery('.note_yes_behaviour_one').closest('.control-group').hide();
+		jQuery('.note_yes_behaviour_two').closest('.control-group').hide();
+	}
+}
+
+// the vvvvwbv Some function
+function how_vvvvwbv_SomeFunc(how_vvvvwbv)
+{
+	// set the function logic
+	if (how_vvvvwbv == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwbv Some function
+function target_vvvvwbv_SomeFunc(target_vvvvwbv)
+{
+	// set the function logic
+	if (target_vvvvwbv == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwbw function
+function vvvvwbw(target_vvvvwbw,how_vvvvwbw)
+{
+	if (isSet(target_vvvvwbw) && target_vvvvwbw.constructor !== Array)
+	{
+		var temp_vvvvwbw = target_vvvvwbw;
+		var target_vvvvwbw = [];
+		target_vvvvwbw.push(temp_vvvvwbw);
+	}
+	else if (!isSet(target_vvvvwbw))
+	{
+		var target_vvvvwbw = [];
+	}
+	var target = target_vvvvwbw.some(target_vvvvwbw_SomeFunc);
+
+	if (isSet(how_vvvvwbw) && how_vvvvwbw.constructor !== Array)
+	{
+		var temp_vvvvwbw = how_vvvvwbw;
+		var how_vvvvwbw = [];
+		how_vvvvwbw.push(temp_vvvvwbw);
+	}
+	else if (!isSet(how_vvvvwbw))
+	{
+		var how_vvvvwbw = [];
+	}
+	var how = how_vvvvwbw.some(how_vvvvwbw_SomeFunc);
+
+
+	// set this function logic
+	if (target && how)
+	{
+		jQuery('.note_yes_behaviour_one').closest('.control-group').show();
+		jQuery('.note_yes_behaviour_two').closest('.control-group').show();
+	}
+	else
+	{
+		jQuery('.note_yes_behaviour_one').closest('.control-group').hide();
+		jQuery('.note_yes_behaviour_two').closest('.control-group').hide();
+	}
+}
+
+// the vvvvwbw Some function
+function target_vvvvwbw_SomeFunc(target_vvvvwbw)
+{
+	// set the function logic
+	if (target_vvvvwbw == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwbw Some function
+function how_vvvvwbw_SomeFunc(how_vvvvwbw)
+{
+	// set the function logic
+	if (how_vvvvwbw == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwbx function
+function vvvvwbx(how_vvvvwbx,target_vvvvwbx)
+{
+	if (isSet(how_vvvvwbx) && how_vvvvwbx.constructor !== Array)
+	{
+		var temp_vvvvwbx = how_vvvvwbx;
+		var how_vvvvwbx = [];
+		how_vvvvwbx.push(temp_vvvvwbx);
+	}
+	else if (!isSet(how_vvvvwbx))
+	{
+		var how_vvvvwbx = [];
+	}
+	var how = how_vvvvwbx.some(how_vvvvwbx_SomeFunc);
+
+	if (isSet(target_vvvvwbx) && target_vvvvwbx.constructor !== Array)
+	{
+		var temp_vvvvwbx = target_vvvvwbx;
+		var target_vvvvwbx = [];
+		target_vvvvwbx.push(temp_vvvvwbx);
+	}
+	else if (!isSet(target_vvvvwbx))
+	{
+		var target_vvvvwbx = [];
+	}
+	var target = target_vvvvwbx.some(target_vvvvwbx_SomeFunc);
+
+
+	// set this function logic
+	if (how && target)
 	{
 		jQuery('.note_build_in_behaviour_one').closest('.control-group').show();
 		jQuery('.note_build_in_behaviour_three').closest('.control-group').show();
@@ -323,49 +629,191 @@ function vvvvwbr(how_vvvvwbr)
 	}
 }
 
-// the vvvvwbr Some function
-function how_vvvvwbr_SomeFunc(how_vvvvwbr)
+// the vvvvwbx Some function
+function how_vvvvwbx_SomeFunc(how_vvvvwbx)
 {
 	// set the function logic
-	if (how_vvvvwbr == 4)
+	if (how_vvvvwbx == 4)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbs function
-function vvvvwbs(type_vvvvwbs)
+// the vvvvwbx Some function
+function target_vvvvwbx_SomeFunc(target_vvvvwbx)
 {
 	// set the function logic
-	if (type_vvvvwbs == 2)
+	if (target_vvvvwbx == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwby function
+function vvvvwby(target_vvvvwby,how_vvvvwby)
+{
+	if (isSet(target_vvvvwby) && target_vvvvwby.constructor !== Array)
+	{
+		var temp_vvvvwby = target_vvvvwby;
+		var target_vvvvwby = [];
+		target_vvvvwby.push(temp_vvvvwby);
+	}
+	else if (!isSet(target_vvvvwby))
+	{
+		var target_vvvvwby = [];
+	}
+	var target = target_vvvvwby.some(target_vvvvwby_SomeFunc);
+
+	if (isSet(how_vvvvwby) && how_vvvvwby.constructor !== Array)
+	{
+		var temp_vvvvwby = how_vvvvwby;
+		var how_vvvvwby = [];
+		how_vvvvwby.push(temp_vvvvwby);
+	}
+	else if (!isSet(how_vvvvwby))
+	{
+		var how_vvvvwby = [];
+	}
+	var how = how_vvvvwby.some(how_vvvvwby_SomeFunc);
+
+
+	// set this function logic
+	if (target && how)
+	{
+		jQuery('.note_build_in_behaviour_one').closest('.control-group').show();
+		jQuery('.note_build_in_behaviour_three').closest('.control-group').show();
+		jQuery('.note_build_in_behaviour_two').closest('.control-group').show();
+	}
+	else
+	{
+		jQuery('.note_build_in_behaviour_one').closest('.control-group').hide();
+		jQuery('.note_build_in_behaviour_three').closest('.control-group').hide();
+		jQuery('.note_build_in_behaviour_two').closest('.control-group').hide();
+	}
+}
+
+// the vvvvwby Some function
+function target_vvvvwby_SomeFunc(target_vvvvwby)
+{
+	// set the function logic
+	if (target_vvvvwby == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwby Some function
+function how_vvvvwby_SomeFunc(how_vvvvwby)
+{
+	// set the function logic
+	if (how_vvvvwby == 4)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwbz function
+function vvvvwbz(target_vvvvwbz,type_vvvvwbz)
+{
+	// set the function logic
+	if (target_vvvvwbz == 1 && type_vvvvwbz == 2)
 	{
 		jQuery('#jform_libraries').closest('.control-group').show();
 		// add required attribute to libraries field
-		if (jform_vvvvwbsvxk_required)
+		if (jform_vvvvwbzvxk_required)
 		{
 			updateFieldRequired('libraries',0);
 			jQuery('#jform_libraries').prop('required','required');
 			jQuery('#jform_libraries').attr('aria-required',true);
 			jQuery('#jform_libraries').addClass('required');
-			jform_vvvvwbsvxk_required = false;
+			jform_vvvvwbzvxk_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_libraries').closest('.control-group').hide();
 		// remove required attribute from libraries field
-		if (!jform_vvvvwbsvxk_required)
+		if (!jform_vvvvwbzvxk_required)
 		{
 			updateFieldRequired('libraries',1);
 			jQuery('#jform_libraries').removeAttr('required');
 			jQuery('#jform_libraries').removeAttr('aria-required');
 			jQuery('#jform_libraries').removeClass('required');
-			jform_vvvvwbsvxk_required = true;
+			jform_vvvvwbzvxk_required = true;
 		}
 	}
 }
 
+// the vvvvwcb function
+function vvvvwcb(target_vvvvwcb)
+{
+	// set the function logic
+	if (target_vvvvwcb == 1)
+	{
+		jQuery('#jform_how').closest('.control-group').show();
+		// add required attribute to how field
+		if (jform_vvvvwcbvxl_required)
+		{
+			updateFieldRequired('how',0);
+			jQuery('#jform_how').prop('required','required');
+			jQuery('#jform_how').attr('aria-required',true);
+			jQuery('#jform_how').addClass('required');
+			jform_vvvvwcbvxl_required = false;
+		}
+		jQuery('#jform_type').closest('.control-group').show();
+		// add required attribute to type field
+		if (jform_vvvvwcbvxm_required)
+		{
+			updateFieldRequired('type',0);
+			jQuery('#jform_type').prop('required','required');
+			jQuery('#jform_type').attr('aria-required',true);
+			jQuery('#jform_type').addClass('required');
+			jform_vvvvwcbvxm_required = false;
+		}
+	}
+	else
+	{
+		jQuery('#jform_how').closest('.control-group').hide();
+		// remove required attribute from how field
+		if (!jform_vvvvwcbvxl_required)
+		{
+			updateFieldRequired('how',1);
+			jQuery('#jform_how').removeAttr('required');
+			jQuery('#jform_how').removeAttr('aria-required');
+			jQuery('#jform_how').removeClass('required');
+			jform_vvvvwcbvxl_required = true;
+		}
+		jQuery('#jform_type').closest('.control-group').hide();
+		// remove required attribute from type field
+		if (!jform_vvvvwcbvxm_required)
+		{
+			updateFieldRequired('type',1);
+			jQuery('#jform_type').removeAttr('required');
+			jQuery('#jform_type').removeAttr('aria-required');
+			jQuery('#jform_type').removeClass('required');
+			jform_vvvvwcbvxm_required = true;
+		}
+	}
+}
+
+// the vvvvwcc function
+function vvvvwcc(target_vvvvwcc)
+{
+	// set the function logic
+	if (target_vvvvwcc == 2)
+	{
+		jQuery('.note_yes_behaviour_library').closest('.control-group').show();
+	}
+	else
+	{
+		jQuery('.note_yes_behaviour_library').closest('.control-group').hide();
+	}
+}
+
 // update required fields
 function updateFieldRequired(name,status)
 {

admin/models/forms/library.xml

@@ -101,22 +101,21 @@
 			message="COM_COMPONENTBUILDER_LIBRARY_NAME_MESSAGE"
 			hint="COM_COMPONENTBUILDER_LIBRARY_NAME_HINT"
 		/>
-		<!-- Description Field. Type: Text. (joomla) -->
+		<!-- Target Field. Type: Radio. (joomla) -->
 		<field
-			type="text"
-			name="description"
-			label="COM_COMPONENTBUILDER_LIBRARY_DESCRIPTION_LABEL"
-			size="80"
-			maxlength="150"
-			description="COM_COMPONENTBUILDER_LIBRARY_DESCRIPTION_DESCRIPTION"
-			class="text_area"
-			readonly="false"
-			disabled="false"
-			required="false"
-			filter="STRING"
-			message="COM_COMPONENTBUILDER_LIBRARY_DESCRIPTION_MESSAGE"
-			hint="COM_COMPONENTBUILDER_LIBRARY_DESCRIPTION_HINT"
-		/>
+			type="radio"
+			name="target"
+			label="COM_COMPONENTBUILDER_LIBRARY_TARGET_LABEL"
+			description="COM_COMPONENTBUILDER_LIBRARY_TARGET_DESCRIPTION"
+			class="btn-group btn-group-yesno"
+			default="1"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_LIBRARY_MEDIA</option>
+			<option value="2">
+				COM_COMPONENTBUILDER_LIBRARY_LIBRARIES</option>
+		</field>
 		<!-- How Field. Type: Filebehaviour. (custom) -->
 		<field
 			type="filebehaviour"
@@ -144,40 +143,40 @@
 			<option value="2">
 				COM_COMPONENTBUILDER_LIBRARY_BUNDLE</option>
 		</field>
-		<!-- Note_build_in_behaviour_two Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_build_in_behaviour_two" label="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_TWO_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_TWO_DESCRIPTION" heading="h4" class="alert alert-success note_build_in_behaviour_two" />
+		<!-- Description Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="description"
+			label="COM_COMPONENTBUILDER_LIBRARY_DESCRIPTION_LABEL"
+			size="80"
+			maxlength="150"
+			description="COM_COMPONENTBUILDER_LIBRARY_DESCRIPTION_DESCRIPTION"
+			class="text_area"
+			readonly="false"
+			disabled="false"
+			required="false"
+			filter="STRING"
+			message="COM_COMPONENTBUILDER_LIBRARY_DESCRIPTION_MESSAGE"
+			hint="COM_COMPONENTBUILDER_LIBRARY_DESCRIPTION_HINT"
+		/>
 		<!-- Note_no_behaviour_two Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_no_behaviour_two" label="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_TWO_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_TWO_DESCRIPTION" heading="h4" class="alert alert-error note_no_behaviour_two" />
-		<!-- Note_yes_behaviour_two Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_yes_behaviour_two" label="COM_COMPONENTBUILDER_LIBRARY_NOTE_YES_BEHAVIOUR_TWO_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_NOTE_YES_BEHAVIOUR_TWO_DESCRIPTION" heading="h4" class="alert alert-success note_yes_behaviour_two" />
-		<!-- Note_build_in_behaviour_three Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_build_in_behaviour_three" label="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_THREE_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_THREE_DESCRIPTION" heading="h4" class="alert alert-success note_build_in_behaviour_three" />
 		<!-- Note_display_library_files_folders_urls Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_display_library_files_folders_urls" description="COM_COMPONENTBUILDER_LIBRARY_NOTE_DISPLAY_LIBRARY_FILES_FOLDERS_URLS_DESCRIPTION" class="note_display_library_files_folders_urls" />
+		<!-- Note_build_in_behaviour_three Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_build_in_behaviour_three" label="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_THREE_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_THREE_DESCRIPTION" heading="h4" class="alert alert-success note_build_in_behaviour_three" />
+		<!-- Note_no_behaviour_three Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_no_behaviour_three" label="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_THREE_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_THREE_DESCRIPTION" heading="h4" class="alert alert-error note_no_behaviour_three" />
 		<!-- Not_required Field. Type: Hidden. (joomla) -->
 		<field
 			type="hidden"
 			name="not_required"
 			default="[]"
 		/>
-		<!-- Note_no_behaviour_three Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_no_behaviour_three" label="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_THREE_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_THREE_DESCRIPTION" heading="h4" class="alert alert-error note_no_behaviour_three" />
+		<!-- Note_yes_behaviour_one Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_yes_behaviour_one" label="COM_COMPONENTBUILDER_LIBRARY_NOTE_YES_BEHAVIOUR_ONE_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_NOTE_YES_BEHAVIOUR_ONE_DESCRIPTION" heading="h4" class="alert alert-success note_yes_behaviour_one" />
 		<!-- Note_display_library_config Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_display_library_config" description="COM_COMPONENTBUILDER_LIBRARY_NOTE_DISPLAY_LIBRARY_CONFIG_DESCRIPTION" class="note_display_library_config" />
-		<!-- Libraries Field. Type: Librariesx. (custom) -->
-		<field
-			type="librariesx"
-			name="libraries"
-			label="COM_COMPONENTBUILDER_LIBRARY_LIBRARIES_LABEL"
-			description="COM_COMPONENTBUILDER_LIBRARY_LIBRARIES_DESCRIPTION"
-			class="list_class"
-			multiple="true"
-			default="0"
-			required="false"
-			button="true"
-		/>
-		<!-- Note_no_behaviour_one Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_no_behaviour_one" label="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_ONE_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_ONE_DESCRIPTION" heading="h4" class="alert alert-error note_no_behaviour_one" />
 		<!-- Php_setdocument Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
@@ -309,10 +308,28 @@
 				/>
 			</form>
 		</field>
+		<!-- Note_yes_behaviour_library Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_yes_behaviour_library" label="COM_COMPONENTBUILDER_LIBRARY_NOTE_YES_BEHAVIOUR_LIBRARY_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_NOTE_YES_BEHAVIOUR_LIBRARY_DESCRIPTION" heading="h4" class="alert alert-success note_yes_behaviour_library" />
 		<!-- Note_build_in_behaviour_one Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_build_in_behaviour_one" label="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_ONE_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_ONE_DESCRIPTION" heading="h4" class="alert alert-success note_build_in_behaviour_one" />
-		<!-- Note_yes_behaviour_one Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_yes_behaviour_one" label="COM_COMPONENTBUILDER_LIBRARY_NOTE_YES_BEHAVIOUR_ONE_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_NOTE_YES_BEHAVIOUR_ONE_DESCRIPTION" heading="h4" class="alert alert-success note_yes_behaviour_one" />
+		<!-- Note_yes_behaviour_two Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_yes_behaviour_two" label="COM_COMPONENTBUILDER_LIBRARY_NOTE_YES_BEHAVIOUR_TWO_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_NOTE_YES_BEHAVIOUR_TWO_DESCRIPTION" heading="h4" class="alert alert-success note_yes_behaviour_two" />
+		<!-- Libraries Field. Type: Librariesx. (custom) -->
+		<field
+			type="librariesx"
+			name="libraries"
+			label="COM_COMPONENTBUILDER_LIBRARY_LIBRARIES_LABEL"
+			description="COM_COMPONENTBUILDER_LIBRARY_LIBRARIES_DESCRIPTION"
+			class="list_class"
+			multiple="true"
+			default="0"
+			required="false"
+			button="true"
+		/>
+		<!-- Note_build_in_behaviour_two Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_build_in_behaviour_two" label="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_TWO_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_TWO_DESCRIPTION" heading="h4" class="alert alert-success note_build_in_behaviour_two" />
+		<!-- Note_no_behaviour_one Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_no_behaviour_one" label="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_ONE_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_ONE_DESCRIPTION" heading="h4" class="alert alert-error note_no_behaviour_one" />
 		<!-- Note_linked_to_notice Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_linked_to_notice" label="COM_COMPONENTBUILDER_LIBRARY_NOTE_LINKED_TO_NOTICE_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_NOTE_LINKED_TO_NOTICE_DESCRIPTION" heading="h4" class="note_linked_to_notice" />
 		<!-- Note_library_instruction Field. Type: Note. A None Database Field. (joomla) -->

admin/models/forms/library_config.xml

@@ -116,7 +116,6 @@
 					description="COM_COMPONENTBUILDER_LIBRARY_CONFIG_FIELD_DESCRIPTION"
 					class="list_class fieldFull"
 					multiple="false"
-					default=""
 					required="true"
 					button="false"
 				/>

admin/models/forms/placeholder.js

@@ -110,7 +110,7 @@ function placedin(placeholder, ide) {
 function placedin_server(placeholder, ide, target){
 	var getUrl = "index.php?option=com_componentbuilder&task=ajax.placedin&format=json";
 	if(token.length > 0){
-		var request = 'token='+token+'&placeholder='+placeholder+'&id='+ide+'&target='+target+'&raw=true&return_here='+return_here;
+		var request = token+'=1&placeholder='+placeholder+'&id='+ide+'&target='+target+'&raw=true&return_here='+return_here;
 	}
 	return jQuery.ajax({
 		type: 'GET',

admin/models/forms/server.js

@@ -9,56 +9,56 @@
  */
 
 // Some Global Values
-jform_vvvvwcpvxx_required = false;
-jform_vvvvwcpvxy_required = false;
-jform_vvvvwcpvxz_required = false;
-jform_vvvvwcpvya_required = false;
-jform_vvvvwcpvyb_required = false;
-jform_vvvvwcqvyc_required = false;
-jform_vvvvwcrvyd_required = false;
-jform_vvvvwctvye_required = false;
-jform_vvvvwcvvyf_required = false;
+jform_vvvvwdevyj_required = false;
+jform_vvvvwdevyk_required = false;
+jform_vvvvwdevyl_required = false;
+jform_vvvvwdevym_required = false;
+jform_vvvvwdevyn_required = false;
+jform_vvvvwdfvyo_required = false;
+jform_vvvvwdgvyp_required = false;
+jform_vvvvwdivyq_required = false;
+jform_vvvvwdkvyr_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var protocol_vvvvwcp = jQuery("#jform_protocol").val();
-	vvvvwcp(protocol_vvvvwcp);
+	var protocol_vvvvwde = jQuery("#jform_protocol").val();
+	vvvvwde(protocol_vvvvwde);
 
-	var protocol_vvvvwcq = jQuery("#jform_protocol").val();
-	vvvvwcq(protocol_vvvvwcq);
+	var protocol_vvvvwdf = jQuery("#jform_protocol").val();
+	vvvvwdf(protocol_vvvvwdf);
 
-	var protocol_vvvvwcr = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcr = jQuery("#jform_authentication").val();
-	vvvvwcr(protocol_vvvvwcr,authentication_vvvvwcr);
+	var protocol_vvvvwdg = jQuery("#jform_protocol").val();
+	var authentication_vvvvwdg = jQuery("#jform_authentication").val();
+	vvvvwdg(protocol_vvvvwdg,authentication_vvvvwdg);
 
-	var protocol_vvvvwct = jQuery("#jform_protocol").val();
-	var authentication_vvvvwct = jQuery("#jform_authentication").val();
-	vvvvwct(protocol_vvvvwct,authentication_vvvvwct);
+	var protocol_vvvvwdi = jQuery("#jform_protocol").val();
+	var authentication_vvvvwdi = jQuery("#jform_authentication").val();
+	vvvvwdi(protocol_vvvvwdi,authentication_vvvvwdi);
 
-	var protocol_vvvvwcv = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcv = jQuery("#jform_authentication").val();
-	vvvvwcv(protocol_vvvvwcv,authentication_vvvvwcv);
+	var protocol_vvvvwdk = jQuery("#jform_protocol").val();
+	var authentication_vvvvwdk = jQuery("#jform_authentication").val();
+	vvvvwdk(protocol_vvvvwdk,authentication_vvvvwdk);
 
-	var protocol_vvvvwcx = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcx = jQuery("#jform_authentication").val();
-	vvvvwcx(protocol_vvvvwcx,authentication_vvvvwcx);
+	var protocol_vvvvwdm = jQuery("#jform_protocol").val();
+	var authentication_vvvvwdm = jQuery("#jform_authentication").val();
+	vvvvwdm(protocol_vvvvwdm,authentication_vvvvwdm);
 });
 
-// the vvvvwcp function
-function vvvvwcp(protocol_vvvvwcp)
+// the vvvvwde function
+function vvvvwde(protocol_vvvvwde)
 {
-	if (isSet(protocol_vvvvwcp) && protocol_vvvvwcp.constructor !== Array)
+	if (isSet(protocol_vvvvwde) && protocol_vvvvwde.constructor !== Array)
 	{
-		var temp_vvvvwcp = protocol_vvvvwcp;
-		var protocol_vvvvwcp = [];
-		protocol_vvvvwcp.push(temp_vvvvwcp);
+		var temp_vvvvwde = protocol_vvvvwde;
+		var protocol_vvvvwde = [];
+		protocol_vvvvwde.push(temp_vvvvwde);
 	}
-	else if (!isSet(protocol_vvvvwcp))
+	else if (!isSet(protocol_vvvvwde))
 	{
-		var protocol_vvvvwcp = [];
+		var protocol_vvvvwde = [];
 	}
-	var protocol = protocol_vvvvwcp.some(protocol_vvvvwcp_SomeFunc);
+	var protocol = protocol_vvvvwde.some(protocol_vvvvwde_SomeFunc);
 
 
 	// set this function logic
@@ -66,137 +66,137 @@ function vvvvwcp(protocol_vvvvwcp)
 	{
 		jQuery('#jform_authentication').closest('.control-group').show();
 		// add required attribute to authentication field
-		if (jform_vvvvwcpvxx_required)
+		if (jform_vvvvwdevyj_required)
 		{
 			updateFieldRequired('authentication',0);
 			jQuery('#jform_authentication').prop('required','required');
 			jQuery('#jform_authentication').attr('aria-required',true);
 			jQuery('#jform_authentication').addClass('required');
-			jform_vvvvwcpvxx_required = false;
+			jform_vvvvwdevyj_required = false;
 		}
 		jQuery('#jform_host').closest('.control-group').show();
 		// add required attribute to host field
-		if (jform_vvvvwcpvxy_required)
+		if (jform_vvvvwdevyk_required)
 		{
 			updateFieldRequired('host',0);
 			jQuery('#jform_host').prop('required','required');
 			jQuery('#jform_host').attr('aria-required',true);
 			jQuery('#jform_host').addClass('required');
-			jform_vvvvwcpvxy_required = false;
+			jform_vvvvwdevyk_required = false;
 		}
 		jQuery('#jform_port').closest('.control-group').show();
 		// add required attribute to port field
-		if (jform_vvvvwcpvxz_required)
+		if (jform_vvvvwdevyl_required)
 		{
 			updateFieldRequired('port',0);
 			jQuery('#jform_port').prop('required','required');
 			jQuery('#jform_port').attr('aria-required',true);
 			jQuery('#jform_port').addClass('required');
-			jform_vvvvwcpvxz_required = false;
+			jform_vvvvwdevyl_required = false;
 		}
 		jQuery('#jform_path').closest('.control-group').show();
 		// add required attribute to path field
-		if (jform_vvvvwcpvya_required)
+		if (jform_vvvvwdevym_required)
 		{
 			updateFieldRequired('path',0);
 			jQuery('#jform_path').prop('required','required');
 			jQuery('#jform_path').attr('aria-required',true);
 			jQuery('#jform_path').addClass('required');
-			jform_vvvvwcpvya_required = false;
+			jform_vvvvwdevym_required = false;
 		}
 		jQuery('.note_ssh_security').closest('.control-group').show();
 		jQuery('#jform_username').closest('.control-group').show();
 		// add required attribute to username field
-		if (jform_vvvvwcpvyb_required)
+		if (jform_vvvvwdevyn_required)
 		{
 			updateFieldRequired('username',0);
 			jQuery('#jform_username').prop('required','required');
 			jQuery('#jform_username').attr('aria-required',true);
 			jQuery('#jform_username').addClass('required');
-			jform_vvvvwcpvyb_required = false;
+			jform_vvvvwdevyn_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_authentication').closest('.control-group').hide();
 		// remove required attribute from authentication field
-		if (!jform_vvvvwcpvxx_required)
+		if (!jform_vvvvwdevyj_required)
 		{
 			updateFieldRequired('authentication',1);
 			jQuery('#jform_authentication').removeAttr('required');
 			jQuery('#jform_authentication').removeAttr('aria-required');
 			jQuery('#jform_authentication').removeClass('required');
-			jform_vvvvwcpvxx_required = true;
+			jform_vvvvwdevyj_required = true;
 		}
 		jQuery('#jform_host').closest('.control-group').hide();
 		// remove required attribute from host field
-		if (!jform_vvvvwcpvxy_required)
+		if (!jform_vvvvwdevyk_required)
 		{
 			updateFieldRequired('host',1);
 			jQuery('#jform_host').removeAttr('required');
 			jQuery('#jform_host').removeAttr('aria-required');
 			jQuery('#jform_host').removeClass('required');
-			jform_vvvvwcpvxy_required = true;
+			jform_vvvvwdevyk_required = true;
 		}
 		jQuery('#jform_port').closest('.control-group').hide();
 		// remove required attribute from port field
-		if (!jform_vvvvwcpvxz_required)
+		if (!jform_vvvvwdevyl_required)
 		{
 			updateFieldRequired('port',1);
 			jQuery('#jform_port').removeAttr('required');
 			jQuery('#jform_port').removeAttr('aria-required');
 			jQuery('#jform_port').removeClass('required');
-			jform_vvvvwcpvxz_required = true;
+			jform_vvvvwdevyl_required = true;
 		}
 		jQuery('#jform_path').closest('.control-group').hide();
 		// remove required attribute from path field
-		if (!jform_vvvvwcpvya_required)
+		if (!jform_vvvvwdevym_required)
 		{
 			updateFieldRequired('path',1);
 			jQuery('#jform_path').removeAttr('required');
 			jQuery('#jform_path').removeAttr('aria-required');
 			jQuery('#jform_path').removeClass('required');
-			jform_vvvvwcpvya_required = true;
+			jform_vvvvwdevym_required = true;
 		}
 		jQuery('.note_ssh_security').closest('.control-group').hide();
 		jQuery('#jform_username').closest('.control-group').hide();
 		// remove required attribute from username field
-		if (!jform_vvvvwcpvyb_required)
+		if (!jform_vvvvwdevyn_required)
 		{
 			updateFieldRequired('username',1);
 			jQuery('#jform_username').removeAttr('required');
 			jQuery('#jform_username').removeAttr('aria-required');
 			jQuery('#jform_username').removeClass('required');
-			jform_vvvvwcpvyb_required = true;
+			jform_vvvvwdevyn_required = true;
 		}
 	}
 }
 
-// the vvvvwcp Some function
-function protocol_vvvvwcp_SomeFunc(protocol_vvvvwcp)
+// the vvvvwde Some function
+function protocol_vvvvwde_SomeFunc(protocol_vvvvwde)
 {
 	// set the function logic
-	if (protocol_vvvvwcp == 2)
+	if (protocol_vvvvwde == 2)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwcq function
-function vvvvwcq(protocol_vvvvwcq)
+// the vvvvwdf function
+function vvvvwdf(protocol_vvvvwdf)
 {
-	if (isSet(protocol_vvvvwcq) && protocol_vvvvwcq.constructor !== Array)
+	if (isSet(protocol_vvvvwdf) && protocol_vvvvwdf.constructor !== Array)
 	{
-		var temp_vvvvwcq = protocol_vvvvwcq;
-		var protocol_vvvvwcq = [];
-		protocol_vvvvwcq.push(temp_vvvvwcq);
+		var temp_vvvvwdf = protocol_vvvvwdf;
+		var protocol_vvvvwdf = [];
+		protocol_vvvvwdf.push(temp_vvvvwdf);
 	}
-	else if (!isSet(protocol_vvvvwcq))
+	else if (!isSet(protocol_vvvvwdf))
 	{
-		var protocol_vvvvwcq = [];
+		var protocol_vvvvwdf = [];
 	}
-	var protocol = protocol_vvvvwcq.some(protocol_vvvvwcq_SomeFunc);
+	var protocol = protocol_vvvvwdf.some(protocol_vvvvwdf_SomeFunc);
 
 
 	// set this function logic
@@ -205,13 +205,13 @@ function vvvvwcq(protocol_vvvvwcq)
 		jQuery('.note_ftp_signature').closest('.control-group').show();
 		jQuery('#jform_signature').closest('.control-group').show();
 		// add required attribute to signature field
-		if (jform_vvvvwcqvyc_required)
+		if (jform_vvvvwdfvyo_required)
 		{
 			updateFieldRequired('signature',0);
 			jQuery('#jform_signature').prop('required','required');
 			jQuery('#jform_signature').attr('aria-required',true);
 			jQuery('#jform_signature').addClass('required');
-			jform_vvvvwcqvyc_required = false;
+			jform_vvvvwdfvyo_required = false;
 		}
 	}
 	else
@@ -219,54 +219,54 @@ function vvvvwcq(protocol_vvvvwcq)
 		jQuery('.note_ftp_signature').closest('.control-group').hide();
 		jQuery('#jform_signature').closest('.control-group').hide();
 		// remove required attribute from signature field
-		if (!jform_vvvvwcqvyc_required)
+		if (!jform_vvvvwdfvyo_required)
 		{
 			updateFieldRequired('signature',1);
 			jQuery('#jform_signature').removeAttr('required');
 			jQuery('#jform_signature').removeAttr('aria-required');
 			jQuery('#jform_signature').removeClass('required');
-			jform_vvvvwcqvyc_required = true;
+			jform_vvvvwdfvyo_required = true;
 		}
 	}
 }
 
-// the vvvvwcq Some function
-function protocol_vvvvwcq_SomeFunc(protocol_vvvvwcq)
+// the vvvvwdf Some function
+function protocol_vvvvwdf_SomeFunc(protocol_vvvvwdf)
 {
 	// set the function logic
-	if (protocol_vvvvwcq == 1)
+	if (protocol_vvvvwdf == 1)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwcr function
-function vvvvwcr(protocol_vvvvwcr,authentication_vvvvwcr)
+// the vvvvwdg function
+function vvvvwdg(protocol_vvvvwdg,authentication_vvvvwdg)
 {
-	if (isSet(protocol_vvvvwcr) && protocol_vvvvwcr.constructor !== Array)
+	if (isSet(protocol_vvvvwdg) && protocol_vvvvwdg.constructor !== Array)
 	{
-		var temp_vvvvwcr = protocol_vvvvwcr;
-		var protocol_vvvvwcr = [];
-		protocol_vvvvwcr.push(temp_vvvvwcr);
+		var temp_vvvvwdg = protocol_vvvvwdg;
+		var protocol_vvvvwdg = [];
+		protocol_vvvvwdg.push(temp_vvvvwdg);
 	}
-	else if (!isSet(protocol_vvvvwcr))
+	else if (!isSet(protocol_vvvvwdg))
 	{
-		var protocol_vvvvwcr = [];
+		var protocol_vvvvwdg = [];
 	}
-	var protocol = protocol_vvvvwcr.some(protocol_vvvvwcr_SomeFunc);
+	var protocol = protocol_vvvvwdg.some(protocol_vvvvwdg_SomeFunc);
 
-	if (isSet(authentication_vvvvwcr) && authentication_vvvvwcr.constructor !== Array)
+	if (isSet(authentication_vvvvwdg) && authentication_vvvvwdg.constructor !== Array)
 	{
-		var temp_vvvvwcr = authentication_vvvvwcr;
-		var authentication_vvvvwcr = [];
-		authentication_vvvvwcr.push(temp_vvvvwcr);
+		var temp_vvvvwdg = authentication_vvvvwdg;
+		var authentication_vvvvwdg = [];
+		authentication_vvvvwdg.push(temp_vvvvwdg);
 	}
-	else if (!isSet(authentication_vvvvwcr))
+	else if (!isSet(authentication_vvvvwdg))
 	{
-		var authentication_vvvvwcr = [];
+		var authentication_vvvvwdg = [];
 	}
-	var authentication = authentication_vvvvwcr.some(authentication_vvvvwcr_SomeFunc);
+	var authentication = authentication_vvvvwdg.some(authentication_vvvvwdg_SomeFunc);
 
 
 	// set this function logic
@@ -274,78 +274,78 @@ function vvvvwcr(protocol_vvvvwcr,authentication_vvvvwcr)
 	{
 		jQuery('#jform_password').closest('.control-group').show();
 		// add required attribute to password field
-		if (jform_vvvvwcrvyd_required)
+		if (jform_vvvvwdgvyp_required)
 		{
 			updateFieldRequired('password',0);
 			jQuery('#jform_password').prop('required','required');
 			jQuery('#jform_password').attr('aria-required',true);
 			jQuery('#jform_password').addClass('required');
-			jform_vvvvwcrvyd_required = false;
+			jform_vvvvwdgvyp_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_password').closest('.control-group').hide();
 		// remove required attribute from password field
-		if (!jform_vvvvwcrvyd_required)
+		if (!jform_vvvvwdgvyp_required)
 		{
 			updateFieldRequired('password',1);
 			jQuery('#jform_password').removeAttr('required');
 			jQuery('#jform_password').removeAttr('aria-required');
 			jQuery('#jform_password').removeClass('required');
-			jform_vvvvwcrvyd_required = true;
+			jform_vvvvwdgvyp_required = true;
 		}
 	}
 }
 
-// the vvvvwcr Some function
-function protocol_vvvvwcr_SomeFunc(protocol_vvvvwcr)
+// the vvvvwdg Some function
+function protocol_vvvvwdg_SomeFunc(protocol_vvvvwdg)
 {
 	// set the function logic
-	if (protocol_vvvvwcr == 2)
+	if (protocol_vvvvwdg == 2)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwcr Some function
-function authentication_vvvvwcr_SomeFunc(authentication_vvvvwcr)
+// the vvvvwdg Some function
+function authentication_vvvvwdg_SomeFunc(authentication_vvvvwdg)
 {
 	// set the function logic
-	if (authentication_vvvvwcr == 1 || authentication_vvvvwcr == 3 || authentication_vvvvwcr == 5)
+	if (authentication_vvvvwdg == 1 || authentication_vvvvwdg == 3 || authentication_vvvvwdg == 5)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwct function
-function vvvvwct(protocol_vvvvwct,authentication_vvvvwct)
+// the vvvvwdi function
+function vvvvwdi(protocol_vvvvwdi,authentication_vvvvwdi)
 {
-	if (isSet(protocol_vvvvwct) && protocol_vvvvwct.constructor !== Array)
+	if (isSet(protocol_vvvvwdi) && protocol_vvvvwdi.constructor !== Array)
 	{
-		var temp_vvvvwct = protocol_vvvvwct;
-		var protocol_vvvvwct = [];
-		protocol_vvvvwct.push(temp_vvvvwct);
+		var temp_vvvvwdi = protocol_vvvvwdi;
+		var protocol_vvvvwdi = [];
+		protocol_vvvvwdi.push(temp_vvvvwdi);
 	}
-	else if (!isSet(protocol_vvvvwct))
+	else if (!isSet(protocol_vvvvwdi))
 	{
-		var protocol_vvvvwct = [];
+		var protocol_vvvvwdi = [];
 	}
-	var protocol = protocol_vvvvwct.some(protocol_vvvvwct_SomeFunc);
+	var protocol = protocol_vvvvwdi.some(protocol_vvvvwdi_SomeFunc);
 
-	if (isSet(authentication_vvvvwct) && authentication_vvvvwct.constructor !== Array)
+	if (isSet(authentication_vvvvwdi) && authentication_vvvvwdi.constructor !== Array)
 	{
-		var temp_vvvvwct = authentication_vvvvwct;
-		var authentication_vvvvwct = [];
-		authentication_vvvvwct.push(temp_vvvvwct);
+		var temp_vvvvwdi = authentication_vvvvwdi;
+		var authentication_vvvvwdi = [];
+		authentication_vvvvwdi.push(temp_vvvvwdi);
 	}
-	else if (!isSet(authentication_vvvvwct))
+	else if (!isSet(authentication_vvvvwdi))
 	{
-		var authentication_vvvvwct = [];
+		var authentication_vvvvwdi = [];
 	}
-	var authentication = authentication_vvvvwct.some(authentication_vvvvwct_SomeFunc);
+	var authentication = authentication_vvvvwdi.some(authentication_vvvvwdi_SomeFunc);
 
 
 	// set this function logic
@@ -353,78 +353,78 @@ function vvvvwct(protocol_vvvvwct,authentication_vvvvwct)
 	{
 		jQuery('#jform_private').closest('.control-group').show();
 		// add required attribute to private field
-		if (jform_vvvvwctvye_required)
+		if (jform_vvvvwdivyq_required)
 		{
 			updateFieldRequired('private',0);
 			jQuery('#jform_private').prop('required','required');
 			jQuery('#jform_private').attr('aria-required',true);
 			jQuery('#jform_private').addClass('required');
-			jform_vvvvwctvye_required = false;
+			jform_vvvvwdivyq_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_private').closest('.control-group').hide();
 		// remove required attribute from private field
-		if (!jform_vvvvwctvye_required)
+		if (!jform_vvvvwdivyq_required)
 		{
 			updateFieldRequired('private',1);
 			jQuery('#jform_private').removeAttr('required');
 			jQuery('#jform_private').removeAttr('aria-required');
 			jQuery('#jform_private').removeClass('required');
-			jform_vvvvwctvye_required = true;
+			jform_vvvvwdivyq_required = true;
 		}
 	}
 }
 
-// the vvvvwct Some function
-function protocol_vvvvwct_SomeFunc(protocol_vvvvwct)
+// the vvvvwdi Some function
+function protocol_vvvvwdi_SomeFunc(protocol_vvvvwdi)
 {
 	// set the function logic
-	if (protocol_vvvvwct == 2)
+	if (protocol_vvvvwdi == 2)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwct Some function
-function authentication_vvvvwct_SomeFunc(authentication_vvvvwct)
+// the vvvvwdi Some function
+function authentication_vvvvwdi_SomeFunc(authentication_vvvvwdi)
 {
 	// set the function logic
-	if (authentication_vvvvwct == 2 || authentication_vvvvwct == 3)
+	if (authentication_vvvvwdi == 2 || authentication_vvvvwdi == 3)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwcv function
-function vvvvwcv(protocol_vvvvwcv,authentication_vvvvwcv)
+// the vvvvwdk function
+function vvvvwdk(protocol_vvvvwdk,authentication_vvvvwdk)
 {
-	if (isSet(protocol_vvvvwcv) && protocol_vvvvwcv.constructor !== Array)
+	if (isSet(protocol_vvvvwdk) && protocol_vvvvwdk.constructor !== Array)
 	{
-		var temp_vvvvwcv = protocol_vvvvwcv;
-		var protocol_vvvvwcv = [];
-		protocol_vvvvwcv.push(temp_vvvvwcv);
+		var temp_vvvvwdk = protocol_vvvvwdk;
+		var protocol_vvvvwdk = [];
+		protocol_vvvvwdk.push(temp_vvvvwdk);
 	}
-	else if (!isSet(protocol_vvvvwcv))
+	else if (!isSet(protocol_vvvvwdk))
 	{
-		var protocol_vvvvwcv = [];
+		var protocol_vvvvwdk = [];
 	}
-	var protocol = protocol_vvvvwcv.some(protocol_vvvvwcv_SomeFunc);
+	var protocol = protocol_vvvvwdk.some(protocol_vvvvwdk_SomeFunc);
 
-	if (isSet(authentication_vvvvwcv) && authentication_vvvvwcv.constructor !== Array)
+	if (isSet(authentication_vvvvwdk) && authentication_vvvvwdk.constructor !== Array)
 	{
-		var temp_vvvvwcv = authentication_vvvvwcv;
-		var authentication_vvvvwcv = [];
-		authentication_vvvvwcv.push(temp_vvvvwcv);
+		var temp_vvvvwdk = authentication_vvvvwdk;
+		var authentication_vvvvwdk = [];
+		authentication_vvvvwdk.push(temp_vvvvwdk);
 	}
-	else if (!isSet(authentication_vvvvwcv))
+	else if (!isSet(authentication_vvvvwdk))
 	{
-		var authentication_vvvvwcv = [];
+		var authentication_vvvvwdk = [];
 	}
-	var authentication = authentication_vvvvwcv.some(authentication_vvvvwcv_SomeFunc);
+	var authentication = authentication_vvvvwdk.some(authentication_vvvvwdk_SomeFunc);
 
 
 	// set this function logic
@@ -432,78 +432,78 @@ function vvvvwcv(protocol_vvvvwcv,authentication_vvvvwcv)
 	{
 		jQuery('#jform_private_key').closest('.control-group').show();
 		// add required attribute to private_key field
-		if (jform_vvvvwcvvyf_required)
+		if (jform_vvvvwdkvyr_required)
 		{
 			updateFieldRequired('private_key',0);
 			jQuery('#jform_private_key').prop('required','required');
 			jQuery('#jform_private_key').attr('aria-required',true);
 			jQuery('#jform_private_key').addClass('required');
-			jform_vvvvwcvvyf_required = false;
+			jform_vvvvwdkvyr_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_private_key').closest('.control-group').hide();
 		// remove required attribute from private_key field
-		if (!jform_vvvvwcvvyf_required)
+		if (!jform_vvvvwdkvyr_required)
 		{
 			updateFieldRequired('private_key',1);
 			jQuery('#jform_private_key').removeAttr('required');
 			jQuery('#jform_private_key').removeAttr('aria-required');
 			jQuery('#jform_private_key').removeClass('required');
-			jform_vvvvwcvvyf_required = true;
+			jform_vvvvwdkvyr_required = true;
 		}
 	}
 }
 
-// the vvvvwcv Some function
-function protocol_vvvvwcv_SomeFunc(protocol_vvvvwcv)
+// the vvvvwdk Some function
+function protocol_vvvvwdk_SomeFunc(protocol_vvvvwdk)
 {
 	// set the function logic
-	if (protocol_vvvvwcv == 2)
+	if (protocol_vvvvwdk == 2)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwcv Some function
-function authentication_vvvvwcv_SomeFunc(authentication_vvvvwcv)
+// the vvvvwdk Some function
+function authentication_vvvvwdk_SomeFunc(authentication_vvvvwdk)
 {
 	// set the function logic
-	if (authentication_vvvvwcv == 4 || authentication_vvvvwcv == 5)
+	if (authentication_vvvvwdk == 4 || authentication_vvvvwdk == 5)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwcx function
-function vvvvwcx(protocol_vvvvwcx,authentication_vvvvwcx)
+// the vvvvwdm function
+function vvvvwdm(protocol_vvvvwdm,authentication_vvvvwdm)
 {
-	if (isSet(protocol_vvvvwcx) && protocol_vvvvwcx.constructor !== Array)
+	if (isSet(protocol_vvvvwdm) && protocol_vvvvwdm.constructor !== Array)
 	{
-		var temp_vvvvwcx = protocol_vvvvwcx;
-		var protocol_vvvvwcx = [];
-		protocol_vvvvwcx.push(temp_vvvvwcx);
+		var temp_vvvvwdm = protocol_vvvvwdm;
+		var protocol_vvvvwdm = [];
+		protocol_vvvvwdm.push(temp_vvvvwdm);
 	}
-	else if (!isSet(protocol_vvvvwcx))
+	else if (!isSet(protocol_vvvvwdm))
 	{
-		var protocol_vvvvwcx = [];
+		var protocol_vvvvwdm = [];
 	}
-	var protocol = protocol_vvvvwcx.some(protocol_vvvvwcx_SomeFunc);
+	var protocol = protocol_vvvvwdm.some(protocol_vvvvwdm_SomeFunc);
 
-	if (isSet(authentication_vvvvwcx) && authentication_vvvvwcx.constructor !== Array)
+	if (isSet(authentication_vvvvwdm) && authentication_vvvvwdm.constructor !== Array)
 	{
-		var temp_vvvvwcx = authentication_vvvvwcx;
-		var authentication_vvvvwcx = [];
-		authentication_vvvvwcx.push(temp_vvvvwcx);
+		var temp_vvvvwdm = authentication_vvvvwdm;
+		var authentication_vvvvwdm = [];
+		authentication_vvvvwdm.push(temp_vvvvwdm);
 	}
-	else if (!isSet(authentication_vvvvwcx))
+	else if (!isSet(authentication_vvvvwdm))
 	{
-		var authentication_vvvvwcx = [];
+		var authentication_vvvvwdm = [];
 	}
-	var authentication = authentication_vvvvwcx.some(authentication_vvvvwcx_SomeFunc);
+	var authentication = authentication_vvvvwdm.some(authentication_vvvvwdm_SomeFunc);
 
 
 	// set this function logic
@@ -517,22 +517,22 @@ function vvvvwcx(protocol_vvvvwcx,authentication_vvvvwcx)
 	}
 }
 
-// the vvvvwcx Some function
-function protocol_vvvvwcx_SomeFunc(protocol_vvvvwcx)
+// the vvvvwdm Some function
+function protocol_vvvvwdm_SomeFunc(protocol_vvvvwdm)
 {
 	// set the function logic
-	if (protocol_vvvvwcx == 2)
+	if (protocol_vvvvwdm == 2)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwcx Some function
-function authentication_vvvvwcx_SomeFunc(authentication_vvvvwcx)
+// the vvvvwdm Some function
+function authentication_vvvvwdm_SomeFunc(authentication_vvvvwdm)
 {
 	// set the function logic
-	if (authentication_vvvvwcx == 2 || authentication_vvvvwcx == 3 || authentication_vvvvwcx == 4 || authentication_vvvvwcx == 5)
+	if (authentication_vvvvwdm == 2 || authentication_vvvvwdm == 3 || authentication_vvvvwdm == 4 || authentication_vvvvwdm == 5)
 	{
 		return true;
 	}

admin/models/help_document.php

@@ -144,8 +144,23 @@ class ComponentbuilderModelHelp_document extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
+		// // check if xpath was set in options
+		$xpath = false;
+		if (isset($options['xpath']))
+		{
+			$xpath = $options['xpath'];
+			unset($options['xpath']);
+		}
+		// // check if clear form was set in options
+		$clear = false;
+		if (isset($options['clear']))
+		{
+			$clear = $options['clear'];
+			unset($options['clear']);
+		}
+
 		// Get the form.
-		$form = $this->loadForm('com_componentbuilder.help_document', 'help_document', $options);
+		$form = $this->loadForm('com_componentbuilder.help_document', 'help_document', $options, $clear, $xpath);
 
 		if (empty($form))
 		{
@@ -375,6 +390,8 @@ class ComponentbuilderModelHelp_document extends JModelAdmin
 		if (empty($data))
 		{
 			$data = $this->getItem();
+			// run the perprocess of the data
+			$this->preprocessData('com_componentbuilder.help_document', $data);
 		}
 
 		return $data;

admin/models/help_documents.php

@@ -102,12 +102,18 @@ class ComponentbuilderModelHelp_documents extends JModelList
 		// load parent items
 		$items = parent::getItems();
 
-		// set values to display correctly.
+		// Set values to display correctly.
 		if (ComponentbuilderHelper::checkArray($items))
 		{
+			// Get the user object if not set.
+			if (!isset($user) || !ComponentbuilderHelper::checkObject($user))
+			{
+				$user = JFactory::getUser();
+			}
 			foreach ($items as $nr => &$item)
 			{
-				$access = (JFactory::getUser()->authorise('help_document.access', 'com_componentbuilder.help_document.' . (int) $item->id) && JFactory::getUser()->authorise('help_document.access', 'com_componentbuilder'));
+				// Remove items the user can't access.
+				$access = ($user->authorise('help_document.access', 'com_componentbuilder.help_document.' . (int) $item->id) && $user->authorise('help_document.access', 'com_componentbuilder'));
 				if (!$access)
 				{
 					unset($items[$nr]);
@@ -118,21 +124,12 @@ class ComponentbuilderModelHelp_documents extends JModelList
 				$groupsArray = json_decode($item->groups, true);
 				if (ComponentbuilderHelper::checkArray($groupsArray))
 				{
-					$groupsNames = '';
-					$counter = 0;
+					$groupsNames = array();
 					foreach ($groupsArray as $groups)
 					{
-						if ($counter == 0)
-						{
-							$groupsNames .= ComponentbuilderHelper::getGroupName($groups);
-						}
-						else
-						{
-							$groupsNames .= ', '.ComponentbuilderHelper::getGroupName($groups);
-						}
-						$counter++;
+						$groupsNames[] = ComponentbuilderHelper::getGroupName($groups);
 					}
-					$item->groups = $groupsNames;
+					$item->groups =  implode(', ', $groupsNames);
 				}
 			}
 		}
@@ -271,17 +268,23 @@ class ComponentbuilderModelHelp_documents extends JModelList
 	/**
 	 * Method to get list export data.
 	 *
+	 * @param   array  $pks  The ids of the items to get
+	 * @param   JUser  $user  The user making the request
+	 *
 	 * @return mixed  An array of data items on success, false on failure.
 	 */
-	public function getExportData($pks)
+	public function getExportData($pks, $user = null)
 	{
 		// setup the query
 		if (ComponentbuilderHelper::checkArray($pks))
 		{
-			// Set a value to know this is exporting method.
+			// Set a value to know this is export method. (USE IN CUSTOM CODE TO ALTER OUTCOME)
 			$_export = true;
-			// Get the user object.
-			$user = JFactory::getUser();
+			// Get the user object if not set.
+			if (!isset($user) || !ComponentbuilderHelper::checkObject($user))
+			{
+				$user = JFactory::getUser();
+			}
 			// Create a new query object.
 			$db = JFactory::getDBO();
 			$query = $db->getQuery(true);
@@ -303,12 +306,13 @@ class ComponentbuilderModelHelp_documents extends JModelList
 			{
 				$items = $db->loadObjectList();
 
-				// set values to display correctly.
+				// Set values to display correctly.
 				if (ComponentbuilderHelper::checkArray($items))
 				{
 					foreach ($items as $nr => &$item)
 					{
-						$access = (JFactory::getUser()->authorise('help_document.access', 'com_componentbuilder.help_document.' . (int) $item->id) && JFactory::getUser()->authorise('help_document.access', 'com_componentbuilder'));
+						// Remove items the user can't access.
+						$access = ($user->authorise('help_document.access', 'com_componentbuilder.help_document.' . (int) $item->id) && $user->authorise('help_document.access', 'com_componentbuilder'));
 						if (!$access)
 						{
 							unset($items[$nr]);

admin/models/import_joomla_components.php

@@ -1045,7 +1045,6 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
 					$this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_FILE_BSB_WAS_SUCCESSFULLY_UNLOCKED', $file),  'success');
 				}
 			}
-			
 		}
 	}
 

admin/models/joomla_component.php

@@ -238,14 +238,51 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
+
 	/**
-	 * get VDM session key
+	 * get VDM internal session key
 	 *
 	 * @return  string  the session key
 	 *
 	 */
 	public function getVDM()
 	{
+		if (!isset($this->vastDevMod))
+		{
+			$_id = 0; // new item probably (since it was not set in the getItem method)
+
+			if (empty($_id))
+			{
+				$id = 0;
+			}
+			else
+			{
+				$id = $_id;
+			}
+			// set the id and view name to session
+			if ($vdm = ComponentbuilderHelper::get('joomla_component__'.$id))
+			{
+				$this->vastDevMod = $vdm;
+			}
+			else
+			{
+				// set the vast development method key
+				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				ComponentbuilderHelper::set($this->vastDevMod, 'joomla_component__'.$id);
+				ComponentbuilderHelper::set('joomla_component__'.$id, $this->vastDevMod);
+				// set a return value if found
+				$jinput = JFactory::getApplication()->input;
+				$return = $jinput->get('return', null, 'base64');
+				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				// set a GUID value if found
+				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+					&& method_exists('ComponentbuilderHelper', 'validGUID')
+					&& ComponentbuilderHelper::validGUID($item->guid))
+				{
+					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+				}
+			}
+		}
 		return $this->vastDevMod;
 	}
 
@@ -448,6 +485,13 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 				$jinput = JFactory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
 				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				// set a GUID value if found
+				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+					&& method_exists('ComponentbuilderHelper', 'validGUID')
+					&& ComponentbuilderHelper::validGUID($item->guid))
+				{
+					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+				}
 			}
 
 			// update the fields
@@ -506,8 +550,23 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
+		// // check if xpath was set in options
+		$xpath = false;
+		if (isset($options['xpath']))
+		{
+			$xpath = $options['xpath'];
+			unset($options['xpath']);
+		}
+		// // check if clear form was set in options
+		$clear = false;
+		if (isset($options['clear']))
+		{
+			$clear = $options['clear'];
+			unset($options['clear']);
+		}
+
 		// Get the form.
-		$form = $this->loadForm('com_componentbuilder.joomla_component', 'joomla_component', $options);
+		$form = $this->loadForm('com_componentbuilder.joomla_component', 'joomla_component', $options, $clear, $xpath);
 
 		if (empty($form))
 		{
@@ -767,6 +826,8 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 		if (empty($data))
 		{
 			$data = $this->getItem();
+			// run the perprocess of the data
+			$this->preprocessData('com_componentbuilder.joomla_component', $data);
 		}
 
 		return $data;
@@ -859,7 +920,7 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 				{
 					// load the model
 					$_Model = ComponentbuilderHelper::getModel($_updateTable);
-					// change publish state
+					// delete items
 					$_Model->delete($_pks);
 				}
 			}