Added GUID to selected views, and started updating JCB accordingly.

README.md

@@ -12,7 +12,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.9) 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.10) 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)
 
@@ -144,13 +144,13 @@ 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*: 23rd December, 2019
-+ *Version*: 2.10.9
++ *Last Build*: 3rd January, 2020
++ *Version*: 2.10.10
 + *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*: **277353**
-+ *Field count*: **1490**
-+ *File count*: **1752**
++ *Line count*: **278234**
++ *Field count*: **1503**
++ *File count*: **1755**
 + *Folder count*: **278**
 
 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](http://joomlacomponentbuilder.com).

admin/README.txt

@@ -12,7 +12,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.9) 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.10) 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)
 
@@ -144,13 +144,13 @@ 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*: 23rd December, 2019
-+ *Version*: 2.10.9
++ *Last Build*: 3rd January, 2020
++ *Version*: 2.10.10
 + *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*: **277353**
-+ *Field count*: **1490**
-+ *File count*: **1752**
++ *Line count*: **278234**
++ *Field count*: **1503**
++ *File count*: **1755**
 + *Folder count*: **278**
 
 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](http://joomlacomponentbuilder.com).

admin/assets/js/get_snippets.js

@@ -9,6 +9,7 @@
  */
 
 /* JS Document */
+
 // start the moment the document is ready
 jQuery(document).ready(function () {
 	// just get the available libraries
@@ -97,9 +98,9 @@ function buildLibraries(paths) {
 		var temp = {};
 		jQuery.each(paths.tree, function(key,value) {
 			if (value.path.match(".json$")) {
-				var libName = value.path.split(/ -(.+)/)[0];
-				libName = libName.trim()
-				temp[libName] = libName;
+				var libraryName = value.path.split(/ -(.+)/)[0];
+				libraryName = libraryName.trim()
+				temp[libraryName] = libraryName;
 			}
 		});
 		// load only this library paths
@@ -110,7 +111,7 @@ function buildLibraries(paths) {
 
 // set the libraries
 function setLibraries(names) {
-	// now load the lib buttons
+	// now load the library buttons
 	jQuery.each(names, function(value) {
 		setLibrary(value);
 	});
@@ -131,7 +132,7 @@ function setLibrary(name) {
 	html += '<h3 class="uk-panel-title">' + name + '</h3>';
 	html += '<hr />';
 	// set the data buttons
-	html += setLibButtons(name);
+	html += setLibraryButtons(name);
 	// close the box panel
 	html += '</div>';
 	html += '</div>';
@@ -139,7 +140,7 @@ function setLibrary(name) {
 	jQuery('#libraries-grid').append(html);
 }
 
-function setLibButtons(name) {
+function setLibraryButtons(name) {
 	return  '<button class="uk-button uk-button-small uk-button-success uk-width-1-1 getreaction" data-name="'+name+'" data-type="getSnippets" title="'+Joomla.JText._('COM_COMPONENTBUILDER_VIEW_DESCRIPTION_OF_COMMUNITY_VERSION')+'"><i class="uk-icon-thumb-tack"></i><span class="uk-hidden-small"> '+Joomla.JText._('COM_COMPONENTBUILDER_OPEN_LIBRARY_SNIPPETS')+'</span></button>';
 }
 
@@ -525,4 +526,16 @@ function getKeyID(key) {
 	keyID = keyID.replace(/\)/g, '');
 	// return the id build
 	return keyID;
-}
+}
+
+// get key ID
+function getKeyID(key) {
+	// get useful ID
+	var keyID = key.replace('-', '');
+	keyID = keyID.replace('.json', '');
+	keyID = keyID.replace(/\s+/ig, '-');
+	keyID = keyID.replace(/\(/g, '');
+	keyID = keyID.replace(/\)/g, '');
+	// return the id build
+	return keyID;
+}

admin/helpers/compiler/e_Interpretation.php

@@ -11728,14 +11728,14 @@ class Interpretation extends Fields
 		$component = $this->componentCodeName;
 		// allways load these
 		$getForm = array();
-		$getForm[] = PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " // check if xpath was set in options";
+		$getForm[] = PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " check if xpath was set in options";
 		$getForm[] = $this->_t(2) . "\$xpath = false;";
 		$getForm[] = $this->_t(2) . "if (isset(\$options['xpath']))";
 		$getForm[] = $this->_t(2) . "{";
 		$getForm[] = $this->_t(3) . "\$xpath = \$options['xpath'];";
 		$getForm[] = $this->_t(3) . "unset(\$options['xpath']);";
 		$getForm[] = $this->_t(2) . "}";
-		$getForm[] = $this->_t(2) . "//" . $this->setLine(__LINE__) . " // check if clear form was set in options";
+		$getForm[] = $this->_t(2) . "//" . $this->setLine(__LINE__) . " check if clear form was set in options";
 		$getForm[] = $this->_t(2) . "\$clear = false;";
 		$getForm[] = $this->_t(2) . "if (isset(\$options['clear']))";
 		$getForm[] = $this->_t(2) . "{";

admin/helpers/componentbuilder.php

@@ -2008,6 +2008,78 @@ abstract class ComponentbuilderHelper
 		return $default;
 	}
 
+	/**
+	* Returns a GUIDv4 string
+	* 
+	* Thanks to Dave Pearson (and other)
+	* https://www.php.net/manual/en/function.com-create-guid.php#119168 
+	*
+	* Uses the best cryptographically secure method
+	* for all supported platforms with fallback to an older,
+	* less secure version.
+	*
+	* @param bool $trim
+	* @return string
+	*/
+	public static function GUID ($trim = true)
+	{
+		// Windows
+		if (function_exists('com_create_guid') === true)
+		{
+			if ($trim === true)
+			{
+				return trim(com_create_guid(), '{}');
+			}
+			return com_create_guid();
+		}
+
+		// set the braces if needed
+		$lbrace = $trim ? "" : chr(123);    // "{"
+		$rbrace = $trim ? "" : chr(125);    // "}"
+
+		// OSX/Linux
+		if (function_exists('openssl_random_pseudo_bytes') === true)
+		{
+			$data = openssl_random_pseudo_bytes(16);
+			$data[6] = chr(ord($data[6]) & 0x0f | 0x40);    // set version to 0100
+			$data[8] = chr(ord($data[8]) & 0x3f | 0x80);    // set bits 6-7 to 10
+			return $lbrace . vsprintf('%s%s-%s-%s-%s-%s%s%s', str_split(bin2hex($data), 4)) . $lbrace;
+		}
+
+		// Fallback (PHP 4.2+)
+		mt_srand((double)microtime() * 10000);
+		$charid = strtolower(md5(uniqid(rand(), true)));
+		$hyphen = chr(45);                  // "-"
+		$guidv4 = $lbrace.
+			substr($charid,  0,  8).$hyphen.
+			substr($charid,  8,  4).$hyphen.
+			substr($charid, 12,  4).$hyphen.
+			substr($charid, 16,  4).$hyphen.
+			substr($charid, 20, 12).
+			$rbrace;
+		return $guidv4;
+	}
+
+	/**
+	* Validate the Globally Unique Identifier
+	*
+	* Thanks to Lewie
+	* https://stackoverflow.com/a/1515456/1429677
+	*
+	* @param string $guid
+	* @return bool
+	*/
+	public static function validGUID ($guid)
+	{
+		// check if we have a string
+		if (self::checkString($guid))
+		{
+			return preg_match("/^(\{)?[a-f\d]{8}(-[a-f\d]{4}){4}[a-f\d]{8}(?(1)\})$/i", $guid);
+		}
+		return false;
+	}
+
+
 	/**
 	 * Tab/spacer bucket (to speed-up the build)
 	 * 

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

@@ -549,7 +549,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ALIAS_BUILDER_TYPE_LABEL="Alias Builder Type"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ALLOW_ZERO_DESCRIPTION="null & zero values"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ALLOW_ZERO_LABEL="Allow"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ALNUM="ALNUM"
-COM_COMPONENTBUILDER_ADMIN_VIEW_ARCHIVE="ARCHIVE"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ARCHIVE="Archive"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ARMSCIIEIGHT_ARMSCIIEIGHT_ARMENIAN_MOST_SUITABLE_COLLATION_ARMSCIIEIGHT_GENERAL_CI="armscii8 - ARMSCII-8 Armenian (most suitable collation = armscii8_general_ci)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ARMSCIIEIGHT_BIN_CHARSET_ARMSCIIEIGHT="armscii8_bin (charset = armscii8)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ARMSCIIEIGHT_GENERAL_CI_CHARSET_ARMSCIIEIGHT="armscii8_general_ci (charset = armscii8)"
@@ -755,6 +755,10 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_GREEK_GENERAL_CI_CHARSET_GREEK="greek_general_ci
 COM_COMPONENTBUILDER_ADMIN_VIEW_GREEK_ISO_EIGHT_THOUSAND_EIGHT_HUNDRED_AND_FIFTY_NINESEVEN_GREEK_MOST_SUITABLE_COLLATION_GREEK_GENERAL_CI="greek - ISO 8859-7 Greek (most suitable collation = greek_general_ci)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_GRID="Grid"
 COM_COMPONENTBUILDER_ADMIN_VIEW_GRID_TWO="Grid 2"
+COM_COMPONENTBUILDER_ADMIN_VIEW_GUID="Guid"
+COM_COMPONENTBUILDER_ADMIN_VIEW_GUID_DESCRIPTION="Globally Unique Identifier"
+COM_COMPONENTBUILDER_ADMIN_VIEW_GUID_HINT="Auto Generated"
+COM_COMPONENTBUILDER_ADMIN_VIEW_GUID_LABEL="GUID"
 COM_COMPONENTBUILDER_ADMIN_VIEW_HEALTH="Health"
 COM_COMPONENTBUILDER_ADMIN_VIEW_HEART="Heart"
 COM_COMPONENTBUILDER_ADMIN_VIEW_HEART_TWO="Heart 2"
@@ -1588,6 +1592,10 @@ COM_COMPONENTBUILDER_CLASS_METHOD_ERROR_UNIQUE_ALIAS="Another Class Method has t
 COM_COMPONENTBUILDER_CLASS_METHOD_EXTENSION_TYPE="Extension Type"
 COM_COMPONENTBUILDER_CLASS_METHOD_EXTENSION_TYPE_DESCRIPTION="Extension type this class_method belongs to."
 COM_COMPONENTBUILDER_CLASS_METHOD_EXTENSION_TYPE_LABEL="Extension Type"
+COM_COMPONENTBUILDER_CLASS_METHOD_GUID="Guid"
+COM_COMPONENTBUILDER_CLASS_METHOD_GUID_DESCRIPTION="Globally Unique Identifier"
+COM_COMPONENTBUILDER_CLASS_METHOD_GUID_HINT="Auto Generated"
+COM_COMPONENTBUILDER_CLASS_METHOD_GUID_LABEL="GUID"
 COM_COMPONENTBUILDER_CLASS_METHOD_ID="Id"
 COM_COMPONENTBUILDER_CLASS_METHOD_JOOMLA_PLUGIN_GROUP="Joomla Plugin Group"
 COM_COMPONENTBUILDER_CLASS_METHOD_JOOMLA_PLUGIN_GROUP_LABEL="Joomla Plugin Group"
@@ -1687,6 +1695,10 @@ COM_COMPONENTBUILDER_CLASS_PROPERTY_ERROR_UNIQUE_ALIAS="Another Class Property h
 COM_COMPONENTBUILDER_CLASS_PROPERTY_EXTENSION_TYPE="Extension Type"
 COM_COMPONENTBUILDER_CLASS_PROPERTY_EXTENSION_TYPE_DESCRIPTION="Extension type this class_property belongs to."
 COM_COMPONENTBUILDER_CLASS_PROPERTY_EXTENSION_TYPE_LABEL="Extension Type"
+COM_COMPONENTBUILDER_CLASS_PROPERTY_GUID="Guid"
+COM_COMPONENTBUILDER_CLASS_PROPERTY_GUID_DESCRIPTION="Globally Unique Identifier"
+COM_COMPONENTBUILDER_CLASS_PROPERTY_GUID_HINT="Auto Generated"
+COM_COMPONENTBUILDER_CLASS_PROPERTY_GUID_LABEL="GUID"
 COM_COMPONENTBUILDER_CLASS_PROPERTY_ID="Id"
 COM_COMPONENTBUILDER_CLASS_PROPERTY_JOOMLA_PLUGIN_GROUP="Joomla Plugin Group"
 COM_COMPONENTBUILDER_CLASS_PROPERTY_JOOMLA_PLUGIN_GROUP_LABEL="Joomla Plugin Group"
@@ -3840,6 +3852,10 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_GET_SNIPPETS_BUTTON_ACCESS="Custom Admin
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_GET_SNIPPETS_BUTTON_ACCESS_DESC="Allows the users in this group to access the get snippets button."
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_GRID="Grid"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_GRID_TWO="Grid 2"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_GUID="Guid"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_GUID_DESCRIPTION="Globally Unique Identifier"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_GUID_HINT="Auto Generated"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_GUID_LABEL="GUID"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_HEALTH="Health"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_HEART="Heart"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_HEART_TWO="Heart 2"
@@ -4509,6 +4525,10 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_GREATER_THAN_OR_EQUAL="greater than or equal"
 COM_COMPONENTBUILDER_DYNAMIC_GET_GROUP="Group"
 COM_COMPONENTBUILDER_DYNAMIC_GET_GROUP_DESCRIPTION="Here you can set the grouping per data set."
 COM_COMPONENTBUILDER_DYNAMIC_GET_GROUP_LABEL="Grouping"
+COM_COMPONENTBUILDER_DYNAMIC_GET_GUID="Guid"
+COM_COMPONENTBUILDER_DYNAMIC_GET_GUID_DESCRIPTION="Globally Unique Identifier"
+COM_COMPONENTBUILDER_DYNAMIC_GET_GUID_HINT="Auto Generated"
+COM_COMPONENTBUILDER_DYNAMIC_GET_GUID_LABEL="GUID"
 COM_COMPONENTBUILDER_DYNAMIC_GET_H="h"
 COM_COMPONENTBUILDER_DYNAMIC_GET_HH="hh"
 COM_COMPONENTBUILDER_DYNAMIC_GET_I="i"
@@ -4883,6 +4903,10 @@ COM_COMPONENTBUILDER_FIELDTYPE_FIELDS="Fields"
 COM_COMPONENTBUILDER_FIELDTYPE_FIELDTYPES_CATEGORIES="Fieldtypes Categories"
 COM_COMPONENTBUILDER_FIELDTYPE_FIFTY="50"
 COM_COMPONENTBUILDER_FIELDTYPE_FLOAT="FLOAT"
+COM_COMPONENTBUILDER_FIELDTYPE_GUID="Guid"
+COM_COMPONENTBUILDER_FIELDTYPE_GUID_DESCRIPTION="Globally Unique Identifier"
+COM_COMPONENTBUILDER_FIELDTYPE_GUID_HINT="Auto Generated"
+COM_COMPONENTBUILDER_FIELDTYPE_GUID_LABEL="GUID"
 COM_COMPONENTBUILDER_FIELDTYPE_HAS_DEFAULTS="Has Defaults"
 COM_COMPONENTBUILDER_FIELDTYPE_HAS_DEFAULTS_DESCRIPTION="set the database defaults for this field type"
 COM_COMPONENTBUILDER_FIELDTYPE_HAS_DEFAULTS_LABEL="Set Database Defaults"
@@ -5024,6 +5048,10 @@ COM_COMPONENTBUILDER_FIELD_FIELDTYPE_DESCRIPTION="Set the field type"
 COM_COMPONENTBUILDER_FIELD_FIELDTYPE_LABEL="Type"
 COM_COMPONENTBUILDER_FIELD_FIFTY="50"
 COM_COMPONENTBUILDER_FIELD_FLOAT="FLOAT"
+COM_COMPONENTBUILDER_FIELD_GUID="Guid"
+COM_COMPONENTBUILDER_FIELD_GUID_DESCRIPTION="Globally Unique Identifier"
+COM_COMPONENTBUILDER_FIELD_GUID_HINT="Auto Generated"
+COM_COMPONENTBUILDER_FIELD_GUID_LABEL="GUID"
 COM_COMPONENTBUILDER_FIELD_HELPNOTE_LABEL="Field Information"
 COM_COMPONENTBUILDER_FIELD_ID="Id"
 COM_COMPONENTBUILDER_FIELD_INDEXES="Indexes"
@@ -5689,6 +5717,10 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_KEY_HINT="Export Key Here"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_KEY_LABEL="Export Key<br /><small>(encrypted field)</small>"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_KEY_MESSAGE="Error! Please add export key here."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_FRONT="Front"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_GUID="Guid"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_GUID_DESCRIPTION="Globally Unique Identifier"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_GUID_HINT="Auto Generated"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_GUID_LABEL="GUID"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ID="Id"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMAGE="Image"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMAGE_DESCRIPTION="The component image (product box) for the dashboard and install page, must be 300px X 300px."
@@ -6299,6 +6331,10 @@ COM_COMPONENTBUILDER_JOOMLA_MODULE_FILE_LABEL="File Name"
 COM_COMPONENTBUILDER_JOOMLA_MODULE_FORMS_FIELDS="Forms & Fields"
 COM_COMPONENTBUILDER_JOOMLA_MODULE_GET_SNIPPETS_BUTTON_ACCESS="Joomla Module Get Snippets Button Access"
 COM_COMPONENTBUILDER_JOOMLA_MODULE_GET_SNIPPETS_BUTTON_ACCESS_DESC="Allows the users in this group to access the get snippets button."
+COM_COMPONENTBUILDER_JOOMLA_MODULE_GUID="Guid"
+COM_COMPONENTBUILDER_JOOMLA_MODULE_GUID_DESCRIPTION="Globally Unique Identifier"
+COM_COMPONENTBUILDER_JOOMLA_MODULE_GUID_HINT="Auto Generated"
+COM_COMPONENTBUILDER_JOOMLA_MODULE_GUID_LABEL="GUID"
 COM_COMPONENTBUILDER_JOOMLA_MODULE_HELPER="Helper"
 COM_COMPONENTBUILDER_JOOMLA_MODULE_HTML="HTML"
 COM_COMPONENTBUILDER_JOOMLA_MODULE_ID="Id"
@@ -6813,6 +6849,10 @@ COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GROUP_SAVE_WARNING="Alias already existed so
 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="Version"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GUID="Guid"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GUID_DESCRIPTION="Globally Unique Identifier"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GUID_HINT="Auto Generated"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GUID_LABEL="GUID"
 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"
@@ -7555,6 +7595,10 @@ 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"
 COM_COMPONENTBUILDER_LIBRARY_GET_SNIPPETS_BUTTON_ACCESS_DESC="Allows the users in this group to access the get snippets button."
+COM_COMPONENTBUILDER_LIBRARY_GUID="Guid"
+COM_COMPONENTBUILDER_LIBRARY_GUID_DESCRIPTION="Globally Unique Identifier"
+COM_COMPONENTBUILDER_LIBRARY_GUID_HINT="Auto Generated"
+COM_COMPONENTBUILDER_LIBRARY_GUID_LABEL="GUID"
 COM_COMPONENTBUILDER_LIBRARY_HOW="How"
 COM_COMPONENTBUILDER_LIBRARY_HOW_DESCRIPTION="Select how you want to control the behaviour of the library file inclusion."
 COM_COMPONENTBUILDER_LIBRARY_HOW_LABEL="File Behaviour"
@@ -8266,6 +8310,10 @@ COM_COMPONENTBUILDER_SITE_VIEW_GET_SNIPPETS_BUTTON_ACCESS="Site View Get Snippet
 COM_COMPONENTBUILDER_SITE_VIEW_GET_SNIPPETS_BUTTON_ACCESS_DESC="Allows the users in this group to access the get snippets button."
 COM_COMPONENTBUILDER_SITE_VIEW_GRID="Grid"
 COM_COMPONENTBUILDER_SITE_VIEW_GRID_TWO="Grid 2"
+COM_COMPONENTBUILDER_SITE_VIEW_GUID="Guid"
+COM_COMPONENTBUILDER_SITE_VIEW_GUID_DESCRIPTION="Globally Unique Identifier"
+COM_COMPONENTBUILDER_SITE_VIEW_GUID_HINT="Auto Generated"
+COM_COMPONENTBUILDER_SITE_VIEW_GUID_LABEL="GUID"
 COM_COMPONENTBUILDER_SITE_VIEW_HEALTH="Health"
 COM_COMPONENTBUILDER_SITE_VIEW_HEART="Heart"
 COM_COMPONENTBUILDER_SITE_VIEW_HEART_TWO="Heart 2"
@@ -8580,6 +8628,10 @@ COM_COMPONENTBUILDER_SNIPPET_EDIT="Editing the Snippet"
 COM_COMPONENTBUILDER_SNIPPET_ERROR_UNIQUE_ALIAS="Another Snippet has the same alias."
 COM_COMPONENTBUILDER_SNIPPET_GET_SNIPPETS_BUTTON_ACCESS="Snippet Get Snippets Button Access"
 COM_COMPONENTBUILDER_SNIPPET_GET_SNIPPETS_BUTTON_ACCESS_DESC="Allows the users in this group to access the get snippets button."
+COM_COMPONENTBUILDER_SNIPPET_GUID="Guid"
+COM_COMPONENTBUILDER_SNIPPET_GUID_DESCRIPTION="Globally Unique Identifier"
+COM_COMPONENTBUILDER_SNIPPET_GUID_HINT="Auto Generated"
+COM_COMPONENTBUILDER_SNIPPET_GUID_LABEL="GUID"
 COM_COMPONENTBUILDER_SNIPPET_HEADING="Heading"
 COM_COMPONENTBUILDER_SNIPPET_HEADING_DESCRIPTION="Enter short heading"
 COM_COMPONENTBUILDER_SNIPPET_HEADING_HINT="Your Heading Here"

admin/layouts/admin_view/publishing.php

@@ -26,6 +26,7 @@ $fields_tab_layout = 'fields_' . $layout_path_array[1];
 
 // get the fields
 $fields = $displayData->get($fields_tab_layout) ?: array(
+	'guid',
 	'created',
 	'created_by',
 	'modified',

admin/layouts/class_method/publishing.php

@@ -26,6 +26,7 @@ $fields_tab_layout = 'fields_' . $layout_path_array[1];
 
 // get the fields
 $fields = $displayData->get($fields_tab_layout) ?: array(
+	'guid',
 	'created',
 	'created_by',
 	'modified',

admin/layouts/class_property/publishing.php

@@ -26,6 +26,7 @@ $fields_tab_layout = 'fields_' . $layout_path_array[1];
 
 // get the fields
 $fields = $displayData->get($fields_tab_layout) ?: array(
+	'guid',
 	'created',
 	'created_by',
 	'modified',

admin/layouts/custom_admin_view/publishing.php

@@ -26,6 +26,7 @@ $fields_tab_layout = 'fields_' . $layout_path_array[1];
 
 // get the fields
 $fields = $displayData->get($fields_tab_layout) ?: array(
+	'guid',
 	'created',
 	'created_by',
 	'modified',

admin/layouts/dynamic_get/publishing.php

@@ -26,6 +26,7 @@ $fields_tab_layout = 'fields_' . $layout_path_array[1];
 
 // get the fields
 $fields = $displayData->get($fields_tab_layout) ?: array(
+	'guid',
 	'created',
 	'created_by',
 	'modified',

admin/layouts/field/publishing.php

@@ -26,6 +26,7 @@ $fields_tab_layout = 'fields_' . $layout_path_array[1];
 
 // get the fields
 $fields = $displayData->get($fields_tab_layout) ?: array(
+	'guid',
 	'created',
 	'created_by',
 	'modified',

admin/layouts/fieldtype/publishing.php

@@ -26,6 +26,7 @@ $fields_tab_layout = 'fields_' . $layout_path_array[1];
 
 // get the fields
 $fields = $displayData->get($fields_tab_layout) ?: array(
+	'guid',
 	'created',
 	'created_by',
 	'modified',

admin/layouts/jcbnoticeboardtabs.php

@@ -0,0 +1,37 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('JPATH_BASE') or die('Restricted access');
+
+
+
+?>
+<div id="noticeboard">
+	<?php echo JHtml::_('bootstrap.startTabSet', 'compiler_tab', array('active' => 'vdm-noticeboard')); ?>
+		<?php echo JHtml::_('bootstrap.addTab', 'compiler_tab', 'vdm-noticeboard', JText::_('COM_COMPONENTBUILDER_VDM_BOARD', true)); ?>
+			<div  class="well well-small">
+				<h2 class="module-title nav-header"><?php echo JText::_('COM_COMPONENTBUILDER_VDM_NOTICE_BOARD'); ?><span id="vdm-new-notice" style="display:none; color:red;"> (<?php echo JText::_('COM_COMPONENTBUILDER_NEW_NOTICE'); ?>)</span></h2>
+				<div id="noticeboard-md"><small><?php echo JText::_('COM_COMPONENTBUILDER_THE_NOTICE_BOARD_IS_LOADING'); ?><span class="loading-dots">.</span></small></div>
+				<div style="text-align:right;"><small><a href="https://github.com/Llewellynvdm" target="_blank" style="color:gray">&lt;&lt;ewe&gt;&gt;yn</a></small></div>
+			</div>
+			<div><?php echo ComponentbuilderHelper::getDynamicContent('banner', '728-90'); ?></div>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+		<?php echo JHtml::_('bootstrap.addTab', 'compiler_tab', 'proboard', JText::_('COM_COMPONENTBUILDER_JCB_PRO_BOARD', true)); ?>
+			<div  class="well well-small">
+				<h2 class="module-title nav-header"><?php echo JText::_('COM_COMPONENTBUILDER_JCB_PRO_NOTICE_BOARD'); ?></h2>
+				<div id="proboard-md"><small><?php echo JText::_('COM_COMPONENTBUILDER_THE_PRO_BOARD_IS_LOADING'); ?><span class="loading-dots">.</span></small></div>
+				<div style="text-align:right;"><small><a href="https://vdm.bz/get-jcb-pro-membership" target="_blank" style="color:gray">JCB PRO</a></small></div>
+			</div>
+			<div><?php echo ComponentbuilderHelper::getDynamicContent('banner', '728-90'); ?></div>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+	<?php echo JHtml::_('bootstrap.endTabSet'); ?>
+</div>

admin/layouts/joomla_component/publishing.php

@@ -26,6 +26,7 @@ $fields_tab_layout = 'fields_' . $layout_path_array[1];
 
 // get the fields
 $fields = $displayData->get($fields_tab_layout) ?: array(
+	'guid',
 	'created',
 	'created_by',
 	'modified',

admin/layouts/joomla_module/publishing.php

@@ -26,6 +26,7 @@ $fields_tab_layout = 'fields_' . $layout_path_array[1];
 
 // get the fields
 $fields = $displayData->get($fields_tab_layout) ?: array(
+	'guid',
 	'created',
 	'created_by',
 	'modified',

admin/layouts/joomla_plugin/publishing.php

@@ -26,6 +26,7 @@ $fields_tab_layout = 'fields_' . $layout_path_array[1];
 
 // get the fields
 $fields = $displayData->get($fields_tab_layout) ?: array(
+	'guid',
 	'created',
 	'created_by',
 	'modified',

admin/layouts/library/publishing.php

@@ -26,6 +26,7 @@ $fields_tab_layout = 'fields_' . $layout_path_array[1];
 
 // get the fields
 $fields = $displayData->get($fields_tab_layout) ?: array(
+	'guid',
 	'created',
 	'created_by',
 	'modified',

admin/layouts/site_view/publishing.php

@@ -26,6 +26,7 @@ $fields_tab_layout = 'fields_' . $layout_path_array[1];
 
 // get the fields
 $fields = $displayData->get($fields_tab_layout) ?: array(
+	'guid',
 	'created',
 	'created_by',
 	'modified',

admin/layouts/snippet/publishing.php

@@ -26,6 +26,7 @@ $fields_tab_layout = 'fields_' . $layout_path_array[1];
 
 // get the fields
 $fields = $displayData->get($fields_tab_layout) ?: array(
+	'guid',
 	'created',
 	'created_by',
 	'modified',

admin/models/admin_custom_tabs.php

@@ -130,14 +130,14 @@ class ComponentbuilderModelAdmin_custom_tabs extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
-		// // check if xpath was set in options
+		// 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
+		// check if clear form was set in options
 		$clear = false;
 		if (isset($options['clear']))
 		{

admin/models/admin_fields.php

@@ -151,14 +151,14 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
-		// // check if xpath was set in options
+		// 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
+		// check if clear form was set in options
 		$clear = false;
 		if (isset($options['clear']))
 		{

admin/models/admin_fields_conditions.php

@@ -151,14 +151,14 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
-		// // check if xpath was set in options
+		// 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
+		// check if clear form was set in options
 		$clear = false;
 		if (isset($options['clear']))
 		{

admin/models/admin_fields_relations.php

@@ -213,14 +213,14 @@ class ComponentbuilderModelAdmin_fields_relations extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
-		// // check if xpath was set in options
+		// 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
+		// check if clear form was set in options
 		$clear = false;
 		if (isset($options['clear']))
 		{

admin/models/admin_view.php

@@ -94,20 +94,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				'php_document'
 			)
 		),
-		'mysql' => array(
-			'left' => array(
-				'mysql_table_engine',
-				'mysql_table_charset',
-				'mysql_table_collate',
-				'mysql_table_row_format',
-				'add_sql',
-				'source',
-				'addtables'
-			),
-			'fullwidth' => array(
-				'sql'
-			)
-		),
 		'custom_import' => array(
 			'fullwidth' => array(
 				'note_beginner_import',
@@ -122,6 +108,20 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				'php_import_ext'
 			)
 		),
+		'mysql' => array(
+			'left' => array(
+				'mysql_table_engine',
+				'mysql_table_charset',
+				'mysql_table_collate',
+				'mysql_table_row_format',
+				'add_sql',
+				'source',
+				'addtables'
+			),
+			'fullwidth' => array(
+				'sql'
+			)
+		),
 		'settings' => array(
 			'fullwidth' => array(
 				'note_on_permissions',
@@ -293,76 +293,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->metadata = $registry->toArray();
 			}
 
-			if (!empty($item->php_import_headers))
+			if (!empty($item->php_before_cancel))
 			{
-				// base64 Decode php_import_headers.
-				$item->php_import_headers = base64_decode($item->php_import_headers);
-			}
-
-			if (!empty($item->html_import_view))
-			{
-				// base64 Decode html_import_view.
-				$item->html_import_view = base64_decode($item->html_import_view);
-			}
-
-			if (!empty($item->php_import_save))
-			{
-				// base64 Decode php_import_save.
-				$item->php_import_save = base64_decode($item->php_import_save);
-			}
-
-			if (!empty($item->php_getitems_after_all))
-			{
-				// base64 Decode php_getitems_after_all.
-				$item->php_getitems_after_all = base64_decode($item->php_getitems_after_all);
-			}
-
-			if (!empty($item->php_getlistquery))
-			{
-				// base64 Decode php_getlistquery.
-				$item->php_getlistquery = base64_decode($item->php_getlistquery);
-			}
-
-			if (!empty($item->css_view))
-			{
-				// base64 Decode css_view.
-				$item->css_view = base64_decode($item->css_view);
-			}
-
-			if (!empty($item->php_getform))
-			{
-				// base64 Decode php_getform.
-				$item->php_getform = base64_decode($item->php_getform);
-			}
-
-			if (!empty($item->php_before_save))
-			{
-				// base64 Decode php_before_save.
-				$item->php_before_save = base64_decode($item->php_before_save);
-			}
-
-			if (!empty($item->css_views))
-			{
-				// base64 Decode css_views.
-				$item->css_views = base64_decode($item->css_views);
-			}
-
-			if (!empty($item->php_save))
-			{
-				// base64 Decode php_save.
-				$item->php_save = base64_decode($item->php_save);
-			}
-
-			if (!empty($item->php_postsavehook))
-			{
-				// base64 Decode php_postsavehook.
-				$item->php_postsavehook = base64_decode($item->php_postsavehook);
-			}
-
-			if (!empty($item->javascript_view_file))
-			{
-				// base64 Decode javascript_view_file.
-				$item->javascript_view_file = base64_decode($item->javascript_view_file);
+				// base64 Decode php_before_cancel.
+				$item->php_before_cancel = base64_decode($item->php_before_cancel);
 			}
 
 			if (!empty($item->php_allowadd))
@@ -371,64 +305,22 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->php_allowadd = base64_decode($item->php_allowadd);
 			}
 
-			if (!empty($item->php_allowedit))
+			if (!empty($item->php_save))
 			{
-				// base64 Decode php_allowedit.
-				$item->php_allowedit = base64_decode($item->php_allowedit);
+				// base64 Decode php_save.
+				$item->php_save = base64_decode($item->php_save);
 			}
 
-			if (!empty($item->javascript_view_footer))
+			if (!empty($item->php_getform))
 			{
-				// base64 Decode javascript_view_footer.
-				$item->javascript_view_footer = base64_decode($item->javascript_view_footer);
+				// base64 Decode php_getform.
+				$item->php_getform = base64_decode($item->php_getform);
 			}
 
-			if (!empty($item->php_before_cancel))
+			if (!empty($item->php_import_display))
 			{
-				// base64 Decode php_before_cancel.
-				$item->php_before_cancel = base64_decode($item->php_before_cancel);
-			}
-
-			if (!empty($item->php_after_cancel))
-			{
-				// base64 Decode php_after_cancel.
-				$item->php_after_cancel = base64_decode($item->php_after_cancel);
-			}
-
-			if (!empty($item->javascript_views_file))
-			{
-				// base64 Decode javascript_views_file.
-				$item->javascript_views_file = base64_decode($item->javascript_views_file);
-			}
-
-			if (!empty($item->php_batchcopy))
-			{
-				// base64 Decode php_batchcopy.
-				$item->php_batchcopy = base64_decode($item->php_batchcopy);
-			}
-
-			if (!empty($item->php_batchmove))
-			{
-				// base64 Decode php_batchmove.
-				$item->php_batchmove = base64_decode($item->php_batchmove);
-			}
-
-			if (!empty($item->javascript_views_footer))
-			{
-				// base64 Decode javascript_views_footer.
-				$item->javascript_views_footer = base64_decode($item->javascript_views_footer);
-			}
-
-			if (!empty($item->php_before_publish))
-			{
-				// base64 Decode php_before_publish.
-				$item->php_before_publish = base64_decode($item->php_before_publish);
-			}
-
-			if (!empty($item->php_after_publish))
-			{
-				// base64 Decode php_after_publish.
-				$item->php_after_publish = base64_decode($item->php_after_publish);
+				// base64 Decode php_import_display.
+				$item->php_import_display = base64_decode($item->php_import_display);
 			}
 
 			if (!empty($item->php_before_delete))
@@ -437,10 +329,76 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->php_before_delete = base64_decode($item->php_before_delete);
 			}
 
-			if (!empty($item->php_controller))
+			if (!empty($item->php_batchcopy))
 			{
-				// base64 Decode php_controller.
-				$item->php_controller = base64_decode($item->php_controller);
+				// base64 Decode php_batchcopy.
+				$item->php_batchcopy = base64_decode($item->php_batchcopy);
+			}
+
+			if (!empty($item->php_before_publish))
+			{
+				// base64 Decode php_before_publish.
+				$item->php_before_publish = base64_decode($item->php_before_publish);
+			}
+
+			if (!empty($item->php_document))
+			{
+				// base64 Decode php_document.
+				$item->php_document = base64_decode($item->php_document);
+			}
+
+			if (!empty($item->sql))
+			{
+				// base64 Decode sql.
+				$item->sql = base64_decode($item->sql);
+			}
+
+			if (!empty($item->php_import_setdata))
+			{
+				// base64 Decode php_import_setdata.
+				$item->php_import_setdata = base64_decode($item->php_import_setdata);
+			}
+
+			if (!empty($item->php_getlistquery))
+			{
+				// base64 Decode php_getlistquery.
+				$item->php_getlistquery = base64_decode($item->php_getlistquery);
+			}
+
+			if (!empty($item->php_before_save))
+			{
+				// base64 Decode php_before_save.
+				$item->php_before_save = base64_decode($item->php_before_save);
+			}
+
+			if (!empty($item->php_postsavehook))
+			{
+				// base64 Decode php_postsavehook.
+				$item->php_postsavehook = base64_decode($item->php_postsavehook);
+			}
+
+			if (!empty($item->php_allowedit))
+			{
+				// base64 Decode php_allowedit.
+				$item->php_allowedit = base64_decode($item->php_allowedit);
+			}
+
+			if (!empty($item->php_after_cancel))
+			{
+				// base64 Decode php_after_cancel.
+				$item->php_after_cancel = base64_decode($item->php_after_cancel);
+			}
+
+			if (!empty($item->php_batchmove))
+			{
+				// base64 Decode php_batchmove.
+				$item->php_batchmove = base64_decode($item->php_batchmove);
+			}
+
+			if (!empty($item->php_after_publish))
+			{
+				// base64 Decode php_after_publish.
+				$item->php_after_publish = base64_decode($item->php_after_publish);
 			}
 
 			if (!empty($item->php_after_delete))
@@ -449,18 +407,66 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->php_after_delete = base64_decode($item->php_after_delete);
 			}
 
+			if (!empty($item->php_import))
+			{
+				// base64 Decode php_import.
+				$item->php_import = base64_decode($item->php_import);
+			}
+
+			if (!empty($item->php_import_ext))
+			{
+				// base64 Decode php_import_ext.
+				$item->php_import_ext = base64_decode($item->php_import_ext);
+			}
+
+			if (!empty($item->css_view))
+			{
+				// base64 Decode css_view.
+				$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_file))
+			{
+				// base64 Decode javascript_view_file.
+				$item->javascript_view_file = base64_decode($item->javascript_view_file);
+			}
+
+			if (!empty($item->javascript_view_footer))
+			{
+				// base64 Decode javascript_view_footer.
+				$item->javascript_view_footer = base64_decode($item->javascript_view_footer);
+			}
+
+			if (!empty($item->javascript_views_file))
+			{
+				// base64 Decode javascript_views_file.
+				$item->javascript_views_file = base64_decode($item->javascript_views_file);
+			}
+
+			if (!empty($item->javascript_views_footer))
+			{
+				// base64 Decode javascript_views_footer.
+				$item->javascript_views_footer = base64_decode($item->javascript_views_footer);
+			}
+
+			if (!empty($item->php_controller))
+			{
+				// base64 Decode php_controller.
+				$item->php_controller = base64_decode($item->php_controller);
+			}
+
 			if (!empty($item->php_model))
 			{
 				// base64 Decode php_model.
 				$item->php_model = base64_decode($item->php_model);
 			}
 
-			if (!empty($item->php_document))
-			{
-				// base64 Decode php_document.
-				$item->php_document = base64_decode($item->php_document);
-			}
-
 			if (!empty($item->php_controller_list))
 			{
 				// base64 Decode php_controller_list.
@@ -479,34 +485,22 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->php_ajaxmethod = base64_decode($item->php_ajaxmethod);
 			}
 
-			if (!empty($item->sql))
-			{
-				// base64 Decode sql.
-				$item->sql = base64_decode($item->sql);
-			}
-
-			if (!empty($item->php_import_display))
-			{
-				// base64 Decode php_import_display.
-				$item->php_import_display = base64_decode($item->php_import_display);
-			}
-
 			if (!empty($item->php_getitem))
 			{
 				// base64 Decode php_getitem.
 				$item->php_getitem = base64_decode($item->php_getitem);
 			}
 
-			if (!empty($item->php_import))
+			if (!empty($item->html_import_view))
 			{
-				// base64 Decode php_import.
-				$item->php_import = base64_decode($item->php_import);
+				// base64 Decode html_import_view.
+				$item->html_import_view = base64_decode($item->html_import_view);
 			}
 
-			if (!empty($item->php_import_setdata))
+			if (!empty($item->php_import_headers))
 			{
-				// base64 Decode php_import_setdata.
-				$item->php_import_setdata = base64_decode($item->php_import_setdata);
+				// base64 Decode php_import_headers.
+				$item->php_import_headers = base64_decode($item->php_import_headers);
 			}
 
 			if (!empty($item->php_getitems))
@@ -515,18 +509,16 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->php_getitems = base64_decode($item->php_getitems);
 			}
 
-			if (!empty($item->php_import_ext))
+			if (!empty($item->php_import_save))
 			{
-				// base64 Decode php_import_ext.
-				$item->php_import_ext = base64_decode($item->php_import_ext);
+				// base64 Decode php_import_save.
+				$item->php_import_save = base64_decode($item->php_import_save);
 			}
 
-			if (!empty($item->addtables))
+			if (!empty($item->php_getitems_after_all))
 			{
-				// Convert the addtables field to an array.
-				$addtables = new Registry;
-				$addtables->loadString($item->addtables);
-				$item->addtables = $addtables->toArray();
+				// base64 Decode php_getitems_after_all.
+				$item->php_getitems_after_all = base64_decode($item->php_getitems_after_all);
 			}
 
 			if (!empty($item->addpermissions))
@@ -569,6 +561,14 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->custom_button = $custom_button->toArray();
 			}
 
+			if (!empty($item->addtables))
+			{
+				// Convert the addtables field to an array.
+				$addtables = new Registry;
+				$addtables->loadString($item->addtables);
+				$item->addtables = $addtables->toArray();
+			}
+
 			if (!empty($item->ajax_input))
 			{
 				// Convert the ajax_input field to an array.
@@ -687,14 +687,14 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
-		// // check if xpath was set in options
+		// 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
+		// check if clear form was set in options
 		$clear = false;
 		if (isset($options['clear']))
 		{
@@ -796,6 +796,13 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$form->setFieldAttribute($name, 'editor', $global_editor . '|none');
 			}
 		}
+
+
+		// Only load the GUID if new item
+		if (0 == $id)
+		{
+			$form->setValue('guid', null, ComponentbuilderHelper::GUID());
+		}
 
 		return $form;
 	}
@@ -1481,19 +1488,12 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['system_name'] = $data['name_single'];
 		}
 
+		// Set the GUID if empty or not valid
+		if (isset($data['guid']) && !ComponentbuilderHelper::validGUID($data['guid']))
+		{
+			$data['guid'] = (string) ComponentbuilderHelper::GUID();
+		}
 
-		// Set the addtables items to data.
-		if (isset($data['addtables']) && is_array($data['addtables']))
-		{
-			$addtables = new JRegistry;
-			$addtables->loadArray($data['addtables']);
-			$data['addtables'] = (string) $addtables;
-		}
-		elseif (!isset($data['addtables']))
-		{
-			// Set the empty addtables to data
-			$data['addtables'] = '';
-		}
 
 		// Set the addpermissions items to data.
 		if (isset($data['addpermissions']) && is_array($data['addpermissions']))
@@ -1560,6 +1560,19 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['custom_button'] = '';
 		}
 
+		// Set the addtables items to data.
+		if (isset($data['addtables']) && is_array($data['addtables']))
+		{
+			$addtables = new JRegistry;
+			$addtables->loadArray($data['addtables']);
+			$data['addtables'] = (string) $addtables;
+		}
+		elseif (!isset($data['addtables']))
+		{
+			// Set the empty addtables to data
+			$data['addtables'] = '';
+		}
+
 		// Set the ajax_input items to data.
 		if (isset($data['ajax_input']) && is_array($data['ajax_input']))
 		{
@@ -1573,76 +1586,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['ajax_input'] = '';
 		}
 
-		// Set the php_import_headers string to base64 string.
-		if (isset($data['php_import_headers']))
+		// Set the php_before_cancel string to base64 string.
+		if (isset($data['php_before_cancel']))
 		{
-			$data['php_import_headers'] = base64_encode($data['php_import_headers']);
-		}
-
-		// Set the html_import_view string to base64 string.
-		if (isset($data['html_import_view']))
-		{
-			$data['html_import_view'] = base64_encode($data['html_import_view']);
-		}
-
-		// Set the php_import_save string to base64 string.
-		if (isset($data['php_import_save']))
-		{
-			$data['php_import_save'] = base64_encode($data['php_import_save']);
-		}
-
-		// Set the php_getitems_after_all string to base64 string.
-		if (isset($data['php_getitems_after_all']))
-		{
-			$data['php_getitems_after_all'] = base64_encode($data['php_getitems_after_all']);
-		}
-
-		// Set the php_getlistquery string to base64 string.
-		if (isset($data['php_getlistquery']))
-		{
-			$data['php_getlistquery'] = base64_encode($data['php_getlistquery']);
-		}
-
-		// Set the css_view string to base64 string.
-		if (isset($data['css_view']))
-		{
-			$data['css_view'] = base64_encode($data['css_view']);
-		}
-
-		// Set the php_getform string to base64 string.
-		if (isset($data['php_getform']))
-		{
-			$data['php_getform'] = base64_encode($data['php_getform']);
-		}
-
-		// Set the php_before_save string to base64 string.
-		if (isset($data['php_before_save']))
-		{
-			$data['php_before_save'] = base64_encode($data['php_before_save']);
-		}
-
-		// Set the css_views string to base64 string.
-		if (isset($data['css_views']))
-		{
-			$data['css_views'] = base64_encode($data['css_views']);
-		}
-
-		// Set the php_save string to base64 string.
-		if (isset($data['php_save']))
-		{
-			$data['php_save'] = base64_encode($data['php_save']);
-		}
-
-		// Set the php_postsavehook string to base64 string.
-		if (isset($data['php_postsavehook']))
-		{
-			$data['php_postsavehook'] = base64_encode($data['php_postsavehook']);
-		}
-
-		// Set the javascript_view_file string to base64 string.
-		if (isset($data['javascript_view_file']))
-		{
-			$data['javascript_view_file'] = base64_encode($data['javascript_view_file']);
+			$data['php_before_cancel'] = base64_encode($data['php_before_cancel']);
 		}
 
 		// Set the php_allowadd string to base64 string.
@@ -1651,64 +1598,22 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['php_allowadd'] = base64_encode($data['php_allowadd']);
 		}
 
-		// Set the php_allowedit string to base64 string.
-		if (isset($data['php_allowedit']))
+		// Set the php_save string to base64 string.
+		if (isset($data['php_save']))
 		{
-			$data['php_allowedit'] = base64_encode($data['php_allowedit']);
+			$data['php_save'] = base64_encode($data['php_save']);
 		}
 
-		// Set the javascript_view_footer string to base64 string.
-		if (isset($data['javascript_view_footer']))
+		// Set the php_getform string to base64 string.
+		if (isset($data['php_getform']))
 		{
-			$data['javascript_view_footer'] = base64_encode($data['javascript_view_footer']);
+			$data['php_getform'] = base64_encode($data['php_getform']);
 		}
 
-		// Set the php_before_cancel string to base64 string.
-		if (isset($data['php_before_cancel']))
+		// Set the php_import_display string to base64 string.
+		if (isset($data['php_import_display']))
 		{
-			$data['php_before_cancel'] = base64_encode($data['php_before_cancel']);
-		}
-
-		// Set the php_after_cancel string to base64 string.
-		if (isset($data['php_after_cancel']))
-		{
-			$data['php_after_cancel'] = base64_encode($data['php_after_cancel']);
-		}
-
-		// Set the javascript_views_file string to base64 string.
-		if (isset($data['javascript_views_file']))
-		{
-			$data['javascript_views_file'] = base64_encode($data['javascript_views_file']);
-		}
-
-		// Set the php_batchcopy string to base64 string.
-		if (isset($data['php_batchcopy']))
-		{
-			$data['php_batchcopy'] = base64_encode($data['php_batchcopy']);
-		}
-
-		// Set the php_batchmove string to base64 string.
-		if (isset($data['php_batchmove']))
-		{
-			$data['php_batchmove'] = base64_encode($data['php_batchmove']);
-		}
-
-		// Set the javascript_views_footer string to base64 string.
-		if (isset($data['javascript_views_footer']))
-		{
-			$data['javascript_views_footer'] = base64_encode($data['javascript_views_footer']);
-		}
-
-		// Set the php_before_publish string to base64 string.
-		if (isset($data['php_before_publish']))
-		{
-			$data['php_before_publish'] = base64_encode($data['php_before_publish']);
-		}
-
-		// Set the php_after_publish string to base64 string.
-		if (isset($data['php_after_publish']))
-		{
-			$data['php_after_publish'] = base64_encode($data['php_after_publish']);
+			$data['php_import_display'] = base64_encode($data['php_import_display']);
 		}
 
 		// Set the php_before_delete string to base64 string.
@@ -1717,10 +1622,76 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['php_before_delete'] = base64_encode($data['php_before_delete']);
 		}
 
-		// Set the php_controller string to base64 string.
-		if (isset($data['php_controller']))
+		// Set the php_batchcopy string to base64 string.
+		if (isset($data['php_batchcopy']))
 		{
-			$data['php_controller'] = base64_encode($data['php_controller']);
+			$data['php_batchcopy'] = base64_encode($data['php_batchcopy']);
+		}
+
+		// Set the php_before_publish string to base64 string.
+		if (isset($data['php_before_publish']))
+		{
+			$data['php_before_publish'] = base64_encode($data['php_before_publish']);
+		}
+
+		// Set the php_document string to base64 string.
+		if (isset($data['php_document']))
+		{
+			$data['php_document'] = base64_encode($data['php_document']);
+		}
+
+		// Set the sql string to base64 string.
+		if (isset($data['sql']))
+		{
+			$data['sql'] = base64_encode($data['sql']);
+		}
+
+		// Set the php_import_setdata string to base64 string.
+		if (isset($data['php_import_setdata']))
+		{
+			$data['php_import_setdata'] = base64_encode($data['php_import_setdata']);
+		}
+
+		// Set the php_getlistquery string to base64 string.
+		if (isset($data['php_getlistquery']))
+		{
+			$data['php_getlistquery'] = base64_encode($data['php_getlistquery']);
+		}
+
+		// Set the php_before_save string to base64 string.
+		if (isset($data['php_before_save']))
+		{
+			$data['php_before_save'] = base64_encode($data['php_before_save']);
+		}
+
+		// Set the php_postsavehook string to base64 string.
+		if (isset($data['php_postsavehook']))
+		{
+			$data['php_postsavehook'] = base64_encode($data['php_postsavehook']);
+		}
+
+		// Set the php_allowedit string to base64 string.
+		if (isset($data['php_allowedit']))
+		{
+			$data['php_allowedit'] = base64_encode($data['php_allowedit']);
+		}
+
+		// Set the php_after_cancel string to base64 string.
+		if (isset($data['php_after_cancel']))
+		{
+			$data['php_after_cancel'] = base64_encode($data['php_after_cancel']);
+		}
+
+		// Set the php_batchmove string to base64 string.
+		if (isset($data['php_batchmove']))
+		{
+			$data['php_batchmove'] = base64_encode($data['php_batchmove']);
+		}
+
+		// Set the php_after_publish string to base64 string.
+		if (isset($data['php_after_publish']))
+		{
+			$data['php_after_publish'] = base64_encode($data['php_after_publish']);
 		}
 
 		// Set the php_after_delete string to base64 string.
@@ -1729,18 +1700,66 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['php_after_delete'] = base64_encode($data['php_after_delete']);
 		}
 
+		// Set the php_import string to base64 string.
+		if (isset($data['php_import']))
+		{
+			$data['php_import'] = base64_encode($data['php_import']);
+		}
+
+		// Set the php_import_ext string to base64 string.
+		if (isset($data['php_import_ext']))
+		{
+			$data['php_import_ext'] = base64_encode($data['php_import_ext']);
+		}
+
+		// Set the css_view string to base64 string.
+		if (isset($data['css_view']))
+		{
+			$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_file string to base64 string.
+		if (isset($data['javascript_view_file']))
+		{
+			$data['javascript_view_file'] = base64_encode($data['javascript_view_file']);
+		}
+
+		// Set the javascript_view_footer string to base64 string.
+		if (isset($data['javascript_view_footer']))
+		{
+			$data['javascript_view_footer'] = base64_encode($data['javascript_view_footer']);
+		}
+
+		// Set the javascript_views_file string to base64 string.
+		if (isset($data['javascript_views_file']))
+		{
+			$data['javascript_views_file'] = base64_encode($data['javascript_views_file']);
+		}
+
+		// Set the javascript_views_footer string to base64 string.
+		if (isset($data['javascript_views_footer']))
+		{
+			$data['javascript_views_footer'] = base64_encode($data['javascript_views_footer']);
+		}
+
+		// Set the php_controller string to base64 string.
+		if (isset($data['php_controller']))
+		{
+			$data['php_controller'] = base64_encode($data['php_controller']);
+		}
+
 		// Set the php_model string to base64 string.
 		if (isset($data['php_model']))
 		{
 			$data['php_model'] = base64_encode($data['php_model']);
 		}
 
-		// Set the php_document string to base64 string.
-		if (isset($data['php_document']))
-		{
-			$data['php_document'] = base64_encode($data['php_document']);
-		}
-
 		// Set the php_controller_list string to base64 string.
 		if (isset($data['php_controller_list']))
 		{
@@ -1759,34 +1778,22 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['php_ajaxmethod'] = base64_encode($data['php_ajaxmethod']);
 		}
 
-		// Set the sql string to base64 string.
-		if (isset($data['sql']))
-		{
-			$data['sql'] = base64_encode($data['sql']);
-		}
-
-		// Set the php_import_display string to base64 string.
-		if (isset($data['php_import_display']))
-		{
-			$data['php_import_display'] = base64_encode($data['php_import_display']);
-		}
-
 		// Set the php_getitem string to base64 string.
 		if (isset($data['php_getitem']))
 		{
 			$data['php_getitem'] = base64_encode($data['php_getitem']);
 		}
 
-		// Set the php_import string to base64 string.
-		if (isset($data['php_import']))
+		// Set the html_import_view string to base64 string.
+		if (isset($data['html_import_view']))
 		{
-			$data['php_import'] = base64_encode($data['php_import']);
+			$data['html_import_view'] = base64_encode($data['html_import_view']);
 		}
 
-		// Set the php_import_setdata string to base64 string.
-		if (isset($data['php_import_setdata']))
+		// Set the php_import_headers string to base64 string.
+		if (isset($data['php_import_headers']))
 		{
-			$data['php_import_setdata'] = base64_encode($data['php_import_setdata']);
+			$data['php_import_headers'] = base64_encode($data['php_import_headers']);
 		}
 
 		// Set the php_getitems string to base64 string.
@@ -1795,10 +1802,16 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['php_getitems'] = base64_encode($data['php_getitems']);
 		}
 
-		// Set the php_import_ext string to base64 string.
-		if (isset($data['php_import_ext']))
+		// Set the php_import_save string to base64 string.
+		if (isset($data['php_import_save']))
 		{
-			$data['php_import_ext'] = base64_encode($data['php_import_ext']);
+			$data['php_import_save'] = base64_encode($data['php_import_save']);
+		}
+
+		// Set the php_getitems_after_all string to base64 string.
+		if (isset($data['php_getitems_after_all']))
+		{
+			$data['php_getitems_after_all'] = base64_encode($data['php_getitems_after_all']);
 		}
         
 		// Set the Params Items to data

admin/models/admin_views.php

@@ -31,10 +31,10 @@ class ComponentbuilderModelAdmin_views extends JModelList
 				'a.name_single','name_single',
 				'a.short_description','short_description',
 				'a.add_fadein','add_fadein',
-				'a.add_custom_import','add_custom_import',
 				'a.type','type',
 				'a.add_custom_button','add_custom_button',
-				'a.add_php_ajax','add_php_ajax'
+				'a.add_php_ajax','add_php_ajax',
+				'a.add_custom_import','add_custom_import'
 			);
 		}
 
@@ -67,9 +67,6 @@ class ComponentbuilderModelAdmin_views extends JModelList
 		$add_fadein = $this->getUserStateFromRequest($this->context . '.filter.add_fadein', 'filter_add_fadein');
 		$this->setState('filter.add_fadein', $add_fadein);
 
-		$add_custom_import = $this->getUserStateFromRequest($this->context . '.filter.add_custom_import', 'filter_add_custom_import');
-		$this->setState('filter.add_custom_import', $add_custom_import);
-
 		$type = $this->getUserStateFromRequest($this->context . '.filter.type', 'filter_type');
 		$this->setState('filter.type', $type);
 
@@ -77,7 +74,10 @@ class ComponentbuilderModelAdmin_views extends JModelList
 		$this->setState('filter.add_custom_button', $add_custom_button);
 
 		$add_php_ajax = $this->getUserStateFromRequest($this->context . '.filter.add_php_ajax', 'filter_add_php_ajax');
-		$this->setState('filter.add_php_ajax', $add_php_ajax);
+		$this->setState('filter.add_php_ajax', $add_php_ajax);
+
+		$add_custom_import = $this->getUserStateFromRequest($this->context . '.filter.add_custom_import', 'filter_add_custom_import');
+		$this->setState('filter.add_custom_import', $add_custom_import);
         
 		$sorting = $this->getUserStateFromRequest($this->context . '.filter.sorting', 'filter_sorting', 0, 'int');
 		$this->setState('filter.sorting', $sorting);
@@ -142,14 +142,14 @@ class ComponentbuilderModelAdmin_views extends JModelList
 			{
 				// convert add_fadein
 				$item->add_fadein = $this->selectionTranslation($item->add_fadein, 'add_fadein');
-				// convert add_custom_import
-				$item->add_custom_import = $this->selectionTranslation($item->add_custom_import, 'add_custom_import');
 				// convert type
 				$item->type = $this->selectionTranslation($item->type, 'type');
 				// convert add_custom_button
 				$item->add_custom_button = $this->selectionTranslation($item->add_custom_button, 'add_custom_button');
 				// convert add_php_ajax
 				$item->add_php_ajax = $this->selectionTranslation($item->add_php_ajax, 'add_php_ajax');
+				// convert add_custom_import
+				$item->add_custom_import = $this->selectionTranslation($item->add_custom_import, 'add_custom_import');
 			}
 		}
 
@@ -178,19 +178,6 @@ class ComponentbuilderModelAdmin_views extends JModelList
 				return $add_fadeinArray[$value];
 			}
 		}
-		// Array of add_custom_import language strings
-		if ($name === 'add_custom_import')
-		{
-			$add_custom_importArray = array(
-				1 => 'COM_COMPONENTBUILDER_ADMIN_VIEW_YES',
-				0 => 'COM_COMPONENTBUILDER_ADMIN_VIEW_NO'
-			);
-			// Now check if value is found in this array
-			if (isset($add_custom_importArray[$value]) && ComponentbuilderHelper::checkString($add_custom_importArray[$value]))
-			{
-				return $add_custom_importArray[$value];
-			}
-		}
 		// Array of type language strings
 		if ($name === 'type')
 		{
@@ -230,6 +217,19 @@ class ComponentbuilderModelAdmin_views extends JModelList
 				return $add_php_ajaxArray[$value];
 			}
 		}
+		// Array of add_custom_import language strings
+		if ($name === 'add_custom_import')
+		{
+			$add_custom_importArray = array(
+				1 => 'COM_COMPONENTBUILDER_ADMIN_VIEW_YES',
+				0 => 'COM_COMPONENTBUILDER_ADMIN_VIEW_NO'
+			);
+			// Now check if value is found in this array
+			if (isset($add_custom_importArray[$value]) && ComponentbuilderHelper::checkString($add_custom_importArray[$value]))
+			{
+				return $add_custom_importArray[$value];
+			}
+		}
 		return $value;
 	}
 	
@@ -297,11 +297,6 @@ class ComponentbuilderModelAdmin_views extends JModelList
 		{
 			$query->where('a.add_fadein = ' . $db->quote($db->escape($add_fadein)));
 		}
-		// Filter by Add_custom_import.
-		if ($add_custom_import = $this->getState('filter.add_custom_import'))
-		{
-			$query->where('a.add_custom_import = ' . $db->quote($db->escape($add_custom_import)));
-		}
 		// Filter by Type.
 		if ($type = $this->getState('filter.type'))
 		{
@@ -317,6 +312,11 @@ class ComponentbuilderModelAdmin_views extends JModelList
 		{
 			$query->where('a.add_php_ajax = ' . $db->quote($db->escape($add_php_ajax)));
 		}
+		// Filter by Add_custom_import.
+		if ($add_custom_import = $this->getState('filter.add_custom_import'))
+		{
+			$query->where('a.add_custom_import = ' . $db->quote($db->escape($add_custom_import)));
+		}
 
 		// Add the list ordering clause.
 		$orderCol = $this->state->get('list.ordering', 'a.id');
@@ -389,82 +389,82 @@ class ComponentbuilderModelAdmin_views extends JModelList
 							continue;
 						}
 
-						// decode php_import_headers
-						$item->php_import_headers = base64_decode($item->php_import_headers);
-						// decode html_import_view
-						$item->html_import_view = base64_decode($item->html_import_view);
-						// decode php_import_save
-						$item->php_import_save = base64_decode($item->php_import_save);
-						// decode php_getitems_after_all
-						$item->php_getitems_after_all = base64_decode($item->php_getitems_after_all);
-						// decode php_getlistquery
-						$item->php_getlistquery = base64_decode($item->php_getlistquery);
-						// decode css_view
-						$item->css_view = base64_decode($item->css_view);
-						// decode php_getform
-						$item->php_getform = base64_decode($item->php_getform);
-						// decode php_before_save
-						$item->php_before_save = base64_decode($item->php_before_save);
-						// decode css_views
-						$item->css_views = base64_decode($item->css_views);
-						// decode php_save
-						$item->php_save = base64_decode($item->php_save);
-						// decode php_postsavehook
-						$item->php_postsavehook = base64_decode($item->php_postsavehook);
-						// decode javascript_view_file
-						$item->javascript_view_file = base64_decode($item->javascript_view_file);
-						// decode php_allowadd
-						$item->php_allowadd = base64_decode($item->php_allowadd);
-						// decode php_allowedit
-						$item->php_allowedit = base64_decode($item->php_allowedit);
-						// decode javascript_view_footer
-						$item->javascript_view_footer = base64_decode($item->javascript_view_footer);
 						// decode php_before_cancel
 						$item->php_before_cancel = base64_decode($item->php_before_cancel);
-						// decode php_after_cancel
-						$item->php_after_cancel = base64_decode($item->php_after_cancel);
-						// decode javascript_views_file
-						$item->javascript_views_file = base64_decode($item->javascript_views_file);
-						// decode php_batchcopy
-						$item->php_batchcopy = base64_decode($item->php_batchcopy);
-						// decode php_batchmove
-						$item->php_batchmove = base64_decode($item->php_batchmove);
-						// decode javascript_views_footer
-						$item->javascript_views_footer = base64_decode($item->javascript_views_footer);
-						// decode php_before_publish
-						$item->php_before_publish = base64_decode($item->php_before_publish);
-						// decode php_after_publish
-						$item->php_after_publish = base64_decode($item->php_after_publish);
+						// decode php_allowadd
+						$item->php_allowadd = base64_decode($item->php_allowadd);
+						// decode php_save
+						$item->php_save = base64_decode($item->php_save);
+						// decode php_getform
+						$item->php_getform = base64_decode($item->php_getform);
+						// decode php_import_display
+						$item->php_import_display = base64_decode($item->php_import_display);
 						// decode php_before_delete
 						$item->php_before_delete = base64_decode($item->php_before_delete);
-						// decode php_controller
-						$item->php_controller = base64_decode($item->php_controller);
-						// decode php_after_delete
-						$item->php_after_delete = base64_decode($item->php_after_delete);
-						// decode php_model
-						$item->php_model = base64_decode($item->php_model);
+						// decode php_batchcopy
+						$item->php_batchcopy = base64_decode($item->php_batchcopy);
+						// decode php_before_publish
+						$item->php_before_publish = base64_decode($item->php_before_publish);
 						// decode php_document
 						$item->php_document = base64_decode($item->php_document);
+						// decode sql
+						$item->sql = base64_decode($item->sql);
+						// decode php_import_setdata
+						$item->php_import_setdata = base64_decode($item->php_import_setdata);
+						// decode php_getlistquery
+						$item->php_getlistquery = base64_decode($item->php_getlistquery);
+						// decode php_before_save
+						$item->php_before_save = base64_decode($item->php_before_save);
+						// decode php_postsavehook
+						$item->php_postsavehook = base64_decode($item->php_postsavehook);
+						// decode php_allowedit
+						$item->php_allowedit = base64_decode($item->php_allowedit);
+						// decode php_after_cancel
+						$item->php_after_cancel = base64_decode($item->php_after_cancel);
+						// decode php_batchmove
+						$item->php_batchmove = base64_decode($item->php_batchmove);
+						// decode php_after_publish
+						$item->php_after_publish = base64_decode($item->php_after_publish);
+						// decode php_after_delete
+						$item->php_after_delete = base64_decode($item->php_after_delete);
+						// decode php_import
+						$item->php_import = base64_decode($item->php_import);
+						// decode php_import_ext
+						$item->php_import_ext = base64_decode($item->php_import_ext);
+						// 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_file
+						$item->javascript_view_file = base64_decode($item->javascript_view_file);
+						// decode javascript_view_footer
+						$item->javascript_view_footer = base64_decode($item->javascript_view_footer);
+						// decode javascript_views_file
+						$item->javascript_views_file = base64_decode($item->javascript_views_file);
+						// decode javascript_views_footer
+						$item->javascript_views_footer = base64_decode($item->javascript_views_footer);
+						// decode php_controller
+						$item->php_controller = base64_decode($item->php_controller);
+						// decode php_model
+						$item->php_model = base64_decode($item->php_model);
 						// decode php_controller_list
 						$item->php_controller_list = base64_decode($item->php_controller_list);
 						// decode php_model_list
 						$item->php_model_list = base64_decode($item->php_model_list);
 						// decode php_ajaxmethod
 						$item->php_ajaxmethod = base64_decode($item->php_ajaxmethod);
-						// decode sql
-						$item->sql = base64_decode($item->sql);
-						// decode php_import_display
-						$item->php_import_display = base64_decode($item->php_import_display);
 						// decode php_getitem
 						$item->php_getitem = base64_decode($item->php_getitem);
-						// decode php_import
-						$item->php_import = base64_decode($item->php_import);
-						// decode php_import_setdata
-						$item->php_import_setdata = base64_decode($item->php_import_setdata);
+						// decode html_import_view
+						$item->html_import_view = base64_decode($item->html_import_view);
+						// decode php_import_headers
+						$item->php_import_headers = base64_decode($item->php_import_headers);
 						// decode php_getitems
 						$item->php_getitems = base64_decode($item->php_getitems);
-						// decode php_import_ext
-						$item->php_import_ext = base64_decode($item->php_import_ext);
+						// decode php_import_save
+						$item->php_import_save = base64_decode($item->php_import_save);
+						// decode php_getitems_after_all
+						$item->php_getitems_after_all = base64_decode($item->php_getitems_after_all);
 						// unset the values we don't want exported.
 						unset($item->asset_id);
 						unset($item->checked_out);
@@ -529,10 +529,10 @@ class ComponentbuilderModelAdmin_views extends JModelList
 		$id .= ':' . $this->getState('filter.name_single');
 		$id .= ':' . $this->getState('filter.short_description');
 		$id .= ':' . $this->getState('filter.add_fadein');
-		$id .= ':' . $this->getState('filter.add_custom_import');
 		$id .= ':' . $this->getState('filter.type');
 		$id .= ':' . $this->getState('filter.add_custom_button');
-		$id .= ':' . $this->getState('filter.add_php_ajax');
+		$id .= ':' . $this->getState('filter.add_php_ajax');
+		$id .= ':' . $this->getState('filter.add_custom_import');
 
 		return parent::getStoreId($id);
 	}

admin/models/ajax.php

@@ -2514,7 +2514,7 @@ class ComponentbuilderModelAjax extends JModelList
 		// #__componentbuilder_custom_admin_view (g)
 		'custom_admin_view' => array(
 			'search' => array('id', 'system_name', 'default', 'php_view', 'php_jview', 'php_jview_display', 'php_document',
-				'js_document', 'css_document', 'css', 'php_ajaxmethod', 'php_model', 'php_controller'),
+				'javascript_file', 'js_document', 'css_document', 'css', 'php_ajaxmethod', 'php_model', 'php_controller'),
 			'views' => 'custom_admin_views',
 			'not_base64' => array(),
 			'name' => 'system_name'
@@ -2522,7 +2522,7 @@ class ComponentbuilderModelAjax extends JModelList
 		// #__componentbuilder_site_view (h)
 		'site_view' => array(
 			'search' => array('id', 'system_name', 'default', 'php_view', 'php_jview', 'php_jview_display', 'php_document',
-				'js_document', 'css_document', 'css', 'php_ajaxmethod', 'php_model', 'php_controller'),
+				'javascript_file', 'js_document', 'css_document', 'css', 'php_ajaxmethod', 'php_model', 'php_controller'),
 			'views' => 'site_views',
 			'not_base64' => array(),
 			'name' => 'system_name'

admin/models/class_extends.php

@@ -220,14 +220,14 @@ class ComponentbuilderModelClass_extends extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
-		// // check if xpath was set in options
+		// 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
+		// check if clear form was set in options
 		$clear = false;
 		if (isset($options['clear']))
 		{

admin/models/class_method.php

@@ -229,14 +229,14 @@ class ComponentbuilderModelClass_method extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
-		// // check if xpath was set in options
+		// 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
+		// check if clear form was set in options
 		$clear = false;
 		if (isset($options['clear']))
 		{
@@ -338,6 +338,13 @@ class ComponentbuilderModelClass_method extends JModelAdmin
 				$form->setFieldAttribute($name, 'editor', $global_editor . '|none');
 			}
 		}
+
+
+		// Only load the GUID if new item
+		if (0 == $id)
+		{
+			$form->setValue('guid', null, ComponentbuilderHelper::GUID());
+		}
 
 		return $form;
 	}
@@ -960,7 +967,14 @@ class ComponentbuilderModelClass_method extends JModelAdmin
 		}
 
 		// make sure the name is safe to be used as a function name
-		$data['name'] = ComponentbuilderHelper::safeClassFunctionName($data['name']);
+		$data['name'] = ComponentbuilderHelper::safeClassFunctionName($data['name']);
+
+		// Set the GUID if empty or not valid
+		if (isset($data['guid']) && !ComponentbuilderHelper::validGUID($data['guid']))
+		{
+			$data['guid'] = (string) ComponentbuilderHelper::GUID();
+		}
+
 
 		// Set the code string to base64 string.
 		if (isset($data['code']))

admin/models/class_property.php

@@ -220,14 +220,14 @@ class ComponentbuilderModelClass_property extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
-		// // check if xpath was set in options
+		// 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
+		// check if clear form was set in options
 		$clear = false;
 		if (isset($options['clear']))
 		{
@@ -329,6 +329,13 @@ class ComponentbuilderModelClass_property extends JModelAdmin
 				$form->setFieldAttribute($name, 'editor', $global_editor . '|none');
 			}
 		}
+
+
+		// Only load the GUID if new item
+		if (0 == $id)
+		{
+			$form->setValue('guid', null, ComponentbuilderHelper::GUID());
+		}
 
 		return $form;
 	}
@@ -951,7 +958,14 @@ class ComponentbuilderModelClass_property extends JModelAdmin
 		}
 
 		// make sure the name is safe to be used as a function name
-		$data['name'] = ComponentbuilderHelper::safeClassFunctionName($data['name']);
+		$data['name'] = ComponentbuilderHelper::safeClassFunctionName($data['name']);
+
+		// Set the GUID if empty or not valid
+		if (isset($data['guid']) && !ComponentbuilderHelper::validGUID($data['guid']))
+		{
+			$data['guid'] = (string) ComponentbuilderHelper::GUID();
+		}
+
 
 		// Set the comment string to base64 string.
 		if (isset($data['comment']))

admin/models/component_admin_views.php

@@ -162,14 +162,14 @@ class ComponentbuilderModelComponent_admin_views extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
-		// // check if xpath was set in options
+		// 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
+		// check if clear form was set in options
 		$clear = false;
 		if (isset($options['clear']))
 		{

admin/models/component_config.php

@@ -161,14 +161,14 @@ class ComponentbuilderModelComponent_config extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
-		// // check if xpath was set in options
+		// 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
+		// check if clear form was set in options
 		$clear = false;
 		if (isset($options['clear']))
 		{

admin/models/component_custom_admin_menus.php

@@ -161,14 +161,14 @@ class ComponentbuilderModelComponent_custom_admin_menus extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
-		// // check if xpath was set in options
+		// 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
+		// check if clear form was set in options
 		$clear = false;
 		if (isset($options['clear']))
 		{

admin/models/component_custom_admin_views.php

@@ -162,14 +162,14 @@ class ComponentbuilderModelComponent_custom_admin_views extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
-		// // check if xpath was set in options
+		// 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
+		// check if clear form was set in options
 		$clear = false;
 		if (isset($options['clear']))
 		{

admin/models/component_dashboard.php

@@ -250,14 +250,14 @@ class ComponentbuilderModelComponent_dashboard extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
-		// // check if xpath was set in options
+		// 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
+		// check if clear form was set in options
 		$clear = false;
 		if (isset($options['clear']))
 		{

admin/models/component_files_folders.php

@@ -198,14 +198,14 @@ class ComponentbuilderModelComponent_files_folders extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
-		// // check if xpath was set in options
+		// 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
+		// check if clear form was set in options
 		$clear = false;
 		if (isset($options['clear']))
 		{

admin/models/component_modules.php

@@ -131,14 +131,14 @@ class ComponentbuilderModelComponent_modules extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
-		// // check if xpath was set in options
+		// 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
+		// check if clear form was set in options
 		$clear = false;
 		if (isset($options['clear']))
 		{

admin/models/component_mysql_tweaks.php

@@ -161,14 +161,14 @@ class ComponentbuilderModelComponent_mysql_tweaks extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
-		// // check if xpath was set in options
+		// 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
+		// check if clear form was set in options
 		$clear = false;
 		if (isset($options['clear']))
 		{

admin/models/component_placeholders.php

@@ -130,14 +130,14 @@ class ComponentbuilderModelComponent_placeholders extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
-		// // check if xpath was set in options
+		// 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
+		// check if clear form was set in options
 		$clear = false;
 		if (isset($options['clear']))
 		{

admin/models/component_plugins.php

@@ -131,14 +131,14 @@ class ComponentbuilderModelComponent_plugins extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
-		// // check if xpath was set in options
+		// 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
+		// check if clear form was set in options
 		$clear = false;
 		if (isset($options['clear']))
 		{

admin/models/component_site_views.php

@@ -162,14 +162,14 @@ class ComponentbuilderModelComponent_site_views extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
-		// // check if xpath was set in options
+		// 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
+		// check if clear form was set in options
 		$clear = false;
 		if (isset($options['clear']))
 		{

admin/models/component_updates.php

@@ -161,14 +161,14 @@ class ComponentbuilderModelComponent_updates extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
-		// // check if xpath was set in options
+		// 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
+		// check if clear form was set in options
 		$clear = false;
 		if (isset($options['clear']))
 		{

admin/models/custom_admin_view.php

@@ -84,6 +84,11 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 				'css'
 			)
 		),
+		'linked_components' => array(
+			'fullwidth' => array(
+				'note_linked_to_notice'
+			)
+		),
 		'custom_buttons' => array(
 			'left' => array(
 				'add_custom_button',
@@ -93,11 +98,6 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 				'php_controller',
 				'php_model'
 			)
-		),
-		'linked_components' => array(
-			'fullwidth' => array(
-				'note_linked_to_notice'
-			)
 		)
 	);
 
@@ -212,28 +212,16 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 				$item->metadata = $registry->toArray();
 			}
 
-			if (!empty($item->php_jview_display))
+			if (!empty($item->css_document))
 			{
-				// base64 Decode php_jview_display.
-				$item->php_jview_display = base64_decode($item->php_jview_display);
+				// base64 Decode css_document.
+				$item->css_document = base64_decode($item->css_document);
 			}
 
-			if (!empty($item->php_view))
+			if (!empty($item->css))
 			{
-				// base64 Decode php_view.
-				$item->php_view = base64_decode($item->php_view);
-			}
-
-			if (!empty($item->default))
-			{
-				// base64 Decode default.
-				$item->default = base64_decode($item->default);
-			}
-
-			if (!empty($item->php_jview))
-			{
-				// base64 Decode php_jview.
-				$item->php_jview = base64_decode($item->php_jview);
+				// base64 Decode css.
+				$item->css = base64_decode($item->css);
 			}
 
 			if (!empty($item->js_document))
@@ -248,10 +236,16 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 				$item->javascript_file = base64_decode($item->javascript_file);
 			}
 
-			if (!empty($item->css_document))
+			if (!empty($item->default))
 			{
-				// base64 Decode css_document.
-				$item->css_document = base64_decode($item->css_document);
+				// base64 Decode default.
+				$item->default = base64_decode($item->default);
+			}
+
+			if (!empty($item->php_ajaxmethod))
+			{
+				// base64 Decode php_ajaxmethod.
+				$item->php_ajaxmethod = base64_decode($item->php_ajaxmethod);
 			}
 
 			if (!empty($item->php_document))
@@ -260,16 +254,22 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 				$item->php_document = base64_decode($item->php_document);
 			}
 
-			if (!empty($item->css))
+			if (!empty($item->php_view))
 			{
-				// base64 Decode css.
-				$item->css = base64_decode($item->css);
+				// base64 Decode php_view.
+				$item->php_view = base64_decode($item->php_view);
 			}
 
-			if (!empty($item->php_ajaxmethod))
+			if (!empty($item->php_jview_display))
 			{
-				// base64 Decode php_ajaxmethod.
-				$item->php_ajaxmethod = base64_decode($item->php_ajaxmethod);
+				// base64 Decode php_jview_display.
+				$item->php_jview_display = base64_decode($item->php_jview_display);
+			}
+
+			if (!empty($item->php_jview))
+			{
+				// base64 Decode php_jview.
+				$item->php_jview = base64_decode($item->php_jview);
 			}
 
 			if (!empty($item->php_controller))
@@ -292,14 +292,6 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 				$item->custom_get = $custom_get->toArray();
 			}
 
-			if (!empty($item->ajax_input))
-			{
-				// Convert the ajax_input field to an array.
-				$ajax_input = new Registry;
-				$ajax_input->loadString($item->ajax_input);
-				$item->ajax_input = $ajax_input->toArray();
-			}
-
 			if (!empty($item->libraries))
 			{
 				// Convert the libraries field to an array.
@@ -308,6 +300,14 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 				$item->libraries = $libraries->toArray();
 			}
 
+			if (!empty($item->ajax_input))
+			{
+				// Convert the ajax_input field to an array.
+				$ajax_input = new Registry;
+				$ajax_input->loadString($item->ajax_input);
+				$item->ajax_input = $ajax_input->toArray();
+			}
+
 			if (!empty($item->custom_button))
 			{
 				// Convert the custom_button field to an array.
@@ -395,14 +395,14 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
-		// // check if xpath was set in options
+		// 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
+		// check if clear form was set in options
 		$clear = false;
 		if (isset($options['clear']))
 		{
@@ -502,6 +502,13 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 				$form->setFieldAttribute($name, 'editor', $global_editor . '|none');
 			}
 		}
+
+
+		// Only load the GUID if new item
+		if (0 == $id)
+		{
+			$form->setValue('guid', null, ComponentbuilderHelper::GUID());
+		}
 
 		return $form;
 	}
@@ -1113,7 +1120,14 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 		{
 			// always make safe string
 			$data['context'] = ComponentbuilderHelper::safeString($data['context']);
-		}
+		}
+
+		// Set the GUID if empty or not valid
+		if (isset($data['guid']) && !ComponentbuilderHelper::validGUID($data['guid']))
+		{
+			$data['guid'] = (string) ComponentbuilderHelper::GUID();
+		}
+
 
 		// Set the custom_get items to data.
 		if (isset($data['custom_get']) && is_array($data['custom_get']))
@@ -1128,19 +1142,6 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 			$data['custom_get'] = '';
 		}
 
-		// Set the ajax_input items to data.
-		if (isset($data['ajax_input']) && is_array($data['ajax_input']))
-		{
-			$ajax_input = new JRegistry;
-			$ajax_input->loadArray($data['ajax_input']);
-			$data['ajax_input'] = (string) $ajax_input;
-		}
-		elseif (!isset($data['ajax_input']))
-		{
-			// Set the empty ajax_input to data
-			$data['ajax_input'] = '';
-		}
-
 		// Set the libraries items to data.
 		if (isset($data['libraries']) && is_array($data['libraries']))
 		{
@@ -1154,6 +1155,19 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 			$data['libraries'] = '';
 		}
 
+		// Set the ajax_input items to data.
+		if (isset($data['ajax_input']) && is_array($data['ajax_input']))
+		{
+			$ajax_input = new JRegistry;
+			$ajax_input->loadArray($data['ajax_input']);
+			$data['ajax_input'] = (string) $ajax_input;
+		}
+		elseif (!isset($data['ajax_input']))
+		{
+			// Set the empty ajax_input to data
+			$data['ajax_input'] = '';
+		}
+
 		// Set the custom_button items to data.
 		if (isset($data['custom_button']) && is_array($data['custom_button']))
 		{
@@ -1167,28 +1181,16 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 			$data['custom_button'] = '';
 		}
 
-		// Set the php_jview_display string to base64 string.
-		if (isset($data['php_jview_display']))
+		// Set the css_document string to base64 string.
+		if (isset($data['css_document']))
 		{
-			$data['php_jview_display'] = base64_encode($data['php_jview_display']);
+			$data['css_document'] = base64_encode($data['css_document']);
 		}
 
-		// Set the php_view string to base64 string.
-		if (isset($data['php_view']))
+		// Set the css string to base64 string.
+		if (isset($data['css']))
 		{
-			$data['php_view'] = base64_encode($data['php_view']);
-		}
-
-		// Set the default string to base64 string.
-		if (isset($data['default']))
-		{
-			$data['default'] = base64_encode($data['default']);
-		}
-
-		// Set the php_jview string to base64 string.
-		if (isset($data['php_jview']))
-		{
-			$data['php_jview'] = base64_encode($data['php_jview']);
+			$data['css'] = base64_encode($data['css']);
 		}
 
 		// Set the js_document string to base64 string.
@@ -1203,10 +1205,16 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 			$data['javascript_file'] = base64_encode($data['javascript_file']);
 		}
 
-		// Set the css_document string to base64 string.
-		if (isset($data['css_document']))
+		// Set the default string to base64 string.
+		if (isset($data['default']))
 		{
-			$data['css_document'] = base64_encode($data['css_document']);
+			$data['default'] = base64_encode($data['default']);
+		}
+
+		// Set the php_ajaxmethod string to base64 string.
+		if (isset($data['php_ajaxmethod']))
+		{
+			$data['php_ajaxmethod'] = base64_encode($data['php_ajaxmethod']);
 		}
 
 		// Set the php_document string to base64 string.
@@ -1215,16 +1223,22 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 			$data['php_document'] = base64_encode($data['php_document']);
 		}
 
-		// Set the css string to base64 string.
-		if (isset($data['css']))
+		// Set the php_view string to base64 string.
+		if (isset($data['php_view']))
 		{
-			$data['css'] = base64_encode($data['css']);
+			$data['php_view'] = base64_encode($data['php_view']);
 		}
 
-		// Set the php_ajaxmethod string to base64 string.
-		if (isset($data['php_ajaxmethod']))
+		// Set the php_jview_display string to base64 string.
+		if (isset($data['php_jview_display']))
 		{
-			$data['php_ajaxmethod'] = base64_encode($data['php_ajaxmethod']);
+			$data['php_jview_display'] = base64_encode($data['php_jview_display']);
+		}
+
+		// Set the php_jview string to base64 string.
+		if (isset($data['php_jview']))
+		{
+			$data['php_jview'] = base64_encode($data['php_jview']);
 		}
 
 		// Set the php_controller string to base64 string.

admin/models/custom_admin_views.php

@@ -239,7 +239,7 @@ class ComponentbuilderModelCustom_admin_views extends JModelList
 			else
 			{
 				$search = $db->quote('%' . $db->escape($search) . '%');
-				$query->where('(a.system_name LIKE '.$search.' OR a.name LIKE '.$search.' OR a.description LIKE '.$search.' OR a.main_get LIKE '.$search.' OR g.name LIKE '.$search.' OR a.context LIKE '.$search.' OR a.codename LIKE '.$search.')');
+				$query->where('(a.system_name LIKE '.$search.' OR a.name LIKE '.$search.' OR a.description LIKE '.$search.' OR a.main_get LIKE '.$search.' OR g.name LIKE '.$search.' OR a.codename LIKE '.$search.' OR a.context LIKE '.$search.')');
 			}
 		}
 
@@ -330,26 +330,26 @@ class ComponentbuilderModelCustom_admin_views extends JModelList
 							continue;
 						}
 
-						// decode php_jview_display
-						$item->php_jview_display = base64_decode($item->php_jview_display);
-						// decode php_view
-						$item->php_view = base64_decode($item->php_view);
-						// decode default
-						$item->default = base64_decode($item->default);
-						// decode php_jview
-						$item->php_jview = base64_decode($item->php_jview);
+						// decode css_document
+						$item->css_document = base64_decode($item->css_document);
+						// decode css
+						$item->css = base64_decode($item->css);
 						// decode js_document
 						$item->js_document = base64_decode($item->js_document);
 						// decode javascript_file
 						$item->javascript_file = base64_decode($item->javascript_file);
-						// decode css_document
-						$item->css_document = base64_decode($item->css_document);
-						// decode php_document
-						$item->php_document = base64_decode($item->php_document);
-						// decode css
-						$item->css = base64_decode($item->css);
+						// decode default
+						$item->default = base64_decode($item->default);
 						// decode php_ajaxmethod
 						$item->php_ajaxmethod = base64_decode($item->php_ajaxmethod);
+						// decode php_document
+						$item->php_document = base64_decode($item->php_document);
+						// decode php_view
+						$item->php_view = base64_decode($item->php_view);
+						// decode php_jview_display
+						$item->php_jview_display = base64_decode($item->php_jview_display);
+						// decode php_jview
+						$item->php_jview = base64_decode($item->php_jview);
 						// decode php_controller
 						$item->php_controller = base64_decode($item->php_controller);
 						// decode php_model

admin/models/custom_code.php

@@ -229,14 +229,14 @@ class ComponentbuilderModelCustom_code extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
-		// // check if xpath was set in options
+		// 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
+		// check if clear form was set in options
 		$clear = false;
 		if (isset($options['clear']))
 		{

admin/models/dynamic_get.php

@@ -51,16 +51,6 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 				'not_required'
 			)
 		),
-		'abacus' => array(
-			'left' => array(
-				'addcalculation'
-			),
-			'fullwidth' => array(
-				'note_calculation_item',
-				'note_calculation_items',
-				'php_calculation'
-			)
-		),
 		'custom_script' => array(
 			'fullwidth' => array(
 				'add_php_before_getitem',
@@ -77,6 +67,16 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 				'php_router_parse'
 			)
 		),
+		'abacus' => array(
+			'left' => array(
+				'addcalculation'
+			),
+			'fullwidth' => array(
+				'note_calculation_item',
+				'note_calculation_items',
+				'php_calculation'
+			)
+		),
 		'joint' => array(
 			'fullwidth' => array(
 				'join_view_table',
@@ -205,28 +205,10 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 				$item->metadata = $registry->toArray();
 			}
 
-			if (!empty($item->php_custom_get))
+			if (!empty($item->php_router_parse))
 			{
-				// base64 Decode php_custom_get.
-				$item->php_custom_get = base64_decode($item->php_custom_get);
-			}
-
-			if (!empty($item->php_before_getitem))
-			{
-				// base64 Decode php_before_getitem.
-				$item->php_before_getitem = base64_decode($item->php_before_getitem);
-			}
-
-			if (!empty($item->php_after_getitem))
-			{
-				// base64 Decode php_after_getitem.
-				$item->php_after_getitem = base64_decode($item->php_after_getitem);
-			}
-
-			if (!empty($item->php_getlistquery))
-			{
-				// base64 Decode php_getlistquery.
-				$item->php_getlistquery = base64_decode($item->php_getlistquery);
+				// base64 Decode php_router_parse.
+				$item->php_router_parse = base64_decode($item->php_router_parse);
 			}
 
 			if (!empty($item->php_before_getitems))
@@ -241,10 +223,22 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 				$item->php_after_getitems = base64_decode($item->php_after_getitems);
 			}
 
-			if (!empty($item->php_router_parse))
+			if (!empty($item->php_after_getitem))
 			{
-				// base64 Decode php_router_parse.
-				$item->php_router_parse = base64_decode($item->php_router_parse);
+				// base64 Decode php_after_getitem.
+				$item->php_after_getitem = base64_decode($item->php_after_getitem);
+			}
+
+			if (!empty($item->php_getlistquery))
+			{
+				// base64 Decode php_getlistquery.
+				$item->php_getlistquery = base64_decode($item->php_getlistquery);
+			}
+
+			if (!empty($item->php_custom_get))
+			{
+				// base64 Decode php_custom_get.
+				$item->php_custom_get = base64_decode($item->php_custom_get);
 			}
 
 			if (!empty($item->php_calculation))
@@ -253,12 +247,10 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 				$item->php_calculation = base64_decode($item->php_calculation);
 			}
 
-			if (!empty($item->join_view_table))
+			if (!empty($item->php_before_getitem))
 			{
-				// Convert the join_view_table field to an array.
-				$join_view_table = new Registry;
-				$join_view_table->loadString($item->join_view_table);
-				$item->join_view_table = $join_view_table->toArray();
+				// base64 Decode php_before_getitem.
+				$item->php_before_getitem = base64_decode($item->php_before_getitem);
 			}
 
 			if (!empty($item->join_db_table))
@@ -309,6 +301,14 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 				$item->global = $global->toArray();
 			}
 
+			if (!empty($item->join_view_table))
+			{
+				// Convert the join_view_table field to an array.
+				$join_view_table = new Registry;
+				$join_view_table->loadString($item->join_view_table);
+				$item->join_view_table = $join_view_table->toArray();
+			}
+
 			if (!empty($item->plugin_events))
 			{
 				// JSON Decode plugin_events.
@@ -409,14 +409,14 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
-		// // check if xpath was set in options
+		// 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
+		// check if clear form was set in options
 		$clear = false;
 		if (isset($options['clear']))
 		{
@@ -516,6 +516,13 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 				$form->setFieldAttribute($name, 'editor', $global_editor . '|none');
 			}
 		}
+
+
+		// Only load the GUID if new item
+		if (0 == $id)
+		{
+			$form->setValue('guid', null, ComponentbuilderHelper::GUID());
+		}
 
 		return $form;
 	}
@@ -1137,18 +1144,13 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 			$data['metadata'] = (string) $metadata;
 		}
 
-		// Set the join_view_table items to data.
-		if (isset($data['join_view_table']) && is_array($data['join_view_table']))
-		{
-			$join_view_table = new JRegistry;
-			$join_view_table->loadArray($data['join_view_table']);
-			$data['join_view_table'] = (string) $join_view_table;
-		}
-		elseif (!isset($data['join_view_table']))
-		{
-			// Set the empty join_view_table to data
-			$data['join_view_table'] = '';
-		}
+
+		// Set the GUID if empty or not valid
+		if (isset($data['guid']) && !ComponentbuilderHelper::validGUID($data['guid']))
+		{
+			$data['guid'] = (string) ComponentbuilderHelper::GUID();
+		}
+
 
 		// Set the join_db_table items to data.
 		if (isset($data['join_db_table']) && is_array($data['join_db_table']))
@@ -1228,34 +1230,29 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 			$data['global'] = '';
 		}
 
+		// Set the join_view_table items to data.
+		if (isset($data['join_view_table']) && is_array($data['join_view_table']))
+		{
+			$join_view_table = new JRegistry;
+			$join_view_table->loadArray($data['join_view_table']);
+			$data['join_view_table'] = (string) $join_view_table;
+		}
+		elseif (!isset($data['join_view_table']))
+		{
+			// Set the empty join_view_table to data
+			$data['join_view_table'] = '';
+		}
+
 		// Set the plugin_events string to JSON string.
 		if (isset($data['plugin_events']))
 		{
 			$data['plugin_events'] = (string) json_encode($data['plugin_events']);
 		}
 
-		// Set the php_custom_get string to base64 string.
-		if (isset($data['php_custom_get']))
+		// Set the php_router_parse string to base64 string.
+		if (isset($data['php_router_parse']))
 		{
-			$data['php_custom_get'] = base64_encode($data['php_custom_get']);
-		}
-
-		// Set the php_before_getitem string to base64 string.
-		if (isset($data['php_before_getitem']))
-		{
-			$data['php_before_getitem'] = base64_encode($data['php_before_getitem']);
-		}
-
-		// Set the php_after_getitem string to base64 string.
-		if (isset($data['php_after_getitem']))
-		{
-			$data['php_after_getitem'] = base64_encode($data['php_after_getitem']);
-		}
-
-		// Set the php_getlistquery string to base64 string.
-		if (isset($data['php_getlistquery']))
-		{
-			$data['php_getlistquery'] = base64_encode($data['php_getlistquery']);
+			$data['php_router_parse'] = base64_encode($data['php_router_parse']);
 		}
 
 		// Set the php_before_getitems string to base64 string.
@@ -1270,16 +1267,34 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 			$data['php_after_getitems'] = base64_encode($data['php_after_getitems']);
 		}
 
-		// Set the php_router_parse string to base64 string.
-		if (isset($data['php_router_parse']))
+		// Set the php_after_getitem string to base64 string.
+		if (isset($data['php_after_getitem']))
 		{
-			$data['php_router_parse'] = base64_encode($data['php_router_parse']);
+			$data['php_after_getitem'] = base64_encode($data['php_after_getitem']);
+		}
+
+		// Set the php_getlistquery string to base64 string.
+		if (isset($data['php_getlistquery']))
+		{
+			$data['php_getlistquery'] = base64_encode($data['php_getlistquery']);
+		}
+
+		// Set the php_custom_get string to base64 string.
+		if (isset($data['php_custom_get']))
+		{
+			$data['php_custom_get'] = base64_encode($data['php_custom_get']);
 		}
 
 		// Set the php_calculation string to base64 string.
 		if (isset($data['php_calculation']))
 		{
 			$data['php_calculation'] = base64_encode($data['php_calculation']);
+		}
+
+		// Set the php_before_getitem string to base64 string.
+		if (isset($data['php_before_getitem']))
+		{
+			$data['php_before_getitem'] = base64_encode($data['php_before_getitem']);
 		}
         
 		// Set the Params Items to data

admin/models/dynamic_gets.php

@@ -313,22 +313,22 @@ class ComponentbuilderModelDynamic_gets extends JModelList
 							continue;
 						}
 
-						// decode php_custom_get
-						$item->php_custom_get = base64_decode($item->php_custom_get);
-						// decode php_before_getitem
-						$item->php_before_getitem = base64_decode($item->php_before_getitem);
-						// decode php_after_getitem
-						$item->php_after_getitem = base64_decode($item->php_after_getitem);
-						// decode php_getlistquery
-						$item->php_getlistquery = base64_decode($item->php_getlistquery);
+						// decode php_router_parse
+						$item->php_router_parse = base64_decode($item->php_router_parse);
 						// decode php_before_getitems
 						$item->php_before_getitems = base64_decode($item->php_before_getitems);
 						// decode php_after_getitems
 						$item->php_after_getitems = base64_decode($item->php_after_getitems);
-						// decode php_router_parse
-						$item->php_router_parse = base64_decode($item->php_router_parse);
+						// decode php_after_getitem
+						$item->php_after_getitem = base64_decode($item->php_after_getitem);
+						// decode php_getlistquery
+						$item->php_getlistquery = base64_decode($item->php_getlistquery);
+						// decode php_custom_get
+						$item->php_custom_get = base64_decode($item->php_custom_get);
 						// decode php_calculation
 						$item->php_calculation = base64_decode($item->php_calculation);
+						// decode php_before_getitem
+						$item->php_before_getitem = base64_decode($item->php_before_getitem);
 						// unset the values we don't want exported.
 						unset($item->asset_id);
 						unset($item->checked_out);

admin/models/field.php

@@ -220,18 +220,18 @@ 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.
 				$item->javascript_view_footer = base64_decode($item->javascript_view_footer);
 			}
 
+			if (!empty($item->css_views))
+			{
+				// base64 Decode css_views.
+				$item->css_views = base64_decode($item->css_views);
+			}
+
 			if (!empty($item->javascript_views_footer))
 			{
 				// base64 Decode javascript_views_footer.
@@ -308,14 +308,14 @@ class ComponentbuilderModelField extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
-		// // check if xpath was set in options
+		// 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
+		// check if clear form was set in options
 		$clear = false;
 		if (isset($options['clear']))
 		{
@@ -415,6 +415,13 @@ class ComponentbuilderModelField extends JModelAdmin
 				$form->setFieldAttribute($name, 'editor', $global_editor . '|none');
 			}
 		}
+
+
+		// Only load the GUID if new item
+		if (0 == $id)
+		{
+			$form->setValue('guid', null, ComponentbuilderHelper::GUID());
+		}
 
 		return $form;
 	}
@@ -1132,7 +1139,14 @@ class ComponentbuilderModelField extends JModelAdmin
 			{
 				$data['xml'] = "<field" . PHP_EOL . implode(PHP_EOL, $bucket) . PHP_EOL . "/>";
 			}
-		}
+		}
+
+		// Set the GUID if empty or not valid
+		if (isset($data['guid']) && !ComponentbuilderHelper::validGUID($data['guid']))
+		{
+			$data['guid'] = (string) ComponentbuilderHelper::GUID();
+		}
+
 
 		// Set the xml string to JSON string.
 		if (isset($data['xml']))
@@ -1164,18 +1178,18 @@ 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']))
 		{
 			$data['javascript_view_footer'] = base64_encode($data['javascript_view_footer']);
 		}
 
+		// Set the css_views string to base64 string.
+		if (isset($data['css_views']))
+		{
+			$data['css_views'] = base64_encode($data['css_views']);
+		}
+
 		// Set the javascript_views_footer string to base64 string.
 		if (isset($data['javascript_views_footer']))
 		{

admin/models/fields.php

@@ -437,10 +437,10 @@ class ComponentbuilderModelFields extends JModelList
 						$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 css_views
+						$item->css_views = base64_decode($item->css_views);
 						// decode javascript_views_footer
 						$item->javascript_views_footer = base64_decode($item->javascript_views_footer);
 						// decode initiator_on_save_model

admin/models/fieldtype.php

@@ -450,14 +450,14 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
-		// // check if xpath was set in options
+		// 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
+		// check if clear form was set in options
 		$clear = false;
 		if (isset($options['clear']))
 		{
@@ -541,6 +541,13 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 				$form->setValue($redirectedField, null, $redirectedValue);
 			}
 		}
+
+		// Only load the GUID if new item
+		if (0 == $id)
+		{
+			$form->setValue('guid', null, ComponentbuilderHelper::GUID());
+		}
+
 		return $form;
 	}
 
@@ -1186,6 +1193,14 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 			$data['metadata'] = (string) $metadata;
 		}
 
+
+		// Set the GUID if empty or not valid
+		if (isset($data['guid']) && !ComponentbuilderHelper::validGUID($data['guid']))
+		{
+			$data['guid'] = (string) ComponentbuilderHelper::GUID();
+		}
+
+
 		// Set the properties items to data.
 		if (isset($data['properties']) && is_array($data['properties']))
 		{

admin/models/forms/class_method.xml

@@ -138,6 +138,20 @@
 			<option value="modules">
 				COM_COMPONENTBUILDER_CLASS_METHOD_MODULES</option>
 		</field>
+		<!-- Guid Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="guid"
+			label="COM_COMPONENTBUILDER_CLASS_METHOD_GUID_LABEL"
+			size="40"
+			maxlength="40"
+			description="COM_COMPONENTBUILDER_CLASS_METHOD_GUID_DESCRIPTION"
+			class="text_area"
+			readonly="true"
+			filter="CMD"
+			validate="guid"
+			hint="COM_COMPONENTBUILDER_CLASS_METHOD_GUID_HINT"
+		/>
 		<!-- Code Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"

admin/models/forms/class_property.xml

@@ -138,6 +138,20 @@
 			<option value="modules">
 				COM_COMPONENTBUILDER_CLASS_PROPERTY_MODULES</option>
 		</field>
+		<!-- Guid Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="guid"
+			label="COM_COMPONENTBUILDER_CLASS_PROPERTY_GUID_LABEL"
+			size="40"
+			maxlength="40"
+			description="COM_COMPONENTBUILDER_CLASS_PROPERTY_GUID_DESCRIPTION"
+			class="text_area"
+			readonly="true"
+			filter="CMD"
+			validate="guid"
+			hint="COM_COMPONENTBUILDER_CLASS_PROPERTY_GUID_HINT"
+		/>
 		<!-- Comment Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"

admin/models/forms/custom_admin_view.xml

@@ -142,111 +142,101 @@
 			required="true"
 			button="true"
 		/>
-		<!-- Php_jview_display Field. Type: Editor. (joomla) -->
-		<field
-			type="editor"
-			name="php_jview_display"
-			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_DISPLAY_LABEL"
-			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_DISPLAY_DESCRIPTION"
-			width="100%"
-			height="450px"
-			cols="15"
-			rows="30"
-			buttons="no"
-			syntax="php"
-			editor="codemirror|none"
-			filter="raw"
-			validate="code"
-		/>
 		<!-- Note_add_language_string Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_add_language_string" label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_ADD_LANGUAGE_STRING_LABEL" description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_ADD_LANGUAGE_STRING_DESCRIPTION" heading="h4" class="note_add_language_string" />
-		<!-- Php_view Field. Type: Editor. (joomla) -->
+		<!-- Add_php_jview_display Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_php_jview_display"
+			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_JVIEW_DISPLAY_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
+		</field>
+		<!-- Css_document Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_view"
-			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_VIEW_LABEL"
-			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_VIEW_DESCRIPTION"
+			name="css_document"
+			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_DOCUMENT_LABEL"
+			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_DOCUMENT_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
 			rows="30"
 			buttons="no"
-			syntax="php"
+			syntax="css"
 			editor="codemirror|none"
 			filter="raw"
 			validate="code"
 		/>
-		<!-- Add_css_document Field. Type: Radio. (joomla) -->
+		<!-- Css Field. Type: Editor. (joomla) -->
 		<field
-			type="radio"
-			name="add_css_document"
-			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_CSS_DOCUMENT_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
-		</field>
-		<!-- Add_css Field. Type: Radio. (joomla) -->
+			type="editor"
+			name="css"
+			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_LABEL"
+			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="css"
+			editor="codemirror|none"
+			filter="raw"
+			validate="code"
+		/>
+		<!-- Js_document Field. Type: Editor. (joomla) -->
 		<field
-			type="radio"
-			name="add_css"
-			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_CSS_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
-		</field>
-		<!-- Add_js_document Field. Type: Radio. (joomla) -->
+			type="editor"
+			name="js_document"
+			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JS_DOCUMENT_LABEL"
+			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JS_DOCUMENT_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="javascript"
+			editor="codemirror|none"
+			filter="raw"
+			validate="code"
+		/>
+		<!-- Javascript_file Field. Type: Editor. (joomla) -->
 		<field
-			type="radio"
-			name="add_js_document"
-			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_JS_DOCUMENT_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
-		</field>
-		<!-- Add_javascript_file Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_javascript_file"
-			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_JAVASCRIPT_FILE_LABEL"
-			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_JAVASCRIPT_FILE_DESCRIPTION"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
-		</field>
+			type="editor"
+			name="javascript_file"
+			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JAVASCRIPT_FILE_LABEL"
+			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JAVASCRIPT_FILE_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="javascript"
+			editor="codemirror|none"
+			filter="raw"
+			validate="code"
+		/>
 		<!-- Note_libraries_selection Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_libraries_selection" label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_LIBRARIES_SELECTION_LABEL" description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_LIBRARIES_SELECTION_DESCRIPTION" heading="h4" class="alert alert-info note_libraries_selection" />
-		<!-- Context Field. Type: Text. (joomla) -->
+		<!-- Codename Field. Type: Text. (joomla) -->
 		<field
 			type="text"
-			name="context"
-			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CONTEXT_LABEL"
-			size="40"
-			maxlength="50"
-			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CONTEXT_DESCRIPTION"
+			name="codename"
+			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CODENAME_LABEL"
+			size="80"
+			maxlength="150"
+			default=""
+			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CODENAME_DESCRIPTION"
 			class="text_area"
-			filter="WORD"
-			message="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CONTEXT_MESSAGE"
-			hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CONTEXT_HINT"
+			filter="CMD"
+			message="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CODENAME_MESSAGE"
+			hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CODENAME_HINT"
 		/>
 		<!-- Note_snippet_usage Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_snippet_usage" label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_SNIPPET_USAGE_LABEL" heading="h4" class="snippet-usage note_snippet_usage" />
@@ -287,12 +277,85 @@
 			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ICON_DESCRIPTION"
 			directory=""
 		/>
-		<!-- Php_jview Field. Type: Editor. (joomla) -->
+		<!-- Add_php_jview Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_php_jview"
+			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_JVIEW_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
+		</field>
+		<!-- Context Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="context"
+			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CONTEXT_LABEL"
+			size="40"
+			maxlength="50"
+			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CONTEXT_DESCRIPTION"
+			class="text_area"
+			filter="WORD"
+			message="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CONTEXT_MESSAGE"
+			hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CONTEXT_HINT"
+		/>
+		<!-- Note_linked_to_notice Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_linked_to_notice" label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_LINKED_TO_NOTICE_LABEL" description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_LINKED_TO_NOTICE_DESCRIPTION" heading="h4" class="note_linked_to_notice" />
+		<!-- Not_required Field. Type: Hidden. (joomla) -->
+		<field
+			type="hidden"
+			name="not_required"
+			default="[]"
+		/>
+		<!-- Add_js_document Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_js_document"
+			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_JS_DOCUMENT_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
+		</field>
+		<!-- Custom_get Field. Type: Customgets. (custom) -->
+		<field
+			type="customgets"
+			name="custom_get"
+			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_GET_LABEL"
+			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_GET_DESCRIPTION"
+			multiple="true"
+			default=""
+		/>
+		<!-- Add_javascript_file Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_javascript_file"
+			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_JAVASCRIPT_FILE_LABEL"
+			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_JAVASCRIPT_FILE_DESCRIPTION"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
+		</field>
+		<!-- Php_ajaxmethod Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_jview"
-			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_LABEL"
-			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_DESCRIPTION"
+			name="php_ajaxmethod"
+			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_AJAXMETHOD_LABEL"
+			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_AJAXMETHOD_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
@@ -303,51 +366,62 @@
 			filter="raw"
 			validate="code"
 		/>
-		<!-- Not_required Field. Type: Hidden. (joomla) -->
+		<!-- Add_css_document Field. Type: Radio. (joomla) -->
 		<field
-			type="hidden"
-			name="not_required"
-			default="[]"
-		/>
-		<!-- Codename Field. Type: Text. (joomla) -->
+			type="radio"
+			name="add_css_document"
+			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_CSS_DOCUMENT_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
+		</field>
+		<!-- Add_php_document Field. Type: Radio. (joomla) -->
 		<field
-			type="text"
-			name="codename"
-			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CODENAME_LABEL"
-			size="80"
-			maxlength="150"
-			default=""
-			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CODENAME_DESCRIPTION"
-			class="text_area"
-			filter="CMD"
-			message="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CODENAME_MESSAGE"
-			hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CODENAME_HINT"
-		/>
-		<!-- Custom_get Field. Type: Customgets. (custom) -->
+			type="radio"
+			name="add_php_document"
+			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_DOCUMENT_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
+		</field>
+		<!-- Add_css Field. Type: Radio. (joomla) -->
 		<field
-			type="customgets"
-			name="custom_get"
-			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_GET_LABEL"
-			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_GET_DESCRIPTION"
-			multiple="true"
-			default=""
-		/>
-		<!-- Js_document Field. Type: Editor. (joomla) -->
+			type="radio"
+			name="add_css"
+			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_CSS_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
+		</field>
+		<!-- Add_php_view Field. Type: Radio. (joomla) -->
 		<field
-			type="editor"
-			name="js_document"
-			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JS_DOCUMENT_LABEL"
-			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JS_DOCUMENT_DESCRIPTION"
-			width="100%"
-			height="450px"
-			cols="15"
-			rows="30"
-			buttons="no"
-			syntax="javascript"
-			editor="codemirror|none"
-			filter="raw"
-			validate="code"
-		/>
+			type="radio"
+			name="add_php_view"
+			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_VIEW_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
+		</field>
 		<!-- Add_php_ajax Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -362,21 +436,17 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
 		</field>
-		<!-- Javascript_file Field. Type: Editor. (joomla) -->
+		<!-- Libraries Field. Type: Libraries. (custom) -->
 		<field
-			type="editor"
-			name="javascript_file"
-			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JAVASCRIPT_FILE_LABEL"
-			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JAVASCRIPT_FILE_DESCRIPTION"
-			width="100%"
-			height="450px"
-			cols="15"
-			rows="30"
-			buttons="no"
-			syntax="javascript"
-			editor="codemirror|none"
-			filter="raw"
-			validate="code"
+			type="libraries"
+			name="libraries"
+			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LIBRARIES_LABEL"
+			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LIBRARIES_DESCRIPTION"
+			class="list_class"
+			multiple="true"
+			default="0"
+			required="false"
+			button="true"
 		/>
 		<!-- Ajax_input Field. Type: Subform. (joomla) -->
 		<field
@@ -518,21 +588,15 @@
 				/>
 			</form>
 		</field>
-		<!-- Css_document Field. Type: Editor. (joomla) -->
+		<!-- Dynamic_get Field. Type: Dynamicgets. (custom) -->
 		<field
-			type="editor"
-			name="css_document"
-			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_DOCUMENT_LABEL"
-			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_DOCUMENT_DESCRIPTION"
-			width="100%"
-			height="450px"
-			cols="15"
-			rows="30"
-			buttons="no"
-			syntax="css"
-			editor="codemirror|none"
-			filter="raw"
-			validate="code"
+			type="dynamicgets"
+			name="dynamic_get"
+			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DYNAMIC_GET_LABEL"
+			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DYNAMIC_GET_DESCRIPTION"
+			multiple="false"
+			default=""
+			required="false"
 		/>
 		<!-- Php_document Field. Type: Editor. (joomla) -->
 		<field
@@ -550,40 +614,14 @@
 			filter="raw"
 			validate="code"
 		/>
-		<!-- Css Field. Type: Editor. (joomla) -->
+		<!-- Dynamic_values Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="dynamic_values" label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DYNAMIC_VALUES_LABEL" description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DYNAMIC_VALUES_DESCRIPTION" heading="h4" class="dynamic_values" />
+		<!-- Php_view Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="css"
-			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_LABEL"
-			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_DESCRIPTION"
-			width="100%"
-			height="450px"
-			cols="15"
-			rows="30"
-			buttons="no"
-			syntax="css"
-			editor="codemirror|none"
-			filter="raw"
-			validate="code"
-		/>
-		<!-- Libraries Field. Type: Libraries. (custom) -->
-		<field
-			type="libraries"
-			name="libraries"
-			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LIBRARIES_LABEL"
-			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LIBRARIES_DESCRIPTION"
-			class="list_class"
-			multiple="true"
-			default="0"
-			required="false"
-			button="true"
-		/>
-		<!-- Php_ajaxmethod Field. Type: Editor. (joomla) -->
-		<field
-			type="editor"
-			name="php_ajaxmethod"
-			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_AJAXMETHOD_LABEL"
-			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_AJAXMETHOD_DESCRIPTION"
+			name="php_view"
+			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_VIEW_LABEL"
+			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_VIEW_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
@@ -594,46 +632,6 @@
 			filter="raw"
 			validate="code"
 		/>
-		<!-- Dynamic_get Field. Type: Dynamicgets. (custom) -->
-		<field
-			type="dynamicgets"
-			name="dynamic_get"
-			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DYNAMIC_GET_LABEL"
-			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DYNAMIC_GET_DESCRIPTION"
-			multiple="false"
-			default=""
-			required="false"
-		/>
-		<!-- Add_php_document Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_php_document"
-			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_DOCUMENT_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
-		</field>
-		<!-- Dynamic_values Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="dynamic_values" label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DYNAMIC_VALUES_LABEL" description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DYNAMIC_VALUES_DESCRIPTION" heading="h4" class="dynamic_values" />
-		<!-- Add_php_view Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_php_view"
-			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_VIEW_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
-		</field>
 		<!-- Add_custom_button Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -648,20 +646,22 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
 		</field>
-		<!-- Add_php_jview_display Field. Type: Radio. (joomla) -->
+		<!-- Php_jview_display Field. Type: Editor. (joomla) -->
 		<field
-			type="radio"
-			name="add_php_jview_display"
-			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_JVIEW_DISPLAY_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
-		</field>
+			type="editor"
+			name="php_jview_display"
+			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_DISPLAY_LABEL"
+			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_DISPLAY_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="raw"
+			validate="code"
+		/>
 		<!-- Custom_button Field. Type: Subform. (joomla) -->
 		<field
 			type="subform"
@@ -1170,20 +1170,22 @@
 				</field>
 			</form>
 		</field>
-		<!-- Add_php_jview Field. Type: Radio. (joomla) -->
+		<!-- Php_jview Field. Type: Editor. (joomla) -->
 		<field
-			type="radio"
-			name="add_php_jview"
-			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_JVIEW_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
-		</field>
+			type="editor"
+			name="php_jview"
+			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_LABEL"
+			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="raw"
+			validate="code"
+		/>
 		<!-- Php_controller Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
@@ -1200,8 +1202,20 @@
 			filter="raw"
 			validate="code"
 		/>
-		<!-- Note_linked_to_notice Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_linked_to_notice" label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_LINKED_TO_NOTICE_LABEL" description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_LINKED_TO_NOTICE_DESCRIPTION" heading="h4" class="note_linked_to_notice" />
+		<!-- Guid Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="guid"
+			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_GUID_LABEL"
+			size="40"
+			maxlength="40"
+			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_GUID_DESCRIPTION"
+			class="text_area"
+			readonly="true"
+			filter="CMD"
+			validate="guid"
+			hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_GUID_HINT"
+		/>
 		<!-- Php_model Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"

admin/models/forms/field.xml

@@ -232,8 +232,6 @@
 			description="COM_COMPONENTBUILDER_FIELD_CATID_DESCRIPTION"
 			class="inputbox"
 		/>
-		<!-- 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) -->
@@ -313,48 +311,54 @@
 			<option value="Other">
 				COM_COMPONENTBUILDER_FIELD_OTHER</option>
 		</field>
-		<!-- Add_javascript_views_footer Field. Type: Radio. (joomla) -->
+		<!-- Css_view Field. Type: Editor. (joomla) -->
 		<field
-			type="radio"
-			name="add_javascript_views_footer"
-			label="COM_COMPONENTBUILDER_FIELD_ADD_JAVASCRIPT_VIEWS_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_javascript_view_footer Field. Type: Radio. (joomla) -->
+			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"
+		/>
+		<!-- Javascript_view_footer Field. Type: Editor. (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) -->
+			type="editor"
+			name="javascript_view_footer"
+			label="COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEW_FOOTER_LABEL"
+			description="COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEW_FOOTER_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="javascript"
+			editor="codemirror|none"
+			filter="raw"
+			validate="code"
+		/>
+		<!-- Css_views Field. Type: Editor. (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>
+			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"
+		/>
 		<!-- Datadefault_other Field. Type: Text. (joomla) -->
 		<field
 			type="text"
@@ -408,80 +412,8 @@
 			message="COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_MESSAGE"
 			hint="COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_HINT"
 		/>
-		<!-- 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>
-		<!-- 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) -->
-		<field
-			type="editor"
-			name="javascript_view_footer"
-			label="COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEW_FOOTER_LABEL"
-			description="COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEW_FOOTER_DESCRIPTION"
-			width="100%"
-			height="450px"
-			cols="15"
-			rows="30"
-			buttons="no"
-			syntax="javascript"
-			editor="codemirror|none"
-			filter="raw"
-			validate="code"
-		/>
-		<!-- 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" />
+		<!-- 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" />
 		<!-- Javascript_views_footer Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
@@ -498,6 +430,81 @@
 			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>
+		<!-- Xml Field. Type: Hidden. (joomla) -->
+		<field
+			type="hidden"
+			name="xml"
+			default="1"
+			filter="raw"
+		/>
+		<!-- 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>
+		<!-- Not_required Field. Type: Hidden. (joomla) -->
+		<field
+			type="hidden"
+			name="not_required"
+			default="[]"
+		/>
+		<!-- 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>
+		<!-- 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" />
+		<!-- Add_javascript_views_footer Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_javascript_views_footer"
+			label="COM_COMPONENTBUILDER_FIELD_ADD_JAVASCRIPT_VIEWS_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>
+		<!-- 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" />
+		<!-- Helpnote Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="helpnote" label="COM_COMPONENTBUILDER_FIELD_HELPNOTE_LABEL" class="helpNote helpnote" />
 		<!-- Initiator_on_save_model Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
@@ -511,12 +518,19 @@
 			hint="COM_COMPONENTBUILDER_FIELD_INITIATOR_ON_SAVE_MODEL_HINT"
 			required="false"
 		/>
-		<!-- Xml Field. Type: Hidden. (joomla) -->
+		<!-- Guid Field. Type: Text. (joomla) -->
 		<field
-			type="hidden"
-			name="xml"
-			default="1"
-			filter="raw"
+			type="text"
+			name="guid"
+			label="COM_COMPONENTBUILDER_FIELD_GUID_LABEL"
+			size="40"
+			maxlength="40"
+			description="COM_COMPONENTBUILDER_FIELD_GUID_DESCRIPTION"
+			class="text_area"
+			readonly="true"
+			filter="CMD"
+			validate="guid"
+			hint="COM_COMPONENTBUILDER_FIELD_GUID_HINT"
 		/>
 		<!-- Note_select_field_type Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_select_field_type" label="COM_COMPONENTBUILDER_FIELD_NOTE_SELECT_FIELD_TYPE_LABEL" description="COM_COMPONENTBUILDER_FIELD_NOTE_SELECT_FIELD_TYPE_DESCRIPTION" heading="h4" class="alert alert-info note_select_field_type" />

admin/models/forms/fieldtype.xml

@@ -101,6 +101,33 @@
 			message="COM_COMPONENTBUILDER_FIELDTYPE_NAME_MESSAGE"
 			hint="COM_COMPONENTBUILDER_FIELDTYPE_NAME_HINT"
 		/>
+		<!-- Store Field. Type: List. (joomla) -->
+		<field
+			type="list"
+			name="store"
+			label="COM_COMPONENTBUILDER_FIELDTYPE_STORE_LABEL"
+			description="COM_COMPONENTBUILDER_FIELDTYPE_STORE_DESCRIPTION"
+			class="list_class"
+			multiple="false"
+			filter="INT"
+			required="true"
+			default="0">
+			<!-- Option Set. -->
+			<option value="0">
+				COM_COMPONENTBUILDER_FIELDTYPE_DEFAULT</option>
+			<option value="1">
+				COM_COMPONENTBUILDER_FIELDTYPE_JSON</option>
+			<option value="2">
+				COM_COMPONENTBUILDER_FIELDTYPE_BASESIXTY_FOUR</option>
+			<option value="3">
+				COM_COMPONENTBUILDER_FIELDTYPE_BASIC_ENCRYPTION_LOCALDBKEY</option>
+			<option value="5">
+				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>
 		<!-- Null_switch Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -186,42 +213,6 @@
 			message="COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_OTHER_MESSAGE"
 			hint="COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_OTHER_HINT"
 		/>
-		<!-- Datalenght Field. Type: List. (joomla) -->
-		<field
-			type="list"
-			name="datalenght"
-			label="COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_LABEL"
-			description="COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_DESCRIPTION"
-			class="btn-group"
-			multiple="false"
-			required="true"
-			default="">
-			<!-- Option Set. -->
-			<option value="">
-				COM_COMPONENTBUILDER_FIELDTYPE_NONE_SET</option>
-			<option value="1">
-				COM_COMPONENTBUILDER_FIELDTYPE_ONE</option>
-			<option value="7">
-				COM_COMPONENTBUILDER_FIELDTYPE_SEVEN</option>
-			<option value="10">
-				COM_COMPONENTBUILDER_FIELDTYPE_TEN</option>
-			<option value="11">
-				COM_COMPONENTBUILDER_FIELDTYPE_ELEVEN</option>
-			<option value="50">
-				COM_COMPONENTBUILDER_FIELDTYPE_FIFTY</option>
-			<option value="64">
-				COM_COMPONENTBUILDER_FIELDTYPE_SIXTY_FOUR</option>
-			<option value="100">
-				COM_COMPONENTBUILDER_FIELDTYPE_ONE_HUNDRED</option>
-			<option value="255">
-				COM_COMPONENTBUILDER_FIELDTYPE_TWO_HUNDRED_AND_FIFTY_FIVE</option>
-			<option value="1024">
-				COM_COMPONENTBUILDER_FIELDTYPE_ONE_THOUSAND_AND_TWENTY_FOUR</option>
-			<option value="2048">
-				COM_COMPONENTBUILDER_FIELDTYPE_TWO_THOUSAND_AND_FORTY_EIGHT</option>
-			<option value="Other">
-				COM_COMPONENTBUILDER_FIELDTYPE_OTHER</option>
-		</field>
 		<!-- Short_description Field. Type: Text. (joomla) -->
 		<field
 			type="text"
@@ -236,6 +227,56 @@
 			message="COM_COMPONENTBUILDER_FIELDTYPE_SHORT_DESCRIPTION_MESSAGE"
 			hint="COM_COMPONENTBUILDER_FIELDTYPE_SHORT_DESCRIPTION_HINT"
 		/>
+		<!-- Datatype Field. Type: List. (joomla) -->
+		<field
+			type="list"
+			name="datatype"
+			label="COM_COMPONENTBUILDER_FIELDTYPE_DATATYPE_LABEL"
+			description="COM_COMPONENTBUILDER_FIELDTYPE_DATATYPE_DESCRIPTION"
+			class="btn-group"
+			multiple="false"
+			required="true"
+			default="">
+			<!-- Option Set. -->
+			<option value="">
+				COM_COMPONENTBUILDER_FIELDTYPE_SELECT_AN_OPTION</option>
+			<option value="CHAR">
+				COM_COMPONENTBUILDER_FIELDTYPE_CHAR</option>
+			<option value="VARCHAR">
+				COM_COMPONENTBUILDER_FIELDTYPE_VARCHAR</option>
+			<option value="TEXT">
+				COM_COMPONENTBUILDER_FIELDTYPE_TEXT</option>
+			<option value="MEDIUMTEXT">
+				COM_COMPONENTBUILDER_FIELDTYPE_MEDIUMTEXT</option>
+			<option value="LONGTEXT">
+				COM_COMPONENTBUILDER_FIELDTYPE_LONGTEXT</option>
+			<option value="BLOB">
+				COM_COMPONENTBUILDER_FIELDTYPE_BLOB</option>
+			<option value="TINYBLOB">
+				COM_COMPONENTBUILDER_FIELDTYPE_TINYBLOB</option>
+			<option value="MEDIUMBLOB">
+				COM_COMPONENTBUILDER_FIELDTYPE_MEDIUMBLOB</option>
+			<option value="LONGBLOB">
+				COM_COMPONENTBUILDER_FIELDTYPE_LONGBLOB</option>
+			<option value="DATETIME">
+				COM_COMPONENTBUILDER_FIELDTYPE_DATETIME</option>
+			<option value="DATE">
+				COM_COMPONENTBUILDER_FIELDTYPE_DATE</option>
+			<option value="TIME">
+				COM_COMPONENTBUILDER_FIELDTYPE_TIME</option>
+			<option value="INT">
+				COM_COMPONENTBUILDER_FIELDTYPE_INT</option>
+			<option value="TINYINT">
+				COM_COMPONENTBUILDER_FIELDTYPE_TINYINT</option>
+			<option value="BIGINT">
+				COM_COMPONENTBUILDER_FIELDTYPE_BIGINT</option>
+			<option value="FLOAT">
+				COM_COMPONENTBUILDER_FIELDTYPE_FLOAT</option>
+			<option value="DECIMAL">
+				COM_COMPONENTBUILDER_FIELDTYPE_DECIMAL</option>
+			<option value="DOUBLE">
+				COM_COMPONENTBUILDER_FIELDTYPE_DOUBLE</option>
+		</field>
 		<!-- Has_defaults Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -351,85 +392,58 @@
 			filter="HTML"
 			hint="COM_COMPONENTBUILDER_FIELDTYPE_DESCRIPTION_HINT"
 		/>
-		<!-- Store Field. Type: List. (joomla) -->
+		<!-- Note_whmcs_encryption Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_whmcs_encryption" label="COM_COMPONENTBUILDER_FIELDTYPE_NOTE_WHMCS_ENCRYPTION_LABEL" description="COM_COMPONENTBUILDER_FIELDTYPE_NOTE_WHMCS_ENCRYPTION_DESCRIPTION" heading="h4" class="alert alert-success note_whmcs_encryption" />
+		<!-- Datalenght Field. Type: List. (joomla) -->
 		<field
 			type="list"
-			name="store"
-			label="COM_COMPONENTBUILDER_FIELDTYPE_STORE_LABEL"
-			description="COM_COMPONENTBUILDER_FIELDTYPE_STORE_DESCRIPTION"
-			class="list_class"
-			multiple="false"
-			filter="INT"
-			required="true"
-			default="0">
-			<!-- Option Set. -->
-			<option value="0">
-				COM_COMPONENTBUILDER_FIELDTYPE_DEFAULT</option>
-			<option value="1">
-				COM_COMPONENTBUILDER_FIELDTYPE_JSON</option>
-			<option value="2">
-				COM_COMPONENTBUILDER_FIELDTYPE_BASESIXTY_FOUR</option>
-			<option value="3">
-				COM_COMPONENTBUILDER_FIELDTYPE_BASIC_ENCRYPTION_LOCALDBKEY</option>
-			<option value="5">
-				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
-			type="list"
-			name="datatype"
-			label="COM_COMPONENTBUILDER_FIELDTYPE_DATATYPE_LABEL"
-			description="COM_COMPONENTBUILDER_FIELDTYPE_DATATYPE_DESCRIPTION"
+			name="datalenght"
+			label="COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_LABEL"
+			description="COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_DESCRIPTION"
 			class="btn-group"
 			multiple="false"
 			required="true"
 			default="">
 			<!-- Option Set. -->
 			<option value="">
-				COM_COMPONENTBUILDER_FIELDTYPE_SELECT_AN_OPTION</option>
-			<option value="CHAR">
-				COM_COMPONENTBUILDER_FIELDTYPE_CHAR</option>
-			<option value="VARCHAR">
-				COM_COMPONENTBUILDER_FIELDTYPE_VARCHAR</option>
-			<option value="TEXT">
-				COM_COMPONENTBUILDER_FIELDTYPE_TEXT</option>
-			<option value="MEDIUMTEXT">
-				COM_COMPONENTBUILDER_FIELDTYPE_MEDIUMTEXT</option>
-			<option value="LONGTEXT">
-				COM_COMPONENTBUILDER_FIELDTYPE_LONGTEXT</option>
-			<option value="BLOB">
-				COM_COMPONENTBUILDER_FIELDTYPE_BLOB</option>
-			<option value="TINYBLOB">
-				COM_COMPONENTBUILDER_FIELDTYPE_TINYBLOB</option>
-			<option value="MEDIUMBLOB">
-				COM_COMPONENTBUILDER_FIELDTYPE_MEDIUMBLOB</option>
-			<option value="LONGBLOB">
-				COM_COMPONENTBUILDER_FIELDTYPE_LONGBLOB</option>
-			<option value="DATETIME">
-				COM_COMPONENTBUILDER_FIELDTYPE_DATETIME</option>
-			<option value="DATE">
-				COM_COMPONENTBUILDER_FIELDTYPE_DATE</option>
-			<option value="TIME">
-				COM_COMPONENTBUILDER_FIELDTYPE_TIME</option>
-			<option value="INT">
-				COM_COMPONENTBUILDER_FIELDTYPE_INT</option>
-			<option value="TINYINT">
-				COM_COMPONENTBUILDER_FIELDTYPE_TINYINT</option>
-			<option value="BIGINT">
-				COM_COMPONENTBUILDER_FIELDTYPE_BIGINT</option>
-			<option value="FLOAT">
-				COM_COMPONENTBUILDER_FIELDTYPE_FLOAT</option>
-			<option value="DECIMAL">
-				COM_COMPONENTBUILDER_FIELDTYPE_DECIMAL</option>
-			<option value="DOUBLE">
-				COM_COMPONENTBUILDER_FIELDTYPE_DOUBLE</option>
+				COM_COMPONENTBUILDER_FIELDTYPE_NONE_SET</option>
+			<option value="1">
+				COM_COMPONENTBUILDER_FIELDTYPE_ONE</option>
+			<option value="7">
+				COM_COMPONENTBUILDER_FIELDTYPE_SEVEN</option>
+			<option value="10">
+				COM_COMPONENTBUILDER_FIELDTYPE_TEN</option>
+			<option value="11">
+				COM_COMPONENTBUILDER_FIELDTYPE_ELEVEN</option>
+			<option value="50">
+				COM_COMPONENTBUILDER_FIELDTYPE_FIFTY</option>
+			<option value="64">
+				COM_COMPONENTBUILDER_FIELDTYPE_SIXTY_FOUR</option>
+			<option value="100">
+				COM_COMPONENTBUILDER_FIELDTYPE_ONE_HUNDRED</option>
+			<option value="255">
+				COM_COMPONENTBUILDER_FIELDTYPE_TWO_HUNDRED_AND_FIFTY_FIVE</option>
+			<option value="1024">
+				COM_COMPONENTBUILDER_FIELDTYPE_ONE_THOUSAND_AND_TWENTY_FOUR</option>
+			<option value="2048">
+				COM_COMPONENTBUILDER_FIELDTYPE_TWO_THOUSAND_AND_FORTY_EIGHT</option>
+			<option value="Other">
+				COM_COMPONENTBUILDER_FIELDTYPE_OTHER</option>
 		</field>
-		<!-- Note_whmcs_encryption Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_whmcs_encryption" label="COM_COMPONENTBUILDER_FIELDTYPE_NOTE_WHMCS_ENCRYPTION_LABEL" description="COM_COMPONENTBUILDER_FIELDTYPE_NOTE_WHMCS_ENCRYPTION_DESCRIPTION" heading="h4" class="alert alert-success note_whmcs_encryption" />
+		<!-- Guid Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="guid"
+			label="COM_COMPONENTBUILDER_FIELDTYPE_GUID_LABEL"
+			size="40"
+			maxlength="40"
+			description="COM_COMPONENTBUILDER_FIELDTYPE_GUID_DESCRIPTION"
+			class="text_area"
+			readonly="true"
+			filter="CMD"
+			validate="guid"
+			hint="COM_COMPONENTBUILDER_FIELDTYPE_GUID_HINT"
+		/>
 		<!-- Catid Field. Type: Category. (joomla) -->
 		<field
 			type="category"

admin/models/forms/joomla_module.xml

@@ -111,126 +111,91 @@
 			filter="HTML"
 			hint="COM_COMPONENTBUILDER_JOOMLA_MODULE_DESCRIPTION_HINT"
 		/>
-		<!-- Php_method_uninstall Field. Type: Editor. (joomla) -->
+		<!-- Add_php_postflight_install Field. Type: Radio. (joomla) -->
 		<field
-			type="editor"
-			name="php_method_uninstall"
-			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_PHP_METHOD_UNINSTALL_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_PHP_METHOD_UNINSTALL_DESCRIPTION"
-			width="100%"
-			height="450px"
-			cols="15"
-			rows="30"
-			buttons="no"
-			syntax="php"
-			editor="codemirror|none"
-			filter="raw"
-			validate="code"
-		/>
-		<!-- Php_postflight_install Field. Type: Editor. (joomla) -->
+			type="radio"
+			name="add_php_postflight_install"
+			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_PHP_POSTFLIGHT_INSTALL_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_JOOMLA_MODULE_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_JOOMLA_MODULE_NO</option>
+		</field>
+		<!-- Add_php_preflight_uninstall Field. Type: Radio. (joomla) -->
 		<field
-			type="editor"
-			name="php_postflight_install"
-			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_PHP_POSTFLIGHT_INSTALL_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_PHP_POSTFLIGHT_INSTALL_DESCRIPTION"
-			width="100%"
-			height="450px"
-			cols="15"
-			rows="30"
-			buttons="no"
-			syntax="php"
-			editor="codemirror|none"
-			filter="raw"
-			validate="code"
-		/>
-		<!-- Php_postflight_update Field. Type: Editor. (joomla) -->
+			type="radio"
+			name="add_php_preflight_uninstall"
+			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_PHP_PREFLIGHT_UNINSTALL_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_JOOMLA_MODULE_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_JOOMLA_MODULE_NO</option>
+		</field>
+		<!-- Update_server Field. Type: Servers. (custom) -->
 		<field
-			type="editor"
-			name="php_postflight_update"
-			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_PHP_POSTFLIGHT_UPDATE_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_PHP_POSTFLIGHT_UPDATE_DESCRIPTION"
-			width="100%"
-			height="450px"
-			cols="15"
-			rows="30"
-			buttons="no"
-			syntax="php"
-			editor="codemirror|none"
-			filter="raw"
-			validate="code"
+			type="servers"
+			name="update_server"
+			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_UPDATE_SERVER_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_UPDATE_SERVER_DESCRIPTION"
+			class="list_class"
+			multiple="false"
+			default="0"
+			button="true"
 		/>
-		<!-- Php_preflight_update Field. Type: Editor. (joomla) -->
+		<!-- Update_server_target Field. Type: Radio. (joomla) -->
 		<field
-			type="editor"
-			name="php_preflight_update"
-			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_PHP_PREFLIGHT_UPDATE_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_PHP_PREFLIGHT_UPDATE_DESCRIPTION"
-			width="100%"
-			height="450px"
-			cols="15"
-			rows="30"
-			buttons="no"
-			syntax="php"
-			editor="codemirror|none"
-			filter="raw"
-			validate="code"
-		/>
-		<!-- Php_preflight_uninstall Field. Type: Editor. (joomla) -->
+			type="radio"
+			name="update_server_target"
+			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_UPDATE_SERVER_TARGET_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_UPDATE_SERVER_TARGET_DESCRIPTION"
+			class="btn-group btn-group-yesno"
+			default="1"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_JOOMLA_MODULE_SERVER</option>
+			<option value="2">
+				COM_COMPONENTBUILDER_JOOMLA_MODULE_ZIP</option>
+			<option value="3">
+				COM_COMPONENTBUILDER_JOOMLA_MODULE_OTHER</option>
+		</field>
+		<!-- Addreadme Field. Type: Radio. (joomla) -->
 		<field
-			type="editor"
-			name="php_preflight_uninstall"
-			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_PHP_PREFLIGHT_UNINSTALL_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_PHP_PREFLIGHT_UNINSTALL_DESCRIPTION"
-			width="100%"
-			height="450px"
-			cols="15"
-			rows="30"
-			buttons="no"
-			syntax="php"
-			editor="codemirror|none"
-			filter="raw"
-			validate="code"
-		/>
-		<!-- Readme Field. Type: Editor. (joomla) -->
+			type="radio"
+			name="addreadme"
+			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_ADDREADME_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_JOOMLA_MODULE_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_JOOMLA_MODULE_NO</option>
+		</field>
+		<!-- Add_sql Field. Type: Radio. (joomla) -->
 		<field
-			type="editor"
-			name="readme"
-			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_README_LABEL"
-			default="You can use all the normal markdown, including the place-holders."
-			width="100%"
-			height="1200px"
-			buttons="false"
-			editor="none"
-			filter="raw"
-		/>
-		<!-- Note_libraries_options Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_libraries_options" label="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_LIBRARIES_OPTIONS_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_LIBRARIES_OPTIONS_DESCRIPTION" heading="h4" class="alert alert-info note_libraries_options" />
-		<!-- Note_linked_to_notice Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_linked_to_notice" label="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_LINKED_TO_NOTICE_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_LINKED_TO_NOTICE_DESCRIPTION" heading="h4" class="note_linked_to_notice" />
-		<!-- Not_required Field. Type: Hidden. (joomla) -->
-		<field
-			type="hidden"
-			name="not_required"
-			default="[]"
-		/>
+			type="radio"
+			name="add_sql"
+			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_SQL_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_JOOMLA_MODULE_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_JOOMLA_MODULE_NO</option>
+		</field>
 		<!-- Note_snippet_usage Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_snippet_usage" label="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_SNIPPET_USAGE_LABEL" heading="h4" class="snippet-usage note_snippet_usage" />
-		<!-- Default Field. Type: Editor. (joomla) -->
-		<field
-			type="editor"
-			name="default"
-			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_DEFAULT_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_DEFAULT_DESCRIPTION"
-			width="100%"
-			height="500px"
-			cols="15"
-			rows="30"
-			buttons="no"
-			syntax="html"
-			editor="codemirror|none"
-			filter="raw"
-			validate="code"
-		/>
 		<!-- Note_uikit_snippet Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_uikit_snippet" label="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_UIKIT_SNIPPET_LABEL" heading="h4" class="snippet-code note_uikit_snippet" />
 		<!-- Snippet Field. Type: Snippets. (custom) -->
@@ -246,63 +211,8 @@
 		/>
 		<!-- Note_add_language_string Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_add_language_string" label="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_ADD_LANGUAGE_STRING_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_ADD_LANGUAGE_STRING_DESCRIPTION" heading="h4" class="note_add_language_string" />
-		<!-- Sql Field. Type: Textarea. (joomla) -->
-		<field
-			type="textarea"
-			name="sql"
-			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_SQL_LABEL"
-			rows="30"
-			cols="15"
-			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_SQL_DESCRIPTION"
-			class="text_area span12"
-			filter="raw"
-			hint="COM_COMPONENTBUILDER_JOOMLA_MODULE_SQL_HINT"
-			required="true"
-		/>
-		<!-- Note_update_server_note_ftp Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_update_server_note_ftp" label="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_UPDATE_SERVER_NOTE_FTP_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_UPDATE_SERVER_NOTE_FTP_DESCRIPTION" heading="h4" class="alert alert-success note_update_server_note_ftp" />
-		<!-- Sql_uninstall Field. Type: Textarea. (joomla) -->
-		<field
-			type="textarea"
-			name="sql_uninstall"
-			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_SQL_UNINSTALL_LABEL"
-			rows="30"
-			cols="15"
-			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_SQL_UNINSTALL_DESCRIPTION"
-			class="text_area span12"
-			filter="raw"
-			hint="COM_COMPONENTBUILDER_JOOMLA_MODULE_SQL_UNINSTALL_HINT"
-			required="true"
-		/>
-		<!-- Add_sales_server Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_sales_server"
-			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_SALES_SERVER_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_JOOMLA_MODULE_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_JOOMLA_MODULE_NO</option>
-		</field>
-		<!-- Update_server_url Field. Type: Url. (joomla) -->
-		<field
-			type="url"
-			name="update_server_url"
-			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_UPDATE_SERVER_URL_LABEL"
-			size="60"
-			maxlength="150"
-			default=""
-			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_UPDATE_SERVER_URL_DESCRIPTION"
-			class="text_area span12"
-			filter="url"
-			validated="url"
-			message="COM_COMPONENTBUILDER_JOOMLA_MODULE_UPDATE_SERVER_URL_MESSAGE"
-			hint="COM_COMPONENTBUILDER_JOOMLA_MODULE_UPDATE_SERVER_URL_HINT"
-		/>
+		<!-- Note_libraries_options Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_libraries_options" label="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_LIBRARIES_OPTIONS_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_LIBRARIES_OPTIONS_DESCRIPTION" heading="h4" class="alert alert-info note_libraries_options" />
 		<!-- Libraries Field. Type: Libraries. (custom) -->
 		<field
 			type="libraries"
@@ -315,97 +225,6 @@
 			required="false"
 			button="true"
 		/>
-		<!-- Note_update_server_note_other Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_update_server_note_other" label="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_UPDATE_SERVER_NOTE_OTHER_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_UPDATE_SERVER_NOTE_OTHER_DESCRIPTION" heading="h4" class="alert alert-success note_update_server_note_other" />
-		<!-- Module_version Field. Type: Text. (joomla) -->
-		<field
-			type="text"
-			name="module_version"
-			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_MODULE_VERSION_LABEL"
-			size="40"
-			maxlength="50"
-			default="1.0.0"
-			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_MODULE_VERSION_DESCRIPTION"
-			class="text_area"
-			required="true"
-			filter="CMD"
-			message="COM_COMPONENTBUILDER_JOOMLA_MODULE_MODULE_VERSION_MESSAGE"
-			hint="COM_COMPONENTBUILDER_JOOMLA_MODULE_MODULE_VERSION_HINT"
-		/>
-		<!-- Custom_get Field. Type: Customgets. (custom) -->
-		<field
-			type="customgets"
-			name="custom_get"
-			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_CUSTOM_GET_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_CUSTOM_GET_DESCRIPTION"
-			multiple="true"
-			default=""
-		/>
-		<!-- Note_mod_file_options Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_mod_file_options" label="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_MOD_FILE_OPTIONS_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_MOD_FILE_OPTIONS_DESCRIPTION" heading="h4" class="alert alert-info note_mod_file_options" />
-		<!-- Add_php_preflight_uninstall Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_php_preflight_uninstall"
-			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_PHP_PREFLIGHT_UNINSTALL_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_JOOMLA_MODULE_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_JOOMLA_MODULE_NO</option>
-		</field>
-		<!-- Mod_code Field. Type: Editor. (joomla) -->
-		<field
-			type="editor"
-			name="mod_code"
-			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_MOD_CODE_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_MOD_CODE_DESCRIPTION"
-			width="100%"
-			height="500px"
-			cols="15"
-			rows="10"
-			buttons="no"
-			syntax="php"
-			editor="codemirror|none"
-			filter="raw"
-			required="true"
-			validate="code"
-		/>
-		<!-- Add_php_postflight_install Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_php_postflight_install"
-			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_PHP_POSTFLIGHT_INSTALL_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_JOOMLA_MODULE_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_JOOMLA_MODULE_NO</option>
-		</field>
-		<!-- Add_class_helper Field. Type: List. (joomla) -->
-		<field
-			type="list"
-			name="add_class_helper"
-			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_CLASS_HELPER_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_CLASS_HELPER_DESCRIPTION"
-			class="list_class"
-			multiple="false"
-			required="true"
-			default="0">
-			<!-- Option Set. -->
-			<option value="0">
-				COM_COMPONENTBUILDER_JOOMLA_MODULE_NONE</option>
-			<option value="1">
-				COM_COMPONENTBUILDER_JOOMLA_MODULE_CLASS</option>
-			<option value="2">
-				COM_COMPONENTBUILDER_JOOMLA_MODULE_ABSTRACT_CLASS</option>
-		</field>
 		<!-- Add_php_postflight_update Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -420,20 +239,6 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_JOOMLA_MODULE_NO</option>
 		</field>
-		<!-- Add_class_helper_header Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_class_helper_header"
-			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_CLASS_HELPER_HEADER_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_CLASS_HELPER_HEADER_DESCRIPTION"
-			class="btn-group btn-group-yesno"
-			default="0">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_JOOMLA_MODULE_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_JOOMLA_MODULE_NO</option>
-		</field>
 		<!-- Add_php_method_uninstall Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -448,49 +253,18 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_JOOMLA_MODULE_NO</option>
 		</field>
-		<!-- Class_helper_header Field. Type: Editor. (joomla) -->
+		<!-- Default Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="class_helper_header"
-			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_CLASS_HELPER_HEADER_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_CLASS_HELPER_HEADER_DESCRIPTION"
+			name="default"
+			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_DEFAULT_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_DEFAULT_DESCRIPTION"
 			width="100%"
-			height="100px"
+			height="500px"
 			cols="15"
-			rows="10"
+			rows="30"
 			buttons="no"
-			syntax="php"
-			editor="codemirror|none"
-			filter="raw"
-			required="false"
-			validate="code"
-		/>
-		<!-- Add_sql Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_sql"
-			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_SQL_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_JOOMLA_MODULE_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_JOOMLA_MODULE_NO</option>
-		</field>
-		<!-- Class_helper_code Field. Type: Editor. (joomla) -->
-		<field
-			type="editor"
-			name="class_helper_code"
-			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_CLASS_HELPER_CODE_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_CLASS_HELPER_CODE_DESCRIPTION"
-			width="100%"
-			height="800px"
-			cols="40"
-			rows="300"
-			buttons="no"
-			syntax="php"
+			syntax="html"
 			editor="codemirror|none"
 			filter="raw"
 			validate="code"
@@ -509,6 +283,255 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_JOOMLA_MODULE_NO</option>
 		</field>
+		<!-- Note_linked_to_notice Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_linked_to_notice" label="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_LINKED_TO_NOTICE_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_LINKED_TO_NOTICE_DESCRIPTION" heading="h4" class="note_linked_to_notice" />
+		<!-- Add_update_server Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_update_server"
+			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_UPDATE_SERVER_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_JOOMLA_MODULE_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_JOOMLA_MODULE_NO</option>
+		</field>
+		<!-- Not_required Field. Type: Hidden. (joomla) -->
+		<field
+			type="hidden"
+			name="not_required"
+			default="[]"
+		/>
+		<!-- Note_update_server_note_zip Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_update_server_note_zip" label="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_UPDATE_SERVER_NOTE_ZIP_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_UPDATE_SERVER_NOTE_ZIP_DESCRIPTION" heading="h4" class="alert alert-info note_update_server_note_zip" />
+		<!-- Module_version Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="module_version"
+			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_MODULE_VERSION_LABEL"
+			size="40"
+			maxlength="50"
+			default="1.0.0"
+			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_MODULE_VERSION_DESCRIPTION"
+			class="text_area"
+			required="true"
+			filter="CMD"
+			message="COM_COMPONENTBUILDER_JOOMLA_MODULE_MODULE_VERSION_MESSAGE"
+			hint="COM_COMPONENTBUILDER_JOOMLA_MODULE_MODULE_VERSION_HINT"
+		/>
+		<!-- Sales_server Field. Type: Servers. (custom) -->
+		<field
+			type="servers"
+			name="sales_server"
+			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_SALES_SERVER_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_SALES_SERVER_DESCRIPTION"
+			class="list_class"
+			multiple="false"
+			default="0"
+			button="true"
+		/>
+		<!-- Custom_get Field. Type: Customgets. (custom) -->
+		<field
+			type="customgets"
+			name="custom_get"
+			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_CUSTOM_GET_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_CUSTOM_GET_DESCRIPTION"
+			multiple="true"
+			default=""
+		/>
+		<!-- Php_preflight_update Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="php_preflight_update"
+			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_PHP_PREFLIGHT_UPDATE_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_PHP_PREFLIGHT_UPDATE_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="raw"
+			validate="code"
+		/>
+		<!-- Note_mod_file_options Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_mod_file_options" label="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_MOD_FILE_OPTIONS_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_MOD_FILE_OPTIONS_DESCRIPTION" heading="h4" class="alert alert-info note_mod_file_options" />
+		<!-- Php_preflight_uninstall Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="php_preflight_uninstall"
+			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_PHP_PREFLIGHT_UNINSTALL_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_PHP_PREFLIGHT_UNINSTALL_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="raw"
+			validate="code"
+		/>
+		<!-- Mod_code Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="mod_code"
+			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_MOD_CODE_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_MOD_CODE_DESCRIPTION"
+			width="100%"
+			height="500px"
+			cols="15"
+			rows="10"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="raw"
+			required="true"
+			validate="code"
+		/>
+		<!-- Php_postflight_install Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="php_postflight_install"
+			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_PHP_POSTFLIGHT_INSTALL_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_PHP_POSTFLIGHT_INSTALL_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="raw"
+			validate="code"
+		/>
+		<!-- Add_class_helper Field. Type: List. (joomla) -->
+		<field
+			type="list"
+			name="add_class_helper"
+			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_CLASS_HELPER_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_CLASS_HELPER_DESCRIPTION"
+			class="list_class"
+			multiple="false"
+			required="true"
+			default="0">
+			<!-- Option Set. -->
+			<option value="0">
+				COM_COMPONENTBUILDER_JOOMLA_MODULE_NONE</option>
+			<option value="1">
+				COM_COMPONENTBUILDER_JOOMLA_MODULE_CLASS</option>
+			<option value="2">
+				COM_COMPONENTBUILDER_JOOMLA_MODULE_ABSTRACT_CLASS</option>
+		</field>
+		<!-- Php_postflight_update Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="php_postflight_update"
+			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_PHP_POSTFLIGHT_UPDATE_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_PHP_POSTFLIGHT_UPDATE_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="raw"
+			validate="code"
+		/>
+		<!-- Add_class_helper_header Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_class_helper_header"
+			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_CLASS_HELPER_HEADER_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_CLASS_HELPER_HEADER_DESCRIPTION"
+			class="btn-group btn-group-yesno"
+			default="0">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_JOOMLA_MODULE_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_JOOMLA_MODULE_NO</option>
+		</field>
+		<!-- Php_method_uninstall Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="php_method_uninstall"
+			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_PHP_METHOD_UNINSTALL_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_PHP_METHOD_UNINSTALL_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="raw"
+			validate="code"
+		/>
+		<!-- Class_helper_header Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="class_helper_header"
+			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_CLASS_HELPER_HEADER_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_CLASS_HELPER_HEADER_DESCRIPTION"
+			width="100%"
+			height="100px"
+			cols="15"
+			rows="10"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="raw"
+			required="false"
+			validate="code"
+		/>
+		<!-- Sql Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="sql"
+			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_SQL_LABEL"
+			rows="30"
+			cols="15"
+			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_SQL_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_JOOMLA_MODULE_SQL_HINT"
+			required="true"
+		/>
+		<!-- Class_helper_code Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="class_helper_code"
+			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_CLASS_HELPER_CODE_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_CLASS_HELPER_CODE_DESCRIPTION"
+			width="100%"
+			height="800px"
+			cols="40"
+			rows="300"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="raw"
+			validate="code"
+		/>
+		<!-- Sql_uninstall Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="sql_uninstall"
+			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_SQL_UNINSTALL_LABEL"
+			rows="30"
+			cols="15"
+			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_SQL_UNINSTALL_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_JOOMLA_MODULE_SQL_UNINSTALL_HINT"
+			required="true"
+		/>
 		<!-- Fields Field. Type: Subform. (joomla) -->
 		<field
 			type="subform"
@@ -643,19 +666,18 @@
 				</field>
 			</form>
 		</field>
-		<!-- Addreadme Field. Type: Radio. (joomla) -->
+		<!-- Readme Field. Type: Editor. (joomla) -->
 		<field
-			type="radio"
-			name="addreadme"
-			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_ADDREADME_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_JOOMLA_MODULE_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_JOOMLA_MODULE_NO</option>
-		</field>
+			type="editor"
+			name="readme"
+			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_README_LABEL"
+			default="You can use all the normal markdown, including the place-holders."
+			width="100%"
+			height="1200px"
+			buttons="false"
+			editor="none"
+			filter="raw"
+		/>
 		<!-- Add_php_script_construct Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -670,20 +692,21 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_JOOMLA_MODULE_NO</option>
 		</field>
-		<!-- Add_update_server Field. Type: Radio. (joomla) -->
+		<!-- Update_server_url Field. Type: Url. (joomla) -->
 		<field
-			type="radio"
-			name="add_update_server"
-			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_UPDATE_SERVER_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_JOOMLA_MODULE_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_JOOMLA_MODULE_NO</option>
-		</field>
+			type="url"
+			name="update_server_url"
+			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_UPDATE_SERVER_URL_LABEL"
+			size="60"
+			maxlength="150"
+			default=""
+			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_UPDATE_SERVER_URL_DESCRIPTION"
+			class="text_area span12"
+			filter="url"
+			validated="url"
+			message="COM_COMPONENTBUILDER_JOOMLA_MODULE_UPDATE_SERVER_URL_MESSAGE"
+			hint="COM_COMPONENTBUILDER_JOOMLA_MODULE_UPDATE_SERVER_URL_HINT"
+		/>
 		<!-- Php_script_construct Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
@@ -700,23 +723,8 @@
 			filter="raw"
 			validate="code"
 		/>
-		<!-- Update_server_target Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="update_server_target"
-			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_UPDATE_SERVER_TARGET_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_UPDATE_SERVER_TARGET_DESCRIPTION"
-			class="btn-group btn-group-yesno"
-			default="1"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_JOOMLA_MODULE_SERVER</option>
-			<option value="2">
-				COM_COMPONENTBUILDER_JOOMLA_MODULE_ZIP</option>
-			<option value="3">
-				COM_COMPONENTBUILDER_JOOMLA_MODULE_OTHER</option>
-		</field>
+		<!-- Note_update_server_note_ftp Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_update_server_note_ftp" label="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_UPDATE_SERVER_NOTE_FTP_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_UPDATE_SERVER_NOTE_FTP_DESCRIPTION" heading="h4" class="alert alert-success note_update_server_note_ftp" />
 		<!-- Add_php_preflight_install Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -731,8 +739,8 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_JOOMLA_MODULE_NO</option>
 		</field>
-		<!-- Note_update_server_note_zip Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_update_server_note_zip" label="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_UPDATE_SERVER_NOTE_ZIP_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_UPDATE_SERVER_NOTE_ZIP_DESCRIPTION" heading="h4" class="alert alert-info note_update_server_note_zip" />
+		<!-- Note_update_server_note_other Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_update_server_note_other" label="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_UPDATE_SERVER_NOTE_OTHER_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_UPDATE_SERVER_NOTE_OTHER_DESCRIPTION" heading="h4" class="alert alert-success note_update_server_note_other" />
 		<!-- Php_preflight_install Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
@@ -749,17 +757,20 @@
 			filter="raw"
 			validate="code"
 		/>
-		<!-- Update_server Field. Type: Servers. (custom) -->
+		<!-- Add_sales_server Field. Type: Radio. (joomla) -->
 		<field
-			type="servers"
-			name="update_server"
-			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_UPDATE_SERVER_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_UPDATE_SERVER_DESCRIPTION"
-			class="list_class"
-			multiple="false"
+			type="radio"
+			name="add_sales_server"
+			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_SALES_SERVER_LABEL"
+			class="btn-group btn-group-yesno"
 			default="0"
-			button="true"
-		/>
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_JOOMLA_MODULE_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_JOOMLA_MODULE_NO</option>
+		</field>
 		<!-- Add_php_preflight_update Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -774,16 +785,19 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_JOOMLA_MODULE_NO</option>
 		</field>
-		<!-- Sales_server Field. Type: Servers. (custom) -->
+		<!-- Guid Field. Type: Text. (joomla) -->
 		<field
-			type="servers"
-			name="sales_server"
-			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_SALES_SERVER_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_SALES_SERVER_DESCRIPTION"
-			class="list_class"
-			multiple="false"
-			default="0"
-			button="true"
+			type="text"
+			name="guid"
+			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_GUID_LABEL"
+			size="40"
+			maxlength="40"
+			description="COM_COMPONENTBUILDER_JOOMLA_MODULE_GUID_DESCRIPTION"
+			class="text_area"
+			readonly="true"
+			filter="CMD"
+			validate="guid"
+			hint="COM_COMPONENTBUILDER_JOOMLA_MODULE_GUID_HINT"
 		/>
 		<!-- Name Field. Type: Text. (joomla) -->
 		<field

admin/models/forms/joomla_plugin.xml

@@ -121,113 +121,89 @@
 			required="true"
 			button="true"
 		/>
-		<!-- Sql Field. Type: Textarea. (joomla) -->
+		<!-- Add_sql Field. Type: Radio. (joomla) -->
 		<field
-			type="textarea"
-			name="sql"
-			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_SQL_LABEL"
-			rows="30"
-			cols="15"
-			description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_SQL_DESCRIPTION"
-			class="text_area span12"
-			filter="raw"
-			hint="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_SQL_HINT"
-			required="true"
-		/>
-		<!-- Php_method_uninstall Field. Type: Editor. (joomla) -->
+			type="radio"
+			name="add_sql"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADD_SQL_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NO</option>
+		</field>
+		<!-- Add_php_method_uninstall Field. Type: Radio. (joomla) -->
 		<field
-			type="editor"
-			name="php_method_uninstall"
-			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PHP_METHOD_UNINSTALL_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PHP_METHOD_UNINSTALL_DESCRIPTION"
-			width="100%"
-			height="450px"
-			cols="15"
-			rows="30"
-			buttons="no"
-			syntax="php"
-			editor="codemirror|none"
-			filter="raw"
-			validate="code"
-		/>
-		<!-- Php_postflight_update Field. Type: Editor. (joomla) -->
+			type="radio"
+			name="add_php_method_uninstall"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADD_PHP_METHOD_UNINSTALL_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NO</option>
+		</field>
+		<!-- Add_php_postflight_update Field. Type: Radio. (joomla) -->
 		<field
-			type="editor"
-			name="php_postflight_update"
-			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PHP_POSTFLIGHT_UPDATE_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PHP_POSTFLIGHT_UPDATE_DESCRIPTION"
-			width="100%"
-			height="450px"
-			cols="15"
-			rows="30"
-			buttons="no"
-			syntax="php"
-			editor="codemirror|none"
-			filter="raw"
-			validate="code"
-		/>
-		<!-- Php_postflight_install Field. Type: Editor. (joomla) -->
+			type="radio"
+			name="add_php_postflight_update"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADD_PHP_POSTFLIGHT_UPDATE_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NO</option>
+		</field>
+		<!-- Add_php_postflight_install Field. Type: Radio. (joomla) -->
 		<field
-			type="editor"
-			name="php_postflight_install"
-			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PHP_POSTFLIGHT_INSTALL_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PHP_POSTFLIGHT_INSTALL_DESCRIPTION"
-			width="100%"
-			height="450px"
-			cols="15"
-			rows="30"
-			buttons="no"
-			syntax="php"
-			editor="codemirror|none"
-			filter="raw"
-			validate="code"
-		/>
-		<!-- Description Field. Type: Textarea. (joomla) -->
+			type="radio"
+			name="add_php_postflight_install"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADD_PHP_POSTFLIGHT_INSTALL_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NO</option>
+		</field>
+		<!-- Sales_server Field. Type: Servers. (custom) -->
 		<field
-			type="textarea"
-			name="description"
-			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_DESCRIPTION_LABEL"
-			rows="11"
-			cols="10"
-			description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_DESCRIPTION_DESCRIPTION"
-			class="text_area span12"
-			filter="HTML"
-			hint="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_DESCRIPTION_HINT"
+			type="servers"
+			name="sales_server"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_SALES_SERVER_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_SALES_SERVER_DESCRIPTION"
+			class="list_class"
+			multiple="false"
+			default="0"
+			button="true"
 		/>
-		<!-- Note_update_server_note_other Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_update_server_note_other" label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NOTE_UPDATE_SERVER_NOTE_OTHER_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NOTE_UPDATE_SERVER_NOTE_OTHER_DESCRIPTION" heading="h4" class="alert alert-success note_update_server_note_other" />
-		<!-- Update_server_url Field. Type: Url. (joomla) -->
+		<!-- Note_update_server_note_zip Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_update_server_note_zip" label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NOTE_UPDATE_SERVER_NOTE_ZIP_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NOTE_UPDATE_SERVER_NOTE_ZIP_DESCRIPTION" heading="h4" class="alert alert-info note_update_server_note_zip" />
+		<!-- Add_update_server Field. Type: Radio. (joomla) -->
 		<field
-			type="url"
-			name="update_server_url"
-			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATE_SERVER_URL_LABEL"
-			size="60"
-			maxlength="150"
-			default=""
-			description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATE_SERVER_URL_DESCRIPTION"
-			class="text_area span12"
-			filter="url"
-			validated="url"
-			message="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATE_SERVER_URL_MESSAGE"
-			hint="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATE_SERVER_URL_HINT"
-		/>
-		<!-- Head Field. Type: Editor. (joomla) -->
-		<field
-			type="editor"
-			name="head"
-			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_HEAD_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_HEAD_DESCRIPTION"
-			width="100%"
-			height="100px"
-			cols="15"
-			rows="10"
-			buttons="no"
-			syntax="php"
-			editor="codemirror|none"
-			filter="raw"
-			required="false"
-			validate="code"
-		/>
+			type="radio"
+			name="add_update_server"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADD_UPDATE_SERVER_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NO</option>
+		</field>
 		<!-- Method_selection Field. Type: Subform. (joomla) -->
 		<field
 			type="subform"
@@ -296,31 +272,67 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NO</option>
 		</field>
-		<!-- Sql_uninstall Field. Type: Textarea. (joomla) -->
+		<!-- Add_sql_uninstall Field. Type: Radio. (joomla) -->
 		<field
-			type="textarea"
-			name="sql_uninstall"
-			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_SQL_UNINSTALL_LABEL"
-			rows="30"
-			cols="15"
-			description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_SQL_UNINSTALL_DESCRIPTION"
-			class="text_area span12"
-			filter="raw"
-			hint="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_SQL_UNINSTALL_HINT"
-			required="true"
-		/>
-		<!-- Readme Field. Type: Editor. (joomla) -->
+			type="radio"
+			name="add_sql_uninstall"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADD_SQL_UNINSTALL_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NO</option>
+		</field>
+		<!-- Addreadme Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="addreadme"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADDREADME_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NO</option>
+		</field>
+		<!-- Head Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="readme"
-			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_README_LABEL"
-			default="You can use all the normal markdown, including the place-holders."
+			name="head"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_HEAD_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_HEAD_DESCRIPTION"
 			width="100%"
-			height="1200px"
-			buttons="false"
-			editor="none"
+			height="100px"
+			cols="15"
+			rows="10"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
 			filter="raw"
+			required="false"
+			validate="code"
 		/>
+		<!-- Update_server_target Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="update_server_target"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATE_SERVER_TARGET_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATE_SERVER_TARGET_DESCRIPTION"
+			class="btn-group btn-group-yesno"
+			default="1"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_SERVER</option>
+			<option value="2">
+				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ZIP</option>
+			<option value="3">
+				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_OTHER</option>
+		</field>
 		<!-- Main_class_code Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
@@ -337,44 +349,53 @@
 			filter="raw"
 			validate="code"
 		/>
-		<!-- Note_update_server_note_ftp Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_update_server_note_ftp" label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NOTE_UPDATE_SERVER_NOTE_FTP_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NOTE_UPDATE_SERVER_NOTE_FTP_DESCRIPTION" heading="h4" class="alert alert-success note_update_server_note_ftp" />
+		<!-- Update_server Field. Type: Servers. (custom) -->
+		<field
+			type="servers"
+			name="update_server"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATE_SERVER_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATE_SERVER_DESCRIPTION"
+			class="list_class"
+			multiple="false"
+			default="0"
+			button="true"
+		/>
 		<!-- Note_linked_to_notice Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_linked_to_notice" label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NOTE_LINKED_TO_NOTICE_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NOTE_LINKED_TO_NOTICE_DESCRIPTION" heading="h4" class="note_linked_to_notice" />
-		<!-- Add_sales_server Field. Type: Radio. (joomla) -->
+		<!-- Description Field. Type: Textarea. (joomla) -->
 		<field
-			type="radio"
-			name="add_sales_server"
-			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADD_SALES_SERVER_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NO</option>
-		</field>
+			type="textarea"
+			name="description"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_DESCRIPTION_LABEL"
+			rows="11"
+			cols="10"
+			description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_DESCRIPTION_DESCRIPTION"
+			class="text_area span12"
+			filter="HTML"
+			hint="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_DESCRIPTION_HINT"
+		/>
 		<!-- Not_required Field. Type: Hidden. (joomla) -->
 		<field
 			type="hidden"
 			name="not_required"
 			default="[]"
 		/>
-		<!-- Add_php_postflight_install Field. Type: Radio. (joomla) -->
+		<!-- Php_postflight_install Field. Type: Editor. (joomla) -->
 		<field
-			type="radio"
-			name="add_php_postflight_install"
-			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADD_PHP_POSTFLIGHT_INSTALL_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NO</option>
-		</field>
+			type="editor"
+			name="php_postflight_install"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PHP_POSTFLIGHT_INSTALL_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PHP_POSTFLIGHT_INSTALL_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="raw"
+			validate="code"
+		/>
 		<!-- Plugin_version Field. Type: Text. (joomla) -->
 		<field
 			type="text"
@@ -390,20 +411,22 @@
 			message="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PLUGIN_VERSION_MESSAGE"
 			hint="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PLUGIN_VERSION_HINT"
 		/>
-		<!-- Add_php_postflight_update Field. Type: Radio. (joomla) -->
+		<!-- Php_postflight_update Field. Type: Editor. (joomla) -->
 		<field
-			type="radio"
-			name="add_php_postflight_update"
-			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADD_PHP_POSTFLIGHT_UPDATE_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NO</option>
-		</field>
+			type="editor"
+			name="php_postflight_update"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PHP_POSTFLIGHT_UPDATE_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PHP_POSTFLIGHT_UPDATE_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="raw"
+			validate="code"
+		/>
 		<!-- Fields Field. Type: Subform. (joomla) -->
 		<field
 			type="subform"
@@ -538,20 +561,22 @@
 				</field>
 			</form>
 		</field>
-		<!-- Add_php_method_uninstall Field. Type: Radio. (joomla) -->
+		<!-- Php_method_uninstall Field. Type: Editor. (joomla) -->
 		<field
-			type="radio"
-			name="add_php_method_uninstall"
-			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADD_PHP_METHOD_UNINSTALL_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NO</option>
-		</field>
+			type="editor"
+			name="php_method_uninstall"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PHP_METHOD_UNINSTALL_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PHP_METHOD_UNINSTALL_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="raw"
+			validate="code"
+		/>
 		<!-- Add_php_script_construct Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -566,20 +591,19 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NO</option>
 		</field>
-		<!-- Add_sql Field. Type: Radio. (joomla) -->
+		<!-- Sql Field. Type: Textarea. (joomla) -->
 		<field
-			type="radio"
-			name="add_sql"
-			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADD_SQL_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NO</option>
-		</field>
+			type="textarea"
+			name="sql"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_SQL_LABEL"
+			rows="30"
+			cols="15"
+			description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_SQL_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_SQL_HINT"
+			required="true"
+		/>
 		<!-- Php_script_construct Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
@@ -596,20 +620,19 @@
 			filter="raw"
 			validate="code"
 		/>
-		<!-- Add_sql_uninstall Field. Type: Radio. (joomla) -->
+		<!-- Sql_uninstall Field. Type: Textarea. (joomla) -->
 		<field
-			type="radio"
-			name="add_sql_uninstall"
-			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADD_SQL_UNINSTALL_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NO</option>
-		</field>
+			type="textarea"
+			name="sql_uninstall"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_SQL_UNINSTALL_LABEL"
+			rows="30"
+			cols="15"
+			description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_SQL_UNINSTALL_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_SQL_UNINSTALL_HINT"
+			required="true"
+		/>
 		<!-- Add_php_preflight_install Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -624,19 +647,18 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NO</option>
 		</field>
-		<!-- Addreadme Field. Type: Radio. (joomla) -->
+		<!-- Readme Field. Type: Editor. (joomla) -->
 		<field
-			type="radio"
-			name="addreadme"
-			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADDREADME_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NO</option>
-		</field>
+			type="editor"
+			name="readme"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_README_LABEL"
+			default="You can use all the normal markdown, including the place-holders."
+			width="100%"
+			height="1200px"
+			buttons="false"
+			editor="none"
+			filter="raw"
+		/>
 		<!-- Php_preflight_install Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
@@ -653,20 +675,21 @@
 			filter="raw"
 			validate="code"
 		/>
-		<!-- Add_update_server Field. Type: Radio. (joomla) -->
+		<!-- Update_server_url Field. Type: Url. (joomla) -->
 		<field
-			type="radio"
-			name="add_update_server"
-			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADD_UPDATE_SERVER_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NO</option>
-		</field>
+			type="url"
+			name="update_server_url"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATE_SERVER_URL_LABEL"
+			size="60"
+			maxlength="150"
+			default=""
+			description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATE_SERVER_URL_DESCRIPTION"
+			class="text_area span12"
+			filter="url"
+			validated="url"
+			message="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATE_SERVER_URL_MESSAGE"
+			hint="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATE_SERVER_URL_HINT"
+		/>
 		<!-- Add_php_preflight_update Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -681,23 +704,8 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NO</option>
 		</field>
-		<!-- Update_server_target Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="update_server_target"
-			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATE_SERVER_TARGET_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATE_SERVER_TARGET_DESCRIPTION"
-			class="btn-group btn-group-yesno"
-			default="1"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_SERVER</option>
-			<option value="2">
-				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ZIP</option>
-			<option value="3">
-				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_OTHER</option>
-		</field>
+		<!-- Note_update_server_note_ftp Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_update_server_note_ftp" label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NOTE_UPDATE_SERVER_NOTE_FTP_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NOTE_UPDATE_SERVER_NOTE_FTP_DESCRIPTION" heading="h4" class="alert alert-success note_update_server_note_ftp" />
 		<!-- Php_preflight_update Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
@@ -714,8 +722,8 @@
 			filter="raw"
 			validate="code"
 		/>
-		<!-- Note_update_server_note_zip Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_update_server_note_zip" label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NOTE_UPDATE_SERVER_NOTE_ZIP_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NOTE_UPDATE_SERVER_NOTE_ZIP_DESCRIPTION" heading="h4" class="alert alert-info note_update_server_note_zip" />
+		<!-- Note_update_server_note_other Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_update_server_note_other" label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NOTE_UPDATE_SERVER_NOTE_OTHER_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NOTE_UPDATE_SERVER_NOTE_OTHER_DESCRIPTION" heading="h4" class="alert alert-success note_update_server_note_other" />
 		<!-- Add_php_preflight_uninstall Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -730,17 +738,20 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NO</option>
 		</field>
-		<!-- Update_server Field. Type: Servers. (custom) -->
+		<!-- Add_sales_server Field. Type: Radio. (joomla) -->
 		<field
-			type="servers"
-			name="update_server"
-			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATE_SERVER_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATE_SERVER_DESCRIPTION"
-			class="list_class"
-			multiple="false"
+			type="radio"
+			name="add_sales_server"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADD_SALES_SERVER_LABEL"
+			class="btn-group btn-group-yesno"
 			default="0"
-			button="true"
-		/>
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NO</option>
+		</field>
 		<!-- Php_preflight_uninstall Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
@@ -757,16 +768,19 @@
 			filter="raw"
 			validate="code"
 		/>
-		<!-- Sales_server Field. Type: Servers. (custom) -->
+		<!-- Guid Field. Type: Text. (joomla) -->
 		<field
-			type="servers"
-			name="sales_server"
-			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_SALES_SERVER_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_SALES_SERVER_DESCRIPTION"
-			class="list_class"
-			multiple="false"
-			default="0"
-			button="true"
+			type="text"
+			name="guid"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GUID_LABEL"
+			size="40"
+			maxlength="40"
+			description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GUID_DESCRIPTION"
+			class="text_area"
+			readonly="true"
+			filter="CMD"
+			validate="guid"
+			hint="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GUID_HINT"
 		/>
 		<!-- Name Field. Type: Text. (joomla) -->
 		<field

admin/models/forms/library.xml

@@ -159,6 +159,8 @@
 			message="COM_COMPONENTBUILDER_LIBRARY_DESCRIPTION_MESSAGE"
 			hint="COM_COMPONENTBUILDER_LIBRARY_DESCRIPTION_HINT"
 		/>
+		<!-- 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_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_display_library_files_folders_urls Field. Type: Note. A None Database Field. (joomla) -->
@@ -175,8 +177,20 @@
 		/>
 		<!-- 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_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" />
 		<!-- Php_setdocument Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
@@ -312,26 +326,26 @@
 		<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_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_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" />
 		<!-- 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" />
+		<!-- Guid Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="guid"
+			label="COM_COMPONENTBUILDER_LIBRARY_GUID_LABEL"
+			size="40"
+			maxlength="40"
+			description="COM_COMPONENTBUILDER_LIBRARY_GUID_DESCRIPTION"
+			class="text_area"
+			readonly="true"
+			filter="CMD"
+			validate="guid"
+			hint="COM_COMPONENTBUILDER_LIBRARY_GUID_HINT"
+		/>
 		<!-- Note_library_instruction Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_library_instruction" label="COM_COMPONENTBUILDER_LIBRARY_NOTE_LIBRARY_INSTRUCTION_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_NOTE_LIBRARY_INSTRUCTION_DESCRIPTION" heading="h4" class="alert alert-info note_library_instruction" />
 	</fieldset>

admin/models/forms/site_view.xml

@@ -142,96 +142,66 @@
 			required="true"
 			button="true"
 		/>
-		<!-- Php_document Field. Type: Editor. (joomla) -->
+		<!-- Add_php_jview_display Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_php_jview_display"
+			label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_PHP_JVIEW_DISPLAY_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
+		</field>
+		<!-- Add_php_document Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_php_document"
+			label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_PHP_DOCUMENT_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
+		</field>
+		<!-- Add_php_view Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_php_view"
+			label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_PHP_VIEW_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
+		</field>
+		<!-- Js_document Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_document"
-			label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_DOCUMENT_LABEL"
-			description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_DOCUMENT_DESCRIPTION"
-			width="100%"
-			height="450px"
-			cols="15"
-			rows="50"
-			buttons="no"
-			syntax="php"
-			editor="codemirror|none"
-			filter="raw"
-			validate="code"
-		/>
-		<!-- Php_view Field. Type: Editor. (joomla) -->
-		<field
-			type="editor"
-			name="php_view"
-			label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_VIEW_LABEL"
-			description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_VIEW_DESCRIPTION"
+			name="js_document"
+			label="COM_COMPONENTBUILDER_SITE_VIEW_JS_DOCUMENT_LABEL"
+			description="COM_COMPONENTBUILDER_SITE_VIEW_JS_DOCUMENT_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
 			rows="30"
 			buttons="no"
-			syntax="php"
+			syntax="javascript"
 			editor="codemirror|none"
 			filter="raw"
 			validate="code"
 		/>
-		<!-- Add_css_document Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_css_document"
-			label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_CSS_DOCUMENT_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
-		</field>
 		<!-- Note_add_language_string Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_add_language_string" label="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_ADD_LANGUAGE_STRING_LABEL" description="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_ADD_LANGUAGE_STRING_DESCRIPTION" heading="h4" class="note_add_language_string" />
-		<!-- Add_javascript_file Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_javascript_file"
-			label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_JAVASCRIPT_FILE_LABEL"
-			description="COM_COMPONENTBUILDER_SITE_VIEW_ADD_JAVASCRIPT_FILE_DESCRIPTION"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
-		</field>
-		<!-- Add_js_document Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_js_document"
-			label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_JS_DOCUMENT_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
-		</field>
-		<!-- Context Field. Type: Text. (joomla) -->
-		<field
-			type="text"
-			name="context"
-			label="COM_COMPONENTBUILDER_SITE_VIEW_CONTEXT_LABEL"
-			size="40"
-			maxlength="50"
-			description="COM_COMPONENTBUILDER_SITE_VIEW_CONTEXT_DESCRIPTION"
-			class="text_area"
-			filter="WORD"
-			message="COM_COMPONENTBUILDER_SITE_VIEW_CONTEXT_MESSAGE"
-			hint="COM_COMPONENTBUILDER_SITE_VIEW_CONTEXT_HINT"
-		/>
 		<!-- Codename Field. Type: Text. (joomla) -->
 		<field
 			type="text"
@@ -246,6 +216,41 @@
 			message="COM_COMPONENTBUILDER_SITE_VIEW_CODENAME_MESSAGE"
 			hint="COM_COMPONENTBUILDER_SITE_VIEW_CODENAME_HINT"
 		/>
+		<!-- Javascript_file Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="javascript_file"
+			label="COM_COMPONENTBUILDER_SITE_VIEW_JAVASCRIPT_FILE_LABEL"
+			description="COM_COMPONENTBUILDER_SITE_VIEW_JAVASCRIPT_FILE_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="javascript"
+			editor="codemirror|none"
+			filter="raw"
+			validate="code"
+		/>
+		<!-- Context Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="context"
+			label="COM_COMPONENTBUILDER_SITE_VIEW_CONTEXT_LABEL"
+			size="40"
+			maxlength="50"
+			description="COM_COMPONENTBUILDER_SITE_VIEW_CONTEXT_DESCRIPTION"
+			class="text_area"
+			filter="WORD"
+			message="COM_COMPONENTBUILDER_SITE_VIEW_CONTEXT_MESSAGE"
+			hint="COM_COMPONENTBUILDER_SITE_VIEW_CONTEXT_HINT"
+		/>
+		<!-- Not_required Field. Type: Hidden. (joomla) -->
+		<field
+			type="hidden"
+			name="not_required"
+			default="[]"
+		/>
 		<!-- Default Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
@@ -279,44 +284,20 @@
 			required="false"
 			button="true"
 		/>
-		<!-- Php_jview_display Field. Type: Editor. (joomla) -->
+		<!-- Add_php_jview Field. Type: Radio. (joomla) -->
 		<field
-			type="editor"
-			name="php_jview_display"
-			label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_DISPLAY_LABEL"
-			description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_DISPLAY_DESCRIPTION"
-			width="100%"
-			height="450px"
-			cols="15"
-			rows="30"
-			buttons="no"
-			syntax="php"
-			editor="codemirror|none"
-			filter="raw"
-			validate="code"
-		/>
-		<!-- Not_required Field. Type: Hidden. (joomla) -->
-		<field
-			type="hidden"
-			name="not_required"
-			default="[]"
-		/>
-		<!-- Php_jview Field. Type: Editor. (joomla) -->
-		<field
-			type="editor"
-			name="php_jview"
-			label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_LABEL"
-			description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_DESCRIPTION"
-			width="100%"
-			height="450px"
-			cols="15"
-			rows="30"
-			buttons="no"
-			syntax="php"
-			editor="codemirror|none"
-			filter="raw"
-			validate="code"
-		/>
+			type="radio"
+			name="add_php_jview"
+			label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_PHP_JVIEW_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
+		</field>
 		<!-- Custom_get Field. Type: Customgets. (custom) -->
 		<field
 			type="customgets"
@@ -326,12 +307,75 @@
 			multiple="true"
 			default=""
 		/>
-		<!-- Php_model Field. Type: Editor. (joomla) -->
+		<!-- Note_linked_to_notice Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_linked_to_notice" label="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_LINKED_TO_NOTICE_LABEL" description="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_LINKED_TO_NOTICE_DESCRIPTION" heading="h4" class="note_linked_to_notice" />
+		<!-- Css_document Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_model"
-			label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_MODEL_LABEL"
-			description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_MODEL_DESCRIPTION"
+			name="css_document"
+			label="COM_COMPONENTBUILDER_SITE_VIEW_CSS_DOCUMENT_LABEL"
+			description="COM_COMPONENTBUILDER_SITE_VIEW_CSS_DOCUMENT_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="css"
+			editor="codemirror|none"
+			filter="raw"
+			validate="code"
+		/>
+		<!-- Add_javascript_file Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_javascript_file"
+			label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_JAVASCRIPT_FILE_LABEL"
+			description="COM_COMPONENTBUILDER_SITE_VIEW_ADD_JAVASCRIPT_FILE_DESCRIPTION"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
+		</field>
+		<!-- Css Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="css"
+			label="COM_COMPONENTBUILDER_SITE_VIEW_CSS_LABEL"
+			description="COM_COMPONENTBUILDER_SITE_VIEW_CSS_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="css"
+			editor="codemirror|none"
+			filter="raw"
+			validate="code"
+		/>
+		<!-- Add_js_document Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_js_document"
+			label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_JS_DOCUMENT_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
+		</field>
+		<!-- Php_ajaxmethod Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="php_ajaxmethod"
+			label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_AJAXMETHOD_LABEL"
+			description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_AJAXMETHOD_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
@@ -342,6 +386,32 @@
 			filter="raw"
 			validate="code"
 		/>
+		<!-- Add_css_document Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_css_document"
+			label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_CSS_DOCUMENT_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
+		</field>
+		<!-- Libraries Field. Type: Libraries. (custom) -->
+		<field
+			type="libraries"
+			name="libraries"
+			label="COM_COMPONENTBUILDER_SITE_VIEW_LIBRARIES_LABEL"
+			description="COM_COMPONENTBUILDER_SITE_VIEW_LIBRARIES_DESCRIPTION"
+			class="list_class"
+			multiple="true"
+			default="0"
+			required="false"
+			button="true"
+		/>
 		<!-- Add_css Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -356,21 +426,15 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
 		</field>
-		<!-- Javascript_file Field. Type: Editor. (joomla) -->
+		<!-- Dynamic_get Field. Type: Dynamicgets. (custom) -->
 		<field
-			type="editor"
-			name="javascript_file"
-			label="COM_COMPONENTBUILDER_SITE_VIEW_JAVASCRIPT_FILE_LABEL"
-			description="COM_COMPONENTBUILDER_SITE_VIEW_JAVASCRIPT_FILE_DESCRIPTION"
-			width="100%"
-			height="450px"
-			cols="15"
-			rows="30"
-			buttons="no"
-			syntax="javascript"
-			editor="codemirror|none"
-			filter="raw"
-			validate="code"
+			type="dynamicgets"
+			name="dynamic_get"
+			label="COM_COMPONENTBUILDER_SITE_VIEW_DYNAMIC_GET_LABEL"
+			description="COM_COMPONENTBUILDER_SITE_VIEW_DYNAMIC_GET_DESCRIPTION"
+			multiple="false"
+			default=""
+			required="false"
 		/>
 		<!-- Add_php_ajax Field. Type: Radio. (joomla) -->
 		<field
@@ -386,22 +450,8 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
 		</field>
-		<!-- Js_document Field. Type: Editor. (joomla) -->
-		<field
-			type="editor"
-			name="js_document"
-			label="COM_COMPONENTBUILDER_SITE_VIEW_JS_DOCUMENT_LABEL"
-			description="COM_COMPONENTBUILDER_SITE_VIEW_JS_DOCUMENT_DESCRIPTION"
-			width="100%"
-			height="450px"
-			cols="15"
-			rows="30"
-			buttons="no"
-			syntax="javascript"
-			editor="codemirror|none"
-			filter="raw"
-			validate="code"
-		/>
+		<!-- Dynamic_values Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="dynamic_values" label="COM_COMPONENTBUILDER_SITE_VIEW_DYNAMIC_VALUES_LABEL" description="COM_COMPONENTBUILDER_SITE_VIEW_DYNAMIC_VALUES_DESCRIPTION" heading="h4" class="dynamic_values" />
 		<!-- Ajax_input Field. Type: Subform. (joomla) -->
 		<field
 			type="subform"
@@ -542,92 +592,6 @@
 				/>
 			</form>
 		</field>
-		<!-- Css_document Field. Type: Editor. (joomla) -->
-		<field
-			type="editor"
-			name="css_document"
-			label="COM_COMPONENTBUILDER_SITE_VIEW_CSS_DOCUMENT_LABEL"
-			description="COM_COMPONENTBUILDER_SITE_VIEW_CSS_DOCUMENT_DESCRIPTION"
-			width="100%"
-			height="450px"
-			cols="15"
-			rows="30"
-			buttons="no"
-			syntax="css"
-			editor="codemirror|none"
-			filter="raw"
-			validate="code"
-		/>
-		<!-- Libraries Field. Type: Libraries. (custom) -->
-		<field
-			type="libraries"
-			name="libraries"
-			label="COM_COMPONENTBUILDER_SITE_VIEW_LIBRARIES_LABEL"
-			description="COM_COMPONENTBUILDER_SITE_VIEW_LIBRARIES_DESCRIPTION"
-			class="list_class"
-			multiple="true"
-			default="0"
-			required="false"
-			button="true"
-		/>
-		<!-- Css Field. Type: Editor. (joomla) -->
-		<field
-			type="editor"
-			name="css"
-			label="COM_COMPONENTBUILDER_SITE_VIEW_CSS_LABEL"
-			description="COM_COMPONENTBUILDER_SITE_VIEW_CSS_DESCRIPTION"
-			width="100%"
-			height="450px"
-			cols="15"
-			rows="30"
-			buttons="no"
-			syntax="css"
-			editor="codemirror|none"
-			filter="raw"
-			validate="code"
-		/>
-		<!-- Dynamic_get Field. Type: Dynamicgets. (custom) -->
-		<field
-			type="dynamicgets"
-			name="dynamic_get"
-			label="COM_COMPONENTBUILDER_SITE_VIEW_DYNAMIC_GET_LABEL"
-			description="COM_COMPONENTBUILDER_SITE_VIEW_DYNAMIC_GET_DESCRIPTION"
-			multiple="false"
-			default=""
-			required="false"
-		/>
-		<!-- Php_ajaxmethod Field. Type: Editor. (joomla) -->
-		<field
-			type="editor"
-			name="php_ajaxmethod"
-			label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_AJAXMETHOD_LABEL"
-			description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_AJAXMETHOD_DESCRIPTION"
-			width="100%"
-			height="450px"
-			cols="15"
-			rows="30"
-			buttons="no"
-			syntax="php"
-			editor="codemirror|none"
-			filter="raw"
-			validate="code"
-		/>
-		<!-- Dynamic_values Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="dynamic_values" label="COM_COMPONENTBUILDER_SITE_VIEW_DYNAMIC_VALUES_LABEL" description="COM_COMPONENTBUILDER_SITE_VIEW_DYNAMIC_VALUES_DESCRIPTION" heading="h4" class="dynamic_values" />
-		<!-- Add_php_document Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_php_document"
-			label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_PHP_DOCUMENT_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
-		</field>
 		<!-- Add_custom_button Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -642,20 +606,22 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
 		</field>
-		<!-- Add_php_view Field. Type: Radio. (joomla) -->
+		<!-- Php_document Field. Type: Editor. (joomla) -->
 		<field
-			type="radio"
-			name="add_php_view"
-			label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_PHP_VIEW_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
-		</field>
+			type="editor"
+			name="php_document"
+			label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_DOCUMENT_LABEL"
+			description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_DOCUMENT_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="50"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="raw"
+			validate="code"
+		/>
 		<!-- Button_position Field. Type: List. (joomla) -->
 		<field
 			type="list"
@@ -681,36 +647,40 @@
 			<option value="5">
 				COM_COMPONENTBUILDER_SITE_VIEW_CUSTOM</option>
 		</field>
-		<!-- Add_php_jview_display Field. Type: Radio. (joomla) -->
+		<!-- Php_view Field. Type: Editor. (joomla) -->
 		<field
-			type="radio"
-			name="add_php_jview_display"
-			label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_PHP_JVIEW_DISPLAY_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
-		</field>
+			type="editor"
+			name="php_view"
+			label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_VIEW_LABEL"
+			description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_VIEW_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="raw"
+			validate="code"
+		/>
 		<!-- Note_custom_toolbar_placeholder Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_custom_toolbar_placeholder" description="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_CUSTOM_TOOLBAR_PLACEHOLDER_DESCRIPTION" heading="h4" class="note_custom_toolbar_placeholder" showon="button_position:5" />
-		<!-- Add_php_jview Field. Type: Radio. (joomla) -->
+		<!-- Php_jview_display Field. Type: Editor. (joomla) -->
 		<field
-			type="radio"
-			name="add_php_jview"
-			label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_PHP_JVIEW_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
-		</field>
+			type="editor"
+			name="php_jview_display"
+			label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_DISPLAY_LABEL"
+			description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_DISPLAY_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="raw"
+			validate="code"
+		/>
 		<!-- Custom_button Field. Type: Subform. (joomla) -->
 		<field
 			type="subform"
@@ -1219,8 +1189,22 @@
 				</field>
 			</form>
 		</field>
-		<!-- Note_linked_to_notice Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_linked_to_notice" label="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_LINKED_TO_NOTICE_LABEL" description="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_LINKED_TO_NOTICE_DESCRIPTION" heading="h4" class="note_linked_to_notice" />
+		<!-- Php_jview Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="php_jview"
+			label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_LABEL"
+			description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="raw"
+			validate="code"
+		/>
 		<!-- Php_controller Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
@@ -1237,6 +1221,36 @@
 			filter="raw"
 			validate="code"
 		/>
+		<!-- Guid Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="guid"
+			label="COM_COMPONENTBUILDER_SITE_VIEW_GUID_LABEL"
+			size="40"
+			maxlength="40"
+			description="COM_COMPONENTBUILDER_SITE_VIEW_GUID_DESCRIPTION"
+			class="text_area"
+			readonly="true"
+			filter="CMD"
+			validate="guid"
+			hint="COM_COMPONENTBUILDER_SITE_VIEW_GUID_HINT"
+		/>
+		<!-- Php_model Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="php_model"
+			label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_MODEL_LABEL"
+			description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_MODEL_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="raw"
+			validate="code"
+		/>
 	</fieldset>
 	
 	<!-- Access Control Fields. -->

admin/models/forms/snippet.xml

@@ -155,6 +155,20 @@
 			required="true"
 			button="true"
 		/>
+		<!-- Guid Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="guid"
+			label="COM_COMPONENTBUILDER_SNIPPET_GUID_LABEL"
+			size="40"
+			maxlength="40"
+			description="COM_COMPONENTBUILDER_SNIPPET_GUID_DESCRIPTION"
+			class="text_area"
+			readonly="true"
+			filter="CMD"
+			validate="guid"
+			hint="COM_COMPONENTBUILDER_SNIPPET_GUID_HINT"
+		/>
 		<!-- Note_contributor_details Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_contributor_details" label="COM_COMPONENTBUILDER_SNIPPET_NOTE_CONTRIBUTOR_DETAILS_LABEL" description="COM_COMPONENTBUILDER_SNIPPET_NOTE_CONTRIBUTOR_DETAILS_DESCRIPTION" heading="h4" class="alert alert-info note_contributor_details" />
 		<!-- Contributor_email Field. Type: Text. (joomla) -->

admin/models/help_document.php

@@ -144,14 +144,14 @@ class ComponentbuilderModelHelp_document extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
-		// // check if xpath was set in options
+		// 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
+		// check if clear form was set in options
 		$clear = false;
 		if (isset($options['clear']))
 		{

admin/models/joomla_component.php

@@ -107,13 +107,12 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 				'crowdin_account_api_key'
 			)
 		),
-		'readme' => array(
-			'left' => array(
-				'addreadme',
-				'readme'
-			),
-			'right' => array(
-				'note_readme'
+		'mysql' => array(
+			'fullwidth' => array(
+				'add_sql',
+				'sql',
+				'add_sql_uninstall',
+				'sql_uninstall'
 			)
 		),
 		'dash_install' => array(
@@ -138,12 +137,20 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 				'php_method_uninstall'
 			)
 		),
-		'mysql' => array(
+		'readme' => array(
+			'left' => array(
+				'addreadme',
+				'readme'
+			),
+			'right' => array(
+				'note_readme'
+			)
+		),
+		'dynamic_build_beta' => array(
 			'fullwidth' => array(
-				'add_sql',
-				'sql',
-				'add_sql_uninstall',
-				'sql_uninstall'
+				'note_buildcomp_dynamic_mysql',
+				'buildcomp',
+				'buildcompsql'
 			)
 		),
 		'settings' => array(
@@ -178,13 +185,6 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 				'number'
 			)
 		),
-		'dynamic_build_beta' => array(
-			'fullwidth' => array(
-				'note_buildcomp_dynamic_mysql',
-				'buildcomp',
-				'buildcompsql'
-			)
-		),
 		'admin_views' => array(
 			'fullwidth' => array(
 				'note_on_admin_views',
@@ -286,6 +286,25 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 		return $this->vastDevMod;
 	}
 
+	/**
+	 * The assistant form fields
+	 *
+	 * @var      array
+	 */
+	public $assistantForm = array(
+		'left' => array(
+			'guid',
+			'name',
+			'short_description',
+			'copyright'
+		),
+		'right' => array( 
+			'license',
+			'bom',
+			'image'
+		)
+	);
+
     
 	/**
 	 * Method to get a single record.
@@ -316,52 +335,10 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 				$item->metadata = $registry->toArray();
 			}
 
-			if (!empty($item->php_helper_site))
+			if (!empty($item->buildcompsql))
 			{
-				// base64 Decode php_helper_site.
-				$item->php_helper_site = base64_decode($item->php_helper_site);
-			}
-
-			if (!empty($item->readme))
-			{
-				// base64 Decode readme.
-				$item->readme = base64_decode($item->readme);
-			}
-
-			if (!empty($item->php_postflight_update))
-			{
-				// base64 Decode php_postflight_update.
-				$item->php_postflight_update = base64_decode($item->php_postflight_update);
-			}
-
-			if (!empty($item->javascript))
-			{
-				// base64 Decode javascript.
-				$item->javascript = base64_decode($item->javascript);
-			}
-
-			if (!empty($item->css_site))
-			{
-				// base64 Decode css_site.
-				$item->css_site = base64_decode($item->css_site);
-			}
-
-			if (!empty($item->php_preflight_update))
-			{
-				// base64 Decode php_preflight_update.
-				$item->php_preflight_update = base64_decode($item->php_preflight_update);
-			}
-
-			if (!empty($item->sql))
-			{
-				// base64 Decode sql.
-				$item->sql = base64_decode($item->sql);
-			}
-
-			if (!empty($item->php_helper_admin))
-			{
-				// base64 Decode php_helper_admin.
-				$item->php_helper_admin = base64_decode($item->php_helper_admin);
+				// base64 Decode buildcompsql.
+				$item->buildcompsql = base64_decode($item->buildcompsql);
 			}
 
 			if (!empty($item->php_helper_both))
@@ -370,52 +347,94 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 				$item->php_helper_both = base64_decode($item->php_helper_both);
 			}
 
+			if (!empty($item->php_helper_admin))
+			{
+				// base64 Decode php_helper_admin.
+				$item->php_helper_admin = base64_decode($item->php_helper_admin);
+			}
+
 			if (!empty($item->php_admin_event))
 			{
 				// base64 Decode php_admin_event.
 				$item->php_admin_event = base64_decode($item->php_admin_event);
 			}
 
+			if (!empty($item->php_helper_site))
+			{
+				// base64 Decode php_helper_site.
+				$item->php_helper_site = base64_decode($item->php_helper_site);
+			}
+
 			if (!empty($item->php_site_event))
 			{
 				// base64 Decode php_site_event.
 				$item->php_site_event = base64_decode($item->php_site_event);
 			}
 
+			if (!empty($item->javascript))
+			{
+				// base64 Decode javascript.
+				$item->javascript = base64_decode($item->javascript);
+			}
+
 			if (!empty($item->css_admin))
 			{
 				// base64 Decode css_admin.
 				$item->css_admin = base64_decode($item->css_admin);
 			}
 
+			if (!empty($item->css_site))
+			{
+				// base64 Decode css_site.
+				$item->css_site = base64_decode($item->css_site);
+			}
+
 			if (!empty($item->php_preflight_install))
 			{
 				// base64 Decode php_preflight_install.
 				$item->php_preflight_install = base64_decode($item->php_preflight_install);
 			}
 
+			if (!empty($item->php_preflight_update))
+			{
+				// base64 Decode php_preflight_update.
+				$item->php_preflight_update = base64_decode($item->php_preflight_update);
+			}
+
 			if (!empty($item->php_postflight_install))
 			{
 				// base64 Decode php_postflight_install.
 				$item->php_postflight_install = base64_decode($item->php_postflight_install);
 			}
 
+			if (!empty($item->php_postflight_update))
+			{
+				// base64 Decode php_postflight_update.
+				$item->php_postflight_update = base64_decode($item->php_postflight_update);
+			}
+
 			if (!empty($item->php_method_uninstall))
 			{
 				// base64 Decode php_method_uninstall.
 				$item->php_method_uninstall = base64_decode($item->php_method_uninstall);
 			}
 
+			if (!empty($item->sql))
+			{
+				// base64 Decode sql.
+				$item->sql = base64_decode($item->sql);
+			}
+
 			if (!empty($item->sql_uninstall))
 			{
 				// base64 Decode sql_uninstall.
 				$item->sql_uninstall = base64_decode($item->sql_uninstall);
 			}
 
-			if (!empty($item->buildcompsql))
+			if (!empty($item->readme))
 			{
-				// base64 Decode buildcompsql.
-				$item->buildcompsql = base64_decode($item->buildcompsql);
+				// base64 Decode readme.
+				$item->readme = base64_decode($item->readme);
 			}
 
 			// Get the basic encryption.
@@ -423,10 +442,10 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 			// Get the encryption object.
 			$basic = new FOFEncryptAes($basickey);
 
-			if (!empty($item->crowdin_account_api_key) && $basickey && !is_numeric($item->crowdin_account_api_key) && $item->crowdin_account_api_key === base64_encode(base64_decode($item->crowdin_account_api_key, true)))
+			if (!empty($item->crowdin_username) && $basickey && !is_numeric($item->crowdin_username) && $item->crowdin_username === base64_encode(base64_decode($item->crowdin_username, true)))
 			{
-				// basic decrypt data crowdin_account_api_key.
-				$item->crowdin_account_api_key = rtrim($basic->decryptString($item->crowdin_account_api_key), "\0");
+				// basic decrypt data crowdin_username.
+				$item->crowdin_username = rtrim($basic->decryptString($item->crowdin_username), "\0");
 			}
 
 			if (!empty($item->whmcs_key) && $basickey && !is_numeric($item->whmcs_key) && $item->whmcs_key === base64_encode(base64_decode($item->whmcs_key, true)))
@@ -435,22 +454,22 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 				$item->whmcs_key = rtrim($basic->decryptString($item->whmcs_key), "\0");
 			}
 
-			if (!empty($item->crowdin_project_api_key) && $basickey && !is_numeric($item->crowdin_project_api_key) && $item->crowdin_project_api_key === base64_encode(base64_decode($item->crowdin_project_api_key, true)))
-			{
-				// basic decrypt data crowdin_project_api_key.
-				$item->crowdin_project_api_key = rtrim($basic->decryptString($item->crowdin_project_api_key), "\0");
-			}
-
 			if (!empty($item->export_key) && $basickey && !is_numeric($item->export_key) && $item->export_key === base64_encode(base64_decode($item->export_key, true)))
 			{
 				// basic decrypt data export_key.
 				$item->export_key = rtrim($basic->decryptString($item->export_key), "\0");
 			}
 
-			if (!empty($item->crowdin_username) && $basickey && !is_numeric($item->crowdin_username) && $item->crowdin_username === base64_encode(base64_decode($item->crowdin_username, true)))
+			if (!empty($item->crowdin_project_api_key) && $basickey && !is_numeric($item->crowdin_project_api_key) && $item->crowdin_project_api_key === base64_encode(base64_decode($item->crowdin_project_api_key, true)))
 			{
-				// basic decrypt data crowdin_username.
-				$item->crowdin_username = rtrim($basic->decryptString($item->crowdin_username), "\0");
+				// basic decrypt data crowdin_project_api_key.
+				$item->crowdin_project_api_key = rtrim($basic->decryptString($item->crowdin_project_api_key), "\0");
+			}
+
+			if (!empty($item->crowdin_account_api_key) && $basickey && !is_numeric($item->crowdin_account_api_key) && $item->crowdin_account_api_key === base64_encode(base64_decode($item->crowdin_account_api_key, true)))
+			{
+				// basic decrypt data crowdin_account_api_key.
+				$item->crowdin_account_api_key = rtrim($basic->decryptString($item->crowdin_account_api_key), "\0");
 			}
 
 			if (!empty($item->addcontributors))
@@ -550,14 +569,14 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
-		// // check if xpath was set in options
+		// 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
+		// check if clear form was set in options
 		$clear = false;
 		if (isset($options['clear']))
 		{
@@ -643,6 +662,17 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 				$form->setValue($redirectedField, null, $redirectedValue);
 			}
 		}
+		// Only load these values if no id is found
+		if (0 == $id)
+		{
+			// set company defaults
+			$form->setValue('companyname', null, JComponentHelper::getParams('com_componentbuilder')->get('export_company', ''));
+			$form->setValue('author', null, JComponentHelper::getParams('com_componentbuilder')->get('export_owner', ''));
+			$form->setValue('email', null, JComponentHelper::getParams('com_componentbuilder')->get('export_email', ''));
+			$form->setValue('website', null, JComponentHelper::getParams('com_componentbuilder')->get('export_website', ''));
+			$form->setValue('copyright', null, JComponentHelper::getParams('com_componentbuilder')->get('export_copyright', 'Copyright (C) 2015. All Rights Reserved'));
+			$form->setValue('license', null, JComponentHelper::getParams('com_componentbuilder')->get('export_license', 'GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html'));
+		}
 
 		// update all editors to use this components global editor
 		$global_editor = JComponentHelper::getParams('com_componentbuilder')->get('editor', 'none');
@@ -660,17 +690,13 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 			}
 		}
 
-		// Only load these values if no id is found
+
+		// Only load the GUID if new item
 		if (0 == $id)
 		{
-			// set company defaults
-			$form->setValue('companyname', null, JComponentHelper::getParams('com_componentbuilder')->get('export_company', ''));
-			$form->setValue('author', null, JComponentHelper::getParams('com_componentbuilder')->get('export_owner', ''));
-			$form->setValue('email', null, JComponentHelper::getParams('com_componentbuilder')->get('export_email', ''));
-			$form->setValue('website', null, JComponentHelper::getParams('com_componentbuilder')->get('export_website', ''));
-			$form->setValue('copyright', null, JComponentHelper::getParams('com_componentbuilder')->get('export_copyright', 'Copyright (C) 2015. All Rights Reserved'));
-			$form->setValue('license', null, JComponentHelper::getParams('com_componentbuilder')->get('export_license', 'GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html'));
-		}
+			$form->setValue('guid', null, ComponentbuilderHelper::GUID());
+		}
+
 		return $form;
 	}
 
@@ -1353,7 +1379,14 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 		if (empty($data['system_name']) || !ComponentbuilderHelper::checkString($data['system_name']))
 		{
 			$data['system_name'] = $data['name'];
-		}
+		}
+
+		// Set the GUID if empty or not valid
+		if (isset($data['guid']) && !ComponentbuilderHelper::validGUID($data['guid']))
+		{
+			$data['guid'] = (string) ComponentbuilderHelper::GUID();
+		}
+
 
 		// Set the addcontributors items to data.
 		if (isset($data['addcontributors']) && is_array($data['addcontributors']))
@@ -1368,52 +1401,10 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 			$data['addcontributors'] = '';
 		}
 
-		// Set the php_helper_site string to base64 string.
-		if (isset($data['php_helper_site']))
+		// Set the buildcompsql string to base64 string.
+		if (isset($data['buildcompsql']))
 		{
-			$data['php_helper_site'] = base64_encode($data['php_helper_site']);
-		}
-
-		// Set the readme string to base64 string.
-		if (isset($data['readme']))
-		{
-			$data['readme'] = base64_encode($data['readme']);
-		}
-
-		// Set the php_postflight_update string to base64 string.
-		if (isset($data['php_postflight_update']))
-		{
-			$data['php_postflight_update'] = base64_encode($data['php_postflight_update']);
-		}
-
-		// Set the javascript string to base64 string.
-		if (isset($data['javascript']))
-		{
-			$data['javascript'] = base64_encode($data['javascript']);
-		}
-
-		// Set the css_site string to base64 string.
-		if (isset($data['css_site']))
-		{
-			$data['css_site'] = base64_encode($data['css_site']);
-		}
-
-		// Set the php_preflight_update string to base64 string.
-		if (isset($data['php_preflight_update']))
-		{
-			$data['php_preflight_update'] = base64_encode($data['php_preflight_update']);
-		}
-
-		// Set the sql string to base64 string.
-		if (isset($data['sql']))
-		{
-			$data['sql'] = base64_encode($data['sql']);
-		}
-
-		// Set the php_helper_admin string to base64 string.
-		if (isset($data['php_helper_admin']))
-		{
-			$data['php_helper_admin'] = base64_encode($data['php_helper_admin']);
+			$data['buildcompsql'] = base64_encode($data['buildcompsql']);
 		}
 
 		// Set the php_helper_both string to base64 string.
@@ -1422,52 +1413,94 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 			$data['php_helper_both'] = base64_encode($data['php_helper_both']);
 		}
 
+		// Set the php_helper_admin string to base64 string.
+		if (isset($data['php_helper_admin']))
+		{
+			$data['php_helper_admin'] = base64_encode($data['php_helper_admin']);
+		}
+
 		// Set the php_admin_event string to base64 string.
 		if (isset($data['php_admin_event']))
 		{
 			$data['php_admin_event'] = base64_encode($data['php_admin_event']);
 		}
 
+		// Set the php_helper_site string to base64 string.
+		if (isset($data['php_helper_site']))
+		{
+			$data['php_helper_site'] = base64_encode($data['php_helper_site']);
+		}
+
 		// Set the php_site_event string to base64 string.
 		if (isset($data['php_site_event']))
 		{
 			$data['php_site_event'] = base64_encode($data['php_site_event']);
 		}
 
+		// Set the javascript string to base64 string.
+		if (isset($data['javascript']))
+		{
+			$data['javascript'] = base64_encode($data['javascript']);
+		}
+
 		// Set the css_admin string to base64 string.
 		if (isset($data['css_admin']))
 		{
 			$data['css_admin'] = base64_encode($data['css_admin']);
 		}
 
+		// Set the css_site string to base64 string.
+		if (isset($data['css_site']))
+		{
+			$data['css_site'] = base64_encode($data['css_site']);
+		}
+
 		// Set the php_preflight_install string to base64 string.
 		if (isset($data['php_preflight_install']))
 		{
 			$data['php_preflight_install'] = base64_encode($data['php_preflight_install']);
 		}
 
+		// Set the php_preflight_update string to base64 string.
+		if (isset($data['php_preflight_update']))
+		{
+			$data['php_preflight_update'] = base64_encode($data['php_preflight_update']);
+		}
+
 		// Set the php_postflight_install string to base64 string.
 		if (isset($data['php_postflight_install']))
 		{
 			$data['php_postflight_install'] = base64_encode($data['php_postflight_install']);
 		}
 
+		// Set the php_postflight_update string to base64 string.
+		if (isset($data['php_postflight_update']))
+		{
+			$data['php_postflight_update'] = base64_encode($data['php_postflight_update']);
+		}
+
 		// Set the php_method_uninstall string to base64 string.
 		if (isset($data['php_method_uninstall']))
 		{
 			$data['php_method_uninstall'] = base64_encode($data['php_method_uninstall']);
 		}
 
+		// Set the sql string to base64 string.
+		if (isset($data['sql']))
+		{
+			$data['sql'] = base64_encode($data['sql']);
+		}
+
 		// Set the sql_uninstall string to base64 string.
 		if (isset($data['sql_uninstall']))
 		{
 			$data['sql_uninstall'] = base64_encode($data['sql_uninstall']);
 		}
 
-		// Set the buildcompsql string to base64 string.
-		if (isset($data['buildcompsql']))
+		// Set the readme string to base64 string.
+		if (isset($data['readme']))
 		{
-			$data['buildcompsql'] = base64_encode($data['buildcompsql']);
+			$data['readme'] = base64_encode($data['readme']);
 		}
 
 		// Get the basic encryption key.
@@ -1475,10 +1508,10 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 		// Get the encryption object
 		$basic = new FOFEncryptAes($basickey);
 
-		// Encrypt data crowdin_account_api_key.
-		if (isset($data['crowdin_account_api_key']) && $basickey)
+		// Encrypt data crowdin_username.
+		if (isset($data['crowdin_username']) && $basickey)
 		{
-			$data['crowdin_account_api_key'] = $basic->encryptString($data['crowdin_account_api_key']);
+			$data['crowdin_username'] = $basic->encryptString($data['crowdin_username']);
 		}
 
 		// Encrypt data whmcs_key.
@@ -1487,22 +1520,22 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 			$data['whmcs_key'] = $basic->encryptString($data['whmcs_key']);
 		}
 
-		// Encrypt data crowdin_project_api_key.
-		if (isset($data['crowdin_project_api_key']) && $basickey)
-		{
-			$data['crowdin_project_api_key'] = $basic->encryptString($data['crowdin_project_api_key']);
-		}
-
 		// Encrypt data export_key.
 		if (isset($data['export_key']) && $basickey)
 		{
 			$data['export_key'] = $basic->encryptString($data['export_key']);
 		}
 
-		// Encrypt data crowdin_username.
-		if (isset($data['crowdin_username']) && $basickey)
+		// Encrypt data crowdin_project_api_key.
+		if (isset($data['crowdin_project_api_key']) && $basickey)
 		{
-			$data['crowdin_username'] = $basic->encryptString($data['crowdin_username']);
+			$data['crowdin_project_api_key'] = $basic->encryptString($data['crowdin_project_api_key']);
+		}
+
+		// Encrypt data crowdin_account_api_key.
+		if (isset($data['crowdin_account_api_key']) && $basickey)
+		{
+			$data['crowdin_account_api_key'] = $basic->encryptString($data['crowdin_account_api_key']);
 		}
 
 		// we check if component should be build from sql file

admin/models/joomla_components.php

@@ -1906,7 +1906,7 @@ class ComponentbuilderModelJoomla_components extends JModelList
 		// #__componentbuilder_custom_admin_view (g)
 		'custom_admin_view' => array(
 			'search' => array('id', 'system_name', 'default', 'php_view', 'php_jview', 'php_jview_display', 'php_document',
-				'js_document', 'css_document', 'css', 'php_ajaxmethod', 'php_model', 'php_controller'),
+				'javascript_file', 'js_document', 'css_document', 'css', 'php_ajaxmethod', 'php_model', 'php_controller'),
 			'views' => 'custom_admin_views',
 			'not_base64' => array(),
 			'name' => 'system_name'
@@ -1914,7 +1914,7 @@ class ComponentbuilderModelJoomla_components extends JModelList
 		// #__componentbuilder_site_view (h)
 		'site_view' => array(
 			'search' => array('id', 'system_name', 'default', 'php_view', 'php_jview', 'php_jview_display', 'php_document',
-				'js_document', 'css_document', 'css', 'php_ajaxmethod', 'php_model', 'php_controller'),
+				'javascript_file', 'js_document', 'css_document', 'css', 'php_ajaxmethod', 'php_model', 'php_controller'),
 			'views' => 'site_views',
 			'not_base64' => array(),
 			'name' => 'system_name'
@@ -2303,58 +2303,6 @@ class ComponentbuilderModelJoomla_components extends JModelList
 							continue;
 						}
 
-						// decode php_helper_site
-						$item->php_helper_site = base64_decode($item->php_helper_site);
-						if ($basickey && !is_numeric($item->crowdin_account_api_key) && $item->crowdin_account_api_key === base64_encode(base64_decode($item->crowdin_account_api_key, true)))
-						{
-							// decrypt crowdin_account_api_key
-							$item->crowdin_account_api_key = $basic->decryptString($item->crowdin_account_api_key);
-						}
-						// decode readme
-						$item->readme = base64_decode($item->readme);
-						// decode php_postflight_update
-						$item->php_postflight_update = base64_decode($item->php_postflight_update);
-						// decode javascript
-						$item->javascript = base64_decode($item->javascript);
-						// decode css_site
-						$item->css_site = base64_decode($item->css_site);
-						// decode php_preflight_update
-						$item->php_preflight_update = base64_decode($item->php_preflight_update);
-						// decode sql
-						$item->sql = base64_decode($item->sql);
-						// decode php_helper_admin
-						$item->php_helper_admin = base64_decode($item->php_helper_admin);
-						// decode php_helper_both
-						$item->php_helper_both = base64_decode($item->php_helper_both);
-						// decode php_admin_event
-						$item->php_admin_event = base64_decode($item->php_admin_event);
-						// decode php_site_event
-						$item->php_site_event = base64_decode($item->php_site_event);
-						// decode css_admin
-						$item->css_admin = base64_decode($item->css_admin);
-						if ($basickey && !is_numeric($item->whmcs_key) && $item->whmcs_key === base64_encode(base64_decode($item->whmcs_key, true)))
-						{
-							// decrypt whmcs_key
-							$item->whmcs_key = $basic->decryptString($item->whmcs_key);
-						}
-						// decode php_preflight_install
-						$item->php_preflight_install = base64_decode($item->php_preflight_install);
-						// decode php_postflight_install
-						$item->php_postflight_install = base64_decode($item->php_postflight_install);
-						// decode php_method_uninstall
-						$item->php_method_uninstall = base64_decode($item->php_method_uninstall);
-						// decode sql_uninstall
-						$item->sql_uninstall = base64_decode($item->sql_uninstall);
-						if ($basickey && !is_numeric($item->crowdin_project_api_key) && $item->crowdin_project_api_key === base64_encode(base64_decode($item->crowdin_project_api_key, true)))
-						{
-							// decrypt crowdin_project_api_key
-							$item->crowdin_project_api_key = $basic->decryptString($item->crowdin_project_api_key);
-						}
-						if ($basickey && !is_numeric($item->export_key) && $item->export_key === base64_encode(base64_decode($item->export_key, true)))
-						{
-							// decrypt export_key
-							$item->export_key = $basic->decryptString($item->export_key);
-						}
 						if ($basickey && !is_numeric($item->crowdin_username) && $item->crowdin_username === base64_encode(base64_decode($item->crowdin_username, true)))
 						{
 							// decrypt crowdin_username
@@ -2362,6 +2310,58 @@ class ComponentbuilderModelJoomla_components extends JModelList
 						}
 						// decode buildcompsql
 						$item->buildcompsql = base64_decode($item->buildcompsql);
+						if ($basickey && !is_numeric($item->whmcs_key) && $item->whmcs_key === base64_encode(base64_decode($item->whmcs_key, true)))
+						{
+							// decrypt whmcs_key
+							$item->whmcs_key = $basic->decryptString($item->whmcs_key);
+						}
+						// decode php_helper_both
+						$item->php_helper_both = base64_decode($item->php_helper_both);
+						// decode php_helper_admin
+						$item->php_helper_admin = base64_decode($item->php_helper_admin);
+						// decode php_admin_event
+						$item->php_admin_event = base64_decode($item->php_admin_event);
+						// decode php_helper_site
+						$item->php_helper_site = base64_decode($item->php_helper_site);
+						// decode php_site_event
+						$item->php_site_event = base64_decode($item->php_site_event);
+						// decode javascript
+						$item->javascript = base64_decode($item->javascript);
+						// decode css_admin
+						$item->css_admin = base64_decode($item->css_admin);
+						// decode css_site
+						$item->css_site = base64_decode($item->css_site);
+						// decode php_preflight_install
+						$item->php_preflight_install = base64_decode($item->php_preflight_install);
+						// decode php_preflight_update
+						$item->php_preflight_update = base64_decode($item->php_preflight_update);
+						if ($basickey && !is_numeric($item->export_key) && $item->export_key === base64_encode(base64_decode($item->export_key, true)))
+						{
+							// decrypt export_key
+							$item->export_key = $basic->decryptString($item->export_key);
+						}
+						// decode php_postflight_install
+						$item->php_postflight_install = base64_decode($item->php_postflight_install);
+						// decode php_postflight_update
+						$item->php_postflight_update = base64_decode($item->php_postflight_update);
+						// decode php_method_uninstall
+						$item->php_method_uninstall = base64_decode($item->php_method_uninstall);
+						// decode sql
+						$item->sql = base64_decode($item->sql);
+						// decode sql_uninstall
+						$item->sql_uninstall = base64_decode($item->sql_uninstall);
+						// decode readme
+						$item->readme = base64_decode($item->readme);
+						if ($basickey && !is_numeric($item->crowdin_project_api_key) && $item->crowdin_project_api_key === base64_encode(base64_decode($item->crowdin_project_api_key, true)))
+						{
+							// decrypt crowdin_project_api_key
+							$item->crowdin_project_api_key = $basic->decryptString($item->crowdin_project_api_key);
+						}
+						if ($basickey && !is_numeric($item->crowdin_account_api_key) && $item->crowdin_account_api_key === base64_encode(base64_decode($item->crowdin_account_api_key, true)))
+						{
+							// decrypt crowdin_account_api_key
+							$item->crowdin_account_api_key = $basic->decryptString($item->crowdin_account_api_key);
+						}
 						// unset the values we don't want exported.
 						unset($item->asset_id);
 						unset($item->checked_out);

admin/models/joomla_module.php

@@ -66,6 +66,19 @@ class ComponentbuilderModelJoomla_module extends JModelAdmin
 				'php_method_uninstall'
 			)
 		),
+		'dynamic_integration' => array(
+			'left' => array(
+				'add_update_server',
+				'update_server_url',
+				'update_server_target',
+				'note_update_server_note_ftp',
+				'note_update_server_note_zip',
+				'note_update_server_note_other',
+				'update_server',
+				'add_sales_server',
+				'sales_server'
+			)
+		),
 		'readme' => array(
 			'left' => array(
 				'addreadme',
@@ -80,19 +93,6 @@ class ComponentbuilderModelJoomla_module extends JModelAdmin
 				'sql_uninstall'
 			)
 		),
-		'dynamic_integration' => array(
-			'left' => array(
-				'add_update_server',
-				'update_server_url',
-				'update_server_target',
-				'note_update_server_note_ftp',
-				'note_update_server_note_zip',
-				'note_update_server_note_other',
-				'update_server',
-				'add_sales_server',
-				'sales_server'
-			)
-		),
 		'code' => array(
 			'left' => array(
 				'custom_get'
@@ -234,22 +234,10 @@ class ComponentbuilderModelJoomla_module extends JModelAdmin
 				$item->metadata = $registry->toArray();
 			}
 
-			if (!empty($item->php_method_uninstall))
+			if (!empty($item->default))
 			{
-				// base64 Decode php_method_uninstall.
-				$item->php_method_uninstall = base64_decode($item->php_method_uninstall);
-			}
-
-			if (!empty($item->php_postflight_install))
-			{
-				// base64 Decode php_postflight_install.
-				$item->php_postflight_install = base64_decode($item->php_postflight_install);
-			}
-
-			if (!empty($item->php_postflight_update))
-			{
-				// base64 Decode php_postflight_update.
-				$item->php_postflight_update = base64_decode($item->php_postflight_update);
+				// base64 Decode default.
+				$item->default = base64_decode($item->default);
 			}
 
 			if (!empty($item->php_preflight_update))
@@ -264,48 +252,60 @@ class ComponentbuilderModelJoomla_module extends JModelAdmin
 				$item->php_preflight_uninstall = base64_decode($item->php_preflight_uninstall);
 			}
 
-			if (!empty($item->readme))
-			{
-				// base64 Decode readme.
-				$item->readme = base64_decode($item->readme);
-			}
-
-			if (!empty($item->default))
-			{
-				// base64 Decode default.
-				$item->default = base64_decode($item->default);
-			}
-
-			if (!empty($item->sql))
-			{
-				// base64 Decode sql.
-				$item->sql = base64_decode($item->sql);
-			}
-
-			if (!empty($item->sql_uninstall))
-			{
-				// base64 Decode sql_uninstall.
-				$item->sql_uninstall = base64_decode($item->sql_uninstall);
-			}
-
 			if (!empty($item->mod_code))
 			{
 				// base64 Decode mod_code.
 				$item->mod_code = base64_decode($item->mod_code);
 			}
 
+			if (!empty($item->php_postflight_install))
+			{
+				// base64 Decode php_postflight_install.
+				$item->php_postflight_install = base64_decode($item->php_postflight_install);
+			}
+
+			if (!empty($item->php_postflight_update))
+			{
+				// base64 Decode php_postflight_update.
+				$item->php_postflight_update = base64_decode($item->php_postflight_update);
+			}
+
+			if (!empty($item->php_method_uninstall))
+			{
+				// base64 Decode php_method_uninstall.
+				$item->php_method_uninstall = base64_decode($item->php_method_uninstall);
+			}
+
 			if (!empty($item->class_helper_header))
 			{
 				// base64 Decode class_helper_header.
 				$item->class_helper_header = base64_decode($item->class_helper_header);
 			}
 
+			if (!empty($item->sql))
+			{
+				// base64 Decode sql.
+				$item->sql = base64_decode($item->sql);
+			}
+
 			if (!empty($item->class_helper_code))
 			{
 				// base64 Decode class_helper_code.
 				$item->class_helper_code = base64_decode($item->class_helper_code);
 			}
 
+			if (!empty($item->sql_uninstall))
+			{
+				// base64 Decode sql_uninstall.
+				$item->sql_uninstall = base64_decode($item->sql_uninstall);
+			}
+
+			if (!empty($item->readme))
+			{
+				// base64 Decode readme.
+				$item->readme = base64_decode($item->readme);
+			}
+
 			if (!empty($item->php_script_construct))
 			{
 				// base64 Decode php_script_construct.
@@ -400,14 +400,14 @@ class ComponentbuilderModelJoomla_module extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
-		// // check if xpath was set in options
+		// 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
+		// check if clear form was set in options
 		$clear = false;
 		if (isset($options['clear']))
 		{
@@ -509,6 +509,13 @@ class ComponentbuilderModelJoomla_module extends JModelAdmin
 				$form->setFieldAttribute($name, 'editor', $global_editor . '|none');
 			}
 		}
+
+
+		// Only load the GUID if new item
+		if (0 == $id)
+		{
+			$form->setValue('guid', null, ComponentbuilderHelper::GUID());
+		}
 
 		return $form;
 	}
@@ -1186,7 +1193,14 @@ class ComponentbuilderModelJoomla_module extends JModelAdmin
 		if (empty($data['system_name']) || !ComponentbuilderHelper::checkString($data['system_name']))
 		{
 			$data['system_name'] = $data['name'];
-		}
+		}
+
+		// Set the GUID if empty or not valid
+		if (isset($data['guid']) && !ComponentbuilderHelper::validGUID($data['guid']))
+		{
+			$data['guid'] = (string) ComponentbuilderHelper::GUID();
+		}
+
 
 		// Set the libraries items to data.
 		if (isset($data['libraries']) && is_array($data['libraries']))
@@ -1227,22 +1241,10 @@ class ComponentbuilderModelJoomla_module extends JModelAdmin
 			$data['fields'] = '';
 		}
 
-		// Set the php_method_uninstall string to base64 string.
-		if (isset($data['php_method_uninstall']))
+		// Set the default string to base64 string.
+		if (isset($data['default']))
 		{
-			$data['php_method_uninstall'] = base64_encode($data['php_method_uninstall']);
-		}
-
-		// Set the php_postflight_install string to base64 string.
-		if (isset($data['php_postflight_install']))
-		{
-			$data['php_postflight_install'] = base64_encode($data['php_postflight_install']);
-		}
-
-		// Set the php_postflight_update string to base64 string.
-		if (isset($data['php_postflight_update']))
-		{
-			$data['php_postflight_update'] = base64_encode($data['php_postflight_update']);
+			$data['default'] = base64_encode($data['default']);
 		}
 
 		// Set the php_preflight_update string to base64 string.
@@ -1257,48 +1259,60 @@ class ComponentbuilderModelJoomla_module extends JModelAdmin
 			$data['php_preflight_uninstall'] = base64_encode($data['php_preflight_uninstall']);
 		}
 
-		// Set the readme string to base64 string.
-		if (isset($data['readme']))
-		{
-			$data['readme'] = base64_encode($data['readme']);
-		}
-
-		// Set the default string to base64 string.
-		if (isset($data['default']))
-		{
-			$data['default'] = base64_encode($data['default']);
-		}
-
-		// Set the sql string to base64 string.
-		if (isset($data['sql']))
-		{
-			$data['sql'] = base64_encode($data['sql']);
-		}
-
-		// Set the sql_uninstall string to base64 string.
-		if (isset($data['sql_uninstall']))
-		{
-			$data['sql_uninstall'] = base64_encode($data['sql_uninstall']);
-		}
-
 		// Set the mod_code string to base64 string.
 		if (isset($data['mod_code']))
 		{
 			$data['mod_code'] = base64_encode($data['mod_code']);
 		}
 
+		// Set the php_postflight_install string to base64 string.
+		if (isset($data['php_postflight_install']))
+		{
+			$data['php_postflight_install'] = base64_encode($data['php_postflight_install']);
+		}
+
+		// Set the php_postflight_update string to base64 string.
+		if (isset($data['php_postflight_update']))
+		{
+			$data['php_postflight_update'] = base64_encode($data['php_postflight_update']);
+		}
+
+		// Set the php_method_uninstall string to base64 string.
+		if (isset($data['php_method_uninstall']))
+		{
+			$data['php_method_uninstall'] = base64_encode($data['php_method_uninstall']);
+		}
+
 		// Set the class_helper_header string to base64 string.
 		if (isset($data['class_helper_header']))
 		{
 			$data['class_helper_header'] = base64_encode($data['class_helper_header']);
 		}
 
+		// Set the sql string to base64 string.
+		if (isset($data['sql']))
+		{
+			$data['sql'] = base64_encode($data['sql']);
+		}
+
 		// Set the class_helper_code string to base64 string.
 		if (isset($data['class_helper_code']))
 		{
 			$data['class_helper_code'] = base64_encode($data['class_helper_code']);
 		}
 
+		// Set the sql_uninstall string to base64 string.
+		if (isset($data['sql_uninstall']))
+		{
+			$data['sql_uninstall'] = base64_encode($data['sql_uninstall']);
+		}
+
+		// Set the readme string to base64 string.
+		if (isset($data['readme']))
+		{
+			$data['readme'] = base64_encode($data['readme']);
+		}
+
 		// Set the php_script_construct string to base64 string.
 		if (isset($data['php_script_construct']))
 		{

admin/models/joomla_module_files_folders_urls.php

@@ -176,14 +176,14 @@ class ComponentbuilderModelJoomla_module_files_folders_urls extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
-		// // check if xpath was set in options
+		// 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
+		// check if clear form was set in options
 		$clear = false;
 		if (isset($options['clear']))
 		{

admin/models/joomla_module_updates.php

@@ -130,14 +130,14 @@ class ComponentbuilderModelJoomla_module_updates extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
-		// // check if xpath was set in options
+		// 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
+		// check if clear form was set in options
 		$clear = false;
 		if (isset($options['clear']))
 		{

admin/models/joomla_plugin.php

@@ -212,22 +212,16 @@ class ComponentbuilderModelJoomla_plugin extends JModelAdmin
 				$item->metadata = $registry->toArray();
 			}
 
-			if (!empty($item->sql))
+			if (!empty($item->head))
 			{
-				// base64 Decode sql.
-				$item->sql = base64_decode($item->sql);
+				// base64 Decode head.
+				$item->head = base64_decode($item->head);
 			}
 
-			if (!empty($item->php_method_uninstall))
+			if (!empty($item->main_class_code))
 			{
-				// base64 Decode php_method_uninstall.
-				$item->php_method_uninstall = base64_decode($item->php_method_uninstall);
-			}
-
-			if (!empty($item->php_postflight_update))
-			{
-				// base64 Decode php_postflight_update.
-				$item->php_postflight_update = base64_decode($item->php_postflight_update);
+				// base64 Decode main_class_code.
+				$item->main_class_code = base64_decode($item->main_class_code);
 			}
 
 			if (!empty($item->php_postflight_install))
@@ -236,10 +230,28 @@ class ComponentbuilderModelJoomla_plugin extends JModelAdmin
 				$item->php_postflight_install = base64_decode($item->php_postflight_install);
 			}
 
-			if (!empty($item->head))
+			if (!empty($item->php_postflight_update))
 			{
-				// base64 Decode head.
-				$item->head = base64_decode($item->head);
+				// base64 Decode php_postflight_update.
+				$item->php_postflight_update = base64_decode($item->php_postflight_update);
+			}
+
+			if (!empty($item->php_method_uninstall))
+			{
+				// base64 Decode php_method_uninstall.
+				$item->php_method_uninstall = base64_decode($item->php_method_uninstall);
+			}
+
+			if (!empty($item->sql))
+			{
+				// base64 Decode sql.
+				$item->sql = base64_decode($item->sql);
+			}
+
+			if (!empty($item->php_script_construct))
+			{
+				// base64 Decode php_script_construct.
+				$item->php_script_construct = base64_decode($item->php_script_construct);
 			}
 
 			if (!empty($item->sql_uninstall))
@@ -254,18 +266,6 @@ class ComponentbuilderModelJoomla_plugin extends JModelAdmin
 				$item->readme = base64_decode($item->readme);
 			}
 
-			if (!empty($item->main_class_code))
-			{
-				// base64 Decode main_class_code.
-				$item->main_class_code = base64_decode($item->main_class_code);
-			}
-
-			if (!empty($item->php_script_construct))
-			{
-				// base64 Decode php_script_construct.
-				$item->php_script_construct = base64_decode($item->php_script_construct);
-			}
-
 			if (!empty($item->php_preflight_install))
 			{
 				// base64 Decode php_preflight_install.
@@ -366,14 +366,14 @@ class ComponentbuilderModelJoomla_plugin extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
-		// // check if xpath was set in options
+		// 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
+		// check if clear form was set in options
 		$clear = false;
 		if (isset($options['clear']))
 		{
@@ -475,6 +475,13 @@ class ComponentbuilderModelJoomla_plugin extends JModelAdmin
 				$form->setFieldAttribute($name, 'editor', $global_editor . '|none');
 			}
 		}
+
+
+		// Only load the GUID if new item
+		if (0 == $id)
+		{
+			$form->setValue('guid', null, ComponentbuilderHelper::GUID());
+		}
 
 		return $form;
 	}
@@ -1150,7 +1157,14 @@ class ComponentbuilderModelJoomla_plugin extends JModelAdmin
 		if (empty($data['system_name']) || !ComponentbuilderHelper::checkString($data['system_name']))
 		{
 			$data['system_name'] = $data['name'];
-		}
+		}
+
+		// Set the GUID if empty or not valid
+		if (isset($data['guid']) && !ComponentbuilderHelper::validGUID($data['guid']))
+		{
+			$data['guid'] = (string) ComponentbuilderHelper::GUID();
+		}
+
 
 		// Set the method_selection items to data.
 		if (isset($data['method_selection']) && is_array($data['method_selection']))
@@ -1191,22 +1205,16 @@ class ComponentbuilderModelJoomla_plugin extends JModelAdmin
 			$data['fields'] = '';
 		}
 
-		// Set the sql string to base64 string.
-		if (isset($data['sql']))
+		// Set the head string to base64 string.
+		if (isset($data['head']))
 		{
-			$data['sql'] = base64_encode($data['sql']);
+			$data['head'] = base64_encode($data['head']);
 		}
 
-		// Set the php_method_uninstall string to base64 string.
-		if (isset($data['php_method_uninstall']))
+		// Set the main_class_code string to base64 string.
+		if (isset($data['main_class_code']))
 		{
-			$data['php_method_uninstall'] = base64_encode($data['php_method_uninstall']);
-		}
-
-		// Set the php_postflight_update string to base64 string.
-		if (isset($data['php_postflight_update']))
-		{
-			$data['php_postflight_update'] = base64_encode($data['php_postflight_update']);
+			$data['main_class_code'] = base64_encode($data['main_class_code']);
 		}
 
 		// Set the php_postflight_install string to base64 string.
@@ -1215,10 +1223,28 @@ class ComponentbuilderModelJoomla_plugin extends JModelAdmin
 			$data['php_postflight_install'] = base64_encode($data['php_postflight_install']);
 		}
 
-		// Set the head string to base64 string.
-		if (isset($data['head']))
+		// Set the php_postflight_update string to base64 string.
+		if (isset($data['php_postflight_update']))
 		{
-			$data['head'] = base64_encode($data['head']);
+			$data['php_postflight_update'] = base64_encode($data['php_postflight_update']);
+		}
+
+		// Set the php_method_uninstall string to base64 string.
+		if (isset($data['php_method_uninstall']))
+		{
+			$data['php_method_uninstall'] = base64_encode($data['php_method_uninstall']);
+		}
+
+		// Set the sql string to base64 string.
+		if (isset($data['sql']))
+		{
+			$data['sql'] = base64_encode($data['sql']);
+		}
+
+		// Set the php_script_construct string to base64 string.
+		if (isset($data['php_script_construct']))
+		{
+			$data['php_script_construct'] = base64_encode($data['php_script_construct']);
 		}
 
 		// Set the sql_uninstall string to base64 string.
@@ -1233,18 +1259,6 @@ class ComponentbuilderModelJoomla_plugin extends JModelAdmin
 			$data['readme'] = base64_encode($data['readme']);
 		}
 
-		// Set the main_class_code string to base64 string.
-		if (isset($data['main_class_code']))
-		{
-			$data['main_class_code'] = base64_encode($data['main_class_code']);
-		}
-
-		// Set the php_script_construct string to base64 string.
-		if (isset($data['php_script_construct']))
-		{
-			$data['php_script_construct'] = base64_encode($data['php_script_construct']);
-		}
-
 		// Set the php_preflight_install string to base64 string.
 		if (isset($data['php_preflight_install']))
 		{

admin/models/joomla_plugin_files_folders_urls.php

@@ -176,14 +176,14 @@ class ComponentbuilderModelJoomla_plugin_files_folders_urls extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
-		// // check if xpath was set in options
+		// 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
+		// check if clear form was set in options
 		$clear = false;
 		if (isset($options['clear']))
 		{

admin/models/joomla_plugin_group.php

@@ -122,14 +122,14 @@ class ComponentbuilderModelJoomla_plugin_group extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
-		// // check if xpath was set in options
+		// 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
+		// check if clear form was set in options
 		$clear = false;
 		if (isset($options['clear']))
 		{

admin/models/joomla_plugin_updates.php

@@ -130,14 +130,14 @@ class ComponentbuilderModelJoomla_plugin_updates extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
-		// // check if xpath was set in options
+		// 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
+		// check if clear form was set in options
 		$clear = false;
 		if (isset($options['clear']))
 		{

admin/models/language.php

@@ -122,14 +122,14 @@ class ComponentbuilderModelLanguage extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
-		// // check if xpath was set in options
+		// 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
+		// check if clear form was set in options
 		$clear = false;
 		if (isset($options['clear']))
 		{

admin/models/language_translation.php

@@ -217,14 +217,14 @@ class ComponentbuilderModelLanguage_translation extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
-		// // check if xpath was set in options
+		// 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
+		// check if clear form was set in options
 		$clear = false;
 		if (isset($options['clear']))
 		{

admin/models/layout.php

@@ -247,14 +247,14 @@ class ComponentbuilderModelLayout extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
-		// // check if xpath was set in options
+		// 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
+		// check if clear form was set in options
 		$clear = false;
 		if (isset($options['clear']))
 		{

admin/models/library.php

@@ -190,14 +190,6 @@ class ComponentbuilderModelLibrary extends JModelAdmin
 				$item->php_setdocument = base64_decode($item->php_setdocument);
 			}
 
-			if (!empty($item->addconditions))
-			{
-				// Convert the addconditions field to an array.
-				$addconditions = new Registry;
-				$addconditions->loadString($item->addconditions);
-				$item->addconditions = $addconditions->toArray();
-			}
-
 			if (!empty($item->libraries))
 			{
 				// Convert the libraries field to an array.
@@ -206,6 +198,14 @@ class ComponentbuilderModelLibrary extends JModelAdmin
 				$item->libraries = $libraries->toArray();
 			}
 
+			if (!empty($item->addconditions))
+			{
+				// Convert the addconditions field to an array.
+				$addconditions = new Registry;
+				$addconditions->loadString($item->addconditions);
+				$item->addconditions = $addconditions->toArray();
+			}
+
 
 			if (empty($item->id))
 			{
@@ -264,14 +264,14 @@ class ComponentbuilderModelLibrary extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
-		// // check if xpath was set in options
+		// 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
+		// check if clear form was set in options
 		$clear = false;
 		if (isset($options['clear']))
 		{
@@ -355,6 +355,13 @@ class ComponentbuilderModelLibrary extends JModelAdmin
 				$form->setValue($redirectedField, null, $redirectedValue);
 			}
 		}
+
+		// Only load the GUID if new item
+		if (0 == $id)
+		{
+			$form->setValue('guid', null, ComponentbuilderHelper::GUID());
+		}
+
 		return $form;
 	}
 
@@ -1037,18 +1044,13 @@ class ComponentbuilderModelLibrary extends JModelAdmin
 			$data['metadata'] = (string) $metadata;
 		}
 
-		// Set the addconditions items to data.
-		if (isset($data['addconditions']) && is_array($data['addconditions']))
-		{
-			$addconditions = new JRegistry;
-			$addconditions->loadArray($data['addconditions']);
-			$data['addconditions'] = (string) $addconditions;
-		}
-		elseif (!isset($data['addconditions']))
-		{
-			// Set the empty addconditions to data
-			$data['addconditions'] = '';
-		}
+
+		// Set the GUID if empty or not valid
+		if (isset($data['guid']) && !ComponentbuilderHelper::validGUID($data['guid']))
+		{
+			$data['guid'] = (string) ComponentbuilderHelper::GUID();
+		}
+
 
 		// Set the libraries items to data.
 		if (isset($data['libraries']) && is_array($data['libraries']))
@@ -1063,6 +1065,19 @@ class ComponentbuilderModelLibrary extends JModelAdmin
 			$data['libraries'] = '';
 		}
 
+		// Set the addconditions items to data.
+		if (isset($data['addconditions']) && is_array($data['addconditions']))
+		{
+			$addconditions = new JRegistry;
+			$addconditions->loadArray($data['addconditions']);
+			$data['addconditions'] = (string) $addconditions;
+		}
+		elseif (!isset($data['addconditions']))
+		{
+			// Set the empty addconditions to data
+			$data['addconditions'] = '';
+		}
+
 		// Set the php_setdocument string to base64 string.
 		if (isset($data['php_setdocument']))
 		{

admin/models/library_config.php

@@ -130,14 +130,14 @@ class ComponentbuilderModelLibrary_config extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
-		// // check if xpath was set in options
+		// 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
+		// check if clear form was set in options
 		$clear = false;
 		if (isset($options['clear']))
 		{

admin/models/library_files_folders_urls.php

@@ -176,14 +176,14 @@ class ComponentbuilderModelLibrary_files_folders_urls extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
-		// // check if xpath was set in options
+		// 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
+		// check if clear form was set in options
 		$clear = false;
 		if (isset($options['clear']))
 		{

admin/models/placeholder.php

@@ -213,14 +213,14 @@ class ComponentbuilderModelPlaceholder extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
-		// // check if xpath was set in options
+		// 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
+		// check if clear form was set in options
 		$clear = false;
 		if (isset($options['clear']))
 		{

admin/models/rules/guid.php

@@ -0,0 +1,54 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Form\Form;
+use Joomla\CMS\Form\FormRule;
+use Joomla\Registry\Registry;
+
+/**
+ * Form Rule (Guid) class for the Joomla Platform.
+ */
+class JFormRuleGuid extends FormRule
+{
+	/**
+	 * Method to test for a Globally Unique Identifier.
+	 *
+	 * @param   \SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed              $value    The form field value to validate.
+	 * @param   string             $group    The field name group control value. This acts as an array container for the field.
+	 *                                       For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                       full field name would end up being "bar[foo]".
+	 * @param   Registry           $input    An optional Registry object with the entire data set to validate against the entire form.
+	 * @param   Form               $form     The form object for which the field is being tested.
+	 *
+	 * @return  boolean  True if the value is valid, false otherwise.
+	 *
+	 */
+	public function test(\SimpleXMLElement $element, $value, $group = null, Registry $input = null, Form $form = null)
+	{
+		$value = trim($value);
+
+		// If the field is empty and not required, the field is valid.
+		$required = ((string) $element['required'] == 'true' || (string) $element['required'] == 'required');
+
+		if (!$required && empty($value))
+		{
+			return true;
+		}
+
+		// thanks to Lewie https://stackoverflow.com/a/1515456/1429677
+		return preg_match("/^(\{)?[a-f\d]{8}(-[a-f\d]{4}){4}[a-f\d]{8}(?(1)\})$/i", $value);
+	}
+
+}

admin/models/server.php

@@ -284,14 +284,14 @@ class ComponentbuilderModelServer extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
-		// // check if xpath was set in options
+		// 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
+		// check if clear form was set in options
 		$clear = false;
 		if (isset($options['clear']))
 		{

admin/models/site_view.php

@@ -83,6 +83,11 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 				'css'
 			)
 		),
+		'linked_components' => array(
+			'fullwidth' => array(
+				'note_linked_to_notice'
+			)
+		),
 		'custom_buttons' => array(
 			'left' => array(
 				'add_custom_button'
@@ -96,11 +101,6 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 				'php_controller',
 				'php_model'
 			)
-		),
-		'linked_components' => array(
-			'fullwidth' => array(
-				'note_linked_to_notice'
-			)
 		)
 	);
 
@@ -215,40 +215,10 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 				$item->metadata = $registry->toArray();
 			}
 
-			if (!empty($item->php_document))
+			if (!empty($item->js_document))
 			{
-				// base64 Decode php_document.
-				$item->php_document = base64_decode($item->php_document);
-			}
-
-			if (!empty($item->php_view))
-			{
-				// base64 Decode php_view.
-				$item->php_view = base64_decode($item->php_view);
-			}
-
-			if (!empty($item->default))
-			{
-				// base64 Decode default.
-				$item->default = base64_decode($item->default);
-			}
-
-			if (!empty($item->php_jview_display))
-			{
-				// base64 Decode php_jview_display.
-				$item->php_jview_display = base64_decode($item->php_jview_display);
-			}
-
-			if (!empty($item->php_jview))
-			{
-				// base64 Decode php_jview.
-				$item->php_jview = base64_decode($item->php_jview);
-			}
-
-			if (!empty($item->php_model))
-			{
-				// base64 Decode php_model.
-				$item->php_model = base64_decode($item->php_model);
+				// base64 Decode js_document.
+				$item->js_document = base64_decode($item->js_document);
 			}
 
 			if (!empty($item->javascript_file))
@@ -257,10 +227,10 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 				$item->javascript_file = base64_decode($item->javascript_file);
 			}
 
-			if (!empty($item->js_document))
+			if (!empty($item->default))
 			{
-				// base64 Decode js_document.
-				$item->js_document = base64_decode($item->js_document);
+				// base64 Decode default.
+				$item->default = base64_decode($item->default);
 			}
 
 			if (!empty($item->css_document))
@@ -281,12 +251,42 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 				$item->php_ajaxmethod = base64_decode($item->php_ajaxmethod);
 			}
 
