Made some changes to insure JCB is stable in PHP7, removed the related translations string from joomla_component view to speed up page load.

README.md

@@ -130,9 +130,9 @@ Component Builder is mapped as a component in itself on my local development env
 + *Version*: 2.6.18
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-+ *Line count*: **184122**
++ *Line count*: **183732**
 + *Field count*: **1651**
-+ *File count*: **1172**
++ *File count*: **1171**
 + *Folder count*: **189**
 
 > This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com).

admin/README.txt

@@ -130,9 +130,9 @@ Component Builder is mapped as a component in itself on my local development env
 + *Version*: 2.6.18
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-+ *Line count*: **184122**
++ *Line count*: **183732**
 + *Field count*: **1651**
-+ *File count*: **1172**
++ *File count*: **1171**
 + *Folder count*: **189**
 
 > This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com).

admin/access.xml

@@ -473,9 +473,9 @@
 		<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.edit.properties" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_PROPERTIES" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_PROPERTIES_DESC" />
 		<action name="fieldtype.edit.description" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_DESCRIPTION" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_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.edit.properties" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_PROPERTIES" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_PROPERTIES_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

@@ -642,6 +642,13 @@ abstract class ###Component###Helper
 
 	}
 
+	/**
+	*	Check if have an json string
+	*
+	*	@input	string   The json string to check
+	*
+	*	@returns bool true on success
+	**/
 	public static function checkJson($string)
 	{
 		if (self::checkString($string))
@@ -652,15 +659,29 @@ abstract class ###Component###Helper
 		return false;
 	}
 
+	/**
+	*	Check if have an object with a length
+	*
+	*	@input	object   The object to check
+	*
+	*	@returns bool true on success
+	**/
 	public static function checkObject($object)
 	{
-		if (isset($object) && is_object($object) && count($object) > 0)
+		if (isset($object) && is_object($object))
 		{
-			return true;
+			return count((array)$object) > 0;
 		}
 		return false;
 	}
 
+	/**
+	*	Check if have an array with a length
+	*
+	*	@input	array   The array to check
+	*
+	*	@returns bool true on success
+	**/
 	public static function checkArray($array, $removeEmptyString = false)
 	{
 		if (isset($array) && is_array($array) && count($array) > 0)
@@ -682,6 +703,13 @@ abstract class ###Component###Helper
 		return false;
 	}
 
+	/**
+	*	Check if have a string with a length
+	*
+	*	@input	string   The string to check
+	*
+	*	@returns bool true on success
+	**/
 	public static function checkString($string)
 	{
 		if (isset($string) && is_string($string) && strlen($string) > 0)
@@ -716,6 +744,13 @@ abstract class ###Component###Helper
 		return $is_conn;
 	}
 
+	/**
+	*	Merge an array of array's
+	*
+	*	@input	array   The arrays you would like to merge
+	*
+	*	@returns array on success
+	**/
 	public static function mergeArrays($arrays)
 	{
 		if(self::checkArray($arrays))
@@ -739,6 +774,13 @@ abstract class ###Component###Helper
 		return self::shorten($string, $length, $addTip);
 	}
 
+	/**
+	*	Shorten a string
+	*
+	*	@input	string   The you would like to shorten
+	*
+	*	@returns string on success
+	**/
 	public static function shorten($string, $length = 40, $addTip = true)
 	{
 		if (self::checkString($string))
@@ -773,6 +815,13 @@ abstract class ###Component###Helper
 		return $string;
 	}
 
+	/**
+	*	Making strings safe (various ways)
+	*
+	*	@input	string   The you would like to make safe
+	*
+	*	@returns string on success
+	**/
 	public static function safeString($string, $type = 'L', $spacer = '_', $replaceNumbers = true)
 	{
 		if ($replaceNumbers === true)

admin/compiler/joomla_3/Helper_site.php

@@ -634,6 +634,13 @@ abstract class ###Component###Helper
 		return $result;
 	}
 
+	/**
+	*	Check if have an json string
+	*
+	*	@input	string   The json string to check
+	*
+	*	@returns bool true on success
+	**/
 	public static function checkJson($string)
 	{
 		if (self::checkString($string))
@@ -644,15 +651,29 @@ abstract class ###Component###Helper
 		return false;
 	}
 
+	/**
+	*	Check if have an object with a length
+	*
+	*	@input	object   The object to check
+	*
+	*	@returns bool true on success
+	**/
 	public static function checkObject($object)
 	{
-		if (isset($object) && is_object($object) && count($object) > 0)
+		if (isset($object) && is_object($object))
 		{
-			return true;
+			return count((array)$object) > 0;
 		}
 		return false;
 	}
 
+	/**
+	*	Check if have an array with a length
+	*
+	*	@input	array   The array to check
+	*
+	*	@returns bool true on success
+	**/
 	public static function checkArray($array, $removeEmptyString = false)
 	{
 		if (isset($array) && is_array($array) && count($array) > 0)
@@ -674,6 +695,13 @@ abstract class ###Component###Helper
 		return false;
 	}
 
+	/**
+	*	Check if have a string with a length
+	*
+	*	@input	string   The string to check
+	*
+	*	@returns bool true on success
+	**/
 	public static function checkString($string)
 	{
 		if (isset($string) && is_string($string) && strlen($string) > 0)
@@ -708,6 +736,13 @@ abstract class ###Component###Helper
 		return $is_conn;
 	}
 
+	/**
+	*	Merge an array of array's
+	*
+	*	@input	array   The arrays you would like to merge
+	*
+	*	@returns array on success
+	**/
 	public static function mergeArrays($arrays)
 	{
 		if(self::checkArray($arrays))
@@ -731,6 +766,13 @@ abstract class ###Component###Helper
 		return self::shorten($string, $length, $addTip);
 	}
 
+	/**
+	*	Shorten a string
+	*
+	*	@input	string   The you would like to shorten
+	*
+	*	@returns string on success
+	**/
 	public static function shorten($string, $length = 40, $addTip = true)
 	{
 		if (self::checkString($string))
@@ -765,6 +807,13 @@ abstract class ###Component###Helper
 		return $string;
 	}
 
+	/**
+	*	Making strings safe (various ways)
+	*
+	*	@input	string   The you would like to make safe
+	*
+	*	@returns string on success
+	**/
 	public static function safeString($string, $type = 'L', $spacer = '_', $replaceNumbers = true)
 	{
 		if ($replaceNumbers === true)

admin/helpers/compiler/c_Fields.php

@@ -1246,7 +1246,11 @@ class Fields extends Structure
 			$this->tabCounter[$viewName][(int) $field['tab']] = $tabName;
 			if (isset($this->layoutBuilder[$viewName][$tabName][(int) $field['alignment']][(int) $field['order_edit']]))
 			{
-				$size = count($this->layoutBuilder[$viewName][$tabName][(int) $field['alignment']][(int) $field['order_edit']]) + 1;
+				$size = (int) count((array) $this->layoutBuilder[$viewName][$tabName][(int) $field['alignment']]) + 1;
+				while(isset($this->layoutBuilder[$viewName][$tabName][(int) $field['alignment']][$size]))
+				{
+					$size++;
+				}
 				$this->layoutBuilder[$viewName][$tabName][(int) $field['alignment']][$size] = $name;
 			}
 			else
@@ -1266,7 +1270,11 @@ class Fields extends Structure
 			{
 				if (isset($this->newPublishingFields[$viewName][(int) $field['alignment']][(int) $field['order_edit']]))
 				{
-					$size = count($this->newPublishingFields[$viewName][(int) $field['alignment']][(int) $field['order_edit']]) + 1;
+					$size = (int) count((array) $this->newPublishingFields[$viewName][(int) $field['alignment']]) + 1;
+					while(isset($this->newPublishingFields[$viewName][(int) $field['alignment']][$size]))
+					{
+						$size++;
+					}
 					$this->newPublishingFields[$viewName][(int) $field['alignment']][$size] = $name;
 				}
 				else
@@ -1280,7 +1288,11 @@ class Fields extends Structure
 			$this->tabCounter[$viewName][1] = 'Details';
 			if (isset($this->layoutBuilder[$viewName]['Details'][(int) $field['alignment']][(int) $field['order_edit']]))
 			{
-				$size = count($this->layoutBuilder[$viewName]['Details'][(int) $field['alignment']][(int) $field['order_edit']]) + 1;
+				$size = (int) count((array) $this->layoutBuilder[$viewName]['Details'][(int) $field['alignment']]) + 1;
+				while(isset($this->layoutBuilder[$viewName]['Details'][(int) $field['alignment']][$size]))
+				{
+					$size++;
+				}
 				$this->layoutBuilder[$viewName]['Details'][(int) $field['alignment']][$size] = $name;
 			}
 			else

admin/helpers/componentbuilder.php

@@ -3530,6 +3530,13 @@ abstract class ComponentbuilderHelper
 
 	}
 
+	/**
+	*	Check if have an json string
+	*
+	*	@input	string   The json string to check
+	*
+	*	@returns bool true on success
+	**/
 	public static function checkJson($string)
 	{
 		if (self::checkString($string))
@@ -3540,15 +3547,29 @@ abstract class ComponentbuilderHelper
 		return false;
 	}
 
+	/**
+	*	Check if have an object with a length
+	*
+	*	@input	object   The object to check
+	*
+	*	@returns bool true on success
+	**/
 	public static function checkObject($object)
 	{
-		if (isset($object) && is_object($object) && count($object) > 0)
+		if (isset($object) && is_object($object))
 		{
-			return true;
+			return count((array)$object) > 0;
 		}
 		return false;
 	}
 
+	/**
+	*	Check if have an array with a length
+	*
+	*	@input	array   The array to check
+	*
+	*	@returns bool true on success
+	**/
 	public static function checkArray($array, $removeEmptyString = false)
 	{
 		if (isset($array) && is_array($array) && count($array) > 0)
@@ -3570,6 +3591,13 @@ abstract class ComponentbuilderHelper
 		return false;
 	}
 
+	/**
+	*	Check if have a string with a length
+	*
+	*	@input	string   The string to check
+	*
+	*	@returns bool true on success
+	**/
 	public static function checkString($string)
 	{
 		if (isset($string) && is_string($string) && strlen($string) > 0)
@@ -3604,6 +3632,13 @@ abstract class ComponentbuilderHelper
 		return $is_conn;
 	}
 
+	/**
+	*	Merge an array of array's
+	*
+	*	@input	array   The arrays you would like to merge
+	*
+	*	@returns array on success
+	**/
 	public static function mergeArrays($arrays)
 	{
 		if(self::checkArray($arrays))
@@ -3627,6 +3662,13 @@ abstract class ComponentbuilderHelper
 		return self::shorten($string, $length, $addTip);
 	}
 
+	/**
+	*	Shorten a string
+	*
+	*	@input	string   The you would like to shorten
+	*
+	*	@returns string on success
+	**/
 	public static function shorten($string, $length = 40, $addTip = true)
 	{
 		if (self::checkString($string))
@@ -3661,6 +3703,13 @@ abstract class ComponentbuilderHelper
 		return $string;
 	}
 
+	/**
+	*	Making strings safe (various ways)
+	*
+	*	@input	string   The you would like to make safe
+	*
+	*	@returns string on success
+	**/
 	public static function safeString($string, $type = 'L', $spacer = '_', $replaceNumbers = true)
 	{
 		if ($replaceNumbers === true)

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

@@ -4319,9 +4319,9 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_CODE_HINT="codename"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_CODE_LABEL="Name in Code"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_CODE_MESSAGE="Error! Please add name in code here."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_DESCRIPTION="Enter Name Here"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_HINT="Name Here"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_HINT="Component Name"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_LABEL="Name"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_MESSAGE="Error! Please add name here."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_MESSAGE="Error! Please add component name here."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NEW="A New Joomla Component"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO="No"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NONE="None"
@@ -4502,7 +4502,6 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TOIGNORE_HINT="Coma separated names of fol
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TOIGNORE_LABEL="Repository Folders or Files to Ignore"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TO_IGNORE_NOTE_DESCRIPTION="During compilation JCB deletes all files and folders from the repository folder, and then adds the newly created files and folders back into the repository folder. Yet there may be files or folders you may not want deleted, like the <b>.git</b> folder, since JCB does not dynamically create that folder and so it will not be placed back, but simply delete it, unless you add it in this text field below, so that it will be ignored, and therefore not deleted in the first place. You can add multiple folders and files, separated by commas. Like: <code>.git, .hg</code>"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TO_IGNORE_NOTE_LABEL="Repository Folders or Files to Ignore"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TRANSLATION="Translation"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATES_NOT_READY="Updates (NOT READY!)"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATE_SERVER="Update Server"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATE_SERVER_DESCRIPTION="Select your update server for this component."

admin/layouts/fieldtype/fields_fullwidth.php

@@ -28,7 +28,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->wadfields;
+$items	= $displayData->wacfields;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit = "index.php?option=com_componentbuilder&view=fields&task=field.edit";

admin/layouts/joomla_component/translation_fullwidth.php

@@ -1,108 +0,0 @@
-<?php
-/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
-    __      __       _     _____                 _                                  _     __  __      _   _               _
-    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
-     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
-      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
-       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
-        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
-                                                        |_| 				
-/-------------------------------------------------------------------------------------------------------------------------------/
-
-	@version		2.6.x
-	@created		30th April, 2015
-	@package		Component Builder
-	@subpackage		translation_fullwidth.php
-	@author			Llewellyn van der Merwe <http://joomlacomponentbuilder.com>	
-	@github			Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
-	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
-	
-	Builds Complex Joomla Components 
-                                                             
-/-----------------------------------------------------------------------------------------------------------------------------*/
-
-// No direct access to this file
-
-defined('_JEXEC') or die('Restricted access');
-
-// set the defaults
-$items	= $displayData->vwntranslation;
-$user	= JFactory::getUser();
-$id	= $displayData->item->id;
-$edit = "index.php?option=com_componentbuilder&view=language_translations&task=language_translation.edit";
-
-?>
-<div class="form-vertical">
-<?php if (ComponentbuilderHelper::checkArray($items)): ?>
-<table class="footable table data language_translations" data-show-toggle="true" data-toggle-column="first" data-sorting="true" data-paging="true" data-paging-size="20" data-filtering="true">
-<thead>
-	<tr>
-		<th data-type="html" data-sort-use="text">
-			<?php echo JText::_('COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_ENTRANSLATION_LABEL'); ?>
-		</th>
-		<th width="10" data-breakpoints="xs sm md">
-			<?php echo JText::_('COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_STATUS'); ?>
-		</th>
-		<th width="5" data-type="number" data-breakpoints="xs sm md">
-			<?php echo JText::_('COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_ID'); ?>
-		</th>
-	</tr>
-</thead>
-<tbody>
-<?php foreach ($items as $i => $item): ?>
-	<?php
-		$canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out == $user->id || $item->checked_out == 0;
-		$userChkOut = JFactory::getUser($item->checked_out);
-		$canDo = ComponentbuilderHelper::getActions('language_translation',$item,'language_translations');
-	?>
-	<tr>
-		<td class="nowrap">
-			<?php if ($canDo->get('language_translation.edit')): ?>
-				<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>&ref=joomla_component&refid=<?php echo $id; ?>"><?php echo $item->entranslation; ?></a>
-					<?php if ($item->checked_out): ?>
-						<?php echo JHtml::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'language_translations.', $canCheckin); ?>
-					<?php endif; ?>
-			<?php else: ?>
-				<div class="name"><?php echo $item->entranslation; ?></div>
-			<?php endif; ?>
-		</td>
-		<?php if ($item->published == 1):?>
-			<td class="center"  data-sort-value="1">
-				<span class="status-metro status-published" title="<?php echo JText::_('COM_COMPONENTBUILDER_PUBLISHED');  ?>">
-					<?php echo JText::_('COM_COMPONENTBUILDER_PUBLISHED'); ?>
-				</span>
-			</td>
-		<?php elseif ($item->published == 0):?>
-			<td class="center"  data-sort-value="2">
-				<span class="status-metro status-inactive" title="<?php echo JText::_('COM_COMPONENTBUILDER_INACTIVE');  ?>">
-					<?php echo JText::_('COM_COMPONENTBUILDER_INACTIVE'); ?>
-				</span>
-			</td>
-		<?php elseif ($item->published == 2):?>
-			<td class="center"  data-sort-value="3">
-				<span class="status-metro status-archived" title="<?php echo JText::_('COM_COMPONENTBUILDER_ARCHIVED');  ?>">
-					<?php echo JText::_('COM_COMPONENTBUILDER_ARCHIVED'); ?>
-				</span>
-			</td>
-		<?php elseif ($item->published == -2):?>
-			<td class="center"  data-sort-value="4">
-				<span class="status-metro status-trashed" title="<?php echo JText::_('COM_COMPONENTBUILDER_TRASHED');  ?>">
-					<?php echo JText::_('COM_COMPONENTBUILDER_TRASHED'); ?>
-				</span>
-			</td>
-		<?php endif; ?>
-		<td class="nowrap center hidden-phone">
-			<?php echo $item->id; ?>
-		</td>
-	</tr>
-<?php endforeach; ?>
-</tbody>
-</table>
-<?php else: ?>
-	<div class="alert alert-no-items">
-		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-	</div>
-<?php endif; ?>
-</div>

admin/layouts/server/linked_components_fullwidth.php

@@ -28,7 +28,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->wanlinked_components;
+$items	= $displayData->wamlinked_components;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit = "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit";

admin/layouts/template/details_right.php

@@ -31,8 +31,8 @@ $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
 	'snippet',
-	'note_uikit_snippet',
+	'note_snippet_usage',
-	'note_snippet_usage'
+	'note_uikit_snippet'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();

admin/models/admin_view.php

@@ -100,14 +100,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->metadata = $registry->toArray();
 			}
 
-			if (!empty($item->addtables))
-			{
-				// Convert the addtables field to an array.
-				$addtables = new Registry;
-				$addtables->loadString($item->addtables);
-				$item->addtables = $addtables->toArray();
-			}
-
 			if (!empty($item->addpermissions))
 			{
 				// Convert the addpermissions field to an array.
@@ -132,6 +124,14 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->addlinked_views = $addlinked_views->toArray();
 			}
 
+			if (!empty($item->addtables))
+			{
+				// Convert the addtables field to an array.
+				$addtables = new Registry;
+				$addtables->loadString($item->addtables);
+				$item->addtables = $addtables->toArray();
+			}
+
 			if (!empty($item->custom_button))
 			{
 				// Convert the custom_button field to an array.
@@ -148,10 +148,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->ajax_input = $ajax_input->toArray();
 			}
 
-			if (!empty($item->php_import_headers))
+			if (!empty($item->php_import_save))
 			{
-				// base64 Decode php_import_headers.
+				// base64 Decode php_import_save.
-				$item->php_import_headers = base64_decode($item->php_import_headers);
+				$item->php_import_save = base64_decode($item->php_import_save);
 			}
 
 			if (!empty($item->html_import_view))
@@ -160,16 +160,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->html_import_view = base64_decode($item->html_import_view);
 			}
 
-			if (!empty($item->php_import_save))
+			if (!empty($item->php_import_headers))
 			{
-				// base64 Decode php_import_save.
+				// base64 Decode php_import_headers.
-				$item->php_import_save = base64_decode($item->php_import_save);
+				$item->php_import_headers = base64_decode($item->php_import_headers);
-			}
-
-			if (!empty($item->php_getitem))
-			{
-				// base64 Decode php_getitem.
-				$item->php_getitem = base64_decode($item->php_getitem);
 			}
 
 			if (!empty($item->css_view))
@@ -352,6 +346,12 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->php_import_ext = base64_decode($item->php_import_ext);
 			}
 
+			if (!empty($item->php_getitem))
+			{
+				// base64 Decode php_getitem.
+				$item->php_getitem = base64_decode($item->php_getitem);
+			}
+
 
 			if (empty($item->id))
 			{
@@ -1184,19 +1184,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['system_name'] = $data['name_single'];
 		}
 
-		// Set the addtables items to data.
-		if (isset($data['addtables']) && is_array($data['addtables']))
-		{
-			$addtables = new JRegistry;
-			$addtables->loadArray($data['addtables']);
-			$data['addtables'] = (string) $addtables;
-		}
-		elseif (!isset($data['addtables']))
-		{
-			// Set the empty addtables to data
-			$data['addtables'] = '';
-		}
-
 		// Set the addpermissions items to data.
 		if (isset($data['addpermissions']) && is_array($data['addpermissions']))
 		{
@@ -1236,6 +1223,19 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['addlinked_views'] = '';
 		}
 
+		// Set the addtables items to data.
+		if (isset($data['addtables']) && is_array($data['addtables']))
+		{
+			$addtables = new JRegistry;
+			$addtables->loadArray($data['addtables']);
+			$data['addtables'] = (string) $addtables;
+		}
+		elseif (!isset($data['addtables']))
+		{
+			// Set the empty addtables to data
+			$data['addtables'] = '';
+		}
+
 		// Set the custom_button items to data.
 		if (isset($data['custom_button']) && is_array($data['custom_button']))
 		{
@@ -1262,10 +1262,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['ajax_input'] = '';
 		}
 
-		// Set the php_import_headers string to base64 string.
+		// Set the php_import_save string to base64 string.
-		if (isset($data['php_import_headers']))
+		if (isset($data['php_import_save']))
 		{
-			$data['php_import_headers'] = base64_encode($data['php_import_headers']);
+			$data['php_import_save'] = base64_encode($data['php_import_save']);
 		}
 
 		// Set the html_import_view string to base64 string.
@@ -1274,16 +1274,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['html_import_view'] = base64_encode($data['html_import_view']);
 		}
 
-		// Set the php_import_save string to base64 string.
+		// Set the php_import_headers string to base64 string.
-		if (isset($data['php_import_save']))
+		if (isset($data['php_import_headers']))
 		{
-			$data['php_import_save'] = base64_encode($data['php_import_save']);
+			$data['php_import_headers'] = base64_encode($data['php_import_headers']);
-		}
-
-		// Set the php_getitem string to base64 string.
-		if (isset($data['php_getitem']))
-		{
-			$data['php_getitem'] = base64_encode($data['php_getitem']);
 		}
 
 		// Set the css_view string to base64 string.
@@ -1466,6 +1460,12 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['php_import_ext'] = base64_encode($data['php_import_ext']);
 		}
 
+		// Set the php_getitem string to base64 string.
+		if (isset($data['php_getitem']))
+		{
+			$data['php_getitem'] = base64_encode($data['php_getitem']);
+		}
+        
 		// Set the Params Items to data
 		if (isset($data['params']) && is_array($data['params']))
 		{

admin/models/admin_views.php

@@ -262,14 +262,12 @@ class ComponentbuilderModelAdmin_views extends JModelList
 							continue;
 						}
 
-						// decode php_import_headers
-						$item->php_import_headers = base64_decode($item->php_import_headers);
-						// decode html_import_view
-						$item->html_import_view = base64_decode($item->html_import_view);
 						// decode php_import_save
 						$item->php_import_save = base64_decode($item->php_import_save);
-						// decode php_getitem
+						// decode html_import_view
-						$item->php_getitem = base64_decode($item->php_getitem);
+						$item->html_import_view = base64_decode($item->html_import_view);
+						// decode php_import_headers
+						$item->php_import_headers = base64_decode($item->php_import_headers);
 						// decode css_view
 						$item->css_view = base64_decode($item->css_view);
 						// decode php_getitems
@@ -330,6 +328,8 @@ class ComponentbuilderModelAdmin_views extends JModelList
 						$item->php_import_setdata = base64_decode($item->php_import_setdata);
 						// decode php_import_ext
 						$item->php_import_ext = base64_decode($item->php_import_ext);
+						// decode php_getitem
+						$item->php_getitem = base64_decode($item->php_getitem);
 						// unset the values we don't want exported.
 						unset($item->asset_id);
 						unset($item->checked_out);

admin/models/custom_admin_view.php

@@ -100,14 +100,6 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 				$item->metadata = $registry->toArray();
 			}
 
-			if (!empty($item->libraries))
-			{
-				// Convert the libraries field to an array.
-				$libraries = new Registry;
-				$libraries->loadString($item->libraries);
-				$item->libraries = $libraries->toArray();
-			}
-
 			if (!empty($item->ajax_input))
 			{
 				// Convert the ajax_input field to an array.
@@ -116,6 +108,14 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 				$item->ajax_input = $ajax_input->toArray();
 			}
 
+			if (!empty($item->libraries))
+			{
+				// Convert the libraries field to an array.
+				$libraries = new Registry;
+				$libraries->loadString($item->libraries);
+				$item->libraries = $libraries->toArray();
+			}
+
 			if (!empty($item->custom_get))
 			{
 				// Convert the custom_get field to an array.
@@ -132,12 +132,6 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 				$item->custom_button = $custom_button->toArray();
 			}
 
-			if (!empty($item->php_document))
-			{
-				// base64 Decode php_document.
-				$item->php_document = base64_decode($item->php_document);
-			}
-
 			if (!empty($item->php_jview_display))
 			{
 				// base64 Decode php_jview_display.
@@ -150,10 +144,10 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 				$item->php_view = base64_decode($item->php_view);
 			}
 
-			if (!empty($item->php_jview))
+			if (!empty($item->php_document))
 			{
-				// base64 Decode php_jview.
+				// base64 Decode php_document.
-				$item->php_jview = base64_decode($item->php_jview);
+				$item->php_document = base64_decode($item->php_document);
 			}
 
 			if (!empty($item->default))
@@ -162,6 +156,12 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 				$item->default = base64_decode($item->default);
 			}
 
+			if (!empty($item->php_jview))
+			{
+				// base64 Decode php_jview.
+				$item->php_jview = base64_decode($item->php_jview);
+			}
+
 			if (!empty($item->js_document))
 			{
 				// base64 Decode js_document.
@@ -962,19 +962,6 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 		// always reset the snippets
 		$data['snippet'] = 0;
 
-		// Set the libraries items to data.
-		if (isset($data['libraries']) && is_array($data['libraries']))
-		{
-			$libraries = new JRegistry;
-			$libraries->loadArray($data['libraries']);
-			$data['libraries'] = (string) $libraries;
-		}
-		elseif (!isset($data['libraries']))
-		{
-			// Set the empty libraries to data
-			$data['libraries'] = '';
-		}
-
 		// Set the ajax_input items to data.
 		if (isset($data['ajax_input']) && is_array($data['ajax_input']))
 		{
@@ -988,6 +975,19 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 			$data['ajax_input'] = '';
 		}
 
+		// Set the libraries items to data.
+		if (isset($data['libraries']) && is_array($data['libraries']))
+		{
+			$libraries = new JRegistry;
+			$libraries->loadArray($data['libraries']);
+			$data['libraries'] = (string) $libraries;
+		}
+		elseif (!isset($data['libraries']))
+		{
+			// Set the empty libraries to data
+			$data['libraries'] = '';
+		}
+
 		// Set the custom_get items to data.
 		if (isset($data['custom_get']) && is_array($data['custom_get']))
 		{
@@ -1014,12 +1014,6 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 			$data['custom_button'] = '';
 		}
 
-		// Set the php_document string to base64 string.
-		if (isset($data['php_document']))
-		{
-			$data['php_document'] = base64_encode($data['php_document']);
-		}
-
 		// Set the php_jview_display string to base64 string.
 		if (isset($data['php_jview_display']))
 		{
@@ -1032,10 +1026,10 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 			$data['php_view'] = base64_encode($data['php_view']);
 		}
 
-		// Set the php_jview string to base64 string.
+		// Set the php_document string to base64 string.
-		if (isset($data['php_jview']))
+		if (isset($data['php_document']))
 		{
-			$data['php_jview'] = base64_encode($data['php_jview']);
+			$data['php_document'] = base64_encode($data['php_document']);
 		}
 
 		// Set the default string to base64 string.
@@ -1044,6 +1038,12 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 			$data['default'] = base64_encode($data['default']);
 		}
 
+		// Set the php_jview string to base64 string.
+		if (isset($data['php_jview']))
+		{
+			$data['php_jview'] = base64_encode($data['php_jview']);
+		}
+
 		// Set the js_document string to base64 string.
 		if (isset($data['js_document']))
 		{

admin/models/custom_admin_views.php

@@ -266,16 +266,16 @@ class ComponentbuilderModelCustom_admin_views extends JModelList
 							continue;
 						}
 
-						// decode php_document
-						$item->php_document = base64_decode($item->php_document);
 						// decode php_jview_display
 						$item->php_jview_display = base64_decode($item->php_jview_display);
 						// decode php_view
 						$item->php_view = base64_decode($item->php_view);
-						// decode php_jview
+						// decode php_document
-						$item->php_jview = base64_decode($item->php_jview);
+						$item->php_document = base64_decode($item->php_document);
 						// decode default
 						$item->default = base64_decode($item->default);
+						// decode php_jview
+						$item->php_jview = base64_decode($item->php_jview);
 						// decode js_document
 						$item->js_document = base64_decode($item->js_document);
 						// decode javascript_file

admin/models/dynamic_get.php

@@ -100,14 +100,6 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 				$item->metadata = $registry->toArray();
 			}
 
-			if (!empty($item->join_db_table))
-			{
-				// Convert the join_db_table field to an array.
-				$join_db_table = new Registry;
-				$join_db_table->loadString($item->join_db_table);
-				$item->join_db_table = $join_db_table->toArray();
-			}
-
 			if (!empty($item->filter))
 			{
 				// Convert the filter field to an array.
@@ -148,6 +140,14 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 				$item->join_view_table = $join_view_table->toArray();
 			}
 
+			if (!empty($item->join_db_table))
+			{
+				// Convert the join_db_table field to an array.
+				$join_db_table = new Registry;
+				$join_db_table->loadString($item->join_db_table);
+				$item->join_db_table = $join_db_table->toArray();
+			}
+
 			if (!empty($item->php_custom_get))
 			{
 				// base64 Decode php_custom_get.
@@ -966,19 +966,6 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 			$data['metadata'] = (string) $metadata;
 		} 
 
-		// Set the join_db_table items to data.
-		if (isset($data['join_db_table']) && is_array($data['join_db_table']))
-		{
-			$join_db_table = new JRegistry;
-			$join_db_table->loadArray($data['join_db_table']);
-			$data['join_db_table'] = (string) $join_db_table;
-		}
-		elseif (!isset($data['join_db_table']))
-		{
-			// Set the empty join_db_table to data
-			$data['join_db_table'] = '';
-		}
-
 		// Set the filter items to data.
 		if (isset($data['filter']) && is_array($data['filter']))
 		{
@@ -1044,6 +1031,19 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 			$data['join_view_table'] = '';
 		}
 
+		// Set the join_db_table items to data.
+		if (isset($data['join_db_table']) && is_array($data['join_db_table']))
+		{
+			$join_db_table = new JRegistry;
+			$join_db_table->loadArray($data['join_db_table']);
+			$data['join_db_table'] = (string) $join_db_table;
+		}
+		elseif (!isset($data['join_db_table']))
+		{
+			// Set the empty join_db_table to data
+			$data['join_db_table'] = '';
+		}
+
 		// Set the php_custom_get string to base64 string.
 		if (isset($data['php_custom_get']))
 		{

admin/models/fields.php

@@ -313,7 +313,7 @@ class ComponentbuilderModelFields extends JModelList
 			else
 			{
 				$search = $db->quote('%' . $db->escape($search) . '%');
-				$query->where('(a.name LIKE '.$search.' OR a.fieldtype LIKE '.$search.' OR g.name LIKE '.$search.' OR a.datatype LIKE '.$search.' OR a.indexes LIKE '.$search.' OR a.null_switch LIKE '.$search.' OR a.xml LIKE '.$search.' OR a.catid LIKE '.$search.' OR a.store LIKE '.$search.')');
+				$query->where('(a.name LIKE '.$search.' OR a.fieldtype LIKE '.$search.' OR g.name LIKE '.$search.' OR a.datatype LIKE '.$search.' OR a.indexes LIKE '.$search.' OR a.null_switch LIKE '.$search.' OR a.catid LIKE '.$search.' OR a.xml LIKE '.$search.' OR a.store LIKE '.$search.')');
 			}
 		}
 

admin/models/fieldtype.php

@@ -129,7 +129,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 				$item->tags->getTagIds($item->id, 'com_componentbuilder.fieldtype');
 			}
 		}
-		$this->fieldtypevvvw = $item->id;
+		$this->fieldtypevvvv = $item->id;
 
 		return $item;
 	}
@@ -139,7 +139,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 	*
 	* @return mixed  An array of data items on success, false on failure.
 	*/
-	public function getWadfields()
+	public function getWacfields()
 	{
 		// Get the user object.
 		$user = JFactory::getUser();
@@ -159,15 +159,15 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 		$query->select($db->quoteName('g.name','fieldtype_name'));
 		$query->join('LEFT', $db->quoteName('#__componentbuilder_fieldtype', 'g') . ' ON (' . $db->quoteName('a.fieldtype') . ' = ' . $db->quoteName('g.id') . ')');
 
-		// Filter by fieldtypevvvw global.
+		// Filter by fieldtypevvvv global.
-		$fieldtypevvvw = $this->fieldtypevvvw;
+		$fieldtypevvvv = $this->fieldtypevvvv;
-		if (is_numeric($fieldtypevvvw ))
+		if (is_numeric($fieldtypevvvv ))
 		{
-			$query->where('a.fieldtype = ' . (int) $fieldtypevvvw );
+			$query->where('a.fieldtype = ' . (int) $fieldtypevvvv );
 		}
-		elseif (is_string($fieldtypevvvw))
+		elseif (is_string($fieldtypevvvv))
 		{
-			$query->where('a.fieldtype = ' . $db->quote($fieldtypevvvw));
+			$query->where('a.fieldtype = ' . $db->quote($fieldtypevvvv));
 		}
 		else
 		{
@@ -223,13 +223,13 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 				foreach ($items as $nr => &$item)
 				{
 					// convert datatype
-					$item->datatype = $this->selectionTranslationWadfields($item->datatype, 'datatype');
+					$item->datatype = $this->selectionTranslationWacfields($item->datatype, 'datatype');
 					// convert indexes
-					$item->indexes = $this->selectionTranslationWadfields($item->indexes, 'indexes');
+					$item->indexes = $this->selectionTranslationWacfields($item->indexes, 'indexes');
 					// convert null_switch
-					$item->null_switch = $this->selectionTranslationWadfields($item->null_switch, 'null_switch');
+					$item->null_switch = $this->selectionTranslationWacfields($item->null_switch, 'null_switch');
 					// convert store
-					$item->store = $this->selectionTranslationWadfields($item->store, 'store');
+					$item->store = $this->selectionTranslationWacfields($item->store, 'store');
 				}
 			}
 
@@ -243,7 +243,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 	*
 	* @return translatable string
 	*/
-	public function selectionTranslationWadfields($value,$name)
+	public function selectionTranslationWacfields($value,$name)
 	{
 		// Array of datatype language strings
 		if ($name === 'datatype')
@@ -404,6 +404,22 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 				$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')))
@@ -436,22 +452,6 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 				$form->setFieldAttribute('short_description', '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');
-			}
-		}
 		// Only load these values if no id is found
 		if (0 == $id)
 		{

admin/models/fieldtypes.php

@@ -45,10 +45,10 @@ class ComponentbuilderModelFieldtypes extends JModelList
 				'a.created_by','created_by',
 				'a.modified_by','modified_by',
 				'a.name','name',
+				'a.short_description','short_description',
 				'c.title','category_title',
 				'c.id', 'category_id',
-				'a.catid', 'catid',
+				'a.catid', 'catid'
-				'a.short_description','short_description'
 			);
 		}
 
@@ -72,6 +72,9 @@ class ComponentbuilderModelFieldtypes extends JModelList
 		$name = $this->getUserStateFromRequest($this->context . '.filter.name', 'filter_name');
 		$this->setState('filter.name', $name);
 
+		$short_description = $this->getUserStateFromRequest($this->context . '.filter.short_description', 'filter_short_description');
+		$this->setState('filter.short_description', $short_description);
+
 		$category = $app->getUserStateFromRequest($this->context . '.filter.category', 'filter_category');
 		$this->setState('filter.category', $category);
 
@@ -81,9 +84,6 @@ class ComponentbuilderModelFieldtypes extends JModelList
 		$catid = $app->getUserStateFromRequest($this->context . '.filter.catid', 'filter_catid');
 		$this->setState('filter.catid', $catid);
         
-		$short_description = $this->getUserStateFromRequest($this->context . '.filter.short_description', 'filter_short_description');
-		$this->setState('filter.short_description', $short_description);
-        
 		$sorting = $this->getUserStateFromRequest($this->context . '.filter.sorting', 'filter_sorting', 0, 'int');
 		$this->setState('filter.sorting', $sorting);
         
@@ -197,7 +197,7 @@ class ComponentbuilderModelFieldtypes extends JModelList
 			else
 			{
 				$search = $db->quote('%' . $db->escape($search) . '%');
-				$query->where('(a.name LIKE '.$search.' OR a.catid LIKE '.$search.' OR a.description LIKE '.$search.' OR a.short_description LIKE '.$search.')');
+				$query->where('(a.name LIKE '.$search.' OR a.description LIKE '.$search.' OR a.short_description LIKE '.$search.' OR a.catid LIKE '.$search.')');
 			}
 		}
 
@@ -351,10 +351,10 @@ class ComponentbuilderModelFieldtypes extends JModelList
 		$id .= ':' . $this->getState('filter.created_by');
 		$id .= ':' . $this->getState('filter.modified_by');
 		$id .= ':' . $this->getState('filter.name');
+		$id .= ':' . $this->getState('filter.short_description');
 		$id .= ':' . $this->getState('filter.category');
 		$id .= ':' . $this->getState('filter.category_id');
 		$id .= ':' . $this->getState('filter.catid');
-		$id .= ':' . $this->getState('filter.short_description');
 
 		return parent::getStoreId($id);
 	}

admin/models/forms/admin_fields.xml

@@ -89,13 +89,6 @@
                        required="true"
                        readonly="true"
                        button="false" />
-                <!-- Note_on_views Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_on_views"
-                       label="COM_COMPONENTBUILDER_ADMIN_FIELDS_NOTE_ON_VIEWS_LABEL"
-                       description="COM_COMPONENTBUILDER_ADMIN_FIELDS_NOTE_ON_VIEWS_DESCRIPTION"
-                       heading="h4"
-                       class="alert alert-info note_on_views" />
                 <!-- Addfields Field. Type: Subform. (joomla)-->
                 <field type="subform"
                        name="addfields"
@@ -239,6 +232,13 @@
                                 </field>
                         </form>
                 </field>
+                <!-- Note_on_views Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_on_views"
+                       label="COM_COMPONENTBUILDER_ADMIN_FIELDS_NOTE_ON_VIEWS_LABEL"
+                       description="COM_COMPONENTBUILDER_ADMIN_FIELDS_NOTE_ON_VIEWS_DESCRIPTION"
+                       heading="h4"
+                       class="alert alert-info note_on_views" />
         </fieldset>
 	
 	<!-- Access Control Fields. -->

admin/models/forms/admin_fields_conditions.xml

@@ -89,14 +89,6 @@
                        required="true"
                        readonly="true"
                        button="false" />
-                <!-- Note_on_conditions Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_on_conditions"
-                       label="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_NOTE_ON_CONDITIONS_LABEL"
-                       description="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_NOTE_ON_CONDITIONS_DESCRIPTION"
-                       heading="h4"
-                       class="alert alert-info note_on_conditions"
-                       close="true" />
                 <!-- Addconditions Field. Type: Subform. (joomla)-->
                 <field type="subform"
                        name="addconditions"
@@ -190,6 +182,14 @@
                                        required="false" />
                         </form>
                 </field>
+                <!-- Note_on_conditions Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_on_conditions"
+                       label="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_NOTE_ON_CONDITIONS_LABEL"
+                       description="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_NOTE_ON_CONDITIONS_DESCRIPTION"
+                       heading="h4"
+                       class="alert alert-info note_on_conditions"
+                       close="true" />
         </fieldset>
 	
 	<!-- Access Control Fields. -->

admin/models/forms/admin_view.xml

@@ -130,16 +130,10 @@
                        filter="HTML"
                        message="COM_COMPONENTBUILDER_ADMIN_VIEW_SHORT_DESCRIPTION_MESSAGE"
                        hint="COM_COMPONENTBUILDER_ADMIN_VIEW_SHORT_DESCRIPTION_HINT" />
-                <!-- Icon Field. Type: Media. (joomla)-->
+                <!-- Add_php_after_publish Field. Type: Radio. (joomla)-->
-                <field type="media"
-                       name="icon"
-                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_ICON_LABEL"
-                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_ICON_DESCRIPTION"
-                       directory="" />
-                <!-- Add_php_document Field. Type: Radio. (joomla)-->
                 <field type="radio"
-                       name="add_php_document"
+                       name="add_php_after_publish"
-                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_DOCUMENT_LABEL"
+                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_PUBLISH_LABEL"
                        class="btn-group btn-group-yesno"
                        default="0"
                        required="true">
@@ -147,22 +141,10 @@
                         <option value="1">COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
                         <option value="0">COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
                 </field>
-                <!-- Icon_category Field. Type: Media. (joomla)-->
+                <!-- Add_php_batchmove Field. Type: Radio. (joomla)-->
-                <field type="media"
-                       name="icon_category"
-                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_ICON_CATEGORY_LABEL"
-                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_ICON_CATEGORY_DESCRIPTION"
-                       directory="" />
-                <!-- Icon_add Field. Type: Media. (joomla)-->
-                <field type="media"
-                       name="icon_add"
-                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_ICON_ADD_LABEL"
-                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_ICON_ADD_DESCRIPTION"
-                       directory="" />
-                <!-- Add_php_postsavehook Field. Type: Radio. (joomla)-->
                 <field type="radio"
-                       name="add_php_postsavehook"
+                       name="add_php_batchmove"
-                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_POSTSAVEHOOK_LABEL"
+                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BATCHMOVE_LABEL"
                        class="btn-group btn-group-yesno"
                        default="0"
                        required="true">
@@ -170,11 +152,10 @@
                         <option value="1">COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
                         <option value="0">COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
                 </field>
-                <!-- Add_custom_import Field. Type: Radio. (joomla)-->
+                <!-- Add_php_allowedit Field. Type: Radio. (joomla)-->
                 <field type="radio"
-                       name="add_custom_import"
+                       name="add_php_allowedit"
-                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_IMPORT_LABEL"
+                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_ALLOWEDIT_LABEL"
-                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_IMPORT_DESCRIPTION"
                        class="btn-group btn-group-yesno"
                        default="0"
                        required="true">
@@ -182,10 +163,10 @@
                         <option value="1">COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
                         <option value="0">COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
                 </field>
-                <!-- Add_php_before_publish Field. Type: Radio. (joomla)-->
+                <!-- Add_php_save Field. Type: Radio. (joomla)-->
                 <field type="radio"
-                       name="add_php_before_publish"
+                       name="add_php_save"
-                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_PUBLISH_LABEL"
+                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_SAVE_LABEL"
                        class="btn-group btn-group-yesno"
                        default="0"
                        required="true">
@@ -193,6 +174,35 @@
                         <option value="1">COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
                         <option value="0">COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
                 </field>
+                <!-- Add_php_getlistquery Field. Type: Radio. (joomla)-->
+                <field type="radio"
+                       name="add_php_getlistquery"
+                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETLISTQUERY_LABEL"
+                       class="btn-group btn-group-yesno"
+                       default="0"
+                       required="true">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
+                        <option value="0">COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
+                </field>
+                <!-- Php_import_save Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="php_import_save"
+                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE_LABEL"
+                       rows="30"
+                       cols="15"
+                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE_HINT"
+                       required="true" />
+                <!-- Note_beginner_import Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_beginner_import"
+                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_BEGINNER_IMPORT_LABEL"
+                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_BEGINNER_IMPORT_DESCRIPTION"
+                       heading="h4"
+                       class="alert alert-info note_beginner_import" />
                 <!-- Type Field. Type: List. (joomla)-->
                 <field type="list"
                        name="type"
@@ -205,27 +215,13 @@
                         <option value="1">COM_COMPONENTBUILDER_ADMIN_VIEW_READWRITE</option>
                         <option value="2">COM_COMPONENTBUILDER_ADMIN_VIEW_READONLY</option>
                 </field>
-                <!-- Description Field. Type: Textarea. (joomla)-->
+                <!-- Note_linked_to_notice Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="textarea"
+                <field type="note"
-                       name="description"
+                       name="note_linked_to_notice"
-                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_DESCRIPTION_LABEL"
+                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_LINKED_TO_NOTICE_LABEL"
-                       rows="11"
+                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_LINKED_TO_NOTICE_DESCRIPTION"
-                       cols="10"
+                       heading="h4"
-                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_DESCRIPTION_DESCRIPTION"
+                       class="note_linked_to_notice" />
-                       class="text_area span12"
-                       filter="HTML"
-                       hint="COM_COMPONENTBUILDER_ADMIN_VIEW_DESCRIPTION_HINT" />
-                <!-- Add_php_batchcopy Field. Type: Radio. (joomla)-->
-                <field type="radio"
-                       name="add_php_batchcopy"
-                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BATCHCOPY_LABEL"
-                       class="btn-group btn-group-yesno"
-                       default="0"
-                       required="true">
-                        <!-- Option Set.-->
-                        <option value="1">COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
-                        <option value="0">COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
-                </field>
                 <!-- Add_fadein Field. Type: Radio. (joomla)-->
                 <field type="radio"
                        name="add_fadein"
@@ -237,94 +233,26 @@
                         <option value="1">COM_COMPONENTBUILDER_ADMIN_VIEW_ADD</option>
                         <option value="0">COM_COMPONENTBUILDER_ADMIN_VIEW_REMOVE</option>
                 </field>
-                <!-- Add_php_before_delete Field. Type: Radio. (joomla)-->
+                <!-- Description Field. Type: Textarea. (joomla)-->
-                <field type="radio"
-                       name="add_php_before_delete"
-                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_DELETE_LABEL"
-                       class="btn-group btn-group-yesno"
-                       default="0"
-                       required="true">
-                        <!-- Option Set.-->
-                        <option value="1">COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
-                        <option value="0">COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
-                </field>
-                <!-- Note_linked_to_notice Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_linked_to_notice"
-                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_LINKED_TO_NOTICE_LABEL"
-                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_LINKED_TO_NOTICE_DESCRIPTION"
-                       heading="h4"
-                       class="note_linked_to_notice" />
-                <!-- Addtables Field. Type: Subform. (joomla)-->
-                <field type="subform"
-                       name="addtables"
-                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADDTABLES_LABEL"
-                       layout="joomla.form.field.subform.repeatable-table"
-                       multiple="true"
-                       icon="list"
-                       maximum="50">
-                        <form hidden="true"
-                              name="list_addtables_modal"
-                              repeat="true">
-                                <!-- Table Field. Type: Dbtables. (custom)-->
-                                <field type="dbtables"
-                                       name="table"
-                                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_TABLE_LABEL"
-                                       class="list_class"
-                                       multiple="false"
-                                       default="0"
-                                       required="false"
-                                       button="false" />
-                                <!-- Sourcemap Field. Type: Textarea. (joomla)-->
                 <field type="textarea"
-                                       name="sourcemap"
+                       name="description"
-                                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_SOURCEMAP_LABEL"
+                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_DESCRIPTION_LABEL"
-                                       rows="22"
+                       rows="11"
-                                       cols="30"
+                       cols="10"
-                                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_SOURCEMAP_DESCRIPTION"
+                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_DESCRIPTION_DESCRIPTION"
-                                       class="text_area span4"
-                                       filter="HTML"
-                                       hint="COM_COMPONENTBUILDER_ADMIN_VIEW_SOURCEMAP_HINT"
-                                       required="false" />
-                        </form>
-                </field>
-                <!-- Add_php_getitems_after_all Field. Type: Radio. (joomla)-->
-                <field type="radio"
-                       name="add_php_getitems_after_all"
-                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEMS_AFTER_ALL_LABEL"
-                       class="btn-group btn-group-yesno"
-                       default="0"
-                       required="true">
-                        <!-- Option Set.-->
-                        <option value="1">COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
-                        <option value="0">COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
-                </field>
-                <!-- Php_import_headers Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="php_import_headers"
-                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HEADERS_LABEL"
-                       rows="30"
-                       cols="15"
-                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HEADERS_DESCRIPTION"
                        class="text_area span12"
-                       filter="raw"
+                       filter="HTML"
-                       hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HEADERS_HINT"
+                       hint="COM_COMPONENTBUILDER_ADMIN_VIEW_DESCRIPTION_HINT" />
-                       required="true" />
+                <!-- Icon_category Field. Type: Media. (joomla)-->
-                <!-- Add_php_before_save Field. Type: Radio. (joomla)-->
+                <field type="media"
+                       name="icon_category"
+                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_ICON_CATEGORY_LABEL"
+                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_ICON_CATEGORY_DESCRIPTION"
+                       directory="" />
+                <!-- Add_php_after_delete Field. Type: Radio. (joomla)-->
                 <field type="radio"
-                       name="add_php_before_save"
+                       name="add_php_after_delete"
-                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_SAVE_LABEL"
+                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_DELETE_LABEL"
-                       class="btn-group btn-group-yesno"
-                       default="0"
-                       required="true">
-                        <!-- Option Set.-->
-                        <option value="1">COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
-                        <option value="0">COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
-                </field>
-                <!-- Add_php_getitems Field. Type: Radio. (joomla)-->
-                <field type="radio"
-                       name="add_php_getitems"
-                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEMS_LABEL"
                        class="btn-group btn-group-yesno"
                        default="0"
                        required="true">
@@ -336,10 +264,10 @@
                 <field type="hidden"
                        name="not_required"
                        default="[]" />
-                <!-- Add_php_getlistquery Field. Type: Radio. (joomla)-->
+                <!-- Add_sql Field. Type: Radio. (joomla)-->
                 <field type="radio"
-                       name="add_php_getlistquery"
+                       name="add_sql"
-                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETLISTQUERY_LABEL"
+                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_SQL_LABEL"
                        class="btn-group btn-group-yesno"
                        default="0"
                        required="true">
@@ -354,17 +282,17 @@
                        description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_PERMISSIONS_DESCRIPTION"
                        heading="h4"
                        class="alert alert-info note_on_permissions" />
-                <!-- Add_php_save Field. Type: Radio. (joomla)-->
+                <!-- Html_import_view Field. Type: Textarea. (joomla)-->
-                <field type="radio"
+                <field type="textarea"
-                       name="add_php_save"
+                       name="html_import_view"
-                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_SAVE_LABEL"
+                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_LABEL"
-                       class="btn-group btn-group-yesno"
+                       rows="30"
-                       default="0"
+                       cols="15"
-                       required="true">
+                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_DESCRIPTION"
-                        <!-- Option Set.-->
+                       class="text_area span12"
-                        <option value="1">COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
+                       filter="raw"
-                        <option value="0">COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
+                       hint="COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_HINT"
-                </field>
+                       required="true" />
                 <!-- Addpermissions Field. Type: Subform. (joomla)-->
                 <field type="subform"
                        name="addpermissions"
@@ -420,17 +348,12 @@
                                 </field>
                         </form>
                 </field>
-                <!-- Add_php_allowedit Field. Type: Radio. (joomla)-->
+                <!-- Icon_add Field. Type: Media. (joomla)-->
-                <field type="radio"
+                <field type="media"
-                       name="add_php_allowedit"
+                       name="icon_add"
-                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_ALLOWEDIT_LABEL"
+                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_ICON_ADD_LABEL"
-                       class="btn-group btn-group-yesno"
+                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_ICON_ADD_DESCRIPTION"
-                       default="0"
+                       directory="" />
-                       required="true">
-                        <!-- Option Set.-->
-                        <option value="1">COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
-                        <option value="0">COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
-                </field>
                 <!-- Note_on_tabs Field. Type: Note. A None Database Field. (joomla)-->
                 <field type="note"
                        name="note_on_tabs"
@@ -438,10 +361,10 @@
                        description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_TABS_DESCRIPTION"
                        heading="h4"
                        class="alert alert-info note_on_tabs" />
-                <!-- Add_php_batchmove Field. Type: Radio. (joomla)-->
+                <!-- Add_php_before_save Field. Type: Radio. (joomla)-->
                 <field type="radio"
-                       name="add_php_batchmove"
+                       name="add_php_before_save"
-                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BATCHMOVE_LABEL"
+                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_SAVE_LABEL"
                        class="btn-group btn-group-yesno"
                        default="0"
                        required="true">
@@ -477,10 +400,10 @@
                                        hint="COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_HINT" />
                         </form>
                 </field>
-                <!-- Add_php_after_publish Field. Type: Radio. (joomla)-->
+                <!-- Add_php_postsavehook Field. Type: Radio. (joomla)-->
                 <field type="radio"
-                       name="add_php_after_publish"
+                       name="add_php_postsavehook"
-                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_PUBLISH_LABEL"
+                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_POSTSAVEHOOK_LABEL"
                        class="btn-group btn-group-yesno"
                        default="0"
                        required="true">
@@ -495,10 +418,10 @@
                        description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_LINKED_VIEWS_DESCRIPTION"
                        heading="h4"
                        class="alert alert-info note_on_linked_views" />
-                <!-- Add_php_after_delete Field. Type: Radio. (joomla)-->
+                <!-- Add_php_batchcopy Field. Type: Radio. (joomla)-->
                 <field type="radio"
-                       name="add_php_after_delete"
+                       name="add_php_batchcopy"
-                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_DELETE_LABEL"
+                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BATCHCOPY_LABEL"
                        class="btn-group btn-group-yesno"
                        default="0"
                        required="true">
@@ -584,10 +507,10 @@
                                 </field>
                         </form>
                 </field>
-                <!-- Add_sql Field. Type: Radio. (joomla)-->
+                <!-- Add_php_before_publish Field. Type: Radio. (joomla)-->
                 <field type="radio"
-                       name="add_sql"
+                       name="add_php_before_publish"
-                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_SQL_LABEL"
+                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_PUBLISH_LABEL"
                        class="btn-group btn-group-yesno"
                        default="0"
                        required="true">
@@ -602,45 +525,71 @@
                        description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_NOTICE_DESCRIPTION"
                        heading="h4"
                        class="alert alert-info note_create_edit_notice" />
-                <!-- Note_beginner_import Field. Type: Note. A None Database Field. (joomla)-->
+                <!-- Add_php_before_delete Field. Type: Radio. (joomla)-->
-                <field type="note"
+                <field type="radio"
-                       name="note_beginner_import"
+                       name="add_php_before_delete"
-                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_BEGINNER_IMPORT_LABEL"
+                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_DELETE_LABEL"
-                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_BEGINNER_IMPORT_DESCRIPTION"
+                       class="btn-group btn-group-yesno"
-                       heading="h4"
+                       default="0"
-                       class="alert alert-info note_beginner_import" />
+                       required="true">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
+                        <option value="0">COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
+                </field>
                 <!-- Note_create_edit_buttons Field. Type: Note. A None Database Field. (joomla)-->
                 <field type="note"
                        name="note_create_edit_buttons"
                        description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_BUTTONS_DESCRIPTION"
                        class="note_create_edit_buttons" />
-                <!-- Html_import_view Field. Type: Textarea. (joomla)-->
+                <!-- Add_php_document Field. Type: Radio. (joomla)-->
-                <field type="textarea"
+                <field type="radio"
-                       name="html_import_view"
+                       name="add_php_document"
-                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_LABEL"
+                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_DOCUMENT_LABEL"
-                       rows="30"
+                       class="btn-group btn-group-yesno"
-                       cols="15"
+                       default="0"
-                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_DESCRIPTION"
+                       required="true">
-                       class="text_area span12"
+                        <!-- Option Set.-->
-                       filter="raw"
+                        <option value="1">COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
-                       hint="COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_HINT"
+                        <option value="0">COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
-                       required="true" />
+                </field>
                 <!-- Note_create_edit_display Field. Type: Note. A None Database Field. (joomla)-->
                 <field type="note"
                        name="note_create_edit_display"
                        description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_DISPLAY_DESCRIPTION"
                        class="note_create_edit_display" />
-                <!-- Php_import_save Field. Type: Textarea. (joomla)-->
+                <!-- Addtables Field. Type: Subform. (joomla)-->
+                <field type="subform"
+                       name="addtables"
+                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADDTABLES_LABEL"
+                       layout="joomla.form.field.subform.repeatable-table"
+                       multiple="true"
+                       icon="list"
+                       maximum="50">
+                        <form hidden="true"
+                              name="list_addtables_modal"
+                              repeat="true">
+                                <!-- Table Field. Type: Dbtables. (custom)-->
+                                <field type="dbtables"
+                                       name="table"
+                                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_TABLE_LABEL"
+                                       class="list_class"
+                                       multiple="false"
+                                       default="0"
+                                       required="false"
+                                       button="false" />
+                                <!-- Sourcemap Field. Type: Textarea. (joomla)-->
                                 <field type="textarea"
-                       name="php_import_save"
+                                       name="sourcemap"
-                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE_LABEL"
+                                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_SOURCEMAP_LABEL"
-                       rows="30"
+                                       rows="22"
-                       cols="15"
+                                       cols="30"
-                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE_DESCRIPTION"
+                                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_SOURCEMAP_DESCRIPTION"
-                       class="text_area span12"
+                                       class="text_area span4"
-                       filter="raw"
+                                       filter="HTML"
-                       hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE_HINT"
+                                       hint="COM_COMPONENTBUILDER_ADMIN_VIEW_SOURCEMAP_HINT"
-                       required="true" />
+                                       required="false" />
+                        </form>
+                </field>
                 <!-- Add_css_view Field. Type: Radio. (joomla)-->
                 <field type="radio"
                        name="add_css_view"
@@ -652,17 +601,51 @@
                         <option value="1">COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
                         <option value="0">COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
                 </field>
-                <!-- Php_getitem Field. Type: Textarea. (joomla)-->
+                <!-- Add_custom_import Field. Type: Radio. (joomla)-->
+                <field type="radio"
+                       name="add_custom_import"
+                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_IMPORT_LABEL"
+                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_IMPORT_DESCRIPTION"
+                       class="btn-group btn-group-yesno"
+                       default="0"
+                       required="true">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
+                        <option value="0">COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
+                </field>
+                <!-- Add_php_getitems Field. Type: Radio. (joomla)-->
+                <field type="radio"
+                       name="add_php_getitems"
+                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEMS_LABEL"
+                       class="btn-group btn-group-yesno"
+                       default="0"
+                       required="true">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
+                        <option value="0">COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
+                </field>
+                <!-- Php_import_headers Field. Type: Textarea. (joomla)-->
                 <field type="textarea"
-                       name="php_getitem"
+                       name="php_import_headers"
-                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEM_LABEL"
+                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HEADERS_LABEL"
                        rows="30"
                        cols="15"
-                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEM_DESCRIPTION"
+                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HEADERS_DESCRIPTION"
                        class="text_area span12"
                        filter="raw"
-                       hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEM_HINT"
+                       hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HEADERS_HINT"
                        required="true" />
+                <!-- Add_php_getitems_after_all Field. Type: Radio. (joomla)-->
+                <field type="radio"
+                       name="add_php_getitems_after_all"
+                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEMS_AFTER_ALL_LABEL"
+                       class="btn-group btn-group-yesno"
+                       default="0"
+                       required="true">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
+                        <option value="0">COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
+                </field>
                 <!-- Css_view Field. Type: Textarea. (joomla)-->
                 <field type="textarea"
                        name="css_view"
@@ -674,6 +657,12 @@
                        filter="raw"
                        hint="COM_COMPONENTBUILDER_ADMIN_VIEW_CSS_VIEW_HINT"
                        required="true" />
+                <!-- Icon Field. Type: Media. (joomla)-->
+                <field type="media"
+                       name="icon"
+                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_ICON_LABEL"
+                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_ICON_DESCRIPTION"
+                       directory="" />
                 <!-- Php_getitems Field. Type: Textarea. (joomla)-->
                 <field type="textarea"
                        name="php_getitems"
@@ -1492,6 +1481,17 @@
                        filter="raw"
                        hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_EXT_HINT"
                        required="true" />
+                <!-- Php_getitem Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="php_getitem"
+                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEM_LABEL"
+                       rows="30"
+                       cols="15"
+                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEM_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEM_HINT"
+                       required="true" />
         </fieldset>
 	
 	<!-- Access Control Fields. -->

admin/models/forms/component_admin_views.xml

@@ -89,13 +89,6 @@
                        required="true"
                        readonly="true"
                        button="false" />
-                <!-- Note_on_admin_views Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_on_admin_views"
-                       label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_NOTE_ON_ADMIN_VIEWS_LABEL"
-                       description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_NOTE_ON_ADMIN_VIEWS_DESCRIPTION"
-                       heading="h4"
-                       class="alert alert-info note_on_admin_views" />
                 <!-- Addadmin_views Field. Type: Subform. (joomla)-->
                 <field type="subform"
                        name="addadmin_views"
@@ -437,6 +430,13 @@
                                        step="1" />
                         </form>
                 </field>
+                <!-- Note_on_admin_views Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_on_admin_views"
+                       label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_NOTE_ON_ADMIN_VIEWS_LABEL"
+                       description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_NOTE_ON_ADMIN_VIEWS_DESCRIPTION"
+                       heading="h4"
+                       class="alert alert-info note_on_admin_views" />
         </fieldset>
 	
 	<!-- Access Control Fields. -->

admin/models/forms/component_custom_admin_views.xml

@@ -89,13 +89,6 @@
                        required="true"
                        readonly="true"
                        button="false" />
-                <!-- Note_on_custom_admin_views Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_on_custom_admin_views"
-                       label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_NOTE_ON_CUSTOM_ADMIN_VIEWS_LABEL"
-                       description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_NOTE_ON_CUSTOM_ADMIN_VIEWS_DESCRIPTION"
-                       heading="h4"
-                       class="alert alert-info note_on_custom_admin_views" />
                 <!-- Addcustom_admin_views Field. Type: Subform. (joomla)-->
                 <field type="subform"
                        name="addcustom_admin_views"
@@ -401,6 +394,13 @@
                                        button="false" />
                         </form>
                 </field>
+                <!-- Note_on_custom_admin_views Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_on_custom_admin_views"
+                       label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_NOTE_ON_CUSTOM_ADMIN_VIEWS_LABEL"
+                       description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_NOTE_ON_CUSTOM_ADMIN_VIEWS_DESCRIPTION"
+                       heading="h4"
+                       class="alert alert-info note_on_custom_admin_views" />
         </fieldset>
 	
 	<!-- Access Control Fields. -->

admin/models/forms/component_dashboard.xml

@@ -89,17 +89,6 @@
                        required="true"
                        readonly="true"
                        button="false" />
-                <!-- Php_dashboard_methods Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="php_dashboard_methods"
-                       label="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_PHP_DASHBOARD_METHODS_LABEL"
-                       rows="17"
-                       cols="5"
-                       description="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_PHP_DASHBOARD_METHODS_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_PHP_DASHBOARD_METHODS_HINT"
-                       required="false" />
                 <!-- Dashboard_tab Field. Type: Subform. (joomla)-->
                 <field type="subform"
                        name="dashboard_tab"
@@ -152,6 +141,17 @@
                                        required="false" />
                         </form>
                 </field>
+                <!-- Php_dashboard_methods Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="php_dashboard_methods"
+                       label="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_PHP_DASHBOARD_METHODS_LABEL"
+                       rows="17"
+                       cols="5"
+                       description="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_PHP_DASHBOARD_METHODS_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_PHP_DASHBOARD_METHODS_HINT"
+                       required="false" />
         </fieldset>
 	
 	<!-- Access Control Fields. -->

admin/models/forms/component_files_folders.xml

@@ -89,6 +89,13 @@
                        required="true"
                        readonly="true"
                        button="false" />
+                <!-- Note_constant_paths Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_constant_paths"
+                       label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_CONSTANT_PATHS_LABEL"
+                       description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_CONSTANT_PATHS_DESCRIPTION"
+                       heading="h4"
+                       class="alert alert-info note_constant_paths" />
                 <!-- Addfoldersfullpath Field. Type: Subform. (joomla)-->
                 <field type="subform"
                        name="addfoldersfullpath"
@@ -136,13 +143,13 @@
                                        class="inputbox" />
                         </form>
                 </field>
-                <!-- Note_add_folders Field. Type: Note. A None Database Field. (joomla)-->
+                <!-- Note_add_folders_fullpath Field. Type: Note. A None Database Field. (joomla)-->
                 <field type="note"
-                       name="note_add_folders"
+                       name="note_add_folders_fullpath"
-                       label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_ADD_FOLDERS_LABEL"
+                       label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_ADD_FOLDERS_FULLPATH_LABEL"
-                       description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_ADD_FOLDERS_DESCRIPTION"
+                       description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_ADD_FOLDERS_FULLPATH_DESCRIPTION"
                        heading="h4"
-                       class="alert alert-info note_add_folders" />
+                       class="alert alert-info note_add_folders_fullpath" />
                 <!-- Addfilesfullpath Field. Type: Subform. (joomla)-->
                 <field type="subform"
                        name="addfilesfullpath"
@@ -191,6 +198,13 @@
                                        class="inputbox" />
                         </form>
                 </field>
+                <!-- Note_add_files_fullpath Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_add_files_fullpath"
+                       label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_ADD_FILES_FULLPATH_LABEL"
+                       description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_ADD_FILES_FULLPATH_DESCRIPTION"
+                       heading="h4"
+                       class="alert alert-info note_add_files_fullpath" />
                 <!-- Addfolders Field. Type: Subform. (joomla)-->
                 <field type="subform"
                        name="addfolders"
@@ -236,6 +250,13 @@
                                        class="inputbox" />
                         </form>
                 </field>
+                <!-- Note_add_folders Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_add_folders"
+                       label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_ADD_FOLDERS_LABEL"
+                       description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_ADD_FOLDERS_DESCRIPTION"
+                       heading="h4"
+                       class="alert alert-info note_add_folders" />
                 <!-- Addfiles Field. Type: Subform. (joomla)-->
                 <field type="subform"
                        name="addfiles"
@@ -289,27 +310,6 @@
                        description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_ADD_FILES_DESCRIPTION"
                        heading="h4"
                        class="alert alert-info note_add_files" />
-                <!-- Note_add_folders_fullpath Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_add_folders_fullpath"
-                       label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_ADD_FOLDERS_FULLPATH_LABEL"
-                       description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_ADD_FOLDERS_FULLPATH_DESCRIPTION"
-                       heading="h4"
-                       class="alert alert-info note_add_folders_fullpath" />
-                <!-- Note_add_files_fullpath Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_add_files_fullpath"
-                       label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_ADD_FILES_FULLPATH_LABEL"
-                       description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_ADD_FILES_FULLPATH_DESCRIPTION"
-                       heading="h4"
-                       class="alert alert-info note_add_files_fullpath" />
-                <!-- Note_constant_paths Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_constant_paths"
-                       label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_CONSTANT_PATHS_LABEL"
-                       description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_CONSTANT_PATHS_DESCRIPTION"
-                       heading="h4"
-                       class="alert alert-info note_constant_paths" />
         </fieldset>
 	
 	<!-- Access Control Fields. -->

admin/models/forms/component_site_views.xml

@@ -89,13 +89,6 @@
                        required="true"
                        readonly="true"
                        button="false" />
-                <!-- Note_on_site_views Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_on_site_views"
-                       label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_NOTE_ON_SITE_VIEWS_LABEL"
-                       description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_NOTE_ON_SITE_VIEWS_DESCRIPTION"
-                       heading="h4"
-                       class="alert alert-info note_on_site_views" />
                 <!-- Addsite_views Field. Type: Subform. (joomla)-->
                 <field type="subform"
                        name="addsite_views"
@@ -162,6 +155,13 @@
                                        class="inputbox" />
                         </form>
                 </field>
+                <!-- Note_on_site_views Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_on_site_views"
+                       label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_NOTE_ON_SITE_VIEWS_LABEL"
+                       description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_NOTE_ON_SITE_VIEWS_DESCRIPTION"
+                       heading="h4"
+                       class="alert alert-info note_on_site_views" />
         </fieldset>
 	
 	<!-- Access Control Fields. -->

admin/models/forms/custom_admin_view.js

@@ -23,17 +23,17 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvvydvxx_required = false;
+jform_vvvvvydvxw_required = false;
-jform_vvvvvyevxy_required = false;
+jform_vvvvvyevxx_required = false;
-jform_vvvvvyfvxz_required = false;
+jform_vvvvvyfvxy_required = false;
-jform_vvvvvygvya_required = false;
+jform_vvvvvygvxz_required = false;
-jform_vvvvvyhvyb_required = false;
+jform_vvvvvyhvya_required = false;
-jform_vvvvvyivyc_required = false;
+jform_vvvvvyivyb_required = false;
-jform_vvvvvyjvyd_required = false;
+jform_vvvvvyjvyc_required = false;
+jform_vvvvvykvyd_required = false;
 jform_vvvvvykvye_required = false;
-jform_vvvvvykvyf_required = false;
+jform_vvvvvylvyf_required = false;
-jform_vvvvvylvyg_required = false;
+jform_vvvvvymvyg_required = false;
-jform_vvvvvymvyh_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -76,26 +76,26 @@ function vvvvvyd(add_php_view_vvvvvyd)
 	if (add_php_view_vvvvvyd == 1)
 	{
 		jQuery('#jform_php_view').closest('.control-group').show();
-		if (jform_vvvvvydvxx_required)
+		if (jform_vvvvvydvxw_required)
 		{
 			updateFieldRequired('php_view',0);
 			jQuery('#jform_php_view').prop('required','required');
 			jQuery('#jform_php_view').attr('aria-required',true);
 			jQuery('#jform_php_view').addClass('required');
-			jform_vvvvvydvxx_required = false;
+			jform_vvvvvydvxw_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_view').closest('.control-group').hide();
-		if (!jform_vvvvvydvxx_required)
+		if (!jform_vvvvvydvxw_required)
 		{
 			updateFieldRequired('php_view',1);
 			jQuery('#jform_php_view').removeAttr('required');
 			jQuery('#jform_php_view').removeAttr('aria-required');
 			jQuery('#jform_php_view').removeClass('required');
-			jform_vvvvvydvxx_required = true;
+			jform_vvvvvydvxw_required = true;
 		}
 	}
 }
@@ -107,26 +107,26 @@ function vvvvvye(add_php_jview_display_vvvvvye)
 	if (add_php_jview_display_vvvvvye == 1)
 	{
 		jQuery('#jform_php_jview_display').closest('.control-group').show();
-		if (jform_vvvvvyevxy_required)
+		if (jform_vvvvvyevxx_required)
 		{
 			updateFieldRequired('php_jview_display',0);
 			jQuery('#jform_php_jview_display').prop('required','required');
 			jQuery('#jform_php_jview_display').attr('aria-required',true);
 			jQuery('#jform_php_jview_display').addClass('required');
-			jform_vvvvvyevxy_required = false;
+			jform_vvvvvyevxx_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_jview_display').closest('.control-group').hide();
-		if (!jform_vvvvvyevxy_required)
+		if (!jform_vvvvvyevxx_required)
 		{
 			updateFieldRequired('php_jview_display',1);
 			jQuery('#jform_php_jview_display').removeAttr('required');
 			jQuery('#jform_php_jview_display').removeAttr('aria-required');
 			jQuery('#jform_php_jview_display').removeClass('required');
-			jform_vvvvvyevxy_required = true;
+			jform_vvvvvyevxx_required = true;
 		}
 	}
 }
@@ -138,26 +138,26 @@ function vvvvvyf(add_php_jview_vvvvvyf)
 	if (add_php_jview_vvvvvyf == 1)
 	{
 		jQuery('#jform_php_jview').closest('.control-group').show();
-		if (jform_vvvvvyfvxz_required)
+		if (jform_vvvvvyfvxy_required)
 		{
 			updateFieldRequired('php_jview',0);
 			jQuery('#jform_php_jview').prop('required','required');
 			jQuery('#jform_php_jview').attr('aria-required',true);
 			jQuery('#jform_php_jview').addClass('required');
-			jform_vvvvvyfvxz_required = false;
+			jform_vvvvvyfvxy_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_jview').closest('.control-group').hide();
-		if (!jform_vvvvvyfvxz_required)
+		if (!jform_vvvvvyfvxy_required)
 		{
 			updateFieldRequired('php_jview',1);
 			jQuery('#jform_php_jview').removeAttr('required');
 			jQuery('#jform_php_jview').removeAttr('aria-required');
 			jQuery('#jform_php_jview').removeClass('required');
-			jform_vvvvvyfvxz_required = true;
+			jform_vvvvvyfvxy_required = true;
 		}
 	}
 }
@@ -169,26 +169,26 @@ function vvvvvyg(add_php_document_vvvvvyg)
 	if (add_php_document_vvvvvyg == 1)
 	{
 		jQuery('#jform_php_document').closest('.control-group').show();
-		if (jform_vvvvvygvya_required)
+		if (jform_vvvvvygvxz_required)
 		{
 			updateFieldRequired('php_document',0);
 			jQuery('#jform_php_document').prop('required','required');
 			jQuery('#jform_php_document').attr('aria-required',true);
 			jQuery('#jform_php_document').addClass('required');
-			jform_vvvvvygvya_required = false;
+			jform_vvvvvygvxz_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_document').closest('.control-group').hide();
-		if (!jform_vvvvvygvya_required)
+		if (!jform_vvvvvygvxz_required)
 		{
 			updateFieldRequired('php_document',1);
 			jQuery('#jform_php_document').removeAttr('required');
 			jQuery('#jform_php_document').removeAttr('aria-required');
 			jQuery('#jform_php_document').removeClass('required');
-			jform_vvvvvygvya_required = true;
+			jform_vvvvvygvxz_required = true;
 		}
 	}
 }
@@ -200,26 +200,26 @@ function vvvvvyh(add_css_document_vvvvvyh)
 	if (add_css_document_vvvvvyh == 1)
 	{
 		jQuery('#jform_css_document').closest('.control-group').show();
-		if (jform_vvvvvyhvyb_required)
+		if (jform_vvvvvyhvya_required)
 		{
 			updateFieldRequired('css_document',0);
 			jQuery('#jform_css_document').prop('required','required');
 			jQuery('#jform_css_document').attr('aria-required',true);
 			jQuery('#jform_css_document').addClass('required');
-			jform_vvvvvyhvyb_required = false;
+			jform_vvvvvyhvya_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_css_document').closest('.control-group').hide();
-		if (!jform_vvvvvyhvyb_required)
+		if (!jform_vvvvvyhvya_required)
 		{
 			updateFieldRequired('css_document',1);
 			jQuery('#jform_css_document').removeAttr('required');
 			jQuery('#jform_css_document').removeAttr('aria-required');
 			jQuery('#jform_css_document').removeClass('required');
-			jform_vvvvvyhvyb_required = true;
+			jform_vvvvvyhvya_required = true;
 		}
 	}
 }
@@ -231,26 +231,26 @@ function vvvvvyi(add_javascript_file_vvvvvyi)
 	if (add_javascript_file_vvvvvyi == 1)
 	{
 		jQuery('#jform_javascript_file').closest('.control-group').show();
-		if (jform_vvvvvyivyc_required)
+		if (jform_vvvvvyivyb_required)
 		{
 			updateFieldRequired('javascript_file',0);
 			jQuery('#jform_javascript_file').prop('required','required');
 			jQuery('#jform_javascript_file').attr('aria-required',true);
 			jQuery('#jform_javascript_file').addClass('required');
-			jform_vvvvvyivyc_required = false;
+			jform_vvvvvyivyb_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_javascript_file').closest('.control-group').hide();
-		if (!jform_vvvvvyivyc_required)
+		if (!jform_vvvvvyivyb_required)
 		{
 			updateFieldRequired('javascript_file',1);
 			jQuery('#jform_javascript_file').removeAttr('required');
 			jQuery('#jform_javascript_file').removeAttr('aria-required');
 			jQuery('#jform_javascript_file').removeClass('required');
-			jform_vvvvvyivyc_required = true;
+			jform_vvvvvyivyb_required = true;
 		}
 	}
 }
@@ -262,26 +262,26 @@ function vvvvvyj(add_js_document_vvvvvyj)
 	if (add_js_document_vvvvvyj == 1)
 	{
 		jQuery('#jform_js_document').closest('.control-group').show();
-		if (jform_vvvvvyjvyd_required)
+		if (jform_vvvvvyjvyc_required)
 		{
 			updateFieldRequired('js_document',0);
 			jQuery('#jform_js_document').prop('required','required');
 			jQuery('#jform_js_document').attr('aria-required',true);
 			jQuery('#jform_js_document').addClass('required');
-			jform_vvvvvyjvyd_required = false;
+			jform_vvvvvyjvyc_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_js_document').closest('.control-group').hide();
-		if (!jform_vvvvvyjvyd_required)
+		if (!jform_vvvvvyjvyc_required)
 		{
 			updateFieldRequired('js_document',1);
 			jQuery('#jform_js_document').removeAttr('required');
 			jQuery('#jform_js_document').removeAttr('aria-required');
 			jQuery('#jform_js_document').removeClass('required');
-			jform_vvvvvyjvyd_required = true;
+			jform_vvvvvyjvyc_required = true;
 		}
 	}
 }
@@ -294,23 +294,23 @@ function vvvvvyk(add_custom_button_vvvvvyk)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').show();
 		jQuery('#jform_php_controller').closest('.control-group').show();
-		if (jform_vvvvvykvye_required)
+		if (jform_vvvvvykvyd_required)
 		{
 			updateFieldRequired('php_controller',0);
 			jQuery('#jform_php_controller').prop('required','required');
 			jQuery('#jform_php_controller').attr('aria-required',true);
 			jQuery('#jform_php_controller').addClass('required');
-			jform_vvvvvykvye_required = false;
+			jform_vvvvvykvyd_required = false;
 		}
 
 		jQuery('#jform_php_model').closest('.control-group').show();
-		if (jform_vvvvvykvyf_required)
+		if (jform_vvvvvykvye_required)
 		{
 			updateFieldRequired('php_model',0);
 			jQuery('#jform_php_model').prop('required','required');
 			jQuery('#jform_php_model').attr('aria-required',true);
 			jQuery('#jform_php_model').addClass('required');
-			jform_vvvvvykvyf_required = false;
+			jform_vvvvvykvye_required = false;
 		}
 
 	}
@@ -318,22 +318,22 @@ function vvvvvyk(add_custom_button_vvvvvyk)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_controller').closest('.control-group').hide();
-		if (!jform_vvvvvykvye_required)
+		if (!jform_vvvvvykvyd_required)
 		{
 			updateFieldRequired('php_controller',1);
 			jQuery('#jform_php_controller').removeAttr('required');
 			jQuery('#jform_php_controller').removeAttr('aria-required');
 			jQuery('#jform_php_controller').removeClass('required');
-			jform_vvvvvykvye_required = true;
+			jform_vvvvvykvyd_required = true;
 		}
 		jQuery('#jform_php_model').closest('.control-group').hide();
-		if (!jform_vvvvvykvyf_required)
+		if (!jform_vvvvvykvye_required)
 		{
 			updateFieldRequired('php_model',1);
 			jQuery('#jform_php_model').removeAttr('required');
 			jQuery('#jform_php_model').removeAttr('aria-required');
 			jQuery('#jform_php_model').removeClass('required');
-			jform_vvvvvykvyf_required = true;
+			jform_vvvvvykvye_required = true;
 		}
 	}
 }
@@ -345,26 +345,26 @@ function vvvvvyl(add_css_vvvvvyl)
 	if (add_css_vvvvvyl == 1)
 	{
 		jQuery('#jform_css').closest('.control-group').show();
-		if (jform_vvvvvylvyg_required)
+		if (jform_vvvvvylvyf_required)
 		{
 			updateFieldRequired('css',0);
 			jQuery('#jform_css').prop('required','required');
 			jQuery('#jform_css').attr('aria-required',true);
 			jQuery('#jform_css').addClass('required');
-			jform_vvvvvylvyg_required = false;
+			jform_vvvvvylvyf_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_css').closest('.control-group').hide();
-		if (!jform_vvvvvylvyg_required)
+		if (!jform_vvvvvylvyf_required)
 		{
 			updateFieldRequired('css',1);
 			jQuery('#jform_css').removeAttr('required');
 			jQuery('#jform_css').removeAttr('aria-required');
 			jQuery('#jform_css').removeClass('required');
-			jform_vvvvvylvyg_required = true;
+			jform_vvvvvylvyf_required = true;
 		}
 	}
 }
@@ -377,13 +377,13 @@ function vvvvvym(add_php_ajax_vvvvvym)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').show();
 		jQuery('#jform_php_ajaxmethod').closest('.control-group').show();
-		if (jform_vvvvvymvyh_required)
+		if (jform_vvvvvymvyg_required)
 		{
 			updateFieldRequired('php_ajaxmethod',0);
 			jQuery('#jform_php_ajaxmethod').prop('required','required');
 			jQuery('#jform_php_ajaxmethod').attr('aria-required',true);
 			jQuery('#jform_php_ajaxmethod').addClass('required');
-			jform_vvvvvymvyh_required = false;
+			jform_vvvvvymvyg_required = false;
 		}
 
 	}
@@ -391,13 +391,13 @@ function vvvvvym(add_php_ajax_vvvvvym)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_ajaxmethod').closest('.control-group').hide();
-		if (!jform_vvvvvymvyh_required)
+		if (!jform_vvvvvymvyg_required)
 		{
 			updateFieldRequired('php_ajaxmethod',1);
 			jQuery('#jform_php_ajaxmethod').removeAttr('required');
 			jQuery('#jform_php_ajaxmethod').removeAttr('aria-required');
 			jQuery('#jform_php_ajaxmethod').removeClass('required');
-			jform_vvvvvymvyh_required = true;
+			jform_vvvvvymvyg_required = true;
 		}
 	}
 }

admin/models/forms/custom_admin_view.xml

@@ -138,69 +138,6 @@
                        multiple="false"
                        required="false"
                        button="true" />
-                <!-- Add_css_document Field. Type: Radio. (joomla)-->
-                <field type="radio"
-                       name="add_css_document"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_CSS_DOCUMENT_LABEL"
-                       class="btn-group btn-group-yesno"
-                       default="0"
-                       required="true">
-                        <!-- Option Set.-->
-                        <option value="1">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
-                        <option value="0">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
-                </field>
-                <!-- Icon Field. Type: Media. (joomla)-->
-                <field type="media"
-                       name="icon"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ICON_LABEL"
-                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ICON_DESCRIPTION"
-                       directory="" />
-                <!-- Libraries Field. Type: Libraries. (custom)-->
-                <field type="libraries"
-                       name="libraries"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LIBRARIES_LABEL"
-                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LIBRARIES_DESCRIPTION"
-                       class="list_class"
-                       multiple="true"
-                       default="0"
-                       required="false"
-                       button="true" />
-                <!-- Add_php_ajax Field. Type: Radio. (joomla)-->
-                <field type="radio"
-                       name="add_php_ajax"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_AJAX_LABEL"
-                       class="btn-group btn-group-yesno"
-                       default="0"
-                       required="true">
-                        <!-- Option Set.-->
-                        <option value="1">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
-                        <option value="0">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
-                </field>
-                <!-- Note_add_language_string Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_add_language_string"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_ADD_LANGUAGE_STRING_LABEL"
-                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_ADD_LANGUAGE_STRING_DESCRIPTION"
-                       heading="h4"
-                       class="note_add_language_string" />
-                <!-- Php_document Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="php_document"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_DOCUMENT_LABEL"
-                       rows="17"
-                       cols="5"
-                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_DOCUMENT_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_DOCUMENT_HINT"
-                       required="true" />
-                <!-- Note_libraries_selection Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_libraries_selection"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_LIBRARIES_SELECTION_LABEL"
-                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_LIBRARIES_SELECTION_DESCRIPTION"
-                       heading="h4"
-                       class="alert alert-info note_libraries_selection" />
                 <!-- Php_jview_display Field. Type: Textarea. (joomla)-->
                 <field type="textarea"
                        name="php_jview_display"
@@ -212,23 +149,28 @@
                        filter="raw"
                        hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_DISPLAY_HINT"
                        required="true" />
-                <!-- Add_css Field. Type: Radio. (joomla)-->
+                <!-- Php_view Field. Type: Textarea. (joomla)-->
-                <field type="radio"
+                <field type="textarea"
-                       name="add_css"
+                       name="php_view"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_CSS_LABEL"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_VIEW_LABEL"
-                       class="btn-group btn-group-yesno"
+                       rows="17"
-                       default="0"
+                       cols="5"
-                       required="true">
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_VIEW_DESCRIPTION"
-                        <!-- Option Set.-->
+                       class="text_area span12"
-                        <option value="1">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
+                       filter="raw"
-                        <option value="0">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
+                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_VIEW_HINT"
-                </field>
+                       required="true" />
-                <!-- Note_uikit_snippet Field. Type: Note. A None Database Field. (joomla)-->
+                <!-- Php_document Field. Type: Textarea. (joomla)-->
-                <field type="note"
+                <field type="textarea"
-                       name="note_uikit_snippet"
+                       name="php_document"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_UIKIT_SNIPPET_LABEL"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_DOCUMENT_LABEL"
-                       heading="h4"
+                       rows="17"
-                       class="snippet-code note_uikit_snippet" />
+                       cols="5"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_DOCUMENT_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_DOCUMENT_HINT"
+                       required="true" />
                 <!-- Ajax_input Field. Type: Subform. (joomla)-->
                 <field type="subform"
                        name="ajax_input"
@@ -336,23 +278,35 @@
                                        class="inputbox" />
                         </form>
                 </field>
-                <!-- Note_snippet_usage Field. Type: Note. A None Database Field. (joomla)-->
+                <!-- Add_php_ajax Field. Type: Radio. (joomla)-->
+                <field type="radio"
+                       name="add_php_ajax"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_AJAX_LABEL"
+                       class="btn-group btn-group-yesno"
+                       default="0"
+                       required="true">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
+                        <option value="0">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
+                </field>
+                <!-- Add_css Field. Type: Radio. (joomla)-->
+                <field type="radio"
+                       name="add_css"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_CSS_LABEL"
+                       class="btn-group btn-group-yesno"
+                       default="0"
+                       required="true">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
+                        <option value="0">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
+                </field>
+                <!-- Note_add_language_string Field. Type: Note. A None Database Field. (joomla)-->
                 <field type="note"
-                       name="note_snippet_usage"
+                       name="note_add_language_string"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_SNIPPET_USAGE_LABEL"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_ADD_LANGUAGE_STRING_LABEL"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_ADD_LANGUAGE_STRING_DESCRIPTION"
                        heading="h4"
-                       class="snippet-usage note_snippet_usage" />
+                       class="note_add_language_string" />
-                <!-- Php_view Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="php_view"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_VIEW_LABEL"
-                       rows="17"
-                       cols="5"
-                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_VIEW_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_VIEW_HINT"
-                       required="true" />
                 <!-- Add_js_document Field. Type: Radio. (joomla)-->
                 <field type="radio"
                        name="add_js_document"
@@ -364,6 +318,34 @@
                         <option value="1">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
                         <option value="0">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
                 </field>
+                <!-- Default Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="default"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DEFAULT_LABEL"
+                       rows="20"
+                       cols="15"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DEFAULT_HINT"
+                       required="true" />
+                <!-- Note_snippet_usage Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_snippet_usage"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_SNIPPET_USAGE_LABEL"
+                       heading="h4"
+                       class="snippet-usage note_snippet_usage" />
+                <!-- Note_uikit_snippet Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_uikit_snippet"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_UIKIT_SNIPPET_LABEL"
+                       heading="h4"
+                       class="snippet-code note_uikit_snippet" />
+                <!-- Icon Field. Type: Media. (joomla)-->
+                <field type="media"
+                       name="icon"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ICON_LABEL"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ICON_DESCRIPTION"
+                       directory="" />
                 <!-- Php_jview Field. Type: Textarea. (joomla)-->
                 <field type="textarea"
                        name="php_jview"
@@ -375,16 +357,13 @@
                        filter="raw"
                        hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_HINT"
                        required="true" />
-                <!-- Default Field. Type: Textarea. (joomla)-->
+                <!-- Note_libraries_selection Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="textarea"
+                <field type="note"
-                       name="default"
+                       name="note_libraries_selection"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DEFAULT_LABEL"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_LIBRARIES_SELECTION_LABEL"
-                       rows="20"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_LIBRARIES_SELECTION_DESCRIPTION"
-                       cols="15"
+                       heading="h4"
-                       class="text_area span12"
+                       class="alert alert-info note_libraries_selection" />
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DEFAULT_HINT"
-                       required="true" />
                 <!-- Add_javascript_file Field. Type: Radio. (joomla)-->
                 <field type="radio"
                        name="add_javascript_file"
@@ -397,6 +376,16 @@
                         <option value="1">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
                         <option value="0">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
                 </field>
+                <!-- Libraries Field. Type: Libraries. (custom)-->
+                <field type="libraries"
+                       name="libraries"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LIBRARIES_LABEL"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LIBRARIES_DESCRIPTION"
+                       class="list_class"
+                       multiple="true"
+                       default="0"
+                       required="false"
+                       button="true" />
                 <!-- Js_document Field. Type: Textarea. (joomla)-->
                 <field type="textarea"
                        name="js_document"
@@ -408,10 +397,17 @@
                        filter="raw"
                        hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JS_DOCUMENT_HINT"
                        required="true" />
-                <!-- Not_required Field. Type: Hidden. (joomla)-->
+                <!-- Add_css_document Field. Type: Radio. (joomla)-->
-                <field type="hidden"
+                <field type="radio"
-                       name="not_required"
+                       name="add_css_document"
-                       default="[]" />
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_CSS_DOCUMENT_LABEL"
+                       class="btn-group btn-group-yesno"
+                       default="0"
+                       required="true">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
+                        <option value="0">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
+                </field>
                 <!-- Javascript_file Field. Type: Textarea. (joomla)-->
                 <field type="textarea"
                        name="javascript_file"
@@ -423,12 +419,10 @@
                        filter="raw"
                        hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JAVASCRIPT_FILE_HINT"
                        required="true" />
-                <!-- Custom_get Field. Type: Customgets. (custom)-->
+                <!-- Not_required Field. Type: Hidden. (joomla)-->
-                <field type="customgets"
+                <field type="hidden"
-                       name="custom_get"
+                       name="not_required"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_GET_LABEL"
+                       default="[]" />
-                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_GET_DESCRIPTION"
-                       multiple="true" />
                 <!-- Css_document Field. Type: Textarea. (joomla)-->
                 <field type="textarea"
                        name="css_document"
@@ -440,14 +434,12 @@
                        filter="raw"
                        hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_DOCUMENT_HINT"
                        required="true" />
-                <!-- Main_get Field. Type: Maingets. (custom)-->
+                <!-- Custom_get Field. Type: Customgets. (custom)-->
-                <field type="maingets"
+                <field type="customgets"
-                       name="main_get"
+                       name="custom_get"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MAIN_GET_LABEL"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_GET_LABEL"
-                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MAIN_GET_DESCRIPTION"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_GET_DESCRIPTION"
-                       multiple="false"
+                       multiple="true" />
-                       required="true"
-                       button="true" />
                 <!-- Css Field. Type: Textarea. (joomla)-->
                 <field type="textarea"
                        name="css"
@@ -459,13 +451,14 @@
                        filter="raw"
                        hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_HINT"
                        required="true" />
-                <!-- Dynamic_get Field. Type: Dynamicgets. (custom)-->
+                <!-- Main_get Field. Type: Maingets. (custom)-->
-                <field type="dynamicgets"
+                <field type="maingets"
-                       name="dynamic_get"
+                       name="main_get"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DYNAMIC_GET_LABEL"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MAIN_GET_LABEL"
-                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DYNAMIC_GET_DESCRIPTION"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MAIN_GET_DESCRIPTION"
                        multiple="false"
-                       required="false" />
+                       required="true"
+                       button="true" />
                 <!-- Php_ajaxmethod Field. Type: Textarea. (joomla)-->
                 <field type="textarea"
                        name="php_ajaxmethod"
@@ -477,6 +470,24 @@
                        filter="raw"
                        hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_AJAXMETHOD_HINT"
                        required="true" />
+                <!-- Dynamic_get Field. Type: Dynamicgets. (custom)-->
+                <field type="dynamicgets"
+                       name="dynamic_get"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DYNAMIC_GET_LABEL"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DYNAMIC_GET_DESCRIPTION"
+                       multiple="false"
+                       required="false" />
+                <!-- Add_php_document Field. Type: Radio. (joomla)-->
+                <field type="radio"
+                       name="add_php_document"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_DOCUMENT_LABEL"
+                       class="btn-group btn-group-yesno"
+                       default="0"
+                       required="true">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
+                        <option value="0">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
+                </field>
                 <!-- Dynamic_values Field. Type: Note. A None Database Field. (joomla)-->
                 <field type="note"
                        name="dynamic_values"
@@ -484,10 +495,10 @@
                        description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DYNAMIC_VALUES_DESCRIPTION"
                        heading="h4"
                        class="dynamic_values" />
-                <!-- Add_php_document Field. Type: Radio. (joomla)-->
+                <!-- Add_php_view Field. Type: Radio. (joomla)-->
                 <field type="radio"
-                       name="add_php_document"
+                       name="add_php_view"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_DOCUMENT_LABEL"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_VIEW_LABEL"
                        class="btn-group btn-group-yesno"
                        default="0"
                        required="true">
@@ -506,10 +517,10 @@
                         <option value="1">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
                         <option value="0">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
                 </field>
-                <!-- Add_php_view Field. Type: Radio. (joomla)-->
+                <!-- Add_php_jview_display Field. Type: Radio. (joomla)-->
                 <field type="radio"
-                       name="add_php_view"
+                       name="add_php_jview_display"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_VIEW_LABEL"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_JVIEW_DISPLAY_LABEL"
                        class="btn-group btn-group-yesno"
                        default="0"
                        required="true">
@@ -804,10 +815,10 @@
                                 </field>
                         </form>
                 </field>
-                <!-- Add_php_jview_display Field. Type: Radio. (joomla)-->
+                <!-- Add_php_jview Field. Type: Radio. (joomla)-->
                 <field type="radio"
-                       name="add_php_jview_display"
+                       name="add_php_jview"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_JVIEW_DISPLAY_LABEL"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_JVIEW_LABEL"
                        class="btn-group btn-group-yesno"
                        default="0"
                        required="true">
@@ -826,17 +837,13 @@
                        filter="raw"
                        hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_CONTROLLER_HINT"
                        required="false" />
-                <!-- Add_php_jview Field. Type: Radio. (joomla)-->
+                <!-- Note_linked_to_notice Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="radio"
+                <field type="note"
-                       name="add_php_jview"
+                       name="note_linked_to_notice"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_JVIEW_LABEL"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_LINKED_TO_NOTICE_LABEL"
-                       class="btn-group btn-group-yesno"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_LINKED_TO_NOTICE_DESCRIPTION"
-                       default="0"
+                       heading="h4"
-                       required="true">
+                       class="note_linked_to_notice" />
-                        <!-- Option Set.-->
-                        <option value="1">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
-                        <option value="0">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
-                </field>
                 <!-- Php_model Field. Type: Textarea. (joomla)-->
                 <field type="textarea"
                        name="php_model"
@@ -848,13 +855,6 @@
                        filter="raw"
                        hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_MODEL_HINT"
                        required="false" />
-                <!-- Note_linked_to_notice Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_linked_to_notice"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_LINKED_TO_NOTICE_LABEL"
-                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_LINKED_TO_NOTICE_DESCRIPTION"
-                       heading="h4"
-                       class="note_linked_to_notice" />
         </fieldset>
 	
 	<!-- Access Control Fields. -->

admin/models/forms/custom_code.js

@@ -23,10 +23,10 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvvzzvzp_required = false;
+jform_vvvvvzzvzo_required = false;
+jform_vvvvwaavzp_required = false;
 jform_vvvvwaavzq_required = false;
 jform_vvvvwaavzr_required = false;
-jform_vvvvwaavzs_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -53,13 +53,13 @@ function vvvvvzz(target_vvvvvzz)
 	if (target_vvvvvzz == 2)
 	{
 		jQuery('#jform_function_name').closest('.control-group').show();
-		if (jform_vvvvvzzvzp_required)
+		if (jform_vvvvvzzvzo_required)
 		{
 			updateFieldRequired('function_name',0);
 			jQuery('#jform_function_name').prop('required','required');
 			jQuery('#jform_function_name').attr('aria-required',true);
 			jQuery('#jform_function_name').addClass('required');
-			jform_vvvvvzzvzp_required = false;
+			jform_vvvvvzzvzo_required = false;
 		}
 
 		jQuery('.note_jcb_placeholder').closest('.control-group').show();
@@ -68,13 +68,13 @@ function vvvvvzz(target_vvvvvzz)
 	else
 	{
 		jQuery('#jform_function_name').closest('.control-group').hide();
-		if (!jform_vvvvvzzvzp_required)
+		if (!jform_vvvvvzzvzo_required)
 		{
 			updateFieldRequired('function_name',1);
 			jQuery('#jform_function_name').removeAttr('required');
 			jQuery('#jform_function_name').removeAttr('aria-required');
 			jQuery('#jform_function_name').removeClass('required');
-			jform_vvvvvzzvzp_required = true;
+			jform_vvvvvzzvzo_required = true;
 		}
 		jQuery('.note_jcb_placeholder').closest('.control-group').hide();
 		jQuery('#jform_system_name').closest('.control-group').hide();
@@ -88,70 +88,70 @@ function vvvvwaa(target_vvvvwaa)
 	if (target_vvvvwaa == 1)
 	{
 		jQuery('#jform_component').closest('.control-group').show();
-		if (jform_vvvvwaavzq_required)
+		if (jform_vvvvwaavzp_required)
 		{
 			updateFieldRequired('component',0);
 			jQuery('#jform_component').prop('required','required');
 			jQuery('#jform_component').attr('aria-required',true);
 			jQuery('#jform_component').addClass('required');
-			jform_vvvvwaavzq_required = false;
+			jform_vvvvwaavzp_required = false;
 		}
 
 		jQuery('#jform_path').closest('.control-group').show();
-		if (jform_vvvvwaavzr_required)
+		if (jform_vvvvwaavzq_required)
 		{
 			updateFieldRequired('path',0);
 			jQuery('#jform_path').prop('required','required');
 			jQuery('#jform_path').attr('aria-required',true);
 			jQuery('#jform_path').addClass('required');
-			jform_vvvvwaavzr_required = false;
+			jform_vvvvwaavzq_required = false;
 		}
 
 		jQuery('#jform_from_line').closest('.control-group').show();
 		jQuery('#jform_hashtarget').closest('.control-group').show();
 		jQuery('#jform_to_line').closest('.control-group').show();
 		jQuery('#jform_type').closest('.control-group').show();
-		if (jform_vvvvwaavzs_required)
+		if (jform_vvvvwaavzr_required)
 		{
 			updateFieldRequired('type',0);
 			jQuery('#jform_type').prop('required','required');
 			jQuery('#jform_type').attr('aria-required',true);
 			jQuery('#jform_type').addClass('required');
-			jform_vvvvwaavzs_required = false;
+			jform_vvvvwaavzr_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_component').closest('.control-group').hide();
-		if (!jform_vvvvwaavzq_required)
+		if (!jform_vvvvwaavzp_required)
 		{
 			updateFieldRequired('component',1);
 			jQuery('#jform_component').removeAttr('required');
 			jQuery('#jform_component').removeAttr('aria-required');
 			jQuery('#jform_component').removeClass('required');
-			jform_vvvvwaavzq_required = true;
+			jform_vvvvwaavzp_required = true;
 		}
 		jQuery('#jform_path').closest('.control-group').hide();
-		if (!jform_vvvvwaavzr_required)
+		if (!jform_vvvvwaavzq_required)
 		{
 			updateFieldRequired('path',1);
 			jQuery('#jform_path').removeAttr('required');
 			jQuery('#jform_path').removeAttr('aria-required');
 			jQuery('#jform_path').removeClass('required');
-			jform_vvvvwaavzr_required = true;
+			jform_vvvvwaavzq_required = true;
 		}
 		jQuery('#jform_from_line').closest('.control-group').hide();
 		jQuery('#jform_hashtarget').closest('.control-group').hide();
 		jQuery('#jform_to_line').closest('.control-group').hide();
 		jQuery('#jform_type').closest('.control-group').hide();
-		if (!jform_vvvvwaavzs_required)
+		if (!jform_vvvvwaavzr_required)
 		{
 			updateFieldRequired('type',1);
 			jQuery('#jform_type').removeAttr('required');
 			jQuery('#jform_type').removeAttr('aria-required');
 			jQuery('#jform_type').removeClass('required');
-			jform_vvvvwaavzs_required = true;
+			jform_vvvvwaavzr_required = true;
 		}
 	}
 }

admin/models/forms/custom_code.xml

@@ -135,18 +135,36 @@
                         <option value="1">COM_COMPONENTBUILDER_CUSTOM_CODE_PHPJS</option>
                         <option value="2">COM_COMPONENTBUILDER_CUSTOM_CODE_HTML</option>
                 </field>
-                <!-- Hashtarget Field. Type: Text. (joomla)-->
+                <!-- Not_required Field. Type: Hidden. (joomla)-->
+                <field type="hidden"
+                       name="not_required"
+                       default="[]" />
+                <!-- Function_name Field. Type: Text. (joomla)-->
                 <field type="text"
-                       name="hashtarget"
+                       name="function_name"
-                       label="COM_COMPONENTBUILDER_CUSTOM_CODE_HASHTARGET_LABEL"
+                       label="COM_COMPONENTBUILDER_CUSTOM_CODE_FUNCTION_NAME_LABEL"
-                       size="50"
+                       size="40"
-                       maxlength="150"
+                       description="COM_COMPONENTBUILDER_CUSTOM_CODE_FUNCTION_NAME_DESCRIPTION"
-                       description="COM_COMPONENTBUILDER_CUSTOM_CODE_HASHTARGET_DESCRIPTION"
+                       class="input-large-text"
+                       required="true" />
+                <!-- System_name Field. Type: Text. (joomla)-->
+                <field type="text"
+                       name="system_name"
+                       label="COM_COMPONENTBUILDER_CUSTOM_CODE_SYSTEM_NAME_LABEL"
+                       size="10"
+                       maxlength="50"
+                       description="COM_COMPONENTBUILDER_CUSTOM_CODE_SYSTEM_NAME_DESCRIPTION"
                        class="text_area"
-                       readonly="true"
                        filter="STRING"
-                       message="COM_COMPONENTBUILDER_CUSTOM_CODE_HASHTARGET_MESSAGE"
+                       message="COM_COMPONENTBUILDER_CUSTOM_CODE_SYSTEM_NAME_MESSAGE"
-                       hint="COM_COMPONENTBUILDER_CUSTOM_CODE_HASHTARGET_HINT" />
+                       hint="COM_COMPONENTBUILDER_CUSTOM_CODE_SYSTEM_NAME_HINT" />
+                <!-- Note_placeholders_explained Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_placeholders_explained"
+                       label="COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_PLACEHOLDERS_EXPLAINED_LABEL"
+                       description="COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_PLACEHOLDERS_EXPLAINED_DESCRIPTION"
+                       heading="h4"
+                       class="note_placeholders_explained" />
                 <!-- Code Field. Type: Textarea. (joomla)-->
                 <field type="textarea"
                        name="code"
@@ -158,6 +176,13 @@
                        filter="raw"
                        hint="COM_COMPONENTBUILDER_CUSTOM_CODE_CODE_HINT"
                        required="true" />
+                <!-- Note_jcb_placeholder Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_jcb_placeholder"
+                       label="COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_JCB_PLACEHOLDER_LABEL"
+                       description="COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_JCB_PLACEHOLDER_DESCRIPTION"
+                       heading="h4"
+                       class="span12 note_jcb_placeholder" />
                 <!-- Hashendtarget Field. Type: Text. (joomla)-->
                 <field type="text"
                        name="hashendtarget"
@@ -182,21 +207,6 @@
                        message="COM_COMPONENTBUILDER_CUSTOM_CODE_TO_LINE_MESSAGE"
                        hint="COM_COMPONENTBUILDER_CUSTOM_CODE_TO_LINE_HINT"
                        onchange="if(!jQuery(this).val().match(/^\d+$/)){jQuery(this).val('')};" />
-                <!-- Function_name Field. Type: Text. (joomla)-->
-                <field type="text"
-                       name="function_name"
-                       label="COM_COMPONENTBUILDER_CUSTOM_CODE_FUNCTION_NAME_LABEL"
-                       size="40"
-                       description="COM_COMPONENTBUILDER_CUSTOM_CODE_FUNCTION_NAME_DESCRIPTION"
-                       class="input-large-text"
-                       required="true" />
-                <!-- Note_placeholders_explained Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_placeholders_explained"
-                       label="COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_PLACEHOLDERS_EXPLAINED_LABEL"
-                       description="COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_PLACEHOLDERS_EXPLAINED_DESCRIPTION"
-                       heading="h4"
-                       class="note_placeholders_explained" />
                 <!-- From_line Field. Type: Text. (joomla)-->
                 <field type="text"
                        name="from_line"
@@ -209,28 +219,18 @@
                        message="COM_COMPONENTBUILDER_CUSTOM_CODE_FROM_LINE_MESSAGE"
                        hint="COM_COMPONENTBUILDER_CUSTOM_CODE_FROM_LINE_HINT"
                        onchange="if(!jQuery(this).val().match(/^\d+$/)){jQuery(this).val('')};" />
-                <!-- System_name Field. Type: Text. (joomla)-->
+                <!-- Hashtarget Field. Type: Text. (joomla)-->
                 <field type="text"
-                       name="system_name"
+                       name="hashtarget"
-                       label="COM_COMPONENTBUILDER_CUSTOM_CODE_SYSTEM_NAME_LABEL"
+                       label="COM_COMPONENTBUILDER_CUSTOM_CODE_HASHTARGET_LABEL"
-                       size="10"
+                       size="50"
-                       maxlength="50"
+                       maxlength="150"
-                       description="COM_COMPONENTBUILDER_CUSTOM_CODE_SYSTEM_NAME_DESCRIPTION"
+                       description="COM_COMPONENTBUILDER_CUSTOM_CODE_HASHTARGET_DESCRIPTION"
                        class="text_area"
+                       readonly="true"
                        filter="STRING"
-                       message="COM_COMPONENTBUILDER_CUSTOM_CODE_SYSTEM_NAME_MESSAGE"
+                       message="COM_COMPONENTBUILDER_CUSTOM_CODE_HASHTARGET_MESSAGE"
-                       hint="COM_COMPONENTBUILDER_CUSTOM_CODE_SYSTEM_NAME_HINT" />
+                       hint="COM_COMPONENTBUILDER_CUSTOM_CODE_HASHTARGET_HINT" />
-                <!-- Note_jcb_placeholder Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_jcb_placeholder"
-                       label="COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_JCB_PLACEHOLDER_LABEL"
-                       description="COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_JCB_PLACEHOLDER_DESCRIPTION"
-                       heading="h4"
-                       class="span12 note_jcb_placeholder" />
-                <!-- Not_required Field. Type: Hidden. (joomla)-->
-                <field type="hidden"
-                       name="not_required"
-                       default="[]" />
         </fieldset>
 	
 	<!-- Access Control Fields. -->

admin/models/forms/dynamic_get.js

@@ -23,26 +23,26 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvvzavyv_required = false;
+jform_vvvvvzavyu_required = false;
-jform_vvvvvzbvyw_required = false;
+jform_vvvvvzbvyv_required = false;
-jform_vvvvvzcvyx_required = false;
+jform_vvvvvzcvyw_required = false;
-jform_vvvvvzdvyy_required = false;
+jform_vvvvvzdvyx_required = false;
-jform_vvvvvzevyz_required = false;
+jform_vvvvvzevyy_required = false;
-jform_vvvvvzfvza_required = false;
+jform_vvvvvzfvyz_required = false;
-jform_vvvvvzkvzb_required = false;
+jform_vvvvvzkvza_required = false;
-jform_vvvvvzmvzc_required = false;
+jform_vvvvvzmvzb_required = false;
-jform_vvvvvznvzd_required = false;
+jform_vvvvvznvzc_required = false;
+jform_vvvvvzpvzd_required = false;
 jform_vvvvvzpvze_required = false;
-jform_vvvvvzpvzf_required = false;
+jform_vvvvvzqvzf_required = false;
-jform_vvvvvzqvzg_required = false;
+jform_vvvvvzrvzg_required = false;
-jform_vvvvvzrvzh_required = false;
+jform_vvvvvzsvzh_required = false;
-jform_vvvvvzsvzi_required = false;
+jform_vvvvvzuvzi_required = false;
 jform_vvvvvzuvzj_required = false;
 jform_vvvvvzuvzk_required = false;
-jform_vvvvvzuvzl_required = false;
+jform_vvvvvzvvzl_required = false;
-jform_vvvvvzvvzm_required = false;
+jform_vvvvvzwvzm_required = false;
-jform_vvvvvzwvzn_required = false;
+jform_vvvvvzxvzn_required = false;
-jform_vvvvvzxvzo_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -136,26 +136,26 @@ function vvvvvza(gettype_vvvvvza)
 	if (gettype)
 	{
 		jQuery('#jform_getcustom').closest('.control-group').show();
-		if (jform_vvvvvzavyv_required)
+		if (jform_vvvvvzavyu_required)
 		{
 			updateFieldRequired('getcustom',0);
 			jQuery('#jform_getcustom').prop('required','required');
 			jQuery('#jform_getcustom').attr('aria-required',true);
 			jQuery('#jform_getcustom').addClass('required');
-			jform_vvvvvzavyv_required = false;
+			jform_vvvvvzavyu_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_getcustom').closest('.control-group').hide();
-		if (!jform_vvvvvzavyv_required)
+		if (!jform_vvvvvzavyu_required)
 		{
 			updateFieldRequired('getcustom',1);
 			jQuery('#jform_getcustom').removeAttr('required');
 			jQuery('#jform_getcustom').removeAttr('aria-required');
 			jQuery('#jform_getcustom').removeClass('required');
-			jform_vvvvvzavyv_required = true;
+			jform_vvvvvzavyu_required = true;
 		}
 	}
 }
@@ -191,26 +191,26 @@ function vvvvvzb(main_source_vvvvvzb)
 	if (main_source)
 	{
 		jQuery('#jform_view_table_main').closest('.control-group').show();
-		if (jform_vvvvvzbvyw_required)
+		if (jform_vvvvvzbvyv_required)
 		{
 			updateFieldRequired('view_table_main',0);
 			jQuery('#jform_view_table_main').prop('required','required');
 			jQuery('#jform_view_table_main').attr('aria-required',true);
 			jQuery('#jform_view_table_main').addClass('required');
-			jform_vvvvvzbvyw_required = false;
+			jform_vvvvvzbvyv_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_view_table_main').closest('.control-group').hide();
-		if (!jform_vvvvvzbvyw_required)
+		if (!jform_vvvvvzbvyv_required)
 		{
 			updateFieldRequired('view_table_main',1);
 			jQuery('#jform_view_table_main').removeAttr('required');
 			jQuery('#jform_view_table_main').removeAttr('aria-required');
 			jQuery('#jform_view_table_main').removeClass('required');
-			jform_vvvvvzbvyw_required = true;
+			jform_vvvvvzbvyv_required = true;
 		}
 	}
 }
@@ -246,26 +246,26 @@ function vvvvvzc(main_source_vvvvvzc)
 	if (main_source)
 	{
 		jQuery('#jform_view_selection').closest('.control-group').show();
-		if (jform_vvvvvzcvyx_required)
+		if (jform_vvvvvzcvyw_required)
 		{
 			updateFieldRequired('view_selection',0);
 			jQuery('#jform_view_selection').prop('required','required');
 			jQuery('#jform_view_selection').attr('aria-required',true);
 			jQuery('#jform_view_selection').addClass('required');
-			jform_vvvvvzcvyx_required = false;
+			jform_vvvvvzcvyw_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_view_selection').closest('.control-group').hide();
-		if (!jform_vvvvvzcvyx_required)
+		if (!jform_vvvvvzcvyw_required)
 		{
 			updateFieldRequired('view_selection',1);
 			jQuery('#jform_view_selection').removeAttr('required');
 			jQuery('#jform_view_selection').removeAttr('aria-required');
 			jQuery('#jform_view_selection').removeClass('required');
-			jform_vvvvvzcvyx_required = true;
+			jform_vvvvvzcvyw_required = true;
 		}
 	}
 }
@@ -301,26 +301,26 @@ function vvvvvzd(main_source_vvvvvzd)
 	if (main_source)
 	{
 		jQuery('#jform_db_table_main').closest('.control-group').show();
-		if (jform_vvvvvzdvyy_required)
+		if (jform_vvvvvzdvyx_required)
 		{
 			updateFieldRequired('db_table_main',0);
 			jQuery('#jform_db_table_main').prop('required','required');
 			jQuery('#jform_db_table_main').attr('aria-required',true);
 			jQuery('#jform_db_table_main').addClass('required');
-			jform_vvvvvzdvyy_required = false;
+			jform_vvvvvzdvyx_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_db_table_main').closest('.control-group').hide();
-		if (!jform_vvvvvzdvyy_required)
+		if (!jform_vvvvvzdvyx_required)
 		{
 			updateFieldRequired('db_table_main',1);
 			jQuery('#jform_db_table_main').removeAttr('required');
 			jQuery('#jform_db_table_main').removeAttr('aria-required');
 			jQuery('#jform_db_table_main').removeClass('required');
-			jform_vvvvvzdvyy_required = true;
+			jform_vvvvvzdvyx_required = true;
 		}
 	}
 }
@@ -356,26 +356,26 @@ function vvvvvze(main_source_vvvvvze)
 	if (main_source)
 	{
 		jQuery('#jform_db_selection').closest('.control-group').show();
-		if (jform_vvvvvzevyz_required)
+		if (jform_vvvvvzevyy_required)
 		{
 			updateFieldRequired('db_selection',0);
 			jQuery('#jform_db_selection').prop('required','required');
 			jQuery('#jform_db_selection').attr('aria-required',true);
 			jQuery('#jform_db_selection').addClass('required');
-			jform_vvvvvzevyz_required = false;
+			jform_vvvvvzevyy_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_db_selection').closest('.control-group').hide();
-		if (!jform_vvvvvzevyz_required)
+		if (!jform_vvvvvzevyy_required)
 		{
 			updateFieldRequired('db_selection',1);
 			jQuery('#jform_db_selection').removeAttr('required');
 			jQuery('#jform_db_selection').removeAttr('aria-required');
 			jQuery('#jform_db_selection').removeClass('required');
-			jform_vvvvvzevyz_required = true;
+			jform_vvvvvzevyy_required = true;
 		}
 	}
 }
@@ -398,26 +398,26 @@ function vvvvvzf(addcalculation_vvvvvzf)
 	if (addcalculation_vvvvvzf == 1)
 	{
 		jQuery('#jform_php_calculation').closest('.control-group').show();
-		if (jform_vvvvvzfvza_required)
+		if (jform_vvvvvzfvyz_required)
 		{
 			updateFieldRequired('php_calculation',0);
 			jQuery('#jform_php_calculation').prop('required','required');
 			jQuery('#jform_php_calculation').attr('aria-required',true);
 			jQuery('#jform_php_calculation').addClass('required');
-			jform_vvvvvzfvza_required = false;
+			jform_vvvvvzfvyz_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_calculation').closest('.control-group').hide();
-		if (!jform_vvvvvzfvza_required)
+		if (!jform_vvvvvzfvyz_required)
 		{
 			updateFieldRequired('php_calculation',1);
 			jQuery('#jform_php_calculation').removeAttr('required');
 			jQuery('#jform_php_calculation').removeAttr('aria-required');
 			jQuery('#jform_php_calculation').removeClass('required');
-			jform_vvvvvzfvza_required = true;
+			jform_vvvvvzfvyz_required = true;
 		}
 	}
 }
@@ -564,26 +564,26 @@ function vvvvvzk(main_source_vvvvvzk)
 	if (main_source)
 	{
 		jQuery('#jform_php_custom_get').closest('.control-group').show();
-		if (jform_vvvvvzkvzb_required)
+		if (jform_vvvvvzkvza_required)
 		{
 			updateFieldRequired('php_custom_get',0);
 			jQuery('#jform_php_custom_get').prop('required','required');
 			jQuery('#jform_php_custom_get').attr('aria-required',true);
 			jQuery('#jform_php_custom_get').addClass('required');
-			jform_vvvvvzkvzb_required = false;
+			jform_vvvvvzkvza_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_custom_get').closest('.control-group').hide();
-		if (!jform_vvvvvzkvzb_required)
+		if (!jform_vvvvvzkvza_required)
 		{
 			updateFieldRequired('php_custom_get',1);
 			jQuery('#jform_php_custom_get').removeAttr('required');
 			jQuery('#jform_php_custom_get').removeAttr('aria-required');
 			jQuery('#jform_php_custom_get').removeClass('required');
-			jform_vvvvvzkvzb_required = true;
+			jform_vvvvvzkvza_required = true;
 		}
 	}
 }
@@ -679,26 +679,26 @@ function vvvvvzm(add_php_before_getitem_vvvvvzm,gettype_vvvvvzm)
 	if (add_php_before_getitem && gettype)
 	{
 		jQuery('#jform_php_before_getitem').closest('.control-group').show();
-		if (jform_vvvvvzmvzc_required)
+		if (jform_vvvvvzmvzb_required)
 		{
 			updateFieldRequired('php_before_getitem',0);
 			jQuery('#jform_php_before_getitem').prop('required','required');
 			jQuery('#jform_php_before_getitem').attr('aria-required',true);
 			jQuery('#jform_php_before_getitem').addClass('required');
-			jform_vvvvvzmvzc_required = false;
+			jform_vvvvvzmvzb_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_before_getitem').closest('.control-group').hide();
-		if (!jform_vvvvvzmvzc_required)
+		if (!jform_vvvvvzmvzb_required)
 		{
 			updateFieldRequired('php_before_getitem',1);
 			jQuery('#jform_php_before_getitem').removeAttr('required');
 			jQuery('#jform_php_before_getitem').removeAttr('aria-required');
 			jQuery('#jform_php_before_getitem').removeClass('required');
-			jform_vvvvvzmvzc_required = true;
+			jform_vvvvvzmvzb_required = true;
 		}
 	}
 }
@@ -757,26 +757,26 @@ function vvvvvzn(add_php_after_getitem_vvvvvzn,gettype_vvvvvzn)
 	if (add_php_after_getitem && gettype)
 	{
 		jQuery('#jform_php_after_getitem').closest('.control-group').show();
-		if (jform_vvvvvznvzd_required)
+		if (jform_vvvvvznvzc_required)
 		{
 			updateFieldRequired('php_after_getitem',0);
 			jQuery('#jform_php_after_getitem').prop('required','required');
 			jQuery('#jform_php_after_getitem').attr('aria-required',true);
 			jQuery('#jform_php_after_getitem').addClass('required');
-			jform_vvvvvznvzd_required = false;
+			jform_vvvvvznvzc_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_after_getitem').closest('.control-group').hide();
-		if (!jform_vvvvvznvzd_required)
+		if (!jform_vvvvvznvzc_required)
 		{
 			updateFieldRequired('php_after_getitem',1);
 			jQuery('#jform_php_after_getitem').removeAttr('required');
 			jQuery('#jform_php_after_getitem').removeAttr('aria-required');
 			jQuery('#jform_php_after_getitem').removeClass('required');
-			jform_vvvvvznvzd_required = true;
+			jform_vvvvvznvzc_required = true;
 		}
 	}
 }
@@ -823,45 +823,45 @@ function vvvvvzp(gettype_vvvvvzp)
 	if (gettype)
 	{
 		jQuery('#jform_add_php_after_getitem').closest('.control-group').show();
-		if (jform_vvvvvzpvze_required)
+		if (jform_vvvvvzpvzd_required)
 		{
 			updateFieldRequired('add_php_after_getitem',0);
 			jQuery('#jform_add_php_after_getitem').prop('required','required');
 			jQuery('#jform_add_php_after_getitem').attr('aria-required',true);
 			jQuery('#jform_add_php_after_getitem').addClass('required');
-			jform_vvvvvzpvze_required = false;
+			jform_vvvvvzpvzd_required = false;
 		}
 
 		jQuery('#jform_add_php_before_getitem').closest('.control-group').show();
-		if (jform_vvvvvzpvzf_required)
+		if (jform_vvvvvzpvze_required)
 		{
 			updateFieldRequired('add_php_before_getitem',0);
 			jQuery('#jform_add_php_before_getitem').prop('required','required');
 			jQuery('#jform_add_php_before_getitem').attr('aria-required',true);
 			jQuery('#jform_add_php_before_getitem').addClass('required');
-			jform_vvvvvzpvzf_required = false;
+			jform_vvvvvzpvze_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_add_php_after_getitem').closest('.control-group').hide();
-		if (!jform_vvvvvzpvze_required)
+		if (!jform_vvvvvzpvzd_required)
 		{
 			updateFieldRequired('add_php_after_getitem',1);
 			jQuery('#jform_add_php_after_getitem').removeAttr('required');
 			jQuery('#jform_add_php_after_getitem').removeAttr('aria-required');
 			jQuery('#jform_add_php_after_getitem').removeClass('required');
-			jform_vvvvvzpvze_required = true;
+			jform_vvvvvzpvzd_required = true;
 		}
 		jQuery('#jform_add_php_before_getitem').closest('.control-group').hide();
-		if (!jform_vvvvvzpvzf_required)
+		if (!jform_vvvvvzpvze_required)
 		{
 			updateFieldRequired('add_php_before_getitem',1);
 			jQuery('#jform_add_php_before_getitem').removeAttr('required');
 			jQuery('#jform_add_php_before_getitem').removeAttr('aria-required');
 			jQuery('#jform_add_php_before_getitem').removeClass('required');
-			jform_vvvvvzpvzf_required = true;
+			jform_vvvvvzpvze_required = true;
 		}
 	}
 }
@@ -909,26 +909,26 @@ function vvvvvzq(add_php_getlistquery_vvvvvzq,gettype_vvvvvzq)
 	if (add_php_getlistquery && gettype)
 	{
 		jQuery('#jform_php_getlistquery').closest('.control-group').show();
-		if (jform_vvvvvzqvzg_required)
+		if (jform_vvvvvzqvzf_required)
 		{
 			updateFieldRequired('php_getlistquery',0);
 			jQuery('#jform_php_getlistquery').prop('required','required');
 			jQuery('#jform_php_getlistquery').attr('aria-required',true);
 			jQuery('#jform_php_getlistquery').addClass('required');
-			jform_vvvvvzqvzg_required = false;
+			jform_vvvvvzqvzf_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_getlistquery').closest('.control-group').hide();
-		if (!jform_vvvvvzqvzg_required)
+		if (!jform_vvvvvzqvzf_required)
 		{
 			updateFieldRequired('php_getlistquery',1);
 			jQuery('#jform_php_getlistquery').removeAttr('required');
 			jQuery('#jform_php_getlistquery').removeAttr('aria-required');
 			jQuery('#jform_php_getlistquery').removeClass('required');
-			jform_vvvvvzqvzg_required = true;
+			jform_vvvvvzqvzf_required = true;
 		}
 	}
 }
@@ -987,26 +987,26 @@ function vvvvvzr(add_php_before_getitems_vvvvvzr,gettype_vvvvvzr)
 	if (add_php_before_getitems && gettype)
 	{
 		jQuery('#jform_php_before_getitems').closest('.control-group').show();
-		if (jform_vvvvvzrvzh_required)
+		if (jform_vvvvvzrvzg_required)
 		{
 			updateFieldRequired('php_before_getitems',0);
 			jQuery('#jform_php_before_getitems').prop('required','required');
 			jQuery('#jform_php_before_getitems').attr('aria-required',true);
 			jQuery('#jform_php_before_getitems').addClass('required');
-			jform_vvvvvzrvzh_required = false;
+			jform_vvvvvzrvzg_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_before_getitems').closest('.control-group').hide();
-		if (!jform_vvvvvzrvzh_required)
+		if (!jform_vvvvvzrvzg_required)
 		{
 			updateFieldRequired('php_before_getitems',1);
 			jQuery('#jform_php_before_getitems').removeAttr('required');
 			jQuery('#jform_php_before_getitems').removeAttr('aria-required');
 			jQuery('#jform_php_before_getitems').removeClass('required');
-			jform_vvvvvzrvzh_required = true;
+			jform_vvvvvzrvzg_required = true;
 		}
 	}
 }
@@ -1065,26 +1065,26 @@ function vvvvvzs(add_php_after_getitems_vvvvvzs,gettype_vvvvvzs)
 	if (add_php_after_getitems && gettype)
 	{
 		jQuery('#jform_php_after_getitems').closest('.control-group').show();
-		if (jform_vvvvvzsvzi_required)
+		if (jform_vvvvvzsvzh_required)
 		{
 			updateFieldRequired('php_after_getitems',0);
 			jQuery('#jform_php_after_getitems').prop('required','required');
 			jQuery('#jform_php_after_getitems').attr('aria-required',true);
 			jQuery('#jform_php_after_getitems').addClass('required');
-			jform_vvvvvzsvzi_required = false;
+			jform_vvvvvzsvzh_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_after_getitems').closest('.control-group').hide();
-		if (!jform_vvvvvzsvzi_required)
+		if (!jform_vvvvvzsvzh_required)
 		{
 			updateFieldRequired('php_after_getitems',1);
 			jQuery('#jform_php_after_getitems').removeAttr('required');
 			jQuery('#jform_php_after_getitems').removeAttr('aria-required');
 			jQuery('#jform_php_after_getitems').removeClass('required');
-			jform_vvvvvzsvzi_required = true;
+			jform_vvvvvzsvzh_required = true;
 		}
 	}
 }
@@ -1131,64 +1131,64 @@ function vvvvvzu(gettype_vvvvvzu)
 	if (gettype)
 	{
 		jQuery('#jform_add_php_after_getitems').closest('.control-group').show();
-		if (jform_vvvvvzuvzj_required)
+		if (jform_vvvvvzuvzi_required)
 		{
 			updateFieldRequired('add_php_after_getitems',0);
 			jQuery('#jform_add_php_after_getitems').prop('required','required');
 			jQuery('#jform_add_php_after_getitems').attr('aria-required',true);
 			jQuery('#jform_add_php_after_getitems').addClass('required');
-			jform_vvvvvzuvzj_required = false;
+			jform_vvvvvzuvzi_required = false;
 		}
 
 		jQuery('#jform_add_php_before_getitems').closest('.control-group').show();
-		if (jform_vvvvvzuvzk_required)
+		if (jform_vvvvvzuvzj_required)
 		{
 			updateFieldRequired('add_php_before_getitems',0);
 			jQuery('#jform_add_php_before_getitems').prop('required','required');
 			jQuery('#jform_add_php_before_getitems').attr('aria-required',true);
 			jQuery('#jform_add_php_before_getitems').addClass('required');
-			jform_vvvvvzuvzk_required = false;
+			jform_vvvvvzuvzj_required = false;
 		}
 
 		jQuery('#jform_add_php_getlistquery').closest('.control-group').show();
-		if (jform_vvvvvzuvzl_required)
+		if (jform_vvvvvzuvzk_required)
 		{
 			updateFieldRequired('add_php_getlistquery',0);
 			jQuery('#jform_add_php_getlistquery').prop('required','required');
 			jQuery('#jform_add_php_getlistquery').attr('aria-required',true);
 			jQuery('#jform_add_php_getlistquery').addClass('required');
-			jform_vvvvvzuvzl_required = false;
+			jform_vvvvvzuvzk_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_add_php_after_getitems').closest('.control-group').hide();
-		if (!jform_vvvvvzuvzj_required)
+		if (!jform_vvvvvzuvzi_required)
 		{
 			updateFieldRequired('add_php_after_getitems',1);
 			jQuery('#jform_add_php_after_getitems').removeAttr('required');
 			jQuery('#jform_add_php_after_getitems').removeAttr('aria-required');
 			jQuery('#jform_add_php_after_getitems').removeClass('required');
-			jform_vvvvvzuvzj_required = true;
+			jform_vvvvvzuvzi_required = true;
 		}
 		jQuery('#jform_add_php_before_getitems').closest('.control-group').hide();
-		if (!jform_vvvvvzuvzk_required)
+		if (!jform_vvvvvzuvzj_required)
 		{
 			updateFieldRequired('add_php_before_getitems',1);
 			jQuery('#jform_add_php_before_getitems').removeAttr('required');
 			jQuery('#jform_add_php_before_getitems').removeAttr('aria-required');
 			jQuery('#jform_add_php_before_getitems').removeClass('required');
-			jform_vvvvvzuvzk_required = true;
+			jform_vvvvvzuvzj_required = true;
 		}
 		jQuery('#jform_add_php_getlistquery').closest('.control-group').hide();
-		if (!jform_vvvvvzuvzl_required)
+		if (!jform_vvvvvzuvzk_required)
 		{
 			updateFieldRequired('add_php_getlistquery',1);
 			jQuery('#jform_add_php_getlistquery').removeAttr('required');
 			jQuery('#jform_add_php_getlistquery').removeAttr('aria-required');
 			jQuery('#jform_add_php_getlistquery').removeClass('required');
-			jform_vvvvvzuvzl_required = true;
+			jform_vvvvvzuvzk_required = true;
 		}
 	}
 }
@@ -1224,26 +1224,26 @@ function vvvvvzv(gettype_vvvvvzv)
 	if (gettype)
 	{
 		jQuery('#jform_pagination').closest('.control-group').show();
-		if (jform_vvvvvzvvzm_required)
+		if (jform_vvvvvzvvzl_required)
 		{
 			updateFieldRequired('pagination',0);
 			jQuery('#jform_pagination').prop('required','required');
 			jQuery('#jform_pagination').attr('aria-required',true);
 			jQuery('#jform_pagination').addClass('required');
-			jform_vvvvvzvvzm_required = false;
+			jform_vvvvvzvvzl_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_pagination').closest('.control-group').hide();
-		if (!jform_vvvvvzvvzm_required)
+		if (!jform_vvvvvzvvzl_required)
 		{
 			updateFieldRequired('pagination',1);
 			jQuery('#jform_pagination').removeAttr('required');
 			jQuery('#jform_pagination').removeAttr('aria-required');
 			jQuery('#jform_pagination').removeClass('required');
-			jform_vvvvvzvvzm_required = true;
+			jform_vvvvvzvvzl_required = true;
 		}
 	}
 }
@@ -1279,26 +1279,26 @@ function vvvvvzw(gettype_vvvvvzw)
 	if (gettype)
 	{
 		jQuery('#jform_add_php_router_parse').closest('.control-group').show();
-		if (jform_vvvvvzwvzn_required)
+		if (jform_vvvvvzwvzm_required)
 		{
 			updateFieldRequired('add_php_router_parse',0);
 			jQuery('#jform_add_php_router_parse').prop('required','required');
 			jQuery('#jform_add_php_router_parse').attr('aria-required',true);
 			jQuery('#jform_add_php_router_parse').addClass('required');
-			jform_vvvvvzwvzn_required = false;
+			jform_vvvvvzwvzm_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_add_php_router_parse').closest('.control-group').hide();
-		if (!jform_vvvvvzwvzn_required)
+		if (!jform_vvvvvzwvzm_required)
 		{
 			updateFieldRequired('add_php_router_parse',1);
 			jQuery('#jform_add_php_router_parse').removeAttr('required');
 			jQuery('#jform_add_php_router_parse').removeAttr('aria-required');
 			jQuery('#jform_add_php_router_parse').removeClass('required');
-			jform_vvvvvzwvzn_required = true;
+			jform_vvvvvzwvzm_required = true;
 		}
 	}
 }
@@ -1346,26 +1346,26 @@ function vvvvvzx(gettype_vvvvvzx,add_php_router_parse_vvvvvzx)
 	if (gettype && add_php_router_parse)
 	{
 		jQuery('#jform_php_router_parse').closest('.control-group').show();
-		if (jform_vvvvvzxvzo_required)
+		if (jform_vvvvvzxvzn_required)
 		{
 			updateFieldRequired('php_router_parse',0);
 			jQuery('#jform_php_router_parse').prop('required','required');
 			jQuery('#jform_php_router_parse').attr('aria-required',true);
 			jQuery('#jform_php_router_parse').addClass('required');
-			jform_vvvvvzxvzo_required = false;
+			jform_vvvvvzxvzn_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_router_parse').closest('.control-group').hide();
-		if (!jform_vvvvvzxvzo_required)
+		if (!jform_vvvvvzxvzn_required)
 		{
 			updateFieldRequired('php_router_parse',1);
 			jQuery('#jform_php_router_parse').removeAttr('required');
 			jQuery('#jform_php_router_parse').removeAttr('aria-required');
 			jQuery('#jform_php_router_parse').removeClass('required');
-			jform_vvvvvzxvzo_required = true;
+			jform_vvvvvzxvzn_required = true;
 		}
 	}
 }

admin/models/forms/dynamic_get.xml

@@ -124,25 +124,6 @@
                         <option value="3">COM_COMPONENTBUILDER_DYNAMIC_GET_GETCUSTOM</option>
                         <option value="4">COM_COMPONENTBUILDER_DYNAMIC_GET_GETCUSTOMS</option>
                 </field>
-                <!-- Db_table_main Field. Type: Dbtables. (custom)-->
-                <field type="dbtables"
-                       name="db_table_main"
-                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_DB_TABLE_MAIN_LABEL"
-                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_DB_TABLE_MAIN_DESCRIPTION"
-                       class="list_class"
-                       multiple="false"
-                       required="true" />
-                <!-- Db_selection Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="db_selection"
-                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_DB_SELECTION_LABEL"
-                       rows="22"
-                       cols="30"
-                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_DB_SELECTION_DESCRIPTION"
-                       class="text_area span12"
-                       filter="HTML"
-                       hint="COM_COMPONENTBUILDER_DYNAMIC_GET_DB_SELECTION_HINT"
-                       required="true" />
                 <!-- Addcalculation Field. Type: Radio. (joomla)-->
                 <field type="radio"
                        name="addcalculation"
@@ -155,75 +136,6 @@
                         <option value="1">COM_COMPONENTBUILDER_DYNAMIC_GET_YES</option>
                         <option value="0">COM_COMPONENTBUILDER_DYNAMIC_GET_NO</option>
                 </field>
-                <!-- Php_custom_get Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="php_custom_get"
-                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_CUSTOM_GET_LABEL"
-                       rows="30"
-                       cols="15"
-                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_CUSTOM_GET_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_CUSTOM_GET_HINT"
-                       required="true" />
-                <!-- Add_php_after_getitems Field. Type: Radio. (joomla)-->
-                <field type="radio"
-                       name="add_php_after_getitems"
-                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_ADD_PHP_AFTER_GETITEMS_LABEL"
-                       class="btn-group btn-group-yesno"
-                       default="0"
-                       required="true">
-                        <!-- Option Set.-->
-                        <option value="1">COM_COMPONENTBUILDER_DYNAMIC_GET_YES</option>
-                        <option value="0">COM_COMPONENTBUILDER_DYNAMIC_GET_NO</option>
-                </field>
-                <!-- Note_linked_to_notice Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_linked_to_notice"
-                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_NOTE_LINKED_TO_NOTICE_LABEL"
-                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_NOTE_LINKED_TO_NOTICE_DESCRIPTION"
-                       heading="h4"
-                       class="note_linked_to_notice" />
-                <!-- View_table_main Field. Type: Adminviews. (custom)-->
-                <field type="adminviews"
-                       name="view_table_main"
-                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_MAIN_LABEL"
-                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_MAIN_DESCRIPTION"
-                       multiple="false"
-                       required="true" />
-                <!-- View_selection Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="view_selection"
-                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_SELECTION_LABEL"
-                       rows="22"
-                       cols="30"
-                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_SELECTION_DESCRIPTION"
-                       class="text_area span12"
-                       filter="HTML"
-                       hint="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_SELECTION_HINT"
-                       required="true" />
-                <!-- Add_php_before_getitems Field. Type: Radio. (joomla)-->
-                <field type="radio"
-                       name="add_php_before_getitems"
-                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_ADD_PHP_BEFORE_GETITEMS_LABEL"
-                       class="btn-group btn-group-yesno"
-                       default="0"
-                       required="true">
-                        <!-- Option Set.-->
-                        <option value="1">COM_COMPONENTBUILDER_DYNAMIC_GET_YES</option>
-                        <option value="0">COM_COMPONENTBUILDER_DYNAMIC_GET_NO</option>
-                </field>
-                <!-- Add_php_before_getitem Field. Type: Radio. (joomla)-->
-                <field type="radio"
-                       name="add_php_before_getitem"
-                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_ADD_PHP_BEFORE_GETITEM_LABEL"
-                       class="btn-group btn-group-yesno"
-                       default="0"
-                       required="true">
-                        <!-- Option Set.-->
-                        <option value="1">COM_COMPONENTBUILDER_DYNAMIC_GET_YES</option>
-                        <option value="0">COM_COMPONENTBUILDER_DYNAMIC_GET_NO</option>
-                </field>
                 <!-- Add_php_router_parse Field. Type: Radio. (joomla)-->
                 <field type="radio"
                        name="add_php_router_parse"
@@ -236,10 +148,21 @@
                         <option value="1">COM_COMPONENTBUILDER_DYNAMIC_GET_YES</option>
                         <option value="0">COM_COMPONENTBUILDER_DYNAMIC_GET_NO</option>
                 </field>
-                <!-- Add_php_after_getitem Field. Type: Radio. (joomla)-->
+                <!-- Add_php_after_getitems Field. Type: Radio. (joomla)-->
                 <field type="radio"
-                       name="add_php_after_getitem"
+                       name="add_php_after_getitems"
-                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_ADD_PHP_AFTER_GETITEM_LABEL"
+                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_ADD_PHP_AFTER_GETITEMS_LABEL"
+                       class="btn-group btn-group-yesno"
+                       default="0"
+                       required="true">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_DYNAMIC_GET_YES</option>
+                        <option value="0">COM_COMPONENTBUILDER_DYNAMIC_GET_NO</option>
+                </field>
+                <!-- Add_php_before_getitems Field. Type: Radio. (joomla)-->
+                <field type="radio"
+                       name="add_php_before_getitems"
+                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_ADD_PHP_BEFORE_GETITEMS_LABEL"
                        class="btn-group btn-group-yesno"
                        default="0"
                        required="true">
@@ -247,11 +170,6 @@
                         <option value="1">COM_COMPONENTBUILDER_DYNAMIC_GET_YES</option>
                         <option value="0">COM_COMPONENTBUILDER_DYNAMIC_GET_NO</option>
                 </field>
-                <!-- Note_calculation_items Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_calculation_items"
-                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_NOTE_CALCULATION_ITEMS_DESCRIPTION"
-                       class="note_calculation_items" />
                 <!-- Add_php_getlistquery Field. Type: Radio. (joomla)-->
                 <field type="radio"
                        name="add_php_getlistquery"
@@ -263,183 +181,88 @@
                         <option value="1">COM_COMPONENTBUILDER_DYNAMIC_GET_YES</option>
                         <option value="0">COM_COMPONENTBUILDER_DYNAMIC_GET_NO</option>
                 </field>
-                <!-- Join_db_table Field. Type: Subform. (joomla)-->
+                <!-- Add_php_after_getitem Field. Type: Radio. (joomla)-->
-                <field type="subform"
+                <field type="radio"
-                       name="join_db_table"
+                       name="add_php_after_getitem"
-                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_DB_TABLE_LABEL"
+                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_ADD_PHP_AFTER_GETITEM_LABEL"
-                       layout="joomla.form.field.subform.repeatable-table"
+                       class="btn-group btn-group-yesno"
-                       multiple="true"
+                       default="0"
-                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_DB_TABLE_DESCRIPTION"
+                       required="true">
-                       icon="list"
-                       maximum="50">
-                        <form hidden="true"
-                              name="list_join_db_table_modal"
-                              repeat="true">
-                                <!-- Db_table Field. Type: Dbtables. (custom)-->
-                                <field type="dbtables"
-                                       name="db_table"
-                                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_DB_TABLE_LABEL"
-                                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_DB_TABLE_DESCRIPTION"
-                                       class="list_class"
-                                       multiple="false"
-                                       required="false"
-                                       button="false" />
-                                <!-- Row_type Field. Type: List. (joomla)-->
-                                <field type="list"
-                                       name="row_type"
-                                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_ROW_TYPE_LABEL"
-                                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_ROW_TYPE_DESCRIPTION"
-                                       class="list_class fieldMedium"
-                                       multiple="false"
-                                       filter="INT"
-                                       required="false"
-                                       default="1">
                         <!-- Option Set.-->
-                                        <option value="1">COM_COMPONENTBUILDER_DYNAMIC_GET_SINGLE</option>
+                        <option value="1">COM_COMPONENTBUILDER_DYNAMIC_GET_YES</option>
-                                        <option value="2">COM_COMPONENTBUILDER_DYNAMIC_GET_MULTIPLE</option>
+                        <option value="0">COM_COMPONENTBUILDER_DYNAMIC_GET_NO</option>
                 </field>
-                                <!-- As Field. Type: List. (joomla)-->
+                <!-- Add_php_before_getitem Field. Type: Radio. (joomla)-->
-                                <field type="list"
+                <field type="radio"
-                                       name="as"
+                       name="add_php_before_getitem"
-                                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_AS_LABEL"
+                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_ADD_PHP_BEFORE_GETITEM_LABEL"
-                                       class="list_class fieldSmall"
+                       class="btn-group btn-group-yesno"
-                                       multiple="false"
+                       default="0"
-                                       filter="WORD"
+                       required="true">
-                                       required="false"
-                                       default="b">
                         <!-- Option Set.-->
-                                        <option value="b">COM_COMPONENTBUILDER_DYNAMIC_GET_B</option>
+                        <option value="1">COM_COMPONENTBUILDER_DYNAMIC_GET_YES</option>
-                                        <option value="c">COM_COMPONENTBUILDER_DYNAMIC_GET_C</option>
+                        <option value="0">COM_COMPONENTBUILDER_DYNAMIC_GET_NO</option>
-                                        <option value="d">COM_COMPONENTBUILDER_DYNAMIC_GET_D</option>
-                                        <option value="e">COM_COMPONENTBUILDER_DYNAMIC_GET_E</option>
-                                        <option value="f">COM_COMPONENTBUILDER_DYNAMIC_GET_F</option>
-                                        <option value="g">COM_COMPONENTBUILDER_DYNAMIC_GET_G</option>
-                                        <option value="h">COM_COMPONENTBUILDER_DYNAMIC_GET_H</option>
-                                        <option value="i">COM_COMPONENTBUILDER_DYNAMIC_GET_I</option>
-                                        <option value="j">COM_COMPONENTBUILDER_DYNAMIC_GET_J</option>
-                                        <option value="k">COM_COMPONENTBUILDER_DYNAMIC_GET_K</option>
-                                        <option value="l">COM_COMPONENTBUILDER_DYNAMIC_GET_L</option>
-                                        <option value="m">COM_COMPONENTBUILDER_DYNAMIC_GET_M</option>
-                                        <option value="n">COM_COMPONENTBUILDER_DYNAMIC_GET_N</option>
-                                        <option value="o">COM_COMPONENTBUILDER_DYNAMIC_GET_O</option>
-                                        <option value="p">COM_COMPONENTBUILDER_DYNAMIC_GET_P</option>
-                                        <option value="q">COM_COMPONENTBUILDER_DYNAMIC_GET_Q</option>
-                                        <option value="r">COM_COMPONENTBUILDER_DYNAMIC_GET_R</option>
-                                        <option value="s">COM_COMPONENTBUILDER_DYNAMIC_GET_S</option>
-                                        <option value="t">COM_COMPONENTBUILDER_DYNAMIC_GET_T</option>
-                                        <option value="u">COM_COMPONENTBUILDER_DYNAMIC_GET_U</option>
-                                        <option value="v">COM_COMPONENTBUILDER_DYNAMIC_GET_V</option>
-                                        <option value="w">COM_COMPONENTBUILDER_DYNAMIC_GET_W</option>
-                                        <option value="x">COM_COMPONENTBUILDER_DYNAMIC_GET_X</option>
-                                        <option value="y">COM_COMPONENTBUILDER_DYNAMIC_GET_Y</option>
-                                        <option value="z">COM_COMPONENTBUILDER_DYNAMIC_GET_Z</option>
-                                        <option value="aa">COM_COMPONENTBUILDER_DYNAMIC_GET_AA</option>
-                                        <option value="bb">COM_COMPONENTBUILDER_DYNAMIC_GET_BB</option>
-                                        <option value="cc">COM_COMPONENTBUILDER_DYNAMIC_GET_CC</option>
-                                        <option value="dd">COM_COMPONENTBUILDER_DYNAMIC_GET_DD</option>
-                                        <option value="ee">COM_COMPONENTBUILDER_DYNAMIC_GET_EE</option>
-                                        <option value="ff">COM_COMPONENTBUILDER_DYNAMIC_GET_FF</option>
-                                        <option value="gg">COM_COMPONENTBUILDER_DYNAMIC_GET_GG</option>
-                                        <option value="hh">COM_COMPONENTBUILDER_DYNAMIC_GET_HH</option>
-                                        <option value="ii">COM_COMPONENTBUILDER_DYNAMIC_GET_II</option>
-                                        <option value="jj">COM_COMPONENTBUILDER_DYNAMIC_GET_JJ</option>
-                                        <option value="kk">COM_COMPONENTBUILDER_DYNAMIC_GET_KK</option>
-                                        <option value="ll">COM_COMPONENTBUILDER_DYNAMIC_GET_LL</option>
-                                        <option value="mm">COM_COMPONENTBUILDER_DYNAMIC_GET_MM</option>
-                                        <option value="nn">COM_COMPONENTBUILDER_DYNAMIC_GET_NN</option>
-                                        <option value="oo">COM_COMPONENTBUILDER_DYNAMIC_GET_OO</option>
-                                        <option value="pp">COM_COMPONENTBUILDER_DYNAMIC_GET_PP</option>
-                                        <option value="qq">COM_COMPONENTBUILDER_DYNAMIC_GET_QQ</option>
-                                        <option value="rr">COM_COMPONENTBUILDER_DYNAMIC_GET_RR</option>
-                                        <option value="ss">COM_COMPONENTBUILDER_DYNAMIC_GET_SS</option>
-                                        <option value="tt">COM_COMPONENTBUILDER_DYNAMIC_GET_TT</option>
-                                        <option value="uu">COM_COMPONENTBUILDER_DYNAMIC_GET_UU</option>
-                                        <option value="vv">COM_COMPONENTBUILDER_DYNAMIC_GET_VV</option>
-                                        <option value="ww">COM_COMPONENTBUILDER_DYNAMIC_GET_WW</option>
-                                        <option value="xx">COM_COMPONENTBUILDER_DYNAMIC_GET_XX</option>
-                                        <option value="yy">COM_COMPONENTBUILDER_DYNAMIC_GET_YY</option>
-                                        <option value="zz">COM_COMPONENTBUILDER_DYNAMIC_GET_ZZ</option>
                 </field>
-                                <!-- Type Field. Type: List. (joomla)-->
+                <!-- Note_linked_to_notice Field. Type: Note. A None Database Field. (joomla)-->
-                                <field type="list"
+                <field type="note"
-                                       name="type"
+                       name="note_linked_to_notice"
-                                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_TYPE_LABEL"
+                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_NOTE_LINKED_TO_NOTICE_LABEL"
-                                       class="list_class fieldMedium"
+                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_NOTE_LINKED_TO_NOTICE_DESCRIPTION"
-                                       multiple="false"
+                       heading="h4"
-                                       filter="INT"
+                       class="note_linked_to_notice" />
-                                       required="false"
+                <!-- Php_custom_get Field. Type: Textarea. (joomla)-->
-                                       default="1">
-                                        <!-- Option Set.-->
-                                        <option value="1">COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_LEFT</option>
-                                        <option value="2">COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_LEFT_OUTER</option>
-                                        <option value="3">COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_INNER</option>
-                                        <option value="4">COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_RIGHT</option>
-                                        <option value="5">COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_RIGHT_OUTER</option>
-                                </field>
-                                <!-- On_field Field. Type: Text. (joomla)-->
-                                <field type="text"
-                                       name="on_field"
-                                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_ON_FIELD_LABEL"
-                                       size="40"
-                                       maxlength="150"
-                                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_ON_FIELD_DESCRIPTION"
-                                       class="text_area fieldMedium"
-                                       readonly="false"
-                                       disabled="false"
-                                       required="false"
-                                       filter="CMD"
-                                       message="COM_COMPONENTBUILDER_DYNAMIC_GET_ON_FIELD_MESSAGE"
-                                       hint="COM_COMPONENTBUILDER_DYNAMIC_GET_ON_FIELD_HINT" />
-                                <!-- Operator Field. Type: List. (joomla)-->
-                                <field type="list"
-                                       name="operator"
-                                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_OPERATOR_LABEL"
-                                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_OPERATOR_DESCRIPTION"
-                                       class="list_class fieldMedium"
-                                       multiple="false"
-                                       filter="INT"
-                                       required="false"
-                                       default="0">
-                                        <!-- Option Set.-->
-                                        <option value="1">COM_COMPONENTBUILDER_DYNAMIC_GET_EQUAL</option>
-                                        <option value="2">COM_COMPONENTBUILDER_DYNAMIC_GET_NOT_EQUAL</option>
-                                        <option value="3">COM_COMPONENTBUILDER_DYNAMIC_GET_EQUAL_OR_NOT</option>
-                                        <option value="4">COM_COMPONENTBUILDER_DYNAMIC_GET_GREATER_THAN</option>
-                                        <option value="5">COM_COMPONENTBUILDER_DYNAMIC_GET_LESS_THAN</option>
-                                        <option value="6">COM_COMPONENTBUILDER_DYNAMIC_GET_GREATER_THAN_OR_EQUAL</option>
-                                        <option value="7">COM_COMPONENTBUILDER_DYNAMIC_GET_LESS_THAN_OR_EQUAL_TO</option>
-                                        <option value="8">COM_COMPONENTBUILDER_DYNAMIC_GET_NOT_LESS_THAN</option>
-                                        <option value="9">COM_COMPONENTBUILDER_DYNAMIC_GET_NOT_GREATER_THAN</option>
-                                        <option value="10">COM_COMPONENTBUILDER_DYNAMIC_GET_IN</option>
-                                        <option value="11">COM_COMPONENTBUILDER_DYNAMIC_GET_NOT_IN</option>
-                                </field>
-                                <!-- Join_field Field. Type: Text. (joomla)-->
-                                <field type="text"
-                                       name="join_field"
-                                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_FIELD_LABEL"
-                                       size="40"
-                                       maxlength="150"
-                                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_FIELD_DESCRIPTION"
-                                       class="text_area fieldMedium"
-                                       readonly="false"
-                                       disabled="false"
-                                       required="false"
-                                       filter="CMD"
-                                       message="COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_FIELD_MESSAGE"
-                                       hint="COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_FIELD_HINT" />
-                                <!-- Selection Field. Type: Textarea. (joomla)-->
                 <field type="textarea"
-                                       name="selection"
+                       name="php_custom_get"
-                                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_SELECTION_LABEL"
+                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_CUSTOM_GET_LABEL"
+                       rows="30"
+                       cols="15"
+                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_CUSTOM_GET_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_CUSTOM_GET_HINT"
+                       required="true" />
+                <!-- Db_selection Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="db_selection"
+                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_DB_SELECTION_LABEL"
                        rows="22"
                        cols="30"
-                                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_SELECTION_DESCRIPTION"
+                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_DB_SELECTION_DESCRIPTION"
                        class="text_area span12"
                        filter="HTML"
-                                       hint="COM_COMPONENTBUILDER_DYNAMIC_GET_SELECTION_HINT"
+                       hint="COM_COMPONENTBUILDER_DYNAMIC_GET_DB_SELECTION_HINT"
-                                       required="false" />
+                       required="true" />
-                        </form>
+                <!-- Db_table_main Field. Type: Dbtables. (custom)-->
-                </field>
+                <field type="dbtables"
+                       name="db_table_main"
+                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_DB_TABLE_MAIN_LABEL"
+                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_DB_TABLE_MAIN_DESCRIPTION"
+                       class="list_class"
+                       multiple="false"
+                       required="true" />
+                <!-- View_selection Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="view_selection"
+                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_SELECTION_LABEL"
+                       rows="22"
+                       cols="30"
+                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_SELECTION_DESCRIPTION"
+                       class="text_area span12"
+                       filter="HTML"
+                       hint="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_SELECTION_HINT"
+                       required="true" />
+                <!-- Note_calculation_items Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_calculation_items"
+                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_NOTE_CALCULATION_ITEMS_DESCRIPTION"
+                       class="note_calculation_items" />
+                <!-- View_table_main Field. Type: Adminviews. (custom)-->
+                <field type="adminviews"
+                       name="view_table_main"
+                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_MAIN_LABEL"
+                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_MAIN_DESCRIPTION"
+                       multiple="false"
+                       required="true" />
                 <!-- Getcustom Field. Type: Text. (joomla)-->
                 <field type="text"
                        name="getcustom"
@@ -1036,6 +859,183 @@
                        filter="raw"
                        hint="COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_CALCULATION_HINT"
                        required="true" />
+                <!-- Join_db_table Field. Type: Subform. (joomla)-->
+                <field type="subform"
+                       name="join_db_table"
+                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_DB_TABLE_LABEL"
+                       layout="joomla.form.field.subform.repeatable-table"
+                       multiple="true"
+                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_DB_TABLE_DESCRIPTION"
+                       icon="list"
+                       maximum="50">
+                        <form hidden="true"
+                              name="list_join_db_table_modal"
+                              repeat="true">
+                                <!-- Db_table Field. Type: Dbtables. (custom)-->
+                                <field type="dbtables"
+                                       name="db_table"
+                                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_DB_TABLE_LABEL"
+                                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_DB_TABLE_DESCRIPTION"
+                                       class="list_class"
+                                       multiple="false"
+                                       required="false"
+                                       button="false" />
+                                <!-- Row_type Field. Type: List. (joomla)-->
+                                <field type="list"
+                                       name="row_type"
+                                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_ROW_TYPE_LABEL"
+                                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_ROW_TYPE_DESCRIPTION"
+                                       class="list_class fieldMedium"
+                                       multiple="false"
+                                       filter="INT"
+                                       required="false"
+                                       default="1">
+                                        <!-- Option Set.-->
+                                        <option value="1">COM_COMPONENTBUILDER_DYNAMIC_GET_SINGLE</option>
+                                        <option value="2">COM_COMPONENTBUILDER_DYNAMIC_GET_MULTIPLE</option>
+                                </field>
+                                <!-- As Field. Type: List. (joomla)-->
+                                <field type="list"
+                                       name="as"
+                                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_AS_LABEL"
+                                       class="list_class fieldSmall"
+                                       multiple="false"
+                                       filter="WORD"
+                                       required="false"
+                                       default="b">
+                                        <!-- Option Set.-->
+                                        <option value="b">COM_COMPONENTBUILDER_DYNAMIC_GET_B</option>
+                                        <option value="c">COM_COMPONENTBUILDER_DYNAMIC_GET_C</option>
+                                        <option value="d">COM_COMPONENTBUILDER_DYNAMIC_GET_D</option>
+                                        <option value="e">COM_COMPONENTBUILDER_DYNAMIC_GET_E</option>
+                                        <option value="f">COM_COMPONENTBUILDER_DYNAMIC_GET_F</option>
+                                        <option value="g">COM_COMPONENTBUILDER_DYNAMIC_GET_G</option>
+                                        <option value="h">COM_COMPONENTBUILDER_DYNAMIC_GET_H</option>
+                                        <option value="i">COM_COMPONENTBUILDER_DYNAMIC_GET_I</option>
+                                        <option value="j">COM_COMPONENTBUILDER_DYNAMIC_GET_J</option>
+                                        <option value="k">COM_COMPONENTBUILDER_DYNAMIC_GET_K</option>
+                                        <option value="l">COM_COMPONENTBUILDER_DYNAMIC_GET_L</option>
+                                        <option value="m">COM_COMPONENTBUILDER_DYNAMIC_GET_M</option>
+                                        <option value="n">COM_COMPONENTBUILDER_DYNAMIC_GET_N</option>
+                                        <option value="o">COM_COMPONENTBUILDER_DYNAMIC_GET_O</option>
+                                        <option value="p">COM_COMPONENTBUILDER_DYNAMIC_GET_P</option>
+                                        <option value="q">COM_COMPONENTBUILDER_DYNAMIC_GET_Q</option>
+                                        <option value="r">COM_COMPONENTBUILDER_DYNAMIC_GET_R</option>
+                                        <option value="s">COM_COMPONENTBUILDER_DYNAMIC_GET_S</option>
+                                        <option value="t">COM_COMPONENTBUILDER_DYNAMIC_GET_T</option>
+                                        <option value="u">COM_COMPONENTBUILDER_DYNAMIC_GET_U</option>
+                                        <option value="v">COM_COMPONENTBUILDER_DYNAMIC_GET_V</option>
+                                        <option value="w">COM_COMPONENTBUILDER_DYNAMIC_GET_W</option>
+                                        <option value="x">COM_COMPONENTBUILDER_DYNAMIC_GET_X</option>
+                                        <option value="y">COM_COMPONENTBUILDER_DYNAMIC_GET_Y</option>
+                                        <option value="z">COM_COMPONENTBUILDER_DYNAMIC_GET_Z</option>
+                                        <option value="aa">COM_COMPONENTBUILDER_DYNAMIC_GET_AA</option>
+                                        <option value="bb">COM_COMPONENTBUILDER_DYNAMIC_GET_BB</option>
+                                        <option value="cc">COM_COMPONENTBUILDER_DYNAMIC_GET_CC</option>
+                                        <option value="dd">COM_COMPONENTBUILDER_DYNAMIC_GET_DD</option>
+                                        <option value="ee">COM_COMPONENTBUILDER_DYNAMIC_GET_EE</option>
+                                        <option value="ff">COM_COMPONENTBUILDER_DYNAMIC_GET_FF</option>
+                                        <option value="gg">COM_COMPONENTBUILDER_DYNAMIC_GET_GG</option>
+                                        <option value="hh">COM_COMPONENTBUILDER_DYNAMIC_GET_HH</option>
+                                        <option value="ii">COM_COMPONENTBUILDER_DYNAMIC_GET_II</option>
+                                        <option value="jj">COM_COMPONENTBUILDER_DYNAMIC_GET_JJ</option>
+                                        <option value="kk">COM_COMPONENTBUILDER_DYNAMIC_GET_KK</option>
+                                        <option value="ll">COM_COMPONENTBUILDER_DYNAMIC_GET_LL</option>
+                                        <option value="mm">COM_COMPONENTBUILDER_DYNAMIC_GET_MM</option>
+                                        <option value="nn">COM_COMPONENTBUILDER_DYNAMIC_GET_NN</option>
+                                        <option value="oo">COM_COMPONENTBUILDER_DYNAMIC_GET_OO</option>
+                                        <option value="pp">COM_COMPONENTBUILDER_DYNAMIC_GET_PP</option>
+                                        <option value="qq">COM_COMPONENTBUILDER_DYNAMIC_GET_QQ</option>
+                                        <option value="rr">COM_COMPONENTBUILDER_DYNAMIC_GET_RR</option>
+                                        <option value="ss">COM_COMPONENTBUILDER_DYNAMIC_GET_SS</option>
+                                        <option value="tt">COM_COMPONENTBUILDER_DYNAMIC_GET_TT</option>
+                                        <option value="uu">COM_COMPONENTBUILDER_DYNAMIC_GET_UU</option>
+                                        <option value="vv">COM_COMPONENTBUILDER_DYNAMIC_GET_VV</option>
+                                        <option value="ww">COM_COMPONENTBUILDER_DYNAMIC_GET_WW</option>
+                                        <option value="xx">COM_COMPONENTBUILDER_DYNAMIC_GET_XX</option>
+                                        <option value="yy">COM_COMPONENTBUILDER_DYNAMIC_GET_YY</option>
+                                        <option value="zz">COM_COMPONENTBUILDER_DYNAMIC_GET_ZZ</option>
+                                </field>
+                                <!-- Type Field. Type: List. (joomla)-->
+                                <field type="list"
+                                       name="type"
+                                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_TYPE_LABEL"
+                                       class="list_class fieldMedium"
+                                       multiple="false"
+                                       filter="INT"
+                                       required="false"
+                                       default="1">
+                                        <!-- Option Set.-->
+                                        <option value="1">COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_LEFT</option>
+                                        <option value="2">COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_LEFT_OUTER</option>
+                                        <option value="3">COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_INNER</option>
+                                        <option value="4">COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_RIGHT</option>
+                                        <option value="5">COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_RIGHT_OUTER</option>
+                                </field>
+                                <!-- On_field Field. Type: Text. (joomla)-->
+                                <field type="text"
+                                       name="on_field"
+                                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_ON_FIELD_LABEL"
+                                       size="40"
+                                       maxlength="150"
+                                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_ON_FIELD_DESCRIPTION"
+                                       class="text_area fieldMedium"
+                                       readonly="false"
+                                       disabled="false"
+                                       required="false"
+                                       filter="CMD"
+                                       message="COM_COMPONENTBUILDER_DYNAMIC_GET_ON_FIELD_MESSAGE"
+                                       hint="COM_COMPONENTBUILDER_DYNAMIC_GET_ON_FIELD_HINT" />
+                                <!-- Operator Field. Type: List. (joomla)-->
+                                <field type="list"
+                                       name="operator"
+                                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_OPERATOR_LABEL"
+                                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_OPERATOR_DESCRIPTION"
+                                       class="list_class fieldMedium"
+                                       multiple="false"
+                                       filter="INT"
+                                       required="false"
+                                       default="0">
+                                        <!-- Option Set.-->
+                                        <option value="1">COM_COMPONENTBUILDER_DYNAMIC_GET_EQUAL</option>
+                                        <option value="2">COM_COMPONENTBUILDER_DYNAMIC_GET_NOT_EQUAL</option>
+                                        <option value="3">COM_COMPONENTBUILDER_DYNAMIC_GET_EQUAL_OR_NOT</option>
+                                        <option value="4">COM_COMPONENTBUILDER_DYNAMIC_GET_GREATER_THAN</option>
+                                        <option value="5">COM_COMPONENTBUILDER_DYNAMIC_GET_LESS_THAN</option>
+                                        <option value="6">COM_COMPONENTBUILDER_DYNAMIC_GET_GREATER_THAN_OR_EQUAL</option>
+                                        <option value="7">COM_COMPONENTBUILDER_DYNAMIC_GET_LESS_THAN_OR_EQUAL_TO</option>
+                                        <option value="8">COM_COMPONENTBUILDER_DYNAMIC_GET_NOT_LESS_THAN</option>
+                                        <option value="9">COM_COMPONENTBUILDER_DYNAMIC_GET_NOT_GREATER_THAN</option>
+                                        <option value="10">COM_COMPONENTBUILDER_DYNAMIC_GET_IN</option>
+                                        <option value="11">COM_COMPONENTBUILDER_DYNAMIC_GET_NOT_IN</option>
+                                </field>
+                                <!-- Join_field Field. Type: Text. (joomla)-->
+                                <field type="text"
+                                       name="join_field"
+                                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_FIELD_LABEL"
+                                       size="40"
+                                       maxlength="150"
+                                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_FIELD_DESCRIPTION"
+                                       class="text_area fieldMedium"
+                                       readonly="false"
+                                       disabled="false"
+                                       required="false"
+                                       filter="CMD"
+                                       message="COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_FIELD_MESSAGE"
+                                       hint="COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_FIELD_HINT" />
+                                <!-- Selection Field. Type: Textarea. (joomla)-->
+                                <field type="textarea"
+                                       name="selection"
+                                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_SELECTION_LABEL"
+                                       rows="22"
+                                       cols="30"
+                                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_SELECTION_DESCRIPTION"
+                                       class="text_area span12"
+                                       filter="HTML"
+                                       hint="COM_COMPONENTBUILDER_DYNAMIC_GET_SELECTION_HINT"
+                                       required="false" />
+                        </form>
+                </field>
         </fieldset>
 	
 	<!-- Access Control Fields. -->

admin/models/forms/field.js

@@ -23,14 +23,14 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvwalvzv_required = false;
+jform_vvvvwalvzu_required = false;
-jform_vvvvwamvzw_required = false;
+jform_vvvvwamvzv_required = false;
-jform_vvvvwanvzx_required = false;
+jform_vvvvwanvzw_required = false;
-jform_vvvvwaovzy_required = false;
+jform_vvvvwaovzx_required = false;
-jform_vvvvwarvzz_required = false;
+jform_vvvvwarvzy_required = false;
-jform_vvvvwaswaa_required = false;
+jform_vvvvwasvzz_required = false;
-jform_vvvvwatwab_required = false;
+jform_vvvvwatwaa_required = false;
-jform_vvvvwauwac_required = false;
+jform_vvvvwauwab_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -84,26 +84,26 @@ function vvvvwal(datalenght_vvvvwal)
 	if (datalenght)
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').show();
-		if (jform_vvvvwalvzv_required)
+		if (jform_vvvvwalvzu_required)
 		{
 			updateFieldRequired('datalenght_other',0);
 			jQuery('#jform_datalenght_other').prop('required','required');
 			jQuery('#jform_datalenght_other').attr('aria-required',true);
 			jQuery('#jform_datalenght_other').addClass('required');
-			jform_vvvvwalvzv_required = false;
+			jform_vvvvwalvzu_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').hide();
-		if (!jform_vvvvwalvzv_required)
+		if (!jform_vvvvwalvzu_required)
 		{
 			updateFieldRequired('datalenght_other',1);
 			jQuery('#jform_datalenght_other').removeAttr('required');
 			jQuery('#jform_datalenght_other').removeAttr('aria-required');
 			jQuery('#jform_datalenght_other').removeClass('required');
-			jform_vvvvwalvzv_required = true;
+			jform_vvvvwalvzu_required = true;
 		}
 	}
 }
@@ -139,26 +139,26 @@ function vvvvwam(datadefault_vvvvwam)
 	if (datadefault)
 	{
 		jQuery('#jform_datadefault_other').closest('.control-group').show();
-		if (jform_vvvvwamvzw_required)
+		if (jform_vvvvwamvzv_required)
 		{
 			updateFieldRequired('datadefault_other',0);
 			jQuery('#jform_datadefault_other').prop('required','required');
 			jQuery('#jform_datadefault_other').attr('aria-required',true);
 			jQuery('#jform_datadefault_other').addClass('required');
-			jform_vvvvwamvzw_required = false;
+			jform_vvvvwamvzv_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_datadefault_other').closest('.control-group').hide();
-		if (!jform_vvvvwamvzw_required)
+		if (!jform_vvvvwamvzv_required)
 		{
 			updateFieldRequired('datadefault_other',1);
 			jQuery('#jform_datadefault_other').removeAttr('required');
 			jQuery('#jform_datadefault_other').removeAttr('aria-required');
 			jQuery('#jform_datadefault_other').removeClass('required');
-			jform_vvvvwamvzw_required = true;
+			jform_vvvvwamvzv_required = true;
 		}
 	}
 }
@@ -196,13 +196,13 @@ function vvvvwan(datatype_vvvvwan)
 		jQuery('#jform_datadefault').closest('.control-group').show();
 		jQuery('#jform_datalenght').closest('.control-group').show();
 		jQuery('#jform_indexes').closest('.control-group').show();
-		if (jform_vvvvwanvzx_required)
+		if (jform_vvvvwanvzw_required)
 		{
 			updateFieldRequired('indexes',0);
 			jQuery('#jform_indexes').prop('required','required');
 			jQuery('#jform_indexes').attr('aria-required',true);
 			jQuery('#jform_indexes').addClass('required');
-			jform_vvvvwanvzx_required = false;
+			jform_vvvvwanvzw_required = false;
 		}
 
 	}
@@ -211,13 +211,13 @@ function vvvvwan(datatype_vvvvwan)
 		jQuery('#jform_datadefault').closest('.control-group').hide();
 		jQuery('#jform_datalenght').closest('.control-group').hide();
 		jQuery('#jform_indexes').closest('.control-group').hide();
-		if (!jform_vvvvwanvzx_required)
+		if (!jform_vvvvwanvzw_required)
 		{
 			updateFieldRequired('indexes',1);
 			jQuery('#jform_indexes').removeAttr('required');
 			jQuery('#jform_indexes').removeAttr('aria-required');
 			jQuery('#jform_indexes').removeClass('required');
-			jform_vvvvwanvzx_required = true;
+			jform_vvvvwanvzw_required = true;
 		}
 	}
 }
@@ -253,26 +253,26 @@ function vvvvwao(datatype_vvvvwao)
 	if (datatype)
 	{
 		jQuery('#jform_store').closest('.control-group').show();
-		if (jform_vvvvwaovzy_required)
+		if (jform_vvvvwaovzx_required)
 		{
 			updateFieldRequired('store',0);
 			jQuery('#jform_store').prop('required','required');
 			jQuery('#jform_store').attr('aria-required',true);
 			jQuery('#jform_store').addClass('required');
-			jform_vvvvwaovzy_required = false;
+			jform_vvvvwaovzx_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_store').closest('.control-group').hide();
-		if (!jform_vvvvwaovzy_required)
+		if (!jform_vvvvwaovzx_required)
 		{
 			updateFieldRequired('store',1);
 			jQuery('#jform_store').removeAttr('required');
 			jQuery('#jform_store').removeAttr('aria-required');
 			jQuery('#jform_store').removeClass('required');
-			jform_vvvvwaovzy_required = true;
+			jform_vvvvwaovzx_required = true;
 		}
 	}
 }
@@ -356,26 +356,26 @@ function vvvvwar(add_css_view_vvvvwar)
 	if (add_css_view_vvvvwar == 1)
 	{
 		jQuery('#jform_css_view').closest('.control-group').show();
-		if (jform_vvvvwarvzz_required)
+		if (jform_vvvvwarvzy_required)
 		{
 			updateFieldRequired('css_view',0);
 			jQuery('#jform_css_view').prop('required','required');
 			jQuery('#jform_css_view').attr('aria-required',true);
 			jQuery('#jform_css_view').addClass('required');
-			jform_vvvvwarvzz_required = false;
+			jform_vvvvwarvzy_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_css_view').closest('.control-group').hide();
-		if (!jform_vvvvwarvzz_required)
+		if (!jform_vvvvwarvzy_required)
 		{
 			updateFieldRequired('css_view',1);
 			jQuery('#jform_css_view').removeAttr('required');
 			jQuery('#jform_css_view').removeAttr('aria-required');
 			jQuery('#jform_css_view').removeClass('required');
-			jform_vvvvwarvzz_required = true;
+			jform_vvvvwarvzy_required = true;
 		}
 	}
 }
@@ -387,26 +387,26 @@ function vvvvwas(add_css_views_vvvvwas)
 	if (add_css_views_vvvvwas == 1)
 	{
 		jQuery('#jform_css_views').closest('.control-group').show();
-		if (jform_vvvvwaswaa_required)
+		if (jform_vvvvwasvzz_required)
 		{
 			updateFieldRequired('css_views',0);
 			jQuery('#jform_css_views').prop('required','required');
 			jQuery('#jform_css_views').attr('aria-required',true);
 			jQuery('#jform_css_views').addClass('required');
-			jform_vvvvwaswaa_required = false;
+			jform_vvvvwasvzz_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_css_views').closest('.control-group').hide();
-		if (!jform_vvvvwaswaa_required)
+		if (!jform_vvvvwasvzz_required)
 		{
 			updateFieldRequired('css_views',1);
 			jQuery('#jform_css_views').removeAttr('required');
 			jQuery('#jform_css_views').removeAttr('aria-required');
 			jQuery('#jform_css_views').removeClass('required');
-			jform_vvvvwaswaa_required = true;
+			jform_vvvvwasvzz_required = true;
 		}
 	}
 }
@@ -418,26 +418,26 @@ function vvvvwat(add_javascript_view_footer_vvvvwat)
 	if (add_javascript_view_footer_vvvvwat == 1)
 	{
 		jQuery('#jform_javascript_view_footer').closest('.control-group').show();
-		if (jform_vvvvwatwab_required)
+		if (jform_vvvvwatwaa_required)
 		{
 			updateFieldRequired('javascript_view_footer',0);
 			jQuery('#jform_javascript_view_footer').prop('required','required');
 			jQuery('#jform_javascript_view_footer').attr('aria-required',true);
 			jQuery('#jform_javascript_view_footer').addClass('required');
-			jform_vvvvwatwab_required = false;
+			jform_vvvvwatwaa_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_javascript_view_footer').closest('.control-group').hide();
-		if (!jform_vvvvwatwab_required)
+		if (!jform_vvvvwatwaa_required)
 		{
 			updateFieldRequired('javascript_view_footer',1);
 			jQuery('#jform_javascript_view_footer').removeAttr('required');
 			jQuery('#jform_javascript_view_footer').removeAttr('aria-required');
 			jQuery('#jform_javascript_view_footer').removeClass('required');
-			jform_vvvvwatwab_required = true;
+			jform_vvvvwatwaa_required = true;
 		}
 	}
 }
@@ -449,26 +449,26 @@ function vvvvwau(add_javascript_views_footer_vvvvwau)
 	if (add_javascript_views_footer_vvvvwau == 1)
 	{
 		jQuery('#jform_javascript_views_footer').closest('.control-group').show();
-		if (jform_vvvvwauwac_required)
+		if (jform_vvvvwauwab_required)
 		{
 			updateFieldRequired('javascript_views_footer',0);
 			jQuery('#jform_javascript_views_footer').prop('required','required');
 			jQuery('#jform_javascript_views_footer').attr('aria-required',true);
 			jQuery('#jform_javascript_views_footer').addClass('required');
-			jform_vvvvwauwac_required = false;
+			jform_vvvvwauwab_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_javascript_views_footer').closest('.control-group').hide();
-		if (!jform_vvvvwauwac_required)
+		if (!jform_vvvvwauwab_required)
 		{
 			updateFieldRequired('javascript_views_footer',1);
 			jQuery('#jform_javascript_views_footer').removeAttr('required');
 			jQuery('#jform_javascript_views_footer').removeAttr('aria-required');
 			jQuery('#jform_javascript_views_footer').removeClass('required');
-			jform_vvvvwauwac_required = true;
+			jform_vvvvwauwab_required = true;
 		}
 	}
 }

admin/models/forms/field.xml

@@ -151,35 +151,6 @@
                         <option value="NULL">COM_COMPONENTBUILDER_FIELD_NULL</option>
                         <option value="NOT NULL">COM_COMPONENTBUILDER_FIELD_NOT_NULL</option>
                 </field>
-                <!-- Datalenght_other Field. Type: Text. (joomla)-->
-                <field type="text"
-                       name="datalenght_other"
-                       label="COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_LABEL"
-                       size="10"
-                       maxlength="50"
-                       description="COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_DESCRIPTION"
-                       class="text_area"
-                       readonly="false"
-                       disabled="false"
-                       required="true"
-                       filter="STRING"
-                       message="COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_MESSAGE"
-                       hint="COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_HINT" />
-                <!-- Datadefault Field. Type: List. (joomla)-->
-                <field type="list"
-                       name="datadefault"
-                       label="COM_COMPONENTBUILDER_FIELD_DATADEFAULT_LABEL"
-                       description="COM_COMPONENTBUILDER_FIELD_DATADEFAULT_DESCRIPTION"
-                       class="btn-group"
-                       multiple="false">
-                        <!-- Option Set.-->
-                        <option value="">COM_COMPONENTBUILDER_FIELD_NONE</option>
-                        <option value="0">COM_COMPONENTBUILDER_FIELD_ZERO</option>
-                        <option value="1">COM_COMPONENTBUILDER_FIELD_ONE</option>
-                        <option value="CURRENT_TIMESTAMP">COM_COMPONENTBUILDER_FIELD_CURRENT_TIMESTAMP</option>
-                        <option value="DATETIME">COM_COMPONENTBUILDER_FIELD_DATETIME</option>
-                        <option value="Other">COM_COMPONENTBUILDER_FIELD_OTHER</option>
-                </field>
                 <!-- Add_css_view Field. Type: Radio. (joomla)-->
                 <field type="radio"
                        name="add_css_view"
@@ -191,25 +162,77 @@
                         <option value="1">COM_COMPONENTBUILDER_FIELD_YES</option>
                         <option value="0">COM_COMPONENTBUILDER_FIELD_NO</option>
                 </field>
-                <!-- Datadefault_other Field. Type: Text. (joomla)-->
+                <!-- Css_view Field. Type: Textarea. (joomla)-->
-                <field type="text"
+                <field type="textarea"
-                       name="datadefault_other"
+                       name="css_view"
-                       label="COM_COMPONENTBUILDER_FIELD_DATADEFAULT_OTHER_LABEL"
+                       label="COM_COMPONENTBUILDER_FIELD_CSS_VIEW_LABEL"
-                       size="10"
+                       rows="30"
-                       maxlength="50"
+                       cols="15"
-                       description="COM_COMPONENTBUILDER_FIELD_DATADEFAULT_OTHER_DESCRIPTION"
+                       description="COM_COMPONENTBUILDER_FIELD_CSS_VIEW_DESCRIPTION"
-                       class="text_area"
+                       class="text_area span12"
-                       readonly="false"
+                       filter="raw"
-                       disabled="false"
+                       hint="COM_COMPONENTBUILDER_FIELD_CSS_VIEW_HINT"
-                       required="true"
+                       required="true" />
-                       filter="STRING"
-                       message="COM_COMPONENTBUILDER_FIELD_DATADEFAULT_OTHER_MESSAGE"
-                       hint="COM_COMPONENTBUILDER_FIELD_DATADEFAULT_OTHER_HINT" />
                 <!-- Note_filter_information Field. Type: Note. A None Database Field. (joomla)-->
                 <field type="note"
                        name="note_filter_information"
                        description="COM_COMPONENTBUILDER_FIELD_NOTE_FILTER_INFORMATION_DESCRIPTION"
                        class="note_filter_information" />
+                <!-- Not_required Field. Type: Hidden. (joomla)-->
+                <field type="hidden"
+                       name="not_required"
+                       default="[]" />
+                <!-- Catid Field. Type: Category. (joomla)-->
+                <field type="category"
+                       name="catid"
+                       label="COM_COMPONENTBUILDER_FIELD_CATID_LABEL"
+                       extension="com_componentbuilder.fields"
+                       description="COM_COMPONENTBUILDER_FIELD_CATID_DESCRIPTION"
+                       class="inputbox" />
+                <!-- Xml Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="xml"
+                       label="COM_COMPONENTBUILDER_FIELD_XML_LABEL"
+                       rows="17"
+                       cols="720"
+                       description="COM_COMPONENTBUILDER_FIELD_XML_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_FIELD_XML_HINT"
+                       required="true" />
+                <!-- Add_javascript_view_footer Field. Type: Radio. (joomla)-->
+                <field type="radio"
+                       name="add_javascript_view_footer"
+                       label="COM_COMPONENTBUILDER_FIELD_ADD_JAVASCRIPT_VIEW_FOOTER_LABEL"
+                       class="btn-group btn-group-yesno"
+                       default="0"
+                       required="true">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_FIELD_YES</option>
+                        <option value="0">COM_COMPONENTBUILDER_FIELD_NO</option>
+                </field>
+                <!-- Add_javascript_views_footer Field. Type: Radio. (joomla)-->
+                <field type="radio"
+                       name="add_javascript_views_footer"
+                       label="COM_COMPONENTBUILDER_FIELD_ADD_JAVASCRIPT_VIEWS_FOOTER_LABEL"
+                       class="btn-group btn-group-yesno"
+                       default="0"
+                       required="true">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_FIELD_YES</option>
+                        <option value="0">COM_COMPONENTBUILDER_FIELD_NO</option>
+                </field>
+                <!-- Add_css_views Field. Type: Radio. (joomla)-->
+                <field type="radio"
+                       name="add_css_views"
+                       label="COM_COMPONENTBUILDER_FIELD_ADD_CSS_VIEWS_LABEL"
+                       class="btn-group btn-group-yesno"
+                       default="0"
+                       required="true">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_FIELD_YES</option>
+                        <option value="0">COM_COMPONENTBUILDER_FIELD_NO</option>
+                </field>
                 <!-- Datalenght Field. Type: List. (joomla)-->
                 <field type="list"
                        name="datalenght"
@@ -231,77 +254,49 @@
                         <option value="2048">COM_COMPONENTBUILDER_FIELD_TWO_THOUSAND_AND_FORTY_EIGHT</option>
                         <option value="Other">COM_COMPONENTBUILDER_FIELD_OTHER</option>
                 </field>
-                <!-- Add_css_views Field. Type: Radio. (joomla)-->
+                <!-- Datadefault_other Field. Type: Text. (joomla)-->
-                <field type="radio"
+                <field type="text"
-                       name="add_css_views"
+                       name="datadefault_other"
-                       label="COM_COMPONENTBUILDER_FIELD_ADD_CSS_VIEWS_LABEL"
+                       label="COM_COMPONENTBUILDER_FIELD_DATADEFAULT_OTHER_LABEL"
-                       class="btn-group btn-group-yesno"
+                       size="10"
-                       default="0"
+                       maxlength="50"
-                       required="true">
+                       description="COM_COMPONENTBUILDER_FIELD_DATADEFAULT_OTHER_DESCRIPTION"
+                       class="text_area"
+                       readonly="false"
+                       disabled="false"
+                       required="true"
+                       filter="STRING"
+                       message="COM_COMPONENTBUILDER_FIELD_DATADEFAULT_OTHER_MESSAGE"
+                       hint="COM_COMPONENTBUILDER_FIELD_DATADEFAULT_OTHER_HINT" />
+                <!-- Datadefault Field. Type: List. (joomla)-->
+                <field type="list"
+                       name="datadefault"
+                       label="COM_COMPONENTBUILDER_FIELD_DATADEFAULT_LABEL"
+                       description="COM_COMPONENTBUILDER_FIELD_DATADEFAULT_DESCRIPTION"
+                       class="btn-group"
+                       multiple="false">
                         <!-- Option Set.-->
-                        <option value="1">COM_COMPONENTBUILDER_FIELD_YES</option>
+                        <option value="">COM_COMPONENTBUILDER_FIELD_NONE</option>
-                        <option value="0">COM_COMPONENTBUILDER_FIELD_NO</option>
+                        <option value="0">COM_COMPONENTBUILDER_FIELD_ZERO</option>
+                        <option value="1">COM_COMPONENTBUILDER_FIELD_ONE</option>
+                        <option value="CURRENT_TIMESTAMP">COM_COMPONENTBUILDER_FIELD_CURRENT_TIMESTAMP</option>
+                        <option value="DATETIME">COM_COMPONENTBUILDER_FIELD_DATETIME</option>
+                        <option value="Other">COM_COMPONENTBUILDER_FIELD_OTHER</option>
                 </field>
-                <!-- Add_javascript_view_footer Field. Type: Radio. (joomla)-->
+                <!-- Datalenght_other Field. Type: Text. (joomla)-->
-                <field type="radio"
+                <field type="text"
-                       name="add_javascript_view_footer"
+                       name="datalenght_other"
-                       label="COM_COMPONENTBUILDER_FIELD_ADD_JAVASCRIPT_VIEW_FOOTER_LABEL"
+                       label="COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_LABEL"
-                       class="btn-group btn-group-yesno"
+                       size="10"
-                       default="0"
+                       maxlength="50"
-                       required="true">
+                       description="COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_DESCRIPTION"
-                        <!-- Option Set.-->
+                       class="text_area"
-                        <option value="1">COM_COMPONENTBUILDER_FIELD_YES</option>
+                       readonly="false"
-                        <option value="0">COM_COMPONENTBUILDER_FIELD_NO</option>
+                       disabled="false"
-                </field>
+                       required="true"
-                <!-- Xml Field. Type: Textarea. (joomla)-->
+                       filter="STRING"
-                <field type="textarea"
+                       message="COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_MESSAGE"
-                       name="xml"
+                       hint="COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_HINT" />
-                       label="COM_COMPONENTBUILDER_FIELD_XML_LABEL"
-                       rows="17"
-                       cols="720"
-                       description="COM_COMPONENTBUILDER_FIELD_XML_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_FIELD_XML_HINT"
-                       required="true" />
-                <!-- Add_javascript_views_footer Field. Type: Radio. (joomla)-->
-                <field type="radio"
-                       name="add_javascript_views_footer"
-                       label="COM_COMPONENTBUILDER_FIELD_ADD_JAVASCRIPT_VIEWS_FOOTER_LABEL"
-                       class="btn-group btn-group-yesno"
-                       default="0"
-                       required="true">
-                        <!-- Option Set.-->
-                        <option value="1">COM_COMPONENTBUILDER_FIELD_YES</option>
-                        <option value="0">COM_COMPONENTBUILDER_FIELD_NO</option>
-                </field>
-                <!-- Not_required Field. Type: Hidden. (joomla)-->
-                <field type="hidden"
-                       name="not_required"
-                       default="[]" />
-                <!-- Catid Field. Type: Category. (joomla)-->
-                <field type="category"
-                       name="catid"
-                       label="COM_COMPONENTBUILDER_FIELD_CATID_LABEL"
-                       extension="com_componentbuilder.fields"
-                       description="COM_COMPONENTBUILDER_FIELD_CATID_DESCRIPTION"
-                       class="inputbox" />
-                <!-- Css_view Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="css_view"
-                       label="COM_COMPONENTBUILDER_FIELD_CSS_VIEW_LABEL"
-                       rows="30"
-                       cols="15"
-                       description="COM_COMPONENTBUILDER_FIELD_CSS_VIEW_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_FIELD_CSS_VIEW_HINT"
-                       required="true" />
-                <!-- Helpnote Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="helpnote"
-                       label="COM_COMPONENTBUILDER_FIELD_HELPNOTE_LABEL"
-                       class="helpNote helpnote" />
                 <!-- Css_views Field. Type: Textarea. (joomla)-->
                 <field type="textarea"
                        name="css_views"
@@ -360,6 +355,11 @@
                        filter="raw"
                        hint="COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEWS_FOOTER_HINT"
                        required="true" />
+                <!-- Helpnote Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="helpnote"
+                       label="COM_COMPONENTBUILDER_FIELD_HELPNOTE_LABEL"
+                       class="helpNote helpnote" />
         </fieldset>
 	
 	<!-- Access Control Fields. -->

admin/models/forms/fieldtype.xml

@@ -93,42 +93,6 @@
                        filter="STRING"
                        message="COM_COMPONENTBUILDER_FIELDTYPE_NAME_MESSAGE"
                        hint="COM_COMPONENTBUILDER_FIELDTYPE_NAME_HINT" />
-                <!-- Note_on_fields Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_on_fields"
-                       label="COM_COMPONENTBUILDER_FIELDTYPE_NOTE_ON_FIELDS_LABEL"
-                       description="COM_COMPONENTBUILDER_FIELDTYPE_NOTE_ON_FIELDS_DESCRIPTION"
-                       heading="h4"
-                       class="alert alert-info note_on_fields" />
-                <!-- Catid Field. Type: Category. (joomla)-->
-                <field type="category"
-                       name="catid"
-                       label="COM_COMPONENTBUILDER_FIELDTYPE_CATID_LABEL"
-                       extension="com_componentbuilder.fieldtypes"
-                       description="COM_COMPONENTBUILDER_FIELDTYPE_CATID_DESCRIPTION"
-                       class="inputbox" />
-                <!-- Description Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="description"
-                       label="COM_COMPONENTBUILDER_FIELDTYPE_DESCRIPTION_LABEL"
-                       rows="11"
-                       cols="10"
-                       description="COM_COMPONENTBUILDER_FIELDTYPE_DESCRIPTION_DESCRIPTION"
-                       class="text_area span12"
-                       filter="HTML"
-                       hint="COM_COMPONENTBUILDER_FIELDTYPE_DESCRIPTION_HINT" />
-                <!-- Short_description Field. Type: Text. (joomla)-->
-                <field type="text"
-                       name="short_description"
-                       label="COM_COMPONENTBUILDER_FIELDTYPE_SHORT_DESCRIPTION_LABEL"
-                       size="40"
-                       maxlength="150"
-                       description="COM_COMPONENTBUILDER_FIELDTYPE_SHORT_DESCRIPTION_DESCRIPTION"
-                       class="text_area"
-                       required="true"
-                       filter="HTML"
-                       message="COM_COMPONENTBUILDER_FIELDTYPE_SHORT_DESCRIPTION_MESSAGE"
-                       hint="COM_COMPONENTBUILDER_FIELDTYPE_SHORT_DESCRIPTION_HINT" />
                 <!-- Properties Field. Type: Subform. (joomla)-->
                 <field type="subform"
                        name="properties"
@@ -205,6 +169,42 @@
                                        required="false" />
                         </form>
                 </field>
+                <!-- Note_on_fields Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_on_fields"
+                       label="COM_COMPONENTBUILDER_FIELDTYPE_NOTE_ON_FIELDS_LABEL"
+                       description="COM_COMPONENTBUILDER_FIELDTYPE_NOTE_ON_FIELDS_DESCRIPTION"
+                       heading="h4"
+                       class="alert alert-info note_on_fields" />
+                <!-- Description Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="description"
+                       label="COM_COMPONENTBUILDER_FIELDTYPE_DESCRIPTION_LABEL"
+                       rows="11"
+                       cols="10"
+                       description="COM_COMPONENTBUILDER_FIELDTYPE_DESCRIPTION_DESCRIPTION"
+                       class="text_area span12"
+                       filter="HTML"
+                       hint="COM_COMPONENTBUILDER_FIELDTYPE_DESCRIPTION_HINT" />
+                <!-- Short_description Field. Type: Text. (joomla)-->
+                <field type="text"
+                       name="short_description"
+                       label="COM_COMPONENTBUILDER_FIELDTYPE_SHORT_DESCRIPTION_LABEL"
+                       size="40"
+                       maxlength="150"
+                       description="COM_COMPONENTBUILDER_FIELDTYPE_SHORT_DESCRIPTION_DESCRIPTION"
+                       class="text_area"
+                       required="true"
+                       filter="HTML"
+                       message="COM_COMPONENTBUILDER_FIELDTYPE_SHORT_DESCRIPTION_MESSAGE"
+                       hint="COM_COMPONENTBUILDER_FIELDTYPE_SHORT_DESCRIPTION_HINT" />
+                <!-- Catid Field. Type: Category. (joomla)-->
+                <field type="category"
+                       name="catid"
+                       label="COM_COMPONENTBUILDER_FIELDTYPE_CATID_LABEL"
+                       extension="com_componentbuilder.fieldtypes"
+                       description="COM_COMPONENTBUILDER_FIELDTYPE_CATID_DESCRIPTION"
+                       class="inputbox" />
         </fieldset>
 	
 	<!-- Access Control Fields. -->

admin/models/forms/help_document.js

@@ -23,12 +23,12 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvwbfwao_required = false;
+jform_vvvvwbfwan_required = false;
-jform_vvvvwbgwap_required = false;
+jform_vvvvwbgwao_required = false;
-jform_vvvvwbhwaq_required = false;
+jform_vvvvwbhwap_required = false;
-jform_vvvvwbiwar_required = false;
+jform_vvvvwbiwaq_required = false;
-jform_vvvvwbjwas_required = false;
+jform_vvvvwbjwar_required = false;
-jform_vvvvwbkwat_required = false;
+jform_vvvvwbkwas_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -59,26 +59,26 @@ function vvvvwbf(location_vvvvwbf)
 	if (location_vvvvwbf == 1)
 	{
 		jQuery('#jform_admin_view').closest('.control-group').show();
-		if (jform_vvvvwbfwao_required)
+		if (jform_vvvvwbfwan_required)
 		{
 			updateFieldRequired('admin_view',0);
 			jQuery('#jform_admin_view').prop('required','required');
 			jQuery('#jform_admin_view').attr('aria-required',true);
 			jQuery('#jform_admin_view').addClass('required');
-			jform_vvvvwbfwao_required = false;
+			jform_vvvvwbfwan_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_admin_view').closest('.control-group').hide();
-		if (!jform_vvvvwbfwao_required)
+		if (!jform_vvvvwbfwan_required)
 		{
 			updateFieldRequired('admin_view',1);
 			jQuery('#jform_admin_view').removeAttr('required');
 			jQuery('#jform_admin_view').removeAttr('aria-required');
 			jQuery('#jform_admin_view').removeClass('required');
-			jform_vvvvwbfwao_required = true;
+			jform_vvvvwbfwan_required = true;
 		}
 	}
 }
@@ -90,26 +90,26 @@ function vvvvwbg(location_vvvvwbg)
 	if (location_vvvvwbg == 2)
 	{
 		jQuery('#jform_site_view').closest('.control-group').show();
-		if (jform_vvvvwbgwap_required)
+		if (jform_vvvvwbgwao_required)
 		{
 			updateFieldRequired('site_view',0);
 			jQuery('#jform_site_view').prop('required','required');
 			jQuery('#jform_site_view').attr('aria-required',true);
 			jQuery('#jform_site_view').addClass('required');
-			jform_vvvvwbgwap_required = false;
+			jform_vvvvwbgwao_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_site_view').closest('.control-group').hide();
-		if (!jform_vvvvwbgwap_required)
+		if (!jform_vvvvwbgwao_required)
 		{
 			updateFieldRequired('site_view',1);
 			jQuery('#jform_site_view').removeAttr('required');
 			jQuery('#jform_site_view').removeAttr('aria-required');
 			jQuery('#jform_site_view').removeClass('required');
-			jform_vvvvwbgwap_required = true;
+			jform_vvvvwbgwao_required = true;
 		}
 	}
 }
@@ -134,26 +134,26 @@ function vvvvwbh(type_vvvvwbh)
 	if (type)
 	{
 		jQuery('#jform_url').closest('.control-group').show();
-		if (jform_vvvvwbhwaq_required)
+		if (jform_vvvvwbhwap_required)
 		{
 			updateFieldRequired('url',0);
 			jQuery('#jform_url').prop('required','required');
 			jQuery('#jform_url').attr('aria-required',true);
 			jQuery('#jform_url').addClass('required');
-			jform_vvvvwbhwaq_required = false;
+			jform_vvvvwbhwap_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_url').closest('.control-group').hide();
-		if (!jform_vvvvwbhwaq_required)
+		if (!jform_vvvvwbhwap_required)
 		{
 			updateFieldRequired('url',1);
 			jQuery('#jform_url').removeAttr('required');
 			jQuery('#jform_url').removeAttr('aria-required');
 			jQuery('#jform_url').removeClass('required');
-			jform_vvvvwbhwaq_required = true;
+			jform_vvvvwbhwap_required = true;
 		}
 	}
 }
@@ -189,26 +189,26 @@ function vvvvwbi(type_vvvvwbi)
 	if (type)
 	{
 		jQuery('#jform_article').closest('.control-group').show();
-		if (jform_vvvvwbiwar_required)
+		if (jform_vvvvwbiwaq_required)
 		{
 			updateFieldRequired('article',0);
 			jQuery('#jform_article').prop('required','required');
 			jQuery('#jform_article').attr('aria-required',true);
 			jQuery('#jform_article').addClass('required');
-			jform_vvvvwbiwar_required = false;
+			jform_vvvvwbiwaq_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_article').closest('.control-group').hide();
-		if (!jform_vvvvwbiwar_required)
+		if (!jform_vvvvwbiwaq_required)
 		{
 			updateFieldRequired('article',1);
 			jQuery('#jform_article').removeAttr('required');
 			jQuery('#jform_article').removeAttr('aria-required');
 			jQuery('#jform_article').removeClass('required');
-			jform_vvvvwbiwar_required = true;
+			jform_vvvvwbiwaq_required = true;
 		}
 	}
 }
@@ -244,26 +244,26 @@ function vvvvwbj(type_vvvvwbj)
 	if (type)
 	{
 		jQuery('#jform_content-lbl').closest('.control-group').show();
-		if (jform_vvvvwbjwas_required)
+		if (jform_vvvvwbjwar_required)
 		{
 			updateFieldRequired('content',0);
 			jQuery('#jform_content').prop('required','required');
 			jQuery('#jform_content').attr('aria-required',true);
 			jQuery('#jform_content').addClass('required');
-			jform_vvvvwbjwas_required = false;
+			jform_vvvvwbjwar_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_content-lbl').closest('.control-group').hide();
-		if (!jform_vvvvwbjwas_required)
+		if (!jform_vvvvwbjwar_required)
 		{
 			updateFieldRequired('content',1);
 			jQuery('#jform_content').removeAttr('required');
 			jQuery('#jform_content').removeAttr('aria-required');
 			jQuery('#jform_content').removeClass('required');
-			jform_vvvvwbjwas_required = true;
+			jform_vvvvwbjwar_required = true;
 		}
 	}
 }
@@ -286,26 +286,26 @@ function vvvvwbk(target_vvvvwbk)
 	if (target_vvvvwbk == 1)
 	{
 		jQuery('#jform_groups').closest('.control-group').show();
-		if (jform_vvvvwbkwat_required)
+		if (jform_vvvvwbkwas_required)
 		{
 			updateFieldRequired('groups',0);
 			jQuery('#jform_groups').prop('required','required');
 			jQuery('#jform_groups').attr('aria-required',true);
 			jQuery('#jform_groups').addClass('required');
-			jform_vvvvwbkwat_required = false;
+			jform_vvvvwbkwas_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_groups').closest('.control-group').hide();
-		if (!jform_vvvvwbkwat_required)
+		if (!jform_vvvvwbkwas_required)
 		{
 			updateFieldRequired('groups',1);
 			jQuery('#jform_groups').removeAttr('required');
 			jQuery('#jform_groups').removeAttr('aria-required');
 			jQuery('#jform_groups').removeClass('required');
-			jform_vvvvwbkwat_required = true;
+			jform_vvvvwbkwas_required = true;
 		}
 	}
 }

admin/models/forms/help_document.xml

@@ -143,17 +143,10 @@
                        multiple="false"
                        required="true"
                        button="false" />
-                <!-- Target Field. Type: Radio. (joomla)-->
+                <!-- Not_required Field. Type: Hidden. (joomla)-->
-                <field type="radio"
+                <field type="hidden"
-                       name="target"
+                       name="not_required"
-                       label="COM_COMPONENTBUILDER_HELP_DOCUMENT_TARGET_LABEL"
+                       default="[]" />
-                       description="COM_COMPONENTBUILDER_HELP_DOCUMENT_TARGET_DESCRIPTION"
-                       class="btn-group"
-                       required="true">
-                        <!-- Option Set.-->
-                        <option value="1">COM_COMPONENTBUILDER_HELP_DOCUMENT_SOME</option>
-                        <option value="2">COM_COMPONENTBUILDER_HELP_DOCUMENT_ALL</option>
-                </field>
                 <!-- Content Field. Type: Editor. (joomla)-->
                 <field type="editor"
                        name="content"
@@ -163,13 +156,6 @@
                        buttons="false"
                        filter="safehtml"
                        required="true" />
-                <!-- Alias Field. Type: Text. (joomla)-->
-                <field type="text"
-                       name="alias"
-                       label="COM_COMPONENTBUILDER_HELP_DOCUMENT_ALIAS_LABEL"
-                       description="JFIELD_ALIAS_DESC"
-                       filter="STRING"
-                       hint="COM_COMPONENTBUILDER_HELP_DOCUMENT_ALIAS_HINT" />
                 <!-- Article Field. Type: Articles. (custom)-->
                 <field type="articles"
                        name="article"
@@ -191,10 +177,24 @@
                        validated="url"
                        message="COM_COMPONENTBUILDER_HELP_DOCUMENT_URL_MESSAGE"
                        hint="COM_COMPONENTBUILDER_HELP_DOCUMENT_URL_HINT" />
-                <!-- Not_required Field. Type: Hidden. (joomla)-->
+                <!-- Target Field. Type: Radio. (joomla)-->
-                <field type="hidden"
+                <field type="radio"
-                       name="not_required"
+                       name="target"
-                       default="[]" />
+                       label="COM_COMPONENTBUILDER_HELP_DOCUMENT_TARGET_LABEL"
+                       description="COM_COMPONENTBUILDER_HELP_DOCUMENT_TARGET_DESCRIPTION"
+                       class="btn-group"
+                       required="true">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_HELP_DOCUMENT_SOME</option>
+                        <option value="2">COM_COMPONENTBUILDER_HELP_DOCUMENT_ALL</option>
+                </field>
+                <!-- Alias Field. Type: Text. (joomla)-->
+                <field type="text"
+                       name="alias"
+                       label="COM_COMPONENTBUILDER_HELP_DOCUMENT_ALIAS_LABEL"
+                       description="JFIELD_ALIAS_DESC"
+                       filter="STRING"
+                       hint="COM_COMPONENTBUILDER_HELP_DOCUMENT_ALIAS_HINT" />
         </fieldset>
 	
 	<!-- Access Control Fields. -->

admin/models/forms/language_translation.xml

@@ -92,6 +92,15 @@
                        hint="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_ENTRANSLATION_HINT"
                        readonly="true"
                        disabled="true" />
+                <!-- Components Field. Type: Components. (custom)-->
+                <field type="components"
+                       name="components"
+                       label="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_COMPONENTS_LABEL"
+                       class="list_class"
+                       multiple="true"
+                       default="0"
+                       required="true"
+                       button="false" />
                 <!-- Translation Field. Type: Subform. (joomla)-->
                 <field type="subform"
                        name="translation"
@@ -126,15 +135,6 @@
                                        button="false" />
                         </form>
                 </field>
-                <!-- Components Field. Type: Components. (custom)-->
-                <field type="components"
-                       name="components"
-                       label="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_COMPONENTS_LABEL"
-                       class="list_class"
-                       multiple="true"
-                       default="0"
-                       required="true"
-                       button="false" />
         </fieldset>
 	
 	<!-- Access Control Fields. -->

admin/models/forms/layout.js

@@ -23,7 +23,7 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvvyzvyu_required = false;
+jform_vvvvvyzvyt_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -39,26 +39,26 @@ function vvvvvyz(add_php_view_vvvvvyz)
 	if (add_php_view_vvvvvyz == 1)
 	{
 		jQuery('#jform_php_view').closest('.control-group').show();
-		if (jform_vvvvvyzvyu_required)
+		if (jform_vvvvvyzvyt_required)
 		{
 			updateFieldRequired('php_view',0);
 			jQuery('#jform_php_view').prop('required','required');
 			jQuery('#jform_php_view').attr('aria-required',true);
 			jQuery('#jform_php_view').addClass('required');
-			jform_vvvvvyzvyu_required = false;
+			jform_vvvvvyzvyt_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_view').closest('.control-group').hide();
-		if (!jform_vvvvvyzvyu_required)
+		if (!jform_vvvvvyzvyt_required)
 		{
 			updateFieldRequired('php_view',1);
 			jQuery('#jform_php_view').removeAttr('required');
 			jQuery('#jform_php_view').removeAttr('aria-required');
 			jQuery('#jform_php_view').removeClass('required');
-			jform_vvvvvyzvyu_required = true;
+			jform_vvvvvyzvyt_required = true;
 		}
 	}
 }

admin/models/forms/layout.xml

@@ -135,22 +135,16 @@
                        multiple="false"
                        required="false"
                        button="true" />
-                <!-- Note_libraries_selection Field. Type: Note. A None Database Field. (joomla)-->
+                <!-- Php_view Field. Type: Textarea. (joomla)-->
-                <field type="note"
-                       name="note_libraries_selection"
-                       label="COM_COMPONENTBUILDER_LAYOUT_NOTE_LIBRARIES_SELECTION_LABEL"
-                       description="COM_COMPONENTBUILDER_LAYOUT_NOTE_LIBRARIES_SELECTION_DESCRIPTION"
-                       heading="h4"
-                       class="alert alert-info note_libraries_selection" />
-                <!-- Layout Field. Type: Textarea. (joomla)-->
                 <field type="textarea"
-                       name="layout"
+                       name="php_view"
-                       label="COM_COMPONENTBUILDER_LAYOUT_LAYOUT_LABEL"
+                       label="COM_COMPONENTBUILDER_LAYOUT_PHP_VIEW_LABEL"
-                       rows="20"
+                       rows="17"
-                       cols="15"
+                       cols="5"
+                       description="COM_COMPONENTBUILDER_LAYOUT_PHP_VIEW_DESCRIPTION"
                        class="text_area span12"
                        filter="raw"
-                       hint="COM_COMPONENTBUILDER_LAYOUT_LAYOUT_HINT"
+                       hint="COM_COMPONENTBUILDER_LAYOUT_PHP_VIEW_HINT"
                        required="true" />
                 <!-- Add_php_view Field. Type: Radio. (joomla)-->
                 <field type="radio"
@@ -163,6 +157,39 @@
                         <option value="1">COM_COMPONENTBUILDER_LAYOUT_YES</option>
                         <option value="0">COM_COMPONENTBUILDER_LAYOUT_NO</option>
                 </field>
+                <!-- Dynamic_values Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="dynamic_values"
+                       label="COM_COMPONENTBUILDER_LAYOUT_DYNAMIC_VALUES_LABEL"
+                       description="COM_COMPONENTBUILDER_LAYOUT_DYNAMIC_VALUES_DESCRIPTION"
+                       heading="h4"
+                       class="dynamic_values" />
+                <!-- Not_required Field. Type: Hidden. (joomla)-->
+                <field type="hidden"
+                       name="not_required"
+                       default="[]" />
+                <!-- Layout Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="layout"
+                       label="COM_COMPONENTBUILDER_LAYOUT_LAYOUT_LABEL"
+                       rows="20"
+                       cols="15"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_LAYOUT_LAYOUT_HINT"
+                       required="true" />
+                <!-- Note_snippet_usage Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_snippet_usage"
+                       label="COM_COMPONENTBUILDER_LAYOUT_NOTE_SNIPPET_USAGE_LABEL"
+                       heading="h4"
+                       class="snippet-usage note_snippet_usage" />
+                <!-- Note_uikit_snippet Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_uikit_snippet"
+                       label="COM_COMPONENTBUILDER_LAYOUT_NOTE_UIKIT_SNIPPET_LABEL"
+                       heading="h4"
+                       class="snippet-code note_uikit_snippet" />
                 <!-- Note_add_language_string Field. Type: Note. A None Database Field. (joomla)-->
                 <field type="note"
                        name="note_add_language_string"
@@ -180,40 +207,13 @@
                        default="0"
                        required="false"
                        button="true" />
-                <!-- Not_required Field. Type: Hidden. (joomla)-->
+                <!-- Note_libraries_selection Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="hidden"
-                       name="not_required"
-                       default="[]" />
-                <!-- Note_snippet_usage Field. Type: Note. A None Database Field. (joomla)-->
                 <field type="note"
-                       name="note_snippet_usage"
+                       name="note_libraries_selection"
-                       label="COM_COMPONENTBUILDER_LAYOUT_NOTE_SNIPPET_USAGE_LABEL"
+                       label="COM_COMPONENTBUILDER_LAYOUT_NOTE_LIBRARIES_SELECTION_LABEL"
+                       description="COM_COMPONENTBUILDER_LAYOUT_NOTE_LIBRARIES_SELECTION_DESCRIPTION"
                        heading="h4"
-                       class="snippet-usage note_snippet_usage" />
+                       class="alert alert-info note_libraries_selection" />
-                <!-- Dynamic_values Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="dynamic_values"
-                       label="COM_COMPONENTBUILDER_LAYOUT_DYNAMIC_VALUES_LABEL"
-                       description="COM_COMPONENTBUILDER_LAYOUT_DYNAMIC_VALUES_DESCRIPTION"
-                       heading="h4"
-                       class="dynamic_values" />
-                <!-- Note_uikit_snippet Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_uikit_snippet"
-                       label="COM_COMPONENTBUILDER_LAYOUT_NOTE_UIKIT_SNIPPET_LABEL"
-                       heading="h4"
-                       class="snippet-code note_uikit_snippet" />
-                <!-- Php_view Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="php_view"
-                       label="COM_COMPONENTBUILDER_LAYOUT_PHP_VIEW_LABEL"
-                       rows="17"
-                       cols="5"
-                       description="COM_COMPONENTBUILDER_LAYOUT_PHP_VIEW_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_LAYOUT_PHP_VIEW_HINT"
-                       required="true" />
         </fieldset>
 	
 	<!-- Access Control Fields. -->

admin/models/forms/library.js

@@ -23,8 +23,8 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvwaevzt_required = false;
+jform_vvvvwaevzs_required = false;
-jform_vvvvwakvzu_required = false;
+jform_vvvvwakvzt_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -112,26 +112,26 @@ function vvvvwae(how_vvvvwae)
 	if (how)
 	{
 		jQuery('#jform_php_setdocument').closest('.control-group').show();
-		if (jform_vvvvwaevzt_required)
+		if (jform_vvvvwaevzs_required)
 		{
 			updateFieldRequired('php_setdocument',0);
 			jQuery('#jform_php_setdocument').prop('required','required');
 			jQuery('#jform_php_setdocument').attr('aria-required',true);
 			jQuery('#jform_php_setdocument').addClass('required');
-			jform_vvvvwaevzt_required = false;
+			jform_vvvvwaevzs_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_setdocument').closest('.control-group').hide();
-		if (!jform_vvvvwaevzt_required)
+		if (!jform_vvvvwaevzs_required)
 		{
 			updateFieldRequired('php_setdocument',1);
 			jQuery('#jform_php_setdocument').removeAttr('required');
 			jQuery('#jform_php_setdocument').removeAttr('aria-required');
 			jQuery('#jform_php_setdocument').removeClass('required');
-			jform_vvvvwaevzt_required = true;
+			jform_vvvvwaevzs_required = true;
 		}
 	}
 }
@@ -354,26 +354,26 @@ function vvvvwak(type_vvvvwak)
 	if (type_vvvvwak == 2)
 	{
 		jQuery('#jform_libraries').closest('.control-group').show();
-		if (jform_vvvvwakvzu_required)
+		if (jform_vvvvwakvzt_required)
 		{
 			updateFieldRequired('libraries',0);
 			jQuery('#jform_libraries').prop('required','required');
 			jQuery('#jform_libraries').attr('aria-required',true);
 			jQuery('#jform_libraries').addClass('required');
-			jform_vvvvwakvzu_required = false;
+			jform_vvvvwakvzt_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_libraries').closest('.control-group').hide();
-		if (!jform_vvvvwakvzu_required)
+		if (!jform_vvvvwakvzt_required)
 		{
 			updateFieldRequired('libraries',1);
 			jQuery('#jform_libraries').removeAttr('required');
 			jQuery('#jform_libraries').removeAttr('aria-required');
 			jQuery('#jform_libraries').removeClass('required');
-			jform_vvvvwakvzu_required = true;
+			jform_vvvvwakvzt_required = true;
 		}
 	}
 }

admin/models/forms/library.xml

@@ -129,25 +129,43 @@
                         <option value="1">COM_COMPONENTBUILDER_LIBRARY_MAIN</option>
                         <option value="2">COM_COMPONENTBUILDER_LIBRARY_BUNDLE</option>
                 </field>
-                <!-- Note_yes_behaviour_one Field. Type: Note. A None Database Field. (joomla)-->
+                <!-- Note_build_in_behaviour_two Field. Type: Note. A None Database Field. (joomla)-->
                 <field type="note"
-                       name="note_yes_behaviour_one"
+                       name="note_build_in_behaviour_two"
-                       label="COM_COMPONENTBUILDER_LIBRARY_NOTE_YES_BEHAVIOUR_ONE_LABEL"
+                       label="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_TWO_LABEL"
-                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_YES_BEHAVIOUR_ONE_DESCRIPTION"
+                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_TWO_DESCRIPTION"
                        heading="h4"
-                       class="alert alert-success note_yes_behaviour_one" />
+                       class="alert alert-success note_build_in_behaviour_two" />
+                <!-- Note_no_behaviour_two Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_no_behaviour_two"
+                       label="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_TWO_LABEL"
+                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_TWO_DESCRIPTION"
+                       heading="h4"
+                       class="alert alert-error note_no_behaviour_two" />
+                <!-- Note_yes_behaviour_two Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_yes_behaviour_two"
+                       label="COM_COMPONENTBUILDER_LIBRARY_NOTE_YES_BEHAVIOUR_TWO_LABEL"
+                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_YES_BEHAVIOUR_TWO_DESCRIPTION"
+                       heading="h4"
+                       class="alert alert-success note_yes_behaviour_two" />
+                <!-- Note_build_in_behaviour_three Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_build_in_behaviour_three"
+                       label="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_THREE_LABEL"
+                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_THREE_DESCRIPTION"
+                       heading="h4"
+                       class="alert alert-success note_build_in_behaviour_three" />
                 <!-- Note_display_library_files_folders_urls Field. Type: Note. A None Database Field. (joomla)-->
                 <field type="note"
                        name="note_display_library_files_folders_urls"
                        description="COM_COMPONENTBUILDER_LIBRARY_NOTE_DISPLAY_LIBRARY_FILES_FOLDERS_URLS_DESCRIPTION"
                        class="note_display_library_files_folders_urls" />
-                <!-- Note_build_in_behaviour_one Field. Type: Note. A None Database Field. (joomla)-->
+                <!-- Not_required Field. Type: Hidden. (joomla)-->
-                <field type="note"
+                <field type="hidden"
-                       name="note_build_in_behaviour_one"
+                       name="not_required"
-                       label="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_ONE_LABEL"
+                       default="[]" />
-                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_ONE_DESCRIPTION"
-                       heading="h4"
-                       class="alert alert-success note_build_in_behaviour_one" />
                 <!-- Note_no_behaviour_three Field. Type: Note. A None Database Field. (joomla)-->
                 <field type="note"
                        name="note_no_behaviour_three"
@@ -155,6 +173,39 @@
                        description="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_THREE_DESCRIPTION"
                        heading="h4"
                        class="alert alert-error note_no_behaviour_three" />
+                <!-- Note_display_library_config Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_display_library_config"
+                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_DISPLAY_LIBRARY_CONFIG_DESCRIPTION"
+                       class="note_display_library_config" />
+                <!-- Libraries Field. Type: Librariesx. (custom)-->
+                <field type="librariesx"
+                       name="libraries"
+                       label="COM_COMPONENTBUILDER_LIBRARY_LIBRARIES_LABEL"
+                       description="COM_COMPONENTBUILDER_LIBRARY_LIBRARIES_DESCRIPTION"
+                       class="list_class"
+                       multiple="true"
+                       default="0"
+                       required="false"
+                       button="true" />
+                <!-- Note_no_behaviour_one Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_no_behaviour_one"
+                       label="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_ONE_LABEL"
+                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_ONE_DESCRIPTION"
+                       heading="h4"
+                       class="alert alert-error note_no_behaviour_one" />
+                <!-- Php_setdocument Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="php_setdocument"
+                       label="COM_COMPONENTBUILDER_LIBRARY_PHP_SETDOCUMENT_LABEL"
+                       rows="30"
+                       cols="15"
+                       description="COM_COMPONENTBUILDER_LIBRARY_PHP_SETDOCUMENT_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_LIBRARY_PHP_SETDOCUMENT_HINT"
+                       required="true" />
                 <!-- Addconditions Field. Type: Subform. (joomla)-->
                 <field type="subform"
                        name="addconditions"
@@ -249,78 +300,20 @@
                                        required="false" />
                         </form>
                 </field>
-                <!-- Note_yes_behaviour_two Field. Type: Note. A None Database Field. (joomla)-->
+                <!-- Note_build_in_behaviour_one Field. Type: Note. A None Database Field. (joomla)-->
                 <field type="note"
-                       name="note_yes_behaviour_two"
+                       name="note_build_in_behaviour_one"
-                       label="COM_COMPONENTBUILDER_LIBRARY_NOTE_YES_BEHAVIOUR_TWO_LABEL"
+                       label="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_ONE_LABEL"
-                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_YES_BEHAVIOUR_TWO_DESCRIPTION"
+                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_ONE_DESCRIPTION"
                        heading="h4"
-                       class="alert alert-success note_yes_behaviour_two" />
+                       class="alert alert-success note_build_in_behaviour_one" />
-                <!-- Php_setdocument Field. Type: Textarea. (joomla)-->
+                <!-- Note_yes_behaviour_one Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="textarea"
-                       name="php_setdocument"
-                       label="COM_COMPONENTBUILDER_LIBRARY_PHP_SETDOCUMENT_LABEL"
-                       rows="30"
-                       cols="15"
-                       description="COM_COMPONENTBUILDER_LIBRARY_PHP_SETDOCUMENT_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_LIBRARY_PHP_SETDOCUMENT_HINT"
-                       required="true" />
-                <!-- Note_no_behaviour_one Field. Type: Note. A None Database Field. (joomla)-->
                 <field type="note"
-                       name="note_no_behaviour_one"
+                       name="note_yes_behaviour_one"
-                       label="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_ONE_LABEL"
+                       label="COM_COMPONENTBUILDER_LIBRARY_NOTE_YES_BEHAVIOUR_ONE_LABEL"
-                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_ONE_DESCRIPTION"
+                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_YES_BEHAVIOUR_ONE_DESCRIPTION"
                        heading="h4"
-                       class="alert alert-error note_no_behaviour_one" />
+                       class="alert alert-success note_yes_behaviour_one" />
-                <!-- Libraries Field. Type: Librariesx. (custom)-->
-                <field type="librariesx"
-                       name="libraries"
-                       label="COM_COMPONENTBUILDER_LIBRARY_LIBRARIES_LABEL"
-                       description="COM_COMPONENTBUILDER_LIBRARY_LIBRARIES_DESCRIPTION"
-                       class="list_class"
-                       multiple="true"
-                       default="0"
-                       required="false"
-                       button="true" />
-                <!-- Note_build_in_behaviour_three Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_build_in_behaviour_three"
-                       label="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_THREE_LABEL"
-                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_THREE_DESCRIPTION"
-                       heading="h4"
-                       class="alert alert-success note_build_in_behaviour_three" />
-                <!-- Note_library_instruction Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_library_instruction"
-                       label="COM_COMPONENTBUILDER_LIBRARY_NOTE_LIBRARY_INSTRUCTION_LABEL"
-                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_LIBRARY_INSTRUCTION_DESCRIPTION"
-                       heading="h4"
-                       class="alert alert-info note_library_instruction" />
-                <!-- Note_no_behaviour_two Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_no_behaviour_two"
-                       label="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_TWO_LABEL"
-                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_TWO_DESCRIPTION"
-                       heading="h4"
-                       class="alert alert-error note_no_behaviour_two" />
-                <!-- Note_display_library_config Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_display_library_config"
-                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_DISPLAY_LIBRARY_CONFIG_DESCRIPTION"
-                       class="note_display_library_config" />
-                <!-- Note_build_in_behaviour_two Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_build_in_behaviour_two"
-                       label="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_TWO_LABEL"
-                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_TWO_DESCRIPTION"
-                       heading="h4"
-                       class="alert alert-success note_build_in_behaviour_two" />
-                <!-- Not_required Field. Type: Hidden. (joomla)-->
-                <field type="hidden"
-                       name="not_required"
-                       default="[]" />
                 <!-- Note_linked_to_notice Field. Type: Note. A None Database Field. (joomla)-->
                 <field type="note"
                        name="note_linked_to_notice"
@@ -328,6 +321,13 @@
                        description="COM_COMPONENTBUILDER_LIBRARY_NOTE_LINKED_TO_NOTICE_DESCRIPTION"
                        heading="h4"
                        class="note_linked_to_notice" />
+                <!-- Note_library_instruction Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_library_instruction"
+                       label="COM_COMPONENTBUILDER_LIBRARY_NOTE_LIBRARY_INSTRUCTION_LABEL"
+                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_LIBRARY_INSTRUCTION_DESCRIPTION"
+                       heading="h4"
+                       class="alert alert-info note_library_instruction" />
         </fieldset>
 	
 	<!-- Access Control Fields. -->

admin/models/forms/library_files_folders_urls.xml

@@ -89,6 +89,13 @@
                        default="0"
                        required="true"
                        readonly="true" />
+                <!-- Note_constant_paths Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_constant_paths"
+                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_CONSTANT_PATHS_LABEL"
+                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_CONSTANT_PATHS_DESCRIPTION"
+                       heading="h4"
+                       class="alert alert-info note_constant_paths" />
                 <!-- Addfoldersfullpath Field. Type: Subform. (joomla)-->
                 <field type="subform"
                        name="addfoldersfullpath"
@@ -136,48 +143,13 @@
                                        class="inputbox" />
                         </form>
                 </field>
-                <!-- Addurls Field. Type: Subform. (joomla)-->
+                <!-- Note_add_folders_fullpath Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="subform"
+                <field type="note"
-                       name="addurls"
+                       name="note_add_folders_fullpath"
-                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_ADDURLS_LABEL"
+                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_FOLDERS_FULLPATH_LABEL"
-                       layout="joomla.form.field.subform.repeatable-table"
+                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_FOLDERS_FULLPATH_DESCRIPTION"
-                       multiple="true"
+                       heading="h4"
-                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_ADDURLS_DESCRIPTION"
+                       class="alert alert-info note_add_folders_fullpath" />
-                       icon="list"
-                       maximum="500">
-                        <form hidden="true"
-                              name="list_addurls_modal"
-                              repeat="true">
-                                <!-- Url Field. Type: Url. (joomla)-->
-                                <field type="url"
-                                       name="url"
-                                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_URL_LABEL"
-                                       size="150"
-                                       maxlength="250"
-                                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_URL_DESCRIPTION"
-                                       class="text_area"
-                                       required="false"
-                                       filter="url"
-                                       validated="url"
-                                       message="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_URL_MESSAGE"
-                                       hint="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_URL_HINT" />
-                                <!-- Type Field. Type: List. (joomla)-->
-                                <field type="list"
-                                       name="type"
-                                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_TYPE_LABEL"
-                                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_TYPE_DESCRIPTION"
-                                       class="list_class"
-                                       multiple="false"
-                                       filter="INT"
-                                       required="false"
-                                       default="1">
-                                        <!-- Option Set.-->
-                                        <option value="1">COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_DEFAULT_LINK</option>
-                                        <option value="2">COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_LOCAL_GET</option>
-                                        <option value="3">COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_LINK_LOCAL_DYNAMIC</option>
-                                </field>
-                        </form>
-                </field>
                 <!-- Addfilesfullpath Field. Type: Subform. (joomla)-->
                 <field type="subform"
                        name="addfilesfullpath"
@@ -226,20 +198,65 @@
                                        class="inputbox" />
                         </form>
                 </field>
-                <!-- Note_add_files Field. Type: Note. A None Database Field. (joomla)-->
+                <!-- Note_add_files_fullpath Field. Type: Note. A None Database Field. (joomla)-->
                 <field type="note"
-                       name="note_add_files"
+                       name="note_add_files_fullpath"
-                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_FILES_LABEL"
+                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_FILES_FULLPATH_LABEL"
-                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_FILES_DESCRIPTION"
+                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_FILES_FULLPATH_DESCRIPTION"
                        heading="h4"
-                       class="alert alert-info note_add_files" />
+                       class="alert alert-info note_add_files_fullpath" />
-                <!-- Note_add_urls Field. Type: Note. A None Database Field. (joomla)-->
+                <!-- Addfolders Field. Type: Subform. (joomla)-->
+                <field type="subform"
+                       name="addfolders"
+                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_ADDFOLDERS_LABEL"
+                       layout="joomla.form.field.subform.repeatable-table"
+                       multiple="true"
+                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_ADDFOLDERS_DESCRIPTION"
+                       icon="list"
+                       maximum="500">
+                        <form hidden="true"
+                              name="list_addfolders_modal"
+                              repeat="true">
+                                <!-- Folder Field. Type: Customfolderlist. (custom)-->
+                                <field type="customfolderlist"
+                                       name="folder"
+                                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_FOLDER_LABEL"
+                                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_FOLDER_DESCRIPTION"
+                                       class="list_class"
+                                       multiple="false"
+                                       default="0"
+                                       required="false"
+                                       button="false" />
+                                <!-- Path Field. Type: Text. (joomla)-->
+                                <field type="text"
+                                       name="path"
+                                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_LABEL"
+                                       size="40"
+                                       maxlength="150"
+                                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_DESCRIPTION"
+                                       class="text_area"
+                                       readonly="false"
+                                       disabled="false"
+                                       required="false"
+                                       filter="PATH"
+                                       message="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_MESSAGE"
+                                       hint="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_HINT" />
+                                <!-- Rename Field. Type: Checkbox. (joomla)-->
+                                <field type="checkbox"
+                                       name="rename"
+                                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_RENAME_LABEL"
+                                       value="1"
+                                       required="false"
+                                       class="inputbox" />
+                        </form>
+                </field>
+                <!-- Note_add_folders Field. Type: Note. A None Database Field. (joomla)-->
                 <field type="note"
-                       name="note_add_urls"
+                       name="note_add_folders"
-                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_URLS_LABEL"
+                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_FOLDERS_LABEL"
-                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_URLS_DESCRIPTION"
+                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_FOLDERS_DESCRIPTION"
                        heading="h4"
-                       class="alert alert-info note_add_urls" />
+                       class="alert alert-info note_add_folders" />
                 <!-- Addfiles Field. Type: Subform. (joomla)-->
                 <field type="subform"
                        name="addfiles"
@@ -286,79 +303,62 @@
                                        class="inputbox" />
                         </form>
                 </field>
-                <!-- Note_add_files_fullpath Field. Type: Note. A None Database Field. (joomla)-->
+                <!-- Note_add_files Field. Type: Note. A None Database Field. (joomla)-->
                 <field type="note"
-                       name="note_add_files_fullpath"
+                       name="note_add_files"
-                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_FILES_FULLPATH_LABEL"
+                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_FILES_LABEL"
-                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_FILES_FULLPATH_DESCRIPTION"
+                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_FILES_DESCRIPTION"
                        heading="h4"
-                       class="alert alert-info note_add_files_fullpath" />
+                       class="alert alert-info note_add_files" />
-                <!-- Note_add_folders Field. Type: Note. A None Database Field. (joomla)-->
+                <!-- Addurls Field. Type: Subform. (joomla)-->
-                <field type="note"
-                       name="note_add_folders"
-                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_FOLDERS_LABEL"
-                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_FOLDERS_DESCRIPTION"
-                       heading="h4"
-                       class="alert alert-info note_add_folders" />
-                <!-- Note_add_folders_fullpath Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_add_folders_fullpath"
-                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_FOLDERS_FULLPATH_LABEL"
-                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_FOLDERS_FULLPATH_DESCRIPTION"
-                       heading="h4"
-                       class="alert alert-info note_add_folders_fullpath" />
-                <!-- Addfolders Field. Type: Subform. (joomla)-->
                 <field type="subform"
-                       name="addfolders"
+                       name="addurls"
-                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_ADDFOLDERS_LABEL"
+                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_ADDURLS_LABEL"
                        layout="joomla.form.field.subform.repeatable-table"
                        multiple="true"
-                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_ADDFOLDERS_DESCRIPTION"
+                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_ADDURLS_DESCRIPTION"
                        icon="list"
                        maximum="500">
                         <form hidden="true"
-                              name="list_addfolders_modal"
+                              name="list_addurls_modal"
                               repeat="true">
-                                <!-- Folder Field. Type: Customfolderlist. (custom)-->
+                                <!-- Url Field. Type: Url. (joomla)-->
-                                <field type="customfolderlist"
+                                <field type="url"
-                                       name="folder"
+                                       name="url"
-                                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_FOLDER_LABEL"
+                                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_URL_LABEL"
-                                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_FOLDER_DESCRIPTION"
+                                       size="150"
+                                       maxlength="250"
+                                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_URL_DESCRIPTION"
+                                       class="text_area"
+                                       required="false"
+                                       filter="url"
+                                       validated="url"
+                                       message="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_URL_MESSAGE"
+                                       hint="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_URL_HINT" />
+                                <!-- Type Field. Type: List. (joomla)-->
+                                <field type="list"
+                                       name="type"
+                                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_TYPE_LABEL"
+                                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_TYPE_DESCRIPTION"
                                        class="list_class"
                                        multiple="false"
-                                       default="0"
+                                       filter="INT"
                                        required="false"
-                                       button="false" />
+                                       default="1">
-                                <!-- Path Field. Type: Text. (joomla)-->
+                                        <!-- Option Set.-->
-                                <field type="text"
+                                        <option value="1">COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_DEFAULT_LINK</option>
-                                       name="path"
+                                        <option value="2">COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_LOCAL_GET</option>
-                                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_LABEL"
+                                        <option value="3">COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_LINK_LOCAL_DYNAMIC</option>
-                                       size="40"
+                                </field>
-                                       maxlength="150"
-                                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_DESCRIPTION"
-                                       class="text_area"
-                                       readonly="false"
-                                       disabled="false"
-                                       required="false"
-                                       filter="PATH"
-                                       message="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_MESSAGE"
-                                       hint="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_HINT" />
-                                <!-- Rename Field. Type: Checkbox. (joomla)-->
-                                <field type="checkbox"
-                                       name="rename"
-                                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_RENAME_LABEL"
-                                       value="1"
-                                       required="false"
-                                       class="inputbox" />
                         </form>
                 </field>
-                <!-- Note_constant_paths Field. Type: Note. A None Database Field. (joomla)-->
+                <!-- Note_add_urls Field. Type: Note. A None Database Field. (joomla)-->
                 <field type="note"
-                       name="note_constant_paths"
+                       name="note_add_urls"
-                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_CONSTANT_PATHS_LABEL"
+                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_URLS_LABEL"
-                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_CONSTANT_PATHS_DESCRIPTION"
+                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_URLS_DESCRIPTION"
                        heading="h4"
-                       class="alert alert-info note_constant_paths" />
+                       class="alert alert-info note_add_urls" />
         </fieldset>
 	
 	<!-- Access Control Fields. -->

admin/models/forms/server.js

@@ -23,15 +23,15 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
+jform_vvvvwavwad_required = false;
 jform_vvvvwavwae_required = false;
 jform_vvvvwavwaf_required = false;
 jform_vvvvwavwag_required = false;
 jform_vvvvwavwah_required = false;
-jform_vvvvwavwai_required = false;
+jform_vvvvwawwai_required = false;
-jform_vvvvwawwaj_required = false;
+jform_vvvvwaxwaj_required = false;
-jform_vvvvwaxwak_required = false;
+jform_vvvvwazwak_required = false;
-jform_vvvvwazwal_required = false;
+jform_vvvvwbbwal_required = false;
-jform_vvvvwbbwam_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -79,104 +79,104 @@ function vvvvwav(protocol_vvvvwav)
 	if (protocol)
 	{
 		jQuery('#jform_authentication').closest('.control-group').show();
-		if (jform_vvvvwavwae_required)
+		if (jform_vvvvwavwad_required)
 		{
 			updateFieldRequired('authentication',0);
 			jQuery('#jform_authentication').prop('required','required');
 			jQuery('#jform_authentication').attr('aria-required',true);
 			jQuery('#jform_authentication').addClass('required');
-			jform_vvvvwavwae_required = false;
+			jform_vvvvwavwad_required = false;
 		}
 
 		jQuery('#jform_host').closest('.control-group').show();
-		if (jform_vvvvwavwaf_required)
+		if (jform_vvvvwavwae_required)
 		{
 			updateFieldRequired('host',0);
 			jQuery('#jform_host').prop('required','required');
 			jQuery('#jform_host').attr('aria-required',true);
 			jQuery('#jform_host').addClass('required');
-			jform_vvvvwavwaf_required = false;
+			jform_vvvvwavwae_required = false;
 		}
 
 		jQuery('#jform_port').closest('.control-group').show();
-		if (jform_vvvvwavwag_required)
+		if (jform_vvvvwavwaf_required)
 		{
 			updateFieldRequired('port',0);
 			jQuery('#jform_port').prop('required','required');
 			jQuery('#jform_port').attr('aria-required',true);
 			jQuery('#jform_port').addClass('required');
-			jform_vvvvwavwag_required = false;
+			jform_vvvvwavwaf_required = false;
 		}
 
 		jQuery('#jform_path').closest('.control-group').show();
-		if (jform_vvvvwavwah_required)
+		if (jform_vvvvwavwag_required)
 		{
 			updateFieldRequired('path',0);
 			jQuery('#jform_path').prop('required','required');
 			jQuery('#jform_path').attr('aria-required',true);
 			jQuery('#jform_path').addClass('required');
-			jform_vvvvwavwah_required = false;
+			jform_vvvvwavwag_required = false;
 		}
 
 		jQuery('.note_ssh_security').closest('.control-group').show();
 		jQuery('#jform_username').closest('.control-group').show();
-		if (jform_vvvvwavwai_required)
+		if (jform_vvvvwavwah_required)
 		{
 			updateFieldRequired('username',0);
 			jQuery('#jform_username').prop('required','required');
 			jQuery('#jform_username').attr('aria-required',true);
 			jQuery('#jform_username').addClass('required');
-			jform_vvvvwavwai_required = false;
+			jform_vvvvwavwah_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_authentication').closest('.control-group').hide();
-		if (!jform_vvvvwavwae_required)
+		if (!jform_vvvvwavwad_required)
 		{
 			updateFieldRequired('authentication',1);
 			jQuery('#jform_authentication').removeAttr('required');
 			jQuery('#jform_authentication').removeAttr('aria-required');
 			jQuery('#jform_authentication').removeClass('required');
-			jform_vvvvwavwae_required = true;
+			jform_vvvvwavwad_required = true;
 		}
 		jQuery('#jform_host').closest('.control-group').hide();
-		if (!jform_vvvvwavwaf_required)
+		if (!jform_vvvvwavwae_required)
 		{
 			updateFieldRequired('host',1);
 			jQuery('#jform_host').removeAttr('required');
 			jQuery('#jform_host').removeAttr('aria-required');
 			jQuery('#jform_host').removeClass('required');
-			jform_vvvvwavwaf_required = true;
+			jform_vvvvwavwae_required = true;
 		}
 		jQuery('#jform_port').closest('.control-group').hide();
-		if (!jform_vvvvwavwag_required)
+		if (!jform_vvvvwavwaf_required)
 		{
 			updateFieldRequired('port',1);
 			jQuery('#jform_port').removeAttr('required');
 			jQuery('#jform_port').removeAttr('aria-required');
 			jQuery('#jform_port').removeClass('required');
-			jform_vvvvwavwag_required = true;
+			jform_vvvvwavwaf_required = true;
 		}
 		jQuery('#jform_path').closest('.control-group').hide();
-		if (!jform_vvvvwavwah_required)
+		if (!jform_vvvvwavwag_required)
 		{
 			updateFieldRequired('path',1);
 			jQuery('#jform_path').removeAttr('required');
 			jQuery('#jform_path').removeAttr('aria-required');
 			jQuery('#jform_path').removeClass('required');
-			jform_vvvvwavwah_required = true;
+			jform_vvvvwavwag_required = true;
 		}
 		jQuery('.note_ssh_security').closest('.control-group').hide();
 		jQuery('#jform_username').closest('.control-group').hide();
-		if (!jform_vvvvwavwai_required)
+		if (!jform_vvvvwavwah_required)
 		{
 			updateFieldRequired('username',1);
 			jQuery('#jform_username').removeAttr('required');
 			jQuery('#jform_username').removeAttr('aria-required');
 			jQuery('#jform_username').removeClass('required');
-			jform_vvvvwavwai_required = true;
+			jform_vvvvwavwah_required = true;
 		}
 	}
 }
@@ -213,13 +213,13 @@ function vvvvwaw(protocol_vvvvwaw)
 	{
 		jQuery('.note_ftp_signature').closest('.control-group').show();
 		jQuery('#jform_signature').closest('.control-group').show();
-		if (jform_vvvvwawwaj_required)
+		if (jform_vvvvwawwai_required)
 		{
 			updateFieldRequired('signature',0);
 			jQuery('#jform_signature').prop('required','required');
 			jQuery('#jform_signature').attr('aria-required',true);
 			jQuery('#jform_signature').addClass('required');
-			jform_vvvvwawwaj_required = false;
+			jform_vvvvwawwai_required = false;
 		}
 
 	}
@@ -227,13 +227,13 @@ function vvvvwaw(protocol_vvvvwaw)
 	{
 		jQuery('.note_ftp_signature').closest('.control-group').hide();
 		jQuery('#jform_signature').closest('.control-group').hide();
-		if (!jform_vvvvwawwaj_required)
+		if (!jform_vvvvwawwai_required)
 		{
 			updateFieldRequired('signature',1);
 			jQuery('#jform_signature').removeAttr('required');
 			jQuery('#jform_signature').removeAttr('aria-required');
 			jQuery('#jform_signature').removeClass('required');
-			jform_vvvvwawwaj_required = true;
+			jform_vvvvwawwai_required = true;
 		}
 	}
 }
@@ -281,26 +281,26 @@ function vvvvwax(protocol_vvvvwax,authentication_vvvvwax)
 	if (protocol && authentication)
 	{
 		jQuery('#jform_password').closest('.control-group').show();
-		if (jform_vvvvwaxwak_required)
+		if (jform_vvvvwaxwaj_required)
 		{
 			updateFieldRequired('password',0);
 			jQuery('#jform_password').prop('required','required');
 			jQuery('#jform_password').attr('aria-required',true);
 			jQuery('#jform_password').addClass('required');
-			jform_vvvvwaxwak_required = false;
+			jform_vvvvwaxwaj_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_password').closest('.control-group').hide();
-		if (!jform_vvvvwaxwak_required)
+		if (!jform_vvvvwaxwaj_required)
 		{
 			updateFieldRequired('password',1);
 			jQuery('#jform_password').removeAttr('required');
 			jQuery('#jform_password').removeAttr('aria-required');
 			jQuery('#jform_password').removeClass('required');
-			jform_vvvvwaxwak_required = true;
+			jform_vvvvwaxwaj_required = true;
 		}
 	}
 }
@@ -359,26 +359,26 @@ function vvvvwaz(protocol_vvvvwaz,authentication_vvvvwaz)
 	if (protocol && authentication)
 	{
 		jQuery('#jform_private').closest('.control-group').show();
-		if (jform_vvvvwazwal_required)
+		if (jform_vvvvwazwak_required)
 		{
 			updateFieldRequired('private',0);
 			jQuery('#jform_private').prop('required','required');
 			jQuery('#jform_private').attr('aria-required',true);
 			jQuery('#jform_private').addClass('required');
-			jform_vvvvwazwal_required = false;
+			jform_vvvvwazwak_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_private').closest('.control-group').hide();
-		if (!jform_vvvvwazwal_required)
+		if (!jform_vvvvwazwak_required)
 		{
 			updateFieldRequired('private',1);
 			jQuery('#jform_private').removeAttr('required');
 			jQuery('#jform_private').removeAttr('aria-required');
 			jQuery('#jform_private').removeClass('required');
-			jform_vvvvwazwal_required = true;
+			jform_vvvvwazwak_required = true;
 		}
 	}
 }
@@ -437,26 +437,26 @@ function vvvvwbb(protocol_vvvvwbb,authentication_vvvvwbb)
 	if (protocol && authentication)
 	{
 		jQuery('#jform_private_key').closest('.control-group').show();
-		if (jform_vvvvwbbwam_required)
+		if (jform_vvvvwbbwal_required)
 		{
 			updateFieldRequired('private_key',0);
 			jQuery('#jform_private_key').prop('required','required');
 			jQuery('#jform_private_key').attr('aria-required',true);
 			jQuery('#jform_private_key').addClass('required');
-			jform_vvvvwbbwam_required = false;
+			jform_vvvvwbbwal_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_private_key').closest('.control-group').hide();
-		if (!jform_vvvvwbbwam_required)
+		if (!jform_vvvvwbbwal_required)
 		{
 			updateFieldRequired('private_key',1);
 			jQuery('#jform_private_key').removeAttr('required');
 			jQuery('#jform_private_key').removeAttr('aria-required');
 			jQuery('#jform_private_key').removeClass('required');
-			jform_vvvvwbbwam_required = true;
+			jform_vvvvwbbwal_required = true;
 		}
 	}
 }

admin/models/forms/server.xml

@@ -107,6 +107,17 @@
                         <option value="1">COM_COMPONENTBUILDER_SERVER_FTP</option>
                         <option value="2">COM_COMPONENTBUILDER_SERVER_SFTP</option>
                 </field>
+                <!-- Note_ssh_security Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_ssh_security"
+                       label="COM_COMPONENTBUILDER_SERVER_NOTE_SSH_SECURITY_LABEL"
+                       description="COM_COMPONENTBUILDER_SERVER_NOTE_SSH_SECURITY_DESCRIPTION"
+                       heading="h4"
+                       class="alert alert-info note_ssh_security" />
+                <!-- Not_required Field. Type: Hidden. (joomla)-->
+                <field type="hidden"
+                       name="not_required"
+                       default="[]" />
                 <!-- Note_ftp_signature Field. Type: Note. A None Database Field. (joomla)-->
                 <field type="note"
                        name="note_ftp_signature"
@@ -114,6 +125,79 @@
                        description="COM_COMPONENTBUILDER_SERVER_NOTE_FTP_SIGNATURE_DESCRIPTION"
                        heading="h4"
                        class="alert alert-success note_ftp_signature" />
+                <!-- Signature Field. Type: Text. (joomla)-->
+                <field type="text"
+                       name="signature"
+                       label="COM_COMPONENTBUILDER_SERVER_SIGNATURE_LABEL"
+                       size="250"
+                       maxlength="250"
+                       description="COM_COMPONENTBUILDER_SERVER_SIGNATURE_DESCRIPTION"
+                       class="text_area span12"
+                       required="true"
+                       filter="STRING"
+                       message="COM_COMPONENTBUILDER_SERVER_SIGNATURE_MESSAGE"
+                       hint="COM_COMPONENTBUILDER_SERVER_SIGNATURE_HINT"
+                       autocomplete="off" />
+                <!-- Private_key Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="private_key"
+                       label="COM_COMPONENTBUILDER_SERVER_PRIVATE_KEY_LABEL"
+                       rows="15"
+                       cols="5"
+                       description="COM_COMPONENTBUILDER_SERVER_PRIVATE_KEY_DESCRIPTION"
+                       class="input-xxlarge span12"
+                       hint="COM_COMPONENTBUILDER_SERVER_PRIVATE_KEY_HINT"
+                       required="true" />
+                <!-- Secret Field. Type: Password. (joomla)-->
+                <field type="password"
+                       name="secret"
+                       label="COM_COMPONENTBUILDER_SERVER_SECRET_LABEL"
+                       size="60"
+                       description="COM_COMPONENTBUILDER_SERVER_SECRET_DESCRIPTION"
+                       message="Error! Please add the passphrase here."
+                       class="text_area"
+                       filter="raw" />
+                <!-- Password Field. Type: Password. (joomla)-->
+                <field type="password"
+                       name="password"
+                       label="COM_COMPONENTBUILDER_SERVER_PASSWORD_LABEL"
+                       size="60"
+                       description="COM_COMPONENTBUILDER_SERVER_PASSWORD_DESCRIPTION"
+                       message="Error! Please add the password here."
+                       class="text_area"
+                       required="true"
+                       filter="raw" />
+                <!-- Private Field. Type: Text. (joomla)-->
+                <field type="text"
+                       name="private"
+                       label="COM_COMPONENTBUILDER_SERVER_PRIVATE_LABEL"
+                       size="50"
+                       maxlength="150"
+                       description="COM_COMPONENTBUILDER_SERVER_PRIVATE_DESCRIPTION"
+                       class="text_area"
+                       readonly="false"
+                       disabled="false"
+                       required="true"
+                       filter="PATH"
+                       message="COM_COMPONENTBUILDER_SERVER_PRIVATE_MESSAGE"
+                       hint="COM_COMPONENTBUILDER_SERVER_PRIVATE_HINT" />
+                <!-- Authentication Field. Type: List. (joomla)-->
+                <field type="list"
+                       name="authentication"
+                       label="COM_COMPONENTBUILDER_SERVER_AUTHENTICATION_LABEL"
+                       description="COM_COMPONENTBUILDER_SERVER_AUTHENTICATION_DESCRIPTION"
+                       class="list_class"
+                       multiple="false"
+                       filter="INT"
+                       required="true">
+                        <!-- Option Set.-->
+                        <option value="">COM_COMPONENTBUILDER_SERVER_SELECT_AN_OPTION</option>
+                        <option value="1">COM_COMPONENTBUILDER_SERVER_PASSWORD</option>
+                        <option value="2">COM_COMPONENTBUILDER_SERVER_PRIVATE_KEY_FILE_PATH</option>
+                        <option value="3">COM_COMPONENTBUILDER_SERVER_BOTH_PASSWORD_PRIVATE_KEY_FILE_PATH</option>
+                        <option value="4">COM_COMPONENTBUILDER_SERVER_PRIVATE_KEY_TEXT_FIELD</option>
+                        <option value="5">COM_COMPONENTBUILDER_SERVER_BOTH_PASSWORD_PRIVATE_KEY_TEXT_FIELD</option>
+                </field>
                 <!-- Path Field. Type: Text. (joomla)-->
                 <field type="text"
                        name="path"
@@ -142,49 +226,6 @@
                        message="COM_COMPONENTBUILDER_SERVER_PORT_MESSAGE"
                        hint="COM_COMPONENTBUILDER_SERVER_PORT_HINT"
                        onchange="if(!jQuery(this).val().match(/^\d+$/)){jQuery(this).val('')};" />
-                <!-- Authentication Field. Type: List. (joomla)-->
-                <field type="list"
-                       name="authentication"
-                       label="COM_COMPONENTBUILDER_SERVER_AUTHENTICATION_LABEL"
-                       description="COM_COMPONENTBUILDER_SERVER_AUTHENTICATION_DESCRIPTION"
-                       class="list_class"
-                       multiple="false"
-                       filter="INT"
-                       required="true">
-                        <!-- Option Set.-->
-                        <option value="">COM_COMPONENTBUILDER_SERVER_SELECT_AN_OPTION</option>
-                        <option value="1">COM_COMPONENTBUILDER_SERVER_PASSWORD</option>
-                        <option value="2">COM_COMPONENTBUILDER_SERVER_PRIVATE_KEY_FILE_PATH</option>
-                        <option value="3">COM_COMPONENTBUILDER_SERVER_BOTH_PASSWORD_PRIVATE_KEY_FILE_PATH</option>
-                        <option value="4">COM_COMPONENTBUILDER_SERVER_PRIVATE_KEY_TEXT_FIELD</option>
-                        <option value="5">COM_COMPONENTBUILDER_SERVER_BOTH_PASSWORD_PRIVATE_KEY_TEXT_FIELD</option>
-                </field>
-                <!-- Note_ssh_security Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_ssh_security"
-                       label="COM_COMPONENTBUILDER_SERVER_NOTE_SSH_SECURITY_LABEL"
-                       description="COM_COMPONENTBUILDER_SERVER_NOTE_SSH_SECURITY_DESCRIPTION"
-                       heading="h4"
-                       class="alert alert-info note_ssh_security" />
-                <!-- Password Field. Type: Password. (joomla)-->
-                <field type="password"
-                       name="password"
-                       label="COM_COMPONENTBUILDER_SERVER_PASSWORD_LABEL"
-                       size="60"
-                       description="COM_COMPONENTBUILDER_SERVER_PASSWORD_DESCRIPTION"
-                       message="Error! Please add the password here."
-                       class="text_area"
-                       required="true"
-                       filter="raw" />
-                <!-- Secret Field. Type: Password. (joomla)-->
-                <field type="password"
-                       name="secret"
-                       label="COM_COMPONENTBUILDER_SERVER_SECRET_LABEL"
-                       size="60"
-                       description="COM_COMPONENTBUILDER_SERVER_SECRET_DESCRIPTION"
-                       message="Error! Please add the passphrase here."
-                       class="text_area"
-                       filter="raw" />
                 <!-- Host Field. Type: Text. (joomla)-->
                 <field type="text"
                        name="host"
@@ -197,19 +238,6 @@
                        filter="STRING"
                        message="COM_COMPONENTBUILDER_SERVER_HOST_MESSAGE"
                        hint="COM_COMPONENTBUILDER_SERVER_HOST_HINT" />
-                <!-- Signature Field. Type: Text. (joomla)-->
-                <field type="text"
-                       name="signature"
-                       label="COM_COMPONENTBUILDER_SERVER_SIGNATURE_LABEL"
-                       size="250"
-                       maxlength="250"
-                       description="COM_COMPONENTBUILDER_SERVER_SIGNATURE_DESCRIPTION"
-                       class="text_area span12"
-                       required="true"
-                       filter="STRING"
-                       message="COM_COMPONENTBUILDER_SERVER_SIGNATURE_MESSAGE"
-                       hint="COM_COMPONENTBUILDER_SERVER_SIGNATURE_HINT"
-                       autocomplete="off" />
                 <!-- Username Field. Type: Text. (joomla)-->
                 <field type="text"
                        name="username"
@@ -222,34 +250,6 @@
                        filter="STRING"
                        message="COM_COMPONENTBUILDER_SERVER_USERNAME_MESSAGE"
                        hint="COM_COMPONENTBUILDER_SERVER_USERNAME_HINT" />
-                <!-- Not_required Field. Type: Hidden. (joomla)-->
-                <field type="hidden"
-                       name="not_required"
-                       default="[]" />
-                <!-- Private Field. Type: Text. (joomla)-->
-                <field type="text"
-                       name="private"
-                       label="COM_COMPONENTBUILDER_SERVER_PRIVATE_LABEL"
-                       size="50"
-                       maxlength="150"
-                       description="COM_COMPONENTBUILDER_SERVER_PRIVATE_DESCRIPTION"
-                       class="text_area"
-                       readonly="false"
-                       disabled="false"
-                       required="true"
-                       filter="PATH"
-                       message="COM_COMPONENTBUILDER_SERVER_PRIVATE_MESSAGE"
-                       hint="COM_COMPONENTBUILDER_SERVER_PRIVATE_HINT" />
-                <!-- Private_key Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="private_key"
-                       label="COM_COMPONENTBUILDER_SERVER_PRIVATE_KEY_LABEL"
-                       rows="15"
-                       cols="5"
-                       description="COM_COMPONENTBUILDER_SERVER_PRIVATE_KEY_DESCRIPTION"
-                       class="input-xxlarge span12"
-                       hint="COM_COMPONENTBUILDER_SERVER_PRIVATE_KEY_HINT"
-                       required="true" />
         </fieldset>
 	
 	<!-- Access Control Fields. -->

admin/models/forms/site_view.js

@@ -23,17 +23,17 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvvynvyi_required = false;
+jform_vvvvvynvyh_required = false;
-jform_vvvvvyovyj_required = false;
+jform_vvvvvyovyi_required = false;
-jform_vvvvvypvyk_required = false;
+jform_vvvvvypvyj_required = false;
-jform_vvvvvyqvyl_required = false;
+jform_vvvvvyqvyk_required = false;
-jform_vvvvvyrvym_required = false;
+jform_vvvvvyrvyl_required = false;
-jform_vvvvvysvyn_required = false;
+jform_vvvvvysvym_required = false;
-jform_vvvvvytvyo_required = false;
+jform_vvvvvytvyn_required = false;
-jform_vvvvvyuvyp_required = false;
+jform_vvvvvyuvyo_required = false;
-jform_vvvvvyvvyq_required = false;
+jform_vvvvvyvvyp_required = false;
+jform_vvvvvywvyq_required = false;
 jform_vvvvvywvyr_required = false;
-jform_vvvvvywvys_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -79,26 +79,26 @@ function vvvvvyn(add_php_view_vvvvvyn)
 	if (add_php_view_vvvvvyn == 1)
 	{
 		jQuery('#jform_php_view').closest('.control-group').show();
-		if (jform_vvvvvynvyi_required)
+		if (jform_vvvvvynvyh_required)
 		{
 			updateFieldRequired('php_view',0);
 			jQuery('#jform_php_view').prop('required','required');
 			jQuery('#jform_php_view').attr('aria-required',true);
 			jQuery('#jform_php_view').addClass('required');
-			jform_vvvvvynvyi_required = false;
+			jform_vvvvvynvyh_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_view').closest('.control-group').hide();
-		if (!jform_vvvvvynvyi_required)
+		if (!jform_vvvvvynvyh_required)
 		{
 			updateFieldRequired('php_view',1);
 			jQuery('#jform_php_view').removeAttr('required');
 			jQuery('#jform_php_view').removeAttr('aria-required');
 			jQuery('#jform_php_view').removeClass('required');
-			jform_vvvvvynvyi_required = true;
+			jform_vvvvvynvyh_required = true;
 		}
 	}
 }
@@ -110,26 +110,26 @@ function vvvvvyo(add_php_jview_display_vvvvvyo)
 	if (add_php_jview_display_vvvvvyo == 1)
 	{
 		jQuery('#jform_php_jview_display').closest('.control-group').show();
-		if (jform_vvvvvyovyj_required)
+		if (jform_vvvvvyovyi_required)
 		{
 			updateFieldRequired('php_jview_display',0);
 			jQuery('#jform_php_jview_display').prop('required','required');
 			jQuery('#jform_php_jview_display').attr('aria-required',true);
 			jQuery('#jform_php_jview_display').addClass('required');
-			jform_vvvvvyovyj_required = false;
+			jform_vvvvvyovyi_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_jview_display').closest('.control-group').hide();
-		if (!jform_vvvvvyovyj_required)
+		if (!jform_vvvvvyovyi_required)
 		{
 			updateFieldRequired('php_jview_display',1);
 			jQuery('#jform_php_jview_display').removeAttr('required');
 			jQuery('#jform_php_jview_display').removeAttr('aria-required');
 			jQuery('#jform_php_jview_display').removeClass('required');
-			jform_vvvvvyovyj_required = true;
+			jform_vvvvvyovyi_required = true;
 		}
 	}
 }
@@ -141,26 +141,26 @@ function vvvvvyp(add_php_jview_vvvvvyp)
 	if (add_php_jview_vvvvvyp == 1)
 	{
 		jQuery('#jform_php_jview').closest('.control-group').show();
-		if (jform_vvvvvypvyk_required)
+		if (jform_vvvvvypvyj_required)
 		{
 			updateFieldRequired('php_jview',0);
 			jQuery('#jform_php_jview').prop('required','required');
 			jQuery('#jform_php_jview').attr('aria-required',true);
 			jQuery('#jform_php_jview').addClass('required');
-			jform_vvvvvypvyk_required = false;
+			jform_vvvvvypvyj_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_jview').closest('.control-group').hide();
-		if (!jform_vvvvvypvyk_required)
+		if (!jform_vvvvvypvyj_required)
 		{
 			updateFieldRequired('php_jview',1);
 			jQuery('#jform_php_jview').removeAttr('required');
 			jQuery('#jform_php_jview').removeAttr('aria-required');
 			jQuery('#jform_php_jview').removeClass('required');
-			jform_vvvvvypvyk_required = true;
+			jform_vvvvvypvyj_required = true;
 		}
 	}
 }
@@ -172,26 +172,26 @@ function vvvvvyq(add_php_document_vvvvvyq)
 	if (add_php_document_vvvvvyq == 1)
 	{
 		jQuery('#jform_php_document').closest('.control-group').show();
-		if (jform_vvvvvyqvyl_required)
+		if (jform_vvvvvyqvyk_required)
 		{
 			updateFieldRequired('php_document',0);
 			jQuery('#jform_php_document').prop('required','required');
 			jQuery('#jform_php_document').attr('aria-required',true);
 			jQuery('#jform_php_document').addClass('required');
-			jform_vvvvvyqvyl_required = false;
+			jform_vvvvvyqvyk_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_document').closest('.control-group').hide();
-		if (!jform_vvvvvyqvyl_required)
+		if (!jform_vvvvvyqvyk_required)
 		{
 			updateFieldRequired('php_document',1);
 			jQuery('#jform_php_document').removeAttr('required');
 			jQuery('#jform_php_document').removeAttr('aria-required');
 			jQuery('#jform_php_document').removeClass('required');
-			jform_vvvvvyqvyl_required = true;
+			jform_vvvvvyqvyk_required = true;
 		}
 	}
 }
@@ -203,26 +203,26 @@ function vvvvvyr(add_css_document_vvvvvyr)
 	if (add_css_document_vvvvvyr == 1)
 	{
 		jQuery('#jform_css_document').closest('.control-group').show();
-		if (jform_vvvvvyrvym_required)
+		if (jform_vvvvvyrvyl_required)
 		{
 			updateFieldRequired('css_document',0);
 			jQuery('#jform_css_document').prop('required','required');
 			jQuery('#jform_css_document').attr('aria-required',true);
 			jQuery('#jform_css_document').addClass('required');
-			jform_vvvvvyrvym_required = false;
+			jform_vvvvvyrvyl_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_css_document').closest('.control-group').hide();
-		if (!jform_vvvvvyrvym_required)
+		if (!jform_vvvvvyrvyl_required)
 		{
 			updateFieldRequired('css_document',1);
 			jQuery('#jform_css_document').removeAttr('required');
 			jQuery('#jform_css_document').removeAttr('aria-required');
 			jQuery('#jform_css_document').removeClass('required');
-			jform_vvvvvyrvym_required = true;
+			jform_vvvvvyrvyl_required = true;
 		}
 	}
 }
@@ -234,26 +234,26 @@ function vvvvvys(add_javascript_file_vvvvvys)
 	if (add_javascript_file_vvvvvys == 1)
 	{
 		jQuery('#jform_javascript_file').closest('.control-group').show();
-		if (jform_vvvvvysvyn_required)
+		if (jform_vvvvvysvym_required)
 		{
 			updateFieldRequired('javascript_file',0);
 			jQuery('#jform_javascript_file').prop('required','required');
 			jQuery('#jform_javascript_file').attr('aria-required',true);
 			jQuery('#jform_javascript_file').addClass('required');
-			jform_vvvvvysvyn_required = false;
+			jform_vvvvvysvym_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_javascript_file').closest('.control-group').hide();
-		if (!jform_vvvvvysvyn_required)
+		if (!jform_vvvvvysvym_required)
 		{
 			updateFieldRequired('javascript_file',1);
 			jQuery('#jform_javascript_file').removeAttr('required');
 			jQuery('#jform_javascript_file').removeAttr('aria-required');
 			jQuery('#jform_javascript_file').removeClass('required');
-			jform_vvvvvysvyn_required = true;
+			jform_vvvvvysvym_required = true;
 		}
 	}
 }
@@ -265,26 +265,26 @@ function vvvvvyt(add_js_document_vvvvvyt)
 	if (add_js_document_vvvvvyt == 1)
 	{
 		jQuery('#jform_js_document').closest('.control-group').show();
-		if (jform_vvvvvytvyo_required)
+		if (jform_vvvvvytvyn_required)
 		{
 			updateFieldRequired('js_document',0);
 			jQuery('#jform_js_document').prop('required','required');
 			jQuery('#jform_js_document').attr('aria-required',true);
 			jQuery('#jform_js_document').addClass('required');
-			jform_vvvvvytvyo_required = false;
+			jform_vvvvvytvyn_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_js_document').closest('.control-group').hide();
-		if (!jform_vvvvvytvyo_required)
+		if (!jform_vvvvvytvyn_required)
 		{
 			updateFieldRequired('js_document',1);
 			jQuery('#jform_js_document').removeAttr('required');
 			jQuery('#jform_js_document').removeAttr('aria-required');
 			jQuery('#jform_js_document').removeClass('required');
-			jform_vvvvvytvyo_required = true;
+			jform_vvvvvytvyn_required = true;
 		}
 	}
 }
@@ -296,26 +296,26 @@ function vvvvvyu(add_css_vvvvvyu)
 	if (add_css_vvvvvyu == 1)
 	{
 		jQuery('#jform_css').closest('.control-group').show();
-		if (jform_vvvvvyuvyp_required)
+		if (jform_vvvvvyuvyo_required)
 		{
 			updateFieldRequired('css',0);
 			jQuery('#jform_css').prop('required','required');
 			jQuery('#jform_css').attr('aria-required',true);
 			jQuery('#jform_css').addClass('required');
-			jform_vvvvvyuvyp_required = false;
+			jform_vvvvvyuvyo_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_css').closest('.control-group').hide();
-		if (!jform_vvvvvyuvyp_required)
+		if (!jform_vvvvvyuvyo_required)
 		{
 			updateFieldRequired('css',1);
 			jQuery('#jform_css').removeAttr('required');
 			jQuery('#jform_css').removeAttr('aria-required');
 			jQuery('#jform_css').removeClass('required');
-			jform_vvvvvyuvyp_required = true;
+			jform_vvvvvyuvyo_required = true;
 		}
 	}
 }
@@ -328,13 +328,13 @@ function vvvvvyv(add_php_ajax_vvvvvyv)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').show();
 		jQuery('#jform_php_ajaxmethod').closest('.control-group').show();
-		if (jform_vvvvvyvvyq_required)
+		if (jform_vvvvvyvvyp_required)
 		{
 			updateFieldRequired('php_ajaxmethod',0);
 			jQuery('#jform_php_ajaxmethod').prop('required','required');
 			jQuery('#jform_php_ajaxmethod').attr('aria-required',true);
 			jQuery('#jform_php_ajaxmethod').addClass('required');
-			jform_vvvvvyvvyq_required = false;
+			jform_vvvvvyvvyp_required = false;
 		}
 
 	}
@@ -342,13 +342,13 @@ function vvvvvyv(add_php_ajax_vvvvvyv)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_ajaxmethod').closest('.control-group').hide();
-		if (!jform_vvvvvyvvyq_required)
+		if (!jform_vvvvvyvvyp_required)
 		{
 			updateFieldRequired('php_ajaxmethod',1);
 			jQuery('#jform_php_ajaxmethod').removeAttr('required');
 			jQuery('#jform_php_ajaxmethod').removeAttr('aria-required');
 			jQuery('#jform_php_ajaxmethod').removeClass('required');
-			jform_vvvvvyvvyq_required = true;
+			jform_vvvvvyvvyp_required = true;
 		}
 	}
 }
@@ -361,23 +361,23 @@ function vvvvvyw(add_custom_button_vvvvvyw)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').show();
 		jQuery('#jform_php_controller').closest('.control-group').show();
-		if (jform_vvvvvywvyr_required)
+		if (jform_vvvvvywvyq_required)
 		{
 			updateFieldRequired('php_controller',0);
 			jQuery('#jform_php_controller').prop('required','required');
 			jQuery('#jform_php_controller').attr('aria-required',true);
 			jQuery('#jform_php_controller').addClass('required');
-			jform_vvvvvywvyr_required = false;
+			jform_vvvvvywvyq_required = false;
 		}
 
 		jQuery('#jform_php_model').closest('.control-group').show();
-		if (jform_vvvvvywvys_required)
+		if (jform_vvvvvywvyr_required)
 		{
 			updateFieldRequired('php_model',0);
 			jQuery('#jform_php_model').prop('required','required');
 			jQuery('#jform_php_model').attr('aria-required',true);
 			jQuery('#jform_php_model').addClass('required');
-			jform_vvvvvywvys_required = false;
+			jform_vvvvvywvyr_required = false;
 		}
 
 	}
@@ -385,22 +385,22 @@ function vvvvvyw(add_custom_button_vvvvvyw)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_controller').closest('.control-group').hide();
-		if (!jform_vvvvvywvyr_required)
+		if (!jform_vvvvvywvyq_required)
 		{
 			updateFieldRequired('php_controller',1);
 			jQuery('#jform_php_controller').removeAttr('required');
 			jQuery('#jform_php_controller').removeAttr('aria-required');
 			jQuery('#jform_php_controller').removeClass('required');
-			jform_vvvvvywvyr_required = true;
+			jform_vvvvvywvyq_required = true;
 		}
 		jQuery('#jform_php_model').closest('.control-group').hide();
-		if (!jform_vvvvvywvys_required)
+		if (!jform_vvvvvywvyr_required)
 		{
 			updateFieldRequired('php_model',1);
 			jQuery('#jform_php_model').removeAttr('required');
 			jQuery('#jform_php_model').removeAttr('aria-required');
 			jQuery('#jform_php_model').removeClass('required');
-			jform_vvvvvywvys_required = true;
+			jform_vvvvvywvyr_required = true;
 		}
 	}
 }

admin/models/forms/site_view.xml

@@ -138,56 +138,6 @@
                        multiple="false"
                        required="false"
                        button="true" />
-                <!-- Note_add_language_string Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_add_language_string"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_ADD_LANGUAGE_STRING_LABEL"
-                       description="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_ADD_LANGUAGE_STRING_DESCRIPTION"
-                       heading="h4"
-                       class="note_add_language_string" />
-                <!-- Add_css_document Field. Type: Radio. (joomla)-->
-                <field type="radio"
-                       name="add_css_document"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_CSS_DOCUMENT_LABEL"
-                       class="btn-group btn-group-yesno"
-                       default="0"
-                       required="true">
-                        <!-- Option Set.-->
-                        <option value="1">COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
-                        <option value="0">COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
-                </field>
-                <!-- Libraries Field. Type: Libraries. (custom)-->
-                <field type="libraries"
-                       name="libraries"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_LIBRARIES_LABEL"
-                       description="COM_COMPONENTBUILDER_SITE_VIEW_LIBRARIES_DESCRIPTION"
-                       class="list_class"
-                       multiple="true"
-                       default="0"
-                       required="false"
-                       button="true" />
-                <!-- Add_php_ajax Field. Type: Radio. (joomla)-->
-                <field type="radio"
-                       name="add_php_ajax"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_PHP_AJAX_LABEL"
-                       class="btn-group btn-group-yesno"
-                       default="0"
-                       required="true">
-                        <!-- Option Set.-->
-                        <option value="1">COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
-                        <option value="0">COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
-                </field>
-                <!-- Php_jview_display Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="php_jview_display"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_DISPLAY_LABEL"
-                       rows="17"
-                       cols="5"
-                       description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_DISPLAY_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_DISPLAY_HINT"
-                       required="true" />
                 <!-- Php_document Field. Type: Textarea. (joomla)-->
                 <field type="textarea"
                        name="php_document"
@@ -199,36 +149,6 @@
                        filter="raw"
                        hint="COM_COMPONENTBUILDER_SITE_VIEW_PHP_DOCUMENT_HINT"
                        required="true" />
-                <!-- Note_libraries_selection Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_libraries_selection"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_LIBRARIES_SELECTION_LABEL"
-                       description="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_LIBRARIES_SELECTION_DESCRIPTION"
-                       heading="h4"
-                       class="alert alert-info note_libraries_selection" />
-                <!-- Note_uikit_snippet Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_uikit_snippet"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_UIKIT_SNIPPET_LABEL"
-                       heading="h4"
-                       class="snippet-code note_uikit_snippet" />
-                <!-- Add_css Field. Type: Radio. (joomla)-->
-                <field type="radio"
-                       name="add_css"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_CSS_LABEL"
-                       class="btn-group btn-group-yesno"
-                       default="0"
-                       required="true">
-                        <!-- Option Set.-->
-                        <option value="1">COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
-                        <option value="0">COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
-                </field>
-                <!-- Note_snippet_usage Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_snippet_usage"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_SNIPPET_USAGE_LABEL"
-                       heading="h4"
-                       class="snippet-usage note_snippet_usage" />
                 <!-- Ajax_input Field. Type: Subform. (joomla)-->
                 <field type="subform"
                        name="ajax_input"
@@ -336,6 +256,60 @@
                                        class="inputbox" />
                         </form>
                 </field>
+                <!-- Add_php_ajax Field. Type: Radio. (joomla)-->
+                <field type="radio"
+                       name="add_php_ajax"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_PHP_AJAX_LABEL"
+                       class="btn-group btn-group-yesno"
+                       default="0"
+                       required="true">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
+                        <option value="0">COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
+                </field>
+                <!-- Add_css Field. Type: Radio. (joomla)-->
+                <field type="radio"
+                       name="add_css"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_CSS_LABEL"
+                       class="btn-group btn-group-yesno"
+                       default="0"
+                       required="true">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
+                        <option value="0">COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
+                </field>
+                <!-- Add_css_document Field. Type: Radio. (joomla)-->
+                <field type="radio"
+                       name="add_css_document"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_CSS_DOCUMENT_LABEL"
+                       class="btn-group btn-group-yesno"
+                       default="0"
+                       required="true">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
+                        <option value="0">COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
+                </field>
+                <!-- Libraries Field. Type: Libraries. (custom)-->
+                <field type="libraries"
+                       name="libraries"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_LIBRARIES_LABEL"
+                       description="COM_COMPONENTBUILDER_SITE_VIEW_LIBRARIES_DESCRIPTION"
+                       class="list_class"
+                       multiple="true"
+                       default="0"
+                       required="false"
+                       button="true" />
+                <!-- Php_jview Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="php_jview"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_LABEL"
+                       rows="17"
+                       cols="5"
+                       description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_HINT"
+                       required="true" />
                 <!-- Default Field. Type: Textarea. (joomla)-->
                 <field type="textarea"
                        name="default"
@@ -346,6 +320,25 @@
                        filter="raw"
                        hint="COM_COMPONENTBUILDER_SITE_VIEW_DEFAULT_HINT"
                        required="true" />
+                <!-- Note_snippet_usage Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_snippet_usage"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_SNIPPET_USAGE_LABEL"
+                       heading="h4"
+                       class="snippet-usage note_snippet_usage" />
+                <!-- Note_uikit_snippet Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_uikit_snippet"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_UIKIT_SNIPPET_LABEL"
+                       heading="h4"
+                       class="snippet-code note_uikit_snippet" />
+                <!-- Note_add_language_string Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_add_language_string"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_ADD_LANGUAGE_STRING_LABEL"
+                       description="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_ADD_LANGUAGE_STRING_DESCRIPTION"
+                       heading="h4"
+                       class="note_add_language_string" />
                 <!-- Php_view Field. Type: Textarea. (joomla)-->
                 <field type="textarea"
                        name="php_view"
@@ -369,16 +362,16 @@
                         <option value="1">COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
                         <option value="0">COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
                 </field>
-                <!-- Php_jview Field. Type: Textarea. (joomla)-->
+                <!-- Php_jview_display Field. Type: Textarea. (joomla)-->
                 <field type="textarea"
-                       name="php_jview"
+                       name="php_jview_display"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_LABEL"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_DISPLAY_LABEL"
                        rows="17"
                        cols="5"
-                       description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_DESCRIPTION"
+                       description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_DISPLAY_DESCRIPTION"
                        class="text_area span12"
                        filter="raw"
-                       hint="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_HINT"
+                       hint="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_DISPLAY_HINT"
                        required="true" />
                 <!-- Add_js_document Field. Type: Radio. (joomla)-->
                 <field type="radio"
@@ -391,21 +384,17 @@
                         <option value="1">COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
                         <option value="0">COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
                 </field>
-                <!-- Php_model Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="php_model"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_MODEL_LABEL"
-                       rows="30"
-                       cols="15"
-                       description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_MODEL_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_SITE_VIEW_PHP_MODEL_HINT"
-                       required="false" />
                 <!-- Not_required Field. Type: Hidden. (joomla)-->
                 <field type="hidden"
                        name="not_required"
                        default="[]" />
+                <!-- Note_libraries_selection Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_libraries_selection"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_LIBRARIES_SELECTION_LABEL"
+                       description="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_LIBRARIES_SELECTION_DESCRIPTION"
+                       heading="h4"
+                       class="alert alert-info note_libraries_selection" />
                 <!-- Javascript_file Field. Type: Textarea. (joomla)-->
                 <field type="textarea"
                        name="javascript_file"
@@ -874,6 +863,17 @@
                        description="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_LINKED_TO_NOTICE_DESCRIPTION"
                        heading="h4"
                        class="note_linked_to_notice" />
+                <!-- Php_model Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="php_model"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_MODEL_LABEL"
+                       rows="30"
+                       cols="15"
+                       description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_MODEL_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_SITE_VIEW_PHP_MODEL_HINT"
+                       required="false" />
         </fieldset>
 	
 	<!-- Access Control Fields. -->

admin/models/forms/snippet.xml

@@ -137,6 +137,13 @@
                        default="0"
                        required="true"
                        button="true" />
+                <!-- Note_contributor_details Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_contributor_details"
+                       label="COM_COMPONENTBUILDER_SNIPPET_NOTE_CONTRIBUTOR_DETAILS_LABEL"
+                       description="COM_COMPONENTBUILDER_SNIPPET_NOTE_CONTRIBUTOR_DETAILS_DESCRIPTION"
+                       heading="h4"
+                       class="alert alert-info note_contributor_details" />
                 <!-- Contributor_email Field. Type: Text. (joomla)-->
                 <field type="text"
                        name="contributor_email"
@@ -149,48 +156,6 @@
                        filter="STRING"
                        message="COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR_EMAIL_MESSAGE"
                        hint="COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR_EMAIL_HINT" />
-                <!-- Contributor_website Field. Type: Text. (joomla)-->
-                <field type="text"
-                       name="contributor_website"
-                       label="COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR_WEBSITE_LABEL"
-                       size="10"
-                       maxlength="50"
-                       description="COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR_WEBSITE_DESCRIPTION"
-                       class="text_area"
-                       readonly="true"
-                       filter="STRING"
-                       message="COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR_WEBSITE_MESSAGE"
-                       hint="COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR_WEBSITE_HINT" />
-                <!-- Usage Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="usage"
-                       label="COM_COMPONENTBUILDER_SNIPPET_USAGE_LABEL"
-                       rows="11"
-                       cols="10"
-                       description="COM_COMPONENTBUILDER_SNIPPET_USAGE_DESCRIPTION"
-                       class="text_area span12"
-                       filter="STRING"
-                       hint="COM_COMPONENTBUILDER_SNIPPET_USAGE_HINT" />
-                <!-- Snippet Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="snippet"
-                       label="COM_COMPONENTBUILDER_SNIPPET_SNIPPET_LABEL"
-                       rows="27"
-                       cols="10"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_SNIPPET_SNIPPET_HINT"
-                       required="true" />
-                <!-- Description Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="description"
-                       label="COM_COMPONENTBUILDER_SNIPPET_DESCRIPTION_LABEL"
-                       rows="11"
-                       cols="10"
-                       description="COM_COMPONENTBUILDER_SNIPPET_DESCRIPTION_DESCRIPTION"
-                       class="text_area span12"
-                       filter="HTML"
-                       hint="COM_COMPONENTBUILDER_SNIPPET_DESCRIPTION_HINT" />
                 <!-- Contributor_name Field. Type: Text. (joomla)-->
                 <field type="text"
                        name="contributor_name"
@@ -203,6 +168,18 @@
                        filter="STRING"
                        message="COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR_NAME_MESSAGE"
                        hint="COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR_NAME_HINT" />
+                <!-- Contributor_website Field. Type: Text. (joomla)-->
+                <field type="text"
+                       name="contributor_website"
+                       label="COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR_WEBSITE_LABEL"
+                       size="10"
+                       maxlength="50"
+                       description="COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR_WEBSITE_DESCRIPTION"
+                       class="text_area"
+                       readonly="true"
+                       filter="STRING"
+                       message="COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR_WEBSITE_MESSAGE"
+                       hint="COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR_WEBSITE_HINT" />
                 <!-- Contributor_company Field. Type: Text. (joomla)-->
                 <field type="text"
                        name="contributor_company"
@@ -215,13 +192,36 @@
                        filter="STRING"
                        message="COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR_COMPANY_MESSAGE"
                        hint="COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR_COMPANY_HINT" />
-                <!-- Note_contributor_details Field. Type: Note. A None Database Field. (joomla)-->
+                <!-- Snippet Field. Type: Textarea. (joomla)-->
-                <field type="note"
+                <field type="textarea"
-                       name="note_contributor_details"
+                       name="snippet"
-                       label="COM_COMPONENTBUILDER_SNIPPET_NOTE_CONTRIBUTOR_DETAILS_LABEL"
+                       label="COM_COMPONENTBUILDER_SNIPPET_SNIPPET_LABEL"
-                       description="COM_COMPONENTBUILDER_SNIPPET_NOTE_CONTRIBUTOR_DETAILS_DESCRIPTION"
+                       rows="27"
-                       heading="h4"
+                       cols="10"
-                       class="alert alert-info note_contributor_details" />
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_SNIPPET_SNIPPET_HINT"
+                       required="true" />
+                <!-- Usage Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="usage"
+                       label="COM_COMPONENTBUILDER_SNIPPET_USAGE_LABEL"
+                       rows="11"
+                       cols="10"
+                       description="COM_COMPONENTBUILDER_SNIPPET_USAGE_DESCRIPTION"
+                       class="text_area span12"
+                       filter="STRING"
+                       hint="COM_COMPONENTBUILDER_SNIPPET_USAGE_HINT" />
+                <!-- Description Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="description"
+                       label="COM_COMPONENTBUILDER_SNIPPET_DESCRIPTION_LABEL"
+                       rows="11"
+                       cols="10"
+                       description="COM_COMPONENTBUILDER_SNIPPET_DESCRIPTION_DESCRIPTION"
+                       class="text_area span12"
+                       filter="HTML"
+                       hint="COM_COMPONENTBUILDER_SNIPPET_DESCRIPTION_HINT" />
         </fieldset>
 	
 	<!-- Access Control Fields. -->

admin/models/forms/template.js

@@ -23,7 +23,7 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvvyyvyt_required = false;
+jform_vvvvvyyvys_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -39,26 +39,26 @@ function vvvvvyy(add_php_view_vvvvvyy)
 	if (add_php_view_vvvvvyy == 1)
 	{
 		jQuery('#jform_php_view').closest('.control-group').show();
-		if (jform_vvvvvyyvyt_required)
+		if (jform_vvvvvyyvys_required)
 		{
 			updateFieldRequired('php_view',0);
 			jQuery('#jform_php_view').prop('required','required');
 			jQuery('#jform_php_view').attr('aria-required',true);
 			jQuery('#jform_php_view').addClass('required');
-			jform_vvvvvyyvyt_required = false;
+			jform_vvvvvyyvys_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_view').closest('.control-group').hide();
-		if (!jform_vvvvvyyvyt_required)
+		if (!jform_vvvvvyyvys_required)
 		{
 			updateFieldRequired('php_view',1);
 			jQuery('#jform_php_view').removeAttr('required');
 			jQuery('#jform_php_view').removeAttr('aria-required');
 			jQuery('#jform_php_view').removeClass('required');
-			jform_vvvvvyyvyt_required = true;
+			jform_vvvvvyyvys_required = true;
 		}
 	}
 }

admin/models/forms/template.xml

@@ -127,6 +127,35 @@
                        multiple="false"
                        required="false"
                        button="true" />
+                <!-- Php_view Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="php_view"
+                       label="COM_COMPONENTBUILDER_TEMPLATE_PHP_VIEW_LABEL"
+                       rows="17"
+                       cols="5"
+                       description="COM_COMPONENTBUILDER_TEMPLATE_PHP_VIEW_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_TEMPLATE_PHP_VIEW_HINT"
+                       required="true" />
+                <!-- Add_php_view Field. Type: Radio. (joomla)-->
+                <field type="radio"
+                       name="add_php_view"
+                       label="COM_COMPONENTBUILDER_TEMPLATE_ADD_PHP_VIEW_LABEL"
+                       class="btn-group btn-group-yesno"
+                       default="0"
+                       required="true">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_TEMPLATE_YES</option>
+                        <option value="0">COM_COMPONENTBUILDER_TEMPLATE_NO</option>
+                </field>
+                <!-- Dynamic_values Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="dynamic_values"
+                       label="COM_COMPONENTBUILDER_TEMPLATE_DYNAMIC_VALUES_LABEL"
+                       description="COM_COMPONENTBUILDER_TEMPLATE_DYNAMIC_VALUES_DESCRIPTION"
+                       heading="h4"
+                       class="dynamic_values" />
                 <!-- Dynamic_get Field. Type: Dynamicget. (custom)-->
                 <field type="dynamicget"
                        name="dynamic_get"
@@ -135,6 +164,32 @@
                        multiple="false"
                        required="false"
                        button="true" />
+                <!-- Not_required Field. Type: Hidden. (joomla)-->
+                <field type="hidden"
+                       name="not_required"
+                       default="[]" />
+                <!-- Template Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="template"
+                       label="COM_COMPONENTBUILDER_TEMPLATE_TEMPLATE_LABEL"
+                       rows="20"
+                       cols="15"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_TEMPLATE_TEMPLATE_HINT"
+                       required="true" />
+                <!-- Note_snippet_usage Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_snippet_usage"
+                       label="COM_COMPONENTBUILDER_TEMPLATE_NOTE_SNIPPET_USAGE_LABEL"
+                       heading="h4"
+                       class="snippet-usage note_snippet_usage" />
+                <!-- Note_uikit_snippet Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_uikit_snippet"
+                       label="COM_COMPONENTBUILDER_TEMPLATE_NOTE_UIKIT_SNIPPET_LABEL"
+                       heading="h4"
+                       class="snippet-code note_uikit_snippet" />
                 <!-- Note_add_language_string Field. Type: Note. A None Database Field. (joomla)-->
                 <field type="note"
                        name="note_add_language_string"
@@ -152,23 +207,6 @@
                        default="0"
                        required="false"
                        button="true" />
-                <!-- Note_uikit_snippet Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_uikit_snippet"
-                       label="COM_COMPONENTBUILDER_TEMPLATE_NOTE_UIKIT_SNIPPET_LABEL"
-                       heading="h4"
-                       class="snippet-code note_uikit_snippet" />
-                <!-- Add_php_view Field. Type: Radio. (joomla)-->
-                <field type="radio"
-                       name="add_php_view"
-                       label="COM_COMPONENTBUILDER_TEMPLATE_ADD_PHP_VIEW_LABEL"
-                       class="btn-group btn-group-yesno"
-                       default="0"
-                       required="true">
-                        <!-- Option Set.-->
-                        <option value="1">COM_COMPONENTBUILDER_TEMPLATE_YES</option>
-                        <option value="0">COM_COMPONENTBUILDER_TEMPLATE_NO</option>
-                </field>
                 <!-- Note_libraries_selection Field. Type: Note. A None Database Field. (joomla)-->
                 <field type="note"
                        name="note_libraries_selection"
@@ -176,44 +214,6 @@
                        description="COM_COMPONENTBUILDER_TEMPLATE_NOTE_LIBRARIES_SELECTION_DESCRIPTION"
                        heading="h4"
                        class="alert alert-info note_libraries_selection" />
-                <!-- Not_required Field. Type: Hidden. (joomla)-->
-                <field type="hidden"
-                       name="not_required"
-                       default="[]" />
-                <!-- Note_snippet_usage Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_snippet_usage"
-                       label="COM_COMPONENTBUILDER_TEMPLATE_NOTE_SNIPPET_USAGE_LABEL"
-                       heading="h4"
-                       class="snippet-usage note_snippet_usage" />
-                <!-- Dynamic_values Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="dynamic_values"
-                       label="COM_COMPONENTBUILDER_TEMPLATE_DYNAMIC_VALUES_LABEL"
-                       description="COM_COMPONENTBUILDER_TEMPLATE_DYNAMIC_VALUES_DESCRIPTION"
-                       heading="h4"
-                       class="dynamic_values" />
-                <!-- Template Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="template"
-                       label="COM_COMPONENTBUILDER_TEMPLATE_TEMPLATE_LABEL"
-                       rows="20"
-                       cols="15"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_TEMPLATE_TEMPLATE_HINT"
-                       required="true" />
-                <!-- Php_view Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="php_view"
-                       label="COM_COMPONENTBUILDER_TEMPLATE_PHP_VIEW_LABEL"
-                       rows="17"
-                       cols="5"
-                       description="COM_COMPONENTBUILDER_TEMPLATE_PHP_VIEW_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_TEMPLATE_PHP_VIEW_HINT"
-                       required="true" />
         </fieldset>
 	
 	<!-- Access Control Fields. -->

admin/models/joomla_component.php

@@ -108,64 +108,16 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 				$item->addcontributors = $addcontributors->toArray();
 			}
 
-			if (!empty($item->php_postflight_install))
+			if (!empty($item->php_postflight_update))
 			{
-				// base64 Decode php_postflight_install.
+				// base64 Decode php_postflight_update.
-				$item->php_postflight_install = base64_decode($item->php_postflight_install);
+				$item->php_postflight_update = base64_decode($item->php_postflight_update);
 			}
 
-			if (!empty($item->php_site_event))
+			if (!empty($item->php_preflight_update))
 			{
-				// base64 Decode php_site_event.
+				// base64 Decode php_preflight_update.
-				$item->php_site_event = base64_decode($item->php_site_event);
+				$item->php_preflight_update = base64_decode($item->php_preflight_update);
-			}
-
-			if (!empty($item->readme))
-			{
-				// base64 Decode readme.
-				$item->readme = base64_decode($item->readme);
-			}
-
-			if (!empty($item->css_admin))
-			{
-				// base64 Decode css_admin.
-				$item->css_admin = base64_decode($item->css_admin);
-			}
-
-			if (!empty($item->php_preflight_install))
-			{
-				// base64 Decode php_preflight_install.
-				$item->php_preflight_install = base64_decode($item->php_preflight_install);
-			}
-
-			if (!empty($item->php_method_uninstall))
-			{
-				// base64 Decode php_method_uninstall.
-				$item->php_method_uninstall = base64_decode($item->php_method_uninstall);
-			}
-
-			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))
-			{
-				// base64 Decode php_admin_event.
-				$item->php_admin_event = base64_decode($item->php_admin_event);
-			}
-
-			if (!empty($item->php_helper_admin))
-			{
-				// base64 Decode php_helper_admin.
-				$item->php_helper_admin = base64_decode($item->php_helper_admin);
-			}
-
-			if (!empty($item->php_helper_site))
-			{
-				// base64 Decode php_helper_site.
-				$item->php_helper_site = base64_decode($item->php_helper_site);
 			}
 
 			if (!empty($item->javascript))
@@ -180,24 +132,72 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 				$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->php_helper_admin))
+			{
+				// base64 Decode php_helper_admin.
+				$item->php_helper_admin = base64_decode($item->php_helper_admin);
+			}
+
+			if (!empty($item->php_helper_site))
+			{
+				// base64 Decode php_helper_site.
+				$item->php_helper_site = base64_decode($item->php_helper_site);
+			}
+
+			if (!empty($item->php_helper_both))
+			{
+				// base64 Decode php_helper_both.
+				$item->php_helper_both = base64_decode($item->php_helper_both);
+			}
+
+			if (!empty($item->php_admin_event))
+			{
+				// base64 Decode php_admin_event.
+				$item->php_admin_event = base64_decode($item->php_admin_event);
+			}
+
+			if (!empty($item->php_site_event))
+			{
+				// base64 Decode php_site_event.
+				$item->php_site_event = base64_decode($item->php_site_event);
+			}
+
+			if (!empty($item->css_admin))
+			{
+				// base64 Decode css_admin.
+				$item->css_admin = base64_decode($item->css_admin);
+			}
+
+			if (!empty($item->php_preflight_install))
+			{
+				// base64 Decode php_preflight_install.
+				$item->php_preflight_install = base64_decode($item->php_preflight_install);
+			}
+
+			if (!empty($item->php_postflight_install))
+			{
+				// base64 Decode php_postflight_install.
+				$item->php_postflight_install = base64_decode($item->php_postflight_install);
+			}
+
+			if (!empty($item->php_method_uninstall))
+			{
+				// base64 Decode php_method_uninstall.
+				$item->php_method_uninstall = base64_decode($item->php_method_uninstall);
+			}
+
+			if (!empty($item->readme))
+			{
+				// base64 Decode readme.
+				$item->readme = base64_decode($item->readme);
+			}
+
 			if (!empty($item->buildcompsql))
 			{
 				// base64 Decode buildcompsql.
@@ -279,194 +279,10 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 				$item->tags->getTagIds($item->id, 'com_componentbuilder.joomla_component');
 			}
 		}
-		$this->componentsvvvv = $item->id;
 
 		return $item;
 	} 
 
-	/**
-	* Method to get list data.
-	*
-	* @return mixed  An array of data items on success, false on failure.
-	*/
-	public function getVwntranslation()
-	{
-		// Get the user object.
-		$user = JFactory::getUser();
-		// Create a new query object.
-		$db = JFactory::getDBO();
-		$query = $db->getQuery(true);
-
-		// Select some fields
-		$query->select('a.*');
-
-		// From the componentbuilder_language_translation table
-		$query->from($db->quoteName('#__componentbuilder_language_translation', 'a'));
-
-		// Join over the asset groups.
-		$query->select('ag.title AS access_level');
-		$query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
-		// Filter by access level.
-		if ($access = $this->getState('filter.access'))
-		{
-			$query->where('a.access = ' . (int) $access);
-		}
-		// Implement View Level Access
-		if (!$user->authorise('core.options', 'com_componentbuilder'))
-		{
-			$groups = implode(',', $user->getAuthorisedViewLevels());
-			$query->where('a.access IN (' . $groups . ')');
-		}
-
-		// Order the results by ordering
-		$query->order('a.published  ASC');
-		$query->order('a.ordering  ASC');
-
-		// Load the items
-		$db->setQuery($query);
-		$db->execute();
-		if ($db->getNumRows())
-		{
-			$items = $db->loadObjectList();
-
-			// set values to display correctly.
-			if (ComponentbuilderHelper::checkArray($items))
-			{
-				// get user object.
-				$user = JFactory::getUser();
-				foreach ($items as $nr => &$item)
-				{
-					$access = ($user->authorise('language_translation.access', 'com_componentbuilder.language_translation.' . (int) $item->id) && $user->authorise('language_translation.access', 'com_componentbuilder'));
-					if (!$access)
-					{
-						unset($items[$nr]);
-						continue;
-					}
-
-				}
-			}
-
-			// Filter by componentsvvvv Array Field
-			$componentsvvvv = $this->componentsvvvv;
-			if (ComponentbuilderHelper::checkArray($items) && $componentsvvvv)
-			{
-				foreach ($items as $nr => &$item)
-				{
-					if (ComponentbuilderHelper::checkJson($item->components))
-					{
-						$item->components = json_decode($item->components, true);
-					}
-					elseif (!isset($item->components) || !ComponentbuilderHelper::checkArray($item->components))
-					{
-						unset($items[$nr]);
-						continue;
-					}
-					if (!in_array($componentsvvvv,$item->components))
-					{
-						unset($items[$nr]);
-						continue;
-					}
-				}
-			}
-			else
-			{
-				return false;
-			}
-
-				// show all languages that are already set for this string
-			if (!isset($_export) && ComponentbuilderHelper::checkArray($items))
-			{
-				foreach ($items as $nr => &$item)
-				{
-					$langBucket = array();
-					if (ComponentbuilderHelper::checkJson($item->translation))
-					{
-						$translations = json_decode($item->translation, true);
-						if (ComponentbuilderHelper::checkArray($translations))
-						{
-							foreach ($translations as $language)
-							{
-								if (isset($language['translation']) && ComponentbuilderHelper::checkString($language['translation'])
-								&& isset($language['language']) && ComponentbuilderHelper::checkString($language['language']))
-								{
-									$langBucket[$language['language']] = $language['language'];
-								}
-							}
-						}
-					}
-					// set how many component use this string
-					$componentCounter = '';
-					if (ComponentbuilderHelper::checkJson($item->components))
-					{
-						$item->components = json_decode($item->components, true);
-					}
-					if (ComponentbuilderHelper::checkArray($item->components))
-					{
-						$componentCounter = ' - <small>' . JText::_('COM_COMPONENTBUILDER_USED_IN') . ' ' . count($item->components) . '</small>';
-					}
-					// load the languages to the string
-					if (ComponentbuilderHelper::checkArray($langBucket))
-					{
-						$item->entranslation = '<small><em>(' . implode(', ', $langBucket) . ')</em></small> ' . ComponentbuilderHelper::htmlEscape($item->entranslation, 'UTF-8', true, 150) . $componentCounter;
-					}
-					else
-					{
-						$item->entranslation = '<small><em>(' . JText::_('COM_COMPONENTBUILDER_NOTRANSLATION') . ')</em></small> ' . ComponentbuilderHelper::htmlEscape($item->entranslation, 'UTF-8', true, 150) . $componentCounter;
-					}
-				}
-			}
-			// prep the lang strings for export
-			if (isset($_export) && $_export && ComponentbuilderHelper::checkArray($items))
-			{
-				// insure we have the same order in the languages
-				$languages = ComponentbuilderHelper::getVars('language', 1, 'published', 'langtag');
-				foreach ($items as $nr => &$item)
-				{
-					// remove some values completely
-					unset($item->components);
-					unset($item->params);
-					unset($item->published);
-					unset($item->created_by);
-					unset($item->modified_by);
-					unset($item->created);
-					unset($item->modified);
-					unset($item->version);
-					unset($item->hits);
-					unset($item->access);
-					unset($item->ordering);
-					// set the lang order
-					if ($nr != 0)
-					{
-						foreach ($languages as $lanTag)
-						{
-							$item->{$lanTag} = '';
-						}
-						// now adapt the entranslation
-						if (isset($item->translation) && ComponentbuilderHelper::checkJson($item->translation))
-						{
-							$translations = json_decode($item->translation, true);
-							if (ComponentbuilderHelper::checkArray($translations))
-							{
-								foreach ($translations as $language)
-								{
-									if (isset($language['translation']) && ComponentbuilderHelper::checkString($language['translation'])
-									&& isset($language['language']) && ComponentbuilderHelper::checkString($language['language']))
-									{
-										$item->{$language['language']} = $language['translation'];
-									}
-								}
-							}
-						}
-					}
-					// remove translation
-					unset($item->translation);
-				}
-			}
-			return $items;
-		}
-		return false;
-	} 
-
 	/**
 	 * Method to get the record form.
 	 *
@@ -1247,64 +1063,16 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 			$data['addcontributors'] = '';
 		}
 
-		// Set the php_postflight_install string to base64 string.
+		// Set the php_postflight_update string to base64 string.
-		if (isset($data['php_postflight_install']))
+		if (isset($data['php_postflight_update']))
 		{
-			$data['php_postflight_install'] = base64_encode($data['php_postflight_install']);
+			$data['php_postflight_update'] = base64_encode($data['php_postflight_update']);
 		}
 
-		// Set the php_site_event string to base64 string.
+		// Set the php_preflight_update string to base64 string.
-		if (isset($data['php_site_event']))
+		if (isset($data['php_preflight_update']))
 		{
-			$data['php_site_event'] = base64_encode($data['php_site_event']);
+			$data['php_preflight_update'] = base64_encode($data['php_preflight_update']);
-		}
-
-		// Set the readme string to base64 string.
-		if (isset($data['readme']))
-		{
-			$data['readme'] = base64_encode($data['readme']);
-		}
-
-		// Set the css_admin string to base64 string.
-		if (isset($data['css_admin']))
-		{
-			$data['css_admin'] = base64_encode($data['css_admin']);
-		}
-
-		// Set the php_preflight_install string to base64 string.
-		if (isset($data['php_preflight_install']))
-		{
-			$data['php_preflight_install'] = base64_encode($data['php_preflight_install']);
-		}
-
-		// Set the php_method_uninstall string to base64 string.
-		if (isset($data['php_method_uninstall']))
-		{
-			$data['php_method_uninstall'] = base64_encode($data['php_method_uninstall']);
-		}
-
-		// 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.
-		if (isset($data['php_admin_event']))
-		{
-			$data['php_admin_event'] = base64_encode($data['php_admin_event']);
-		}
-
-		// Set the php_helper_admin string to base64 string.
-		if (isset($data['php_helper_admin']))
-		{
-			$data['php_helper_admin'] = base64_encode($data['php_helper_admin']);
-		}
-
-		// Set the php_helper_site string to base64 string.
-		if (isset($data['php_helper_site']))
-		{
-			$data['php_helper_site'] = base64_encode($data['php_helper_site']);
 		}
 
 		// Set the javascript string to base64 string.
@@ -1319,24 +1087,72 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 			$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 php_helper_admin string to base64 string.
+		if (isset($data['php_helper_admin']))
+		{
+			$data['php_helper_admin'] = base64_encode($data['php_helper_admin']);
+		}
+
+		// Set the php_helper_site string to base64 string.
+		if (isset($data['php_helper_site']))
+		{
+			$data['php_helper_site'] = base64_encode($data['php_helper_site']);
+		}
+
+		// Set the php_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.
+		if (isset($data['php_admin_event']))
+		{
+			$data['php_admin_event'] = base64_encode($data['php_admin_event']);
+		}
+
+		// Set the php_site_event string to base64 string.
+		if (isset($data['php_site_event']))
+		{
+			$data['php_site_event'] = base64_encode($data['php_site_event']);
+		}
+
+		// Set the css_admin string to base64 string.
+		if (isset($data['css_admin']))
+		{
+			$data['css_admin'] = base64_encode($data['css_admin']);
+		}
+
+		// Set the php_preflight_install string to base64 string.
+		if (isset($data['php_preflight_install']))
+		{
+			$data['php_preflight_install'] = base64_encode($data['php_preflight_install']);
+		}
+
+		// Set the php_postflight_install string to base64 string.
+		if (isset($data['php_postflight_install']))
+		{
+			$data['php_postflight_install'] = base64_encode($data['php_postflight_install']);
+		}
+
+		// Set the php_method_uninstall string to base64 string.
+		if (isset($data['php_method_uninstall']))
+		{
+			$data['php_method_uninstall'] = base64_encode($data['php_method_uninstall']);
+		}
+
+		// Set the readme string to base64 string.
+		if (isset($data['readme']))
+		{
+			$data['readme'] = base64_encode($data['readme']);
+		}
+
 		// Set the buildcompsql string to base64 string.
 		if (isset($data['buildcompsql']))
 		{

admin/models/joomla_components.php

@@ -1723,41 +1723,41 @@ class ComponentbuilderModelJoomla_components extends JModelList
 							continue;
 						}
 
-						// 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_site_event
+						// decode php_preflight_update
-						$item->php_site_event = base64_decode($item->php_site_event);
+						$item->php_preflight_update = base64_decode($item->php_preflight_update);
-						// decode readme
-						$item->readme = base64_decode($item->readme);
-						// decode css_admin
-						$item->css_admin = base64_decode($item->css_admin);
-						// decode php_preflight_install
-						$item->php_preflight_install = base64_decode($item->php_preflight_install);
-						// decode php_method_uninstall
-						$item->php_method_uninstall = base64_decode($item->php_method_uninstall);
-						// 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_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);
+						// decode sql
+						$item->sql = base64_decode($item->sql);
+						// decode php_helper_admin
+						$item->php_helper_admin = base64_decode($item->php_helper_admin);
+						// decode php_helper_site
+						$item->php_helper_site = base64_decode($item->php_helper_site);
+						// decode php_helper_both
+						$item->php_helper_both = base64_decode($item->php_helper_both);
+						// decode php_admin_event
+						$item->php_admin_event = base64_decode($item->php_admin_event);
+						// decode php_site_event
+						$item->php_site_event = base64_decode($item->php_site_event);
+						// decode css_admin
+						$item->css_admin = base64_decode($item->css_admin);
 						if ($basickey && !is_numeric($item->whmcs_key) && $item->whmcs_key === base64_encode(base64_decode($item->whmcs_key, true)))
 						{
 							// decrypt whmcs_key
 							$item->whmcs_key = $basic->decryptString($item->whmcs_key);
 						}
-						// decode php_preflight_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 php_postflight_update
+						// decode php_postflight_install
-						$item->php_postflight_update = base64_decode($item->php_postflight_update);
+						$item->php_postflight_install = base64_decode($item->php_postflight_install);
-						// decode sql
+						// decode php_method_uninstall
-						$item->sql = base64_decode($item->sql);
+						$item->php_method_uninstall = base64_decode($item->php_method_uninstall);
+						// decode readme
+						$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/models/layout.php

@@ -103,18 +103,18 @@ class ComponentbuilderModelLayout extends JModelAdmin
 				$item->libraries = $libraries->toArray();
 			}
 
-			if (!empty($item->layout))
-			{
-				// base64 Decode layout.
-				$item->layout = base64_decode($item->layout);
-			}
-
 			if (!empty($item->php_view))
 			{
 				// base64 Decode php_view.
 				$item->php_view = base64_decode($item->php_view);
 			}
 
+			if (!empty($item->layout))
+			{
+				// base64 Decode layout.
+				$item->layout = base64_decode($item->layout);
+			}
+			
 			if (!empty($item->id))
 			{
 				$item->tags = new JHelperTags;
@@ -839,18 +839,18 @@ class ComponentbuilderModelLayout extends JModelAdmin
 			$data['libraries'] = '';
 		}
 
-		// Set the layout string to base64 string.
-		if (isset($data['layout']))
-		{
-			$data['layout'] = base64_encode($data['layout']);
-		}
-
 		// Set the php_view string to base64 string.
 		if (isset($data['php_view']))
 		{
 			$data['php_view'] = base64_encode($data['php_view']);
 		}
 
+		// Set the layout string to base64 string.
+		if (isset($data['layout']))
+		{
+			$data['layout'] = base64_encode($data['layout']);
+		}
+        
 		// Set the Params Items to data
 		if (isset($data['params']) && is_array($data['params']))
 		{

admin/models/layouts.php

@@ -271,10 +271,10 @@ class ComponentbuilderModelLayouts extends JModelList
 							continue;
 						}
 
-						// decode layout
-						$item->layout = base64_decode($item->layout);
 						// decode php_view
 						$item->php_view = base64_decode($item->php_view);
+						// decode layout
+						$item->layout = base64_decode($item->layout);
 						// unset the values we don't want exported.
 						unset($item->asset_id);
 						unset($item->checked_out);

admin/models/library.php

@@ -100,14 +100,6 @@ class ComponentbuilderModelLibrary extends JModelAdmin
 				$item->metadata = $registry->toArray();
 			}
 
-			if (!empty($item->addconditions))
-			{
-				// Convert the addconditions field to an array.
-				$addconditions = new Registry;
-				$addconditions->loadString($item->addconditions);
-				$item->addconditions = $addconditions->toArray();
-			}
-
 			if (!empty($item->libraries))
 			{
 				// Convert the libraries field to an array.
@@ -116,6 +108,14 @@ class ComponentbuilderModelLibrary extends JModelAdmin
 				$item->libraries = $libraries->toArray();
 			}
 
+			if (!empty($item->addconditions))
+			{
+				// Convert the addconditions field to an array.
+				$addconditions = new Registry;
+				$addconditions->loadString($item->addconditions);
+				$item->addconditions = $addconditions->toArray();
+			}
+
 			if (!empty($item->php_setdocument))
 			{
 				// base64 Decode php_setdocument.
@@ -918,19 +918,6 @@ class ComponentbuilderModelLibrary extends JModelAdmin
 			$data['metadata'] = (string) $metadata;
 		} 
 
-		// Set the addconditions items to data.
-		if (isset($data['addconditions']) && is_array($data['addconditions']))
-		{
-			$addconditions = new JRegistry;
-			$addconditions->loadArray($data['addconditions']);
-			$data['addconditions'] = (string) $addconditions;
-		}
-		elseif (!isset($data['addconditions']))
-		{
-			// Set the empty addconditions to data
-			$data['addconditions'] = '';
-		}
-
 		// Set the libraries items to data.
 		if (isset($data['libraries']) && is_array($data['libraries']))
 		{
@@ -944,6 +931,19 @@ class ComponentbuilderModelLibrary extends JModelAdmin
 			$data['libraries'] = '';
 		}
 
+		// Set the addconditions items to data.
+		if (isset($data['addconditions']) && is_array($data['addconditions']))
+		{
+			$addconditions = new JRegistry;
+			$addconditions->loadArray($data['addconditions']);
+			$data['addconditions'] = (string) $addconditions;
+		}
+		elseif (!isset($data['addconditions']))
+		{
+			// Set the empty addconditions to data
+			$data['addconditions'] = '';
+		}
+
 		// Set the php_setdocument string to base64 string.
 		if (isset($data['php_setdocument']))
 		{

admin/models/library_files_folders_urls.php

@@ -103,14 +103,6 @@ class ComponentbuilderModelLibrary_files_folders_urls extends JModelAdmin
 				$item->addfoldersfullpath = $addfoldersfullpath->toArray();
 			}
 
-			if (!empty($item->addurls))
-			{
-				// Convert the addurls field to an array.
-				$addurls = new Registry;
-				$addurls->loadString($item->addurls);
-				$item->addurls = $addurls->toArray();
-			}
-
 			if (!empty($item->addfilesfullpath))
 			{
 				// Convert the addfilesfullpath field to an array.
@@ -119,6 +111,14 @@ class ComponentbuilderModelLibrary_files_folders_urls extends JModelAdmin
 				$item->addfilesfullpath = $addfilesfullpath->toArray();
 			}
 
+			if (!empty($item->addfolders))
+			{
+				// Convert the addfolders field to an array.
+				$addfolders = new Registry;
+				$addfolders->loadString($item->addfolders);
+				$item->addfolders = $addfolders->toArray();
+			}
+
 			if (!empty($item->addfiles))
 			{
 				// Convert the addfiles field to an array.
@@ -127,12 +127,12 @@ class ComponentbuilderModelLibrary_files_folders_urls extends JModelAdmin
 				$item->addfiles = $addfiles->toArray();
 			}
 
-			if (!empty($item->addfolders))
+			if (!empty($item->addurls))
 			{
-				// Convert the addfolders field to an array.
+				// Convert the addurls field to an array.
-				$addfolders = new Registry;
+				$addurls = new Registry;
-				$addfolders->loadString($item->addfolders);
+				$addurls->loadString($item->addurls);
-				$item->addfolders = $addfolders->toArray();
+				$item->addurls = $addurls->toArray();
 			}
 			
 			if (!empty($item->id))
@@ -827,19 +827,6 @@ class ComponentbuilderModelLibrary_files_folders_urls extends JModelAdmin
 			$data['addfoldersfullpath'] = '';
 		}
 
-		// Set the addurls items to data.
-		if (isset($data['addurls']) && is_array($data['addurls']))
-		{
-			$addurls = new JRegistry;
-			$addurls->loadArray($data['addurls']);
-			$data['addurls'] = (string) $addurls;
-		}
-		elseif (!isset($data['addurls']))
-		{
-			// Set the empty addurls to data
-			$data['addurls'] = '';
-		}
-
 		// Set the addfilesfullpath items to data.
 		if (isset($data['addfilesfullpath']) && is_array($data['addfilesfullpath']))
 		{
@@ -853,6 +840,19 @@ class ComponentbuilderModelLibrary_files_folders_urls extends JModelAdmin
 			$data['addfilesfullpath'] = '';
 		}
 
+		// Set the addfolders items to data.
+		if (isset($data['addfolders']) && is_array($data['addfolders']))
+		{
+			$addfolders = new JRegistry;
+			$addfolders->loadArray($data['addfolders']);
+			$data['addfolders'] = (string) $addfolders;
+		}
+		elseif (!isset($data['addfolders']))
+		{
+			// Set the empty addfolders to data
+			$data['addfolders'] = '';
+		}
+
 		// Set the addfiles items to data.
 		if (isset($data['addfiles']) && is_array($data['addfiles']))
 		{
@@ -866,17 +866,17 @@ class ComponentbuilderModelLibrary_files_folders_urls extends JModelAdmin
 			$data['addfiles'] = '';
 		}
 
-		// Set the addfolders items to data.
+		// Set the addurls items to data.
-		if (isset($data['addfolders']) && is_array($data['addfolders']))
+		if (isset($data['addurls']) && is_array($data['addurls']))
 		{
-			$addfolders = new JRegistry;
+			$addurls = new JRegistry;
-			$addfolders->loadArray($data['addfolders']);
+			$addurls->loadArray($data['addurls']);
-			$data['addfolders'] = (string) $addfolders;
+			$data['addurls'] = (string) $addurls;
 		}
-		elseif (!isset($data['addfolders']))
+		elseif (!isset($data['addurls']))
 		{
-			// Set the empty addfolders to data
+			// Set the empty addurls to data
-			$data['addfolders'] = '';
+			$data['addurls'] = '';
 		}
         
 		// Set the Params Items to data

admin/models/server.php

@@ -100,6 +100,36 @@ class ComponentbuilderModelServer extends JModelAdmin
 			// Get the encryption object.
 			$basic = new FOFEncryptAes($basickey);
 
+			if (!empty($item->signature) && $basickey && !is_numeric($item->signature) && $item->signature === base64_encode(base64_decode($item->signature, true)))
+			{
+				// basic decrypt data signature.
+				$item->signature = rtrim($basic->decryptString($item->signature), "\0");
+			}
+
+			if (!empty($item->private_key) && $basickey && !is_numeric($item->private_key) && $item->private_key === base64_encode(base64_decode($item->private_key, true)))
+			{
+				// basic decrypt data private_key.
+				$item->private_key = rtrim($basic->decryptString($item->private_key), "\0");
+			}
+
+			if (!empty($item->secret) && $basickey && !is_numeric($item->secret) && $item->secret === base64_encode(base64_decode($item->secret, true)))
+			{
+				// basic decrypt data secret.
+				$item->secret = rtrim($basic->decryptString($item->secret), "\0");
+			}
+
+			if (!empty($item->password) && $basickey && !is_numeric($item->password) && $item->password === base64_encode(base64_decode($item->password, true)))
+			{
+				// basic decrypt data password.
+				$item->password = rtrim($basic->decryptString($item->password), "\0");
+			}
+
+			if (!empty($item->private) && $basickey && !is_numeric($item->private) && $item->private === base64_encode(base64_decode($item->private, true)))
+			{
+				// basic decrypt data private.
+				$item->private = rtrim($basic->decryptString($item->private), "\0");
+			}
+
 			if (!empty($item->path) && $basickey && !is_numeric($item->path) && $item->path === base64_encode(base64_decode($item->path, true)))
 			{
 				// basic decrypt data path.
@@ -112,55 +142,25 @@ class ComponentbuilderModelServer extends JModelAdmin
 				$item->port = rtrim($basic->decryptString($item->port), "\0");
 			}
 
-			if (!empty($item->password) && $basickey && !is_numeric($item->password) && $item->password === base64_encode(base64_decode($item->password, true)))
-			{
-				// basic decrypt data password.
-				$item->password = rtrim($basic->decryptString($item->password), "\0");
-			}
-
-			if (!empty($item->secret) && $basickey && !is_numeric($item->secret) && $item->secret === base64_encode(base64_decode($item->secret, true)))
-			{
-				// basic decrypt data secret.
-				$item->secret = rtrim($basic->decryptString($item->secret), "\0");
-			}
-
 			if (!empty($item->host) && $basickey && !is_numeric($item->host) && $item->host === base64_encode(base64_decode($item->host, true)))
 			{
 				// basic decrypt data host.
 				$item->host = rtrim($basic->decryptString($item->host), "\0");
 			}
 
-			if (!empty($item->signature) && $basickey && !is_numeric($item->signature) && $item->signature === base64_encode(base64_decode($item->signature, true)))
-			{
-				// basic decrypt data signature.
-				$item->signature = rtrim($basic->decryptString($item->signature), "\0");
-			}
-
 			if (!empty($item->username) && $basickey && !is_numeric($item->username) && $item->username === base64_encode(base64_decode($item->username, true)))
 			{
 				// basic decrypt data username.
 				$item->username = rtrim($basic->decryptString($item->username), "\0");
 			}
 			
-			if (!empty($item->private) && $basickey && !is_numeric($item->private) && $item->private === base64_encode(base64_decode($item->private, true)))
-			{
-				// basic decrypt data private.
-				$item->private = rtrim($basic->decryptString($item->private), "\0");
-			}
-
-			if (!empty($item->private_key) && $basickey && !is_numeric($item->private_key) && $item->private_key === base64_encode(base64_decode($item->private_key, true)))
-			{
-				// basic decrypt data private_key.
-				$item->private_key = rtrim($basic->decryptString($item->private_key), "\0");
-			}
-			
 			if (!empty($item->id))
 			{
 				$item->tags = new JHelperTags;
 				$item->tags->getTagIds($item->id, 'com_componentbuilder.server');
 			}
 		}
-		$this->sales_serverupdate_servervvvx = $item->id;
+		$this->sales_serverupdate_servervvvw = $item->id;
 
 		return $item;
 	}
@@ -170,7 +170,7 @@ class ComponentbuilderModelServer extends JModelAdmin
 	*
 	* @return mixed  An array of data items on success, false on failure.
 	*/
-	public function getWanlinked_components()
+	public function getWamlinked_components()
 	{
 		// Get the user object.
 		$user = JFactory::getUser();
@@ -184,15 +184,15 @@ class ComponentbuilderModelServer extends JModelAdmin
 		// From the componentbuilder_joomla_component table
 		$query->from($db->quoteName('#__componentbuilder_joomla_component', 'a'));
 
-		// Filter by sales_serverupdate_servervvvx global.
+		// Filter by sales_serverupdate_servervvvw global.
-		$sales_serverupdate_servervvvx = $this->sales_serverupdate_servervvvx;
+		$sales_serverupdate_servervvvw = $this->sales_serverupdate_servervvvw;
-		if (is_numeric($sales_serverupdate_servervvvx ))
+		if (is_numeric($sales_serverupdate_servervvvw ))
 		{
-			$query->where('a.sales_server = ' . (int) $sales_serverupdate_servervvvx . ' OR a.update_server = ' . (int) $sales_serverupdate_servervvvx, ' OR');
+			$query->where('a.sales_server = ' . (int) $sales_serverupdate_servervvvw . ' OR a.update_server = ' . (int) $sales_serverupdate_servervvvw, ' OR');
 		}
-		elseif (is_string($sales_serverupdate_servervvvx))
+		elseif (is_string($sales_serverupdate_servervvvw))
 		{
-			$query->where('a.sales_server = ' . $db->quote($sales_serverupdate_servervvvx) . ' OR a.update_server = ' . $db->quote($sales_serverupdate_servervvvx), ' OR');
+			$query->where('a.sales_server = ' . $db->quote($sales_serverupdate_servervvvw) . ' OR a.update_server = ' . $db->quote($sales_serverupdate_servervvvw), ' OR');
 		}
 		else
 		{
@@ -956,6 +956,36 @@ class ComponentbuilderModelServer extends JModelAdmin
 		// Get the encryption object
 		$basic = new FOFEncryptAes($basickey);
 
+		// Encrypt data signature.
+		if (isset($data['signature']) && $basickey)
+		{
+			$data['signature'] = $basic->encryptString($data['signature']);
+		}
+
+		// Encrypt data private_key.
+		if (isset($data['private_key']) && $basickey)
+		{
+			$data['private_key'] = $basic->encryptString($data['private_key']);
+		}
+
+		// Encrypt data secret.
+		if (isset($data['secret']) && $basickey)
+		{
+			$data['secret'] = $basic->encryptString($data['secret']);
+		}
+
+		// Encrypt data password.
+		if (isset($data['password']) && $basickey)
+		{
+			$data['password'] = $basic->encryptString($data['password']);
+		}
+
+		// Encrypt data private.
+		if (isset($data['private']) && $basickey)
+		{
+			$data['private'] = $basic->encryptString($data['private']);
+		}
+
 		// Encrypt data path.
 		if (isset($data['path']) && $basickey)
 		{
@@ -968,48 +998,18 @@ class ComponentbuilderModelServer extends JModelAdmin
 			$data['port'] = $basic->encryptString($data['port']);
 		}
 
-		// Encrypt data password.
-		if (isset($data['password']) && $basickey)
-		{
-			$data['password'] = $basic->encryptString($data['password']);
-		}
-
-		// Encrypt data secret.
-		if (isset($data['secret']) && $basickey)
-		{
-			$data['secret'] = $basic->encryptString($data['secret']);
-		}
-
 		// Encrypt data host.
 		if (isset($data['host']) && $basickey)
 		{
 			$data['host'] = $basic->encryptString($data['host']);
 		}
 
-		// Encrypt data signature.
-		if (isset($data['signature']) && $basickey)
-		{
-			$data['signature'] = $basic->encryptString($data['signature']);
-		}
-
 		// Encrypt data username.
 		if (isset($data['username']) && $basickey)
 		{
 			$data['username'] = $basic->encryptString($data['username']);
 		}
         
-		// Encrypt data private.
-		if (isset($data['private']) && $basickey)
-		{
-			$data['private'] = $basic->encryptString($data['private']);
-		}
-
-		// Encrypt data private_key.
-		if (isset($data['private_key']) && $basickey)
-		{
-			$data['private_key'] = $basic->encryptString($data['private_key']);
-		}
-        
 		// Set the Params Items to data
 		if (isset($data['params']) && is_array($data['params']))
 		{

admin/models/servers.php

@@ -304,6 +304,31 @@ class ComponentbuilderModelServers extends JModelList
 							continue;
 						}
 
+						if ($basickey && !is_numeric($item->signature) && $item->signature === base64_encode(base64_decode($item->signature, true)))
+						{
+							// decrypt signature
+							$item->signature = $basic->decryptString($item->signature);
+						}
+						if ($basickey && !is_numeric($item->private_key) && $item->private_key === base64_encode(base64_decode($item->private_key, true)))
+						{
+							// decrypt private_key
+							$item->private_key = $basic->decryptString($item->private_key);
+						}
+						if ($basickey && !is_numeric($item->secret) && $item->secret === base64_encode(base64_decode($item->secret, true)))
+						{
+							// decrypt secret
+							$item->secret = $basic->decryptString($item->secret);
+						}
+						if ($basickey && !is_numeric($item->password) && $item->password === base64_encode(base64_decode($item->password, true)))
+						{
+							// decrypt password
+							$item->password = $basic->decryptString($item->password);
+						}
+						if ($basickey && !is_numeric($item->private) && $item->private === base64_encode(base64_decode($item->private, true)))
+						{
+							// decrypt private
+							$item->private = $basic->decryptString($item->private);
+						}
 						if ($basickey && !is_numeric($item->path) && $item->path === base64_encode(base64_decode($item->path, true)))
 						{
 							// decrypt path
@@ -314,41 +339,16 @@ class ComponentbuilderModelServers extends JModelList
 							// decrypt port
 							$item->port = $basic->decryptString($item->port);
 						}
-						if ($basickey && !is_numeric($item->password) && $item->password === base64_encode(base64_decode($item->password, true)))
-						{
-							// decrypt password
-							$item->password = $basic->decryptString($item->password);
-						}
-						if ($basickey && !is_numeric($item->secret) && $item->secret === base64_encode(base64_decode($item->secret, true)))
-						{
-							// decrypt secret
-							$item->secret = $basic->decryptString($item->secret);
-						}
 						if ($basickey && !is_numeric($item->host) && $item->host === base64_encode(base64_decode($item->host, true)))
 						{
 							// decrypt host
 							$item->host = $basic->decryptString($item->host);
 						}
-						if ($basickey && !is_numeric($item->signature) && $item->signature === base64_encode(base64_decode($item->signature, true)))
-						{
-							// decrypt signature
-							$item->signature = $basic->decryptString($item->signature);
-						}
 						if ($basickey && !is_numeric($item->username) && $item->username === base64_encode(base64_decode($item->username, true)))
 						{
 							// decrypt username
 							$item->username = $basic->decryptString($item->username);
 						}
-						if ($basickey && !is_numeric($item->private) && $item->private === base64_encode(base64_decode($item->private, true)))
-						{
-							// decrypt private
-							$item->private = $basic->decryptString($item->private);
-						}
-						if ($basickey && !is_numeric($item->private_key) && $item->private_key === base64_encode(base64_decode($item->private_key, true)))
-						{
-							// decrypt private_key
-							$item->private_key = $basic->decryptString($item->private_key);
-						}
 						// unset the values we don't want exported.
 						unset($item->asset_id);
 						unset($item->checked_out);

admin/models/site_view.php

@@ -100,14 +100,6 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 				$item->metadata = $registry->toArray();
 			}
 
-			if (!empty($item->libraries))
-			{
-				// Convert the libraries field to an array.
-				$libraries = new Registry;
-				$libraries->loadString($item->libraries);
-				$item->libraries = $libraries->toArray();
-			}
-
 			if (!empty($item->ajax_input))
 			{
 				// Convert the ajax_input field to an array.
@@ -116,6 +108,14 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 				$item->ajax_input = $ajax_input->toArray();
 			}
 
+			if (!empty($item->libraries))
+			{
+				// Convert the libraries field to an array.
+				$libraries = new Registry;
+				$libraries->loadString($item->libraries);
+				$item->libraries = $libraries->toArray();
+			}
+
 			if (!empty($item->custom_get))
 			{
 				// Convert the custom_get field to an array.
@@ -132,18 +132,18 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 				$item->custom_button = $custom_button->toArray();
 			}
 
-			if (!empty($item->php_jview_display))
-			{
-				// base64 Decode php_jview_display.
-				$item->php_jview_display = base64_decode($item->php_jview_display);
-			}
-
 			if (!empty($item->php_document))
 			{
 				// base64 Decode php_document.
 				$item->php_document = base64_decode($item->php_document);
 			}
 
+			if (!empty($item->php_jview))
+			{
+				// base64 Decode php_jview.
+				$item->php_jview = base64_decode($item->php_jview);
+			}
+
 			if (!empty($item->default))
 			{
 				// base64 Decode default.
@@ -156,16 +156,10 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 				$item->php_view = base64_decode($item->php_view);
 			}
 
-			if (!empty($item->php_jview))
+			if (!empty($item->php_jview_display))
 			{
-				// base64 Decode php_jview.
+				// base64 Decode php_jview_display.
-				$item->php_jview = base64_decode($item->php_jview);
+				$item->php_jview_display = base64_decode($item->php_jview_display);
-			}
-
-			if (!empty($item->php_model))
-			{
-				// base64 Decode php_model.
-				$item->php_model = base64_decode($item->php_model);
 			}
 
 			if (!empty($item->javascript_file))
@@ -204,6 +198,12 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 				$item->php_controller = base64_decode($item->php_controller);
 			}
 
+			if (!empty($item->php_model))
+			{
+				// base64 Decode php_model.
+				$item->php_model = base64_decode($item->php_model);
+			}
+
 
 			if (empty($item->id))
 			{
@@ -985,19 +985,6 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 			$data['system_name'] = $data['name'];
 		}
 
-		// Set the libraries items to data.
-		if (isset($data['libraries']) && is_array($data['libraries']))
-		{
-			$libraries = new JRegistry;
-			$libraries->loadArray($data['libraries']);
-			$data['libraries'] = (string) $libraries;
-		}
-		elseif (!isset($data['libraries']))
-		{
-			// Set the empty libraries to data
-			$data['libraries'] = '';
-		}
-
 		// Set the ajax_input items to data.
 		if (isset($data['ajax_input']) && is_array($data['ajax_input']))
 		{
@@ -1011,6 +998,19 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 			$data['ajax_input'] = '';
 		}
 
+		// Set the libraries items to data.
+		if (isset($data['libraries']) && is_array($data['libraries']))
+		{
+			$libraries = new JRegistry;
+			$libraries->loadArray($data['libraries']);
+			$data['libraries'] = (string) $libraries;
+		}
+		elseif (!isset($data['libraries']))
+		{
+			// Set the empty libraries to data
+			$data['libraries'] = '';
+		}
+
 		// Set the custom_get items to data.
 		if (isset($data['custom_get']) && is_array($data['custom_get']))
 		{
@@ -1037,18 +1037,18 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 			$data['custom_button'] = '';
 		}
 
-		// Set the php_jview_display string to base64 string.
-		if (isset($data['php_jview_display']))
-		{
-			$data['php_jview_display'] = base64_encode($data['php_jview_display']);
-		}
-
 		// Set the php_document string to base64 string.
 		if (isset($data['php_document']))
 		{
 			$data['php_document'] = base64_encode($data['php_document']);
 		}
 
+		// Set the php_jview string to base64 string.
+		if (isset($data['php_jview']))
+		{
+			$data['php_jview'] = base64_encode($data['php_jview']);
+		}
+
 		// Set the default string to base64 string.
 		if (isset($data['default']))
 		{
@@ -1061,16 +1061,10 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 			$data['php_view'] = base64_encode($data['php_view']);
 		}
 
-		// Set the php_jview string to base64 string.
+		// Set the php_jview_display string to base64 string.
-		if (isset($data['php_jview']))
+		if (isset($data['php_jview_display']))
 		{
-			$data['php_jview'] = base64_encode($data['php_jview']);
+			$data['php_jview_display'] = base64_encode($data['php_jview_display']);
-		}
-
-		// Set the php_model string to base64 string.
-		if (isset($data['php_model']))
-		{
-			$data['php_model'] = base64_encode($data['php_model']);
 		}
 
 		// Set the javascript_file string to base64 string.
@@ -1109,6 +1103,12 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 			$data['php_controller'] = base64_encode($data['php_controller']);
 		}
 
+		// Set the php_model string to base64 string.
+		if (isset($data['php_model']))
+		{
+			$data['php_model'] = base64_encode($data['php_model']);
+		}
+        
 		// Set the Params Items to data
 		if (isset($data['params']) && is_array($data['params']))
 		{

admin/models/site_views.php

@@ -266,18 +266,16 @@ class ComponentbuilderModelSite_views extends JModelList
 							continue;
 						}
 
-						// decode php_jview_display
-						$item->php_jview_display = base64_decode($item->php_jview_display);
 						// decode php_document
 						$item->php_document = base64_decode($item->php_document);
+						// decode php_jview
+						$item->php_jview = base64_decode($item->php_jview);
 						// decode default
 						$item->default = base64_decode($item->default);
 						// decode php_view
 						$item->php_view = base64_decode($item->php_view);
-						// decode php_jview
+						// decode php_jview_display
-						$item->php_jview = base64_decode($item->php_jview);
+						$item->php_jview_display = base64_decode($item->php_jview_display);
-						// decode php_model
-						$item->php_model = base64_decode($item->php_model);
 						// decode javascript_file
 						$item->javascript_file = base64_decode($item->javascript_file);
 						// decode js_document
@@ -290,6 +288,8 @@ class ComponentbuilderModelSite_views extends JModelList
 						$item->php_ajaxmethod = base64_decode($item->php_ajaxmethod);
 						// decode php_controller
 						$item->php_controller = base64_decode($item->php_controller);
+						// decode php_model
+						$item->php_model = base64_decode($item->php_model);
 						// unset the values we don't want exported.
 						unset($item->asset_id);
 						unset($item->checked_out);

admin/models/template.php

@@ -103,18 +103,18 @@ class ComponentbuilderModelTemplate extends JModelAdmin
 				$item->libraries = $libraries->toArray();
 			}
 
-			if (!empty($item->template))
-			{
-				// base64 Decode template.
-				$item->template = base64_decode($item->template);
-			}
-
 			if (!empty($item->php_view))
 			{
 				// base64 Decode php_view.
 				$item->php_view = base64_decode($item->php_view);
 			}
 
+			if (!empty($item->template))
+			{
+				// base64 Decode template.
+				$item->template = base64_decode($item->template);
+			}
+			
 			if (!empty($item->id))
 			{
 				$item->tags = new JHelperTags;
@@ -839,18 +839,18 @@ class ComponentbuilderModelTemplate extends JModelAdmin
 			$data['libraries'] = '';
 		}
 
-		// Set the template string to base64 string.
-		if (isset($data['template']))
-		{
-			$data['template'] = base64_encode($data['template']);
-		}
-
 		// Set the php_view string to base64 string.
 		if (isset($data['php_view']))
 		{
 			$data['php_view'] = base64_encode($data['php_view']);
 		}
 
+		// Set the template string to base64 string.
+		if (isset($data['template']))
+		{
+			$data['template'] = base64_encode($data['template']);
+		}
+        
 		// Set the Params Items to data
 		if (isset($data['params']) && is_array($data['params']))
 		{

admin/models/templates.php

@@ -262,10 +262,10 @@ class ComponentbuilderModelTemplates extends JModelList
 							continue;
 						}
 
-						// decode template
-						$item->template = base64_decode($item->template);
 						// decode php_view
 						$item->php_view = base64_decode($item->php_view);
+						// decode template
+						$item->template = base64_decode($item->template);
 						// unset the values we don't want exported.
 						unset($item->asset_id);
 						unset($item->checked_out);

admin/sql/install.mysql.utf8.sql

@@ -97,15 +97,15 @@ 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_mvc_versiondate` (`mvc_versiondate`),
-	KEY `idx_add_placeholders` (`add_placeholders`),
-	KEY `idx_adduikit` (`adduikit`),
-	KEY `idx_update_server_target` (`update_server_target`),
 	KEY `idx_debug_linenr` (`debug_linenr`),
 	KEY `idx_add_email_helper` (`add_email_helper`),
+	KEY `idx_add_placeholders` (`add_placeholders`),
+	KEY `idx_mvc_versiondate` (`mvc_versiondate`),
+	KEY `idx_add_update_server` (`add_update_server`),
+	KEY `idx_adduikit` (`adduikit`),
 	KEY `idx_add_license` (`add_license`),
 	KEY `idx_license_type` (`license_type`),
-	KEY `idx_add_update_server` (`add_update_server`),
+	KEY `idx_update_server_target` (`update_server_target`),
 	KEY `idx_creatuserhelper` (`creatuserhelper`),
 	KEY `idx_addfootable` (`addfootable`),
 	KEY `idx_add_php_helper_both` (`add_php_helper_both`),
@@ -122,8 +122,8 @@ 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_addreadme` (`addreadme`),
 	KEY `idx_emptycontributors` (`emptycontributors`),
+	KEY `idx_addreadme` (`addreadme`),
 	KEY `idx_add_sales_server` (`add_sales_server`)
 ) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
 
@@ -227,25 +227,25 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` (
 	KEY `idx_state` (`published`),
 	KEY `idx_name_single` (`name_single`),
 	KEY `idx_name_list` (`name_list`),
-	KEY `idx_add_php_document` (`add_php_document`),
-	KEY `idx_add_php_postsavehook` (`add_php_postsavehook`),
-	KEY `idx_add_custom_import` (`add_custom_import`),
-	KEY `idx_add_php_before_publish` (`add_php_before_publish`),
-	KEY `idx_type` (`type`),
-	KEY `idx_add_php_batchcopy` (`add_php_batchcopy`),
-	KEY `idx_add_fadein` (`add_fadein`),
-	KEY `idx_add_php_before_delete` (`add_php_before_delete`),
-	KEY `idx_add_php_getitems_after_all` (`add_php_getitems_after_all`),
-	KEY `idx_add_php_before_save` (`add_php_before_save`),
-	KEY `idx_add_php_getitems` (`add_php_getitems`),
-	KEY `idx_add_php_getlistquery` (`add_php_getlistquery`),
-	KEY `idx_add_php_save` (`add_php_save`),
-	KEY `idx_add_php_allowedit` (`add_php_allowedit`),
-	KEY `idx_add_php_batchmove` (`add_php_batchmove`),
 	KEY `idx_add_php_after_publish` (`add_php_after_publish`),
+	KEY `idx_add_php_batchmove` (`add_php_batchmove`),
+	KEY `idx_add_php_allowedit` (`add_php_allowedit`),
+	KEY `idx_add_php_save` (`add_php_save`),
+	KEY `idx_add_php_getlistquery` (`add_php_getlistquery`),
+	KEY `idx_type` (`type`),
+	KEY `idx_add_fadein` (`add_fadein`),
 	KEY `idx_add_php_after_delete` (`add_php_after_delete`),
 	KEY `idx_add_sql` (`add_sql`),
+	KEY `idx_add_php_before_save` (`add_php_before_save`),
+	KEY `idx_add_php_postsavehook` (`add_php_postsavehook`),
+	KEY `idx_add_php_batchcopy` (`add_php_batchcopy`),
+	KEY `idx_add_php_before_publish` (`add_php_before_publish`),
+	KEY `idx_add_php_before_delete` (`add_php_before_delete`),
+	KEY `idx_add_php_document` (`add_php_document`),
 	KEY `idx_add_css_view` (`add_css_view`),
+	KEY `idx_add_custom_import` (`add_custom_import`),
+	KEY `idx_add_php_getitems` (`add_php_getitems`),
+	KEY `idx_add_php_getitems_after_all` (`add_php_getitems_after_all`),
 	KEY `idx_add_css_views` (`add_css_views`),
 	KEY `idx_add_javascript_view_file` (`add_javascript_view_file`),
 	KEY `idx_add_javascript_view_footer` (`add_javascript_view_footer`),
@@ -315,16 +315,16 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_custom_admin_view` (
 	KEY `idx_state` (`published`),
 	KEY `idx_name` (`name`),
 	KEY `idx_codename` (`codename`),
-	KEY `idx_add_css_document` (`add_css_document`),
 	KEY `idx_add_php_ajax` (`add_php_ajax`),
 	KEY `idx_add_css` (`add_css`),
 	KEY `idx_add_js_document` (`add_js_document`),
 	KEY `idx_add_javascript_file` (`add_javascript_file`),
+	KEY `idx_add_css_document` (`add_css_document`),
 	KEY `idx_main_get` (`main_get`),
 	KEY `idx_dynamic_get` (`dynamic_get`),
 	KEY `idx_add_php_document` (`add_php_document`),
-	KEY `idx_add_custom_button` (`add_custom_button`),
 	KEY `idx_add_php_view` (`add_php_view`),
+	KEY `idx_add_custom_button` (`add_custom_button`),
 	KEY `idx_add_php_jview_display` (`add_php_jview_display`),
 	KEY `idx_add_php_jview` (`add_php_jview`)
 ) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
@@ -387,9 +387,9 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_site_view` (
 	KEY `idx_state` (`published`),
 	KEY `idx_name` (`name`),
 	KEY `idx_codename` (`codename`),
-	KEY `idx_add_css_document` (`add_css_document`),
 	KEY `idx_add_php_ajax` (`add_php_ajax`),
 	KEY `idx_add_css` (`add_css`),
+	KEY `idx_add_css_document` (`add_css_document`),
 	KEY `idx_add_javascript_file` (`add_javascript_file`),
 	KEY `idx_add_js_document` (`add_js_document`),
 	KEY `idx_main_get` (`main_get`),
@@ -435,8 +435,8 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_template` (
 	KEY `idx_state` (`published`),
 	KEY `idx_name` (`name`),
 	KEY `idx_alias` (`alias`),
-	KEY `idx_dynamic_get` (`dynamic_get`),
+	KEY `idx_add_php_view` (`add_php_view`),
-	KEY `idx_add_php_view` (`add_php_view`)
+	KEY `idx_dynamic_get` (`dynamic_get`)
 ) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
 
 CREATE TABLE IF NOT EXISTS `#__componentbuilder_layout` (
@@ -531,12 +531,12 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_dynamic_get` (
 	KEY `idx_name` (`name`),
 	KEY `idx_main_source` (`main_source`),
 	KEY `idx_gettype` (`gettype`),
+	KEY `idx_add_php_router_parse` (`add_php_router_parse`),
 	KEY `idx_add_php_after_getitems` (`add_php_after_getitems`),
 	KEY `idx_add_php_before_getitems` (`add_php_before_getitems`),
-	KEY `idx_add_php_before_getitem` (`add_php_before_getitem`),
-	KEY `idx_add_php_router_parse` (`add_php_router_parse`),
-	KEY `idx_add_php_after_getitem` (`add_php_after_getitem`),
 	KEY `idx_add_php_getlistquery` (`add_php_getlistquery`),
+	KEY `idx_add_php_after_getitem` (`add_php_after_getitem`),
+	KEY `idx_add_php_before_getitem` (`add_php_before_getitem`),
 	KEY `idx_getcustom` (`getcustom`),
 	KEY `idx_pagination` (`pagination`)
 ) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
@@ -578,8 +578,8 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_custom_code` (
 	KEY `idx_component` (`component`),
 	KEY `idx_target` (`target`),
 	KEY `idx_type` (`type`),
-	KEY `idx_to_line` (`to_line`),
 	KEY `idx_function_name` (`function_name`),
+	KEY `idx_to_line` (`to_line`),
 	KEY `idx_from_line` (`from_line`)
 ) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
 
@@ -701,15 +701,15 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_field` (
 	KEY `idx_datatype` (`datatype`),
 	KEY `idx_indexes` (`indexes`),
 	KEY `idx_null_switch` (`null_switch`),
-	KEY `idx_datalenght_other` (`datalenght_other`),
-	KEY `idx_datadefault` (`datadefault`),
 	KEY `idx_add_css_view` (`add_css_view`),
-	KEY `idx_datadefault_other` (`datadefault_other`),
+	KEY `idx_catid` (`catid`),
-	KEY `idx_datalenght` (`datalenght`),
-	KEY `idx_add_css_views` (`add_css_views`),
 	KEY `idx_add_javascript_view_footer` (`add_javascript_view_footer`),
 	KEY `idx_add_javascript_views_footer` (`add_javascript_views_footer`),
-	KEY `idx_catid` (`catid`)
+	KEY `idx_add_css_views` (`add_css_views`),
+	KEY `idx_datalenght` (`datalenght`),
+	KEY `idx_datadefault_other` (`datadefault_other`),
+	KEY `idx_datadefault` (`datadefault`),
+	KEY `idx_datalenght_other` (`datalenght_other`)
 ) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
 
 CREATE TABLE IF NOT EXISTS `#__componentbuilder_fieldtype` (
@@ -868,9 +868,9 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_help_document` (
 	KEY `idx_title` (`title`),
 	KEY `idx_type` (`type`),
 	KEY `idx_location` (`location`),
+	KEY `idx_article` (`article`),
 	KEY `idx_target` (`target`),
-	KEY `idx_alias` (`alias`),
+	KEY `idx_alias` (`alias`)
-	KEY `idx_article` (`article`)
 ) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
 
 CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_fields` (

admin/views/fieldtype/view.html.php

@@ -64,7 +64,7 @@ class ComponentbuilderViewFieldtype extends JViewLegacy
 		}
 
 		// Get Linked view data
-		$this->wadfields = $this->get('Wadfields');
+		$this->wacfields = $this->get('Wacfields');
 
 		// Set the toolbar
 		$this->addToolBar();

admin/views/fieldtypes/tmpl/default_body.php

@@ -86,6 +86,9 @@ $edit = "index.php?option=com_componentbuilder&view=fieldtypes&task=fieldtype.ed
 				<div class="name"><?php echo $this->escape($item->name); ?></div>
 			<?php endif; ?>
 		</td>
+		<td class="hidden-phone">
+			<?php echo $this->escape($item->short_description); ?>
+		</td>
 		<td class="nowrap">
 			<?php if ($this->user->authorise('core.edit', 'com_componentbuilder.fieldtypes.category.' . (int)$item->catid)): ?>
 				<a href="index.php?option=com_categories&task=category.edit&id=<?php echo (int)$item->catid; ?>&extension=com_componentbuilder.fieldtypes"><?php echo $this->escape($item->category_title); ?></a>
@@ -93,9 +96,6 @@ $edit = "index.php?option=com_componentbuilder&view=fieldtypes&task=fieldtype.ed
 				<?php echo $this->escape($item->category_title); ?>
 			<?php endif; ?>
 		</td>
-		<td class="hidden-phone">
-			<?php echo $this->escape($item->short_description); ?>
-		</td>
 		<td class="center">
 		<?php if ($canDo->get('fieldtype.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>

admin/views/fieldtypes/tmpl/default_head.php

@@ -46,12 +46,12 @@ defined('_JEXEC') or die('Restricted access');
 	<th class="nowrap" >
 			<?php echo JHtml::_('grid.sort', 'COM_COMPONENTBUILDER_FIELDTYPE_NAME_LABEL', 'name', $this->listDirn, $this->listOrder); ?>
 	</th>
-	<th class="nowrap" >
-			<?php echo JHtml::_('grid.sort', 'COM_COMPONENTBUILDER_FIELDTYPE_FIELDTYPE_CATEGORY', 'catid', $this->listDirn, $this->listOrder); ?>
-	</th>
 	<th class="nowrap hidden-phone" >
 			<?php echo JHtml::_('grid.sort', 'COM_COMPONENTBUILDER_FIELDTYPE_SHORT_DESCRIPTION_LABEL', 'short_description', $this->listDirn, $this->listOrder); ?>
 	</th>
+	<th class="nowrap" >
+			<?php echo JHtml::_('grid.sort', 'COM_COMPONENTBUILDER_FIELDTYPE_FIELDTYPE_CATEGORY', 'catid', $this->listDirn, $this->listOrder); ?>
+	</th>
 	<?php if ($this->canState): ?>
 		<th width="10" class="nowrap center" >
 			<?php echo JHtml::_('grid.sort', 'COM_COMPONENTBUILDER_FIELDTYPE_STATUS', 'published', $this->listDirn, $this->listOrder); ?>

admin/views/fieldtypes/view.html.php

@@ -263,8 +263,8 @@ class ComponentbuilderViewFieldtypes extends JViewLegacy
 			'a.sorting' => JText::_('JGRID_HEADING_ORDERING'),
 			'a.published' => JText::_('JSTATUS'),
 			'a.name' => JText::_('COM_COMPONENTBUILDER_FIELDTYPE_NAME_LABEL'),
-			'c.category_title' => JText::_('COM_COMPONENTBUILDER_FIELDTYPE_FIELDTYPE_CATEGORY'),
 			'a.short_description' => JText::_('COM_COMPONENTBUILDER_FIELDTYPE_SHORT_DESCRIPTION_LABEL'),
+			'c.category_title' => JText::_('COM_COMPONENTBUILDER_FIELDTYPE_FIELDTYPE_CATEGORY'),
 			'a.id' => JText::_('JGRID_HEADING_ID')
 		);
 	}

admin/views/joomla_component/tmpl/edit.php

@@ -187,18 +187,6 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 		</div>
 	<?php echo JHtml::_('bootstrap.endTab'); ?>
 
-	<?php if ($this->canDo->get('language_translation.access')) : ?>
-	<?php echo JHtml::_('bootstrap.addTab', 'joomla_componentTab', 'translation', JText::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TRANSLATION', true)); ?>
-		<div class="row-fluid form-horizontal-desktop">
-		</div>
-		<div class="row-fluid form-horizontal-desktop">
-			<div class="span12">
-				<?php echo JLayoutHelper::render('joomla_component.translation_fullwidth', $this); ?>
-			</div>
-		</div>
-	<?php echo JHtml::_('bootstrap.endTab'); ?>
-	<?php endif; ?>
-
 	<?php if ($this->canDo->get('joomla_component.delete') || $this->canDo->get('joomla_component.edit.created_by') || $this->canDo->get('joomla_component.edit.state') || $this->canDo->get('joomla_component.edit.created')) : ?>
 	<?php echo JHtml::_('bootstrap.addTab', 'joomla_componentTab', 'publishing', JText::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PUBLISHING', true)); ?>
 		<div class="row-fluid form-horizontal-desktop">

admin/views/joomla_component/view.html.php

@@ -63,9 +63,6 @@ class ComponentbuilderViewJoomla_component extends JViewLegacy
 			$this->referral = '&ref='.(string)$this->ref;
 		}
 
-		// Get Linked view data
-		$this->vwntranslation = $this->get('Vwntranslation');
-
 		// Set the toolbar
 		$this->addToolBar();
 		
@@ -200,16 +197,6 @@ class ComponentbuilderViewJoomla_component extends JViewLegacy
 		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/joomla_component.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
 		// Add Ajax Token
 		$this->document->addScriptDeclaration("var token = '".JSession::getFormToken()."';"); 
-
-		// Add the CSS for Footable
-		$this->document->addStyleSheet('https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css');
-		$this->document->addStyleSheet(JURI::root() .'media/com_componentbuilder/footable-v3/css/footable.standalone.min.css', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
-		// Add the JavaScript for Footable (adding all funtions)
-		$this->document->addScript(JURI::root() .'media/com_componentbuilder/footable-v3/js/footable.min.js', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
-
-		$footable = "jQuery(document).ready(function() { jQuery(function () { jQuery('.footable').footable();});});";
-		$this->document->addScriptDeclaration($footable);
-
 		$this->document->addScript(JURI::root() . $this->script, (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
 		$this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/joomla_component/submitbutton.js", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); 
 

admin/views/server/view.html.php

@@ -64,7 +64,7 @@ class ComponentbuilderViewServer extends JViewLegacy
 		}
 
 		// Get Linked view data
-		$this->wanlinked_components = $this->get('Wanlinked_components');
+		$this->wamlinked_components = $this->get('Wamlinked_components');
 
 		// Set the toolbar
 		$this->addToolBar();

script.php

@@ -3210,9 +3210,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": "readme","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_postflight_install":"php_postflight_install","php_site_event":"php_site_event","update_server":"update_server","mvc_versiondate":"mvc_versiondate","readme":"readme","description":"description","copyright":"copyright","css_admin":"css_admin","add_placeholders":"add_placeholders","php_preflight_install":"php_preflight_install","adduikit":"adduikit","php_method_uninstall":"php_method_uninstall","php_helper_both":"php_helper_both","update_server_target":"update_server_target","php_admin_event":"php_admin_event","debug_linenr":"debug_linenr","email":"email","add_email_helper":"add_email_helper","website":"website","php_helper_admin":"php_helper_admin","add_license":"add_license","php_helper_site":"php_helper_site","license_type":"license_type","javascript":"javascript","css_site":"css_site","whmcs_key":"whmcs_key","whmcs_url":"whmcs_url","php_preflight_update":"php_preflight_update","license":"license","php_postflight_update":"php_postflight_update","bom":"bom","sql":"sql","image":"image","add_update_server":"add_update_server","buildcomp":"buildcomp","sales_server":"sales_server","not_required":"not_required","name":"name","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","export_package_link":"export_package_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","addreadme":"addreadme","emptycontributors":"emptycontributors","number":"number","update_server_url":"update_server_url","add_sales_server":"add_sales_server","buildcompsql":"buildcompsql"}}';
+			$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": "readme","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_postflight_update":"php_postflight_update","php_preflight_update":"php_preflight_update","javascript":"javascript","css_site":"css_site","debug_linenr":"debug_linenr","add_email_helper":"add_email_helper","copyright":"copyright","add_placeholders":"add_placeholders","description":"description","mvc_versiondate":"mvc_versiondate","sql":"sql","php_helper_admin":"php_helper_admin","add_update_server":"add_update_server","php_helper_site":"php_helper_site","sales_server":"sales_server","adduikit":"adduikit","email":"email","php_helper_both":"php_helper_both","website":"website","php_admin_event":"php_admin_event","add_license":"add_license","php_site_event":"php_site_event","license_type":"license_type","css_admin":"css_admin","whmcs_key":"whmcs_key","php_preflight_install":"php_preflight_install","whmcs_url":"whmcs_url","php_postflight_install":"php_postflight_install","license":"license","php_method_uninstall":"php_method_uninstall","bom":"bom","readme":"readme","image":"image","update_server_target":"update_server_target","not_required":"not_required","update_server":"update_server","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","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","export_package_link":"export_package_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","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","update_server","mvc_versiondate","add_placeholders","adduikit","update_server_target","debug_linenr","add_email_helper","add_license","license_type","add_update_server","buildcomp","sales_server","not_required","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","addreadme","emptycontributors","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": "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","debug_linenr","add_email_helper","add_placeholders","mvc_versiondate","add_update_server","sales_server","adduikit","add_license","license_type","update_server_target","not_required","update_server","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","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);
@@ -3222,9 +3222,9 @@ class com_componentbuilderInstallerScript
 			$admin_view->type_title = 'Componentbuilder Admin_view';
 			$admin_view->type_alias = 'com_componentbuilder.admin_view';
 			$admin_view->table = '{"special": {"dbtable": "#__componentbuilder_admin_view","key": "id","type": "Admin_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","name_list":"name_list","short_description":"short_description","icon":"icon","add_php_document":"add_php_document","icon_category":"icon_category","icon_add":"icon_add","add_php_postsavehook":"add_php_postsavehook","add_custom_import":"add_custom_import","add_php_before_publish":"add_php_before_publish","type":"type","description":"description","add_php_batchcopy":"add_php_batchcopy","add_fadein":"add_fadein","add_php_before_delete":"add_php_before_delete","add_php_getitems_after_all":"add_php_getitems_after_all","php_import_headers":"php_import_headers","add_php_before_save":"add_php_before_save","add_php_getitems":"add_php_getitems","not_required":"not_required","add_php_getlistquery":"add_php_getlistquery","add_php_save":"add_php_save","add_php_allowedit":"add_php_allowedit","add_php_batchmove":"add_php_batchmove","add_php_after_publish":"add_php_after_publish","add_php_after_delete":"add_php_after_delete","add_sql":"add_sql","html_import_view":"html_import_view","php_import_save":"php_import_save","add_css_view":"add_css_view","php_getitem":"php_getitem","css_view":"css_view","php_getitems":"php_getitems","add_css_views":"add_css_views","php_getitems_after_all":"php_getitems_after_all","css_views":"css_views","php_getlistquery":"php_getlistquery","add_javascript_view_file":"add_javascript_view_file","php_before_save":"php_before_save","javascript_view_file":"javascript_view_file","php_save":"php_save","add_javascript_view_footer":"add_javascript_view_footer","php_postsavehook":"php_postsavehook","javascript_view_footer":"javascript_view_footer","php_allowedit":"php_allowedit","add_javascript_views_file":"add_javascript_views_file","php_batchcopy":"php_batchcopy","javascript_views_file":"javascript_views_file","php_batchmove":"php_batchmove","add_javascript_views_footer":"add_javascript_views_footer","php_before_publish":"php_before_publish","javascript_views_footer":"javascript_views_footer","php_after_publish":"php_after_publish","add_custom_button":"add_custom_button","php_before_delete":"php_before_delete","php_after_delete":"php_after_delete","php_controller":"php_controller","php_document":"php_document","php_model":"php_model","source":"source","php_controller_list":"php_controller_list","sql":"sql","php_model_list":"php_model_list","add_php_ajax":"add_php_ajax","php_import_display":"php_import_display","php_ajaxmethod":"php_ajaxmethod","php_import":"php_import","php_import_setdata":"php_import_setdata","add_php_getitem":"add_php_getitem","php_import_ext":"php_import_ext"}}';
+			$admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","name_list":"name_list","short_description":"short_description","add_php_after_publish":"add_php_after_publish","add_php_batchmove":"add_php_batchmove","add_php_allowedit":"add_php_allowedit","add_php_save":"add_php_save","add_php_getlistquery":"add_php_getlistquery","php_import_save":"php_import_save","type":"type","add_fadein":"add_fadein","description":"description","icon_category":"icon_category","add_php_after_delete":"add_php_after_delete","not_required":"not_required","add_sql":"add_sql","html_import_view":"html_import_view","icon_add":"icon_add","add_php_before_save":"add_php_before_save","add_php_postsavehook":"add_php_postsavehook","add_php_batchcopy":"add_php_batchcopy","add_php_before_publish":"add_php_before_publish","add_php_before_delete":"add_php_before_delete","add_php_document":"add_php_document","add_css_view":"add_css_view","add_custom_import":"add_custom_import","add_php_getitems":"add_php_getitems","php_import_headers":"php_import_headers","add_php_getitems_after_all":"add_php_getitems_after_all","css_view":"css_view","icon":"icon","php_getitems":"php_getitems","add_css_views":"add_css_views","php_getitems_after_all":"php_getitems_after_all","css_views":"css_views","php_getlistquery":"php_getlistquery","add_javascript_view_file":"add_javascript_view_file","php_before_save":"php_before_save","javascript_view_file":"javascript_view_file","php_save":"php_save","add_javascript_view_footer":"add_javascript_view_footer","php_postsavehook":"php_postsavehook","javascript_view_footer":"javascript_view_footer","php_allowedit":"php_allowedit","add_javascript_views_file":"add_javascript_views_file","php_batchcopy":"php_batchcopy","javascript_views_file":"javascript_views_file","php_batchmove":"php_batchmove","add_javascript_views_footer":"add_javascript_views_footer","php_before_publish":"php_before_publish","javascript_views_footer":"javascript_views_footer","php_after_publish":"php_after_publish","add_custom_button":"add_custom_button","php_before_delete":"php_before_delete","php_after_delete":"php_after_delete","php_controller":"php_controller","php_document":"php_document","php_model":"php_model","source":"source","php_controller_list":"php_controller_list","sql":"sql","php_model_list":"php_model_list","add_php_ajax":"add_php_ajax","php_import_display":"php_import_display","php_ajaxmethod":"php_ajaxmethod","php_import":"php_import","php_import_setdata":"php_import_setdata","add_php_getitem":"add_php_getitem","php_import_ext":"php_import_ext","php_getitem":"php_getitem"}}';
 			$admin_view->router = 'ComponentbuilderHelperRoute::getAdmin_viewRoute';
-			$admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.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","add_php_document","add_php_postsavehook","add_custom_import","add_php_before_publish","type","add_php_batchcopy","add_fadein","add_php_before_delete","add_php_getitems_after_all","add_php_before_save","add_php_getitems","not_required","add_php_getlistquery","add_php_save","add_php_allowedit","add_php_batchmove","add_php_after_publish","add_php_after_delete","add_sql","add_css_view","add_css_views","add_javascript_view_file","add_javascript_view_footer","add_javascript_views_file","add_javascript_views_footer","add_custom_button","source","add_php_ajax","add_php_getitem"],"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"}]}';
+			$admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.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","add_php_after_publish","add_php_batchmove","add_php_allowedit","add_php_save","add_php_getlistquery","type","add_fadein","add_php_after_delete","not_required","add_sql","add_php_before_save","add_php_postsavehook","add_php_batchcopy","add_php_before_publish","add_php_before_delete","add_php_document","add_css_view","add_custom_import","add_php_getitems","add_php_getitems_after_all","add_css_views","add_javascript_view_file","add_javascript_view_footer","add_javascript_views_file","add_javascript_views_footer","add_custom_button","source","add_php_ajax","add_php_getitem"],"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"}]}';
 
 			// Set the object into the content types table.
 			$admin_view_Inserted = $db->insertObject('#__content_types', $admin_view);
@@ -3234,9 +3234,9 @@ class com_componentbuilderInstallerScript
 			$custom_admin_view->type_title = 'Componentbuilder Custom_admin_view';
 			$custom_admin_view->type_alias = 'com_componentbuilder.custom_admin_view';
 			$custom_admin_view->table = '{"special": {"dbtable": "#__componentbuilder_custom_admin_view","key": "id","type": "Custom_admin_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$custom_admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name":"name","codename":"codename","description":"description","snippet":"snippet","add_css_document":"add_css_document","icon":"icon","libraries":"libraries","add_php_ajax":"add_php_ajax","php_document":"php_document","php_jview_display":"php_jview_display","add_css":"add_css","php_view":"php_view","add_js_document":"add_js_document","php_jview":"php_jview","default":"default","add_javascript_file":"add_javascript_file","js_document":"js_document","not_required":"not_required","javascript_file":"javascript_file","custom_get":"custom_get","css_document":"css_document","main_get":"main_get","css":"css","dynamic_get":"dynamic_get","php_ajaxmethod":"php_ajaxmethod","add_php_document":"add_php_document","add_custom_button":"add_custom_button","add_php_view":"add_php_view","add_php_jview_display":"add_php_jview_display","php_controller":"php_controller","add_php_jview":"add_php_jview","php_model":"php_model"}}';
+			$custom_admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name":"name","codename":"codename","description":"description","snippet":"snippet","php_jview_display":"php_jview_display","php_view":"php_view","php_document":"php_document","add_php_ajax":"add_php_ajax","add_css":"add_css","add_js_document":"add_js_document","default":"default","icon":"icon","php_jview":"php_jview","add_javascript_file":"add_javascript_file","libraries":"libraries","js_document":"js_document","add_css_document":"add_css_document","javascript_file":"javascript_file","not_required":"not_required","css_document":"css_document","custom_get":"custom_get","css":"css","main_get":"main_get","php_ajaxmethod":"php_ajaxmethod","dynamic_get":"dynamic_get","add_php_document":"add_php_document","add_php_view":"add_php_view","add_custom_button":"add_custom_button","add_php_jview_display":"add_php_jview_display","add_php_jview":"add_php_jview","php_controller":"php_controller","php_model":"php_model"}}';
 			$custom_admin_view->router = 'ComponentbuilderHelperRoute::getCustom_admin_viewRoute';
-			$custom_admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/custom_admin_view.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","snippet","add_css_document","add_php_ajax","add_css","add_js_document","add_javascript_file","not_required","main_get","dynamic_get","add_php_document","add_custom_button","add_php_view","add_php_jview_display","add_php_jview"],"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": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "custom_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "main_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"}]}';
+			$custom_admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/custom_admin_view.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","snippet","add_php_ajax","add_css","add_js_document","add_javascript_file","add_css_document","not_required","main_get","dynamic_get","add_php_document","add_php_view","add_custom_button","add_php_jview_display","add_php_jview"],"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": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "custom_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "main_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"}]}';
 
 			// Set the object into the content types table.
 			$custom_admin_view_Inserted = $db->insertObject('#__content_types', $custom_admin_view);
@@ -3246,9 +3246,9 @@ class com_componentbuilderInstallerScript
 			$site_view->type_title = 'Componentbuilder Site_view';
 			$site_view->type_alias = 'com_componentbuilder.site_view';
 			$site_view->table = '{"special": {"dbtable": "#__componentbuilder_site_view","key": "id","type": "Site_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$site_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name":"name","codename":"codename","description":"description","snippet":"snippet","add_css_document":"add_css_document","libraries":"libraries","add_php_ajax":"add_php_ajax","php_jview_display":"php_jview_display","php_document":"php_document","add_css":"add_css","default":"default","php_view":"php_view","add_javascript_file":"add_javascript_file","php_jview":"php_jview","add_js_document":"add_js_document","php_model":"php_model","not_required":"not_required","javascript_file":"javascript_file","custom_get":"custom_get","js_document":"js_document","main_get":"main_get","css_document":"css_document","dynamic_get":"dynamic_get","css":"css","php_ajaxmethod":"php_ajaxmethod","add_custom_button":"add_custom_button","add_php_document":"add_php_document","button_position":"button_position","add_php_view":"add_php_view","add_php_jview_display":"add_php_jview_display","add_php_jview":"add_php_jview","php_controller":"php_controller"}}';
+			$site_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name":"name","codename":"codename","description":"description","snippet":"snippet","php_document":"php_document","add_php_ajax":"add_php_ajax","add_css":"add_css","add_css_document":"add_css_document","libraries":"libraries","php_jview":"php_jview","default":"default","php_view":"php_view","add_javascript_file":"add_javascript_file","php_jview_display":"php_jview_display","add_js_document":"add_js_document","not_required":"not_required","javascript_file":"javascript_file","custom_get":"custom_get","js_document":"js_document","main_get":"main_get","css_document":"css_document","dynamic_get":"dynamic_get","css":"css","php_ajaxmethod":"php_ajaxmethod","add_custom_button":"add_custom_button","add_php_document":"add_php_document","button_position":"button_position","add_php_view":"add_php_view","add_php_jview_display":"add_php_jview_display","add_php_jview":"add_php_jview","php_controller":"php_controller","php_model":"php_model"}}';
 			$site_view->router = 'ComponentbuilderHelperRoute::getSite_viewRoute';
-			$site_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/site_view.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","snippet","add_css_document","add_php_ajax","add_css","add_javascript_file","add_js_document","not_required","main_get","dynamic_get","add_custom_button","add_php_document","button_position","add_php_view","add_php_jview_display","add_php_jview"],"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": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "custom_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "main_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"}]}';
+			$site_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/site_view.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","snippet","add_php_ajax","add_css","add_css_document","add_javascript_file","add_js_document","not_required","main_get","dynamic_get","add_custom_button","add_php_document","button_position","add_php_view","add_php_jview_display","add_php_jview"],"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": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "custom_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "main_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"}]}';
 
 			// Set the object into the content types table.
 			$site_view_Inserted = $db->insertObject('#__content_types', $site_view);
@@ -3258,9 +3258,9 @@ class com_componentbuilderInstallerScript
 			$template->type_title = 'Componentbuilder Template';
 			$template->type_alias = 'com_componentbuilder.template';
 			$template->table = '{"special": {"dbtable": "#__componentbuilder_template","key": "id","type": "Template","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$template->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","alias":"alias","description":"description","snippet":"snippet","dynamic_get":"dynamic_get","libraries":"libraries","add_php_view":"add_php_view","not_required":"not_required","template":"template","php_view":"php_view"}}';
+			$template->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","alias":"alias","description":"description","snippet":"snippet","php_view":"php_view","add_php_view":"add_php_view","dynamic_get":"dynamic_get","not_required":"not_required","template":"template","libraries":"libraries"}}';
 			$template->router = 'ComponentbuilderHelperRoute::getTemplateRoute';
-			$template->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/template.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","snippet","dynamic_get","add_php_view","not_required"],"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": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"}]}';
+			$template->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/template.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","snippet","add_php_view","dynamic_get","not_required"],"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": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"}]}';
 
 			// Set the object into the content types table.
 			$template_Inserted = $db->insertObject('#__content_types', $template);
@@ -3270,7 +3270,7 @@ class com_componentbuilderInstallerScript
 			$layout->type_title = 'Componentbuilder Layout';
 			$layout->type_alias = 'com_componentbuilder.layout';
 			$layout->table = '{"special": {"dbtable": "#__componentbuilder_layout","key": "id","type": "Layout","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$layout->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","alias":"alias","description":"description","dynamic_get":"dynamic_get","snippet":"snippet","layout":"layout","add_php_view":"add_php_view","libraries":"libraries","not_required":"not_required","php_view":"php_view"}}';
+			$layout->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","alias":"alias","description":"description","dynamic_get":"dynamic_get","snippet":"snippet","php_view":"php_view","add_php_view":"add_php_view","not_required":"not_required","layout":"layout","libraries":"libraries"}}';
 			$layout->router = 'ComponentbuilderHelperRoute::getLayoutRoute';
 			$layout->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/layout.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","dynamic_get","snippet","add_php_view","not_required"],"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": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"}]}';
 
@@ -3282,9 +3282,9 @@ class com_componentbuilderInstallerScript
 			$dynamic_get->type_title = 'Componentbuilder Dynamic_get';
 			$dynamic_get->type_alias = 'com_componentbuilder.dynamic_get';
 			$dynamic_get->table = '{"special": {"dbtable": "#__componentbuilder_dynamic_get","key": "id","type": "Dynamic_get","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$dynamic_get->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","main_source":"main_source","gettype":"gettype","db_table_main":"db_table_main","db_selection":"db_selection","addcalculation":"addcalculation","php_custom_get":"php_custom_get","add_php_after_getitems":"add_php_after_getitems","view_table_main":"view_table_main","view_selection":"view_selection","add_php_before_getitems":"add_php_before_getitems","add_php_before_getitem":"add_php_before_getitem","add_php_router_parse":"add_php_router_parse","add_php_after_getitem":"add_php_after_getitem","add_php_getlistquery":"add_php_getlistquery","getcustom":"getcustom","php_before_getitem":"php_before_getitem","pagination":"pagination","php_after_getitem":"php_after_getitem","not_required":"not_required","php_getlistquery":"php_getlistquery","php_before_getitems":"php_before_getitems","php_after_getitems":"php_after_getitems","php_router_parse":"php_router_parse","php_calculation":"php_calculation"}}';
+			$dynamic_get->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","main_source":"main_source","gettype":"gettype","addcalculation":"addcalculation","add_php_router_parse":"add_php_router_parse","add_php_after_getitems":"add_php_after_getitems","add_php_before_getitems":"add_php_before_getitems","add_php_getlistquery":"add_php_getlistquery","add_php_after_getitem":"add_php_after_getitem","add_php_before_getitem":"add_php_before_getitem","php_custom_get":"php_custom_get","db_selection":"db_selection","db_table_main":"db_table_main","view_selection":"view_selection","view_table_main":"view_table_main","getcustom":"getcustom","php_before_getitem":"php_before_getitem","pagination":"pagination","php_after_getitem":"php_after_getitem","not_required":"not_required","php_getlistquery":"php_getlistquery","php_before_getitems":"php_before_getitems","php_after_getitems":"php_after_getitems","php_router_parse":"php_router_parse","php_calculation":"php_calculation"}}';
 			$dynamic_get->router = 'ComponentbuilderHelperRoute::getDynamic_getRoute';
-			$dynamic_get->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/dynamic_get.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","main_source","gettype","add_php_after_getitems","view_table_main","add_php_before_getitems","add_php_before_getitem","add_php_router_parse","add_php_after_getitem","add_php_getlistquery","pagination","not_required"],"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": "view_table_main","targetTable": "#__componentbuilder_admin_view","targetColumn": "id","displayColumn": "system_name"}]}';
+			$dynamic_get->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/dynamic_get.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","main_source","gettype","add_php_router_parse","add_php_after_getitems","add_php_before_getitems","add_php_getlistquery","add_php_after_getitem","add_php_before_getitem","view_table_main","pagination","not_required"],"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": "view_table_main","targetTable": "#__componentbuilder_admin_view","targetColumn": "id","displayColumn": "system_name"}]}';
 
 			// Set the object into the content types table.
 			$dynamic_get_Inserted = $db->insertObject('#__content_types', $dynamic_get);
@@ -3294,7 +3294,7 @@ class com_componentbuilderInstallerScript
 			$custom_code->type_title = 'Componentbuilder Custom_code';
 			$custom_code->type_alias = 'com_componentbuilder.custom_code';
 			$custom_code->table = '{"special": {"dbtable": "#__componentbuilder_custom_code","key": "id","type": "Custom_code","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$custom_code->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "component","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"component":"component","path":"path","target":"target","type":"type","comment_type":"comment_type","hashtarget":"hashtarget","code":"code","hashendtarget":"hashendtarget","to_line":"to_line","function_name":"function_name","from_line":"from_line","system_name":"system_name","not_required":"not_required"}}';
+			$custom_code->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "component","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"component":"component","path":"path","target":"target","type":"type","comment_type":"comment_type","not_required":"not_required","function_name":"function_name","system_name":"system_name","code":"code","hashendtarget":"hashendtarget","to_line":"to_line","from_line":"from_line","hashtarget":"hashtarget"}}';
 			$custom_code->router = 'ComponentbuilderHelperRoute::getCustom_codeRoute';
 			$custom_code->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/custom_code.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","component","target","type","comment_type","not_required"],"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": "component","targetTable": "#__componentbuilder_joomla_component","targetColumn": "id","displayColumn": "system_name"}]}';
 
@@ -3306,7 +3306,7 @@ class com_componentbuilderInstallerScript
 			$library->type_title = 'Componentbuilder Library';
 			$library->type_alias = 'com_componentbuilder.library';
 			$library->table = '{"special": {"dbtable": "#__componentbuilder_library","key": "id","type": "Library","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$library->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","description":"description","how":"how","type":"type","php_setdocument":"php_setdocument","libraries":"libraries","not_required":"not_required"}}';
+			$library->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","description":"description","how":"how","type":"type","not_required":"not_required","libraries":"libraries","php_setdocument":"php_setdocument"}}';
 			$library->router = 'ComponentbuilderHelperRoute::getLibraryRoute';
 			$library->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/library.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","how","type","not_required"],"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": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"}]}';
 
@@ -3318,7 +3318,7 @@ class com_componentbuilderInstallerScript
 			$snippet->type_title = 'Componentbuilder Snippet';
 			$snippet->type_alias = 'com_componentbuilder.snippet';
 			$snippet->table = '{"special": {"dbtable": "#__componentbuilder_snippet","key": "id","type": "Snippet","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$snippet->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","url":"url","type":"type","heading":"heading","library":"library","contributor_email":"contributor_email","contributor_website":"contributor_website","usage":"usage","snippet":"snippet","description":"description","contributor_name":"contributor_name","contributor_company":"contributor_company"}}';
+			$snippet->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","url":"url","type":"type","heading":"heading","library":"library","contributor_email":"contributor_email","contributor_name":"contributor_name","contributor_website":"contributor_website","contributor_company":"contributor_company","snippet":"snippet","usage":"usage","description":"description"}}';
 			$snippet->router = 'ComponentbuilderHelperRoute::getSnippetRoute';
 			$snippet->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/snippet.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","type","library"],"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": "type","targetTable": "#__componentbuilder_snippet_type","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "library","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"}]}';
 
@@ -3330,9 +3330,9 @@ class com_componentbuilderInstallerScript
 			$field->type_title = 'Componentbuilder Field';
 			$field->type_alias = 'com_componentbuilder.field';
 			$field->table = '{"special": {"dbtable": "#__componentbuilder_field","key": "id","type": "Field","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$field->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "catid","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","fieldtype":"fieldtype","datatype":"datatype","indexes":"indexes","null_switch":"null_switch","datalenght_other":"datalenght_other","datadefault":"datadefault","add_css_view":"add_css_view","datadefault_other":"datadefault_other","datalenght":"datalenght","add_css_views":"add_css_views","add_javascript_view_footer":"add_javascript_view_footer","xml":"xml","add_javascript_views_footer":"add_javascript_views_footer","not_required":"not_required","css_view":"css_view","css_views":"css_views","store":"store","javascript_view_footer":"javascript_view_footer","javascript_views_footer":"javascript_views_footer"}}';
+			$field->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "catid","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","fieldtype":"fieldtype","datatype":"datatype","indexes":"indexes","null_switch":"null_switch","add_css_view":"add_css_view","css_view":"css_view","not_required":"not_required","xml":"xml","add_javascript_view_footer":"add_javascript_view_footer","add_javascript_views_footer":"add_javascript_views_footer","add_css_views":"add_css_views","datalenght":"datalenght","datadefault_other":"datadefault_other","datadefault":"datadefault","datalenght_other":"datalenght_other","css_views":"css_views","store":"store","javascript_view_footer":"javascript_view_footer","javascript_views_footer":"javascript_views_footer"}}';
 			$field->router = 'ComponentbuilderHelperRoute::getFieldRoute';
-			$field->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/field.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","fieldtype","add_css_view","add_css_views","add_javascript_view_footer","add_javascript_views_footer","not_required","catid","store"],"displayLookup": [{"sourceColumn": "catid","targetTable": "#__categories","targetColumn": "id","displayColumn": "title"},{"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": "fieldtype","targetTable": "#__componentbuilder_fieldtype","targetColumn": "id","displayColumn": "name"}]}';
+			$field->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/field.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","fieldtype","add_css_view","not_required","catid","add_javascript_view_footer","add_javascript_views_footer","add_css_views","store"],"displayLookup": [{"sourceColumn": "catid","targetTable": "#__categories","targetColumn": "id","displayColumn": "title"},{"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": "fieldtype","targetTable": "#__componentbuilder_fieldtype","targetColumn": "id","displayColumn": "name"}]}';
 
 			// Set the object into the content types table.
 			$field_Inserted = $db->insertObject('#__content_types', $field);
@@ -3402,9 +3402,9 @@ class com_componentbuilderInstallerScript
 			$server->type_title = 'Componentbuilder Server';
 			$server->type_alias = 'com_componentbuilder.server';
 			$server->table = '{"special": {"dbtable": "#__componentbuilder_server","key": "id","type": "Server","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$server->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","protocol":"protocol","path":"path","port":"port","authentication":"authentication","password":"password","secret":"secret","host":"host","signature":"signature","username":"username","not_required":"not_required","private":"private","private_key":"private_key"}}';
+			$server->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","protocol":"protocol","not_required":"not_required","signature":"signature","private_key":"private_key","secret":"secret","password":"password","private":"private","authentication":"authentication","path":"path","port":"port","host":"host","username":"username"}}';
 			$server->router = 'ComponentbuilderHelperRoute::getServerRoute';
-			$server->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/server.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","protocol","authentication","not_required"],"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"}]}';
+			$server->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/server.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","protocol","not_required","authentication"],"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"}]}';
 
 			// Set the object into the content types table.
 			$server_Inserted = $db->insertObject('#__content_types', $server);
@@ -3414,9 +3414,9 @@ class com_componentbuilderInstallerScript
 			$help_document->type_title = 'Componentbuilder Help_document';
 			$help_document->type_alias = 'com_componentbuilder.help_document';
 			$help_document->table = '{"special": {"dbtable": "#__componentbuilder_help_document","key": "id","type": "Help_document","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$help_document->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "title","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "content","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"title":"title","type":"type","groups":"groups","location":"location","admin_view":"admin_view","site_view":"site_view","target":"target","content":"content","alias":"alias","article":"article","url":"url","not_required":"not_required"}}';
+			$help_document->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "title","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "content","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"title":"title","type":"type","groups":"groups","location":"location","admin_view":"admin_view","site_view":"site_view","not_required":"not_required","content":"content","article":"article","url":"url","target":"target","alias":"alias"}}';
 			$help_document->router = 'ComponentbuilderHelperRoute::getHelp_documentRoute';
-			$help_document->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/help_document.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","type","location","target","article","not_required"],"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": "article","targetTable": "#__content","targetColumn": "id","displayColumn": "title"}]}';
+			$help_document->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/help_document.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","type","location","not_required","article","target"],"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": "article","targetTable": "#__content","targetColumn": "id","displayColumn": "title"}]}';
 
 			// Set the object into the content types table.
 			$help_document_Inserted = $db->insertObject('#__content_types', $help_document);
@@ -3620,9 +3620,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": "readme","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_postflight_install":"php_postflight_install","php_site_event":"php_site_event","update_server":"update_server","mvc_versiondate":"mvc_versiondate","readme":"readme","description":"description","copyright":"copyright","css_admin":"css_admin","add_placeholders":"add_placeholders","php_preflight_install":"php_preflight_install","adduikit":"adduikit","php_method_uninstall":"php_method_uninstall","php_helper_both":"php_helper_both","update_server_target":"update_server_target","php_admin_event":"php_admin_event","debug_linenr":"debug_linenr","email":"email","add_email_helper":"add_email_helper","website":"website","php_helper_admin":"php_helper_admin","add_license":"add_license","php_helper_site":"php_helper_site","license_type":"license_type","javascript":"javascript","css_site":"css_site","whmcs_key":"whmcs_key","whmcs_url":"whmcs_url","php_preflight_update":"php_preflight_update","license":"license","php_postflight_update":"php_postflight_update","bom":"bom","sql":"sql","image":"image","add_update_server":"add_update_server","buildcomp":"buildcomp","sales_server":"sales_server","not_required":"not_required","name":"name","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","export_package_link":"export_package_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","addreadme":"addreadme","emptycontributors":"emptycontributors","number":"number","update_server_url":"update_server_url","add_sales_server":"add_sales_server","buildcompsql":"buildcompsql"}}';
+			$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": "readme","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_postflight_update":"php_postflight_update","php_preflight_update":"php_preflight_update","javascript":"javascript","css_site":"css_site","debug_linenr":"debug_linenr","add_email_helper":"add_email_helper","copyright":"copyright","add_placeholders":"add_placeholders","description":"description","mvc_versiondate":"mvc_versiondate","sql":"sql","php_helper_admin":"php_helper_admin","add_update_server":"add_update_server","php_helper_site":"php_helper_site","sales_server":"sales_server","adduikit":"adduikit","email":"email","php_helper_both":"php_helper_both","website":"website","php_admin_event":"php_admin_event","add_license":"add_license","php_site_event":"php_site_event","license_type":"license_type","css_admin":"css_admin","whmcs_key":"whmcs_key","php_preflight_install":"php_preflight_install","whmcs_url":"whmcs_url","php_postflight_install":"php_postflight_install","license":"license","php_method_uninstall":"php_method_uninstall","bom":"bom","readme":"readme","image":"image","update_server_target":"update_server_target","not_required":"not_required","update_server":"update_server","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","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","export_package_link":"export_package_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","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","update_server","mvc_versiondate","add_placeholders","adduikit","update_server_target","debug_linenr","add_email_helper","add_license","license_type","add_update_server","buildcomp","sales_server","not_required","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","addreadme","emptycontributors","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": "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","debug_linenr","add_email_helper","add_placeholders","mvc_versiondate","add_update_server","sales_server","adduikit","add_license","license_type","update_server_target","not_required","update_server","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","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;
@@ -3649,9 +3649,9 @@ class com_componentbuilderInstallerScript
 			$admin_view->type_title = 'Componentbuilder Admin_view';
 			$admin_view->type_alias = 'com_componentbuilder.admin_view';
 			$admin_view->table = '{"special": {"dbtable": "#__componentbuilder_admin_view","key": "id","type": "Admin_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","name_list":"name_list","short_description":"short_description","icon":"icon","add_php_document":"add_php_document","icon_category":"icon_category","icon_add":"icon_add","add_php_postsavehook":"add_php_postsavehook","add_custom_import":"add_custom_import","add_php_before_publish":"add_php_before_publish","type":"type","description":"description","add_php_batchcopy":"add_php_batchcopy","add_fadein":"add_fadein","add_php_before_delete":"add_php_before_delete","add_php_getitems_after_all":"add_php_getitems_after_all","php_import_headers":"php_import_headers","add_php_before_save":"add_php_before_save","add_php_getitems":"add_php_getitems","not_required":"not_required","add_php_getlistquery":"add_php_getlistquery","add_php_save":"add_php_save","add_php_allowedit":"add_php_allowedit","add_php_batchmove":"add_php_batchmove","add_php_after_publish":"add_php_after_publish","add_php_after_delete":"add_php_after_delete","add_sql":"add_sql","html_import_view":"html_import_view","php_import_save":"php_import_save","add_css_view":"add_css_view","php_getitem":"php_getitem","css_view":"css_view","php_getitems":"php_getitems","add_css_views":"add_css_views","php_getitems_after_all":"php_getitems_after_all","css_views":"css_views","php_getlistquery":"php_getlistquery","add_javascript_view_file":"add_javascript_view_file","php_before_save":"php_before_save","javascript_view_file":"javascript_view_file","php_save":"php_save","add_javascript_view_footer":"add_javascript_view_footer","php_postsavehook":"php_postsavehook","javascript_view_footer":"javascript_view_footer","php_allowedit":"php_allowedit","add_javascript_views_file":"add_javascript_views_file","php_batchcopy":"php_batchcopy","javascript_views_file":"javascript_views_file","php_batchmove":"php_batchmove","add_javascript_views_footer":"add_javascript_views_footer","php_before_publish":"php_before_publish","javascript_views_footer":"javascript_views_footer","php_after_publish":"php_after_publish","add_custom_button":"add_custom_button","php_before_delete":"php_before_delete","php_after_delete":"php_after_delete","php_controller":"php_controller","php_document":"php_document","php_model":"php_model","source":"source","php_controller_list":"php_controller_list","sql":"sql","php_model_list":"php_model_list","add_php_ajax":"add_php_ajax","php_import_display":"php_import_display","php_ajaxmethod":"php_ajaxmethod","php_import":"php_import","php_import_setdata":"php_import_setdata","add_php_getitem":"add_php_getitem","php_import_ext":"php_import_ext"}}';
+			$admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","name_list":"name_list","short_description":"short_description","add_php_after_publish":"add_php_after_publish","add_php_batchmove":"add_php_batchmove","add_php_allowedit":"add_php_allowedit","add_php_save":"add_php_save","add_php_getlistquery":"add_php_getlistquery","php_import_save":"php_import_save","type":"type","add_fadein":"add_fadein","description":"description","icon_category":"icon_category","add_php_after_delete":"add_php_after_delete","not_required":"not_required","add_sql":"add_sql","html_import_view":"html_import_view","icon_add":"icon_add","add_php_before_save":"add_php_before_save","add_php_postsavehook":"add_php_postsavehook","add_php_batchcopy":"add_php_batchcopy","add_php_before_publish":"add_php_before_publish","add_php_before_delete":"add_php_before_delete","add_php_document":"add_php_document","add_css_view":"add_css_view","add_custom_import":"add_custom_import","add_php_getitems":"add_php_getitems","php_import_headers":"php_import_headers","add_php_getitems_after_all":"add_php_getitems_after_all","css_view":"css_view","icon":"icon","php_getitems":"php_getitems","add_css_views":"add_css_views","php_getitems_after_all":"php_getitems_after_all","css_views":"css_views","php_getlistquery":"php_getlistquery","add_javascript_view_file":"add_javascript_view_file","php_before_save":"php_before_save","javascript_view_file":"javascript_view_file","php_save":"php_save","add_javascript_view_footer":"add_javascript_view_footer","php_postsavehook":"php_postsavehook","javascript_view_footer":"javascript_view_footer","php_allowedit":"php_allowedit","add_javascript_views_file":"add_javascript_views_file","php_batchcopy":"php_batchcopy","javascript_views_file":"javascript_views_file","php_batchmove":"php_batchmove","add_javascript_views_footer":"add_javascript_views_footer","php_before_publish":"php_before_publish","javascript_views_footer":"javascript_views_footer","php_after_publish":"php_after_publish","add_custom_button":"add_custom_button","php_before_delete":"php_before_delete","php_after_delete":"php_after_delete","php_controller":"php_controller","php_document":"php_document","php_model":"php_model","source":"source","php_controller_list":"php_controller_list","sql":"sql","php_model_list":"php_model_list","add_php_ajax":"add_php_ajax","php_import_display":"php_import_display","php_ajaxmethod":"php_ajaxmethod","php_import":"php_import","php_import_setdata":"php_import_setdata","add_php_getitem":"add_php_getitem","php_import_ext":"php_import_ext","php_getitem":"php_getitem"}}';
 			$admin_view->router = 'ComponentbuilderHelperRoute::getAdmin_viewRoute';
-			$admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.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","add_php_document","add_php_postsavehook","add_custom_import","add_php_before_publish","type","add_php_batchcopy","add_fadein","add_php_before_delete","add_php_getitems_after_all","add_php_before_save","add_php_getitems","not_required","add_php_getlistquery","add_php_save","add_php_allowedit","add_php_batchmove","add_php_after_publish","add_php_after_delete","add_sql","add_css_view","add_css_views","add_javascript_view_file","add_javascript_view_footer","add_javascript_views_file","add_javascript_views_footer","add_custom_button","source","add_php_ajax","add_php_getitem"],"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"}]}';
+			$admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.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","add_php_after_publish","add_php_batchmove","add_php_allowedit","add_php_save","add_php_getlistquery","type","add_fadein","add_php_after_delete","not_required","add_sql","add_php_before_save","add_php_postsavehook","add_php_batchcopy","add_php_before_publish","add_php_before_delete","add_php_document","add_css_view","add_custom_import","add_php_getitems","add_php_getitems_after_all","add_css_views","add_javascript_view_file","add_javascript_view_footer","add_javascript_views_file","add_javascript_views_footer","add_custom_button","source","add_php_ajax","add_php_getitem"],"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"}]}';
 
 			// Check if admin_view type is already in content_type DB.
 			$admin_view_id = null;
@@ -3678,9 +3678,9 @@ class com_componentbuilderInstallerScript
 			$custom_admin_view->type_title = 'Componentbuilder Custom_admin_view';
 			$custom_admin_view->type_alias = 'com_componentbuilder.custom_admin_view';
 			$custom_admin_view->table = '{"special": {"dbtable": "#__componentbuilder_custom_admin_view","key": "id","type": "Custom_admin_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$custom_admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name":"name","codename":"codename","description":"description","snippet":"snippet","add_css_document":"add_css_document","icon":"icon","libraries":"libraries","add_php_ajax":"add_php_ajax","php_document":"php_document","php_jview_display":"php_jview_display","add_css":"add_css","php_view":"php_view","add_js_document":"add_js_document","php_jview":"php_jview","default":"default","add_javascript_file":"add_javascript_file","js_document":"js_document","not_required":"not_required","javascript_file":"javascript_file","custom_get":"custom_get","css_document":"css_document","main_get":"main_get","css":"css","dynamic_get":"dynamic_get","php_ajaxmethod":"php_ajaxmethod","add_php_document":"add_php_document","add_custom_button":"add_custom_button","add_php_view":"add_php_view","add_php_jview_display":"add_php_jview_display","php_controller":"php_controller","add_php_jview":"add_php_jview","php_model":"php_model"}}';
+			$custom_admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name":"name","codename":"codename","description":"description","snippet":"snippet","php_jview_display":"php_jview_display","php_view":"php_view","php_document":"php_document","add_php_ajax":"add_php_ajax","add_css":"add_css","add_js_document":"add_js_document","default":"default","icon":"icon","php_jview":"php_jview","add_javascript_file":"add_javascript_file","libraries":"libraries","js_document":"js_document","add_css_document":"add_css_document","javascript_file":"javascript_file","not_required":"not_required","css_document":"css_document","custom_get":"custom_get","css":"css","main_get":"main_get","php_ajaxmethod":"php_ajaxmethod","dynamic_get":"dynamic_get","add_php_document":"add_php_document","add_php_view":"add_php_view","add_custom_button":"add_custom_button","add_php_jview_display":"add_php_jview_display","add_php_jview":"add_php_jview","php_controller":"php_controller","php_model":"php_model"}}';
 			$custom_admin_view->router = 'ComponentbuilderHelperRoute::getCustom_admin_viewRoute';
-			$custom_admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/custom_admin_view.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","snippet","add_css_document","add_php_ajax","add_css","add_js_document","add_javascript_file","not_required","main_get","dynamic_get","add_php_document","add_custom_button","add_php_view","add_php_jview_display","add_php_jview"],"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": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "custom_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "main_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"}]}';
+			$custom_admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/custom_admin_view.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","snippet","add_php_ajax","add_css","add_js_document","add_javascript_file","add_css_document","not_required","main_get","dynamic_get","add_php_document","add_php_view","add_custom_button","add_php_jview_display","add_php_jview"],"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": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "custom_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "main_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"}]}';
 
 			// Check if custom_admin_view type is already in content_type DB.
 			$custom_admin_view_id = null;
@@ -3707,9 +3707,9 @@ class com_componentbuilderInstallerScript
 			$site_view->type_title = 'Componentbuilder Site_view';
 			$site_view->type_alias = 'com_componentbuilder.site_view';
 			$site_view->table = '{"special": {"dbtable": "#__componentbuilder_site_view","key": "id","type": "Site_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$site_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name":"name","codename":"codename","description":"description","snippet":"snippet","add_css_document":"add_css_document","libraries":"libraries","add_php_ajax":"add_php_ajax","php_jview_display":"php_jview_display","php_document":"php_document","add_css":"add_css","default":"default","php_view":"php_view","add_javascript_file":"add_javascript_file","php_jview":"php_jview","add_js_document":"add_js_document","php_model":"php_model","not_required":"not_required","javascript_file":"javascript_file","custom_get":"custom_get","js_document":"js_document","main_get":"main_get","css_document":"css_document","dynamic_get":"dynamic_get","css":"css","php_ajaxmethod":"php_ajaxmethod","add_custom_button":"add_custom_button","add_php_document":"add_php_document","button_position":"button_position","add_php_view":"add_php_view","add_php_jview_display":"add_php_jview_display","add_php_jview":"add_php_jview","php_controller":"php_controller"}}';
+			$site_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name":"name","codename":"codename","description":"description","snippet":"snippet","php_document":"php_document","add_php_ajax":"add_php_ajax","add_css":"add_css","add_css_document":"add_css_document","libraries":"libraries","php_jview":"php_jview","default":"default","php_view":"php_view","add_javascript_file":"add_javascript_file","php_jview_display":"php_jview_display","add_js_document":"add_js_document","not_required":"not_required","javascript_file":"javascript_file","custom_get":"custom_get","js_document":"js_document","main_get":"main_get","css_document":"css_document","dynamic_get":"dynamic_get","css":"css","php_ajaxmethod":"php_ajaxmethod","add_custom_button":"add_custom_button","add_php_document":"add_php_document","button_position":"button_position","add_php_view":"add_php_view","add_php_jview_display":"add_php_jview_display","add_php_jview":"add_php_jview","php_controller":"php_controller","php_model":"php_model"}}';
 			$site_view->router = 'ComponentbuilderHelperRoute::getSite_viewRoute';
-			$site_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/site_view.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","snippet","add_css_document","add_php_ajax","add_css","add_javascript_file","add_js_document","not_required","main_get","dynamic_get","add_custom_button","add_php_document","button_position","add_php_view","add_php_jview_display","add_php_jview"],"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": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "custom_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "main_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"}]}';
+			$site_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/site_view.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","snippet","add_php_ajax","add_css","add_css_document","add_javascript_file","add_js_document","not_required","main_get","dynamic_get","add_custom_button","add_php_document","button_position","add_php_view","add_php_jview_display","add_php_jview"],"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": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "custom_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "main_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"}]}';
 
 			// Check if site_view type is already in content_type DB.
 			$site_view_id = null;
@@ -3736,9 +3736,9 @@ class com_componentbuilderInstallerScript
 			$template->type_title = 'Componentbuilder Template';
 			$template->type_alias = 'com_componentbuilder.template';
 			$template->table = '{"special": {"dbtable": "#__componentbuilder_template","key": "id","type": "Template","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$template->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","alias":"alias","description":"description","snippet":"snippet","dynamic_get":"dynamic_get","libraries":"libraries","add_php_view":"add_php_view","not_required":"not_required","template":"template","php_view":"php_view"}}';
+			$template->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","alias":"alias","description":"description","snippet":"snippet","php_view":"php_view","add_php_view":"add_php_view","dynamic_get":"dynamic_get","not_required":"not_required","template":"template","libraries":"libraries"}}';
 			$template->router = 'ComponentbuilderHelperRoute::getTemplateRoute';
-			$template->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/template.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","snippet","dynamic_get","add_php_view","not_required"],"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": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"}]}';
+			$template->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/template.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","snippet","add_php_view","dynamic_get","not_required"],"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": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"}]}';
 
 			// Check if template type is already in content_type DB.
 			$template_id = null;
@@ -3765,7 +3765,7 @@ class com_componentbuilderInstallerScript
 			$layout->type_title = 'Componentbuilder Layout';
 			$layout->type_alias = 'com_componentbuilder.layout';
 			$layout->table = '{"special": {"dbtable": "#__componentbuilder_layout","key": "id","type": "Layout","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$layout->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","alias":"alias","description":"description","dynamic_get":"dynamic_get","snippet":"snippet","layout":"layout","add_php_view":"add_php_view","libraries":"libraries","not_required":"not_required","php_view":"php_view"}}';
+			$layout->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","alias":"alias","description":"description","dynamic_get":"dynamic_get","snippet":"snippet","php_view":"php_view","add_php_view":"add_php_view","not_required":"not_required","layout":"layout","libraries":"libraries"}}';
 			$layout->router = 'ComponentbuilderHelperRoute::getLayoutRoute';
 			$layout->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/layout.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","dynamic_get","snippet","add_php_view","not_required"],"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": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"}]}';
 
@@ -3794,9 +3794,9 @@ class com_componentbuilderInstallerScript
 			$dynamic_get->type_title = 'Componentbuilder Dynamic_get';
 			$dynamic_get->type_alias = 'com_componentbuilder.dynamic_get';
 			$dynamic_get->table = '{"special": {"dbtable": "#__componentbuilder_dynamic_get","key": "id","type": "Dynamic_get","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$dynamic_get->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","main_source":"main_source","gettype":"gettype","db_table_main":"db_table_main","db_selection":"db_selection","addcalculation":"addcalculation","php_custom_get":"php_custom_get","add_php_after_getitems":"add_php_after_getitems","view_table_main":"view_table_main","view_selection":"view_selection","add_php_before_getitems":"add_php_before_getitems","add_php_before_getitem":"add_php_before_getitem","add_php_router_parse":"add_php_router_parse","add_php_after_getitem":"add_php_after_getitem","add_php_getlistquery":"add_php_getlistquery","getcustom":"getcustom","php_before_getitem":"php_before_getitem","pagination":"pagination","php_after_getitem":"php_after_getitem","not_required":"not_required","php_getlistquery":"php_getlistquery","php_before_getitems":"php_before_getitems","php_after_getitems":"php_after_getitems","php_router_parse":"php_router_parse","php_calculation":"php_calculation"}}';
+			$dynamic_get->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","main_source":"main_source","gettype":"gettype","addcalculation":"addcalculation","add_php_router_parse":"add_php_router_parse","add_php_after_getitems":"add_php_after_getitems","add_php_before_getitems":"add_php_before_getitems","add_php_getlistquery":"add_php_getlistquery","add_php_after_getitem":"add_php_after_getitem","add_php_before_getitem":"add_php_before_getitem","php_custom_get":"php_custom_get","db_selection":"db_selection","db_table_main":"db_table_main","view_selection":"view_selection","view_table_main":"view_table_main","getcustom":"getcustom","php_before_getitem":"php_before_getitem","pagination":"pagination","php_after_getitem":"php_after_getitem","not_required":"not_required","php_getlistquery":"php_getlistquery","php_before_getitems":"php_before_getitems","php_after_getitems":"php_after_getitems","php_router_parse":"php_router_parse","php_calculation":"php_calculation"}}';
 			$dynamic_get->router = 'ComponentbuilderHelperRoute::getDynamic_getRoute';
-			$dynamic_get->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/dynamic_get.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","main_source","gettype","add_php_after_getitems","view_table_main","add_php_before_getitems","add_php_before_getitem","add_php_router_parse","add_php_after_getitem","add_php_getlistquery","pagination","not_required"],"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": "view_table_main","targetTable": "#__componentbuilder_admin_view","targetColumn": "id","displayColumn": "system_name"}]}';
+			$dynamic_get->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/dynamic_get.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","main_source","gettype","add_php_router_parse","add_php_after_getitems","add_php_before_getitems","add_php_getlistquery","add_php_after_getitem","add_php_before_getitem","view_table_main","pagination","not_required"],"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": "view_table_main","targetTable": "#__componentbuilder_admin_view","targetColumn": "id","displayColumn": "system_name"}]}';
 
 			// Check if dynamic_get type is already in content_type DB.
 			$dynamic_get_id = null;
@@ -3823,7 +3823,7 @@ class com_componentbuilderInstallerScript
 			$custom_code->type_title = 'Componentbuilder Custom_code';
 			$custom_code->type_alias = 'com_componentbuilder.custom_code';
 			$custom_code->table = '{"special": {"dbtable": "#__componentbuilder_custom_code","key": "id","type": "Custom_code","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$custom_code->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "component","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"component":"component","path":"path","target":"target","type":"type","comment_type":"comment_type","hashtarget":"hashtarget","code":"code","hashendtarget":"hashendtarget","to_line":"to_line","function_name":"function_name","from_line":"from_line","system_name":"system_name","not_required":"not_required"}}';
+			$custom_code->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "component","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"component":"component","path":"path","target":"target","type":"type","comment_type":"comment_type","not_required":"not_required","function_name":"function_name","system_name":"system_name","code":"code","hashendtarget":"hashendtarget","to_line":"to_line","from_line":"from_line","hashtarget":"hashtarget"}}';
 			$custom_code->router = 'ComponentbuilderHelperRoute::getCustom_codeRoute';
 			$custom_code->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/custom_code.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","component","target","type","comment_type","not_required"],"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": "component","targetTable": "#__componentbuilder_joomla_component","targetColumn": "id","displayColumn": "system_name"}]}';
 
@@ -3852,7 +3852,7 @@ class com_componentbuilderInstallerScript
 			$library->type_title = 'Componentbuilder Library';
 			$library->type_alias = 'com_componentbuilder.library';
 			$library->table = '{"special": {"dbtable": "#__componentbuilder_library","key": "id","type": "Library","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$library->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","description":"description","how":"how","type":"type","php_setdocument":"php_setdocument","libraries":"libraries","not_required":"not_required"}}';
+			$library->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","description":"description","how":"how","type":"type","not_required":"not_required","libraries":"libraries","php_setdocument":"php_setdocument"}}';
 			$library->router = 'ComponentbuilderHelperRoute::getLibraryRoute';
 			$library->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/library.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","how","type","not_required"],"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": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"}]}';
 
@@ -3881,7 +3881,7 @@ class com_componentbuilderInstallerScript
 			$snippet->type_title = 'Componentbuilder Snippet';
 			$snippet->type_alias = 'com_componentbuilder.snippet';
 			$snippet->table = '{"special": {"dbtable": "#__componentbuilder_snippet","key": "id","type": "Snippet","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$snippet->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","url":"url","type":"type","heading":"heading","library":"library","contributor_email":"contributor_email","contributor_website":"contributor_website","usage":"usage","snippet":"snippet","description":"description","contributor_name":"contributor_name","contributor_company":"contributor_company"}}';
+			$snippet->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","url":"url","type":"type","heading":"heading","library":"library","contributor_email":"contributor_email","contributor_name":"contributor_name","contributor_website":"contributor_website","contributor_company":"contributor_company","snippet":"snippet","usage":"usage","description":"description"}}';
 			$snippet->router = 'ComponentbuilderHelperRoute::getSnippetRoute';
 			$snippet->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/snippet.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","type","library"],"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": "type","targetTable": "#__componentbuilder_snippet_type","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "library","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"}]}';
 
@@ -3910,9 +3910,9 @@ class com_componentbuilderInstallerScript
 			$field->type_title = 'Componentbuilder Field';
 			$field->type_alias = 'com_componentbuilder.field';
 			$field->table = '{"special": {"dbtable": "#__componentbuilder_field","key": "id","type": "Field","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$field->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "catid","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","fieldtype":"fieldtype","datatype":"datatype","indexes":"indexes","null_switch":"null_switch","datalenght_other":"datalenght_other","datadefault":"datadefault","add_css_view":"add_css_view","datadefault_other":"datadefault_other","datalenght":"datalenght","add_css_views":"add_css_views","add_javascript_view_footer":"add_javascript_view_footer","xml":"xml","add_javascript_views_footer":"add_javascript_views_footer","not_required":"not_required","css_view":"css_view","css_views":"css_views","store":"store","javascript_view_footer":"javascript_view_footer","javascript_views_footer":"javascript_views_footer"}}';
+			$field->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "catid","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","fieldtype":"fieldtype","datatype":"datatype","indexes":"indexes","null_switch":"null_switch","add_css_view":"add_css_view","css_view":"css_view","not_required":"not_required","xml":"xml","add_javascript_view_footer":"add_javascript_view_footer","add_javascript_views_footer":"add_javascript_views_footer","add_css_views":"add_css_views","datalenght":"datalenght","datadefault_other":"datadefault_other","datadefault":"datadefault","datalenght_other":"datalenght_other","css_views":"css_views","store":"store","javascript_view_footer":"javascript_view_footer","javascript_views_footer":"javascript_views_footer"}}';
 			$field->router = 'ComponentbuilderHelperRoute::getFieldRoute';
-			$field->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/field.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","fieldtype","add_css_view","add_css_views","add_javascript_view_footer","add_javascript_views_footer","not_required","catid","store"],"displayLookup": [{"sourceColumn": "catid","targetTable": "#__categories","targetColumn": "id","displayColumn": "title"},{"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": "fieldtype","targetTable": "#__componentbuilder_fieldtype","targetColumn": "id","displayColumn": "name"}]}';
+			$field->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/field.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","fieldtype","add_css_view","not_required","catid","add_javascript_view_footer","add_javascript_views_footer","add_css_views","store"],"displayLookup": [{"sourceColumn": "catid","targetTable": "#__categories","targetColumn": "id","displayColumn": "title"},{"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": "fieldtype","targetTable": "#__componentbuilder_fieldtype","targetColumn": "id","displayColumn": "name"}]}';
 
 			// Check if field type is already in content_type DB.
 			$field_id = null;
@@ -4084,9 +4084,9 @@ class com_componentbuilderInstallerScript
 			$server->type_title = 'Componentbuilder Server';
 			$server->type_alias = 'com_componentbuilder.server';
 			$server->table = '{"special": {"dbtable": "#__componentbuilder_server","key": "id","type": "Server","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$server->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","protocol":"protocol","path":"path","port":"port","authentication":"authentication","password":"password","secret":"secret","host":"host","signature":"signature","username":"username","not_required":"not_required","private":"private","private_key":"private_key"}}';
+			$server->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","protocol":"protocol","not_required":"not_required","signature":"signature","private_key":"private_key","secret":"secret","password":"password","private":"private","authentication":"authentication","path":"path","port":"port","host":"host","username":"username"}}';
 			$server->router = 'ComponentbuilderHelperRoute::getServerRoute';
-			$server->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/server.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","protocol","authentication","not_required"],"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"}]}';
+			$server->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/server.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","protocol","not_required","authentication"],"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"}]}';
 
 			// Check if server type is already in content_type DB.
 			$server_id = null;
@@ -4113,9 +4113,9 @@ class com_componentbuilderInstallerScript
 			$help_document->type_title = 'Componentbuilder Help_document';
 			$help_document->type_alias = 'com_componentbuilder.help_document';
 			$help_document->table = '{"special": {"dbtable": "#__componentbuilder_help_document","key": "id","type": "Help_document","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$help_document->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "title","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "content","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"title":"title","type":"type","groups":"groups","location":"location","admin_view":"admin_view","site_view":"site_view","target":"target","content":"content","alias":"alias","article":"article","url":"url","not_required":"not_required"}}';
+			$help_document->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "title","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "content","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"title":"title","type":"type","groups":"groups","location":"location","admin_view":"admin_view","site_view":"site_view","not_required":"not_required","content":"content","article":"article","url":"url","target":"target","alias":"alias"}}';
 			$help_document->router = 'ComponentbuilderHelperRoute::getHelp_documentRoute';
-			$help_document->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/help_document.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","type","location","target","article","not_required"],"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": "article","targetTable": "#__content","targetColumn": "id","displayColumn": "title"}]}';
+			$help_document->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/help_document.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","type","location","not_required","article","target"],"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": "article","targetTable": "#__content","targetColumn": "id","displayColumn": "title"}]}';
 
 			// Check if help_document type is already in content_type DB.
 			$help_document_id = null;

site/helpers/componentbuilder.php

@@ -2334,6 +2334,13 @@ abstract class ComponentbuilderHelper
 		return $result;
 	}
 
+	/**
+	*	Check if have an json string
+	*
+	*	@input	string   The json string to check
+	*
+	*	@returns bool true on success
+	**/
 	public static function checkJson($string)
 	{
 		if (self::checkString($string))
@@ -2344,15 +2351,29 @@ abstract class ComponentbuilderHelper
 		return false;
 	}
 
+	/**
+	*	Check if have an object with a length
+	*
+	*	@input	object   The object to check
+	*
+	*	@returns bool true on success
+	**/
 	public static function checkObject($object)
 	{
-		if (isset($object) && is_object($object) && count($object) > 0)
+		if (isset($object) && is_object($object))
 		{
-			return true;
+			return count((array)$object) > 0;
 		}
 		return false;
 	}
 
+	/**
+	*	Check if have an array with a length
+	*
+	*	@input	array   The array to check
+	*
+	*	@returns bool true on success
+	**/
 	public static function checkArray($array, $removeEmptyString = false)
 	{
 		if (isset($array) && is_array($array) && count($array) > 0)
@@ -2374,6 +2395,13 @@ abstract class ComponentbuilderHelper
 		return false;
 	}
 
+	/**
+	*	Check if have a string with a length
+	*
+	*	@input	string   The string to check
+	*
+	*	@returns bool true on success
+	**/
 	public static function checkString($string)
 	{
 		if (isset($string) && is_string($string) && strlen($string) > 0)
@@ -2408,6 +2436,13 @@ abstract class ComponentbuilderHelper
 		return $is_conn;
 	}
 
+	/**
+	*	Merge an array of array's
+	*
+	*	@input	array   The arrays you would like to merge
+	*
+	*	@returns array on success
+	**/
 	public static function mergeArrays($arrays)
 	{
 		if(self::checkArray($arrays))
@@ -2431,6 +2466,13 @@ abstract class ComponentbuilderHelper
 		return self::shorten($string, $length, $addTip);
 	}
 
+	/**
+	*	Shorten a string
+	*
+	*	@input	string   The you would like to shorten
+	*
+	*	@returns string on success
+	**/
 	public static function shorten($string, $length = 40, $addTip = true)
 	{
 		if (self::checkString($string))
@@ -2465,6 +2507,13 @@ abstract class ComponentbuilderHelper
 		return $string;
 	}
 
+	/**
+	*	Making strings safe (various ways)
+	*
+	*	@input	string   The you would like to make safe
+	*
+	*	@returns string on success
+	**/
 	public static function safeString($string, $type = 'L', $spacer = '_', $replaceNumbers = true)
 	{
 		if ($replaceNumbers === true)