Fixed gh-315 to insure all the WHMCS features work as expected

README.md

@@ -9,7 +9,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.8.2) 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.8.3) 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)
 
@@ -125,13 +125,13 @@ Watch the [proposed development workflow](https://vdm.bz/proposed-development-wo
 + *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*: 7th July, 2018
++ *Last Build*: 8th July, 2018
-+ *Version*: 2.8.2
++ *Version*: 2.8.3
 + *Copyright*: Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **186287**
++ *Line count*: **186333**
-+ *Field count*: **1058**
++ *Field count*: **1059**
-+ *File count*: **1238**
++ *File count*: **1239**
 + *Folder count*: **197**
 
 > This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com).

admin/README.txt

@@ -9,7 +9,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.8.2) 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.8.3) 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)
 
@@ -125,13 +125,13 @@ Watch the [proposed development workflow](https://vdm.bz/proposed-development-wo
 + *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*: 7th July, 2018
++ *Last Build*: 8th July, 2018
-+ *Version*: 2.8.2
++ *Version*: 2.8.3
 + *Copyright*: Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **186287**
++ *Line count*: **186333**
-+ *Field count*: **1058**
++ *Field count*: **1059**
-+ *File count*: **1238**
++ *File count*: **1239**
 + *Folder count*: **197**
 
 > This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com).

admin/config.xml

@@ -1031,6 +1031,7 @@
 			required="false"
 			filter="url"
 			validated="url"
+			scheme="http,https"
 			message="COM_COMPONENTBUILDER_CONFIG_EXPORT_BUY_LINK_MESSAGE"
 			hint="COM_COMPONENTBUILDER_CONFIG_EXPORT_BUY_LINK_HINT"
 		/>

admin/helpers/compiler/a_Get.php

@@ -949,6 +949,28 @@ class Get
 		// set the uikit switch
 		$this->uikit = $component->adduikit;
 