+			if (!empty($item->php_document))
+			{
+				// base64 Decode php_document.
+				$item->php_document = base64_decode($item->php_document);
+			}
+
+			if (!empty($item->php_view))
+			{
+				// base64 Decode php_view.
+				$item->php_view = base64_decode($item->php_view);
+			}
+
+			if (!empty($item->php_jview_display))
+			{
+				// base64 Decode php_jview_display.
+				$item->php_jview_display = base64_decode($item->php_jview_display);
+			}
+
+			if (!empty($item->php_jview))
+			{
+				// base64 Decode php_jview.
+				$item->php_jview = base64_decode($item->php_jview);
+			}
+
 			if (!empty($item->php_controller))
 			{
 				// base64 Decode php_controller.
 				$item->php_controller = base64_decode($item->php_controller);
 			}
 
+			if (!empty($item->php_model))
+			{
+				// base64 Decode php_model.
+				$item->php_model = base64_decode($item->php_model);
+			}
+
 			if (!empty($item->custom_get))
 			{
 				// Convert the custom_get field to an array.
@@ -295,14 +295,6 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 				$item->custom_get = $custom_get->toArray();
 			}
 
-			if (!empty($item->ajax_input))
-			{
-				// Convert the ajax_input field to an array.
-				$ajax_input = new Registry;
-				$ajax_input->loadString($item->ajax_input);
-				$item->ajax_input = $ajax_input->toArray();
-			}
-
 			if (!empty($item->libraries))
 			{
 				// Convert the libraries field to an array.
@@ -311,6 +303,14 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 				$item->libraries = $libraries->toArray();
 			}
 
