Stable Release of version 2.8.5

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.5) with **ALL** its features and **ALL** concepts totally open-source and free! 
 
 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
 
@@ -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*: 30th July, 2018
-+ *Version*: 2.8.2
++ *Version*: 2.8.5
 + *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*: **186360**
-+ *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.5) with **ALL** its features and **ALL** concepts totally open-source and free! 
 
 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
 
@@ -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*: 30th July, 2018
-+ *Version*: 2.8.2
++ *Version*: 2.8.5
 + *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*: **186360**
-+ *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/access.xml

@@ -209,16 +209,16 @@
 		<action name="fieldtype.dashboard_add" title="COM_COMPONENTBUILDER_FIELDTYPES_DASHBOARD_ADD" description="COM_COMPONENTBUILDER_FIELDTYPES_DASHBOARD_ADD_DESC" />
 		<action name="fieldtype.dashboard_list" title="COM_COMPONENTBUILDER_FIELDTYPES_DASHBOARD_LIST" description="COM_COMPONENTBUILDER_FIELDTYPES_DASHBOARD_LIST_DESC" />
 		<action name="fieldtype.delete" title="COM_COMPONENTBUILDER_FIELDTYPES_DELETE" description="COM_COMPONENTBUILDER_FIELDTYPES_DELETE_DESC" />
+		<action name="fieldtype..description" title="COM_COMPONENTBUILDER_FIELDTYPES_DESCRIPTION" description="COM_COMPONENTBUILDER_FIELDTYPES_DESCRIPTION_DESC" />
 		<action name="fieldtype.edit" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_DESC" />
-		<action name="fieldtype.edit.description" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_DESCRIPTION" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_DESCRIPTION_DESC" />
-		<action name="fieldtype.edit.name" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_NAME" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_NAME_DESC" />
 		<action name="fieldtype.edit.own" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_OWN" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_OWN_DESC" />
-		<action name="fieldtype.edit.properties" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_PROPERTIES" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_PROPERTIES_DESC" />
-		<action name="fieldtype.edit.short_description" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_SHORT_DESCRIPTION" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_SHORT_DESCRIPTION_DESC" />
 		<action name="fieldtype.edit.state" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_STATE" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_STATE_DESC" />
 		<action name="fieldtype.version" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_VERSION" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_VERSION_DESC" />
 		<action name="fieldtype.export" title="COM_COMPONENTBUILDER_FIELDTYPES_EXPORT" description="COM_COMPONENTBUILDER_FIELDTYPES_EXPORT_DESC" />
 		<action name="fieldtype.import" title="COM_COMPONENTBUILDER_FIELDTYPES_IMPORT" description="COM_COMPONENTBUILDER_FIELDTYPES_IMPORT_DESC" />
+		<action name="fieldtype..name" title="COM_COMPONENTBUILDER_FIELDTYPES_NAME" description="COM_COMPONENTBUILDER_FIELDTYPES_NAME_DESC" />
+		<action name="fieldtype..properties" title="COM_COMPONENTBUILDER_FIELDTYPES_PROPERTIES" description="COM_COMPONENTBUILDER_FIELDTYPES_PROPERTIES_DESC" />
+		<action name="fieldtype..short_description" title="COM_COMPONENTBUILDER_FIELDTYPES_SHORT_DESCRIPTION" description="COM_COMPONENTBUILDER_FIELDTYPES_SHORT_DESCRIPTION_DESC" />
 		<action name="fieldtype.submenu" title="COM_COMPONENTBUILDER_FIELDTYPES_SUBMENU" description="COM_COMPONENTBUILDER_FIELDTYPES_SUBMENU_DESC" />
 		<action name="get_snippets.access" title="COM_COMPONENTBUILDER_GET_SNIPPETS_ACCESS" description="COM_COMPONENTBUILDER_GET_SNIPPETS_ACCESS_DESC" />
 		<action name="get_snippets.custom_admin_views" title="COM_COMPONENTBUILDER_GET_SNIPPETS_CUSTOM_ADMIN_VIEWS_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_GET_SNIPPETS_CUSTOM_ADMIN_VIEWS_BUTTON_ACCESS_DESC" />
@@ -505,10 +505,10 @@
 		<action name="fieldtype.create" title="COM_COMPONENTBUILDER_FIELDTYPES_CREATE" description="COM_COMPONENTBUILDER_FIELDTYPES_CREATE_DESC" />
 		<action name="fieldtype.delete" title="COM_COMPONENTBUILDER_FIELDTYPES_DELETE" description="COM_COMPONENTBUILDER_FIELDTYPES_DELETE_DESC" />
 		<action name="fieldtype.access" title="COM_COMPONENTBUILDER_FIELDTYPES_ACCESS" description="COM_COMPONENTBUILDER_FIELDTYPES_ACCESS_DESC" />
-		<action name="fieldtype.edit.name" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_NAME" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_NAME_DESC" />
+		<action name="fieldtype..name" title="COM_COMPONENTBUILDER_FIELDTYPES_NAME" description="COM_COMPONENTBUILDER_FIELDTYPES_NAME_DESC" />
-		<action name="fieldtype.edit.properties" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_PROPERTIES" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_PROPERTIES_DESC" />
+		<action name="fieldtype..properties" title="COM_COMPONENTBUILDER_FIELDTYPES_PROPERTIES" description="COM_COMPONENTBUILDER_FIELDTYPES_PROPERTIES_DESC" />
-		<action name="fieldtype.edit.description" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_DESCRIPTION" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_DESCRIPTION_DESC" />
+		<action name="fieldtype..description" title="COM_COMPONENTBUILDER_FIELDTYPES_DESCRIPTION" description="COM_COMPONENTBUILDER_FIELDTYPES_DESCRIPTION_DESC" />
-		<action name="fieldtype.edit.short_description" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_SHORT_DESCRIPTION" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_SHORT_DESCRIPTION_DESC" />
+		<action name="fieldtype..short_description" title="COM_COMPONENTBUILDER_FIELDTYPES_SHORT_DESCRIPTION" description="COM_COMPONENTBUILDER_FIELDTYPES_SHORT_DESCRIPTION_DESC" />
 		<action name="fieldtype.version" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_VERSION" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_VERSION_DESC" />
 	</section>
 	<section name="language_translation">

admin/compiler/joomla_3/Helper.php

@@ -248,16 +248,16 @@ abstract class ###Component###Helper
 					{
 						if ($external)
 						{
-							if ($name = self::getVar(null, $val, $id, $name, '=', $table))
+							if ($_name = self::getVar(null, $val, $id, $name, '=', $table))
 							{
-								$names[] = $name;
+								$names[] = $_name;
 							}
 						}
 						else
 						{
-							if ($name = self::getVar($table, $val, $id, $name))
+							if ($_name = self::getVar($table, $val, $id, $name))
 							{
-								$names[] = $name;
+								$names[] = $_name;
 							}
 						}
 					}
@@ -979,7 +979,7 @@ abstract class ###Component###Helper
 	*
 	*	@returns string on success
 	**/