+		// set whmcs links if needed
+		if (1 == $component->add_license && (!isset($component->whmcs_buy_link) || !ComponentbuilderHelper::checkString($component->whmcs_buy_link)))
+		{
+			// update with the whmcs url
+			if (isset($component->whmcs_url) && ComponentbuilderHelper::checkString($component->whmcs_url))
+			{
+				$component->whmcs_buy_link = $component->whmcs_url;
+			}
+			// use the company website
+			elseif (isset($component->website) && ComponentbuilderHelper::checkString($component->website))
+			{
+				$component->whmcs_buy_link = $component->website;
+				$component->whmcs_url = rtrim($component->website, '/').'/whmcs';
+			}
+			// none set
+			else
+			{
+				$component->whmcs_buy_link = '#';
+				$component->whmcs_url = '#';
+			}
+		}
+
 		// set the footable switch
 		if ($component->addfootable)
 		{

admin/helpers/compiler/e_Interpretation.php

@@ -234,12 +234,12 @@ class Interpretation extends Fields
 		{
 			if (!isset($this->fileContentStatic[$this->hhh . 'HELPER_SITE_LICENSE_LOCK' . $this->hhh]))
 			{
-				$_VDM = '_' . ComponentbuilderHelper::safeString($this->uniquekey(10), 'U');
+				$_WHMCS = '_' . ComponentbuilderHelper::safeString($this->uniquekey(10), 'U');
 				// add it to the system
-				$this->fileContentStatic[$this->hhh . 'HELPER_SITE_LICENSE_LOCK' . $this->hhh] = $this->setHelperLicenseLock($_VDM, 'site');
+				$this->fileContentStatic[$this->hhh . 'HELPER_SITE_LICENSE_LOCK' . $this->hhh] = $this->setHelperLicenseLock($_WHMCS, 'site');
-				$this->fileContentStatic[$this->hhh . 'HELPER_LICENSE_LOCK' . $this->hhh] = $this->setHelperLicenseLock($_VDM, 'admin');
+				$this->fileContentStatic[$this->hhh . 'HELPER_LICENSE_LOCK' . $this->hhh] = $this->setHelperLicenseLock($_WHMCS, 'admin');
-				$this->fileContentStatic[$this->hhh . 'LICENSE_LOCKED_INT' . $this->hhh] = $this->setInitLicenseLock($_VDM);
+				$this->fileContentStatic[$this->hhh . 'LICENSE_LOCKED_INT' . $this->hhh] = $this->setInitLicenseLock($_WHMCS);
-				$this->fileContentStatic[$this->hhh . 'LICENSE_LOCKED_DEFINED' . $this->hhh] = PHP_EOL . PHP_EOL . 'defined(\'' . $_VDM . '\') or die(JText:' . ':_(\'NIE_REG_NIE\'));';
+				$this->fileContentStatic[$this->hhh . 'LICENSE_LOCKED_DEFINED' . $this->hhh] = PHP_EOL . PHP_EOL . 'defined(\'' . $_WHMCS . '\') or die(JText:' . ':_(\'NIE_REG_NIE\'));';
 			}
 		}
 		else
@@ -332,8 +332,8 @@ class Interpretation extends Fields
 		$bool[] = $this->_t(2) . "if (\$license_key)";
 		$bool[] = $this->_t(2) . "{";
 		$bool[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " load the file";
-		$bool[] = $this->_t(3) . "JLoader::import( 'vdm', JPATH_ADMINISTRATOR .'/components/com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "');";
+		$bool[] = $this->_t(3) . "JLoader::import( 'whmcs', JPATH_ADMINISTRATOR .'/components/com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "');";
-		$bool[] = $this->_t(3) . "\$the = new VDM(\$license_key);";
+		$bool[] = $this->_t(3) . "\$the = new WHMCS(\$license_key);";
 		$bool[] = $this->_t(3) . "\$this->" . $globalbool . " = \$the->_is;";
 		$bool[] = $this->_t(3) . "return \$this->" . $globalbool . ";";
 		$bool[] = $this->_t(2) . "}";
@@ -346,12 +346,12 @@ class Interpretation extends Fields
 	/**
 	 * set Helper License Lock
 	 *
-	 * @param type $_VDM
+	 * @param type $_WHMCS
 	 * @param type $target
 	 *
 	 * @return string
 	 */
-	public function setHelperLicenseLock($_VDM, $target)
+	public function setHelperLicenseLock($_WHMCS, $target)
 	{
 		$helper[] = PHP_EOL . PHP_EOL . $this->_t(1) . "/**";
 		$helper[] = $this->_t(1) . " * Check if this install has a license.";
@@ -364,8 +364,8 @@ class Interpretation extends Fields
 		$helper[] = $this->_t(2) . "if (\$license_key)";
 		$helper[] = $this->_t(2) . "{";
 		$helper[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " load the file";
-		$helper[] = $this->_t(3) . "JLoader::import( 'vdm', JPATH_ADMINISTRATOR .'/components/com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "');";
+		$helper[] = $this->_t(3) . "JLoader::import( 'whmcs', JPATH_ADMINISTRATOR .'/components/com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "');";
-		$helper[] = $this->_t(3) . "\$the = new VDM(\$license_key);";
+		$helper[] = $this->_t(3) . "\$the = new WHMCS(\$license_key);";
 		$helper[] = $this->_t(3) . "return \$the->_is;";
 		$helper[] = $this->_t(2) . "}";
 		$helper[] = $this->_t(2) . "return false;";
@@ -377,18 +377,18 @@ class Interpretation extends Fields
 	/**
 	 * set Init License Lock
 	 *
-	 * @param type $_VDM
+	 * @param type $_WHMCS
 	 *
 	 * @return string
 	 */
-	public function setInitLicenseLock($_VDM)
+	public function setInitLicenseLock($_WHMCS)
 	{
-		$init[] = PHP_EOL . "if (!defined('" . $_VDM . "'))";
+		$init[] = PHP_EOL . "if (!defined('" . $_WHMCS . "'))";
 		$init[] = "{";
 		$init[] = $this->_t(1) . "\$allow = " . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::isGenuine();";
 		$init[] = $this->_t(1) . "if (\$allow)";
 		$init[] = $this->_t(1) . "{";
-		$init[] = $this->_t(2) . "define('" . $_VDM . "', 1);";
+		$init[] = $this->_t(2) . "define('" . $_WHMCS . "', 1);";
 		$init[] = $this->_t(1) . "}";
 		$init[] = "}";
 		// return the initializing statement
@@ -6149,7 +6149,7 @@ class Interpretation extends Fields
 		$this->langContent['admin'][$this->langPrefix . '_NOT_FOUND_OR_ACCESS_DENIED'] = "Not found or access denied!";
 		if ($this->componentData->add_license && $this->componentData->license_type == 3)
 		{
-			$this->langContent['admin']['NIE_REG_NIE'] = "<br /><br /><center><h1>License not set for " . $componentName . ".</h1><p>Notify your administrator!<br />The license can be obtained from " . $this->componentData->companyname . ".</p></center>";
+			$this->langContent['admin']['NIE_REG_NIE'] = "<br /><br /><center><h1>License not set for " . $componentName . ".</h1><p>Notify your administrator!<br />The license can be obtained from <a href='".$this->componentData->whmcs_buy_link."' target='_blank'>" . $this->componentData->companyname . "</a>.</p></center>";
 		}
 		// add the langug files needed to import and export data
 		if ($this->addEximport)
@@ -14711,7 +14711,7 @@ function vdm_dkim() {
 				if (isset($this->whmcsEncryption) && $this->whmcsEncryption)
 				{
 					$this->langContent[$this->lang][$lang . '_WHMCS_KEY_NOTE_LABEL'] = "Field Encryption (whmcs)";
-					$this->langContent[$this->lang][$lang . '_WHMCS_KEY_NOTE_DESC'] = "When using this (whmcs) encryption you need to get a key from " . $this->componentData->companyname . ".<br />Never change this key once it is set! <b>DATA WILL GET CORRUPTED IF YOU DO!</b>";
+					$this->langContent[$this->lang][$lang . '_WHMCS_KEY_NOTE_DESC'] = "When using this (whmcs) encryption you need to get a key from <a href='".$this->componentData->whmcs_buy_link."' target='_blank'>" . $this->componentData->companyname . "</a>.<br />Never change this key once it is set! <b>DATA WILL GET CORRUPTED IF YOU DO!</b>";
 				}
 				else
 				{
@@ -14727,7 +14727,7 @@ function vdm_dkim() {
 					{
 						$this->langContent[$this->lang][$lang . '_WHMCS_KEY_NOTE_LABEL'] = "Your Key (whmcs)";
 					}
-					$this->langContent[$this->lang][$lang . '_WHMCS_KEY_NOTE_DESC'] = "You need to get this key from " . $this->componentData->companyname . ".";
+					$this->langContent[$this->lang][$lang . '_WHMCS_KEY_NOTE_DESC'] = "You need to get this key from <a href='".$this->componentData->whmcs_buy_link."' target='_blank'>" . $this->componentData->companyname . "</a>.";
 				}
 				// set the fields
 				$this->configFieldSets[] = $this->_t(2) . '<field type="note" name="whmcs_key_note" class="alert alert-info" label="' . $lang . '_WHMCS_KEY_NOTE_LABEL" description="' . $lang . '_WHMCS_KEY_NOTE_DESC"  />';

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

@@ -4067,9 +4067,9 @@ COM_COMPONENTBUILDER_FIELD_NOTE_NO_DATABASE_SETTINGS_NEEDED_DESCRIPTION="This fi
 COM_COMPONENTBUILDER_FIELD_NOTE_NO_DATABASE_SETTINGS_NEEDED_LABEL="No Database Require"
 COM_COMPONENTBUILDER_FIELD_NOTE_SELECT_FIELD_TYPE_DESCRIPTION="Please select a field type that you would like to build."
 COM_COMPONENTBUILDER_FIELD_NOTE_SELECT_FIELD_TYPE_LABEL="Building a field"
-COM_COMPONENTBUILDER_FIELD_NOTE_WHMCS_ENCRYPTION_DESCRIPTION="<p>When using the WHMCS encryption you need to get a WHMCS key from:<br /><a href='https://www.vdm.io/support' target='_blank'>https://www.vdm.io</a>, or your own WHMCS install.</p><p>Please note that you will need to <b>enable the add-on</b> in the Joomla Component area (Add WHMCS)->Yes.</p><p>You can get more info about the WHMCS licensing add-on at the following links.</p><p><b>Helpful Links:</b><br />
+COM_COMPONENTBUILDER_FIELD_NOTE_WHMCS_ENCRYPTION_DESCRIPTION="<p>When using the WHMCS encryption you need to get a WHMCS key from:<br /><a href='https://www.vdm.io/support' target='_blank'>https://www.vdm.io</a>, or your own <a href='https://www.whmcs.com/members/aff.php?aff=37513' target='_blank'>WHMCS</a> install.</p><p>Please note that you will need to <b>enable the add-on</b> in the Joomla Component area (Add WHMCS)->Yes.</p><p>You can get more info about the WHMCS licensing add-on at the following links.</p><p><b>Helpful Links:</b><br />
-<a href='https://www.whmcs.com/addons/licensing-addon/' target='_blank'>https://www.whmcs.com/addons/licensing-addon/</a><br />
+<a href='https://www.whmcs.com/members/aff.php?aff=37513' target='_blank'>https://www.whmcs.com/software-licensing/</a><br />
-<a href='http://docs.whmcs.com/Licensing_Addon/' target='_blank'>http://docs.whmcs.com/Licensing_Addon/</a></p>"
+<a href='http://docs.whmcs.com/Licensing_Addon/' target='_blank'>http://docs.whmcs.com/Licensing_Addon/</a></p><p>Support JCB and use our affiliate link (<a href='https://www.whmcs.com/members/aff.php?aff=37513' target='_blank'>https://www.whmcs.com/members/aff.php?aff=37513</a>) to sign-up with <a href='https://www.whmcs.com/members/aff.php?aff=37513' target='_blank'>WHMCS</a>.</p>"
 COM_COMPONENTBUILDER_FIELD_NOTE_WHMCS_ENCRYPTION_LABEL="The WHMCS Encryption"
 COM_COMPONENTBUILDER_FIELD_NOT_NULL="NOT NULL"
 COM_COMPONENTBUILDER_FIELD_NOT_REQUIRED="Not Required"
@@ -4678,7 +4678,7 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_UPDATE_SERVER_NOTE_ZIP_LABEL="The ZIP
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_VERSION_OPTIONS_ONE_DESCRIPTION="Use the modified date, and version number of the view/fields instead of the global version in related files."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_VERSION_OPTIONS_THREE_DESCRIPTION="Use only the first numbers from your global version. This is useful if you are using git. Since all document will not then be updated, with version change, with each compilation when major or minor updates are made."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_VERSION_OPTIONS_TWO_DESCRIPTION="Use only the first two numbers from your global version. This is useful if you are using git. Since all document will not then be updated, with version change, with each compilation when only a minor update is made."
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_WHMCS_LISENCING_NOTE_DESCRIPTION="You can use WHMCS licensing addon in your component<br /><strong>Helpful Links</strong><br /><a href='https://www.whmcs.com/addons/licensing-addon/' target='_blank'>https://www.whmcs.com/addons/licensing-addon/</a><br /><a href='http://docs.whmcs.com/Licensing_Addon' target='_blank'>http://docs.whmcs.com/Licensing_Addon</a>"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_WHMCS_LISENCING_NOTE_DESCRIPTION="You can use WHMCS licensing addon in your component<br /><strong>Helpful Links</strong><br /><a href='https://www.whmcs.com/members/aff.php?aff=37513' target='_blank'>https://www.whmcs.com/software-licensing/</a><br /><a href='http://docs.whmcs.com/Licensing_Addon' target='_blank'>http://docs.whmcs.com/Licensing_Addon</a><br />Support JCB and use our affiliate link (<a href='https://www.whmcs.com/members/aff.php?aff=37513' target='_blank'>https://www.whmcs.com/members/aff.php?aff=37513</a>) to sign-up with <a href='https://www.whmcs.com/members/aff.php?aff=37513' target='_blank'>WHMCS</a>."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_WHMCS_LISENCING_NOTE_LABEL="Licensing addon module for WHMCS"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOT_REQUIRED="Not Required"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NUMBER="Number"
@@ -4782,6 +4782,11 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_DESCRIPTION="Enter website address
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_HINT="http://www.example.com"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_LABEL="Website"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_MESSAGE="Error! Please add website here."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_BUY_LINK="Whmcs Buy Link"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_BUY_LINK_DESCRIPTION="Enter link where your WHMCS License key can be bought."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_BUY_LINK_HINT="http://www.example.com/buy-whmcs-key"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_BUY_LINK_LABEL="Buy Link<br /><small>(to get WHMCS License Key)</small>"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_BUY_LINK_MESSAGE="Error! Please add link here."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_ENCRYPTION_ONLY_TO_LOCK_DATAFIELDS="WHMCS encryption (only to lock data/fields)"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_KEY="Whmcs Key"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_KEY_DESCRIPTION="Add your WHMCS Secret Key here that is needed for this license"

admin/layouts/joomla_component/details_right.php

@@ -25,6 +25,7 @@ $fields = $displayData->get('fields') ?: array(
 	'note_whmcs_lisencing_note',
 	'whmcs_key',
 	'whmcs_url',
+	'whmcs_buy_link',
 	'license',
 	'bom',
 	'image'

admin/models/forms/joomla_component.js

@@ -549,12 +549,14 @@ function vvvvvwk(add_license_vvvvvwk)
 		jQuery('.note_whmcs_lisencing_note').closest('.control-group').show();
 		jQuery('#jform_whmcs_key').closest('.control-group').show();
 		jQuery('#jform_whmcs_url').closest('.control-group').show();
+		jQuery('#jform_whmcs_buy_link').closest('.control-group').show();
 	}
 	else
 	{
 		jQuery('.note_whmcs_lisencing_note').closest('.control-group').hide();
 		jQuery('#jform_whmcs_key').closest('.control-group').hide();
 		jQuery('#jform_whmcs_url').closest('.control-group').hide();
+		jQuery('#jform_whmcs_buy_link').closest('.control-group').hide();
 	}
 }
 

admin/models/forms/joomla_component.xml

@@ -191,12 +191,12 @@
 			message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_AUTHOR_MESSAGE"
 			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_AUTHOR_HINT"
 		/>
-		<!-- Php_preflight_update Field. Type: Editor. (joomla) -->
+		<!-- Php_preflight_install Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_preflight_update"
+			name="php_preflight_install"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_PREFLIGHT_UPDATE_LABEL"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_PREFLIGHT_INSTALL_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_PREFLIGHT_UPDATE_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_PREFLIGHT_INSTALL_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
@@ -208,12 +208,29 @@
 			required="true"
 			validate="code"
 		/>
-		<!-- Css_site Field. Type: Editor. (joomla) -->
+		<!-- Php_postflight_install Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="css_site"
+			name="php_postflight_install"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_SITE_LABEL"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_POSTFLIGHT_INSTALL_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_SITE_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_POSTFLIGHT_INSTALL_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="raw"
+			required="true"
+			validate="code"
+		/>
+		<!-- Css_admin Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="css_admin"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_ADMIN_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_ADMIN_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
@@ -225,80 +242,44 @@
 			required="true"
 			validate="code"
 		/>
-		<!-- Note_botton_component_dashboard Field. Type: Note. A None Database Field. (joomla) -->
+		<!-- Note_dynamic_dashboard Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_botton_component_dashboard" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_BOTTON_COMPONENT_DASHBOARD_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_BOTTON_COMPONENT_DASHBOARD_DESCRIPTION" heading="h4" class="alert alert-info note_botton_component_dashboard" />
+		<field type="note" name="note_dynamic_dashboard" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_DYNAMIC_DASHBOARD_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_DYNAMIC_DASHBOARD_DESCRIPTION" heading="h4" class="alert alert-info note_dynamic_dashboard" />
-		<!-- Php_helper_site Field. Type: Editor. (joomla) -->
+		<!-- Sales_server Field. Type: Servers. (custom) -->
 		<field
-			type="editor"
+			type="servers"
-			name="php_helper_site"
+			name="sales_server"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_SITE_LABEL"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SALES_SERVER_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_SITE_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SALES_SERVER_DESCRIPTION"
-			width="100%"
+			class="list_class"
-			height="550px"
+			multiple="false"
-			cols="15"
+			default="0"
-			rows="80"
+			button="true"
-			buttons="no"
-			syntax="php"
-			editor="codemirror|none"
-			filter="raw"
-			required="true"
-			validate="code"
-		/>
-		<!-- Javascript Field. Type: Editor. (joomla) -->
-		<field
-			type="editor"
-			name="javascript"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JAVASCRIPT_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JAVASCRIPT_DESCRIPTION"
-			width="100%"
-			height="450px"
-			cols="15"
-			rows="30"
-			buttons="no"
-			syntax="javascript"
-			editor="codemirror|none"
-			filter="raw"
-			required="true"
-			validate="code"
 		/>
 		<!-- Note_version_options_two Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_version_options_two" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_VERSION_OPTIONS_TWO_DESCRIPTION" class="alert alert-info note_version_options_two" showon="mvc_versiondate:2" />
-		<!-- Php_helper_admin Field. Type: Editor. (joomla) -->
+		<!-- Adduikit Field. Type: List. (joomla) -->
 		<field
-			type="editor"
+			type="list"
-			name="php_helper_admin"
+			name="adduikit"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_ADMIN_LABEL"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADDUIKIT_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_ADMIN_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADDUIKIT_DESCRIPTION"
-			width="100%"
+			class="btn-group btn-group-yesno"
-			height="550px"
+			default="0">
-			cols="15"
+			<!-- Option Set. -->
-			rows="80"
+			<option value="0">
-			buttons="no"
+				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DYNAMIC</option>
-			syntax="php"
+			<option value="2">
-			editor="codemirror|none"
+				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_BOTH_VTWO_AMP_VTHREE</option>
-			filter="raw"
+			<option value="1">
-			required="true"
+				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_UIKIT_VTWO</option>
-			validate="code"
+			<option value="3">
-		/>
+				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_UIKIT_VTHREE</option>
-		<!-- Readme Field. Type: Editor. (joomla) -->
+		</field>
-		<field
+		<!-- Add_update_server Field. Type: Radio. (joomla) -->
-			type="editor"
-			name="readme"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_README_LABEL"
-			default="You can use all the normal markdown, including the place-holders."
-			width="100%"
-			height="1200px"
-			buttons="false"
-			editor="none"
-			filter="raw"
-			required="true"
-		/>
-		<!-- Buildcomp Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="buildcomp"
+			name="add_update_server"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BUILDCOMP_LABEL"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_UPDATE_SERVER_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BUILDCOMP_DESCRIPTION"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -372,12 +353,12 @@
 		</field>
 		<!-- Note_version_options_three Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_version_options_three" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_VERSION_OPTIONS_THREE_DESCRIPTION" class="alert alert-info note_version_options_three" showon="mvc_versiondate:3" />
-		<!-- Php_postflight_update Field. Type: Editor. (joomla) -->
+		<!-- Php_method_uninstall Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_postflight_update"
+			name="php_method_uninstall"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_POSTFLIGHT_UPDATE_LABEL"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_METHOD_UNINSTALL_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_POSTFLIGHT_UPDATE_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_METHOD_UNINSTALL_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
@@ -389,12 +370,12 @@
 			required="true"
 			validate="code"
 		/>
-		<!-- Add_email_helper Field. Type: Radio. (joomla) -->
+		<!-- Debug_linenr Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_email_helper"
+			name="debug_linenr"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_EMAIL_HELPER_LABEL"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DEBUG_LINENR_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_EMAIL_HELPER_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DEBUG_LINENR_DESCRIPTION"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -404,27 +385,80 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
 		</field>
-		<!-- Sql Field. Type: Textarea. (joomla) -->
+		<!-- Sql_uninstall Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
-			name="sql"
+			name="sql_uninstall"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SQL_LABEL"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SQL_UNINSTALL_LABEL"
 			rows="30"
 			cols="15"
-			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SQL_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SQL_UNINSTALL_DESCRIPTION"
 			class="text_area span12"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SQL_HINT"
+			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SQL_UNINSTALL_HINT"
 			required="true"
 		/>
+		<!-- Php_admin_event Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="php_admin_event"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_ADMIN_EVENT_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_ADMIN_EVENT_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="raw"
+			required="true"
+			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_COMPONENT_NOTE_UPDATE_SERVER_NOTE_ZIP_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_UPDATE_SERVER_NOTE_ZIP_DESCRIPTION" heading="h4" class="alert alert-info note_update_server_note_zip" />
+		<!-- Php_site_event Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="php_site_event"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_SITE_EVENT_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_SITE_EVENT_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="raw"
+			required="true"
+			validate="code"
+		/>
+		<!-- Php_helper_both Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="php_helper_both"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_BOTH_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_BOTH_DESCRIPTION"
+			width="100%"
+			height="550px"
+			cols="15"
+			rows="80"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="raw"
+			required="true"
+			validate="code"
+		/>
 		<!-- Note_version_options_one Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_version_options_one" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_VERSION_OPTIONS_ONE_DESCRIPTION" class="alert alert-info note_version_options_one" showon="mvc_versiondate:1" />
-		<!-- Debug_linenr Field. Type: Radio. (joomla) -->
+		<!-- Add_email_helper Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="debug_linenr"
+			name="add_email_helper"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DEBUG_LINENR_LABEL"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_EMAIL_HELPER_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DEBUG_LINENR_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_EMAIL_HELPER_DESCRIPTION"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -449,24 +483,23 @@
 			message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMAIL_MESSAGE"
 			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMAIL_HINT"
 		/>
-		<!-- Adduikit Field. Type: List. (joomla) -->
+		<!-- Php_helper_admin Field. Type: Editor. (joomla) -->
 		<field
-			type="list"
+			type="editor"
-			name="adduikit"
+			name="php_helper_admin"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADDUIKIT_LABEL"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_ADMIN_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADDUIKIT_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_ADMIN_DESCRIPTION"
-			class="btn-group btn-group-yesno"
+			width="100%"
-			default="0">
+			height="550px"
-			<!-- Option Set. -->
+			cols="15"
-			<option value="0">
+			rows="80"
-				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DYNAMIC</option>
+			buttons="no"
-			<option value="2">
+			syntax="php"
-				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_BOTH_VTWO_AMP_VTHREE</option>
+			editor="codemirror|none"
-			<option value="1">
+			filter="raw"
-				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_UIKIT_VTWO</option>
+			required="true"
-			<option value="3">
+			validate="code"
-				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_UIKIT_VTHREE</option>
+		/>
-		</field>
 		<!-- Website Field. Type: Url. (joomla) -->
 		<field
 			type="url"
@@ -482,12 +515,12 @@
 			message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_MESSAGE"
 			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_HINT"
 		/>
-		<!-- Php_helper_both Field. Type: Editor. (joomla) -->
+		<!-- Php_helper_site Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_helper_both"
+			name="php_helper_site"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_BOTH_LABEL"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_SITE_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_BOTH_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_SITE_DESCRIPTION"
 			width="100%"
 			height="550px"
 			cols="15"
@@ -514,18 +547,18 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
 		</field>
-		<!-- Php_admin_event Field. Type: Editor. (joomla) -->
+		<!-- Javascript Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_admin_event"
+			name="javascript"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_ADMIN_EVENT_LABEL"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JAVASCRIPT_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_ADMIN_EVENT_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JAVASCRIPT_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
 			rows="30"
 			buttons="no"
-			syntax="php"
+			syntax="javascript"
 			editor="codemirror|none"
 			filter="raw"
 			required="true"
@@ -552,31 +585,12 @@
 			<option value="4">
 				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CUSTOM_USED_IN_CUSTOM_CODE</option>
 		</field>
-		<!-- Php_site_event Field. Type: Editor. (joomla) -->
+		<!-- Css_site Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_site_event"
+			name="css_site"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_SITE_EVENT_LABEL"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_SITE_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_SITE_EVENT_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_SITE_DESCRIPTION"
-			width="100%"
-			height="450px"
-			cols="15"
-			rows="30"
-			buttons="no"
-			syntax="php"
-			editor="codemirror|none"
-			filter="raw"
-			required="true"
-			validate="code"
-		/>
-		<!-- Note_whmcs_lisencing_note Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_whmcs_lisencing_note" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_WHMCS_LISENCING_NOTE_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_WHMCS_LISENCING_NOTE_DESCRIPTION" heading="h4" class="alert alert-success note_whmcs_lisencing_note" />
-		<!-- Css_admin Field. Type: Editor. (joomla) -->
-		<field
-			type="editor"
-			name="css_admin"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_ADMIN_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_ADMIN_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
@@ -588,6 +602,10 @@
 			required="true"
 			validate="code"
 		/>
+		<!-- Note_whmcs_lisencing_note Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_whmcs_lisencing_note" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_WHMCS_LISENCING_NOTE_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_WHMCS_LISENCING_NOTE_DESCRIPTION" heading="h4" class="alert alert-success note_whmcs_lisencing_note" />
+		<!-- Note_botton_component_dashboard Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_botton_component_dashboard" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_BOTTON_COMPONENT_DASHBOARD_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_BOTTON_COMPONENT_DASHBOARD_DESCRIPTION" heading="h4" class="alert alert-info note_botton_component_dashboard" />
 		<!-- Whmcs_key Field. Type: Text. (joomla) -->
 		<field
 			type="text"
@@ -601,8 +619,23 @@
 			message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_KEY_MESSAGE"
 			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_KEY_HINT"
 		/>
-		<!-- Note_dynamic_dashboard Field. Type: Note. A None Database Field. (joomla) -->
+		<!-- Php_preflight_update Field. Type: Editor. (joomla) -->
-		<field type="note" name="note_dynamic_dashboard" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_DYNAMIC_DASHBOARD_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_DYNAMIC_DASHBOARD_DESCRIPTION" heading="h4" class="alert alert-info note_dynamic_dashboard" />
+		<field
+			type="editor"
+			name="php_preflight_update"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_PREFLIGHT_UPDATE_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_PREFLIGHT_UPDATE_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="raw"
+			required="true"
+			validate="code"
+		/>
 		<!-- Whmcs_url Field. Type: Url. (joomla) -->
 		<field
 			type="url"
@@ -614,15 +647,16 @@
 			class="text_area"
 			filter="url"
 			validated="url"
+			scheme="http,https"
 			message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_URL_MESSAGE"
 			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_URL_HINT"
 		/>
-		<!-- Php_preflight_install Field. Type: Editor. (joomla) -->
+		<!-- Php_postflight_update Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_preflight_install"
+			name="php_postflight_update"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_PREFLIGHT_INSTALL_LABEL"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_POSTFLIGHT_UPDATE_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_PREFLIGHT_INSTALL_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_POSTFLIGHT_UPDATE_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
@@ -634,6 +668,34 @@
 			required="true"
 			validate="code"
 		/>
+		<!-- Whmcs_buy_link Field. Type: Url. (joomla) -->
+		<field
+			type="url"
+			name="whmcs_buy_link"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_BUY_LINK_LABEL"
+			size="60"
+			maxlength="150"
+			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_BUY_LINK_DESCRIPTION"
+			class="text_area"
+			filter="url"
+			validated="url"
+			scheme="http,https"
+			message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_BUY_LINK_MESSAGE"
+			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_BUY_LINK_HINT"
+		/>
+		<!-- Sql Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="sql"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SQL_LABEL"
+			rows="30"
+			cols="15"
+			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SQL_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SQL_HINT"
+			required="true"
+		/>
 		<!-- License Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
@@ -648,22 +710,18 @@
 			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_LICENSE_HINT"
 			required="true"
 		/>
-		<!-- Php_postflight_install Field. Type: Editor. (joomla) -->
+		<!-- Readme Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_postflight_install"
+			name="readme"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_POSTFLIGHT_INSTALL_LABEL"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_README_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_POSTFLIGHT_INSTALL_DESCRIPTION"
+			default="You can use all the normal markdown, including the place-holders."
 			width="100%"
-			height="450px"
+			height="1200px"
-			cols="15"
+			buttons="false"
-			rows="30"
+			editor="none"
-			buttons="no"
-			syntax="php"
-			editor="codemirror|none"
 			filter="raw"
 			required="true"
-			validate="code"
 		/>
 		<!-- Bom Field. Type: Filelist. (joomla) -->
 		<field
@@ -675,44 +733,6 @@
 			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BOM_DESCRIPTION"
 			hide_default="true"
 		/>
-		<!-- Php_method_uninstall Field. Type: Editor. (joomla) -->
-		<field
-			type="editor"
-			name="php_method_uninstall"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_METHOD_UNINSTALL_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_METHOD_UNINSTALL_DESCRIPTION"
-			width="100%"
-			height="450px"
-			cols="15"
-			rows="30"
-			buttons="no"
-			syntax="php"
-			editor="codemirror|none"
-			filter="raw"
-			required="true"
-			validate="code"
-		/>
-		<!-- Image Field. Type: Media. (joomla) -->
-		<field
-			type="media"
-			name="image"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMAGE_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMAGE_DESCRIPTION"
-			directory=""
-		/>
-		<!-- Sql_uninstall Field. Type: Textarea. (joomla) -->
-		<field
-			type="textarea"
-			name="sql_uninstall"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SQL_UNINSTALL_LABEL"
-			rows="30"
-			cols="15"
-			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SQL_UNINSTALL_DESCRIPTION"
-			class="text_area span12"
-			filter="raw"
-			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SQL_UNINSTALL_HINT"
-			required="true"
-		/>
 		<!-- Update_server_target Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -730,20 +750,14 @@
 			<option value="3">
 				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_OTHER</option>
 		</field>
-		<!-- Add_update_server Field. Type: Radio. (joomla) -->
+		<!-- Image Field. Type: Media. (joomla) -->
 		<field
-			type="radio"
+			type="media"
-			name="add_update_server"
+			name="image"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_UPDATE_SERVER_LABEL"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMAGE_LABEL"
-			class="btn-group btn-group-yesno"
+			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMAGE_DESCRIPTION"
-			default="0"
+			directory=""
-			required="true">
+		/>
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
-		</field>
 		<!-- Update_server Field. Type: Servers. (custom) -->
 		<field
 			type="servers"
@@ -755,31 +769,45 @@
 			default="0"
 			button="true"
 		/>
-		<!-- 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_COMPONENT_NOTE_UPDATE_SERVER_NOTE_ZIP_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_UPDATE_SERVER_NOTE_ZIP_DESCRIPTION" heading="h4" class="alert alert-info note_update_server_note_zip" />
 		<!-- Not_required Field. Type: Hidden. (joomla) -->
 		<field
 			type="hidden"
 			name="not_required"
 			default="[]"
 		/>
-		<!-- Sales_server Field. Type: Servers. (custom) -->
+		<!-- Buildcomp Field. Type: Radio. (joomla) -->
 		<field
-			type="servers"
+			type="radio"
-			name="sales_server"
+			name="buildcomp"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SALES_SERVER_LABEL"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BUILDCOMP_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SALES_SERVER_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BUILDCOMP_DESCRIPTION"
-			class="list_class"
+			class="btn-group btn-group-yesno"
-			multiple="false"
 			default="0"
-			button="true"
+			required="true">
-		/>
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
+		</field>
 		<!-- Note_moved_views Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_moved_views" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_MOVED_VIEWS_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_MOVED_VIEWS_DESCRIPTION" heading="h4" class="alert alert-info note_moved_views" />
+		<!-- Creatuserhelper Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="creatuserhelper"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CREATUSERHELPER_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
+		</field>
 		<!-- Spacer_hr_one Field. Type: Spacer. A None Database Field. (joomla) -->
 		<field type="spacer" name="spacer_hr_one" hr="true" class="spacer_hr_one" />
-		<!-- Note_mysql_tweak_options Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_mysql_tweak_options" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_MYSQL_TWEAK_OPTIONS_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_MYSQL_TWEAK_OPTIONS_DESCRIPTION" heading="h4" class="alert alert-info note_mysql_tweak_options" />
 		<!-- Addfootable Field. Type: List. (joomla) -->
 		<field
 			type="list"
@@ -798,8 +826,8 @@
 			<option value="1">
 				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_FOOTABLE_VTWO</option>
 		</field>
-		<!-- Spacer_hr_two Field. Type: Spacer. A None Database Field. (joomla) -->
+		<!-- Note_mysql_tweak_options Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="spacer" name="spacer_hr_two" hr="true" class="spacer_hr_two" />
+		<field type="note" name="note_mysql_tweak_options" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_MYSQL_TWEAK_OPTIONS_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_MYSQL_TWEAK_OPTIONS_DESCRIPTION" heading="h4" class="alert alert-info note_mysql_tweak_options" />
 		<!-- Add_php_helper_both Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -814,8 +842,8 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
 		</field>
-		<!-- Note_add_custom_menus Field. Type: Note. A None Database Field. (joomla) -->
+		<!-- Spacer_hr_two Field. Type: Spacer. A None Database Field. (joomla) -->
-		<field type="note" name="note_add_custom_menus" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ADD_CUSTOM_MENUS_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ADD_CUSTOM_MENUS_DESCRIPTION" heading="h4" class="alert alert-info note_add_custom_menus" />
+		<field type="spacer" name="spacer_hr_two" hr="true" class="spacer_hr_two" />
 		<!-- Add_php_helper_admin Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -830,8 +858,8 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
 		</field>
-		<!-- Spacer_hr_three Field. Type: Spacer. A None Database Field. (joomla) -->
+		<!-- Note_add_custom_menus Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="spacer" name="spacer_hr_three" hr="true" class="spacer_hr_three" />
+		<field type="note" name="note_add_custom_menus" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ADD_CUSTOM_MENUS_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ADD_CUSTOM_MENUS_DESCRIPTION" heading="h4" class="alert alert-info note_add_custom_menus" />
 		<!-- Add_admin_event Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -846,8 +874,8 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
 		</field>
-		<!-- Note_add_config Field. Type: Note. A None Database Field. (joomla) -->
+		<!-- Spacer_hr_three Field. Type: Spacer. A None Database Field. (joomla) -->
-		<field type="note" name="note_add_config" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ADD_CONFIG_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ADD_CONFIG_DESCRIPTION" heading="h4" class="alert alert-info note_add_config" />
+		<field type="spacer" name="spacer_hr_three" hr="true" class="spacer_hr_three" />
 		<!-- Add_php_helper_site Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -862,8 +890,8 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
 		</field>
-		<!-- Note_component_files_folders Field. Type: Note. A None Database Field. (joomla) -->
+		<!-- Note_add_config Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_component_files_folders" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_COMPONENT_FILES_FOLDERS_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_COMPONENT_FILES_FOLDERS_DESCRIPTION" heading="h4" class="alert alert-info note_component_files_folders" />
+		<field type="note" name="note_add_config" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ADD_CONFIG_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ADD_CONFIG_DESCRIPTION" heading="h4" class="alert alert-info note_add_config" />
 		<!-- Add_site_event Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -878,8 +906,8 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
 		</field>
-		<!-- Spacer_hr_four Field. Type: Spacer. A None Database Field. (joomla) -->
+		<!-- Note_component_files_folders Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="spacer" name="spacer_hr_four" hr="true" class="spacer_hr_four" />
+		<field type="note" name="note_component_files_folders" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_COMPONENT_FILES_FOLDERS_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_COMPONENT_FILES_FOLDERS_DESCRIPTION" heading="h4" class="alert alert-info note_component_files_folders" />
 		<!-- Add_javascript Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -894,8 +922,8 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
 		</field>
-		<!-- To_ignore_note Field. Type: Note. A None Database Field. (joomla) -->
+		<!-- Spacer_hr_four Field. Type: Spacer. A None Database Field. (joomla) -->
-		<field type="note" name="to_ignore_note" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TO_IGNORE_NOTE_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TO_IGNORE_NOTE_DESCRIPTION" heading="h4" class="alert alert-info to_ignore_note" />
+		<field type="spacer" name="spacer_hr_four" hr="true" class="spacer_hr_four" />
 		<!-- Add_css_admin Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -910,6 +938,22 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
 		</field>
+		<!-- To_ignore_note Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="to_ignore_note" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TO_IGNORE_NOTE_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TO_IGNORE_NOTE_DESCRIPTION" heading="h4" class="alert alert-info to_ignore_note" />
+		<!-- Add_css_site Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_css_site"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_CSS_SITE_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
+		</field>
 		<!-- Toignore Field. Type: Text. (joomla) -->
 		<field
 			type="text"
@@ -924,22 +968,6 @@
 			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TOIGNORE_HINT"
 			autocomplete="on"
 		/>
-		<!-- Add_css_site Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_css_site"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_CSS_SITE_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
-		</field>
-		<!-- Spacer_hr_five Field. Type: Spacer. A None Database Field. (joomla) -->
-		<field type="spacer" name="spacer_hr_five" hr="true" class="spacer_hr_five" />
 		<!-- Dashboard_type Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -955,8 +983,8 @@
 			<option value="2">
 				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DYNAMIC</option>
 		</field>
-		<!-- Jcb_export_package_note Field. Type: Note. A None Database Field. (joomla) -->
+		<!-- Spacer_hr_five Field. Type: Spacer. A None Database Field. (joomla) -->
-		<field type="note" name="jcb_export_package_note" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JCB_EXPORT_PACKAGE_NOTE_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JCB_EXPORT_PACKAGE_NOTE_DESCRIPTION" heading="h4" class="alert alert-info jcb_export_package_note" />
+		<field type="spacer" name="spacer_hr_five" hr="true" class="spacer_hr_five" />
 		<!-- Dashboard Field. Type: Dynamicdashboard. (custom) -->
 		<field
 			type="dynamicdashboard"
@@ -966,6 +994,22 @@
 			class="fieldMedium"
 			multiple="false"
 		/>
+		<!-- Jcb_export_package_note Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="jcb_export_package_note" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JCB_EXPORT_PACKAGE_NOTE_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JCB_EXPORT_PACKAGE_NOTE_DESCRIPTION" heading="h4" class="alert alert-info jcb_export_package_note" />
+		<!-- Add_php_preflight_install Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_php_preflight_install"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_PHP_PREFLIGHT_INSTALL_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
+		</field>
 		<!-- Export_key Field. Type: Text. (joomla) -->
 		<field
 			type="text"
@@ -980,11 +1024,11 @@
 			message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_KEY_MESSAGE"
 			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_KEY_HINT"
 		/>
-		<!-- Add_php_preflight_install Field. Type: Radio. (joomla) -->
+		<!-- Add_php_preflight_update Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_php_preflight_install"
+			name="add_php_preflight_update"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_PHP_PREFLIGHT_INSTALL_LABEL"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_PHP_PREFLIGHT_UPDATE_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -1009,11 +1053,11 @@
 			message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JOOMLA_SOURCE_LINK_MESSAGE"
 			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JOOMLA_SOURCE_LINK_HINT"
 		/>
-		<!-- Add_php_preflight_update Field. Type: Radio. (joomla) -->
+		<!-- Add_php_postflight_install Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_php_preflight_update"
+			name="add_php_postflight_install"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_PHP_PREFLIGHT_UPDATE_LABEL"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_PHP_POSTFLIGHT_INSTALL_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -1035,25 +1079,10 @@
 			required="false"
 			filter="url"
 			validated="url"
+			scheme="http,https"
 			message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_BUY_LINK_MESSAGE"
 			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_BUY_LINK_HINT"
 		/>
-		<!-- Add_php_postflight_install Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_php_postflight_install"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_PHP_POSTFLIGHT_INSTALL_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
-		</field>
-		<!-- Spacer_hr_six Field. Type: Spacer. A None Database Field. (joomla) -->
-		<field type="spacer" name="spacer_hr_six" hr="true" class="spacer_hr_six" />
 		<!-- Add_php_postflight_update Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -1068,8 +1097,8 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
 		</field>
-		<!-- Note_on_contributors Field. Type: Note. A None Database Field. (joomla) -->
+		<!-- Spacer_hr_six Field. Type: Spacer. A None Database Field. (joomla) -->
-		<field type="note" name="note_on_contributors" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ON_CONTRIBUTORS_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ON_CONTRIBUTORS_DESCRIPTION" heading="h4" class="alert alert-info note_on_contributors" />
+		<field type="spacer" name="spacer_hr_six" hr="true" class="spacer_hr_six" />
 		<!-- Add_php_method_uninstall Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -1084,6 +1113,22 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
 		</field>
+		<!-- Note_on_contributors Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_on_contributors" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ON_CONTRIBUTORS_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ON_CONTRIBUTORS_DESCRIPTION" heading="h4" class="alert alert-info note_on_contributors" />
+		<!-- Add_sql Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_sql"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_SQL_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
+		</field>
 		<!-- Addcontributors Field. Type: Subform. (joomla) -->
 		<field
 			type="subform"
@@ -1153,6 +1198,7 @@
 					required="false"
 					filter="url"
 					validated="url"
+					scheme="http,https"
 					message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_MESSAGE"
 					hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_HINT"
 				/>
@@ -1196,11 +1242,11 @@
 				</field>
 			</form>
 		</field>
-		<!-- Add_sql Field. Type: Radio. (joomla) -->
+		<!-- Add_sql_uninstall Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_sql"
+			name="add_sql_uninstall"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_SQL_LABEL"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_SQL_UNINSTALL_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -1224,14 +1270,13 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
 		</field>
-		<!-- Add_sql_uninstall Field. Type: Radio. (joomla) -->
+		<!-- Addreadme Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_sql_uninstall"
+			name="addreadme"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_SQL_UNINSTALL_LABEL"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADDREADME_LABEL"
 			class="btn-group btn-group-yesno"
-			default="0"
+			default="0">
-			required="true">
 			<!-- Option Set. -->
 			<option value="1">
 				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES</option>
@@ -1249,25 +1294,10 @@
 			max="40"
 			step="1"
 		/>
-		<!-- Addreadme Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="addreadme"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADDREADME_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
-		</field>
-		<!-- Note_on_admin_views Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_on_admin_views" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ON_ADMIN_VIEWS_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ON_ADMIN_VIEWS_DESCRIPTION" heading="h4" class="alert alert-info note_on_admin_views" />
 		<!-- Note_readme Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_readme" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_README_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_README_DESCRIPTION" heading="h4" class="note_readme" />
-		<!-- Note_display_component_admin_views Field. Type: Note. A None Database Field. (joomla) -->
+		<!-- Note_on_admin_views Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_display_component_admin_views" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_DISPLAY_COMPONENT_ADMIN_VIEWS_DESCRIPTION" class="note_display_component_admin_views" />
+		<field type="note" name="note_on_admin_views" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ON_ADMIN_VIEWS_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ON_ADMIN_VIEWS_DESCRIPTION" heading="h4" class="alert alert-info note_on_admin_views" />
 		<!-- Update_server_url Field. Type: Url. (joomla) -->
 		<field
 			type="url"
@@ -1282,16 +1312,16 @@
 			message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATE_SERVER_URL_MESSAGE"
 			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATE_SERVER_URL_HINT"
 		/>
-		<!-- Note_on_site_views Field. Type: Note. A None Database Field. (joomla) -->
+		<!-- Note_display_component_admin_views Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_on_site_views" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ON_SITE_VIEWS_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ON_SITE_VIEWS_DESCRIPTION" heading="h4" class="alert alert-info note_on_site_views" />
+		<field type="note" name="note_display_component_admin_views" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_DISPLAY_COMPONENT_ADMIN_VIEWS_DESCRIPTION" class="note_display_component_admin_views" />
 		<!-- 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_COMPONENT_NOTE_UPDATE_SERVER_NOTE_FTP_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_UPDATE_SERVER_NOTE_FTP_DESCRIPTION" heading="h4" class="alert alert-success note_update_server_note_ftp" />
-		<!-- Note_display_component_site_views Field. Type: Note. A None Database Field. (joomla) -->
+		<!-- Note_on_site_views Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_display_component_site_views" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_DISPLAY_COMPONENT_SITE_VIEWS_DESCRIPTION" class="note_display_component_site_views" />
+		<field type="note" name="note_on_site_views" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ON_SITE_VIEWS_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ON_SITE_VIEWS_DESCRIPTION" heading="h4" class="alert alert-info note_on_site_views" />
 		<!-- 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_COMPONENT_NOTE_UPDATE_SERVER_NOTE_OTHER_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_UPDATE_SERVER_NOTE_OTHER_DESCRIPTION" heading="h4" class="alert alert-success note_update_server_note_other" />
-		<!-- Note_on_custom_admin_views Field. Type: Note. A None Database Field. (joomla) -->
+		<!-- Note_display_component_site_views Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_on_custom_admin_views" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ON_CUSTOM_ADMIN_VIEWS_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ON_CUSTOM_ADMIN_VIEWS_DESCRIPTION" heading="h4" class="alert alert-info note_on_custom_admin_views" />
+		<field type="note" name="note_display_component_site_views" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_DISPLAY_COMPONENT_SITE_VIEWS_DESCRIPTION" class="note_display_component_site_views" />
 		<!-- Add_sales_server Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -1306,24 +1336,12 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
 		</field>
-		<!-- Note_display_component_custom_admin_views Field. Type: Note. A None Database Field. (joomla) -->
+		<!-- Note_on_custom_admin_views Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_display_component_custom_admin_views" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_DISPLAY_COMPONENT_CUSTOM_ADMIN_VIEWS_DESCRIPTION" class="note_display_component_custom_admin_views" />
+		<field type="note" name="note_on_custom_admin_views" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ON_CUSTOM_ADMIN_VIEWS_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ON_CUSTOM_ADMIN_VIEWS_DESCRIPTION" heading="h4" class="alert alert-info note_on_custom_admin_views" />
 		<!-- Note_buildcomp_dynamic_mysql Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_buildcomp_dynamic_mysql" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_BUILDCOMP_DYNAMIC_MYSQL_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_BUILDCOMP_DYNAMIC_MYSQL_DESCRIPTION" heading="h4" class="alert alert-info note_buildcomp_dynamic_mysql" />
-		<!-- Creatuserhelper Field. Type: Radio. (joomla) -->
+		<!-- Note_display_component_custom_admin_views Field. Type: Note. A None Database Field. (joomla) -->
-		<field
+		<field type="note" name="note_display_component_custom_admin_views" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_DISPLAY_COMPONENT_CUSTOM_ADMIN_VIEWS_DESCRIPTION" class="note_display_component_custom_admin_views" />
-			type="radio"
-			name="creatuserhelper"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CREATUSERHELPER_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
-		</field>
 		<!-- Buildcompsql Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"

admin/models/joomla_component.php

@@ -86,58 +86,34 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 				$item->metadata = $registry->toArray();
 			}
 
-			if (!empty($item->php_preflight_update))
+			if (!empty($item->php_preflight_install))
 			{
-				// base64 Decode php_preflight_update.
+				// base64 Decode php_preflight_install.
-				$item->php_preflight_update = base64_decode($item->php_preflight_update);
+				$item->php_preflight_install = base64_decode($item->php_preflight_install);
 			}
 
-			if (!empty($item->css_site))
+			if (!empty($item->php_postflight_install))
 			{
-				// base64 Decode css_site.
+				// base64 Decode php_postflight_install.
-				$item->css_site = base64_decode($item->css_site);
+				$item->php_postflight_install = base64_decode($item->php_postflight_install);
 			}
 
-			if (!empty($item->php_helper_site))
+			if (!empty($item->css_admin))
 			{
-				// base64 Decode php_helper_site.
+				// base64 Decode css_admin.
-				$item->php_helper_site = base64_decode($item->php_helper_site);
+				$item->css_admin = base64_decode($item->css_admin);
 			}
 
-			if (!empty($item->javascript))
+			if (!empty($item->php_method_uninstall))
 			{
-				// base64 Decode javascript.
+				// base64 Decode php_method_uninstall.
-				$item->javascript = base64_decode($item->javascript);
+				$item->php_method_uninstall = base64_decode($item->php_method_uninstall);
 			}
 
-			if (!empty($item->php_helper_admin))
+			if (!empty($item->sql_uninstall))
 			{
-				// base64 Decode php_helper_admin.
+				// base64 Decode sql_uninstall.
-				$item->php_helper_admin = base64_decode($item->php_helper_admin);
+				$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_postflight_update))
-			{
-				// base64 Decode php_postflight_update.
-				$item->php_postflight_update = base64_decode($item->php_postflight_update);
-			}
-
-			if (!empty($item->sql))
-			{
-				// base64 Decode sql.
-				$item->sql = base64_decode($item->sql);
-			}
-
-			if (!empty($item->php_helper_both))
-			{
-				// base64 Decode php_helper_both.
-				$item->php_helper_both = base64_decode($item->php_helper_both);
 			}
 
 			if (!empty($item->php_admin_event))
@@ -152,34 +128,58 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 				$item->php_site_event = base64_decode($item->php_site_event);
 			}
 
-			if (!empty($item->css_admin))
+			if (!empty($item->php_helper_both))
 			{
-				// base64 Decode css_admin.
+				// base64 Decode php_helper_both.
-				$item->css_admin = base64_decode($item->css_admin);
+				$item->php_helper_both = base64_decode($item->php_helper_both);
 			}
 
-			if (!empty($item->php_preflight_install))
+			if (!empty($item->php_helper_admin))
 			{
-				// base64 Decode php_preflight_install.
+				// base64 Decode php_helper_admin.
-				$item->php_preflight_install = base64_decode($item->php_preflight_install);
+				$item->php_helper_admin = base64_decode($item->php_helper_admin);
 			}
 
-			if (!empty($item->php_postflight_install))
+			if (!empty($item->php_helper_site))
 			{
-				// base64 Decode php_postflight_install.
+				// base64 Decode php_helper_site.
-				$item->php_postflight_install = base64_decode($item->php_postflight_install);
+				$item->php_helper_site = base64_decode($item->php_helper_site);
 			}
 
-			if (!empty($item->php_method_uninstall))
+			if (!empty($item->javascript))
 			{
-				// base64 Decode php_method_uninstall.
+				// base64 Decode javascript.
-				$item->php_method_uninstall = base64_decode($item->php_method_uninstall);
+				$item->javascript = base64_decode($item->javascript);
 			}
 
-			if (!empty($item->sql_uninstall))
+			if (!empty($item->css_site))
 			{
-				// base64 Decode sql_uninstall.
+				// base64 Decode css_site.
-				$item->sql_uninstall = base64_decode($item->sql_uninstall);
+				$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->php_postflight_update))
+			{
+				// base64 Decode php_postflight_update.
+				$item->php_postflight_update = base64_decode($item->php_postflight_update);
+			}
+
+			if (!empty($item->sql))
+			{
+				// base64 Decode sql.
+				$item->sql = base64_decode($item->sql);
+			}
+
+			if (!empty($item->readme))
+			{
+				// base64 Decode readme.
+				$item->readme = base64_decode($item->readme);
 			}
 
 			if (!empty($item->buildcompsql))
@@ -1071,58 +1071,34 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 			$data['addcontributors'] = '';
 		}
 
-		// Set the php_preflight_update string to base64 string.
+		// Set the php_preflight_install string to base64 string.
-		if (isset($data['php_preflight_update']))
+		if (isset($data['php_preflight_install']))
 		{
-			$data['php_preflight_update'] = base64_encode($data['php_preflight_update']);
+			$data['php_preflight_install'] = base64_encode($data['php_preflight_install']);
 		}
 
-		// Set the css_site string to base64 string.
+		// Set the php_postflight_install string to base64 string.
-		if (isset($data['css_site']))
+		if (isset($data['php_postflight_install']))
 		{
-			$data['css_site'] = base64_encode($data['css_site']);
+			$data['php_postflight_install'] = base64_encode($data['php_postflight_install']);
 		}
 
-		// Set the php_helper_site string to base64 string.
+		// Set the css_admin string to base64 string.
-		if (isset($data['php_helper_site']))
+		if (isset($data['css_admin']))
 		{
-			$data['php_helper_site'] = base64_encode($data['php_helper_site']);
+			$data['css_admin'] = base64_encode($data['css_admin']);
 		}
 
-		// Set the javascript string to base64 string.
+		// Set the php_method_uninstall string to base64 string.
-		if (isset($data['javascript']))
+		if (isset($data['php_method_uninstall']))
 		{
-			$data['javascript'] = base64_encode($data['javascript']);
+			$data['php_method_uninstall'] = base64_encode($data['php_method_uninstall']);
 		}
 
-		// Set the php_helper_admin string to base64 string.
+		// Set the sql_uninstall string to base64 string.
-		if (isset($data['php_helper_admin']))
+		if (isset($data['sql_uninstall']))
 		{
-			$data['php_helper_admin'] = base64_encode($data['php_helper_admin']);
+			$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_postflight_update string to base64 string.
-		if (isset($data['php_postflight_update']))
-		{
-			$data['php_postflight_update'] = base64_encode($data['php_postflight_update']);
-		}
-
-		// Set the sql string to base64 string.
-		if (isset($data['sql']))
-		{
-			$data['sql'] = base64_encode($data['sql']);
-		}
-
-		// Set the php_helper_both string to base64 string.
-		if (isset($data['php_helper_both']))
-		{
-			$data['php_helper_both'] = base64_encode($data['php_helper_both']);
 		}
 
 		// Set the php_admin_event string to base64 string.
@@ -1137,34 +1113,58 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 			$data['php_site_event'] = base64_encode($data['php_site_event']);
 		}
 
-		// Set the css_admin string to base64 string.
+		// Set the php_helper_both string to base64 string.
-		if (isset($data['css_admin']))
+		if (isset($data['php_helper_both']))
 		{
-			$data['css_admin'] = base64_encode($data['css_admin']);
+			$data['php_helper_both'] = base64_encode($data['php_helper_both']);
 		}
 
-		// Set the php_preflight_install string to base64 string.
+		// Set the php_helper_admin string to base64 string.
-		if (isset($data['php_preflight_install']))
+		if (isset($data['php_helper_admin']))
 		{
-			$data['php_preflight_install'] = base64_encode($data['php_preflight_install']);
+			$data['php_helper_admin'] = base64_encode($data['php_helper_admin']);
 		}
 
-		// Set the php_postflight_install string to base64 string.
+		// Set the php_helper_site string to base64 string.
-		if (isset($data['php_postflight_install']))
+		if (isset($data['php_helper_site']))
 		{
-			$data['php_postflight_install'] = base64_encode($data['php_postflight_install']);
+			$data['php_helper_site'] = base64_encode($data['php_helper_site']);
 		}
 
-		// Set the php_method_uninstall string to base64 string.
+		// Set the javascript string to base64 string.
-		if (isset($data['php_method_uninstall']))
+		if (isset($data['javascript']))
 		{
-			$data['php_method_uninstall'] = base64_encode($data['php_method_uninstall']);
+			$data['javascript'] = base64_encode($data['javascript']);
 		}
 
-		// Set the sql_uninstall string to base64 string.
+		// Set the css_site string to base64 string.
-		if (isset($data['sql_uninstall']))
+		if (isset($data['css_site']))
 		{
-			$data['sql_uninstall'] = base64_encode($data['sql_uninstall']);
+			$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 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 sql string to base64 string.
+		if (isset($data['sql']))
+		{
+			$data['sql'] = base64_encode($data['sql']);
+		}
+
+		// Set the readme string to base64 string.
+		if (isset($data['readme']))
+		{
+			$data['readme'] = base64_encode($data['readme']);
 		}
 
 		// Set the buildcompsql string to base64 string.

admin/models/joomla_components.php

@@ -1918,43 +1918,43 @@ class ComponentbuilderModelJoomla_components extends JModelList
 							continue;
 						}
 
-						// decode php_preflight_update
+						// decode php_preflight_install
-						$item->php_preflight_update = base64_decode($item->php_preflight_update);
+						$item->php_preflight_install = base64_decode($item->php_preflight_install);
-						// decode css_site
+						// decode php_postflight_install
-						$item->css_site = base64_decode($item->css_site);
+						$item->php_postflight_install = base64_decode($item->php_postflight_install);
-						// decode php_helper_site
+						// decode css_admin
-						$item->php_helper_site = base64_decode($item->php_helper_site);
+						$item->css_admin = base64_decode($item->css_admin);
-						// decode javascript
+						// decode php_method_uninstall
-						$item->javascript = base64_decode($item->javascript);
+						$item->php_method_uninstall = base64_decode($item->php_method_uninstall);
-						// decode php_helper_admin
+						// decode sql_uninstall
-						$item->php_helper_admin = base64_decode($item->php_helper_admin);
+						$item->sql_uninstall = base64_decode($item->sql_uninstall);
-						// decode readme
-						$item->readme = base64_decode($item->readme);
-						// decode php_postflight_update
-						$item->php_postflight_update = base64_decode($item->php_postflight_update);
-						// decode sql
-						$item->sql = base64_decode($item->sql);
-						// 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
+						// decode php_helper_both
-						$item->css_admin = base64_decode($item->css_admin);
+						$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_helper_site
+						$item->php_helper_site = base64_decode($item->php_helper_site);
+						// decode javascript
+						$item->javascript = base64_decode($item->javascript);
+						// decode css_site
+						$item->css_site = base64_decode($item->css_site);
 						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
+						// decode php_preflight_update
-						$item->php_preflight_install = base64_decode($item->php_preflight_install);
+						$item->php_preflight_update = base64_decode($item->php_preflight_update);
-						// decode php_postflight_install
+						// decode php_postflight_update
-						$item->php_postflight_install = base64_decode($item->php_postflight_install);
+						$item->php_postflight_update = base64_decode($item->php_postflight_update);
-						// decode php_method_uninstall
+						// decode sql
-						$item->php_method_uninstall = base64_decode($item->php_method_uninstall);
+						$item->sql = base64_decode($item->sql);
-						// decode sql_uninstall
+						// decode readme
-						$item->sql_uninstall = base64_decode($item->sql_uninstall);
+						$item->readme = base64_decode($item->readme);
 						if ($basickey && !is_numeric($item->export_key) && $item->export_key === base64_encode(base64_decode($item->export_key, true)))
 						{
 							// decrypt export_key

admin/sql/install.mysql.utf8.sql

@@ -74,6 +74,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_component` (
 	`update_server_target` TINYINT(1) NOT NULL DEFAULT 0,
 	`update_server_url` VARCHAR(255) NOT NULL DEFAULT '',
 	`website` CHAR(255) NOT NULL DEFAULT '',
+	`whmcs_buy_link` VARCHAR(255) NOT NULL DEFAULT '',
 	`whmcs_key` VARCHAR(255) NOT NULL DEFAULT '',
 	`whmcs_url` VARCHAR(255) NOT NULL DEFAULT '',
 	`params` text NOT NULL DEFAULT '',
@@ -99,15 +100,16 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_component` (
 	KEY `idx_state` (`published`),
 	KEY `idx_system_name` (`system_name`),
 	KEY `idx_name_code` (`name_code`),
+	KEY `idx_adduikit` (`adduikit`),
+	KEY `idx_add_update_server` (`add_update_server`),
 	KEY `idx_add_placeholders` (`add_placeholders`),
 	KEY `idx_mvc_versiondate` (`mvc_versiondate`),
-	KEY `idx_add_email_helper` (`add_email_helper`),
 	KEY `idx_debug_linenr` (`debug_linenr`),
-	KEY `idx_adduikit` (`adduikit`),
+	KEY `idx_add_email_helper` (`add_email_helper`),
 	KEY `idx_add_license` (`add_license`),
 	KEY `idx_license_type` (`license_type`),
 	KEY `idx_update_server_target` (`update_server_target`),
-	KEY `idx_add_update_server` (`add_update_server`),
+	KEY `idx_creatuserhelper` (`creatuserhelper`),
 	KEY `idx_addfootable` (`addfootable`),
 	KEY `idx_add_php_helper_both` (`add_php_helper_both`),
 	KEY `idx_add_php_helper_admin` (`add_php_helper_admin`),
@@ -123,11 +125,10 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_component` (
 	KEY `idx_add_php_postflight_update` (`add_php_postflight_update`),
 	KEY `idx_add_php_method_uninstall` (`add_php_method_uninstall`),
 	KEY `idx_add_sql` (`add_sql`),
-	KEY `idx_emptycontributors` (`emptycontributors`),
 	KEY `idx_add_sql_uninstall` (`add_sql_uninstall`),
+	KEY `idx_emptycontributors` (`emptycontributors`),
 	KEY `idx_addreadme` (`addreadme`),
-	KEY `idx_add_sales_server` (`add_sales_server`),
+	KEY `idx_add_sales_server` (`add_sales_server`)
-	KEY `idx_creatuserhelper` (`creatuserhelper`)
 ) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
 
 CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` (
@@ -1514,7 +1515,7 @@ INSERT INTO `#__componentbuilder_field` (`id`, `add_css_view`, `add_css_views`,
 (196, '', '', '', '', '', '', '', '', '', 64, '', 'VARCHAR', '', '', '', 'Mobile Phone', 'NOT NULL', '', 23, '\"<field type=\\\"text\\\" \\r\\nname=\\\"mobile_phone\\\" \\r\\nlabel=\\\"Mobile Phone\\\" \\r\\nsize=\\\"10\\\" \\r\\nmaxlength=\\\"50\\\" \\r\\ndefault=\\\"\\\" \\r\\ndescription=\\\"Enter Mobile Phone Number\\\" \\r\\nclass=\\\"text_area\\\" \\r\\nfilter=\\\"STRING\\\" \\r\\nvalidated=\\\"tel\\\" \\r\\nrequired=\\\"true\\\" \\r\\nmessage=\\\"Error! Please add mobile phone number here.\\\" \\r\\nhint=\\\"Mobile Phone Here\\\"  \\/>\"', 1, '2015-04-07 22:12:58', '2016-03-28 14:00:02', 2, '', 7),
 (199, '', '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', 2, '', '', 'Name', 'NOT NULL', '', 24, '\"<field\\r\\n\\ttype=\\\"text\\\" \\r\\n\\tname=\\\"name\\\" \\r\\n\\tlabel=\\\"Name\\\" \\r\\n\\tsize=\\\"40\\\" \\r\\n\\tmaxlength=\\\"150\\\" \\r\\n\\tdescription=\\\"Enter Name Here\\\" \\r\\n\\tclass=\\\"text_area\\\" \\r\\n\\treadonly=\\\"false\\\" \\r\\n\\tdisabled=\\\"false\\\" \\r\\n\\trequired=\\\"true\\\"\\r\\n\\tfilter=\\\"STRING\\\" \\r\\n\\tmessage=\\\"Error! Please add name here.\\\" \\r\\n\\thint=\\\"Name Here\\\" \\r\\n\\/>\"', 1, '2015-03-19 17:30:59', '2017-10-25 20:26:02', 8, '', 4),
 (203, '', '', '', '', '', '', '', '', '', 1, '', 'INT', '', '', '', 'Not Required', 'NOT NULL', '', 9, '\"<field \\r\\n\\ttype=\\\"hidden\\\" \\r\\n\\tname=\\\"not_required\\\" \\r\\n\\tdefault=\\\"[]\\\" \\r\\n\\/>\"', 1, '2015-05-08 16:19:16', '2015-08-25 21:15:22', 1, '', 19),
-(280, '', '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', '', '', '', 'Website', 'NOT NULL', '', 27, '\"<field \\r\\n\\ttype=\\\"url\\\" \\r\\n\\tname=\\\"website\\\" \\r\\n\\tlabel=\\\"Website\\\" \\r\\n\\tsize=\\\"60\\\" \\r\\n\\tmaxlength=\\\"150\\\" \\r\\n\\tdefault=\\\"\\\" \\r\\n\\tdescription=\\\"Enter website address\\\" \\r\\n\\tclass=\\\"text_area\\\" \\r\\n\\treadonly=\\\"\\\" \\r\\n\\tdisabled=\\\"\\\" \\r\\n\\trequired=\\\"\\\" \\r\\n\\tfilter=\\\"url\\\" \\r\\n\\tvalidated=\\\"url\\\" \\r\\n\\tmessage=\\\"Error! Please add website here.\\\" \\r\\n\\thint=\\\"http:\\/\\/www.example.com\\\" \\r\\n\\/>\"', 1, '2015-04-08 00:36:16', '2015-08-25 21:15:22', 1, '', 105),
+(280, '', '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', '', '', '', 'Website', 'NOT NULL', '', 27, '\"<field\\n\\ttype=\\\"url\\\"\\n\\tname=\\\"website\\\"\\n\\tlabel=\\\"Website\\\"\\n\\tsize=\\\"60\\\"\\n\\tmaxlength=\\\"150\\\"\\n\\tdescription=\\\"Enter website address\\\"\\n\\tclass=\\\"text_area\\\"\\n\\tfilter=\\\"url\\\"\\n\\tvalidated=\\\"url\\\"\\n\\tmessage=\\\"Error! Please add website here.\\\"\\n\\thint=\\\"http:\\/\\/www.example.com\\\"\\n\\tscheme=\\\"http,https\\\"\\n\\/>\"', 1, '2015-04-08 00:36:16', '2018-07-08 00:11:05', 2, '', 105),
 (682, '', '', '', '', '', '', '', '', '', 1, '', 'TINYINT', 2, '', '', 'Add More', 'NOT NULL', '', 17, '\"<field \\r\\n\\ttype=\\\"radio\\\" \\r\\n\\tname=\\\"add\\\" \\r\\n\\tlabel=\\\"Add More\\\" \\r\\n\\tdescription=\\\"\\\" \\r\\n\\tclass=\\\"btn-group btn-group-yesno\\\" \\r\\n\\toption=\\\"1|Yes,0|No\\\" \\r\\n\\tdefault=\\\"0\\\" \\r\\n\\trequired=\\\"true\\\" \\r\\n\\/>\"', 1, '2015-08-05 01:18:20', '2018-03-30 09:30:45', 4, '', 196),
 (1011, '', '', '', '', '', '', '', 'Other', '0000-00-00', '', '', 'DATE', '', '', '', 'Date of Birth', 'NOT NULL', '', 1, '\"<field \\r\\n\\ttype=\\\"calendar\\\" \\r\\n\\tname=\\\"dateofbirth\\\" \\r\\n\\tlabel=\\\"Date of Birth\\\" \\r\\n\\tdefault=\\\"1970-01-01\\\" \\r\\n\\tdescription=\\\"Your date of birth\\\" \\r\\n\\tclass=\\\"\\\" \\r\\n\\tformat=\\\"%Y-%m-%d\\\" \\r\\n\\tfilter=\\\"\\\" \\r\\n\\trequired=\\\"\\\" \\r\\n\\/>\"', 1, '2015-12-07 01:47:32', '2015-12-07 02:15:24', 3, '', 649);
 

admin/sql/updates/mysql/2.8.2.sql

@@ -0,0 +1 @@
+ALTER TABLE `#__componentbuilder_joomla_component` ADD `whmcs_buy_link` VARCHAR(255) NOT NULL DEFAULT '' AFTER `website`;

componentbuilder.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>7th July, 2018</creationDate>
+	<creationDate>8th July, 2018</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
 	<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>
 	<copyright>Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>2.8.2</version>
+	<version>2.8.3</version>
 	<description><![CDATA[
-		<h1>Component Builder (v.2.8.2)</h1>
+		<h1>Component Builder (v.2.8.3)</h1>
 		<div style="clear: both;"></div>
 		<p>The Component Builder for [Joomla](https://extensions.joomla.org/extension/component-builder/) is highly advanced tool that is truly able to build extremely complex components in a fraction of the time.
 

componentbuilder_update_server.xml

@@ -424,4 +424,21 @@
 		<maintainerurl>http://www.joomlacomponentbuilder.com</maintainerurl>
 		<targetplatform name="joomla" version="3.*"/>
 	</update>
+	<update>
+		<name>Component Builder</name>
+		<description>Builds Complex Joomla Components</description>
+		<element>com_componentbuilder</element>
+		<type>component</type>
+		<version>2.8.3</version>
+		<infourl title="Component Builder!">http://www.joomlacomponentbuilder.com</infourl>
+		<downloads>
+			<downloadurl type="full" format="zip">http://domain.com/demo.zip</downloadurl>
+		</downloads>
+		<tags>
+			<tag>stable</tag>
+		</tags>
+		<maintainer>Llewellyn van der Merwe</maintainer>
+		<maintainerurl>http://www.joomlacomponentbuilder.com</maintainerurl>
+		<targetplatform name="joomla" version="3.*"/>
+	</update>
 </updates>

script.php

@@ -3368,9 +3368,9 @@ class com_componentbuilderInstallerScript
 			$joomla_component->type_title = 'Componentbuilder Joomla_component';
 			$joomla_component->type_alias = 'com_componentbuilder.joomla_component';
 			$joomla_component->table = '{"special": {"dbtable": "#__componentbuilder_joomla_component","key": "id","type": "Joomla_component","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$joomla_component->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "system_name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "php_preflight_update","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "metadata","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "metakey","core_metadesc": "metadesc","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_code":"name_code","component_version":"component_version","short_description":"short_description","companyname":"companyname","author":"author","php_preflight_update":"php_preflight_update","css_site":"css_site","php_helper_site":"php_helper_site","javascript":"javascript","php_helper_admin":"php_helper_admin","readme":"readme","buildcomp":"buildcomp","copyright":"copyright","add_placeholders":"add_placeholders","description":"description","mvc_versiondate":"mvc_versiondate","php_postflight_update":"php_postflight_update","add_email_helper":"add_email_helper","sql":"sql","debug_linenr":"debug_linenr","email":"email","adduikit":"adduikit","website":"website","php_helper_both":"php_helper_both","add_license":"add_license","php_admin_event":"php_admin_event","license_type":"license_type","php_site_event":"php_site_event","css_admin":"css_admin","whmcs_key":"whmcs_key","whmcs_url":"whmcs_url","php_preflight_install":"php_preflight_install","license":"license","php_postflight_install":"php_postflight_install","bom":"bom","php_method_uninstall":"php_method_uninstall","image":"image","sql_uninstall":"sql_uninstall","update_server_target":"update_server_target","add_update_server":"add_update_server","update_server":"update_server","not_required":"not_required","sales_server":"sales_server","addfootable":"addfootable","add_php_helper_both":"add_php_helper_both","add_php_helper_admin":"add_php_helper_admin","add_admin_event":"add_admin_event","add_php_helper_site":"add_php_helper_site","add_site_event":"add_site_event","add_javascript":"add_javascript","add_css_admin":"add_css_admin","toignore":"toignore","add_css_site":"add_css_site","dashboard_type":"dashboard_type","dashboard":"dashboard","export_key":"export_key","add_php_preflight_install":"add_php_preflight_install","joomla_source_link":"joomla_source_link","add_php_preflight_update":"add_php_preflight_update","export_buy_link":"export_buy_link","add_php_postflight_install":"add_php_postflight_install","add_php_postflight_update":"add_php_postflight_update","add_php_method_uninstall":"add_php_method_uninstall","add_sql":"add_sql","emptycontributors":"emptycontributors","add_sql_uninstall":"add_sql_uninstall","number":"number","addreadme":"addreadme","update_server_url":"update_server_url","add_sales_server":"add_sales_server","creatuserhelper":"creatuserhelper","buildcompsql":"buildcompsql","name":"name"}}';
+			$joomla_component->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "system_name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "php_preflight_install","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "metadata","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "metakey","core_metadesc": "metadesc","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_code":"name_code","component_version":"component_version","short_description":"short_description","companyname":"companyname","author":"author","php_preflight_install":"php_preflight_install","php_postflight_install":"php_postflight_install","css_admin":"css_admin","sales_server":"sales_server","adduikit":"adduikit","add_update_server":"add_update_server","copyright":"copyright","add_placeholders":"add_placeholders","description":"description","mvc_versiondate":"mvc_versiondate","php_method_uninstall":"php_method_uninstall","debug_linenr":"debug_linenr","sql_uninstall":"sql_uninstall","php_admin_event":"php_admin_event","php_site_event":"php_site_event","php_helper_both":"php_helper_both","add_email_helper":"add_email_helper","email":"email","php_helper_admin":"php_helper_admin","website":"website","php_helper_site":"php_helper_site","add_license":"add_license","javascript":"javascript","license_type":"license_type","css_site":"css_site","whmcs_key":"whmcs_key","php_preflight_update":"php_preflight_update","whmcs_url":"whmcs_url","php_postflight_update":"php_postflight_update","whmcs_buy_link":"whmcs_buy_link","sql":"sql","license":"license","readme":"readme","bom":"bom","update_server_target":"update_server_target","image":"image","update_server":"update_server","not_required":"not_required","buildcomp":"buildcomp","creatuserhelper":"creatuserhelper","addfootable":"addfootable","add_php_helper_both":"add_php_helper_both","add_php_helper_admin":"add_php_helper_admin","add_admin_event":"add_admin_event","add_php_helper_site":"add_php_helper_site","add_site_event":"add_site_event","add_javascript":"add_javascript","add_css_admin":"add_css_admin","add_css_site":"add_css_site","toignore":"toignore","dashboard_type":"dashboard_type","dashboard":"dashboard","add_php_preflight_install":"add_php_preflight_install","export_key":"export_key","add_php_preflight_update":"add_php_preflight_update","joomla_source_link":"joomla_source_link","add_php_postflight_install":"add_php_postflight_install","export_buy_link":"export_buy_link","add_php_postflight_update":"add_php_postflight_update","add_php_method_uninstall":"add_php_method_uninstall","add_sql":"add_sql","add_sql_uninstall":"add_sql_uninstall","emptycontributors":"emptycontributors","addreadme":"addreadme","number":"number","update_server_url":"update_server_url","add_sales_server":"add_sales_server","buildcompsql":"buildcompsql","name":"name"}}';
 			$joomla_component->router = 'ComponentbuilderHelperRoute::getJoomla_componentRoute';
-			$joomla_component->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/joomla_component.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","buildcomp","add_placeholders","mvc_versiondate","add_email_helper","debug_linenr","adduikit","add_license","license_type","update_server_target","add_update_server","update_server","not_required","sales_server","addfootable","add_php_helper_both","add_php_helper_admin","add_admin_event","add_php_helper_site","add_site_event","add_javascript","add_css_admin","add_css_site","dashboard_type","add_php_preflight_install","add_php_preflight_update","add_php_postflight_install","add_php_postflight_update","add_php_method_uninstall","add_sql","emptycontributors","add_sql_uninstall","number","addreadme","add_sales_server","creatuserhelper"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "update_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "sales_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dashboard","targetTable": "#__componentbuilder_custom_admin_view","targetColumn": "","displayColumn": "system_name"}]}';
+			$joomla_component->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/joomla_component.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","sales_server","adduikit","add_update_server","add_placeholders","mvc_versiondate","debug_linenr","add_email_helper","add_license","license_type","update_server_target","update_server","not_required","buildcomp","creatuserhelper","addfootable","add_php_helper_both","add_php_helper_admin","add_admin_event","add_php_helper_site","add_site_event","add_javascript","add_css_admin","add_css_site","dashboard_type","add_php_preflight_install","add_php_preflight_update","add_php_postflight_install","add_php_postflight_update","add_php_method_uninstall","add_sql","add_sql_uninstall","emptycontributors","addreadme","number","add_sales_server"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "sales_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "update_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dashboard","targetTable": "#__componentbuilder_custom_admin_view","targetColumn": "","displayColumn": "system_name"}]}';
 
 			// Set the object into the content types table.
 			$joomla_component_Inserted = $db->insertObject('#__content_types', $joomla_component);
@@ -3802,9 +3802,9 @@ class com_componentbuilderInstallerScript
 			$joomla_component->type_title = 'Componentbuilder Joomla_component';
 			$joomla_component->type_alias = 'com_componentbuilder.joomla_component';
 			$joomla_component->table = '{"special": {"dbtable": "#__componentbuilder_joomla_component","key": "id","type": "Joomla_component","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$joomla_component->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "system_name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "php_preflight_update","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "metadata","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "metakey","core_metadesc": "metadesc","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_code":"name_code","component_version":"component_version","short_description":"short_description","companyname":"companyname","author":"author","php_preflight_update":"php_preflight_update","css_site":"css_site","php_helper_site":"php_helper_site","javascript":"javascript","php_helper_admin":"php_helper_admin","readme":"readme","buildcomp":"buildcomp","copyright":"copyright","add_placeholders":"add_placeholders","description":"description","mvc_versiondate":"mvc_versiondate","php_postflight_update":"php_postflight_update","add_email_helper":"add_email_helper","sql":"sql","debug_linenr":"debug_linenr","email":"email","adduikit":"adduikit","website":"website","php_helper_both":"php_helper_both","add_license":"add_license","php_admin_event":"php_admin_event","license_type":"license_type","php_site_event":"php_site_event","css_admin":"css_admin","whmcs_key":"whmcs_key","whmcs_url":"whmcs_url","php_preflight_install":"php_preflight_install","license":"license","php_postflight_install":"php_postflight_install","bom":"bom","php_method_uninstall":"php_method_uninstall","image":"image","sql_uninstall":"sql_uninstall","update_server_target":"update_server_target","add_update_server":"add_update_server","update_server":"update_server","not_required":"not_required","sales_server":"sales_server","addfootable":"addfootable","add_php_helper_both":"add_php_helper_both","add_php_helper_admin":"add_php_helper_admin","add_admin_event":"add_admin_event","add_php_helper_site":"add_php_helper_site","add_site_event":"add_site_event","add_javascript":"add_javascript","add_css_admin":"add_css_admin","toignore":"toignore","add_css_site":"add_css_site","dashboard_type":"dashboard_type","dashboard":"dashboard","export_key":"export_key","add_php_preflight_install":"add_php_preflight_install","joomla_source_link":"joomla_source_link","add_php_preflight_update":"add_php_preflight_update","export_buy_link":"export_buy_link","add_php_postflight_install":"add_php_postflight_install","add_php_postflight_update":"add_php_postflight_update","add_php_method_uninstall":"add_php_method_uninstall","add_sql":"add_sql","emptycontributors":"emptycontributors","add_sql_uninstall":"add_sql_uninstall","number":"number","addreadme":"addreadme","update_server_url":"update_server_url","add_sales_server":"add_sales_server","creatuserhelper":"creatuserhelper","buildcompsql":"buildcompsql","name":"name"}}';
+			$joomla_component->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "system_name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "php_preflight_install","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "metadata","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "metakey","core_metadesc": "metadesc","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_code":"name_code","component_version":"component_version","short_description":"short_description","companyname":"companyname","author":"author","php_preflight_install":"php_preflight_install","php_postflight_install":"php_postflight_install","css_admin":"css_admin","sales_server":"sales_server","adduikit":"adduikit","add_update_server":"add_update_server","copyright":"copyright","add_placeholders":"add_placeholders","description":"description","mvc_versiondate":"mvc_versiondate","php_method_uninstall":"php_method_uninstall","debug_linenr":"debug_linenr","sql_uninstall":"sql_uninstall","php_admin_event":"php_admin_event","php_site_event":"php_site_event","php_helper_both":"php_helper_both","add_email_helper":"add_email_helper","email":"email","php_helper_admin":"php_helper_admin","website":"website","php_helper_site":"php_helper_site","add_license":"add_license","javascript":"javascript","license_type":"license_type","css_site":"css_site","whmcs_key":"whmcs_key","php_preflight_update":"php_preflight_update","whmcs_url":"whmcs_url","php_postflight_update":"php_postflight_update","whmcs_buy_link":"whmcs_buy_link","sql":"sql","license":"license","readme":"readme","bom":"bom","update_server_target":"update_server_target","image":"image","update_server":"update_server","not_required":"not_required","buildcomp":"buildcomp","creatuserhelper":"creatuserhelper","addfootable":"addfootable","add_php_helper_both":"add_php_helper_both","add_php_helper_admin":"add_php_helper_admin","add_admin_event":"add_admin_event","add_php_helper_site":"add_php_helper_site","add_site_event":"add_site_event","add_javascript":"add_javascript","add_css_admin":"add_css_admin","add_css_site":"add_css_site","toignore":"toignore","dashboard_type":"dashboard_type","dashboard":"dashboard","add_php_preflight_install":"add_php_preflight_install","export_key":"export_key","add_php_preflight_update":"add_php_preflight_update","joomla_source_link":"joomla_source_link","add_php_postflight_install":"add_php_postflight_install","export_buy_link":"export_buy_link","add_php_postflight_update":"add_php_postflight_update","add_php_method_uninstall":"add_php_method_uninstall","add_sql":"add_sql","add_sql_uninstall":"add_sql_uninstall","emptycontributors":"emptycontributors","addreadme":"addreadme","number":"number","update_server_url":"update_server_url","add_sales_server":"add_sales_server","buildcompsql":"buildcompsql","name":"name"}}';
 			$joomla_component->router = 'ComponentbuilderHelperRoute::getJoomla_componentRoute';
-			$joomla_component->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/joomla_component.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","buildcomp","add_placeholders","mvc_versiondate","add_email_helper","debug_linenr","adduikit","add_license","license_type","update_server_target","add_update_server","update_server","not_required","sales_server","addfootable","add_php_helper_both","add_php_helper_admin","add_admin_event","add_php_helper_site","add_site_event","add_javascript","add_css_admin","add_css_site","dashboard_type","add_php_preflight_install","add_php_preflight_update","add_php_postflight_install","add_php_postflight_update","add_php_method_uninstall","add_sql","emptycontributors","add_sql_uninstall","number","addreadme","add_sales_server","creatuserhelper"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "update_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "sales_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dashboard","targetTable": "#__componentbuilder_custom_admin_view","targetColumn": "","displayColumn": "system_name"}]}';
+			$joomla_component->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/joomla_component.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","sales_server","adduikit","add_update_server","add_placeholders","mvc_versiondate","debug_linenr","add_email_helper","add_license","license_type","update_server_target","update_server","not_required","buildcomp","creatuserhelper","addfootable","add_php_helper_both","add_php_helper_admin","add_admin_event","add_php_helper_site","add_site_event","add_javascript","add_css_admin","add_css_site","dashboard_type","add_php_preflight_install","add_php_preflight_update","add_php_postflight_install","add_php_postflight_update","add_php_method_uninstall","add_sql","add_sql_uninstall","emptycontributors","addreadme","number","add_sales_server"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "sales_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "update_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dashboard","targetTable": "#__componentbuilder_custom_admin_view","targetColumn": "","displayColumn": "system_name"}]}';
 
 			// Check if joomla_component type is already in content_type DB.
 			$joomla_component_id = null;
@@ -4991,7 +4991,7 @@ class com_componentbuilderInstallerScript
 			echo '<a target="_blank" href="http://www.joomlacomponentbuilder.com" title="Component Builder">
 				<img src="components/com_componentbuilder/assets/images/vdm-component.jpg"/>
 				</a>
-				<h3>Upgrade to Version 2.8.2 Was Successful! Let us know if anything is not working as expected.</h3>';
+				<h3>Upgrade to Version 2.8.3 Was Successful! Let us know if anything is not working as expected.</h3>';
 		}
 	}