+			if (!empty($item->ajax_input))
+			{
+				// Convert the ajax_input field to an array.
+				$ajax_input = new Registry;
+				$ajax_input->loadString($item->ajax_input);
+				$item->ajax_input = $ajax_input->toArray();
+			}
+
 			if (!empty($item->custom_button))
 			{
 				// Convert the custom_button field to an array.
@@ -416,14 +416,14 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
-		// // check if xpath was set in options
+		// 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
+		// check if clear form was set in options
 		$clear = false;
 		if (isset($options['clear']))
 		{
@@ -523,6 +523,13 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 				$form->setFieldAttribute($name, 'editor', $global_editor . '|none');
 			}
 		}
+
+
+		// Only load the GUID if new item
+		if (0 == $id)
+		{
+			$form->setValue('guid', null, ComponentbuilderHelper::GUID());
+		}
 
 		return $form;
 	}
@@ -1134,7 +1141,14 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 		{
 			// always make safe string
 			$data['context'] = ComponentbuilderHelper::safeString($data['context']);
-		}
+		}
+
+		// Set the GUID if empty or not valid
+		if (isset($data['guid']) && !ComponentbuilderHelper::validGUID($data['guid']))
+		{
+			$data['guid'] = (string) ComponentbuilderHelper::GUID();
+		}
+
 
 		// Set the custom_get items to data.
 		if (isset($data['custom_get']) && is_array($data['custom_get']))