-	public static function safeString($string, $type = 'L', $spacer = '_', $replaceNumbers = true)
+	public static function safeString($string, $type = 'L', $spacer = '_', $replaceNumbers = true, $keepOnlyCharacters = true)
 	{
 		if ($replaceNumbers === true)
 		{
@@ -1008,7 +1008,16 @@ abstract class ###Component###Helper
 			$string = trim($string);
 			$string = preg_replace('/'.$spacer.'+/', ' ', $string);
 			$string = preg_replace('/\s+/', ' ', $string);
-			$string = preg_replace("/[^A-Za-z ]/", '', $string);
+			// remove all and keep only characters
+			if ($keepOnlyCharacters)
+			{
+				$string = preg_replace("/[^A-Za-z ]/", '', $string);
+			}
+			// keep both numbers and characters
+			else
+			{
+				$string = preg_replace("/[^A-Za-z0-9 ]/", '', $string);
+			}
 			// select final adaptations
 			if ($type === 'L' || $type === 'strtolower')
 			{

admin/compiler/joomla_3/Helper_email.php

@@ -138,17 +138,17 @@ abstract class ###Component###Email
 			$replyto	= $conf->get('replyto');
 			$replytoname	= $conf->get('replytoname');
 		}
+
+		// Set global sender
+		$mail->setSender(array($mailfrom, $fromname));
 			
 		// set the global reply-to if found
 		if ($replyto && $replytoname)
 		{
 			$mail->ClearReplyTos();
-			$mail->addReplyTo( array( $replyto, $replytoname ) );
+			$mail->addReplyTo($replyto, $replytoname);
 		}
 
-		// Set global sender
-		$mail->setSender(array($mailfrom, $fromname));
-
 		// Default mailer is to use PHP's mail function
 		switch ($mailer)
 		{
@@ -196,9 +196,6 @@ abstract class ###Component###Email
 		// set component params
 		$conf = self::getConfig();
 		
-		// do some house cleaning
-		$mail->ClearReplyTos();
-		
 		// set if we have override
 		if ($mailfrom && $fromname)
 		{

admin/compiler/joomla_3/Helper_site.php

@@ -58,16 +58,16 @@ abstract class ###Component###Helper
 					{
 						if ($external)
 						{
-							if ($name = self::getVar(null, $val, $id, $name, '=', $table))
+							if ($_name = self::getVar(null, $val, $id, $name, '=', $table))
 							{
-								$names[] = $name;
+								$names[] = $_name;
 							}
 						}
 						else
 						{
-							if ($name = self::getVar($table, $val, $id, $name))
+							if ($_name = self::getVar($table, $val, $id, $name))
 							{
-								$names[] = $name;
+								$names[] = $_name;
 							}
 						}
 					}
@@ -971,7 +971,7 @@ abstract class ###Component###Helper
 	*
 	*	@returns string on success
 	**/
-	public static function safeString($string, $type = 'L', $spacer = '_', $replaceNumbers = true)
+	public static function safeString($string, $type = 'L', $spacer = '_', $replaceNumbers = true, $keepOnlyCharacters = true)
 	{
 		if ($replaceNumbers === true)
 		{
@@ -1000,7 +1000,16 @@ abstract class ###Component###Helper
 			$string = trim($string);
 			$string = preg_replace('/'.$spacer.'+/', ' ', $string);
 			$string = preg_replace('/\s+/', ' ', $string);
-			$string = preg_replace("/[^A-Za-z ]/", '', $string);
+			// remove all and keep only characters
+			if ($keepOnlyCharacters)
+			{
+				$string = preg_replace("/[^A-Za-z ]/", '', $string);
+			}
+			// keep both numbers and characters
+			else
+			{
+				$string = preg_replace("/[^A-Za-z0-9 ]/", '', $string);
+			}
 			// select final adaptations
 			if ($type === 'L' || $type === 'strtolower')
 			{

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/controllers/joomla_component.php

@@ -33,6 +33,31 @@ class ComponentbuilderControllerJoomla_component extends JControllerForm
 	{
 		$this->view_list = 'Joomla_components'; // safeguard for setting the return view listing to the main view.
 		parent::__construct($config);
+	}
+
+	public function refresh()
+	{
+		// Check for request forgeries
+		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
+		// check if import is allowed for this user.
+		$user = JFactory::getUser();
+		if ($user->authorise('joomla_component.import', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder'))
+		{
+			$session = JFactory::getSession();
+			$session->set('backto_VDM_IMPORT', 'joomla_components');
+			$session->set('dataType_VDM_IMPORTINTO', 'smart_package');
+			// clear the session
+			ComponentbuilderHelper::set('vdmGithubPackages', null);
+			ComponentbuilderHelper::set('communityGithubPackages', null);
+			// Redirect to import view.
+			$message = JText::_('COM_COMPONENTBUILDER_YOU_CAN_NOW_SELECT_THE_COMPONENT_BZIPB_PACKAGE_YOU_WOULD_LIKE_TO_IMPORTBR_SMALLPLEASE_NOTE_THAT_SMART_COMPONENT_IMPORT_ONLY_WORKS_WITH_THE_FOLLOWING_FORMAT_BZIPBSMALL');
+			$this->setRedirect(JRoute::_('index.php?option=com_componentbuilder&view=import_joomla_components&target=smartPackage', false), $message);
+			return;
+		}
+		// Redirect to the list screen with error.
+		$message = JText::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_IMPORT_A_COMPONENT_PLEASE_CONTACT_YOUR_SYSTEM_ADMINISTRATOR_FOR_MORE_HELP');
+		$this->setRedirect(JRoute::_('index.php?option=com_componentbuilder&view=joomla_components', false), $message, 'error');
+		return;
 	}
 
         /**

admin/controllers/joomla_components.php

@@ -355,6 +355,8 @@ class ComponentbuilderControllerJoomla_components extends JControllerAdmin
 
 	public function cloner()
 	{
+		// Check for request forgeries
+		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
 		// Get the model
 		$model = $this->getModel('Joomla_components');
 		// check if export is allowed for this user.

admin/helpers/compiler/a_Get.php

@@ -494,6 +494,13 @@ class Get
 	 */
 	public $fieldRelations = array();
 
+	/**
+	 * Default Fields
+	 * 
+	 * @var    array
+	 */
+	public $defaultFields = array('created', 'created_by', 'modified', 'modified_by', 'published', 'ordering', 'access', 'version', 'hits', 'id');
+
 	/**
 	 * The list join fields
 	 * 
@@ -949,6 +956,35 @@ 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 = '#';
+			}
+		}
+		// since the license details are not set clear
+		elseif (0 == $component->add_license)
+		{
+			$component->whmcs_key = '';
+			$component->whmcs_buy_link = '';
+			$component->whmcs_url = '';
+		}
+
 		// set the footable switch
 		if ($component->addfootable)
 		{
@@ -1511,112 +1547,123 @@ class Get
 			$view->addfields = (isset($view->addfields) && ComponentbuilderHelper::checkJson($view->addfields)) ? json_decode($view->addfields, true) : null;
 			if (ComponentbuilderHelper::checkArray($view->addfields))
 			{
+				$ignoreFields = array();
+				// load the field data
+				$view->fields = array_map(function($field) use($name_single, $name_list, &$ignoreFields)
+				{
+					// set hash 
+					static $hash = 123467890; // (TODO) I found this making duplicates
+					// load hash
+					$field['hash'] = md5($field['field'] . $hash);
+					// increment hash
+					$hash++;
+					// set the settings
+					$field['settings'] = $this->getFieldData($field['field'], $name_single, $name_list);
+					// set real field name
+					$field['base_name'] = $this->getFieldName($field);
+					// set code name for field type
+					$field['type_name'] = $this->getFieldType($field);
+					// check if value is array
+					if (isset($field['permission']) && !ComponentbuilderHelper::checkArray($field['permission']) && is_numeric($field['permission']) && $field['permission'] > 0)
+					{
+						$field['permission'] = array($field['permission']);
+					}
+					// check if this field is a default field OR
+					// check if this is none database related field
+					if (in_array($field['base_name'], $this->defaultFields) ||
+						ComponentbuilderHelper::fieldCheck($field['type_name'], 'spacer') ||
+						(isset($field['list']) && $field['list'] == 2)) // 2 = none database
+					{
+						$ignoreFields[$field['field']] = $field['field'];
+					}
+					// set unigue name keeper
+					$this->setUniqueNameCounter($field['base_name'], $name_list);
+					// return field
+					return $field;
+				}, array_values($view->addfields));
 				// build update SQL
 				if ($old_view = $this->getHistoryWatch('admin_fields', $view->addfields_id))
 				{
 					// add new fields were added
 					if (isset($old_view->addfields) && ComponentbuilderHelper::checkJson($old_view->addfields))
 					{
-						$this->setUpdateSQL(json_decode($old_view->addfields, true), $view->addfields, 'field', $name_single);
+						$this->setUpdateSQL(json_decode($old_view->addfields, true), $view->addfields, 'field', $name_single, $ignoreFields);
 					}
 					// clear this data
 					unset($old_view);
 				}
-				if (ComponentbuilderHelper::checkArray($view->addfields))
+				// sort the fields acording to order
+				usort($view->fields, function($a, $b)
 				{
-					// load the field data
+					if (isset($a['order_list']) && isset($b['order_list']))
-					$view->fields = array_map(function($field) use($name_single, $name_list)
 					{
-						// set hash 
+						if ($a['order_list'] != 0 && $b['order_list'] != 0)
-						static $hash = 123467890; // (TODO) I found this making duplicates
+						{
-						// load hash
+							return $a['order_list'] - $b['order_list'];
-						$field['hash'] = md5($field['field'] . $hash);
+						}
-						// increment hash
+						elseif ($b['order_list'] != 0 && $a['order_list'] == 0)
-						$hash++;
-						// set the settings
-						$field['settings'] = $this->getFieldData($field['field'], $name_single, $name_list);
-						// set real field name
-						$field['base_name'] = $this->getFieldName($field);
-						// set unigue name keeper
-						$this->setUniqueNameCounter($field['base_name'], $name_list);
-						// return field
-						return $field;
-					}, array_values($view->addfields));
-
-					// sort the fields acording to order
-					usort($view->fields, function($a, $b)
-					{
-						if (isset($a['order_list']) && isset($b['order_list']))
 						{
-							if ($a['order_list'] != 0 && $b['order_list'] != 0)
-							{
-								return $a['order_list'] - $b['order_list'];
-							}
-							elseif ($b['order_list'] != 0 && $a['order_list'] == 0)
-							{
-								return 1;
-							}
-							elseif ($a['order_list'] != 0 && $b['order_list'] == 0)
-							{
-								return 0;
-							}
 							return 1;
 						}
-						return 0;
+						elseif ($a['order_list'] != 0 && $b['order_list'] == 0)
-					});
-
-					// do some house cleaning (for fields)
-					foreach ($view->fields as $field)
-					{
-						// so first we lock the field name in
-						$field_name = $this->getFieldName($field, $name_list);
-						// check if the field changed since the last compilation
-						if (ComponentbuilderHelper::checkObject($field['settings']->history))
 						{
-							// check if the datatype changed
+							return 0;
-							if (isset($field['settings']->history->datatype))
+						}
+						return 1;
+					}
+					return 0;
+				});
+				// do some house cleaning (for fields)
+				foreach ($view->fields as $field)
+				{
+					// so first we lock the field name in
+					$field_name = $this->getFieldName($field, $name_list);
+					// check if the field changed since the last compilation (default fields never change and are always added)
+					if (!isset($ignoreFields[$field['field']]) && ComponentbuilderHelper::checkObject($field['settings']->history))
+					{
+						// check if the datatype changed
+						if (isset($field['settings']->history->datatype))
+						{
+							$this->setUpdateSQL($field['settings']->history->datatype, $field['settings']->datatype, 'field.datatype', $name_single . '.' . $field_name);
+						}
+						// check if the datatype lenght changed
+						if (isset($field['settings']->history->datalenght) && isset($field['settings']->history->datalenght_other))
+						{
+							$this->setUpdateSQL($field['settings']->history->datalenght . $field['settings']->history->datalenght_other, $field['settings']->datalenght . $field['settings']->datalenght_other, 'field.lenght', $name_single . '.' . $field_name);
+						}
+						// check if the name changed
+						if (isset($field['settings']->history->xml) && ComponentbuilderHelper::checkJson($field['settings']->history->xml))
+						{
+							// only run if this is not an alias or a tag
+							if ((!isset($field['alias']) || !$field['alias']) && 'tag' !== $field['settings']->type_name)
 							{
-								$this->setUpdateSQL($field['settings']->history->datatype, $field['settings']->datatype, 'field.datatype', $name_single . '.' . $field_name);
+								// build temp field bucket
-							}
+								$tmpfield = array();
-							// check if the datatype lenght changed
+								$tmpfield['settings'] = new stdClass();
-							if (isset($field['settings']->history->datalenght) && isset($field['settings']->history->datalenght_other))
+								// convert the xml json string to normal string
-							{
+								$tmpfield['settings']->xml = $this->setDynamicValues(json_decode($field['settings']->history->xml));
-								$this->setUpdateSQL($field['settings']->history->datalenght . $field['settings']->history->datalenght_other, $field['settings']->datalenght . $field['settings']->datalenght_other, 'field.lenght', $name_single . '.' . $field_name);
+								// add properties from current field as it is generic
-							}
+								$tmpfield['settings']->properties = $field['settings']->properties;
-							// check if the name changed
+								// add the old name
-							if (isset($field['settings']->history->xml) && ComponentbuilderHelper::checkJson($field['settings']->history->xml))
+								$tmpfield['settings']->name = $field['settings']->history->name;
-							{
+								// add the field type from current field since it is generic
-								// only run if this is not an alias or a tag
+								$tmpfield['settings']->type_name = $field['settings']->type_name;
-								if ((!isset($field['alias']) || !$field['alias']) && 'tag' !== $field['settings']->type_name)
+								// get the old name
-								{
+								$old_field_name = $this->getFieldName($tmpfield);
-									// build temp field bucket
-									$tmpfield = array();
-									$tmpfield['settings'] = new stdClass();
-									// convert the xml json string to normal string
-									$tmpfield['settings']->xml = $this->setDynamicValues(json_decode($field['settings']->history->xml));
-									// add properties from current field as it is generic
-									$tmpfield['settings']->properties = $field['settings']->properties;
-									// add the old name
-									$tmpfield['settings']->name = $field['settings']->history->name;
-									// add the field type from current field since it is generic
-									$tmpfield['settings']->type_name = $field['settings']->type_name;
-									// get the old name
-									$old_field_name = $this->getFieldName($tmpfield);
 
-									// only run this if not a multi field
+								// only run this if not a multi field
-									if (!isset($this->uniqueNames[$name_list]['names'][$field_name]))
+								if (!isset($this->uniqueNames[$name_list]['names'][$field_name]))
-									{
+								{
-										// this only works when the field is not multiple of the same field
+									// this only works when the field is not multiple of the same field
-										$this->setUpdateSQL($old_field_name, $field_name, 'field.name', $name_single . '.' . $field_name);
+									$this->setUpdateSQL($old_field_name, $field_name, 'field.name', $name_single . '.' . $field_name);
-									}
-									elseif ($old_field_name !== $field_name)
-									{
-										// give a notice atleast that the multi fields could have changed and no DB update was done
-										$this->app->enqueueMessage(JText::sprintf('You have a field called <b>%s</b> that has been added multiple times to the <b>%s</b> view, the name of that field has changed to <b>%s</b>. Normaly we would automaticly add the update SQL to your component, but with multiple fields this does not work automaticly since it could be that noting changed and it just seems like it did. Therefore you will have to do this manualy if it actualy did change!', $field_name, $name_single, $old_field_name), 'Notice');
-									}
-									// remove tmp
-									unset($tmpfield);
 								}
+								elseif ($old_field_name !== $field_name)
+								{
+									// give a notice atleast that the multi fields could have changed and no DB update was done
+									$this->app->enqueueMessage(JText::sprintf('You have a field called <b>%s</b> that has been added multiple times to the <b>%s</b> view, the name of that field has changed to <b>%s</b>. Normaly we would automaticly add the update SQL to your component, but with multiple fields this does not work automaticly since it could be that noting changed and it just seems like it did. Therefore you will have to do this manualy if it actualy did change!', $field_name, $name_single, $old_field_name), 'Notice');
+								}
+								// remove tmp
+								unset($tmpfield);
 							}
 						}
 					}
@@ -1712,23 +1759,28 @@ class Get
 				foreach ($view->addrelations as $nr => $relationsValue)
 				{
 					// only add if list view field is selected and joind fields are set
-					if (isset($relationsValue['listfield']) &&
+					if (isset($relationsValue['listfield']) && is_numeric($relationsValue['listfield']) && $relationsValue['listfield'] > 0 &&
-						is_numeric($relationsValue['listfield']) &&
+						isset($relationsValue['area']) && is_numeric($relationsValue['area']) && $relationsValue['area'] > 0)
-						$relationsValue['listfield'] > 0 &&
-						isset($relationsValue['joinfields']) &&
-						ComponentbuilderHelper::checkArray($relationsValue['joinfields']))
 					{
 						// do a dynamic update on the set values
 						if (isset($relationsValue['set']) && ComponentbuilderHelper::checkString($relationsValue['set']))
 						{
 							$relationsValue['set'] = $this->setDynamicValues($relationsValue['set']);
 						}
-						// load the field relations
+						// check that the arrays are set
-						$this->fieldRelations[$name_list][(int) $relationsValue['listfield']] = $relationsValue;
+						if (!isset($this->fieldRelations[$name_list][(int) $relationsValue['listfield']]) || !ComponentbuilderHelper::checkArray($this->fieldRelations[$name_list][(int) $relationsValue['listfield']]))
-						// load the list joints
-						foreach ($relationsValue['joinfields'] as $join)
 						{
-							$this->listJoinBuilder[$name_list][(int) $join] = (int) $join;
+							$this->fieldRelations[$name_list][(int) $relationsValue['listfield']] = array();
+						}
+						// load the field relations
+						$this->fieldRelations[$name_list][ (int) $relationsValue['listfield']][ (int) $relationsValue['area']] = $relationsValue;
+						// load the list joints
+						if (isset($relationsValue['joinfields']) && ComponentbuilderHelper::checkArray($relationsValue['joinfields']))
+						{
+							foreach ($relationsValue['joinfields'] as $join)
+							{
+								$this->listJoinBuilder[$name_list][(int) $join] = (int) $join;
+							}
 						}
 						// set header over-ride
 						if (isset($relationsValue['column_name']) && ComponentbuilderHelper::checkString($relationsValue['column_name']))
@@ -2289,7 +2341,7 @@ class Get
 								if ($this->validationRules[$validationRule] = ComponentbuilderHelper::getVar('validation_rule', $validationRule, 'name', 'php'))
 								{
 									// open and set the validation rule
-									$this->validationRules[$validationRule] = $this->setDynamicValues(base64_decode($this->validationRules[$validationRule]));
+									$this->validationRules[$validationRule] = $this->setPlaceholders($this->setDynamicValues(base64_decode($this->validationRules[$validationRule])), $this->placeholders);
 								}
 								else
 								{
@@ -2469,6 +2521,11 @@ class Get
 	 */
 	public function getFieldType(&$field)
 	{
+		// check if we have done this already
+		if (isset($field['type_name']))
+		{
+			return $field['type_name'];
+		}
 		// set the type name
 		$type_name = ComponentbuilderHelper::safeString($field['settings']->type_name);
 		// check that we have the poperties
@@ -2478,16 +2535,17 @@ class Get
 			{
 				if ($property['name'] === 'type')
 				{
+					// if custom (we must use the xml value)
 					if ($type_name === 'custom' || $type_name === 'customuser')
 					{
 						$type = ComponentbuilderHelper::safeString(ComponentbuilderHelper::getBetween($field['settings']->xml, 'type="', '"'));
 					}
-					// use field core type
+					// use field core type (name)
-					elseif (ComponentbuilderHelper::checkString($type_name))
+					elseif (ComponentbuilderHelper::checkString($type_name) || (isset($property['example']) && ComponentbuilderHelper::checkString($property['example']) && $property['adjustable'] == 0))
 					{
 						$type = $type_name;
 					}
-					// make sure none adjustable fields are set (should be same as above)
+					// make sure none adjustable fields are set (should be same as above) (TODO) hmmm we need look at this again
 					elseif (isset($property['example']) && ComponentbuilderHelper::checkString($property['example']) && $property['adjustable'] == 0)
 					{
 						$type = $property['example'];
@@ -2993,11 +3051,12 @@ class Get
 	 * @param   mix      $new    The new values
 	 * @param   string   $type   The type of values
 	 * @param   int      $key    The id/key where values changed
+	 * @param   array    $ignore The ids to ignore
 	 *
 	 * @return  void
 	 * 
 	 */
-	protected function setUpdateSQL($old, $new, $type, $key = null)
+	protected function setUpdateSQL($old, $new, $type, $key = null, $ignore = null)
 	{
 		// check if there were new items added
 		if (ComponentbuilderHelper::checkArray($new) && ComponentbuilderHelper::checkArray($old))
@@ -3008,8 +3067,14 @@ class Get
 				foreach ($new[$type] as $item)
 				{
 					$newItem = true;
+					// check if this is an id to ignore
+					if (ComponentbuilderHelper::checkArray($ignore) && in_array($item, $ignore))
+					{
+						// don't add ignored ids
+						$newItem = false;
+					}
 					// check if this is old repeatable field
-					if (isset($old[$type]) && ComponentbuilderHelper::checkArray($old[$type]))
+					elseif (isset($old[$type]) && ComponentbuilderHelper::checkArray($old[$type]))
 					{
 						if (!in_array($item, $old[$type]))
 						{
@@ -3055,12 +3120,18 @@ class Get
 			{
 				foreach ($new as $item)
 				{
-					// search to see if this is a new value
-					$newItem = true;
 					if (isset($item[$type]))
 					{
+						// search to see if this is a new value
+						$newItem = true;
+						// check if this is an id to ignore
+						if (ComponentbuilderHelper::checkArray($ignore) && in_array($item[$type], $ignore))
+						{
+							// don't add ignored ids
+							$newItem = false;
+						}
 						// check if this is old repeatable field
-						if (isset($old[$type]) && ComponentbuilderHelper::checkArray($old[$type]))
+						elseif (isset($old[$type]) && ComponentbuilderHelper::checkArray($old[$type]))
 						{
 							if (in_array($item[$type], $old[$type]))
 							{
@@ -3091,16 +3162,12 @@ class Get
 						{
 							$newItem = false;
 						}
-					}
+						// add if new
-					else
+						if ($newItem)
-					{
+						{
-						break;
+							// we have a new item, lets add to SQL
-					}
+							$this->setAddSQL($type, $item[$type], $key);
-					// add if new
+						}
-					if ($newItem)
-					{
-						// we have a new item, lets add to SQL
-						$this->setAddSQL($type, $item[$type], $key);
 					}
 				}
 			}
@@ -3857,7 +3924,7 @@ class Get
 	 * @param   string         $method_key  The method unique key
 	 * @param   string         $view_code  The code name of the view
 	 * @param   string         $string  The data string
-	 * @param   string || INT  $asset  The asset in question
+	 * @param   string         $asset  The asset in question
 	 * @param   string         $as  The as string
 	 * @param   int            $row_type  The row type
 	 * @param   string         $type  The target type (db||view)
@@ -3891,20 +3958,19 @@ class Get
 				{
 					if (strpos($line, 'AS') !== false)
 					{
-						list($get, $key) = explode("AS", $line);
+						$lineArray = explode("AS", $line);
 					}
 					elseif (strpos($line, 'as') !== false)
 					{
-						list($get, $key) = explode("as", $line);
+						$lineArray = explode("as", $line);
 					}
 					else
 					{
-						$get = $line;
+						$lineArray = array($line, null);
-						$key = null;
 					}
 					// set the get and key
-					$get = trim($get);
+					$get = trim($lineArray[0]);
-					$key = trim($key);
+					$key = trim($lineArray[1]);
 					// only add the view (we must adapt this)
 					if (isset($this->getAsLookup[$method_key][$get]) && 'a' != $as && 1 == $row_type && 'view' === $type && strpos('#' . $key, '#' . $view . '_') === false)
 					{
@@ -3926,10 +3992,18 @@ class Get
 							$this->getAsLookup[$method_key][$get] = $key;
 							$keys[] = $this->db->quote($key);
 						}
+						// make sure we have the view name
 						if (ComponentbuilderHelper::checkString($view))
 						{
+							// prep the field name
 							$field = str_replace($as . '.', '', $get);
-							$this->siteFields[$view][$field][$method_key] = array('site' => $view_code, 'get' => $get, 'as' => $as, 'key' => $key);
+							// make sure the array is set
+							if (!isset($this->siteFields[$view][$field]))
+							{
+								$this->siteFields[$view][$field] = array();
+							}
+							// load to the site fields memory bucket
+							$this->siteFields[$view][$field][$method_key . '___' . $as] = array('site' => $view_code, 'get' => $get, 'as' => $as, 'key' => $key);
 						}
 					}
 				}

admin/helpers/compiler/c_Fields.php

@@ -319,13 +319,6 @@ class Fields extends Structure
 	 */
 	public $fieldsNames = array();
 
-	/**
-	 * Default Fields
-	 * 
-	 * @var    array
-	 */
-	public $defaultFields = array('created', 'created_by', 'modified', 'modified_by', 'published', 'ordering', 'access', 'version', 'hits', 'id');
-
 	/**
 	 * Default Fields set to publishing
 	 * 
@@ -749,6 +742,7 @@ class Fields extends Structure
 				'name' => 'id',
 				'type' => 'text',
 				'class' => 'readonly',
+				'readonly' => "true",
 				'label' => 'JGLOBAL_FIELD_ID_LABEL',
 				'description' => 'JGLOBAL_FIELD_ID_DESC',
 				'size' => 10,
@@ -1993,8 +1987,12 @@ class Fields extends Structure
 		$textareas = array('textarea', 'editor');
 		if (isset($this->siteFields[$view][$field]) && ComponentbuilderHelper::checkArray($this->siteFields[$view][$field]))
 		{
-			foreach ($this->siteFields[$view][$field] as $code => $array)
+			foreach ($this->siteFields[$view][$field] as $codeString => $array)
 			{
+				// get the code array
+				$codeArray = explode('___', $codeString);
+				// set the code
+				$code = trim($codeArray[0]);
 				// set the decoding methods
 				if (in_array($set, $decode))
 				{
@@ -2048,6 +2046,7 @@ class Fields extends Structure
 		// reset array
 		$fieldAttributes = array();
 		$setCustom = false;
+		$setReadonly = false;
 		// setup joomla default fields
 		if (!ComponentbuilderHelper::fieldCheck($typeName))
 		{
@@ -2175,6 +2174,11 @@ class Fields extends Structure
 				{
 					// set read only
 					$xmlValue = 'true';
+					// trip the switch for readonly
+					if ($property['name'] === 'readonly')
+					{
+						$setReadonly = true;
+					}
 				}
 				elseif ($property['name'] === 'multiple')
 				{
@@ -2314,6 +2318,11 @@ class Fields extends Structure
 						$fieldAttributes['validate'] = ComponentbuilderHelper::safeString($validationRule);
 					}
 				}
+				// make sure ID is always readonly
+				if ($fieldAttributes['name'] === 'id' && !$setReadonly)
+				{
+					$fieldAttributes['readonly'] = 'true';
+				}
 			}
 		}
 		return $fieldAttributes;
@@ -2487,11 +2496,15 @@ class Fields extends Structure
 				'options' => $options);
 		}
 		// update the field relations
-		if (isset($this->fieldRelations[$view_name_list]) && isset($this->fieldRelations[$view_name_list][(int) $field['field']]))
+		if (isset($this->fieldRelations[$view_name_list]) && isset($this->fieldRelations[$view_name_list][(int) $field['field']]) 
+			&& ComponentbuilderHelper::checkArray($this->fieldRelations[$view_name_list][(int) $field['field']]))
 		{
-			$this->fieldRelations[$view_name_list][(int) $field['field']]['type'] = $typeName;
+			foreach ($this->fieldRelations[$view_name_list][(int) $field['field']] as $area => &$field_values)
-			$this->fieldRelations[$view_name_list][(int) $field['field']]['code'] = $name;
+			{
-			$this->fieldRelations[$view_name_list][(int) $field['field']]['custom'] = $custom;
+				$field_values['type'] = $typeName;
+				$field_values['code'] = $name;
+				$field_values['custom'] = $custom;
+			}
 		}
 		// set the hidden field of this view
 		if ($typeName === 'hidden')

admin/helpers/compiler/e_Interpretation.php

@@ -165,6 +165,27 @@ class Interpretation extends Fields
 	 */
 	protected $hasCatIdRequest = array();
 
+	/**
+	 * All fields with permissions
+	 *
+	 * @var    array
+	 */
+	protected $permissionFields = array();
+
+	/**
+	 * Custom Admin View List Link
+	 *
+	 * @var    array
+	 */
+	protected $customAdminViewListLink = array();
+
+	/**
+	 * load Tracker of fields to fix
+	 *
+	 * @var    array
+	 */
+	protected $loadTracker = array();
+
 	/**
 	 * View Has Id Request
 	 *
@@ -234,12 +255,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
@@ -328,12 +349,12 @@ class Interpretation extends Fields
 		$bool[] = $this->_t(2) . "}";
 		$bool[] = $this->_t(2) . "//" . $this->setLine(__LINE__) . " Get the global params";
 		$bool[] = $this->_t(2) . "\$params = JComponentHelper::getParams('com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "', true);";
-		$bool[] = $this->_t(2) . "\$license_key = \$params->get('license_key', null);";
+		$bool[] = $this->_t(2) . "\$whmcs_key = \$params->get('whmcs_key', null);";
-		$bool[] = $this->_t(2) . "if (\$license_key)";
+		$bool[] = $this->_t(2) . "if (\$whmcs_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(\$whmcs_key);";
 		$bool[] = $this->_t(3) . "\$this->" . $globalbool . " = \$the->_is;";
 		$bool[] = $this->_t(3) . "return \$this->" . $globalbool . ";";
 		$bool[] = $this->_t(2) . "}";
@@ -346,12 +367,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.";
@@ -360,12 +381,12 @@ class Interpretation extends Fields
 		$helper[] = $this->_t(1) . "{";
 		$helper[] = $this->_t(2) . "//" . $this->setLine(__LINE__) . " Get the global params";
 		$helper[] = $this->_t(2) . "\$params = JComponentHelper::getParams('com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "', true);";
-		$helper[] = $this->_t(2) . "\$license_key = \$params->get('license_key', null);";
+		$helper[] = $this->_t(2) . "\$whmcs_key = \$params->get('whmcs_key', null);";
-		$helper[] = $this->_t(2) . "if (\$license_key)";
+		$helper[] = $this->_t(2) . "if (\$whmcs_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(\$whmcs_key);";
 		$helper[] = $this->_t(3) . "return \$the->_is;";
 		$helper[] = $this->_t(2) . "}";
 		$helper[] = $this->_t(2) . "return false;";
@@ -377,18 +398,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
@@ -423,7 +444,7 @@ class Interpretation extends Fields
 				$encrypt[] = "/**";
 				$encrypt[] = "* " . $this->setLine(__LINE__) . "WHMCS Class ";
 				$encrypt[] = "**/";
-				$encrypt[] = PHP_EOL . "class WHMCS";
+				$encrypt[] = "class WHMCS";
 				$encrypt[] = "{";
 				$encrypt[] = $this->_t(1) . "public \$_key = false;";
 				$encrypt[] = $this->_t(1) . "public \$_is = false;";
@@ -584,7 +605,9 @@ class Interpretation extends Fields
 				return implode(PHP_EOL, $encrypt);
 			}
 		}
-		return '';
+		// give notice of this issue
+		$this->app->enqueueMessage(JText::sprintf('The <b>WHMCS class</b> could not be added to this component. You will need to enable the add-on in the Joomla Component area (Add WHMCS)->Yes.', $this->libraries[$id]->name), 'error');
+		return "//" . $this->setLine(__LINE__) . " The WHMCS class could not be added to this component." . PHP_EOL . "//" . $this->setLine(__LINE__) . " Please note that you will need to enable the add-on in the Joomla Component area (Add WHMCS)->Yes.";
 	}
 
 	/**
@@ -671,7 +694,7 @@ class Interpretation extends Fields
 				$function[] = $this->_t(2) . "//" . $this->setLine(__LINE__) . " WHMCS Encryption Type";
 				$function[] = $this->_t(2) . "if ('whmcs' === \$type || 'advanced' === \$type)";
 				$function[] = $this->_t(2) . "{";
-				$function[] = $this->_t(3) . "\$key = \$params->get('advanced_key', \$default);";
+				$function[] = $this->_t(3) . "\$key = \$params->get('whmcs_key', \$default);";
 				$function[] = $this->_t(3) . "if (self::checkString(\$key))";
 				$function[] = $this->_t(3) . "{";
 				$function[] = $this->_t(4) . "//" . $this->setLine(__LINE__) . " load the file";
@@ -1611,8 +1634,13 @@ class Interpretation extends Fields
 		{
 			foreach ($filters as $field => $ter)
 			{
-				if (strpos($get['selection']['select'], $ter['table_key']) !== false)
+				// build load counter
+				$key = md5('setCustomViewFieldDecodeFilter' . $code . $get['key'] . $string . $ter['table_key']);
+				// check if we should load this again
+				if (strpos($get['selection']['select'], $ter['table_key']) !== false && !isset($this->loadTracker[$key]))
 				{
+					// set the key
+					$this->loadTracker[$key] = $key;
 					$as = '';
 					$felt = '';
 					list($as, $felt) = array_map('trim', explode('.', $ter['table_key']));
@@ -1727,8 +1755,13 @@ class Interpretation extends Fields
 		$fieldDecode = '';
 		foreach ($checker as $field => $array)
 		{
-			if (strpos($get['selection']['select'], $field) !== false && ComponentbuilderHelper::checkArray($array['decode']))
+			// build load counter
+			$key = md5('setCustomViewFieldDecode' . $code . $get['key'] . $string . $field);
+			// check if we should load this again
+			if (strpos($get['selection']['select'], $field) !== false && !isset($this->loadTracker[$key]) && ComponentbuilderHelper::checkArray($array['decode']))
 			{
+				// set the key
+				$this->loadTracker[$key] = $key;
 				// insure it is unique
 				$array['decode'] = (array) array_unique(array_reverse((array) $array['decode']));
 				// now loop the array
@@ -1761,7 +1794,7 @@ class Interpretation extends Fields
 					}
 
 					// build decoder string
-					$fieldDecode .= $if . PHP_EOL . $this->_t(1) . $tab . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Decode " . $field;
+					$fieldDecode .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "//" . $this->setLine(__LINE__) . " Check if we can decode " . $field .$if . PHP_EOL . $this->_t(1) . $tab . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Decode " . $field;
 					$fieldDecode .= PHP_EOL . $this->_t(1) . $tab . $this->_t(2) . $decoder . PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "}";
 				}
 			}
@@ -1776,8 +1809,13 @@ class Interpretation extends Fields
 		$context = 'com_' . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . '.' . $code;
 		foreach ($checker as $field => $array)
 		{
-			if (strpos($get['selection']['select'], $field) !== false)
+			// build load counter
+			$key = md5('setCustomViewFieldonContentPrepareChecker' . $code . $get['key'] . $string . $field);
+			// check if we should load this again
+			if (strpos($get['selection']['select'], $field) !== false && !isset($this->loadTracker[$key]))
 			{
+				// set the key
+				$this->loadTracker[$key] = $key;
 				// build decoder string
 				if (!$runplugins)
 				{
@@ -1793,7 +1831,10 @@ class Interpretation extends Fields
 			}
 		}
 		// load dispatcher
-		$this->JEventDispatcher = array($this->hhh . 'DISPATCHER' . $this->hhh => ($runplugins ?: ''));
+		if ($runplugins)
+		{
+			$this->JEventDispatcher = array($this->hhh . 'DISPATCHER' . $this->hhh => $runplugins);
+		}
 		// return content prepare fix
 		return $fieldPrepare;
 	}
@@ -1803,8 +1844,13 @@ class Interpretation extends Fields
 		$fieldUikit = '';
 		foreach ($checker as $field => $array)
 		{
-			if (strpos($get['selection']['select'], $field) !== false)
+			// build load counter
+			$key = md5('setCustomViewFieldUikitChecker' . $code . $get['key'] . $string . $field);
+			// check if we should load this again
+			if (strpos($get['selection']['select'], $field) !== false && !isset($this->loadTracker[$key]))
 			{
+				// set the key
+				$this->loadTracker[$key] = $key;
 				// only load for uikit version 2 (TODO) we may need to add another check here
 				if (2 == $this->uikit || 1 == $this->uikit)
 				{
@@ -2630,6 +2676,7 @@ class Interpretation extends Fields
 	public function setCustomViewCustomItemMethods(&$main_get, $code)
 	{
 		$methods = '';
+		$this->JEventDispatcher = '';
 		// first set the needed item/s methods
 		if (ComponentbuilderHelper::checkObject($main_get))
 		{
@@ -3936,9 +3983,9 @@ class Interpretation extends Fields
 			if (2 == $this->uikit)
 			{
 				$setter .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Load uikit version.";
-				$setter .= PHP_EOL . $this->_t(2) . "\$uikitVersion = \$this->params->get('uikit_version', 2);";
+				$setter .= PHP_EOL . $this->_t(2) . "\$this->uikitVersion = \$this->params->get('uikit_version', 2);";
 				$setter .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Use Uikit Version 2";
-				$setter .= PHP_EOL . $this->_t(2) . "if (2 == \$uikitVersion)";
+				$setter .= PHP_EOL . $this->_t(2) . "if (2 == \$this->uikitVersion)";
 				$setter .= PHP_EOL . $this->_t(2) . "{";
 				$tabV = $this->_t(1);
 			}
@@ -4053,7 +4100,7 @@ class Interpretation extends Fields
 			{
 				$setter .= PHP_EOL . $this->_t(2) . "}";
 				$setter .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Use Uikit Version 3";
-				$setter .= PHP_EOL . $this->_t(2) . "elseif (3 == \$uikitVersion)";
+				$setter .= PHP_EOL . $this->_t(2) . "elseif (3 == \$this->uikitVersion)";
 				$setter .= PHP_EOL . $this->_t(2) . "{";
 			}
 			// add version 3 fiels to page
@@ -6149,7 +6196,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)
@@ -6483,7 +6530,7 @@ class Interpretation extends Fields
 				if ($firstTimeBeingAdded) // TODO we must improve this to allow more items to be targeted instead of just the first item :)
 				{
 					// get custom admin view buttons
-					$customAdminViewButtons = $this->getCustomAdminViewButtons($item, $viewName_single, $viewName_list, $coreLoad);
+					$customAdminViewButtons = $this->getCustomAdminViewButtons($viewName_list);
 					// make sure the custom admin view buttons are only added once
 					$firstTimeBeingAdded = false;
 				}
@@ -6556,18 +6603,13 @@ class Interpretation extends Fields
 	protected function getListItemBuilder($item, $viewName_single, $viewName_list, &$itemClass, $doNotEscape, $coreLoad, $core, $class = true, $ref = null, $escape = '$this->escape', $user = '$this->user', $refview = null)
 	{
 		// check if we have relation fields
-		if (isset($this->fieldRelations[$viewName_list]) &&
+		if (isset($this->fieldRelations[$viewName_list]) && isset($this->fieldRelations[$viewName_list][(int) $item['id']]) && isset($this->fieldRelations[$viewName_list][(int) $item['id']][2]))
-			isset($this->fieldRelations[$viewName_list][(int) $item['id']]) &&
-			isset($this->fieldRelations[$viewName_list][(int) $item['id']]['area']) &&
-			$this->fieldRelations[$viewName_list][(int) $item['id']]['area'] == 2 &&
-			isset($this->fieldRelations[$viewName_list][(int) $item['id']]['joinfields']) &&
-			ComponentbuilderHelper::checkArray($this->fieldRelations[$viewName_list][(int) $item['id']]['joinfields']))
 		{
 			// set the fields array
 			$field = array();
 			// use custom code
-			$useCustomCode = (isset($this->fieldRelations[$viewName_list][(int) $item['id']]['join_type']) && $this->fieldRelations[$viewName_list][(int) $item['id']]['join_type'] == 2 &&
+			$useCustomCode = (isset($this->fieldRelations[$viewName_list][(int) $item['id']][2]['join_type']) && $this->fieldRelations[$viewName_list][(int) $item['id']][2]['join_type'] == 2 &&
-				isset($this->fieldRelations[$viewName_list][(int) $item['id']]['set']) && ComponentbuilderHelper::checkString($this->fieldRelations[$viewName_list][(int) $item['id']]['set']));
+				isset($this->fieldRelations[$viewName_list][(int) $item['id']][2]['set']) && ComponentbuilderHelper::checkString($this->fieldRelations[$viewName_list][(int) $item['id']][2]['set']));
 			// load the main list view field
 			$field['[field=' . (int) $item['id'] . ']'] = $this->getListItem($item, $viewName_single, $viewName_list, $itemClass, $doNotEscape, $coreLoad, $core, false, $ref, $escape, $user, $refview);
 			// code name
@@ -6576,17 +6618,21 @@ class Interpretation extends Fields
 				$field['$item->{' . (int) $item['id'] . '}'] = '$item->' . $item['code'];
 			}
 			// now load the relations
-			foreach ($this->fieldRelations[$viewName_list][(int) $item['id']]['joinfields'] as $join)
+			if (isset($this->fieldRelations[$viewName_list][(int) $item['id']][2]['joinfields']) &&
+				ComponentbuilderHelper::checkArray($this->fieldRelations[$viewName_list][(int) $item['id']][2]['joinfields']))
 			{
-				$blankClass = '';
+				foreach ($this->fieldRelations[$viewName_list][(int) $item['id']][2]['joinfields'] as $join)
-				if (isset($this->listJoinBuilder[$viewName_list]) && isset($this->listJoinBuilder[$viewName_list][(int) $join]))
 				{
-					// code block
+					$blankClass = '';
-					$field['[field=' . (int) $join . ']'] = $this->getListItem($this->listJoinBuilder[$viewName_list][(int) $join], $viewName_single, $viewName_list, $blankClass, $doNotEscape, $coreLoad, $core, false, $ref, $escape, $user, $refview);
+					if (isset($this->listJoinBuilder[$viewName_list]) && isset($this->listJoinBuilder[$viewName_list][(int) $join]))
-					// code name
-					if (isset($this->listJoinBuilder[$viewName_list][(int) $join]['code']) && $useCustomCode)
 					{
-						$field['$item->{' . (int) $join . '}'] = '$item->' . $this->listJoinBuilder[$viewName_list][(int) $join]['code'];
+						// code block
+						$field['[field=' . (int) $join . ']'] = $this->getListItem($this->listJoinBuilder[$viewName_list][(int) $join], $viewName_single, $viewName_list, $blankClass, $doNotEscape, $coreLoad, $core, false, $ref, $escape, $user, $refview);
+						// code name
+						if (isset($this->listJoinBuilder[$viewName_list][(int) $join]['code']) && $useCustomCode)
+						{
+							$field['$item->{' . (int) $join . '}'] = '$item->' . $this->listJoinBuilder[$viewName_list][(int) $join]['code'];
+						}
 					}
 				}
 			}
@@ -6594,12 +6640,12 @@ class Interpretation extends Fields
 			if ($useCustomCode)
 			{
 				// custom code
-				return PHP_EOL . $this->_t(3) . "<div>" . $this->setPlaceholders(str_replace(array_keys($field), array_values($field), $this->fieldRelations[$viewName_list][(int) $item['id']]['set']), $this->placeholders) . PHP_EOL . $this->_t(3) . "</div>";
+				return PHP_EOL . $this->_t(3) . "<div>" . $this->setPlaceholders(str_replace(array_keys($field), array_values($field), $this->fieldRelations[$viewName_list][(int) $item['id']][2]['set']), $this->placeholders) . PHP_EOL . $this->_t(3) . "</div>";
 			}
-			elseif (isset($this->fieldRelations[$viewName_list][(int) $item['id']]['set']) && ComponentbuilderHelper::checkString($this->fieldRelations[$viewName_list][(int) $item['id']]['set']))
+			elseif (isset($this->fieldRelations[$viewName_list][(int) $item['id']]['set']) && ComponentbuilderHelper::checkString($this->fieldRelations[$viewName_list][(int) $item['id']][2]['set']))
 			{
 				// concatenate
-				return PHP_EOL . $this->_t(3) . "<div>" . implode($this->fieldRelations[$viewName_list][(int) $item['id']]['set'], $field) . PHP_EOL . $this->_t(3) . "</div>";
+				return PHP_EOL . $this->_t(3) . "<div>" . implode($this->fieldRelations[$viewName_list][(int) $item['id']][2]['set'], $field) . PHP_EOL . $this->_t(3) . "</div>";
 			}
 			// default
 			return PHP_EOL . $this->_t(3) . "<div>" . implode('', $field) . PHP_EOL . $this->_t(3) . "</div>";
@@ -7866,7 +7912,7 @@ class Interpretation extends Fields
 				if ($firstTimeBeingAdded) // TODO we must improve this to allow more items to be targeted instead of just the first item :)
 				{
 					// get custom admin view buttons
-					$customAdminViewButtons = $this->getCustomAdminViewButtons($item, $viewName_single, $viewName_list, $coreLoad, $ref);
+					$customAdminViewButtons = $this->getCustomAdminViewButtons($viewName_list, $ref);
 					// make sure the custom admin view buttons are only added once
 					$firstTimeBeingAdded = false;
 				}
@@ -10897,30 +10943,27 @@ class Interpretation extends Fields
 		// handel the fields permissions
 		if (isset($this->permissionFields[$viewName_single]) && ComponentbuilderHelper::checkArray($this->permissionFields[$viewName_single]))
 		{
-			foreach ($this->permissionFields[$viewName_single] as $fieldName => $fieldType)
+			foreach ($this->permissionFields[$viewName_single] as $fieldName => $permission_options)
 			{
-				$allow[] = $this->_t(2) . "//" . $this->setLine(__LINE__) . " Modify the form based on Edit " . ComponentbuilderHelper::safeString($fieldName, 'W') . " access controls.";
+				foreach($permission_options as $permission_option => $fieldType)
-				$allow[] = $this->_t(2) . "if (\$id != 0 && (!\$user->authorise('" . $viewName_single . ".edit." . $fieldName . "', 'com_" . $component . "." . $viewName_single . ".' . (int) \$id))";
-				$allow[] = $this->_t(3) . "|| (\$id == 0 && !\$user->authorise('" . $viewName_single . ".edit." . $fieldName . "', 'com_" . $component . "')))";
-				$allow[] = $this->_t(2) . "{";
-				$allow[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " Disable fields for display.";
-				$allow[] = $this->_t(3) . "\$form->setFieldAttribute('" . $fieldName . "', 'disabled', 'true');";
-				$allow[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " Disable fields for display.";
-				$allow[] = $this->_t(3) . "\$form->setFieldAttribute('" . $fieldName . "', 'readonly', 'true');";
-				if ('radio' === $fieldType || 'repeatable' === $fieldType)
 				{
-					$allow[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " Disable radio button for display.";
+					switch ($permission_option)
-					$allow[] = $this->_t(3) . "\$class = \$form->getFieldAttribute('" . $fieldName . "', 'class', '');";
+					{
-					$allow[] = $this->_t(3) . "\$form->setFieldAttribute('" . $fieldName . "', 'class', \$class.' disabled no-click');";
+						case 'edit':
+							$this->setPermissionEditFields($allow, $viewName_single, $fieldName, $fieldType, $component);
+						break;
+						case 'access':
+							$this->setPermissionAccessFields($allow, $viewName_single, $fieldName, $fieldType, $component);
+						break;
+						case 'view':
+							$this->setPermissionViewFields($allow, $viewName_single, $fieldName, $fieldType, $component);
+						break;
+						case 'edit.own':
+						case 'access.own':
+							// this must still be build (TODO)
+						break;
+					}
 				}
-				$allow[] = $this->_t(3) . "if (!\$form->getValue('" . $fieldName . "'))";
-				$allow[] = $this->_t(3) . "{";
-				$allow[] = $this->_t(4) . "//" . $this->setLine(__LINE__) . " Disable fields while saving.";
-				$allow[] = $this->_t(4) . "\$form->setFieldAttribute('" . $fieldName . "', 'filter', 'unset');";
-				$allow[] = $this->_t(4) . "//" . $this->setLine(__LINE__) . " Disable fields while saving.";
-				$allow[] = $this->_t(4) . "\$form->setFieldAttribute('" . $fieldName . "', 'required', 'false');";
-				$allow[] = $this->_t(3) . "}";
-				$allow[] = $this->_t(2) . "}";
 			}
 		}
 		// add the redirect trick to set the field of origin
@@ -10943,6 +10986,63 @@ class Interpretation extends Fields
 
 		return implode(PHP_EOL, $allow);
 	}
+	
+	protected function setPermissionEditFields(&$allow, $viewName_single, $fieldName, $fieldType, $component)
+	{
+		$allow[] = $this->_t(2) . "//" . $this->setLine(__LINE__) . " Modify the form based on Edit " . ComponentbuilderHelper::safeString($fieldName, 'W') . " access controls.";
+		$allow[] = $this->_t(2) . "if (\$id != 0 && (!\$user->authorise('" . $viewName_single . ".edit." . $fieldName . "', 'com_" . $component . "." . $viewName_single . ".' . (int) \$id))";
+		$allow[] = $this->_t(3) . "|| (\$id == 0 && !\$user->authorise('" . $viewName_single . ".edit." . $fieldName . "', 'com_" . $component . "')))";
+		$allow[] = $this->_t(2) . "{";
+		$allow[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " Disable fields for display.";
+		$allow[] = $this->_t(3) . "\$form->setFieldAttribute('" . $fieldName . "', 'disabled', 'true');";
+		$allow[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " Disable fields for display.";
+		$allow[] = $this->_t(3) . "\$form->setFieldAttribute('" . $fieldName . "', 'readonly', 'true');";
+		if ('radio' === $fieldType || 'repeatable' === $fieldType)
+		{
+			$allow[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " Disable radio button for display.";
+			$allow[] = $this->_t(3) . "\$class = \$form->getFieldAttribute('" . $fieldName . "', 'class', '');";
+			$allow[] = $this->_t(3) . "\$form->setFieldAttribute('" . $fieldName . "', 'class', \$class.' disabled no-click');";
+		}
+		$allow[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " If there is no value continue.";
+		$allow[] = $this->_t(3) . "if (!\$form->getValue('" . $fieldName . "'))";
+		$allow[] = $this->_t(3) . "{";
+		$allow[] = $this->_t(4) . "//" . $this->setLine(__LINE__) . " Disable fields while saving.";
+		$allow[] = $this->_t(4) . "\$form->setFieldAttribute('" . $fieldName . "', 'filter', 'unset');";
+		$allow[] = $this->_t(4) . "//" . $this->setLine(__LINE__) . " Disable fields while saving.";
+		$allow[] = $this->_t(4) . "\$form->setFieldAttribute('" . $fieldName . "', 'required', 'false');";
+		$allow[] = $this->_t(3) . "}";
+		$allow[] = $this->_t(2) . "}";
+	}
+	
+	protected function setPermissionAccessFields(&$allow, $viewName_single, $fieldName, $fieldType, $component)
+	{
+		$allow[] = $this->_t(2) . "//" . $this->setLine(__LINE__) . " Modify the from the form based on " . ComponentbuilderHelper::safeString($fieldName, 'W') . " access controls.";
+		$allow[] = $this->_t(2) . "if (\$id != 0 && (!\$user->authorise('" . $viewName_single . ".access." . $fieldName . "', 'com_" . $component . "." . $viewName_single . ".' . (int) \$id))";
+		$allow[] = $this->_t(3) . "|| (\$id == 0 && !\$user->authorise('" . $viewName_single . ".access." . $fieldName . "', 'com_" . $component . "')))";
+		$allow[] = $this->_t(2) . "{";
+		$allow[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " Remove the field";
+		$allow[] = $this->_t(3) . "\$form->removeField('" . $fieldName . "');";
+		$allow[] = $this->_t(2) . "}";
+	}
+	
+	protected function setPermissionViewFields(&$allow, $viewName_single, $fieldName, $fieldType, $component)
+	{
+		$allow[] = $this->_t(2) . "//" . $this->setLine(__LINE__) . " Modify the form based on View " . ComponentbuilderHelper::safeString($fieldName, 'W') . " access controls.";
+		$allow[] = $this->_t(2) . "if (\$id != 0 && (!\$user->authorise('" . $viewName_single . ".view." . $fieldName . "', 'com_" . $component . "." . $viewName_single . ".' . (int) \$id))";
+		$allow[] = $this->_t(3) . "|| (\$id == 0 && !\$user->authorise('" . $viewName_single . ".view." . $fieldName . "', 'com_" . $component . "')))";
+		$allow[] = $this->_t(2) . "{";
+		$allow[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " Make the field hidded.";
+		$allow[] = $this->_t(3) . "\$form->setFieldAttribute('" . $fieldName . "', 'type', 'hidden');";
+		$allow[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " If there is no value continue.";
+		$allow[] = $this->_t(3) . "if (!\$form->getValue('" . $fieldName . "'))";
+		$allow[] = $this->_t(3) . "{";
+		$allow[] = $this->_t(4) . "//" . $this->setLine(__LINE__) . " Disable fields while saving.";
+		$allow[] = $this->_t(4) . "\$form->setFieldAttribute('" . $fieldName . "', 'filter', 'unset');";
+		$allow[] = $this->_t(4) . "//" . $this->setLine(__LINE__) . " Disable fields while saving.";
+		$allow[] = $this->_t(4) . "\$form->setFieldAttribute('" . $fieldName . "', 'required', 'false');";
+		$allow[] = $this->_t(3) . "}";
+		$allow[] = $this->_t(2) . "}";
+	}
 
 	public function setJmodelAdminAllowEdit($viewName_single, $viewName_list)
 	{
@@ -11838,11 +11938,14 @@ class Interpretation extends Fields
 		// load the relations before modeling
 		if (isset($this->fieldRelations[$viewName_list]) && ComponentbuilderHelper::checkArray($this->fieldRelations[$viewName_list]))
 		{
-			foreach ($this->fieldRelations[$viewName_list] as $field)
+			foreach ($this->fieldRelations[$viewName_list] as $field_id => $fields)
 			{
-				if (isset($field['area']) && $field['area'] == 1 && isset($field['code']))
+				foreach ($fields as $area => $field)
 				{
-					$fix .= $this->setModelFieldRelation($field, $viewName_list);
+					if ($area == 1 && isset($field['code']))
+					{
+						$fix .= $this->setModelFieldRelation($field, $viewName_list, $tab);
+					}
 				}
 			}
 		}
@@ -12056,11 +12159,14 @@ class Interpretation extends Fields
 		// load the relations after modeling
 		if (isset($this->fieldRelations[$viewName_list]) && ComponentbuilderHelper::checkArray($this->fieldRelations[$viewName_list]))
 		{
-			foreach ($this->fieldRelations[$viewName_list] as $field)
+			foreach ($this->fieldRelations[$viewName_list] as $fields)
 			{
-				if (isset($field['area']) && $field['area'] == 3 && isset($field['code']))
+				foreach ($fields as $area => $field)
 				{
-					$fix .= $this->setModelFieldRelation($field, $viewName_list);
+					if ($area == 3 && isset($field['code']))
+					{
+						$fix .= $this->setModelFieldRelation($field, $viewName_list, $tab);
+					}
 				}
 			}
 		}
@@ -12113,7 +12219,7 @@ class Interpretation extends Fields
 		return $script . $forEachStart . $fix;
 	}
 
-	protected function setModelFieldRelation($item, $viewName_list)
+	protected function setModelFieldRelation($item, $viewName_list, $tab)
 	{
 		$fix = '';
 		// set fields
@@ -12121,9 +12227,12 @@ class Interpretation extends Fields
 		// set list field name
 		$field['$item->{' . (int) $item['listfield'] . '}'] = '$item->' . $item['code'];
 		// load joint field names
-		foreach ($item['joinfields'] as $join)
+		if (isset($item['joinfields']) && ComponentbuilderHelper::checkArray($item['joinfields']))
 		{
-			$field['$item->{' . (int) $join . '}'] = '$item->' . $this->listJoinBuilder[$viewName_list][(int) $join]['code'];
+			foreach ($item['joinfields'] as $join)
+			{
+				$field['$item->{' . (int) $join . '}'] = '$item->' . $this->listJoinBuilder[$viewName_list][(int) $join]['code'];
+			}
 		}
 		// set based on join_type
 		if ($item['join_type'] == 2)
@@ -12138,7 +12247,7 @@ class Interpretation extends Fields
 			$fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3) . "//" . $this->setLine(__LINE__) . " concatenate these fields";
 			$fix .= PHP_EOL . $this->_t(1) . $tab . $this->_t(3) . "\$item->" . $item['code'] . ' = ' . implode(" . '" . str_replace("'", '&apos;', $item['set']) . "' . ", $field) . ';';
 		}
-		return $fix;
+		return $this->setPlaceholders($fix, $this->placeholders);
 	}
 
 	public function setSelectionTranslationFix($views, $Component, $tab = '')
@@ -13154,7 +13263,7 @@ class Interpretation extends Fields
 			// these are the coustom settings
 			$this->setCustomControlConfigFieldsets($lang);
 		}
-		// we cad add more event (timers as we need)
+		// we can add more event (timers as we need)
 	}
 
 	public function setSiteControlConfigFieldsets($lang)
@@ -13365,40 +13474,6 @@ class Interpretation extends Fields
 		$this->configFieldSets[] = $this->_t(2) . 'name="global_config"';
 		$this->configFieldSets[] = $this->_t(2) . 'label="' . $lang . '_GLOBAL_LABEL"';
 		$this->configFieldSets[] = $this->_t(2) . 'description="' . $lang . '_GLOBAL_DESC">';
-		// set application update License Key
-		if ($this->componentData->add_license && 1 != $this->componentData->license_type)
-		{
-			// set licence type switch
-			switch ($this->componentData->license_type)
-			{
-				case 2:
-					// for updates
-					$this->langContent[$this->lang][$lang . '_LICENSE_KEY_NOTE_LABEL'] = "Your License Key";
-					$this->langContent[$this->lang][$lang . '_LICENSE_KEY_NOTE_DESC'] = "To get updates you must add the license key here that you recieved from " . $this->componentData->companyname;
-					// set the field
-					$this->configFieldSets[] = $this->_t(2) . '<field type="note" name="license_key_note" class="alert alert-info" label="' . $lang . '_LICENSE_KEY_NOTE_LABEL" description="' . $lang . '_LICENSE_KEY_NOTE_DESC"  />';
-					break;
-				case 3:
-					// with vdm to lock down ownership
-					$this->langContent[$this->lang][$lang . '_LICENSE_KEY_NOTE_LABEL'] = "Your License Key";
-					$this->langContent[$this->lang][$lang . '_LICENSE_KEY_NOTE_DESC'] = "To use this component you must add the license key here that you recieved from " . $this->componentData->companyname;
-					// set the field
-					$this->configFieldSets[] = $this->_t(2) . '<field type="note" name="license_key_note" class="alert alert-info" label="' . $lang . '_LICENSE_KEY_NOTE_LABEL" description="' . $lang . '_LICENSE_KEY_NOTE_DESC"  />';
-					break;
-			}
-			// setup lang
-			$this->langContent[$this->lang][$lang . '_LICENSE_KEY_LABEL'] = "License Key";
-			$this->langContent[$this->lang][$lang . '_LICENSE_KEY_DESC'] = "Add your license key here.";
-			// add the field
-			$this->configFieldSets[] = $this->_t(2) . '<field name="license_key"';
-			$this->configFieldSets[] = $this->_t(3) . 'type="text"';
-			$this->configFieldSets[] = $this->_t(3) . 'label="' . $lang . '_LICENSE_KEY_LABEL"';
-			$this->configFieldSets[] = $this->_t(3) . 'description="' . $lang . '_LICENSE_KEY_DESC"';
-			$this->configFieldSets[] = $this->_t(3) . 'size="60"';
-			$this->configFieldSets[] = $this->_t(3) . 'default=""';
-			$this->configFieldSets[] = $this->_t(2) . "/>";
-			$this->configFieldSets[] = $this->_t(2) . '<field type="spacer" name="spacerLicense" hr="true" />';
-		}
 		// setup lang
 		$this->langContent[$this->lang][$lang . '_GLOBAL_LABEL'] = "Global";
 		$this->langContent[$this->lang][$lang . '_GLOBAL_DESC'] = "The Global Parameters";
@@ -14694,44 +14769,51 @@ function vdm_dkim() {
 				// set field lang label and description
 				if ($this->componentData->add_license && $this->componentData->license_type == 3)
 				{
-					$this->langContent[$this->lang][$lang . '_WHMCS_KEY_LABEL'] = "License Key";
+					$this->langContent[$this->lang][$lang . '_WHMCS_KEY_LABEL'] = $this->componentData->companyname . " License Key";
 					$this->langContent[$this->lang][$lang . '_WHMCS_KEY_DESC'] = "Add the license key you recieved from " . $this->componentData->companyname . " here.";
 				}
 				elseif ($this->componentData->add_license && $this->componentData->license_type == 2)
 				{
-					$this->langContent[$this->lang][$lang . '_WHMCS_KEY_LABEL'] = "Update Key";
+					$this->langContent[$this->lang][$lang . '_WHMCS_KEY_LABEL'] = $this->componentData->companyname . " Update Key";
 					$this->langContent[$this->lang][$lang . '_WHMCS_KEY_DESC'] = "Add the update key you recieved from " . $this->componentData->companyname . " here.";
 				}
 				else
 				{
-					$this->langContent[$this->lang][$lang . '_WHMCS_KEY_LABEL'] = "WHMCS Key";
+					$this->langContent[$this->lang][$lang . '_WHMCS_KEY_LABEL'] = $this->componentData->companyname . " Key";
 					$this->langContent[$this->lang][$lang . '_WHMCS_KEY_DESC'] = "Add the key you recieved from " . $this->componentData->companyname . " here.";
 				}
 				// ajust the notice based on license
-				if (isset($this->whmcsEncryption) && $this->whmcsEncryption)
+				if ($this->componentData->license_type == 3)
 				{
-					$this->langContent[$this->lang][$lang . '_WHMCS_KEY_NOTE_LABEL'] = "Field Encryption (whmcs)";
+					$this->langContent[$this->lang][$lang . '_WHMCS_KEY_NOTE_LABEL'] = "Your " . $this->componentData->companyname . " License Key";
-					$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>";
+				}
+				elseif ($this->componentData->license_type == 2)
+				{
+					$this->langContent[$this->lang][$lang . '_WHMCS_KEY_NOTE_LABEL'] = "Your " . $this->componentData->companyname . " Update Key";
 				}
 				else
 				{
-					if ($this->componentData->license_type == 3)
+					if (isset($this->whmcsEncryption) && $this->whmcsEncryption)
 					{
-						$this->langContent[$this->lang][$lang . '_WHMCS_KEY_NOTE_LABEL'] = "Your License Key";
+						$this->langContent[$this->lang][$lang . '_WHMCS_KEY_NOTE_LABEL'] = "Your " . $this->componentData->companyname . " Field Encryption Key";
-					}
-					elseif ($this->componentData->license_type == 2)
-					{
-						$this->langContent[$this->lang][$lang . '_WHMCS_KEY_NOTE_LABEL'] = "Your Update Key";
 					}
 					else
 					{
-						$this->langContent[$this->lang][$lang . '_WHMCS_KEY_NOTE_LABEL'] = "Your Key (whmcs)";
+						$this->langContent[$this->lang][$lang . '_WHMCS_KEY_NOTE_LABEL'] = "Your " . $this->componentData->companyname . " Key";
 					}
-					$this->langContent[$this->lang][$lang . '_WHMCS_KEY_NOTE_DESC'] = "You need to get this key from " . $this->componentData->companyname . ".";
+				}
+				// add the description based on global settings
+				if (isset($this->whmcsEncryption) && $this->whmcsEncryption)
+				{
+					$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>.<br />When using the " . $this->componentData->companyname . " field encryption you can never change this key once it is set! <b>DATA WILL GET CORRUPTED IF YOU DO!</b>";
+				}
+				else
+				{
+					$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"  />';
-				$this->configFieldSets[] = $this->_t(2) . '<field name="advanced_key"'; // We are going to change this field to whmcs_key (TODO)
+				$this->configFieldSets[] = $this->_t(2) . '<field name="whmcs_key"'; // We had to change this from license_key & advanced_key to whmcs_key
 				$this->configFieldSets[] = $this->_t(3) . 'type="text"';
 				$this->configFieldSets[] = $this->_t(3) . 'label="' . $lang . '_WHMCS_KEY_LABEL"';
 				$this->configFieldSets[] = $this->_t(3) . 'description="' . $lang . '_WHMCS_KEY_DESC"';
@@ -14917,7 +14999,6 @@ function vdm_dkim() {
 				$this->addCustomButtonPermissions($view['settings'], $view['settings']->name_single, $nameView);
 				if ($nameView != 'component')
 				{
-
 					// add menu controll view that has menus options
 					foreach ($menuControllers as $menuController)
 					{
@@ -14947,41 +15028,53 @@ function vdm_dkim() {
 					// check if there are fields
 					if (ComponentbuilderHelper::checkArray($view['settings']->fields))
 					{
+						// field permission options
+						$permission_options = array(1 => 'edit', 2 => 'access', 3 => 'view');
 						// check the fields for their permission settings
 						foreach ($view['settings']->fields as $field)
 						{
 							// see if field require permissions to be set
-							if (isset($field['permission']) && $field['permission'])
+							if (isset($field['permission']) && ComponentbuilderHelper::checkArray($field['permission']))
 							{
 								if (ComponentbuilderHelper::checkArray($field['settings']->properties))
 								{
-									foreach ($field['settings']->properties as $property)
-									{
-										if ($property['name'] === 'type')
-										{
-											$propertyType = $property;
-										}
-									}
 									$fieldType = $this->getFieldType($field);
 									$fieldName = $this->getFieldName($field, $nameViews);
-									$fieldView = array();
+									// loop the permission options
-									// set the permission for this field
+									foreach ($field['permission'] as $permission_id)
-									$fieldView['action'] = 'view.edit.' . $fieldName;
-									$fieldView['implementation'] = '3';
-									if (ComponentbuilderHelper::checkArray($view['settings']->permissions))
 									{
-										array_push($view['settings']->permissions, $fieldView);
+										// set the permission key word
-									}
+										$permission_option = $permission_options[$permission_id];
-									else
+										// reset the bucket
-									{
+										$fieldView = array();
-										$view['settings']->permissions = array();
+										// set the permission for this field
-										$view['settings']->permissions[] = $fieldView;
+										$fieldView['action'] = 'view.' . $permission_option . '.' . $fieldName;
-									}
+										$fieldView['implementation'] = '3';
-									// insure that no default field get loaded
+										// check if persmissions was laready set
-									if (!in_array($fieldName, $this->defaultFields))
+										if (isset($view['settings']->permissions) && ComponentbuilderHelper::checkArray($view['settings']->permissions))
-									{
+										{
-										// load to global field permission set
+											array_push($view['settings']->permissions, $fieldView);
-										$this->permissionFields[$nameView][$fieldName] = $fieldType;
+										}
+										else
+										{
+											$view['settings']->permissions = array();
+											$view['settings']->permissions[] = $fieldView;
+										}
+										// insure that no default field get loaded
+										if (!in_array($fieldName, $this->defaultFields))
+										{
+											// make sure the array is set
+											if (!isset($this->permissionFields[$nameView]) || !ComponentbuilderHelper::checkArray($this->permissionFields[$nameView]))
+											{
+												$this->permissionFields[$nameView] = array();
+											}
+											if (!isset($this->permissionFields[$nameView][$fieldName]) || !ComponentbuilderHelper::checkArray($this->permissionFields[$nameView][$fieldName]))
+											{
+												$this->permissionFields[$nameView][$fieldName] = array();
+											}
+											// load to global field permission set
+											$this->permissionFields[$nameView][$fieldName][$permission_option] = $fieldType;
+										}
 									}
 								}
 							}
@@ -15139,6 +15232,7 @@ function vdm_dkim() {
 					$w_NameList = $view['settings']->name;
 					$w_NameSingle = $view['settings']->name;
 				}
+				// set the title based on the name builder
 				switch ($nameBuilder)
 				{
 					case 'edit':
@@ -15217,7 +15311,7 @@ function vdm_dkim() {
 						// set edit title
 						$permission['title'] = $W_NameList . ' ' . ComponentbuilderHelper::safeString($customName, 'W');
 						// set edit description
-						$permission['description'] = ' Allows the users in this group to update the ' . ComponentbuilderHelper::safeString($customName, 'w') . ' of the ' . $w_NameSingle;
+						$permission['description'] = ' Allows the users in this group to ' . ComponentbuilderHelper::safeString($customName, 'w') . ' of ' . $w_NameSingle;
 						break;
 				}
 				// if core is not used update all core strings

admin/helpers/componentbuilder.php

@@ -4226,16 +4226,16 @@ abstract class ComponentbuilderHelper
 					{
 						if ($external)
 						{
-							if ($name = self::getVar(null, $val, $id, $name, '=', $table))
+							if ($_name = self::getVar(null, $val, $id, $name, '=', $table))
 							{
-								$names[] = $name;
+								$names[] = $_name;
 							}
 						}
 						else
 						{
-							if ($name = self::getVar($table, $val, $id, $name))
+							if ($_name = self::getVar($table, $val, $id, $name))
 							{
-								$names[] = $name;
+								$names[] = $_name;
 							}
 						}
 					}
@@ -4957,7 +4957,7 @@ abstract class ComponentbuilderHelper
 	*
 	*	@returns string on success
 	**/
-	public static function safeString($string, $type = 'L', $spacer = '_', $replaceNumbers = true)
+	public static function safeString($string, $type = 'L', $spacer = '_', $replaceNumbers = true, $keepOnlyCharacters = true)
 	{
 		if ($replaceNumbers === true)
 		{
@@ -4986,7 +4986,16 @@ abstract class ComponentbuilderHelper
 			$string = trim($string);
 			$string = preg_replace('/'.$spacer.'+/', ' ', $string);
 			$string = preg_replace('/\s+/', ' ', $string);
-			$string = preg_replace("/[^A-Za-z ]/", '', $string);
+			// remove all and keep only characters
+			if ($keepOnlyCharacters)
+			{
+				$string = preg_replace("/[^A-Za-z ]/", '', $string);
+			}
+			// keep both numbers and characters
+			else
+			{
+				$string = preg_replace("/[^A-Za-z0-9 ]/", '', $string);
+			}
 			// select final adaptations
 			if ($type === 'L' || $type === 'strtolower')
 			{

admin/helpers/componentbuilderemail.php

@@ -121,17 +121,17 @@ abstract class ComponentbuilderEmail
 			$replyto	= $conf->get('replyto');
 			$replytoname	= $conf->get('replytoname');
 		}
+
+		// Set global sender
+		$mail->setSender(array($mailfrom, $fromname));
 			
 		// set the global reply-to if found
 		if ($replyto && $replytoname)
 		{
 			$mail->ClearReplyTos();
-			$mail->addReplyTo( array( $replyto, $replytoname ) );
+			$mail->addReplyTo($replyto, $replytoname);
 		}
 
-		// Set global sender
-		$mail->setSender(array($mailfrom, $fromname));
-
 		// Default mailer is to use PHP's mail function
 		switch ($mailer)
 		{
@@ -179,9 +179,6 @@ abstract class ComponentbuilderEmail
 		// set component params
 		$conf = self::getConfig();
 		
-		// do some house cleaning
-		$mail->ClearReplyTos();
-		
 		// set if we have override
 		if ($mailfrom && $fromname)
 		{

admin/helpers/extrusion/a_mapping.php

@@ -99,52 +99,64 @@ class Mapping
 	 */
 	public function __construct($data = false)
 	{
+		// set the app to insure messages can be set
+		$this->app = JFactory::getApplication();
+		// check that we have data
 		if (ComponentbuilderHelper::checkArray($data))
 		{
-			if (isset($data['buildcomp']) && 1 == $data['buildcomp'] && isset($data['buildcompsql']))
+			// make sure we have an id
+			if (isset($data['id']) && $data['id'] > 0)
 			{
-				foreach ($data as $key => $value)
+				if (isset($data['buildcomp']) && 1 == $data['buildcomp'] && isset($data['buildcompsql']))
 				{
-					if (isset($this->setting[$key]))
+					foreach ($data as $key => $value)
 					{
-						switch($this->setting[$key])
+						if (isset($this->setting[$key]))
 						{
-							case 'base64':
+							switch($this->setting[$key])
-								// set needed value
+							{
-								$this->$key = base64_decode($value);
+								case 'base64':
-								break;
+									// set needed value
-							case 'json':
+									$this->$key = base64_decode($value);
-								// set needed value
+									break;
-								$this->$key = json_decode($value, true);
+								case 'json':
-								break;
+									// set needed value
-							case 'safeString':
+									$this->$key = json_decode($value, true);
-								// set needed value
+									break;
-								$this->$key = ComponentbuilderHelper::safeString($value);
+								case 'safeString':
-								break;
+									// set needed value
-							default :
+									$this->$key = ComponentbuilderHelper::safeString($value);
-								$this->$key = $value;
+									break;
-								break;
+								default :
+									$this->$key = $value;
+									break;
+							}
 						}
 					}
+					// get linked admin views
+					$addadmin_views = ComponentbuilderHelper::getVar('component_admin_views', $data['id'], 'joomla_component', 'addadmin_views');
+					if (ComponentbuilderHelper::checkJson($addadmin_views))
+					{
+						$this->addadmin_views = json_decode($addadmin_views, true);
+					}
+					// set the map of the views needed
+					if ($this->setMap())
+					{
+						return true;
+					}
+					$this->app->enqueueMessage(
+						JText::_('No "CREATE TABLE.." were found, please check your sql.'),
+						'Error'
+					);
+					return false;
 				}
-				// get linked admin views
+				return false; // not set so just return without any error
-				$addadmin_views = ComponentbuilderHelper::getVar('component_admin_views', $data['id'], 'joomla_component', 'addadmin_views');
-				if (ComponentbuilderHelper::checkJson($addadmin_views))
-				{
-					$this->addadmin_views = json_decode($addadmin_views, true);
-				}
-				// set the map of the views needed
-				if ($this->setMap())
-				{
-					return true;
-				}
-				$this->app->enqueueMessage(
-					JText::_('No "CREATE TABLE.." were found, please check your sql.'),
-					'Error'
-				);
-				return false;
 			}
-			return false; // not set so just return without any error
+			$this->app->enqueueMessage(
+				JText::_('Please try again, this error usualy happens if it is a new component, beacues we need a component ID to do this build with your sql dump.'),
+				'Error'
+			);
+			return false;
 		}
 		$this->app->enqueueMessage(
 			JText::_('Could not find the data needed to continue.'),

admin/helpers/extrusion/c_extrusion.php

@@ -36,30 +36,19 @@ class Extrusion extends Builder
 	 */
 	public function __construct(&$data)
 	{
-		// set the app to insure messages can be set
+		// first we run the perent constructor
-		$this->app = JFactory::getApplication();
+		if (parent::__construct($data))
-		// make sure we have an id
-		if (isset($data['id']) && $data['id'] > 0)
 		{
-			// first we run the perent constructor
+			// link the view data to the component
-			if (parent::__construct($data))
+			if ($this->setAdminViews($data['id']))
 			{
-				// link the view data to the component
+				$this->app->enqueueMessage(
-				if ($this->setAdminViews($data['id']))
+					JText::_('All the fields and views from your sql dump has been created and linked to this component.'),
-				{
+					'Success'
-					$this->app->enqueueMessage(
+				);
-						JText::_('All the fields and views from your sql dump has been created and linked to this component.'),
+				return true;
-						'Success'
-					);
-					return true;
-				}
 			}
-			return false;
 		}
-		$this->app->enqueueMessage(
-			JText::_('Please try again, this error usualy happens if it is a new component, beacues we need a component ID to do this build with your sql dump.'),
-			'Error'
-		);
 		return false;
 	}
 	

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

@@ -3,6 +3,7 @@ COM_COMPONENTBUILDER_ABOVE_TABS="Above Tabs"
 COM_COMPONENTBUILDER_ACCEPTS_AN_EMAIL_ADDRESS_SATISFIES_A_BASIC_SYNTAX_CHECK_IN_THE_PATTERN_OF_QUOTXYZZQUOT_WITH_NO_INVALID_CHARACTERS="Accepts an email address satisfies a basic syntax check in the pattern of "x@y.zz", with no invalid characters."
 COM_COMPONENTBUILDER_ACCEPTS_ONLY_EMPTY_VALUES_CONVERTED_TO_ZERO_AND_STRINGS_IN_THE_FORM_RGB_OR_RRGGBB_WHERE_R_G_AND_B_ARE_HEX_VALUES="Accepts only empty values (converted to '#000000') and strings in the form '#RGB' or '#RRGGBB' where R, G, and B are hex values."
 COM_COMPONENTBUILDER_ACCEPTS_ONLY_THE_VALUES_ZERO_ONE_TRUE_OR_FALSE_CASEINSENSITIVE="Accepts only the values '0', '1', 'true' or 'false' (case-insensitive)."
+COM_COMPONENTBUILDER_ACCESS="Access"
 COM_COMPONENTBUILDER_ACCESS_BULK_TOOLS="Access Bulk Tools"
 COM_COMPONENTBUILDER_ACCESS_DENIED="Access denied!"
 COM_COMPONENTBUILDER_ACTIVE_ONLY_FOUR_TEXT_FIELD="Active (only 4 text_field)"
@@ -138,6 +139,7 @@ COM_COMPONENTBUILDER_ADMINS_FIELDS_RELATIONS_N_ITEMS_UNPUBLISHED_1="%s Admin Fie
 COM_COMPONENTBUILDER_ADMIN_BEHAVIOUR="Admin Behaviour"
 COM_COMPONENTBUILDER_ADMIN_FIELDS="Admin Fields"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_ABOVE_TABS="Above Tabs"
+COM_COMPONENTBUILDER_ADMIN_FIELDS_ACCESS="Access"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_ADDFIELDS="Addfields"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_ADDFIELDS_DESCRIPTION="Setup fields for this view."
 COM_COMPONENTBUILDER_ADMIN_FIELDS_ADDFIELDS_LABEL="Fields"
@@ -234,7 +236,6 @@ COM_COMPONENTBUILDER_ADMIN_FIELDS_MODIFIED_BY_LABEL="Modified By"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_MODIFIED_DATE_DESC="The date this Admin Fields was modified."
 COM_COMPONENTBUILDER_ADMIN_FIELDS_MODIFIED_DATE_LABEL="Modified Date"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_NEW="A New Admin Fields"
-COM_COMPONENTBUILDER_ADMIN_FIELDS_NONE="None"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_NONE_DB="None DB"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_NOTE_ON_VIEWS_DESCRIPTION="id, asset_id, state, access, ordering, created_by, created, modified_by, modified, checked_out, checked_out_time, version, hits, metakey, metadesc, metadata (you don't need to add them again)<br />For more help <a href='https://youtu.be/CdSKSCTzmRA?list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&t=32m28s' target='_blank'>please watch this tutorial</a>."
 COM_COMPONENTBUILDER_ADMIN_FIELDS_NOTE_ON_VIEWS_LABEL="The following fields are added by default to all views."
@@ -313,6 +314,7 @@ COM_COMPONENTBUILDER_ADMIN_FIELDS_TITLE_LABEL="Title"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_UNDERNEATH_TABS="Underneath Tabs"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_VERSION_DESC="A count of the number of times this Admin Fields has been revised."
 COM_COMPONENTBUILDER_ADMIN_FIELDS_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_ADMIN_FIELDS_VIEW="View"
 COM_COMPONENTBUILDER_ADMIN_VIEW="Admin View"
 COM_COMPONENTBUILDER_ADMIN_VIEWS="Admin Views"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_ACCESS="Admin Views Access"
@@ -324,9 +326,9 @@ COM_COMPONENTBUILDER_ADMIN_VIEWS_BATCH_USE_DESC="Allows users in this group to u
 COM_COMPONENTBUILDER_ADMIN_VIEWS_CREATE="Admin Views Create"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_CREATE_DESC="Allows the users in this group to create create admin views"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_ADD="Admin Views Dashboard Add"
-COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the admin view"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of admin view"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_LIST="Admin Views Dashboard List"
-COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the admin view"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of admin view"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_DELETE="Admin Views Delete"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_DELETE_DESC="Allows the users in this group to delete delete admin views"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT="Admin Views Edit"
@@ -363,7 +365,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEWS_N_ITEMS_UNFEATURED_1="%s Admin View unfeatured.
 COM_COMPONENTBUILDER_ADMIN_VIEWS_N_ITEMS_UNPUBLISHED="%s Admin Views unpublished."
 COM_COMPONENTBUILDER_ADMIN_VIEWS_N_ITEMS_UNPUBLISHED_1="%s Admin View unpublished."
 COM_COMPONENTBUILDER_ADMIN_VIEWS_SUBMENU="Admin Views Submenu"
-COM_COMPONENTBUILDER_ADMIN_VIEWS_SUBMENU_DESC="Allows the users in this group to update the submenu of the admin view"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_SUBMENU_DESC="Allows the users in this group to submenu of admin view"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ACTION_DESCRIPTION="Enter Action Name Here"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ACTION_LABEL="Action Name"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD="Add"
@@ -1001,8 +1003,8 @@ COM_COMPONENTBUILDER_BACKUP_WAS_DONE_SUCCESSFULLY="Backup was done successfully"
 COM_COMPONENTBUILDER_BACK_TO_LIBRARIES="Back to Libraries"
 COM_COMPONENTBUILDER_BADMIN_FIELDS_RELATIONSB_IDS_MISMATCH_IN_BFIELDSB_AND_WAS_NOT_UPDATED_IN_THE_CUSTOM_CODE="<b>Admin fields relations</b> id:%s mismatch in <b>field:%s</b>, and was not updated in the custom code."
 COM_COMPONENTBUILDER_BASIC_TUTORIAL_ON_GIT_BSB="Basic Tutorial on git: <b>%s</b>"
-COM_COMPONENTBUILDER_BBEST_TO_NOT_CONTINUEBBR_THIS_PACKAGE_BFAILEDB_CHECKSUM_VALIDATION_THIS_COULD_BE_A_SERIOUS_SECURITY_BREACH_DO_NOT_CONTINUE="<b>Best to not continue!</b><br />This package <b>FAILED</b> checksum validation, this could be a serious security breach! DO NOT CONTINUE!!!"
 COM_COMPONENTBUILDER_BBEST_TO_NOT_CONTINUEBBR_WE_COULD_NOT_LOAD_THE_CHECKSUM_FOR_THIS_PACKAGE_AND_SO_NO_VALIDATION_WAS_POSSIBLE_THIS_MAY_BE_DUE_TO_YOUR_NETWORK_OR_A_CHANGE_TO_THAT_PACKAGE_NAME="<b>Best to not continue!</b><br />We could not load the checksum for this package, and so no validation was possible. This may be due to your network, or a change to that package name."
+COM_COMPONENTBUILDER_BBEST_TO_NOT_CONTINUEBBR_YOU_CAN_REFRESH_AND_TRY_AGAINBR_BUT_NOTE_THAT_THIS_PACKAGE_BFAILEDB_CHECKSUM_VALIDATION_THIS_COULD_BE_A_SERIOUS_SECURITY_BREACH_DO_NOT_CONTINUE="<b>Best to not continue!</b><br />You can Refresh and try again.<br />But note that this package <b>FAILED</b> checksum validation, this could be a serious security breach! DO NOT CONTINUE!!!"
 COM_COMPONENTBUILDER_BCUSTOM_FILESB_NOT_MOVED_TO_CORRECT_LOCATION="<b>Custom files</b> not moved to correct location!"
 COM_COMPONENTBUILDER_BEHIND="Behind"
 COM_COMPONENTBUILDER_BEHIND_MEANS_YOUR_BLOCAL_SNIPPETB_WITH_THE_SAME_NAME_LIBRARY_AND_TYPE_HAS_A_BOLDER_MODIFIED_DATEB_THEN_THE_COMMUNITY_SNIPPET_WITH_THE_SAME_NAME_LIBRARY_AND_TYPE="Behind means your <b>local snippet</b> (with the same name, library and type) has a <b>older modified date</b> then the community snippet (with the same name, library and type)."
@@ -1046,10 +1048,10 @@ COM_COMPONENTBUILDER_COMPILER_ACCESS_DESC=" Allows the users in this group to ac
 COM_COMPONENTBUILDER_COMPILER_CLEAR_TMP_BUTTON_ACCESS="Compiler Clear tmp Button Access"
 COM_COMPONENTBUILDER_COMPILER_CLEAR_TMP_BUTTON_ACCESS_DESC=" Allows the users in this group to access the clear tmp button."
 COM_COMPONENTBUILDER_COMPILER_DASHBOARD_LIST="Compiler Dashboard List"
-COM_COMPONENTBUILDER_COMPILER_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the Compiler"
+COM_COMPONENTBUILDER_COMPILER_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of Compiler"
 COM_COMPONENTBUILDER_COMPILER_DESC="The compiler"
 COM_COMPONENTBUILDER_COMPILER_SUBMENU="Compiler Submenu"
-COM_COMPONENTBUILDER_COMPILER_SUBMENU_DESC="Allows the users in this group to update the submenu of the Compiler"
+COM_COMPONENTBUILDER_COMPILER_SUBMENU_DESC="Allows the users in this group to submenu of Compiler"
 COM_COMPONENTBUILDER_COMPILE_COMPONENT="Compile Component"
 COM_COMPONENTBUILDER_COMPONENTS="Components"
 COM_COMPONENTBUILDER_COMPONENTS_ADMIN_VIEWS="Components Admin Views"
@@ -2671,9 +2673,9 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_BATCH_USE_DESC="Allows users in this gro
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_CREATE="Custom Admin Views Create"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_CREATE_DESC="Allows the users in this group to create create custom admin views"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_DASHBOARD_ADD="Custom Admin Views Dashboard Add"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the custom admin view"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of custom admin view"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_DASHBOARD_LIST="Custom Admin Views Dashboard List"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the custom admin view"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of custom admin view"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_DELETE="Custom Admin Views Delete"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_DELETE_DESC="Allows the users in this group to delete delete custom admin views"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_EDIT="Custom Admin Views Edit"
@@ -2706,7 +2708,7 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_N_ITEMS_UNFEATURED_1="%s Custom Admin Vi
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_N_ITEMS_UNPUBLISHED="%s Custom Admin Views unpublished."
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_N_ITEMS_UNPUBLISHED_1="%s Custom Admin View unpublished."
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_SUBMENU="Custom Admin Views Submenu"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_SUBMENU_DESC="Allows the users in this group to update the submenu of the custom admin view"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_SUBMENU_DESC="Allows the users in this group to submenu of custom admin view"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADDRESS="Address"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_CSS="Add Css"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_CSS_DOCUMENT="Add Css Document"
@@ -3115,7 +3117,7 @@ COM_COMPONENTBUILDER_CUSTOM_CODES_BATCH_USE_DESC="Allows users in this group to
 COM_COMPONENTBUILDER_CUSTOM_CODES_CREATE="Custom Codes Create"
 COM_COMPONENTBUILDER_CUSTOM_CODES_CREATE_DESC="Allows the users in this group to create create custom codes"
 COM_COMPONENTBUILDER_CUSTOM_CODES_DASHBOARD_LIST="Custom Codes Dashboard List"
-COM_COMPONENTBUILDER_CUSTOM_CODES_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the custom code"
+COM_COMPONENTBUILDER_CUSTOM_CODES_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of custom code"
 COM_COMPONENTBUILDER_CUSTOM_CODES_DELETE="Custom Codes Delete"
 COM_COMPONENTBUILDER_CUSTOM_CODES_DELETE_DESC="Allows the users in this group to delete delete custom codes"
 COM_COMPONENTBUILDER_CUSTOM_CODES_EDIT="Custom Codes Edit"
@@ -3152,7 +3154,7 @@ COM_COMPONENTBUILDER_CUSTOM_CODES_N_ITEMS_UNFEATURED_1="%s Custom Code unfeature
 COM_COMPONENTBUILDER_CUSTOM_CODES_N_ITEMS_UNPUBLISHED="%s Custom Codes unpublished."
 COM_COMPONENTBUILDER_CUSTOM_CODES_N_ITEMS_UNPUBLISHED_1="%s Custom Code unpublished."
 COM_COMPONENTBUILDER_CUSTOM_CODES_SUBMENU="Custom Codes Submenu"
-COM_COMPONENTBUILDER_CUSTOM_CODES_SUBMENU_DESC="Allows the users in this group to update the submenu of the custom code"
+COM_COMPONENTBUILDER_CUSTOM_CODES_SUBMENU_DESC="Allows the users in this group to submenu of custom code"
 COM_COMPONENTBUILDER_CUSTOM_CODE_CODE="Code"
 COM_COMPONENTBUILDER_CUSTOM_CODE_CODE_DESCRIPTION="Add your custom code here. <b>Do Not Add The Placeholders Here</b>, it will be added to the code dynamically!"
 COM_COMPONENTBUILDER_CUSTOM_CODE_CODE_LABEL="Custom code"
@@ -3400,9 +3402,9 @@ COM_COMPONENTBUILDER_DYNAMIC_GETS_BATCH_USE_DESC="Allows users in this group to
 COM_COMPONENTBUILDER_DYNAMIC_GETS_CREATE="Dynamic Gets Create"
 COM_COMPONENTBUILDER_DYNAMIC_GETS_CREATE_DESC="Allows the users in this group to create create dynamic gets"
 COM_COMPONENTBUILDER_DYNAMIC_GETS_DASHBOARD_ADD="Dynamic Gets Dashboard Add"
-COM_COMPONENTBUILDER_DYNAMIC_GETS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the dynamic get"
+COM_COMPONENTBUILDER_DYNAMIC_GETS_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of dynamic get"
 COM_COMPONENTBUILDER_DYNAMIC_GETS_DASHBOARD_LIST="Dynamic Gets Dashboard List"
-COM_COMPONENTBUILDER_DYNAMIC_GETS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the dynamic get"
+COM_COMPONENTBUILDER_DYNAMIC_GETS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of dynamic get"
 COM_COMPONENTBUILDER_DYNAMIC_GETS_DELETE="Dynamic Gets Delete"
 COM_COMPONENTBUILDER_DYNAMIC_GETS_DELETE_DESC="Allows the users in this group to delete delete dynamic gets"
 COM_COMPONENTBUILDER_DYNAMIC_GETS_EDIT="Dynamic Gets Edit"
@@ -3435,7 +3437,7 @@ COM_COMPONENTBUILDER_DYNAMIC_GETS_N_ITEMS_UNFEATURED_1="%s Dynamic Get unfeature
 COM_COMPONENTBUILDER_DYNAMIC_GETS_N_ITEMS_UNPUBLISHED="%s Dynamic Gets unpublished."
 COM_COMPONENTBUILDER_DYNAMIC_GETS_N_ITEMS_UNPUBLISHED_1="%s Dynamic Get unpublished."
 COM_COMPONENTBUILDER_DYNAMIC_GETS_SUBMENU="Dynamic Gets Submenu"
-COM_COMPONENTBUILDER_DYNAMIC_GETS_SUBMENU_DESC="Allows the users in this group to update the submenu of the dynamic get"
+COM_COMPONENTBUILDER_DYNAMIC_GETS_SUBMENU_DESC="Allows the users in this group to submenu of dynamic get"
 COM_COMPONENTBUILDER_DYNAMIC_GET_A="a"
 COM_COMPONENTBUILDER_DYNAMIC_GET_AA="aa"
 COM_COMPONENTBUILDER_DYNAMIC_GET_ABACUS="Abacus"
@@ -3694,6 +3696,7 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_Z="z"
 COM_COMPONENTBUILDER_DYNAMIC_GET_ZZ="zz"
 COM_COMPONENTBUILDER_EDIT="Edit"
 COM_COMPONENTBUILDER_EDITCREATE_SITE_VIEW="Edit/Create Site View"
+COM_COMPONENTBUILDER_EDITING="Editing"
 COM_COMPONENTBUILDER_EDIT_CREATED_BY="Edit Created By"
 COM_COMPONENTBUILDER_EDIT_CREATED_BY_DESC=" Allows users in this group to edit created by."
 COM_COMPONENTBUILDER_EDIT_CREATED_DATE="Edit Created Date"
@@ -3742,9 +3745,9 @@ COM_COMPONENTBUILDER_FIELDS_BATCH_USE_DESC="Allows users in this group to use ba
 COM_COMPONENTBUILDER_FIELDS_CREATE="Fields Create"
 COM_COMPONENTBUILDER_FIELDS_CREATE_DESC="Allows the users in this group to create create fields"
 COM_COMPONENTBUILDER_FIELDS_DASHBOARD_ADD="Fields Dashboard Add"
-COM_COMPONENTBUILDER_FIELDS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the field"
+COM_COMPONENTBUILDER_FIELDS_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of field"
 COM_COMPONENTBUILDER_FIELDS_DASHBOARD_LIST="Fields Dashboard List"
-COM_COMPONENTBUILDER_FIELDS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the field"
+COM_COMPONENTBUILDER_FIELDS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of field"
 COM_COMPONENTBUILDER_FIELDS_DELETE="Fields Delete"
 COM_COMPONENTBUILDER_FIELDS_DELETE_DESC="Allows the users in this group to delete delete fields"
 COM_COMPONENTBUILDER_FIELDS_EDIT="Fields Edit"
@@ -3777,7 +3780,7 @@ COM_COMPONENTBUILDER_FIELDS_N_ITEMS_UNFEATURED_1="%s Field unfeatured."
 COM_COMPONENTBUILDER_FIELDS_N_ITEMS_UNPUBLISHED="%s Fields unpublished."
 COM_COMPONENTBUILDER_FIELDS_N_ITEMS_UNPUBLISHED_1="%s Field unpublished."
 COM_COMPONENTBUILDER_FIELDS_SUBMENU="Fields Submenu"
-COM_COMPONENTBUILDER_FIELDS_SUBMENU_DESC="Allows the users in this group to update the submenu of the field"
+COM_COMPONENTBUILDER_FIELDS_SUBMENU_DESC="Allows the users in this group to submenu of field"
 COM_COMPONENTBUILDER_FIELDTYPE="Fieldtype"
 COM_COMPONENTBUILDER_FIELDTYPES="Fieldtypes"
 COM_COMPONENTBUILDER_FIELDTYPES_ACCESS="Fieldtypes Access"
@@ -3789,23 +3792,17 @@ COM_COMPONENTBUILDER_FIELDTYPES_BATCH_USE_DESC="Allows users in this group to us
 COM_COMPONENTBUILDER_FIELDTYPES_CREATE="Fieldtypes Create"
 COM_COMPONENTBUILDER_FIELDTYPES_CREATE_DESC="Allows the users in this group to create create fieldtypes"
 COM_COMPONENTBUILDER_FIELDTYPES_DASHBOARD_ADD="Fieldtypes Dashboard Add"
-COM_COMPONENTBUILDER_FIELDTYPES_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the fieldtype"
+COM_COMPONENTBUILDER_FIELDTYPES_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of fieldtype"
 COM_COMPONENTBUILDER_FIELDTYPES_DASHBOARD_LIST="Fieldtypes Dashboard List"
-COM_COMPONENTBUILDER_FIELDTYPES_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the fieldtype"
+COM_COMPONENTBUILDER_FIELDTYPES_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of fieldtype"
 COM_COMPONENTBUILDER_FIELDTYPES_DELETE="Fieldtypes Delete"
 COM_COMPONENTBUILDER_FIELDTYPES_DELETE_DESC="Allows the users in this group to delete delete fieldtypes"
+COM_COMPONENTBUILDER_FIELDTYPES_DESCRIPTION="Fieldtypes Description"
+COM_COMPONENTBUILDER_FIELDTYPES_DESCRIPTION_DESC="Allows the users in this group to description of fieldtype"
 COM_COMPONENTBUILDER_FIELDTYPES_EDIT="Fieldtypes Edit"
 COM_COMPONENTBUILDER_FIELDTYPES_EDIT_DESC="Allows the users in this group to edit the fieldtype"
-COM_COMPONENTBUILDER_FIELDTYPES_EDIT_DESCRIPTION="Fieldtypes Edit Description"
-COM_COMPONENTBUILDER_FIELDTYPES_EDIT_DESCRIPTION_DESC="Allows the users in this group to update the edit description of the fieldtype"
-COM_COMPONENTBUILDER_FIELDTYPES_EDIT_NAME="Fieldtypes Edit Name"
-COM_COMPONENTBUILDER_FIELDTYPES_EDIT_NAME_DESC="Allows the users in this group to update the edit name of the fieldtype"
 COM_COMPONENTBUILDER_FIELDTYPES_EDIT_OWN="Fieldtypes Edit Own"
 COM_COMPONENTBUILDER_FIELDTYPES_EDIT_OWN_DESC="Allows the users in this group to edit edit own fieldtypes created by them"
-COM_COMPONENTBUILDER_FIELDTYPES_EDIT_PROPERTIES="Fieldtypes Edit Properties"
-COM_COMPONENTBUILDER_FIELDTYPES_EDIT_PROPERTIES_DESC="Allows the users in this group to update the edit properties of the fieldtype"
-COM_COMPONENTBUILDER_FIELDTYPES_EDIT_SHORT_DESCRIPTION="Fieldtypes Edit Short Description"
-COM_COMPONENTBUILDER_FIELDTYPES_EDIT_SHORT_DESCRIPTION_DESC="Allows the users in this group to update the edit short description of the fieldtype"
 COM_COMPONENTBUILDER_FIELDTYPES_EDIT_STATE="Fieldtypes Edit State"
 COM_COMPONENTBUILDER_FIELDTYPES_EDIT_STATE_DESC="Allows the users in this group to update the state of the fieldtype"
 COM_COMPONENTBUILDER_FIELDTYPES_EDIT_VERSION="Fieldtypes Edit Version"
@@ -3814,6 +3811,8 @@ COM_COMPONENTBUILDER_FIELDTYPES_EXPORT="Fieldtypes Export"
 COM_COMPONENTBUILDER_FIELDTYPES_EXPORT_DESC="Allows the users in this group to export export fieldtypes"
 COM_COMPONENTBUILDER_FIELDTYPES_IMPORT="Fieldtypes Import"
 COM_COMPONENTBUILDER_FIELDTYPES_IMPORT_DESC="Allows the users in this group to import import fieldtypes"
+COM_COMPONENTBUILDER_FIELDTYPES_NAME="Fieldtypes Name"
+COM_COMPONENTBUILDER_FIELDTYPES_NAME_DESC="Allows the users in this group to name of fieldtype"
 COM_COMPONENTBUILDER_FIELDTYPES_N_ITEMS_ARCHIVED="%s Fieldtypes archived."
 COM_COMPONENTBUILDER_FIELDTYPES_N_ITEMS_ARCHIVED_1="%s Fieldtype archived."
 COM_COMPONENTBUILDER_FIELDTYPES_N_ITEMS_CHECKED_IN_0="No Fieldtype successfully checked in."
@@ -3831,8 +3830,12 @@ COM_COMPONENTBUILDER_FIELDTYPES_N_ITEMS_UNFEATURED="%s Fieldtypes unfeatured."
 COM_COMPONENTBUILDER_FIELDTYPES_N_ITEMS_UNFEATURED_1="%s Fieldtype unfeatured."
 COM_COMPONENTBUILDER_FIELDTYPES_N_ITEMS_UNPUBLISHED="%s Fieldtypes unpublished."
 COM_COMPONENTBUILDER_FIELDTYPES_N_ITEMS_UNPUBLISHED_1="%s Fieldtype unpublished."
+COM_COMPONENTBUILDER_FIELDTYPES_PROPERTIES="Fieldtypes Properties"
+COM_COMPONENTBUILDER_FIELDTYPES_PROPERTIES_DESC="Allows the users in this group to properties of fieldtype"
+COM_COMPONENTBUILDER_FIELDTYPES_SHORT_DESCRIPTION="Fieldtypes Short Description"
+COM_COMPONENTBUILDER_FIELDTYPES_SHORT_DESCRIPTION_DESC="Allows the users in this group to short description of fieldtype"
 COM_COMPONENTBUILDER_FIELDTYPES_SUBMENU="Fieldtypes Submenu"
-COM_COMPONENTBUILDER_FIELDTYPES_SUBMENU_DESC="Allows the users in this group to update the submenu of the fieldtype"
+COM_COMPONENTBUILDER_FIELDTYPES_SUBMENU_DESC="Allows the users in this group to submenu of fieldtype"
 COM_COMPONENTBUILDER_FIELDTYPE_ADJUSTABLE_DESCRIPTION="Select if the value is adjustable.<br />If not the Value/Example will be enforced."
 COM_COMPONENTBUILDER_FIELDTYPE_ADJUSTABLE_LABEL="Adjustable"
 COM_COMPONENTBUILDER_FIELDTYPE_CATID_DESCRIPTION="select one of the following categories"
@@ -4067,9 +4070,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"
@@ -4133,7 +4136,7 @@ COM_COMPONENTBUILDER_GET_SNIPPETS_ACCESS_DESC=" Allows the users in this group t
 COM_COMPONENTBUILDER_GET_SNIPPETS_CUSTOM_ADMIN_VIEWS_BUTTON_ACCESS="Get Snippets Custom Admin Views Button Access"
 COM_COMPONENTBUILDER_GET_SNIPPETS_CUSTOM_ADMIN_VIEWS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the custom admin views button."
 COM_COMPONENTBUILDER_GET_SNIPPETS_DASHBOARD_LIST="Get Snippets Dashboard List"
-COM_COMPONENTBUILDER_GET_SNIPPETS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the Get Snippets"
+COM_COMPONENTBUILDER_GET_SNIPPETS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of Get Snippets"
 COM_COMPONENTBUILDER_GET_SNIPPETS_DESC="The compiler"
 COM_COMPONENTBUILDER_GET_SNIPPETS_LAYOUTS_BUTTON_ACCESS="Get Snippets Layouts Button Access"
 COM_COMPONENTBUILDER_GET_SNIPPETS_LAYOUTS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the layouts button."
@@ -4144,7 +4147,7 @@ COM_COMPONENTBUILDER_GET_SNIPPETS_SITE_VIEWS_BUTTON_ACCESS_DESC=" Allows the use
 COM_COMPONENTBUILDER_GET_SNIPPETS_SNIPPETS_BUTTON_ACCESS="Get Snippets Snippets Button Access"
 COM_COMPONENTBUILDER_GET_SNIPPETS_SNIPPETS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the snippets button."
 COM_COMPONENTBUILDER_GET_SNIPPETS_SUBMENU="Get Snippets Submenu"
-COM_COMPONENTBUILDER_GET_SNIPPETS_SUBMENU_DESC="Allows the users in this group to update the submenu of the Get Snippets"
+COM_COMPONENTBUILDER_GET_SNIPPETS_SUBMENU_DESC="Allows the users in this group to submenu of Get Snippets"
 COM_COMPONENTBUILDER_GET_SNIPPETS_TEMPLATES_BUTTON_ACCESS="Get Snippets Templates Button Access"
 COM_COMPONENTBUILDER_GET_SNIPPETS_TEMPLATES_BUTTON_ACCESS_DESC=" Allows the users in this group to access the templates button."
 COM_COMPONENTBUILDER_GET_THE_SNIPPET_FROM_GITHUB_AND_INSTALL_IT_LOCALLY="Get the snippet from gitHub and install it locally"
@@ -4165,7 +4168,7 @@ COM_COMPONENTBUILDER_HELP_DOCUMENTS_BATCH_USE_DESC="Allows users in this group t
 COM_COMPONENTBUILDER_HELP_DOCUMENTS_CREATE="Help Documents Create"
 COM_COMPONENTBUILDER_HELP_DOCUMENTS_CREATE_DESC="Allows the users in this group to create create help documents"
 COM_COMPONENTBUILDER_HELP_DOCUMENTS_DASHBOARD_LIST="Help Documents Dashboard List"
-COM_COMPONENTBUILDER_HELP_DOCUMENTS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the help document"
+COM_COMPONENTBUILDER_HELP_DOCUMENTS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of help document"
 COM_COMPONENTBUILDER_HELP_DOCUMENTS_DELETE="Help Documents Delete"
 COM_COMPONENTBUILDER_HELP_DOCUMENTS_DELETE_DESC="Allows the users in this group to delete delete help documents"
 COM_COMPONENTBUILDER_HELP_DOCUMENTS_EDIT="Help Documents Edit"
@@ -4198,7 +4201,7 @@ COM_COMPONENTBUILDER_HELP_DOCUMENTS_N_ITEMS_UNFEATURED_1="%s Help Document unfea
 COM_COMPONENTBUILDER_HELP_DOCUMENTS_N_ITEMS_UNPUBLISHED="%s Help Documents unpublished."
 COM_COMPONENTBUILDER_HELP_DOCUMENTS_N_ITEMS_UNPUBLISHED_1="%s Help Document unpublished."
 COM_COMPONENTBUILDER_HELP_DOCUMENTS_SUBMENU="Help Documents Submenu"
-COM_COMPONENTBUILDER_HELP_DOCUMENTS_SUBMENU_DESC="Allows the users in this group to update the submenu of the help document"
+COM_COMPONENTBUILDER_HELP_DOCUMENTS_SUBMENU_DESC="Allows the users in this group to submenu of help document"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_ADMIN="Admin"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_ADMIN_VIEW="Admin View"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_ADMIN_VIEW_DESCRIPTION="Select the view being target."
@@ -4353,9 +4356,9 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_BATCH_USE_DESC="Allows users in this grou
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_CREATE="Joomla Components Create"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_CREATE_DESC="Allows the users in this group to create create joomla components"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_DASHBOARD_ADD="Joomla Components Dashboard Add"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the joomla component"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of joomla component"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_DASHBOARD_LIST="Joomla Components Dashboard List"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the joomla component"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of joomla component"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_DELETE="Joomla Components Delete"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_DELETE_DESC="Allows the users in this group to delete delete joomla components"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT="Joomla Components Edit"
@@ -4388,7 +4391,7 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_N_ITEMS_UNFEATURED_1="%s Joomla Component
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_N_ITEMS_UNPUBLISHED="%s Joomla Components unpublished."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_N_ITEMS_UNPUBLISHED_1="%s Joomla Component unpublished."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_SUBMENU="Joomla Components Submenu"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_SUBMENU_DESC="Allows the users in this group to update the submenu of the joomla component"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_SUBMENU_DESC="Allows the users in this group to submenu of joomla component"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADDCONTRIBUTORS="Addcontributors"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADDCONTRIBUTORS_DESCRIPTION="Setup contributors for the component."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADDCONTRIBUTORS_LABEL="Contributors"
@@ -4678,7 +4681,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 +4785,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"
@@ -4848,7 +4856,7 @@ COM_COMPONENTBUILDER_LANGUAGES_N_ITEMS_UNFEATURED_1="%s Language unfeatured."
 COM_COMPONENTBUILDER_LANGUAGES_N_ITEMS_UNPUBLISHED="%s Languages unpublished."
 COM_COMPONENTBUILDER_LANGUAGES_N_ITEMS_UNPUBLISHED_1="%s Language unpublished."
 COM_COMPONENTBUILDER_LANGUAGES_SUBMENU="Languages Submenu"
-COM_COMPONENTBUILDER_LANGUAGES_SUBMENU_DESC="Allows the users in this group to update the submenu of the language"
+COM_COMPONENTBUILDER_LANGUAGES_SUBMENU_DESC="Allows the users in this group to submenu of language"
 COM_COMPONENTBUILDER_LANGUAGE_BUILD_BUTTON_ACCESS="Language Build Button Access"
 COM_COMPONENTBUILDER_LANGUAGE_BUILD_BUTTON_ACCESS_DESC=" Allows the users in this group to access the build button."
 COM_COMPONENTBUILDER_LANGUAGE_CREATED_BY_DESC="The user that created this Language."
@@ -4890,7 +4898,7 @@ COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_BATCH_USE_DESC="Allows users in this
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_CREATE="Language Translations Create"
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_CREATE_DESC="Allows the users in this group to create create language translations"
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_DASHBOARD_LIST="Language Translations Dashboard List"
-COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the language translation"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of language translation"
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_DELETE="Language Translations Delete"
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_DELETE_DESC="Allows the users in this group to delete delete language translations"
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT="Language Translations Edit"
@@ -4923,7 +4931,7 @@ COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_N_ITEMS_UNFEATURED_1="%s Language Tra
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_N_ITEMS_UNPUBLISHED="%s Language Translations unpublished."
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_N_ITEMS_UNPUBLISHED_1="%s Language Translation unpublished."
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_SUBMENU="Language Translations Submenu"
-COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_SUBMENU_DESC="Allows the users in this group to update the submenu of the language translation"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_SUBMENU_DESC="Allows the users in this group to submenu of language translation"
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_COMPONENTS="Components"
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_COMPONENTS_LABEL="Components"
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_CREATED_BY_DESC="The user that created this Language Translation."
@@ -4972,9 +4980,9 @@ COM_COMPONENTBUILDER_LAYOUTS_BATCH_USE_DESC="Allows users in this group to use b
 COM_COMPONENTBUILDER_LAYOUTS_CREATE="Layouts Create"
 COM_COMPONENTBUILDER_LAYOUTS_CREATE_DESC="Allows the users in this group to create create layouts"
 COM_COMPONENTBUILDER_LAYOUTS_DASHBOARD_ADD="Layouts Dashboard Add"
-COM_COMPONENTBUILDER_LAYOUTS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the layout"
+COM_COMPONENTBUILDER_LAYOUTS_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of layout"
 COM_COMPONENTBUILDER_LAYOUTS_DASHBOARD_LIST="Layouts Dashboard List"
-COM_COMPONENTBUILDER_LAYOUTS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the layout"
+COM_COMPONENTBUILDER_LAYOUTS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of layout"
 COM_COMPONENTBUILDER_LAYOUTS_DELETE="Layouts Delete"
 COM_COMPONENTBUILDER_LAYOUTS_DELETE_DESC="Allows the users in this group to delete delete layouts"
 COM_COMPONENTBUILDER_LAYOUTS_EDIT="Layouts Edit"
@@ -5007,7 +5015,7 @@ COM_COMPONENTBUILDER_LAYOUTS_N_ITEMS_UNFEATURED_1="%s Layout unfeatured."
 COM_COMPONENTBUILDER_LAYOUTS_N_ITEMS_UNPUBLISHED="%s Layouts unpublished."
 COM_COMPONENTBUILDER_LAYOUTS_N_ITEMS_UNPUBLISHED_1="%s Layout unpublished."
 COM_COMPONENTBUILDER_LAYOUTS_SUBMENU="Layouts Submenu"
-COM_COMPONENTBUILDER_LAYOUTS_SUBMENU_DESC="Allows the users in this group to update the submenu of the layout"
+COM_COMPONENTBUILDER_LAYOUTS_SUBMENU_DESC="Allows the users in this group to submenu of layout"
 COM_COMPONENTBUILDER_LAYOUT_ADD_PHP_VIEW="Add Php View"
 COM_COMPONENTBUILDER_LAYOUT_ADD_PHP_VIEW_LABEL="Add PHP (custom view script)"
 COM_COMPONENTBUILDER_LAYOUT_ALIAS="Alias"
@@ -5127,7 +5135,7 @@ COM_COMPONENTBUILDER_LIBRARIES_CONFIG_N_ITEMS_UNPUBLISHED_1="%s Library Config u
 COM_COMPONENTBUILDER_LIBRARIES_CREATE="Libraries Create"
 COM_COMPONENTBUILDER_LIBRARIES_CREATE_DESC="Allows the users in this group to create create libraries"
 COM_COMPONENTBUILDER_LIBRARIES_DASHBOARD_LIST="Libraries Dashboard List"
-COM_COMPONENTBUILDER_LIBRARIES_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the library"
+COM_COMPONENTBUILDER_LIBRARIES_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of library"
 COM_COMPONENTBUILDER_LIBRARIES_DELETE="Libraries Delete"
 COM_COMPONENTBUILDER_LIBRARIES_DELETE_DESC="Allows the users in this group to delete delete libraries"
 COM_COMPONENTBUILDER_LIBRARIES_EDIT="Libraries Edit"
@@ -5196,7 +5204,7 @@ COM_COMPONENTBUILDER_LIBRARIES_N_ITEMS_UNFEATURED_1="%s Library unfeatured."
 COM_COMPONENTBUILDER_LIBRARIES_N_ITEMS_UNPUBLISHED="%s Libraries unpublished."
 COM_COMPONENTBUILDER_LIBRARIES_N_ITEMS_UNPUBLISHED_1="%s Library unpublished."
 COM_COMPONENTBUILDER_LIBRARIES_SUBMENU="Libraries Submenu"
-COM_COMPONENTBUILDER_LIBRARIES_SUBMENU_DESC="Allows the users in this group to update the submenu of the library"
+COM_COMPONENTBUILDER_LIBRARIES_SUBMENU_DESC="Allows the users in this group to submenu of library"
 COM_COMPONENTBUILDER_LIBRARY="Library"
 COM_COMPONENTBUILDER_LIBRARY_ACTIVE_ONLY_FOUR_TEXT_FIELD="Active (only 4 text_field)"
 COM_COMPONENTBUILDER_LIBRARY_ADDCONDITIONS="Addconditions"
@@ -5486,6 +5494,7 @@ COM_COMPONENTBUILDER_NEW_ISSUE="New Issue"
 COM_COMPONENTBUILDER_NEW_MEANS_THAT_WE_COULD_NOT_FIND_A_LOCAL_SNIPPET_WITH_THE_SAME_NAME_LIBRARY_AND_TYPE_AND_SO_HAVE_MARKED_THIS_SNIPPET_AS_NEW="New means that we could not find a local snippet with the same name, library and type, and so have marked this snippet as new."
 COM_COMPONENTBUILDER_NEW_NOTICE="New Notice"
 COM_COMPONENTBUILDER_NO="No"
+COM_COMPONENTBUILDER_NONE="None"
 COM_COMPONENTBUILDER_NONE_DB="None DB"
 COM_COMPONENTBUILDER_NONE_SELECTED="None selected"
 COM_COMPONENTBUILDER_NOTICE_BOARD="Notice Board"
@@ -5590,7 +5599,7 @@ COM_COMPONENTBUILDER_SERVERS_BATCH_USE_DESC="Allows users in this group to use b
 COM_COMPONENTBUILDER_SERVERS_CREATE="Servers Create"
 COM_COMPONENTBUILDER_SERVERS_CREATE_DESC="Allows the users in this group to create create servers"
 COM_COMPONENTBUILDER_SERVERS_DASHBOARD_LIST="Servers Dashboard List"
-COM_COMPONENTBUILDER_SERVERS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the server"
+COM_COMPONENTBUILDER_SERVERS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of server"
 COM_COMPONENTBUILDER_SERVERS_DELETE="Servers Delete"
 COM_COMPONENTBUILDER_SERVERS_DELETE_DESC="Allows the users in this group to delete delete servers"
 COM_COMPONENTBUILDER_SERVERS_EDIT="Servers Edit"
@@ -5627,7 +5636,7 @@ COM_COMPONENTBUILDER_SERVERS_N_ITEMS_UNFEATURED_1="%s Server unfeatured."
 COM_COMPONENTBUILDER_SERVERS_N_ITEMS_UNPUBLISHED="%s Servers unpublished."
 COM_COMPONENTBUILDER_SERVERS_N_ITEMS_UNPUBLISHED_1="%s Server unpublished."
 COM_COMPONENTBUILDER_SERVERS_SUBMENU="Servers Submenu"
-COM_COMPONENTBUILDER_SERVERS_SUBMENU_DESC="Allows the users in this group to update the submenu of the server"
+COM_COMPONENTBUILDER_SERVERS_SUBMENU_DESC="Allows the users in this group to submenu of server"
 COM_COMPONENTBUILDER_SERVER_AUTHENTICATION="Authentication"
 COM_COMPONENTBUILDER_SERVER_AUTHENTICATION_DESCRIPTION="Select the authentication type to use with SFTP."
 COM_COMPONENTBUILDER_SERVER_AUTHENTICATION_LABEL="Authentication Type"
@@ -5751,9 +5760,9 @@ COM_COMPONENTBUILDER_SITE_VIEWS_BATCH_USE_DESC="Allows users in this group to us
 COM_COMPONENTBUILDER_SITE_VIEWS_CREATE="Site Views Create"
 COM_COMPONENTBUILDER_SITE_VIEWS_CREATE_DESC="Allows the users in this group to create create site views"
 COM_COMPONENTBUILDER_SITE_VIEWS_DASHBOARD_ADD="Site Views Dashboard Add"
-COM_COMPONENTBUILDER_SITE_VIEWS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the site view"
+COM_COMPONENTBUILDER_SITE_VIEWS_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of site view"
 COM_COMPONENTBUILDER_SITE_VIEWS_DASHBOARD_LIST="Site Views Dashboard List"
-COM_COMPONENTBUILDER_SITE_VIEWS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the site view"
+COM_COMPONENTBUILDER_SITE_VIEWS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of site view"
 COM_COMPONENTBUILDER_SITE_VIEWS_DELETE="Site Views Delete"
 COM_COMPONENTBUILDER_SITE_VIEWS_DELETE_DESC="Allows the users in this group to delete delete site views"
 COM_COMPONENTBUILDER_SITE_VIEWS_EDIT="Site Views Edit"
@@ -5786,7 +5795,7 @@ COM_COMPONENTBUILDER_SITE_VIEWS_N_ITEMS_UNFEATURED_1="%s Site View unfeatured."
 COM_COMPONENTBUILDER_SITE_VIEWS_N_ITEMS_UNPUBLISHED="%s Site Views unpublished."
 COM_COMPONENTBUILDER_SITE_VIEWS_N_ITEMS_UNPUBLISHED_1="%s Site View unpublished."
 COM_COMPONENTBUILDER_SITE_VIEWS_SUBMENU="Site Views Submenu"
-COM_COMPONENTBUILDER_SITE_VIEWS_SUBMENU_DESC="Allows the users in this group to update the submenu of the site view"
+COM_COMPONENTBUILDER_SITE_VIEWS_SUBMENU_DESC="Allows the users in this group to submenu of site view"
 COM_COMPONENTBUILDER_SITE_VIEW_ADDRESS="Address"
 COM_COMPONENTBUILDER_SITE_VIEW_ADD_CSS="Add Css"
 COM_COMPONENTBUILDER_SITE_VIEW_ADD_CSS_DOCUMENT="Add Css Document"
@@ -6204,7 +6213,7 @@ COM_COMPONENTBUILDER_SNIPPETS_COULD_NOT_BE_UPDATEDSAVED="Snippets could not be u
 COM_COMPONENTBUILDER_SNIPPETS_CREATE="Snippets Create"
 COM_COMPONENTBUILDER_SNIPPETS_CREATE_DESC="Allows the users in this group to create create snippets"
 COM_COMPONENTBUILDER_SNIPPETS_DASHBOARD_LIST="Snippets Dashboard List"
-COM_COMPONENTBUILDER_SNIPPETS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the snippet"
+COM_COMPONENTBUILDER_SNIPPETS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of snippet"
 COM_COMPONENTBUILDER_SNIPPETS_DELETE="Snippets Delete"
 COM_COMPONENTBUILDER_SNIPPETS_DELETE_DESC="Allows the users in this group to delete delete snippets"
 COM_COMPONENTBUILDER_SNIPPETS_EDIT="Snippets Edit"
@@ -6237,7 +6246,7 @@ COM_COMPONENTBUILDER_SNIPPETS_N_ITEMS_UNFEATURED_1="%s Snippet unfeatured."
 COM_COMPONENTBUILDER_SNIPPETS_N_ITEMS_UNPUBLISHED="%s Snippets unpublished."
 COM_COMPONENTBUILDER_SNIPPETS_N_ITEMS_UNPUBLISHED_1="%s Snippet unpublished."
 COM_COMPONENTBUILDER_SNIPPETS_SUBMENU="Snippets Submenu"
-COM_COMPONENTBUILDER_SNIPPETS_SUBMENU_DESC="Allows the users in this group to update the submenu of the snippet"
+COM_COMPONENTBUILDER_SNIPPETS_SUBMENU_DESC="Allows the users in this group to submenu of snippet"
 COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR="Contributor"
 COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR_COMPANY="Contributor Company"
 COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR_COMPANY_DESCRIPTION="The contributor company name"
@@ -6433,9 +6442,9 @@ COM_COMPONENTBUILDER_TEMPLATES_BATCH_USE_DESC="Allows users in this group to use
 COM_COMPONENTBUILDER_TEMPLATES_CREATE="Templates Create"
 COM_COMPONENTBUILDER_TEMPLATES_CREATE_DESC="Allows the users in this group to create create templates"
 COM_COMPONENTBUILDER_TEMPLATES_DASHBOARD_ADD="Templates Dashboard Add"
-COM_COMPONENTBUILDER_TEMPLATES_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the template"
+COM_COMPONENTBUILDER_TEMPLATES_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of template"
 COM_COMPONENTBUILDER_TEMPLATES_DASHBOARD_LIST="Templates Dashboard List"
-COM_COMPONENTBUILDER_TEMPLATES_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the template"
+COM_COMPONENTBUILDER_TEMPLATES_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of template"
 COM_COMPONENTBUILDER_TEMPLATES_DELETE="Templates Delete"
 COM_COMPONENTBUILDER_TEMPLATES_DELETE_DESC="Allows the users in this group to delete delete templates"
 COM_COMPONENTBUILDER_TEMPLATES_EDIT="Templates Edit"
@@ -6468,7 +6477,7 @@ COM_COMPONENTBUILDER_TEMPLATES_N_ITEMS_UNFEATURED_1="%s Template unfeatured."
 COM_COMPONENTBUILDER_TEMPLATES_N_ITEMS_UNPUBLISHED="%s Templates unpublished."
 COM_COMPONENTBUILDER_TEMPLATES_N_ITEMS_UNPUBLISHED_1="%s Template unpublished."
 COM_COMPONENTBUILDER_TEMPLATES_SUBMENU="Templates Submenu"
-COM_COMPONENTBUILDER_TEMPLATES_SUBMENU_DESC="Allows the users in this group to update the submenu of the template"
+COM_COMPONENTBUILDER_TEMPLATES_SUBMENU_DESC="Allows the users in this group to submenu of template"
 COM_COMPONENTBUILDER_TEMPLATE_ADD_PHP_VIEW="Add Php View"
 COM_COMPONENTBUILDER_TEMPLATE_ADD_PHP_VIEW_LABEL="Add PHP (custom view script)"
 COM_COMPONENTBUILDER_TEMPLATE_ALIAS="Alias"
@@ -6632,7 +6641,7 @@ COM_COMPONENTBUILDER_VALIDATION_RULES_BATCH_USE_DESC="Allows users in this group
 COM_COMPONENTBUILDER_VALIDATION_RULES_CREATE="Validation Rules Create"
 COM_COMPONENTBUILDER_VALIDATION_RULES_CREATE_DESC="Allows the users in this group to create create validation rules"
 COM_COMPONENTBUILDER_VALIDATION_RULES_DASHBOARD_LIST="Validation Rules Dashboard List"
-COM_COMPONENTBUILDER_VALIDATION_RULES_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the validation rule"
+COM_COMPONENTBUILDER_VALIDATION_RULES_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of validation rule"
 COM_COMPONENTBUILDER_VALIDATION_RULES_DELETE="Validation Rules Delete"
 COM_COMPONENTBUILDER_VALIDATION_RULES_DELETE_DESC="Allows the users in this group to delete delete validation rules"
 COM_COMPONENTBUILDER_VALIDATION_RULES_EDIT="Validation Rules Edit"
@@ -6665,7 +6674,7 @@ COM_COMPONENTBUILDER_VALIDATION_RULES_N_ITEMS_UNFEATURED_1="%s Validation Rule u
 COM_COMPONENTBUILDER_VALIDATION_RULES_N_ITEMS_UNPUBLISHED="%s Validation Rules unpublished."
 COM_COMPONENTBUILDER_VALIDATION_RULES_N_ITEMS_UNPUBLISHED_1="%s Validation Rule unpublished."
 COM_COMPONENTBUILDER_VALIDATION_RULES_SUBMENU="Validation Rules Submenu"
-COM_COMPONENTBUILDER_VALIDATION_RULES_SUBMENU_DESC="Allows the users in this group to update the submenu of the validation rule"
+COM_COMPONENTBUILDER_VALIDATION_RULES_SUBMENU_DESC="Allows the users in this group to submenu of validation rule"
 COM_COMPONENTBUILDER_VALIDATION_RULE_CREATED_BY_DESC="The user that created this Validation Rule."
 COM_COMPONENTBUILDER_VALIDATION_RULE_CREATED_BY_LABEL="Created By"
 COM_COMPONENTBUILDER_VALIDATION_RULE_CREATED_DATE_DESC="The date this Validation Rule was created."

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

@@ -66,9 +66,9 @@ COM_COMPONENTBUILDER_ADMIN_VIEWS_BATCH_USE_DESC="Allows users in this group to u
 COM_COMPONENTBUILDER_ADMIN_VIEWS_CREATE="Admin Views Create"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_CREATE_DESC="Allows the users in this group to create create admin views"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_ADD="Admin Views Dashboard Add"
-COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the admin view"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of admin view"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_LIST="Admin Views Dashboard List"
-COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the admin view"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of admin view"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_DELETE="Admin Views Delete"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_DELETE_DESC="Allows the users in this group to delete delete admin views"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT="Admin Views Edit"
@@ -88,15 +88,15 @@ COM_COMPONENTBUILDER_ADMIN_VIEWS_EXPORT_DESC="Allows the users in this group to
 COM_COMPONENTBUILDER_ADMIN_VIEWS_IMPORT="Admin Views Import"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_IMPORT_DESC="Allows the users in this group to import import admin views"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_SUBMENU="Admin Views Submenu"
-COM_COMPONENTBUILDER_ADMIN_VIEWS_SUBMENU_DESC="Allows the users in this group to update the submenu of the admin view"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_SUBMENU_DESC="Allows the users in this group to submenu of admin view"
 COM_COMPONENTBUILDER_COMPILER_ACCESS="Compiler Access"
 COM_COMPONENTBUILDER_COMPILER_ACCESS_DESC=" Allows the users in this group to access compiler."
 COM_COMPONENTBUILDER_COMPILER_CLEAR_TMP_BUTTON_ACCESS="Compiler Clear tmp Button Access"
 COM_COMPONENTBUILDER_COMPILER_CLEAR_TMP_BUTTON_ACCESS_DESC=" Allows the users in this group to access the clear tmp button."
 COM_COMPONENTBUILDER_COMPILER_DASHBOARD_LIST="Compiler Dashboard List"
-COM_COMPONENTBUILDER_COMPILER_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the Compiler"
+COM_COMPONENTBUILDER_COMPILER_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of Compiler"
 COM_COMPONENTBUILDER_COMPILER_SUBMENU="Compiler Submenu"
-COM_COMPONENTBUILDER_COMPILER_SUBMENU_DESC="Allows the users in this group to update the submenu of the Compiler"
+COM_COMPONENTBUILDER_COMPILER_SUBMENU_DESC="Allows the users in this group to submenu of Compiler"
 COM_COMPONENTBUILDER_COMPONENTS_ADMIN_VIEWS_ACCESS="Components Admin Views Access"
 COM_COMPONENTBUILDER_COMPONENTS_ADMIN_VIEWS_ACCESS_DESC="Allows the users in this group to access access components admin views"
 COM_COMPONENTBUILDER_COMPONENTS_ADMIN_VIEWS_BATCH_USE="Components Admin Views Batch Use"
@@ -285,9 +285,9 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_BATCH_USE_DESC="Allows users in this gro
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_CREATE="Custom Admin Views Create"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_CREATE_DESC="Allows the users in this group to create create custom admin views"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_DASHBOARD_ADD="Custom Admin Views Dashboard Add"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the custom admin view"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of custom admin view"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_DASHBOARD_LIST="Custom Admin Views Dashboard List"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the custom admin view"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of custom admin view"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_DELETE="Custom Admin Views Delete"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_DELETE_DESC="Allows the users in this group to delete delete custom admin views"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_EDIT="Custom Admin Views Edit"
@@ -303,7 +303,7 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_EXPORT_DESC="Allows the users in this gr
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_IMPORT="Custom Admin Views Import"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_IMPORT_DESC="Allows the users in this group to import import custom admin views"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_SUBMENU="Custom Admin Views Submenu"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_SUBMENU_DESC="Allows the users in this group to update the submenu of the custom admin view"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_SUBMENU_DESC="Allows the users in this group to submenu of custom admin view"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_GET_SNIPPETS_BUTTON_ACCESS="Custom Admin View Get Snippets Button Access"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_GET_SNIPPETS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the get snippets button."
 COM_COMPONENTBUILDER_CUSTOM_CODES_ACCESS="Custom Codes Access"
@@ -313,7 +313,7 @@ COM_COMPONENTBUILDER_CUSTOM_CODES_BATCH_USE_DESC="Allows users in this group to
 COM_COMPONENTBUILDER_CUSTOM_CODES_CREATE="Custom Codes Create"
 COM_COMPONENTBUILDER_CUSTOM_CODES_CREATE_DESC="Allows the users in this group to create create custom codes"
 COM_COMPONENTBUILDER_CUSTOM_CODES_DASHBOARD_LIST="Custom Codes Dashboard List"
-COM_COMPONENTBUILDER_CUSTOM_CODES_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the custom code"
+COM_COMPONENTBUILDER_CUSTOM_CODES_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of custom code"
 COM_COMPONENTBUILDER_CUSTOM_CODES_DELETE="Custom Codes Delete"
 COM_COMPONENTBUILDER_CUSTOM_CODES_DELETE_DESC="Allows the users in this group to delete delete custom codes"
 COM_COMPONENTBUILDER_CUSTOM_CODES_EDIT="Custom Codes Edit"
@@ -333,7 +333,7 @@ COM_COMPONENTBUILDER_CUSTOM_CODES_EXPORT_DESC="Allows the users in this group to
 COM_COMPONENTBUILDER_CUSTOM_CODES_IMPORT="Custom Codes Import"
 COM_COMPONENTBUILDER_CUSTOM_CODES_IMPORT_DESC="Allows the users in this group to import import custom codes"
 COM_COMPONENTBUILDER_CUSTOM_CODES_SUBMENU="Custom Codes Submenu"
-COM_COMPONENTBUILDER_CUSTOM_CODES_SUBMENU_DESC="Allows the users in this group to update the submenu of the custom code"
+COM_COMPONENTBUILDER_CUSTOM_CODES_SUBMENU_DESC="Allows the users in this group to submenu of custom code"
 COM_COMPONENTBUILDER_DYNAMIC_GETS_ACCESS="Dynamic Gets Access"
 COM_COMPONENTBUILDER_DYNAMIC_GETS_ACCESS_DESC="Allows the users in this group to access access dynamic gets"
 COM_COMPONENTBUILDER_DYNAMIC_GETS_BATCH_USE="Dynamic Gets Batch Use"
@@ -341,9 +341,9 @@ COM_COMPONENTBUILDER_DYNAMIC_GETS_BATCH_USE_DESC="Allows users in this group to
 COM_COMPONENTBUILDER_DYNAMIC_GETS_CREATE="Dynamic Gets Create"
 COM_COMPONENTBUILDER_DYNAMIC_GETS_CREATE_DESC="Allows the users in this group to create create dynamic gets"
 COM_COMPONENTBUILDER_DYNAMIC_GETS_DASHBOARD_ADD="Dynamic Gets Dashboard Add"
-COM_COMPONENTBUILDER_DYNAMIC_GETS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the dynamic get"
+COM_COMPONENTBUILDER_DYNAMIC_GETS_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of dynamic get"
 COM_COMPONENTBUILDER_DYNAMIC_GETS_DASHBOARD_LIST="Dynamic Gets Dashboard List"
-COM_COMPONENTBUILDER_DYNAMIC_GETS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the dynamic get"
+COM_COMPONENTBUILDER_DYNAMIC_GETS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of dynamic get"
 COM_COMPONENTBUILDER_DYNAMIC_GETS_DELETE="Dynamic Gets Delete"
 COM_COMPONENTBUILDER_DYNAMIC_GETS_DELETE_DESC="Allows the users in this group to delete delete dynamic gets"
 COM_COMPONENTBUILDER_DYNAMIC_GETS_EDIT="Dynamic Gets Edit"
@@ -359,7 +359,7 @@ COM_COMPONENTBUILDER_DYNAMIC_GETS_EXPORT_DESC="Allows the users in this group to
 COM_COMPONENTBUILDER_DYNAMIC_GETS_IMPORT="Dynamic Gets Import"
 COM_COMPONENTBUILDER_DYNAMIC_GETS_IMPORT_DESC="Allows the users in this group to import import dynamic gets"
 COM_COMPONENTBUILDER_DYNAMIC_GETS_SUBMENU="Dynamic Gets Submenu"
-COM_COMPONENTBUILDER_DYNAMIC_GETS_SUBMENU_DESC="Allows the users in this group to update the submenu of the dynamic get"
+COM_COMPONENTBUILDER_DYNAMIC_GETS_SUBMENU_DESC="Allows the users in this group to submenu of dynamic get"
 COM_COMPONENTBUILDER_EDIT_CREATED_BY="Edit Created By"
 COM_COMPONENTBUILDER_EDIT_CREATED_BY_DESC=" Allows users in this group to edit created by."
 COM_COMPONENTBUILDER_EDIT_CREATED_DATE="Edit Created Date"
@@ -375,9 +375,9 @@ COM_COMPONENTBUILDER_FIELDS_BATCH_USE_DESC="Allows users in this group to use ba
 COM_COMPONENTBUILDER_FIELDS_CREATE="Fields Create"
 COM_COMPONENTBUILDER_FIELDS_CREATE_DESC="Allows the users in this group to create create fields"
 COM_COMPONENTBUILDER_FIELDS_DASHBOARD_ADD="Fields Dashboard Add"
-COM_COMPONENTBUILDER_FIELDS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the field"
+COM_COMPONENTBUILDER_FIELDS_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of field"
 COM_COMPONENTBUILDER_FIELDS_DASHBOARD_LIST="Fields Dashboard List"
-COM_COMPONENTBUILDER_FIELDS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the field"
+COM_COMPONENTBUILDER_FIELDS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of field"
 COM_COMPONENTBUILDER_FIELDS_DELETE="Fields Delete"
 COM_COMPONENTBUILDER_FIELDS_DELETE_DESC="Allows the users in this group to delete delete fields"
 COM_COMPONENTBUILDER_FIELDS_EDIT="Fields Edit"
@@ -393,7 +393,7 @@ COM_COMPONENTBUILDER_FIELDS_EXPORT_DESC="Allows the users in this group to expor
 COM_COMPONENTBUILDER_FIELDS_IMPORT="Fields Import"
 COM_COMPONENTBUILDER_FIELDS_IMPORT_DESC="Allows the users in this group to import import fields"
 COM_COMPONENTBUILDER_FIELDS_SUBMENU="Fields Submenu"
-COM_COMPONENTBUILDER_FIELDS_SUBMENU_DESC="Allows the users in this group to update the submenu of the field"
+COM_COMPONENTBUILDER_FIELDS_SUBMENU_DESC="Allows the users in this group to submenu of field"
 COM_COMPONENTBUILDER_FIELDTYPES_ACCESS="Fieldtypes Access"
 COM_COMPONENTBUILDER_FIELDTYPES_ACCESS_DESC="Allows the users in this group to access access fieldtypes"
 COM_COMPONENTBUILDER_FIELDTYPES_BATCH_USE="Fieldtypes Batch Use"
@@ -401,23 +401,17 @@ COM_COMPONENTBUILDER_FIELDTYPES_BATCH_USE_DESC="Allows users in this group to us
 COM_COMPONENTBUILDER_FIELDTYPES_CREATE="Fieldtypes Create"
 COM_COMPONENTBUILDER_FIELDTYPES_CREATE_DESC="Allows the users in this group to create create fieldtypes"
 COM_COMPONENTBUILDER_FIELDTYPES_DASHBOARD_ADD="Fieldtypes Dashboard Add"
-COM_COMPONENTBUILDER_FIELDTYPES_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the fieldtype"
+COM_COMPONENTBUILDER_FIELDTYPES_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of fieldtype"
 COM_COMPONENTBUILDER_FIELDTYPES_DASHBOARD_LIST="Fieldtypes Dashboard List"
-COM_COMPONENTBUILDER_FIELDTYPES_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the fieldtype"
+COM_COMPONENTBUILDER_FIELDTYPES_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of fieldtype"
 COM_COMPONENTBUILDER_FIELDTYPES_DELETE="Fieldtypes Delete"
 COM_COMPONENTBUILDER_FIELDTYPES_DELETE_DESC="Allows the users in this group to delete delete fieldtypes"
+COM_COMPONENTBUILDER_FIELDTYPES_DESCRIPTION="Fieldtypes Description"
+COM_COMPONENTBUILDER_FIELDTYPES_DESCRIPTION_DESC="Allows the users in this group to description of fieldtype"
 COM_COMPONENTBUILDER_FIELDTYPES_EDIT="Fieldtypes Edit"
 COM_COMPONENTBUILDER_FIELDTYPES_EDIT_DESC="Allows the users in this group to edit the fieldtype"
-COM_COMPONENTBUILDER_FIELDTYPES_EDIT_DESCRIPTION="Fieldtypes Edit Description"
-COM_COMPONENTBUILDER_FIELDTYPES_EDIT_DESCRIPTION_DESC="Allows the users in this group to update the edit description of the fieldtype"
-COM_COMPONENTBUILDER_FIELDTYPES_EDIT_NAME="Fieldtypes Edit Name"
-COM_COMPONENTBUILDER_FIELDTYPES_EDIT_NAME_DESC="Allows the users in this group to update the edit name of the fieldtype"
 COM_COMPONENTBUILDER_FIELDTYPES_EDIT_OWN="Fieldtypes Edit Own"
 COM_COMPONENTBUILDER_FIELDTYPES_EDIT_OWN_DESC="Allows the users in this group to edit edit own fieldtypes created by them"
-COM_COMPONENTBUILDER_FIELDTYPES_EDIT_PROPERTIES="Fieldtypes Edit Properties"
-COM_COMPONENTBUILDER_FIELDTYPES_EDIT_PROPERTIES_DESC="Allows the users in this group to update the edit properties of the fieldtype"
-COM_COMPONENTBUILDER_FIELDTYPES_EDIT_SHORT_DESCRIPTION="Fieldtypes Edit Short Description"
-COM_COMPONENTBUILDER_FIELDTYPES_EDIT_SHORT_DESCRIPTION_DESC="Allows the users in this group to update the edit short description of the fieldtype"
 COM_COMPONENTBUILDER_FIELDTYPES_EDIT_STATE="Fieldtypes Edit State"
 COM_COMPONENTBUILDER_FIELDTYPES_EDIT_STATE_DESC="Allows the users in this group to update the state of the fieldtype"
 COM_COMPONENTBUILDER_FIELDTYPES_EDIT_VERSION="Fieldtypes Edit Version"
@@ -426,14 +420,20 @@ COM_COMPONENTBUILDER_FIELDTYPES_EXPORT="Fieldtypes Export"
 COM_COMPONENTBUILDER_FIELDTYPES_EXPORT_DESC="Allows the users in this group to export export fieldtypes"
 COM_COMPONENTBUILDER_FIELDTYPES_IMPORT="Fieldtypes Import"
 COM_COMPONENTBUILDER_FIELDTYPES_IMPORT_DESC="Allows the users in this group to import import fieldtypes"
+COM_COMPONENTBUILDER_FIELDTYPES_NAME="Fieldtypes Name"
+COM_COMPONENTBUILDER_FIELDTYPES_NAME_DESC="Allows the users in this group to name of fieldtype"
+COM_COMPONENTBUILDER_FIELDTYPES_PROPERTIES="Fieldtypes Properties"
+COM_COMPONENTBUILDER_FIELDTYPES_PROPERTIES_DESC="Allows the users in this group to properties of fieldtype"
+COM_COMPONENTBUILDER_FIELDTYPES_SHORT_DESCRIPTION="Fieldtypes Short Description"
+COM_COMPONENTBUILDER_FIELDTYPES_SHORT_DESCRIPTION_DESC="Allows the users in this group to short description of fieldtype"
 COM_COMPONENTBUILDER_FIELDTYPES_SUBMENU="Fieldtypes Submenu"
-COM_COMPONENTBUILDER_FIELDTYPES_SUBMENU_DESC="Allows the users in this group to update the submenu of the fieldtype"
+COM_COMPONENTBUILDER_FIELDTYPES_SUBMENU_DESC="Allows the users in this group to submenu of fieldtype"
 COM_COMPONENTBUILDER_GET_SNIPPETS_ACCESS="Get Snippets Access"
 COM_COMPONENTBUILDER_GET_SNIPPETS_ACCESS_DESC=" Allows the users in this group to access get snippets."
 COM_COMPONENTBUILDER_GET_SNIPPETS_CUSTOM_ADMIN_VIEWS_BUTTON_ACCESS="Get Snippets Custom Admin Views Button Access"
 COM_COMPONENTBUILDER_GET_SNIPPETS_CUSTOM_ADMIN_VIEWS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the custom admin views button."
 COM_COMPONENTBUILDER_GET_SNIPPETS_DASHBOARD_LIST="Get Snippets Dashboard List"
-COM_COMPONENTBUILDER_GET_SNIPPETS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the Get Snippets"
+COM_COMPONENTBUILDER_GET_SNIPPETS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of Get Snippets"
 COM_COMPONENTBUILDER_GET_SNIPPETS_LAYOUTS_BUTTON_ACCESS="Get Snippets Layouts Button Access"
 COM_COMPONENTBUILDER_GET_SNIPPETS_LAYOUTS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the layouts button."
 COM_COMPONENTBUILDER_GET_SNIPPETS_LIBRARIES_BUTTON_ACCESS="Get Snippets Libraries Button Access"
@@ -443,7 +443,7 @@ COM_COMPONENTBUILDER_GET_SNIPPETS_SITE_VIEWS_BUTTON_ACCESS_DESC=" Allows the use
 COM_COMPONENTBUILDER_GET_SNIPPETS_SNIPPETS_BUTTON_ACCESS="Get Snippets Snippets Button Access"
 COM_COMPONENTBUILDER_GET_SNIPPETS_SNIPPETS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the snippets button."
 COM_COMPONENTBUILDER_GET_SNIPPETS_SUBMENU="Get Snippets Submenu"
-COM_COMPONENTBUILDER_GET_SNIPPETS_SUBMENU_DESC="Allows the users in this group to update the submenu of the Get Snippets"
+COM_COMPONENTBUILDER_GET_SNIPPETS_SUBMENU_DESC="Allows the users in this group to submenu of Get Snippets"
 COM_COMPONENTBUILDER_GET_SNIPPETS_TEMPLATES_BUTTON_ACCESS="Get Snippets Templates Button Access"
 COM_COMPONENTBUILDER_GET_SNIPPETS_TEMPLATES_BUTTON_ACCESS_DESC=" Allows the users in this group to access the templates button."
 COM_COMPONENTBUILDER_HELP_DOCUMENTS_ACCESS="Help Documents Access"
@@ -453,7 +453,7 @@ COM_COMPONENTBUILDER_HELP_DOCUMENTS_BATCH_USE_DESC="Allows users in this group t
 COM_COMPONENTBUILDER_HELP_DOCUMENTS_CREATE="Help Documents Create"
 COM_COMPONENTBUILDER_HELP_DOCUMENTS_CREATE_DESC="Allows the users in this group to create create help documents"
 COM_COMPONENTBUILDER_HELP_DOCUMENTS_DASHBOARD_LIST="Help Documents Dashboard List"
-COM_COMPONENTBUILDER_HELP_DOCUMENTS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the help document"
+COM_COMPONENTBUILDER_HELP_DOCUMENTS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of help document"
 COM_COMPONENTBUILDER_HELP_DOCUMENTS_DELETE="Help Documents Delete"
 COM_COMPONENTBUILDER_HELP_DOCUMENTS_DELETE_DESC="Allows the users in this group to delete delete help documents"
 COM_COMPONENTBUILDER_HELP_DOCUMENTS_EDIT="Help Documents Edit"
@@ -469,7 +469,7 @@ COM_COMPONENTBUILDER_HELP_DOCUMENTS_EXPORT_DESC="Allows the users in this group
 COM_COMPONENTBUILDER_HELP_DOCUMENTS_IMPORT="Help Documents Import"
 COM_COMPONENTBUILDER_HELP_DOCUMENTS_IMPORT_DESC="Allows the users in this group to import import help documents"
 COM_COMPONENTBUILDER_HELP_DOCUMENTS_SUBMENU="Help Documents Submenu"
-COM_COMPONENTBUILDER_HELP_DOCUMENTS_SUBMENU_DESC="Allows the users in this group to update the submenu of the help document"
+COM_COMPONENTBUILDER_HELP_DOCUMENTS_SUBMENU_DESC="Allows the users in this group to submenu of help document"
 COM_COMPONENTBUILDER_IMPORT_DATA="Import Data"
 COM_COMPONENTBUILDER_IMPORT_DATA_DESC=" Allows users in this group to import data."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_ACCESS="Joomla Components Access"
@@ -479,9 +479,9 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_BATCH_USE_DESC="Allows users in this grou
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_CREATE="Joomla Components Create"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_CREATE_DESC="Allows the users in this group to create create joomla components"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_DASHBOARD_ADD="Joomla Components Dashboard Add"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the joomla component"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of joomla component"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_DASHBOARD_LIST="Joomla Components Dashboard List"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the joomla component"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of joomla component"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_DELETE="Joomla Components Delete"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_DELETE_DESC="Allows the users in this group to delete delete joomla components"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT="Joomla Components Edit"
@@ -497,7 +497,7 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_STATE_DESC="Allows the users in this
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_VERSION="Joomla Components Edit Version"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version joomla components"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_SUBMENU="Joomla Components Submenu"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_SUBMENU_DESC="Allows the users in this group to update the submenu of the joomla component"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_SUBMENU_DESC="Allows the users in this group to submenu of joomla component"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BACKUP_BUTTON_ACCESS="Joomla Component Backup Button Access"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BACKUP_BUTTON_ACCESS_DESC=" Allows the users in this group to access the backup button."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLONE_BUTTON_ACCESS="Joomla Component Clone Button Access"
@@ -527,7 +527,7 @@ COM_COMPONENTBUILDER_LANGUAGES_EXPORT_DESC="Allows the users in this group to ex
 COM_COMPONENTBUILDER_LANGUAGES_IMPORT="Languages Import"
 COM_COMPONENTBUILDER_LANGUAGES_IMPORT_DESC="Allows the users in this group to import import languages"
 COM_COMPONENTBUILDER_LANGUAGES_SUBMENU="Languages Submenu"
-COM_COMPONENTBUILDER_LANGUAGES_SUBMENU_DESC="Allows the users in this group to update the submenu of the language"
+COM_COMPONENTBUILDER_LANGUAGES_SUBMENU_DESC="Allows the users in this group to submenu of language"
 COM_COMPONENTBUILDER_LANGUAGE_BUILD_BUTTON_ACCESS="Language Build Button Access"
 COM_COMPONENTBUILDER_LANGUAGE_BUILD_BUTTON_ACCESS_DESC=" Allows the users in this group to access the build button."
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_ACCESS="Language Translations Access"
@@ -537,7 +537,7 @@ COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_BATCH_USE_DESC="Allows users in this
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_CREATE="Language Translations Create"
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_CREATE_DESC="Allows the users in this group to create create language translations"
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_DASHBOARD_LIST="Language Translations Dashboard List"
-COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the language translation"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of language translation"
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_DELETE="Language Translations Delete"
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_DELETE_DESC="Allows the users in this group to delete delete language translations"
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT="Language Translations Edit"
@@ -553,7 +553,7 @@ COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EXPORT_DESC="Allows the users in this
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_IMPORT="Language Translations Import"
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_IMPORT_DESC="Allows the users in this group to import import language translations"
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_SUBMENU="Language Translations Submenu"
-COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_SUBMENU_DESC="Allows the users in this group to update the submenu of the language translation"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_SUBMENU_DESC="Allows the users in this group to submenu of language translation"
 COM_COMPONENTBUILDER_LAYOUTS_ACCESS="Layouts Access"
 COM_COMPONENTBUILDER_LAYOUTS_ACCESS_DESC="Allows the users in this group to access access layouts"
 COM_COMPONENTBUILDER_LAYOUTS_BATCH_USE="Layouts Batch Use"
@@ -561,9 +561,9 @@ COM_COMPONENTBUILDER_LAYOUTS_BATCH_USE_DESC="Allows users in this group to use b
 COM_COMPONENTBUILDER_LAYOUTS_CREATE="Layouts Create"
 COM_COMPONENTBUILDER_LAYOUTS_CREATE_DESC="Allows the users in this group to create create layouts"
 COM_COMPONENTBUILDER_LAYOUTS_DASHBOARD_ADD="Layouts Dashboard Add"
-COM_COMPONENTBUILDER_LAYOUTS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the layout"
+COM_COMPONENTBUILDER_LAYOUTS_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of layout"
 COM_COMPONENTBUILDER_LAYOUTS_DASHBOARD_LIST="Layouts Dashboard List"
-COM_COMPONENTBUILDER_LAYOUTS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the layout"
+COM_COMPONENTBUILDER_LAYOUTS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of layout"
 COM_COMPONENTBUILDER_LAYOUTS_DELETE="Layouts Delete"
 COM_COMPONENTBUILDER_LAYOUTS_DELETE_DESC="Allows the users in this group to delete delete layouts"
 COM_COMPONENTBUILDER_LAYOUTS_EDIT="Layouts Edit"
@@ -579,7 +579,7 @@ COM_COMPONENTBUILDER_LAYOUTS_EXPORT_DESC="Allows the users in this group to expo
 COM_COMPONENTBUILDER_LAYOUTS_IMPORT="Layouts Import"
 COM_COMPONENTBUILDER_LAYOUTS_IMPORT_DESC="Allows the users in this group to import import layouts"
 COM_COMPONENTBUILDER_LAYOUTS_SUBMENU="Layouts Submenu"
-COM_COMPONENTBUILDER_LAYOUTS_SUBMENU_DESC="Allows the users in this group to update the submenu of the layout"
+COM_COMPONENTBUILDER_LAYOUTS_SUBMENU_DESC="Allows the users in this group to submenu of layout"
 COM_COMPONENTBUILDER_LAYOUT_GET_SNIPPETS_BUTTON_ACCESS="Layout Get Snippets Button Access"
 COM_COMPONENTBUILDER_LAYOUT_GET_SNIPPETS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the get snippets button."
 COM_COMPONENTBUILDER_LIBRARIES_ACCESS="Libraries Access"
@@ -609,7 +609,7 @@ COM_COMPONENTBUILDER_LIBRARIES_CONFIG_EDIT_VERSION_DESC="Allows users in this gr
 COM_COMPONENTBUILDER_LIBRARIES_CREATE="Libraries Create"
 COM_COMPONENTBUILDER_LIBRARIES_CREATE_DESC="Allows the users in this group to create create libraries"
 COM_COMPONENTBUILDER_LIBRARIES_DASHBOARD_LIST="Libraries Dashboard List"
-COM_COMPONENTBUILDER_LIBRARIES_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the library"
+COM_COMPONENTBUILDER_LIBRARIES_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of library"
 COM_COMPONENTBUILDER_LIBRARIES_DELETE="Libraries Delete"
 COM_COMPONENTBUILDER_LIBRARIES_DELETE_DESC="Allows the users in this group to delete delete libraries"
 COM_COMPONENTBUILDER_LIBRARIES_EDIT="Libraries Edit"
@@ -641,7 +641,7 @@ COM_COMPONENTBUILDER_LIBRARIES_FILES_FOLDERS_URLS_EDIT_STATE_DESC="Allows the us
 COM_COMPONENTBUILDER_LIBRARIES_FILES_FOLDERS_URLS_EDIT_VERSION="Libraries Files Folders  Urls Edit Version"
 COM_COMPONENTBUILDER_LIBRARIES_FILES_FOLDERS_URLS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version libraries files folders  urls"
 COM_COMPONENTBUILDER_LIBRARIES_SUBMENU="Libraries Submenu"
-COM_COMPONENTBUILDER_LIBRARIES_SUBMENU_DESC="Allows the users in this group to update the submenu of the library"
+COM_COMPONENTBUILDER_LIBRARIES_SUBMENU_DESC="Allows the users in this group to submenu of library"
 COM_COMPONENTBUILDER_LIBRARY_GET_SNIPPETS_BUTTON_ACCESS="Library Get Snippets Button Access"
 COM_COMPONENTBUILDER_LIBRARY_GET_SNIPPETS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the get snippets button."
 COM_COMPONENTBUILDER_MENU="» Component Builder"
@@ -668,7 +668,7 @@ COM_COMPONENTBUILDER_SERVERS_BATCH_USE_DESC="Allows users in this group to use b
 COM_COMPONENTBUILDER_SERVERS_CREATE="Servers Create"
 COM_COMPONENTBUILDER_SERVERS_CREATE_DESC="Allows the users in this group to create create servers"
 COM_COMPONENTBUILDER_SERVERS_DASHBOARD_LIST="Servers Dashboard List"
-COM_COMPONENTBUILDER_SERVERS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the server"
+COM_COMPONENTBUILDER_SERVERS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of server"
 COM_COMPONENTBUILDER_SERVERS_DELETE="Servers Delete"
 COM_COMPONENTBUILDER_SERVERS_DELETE_DESC="Allows the users in this group to delete delete servers"
 COM_COMPONENTBUILDER_SERVERS_EDIT="Servers Edit"
@@ -688,7 +688,7 @@ COM_COMPONENTBUILDER_SERVERS_EXPORT_DESC="Allows the users in this group to expo
 COM_COMPONENTBUILDER_SERVERS_IMPORT="Servers Import"
 COM_COMPONENTBUILDER_SERVERS_IMPORT_DESC="Allows the users in this group to import import servers"
 COM_COMPONENTBUILDER_SERVERS_SUBMENU="Servers Submenu"
-COM_COMPONENTBUILDER_SERVERS_SUBMENU_DESC="Allows the users in this group to update the submenu of the server"
+COM_COMPONENTBUILDER_SERVERS_SUBMENU_DESC="Allows the users in this group to submenu of server"
 COM_COMPONENTBUILDER_SITE_VIEWS_ACCESS="Site Views Access"
 COM_COMPONENTBUILDER_SITE_VIEWS_ACCESS_DESC="Allows the users in this group to access access site views"
 COM_COMPONENTBUILDER_SITE_VIEWS_BATCH_USE="Site Views Batch Use"
@@ -696,9 +696,9 @@ COM_COMPONENTBUILDER_SITE_VIEWS_BATCH_USE_DESC="Allows users in this group to us
 COM_COMPONENTBUILDER_SITE_VIEWS_CREATE="Site Views Create"
 COM_COMPONENTBUILDER_SITE_VIEWS_CREATE_DESC="Allows the users in this group to create create site views"
 COM_COMPONENTBUILDER_SITE_VIEWS_DASHBOARD_ADD="Site Views Dashboard Add"
-COM_COMPONENTBUILDER_SITE_VIEWS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the site view"
+COM_COMPONENTBUILDER_SITE_VIEWS_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of site view"
 COM_COMPONENTBUILDER_SITE_VIEWS_DASHBOARD_LIST="Site Views Dashboard List"
-COM_COMPONENTBUILDER_SITE_VIEWS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the site view"
+COM_COMPONENTBUILDER_SITE_VIEWS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of site view"
 COM_COMPONENTBUILDER_SITE_VIEWS_DELETE="Site Views Delete"
 COM_COMPONENTBUILDER_SITE_VIEWS_DELETE_DESC="Allows the users in this group to delete delete site views"
 COM_COMPONENTBUILDER_SITE_VIEWS_EDIT="Site Views Edit"
@@ -714,7 +714,7 @@ COM_COMPONENTBUILDER_SITE_VIEWS_EXPORT_DESC="Allows the users in this group to e
 COM_COMPONENTBUILDER_SITE_VIEWS_IMPORT="Site Views Import"
 COM_COMPONENTBUILDER_SITE_VIEWS_IMPORT_DESC="Allows the users in this group to import import site views"
 COM_COMPONENTBUILDER_SITE_VIEWS_SUBMENU="Site Views Submenu"
-COM_COMPONENTBUILDER_SITE_VIEWS_SUBMENU_DESC="Allows the users in this group to update the submenu of the site view"
+COM_COMPONENTBUILDER_SITE_VIEWS_SUBMENU_DESC="Allows the users in this group to submenu of site view"
 COM_COMPONENTBUILDER_SITE_VIEW_GET_SNIPPETS_BUTTON_ACCESS="Site View Get Snippets Button Access"
 COM_COMPONENTBUILDER_SITE_VIEW_GET_SNIPPETS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the get snippets button."
 COM_COMPONENTBUILDER_SNIPPETS_ACCESS="Snippets Access"
@@ -724,7 +724,7 @@ COM_COMPONENTBUILDER_SNIPPETS_BATCH_USE_DESC="Allows users in this group to use
 COM_COMPONENTBUILDER_SNIPPETS_CREATE="Snippets Create"
 COM_COMPONENTBUILDER_SNIPPETS_CREATE_DESC="Allows the users in this group to create create snippets"
 COM_COMPONENTBUILDER_SNIPPETS_DASHBOARD_LIST="Snippets Dashboard List"
-COM_COMPONENTBUILDER_SNIPPETS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the snippet"
+COM_COMPONENTBUILDER_SNIPPETS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of snippet"
 COM_COMPONENTBUILDER_SNIPPETS_DELETE="Snippets Delete"
 COM_COMPONENTBUILDER_SNIPPETS_DELETE_DESC="Allows the users in this group to delete delete snippets"
 COM_COMPONENTBUILDER_SNIPPETS_EDIT="Snippets Edit"
@@ -740,7 +740,7 @@ COM_COMPONENTBUILDER_SNIPPETS_EXPORT_DESC="Allows the users in this group to exp
 COM_COMPONENTBUILDER_SNIPPETS_IMPORT="Snippets Import"
 COM_COMPONENTBUILDER_SNIPPETS_IMPORT_DESC="Allows the users in this group to import import snippets"
 COM_COMPONENTBUILDER_SNIPPETS_SUBMENU="Snippets Submenu"
-COM_COMPONENTBUILDER_SNIPPETS_SUBMENU_DESC="Allows the users in this group to update the submenu of the snippet"
+COM_COMPONENTBUILDER_SNIPPETS_SUBMENU_DESC="Allows the users in this group to submenu of snippet"
 COM_COMPONENTBUILDER_SNIPPET_GET_SNIPPETS_BUTTON_ACCESS="Snippet Get Snippets Button Access"
 COM_COMPONENTBUILDER_SNIPPET_GET_SNIPPETS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the get snippets button."
 COM_COMPONENTBUILDER_SNIPPET_SHARE_SNIPPETS_BUTTON_ACCESS="Snippet Share Snippets Button Access"
@@ -768,9 +768,9 @@ COM_COMPONENTBUILDER_TEMPLATES_BATCH_USE_DESC="Allows users in this group to use
 COM_COMPONENTBUILDER_TEMPLATES_CREATE="Templates Create"
 COM_COMPONENTBUILDER_TEMPLATES_CREATE_DESC="Allows the users in this group to create create templates"
 COM_COMPONENTBUILDER_TEMPLATES_DASHBOARD_ADD="Templates Dashboard Add"
-COM_COMPONENTBUILDER_TEMPLATES_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the template"
+COM_COMPONENTBUILDER_TEMPLATES_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of template"
 COM_COMPONENTBUILDER_TEMPLATES_DASHBOARD_LIST="Templates Dashboard List"
-COM_COMPONENTBUILDER_TEMPLATES_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the template"
+COM_COMPONENTBUILDER_TEMPLATES_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of template"
 COM_COMPONENTBUILDER_TEMPLATES_DELETE="Templates Delete"
 COM_COMPONENTBUILDER_TEMPLATES_DELETE_DESC="Allows the users in this group to delete delete templates"
 COM_COMPONENTBUILDER_TEMPLATES_EDIT="Templates Edit"
@@ -786,7 +786,7 @@ COM_COMPONENTBUILDER_TEMPLATES_EXPORT_DESC="Allows the users in this group to ex
 COM_COMPONENTBUILDER_TEMPLATES_IMPORT="Templates Import"
 COM_COMPONENTBUILDER_TEMPLATES_IMPORT_DESC="Allows the users in this group to import import templates"
 COM_COMPONENTBUILDER_TEMPLATES_SUBMENU="Templates Submenu"
-COM_COMPONENTBUILDER_TEMPLATES_SUBMENU_DESC="Allows the users in this group to update the submenu of the template"
+COM_COMPONENTBUILDER_TEMPLATES_SUBMENU_DESC="Allows the users in this group to submenu of template"
 COM_COMPONENTBUILDER_TEMPLATE_GET_SNIPPETS_BUTTON_ACCESS="Template Get Snippets Button Access"
 COM_COMPONENTBUILDER_TEMPLATE_GET_SNIPPETS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the get snippets button."
 COM_COMPONENTBUILDER_USE_BATCH="Use Batch"
@@ -798,7 +798,7 @@ COM_COMPONENTBUILDER_VALIDATION_RULES_BATCH_USE_DESC="Allows users in this group
 COM_COMPONENTBUILDER_VALIDATION_RULES_CREATE="Validation Rules Create"
 COM_COMPONENTBUILDER_VALIDATION_RULES_CREATE_DESC="Allows the users in this group to create create validation rules"
 COM_COMPONENTBUILDER_VALIDATION_RULES_DASHBOARD_LIST="Validation Rules Dashboard List"
-COM_COMPONENTBUILDER_VALIDATION_RULES_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the validation rule"
+COM_COMPONENTBUILDER_VALIDATION_RULES_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of validation rule"
 COM_COMPONENTBUILDER_VALIDATION_RULES_DELETE="Validation Rules Delete"
 COM_COMPONENTBUILDER_VALIDATION_RULES_DELETE_DESC="Allows the users in this group to delete delete validation rules"
 COM_COMPONENTBUILDER_VALIDATION_RULES_EDIT="Validation Rules Edit"
@@ -814,4 +814,4 @@ COM_COMPONENTBUILDER_VALIDATION_RULES_EXPORT_DESC="Allows the users in this grou
 COM_COMPONENTBUILDER_VALIDATION_RULES_IMPORT="Validation Rules Import"
 COM_COMPONENTBUILDER_VALIDATION_RULES_IMPORT_DESC="Allows the users in this group to import import validation rules"
 COM_COMPONENTBUILDER_VALIDATION_RULES_SUBMENU="Validation Rules Submenu"
-COM_COMPONENTBUILDER_VALIDATION_RULES_SUBMENU_DESC="Allows the users in this group to update the submenu of the validation rule"
+COM_COMPONENTBUILDER_VALIDATION_RULES_SUBMENU_DESC="Allows the users in this group to submenu of validation rule"

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/ajax.php

@@ -428,7 +428,7 @@ class ComponentbuilderModelAjax extends JModelList
 				'search' => 'setYesNo',
 				'filter' => 'setYesNo',
 				'link' => 'setYesNo',
-				'permission' => 'setYesNo',
+				'permission' => 'setPermissions',
 				'tab' => 'setTabName',
 				'alignment' => 'setAlignmentName',
 				'target_field' => 'setItemNames',
@@ -852,6 +852,42 @@ class ComponentbuilderModelAjax extends JModelList
 		return JText::_('COM_COMPONENTBUILDER_NO_ITEM_FOUND');
 	}
 
+	protected function setPermissions($header, $values)
+	{
+		// check if value is array
+		if (!ComponentbuilderHelper::checkArray($values))
+		{
+			$values = array($values);
+		}
+		// check if value is array
+		if (ComponentbuilderHelper::checkArray($values))
+		{
+			// Editing, Access, View
+			$bucket = array();
+			foreach ($values as $value)
+			{
+				switch ($value)
+				{
+					case 1:
+						$bucket[] = JText::_('COM_COMPONENTBUILDER_EDITING');
+					break;
+					case 2:
+						$bucket[] = JText::_('COM_COMPONENTBUILDER_ACCESS');
+					break;
+					case 3:
+						$bucket[] = JText::_('COM_COMPONENTBUILDER_VIEW');
+					break;
+				}
+			}
+			// check if value is array
+			if (ComponentbuilderHelper::checkArray($bucket))
+			{
+				return implode(', ', $bucket);
+			}
+		}
+		return JText::_('COM_COMPONENTBUILDER_NONE');
+	}
+
 	protected function setJoinType($header, $value)
 	{
 		switch ($value)
@@ -2625,11 +2661,18 @@ class ComponentbuilderModelAjax extends JModelList
 		elseif ($type == 2)
 		{
 			// build fields array
-			$fields = array_map( function ($id) {
+			if ('none' !== $joinfields)
-				return (int) $id;
+			{
-			}, (array) explode(',', $joinfields));
+				$fields = array_map( function ($id) {
-			// add the list field to array
+					return (int) $id;
-			array_unshift($fields, (int) $listfield);
+				}, (array) explode(',', $joinfields));
+				// add the list field to array
+				array_unshift($fields, (int) $listfield);
+			}
+			else
+			{
+				$fields = array((int) $listfield);
+			}
 			// get field names
 			$names = array_map( function ($id) {
 				return '[' . $id . ']=> ' . ComponentbuilderHelper::getVar('field', $id, 'id', 'name');

admin/models/field.php

@@ -930,7 +930,7 @@ class ComponentbuilderModelField extends JModelAdmin
 			if (ComponentbuilderHelper::checkString($typephpx))
 			{
 				// load the type_phpx property
-				$bucket[] = "\t".'type_phpx_1="'. str_replace('"', "'", $typephp).'"';
+				$bucket[] = "\t".'type_phpx_1="'. str_replace('"', "'", $typephpx).'"';
 			}
 			// if the bucket has been loaded
 			if (ComponentbuilderHelper::checkArray($bucket))

admin/models/fields/listfields.php

@@ -88,6 +88,7 @@ class JFormFieldListfields extends JFormFieldList
 				$options = array();
 				if ($items)
 				{
+					$options[] = JHtml::_('select.option', '', JText::_('COM_COMPONENTBUILDER_SELECT_AN_OPTION'));
 					foreach($items as $item)
 					{
 						$options[] = JHtml::_('select.option', $item->id, $item->name);

admin/models/fieldtype.php

@@ -373,70 +373,6 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 			// Disable fields while saving.
 			$form->setFieldAttribute('created', 'filter', 'unset');
 		}
-		// Modify the form based on Edit Name access controls.
-		if ($id != 0 && (!$user->authorise('fieldtype.edit.name', 'com_componentbuilder.fieldtype.' . (int) $id))
-			|| ($id == 0 && !$user->authorise('fieldtype.edit.name', 'com_componentbuilder')))
-		{
-			// Disable fields for display.
-			$form->setFieldAttribute('name', 'disabled', 'true');
-			// Disable fields for display.
-			$form->setFieldAttribute('name', 'readonly', 'true');
-			if (!$form->getValue('name'))
-			{
-				// Disable fields while saving.
-				$form->setFieldAttribute('name', 'filter', 'unset');
-				// Disable fields while saving.
-				$form->setFieldAttribute('name', 'required', 'false');
-			}
-		}
-		// Modify the form based on Edit Properties access controls.
-		if ($id != 0 && (!$user->authorise('fieldtype.edit.properties', 'com_componentbuilder.fieldtype.' . (int) $id))
-			|| ($id == 0 && !$user->authorise('fieldtype.edit.properties', 'com_componentbuilder')))
-		{
-			// Disable fields for display.
-			$form->setFieldAttribute('properties', 'disabled', 'true');
-			// Disable fields for display.
-			$form->setFieldAttribute('properties', 'readonly', 'true');
-			if (!$form->getValue('properties'))
-			{
-				// Disable fields while saving.
-				$form->setFieldAttribute('properties', 'filter', 'unset');
-				// Disable fields while saving.
-				$form->setFieldAttribute('properties', 'required', 'false');
-			}
-		}
-		// Modify the form based on Edit Description access controls.
-		if ($id != 0 && (!$user->authorise('fieldtype.edit.description', 'com_componentbuilder.fieldtype.' . (int) $id))
-			|| ($id == 0 && !$user->authorise('fieldtype.edit.description', 'com_componentbuilder')))
-		{
-			// Disable fields for display.
-			$form->setFieldAttribute('description', 'disabled', 'true');
-			// Disable fields for display.
-			$form->setFieldAttribute('description', 'readonly', 'true');
-			if (!$form->getValue('description'))
-			{
-				// Disable fields while saving.
-				$form->setFieldAttribute('description', 'filter', 'unset');
-				// Disable fields while saving.
-				$form->setFieldAttribute('description', 'required', 'false');
-			}
-		}
-		// Modify the form based on Edit Short Description access controls.
-		if ($id != 0 && (!$user->authorise('fieldtype.edit.short_description', 'com_componentbuilder.fieldtype.' . (int) $id))
-			|| ($id == 0 && !$user->authorise('fieldtype.edit.short_description', 'com_componentbuilder')))
-		{
-			// Disable fields for display.
-			$form->setFieldAttribute('short_description', 'disabled', 'true');
-			// Disable fields for display.
-			$form->setFieldAttribute('short_description', 'readonly', 'true');
-			if (!$form->getValue('short_description'))
-			{
-				// Disable fields while saving.
-				$form->setFieldAttribute('short_description', 'filter', 'unset');
-				// Disable fields while saving.
-				$form->setFieldAttribute('short_description', 'required', 'false');
-			}
-		}
 		// Only load these values if no id is found
 		if (0 == $id)
 		{

admin/models/forms/admin_fields.xml

@@ -270,14 +270,16 @@
 					name="permission"
 					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_PERMISSION_LABEL"
 					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_PERMISSION_DESCRIPTION"
-					class="fieldMid"
+					class="fieldMedium"
-					multiple="false"
+					multiple="true"
 					required="false">
 					<!-- Option Set. -->
-					<option value="0">
+					<option value="1">
-						COM_COMPONENTBUILDER_ADMIN_FIELDS_NONE</option>
-					<option value=" 1">
 						COM_COMPONENTBUILDER_ADMIN_FIELDS_EDITING</option>
+					<option value="2">
+						COM_COMPONENTBUILDER_ADMIN_FIELDS_ACCESS</option>
+					<option value="3">
+						COM_COMPONENTBUILDER_ADMIN_FIELDS_VIEW</option>
 				</field>
 			</form>
 		</field>

admin/models/forms/admin_fields_relations.js

@@ -20,14 +20,14 @@ function getCodeGlueOptions(field) {
 	var subID = target[0]+'__'+target[1];
 	// get listfield value
 	var listfield = jQuery('#'+subID+'__listfield').val();
-	// get joinfields values
-	var joinfields = jQuery('#'+subID+'__joinfields').val();
 	// get type value
 	var type = jQuery('#'+subID+'__join_type').val();
 	// get area value
 	var area = jQuery('#'+subID+'__area').val();
 	// check that values are set
-	if (_isSet(listfield) && _isSet(joinfields) && _isSet(type) && _isSet(area)) {
+	if (_isSet(listfield) && _isSet(type) && _isSet(area)) {
+		// get joinfields values
+		var joinfields = jQuery('#'+subID+'__joinfields').val();
 		// get codeGlueOptions
 		getCodeGlueOptions_server(listfield, joinfields, type, area).done(function(result) {
 			if(result){
@@ -43,7 +43,11 @@ function getCodeGlueOptions(field) {
 
 function getCodeGlueOptions_server(listfield, joinfields, type, area){
 	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getCodeGlueOptions&format=json";
-	if(token.length > 0 && listfield > 0 && joinfields.length >= 1 && type > 0 && area > 0) {
+	// make sure the joinfields are set
+	if (!_isSet(joinfields)) {
+		joinfields = 'none';
+	}
+	if(token.length > 0 && listfield > 0 && type > 0 && area > 0) {
 		var request = 'token='+token+'&listfield='+listfield+'&type='+type+'&area='+area+'&joinfields='+joinfields;
 	}
 	return jQuery.ajax({

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/get_snippets.php

@@ -107,9 +107,6 @@ class ComponentbuilderModelGet_snippets extends JModelList
 		// Insure all item fields are adapted where needed.
 		if (ComponentbuilderHelper::checkArray($items))
 		{
-			// Load the JEvent Dispatcher
-			JPluginHelper::importPlugin('content');
-			$this->_dispatcher = JEventDispatcher::getInstance();
 			foreach ($items as $nr => &$item)
 			{
 				// Always create a slug for sef URL's

admin/models/import_joomla_components.php

@@ -300,7 +300,7 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
 						// set error
 						if (!$checksum)
 						{
-							$checksumMessage =  JText::_('COM_COMPONENTBUILDER_BBEST_TO_NOT_CONTINUEBBR_THIS_PACKAGE_BFAILEDB_CHECKSUM_VALIDATION_THIS_COULD_BE_A_SERIOUS_SECURITY_BREACH_DO_NOT_CONTINUE');
+							$checksumMessage =  JText::_('COM_COMPONENTBUILDER_BBEST_TO_NOT_CONTINUEBBR_YOU_CAN_REFRESH_AND_TRY_AGAINBR_BUT_NOTE_THAT_THIS_PACKAGE_BFAILEDB_CHECKSUM_VALIDATION_THIS_COULD_BE_A_SERIOUS_SECURITY_BREACH_DO_NOT_CONTINUE');
 							$checksumStatus = 'error';
 						}
 					}

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`;

admin/views/import_joomla_components/tmpl/default.php

@@ -36,13 +36,14 @@ JHtml::_('behavior.keepalive');
 <?php else: ?>
 	Joomla.submitbutton = function(task)
 	{
-		if ('refresh' === task){
+		if ('joomla_component.refresh' === task){
 			jQuery('#loading').css('display', 'block');
 			// clear the history
 			jQuery.jStorage.flush();
 			// now start the update
 			autoJCBpackageInfo();
-			jQuery('#loading').hide();
+			// also clear the session memory around the component list
+			Joomla.submitform(task);
 		} else {
 			var form = document.getElementById('adminForm');
 			// do field validation
@@ -280,7 +281,7 @@ jQuery(document).ready(function($) {
 			<?php echo JHtml::_('bootstrap.addTab', 'jcbImportTab', 'url_vdm', JText::_('COM_COMPONENTBUILDER_VDM_PACKAGES', true)); ?>
 				<div class="span12" id="vdm_packages_installer">
 					<div class="alert alert-success">
-						<p><?php echo JText::sprintf('COM_COMPONENTBUILDER_ALL_OF_THESE_PACKAGES_ARE_A_FULLY_DEVELOPEDMAPPED_COMPONENTS_FOR_JCB_THEY_CAN_BE_SEEN_AS_DEMO_CONTENT_OR_BASE_IMAGES_FROM_WHICH_TO_START_YOUR_PROJECTBR_ALWAYS_MAKE_SURE_YOU_ARE_ON_THE_LATEST_VERSION_OF_JCB_BEFORE_IMPORTING_ANY_OF_THESE_PACKAGES_SHOULD_ANY_OF_THEM_FAIL_TO_IMPORT_A_S_PLEASE_LET_US_KNOWA', 'href="https://vdm.bz/jcb-package-support" target="_blank" title="Should any of these packages fail to import please let us know, some need a key of course."'); ?></p>
+						<p><?php echo JText::sprintf('COM_COMPONENTBUILDER_ALL_OF_THESE_PACKAGES_ARE_A_FULLY_DEVELOPEDMAPPED_COMPONENTS_FOR_JCB_THEY_CAN_BE_SEEN_AS_DEMO_CONTENT_OR_BASE_IMAGES_FROM_WHICH_TO_START_YOUR_PROJECTBR_ALWAYS_MAKE_SURE_YOU_ARE_ON_THE_LATEST_VERSION_OF_JCB_BEFORE_IMPORTING_ANY_OF_THESE_PACKAGES_SHOULD_ANY_OF_THEM_FAIL_TO_IMPORT_A_S_PLEASE_LET_US_KNOWA', 'href="https://www.joomlacomponentbuilder.com/package-support" target="_blank" title="Should any of these packages fail to import please let us know, some need a key of course."'); ?></p>
 						<p><?php echo JText::sprintf('COM_COMPONENTBUILDER_THESE_ARE_THE_SAME_PACKAGES_FOUND_ON_A_S_GITHUBA_AND_CAN_BE_IMPORTED_BY_SIMPLY_MAKING_A_SELECTION_AND_THEN_CLICKING_THE_BGET_PACKAGEB_BUTTONBR_SOME_OF_THESE_PACKAGES_WOULD_REQUIRE_A_KEY_SINCE_THEY_ARE_NOT_FREE_A_S_GET_A_KEY_TODAYA', 'href="https://github.com/vdm-io/JCB-Packages" target="_blank" title="gitHub Reposetory"', 'href="http://vdm.bz/jcb-packages" target="_blank" title="get a key to import the paid packages."'); ?></p>
 						<p><?php echo JText::sprintf('COM_COMPONENTBUILDER_HOW_TO_GET_A_S_FREE_KEYSA_FROM_VDM', 'href="https://vdm.bz/how-to-get-free-vdm-package-keys" target="_blank" title="see how easy it is to get access keys from VDM"'); ?></p>
 					</div>
@@ -295,7 +296,7 @@ jQuery(document).ready(function($) {
 						<div class="form-actions">
 							<input type="button" class="btn btn-primary" value="<?php echo JText::_('COM_COMPONENTBUILDER_GET_PACKAGE'); ?>" onclick="Joomla.submitbuttonVDM()" />&nbsp;&nbsp;&nbsp;<small><span class="icon-shield"> </span><?php echo JText::_('COM_COMPONENTBUILDER_OFFICIAL_VDM_PACKAGES'); ?></small>
 						</div>
-						<div class="control-group"><small><?php echo JText::sprintf('COM_COMPONENTBUILDER_A_S_SPAN_CLASSICONFLAG_SPANREPORT_BROKEN_PACKAGEA', 'href="https://vdm.bz/jcb-package-support" target="_blank" title="Should any of these packages fail to import please let us know"'); ?></small></div>
+						<div class="control-group"><small><?php echo JText::sprintf('COM_COMPONENTBUILDER_A_S_SPAN_CLASSICONFLAG_SPANREPORT_BROKEN_PACKAGEA', 'href="https://www.joomlacomponentbuilder.com/package-support" target="_blank" title="Should any of these packages fail to import please let us know"'); ?></small></div>
 					</fieldset>
 				</div>
 				<div id="vdm_packages_display">
@@ -311,7 +312,7 @@ jQuery(document).ready(function($) {
 			<?php echo JHtml::_('bootstrap.addTab', 'jcbImportTab', 'url_jcb', JText::_('COM_COMPONENTBUILDER_JCB_COMMUNITY_PACKAGES', true)); ?>
 				<div class="span12" id="jcb_packages_installer">
 					<div class="alert alert-success">
-						<p><?php echo JText::sprintf('COM_COMPONENTBUILDER_ALL_OF_THESE_PACKAGES_ARE_A_FULLY_DEVELOPEDMAPPED_COMPONENTS_FOR_JCB_THEY_CAN_BE_SEEN_AS_DEMO_CONTENT_OR_BASE_IMAGES_FROM_WHICH_TO_START_YOUR_PROJECTBR_ALWAYS_MAKE_SURE_YOU_ARE_ON_THE_LATEST_VERSION_OF_JCB_BEFORE_IMPORTING_ANY_OF_THESE_PACKAGES_SHOULD_ANY_OF_THEM_FAIL_TO_IMPORT_A_S_PLEASE_LET_US_KNOWA', 'href="https://vdm.bz/jcb-package-support" target="_blank" title="Should any of these packages fail to import please let us know, some need a key of course."'); ?></p>
+						<p><?php echo JText::sprintf('COM_COMPONENTBUILDER_ALL_OF_THESE_PACKAGES_ARE_A_FULLY_DEVELOPEDMAPPED_COMPONENTS_FOR_JCB_THEY_CAN_BE_SEEN_AS_DEMO_CONTENT_OR_BASE_IMAGES_FROM_WHICH_TO_START_YOUR_PROJECTBR_ALWAYS_MAKE_SURE_YOU_ARE_ON_THE_LATEST_VERSION_OF_JCB_BEFORE_IMPORTING_ANY_OF_THESE_PACKAGES_SHOULD_ANY_OF_THEM_FAIL_TO_IMPORT_A_S_PLEASE_LET_US_KNOWA', 'href="https://www.joomlacomponentbuilder.com/package-support" target="_blank" title="Should any of these packages fail to import please let us know, some need a key of course."'); ?></p>
 						<p><?php echo JText::sprintf('COM_COMPONENTBUILDER_THESE_ARE_THE_SAME_PACKAGES_FOUND_ON_A_S_GITHUBA_AND_CAN_BE_IMPORTED_BY_SIMPLY_MAKING_A_SELECTION_AND_THEN_CLICKING_THE_BGET_PACKAGEB_BUTTONBR_SOME_OF_THESE_PACKAGES_WOULD_REQUIRE_A_KEY_SINCE_THEY_ARE_NOT_FREE', 'href="https://github.com/vdm-io/JCB-Community-Packages" target="_blank" title="gitHub Reposetory"'); ?></p>
 						<p><?php echo JText::sprintf('COM_COMPONENTBUILDER_ADD_YOUR_OWN_JCB_PACKAGES_TO_THE_COMMUNITY_A_S_GITHUBA_REPOSITORYBR_WATCH_THIS_A_S_TUTORIALA_TO_SEE_HOW', 'href="https://github.com/vdm-io/JCB-Community-Packages" target="_blank" title="gitHub Reposetory"',  'href="https://vdm.bz/add-jcb-community-package" target="_blank" title="watch the quick tutorial on how to add your own packages to this list of community packages"'); ?></p>
 					</div>
@@ -326,7 +327,7 @@ jQuery(document).ready(function($) {
 						<div class="form-actions">
 							<input type="button" class="btn btn-primary" value="<?php echo JText::_('COM_COMPONENTBUILDER_GET_PACKAGE'); ?>" onclick="Joomla.submitbuttonJCB()" />&nbsp;&nbsp;&nbsp;<small><span class="icon-shield"> </span><?php echo JText::_('COM_COMPONENTBUILDER_COMMUNITY_PACKAGES'); ?></small>
 						</div>
-						<div class="control-group"><small><?php echo JText::sprintf('COM_COMPONENTBUILDER_A_S_SPAN_CLASSICONFLAG_SPANREPORT_BROKEN_PACKAGEA', 'href="https://vdm.bz/jcb-package-support" target="_blank" title="Should any of these packages fail to import please let us know"'); ?></small></div>
+						<div class="control-group"><small><?php echo JText::sprintf('COM_COMPONENTBUILDER_A_S_SPAN_CLASSICONFLAG_SPANREPORT_BROKEN_PACKAGEA', 'href="https://www.joomlacomponentbuilder.com/package-support" target="_blank" title="Should any of these packages fail to import please let us know"'); ?></small></div>
 					</fieldset>
 				</div>
 				<div id="jcb_packages_display">

admin/views/import_joomla_components/view.html.php

@@ -59,7 +59,7 @@ class ComponentbuilderViewImport_joomla_components extends JViewLegacy
 			// add title to the page
 			JToolbarHelper::title(JText::_('COM_COMPONENTBUILDER_JCB_PACKAGE_IMPORT'),'upload');
 			// add refesh button.
-			JToolBarHelper::custom('refresh', 'refresh', '', 'COM_COMPONENTBUILDER_REFRESH', false);
+			JToolBarHelper::custom('joomla_component.refresh', 'refresh', '', 'COM_COMPONENTBUILDER_REFRESH', false);
 		}
 		// get the session object
 		$session = JFactory::getSession();

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>30th 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.5</version>
 	<description><![CDATA[
-		<h1>Component Builder (v.2.8.2)</h1>
+		<h1>Component Builder (v.2.8.5)</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.5</version>
+		<infourl title="Component Builder!">http://www.joomlacomponentbuilder.com</infourl>
+		<downloads>
+			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.8.5/JCB_v2.8.5.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.5 Was Successful! Let us know if anything is not working as expected.</h3>';
 		}
 	}
 

site/helpers/componentbuilder.php

@@ -3604,16 +3604,16 @@ abstract class ComponentbuilderHelper
 					{
 						if ($external)
 						{
-							if ($name = self::getVar(null, $val, $id, $name, '=', $table))
+							if ($_name = self::getVar(null, $val, $id, $name, '=', $table))
 							{
-								$names[] = $name;
+								$names[] = $_name;
 							}
 						}
 						else
 						{
-							if ($name = self::getVar($table, $val, $id, $name))
+							if ($_name = self::getVar($table, $val, $id, $name))
 							{
-								$names[] = $name;
+								$names[] = $_name;
 							}
 						}
 					}
@@ -4691,7 +4691,7 @@ abstract class ComponentbuilderHelper
 	*
 	*	@returns string on success
 	**/
-	public static function safeString($string, $type = 'L', $spacer = '_', $replaceNumbers = true)
+	public static function safeString($string, $type = 'L', $spacer = '_', $replaceNumbers = true, $keepOnlyCharacters = true)
 	{
 		if ($replaceNumbers === true)
 		{
@@ -4720,7 +4720,16 @@ abstract class ComponentbuilderHelper
 			$string = trim($string);
 			$string = preg_replace('/'.$spacer.'+/', ' ', $string);
 			$string = preg_replace('/\s+/', ' ', $string);
-			$string = preg_replace("/[^A-Za-z ]/", '', $string);
+			// remove all and keep only characters
+			if ($keepOnlyCharacters)
+			{
+				$string = preg_replace("/[^A-Za-z ]/", '', $string);
+			}
+			// keep both numbers and characters
+			else
+			{
+				$string = preg_replace("/[^A-Za-z0-9 ]/", '', $string);
+			}
 			// select final adaptations
 			if ($type === 'L' || $type === 'strtolower')
 			{

site/models/api.php

@@ -122,9 +122,6 @@ class ComponentbuilderModelApi extends JModelItem
 					$app->redirect(JURI::root());
 					return false;
 				}
-			// Load the JEvent Dispatcher
-			JPluginHelper::importPlugin('content');
-			$this->_dispatcher = JEventDispatcher::getInstance();
 
 				// set data object to item.
 				$this->_item[$pk] = $data;