@@ -1149,19 +1163,6 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 			$data['custom_get'] = '';
 		}
 
-		// Set the ajax_input items to data.
-		if (isset($data['ajax_input']) && is_array($data['ajax_input']))
-		{
-			$ajax_input = new JRegistry;
-			$ajax_input->loadArray($data['ajax_input']);
-			$data['ajax_input'] = (string) $ajax_input;
-		}
-		elseif (!isset($data['ajax_input']))
-		{
-			// Set the empty ajax_input to data
-			$data['ajax_input'] = '';
-		}
-
 		// Set the libraries items to data.
 		if (isset($data['libraries']) && is_array($data['libraries']))
 		{
@@ -1175,6 +1176,19 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 			$data['libraries'] = '';
 		}
 
+		// Set the ajax_input items to data.
+		if (isset($data['ajax_input']) && is_array($data['ajax_input']))
+		{
+			$ajax_input = new JRegistry;
+			$ajax_input->loadArray($data['ajax_input']);
+			$data['ajax_input'] = (string) $ajax_input;
+		}
+		elseif (!isset($data['ajax_input']))
+		{
+			// Set the empty ajax_input to data
+			$data['ajax_input'] = '';
+		}
+
 		// Set the custom_button items to data.
 		if (isset($data['custom_button']) && is_array($data['custom_button']))
 		{
@@ -1188,40 +1202,10 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 			$data['custom_button'] = '';
 		}
 
-		// Set the php_document string to base64 string.
-		if (isset($data['php_document']))
+		// Set the js_document string to base64 string.
+		if (isset($data['js_document']))
 		{
-			$data['php_document'] = base64_encode($data['php_document']);
-		}
-
-		// Set the php_view string to base64 string.
-		if (isset($data['php_view']))
-		{
-			$data['php_view'] = base64_encode($data['php_view']);
-		}
-
-		// Set the default string to base64 string.
-		if (isset($data['default']))
-		{
-			$data['default'] = base64_encode($data['default']);
-		}
-
-		// Set the php_jview_display string to base64 string.
-		if (isset($data['php_jview_display']))
-		{
-			$data['php_jview_display'] = base64_encode($data['php_jview_display']);
-		}
-
-		// Set the php_jview string to base64 string.
-		if (isset($data['php_jview']))
-		{
-			$data['php_jview'] = base64_encode($data['php_jview']);
-		}
-
-		// Set the php_model string to base64 string.
-		if (isset($data['php_model']))
-		{
-			$data['php_model'] = base64_encode($data['php_model']);
+			$data['js_document'] = base64_encode($data['js_document']);
 		}
 
 		// Set the javascript_file string to base64 string.
@@ -1230,10 +1214,10 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 			$data['javascript_file'] = base64_encode($data['javascript_file']);
 		}
 
-		// Set the js_document string to base64 string.
-		if (isset($data['js_document']))
+		// Set the default string to base64 string.
+		if (isset($data['default']))
 		{
-			$data['js_document'] = base64_encode($data['js_document']);
+			$data['default'] = base64_encode($data['default']);
 		}
 
 		// Set the css_document string to base64 string.
@@ -1254,10 +1238,40 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 			$data['php_ajaxmethod'] = base64_encode($data['php_ajaxmethod']);
 		}
 
+		// Set the php_document string to base64 string.
+		if (isset($data['php_document']))
+		{
+			$data['php_document'] = base64_encode($data['php_document']);
+		}
+
+		// Set the php_view string to base64 string.
+		if (isset($data['php_view']))
+		{
+			$data['php_view'] = base64_encode($data['php_view']);
+		}
+
+		// Set the php_jview_display string to base64 string.
+		if (isset($data['php_jview_display']))
+		{
+			$data['php_jview_display'] = base64_encode($data['php_jview_display']);
+		}
+
+		// Set the php_jview string to base64 string.
+		if (isset($data['php_jview']))
+		{
+			$data['php_jview'] = base64_encode($data['php_jview']);
+		}
+
 		// Set the php_controller string to base64 string.
 		if (isset($data['php_controller']))
 		{
 			$data['php_controller'] = base64_encode($data['php_controller']);
+		}
+
+		// Set the php_model string to base64 string.
+		if (isset($data['php_model']))
+		{
+			$data['php_model'] = base64_encode($data['php_model']);
 		}
         
 		// Set the Params Items to data

admin/models/site_views.php

@@ -243,7 +243,7 @@ class ComponentbuilderModelSite_views extends JModelList
 			else
 			{
 				$search = $db->quote('%' . $db->escape($search) . '%');
-				$query->where('(a.system_name LIKE '.$search.' OR a.name LIKE '.$search.' OR a.description LIKE '.$search.' OR a.main_get LIKE '.$search.' OR g.name LIKE '.$search.' OR a.context LIKE '.$search.' OR a.codename LIKE '.$search.')');
+				$query->where('(a.system_name LIKE '.$search.' OR a.name LIKE '.$search.' OR a.description LIKE '.$search.' OR a.main_get LIKE '.$search.' OR g.name LIKE '.$search.' OR a.codename LIKE '.$search.' OR a.context LIKE '.$search.')');
 			}
 		}
 
@@ -334,30 +334,30 @@ class ComponentbuilderModelSite_views extends JModelList
 							continue;
 						}
 
-						// decode php_document
-						$item->php_document = base64_decode($item->php_document);
-						// decode php_view
-						$item->php_view = base64_decode($item->php_view);
-						// decode default
-						$item->default = base64_decode($item->default);
-						// decode php_jview_display
-						$item->php_jview_display = base64_decode($item->php_jview_display);
-						// decode php_jview
-						$item->php_jview = base64_decode($item->php_jview);
-						// decode php_model
-						$item->php_model = base64_decode($item->php_model);
-						// decode javascript_file
-						$item->javascript_file = base64_decode($item->javascript_file);
 						// decode js_document
 						$item->js_document = base64_decode($item->js_document);
+						// decode javascript_file
+						$item->javascript_file = base64_decode($item->javascript_file);
+						// decode default
+						$item->default = base64_decode($item->default);
 						// decode css_document
 						$item->css_document = base64_decode($item->css_document);
 						// decode css
 						$item->css = base64_decode($item->css);
 						// decode php_ajaxmethod
 						$item->php_ajaxmethod = base64_decode($item->php_ajaxmethod);
+						// decode php_document
+						$item->php_document = base64_decode($item->php_document);
+						// decode php_view
+						$item->php_view = base64_decode($item->php_view);
+						// decode php_jview_display
+						$item->php_jview_display = base64_decode($item->php_jview_display);
+						// decode php_jview
+						$item->php_jview = base64_decode($item->php_jview);
 						// decode php_controller
 						$item->php_controller = base64_decode($item->php_controller);
+						// decode php_model
+						$item->php_model = base64_decode($item->php_model);
 						// unset the values we don't want exported.
 						unset($item->asset_id);
 						unset($item->checked_out);

admin/models/snippet.php

@@ -149,14 +149,14 @@ class ComponentbuilderModelSnippet extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
-		// // check if xpath was set in options
+		// 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
+		// check if clear form was set in options
 		$clear = false;
 		if (isset($options['clear']))
 		{
@@ -240,6 +240,13 @@ class ComponentbuilderModelSnippet extends JModelAdmin
 				$form->setValue($redirectedField, null, $redirectedValue);
 			}
 		}
+
+		// Only load the GUID if new item
+		if (0 == $id)
+		{
+			$form->setValue('guid', null, ComponentbuilderHelper::GUID());
+		}
+
 		return $form;
 	}
 
@@ -840,7 +847,14 @@ class ComponentbuilderModelSnippet extends JModelAdmin
 			$data['contributor_name'] = $contributor['contributor_name'];
 			$data['contributor_email'] = $contributor['contributor_email'];
 			$data['contributor_website'] = $contributor['contributor_website'];
-		}
+		}
+
+		// Set the GUID if empty or not valid
+		if (isset($data['guid']) && !ComponentbuilderHelper::validGUID($data['guid']))
+		{
+			$data['guid'] = (string) ComponentbuilderHelper::GUID();
+		}
+
 
 		// Set the snippet string to base64 string.
 		if (isset($data['snippet']))

admin/models/snippet_type.php

@@ -122,14 +122,14 @@ class ComponentbuilderModelSnippet_type extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
-		// // check if xpath was set in options
+		// 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
+		// check if clear form was set in options
 		$clear = false;
 		if (isset($options['clear']))
 		{

admin/models/template.php

@@ -247,14 +247,14 @@ class ComponentbuilderModelTemplate extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
-		// // check if xpath was set in options
+		// 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
+		// check if clear form was set in options
 		$clear = false;
 		if (isset($options['clear']))
 		{

admin/models/validation_rule.php

@@ -216,14 +216,14 @@ class ComponentbuilderModelValidation_rule extends JModelAdmin
 	{
 		// set load data option
 		$options['load_data'] = $loadData;
-		// // check if xpath was set in options
+		// 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
+		// check if clear form was set in options
 		$clear = false;
 		if (isset($options['clear']))
 		{

admin/sql/updates/mysql/2.10.9.sql

@@ -0,0 +1,25 @@
+ALTER TABLE `#__componentbuilder_joomla_component` ADD `guid` VARCHAR(36) NOT NULL DEFAULT '' AFTER `export_key`;
+
+ALTER TABLE `#__componentbuilder_joomla_module` ADD `guid` VARCHAR(36) NOT NULL DEFAULT '' AFTER `fields`;
+
+ALTER TABLE `#__componentbuilder_joomla_plugin` ADD `guid` VARCHAR(36) NOT NULL DEFAULT '' AFTER `fields`;
+
+ALTER TABLE `#__componentbuilder_admin_view` ADD `guid` VARCHAR(36) NOT NULL DEFAULT '' AFTER `description`;
+
+ALTER TABLE `#__componentbuilder_custom_admin_view` ADD `guid` VARCHAR(36) NOT NULL DEFAULT '' AFTER `dynamic_get`;
+
+ALTER TABLE `#__componentbuilder_site_view` ADD `guid` VARCHAR(36) NOT NULL DEFAULT '' AFTER `dynamic_get`;
+
+ALTER TABLE `#__componentbuilder_dynamic_get` ADD `guid` VARCHAR(36) NOT NULL DEFAULT '' AFTER `group`;
+
+ALTER TABLE `#__componentbuilder_class_property` ADD `guid` VARCHAR(36) NOT NULL DEFAULT '' AFTER `extension_type`;
+
+ALTER TABLE `#__componentbuilder_class_method` ADD `guid` VARCHAR(36) NOT NULL DEFAULT '' AFTER `extension_type`;
+
+ALTER TABLE `#__componentbuilder_library` ADD `guid` VARCHAR(36) NOT NULL DEFAULT '' AFTER `description`;
+
+ALTER TABLE `#__componentbuilder_snippet` ADD `guid` VARCHAR(36) NOT NULL DEFAULT '' AFTER `description`;
+
+ALTER TABLE `#__componentbuilder_field` ADD `guid` VARCHAR(36) NOT NULL DEFAULT '' AFTER `fieldtype`;
+
+ALTER TABLE `#__componentbuilder_fieldtype` ADD `guid` VARCHAR(36) NOT NULL DEFAULT '' AFTER `description`;

admin/views/admin_fields_conditions/tmpl/edit.php

@@ -137,7 +137,7 @@ jQuery(document).ready(function(){
 ?>
 function JRouter(link) {
 <?php
-	if ($app->isSite())
+	if ($app->isClient('site'))
 	{
 		echo 'var url = "'.JURI::root().'";';
 	}

admin/views/admin_fields_relations/tmpl/edit.php

@@ -115,7 +115,7 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 ?>
 function JRouter(link) {
 <?php
-	if ($app->isSite())
+	if ($app->isClient('site'))
 	{
 		echo 'var url = "'.JURI::root().'";';
 	}

admin/views/admin_view/tmpl/edit.php

@@ -762,7 +762,7 @@ jQuery('#jform_add_custom_import').on('change',function() {
 ?>
 function JRouter(link) {
 <?php
-	if ($app->isSite())
+	if ($app->isClient('site'))
 	{
 		echo 'var url = "'.JURI::root().'";';
 	}

admin/views/admin_views/view.html.php

@@ -221,36 +221,6 @@ class ComponentbuilderViewAdmin_views extends JViewLegacy
 			}
 		}
 
-		// Set Add Custom Import Selection
-		$this->add_custom_importOptions = $this->getTheAdd_custom_importSelections();
-		// We do some sanitation for Add Custom Import filter
-		if (ComponentbuilderHelper::checkArray($this->add_custom_importOptions) &&
-			isset($this->add_custom_importOptions[0]->value) &&
-			!ComponentbuilderHelper::checkString($this->add_custom_importOptions[0]->value))
-		{
-			unset($this->add_custom_importOptions[0]);
-		}
-		// Only load Add Custom Import filter if it has values
-		if (ComponentbuilderHelper::checkArray($this->add_custom_importOptions))
-		{
-			// Add Custom Import Filter
-			JHtmlSidebar::addFilter(
-				'- Select '.JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_IMPORT_LABEL').' -',
-				'filter_add_custom_import',
-				JHtml::_('select.options', $this->add_custom_importOptions, 'value', 'text', $this->state->get('filter.add_custom_import'))
-			);
-
-			if ($this->canBatch && $this->canCreate && $this->canEdit)
-			{
-				// Add Custom Import Batch Selection
-				JHtmlBatch_::addListSelection(
-					'- Keep Original '.JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_IMPORT_LABEL').' -',
-					'batch[add_custom_import]',
-					JHtml::_('select.options', $this->add_custom_importOptions, 'value', 'text')
-				);
-			}
-		}
-
 		// Set Type Selection
 		$this->typeOptions = $this->getTheTypeSelections();
 		// We do some sanitation for Type filter
@@ -339,6 +309,36 @@ class ComponentbuilderViewAdmin_views extends JViewLegacy
 					JHtml::_('select.options', $this->add_php_ajaxOptions, 'value', 'text')
 				);
 			}
+		}
+
+		// Set Add Custom Import Selection
+		$this->add_custom_importOptions = $this->getTheAdd_custom_importSelections();
+		// We do some sanitation for Add Custom Import filter
+		if (ComponentbuilderHelper::checkArray($this->add_custom_importOptions) &&
+			isset($this->add_custom_importOptions[0]->value) &&
+			!ComponentbuilderHelper::checkString($this->add_custom_importOptions[0]->value))
+		{
+			unset($this->add_custom_importOptions[0]);
+		}
+		// Only load Add Custom Import filter if it has values
+		if (ComponentbuilderHelper::checkArray($this->add_custom_importOptions))
+		{
+			// Add Custom Import Filter
+			JHtmlSidebar::addFilter(
+				'- Select '.JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_IMPORT_LABEL').' -',
+				'filter_add_custom_import',
+				JHtml::_('select.options', $this->add_custom_importOptions, 'value', 'text', $this->state->get('filter.add_custom_import'))
+			);
+
+			if ($this->canBatch && $this->canCreate && $this->canEdit)
+			{
+				// Add Custom Import Batch Selection
+				JHtmlBatch_::addListSelection(
+					'- Keep Original '.JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_IMPORT_LABEL').' -',
+					'batch[add_custom_import]',
+					JHtml::_('select.options', $this->add_custom_importOptions, 'value', 'text')
+				);
+			}
 		}
 	}
 
@@ -428,42 +428,6 @@ class ComponentbuilderViewAdmin_views extends JViewLegacy
 		return false;
 	}
 
-	protected function getTheAdd_custom_importSelections()
-	{
-		// Get a db connection.
-		$db = JFactory::getDbo();
-
-		// Create a new query object.
-		$query = $db->getQuery(true);
-
-		// Select the text.
-		$query->select($db->quoteName('add_custom_import'));
-		$query->from($db->quoteName('#__componentbuilder_admin_view'));
-		$query->order($db->quoteName('add_custom_import') . ' ASC');
-
-		// Reset the query using our newly populated query object.
-		$db->setQuery($query);
-
-		$results = $db->loadColumn();
-
-		if ($results)
-		{
-			// get model
-			$model = $this->getModel();
-			$results = array_unique($results);
-			$_filter = array();
-			foreach ($results as $add_custom_import)
-			{
-				// Translate the add_custom_import selection
-				$text = $model->selectionTranslation($add_custom_import,'add_custom_import');
-				// Now add the add_custom_import and its text to the options array
-				$_filter[] = JHtml::_('select.option', $add_custom_import, JText::_($text));
-			}
-			return $_filter;
-		}
-		return false;
-	}
-
 	protected function getTheTypeSelections()
 	{
 		// Get a db connection.
@@ -570,5 +534,41 @@ class ComponentbuilderViewAdmin_views extends JViewLegacy
 			return $_filter;
 		}
 		return false;
+	}
+
+	protected function getTheAdd_custom_importSelections()
+	{
+		// Get a db connection.
+		$db = JFactory::getDbo();
+
+		// Create a new query object.
+		$query = $db->getQuery(true);
+
+		// Select the text.
+		$query->select($db->quoteName('add_custom_import'));
+		$query->from($db->quoteName('#__componentbuilder_admin_view'));
+		$query->order($db->quoteName('add_custom_import') . ' ASC');
+
+		// Reset the query using our newly populated query object.
+		$db->setQuery($query);
+
+		$results = $db->loadColumn();
+
+		if ($results)
+		{
+			// get model
+			$model = $this->getModel();
+			$results = array_unique($results);
+			$_filter = array();
+			foreach ($results as $add_custom_import)
+			{
+				// Translate the add_custom_import selection
+				$text = $model->selectionTranslation($add_custom_import,'add_custom_import');
+				// Now add the add_custom_import and its text to the options array
+				$_filter[] = JHtml::_('select.option', $add_custom_import, JText::_($text));
+			}
+			return $_filter;
+		}
+		return false;
 	}
 }

admin/views/class_extends/tmpl/edit.php

@@ -120,7 +120,7 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 ?>
 function JRouter(link) {
 <?php
-	if ($app->isSite())
+	if ($app->isClient('site'))
 	{
 		echo 'var url = "'.JURI::root().'";';
 	}

admin/views/class_method/tmpl/edit.php

@@ -135,7 +135,7 @@ jQuery('#adminForm').on('change', '#jform_extension_type',function (e)
 ?>
 function JRouter(link) {
 <?php
-	if ($app->isSite())
+	if ($app->isClient('site'))
 	{
 		echo 'var url = "'.JURI::root().'";';
 	}

admin/views/class_property/tmpl/edit.php

@@ -130,7 +130,7 @@ jQuery('#adminForm').on('change', '#jform_extension_type',function (e)
 ?>
 function JRouter(link) {
 <?php
-	if ($app->isSite())
+	if ($app->isClient('site'))
 	{
 		echo 'var url = "'.JURI::root().'";';
 	}

admin/views/compiler/tmpl/default.php

@@ -137,26 +137,7 @@ jQuery('<div id="loading"></div>')
 		</div>
 		<div class="span7">
 			<div id="component-details"><?php echo $selectNotice; ?></div>
-			<div id="noticeboard">
-				<?php echo JHtml::_('bootstrap.startTabSet', 'compiler_tab', array('active' => 'vdm-noticeboard')); ?>
-					<?php echo JHtml::_('bootstrap.addTab', 'compiler_tab', 'vdm-noticeboard', JText::_('COM_COMPONENTBUILDER_VDM_BOARD', true)); ?>
-						<div  class="well well-small">
-							<h2 class="module-title nav-header"><?php echo JText::_('COM_COMPONENTBUILDER_VDM_NOTICE_BOARD'); ?><span id="vdm-new-notice" style="display:none; color:red;"> (<?php echo JText::_('COM_COMPONENTBUILDER_NEW_NOTICE'); ?>)</span></h2>
-							<div id="noticeboard-md"><small><?php echo JText::_('COM_COMPONENTBUILDER_THE_NOTICE_BOARD_IS_LOADING'); ?><span class="loading-dots">.</span></small></div>
-							<div style="text-align:right;"><small><a href="https://github.com/Llewellynvdm" target="_blank" style="color:gray">&lt;&lt;ewe&gt;&gt;yn</a></small></div>
-						</div>
-						<div><?php echo ComponentbuilderHelper::getDynamicContent('banner', '728-90'); ?></div>
-					<?php echo JHtml::_('bootstrap.endTab'); ?>
-					<?php echo JHtml::_('bootstrap.addTab', 'compiler_tab', 'proboard', JText::_('COM_COMPONENTBUILDER_JCB_PRO_BOARD', true)); ?>
-						<div  class="well well-small">
-							<h2 class="module-title nav-header"><?php echo JText::_('COM_COMPONENTBUILDER_JCB_PRO_NOTICE_BOARD'); ?></h2>
-							<div id="proboard-md"><small><?php echo JText::_('COM_COMPONENTBUILDER_THE_PRO_BOARD_IS_LOADING'); ?><span class="loading-dots">.</span></small></div>
-							<div style="text-align:right;"><small><a href="https://vdm.bz/get-jcb-pro-membership" target="_blank" style="color:gray">JCB PRO</a></small></div>
-						</div>
-						<div><?php echo ComponentbuilderHelper::getDynamicContent('banner', '728-90'); ?></div>
-					<?php echo JHtml::_('bootstrap.endTab'); ?>
-				<?php echo JHtml::_('bootstrap.endTabSet'); ?>
-			</div>
+			<?php echo JLayoutHelper::render('jcbnoticeboardtabs', null); ?>
 		</div>
 	</div>
 	<div id="clear" style="display:none;">
@@ -205,7 +186,7 @@ jQuery(document).ready( function($) {
 ?>
 function JRouter(link) {
 <?php
-	if ($app->isSite())
+	if ($app->isClient('site'))
 	{
 		echo 'var url = "'.JURI::root().'";';
 	}

admin/views/compiler/view.html.php

@@ -250,6 +250,7 @@ class ComponentbuilderViewCompiler extends JViewLegacy
 					}
 				});
 			}
+			
 			var noticeboard = \"https://vdm.bz/componentbuilder-noticeboard-md\";
 			var proboard = \"https://vdm.bz/componentbuilder-pro-noticeboard-md\";
 			jQuery(document).ready(function () {
@@ -299,7 +300,8 @@ class ComponentbuilderViewCompiler extends JViewLegacy
 					data: request,
 					jsonp: false
 				});
-			}
+			}
+			
 		");
 	}
 

admin/views/component_dashboard/tmpl/edit.php

@@ -115,7 +115,7 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 ?>
 function JRouter(link) {
 <?php
-	if ($app->isSite())
+	if ($app->isClient('site'))
 	{
 		echo 'var url = "'.JURI::root().'";';
 	}