README.md

@@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.8.1) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.8.2) with **ALL** its features and **ALL** concepts totally open-source and free! 
 
 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
 
@@ -125,13 +125,13 @@ Watch the [proposed development workflow](https://vdm.bz/proposed-development-wo
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 29th June, 2018
++ *Last Build*: 6th July, 2018
-+ *Version*: 2.8.1
++ *Version*: 2.8.2
 + *Copyright*: Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **186028**
++ *Line count*: **186216**
-+ *Field count*: **1054**
++ *Field count*: **1058**
-+ *File count*: **1237**
++ *File count*: **1238**
 + *Folder count*: **197**
 
 > This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com).

admin/README.txt

@@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.8.1) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.8.2) with **ALL** its features and **ALL** concepts totally open-source and free! 
 
 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
 
@@ -125,13 +125,13 @@ Watch the [proposed development workflow](https://vdm.bz/proposed-development-wo
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 29th June, 2018
++ *Last Build*: 6th July, 2018
-+ *Version*: 2.8.1
++ *Version*: 2.8.2
 + *Copyright*: Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **186028**
++ *Line count*: **186216**
-+ *Field count*: **1054**
++ *Field count*: **1058**
-+ *File count*: **1237**
++ *File count*: **1238**
 + *Folder count*: **197**
 
 > This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com).

admin/config.xml

@@ -47,6 +47,20 @@
 		/>
 		<field type="spacer" name="spacerHistory" hr="true" />
 
+		<!-- Editor Field. Type: Plugins. (joomla) -->
+		<field
+			type="plugins"
+			name="editor"
+			label="COM_COMPONENTBUILDER_CONFIG_EDITOR_LABEL"
+			default="none"
+			description="COM_COMPONENTBUILDER_CONFIG_EDITOR_DESCRIPTION"
+			folder="editors"
+			filter="cmd"
+		/>
+		<!-- No Manual Options Were Added In Field Settings. -->
+
+		<!-- Spacer_hr_one Field. Type: Spacer. A None Database Field. (joomla) -->
+		<field type="spacer" name="spacer_hr_one" hr="true" class="spacer_hr_one" />
 		<!-- Manage_jcb_package_directories Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -79,8 +93,8 @@
 			<option value="jcb">
 				COM_COMPONENTBUILDER_CONFIG_JCB_COMMUNITY_PACKAGES</option>
 		</field>
-		<!-- Spacer_hr_one Field. Type: Spacer. A None Database Field. (joomla) -->
+		<!-- Spacer_hr_two Field. Type: Spacer. A None Database Field. (joomla) -->
-		<field type="spacer" name="spacer_hr_one" hr="true" class="spacer_hr_one" />
+		<field type="spacer" name="spacer_hr_two" hr="true" class="spacer_hr_two" />
 		<!-- Add_menu_prefix Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -111,8 +125,8 @@
 			autocomplete="on"
 			showon="add_menu_prefix:1"
 		/>
-		<!-- Spacer_hr_two Field. Type: Spacer. A None Database Field. (joomla) -->
+		<!-- Spacer_hr_three Field. Type: Spacer. A None Database Field. (joomla) -->
-		<field type="spacer" name="spacer_hr_two" hr="true" class="spacer_hr_two" />
+		<field type="spacer" name="spacer_hr_three" hr="true" class="spacer_hr_three" />
 		<!-- Minify Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -127,8 +141,8 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_CONFIG_NO</option>
 		</field>
-		<!-- Spacer_hr_three Field. Type: Spacer. A None Database Field. (joomla) -->
+		<!-- Spacer_hr_four Field. Type: Spacer. A None Database Field. (joomla) -->
-		<field type="spacer" name="spacer_hr_three" hr="true" class="spacer_hr_three" />
+		<field type="spacer" name="spacer_hr_four" hr="true" class="spacer_hr_four" />
 		<!-- Set_browser_storage Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -180,8 +194,8 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_CONFIG_NEVER_UPDATE</option>
 		</field>
-		<!-- Spacer_hr_four Field. Type: Spacer. A None Database Field. (joomla) -->
+		<!-- Spacer_hr_five Field. Type: Spacer. A None Database Field. (joomla) -->
-		<field type="spacer" name="spacer_hr_four" hr="true" class="spacer_hr_four" />
+		<field type="spacer" name="spacer_hr_five" hr="true" class="spacer_hr_five" />
 		<!-- Note_language_global Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_language_global" label="COM_COMPONENTBUILDER_CONFIG_NOTE_LANGUAGE_GLOBAL_LABEL" description="COM_COMPONENTBUILDER_CONFIG_NOTE_LANGUAGE_GLOBAL_DESCRIPTION" heading="h4" class="alert alert-info note_language_global" />
 		<!-- Language Field. Type: Lang. (custom) -->
@@ -208,8 +222,8 @@
 			max="100"
 			step="10"
 		/>
-		<!-- Spacer_hr_five Field. Type: Spacer. A None Database Field. (joomla) -->
+		<!-- Spacer_hr_six Field. Type: Spacer. A None Database Field. (joomla) -->
-		<field type="spacer" name="spacer_hr_five" hr="true" class="spacer_hr_five" />
+		<field type="spacer" name="spacer_hr_six" hr="true" class="spacer_hr_six" />
 		<!-- Compiler_field_builder_type Field. Type: List. (joomla) -->
 		<field
 			type="list"
@@ -226,8 +240,8 @@
 			<option value="2">
 				COM_COMPONENTBUILDER_CONFIG_SIMPLEXMLELEMENT_CLASS</option>
 		</field>
-		<!-- Spacer_hr_six Field. Type: Spacer. A None Database Field. (joomla) -->
+		<!-- Spacer_hr_seven Field. Type: Spacer. A None Database Field. (joomla) -->
-		<field type="spacer" name="spacer_hr_six" hr="true" class="spacer_hr_six" />
+		<field type="spacer" name="spacer_hr_seven" hr="true" class="spacer_hr_seven" />
 		<!-- Api Field. Type: User. (joomla) -->
 		<field
 			type="user"
@@ -235,8 +249,8 @@
 			label="COM_COMPONENTBUILDER_CONFIG_API_LABEL"
 			description="COM_COMPONENTBUILDER_CONFIG_API_DESCRIPTION"
 		/>
-		<!-- Spacer_hr_seven Field. Type: Spacer. A None Database Field. (joomla) -->
+		<!-- Spacer_hr_eight Field. Type: Spacer. A None Database Field. (joomla) -->
-		<field type="spacer" name="spacer_hr_seven" hr="true" class="spacer_hr_seven" />
+		<field type="spacer" name="spacer_hr_eight" hr="true" class="spacer_hr_eight" />
 		<field name="autorTitle"
 			type="spacer"
 			label="COM_COMPONENTBUILDER_CONFIG_AUTHOR"

admin/helpers/compiler/a_Get.php

@@ -1804,7 +1804,7 @@ class Get
 				}
 			}
 			// add_php
-			$addArrayP = array('php_getitem', 'php_before_save', 'php_save', 'php_postsavehook', 'php_getitems', 'php_getitems_after_all', 'php_getlistquery', 'php_allowedit', 'php_before_delete', 'php_after_delete', 'php_before_publish', 'php_after_publish', 'php_batchcopy', 'php_batchmove', 'php_document');
+			$addArrayP = array('php_getitem', 'php_before_save', 'php_save', 'php_getform', 'php_postsavehook', 'php_getitems', 'php_getitems_after_all', 'php_getlistquery', 'php_allowedit', 'php_before_delete', 'php_after_delete', 'php_before_publish', 'php_after_publish', 'php_batchcopy', 'php_batchmove', 'php_document');
 			foreach ($addArrayP as $scripter)
 			{
 				if (isset($view->{'add_' . $scripter}) && $view->{'add_' . $scripter} == 1)

admin/helpers/compiler/c_Fields.php

@@ -1295,8 +1295,8 @@ class Fields extends Structure
 			else
 			{
 				$optionArray = false;
-				$field .= PHP_EOL . $this->_t(3) . $taber . "<!--" . $this->setLine(__LINE__) . " No Manual Options Were Added In Field Settings. -->";
 				$field .= PHP_EOL . $this->_t(2) . $taber . "/>";
+				$field .= PHP_EOL . $this->_t(2) . $taber . "<!--" . $this->setLine(__LINE__) . " No Manual Options Were Added In Field Settings. -->" . PHP_EOL;
 			}
 		}
 		elseif ($setType === 'plain')

admin/helpers/compiler/e_Interpretation.php

@@ -10937,6 +10937,8 @@ class Interpretation extends Fields
 		$allow[] = $this->_t(4) . "\$form->setValue(\$redirectedField, null, \$redirectedValue);";
 		$allow[] = $this->_t(3) . "}";
 		$allow[] = $this->_t(2) . "}";
+		// load custom script if found
+		$allow[] = $this->getCustomScriptBuilder('php_getform', $viewName_single);
 		// setup the default script
 		$allow[] = PHP_EOL . $this->_t(2) . "return \$form;";
 

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

@@ -424,6 +424,8 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_SAVE="Add Php Before Save"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_SAVE_LABEL="Add PHP (save Method - before data modeling)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_DOCUMENT="Add Php Document"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_DOCUMENT_LABEL="Add PHP (custom document script)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETFORM="Add Php Getform"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETFORM_LABEL="Add PHP (getForm Method)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEM="Add Php Getitem"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEMS="Add Php Getitems"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEMS_AFTER_ALL="Add Php Getitems After All"
@@ -777,6 +779,9 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_LIST_LABEL="PHP <b>List view</b>
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_DOCUMENT="Php Document"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_DOCUMENT_DESCRIPTION="Add PHP to the document method in the view.html.php file of this view. Do not add the php tags."
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_DOCUMENT_LABEL="PHP document method"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETFORM="Php Getform"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETFORM_DESCRIPTION="Add PHP Here that should run in the getForm Method. Do not add the php tags."
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETFORM_LABEL="PHP getForm Method<br /><small>Target (array) $data values & (bool) $loadData & (object) $form. </small>"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEM="Php Getitem"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS="Php Getitems"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS_AFTER_ALL="Php Getitems After All"
@@ -2428,6 +2433,8 @@ COM_COMPONENTBUILDER_CONFIG_DKIM_VALUE_DESCRIPTION="This is the TXT value to use
 COM_COMPONENTBUILDER_CONFIG_DKIM_VALUE_HINT="v=DKIM1;k=rsa;g=*;s=email;h=sha1;t=s;p=PUBLICKEY"
 COM_COMPONENTBUILDER_CONFIG_DKIM_VALUE_LABEL="Value"
 COM_COMPONENTBUILDER_CONFIG_DONT_LOAD="Not"
+COM_COMPONENTBUILDER_CONFIG_EDITOR_DESCRIPTION="Select the editor you would like to use as the JCB global editor for all custom coding areas."
+COM_COMPONENTBUILDER_CONFIG_EDITOR_LABEL="Select an editor"
 COM_COMPONENTBUILDER_CONFIG_EMAILFROM_DESCRIPTION="The global email address that will be used to send system email."
 COM_COMPONENTBUILDER_CONFIG_EMAILFROM_HINT="Email Address Here"
 COM_COMPONENTBUILDER_CONFIG_EMAILFROM_LABEL=" From Email"

admin/layouts/admin_view/php_fullwidth.php

@@ -27,6 +27,8 @@ $fields = $displayData->get('fields') ?: array(
 	'php_getitems_after_all',
 	'add_php_getlistquery',
 	'php_getlistquery',
+	'add_php_getform',
+	'php_getform',
 	'add_php_before_save',
 	'php_before_save',
 	'add_php_save',

admin/layouts/fieldtype/fields_fullwidth.php

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

admin/layouts/server/linked_components_fullwidth.php

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

admin/models/admin_fields.php

@@ -206,6 +206,7 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin
 			}
 		}
 
+
 		return $form;
 	}
 

admin/models/admin_fields_conditions.php

@@ -206,6 +206,7 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin
 			}
 		}
 
+
 		return $form;
 	}
 

admin/models/admin_fields_relations.php

@@ -186,6 +186,7 @@ class ComponentbuilderModelAdmin_fields_relations extends JModelAdmin
 			}
 		}
 
+
 		return $form;
 	}
 

admin/models/admin_view.php

@@ -86,6 +86,12 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->metadata = $registry->toArray();
 			}
 
+			if (!empty($item->php_import_headers))
+			{
+				// base64 Decode php_import_headers.
+				$item->php_import_headers = base64_decode($item->php_import_headers);
+			}
+
 			if (!empty($item->html_import_view))
 			{
 				// base64 Decode html_import_view.
@@ -98,12 +104,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->php_import_save = base64_decode($item->php_import_save);
 			}
 
-			if (!empty($item->php_import_headers))
-			{
-				// base64 Decode php_import_headers.
-				$item->php_import_headers = base64_decode($item->php_import_headers);
-			}
-
 			if (!empty($item->php_getitem))
 			{
 				// base64 Decode php_getitem.
@@ -134,10 +134,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->php_getlistquery = base64_decode($item->php_getlistquery);
 			}
 
-			if (!empty($item->php_before_save))
+			if (!empty($item->php_getform))
 			{
-				// base64 Decode php_before_save.
+				// base64 Decode php_getform.
-				$item->php_before_save = base64_decode($item->php_before_save);
+				$item->php_getform = base64_decode($item->php_getform);
 			}
 
 			if (!empty($item->css_views))
@@ -146,78 +146,84 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->css_views = base64_decode($item->css_views);
 			}
 
+			if (!empty($item->php_before_save))
+			{
+				// base64 Decode php_before_save.
+				$item->php_before_save = base64_decode($item->php_before_save);
+			}
+
 			if (!empty($item->php_save))
 			{
 				// base64 Decode php_save.
 				$item->php_save = base64_decode($item->php_save);
 			}
 
-			if (!empty($item->php_postsavehook))
-			{
-				// base64 Decode php_postsavehook.
-				$item->php_postsavehook = base64_decode($item->php_postsavehook);
-			}
-
 			if (!empty($item->javascript_view_file))
 			{
 				// base64 Decode javascript_view_file.
 				$item->javascript_view_file = base64_decode($item->javascript_view_file);
 			}
 
+			if (!empty($item->php_postsavehook))
+			{
+				// base64 Decode php_postsavehook.
+				$item->php_postsavehook = base64_decode($item->php_postsavehook);
+			}
+
 			if (!empty($item->php_allowedit))
 			{
 				// base64 Decode php_allowedit.
 				$item->php_allowedit = base64_decode($item->php_allowedit);
 			}
 
-			if (!empty($item->php_batchcopy))
-			{
-				// base64 Decode php_batchcopy.
-				$item->php_batchcopy = base64_decode($item->php_batchcopy);
-			}
-
 			if (!empty($item->javascript_view_footer))
 			{
 				// base64 Decode javascript_view_footer.
 				$item->javascript_view_footer = base64_decode($item->javascript_view_footer);
 			}
 
+			if (!empty($item->php_batchcopy))
+			{
+				// base64 Decode php_batchcopy.
+				$item->php_batchcopy = base64_decode($item->php_batchcopy);
+			}
+
 			if (!empty($item->php_batchmove))
 			{
 				// base64 Decode php_batchmove.
 				$item->php_batchmove = base64_decode($item->php_batchmove);
 			}
 
-			if (!empty($item->php_before_publish))
-			{
-				// base64 Decode php_before_publish.
-				$item->php_before_publish = base64_decode($item->php_before_publish);
-			}
-
 			if (!empty($item->javascript_views_file))
 			{
 				// base64 Decode javascript_views_file.
 				$item->javascript_views_file = base64_decode($item->javascript_views_file);
 			}
 
+			if (!empty($item->php_before_publish))
+			{
+				// base64 Decode php_before_publish.
+				$item->php_before_publish = base64_decode($item->php_before_publish);
+			}
+
 			if (!empty($item->php_after_publish))
 			{
 				// base64 Decode php_after_publish.
 				$item->php_after_publish = base64_decode($item->php_after_publish);
 			}
 
-			if (!empty($item->php_before_delete))
-			{
-				// base64 Decode php_before_delete.
-				$item->php_before_delete = base64_decode($item->php_before_delete);
-			}
-
 			if (!empty($item->javascript_views_footer))
 			{
 				// base64 Decode javascript_views_footer.
 				$item->javascript_views_footer = base64_decode($item->javascript_views_footer);
 			}
 
+			if (!empty($item->php_before_delete))
+			{
+				// base64 Decode php_before_delete.
+				$item->php_before_delete = base64_decode($item->php_before_delete);
+			}
+
 			if (!empty($item->php_after_delete))
 			{
 				// base64 Decode php_after_delete.
@@ -236,60 +242,68 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->php_controller = base64_decode($item->php_controller);
 			}
 
-			if (!empty($item->sql))
-			{
-				// base64 Decode sql.
-				$item->sql = base64_decode($item->sql);
-			}
-
 			if (!empty($item->php_model))
 			{
 				// base64 Decode php_model.
 				$item->php_model = base64_decode($item->php_model);
 			}
 
+			if (!empty($item->sql))
+			{
+				// base64 Decode sql.
+				$item->sql = base64_decode($item->sql);
+			}
+
 			if (!empty($item->php_controller_list))
 			{
 				// base64 Decode php_controller_list.
 				$item->php_controller_list = base64_decode($item->php_controller_list);
 			}
 
-			if (!empty($item->php_import_display))
-			{
-				// base64 Decode php_import_display.
-				$item->php_import_display = base64_decode($item->php_import_display);
-			}
-
 			if (!empty($item->php_model_list))
 			{
 				// base64 Decode php_model_list.
 				$item->php_model_list = base64_decode($item->php_model_list);
 			}
 
+			if (!empty($item->php_import_display))
+			{
+				// base64 Decode php_import_display.
+				$item->php_import_display = base64_decode($item->php_import_display);
+			}
+
 			if (!empty($item->php_import))
 			{
 				// base64 Decode php_import.
 				$item->php_import = base64_decode($item->php_import);
 			}
 
-			if (!empty($item->php_import_setdata))
-			{
-				// base64 Decode php_import_setdata.
-				$item->php_import_setdata = base64_decode($item->php_import_setdata);
-			}
-
 			if (!empty($item->php_ajaxmethod))
 			{
 				// base64 Decode php_ajaxmethod.
 				$item->php_ajaxmethod = base64_decode($item->php_ajaxmethod);
 			}
 
+			if (!empty($item->php_import_setdata))
+			{
+				// base64 Decode php_import_setdata.
+				$item->php_import_setdata = base64_decode($item->php_import_setdata);
+			}
+
 			if (!empty($item->php_import_ext))
 			{
 				// base64 Decode php_import_ext.
 				$item->php_import_ext = base64_decode($item->php_import_ext);
 			}
 
+			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.
@@ -314,14 +328,6 @@ 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->alias_builder))
 			{
 				// Convert the alias_builder field to an array.
@@ -500,6 +506,16 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			}
 		}
 
+		// update all editors to use this components global editor
+		$global_editor = JComponentHelper::getParams('com_componentbuilder')->get('editor', 'none');
+		$editors = $form->getXml()->xpath("//field[@type='editor']");
+		foreach ($editors as $editor)
+		{
+			$name = (string) $editor['name'];
+			$form->setFieldAttribute($name, 'editor', $global_editor);
+		}
+
+
 		return $form;
 	}
 
@@ -1180,6 +1196,19 @@ 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']))
 		{
@@ -1219,19 +1248,6 @@ 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 alias_builder items to data.
 		if (isset($data['alias_builder']) && is_array($data['alias_builder']))
 		{
@@ -1271,6 +1287,12 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['ajax_input'] = '';
 		}
 
+		// Set the php_import_headers string to base64 string.
+		if (isset($data['php_import_headers']))
+		{
+			$data['php_import_headers'] = base64_encode($data['php_import_headers']);
+		}
+
 		// Set the html_import_view string to base64 string.
 		if (isset($data['html_import_view']))
 		{
@@ -1283,12 +1305,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['php_import_save'] = base64_encode($data['php_import_save']);
 		}
 
-		// Set the php_import_headers string to base64 string.
-		if (isset($data['php_import_headers']))
-		{
-			$data['php_import_headers'] = base64_encode($data['php_import_headers']);
-		}
-
 		// Set the php_getitem string to base64 string.
 		if (isset($data['php_getitem']))
 		{
@@ -1319,10 +1335,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['php_getlistquery'] = base64_encode($data['php_getlistquery']);
 		}
 
-		// Set the php_before_save string to base64 string.
+		// Set the php_getform string to base64 string.
-		if (isset($data['php_before_save']))
+		if (isset($data['php_getform']))
 		{
-			$data['php_before_save'] = base64_encode($data['php_before_save']);
+			$data['php_getform'] = base64_encode($data['php_getform']);
 		}
 
 		// Set the css_views string to base64 string.
@@ -1331,78 +1347,84 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['css_views'] = base64_encode($data['css_views']);
 		}
 
+		// Set the php_before_save string to base64 string.
+		if (isset($data['php_before_save']))
+		{
+			$data['php_before_save'] = base64_encode($data['php_before_save']);
+		}
+
 		// Set the php_save string to base64 string.
 		if (isset($data['php_save']))
 		{
 			$data['php_save'] = base64_encode($data['php_save']);
 		}
 
-		// Set the php_postsavehook string to base64 string.
-		if (isset($data['php_postsavehook']))
-		{
-			$data['php_postsavehook'] = base64_encode($data['php_postsavehook']);
-		}
-
 		// Set the javascript_view_file string to base64 string.
 		if (isset($data['javascript_view_file']))
 		{
 			$data['javascript_view_file'] = base64_encode($data['javascript_view_file']);
 		}
 
+		// Set the php_postsavehook string to base64 string.
+		if (isset($data['php_postsavehook']))
+		{
+			$data['php_postsavehook'] = base64_encode($data['php_postsavehook']);
+		}
+
 		// Set the php_allowedit string to base64 string.
 		if (isset($data['php_allowedit']))
 		{
 			$data['php_allowedit'] = base64_encode($data['php_allowedit']);
 		}
 
-		// Set the php_batchcopy string to base64 string.
-		if (isset($data['php_batchcopy']))
-		{
-			$data['php_batchcopy'] = base64_encode($data['php_batchcopy']);
-		}
-
 		// Set the javascript_view_footer string to base64 string.
 		if (isset($data['javascript_view_footer']))
 		{
 			$data['javascript_view_footer'] = base64_encode($data['javascript_view_footer']);
 		}
 
+		// Set the php_batchcopy string to base64 string.
+		if (isset($data['php_batchcopy']))
+		{
+			$data['php_batchcopy'] = base64_encode($data['php_batchcopy']);
+		}
+
 		// Set the php_batchmove string to base64 string.
 		if (isset($data['php_batchmove']))
 		{
 			$data['php_batchmove'] = base64_encode($data['php_batchmove']);
 		}
 
-		// Set the php_before_publish string to base64 string.
-		if (isset($data['php_before_publish']))
-		{
-			$data['php_before_publish'] = base64_encode($data['php_before_publish']);
-		}
-
 		// Set the javascript_views_file string to base64 string.
 		if (isset($data['javascript_views_file']))
 		{
 			$data['javascript_views_file'] = base64_encode($data['javascript_views_file']);
 		}
 
+		// Set the php_before_publish string to base64 string.
+		if (isset($data['php_before_publish']))
+		{
+			$data['php_before_publish'] = base64_encode($data['php_before_publish']);
+		}
+
 		// Set the php_after_publish string to base64 string.
 		if (isset($data['php_after_publish']))
 		{
 			$data['php_after_publish'] = base64_encode($data['php_after_publish']);
 		}
 
-		// Set the php_before_delete string to base64 string.
-		if (isset($data['php_before_delete']))
-		{
-			$data['php_before_delete'] = base64_encode($data['php_before_delete']);
-		}
-
 		// Set the javascript_views_footer string to base64 string.
 		if (isset($data['javascript_views_footer']))
 		{
 			$data['javascript_views_footer'] = base64_encode($data['javascript_views_footer']);
 		}
 
+		// Set the php_before_delete string to base64 string.
+		if (isset($data['php_before_delete']))
+		{
+			$data['php_before_delete'] = base64_encode($data['php_before_delete']);
+		}
+
 		// Set the php_after_delete string to base64 string.
 		if (isset($data['php_after_delete']))
 		{
@@ -1421,54 +1443,54 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['php_controller'] = base64_encode($data['php_controller']);
 		}
 
-		// Set the sql string to base64 string.
-		if (isset($data['sql']))
-		{
-			$data['sql'] = base64_encode($data['sql']);
-		}
-
 		// Set the php_model string to base64 string.
 		if (isset($data['php_model']))
 		{
 			$data['php_model'] = base64_encode($data['php_model']);
 		}
 
+		// Set the sql string to base64 string.
+		if (isset($data['sql']))
+		{
+			$data['sql'] = base64_encode($data['sql']);
+		}
+
 		// Set the php_controller_list string to base64 string.
 		if (isset($data['php_controller_list']))
 		{
 			$data['php_controller_list'] = base64_encode($data['php_controller_list']);
 		}
 
-		// Set the php_import_display string to base64 string.
-		if (isset($data['php_import_display']))
-		{
-			$data['php_import_display'] = base64_encode($data['php_import_display']);
-		}
-
 		// Set the php_model_list string to base64 string.
 		if (isset($data['php_model_list']))
 		{
 			$data['php_model_list'] = base64_encode($data['php_model_list']);
 		}
 
+		// Set the php_import_display string to base64 string.
+		if (isset($data['php_import_display']))
+		{
+			$data['php_import_display'] = base64_encode($data['php_import_display']);
+		}
+
 		// Set the php_import string to base64 string.
 		if (isset($data['php_import']))
 		{
 			$data['php_import'] = base64_encode($data['php_import']);
 		}
 
-		// Set the php_import_setdata string to base64 string.
-		if (isset($data['php_import_setdata']))
-		{
-			$data['php_import_setdata'] = base64_encode($data['php_import_setdata']);
-		}
-
 		// Set the php_ajaxmethod string to base64 string.
 		if (isset($data['php_ajaxmethod']))
 		{
 			$data['php_ajaxmethod'] = base64_encode($data['php_ajaxmethod']);
 		}
 
+		// Set the php_import_setdata string to base64 string.
+		if (isset($data['php_import_setdata']))
+		{
+			$data['php_import_setdata'] = base64_encode($data['php_import_setdata']);
+		}
+
 		// Set the php_import_ext string to base64 string.
 		if (isset($data['php_import_ext']))
 		{

admin/models/admin_views.php

@@ -244,12 +244,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_import_headers
-						$item->php_import_headers = base64_decode($item->php_import_headers);
 						// decode php_getitem
 						$item->php_getitem = base64_decode($item->php_getitem);
 						// decode php_getitems
@@ -260,56 +260,58 @@ class ComponentbuilderModelAdmin_views extends JModelList
 						$item->css_view = base64_decode($item->css_view);
 						// decode php_getlistquery
 						$item->php_getlistquery = base64_decode($item->php_getlistquery);
-						// decode php_before_save
+						// decode php_getform
-						$item->php_before_save = base64_decode($item->php_before_save);
+						$item->php_getform = base64_decode($item->php_getform);
 						// decode css_views
 						$item->css_views = base64_decode($item->css_views);
+						// decode php_before_save
+						$item->php_before_save = base64_decode($item->php_before_save);
 						// decode php_save
 						$item->php_save = base64_decode($item->php_save);
-						// decode php_postsavehook
-						$item->php_postsavehook = base64_decode($item->php_postsavehook);
 						// decode javascript_view_file
 						$item->javascript_view_file = base64_decode($item->javascript_view_file);
+						// decode php_postsavehook
+						$item->php_postsavehook = base64_decode($item->php_postsavehook);
 						// decode php_allowedit
 						$item->php_allowedit = base64_decode($item->php_allowedit);
-						// decode php_batchcopy
-						$item->php_batchcopy = base64_decode($item->php_batchcopy);
 						// decode javascript_view_footer
 						$item->javascript_view_footer = base64_decode($item->javascript_view_footer);
+						// decode php_batchcopy
+						$item->php_batchcopy = base64_decode($item->php_batchcopy);
 						// decode php_batchmove
 						$item->php_batchmove = base64_decode($item->php_batchmove);
-						// decode php_before_publish
-						$item->php_before_publish = base64_decode($item->php_before_publish);
 						// decode javascript_views_file
 						$item->javascript_views_file = base64_decode($item->javascript_views_file);
+						// decode php_before_publish
+						$item->php_before_publish = base64_decode($item->php_before_publish);
 						// decode php_after_publish
 						$item->php_after_publish = base64_decode($item->php_after_publish);
-						// decode php_before_delete
-						$item->php_before_delete = base64_decode($item->php_before_delete);
 						// decode javascript_views_footer
 						$item->javascript_views_footer = base64_decode($item->javascript_views_footer);
+						// decode php_before_delete
+						$item->php_before_delete = base64_decode($item->php_before_delete);
 						// decode php_after_delete
 						$item->php_after_delete = base64_decode($item->php_after_delete);
 						// decode php_document
 						$item->php_document = base64_decode($item->php_document);
 						// decode php_controller
 						$item->php_controller = base64_decode($item->php_controller);
-						// decode sql
-						$item->sql = base64_decode($item->sql);
 						// decode php_model
 						$item->php_model = base64_decode($item->php_model);
+						// decode sql
+						$item->sql = base64_decode($item->sql);
 						// decode php_controller_list
 						$item->php_controller_list = base64_decode($item->php_controller_list);
-						// decode php_import_display
-						$item->php_import_display = base64_decode($item->php_import_display);
 						// decode php_model_list
 						$item->php_model_list = base64_decode($item->php_model_list);
+						// decode php_import_display
+						$item->php_import_display = base64_decode($item->php_import_display);
 						// decode php_import
 						$item->php_import = base64_decode($item->php_import);
-						// decode php_import_setdata
-						$item->php_import_setdata = base64_decode($item->php_import_setdata);
 						// decode php_ajaxmethod
 						$item->php_ajaxmethod = base64_decode($item->php_ajaxmethod);
+						// decode php_import_setdata
+						$item->php_import_setdata = base64_decode($item->php_import_setdata);
 						// decode php_import_ext
 						$item->php_import_ext = base64_decode($item->php_import_ext);
 						// unset the values we don't want exported.

admin/models/component_admin_views.php

@@ -217,6 +217,7 @@ class ComponentbuilderModelComponent_admin_views extends JModelAdmin
 			}
 		}
 
+
 		return $form;
 	}
 

admin/models/component_config.php

@@ -217,6 +217,7 @@ class ComponentbuilderModelComponent_config extends JModelAdmin
 			}
 		}
 
+
 		return $form;
 	}
 

admin/models/component_custom_admin_menus.php

@@ -217,6 +217,7 @@ class ComponentbuilderModelComponent_custom_admin_menus extends JModelAdmin
 			}
 		}
 
+
 		return $form;
 	}
 

admin/models/component_custom_admin_views.php

@@ -217,6 +217,7 @@ class ComponentbuilderModelComponent_custom_admin_views extends JModelAdmin
 			}
 		}
 
+
 		return $form;
 	}
 

admin/models/component_dashboard.php

@@ -223,6 +223,7 @@ class ComponentbuilderModelComponent_dashboard extends JModelAdmin
 			}
 		}
 
+
 		return $form;
 	}
 

admin/models/component_files_folders.php

@@ -242,6 +242,7 @@ class ComponentbuilderModelComponent_files_folders extends JModelAdmin
 			}
 		}
 
+
 		return $form;
 	}
 

admin/models/component_mysql_tweaks.php

@@ -217,6 +217,7 @@ class ComponentbuilderModelComponent_mysql_tweaks extends JModelAdmin
 			}
 		}
 
+
 		return $form;
 	}
 

admin/models/component_site_views.php

@@ -217,6 +217,7 @@ class ComponentbuilderModelComponent_site_views extends JModelAdmin
 			}
 		}
 
+
 		return $form;
 	}
 

admin/models/component_updates.php

@@ -217,6 +217,7 @@ class ComponentbuilderModelComponent_updates extends JModelAdmin
 			}
 		}
 
+
 		return $form;
 	}
 

admin/models/custom_admin_view.php

@@ -327,6 +327,16 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 			}
 		}
 
+		// update all editors to use this components global editor
+		$global_editor = JComponentHelper::getParams('com_componentbuilder')->get('editor', 'none');
+		$editors = $form->getXml()->xpath("//field[@type='editor']");
+		foreach ($editors as $editor)
+		{
+			$name = (string) $editor['name'];
+			$form->setFieldAttribute($name, 'editor', $global_editor);
+		}
+
+
 		return $form;
 	}
 

admin/models/custom_code.php

@@ -184,6 +184,16 @@ class ComponentbuilderModelCustom_code extends JModelAdmin
 			}
 		}
 
+		// update all editors to use this components global editor
+		$global_editor = JComponentHelper::getParams('com_componentbuilder')->get('editor', 'none');
+		$editors = $form->getXml()->xpath("//field[@type='editor']");
+		foreach ($editors as $editor)
+		{
+			$name = (string) $editor['name'];
+			$form->setFieldAttribute($name, 'editor', $global_editor);
+		}
+
+
 		return $form;
 	}
 

admin/models/dynamic_get.php

@@ -334,6 +334,16 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 			}
 		}
 
+		// update all editors to use this components global editor
+		$global_editor = JComponentHelper::getParams('com_componentbuilder')->get('editor', 'none');
+		$editors = $form->getXml()->xpath("//field[@type='editor']");
+		foreach ($editors as $editor)
+		{
+			$name = (string) $editor['name'];
+			$form->setFieldAttribute($name, 'editor', $global_editor);
+		}
+
+
 		return $form;
 	}
 

admin/models/field.php

@@ -232,6 +232,7 @@ class ComponentbuilderModelField extends JModelAdmin
 			}
 		}
 
+
 		return $form;
 	}
 

admin/models/fieldtype.php

@@ -125,7 +125,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 	 *
 	 * @return mixed  An array of data items on success, false on failure.
 	 */
-	public function getWadfields()
+	public function getWaefields()
 	{
 		// Get the user object.
 		$user = JFactory::getUser();
@@ -207,13 +207,13 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 				foreach ($items as $nr => &$item)
 				{
 					// convert datatype
-					$item->datatype = $this->selectionTranslationWadfields($item->datatype, 'datatype');
+					$item->datatype = $this->selectionTranslationWaefields($item->datatype, 'datatype');
 					// convert indexes
-					$item->indexes = $this->selectionTranslationWadfields($item->indexes, 'indexes');
+					$item->indexes = $this->selectionTranslationWaefields($item->indexes, 'indexes');
 					// convert null_switch
-					$item->null_switch = $this->selectionTranslationWadfields($item->null_switch, 'null_switch');
+					$item->null_switch = $this->selectionTranslationWaefields($item->null_switch, 'null_switch');
 					// convert store
-					$item->store = $this->selectionTranslationWadfields($item->store, 'store');
+					$item->store = $this->selectionTranslationWaefields($item->store, 'store');
 				}
 			}
 
@@ -227,7 +227,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 	 *
 	 * @return translatable string
 	 */
-	public function selectionTranslationWadfields($value,$name)
+	public function selectionTranslationWaefields($value,$name)
 	{
 		// Array of datatype language strings
 		if ($name === 'datatype')
@@ -451,6 +451,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 			}
 		}
 
+
 		return $form;
 	}
 

admin/models/forms/admin_view.xml

@@ -144,11 +144,11 @@
 			message="COM_COMPONENTBUILDER_ADMIN_VIEW_SHORT_DESCRIPTION_MESSAGE"
 			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_SHORT_DESCRIPTION_HINT"
 		/>
-		<!-- Add_php_batchmove Field. Type: Radio. (joomla) -->
+		<!-- Add_php_before_publish Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_php_batchmove"
+			name="add_php_before_publish"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BATCHMOVE_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_PUBLISH_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -158,11 +158,11 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
 		</field>
-		<!-- Add_php_allowedit Field. Type: Radio. (joomla) -->
+		<!-- Add_php_batchcopy Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_php_allowedit"
+			name="add_php_batchcopy"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_ALLOWEDIT_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BATCHCOPY_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -172,11 +172,11 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
 		</field>
-		<!-- Add_php_save Field. Type: Radio. (joomla) -->
+		<!-- Add_php_postsavehook Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_php_save"
+			name="add_php_postsavehook"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_SAVE_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_POSTSAVEHOOK_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -186,11 +186,11 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
 		</field>
-		<!-- Add_php_getlistquery Field. Type: Radio. (joomla) -->
+		<!-- Add_php_before_save Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_php_getlistquery"
+			name="add_php_before_save"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETLISTQUERY_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_SAVE_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -208,32 +208,53 @@
 			description="COM_COMPONENTBUILDER_ADMIN_VIEW_ICON_ADD_DESCRIPTION"
 			directory=""
 		/>
-		<!-- Html_import_view Field. Type: Textarea. (joomla) -->
+		<!-- Php_import_headers Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
-			name="html_import_view"
+			name="php_import_headers"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HEADERS_LABEL"
 			rows="30"
 			cols="15"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HEADERS_DESCRIPTION"
 			class="text_area span12"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_HINT"
+			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HEADERS_HINT"
 			required="true"
 		/>
-		<!-- Add_sql Field. Type: Radio. (joomla) -->
+		<!-- Addtables Field. Type: Subform. (joomla) -->
 		<field
-			type="radio"
+			type="subform"
-			name="add_sql"
+			name="addtables"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_SQL_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADDTABLES_LABEL"
-			class="btn-group btn-group-yesno"
+			layout="joomla.form.field.subform.repeatable-table"
+			multiple="true"
+			icon="list">
+			<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="true">
+					required="false"
-			<!-- Option Set. -->
+					button="false"
-			<option value="1">
+				/>
-				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
+				<!-- Sourcemap Field. Type: Textarea. (joomla) -->
-			<option value="0">
+				<field
-				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
+					type="textarea"
+					name="sourcemap"
+					label="COM_COMPONENTBUILDER_ADMIN_VIEW_SOURCEMAP_LABEL"
+					rows="22"
+					cols="30"
+					description="COM_COMPONENTBUILDER_ADMIN_VIEW_SOURCEMAP_DESCRIPTION"
+					class="text_area span4"
+					filter="HTML"
+					hint="COM_COMPONENTBUILDER_ADMIN_VIEW_SOURCEMAP_HINT"
+					required="false"
+				/>
+			</form>
 		</field>
 		<!-- Type Field. Type: List. (joomla) -->
 		<field
@@ -286,11 +307,11 @@
 			description="COM_COMPONENTBUILDER_ADMIN_VIEW_ICON_CATEGORY_DESCRIPTION"
 			directory=""
 		/>
-		<!-- Add_php_after_publish Field. Type: Radio. (joomla) -->
+		<!-- Add_php_before_delete Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_php_after_publish"
+			name="add_php_before_delete"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_PUBLISH_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_DELETE_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -306,11 +327,54 @@
 			name="not_required"
 			default="[]"
 		/>
-		<!-- Add_php_after_delete Field. Type: Radio. (joomla) -->
+		<!-- Add_php_document Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_php_after_delete"
+			name="add_php_document"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_DELETE_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_DOCUMENT_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">
+			<!-- Option Set. -->
+			<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) -->
+		<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_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">
@@ -322,8 +386,28 @@
 		</field>
 		<!-- Note_on_permissions Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_on_permissions" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_PERMISSIONS_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_PERMISSIONS_DESCRIPTION" heading="h4" class="alert alert-info note_on_permissions" />
-		<!-- Note_beginner_import Field. Type: Note. A None Database Field. (joomla) -->
+		<!-- Icon Field. Type: Media. (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" />
+		<field
+			type="media"
+			name="icon"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ICON_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_ICON_DESCRIPTION"
+			directory=""
+		/>
+		<!-- 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>
 		<!-- Addpermissions Field. Type: Subform. (joomla) -->
 		<field
 			type="subform"
@@ -397,26 +481,27 @@
 				</field>
 			</form>
 		</field>
-		<!-- Php_import_save Field. Type: Textarea. (joomla) -->
+		<!-- Add_php_getform Field. Type: Radio. (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_on_tabs Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_on_tabs" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_TABS_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_TABS_DESCRIPTION" heading="h4" class="alert alert-info note_on_tabs" />
-		<!-- Add_php_getitems_after_all Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_php_getitems_after_all"
+			name="add_php_getform"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEMS_AFTER_ALL_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETFORM_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_on_tabs Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_on_tabs" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_TABS_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_TABS_DESCRIPTION" heading="h4" class="alert alert-info note_on_tabs" />
+		<!-- Add_php_save Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_php_save"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_SAVE_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -454,11 +539,11 @@
 				/>
 			</form>
 		</field>
-		<!-- Add_php_before_save Field. Type: Radio. (joomla) -->
+		<!-- Add_php_allowedit Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_php_before_save"
+			name="add_php_allowedit"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_SAVE_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_ALLOWEDIT_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -470,11 +555,11 @@
 		</field>
 		<!-- Note_on_linked_views Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_on_linked_views" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_LINKED_VIEWS_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_LINKED_VIEWS_DESCRIPTION" heading="h4" class="alert alert-info note_on_linked_views" />
-		<!-- Add_php_postsavehook Field. Type: Radio. (joomla) -->
+		<!-- Add_php_batchmove 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">
@@ -573,11 +658,11 @@
 				</field>
 			</form>
 		</field>
-		<!-- Add_php_batchcopy Field. Type: Radio. (joomla) -->
+		<!-- Add_php_after_publish Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_php_batchcopy"
+			name="add_php_after_publish"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BATCHCOPY_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_PUBLISH_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -589,11 +674,11 @@
 		</field>
 		<!-- Note_create_edit_notice Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_create_edit_notice" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_NOTICE_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_NOTICE_DESCRIPTION" heading="h4" class="alert alert-info note_create_edit_notice" />
-		<!-- Add_php_before_publish Field. Type: Radio. (joomla) -->
+		<!-- Add_php_after_delete Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_php_before_publish"
+			name="add_php_after_delete"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_PUBLISH_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_DELETE_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -617,11 +702,11 @@
 			<option value="2">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_CUSTOM</option>
 		</field>
-		<!-- Add_php_before_delete Field. Type: Radio. (joomla) -->
+		<!-- Add_sql Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_php_before_delete"
+			name="add_sql"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_DELETE_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_SQL_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -633,57 +718,23 @@
 		</field>
 		<!-- Note_alias_builder_custom Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_alias_builder_custom" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ALIAS_BUILDER_CUSTOM_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ALIAS_BUILDER_CUSTOM_DESCRIPTION" heading="h4" class="alert alert-info note_alias_builder_custom" showon="alias_builder_type:2" />
-		<!-- Add_php_document Field. Type: Radio. (joomla) -->
+		<!-- Note_beginner_import Field. Type: Note. A None Database Field. (joomla) -->
-		<field
+		<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="radio"
-			name="add_php_document"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_DOCUMENT_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_alias_builder_default Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_alias_builder_default" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ALIAS_BUILDER_DEFAULT_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ALIAS_BUILDER_DEFAULT_DESCRIPTION" heading="h4" class="alert alert-info note_alias_builder_default" showon="alias_builder_type:1" />
-		<!-- Addtables Field. Type: Subform. (joomla) -->
+		<!-- Html_import_view Field. Type: Textarea. (joomla) -->
-		<field
-			type="subform"
-			name="addtables"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADDTABLES_LABEL"
-			layout="joomla.form.field.subform.repeatable-table"
-			multiple="true"
-			icon="list">
-			<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="html_import_view"
-					label="COM_COMPONENTBUILDER_ADMIN_VIEW_SOURCEMAP_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_LABEL"
-					rows="22"
+			rows="30"
-					cols="30"
+			cols="15"
-					description="COM_COMPONENTBUILDER_ADMIN_VIEW_SOURCEMAP_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_DESCRIPTION"
-					class="text_area span4"
+			class="text_area span12"
-					filter="HTML"
+			filter="raw"
-					hint="COM_COMPONENTBUILDER_ADMIN_VIEW_SOURCEMAP_HINT"
+			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_HINT"
-					required="false"
+			required="true"
 		/>
-			</form>
-		</field>
 		<!-- Alias_builder Field. Type: Aliasbuilder. (custom) -->
 		<field
 			type="aliasbuilder"
@@ -694,72 +745,21 @@
 			multiple="true"
 			showon="alias_builder_type:2"
 		/>
-		<!-- Add_custom_import Field. Type: Radio. (joomla) -->
+		<!-- Php_import_save Field. Type: Textarea. (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_getitem Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_php_getitem"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEM_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"
+			name="php_import_save"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HEADERS_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE_LABEL"
 			rows="30"
 			cols="15"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HEADERS_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE_DESCRIPTION"
 			class="text_area span12"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HEADERS_HINT"
+			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE_HINT"
 			required="true"
 		/>
-		<!-- 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>
 		<!-- 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" />
-		<!-- 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_getitem Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
@@ -773,7 +773,7 @@
 			buttons="no"
 			syntax="php"
 			editor="codemirror|none"
-			filter="code"
+			filter="raw"
 			required="true"
 			validate="code"
 		/>
@@ -875,12 +875,12 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
 		</field>
-		<!-- Php_before_save Field. Type: Editor. (joomla) -->
+		<!-- Php_getform Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_before_save"
+			name="php_getform"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_SAVE_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETFORM_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_SAVE_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETFORM_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
@@ -909,12 +909,12 @@
 			required="true"
 			validate="code"
 		/>
-		<!-- Php_save Field. Type: Editor. (joomla) -->
+		<!-- Php_before_save Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_save"
+			name="php_before_save"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_SAVE_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_SAVE_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_SAVE_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_SAVE_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
@@ -940,12 +940,12 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
 		</field>
-		<!-- Php_postsavehook Field. Type: Editor. (joomla) -->
+		<!-- Php_save Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_postsavehook"
+			name="php_save"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_POSTSAVEHOOK_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_SAVE_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_POSTSAVEHOOK_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_SAVE_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
@@ -974,12 +974,12 @@
 			required="true"
 			validate="code"
 		/>
-		<!-- Php_allowedit Field. Type: Editor. (joomla) -->
+		<!-- Php_postsavehook Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_allowedit"
+			name="php_postsavehook"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_ALLOWEDIT_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_POSTSAVEHOOK_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_ALLOWEDIT_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_POSTSAVEHOOK_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
@@ -1005,12 +1005,12 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
 		</field>
-		<!-- Php_batchcopy Field. Type: Editor. (joomla) -->
+		<!-- Php_allowedit Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_batchcopy"
+			name="php_allowedit"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHCOPY_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_ALLOWEDIT_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHCOPY_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_ALLOWEDIT_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
@@ -1039,12 +1039,12 @@
 			required="true"
 			validate="code"
 		/>
-		<!-- Php_batchmove Field. Type: Editor. (joomla) -->
+		<!-- Php_batchcopy Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_batchmove"
+			name="php_batchcopy"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHMOVE_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHCOPY_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHMOVE_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHCOPY_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
@@ -1070,12 +1070,12 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
 		</field>
-		<!-- Php_before_publish Field. Type: Editor. (joomla) -->
+		<!-- Php_batchmove Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_before_publish"
+			name="php_batchmove"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_PUBLISH_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHMOVE_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_PUBLISH_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHMOVE_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
@@ -1104,12 +1104,12 @@
 			required="true"
 			validate="code"
 		/>
-		<!-- Php_after_publish Field. Type: Editor. (joomla) -->
+		<!-- Php_before_publish Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_after_publish"
+			name="php_before_publish"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_PUBLISH_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_PUBLISH_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_PUBLISH_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_PUBLISH_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
@@ -1135,12 +1135,12 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
 		</field>
-		<!-- Php_before_delete Field. Type: Editor. (joomla) -->
+		<!-- Php_after_publish Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_before_delete"
+			name="php_after_publish"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_DELETE_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_PUBLISH_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_DELETE_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_PUBLISH_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
@@ -1169,12 +1169,12 @@
 			required="true"
 			validate="code"
 		/>
-		<!-- Php_after_delete Field. Type: Editor. (joomla) -->
+		<!-- Php_before_delete Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_after_delete"
+			name="php_before_delete"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_DELETE_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_DELETE_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_DELETE_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_DELETE_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
@@ -1200,16 +1200,16 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
 		</field>
-		<!-- Php_document Field. Type: Editor. (joomla) -->
+		<!-- Php_after_delete Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_document"
+			name="php_after_delete"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_DOCUMENT_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_DELETE_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_DOCUMENT_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_DELETE_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
-			rows="50"
+			rows="30"
 			buttons="no"
 			syntax="php"
 			editor="codemirror|none"
@@ -1726,6 +1726,40 @@
 				</field>
 			</form>
 		</field>
+		<!-- Php_document Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="php_document"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_DOCUMENT_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_DOCUMENT_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="50"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="raw"
+			required="true"
+			validate="code"
+		/>
+		<!-- Php_controller Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="php_controller"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="raw"
+			required="false"
+			validate="code"
+		/>
 		<!-- Source Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -1739,12 +1773,12 @@
 			<option value="2">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_DUMP</option>
 		</field>
-		<!-- Php_controller Field. Type: Editor. (joomla) -->
+		<!-- Php_model Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_controller"
+			name="php_model"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
@@ -1769,12 +1803,12 @@
 			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_SQL_HINT"
 			required="true"
 		/>
-		<!-- Php_model Field. Type: Editor. (joomla) -->
+		<!-- Php_controller_list Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_model"
+			name="php_controller_list"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_LIST_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_LIST_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
@@ -1788,16 +1822,16 @@
 		/>
 		<!-- Note_advanced_import Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_advanced_import" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ADVANCED_IMPORT_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ADVANCED_IMPORT_DESCRIPTION" heading="h4" class="alert alert-success note_advanced_import" />
-		<!-- Php_controller_list Field. Type: Editor. (joomla) -->
+		<!-- Php_model_list Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_controller_list"
+			name="php_model_list"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_LIST_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_LIST_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_LIST_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_LIST_DESCRIPTION"
 			width="100%"
 			height="450px"
-			cols="15"
+			cols="30"
-			rows="30"
+			rows="15"
 			buttons="no"
 			syntax="php"
 			editor="codemirror|none"
@@ -1818,36 +1852,6 @@
 			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DISPLAY_HINT"
 			required="true"
 		/>
-		<!-- Php_model_list Field. Type: Editor. (joomla) -->
-		<field
-			type="editor"
-			name="php_model_list"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_LIST_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_LIST_DESCRIPTION"
-			width="100%"
-			height="450px"
-			cols="30"
-			rows="15"
-			buttons="no"
-			syntax="php"
-			editor="codemirror|none"
-			filter="raw"
-			required="false"
-			validate="code"
-		/>
-		<!-- Php_import Field. Type: Textarea. (joomla) -->
-		<field
-			type="textarea"
-			name="php_import"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_LABEL"
-			rows="30"
-			cols="15"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DESCRIPTION"
-			class="text_area span12"
-			filter="raw"
-			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HINT"
-			required="true"
-		/>
 		<!-- Add_php_ajax Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -1862,17 +1866,17 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
 		</field>
-		<!-- Php_import_setdata Field. Type: Textarea. (joomla) -->
+		<!-- Php_import Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
-			name="php_import_setdata"
+			name="php_import"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_LABEL"
 			rows="30"
 			cols="15"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DESCRIPTION"
 			class="text_area span12"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA_HINT"
+			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HINT"
 			required="true"
 		/>
 		<!-- Php_ajaxmethod Field. Type: Editor. (joomla) -->
@@ -1892,17 +1896,17 @@
 			required="true"
 			validate="code"
 		/>
-		<!-- Php_import_ext Field. Type: Textarea. (joomla) -->
+		<!-- Php_import_setdata Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
-			name="php_import_ext"
+			name="php_import_setdata"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_EXT_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA_LABEL"
 			rows="30"
 			cols="15"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_EXT_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA_DESCRIPTION"
 			class="text_area span12"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_EXT_HINT"
+			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA_HINT"
 			required="true"
 		/>
 		<!-- Ajax_input Field. Type: Subform. (joomla) -->
@@ -2036,6 +2040,33 @@
 				/>
 			</form>
 		</field>
+		<!-- Php_import_ext Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="php_import_ext"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_EXT_LABEL"
+			rows="30"
+			cols="15"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_EXT_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_EXT_HINT"
+			required="true"
+		/>
+		<!-- Add_php_getitem Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_php_getitem"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEM_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>
 	</fieldset>
 	
 	<!-- Access Control Fields. -->

admin/models/forms/custom_admin_view.js

@@ -9,7 +9,6 @@
  */
 
 // Some Global Values
-jform_vvvvvyevxx_required = false;
 jform_vvvvvyfvxy_required = false;
 jform_vvvvvygvxz_required = false;
 jform_vvvvvyhvya_required = false;
@@ -17,286 +16,287 @@ jform_vvvvvyivyb_required = false;
 jform_vvvvvyjvyc_required = false;
 jform_vvvvvykvyd_required = false;
 jform_vvvvvylvye_required = false;
-jform_vvvvvylvyf_required = false;
+jform_vvvvvymvyf_required = false;
 jform_vvvvvymvyg_required = false;
 jform_vvvvvynvyh_required = false;
+jform_vvvvvyovyi_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var add_php_view_vvvvvye = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvyf = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvye(add_php_view_vvvvvye);
+	vvvvvyf(add_php_view_vvvvvyf);
 
-	var add_php_jview_display_vvvvvyf = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	var add_php_jview_display_vvvvvyg = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvyf(add_php_jview_display_vvvvvyf);
+	vvvvvyg(add_php_jview_display_vvvvvyg);
 
-	var add_php_jview_vvvvvyg = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	var add_php_jview_vvvvvyh = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyg(add_php_jview_vvvvvyg);
+	vvvvvyh(add_php_jview_vvvvvyh);
 
-	var add_php_document_vvvvvyh = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	var add_php_document_vvvvvyi = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyh(add_php_document_vvvvvyh);
+	vvvvvyi(add_php_document_vvvvvyi);
 
-	var add_css_document_vvvvvyi = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	var add_css_document_vvvvvyj = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvyi(add_css_document_vvvvvyi);
+	vvvvvyj(add_css_document_vvvvvyj);
 
-	var add_javascript_file_vvvvvyj = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	var add_javascript_file_vvvvvyk = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvyj(add_javascript_file_vvvvvyj);
+	vvvvvyk(add_javascript_file_vvvvvyk);
 
-	var add_js_document_vvvvvyk = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	var add_js_document_vvvvvyl = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyk(add_js_document_vvvvvyk);
+	vvvvvyl(add_js_document_vvvvvyl);
 
-	var add_custom_button_vvvvvyl = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	var add_custom_button_vvvvvym = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyl(add_custom_button_vvvvvyl);
+	vvvvvym(add_custom_button_vvvvvym);
 
-	var add_css_vvvvvym = jQuery("#jform_add_css input[type='radio']:checked").val();
+	var add_css_vvvvvyn = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvym(add_css_vvvvvym);
+	vvvvvyn(add_css_vvvvvyn);
 
-	var add_php_ajax_vvvvvyn = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	var add_php_ajax_vvvvvyo = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvyn(add_php_ajax_vvvvvyn);
+	vvvvvyo(add_php_ajax_vvvvvyo);
 });
 
-// the vvvvvye function
+// the vvvvvyf function
-function vvvvvye(add_php_view_vvvvvye)
+function vvvvvyf(add_php_view_vvvvvyf)
 {
 	// set the function logic
-	if (add_php_view_vvvvvye == 1)
+	if (add_php_view_vvvvvyf == 1)
 	{
 		jQuery('#jform_php_view-lbl').closest('.control-group').show();
-		if (jform_vvvvvyevxx_required)
+		if (jform_vvvvvyfvxy_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_vvvvvyevxx_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_php_view-lbl').closest('.control-group').hide();
-		if (!jform_vvvvvyevxx_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_vvvvvyevxx_required = true;
-		}
-	}
-}
-
-// the vvvvvyf function
-function vvvvvyf(add_php_jview_display_vvvvvyf)
-{
-	// set the function logic
-	if (add_php_jview_display_vvvvvyf == 1)
-	{
-		jQuery('#jform_php_jview_display-lbl').closest('.control-group').show();
-		if (jform_vvvvvyfvxy_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_vvvvvyfvxy_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_php_jview_display-lbl').closest('.control-group').hide();
+		jQuery('#jform_php_view-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvyfvxy_required)
 		{
-			updateFieldRequired('php_jview_display',1);
+			updateFieldRequired('php_view',1);
-			jQuery('#jform_php_jview_display').removeAttr('required');
+			jQuery('#jform_php_view').removeAttr('required');
-			jQuery('#jform_php_jview_display').removeAttr('aria-required');
+			jQuery('#jform_php_view').removeAttr('aria-required');
-			jQuery('#jform_php_jview_display').removeClass('required');
+			jQuery('#jform_php_view').removeClass('required');
 			jform_vvvvvyfvxy_required = true;
 		}
 	}
 }
 
 // the vvvvvyg function
-function vvvvvyg(add_php_jview_vvvvvyg)
+function vvvvvyg(add_php_jview_display_vvvvvyg)
 {
 	// set the function logic
-	if (add_php_jview_vvvvvyg == 1)
+	if (add_php_jview_display_vvvvvyg == 1)
 	{
-		jQuery('#jform_php_jview-lbl').closest('.control-group').show();
+		jQuery('#jform_php_jview_display-lbl').closest('.control-group').show();
 		if (jform_vvvvvygvxz_required)
 		{
-			updateFieldRequired('php_jview',0);
+			updateFieldRequired('php_jview_display',0);
-			jQuery('#jform_php_jview').prop('required','required');
+			jQuery('#jform_php_jview_display').prop('required','required');
-			jQuery('#jform_php_jview').attr('aria-required',true);
+			jQuery('#jform_php_jview_display').attr('aria-required',true);
-			jQuery('#jform_php_jview').addClass('required');
+			jQuery('#jform_php_jview_display').addClass('required');
 			jform_vvvvvygvxz_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_php_jview-lbl').closest('.control-group').hide();
+		jQuery('#jform_php_jview_display-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvygvxz_required)
 		{
-			updateFieldRequired('php_jview',1);
+			updateFieldRequired('php_jview_display',1);
-			jQuery('#jform_php_jview').removeAttr('required');
+			jQuery('#jform_php_jview_display').removeAttr('required');
-			jQuery('#jform_php_jview').removeAttr('aria-required');
+			jQuery('#jform_php_jview_display').removeAttr('aria-required');
-			jQuery('#jform_php_jview').removeClass('required');
+			jQuery('#jform_php_jview_display').removeClass('required');
 			jform_vvvvvygvxz_required = true;
 		}
 	}
 }
 
 // the vvvvvyh function
-function vvvvvyh(add_php_document_vvvvvyh)
+function vvvvvyh(add_php_jview_vvvvvyh)
 {
 	// set the function logic
-	if (add_php_document_vvvvvyh == 1)
+	if (add_php_jview_vvvvvyh == 1)
 	{
-		jQuery('#jform_php_document-lbl').closest('.control-group').show();
+		jQuery('#jform_php_jview-lbl').closest('.control-group').show();
 		if (jform_vvvvvyhvya_required)
 		{
-			updateFieldRequired('php_document',0);
+			updateFieldRequired('php_jview',0);
-			jQuery('#jform_php_document').prop('required','required');
+			jQuery('#jform_php_jview').prop('required','required');
-			jQuery('#jform_php_document').attr('aria-required',true);
+			jQuery('#jform_php_jview').attr('aria-required',true);
-			jQuery('#jform_php_document').addClass('required');
+			jQuery('#jform_php_jview').addClass('required');
 			jform_vvvvvyhvya_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_php_document-lbl').closest('.control-group').hide();
+		jQuery('#jform_php_jview-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvyhvya_required)
 		{
-			updateFieldRequired('php_document',1);
+			updateFieldRequired('php_jview',1);
-			jQuery('#jform_php_document').removeAttr('required');
+			jQuery('#jform_php_jview').removeAttr('required');
-			jQuery('#jform_php_document').removeAttr('aria-required');
+			jQuery('#jform_php_jview').removeAttr('aria-required');
-			jQuery('#jform_php_document').removeClass('required');
+			jQuery('#jform_php_jview').removeClass('required');
 			jform_vvvvvyhvya_required = true;
 		}
 	}
 }
 
 // the vvvvvyi function
-function vvvvvyi(add_css_document_vvvvvyi)
+function vvvvvyi(add_php_document_vvvvvyi)
 {
 	// set the function logic
-	if (add_css_document_vvvvvyi == 1)
+	if (add_php_document_vvvvvyi == 1)
 	{
-		jQuery('#jform_css_document-lbl').closest('.control-group').show();
+		jQuery('#jform_php_document-lbl').closest('.control-group').show();
 		if (jform_vvvvvyivyb_required)
 		{
-			updateFieldRequired('css_document',0);
+			updateFieldRequired('php_document',0);
-			jQuery('#jform_css_document').prop('required','required');
+			jQuery('#jform_php_document').prop('required','required');
-			jQuery('#jform_css_document').attr('aria-required',true);
+			jQuery('#jform_php_document').attr('aria-required',true);
-			jQuery('#jform_css_document').addClass('required');
+			jQuery('#jform_php_document').addClass('required');
 			jform_vvvvvyivyb_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_css_document-lbl').closest('.control-group').hide();
+		jQuery('#jform_php_document-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvyivyb_required)
 		{
-			updateFieldRequired('css_document',1);
+			updateFieldRequired('php_document',1);
-			jQuery('#jform_css_document').removeAttr('required');
+			jQuery('#jform_php_document').removeAttr('required');
-			jQuery('#jform_css_document').removeAttr('aria-required');
+			jQuery('#jform_php_document').removeAttr('aria-required');
-			jQuery('#jform_css_document').removeClass('required');
+			jQuery('#jform_php_document').removeClass('required');
 			jform_vvvvvyivyb_required = true;
 		}
 	}
 }
 
 // the vvvvvyj function
-function vvvvvyj(add_javascript_file_vvvvvyj)
+function vvvvvyj(add_css_document_vvvvvyj)
 {
 	// set the function logic
-	if (add_javascript_file_vvvvvyj == 1)
+	if (add_css_document_vvvvvyj == 1)
 	{
-		jQuery('#jform_javascript_file-lbl').closest('.control-group').show();
+		jQuery('#jform_css_document-lbl').closest('.control-group').show();
 		if (jform_vvvvvyjvyc_required)
 		{
-			updateFieldRequired('javascript_file',0);
+			updateFieldRequired('css_document',0);
-			jQuery('#jform_javascript_file').prop('required','required');
+			jQuery('#jform_css_document').prop('required','required');
-			jQuery('#jform_javascript_file').attr('aria-required',true);
+			jQuery('#jform_css_document').attr('aria-required',true);
-			jQuery('#jform_javascript_file').addClass('required');
+			jQuery('#jform_css_document').addClass('required');
 			jform_vvvvvyjvyc_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_javascript_file-lbl').closest('.control-group').hide();
+		jQuery('#jform_css_document-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvyjvyc_required)
 		{
-			updateFieldRequired('javascript_file',1);
+			updateFieldRequired('css_document',1);
-			jQuery('#jform_javascript_file').removeAttr('required');
+			jQuery('#jform_css_document').removeAttr('required');
-			jQuery('#jform_javascript_file').removeAttr('aria-required');
+			jQuery('#jform_css_document').removeAttr('aria-required');
-			jQuery('#jform_javascript_file').removeClass('required');
+			jQuery('#jform_css_document').removeClass('required');
 			jform_vvvvvyjvyc_required = true;
 		}
 	}
 }
 
 // the vvvvvyk function
-function vvvvvyk(add_js_document_vvvvvyk)
+function vvvvvyk(add_javascript_file_vvvvvyk)
 {
 	// set the function logic
-	if (add_js_document_vvvvvyk == 1)
+	if (add_javascript_file_vvvvvyk == 1)
 	{
-		jQuery('#jform_js_document-lbl').closest('.control-group').show();
+		jQuery('#jform_javascript_file-lbl').closest('.control-group').show();
 		if (jform_vvvvvykvyd_required)
 		{
-			updateFieldRequired('js_document',0);
+			updateFieldRequired('javascript_file',0);
-			jQuery('#jform_js_document').prop('required','required');
+			jQuery('#jform_javascript_file').prop('required','required');
-			jQuery('#jform_js_document').attr('aria-required',true);
+			jQuery('#jform_javascript_file').attr('aria-required',true);
-			jQuery('#jform_js_document').addClass('required');
+			jQuery('#jform_javascript_file').addClass('required');
 			jform_vvvvvykvyd_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_js_document-lbl').closest('.control-group').hide();
+		jQuery('#jform_javascript_file-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvykvyd_required)
 		{
-			updateFieldRequired('js_document',1);
+			updateFieldRequired('javascript_file',1);
-			jQuery('#jform_js_document').removeAttr('required');
+			jQuery('#jform_javascript_file').removeAttr('required');
-			jQuery('#jform_js_document').removeAttr('aria-required');
+			jQuery('#jform_javascript_file').removeAttr('aria-required');
-			jQuery('#jform_js_document').removeClass('required');
+			jQuery('#jform_javascript_file').removeClass('required');
 			jform_vvvvvykvyd_required = true;
 		}
 	}
 }
 
 // the vvvvvyl function
-function vvvvvyl(add_custom_button_vvvvvyl)
+function vvvvvyl(add_js_document_vvvvvyl)
 {
 	// set the function logic
-	if (add_custom_button_vvvvvyl == 1)
+	if (add_js_document_vvvvvyl == 1)
+	{
+		jQuery('#jform_js_document-lbl').closest('.control-group').show();
+		if (jform_vvvvvylvye_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_vvvvvylvye_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_js_document-lbl').closest('.control-group').hide();
+		if (!jform_vvvvvylvye_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_vvvvvylvye_required = true;
+		}
+	}
+}
+
+// the vvvvvym function
+function vvvvvym(add_custom_button_vvvvvym)
+{
+	// set the function logic
+	if (add_custom_button_vvvvvym == 1)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').show();
 		jQuery('#jform_php_controller-lbl').closest('.control-group').show();
-		if (jform_vvvvvylvye_required)
+		if (jform_vvvvvymvyf_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_vvvvvylvye_required = false;
+			jform_vvvvvymvyf_required = false;
 		}
 
 		jQuery('#jform_php_model-lbl').closest('.control-group').show();
-		if (jform_vvvvvylvyf_required)
+		if (jform_vvvvvymvyg_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_vvvvvylvyf_required = false;
+			jform_vvvvvymvyg_required = false;
 		}
 
 	}
@@ -304,72 +304,72 @@ function vvvvvyl(add_custom_button_vvvvvyl)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_controller-lbl').closest('.control-group').hide();
-		if (!jform_vvvvvylvye_required)
+		if (!jform_vvvvvymvyf_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_vvvvvylvye_required = true;
+			jform_vvvvvymvyf_required = true;
 		}
 		jQuery('#jform_php_model-lbl').closest('.control-group').hide();
-		if (!jform_vvvvvylvyf_required)
+		if (!jform_vvvvvymvyg_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_vvvvvylvyf_required = true;
-		}
-	}
-}
-
-// the vvvvvym function
-function vvvvvym(add_css_vvvvvym)
-{
-	// set the function logic
-	if (add_css_vvvvvym == 1)
-	{
-		jQuery('#jform_css-lbl').closest('.control-group').show();
-		if (jform_vvvvvymvyg_required)
-		{
-			updateFieldRequired('css',0);
-			jQuery('#jform_css').prop('required','required');
-			jQuery('#jform_css').attr('aria-required',true);
-			jQuery('#jform_css').addClass('required');
-			jform_vvvvvymvyg_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_css-lbl').closest('.control-group').hide();
-		if (!jform_vvvvvymvyg_required)
-		{
-			updateFieldRequired('css',1);
-			jQuery('#jform_css').removeAttr('required');
-			jQuery('#jform_css').removeAttr('aria-required');
-			jQuery('#jform_css').removeClass('required');
 			jform_vvvvvymvyg_required = true;
 		}
 	}
 }
 
 // the vvvvvyn function
-function vvvvvyn(add_php_ajax_vvvvvyn)
+function vvvvvyn(add_css_vvvvvyn)
 {
 	// set the function logic
-	if (add_php_ajax_vvvvvyn == 1)
+	if (add_css_vvvvvyn == 1)
+	{
+		jQuery('#jform_css-lbl').closest('.control-group').show();
+		if (jform_vvvvvynvyh_required)
+		{
+			updateFieldRequired('css',0);
+			jQuery('#jform_css').prop('required','required');
+			jQuery('#jform_css').attr('aria-required',true);
+			jQuery('#jform_css').addClass('required');
+			jform_vvvvvynvyh_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_css-lbl').closest('.control-group').hide();
+		if (!jform_vvvvvynvyh_required)
+		{
+			updateFieldRequired('css',1);
+			jQuery('#jform_css').removeAttr('required');
+			jQuery('#jform_css').removeAttr('aria-required');
+			jQuery('#jform_css').removeClass('required');
+			jform_vvvvvynvyh_required = true;
+		}
+	}
+}
+
+// the vvvvvyo function
+function vvvvvyo(add_php_ajax_vvvvvyo)
+{
+	// set the function logic
+	if (add_php_ajax_vvvvvyo == 1)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').show();
 		jQuery('#jform_php_ajaxmethod-lbl').closest('.control-group').show();
-		if (jform_vvvvvynvyh_required)
+		if (jform_vvvvvyovyi_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_vvvvvynvyh_required = false;
+			jform_vvvvvyovyi_required = false;
 		}
 
 	}
@@ -377,13 +377,13 @@ function vvvvvyn(add_php_ajax_vvvvvyn)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_ajaxmethod-lbl').closest('.control-group').hide();
-		if (!jform_vvvvvynvyh_required)
+		if (!jform_vvvvvyovyi_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_vvvvvynvyh_required = true;
+			jform_vvvvvyovyi_required = true;
 		}
 	}
 }

admin/models/forms/custom_code.js

@@ -9,43 +9,43 @@
  */
 
 // Some Global Values
-jform_vvvvwaavzp_required = false;
 jform_vvvvwabvzq_required = false;
-jform_vvvvwabvzr_required = false;
+jform_vvvvwacvzr_required = false;
-jform_vvvvwabvzs_required = false;
+jform_vvvvwacvzs_required = false;
+jform_vvvvwacvzt_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var target_vvvvwaa = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwaa(target_vvvvwaa);
-
 	var target_vvvvwab = jQuery("#jform_target input[type='radio']:checked").val();
 	vvvvwab(target_vvvvwab);
 
 	var target_vvvvwac = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvwac = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwac(target_vvvvwac);
-	vvvvwac(target_vvvvwac,type_vvvvwac);
 
-	var type_vvvvwad = jQuery("#jform_type input[type='radio']:checked").val();
 	var target_vvvvwad = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwad(type_vvvvwad,target_vvvvwad);
+	var type_vvvvwad = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwad(target_vvvvwad,type_vvvvwad);
+
+	var type_vvvvwae = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwae = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwae(type_vvvvwae,target_vvvvwae);
 });
 
-// the vvvvwaa function
+// the vvvvwab function
-function vvvvwaa(target_vvvvwaa)
+function vvvvwab(target_vvvvwab)
 {
 	// set the function logic
-	if (target_vvvvwaa == 2)
+	if (target_vvvvwab == 2)
 	{
 		jQuery('#jform_function_name').closest('.control-group').show();
-		if (jform_vvvvwaavzp_required)
+		if (jform_vvvvwabvzq_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_vvvvwaavzp_required = false;
+			jform_vvvvwabvzq_required = false;
 		}
 
 		jQuery('.note_jcb_placeholder').closest('.control-group').show();
@@ -54,99 +54,99 @@ function vvvvwaa(target_vvvvwaa)
 	else
 	{
 		jQuery('#jform_function_name').closest('.control-group').hide();
-		if (!jform_vvvvwaavzp_required)
+		if (!jform_vvvvwabvzq_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_vvvvwaavzp_required = true;
+			jform_vvvvwabvzq_required = true;
 		}
 		jQuery('.note_jcb_placeholder').closest('.control-group').hide();
 		jQuery('#jform_system_name').closest('.control-group').hide();
 	}
 }
 
-// the vvvvwab function
+// the vvvvwac function
-function vvvvwab(target_vvvvwab)
+function vvvvwac(target_vvvvwac)
 {
 	// set the function logic
-	if (target_vvvvwab == 1)
+	if (target_vvvvwac == 1)
 	{
 		jQuery('#jform_component').closest('.control-group').show();
-		if (jform_vvvvwabvzq_required)
+		if (jform_vvvvwacvzr_required)
 		{
 			updateFieldRequired('component',0);
 			jQuery('#jform_component').prop('required','required');
 			jQuery('#jform_component').attr('aria-required',true);
 			jQuery('#jform_component').addClass('required');
-			jform_vvvvwabvzq_required = false;
+			jform_vvvvwacvzr_required = false;
 		}
 
 		jQuery('#jform_path').closest('.control-group').show();
-		if (jform_vvvvwabvzr_required)
+		if (jform_vvvvwacvzs_required)
 		{
 			updateFieldRequired('path',0);
 			jQuery('#jform_path').prop('required','required');
 			jQuery('#jform_path').attr('aria-required',true);
 			jQuery('#jform_path').addClass('required');
-			jform_vvvvwabvzr_required = false;
+			jform_vvvvwacvzs_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_vvvvwabvzs_required)
+		if (jform_vvvvwacvzt_required)
 		{
 			updateFieldRequired('type',0);
 			jQuery('#jform_type').prop('required','required');
 			jQuery('#jform_type').attr('aria-required',true);
 			jQuery('#jform_type').addClass('required');
-			jform_vvvvwabvzs_required = false;
+			jform_vvvvwacvzt_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_component').closest('.control-group').hide();
-		if (!jform_vvvvwabvzq_required)
+		if (!jform_vvvvwacvzr_required)
 		{
 			updateFieldRequired('component',1);
 			jQuery('#jform_component').removeAttr('required');
 			jQuery('#jform_component').removeAttr('aria-required');
 			jQuery('#jform_component').removeClass('required');
-			jform_vvvvwabvzq_required = true;
+			jform_vvvvwacvzr_required = true;
 		}
 		jQuery('#jform_path').closest('.control-group').hide();
-		if (!jform_vvvvwabvzr_required)
+		if (!jform_vvvvwacvzs_required)
 		{
 			updateFieldRequired('path',1);
 			jQuery('#jform_path').removeAttr('required');
 			jQuery('#jform_path').removeAttr('aria-required');
 			jQuery('#jform_path').removeClass('required');
-			jform_vvvvwabvzr_required = true;
+			jform_vvvvwacvzs_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_vvvvwabvzs_required)
+		if (!jform_vvvvwacvzt_required)
 		{
 			updateFieldRequired('type',1);
 			jQuery('#jform_type').removeAttr('required');
 			jQuery('#jform_type').removeAttr('aria-required');
 			jQuery('#jform_type').removeClass('required');
-			jform_vvvvwabvzs_required = true;
+			jform_vvvvwacvzt_required = true;
 		}
 	}
 }
 
-// the vvvvwac function
+// the vvvvwad function
-function vvvvwac(target_vvvvwac,type_vvvvwac)
+function vvvvwad(target_vvvvwad,type_vvvvwad)
 {
 	// set the function logic
-	if (target_vvvvwac == 1 && type_vvvvwac == 1)
+	if (target_vvvvwad == 1 && type_vvvvwad == 1)
 	{
 		jQuery('#jform_hashendtarget').closest('.control-group').show();
 		jQuery('#jform_to_line').closest('.control-group').show();
@@ -158,11 +158,11 @@ function vvvvwac(target_vvvvwac,type_vvvvwac)
 	}
 }
 
-// the vvvvwad function
+// the vvvvwae function
-function vvvvwad(type_vvvvwad,target_vvvvwad)
+function vvvvwae(type_vvvvwae,target_vvvvwae)
 {
 	// set the function logic
-	if (type_vvvvwad == 1 && target_vvvvwad == 1)
+	if (type_vvvvwae == 1 && target_vvvvwae == 1)
 	{
 		jQuery('#jform_hashendtarget').closest('.control-group').show();
 		jQuery('#jform_to_line').closest('.control-group').show();

admin/models/forms/field.js

@@ -9,151 +9,96 @@
  */
 
 // Some Global Values
-jform_vvvvwamvzv_required = false;
 jform_vvvvwanvzw_required = false;
 jform_vvvvwaovzx_required = false;
 jform_vvvvwapvzy_required = false;
-jform_vvvvwasvzz_required = false;
+jform_vvvvwaqvzz_required = false;
 jform_vvvvwatwaa_required = false;
 jform_vvvvwauwab_required = false;
 jform_vvvvwavwac_required = false;
+jform_vvvvwawwad_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var datalenght_vvvvwam = jQuery("#jform_datalenght").val();
+	var datalenght_vvvvwan = jQuery("#jform_datalenght").val();
-	vvvvwam(datalenght_vvvvwam);
+	vvvvwan(datalenght_vvvvwan);
 
-	var datadefault_vvvvwan = jQuery("#jform_datadefault").val();
+	var datadefault_vvvvwao = jQuery("#jform_datadefault").val();
-	vvvvwan(datadefault_vvvvwan);
+	vvvvwao(datadefault_vvvvwao);
-
-	var datatype_vvvvwao = jQuery("#jform_datatype").val();
-	vvvvwao(datatype_vvvvwao);
 
 	var datatype_vvvvwap = jQuery("#jform_datatype").val();
 	vvvvwap(datatype_vvvvwap);
 
-	var store_vvvvwaq = jQuery("#jform_store").val();
 	var datatype_vvvvwaq = jQuery("#jform_datatype").val();
-	vvvvwaq(store_vvvvwaq,datatype_vvvvwaq);
+	vvvvwaq(datatype_vvvvwaq);
 
-	var add_css_view_vvvvwas = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	var store_vvvvwar = jQuery("#jform_store").val();
-	vvvvwas(add_css_view_vvvvwas);
+	var datatype_vvvvwar = jQuery("#jform_datatype").val();
+	vvvvwar(store_vvvvwar,datatype_vvvvwar);
 
-	var add_css_views_vvvvwat = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	var add_css_view_vvvvwat = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvwat(add_css_views_vvvvwat);
+	vvvvwat(add_css_view_vvvvwat);
 
-	var add_javascript_view_footer_vvvvwau = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	var add_css_views_vvvvwau = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvwau(add_javascript_view_footer_vvvvwau);
+	vvvvwau(add_css_views_vvvvwau);
 
-	var add_javascript_views_footer_vvvvwav = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	var add_javascript_view_footer_vvvvwav = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvwav(add_javascript_views_footer_vvvvwav);
+	vvvvwav(add_javascript_view_footer_vvvvwav);
+
+	var add_javascript_views_footer_vvvvwaw = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	vvvvwaw(add_javascript_views_footer_vvvvwaw);
 });
 
-// the vvvvwam function
+// the vvvvwan function
-function vvvvwam(datalenght_vvvvwam)
+function vvvvwan(datalenght_vvvvwan)
 {
-	if (isSet(datalenght_vvvvwam) && datalenght_vvvvwam.constructor !== Array)
+	if (isSet(datalenght_vvvvwan) && datalenght_vvvvwan.constructor !== Array)
 	{
-		var temp_vvvvwam = datalenght_vvvvwam;
+		var temp_vvvvwan = datalenght_vvvvwan;
-		var datalenght_vvvvwam = [];
+		var datalenght_vvvvwan = [];
-		datalenght_vvvvwam.push(temp_vvvvwam);
+		datalenght_vvvvwan.push(temp_vvvvwan);
 	}
-	else if (!isSet(datalenght_vvvvwam))
+	else if (!isSet(datalenght_vvvvwan))
 	{
-		var datalenght_vvvvwam = [];
+		var datalenght_vvvvwan = [];
 	}
-	var datalenght = datalenght_vvvvwam.some(datalenght_vvvvwam_SomeFunc);
+	var datalenght = datalenght_vvvvwan.some(datalenght_vvvvwan_SomeFunc);
 
 
 	// set this function logic
 	if (datalenght)
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').show();
-		if (jform_vvvvwamvzv_required)
+		if (jform_vvvvwanvzw_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_vvvvwamvzv_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_datalenght_other').closest('.control-group').hide();
-		if (!jform_vvvvwamvzv_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_vvvvwamvzv_required = true;
-		}
-	}
-}
-
-// the vvvvwam Some function
-function datalenght_vvvvwam_SomeFunc(datalenght_vvvvwam)
-{
-	// set the function logic
-	if (datalenght_vvvvwam == 'Other')
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvwan function
-function vvvvwan(datadefault_vvvvwan)
-{
-	if (isSet(datadefault_vvvvwan) && datadefault_vvvvwan.constructor !== Array)
-	{
-		var temp_vvvvwan = datadefault_vvvvwan;
-		var datadefault_vvvvwan = [];
-		datadefault_vvvvwan.push(temp_vvvvwan);
-	}
-	else if (!isSet(datadefault_vvvvwan))
-	{
-		var datadefault_vvvvwan = [];
-	}
-	var datadefault = datadefault_vvvvwan.some(datadefault_vvvvwan_SomeFunc);
-
-
-	// set this function logic
-	if (datadefault)
-	{
-		jQuery('#jform_datadefault_other').closest('.control-group').show();
-		if (jform_vvvvwanvzw_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_vvvvwanvzw_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_datadefault_other').closest('.control-group').hide();
+		jQuery('#jform_datalenght_other').closest('.control-group').hide();
 		if (!jform_vvvvwanvzw_required)
 		{
-			updateFieldRequired('datadefault_other',1);
+			updateFieldRequired('datalenght_other',1);
-			jQuery('#jform_datadefault_other').removeAttr('required');
+			jQuery('#jform_datalenght_other').removeAttr('required');
-			jQuery('#jform_datadefault_other').removeAttr('aria-required');
+			jQuery('#jform_datalenght_other').removeAttr('aria-required');
-			jQuery('#jform_datadefault_other').removeClass('required');
+			jQuery('#jform_datalenght_other').removeClass('required');
 			jform_vvvvwanvzw_required = true;
 		}
 	}
 }
 
 // the vvvvwan Some function
-function datadefault_vvvvwan_SomeFunc(datadefault_vvvvwan)
+function datalenght_vvvvwan_SomeFunc(datalenght_vvvvwan)
 {
 	// set the function logic
-	if (datadefault_vvvvwan == 'Other')
+	if (datalenght_vvvvwan == 'Other')
 	{
 		return true;
 	}
@@ -161,58 +106,54 @@ function datadefault_vvvvwan_SomeFunc(datadefault_vvvvwan)
 }
 
 // the vvvvwao function
-function vvvvwao(datatype_vvvvwao)
+function vvvvwao(datadefault_vvvvwao)
 {
-	if (isSet(datatype_vvvvwao) && datatype_vvvvwao.constructor !== Array)
+	if (isSet(datadefault_vvvvwao) && datadefault_vvvvwao.constructor !== Array)
 	{
-		var temp_vvvvwao = datatype_vvvvwao;
+		var temp_vvvvwao = datadefault_vvvvwao;
-		var datatype_vvvvwao = [];
+		var datadefault_vvvvwao = [];
-		datatype_vvvvwao.push(temp_vvvvwao);
+		datadefault_vvvvwao.push(temp_vvvvwao);
 	}
-	else if (!isSet(datatype_vvvvwao))
+	else if (!isSet(datadefault_vvvvwao))
 	{
-		var datatype_vvvvwao = [];
+		var datadefault_vvvvwao = [];
 	}
-	var datatype = datatype_vvvvwao.some(datatype_vvvvwao_SomeFunc);
+	var datadefault = datadefault_vvvvwao.some(datadefault_vvvvwao_SomeFunc);
 
 
 	// set this function logic
-	if (datatype)
+	if (datadefault)
 	{
-		jQuery('#jform_datadefault').closest('.control-group').show();
+		jQuery('#jform_datadefault_other').closest('.control-group').show();
-		jQuery('#jform_datalenght').closest('.control-group').show();
-		jQuery('#jform_indexes').closest('.control-group').show();
 		if (jform_vvvvwaovzx_required)
 		{
-			updateFieldRequired('indexes',0);
+			updateFieldRequired('datadefault_other',0);
-			jQuery('#jform_indexes').prop('required','required');
+			jQuery('#jform_datadefault_other').prop('required','required');
-			jQuery('#jform_indexes').attr('aria-required',true);
+			jQuery('#jform_datadefault_other').attr('aria-required',true);
-			jQuery('#jform_indexes').addClass('required');
+			jQuery('#jform_datadefault_other').addClass('required');
 			jform_vvvvwaovzx_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_datadefault').closest('.control-group').hide();
+		jQuery('#jform_datadefault_other').closest('.control-group').hide();
-		jQuery('#jform_datalenght').closest('.control-group').hide();
-		jQuery('#jform_indexes').closest('.control-group').hide();
 		if (!jform_vvvvwaovzx_required)
 		{
-			updateFieldRequired('indexes',1);
+			updateFieldRequired('datadefault_other',1);
-			jQuery('#jform_indexes').removeAttr('required');
+			jQuery('#jform_datadefault_other').removeAttr('required');
-			jQuery('#jform_indexes').removeAttr('aria-required');
+			jQuery('#jform_datadefault_other').removeAttr('aria-required');
-			jQuery('#jform_indexes').removeClass('required');
+			jQuery('#jform_datadefault_other').removeClass('required');
 			jform_vvvvwaovzx_required = true;
 		}
 	}
 }
 
 // the vvvvwao Some function
-function datatype_vvvvwao_SomeFunc(datatype_vvvvwao)
+function datadefault_vvvvwao_SomeFunc(datadefault_vvvvwao)
 {
 	// set the function logic
-	if (datatype_vvvvwao == 'CHAR' || datatype_vvvvwao == 'VARCHAR' || datatype_vvvvwao == 'DATETIME' || datatype_vvvvwao == 'DATE' || datatype_vvvvwao == 'TIME' || datatype_vvvvwao == 'INT' || datatype_vvvvwao == 'TINYINT' || datatype_vvvvwao == 'BIGINT' || datatype_vvvvwao == 'FLOAT' || datatype_vvvvwao == 'DECIMAL' || datatype_vvvvwao == 'DOUBLE')
+	if (datadefault_vvvvwao == 'Other')
 	{
 		return true;
 	}
@@ -238,26 +179,30 @@ function vvvvwap(datatype_vvvvwap)
 	// set this function logic
 	if (datatype)
 	{
-		jQuery('#jform_store').closest('.control-group').show();
+		jQuery('#jform_datadefault').closest('.control-group').show();
+		jQuery('#jform_datalenght').closest('.control-group').show();
+		jQuery('#jform_indexes').closest('.control-group').show();
 		if (jform_vvvvwapvzy_required)
 		{
-			updateFieldRequired('store',0);
+			updateFieldRequired('indexes',0);
-			jQuery('#jform_store').prop('required','required');
+			jQuery('#jform_indexes').prop('required','required');
-			jQuery('#jform_store').attr('aria-required',true);
+			jQuery('#jform_indexes').attr('aria-required',true);
-			jQuery('#jform_store').addClass('required');
+			jQuery('#jform_indexes').addClass('required');
 			jform_vvvvwapvzy_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_store').closest('.control-group').hide();
+		jQuery('#jform_datadefault').closest('.control-group').hide();
+		jQuery('#jform_datalenght').closest('.control-group').hide();
+		jQuery('#jform_indexes').closest('.control-group').hide();
 		if (!jform_vvvvwapvzy_required)
 		{
-			updateFieldRequired('store',1);
+			updateFieldRequired('indexes',1);
-			jQuery('#jform_store').removeAttr('required');
+			jQuery('#jform_indexes').removeAttr('required');
-			jQuery('#jform_store').removeAttr('aria-required');
+			jQuery('#jform_indexes').removeAttr('aria-required');
-			jQuery('#jform_store').removeClass('required');
+			jQuery('#jform_indexes').removeClass('required');
 			jform_vvvvwapvzy_required = true;
 		}
 	}
@@ -267,7 +212,7 @@ function vvvvwap(datatype_vvvvwap)
 function datatype_vvvvwap_SomeFunc(datatype_vvvvwap)
 {
 	// set the function logic
-	if (datatype_vvvvwap == 'CHAR' || datatype_vvvvwap == 'VARCHAR' || datatype_vvvvwap == 'TEXT' || datatype_vvvvwap == 'MEDIUMTEXT' || datatype_vvvvwap == 'LONGTEXT')
+	if (datatype_vvvvwap == 'CHAR' || datatype_vvvvwap == 'VARCHAR' || datatype_vvvvwap == 'DATETIME' || datatype_vvvvwap == 'DATE' || datatype_vvvvwap == 'TIME' || datatype_vvvvwap == 'INT' || datatype_vvvvwap == 'TINYINT' || datatype_vvvvwap == 'BIGINT' || datatype_vvvvwap == 'FLOAT' || datatype_vvvvwap == 'DECIMAL' || datatype_vvvvwap == 'DOUBLE')
 	{
 		return true;
 	}
@@ -275,20 +220,8 @@ function datatype_vvvvwap_SomeFunc(datatype_vvvvwap)
 }
 
 // the vvvvwaq function
-function vvvvwaq(store_vvvvwaq,datatype_vvvvwaq)
+function vvvvwaq(datatype_vvvvwaq)
 {
-	if (isSet(store_vvvvwaq) && store_vvvvwaq.constructor !== Array)
-	{
-		var temp_vvvvwaq = store_vvvvwaq;
-		var store_vvvvwaq = [];
-		store_vvvvwaq.push(temp_vvvvwaq);
-	}
-	else if (!isSet(store_vvvvwaq))
-	{
-		var store_vvvvwaq = [];
-	}
-	var store = store_vvvvwaq.some(store_vvvvwaq_SomeFunc);
-
 	if (isSet(datatype_vvvvwaq) && datatype_vvvvwaq.constructor !== Array)
 	{
 		var temp_vvvvwaq = datatype_vvvvwaq;
@@ -303,25 +236,31 @@ function vvvvwaq(store_vvvvwaq,datatype_vvvvwaq)
 
 
 	// set this function logic
-	if (store && datatype)
+	if (datatype)
 	{
-		jQuery('.note_whmcs_encryption').closest('.control-group').show();
+		jQuery('#jform_store').closest('.control-group').show();
+		if (jform_vvvvwaqvzz_required)
+		{
+			updateFieldRequired('store',0);
+			jQuery('#jform_store').prop('required','required');
+			jQuery('#jform_store').attr('aria-required',true);
+			jQuery('#jform_store').addClass('required');
+			jform_vvvvwaqvzz_required = false;
+		}
+
 	}
 	else
 	{
-		jQuery('.note_whmcs_encryption').closest('.control-group').hide();
+		jQuery('#jform_store').closest('.control-group').hide();
-	}
+		if (!jform_vvvvwaqvzz_required)
-}
-
-// the vvvvwaq Some function
-function store_vvvvwaq_SomeFunc(store_vvvvwaq)
-{
-	// set the function logic
-	if (store_vvvvwaq == 4)
 		{
-		return true;
+			updateFieldRequired('store',1);
+			jQuery('#jform_store').removeAttr('required');
+			jQuery('#jform_store').removeAttr('aria-required');
+			jQuery('#jform_store').removeClass('required');
+			jform_vvvvwaqvzz_required = true;
+		}
 	}
-	return false;
 }
 
 // the vvvvwaq Some function
@@ -335,126 +274,187 @@ function datatype_vvvvwaq_SomeFunc(datatype_vvvvwaq)
 	return false;
 }
 
-// the vvvvwas function
+// the vvvvwar function
-function vvvvwas(add_css_view_vvvvwas)
+function vvvvwar(store_vvvvwar,datatype_vvvvwar)
+{
+	if (isSet(store_vvvvwar) && store_vvvvwar.constructor !== Array)
+	{
+		var temp_vvvvwar = store_vvvvwar;
+		var store_vvvvwar = [];
+		store_vvvvwar.push(temp_vvvvwar);
+	}
+	else if (!isSet(store_vvvvwar))
+	{
+		var store_vvvvwar = [];
+	}
+	var store = store_vvvvwar.some(store_vvvvwar_SomeFunc);
+
+	if (isSet(datatype_vvvvwar) && datatype_vvvvwar.constructor !== Array)
+	{
+		var temp_vvvvwar = datatype_vvvvwar;
+		var datatype_vvvvwar = [];
+		datatype_vvvvwar.push(temp_vvvvwar);
+	}
+	else if (!isSet(datatype_vvvvwar))
+	{
+		var datatype_vvvvwar = [];
+	}
+	var datatype = datatype_vvvvwar.some(datatype_vvvvwar_SomeFunc);
+
+
+	// set this function logic
+	if (store && datatype)
+	{
+		jQuery('.note_whmcs_encryption').closest('.control-group').show();
+	}
+	else
+	{
+		jQuery('.note_whmcs_encryption').closest('.control-group').hide();
+	}
+}
+
+// the vvvvwar Some function
+function store_vvvvwar_SomeFunc(store_vvvvwar)
 {
 	// set the function logic
-	if (add_css_view_vvvvwas == 1)
+	if (store_vvvvwar == 4)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwar Some function
+function datatype_vvvvwar_SomeFunc(datatype_vvvvwar)
+{
+	// set the function logic
+	if (datatype_vvvvwar == 'CHAR' || datatype_vvvvwar == 'VARCHAR' || datatype_vvvvwar == 'TEXT' || datatype_vvvvwar == 'MEDIUMTEXT' || datatype_vvvvwar == 'LONGTEXT')
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwat function
+function vvvvwat(add_css_view_vvvvwat)
+{
+	// set the function logic
+	if (add_css_view_vvvvwat == 1)
 	{
 		jQuery('#jform_css_view-lbl').closest('.control-group').show();
-		if (jform_vvvvwasvzz_required)
+		if (jform_vvvvwatwaa_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_vvvvwasvzz_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_css_view-lbl').closest('.control-group').hide();
-		if (!jform_vvvvwasvzz_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_vvvvwasvzz_required = true;
-		}
-	}
-}
-
-// the vvvvwat function
-function vvvvwat(add_css_views_vvvvwat)
-{
-	// set the function logic
-	if (add_css_views_vvvvwat == 1)
-	{
-		jQuery('#jform_css_views-lbl').closest('.control-group').show();
-		if (jform_vvvvwatwaa_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_vvvvwatwaa_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_css_views-lbl').closest('.control-group').hide();
+		jQuery('#jform_css_view-lbl').closest('.control-group').hide();
 		if (!jform_vvvvwatwaa_required)
 		{
-			updateFieldRequired('css_views',1);
+			updateFieldRequired('css_view',1);
-			jQuery('#jform_css_views').removeAttr('required');
+			jQuery('#jform_css_view').removeAttr('required');
-			jQuery('#jform_css_views').removeAttr('aria-required');
+			jQuery('#jform_css_view').removeAttr('aria-required');
-			jQuery('#jform_css_views').removeClass('required');
+			jQuery('#jform_css_view').removeClass('required');
 			jform_vvvvwatwaa_required = true;
 		}
 	}
 }
 
 // the vvvvwau function
-function vvvvwau(add_javascript_view_footer_vvvvwau)
+function vvvvwau(add_css_views_vvvvwau)
 {
 	// set the function logic
-	if (add_javascript_view_footer_vvvvwau == 1)
+	if (add_css_views_vvvvwau == 1)
 	{
-		jQuery('#jform_javascript_view_footer-lbl').closest('.control-group').show();
+		jQuery('#jform_css_views-lbl').closest('.control-group').show();
 		if (jform_vvvvwauwab_required)
 		{
-			updateFieldRequired('javascript_view_footer',0);
+			updateFieldRequired('css_views',0);
-			jQuery('#jform_javascript_view_footer').prop('required','required');
+			jQuery('#jform_css_views').prop('required','required');
-			jQuery('#jform_javascript_view_footer').attr('aria-required',true);
+			jQuery('#jform_css_views').attr('aria-required',true);
-			jQuery('#jform_javascript_view_footer').addClass('required');
+			jQuery('#jform_css_views').addClass('required');
 			jform_vvvvwauwab_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_javascript_view_footer-lbl').closest('.control-group').hide();
+		jQuery('#jform_css_views-lbl').closest('.control-group').hide();
 		if (!jform_vvvvwauwab_required)
 		{
-			updateFieldRequired('javascript_view_footer',1);
+			updateFieldRequired('css_views',1);
-			jQuery('#jform_javascript_view_footer').removeAttr('required');
+			jQuery('#jform_css_views').removeAttr('required');
-			jQuery('#jform_javascript_view_footer').removeAttr('aria-required');
+			jQuery('#jform_css_views').removeAttr('aria-required');
-			jQuery('#jform_javascript_view_footer').removeClass('required');
+			jQuery('#jform_css_views').removeClass('required');
 			jform_vvvvwauwab_required = true;
 		}
 	}
 }
 
 // the vvvvwav function
-function vvvvwav(add_javascript_views_footer_vvvvwav)
+function vvvvwav(add_javascript_view_footer_vvvvwav)
 {
 	// set the function logic
-	if (add_javascript_views_footer_vvvvwav == 1)
+	if (add_javascript_view_footer_vvvvwav == 1)
 	{
-		jQuery('#jform_javascript_views_footer-lbl').closest('.control-group').show();
+		jQuery('#jform_javascript_view_footer-lbl').closest('.control-group').show();
 		if (jform_vvvvwavwac_required)
 		{
-			updateFieldRequired('javascript_views_footer',0);
+			updateFieldRequired('javascript_view_footer',0);
-			jQuery('#jform_javascript_views_footer').prop('required','required');
+			jQuery('#jform_javascript_view_footer').prop('required','required');
-			jQuery('#jform_javascript_views_footer').attr('aria-required',true);
+			jQuery('#jform_javascript_view_footer').attr('aria-required',true);
-			jQuery('#jform_javascript_views_footer').addClass('required');
+			jQuery('#jform_javascript_view_footer').addClass('required');
 			jform_vvvvwavwac_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_javascript_views_footer-lbl').closest('.control-group').hide();
+		jQuery('#jform_javascript_view_footer-lbl').closest('.control-group').hide();
 		if (!jform_vvvvwavwac_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_vvvvwavwac_required = true;
+		}
+	}
+}
+
+// the vvvvwaw function
+function vvvvwaw(add_javascript_views_footer_vvvvwaw)
+{
+	// set the function logic
+	if (add_javascript_views_footer_vvvvwaw == 1)
+	{
+		jQuery('#jform_javascript_views_footer-lbl').closest('.control-group').show();
+		if (jform_vvvvwawwad_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_vvvvwawwad_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_javascript_views_footer-lbl').closest('.control-group').hide();
+		if (!jform_vvvvwawwad_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_vvvvwavwac_required = true;
+			jform_vvvvwawwad_required = true;
 		}
 	}
 }

admin/models/forms/help_document.js

@@ -9,24 +9,21 @@
  */
 
 // Some Global Values
-jform_vvvvwbgwao_required = false;
 jform_vvvvwbhwap_required = false;
 jform_vvvvwbiwaq_required = false;
 jform_vvvvwbjwar_required = false;
 jform_vvvvwbkwas_required = false;
 jform_vvvvwblwat_required = false;
+jform_vvvvwbmwau_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var location_vvvvwbg = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwbg(location_vvvvwbg);
-
 	var location_vvvvwbh = jQuery("#jform_location input[type='radio']:checked").val();
 	vvvvwbh(location_vvvvwbh);
 
-	var type_vvvvwbi = jQuery("#jform_type").val();
+	var location_vvvvwbi = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwbi(type_vvvvwbi);
+	vvvvwbi(location_vvvvwbi);
 
 	var type_vvvvwbj = jQuery("#jform_type").val();
 	vvvvwbj(type_vvvvwbj);
@@ -34,127 +31,75 @@ jQuery(document).ready(function()
 	var type_vvvvwbk = jQuery("#jform_type").val();
 	vvvvwbk(type_vvvvwbk);
 
-	var target_vvvvwbl = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvwbl = jQuery("#jform_type").val();
-	vvvvwbl(target_vvvvwbl);
+	vvvvwbl(type_vvvvwbl);
+
+	var target_vvvvwbm = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbm(target_vvvvwbm);
 });
 
-// the vvvvwbg function
-function vvvvwbg(location_vvvvwbg)
-{
-	// set the function logic
-	if (location_vvvvwbg == 1)
-	{
-		jQuery('#jform_admin_view').closest('.control-group').show();
-		if (jform_vvvvwbgwao_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_vvvvwbgwao_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_admin_view').closest('.control-group').hide();
-		if (!jform_vvvvwbgwao_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_vvvvwbgwao_required = true;
-		}
-	}
-}
-
 // the vvvvwbh function
 function vvvvwbh(location_vvvvwbh)
 {
 	// set the function logic
-	if (location_vvvvwbh == 2)
+	if (location_vvvvwbh == 1)
 	{
-		jQuery('#jform_site_view').closest('.control-group').show();
+		jQuery('#jform_admin_view').closest('.control-group').show();
 		if (jform_vvvvwbhwap_required)
 		{
-			updateFieldRequired('site_view',0);
+			updateFieldRequired('admin_view',0);
-			jQuery('#jform_site_view').prop('required','required');
+			jQuery('#jform_admin_view').prop('required','required');
-			jQuery('#jform_site_view').attr('aria-required',true);
+			jQuery('#jform_admin_view').attr('aria-required',true);
-			jQuery('#jform_site_view').addClass('required');
+			jQuery('#jform_admin_view').addClass('required');
 			jform_vvvvwbhwap_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_site_view').closest('.control-group').hide();
+		jQuery('#jform_admin_view').closest('.control-group').hide();
 		if (!jform_vvvvwbhwap_required)
 		{
-			updateFieldRequired('site_view',1);
+			updateFieldRequired('admin_view',1);
-			jQuery('#jform_site_view').removeAttr('required');
+			jQuery('#jform_admin_view').removeAttr('required');
-			jQuery('#jform_site_view').removeAttr('aria-required');
+			jQuery('#jform_admin_view').removeAttr('aria-required');
-			jQuery('#jform_site_view').removeClass('required');
+			jQuery('#jform_admin_view').removeClass('required');
 			jform_vvvvwbhwap_required = true;
 		}
 	}
 }
 
 // the vvvvwbi function
-function vvvvwbi(type_vvvvwbi)
+function vvvvwbi(location_vvvvwbi)
 {
-	if (isSet(type_vvvvwbi) && type_vvvvwbi.constructor !== Array)
+	// set the function logic
+	if (location_vvvvwbi == 2)
 	{
-		var temp_vvvvwbi = type_vvvvwbi;
+		jQuery('#jform_site_view').closest('.control-group').show();
-		var type_vvvvwbi = [];
-		type_vvvvwbi.push(temp_vvvvwbi);
-	}
-	else if (!isSet(type_vvvvwbi))
-	{
-		var type_vvvvwbi = [];
-	}
-	var type = type_vvvvwbi.some(type_vvvvwbi_SomeFunc);
-
-
-	// set this function logic
-	if (type)
-	{
-		jQuery('#jform_url').closest('.control-group').show();
 		if (jform_vvvvwbiwaq_required)
 		{
-			updateFieldRequired('url',0);
+			updateFieldRequired('site_view',0);
-			jQuery('#jform_url').prop('required','required');
+			jQuery('#jform_site_view').prop('required','required');
-			jQuery('#jform_url').attr('aria-required',true);
+			jQuery('#jform_site_view').attr('aria-required',true);
-			jQuery('#jform_url').addClass('required');
+			jQuery('#jform_site_view').addClass('required');
 			jform_vvvvwbiwaq_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_url').closest('.control-group').hide();
+		jQuery('#jform_site_view').closest('.control-group').hide();
 		if (!jform_vvvvwbiwaq_required)
 		{
-			updateFieldRequired('url',1);
+			updateFieldRequired('site_view',1);
-			jQuery('#jform_url').removeAttr('required');
+			jQuery('#jform_site_view').removeAttr('required');
-			jQuery('#jform_url').removeAttr('aria-required');
+			jQuery('#jform_site_view').removeAttr('aria-required');
-			jQuery('#jform_url').removeClass('required');
+			jQuery('#jform_site_view').removeClass('required');
 			jform_vvvvwbiwaq_required = true;
 		}
 	}
 }
 
-// the vvvvwbi Some function
-function type_vvvvwbi_SomeFunc(type_vvvvwbi)
-{
-	// set the function logic
-	if (type_vvvvwbi == 3)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwbj function
 function vvvvwbj(type_vvvvwbj)
 {
@@ -174,26 +119,26 @@ function vvvvwbj(type_vvvvwbj)
 	// set this function logic
 	if (type)
 	{
-		jQuery('#jform_article').closest('.control-group').show();
+		jQuery('#jform_url').closest('.control-group').show();
 		if (jform_vvvvwbjwar_required)
 		{
-			updateFieldRequired('article',0);
+			updateFieldRequired('url',0);
-			jQuery('#jform_article').prop('required','required');
+			jQuery('#jform_url').prop('required','required');
-			jQuery('#jform_article').attr('aria-required',true);
+			jQuery('#jform_url').attr('aria-required',true);
-			jQuery('#jform_article').addClass('required');
+			jQuery('#jform_url').addClass('required');
 			jform_vvvvwbjwar_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_article').closest('.control-group').hide();
+		jQuery('#jform_url').closest('.control-group').hide();
 		if (!jform_vvvvwbjwar_required)
 		{
-			updateFieldRequired('article',1);
+			updateFieldRequired('url',1);
-			jQuery('#jform_article').removeAttr('required');
+			jQuery('#jform_url').removeAttr('required');
-			jQuery('#jform_article').removeAttr('aria-required');
+			jQuery('#jform_url').removeAttr('aria-required');
-			jQuery('#jform_article').removeClass('required');
+			jQuery('#jform_url').removeClass('required');
 			jform_vvvvwbjwar_required = true;
 		}
 	}
@@ -203,7 +148,7 @@ function vvvvwbj(type_vvvvwbj)
 function type_vvvvwbj_SomeFunc(type_vvvvwbj)
 {
 	// set the function logic
-	if (type_vvvvwbj == 1)
+	if (type_vvvvwbj == 3)
 	{
 		return true;
 	}
@@ -229,26 +174,26 @@ function vvvvwbk(type_vvvvwbk)
 	// set this function logic
 	if (type)
 	{
-		jQuery('#jform_content-lbl').closest('.control-group').show();
+		jQuery('#jform_article').closest('.control-group').show();
 		if (jform_vvvvwbkwas_required)
 		{
-			updateFieldRequired('content',0);
+			updateFieldRequired('article',0);
-			jQuery('#jform_content').prop('required','required');
+			jQuery('#jform_article').prop('required','required');
-			jQuery('#jform_content').attr('aria-required',true);
+			jQuery('#jform_article').attr('aria-required',true);
-			jQuery('#jform_content').addClass('required');
+			jQuery('#jform_article').addClass('required');
 			jform_vvvvwbkwas_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_content-lbl').closest('.control-group').hide();
+		jQuery('#jform_article').closest('.control-group').hide();
 		if (!jform_vvvvwbkwas_required)
 		{
-			updateFieldRequired('content',1);
+			updateFieldRequired('article',1);
-			jQuery('#jform_content').removeAttr('required');
+			jQuery('#jform_article').removeAttr('required');
-			jQuery('#jform_content').removeAttr('aria-required');
+			jQuery('#jform_article').removeAttr('aria-required');
-			jQuery('#jform_content').removeClass('required');
+			jQuery('#jform_article').removeClass('required');
 			jform_vvvvwbkwas_required = true;
 		}
 	}
@@ -258,7 +203,7 @@ function vvvvwbk(type_vvvvwbk)
 function type_vvvvwbk_SomeFunc(type_vvvvwbk)
 {
 	// set the function logic
-	if (type_vvvvwbk == 2)
+	if (type_vvvvwbk == 1)
 	{
 		return true;
 	}
@@ -266,32 +211,87 @@ function type_vvvvwbk_SomeFunc(type_vvvvwbk)
 }
 
 // the vvvvwbl function
-function vvvvwbl(target_vvvvwbl)
+function vvvvwbl(type_vvvvwbl)
 {
-	// set the function logic
+	if (isSet(type_vvvvwbl) && type_vvvvwbl.constructor !== Array)
-	if (target_vvvvwbl == 1)
 	{
-		jQuery('#jform_groups').closest('.control-group').show();
+		var temp_vvvvwbl = type_vvvvwbl;
+		var type_vvvvwbl = [];
+		type_vvvvwbl.push(temp_vvvvwbl);
+	}
+	else if (!isSet(type_vvvvwbl))
+	{
+		var type_vvvvwbl = [];
+	}
+	var type = type_vvvvwbl.some(type_vvvvwbl_SomeFunc);
+
+
+	// set this function logic
+	if (type)
+	{
+		jQuery('#jform_content-lbl').closest('.control-group').show();
 		if (jform_vvvvwblwat_required)
 		{
-			updateFieldRequired('groups',0);
+			updateFieldRequired('content',0);
-			jQuery('#jform_groups').prop('required','required');
+			jQuery('#jform_content').prop('required','required');
-			jQuery('#jform_groups').attr('aria-required',true);
+			jQuery('#jform_content').attr('aria-required',true);
-			jQuery('#jform_groups').addClass('required');
+			jQuery('#jform_content').addClass('required');
 			jform_vvvvwblwat_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_groups').closest('.control-group').hide();
+		jQuery('#jform_content-lbl').closest('.control-group').hide();
 		if (!jform_vvvvwblwat_required)
+		{
+			updateFieldRequired('content',1);
+			jQuery('#jform_content').removeAttr('required');
+			jQuery('#jform_content').removeAttr('aria-required');
+			jQuery('#jform_content').removeClass('required');
+			jform_vvvvwblwat_required = true;
+		}
+	}
+}
+
+// the vvvvwbl Some function
+function type_vvvvwbl_SomeFunc(type_vvvvwbl)
+{
+	// set the function logic
+	if (type_vvvvwbl == 2)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwbm function
+function vvvvwbm(target_vvvvwbm)
+{
+	// set the function logic
+	if (target_vvvvwbm == 1)
+	{
+		jQuery('#jform_groups').closest('.control-group').show();
+		if (jform_vvvvwbmwau_required)
+		{
+			updateFieldRequired('groups',0);
+			jQuery('#jform_groups').prop('required','required');
+			jQuery('#jform_groups').attr('aria-required',true);
+			jQuery('#jform_groups').addClass('required');
+			jform_vvvvwbmwau_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_groups').closest('.control-group').hide();
+		if (!jform_vvvvwbmwau_required)
 		{
 			updateFieldRequired('groups',1);
 			jQuery('#jform_groups').removeAttr('required');
 			jQuery('#jform_groups').removeAttr('aria-required');
 			jQuery('#jform_groups').removeClass('required');
-			jform_vvvvwblwat_required = true;
+			jform_vvvvwbmwau_required = true;
 		}
 	}
 }

admin/models/forms/layout.js

@@ -9,42 +9,42 @@
  */
 
 // Some Global Values
-jform_vvvvvzavyu_required = false;
+jform_vvvvvzbvyv_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var add_php_view_vvvvvza = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvzb = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvza(add_php_view_vvvvvza);
+	vvvvvzb(add_php_view_vvvvvzb);
 });
 
-// the vvvvvza function
+// the vvvvvzb function
-function vvvvvza(add_php_view_vvvvvza)
+function vvvvvzb(add_php_view_vvvvvzb)
 {
 	// set the function logic
-	if (add_php_view_vvvvvza == 1)
+	if (add_php_view_vvvvvzb == 1)
 	{
 		jQuery('#jform_php_view-lbl').closest('.control-group').show();
-		if (jform_vvvvvzavyu_required)
+		if (jform_vvvvvzbvyv_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_vvvvvzavyu_required = false;
+			jform_vvvvvzbvyv_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_view-lbl').closest('.control-group').hide();
-		if (!jform_vvvvvzavyu_required)
+		if (!jform_vvvvvzbvyv_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_vvvvvzavyu_required = true;
+			jform_vvvvvzbvyv_required = true;
 		}
 	}
 }

admin/models/forms/library.js

@@ -9,15 +9,12 @@
  */
 
 // Some Global Values
-jform_vvvvwafvzt_required = false;
+jform_vvvvwagvzu_required = false;
-jform_vvvvwalvzu_required = false;
+jform_vvvvwamvzv_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var how_vvvvwae = jQuery("#jform_how").val();
-	vvvvwae(how_vvvvwae);
-
 	var how_vvvvwaf = jQuery("#jform_how").val();
 	vvvvwaf(how_vvvvwaf);
 
@@ -36,48 +33,13 @@ jQuery(document).ready(function()
 	var how_vvvvwak = jQuery("#jform_how").val();
 	vvvvwak(how_vvvvwak);
 
-	var type_vvvvwal = jQuery("#jform_type input[type='radio']:checked").val();
+	var how_vvvvwal = jQuery("#jform_how").val();
-	vvvvwal(type_vvvvwal);
+	vvvvwal(how_vvvvwal);
+
+	var type_vvvvwam = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwam(type_vvvvwam);
 });
 
-// the vvvvwae function
-function vvvvwae(how_vvvvwae)
-{
-	if (isSet(how_vvvvwae) && how_vvvvwae.constructor !== Array)
-	{
-		var temp_vvvvwae = how_vvvvwae;
-		var how_vvvvwae = [];
-		how_vvvvwae.push(temp_vvvvwae);
-	}
-	else if (!isSet(how_vvvvwae))
-	{
-		var how_vvvvwae = [];
-	}
-	var how = how_vvvvwae.some(how_vvvvwae_SomeFunc);
-
-
-	// set this function logic
-	if (how)
-	{
-		jQuery('#jform_addconditions-lbl').closest('.control-group').show();
-	}
-	else
-	{
-		jQuery('#jform_addconditions-lbl').closest('.control-group').hide();
-	}
-}
-
-// the vvvvwae Some function
-function how_vvvvwae_SomeFunc(how_vvvvwae)
-{
-	// set the function logic
-	if (how_vvvvwae == 2)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwaf function
 function vvvvwaf(how_vvvvwaf)
 {
@@ -97,28 +59,11 @@ function vvvvwaf(how_vvvvwaf)
 	// set this function logic
 	if (how)
 	{
-		jQuery('#jform_php_setdocument').closest('.control-group').show();
+		jQuery('#jform_addconditions-lbl').closest('.control-group').show();
-		if (jform_vvvvwafvzt_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_vvvvwafvzt_required = false;
-		}
-
 	}
 	else
 	{
-		jQuery('#jform_php_setdocument').closest('.control-group').hide();
+		jQuery('#jform_addconditions-lbl').closest('.control-group').hide();
-		if (!jform_vvvvwafvzt_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_vvvvwafvzt_required = true;
-		}
 	}
 }
 
@@ -126,7 +71,7 @@ function vvvvwaf(how_vvvvwaf)
 function how_vvvvwaf_SomeFunc(how_vvvvwaf)
 {
 	// set the function logic
-	if (how_vvvvwaf == 3)
+	if (how_vvvvwaf == 2)
 	{
 		return true;
 	}
@@ -152,11 +97,28 @@ function vvvvwag(how_vvvvwag)
 	// set this function logic
 	if (how)
 	{
-		jQuery('.note_display_library_config').closest('.control-group').show();
+		jQuery('#jform_php_setdocument').closest('.control-group').show();
+		if (jform_vvvvwagvzu_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_vvvvwagvzu_required = false;
+		}
+
 	}
 	else
 	{
-		jQuery('.note_display_library_config').closest('.control-group').hide();
+		jQuery('#jform_php_setdocument').closest('.control-group').hide();
+		if (!jform_vvvvwagvzu_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_vvvvwagvzu_required = true;
+		}
 	}
 }
 
@@ -164,7 +126,7 @@ function vvvvwag(how_vvvvwag)
 function how_vvvvwag_SomeFunc(how_vvvvwag)
 {
 	// set the function logic
-	if (how_vvvvwag == 2 || how_vvvvwag == 3)
+	if (how_vvvvwag == 3)
 	{
 		return true;
 	}
@@ -190,11 +152,11 @@ function vvvvwah(how_vvvvwah)
 	// set this function logic
 	if (how)
 	{
-		jQuery('.note_display_library_files_folders_urls').closest('.control-group').show();
+		jQuery('.note_display_library_config').closest('.control-group').show();
 	}
 	else
 	{
-		jQuery('.note_display_library_files_folders_urls').closest('.control-group').hide();
+		jQuery('.note_display_library_config').closest('.control-group').hide();
 	}
 }
 
@@ -202,7 +164,7 @@ function vvvvwah(how_vvvvwah)
 function how_vvvvwah_SomeFunc(how_vvvvwah)
 {
 	// set the function logic
-	if (how_vvvvwah == 1 || how_vvvvwah == 2 || how_vvvvwah == 3)
+	if (how_vvvvwah == 2 || how_vvvvwah == 3)
 	{
 		return true;
 	}
@@ -228,15 +190,11 @@ function vvvvwai(how_vvvvwai)
 	// set this function logic
 	if (how)
 	{
-		jQuery('.note_no_behaviour_one').closest('.control-group').show();
+		jQuery('.note_display_library_files_folders_urls').closest('.control-group').show();
-		jQuery('.note_no_behaviour_three').closest('.control-group').show();
-		jQuery('.note_no_behaviour_two').closest('.control-group').show();
 	}
 	else
 	{
-		jQuery('.note_no_behaviour_one').closest('.control-group').hide();
+		jQuery('.note_display_library_files_folders_urls').closest('.control-group').hide();
-		jQuery('.note_no_behaviour_three').closest('.control-group').hide();
-		jQuery('.note_no_behaviour_two').closest('.control-group').hide();
 	}
 }
 
@@ -244,7 +202,7 @@ function vvvvwai(how_vvvvwai)
 function how_vvvvwai_SomeFunc(how_vvvvwai)
 {
 	// set the function logic
-	if (how_vvvvwai == 0)
+	if (how_vvvvwai == 1 || how_vvvvwai == 2 || how_vvvvwai == 3)
 	{
 		return true;
 	}
@@ -270,13 +228,15 @@ function vvvvwaj(how_vvvvwaj)
 	// set this function logic
 	if (how)
 	{
-		jQuery('.note_yes_behaviour_one').closest('.control-group').show();
+		jQuery('.note_no_behaviour_one').closest('.control-group').show();
-		jQuery('.note_yes_behaviour_two').closest('.control-group').show();
+		jQuery('.note_no_behaviour_three').closest('.control-group').show();
+		jQuery('.note_no_behaviour_two').closest('.control-group').show();
 	}
 	else
 	{
-		jQuery('.note_yes_behaviour_one').closest('.control-group').hide();
+		jQuery('.note_no_behaviour_one').closest('.control-group').hide();
-		jQuery('.note_yes_behaviour_two').closest('.control-group').hide();
+		jQuery('.note_no_behaviour_three').closest('.control-group').hide();
+		jQuery('.note_no_behaviour_two').closest('.control-group').hide();
 	}
 }
 
@@ -284,7 +244,7 @@ function vvvvwaj(how_vvvvwaj)
 function how_vvvvwaj_SomeFunc(how_vvvvwaj)
 {
 	// set the function logic
-	if (how_vvvvwaj == 1)
+	if (how_vvvvwaj == 0)
 	{
 		return true;
 	}
@@ -307,6 +267,46 @@ function vvvvwak(how_vvvvwak)
 	var how = how_vvvvwak.some(how_vvvvwak_SomeFunc);
 
 
+	// set this function logic
+	if (how)
+	{
+		jQuery('.note_yes_behaviour_one').closest('.control-group').show();
+		jQuery('.note_yes_behaviour_two').closest('.control-group').show();
+	}
+	else
+	{
+		jQuery('.note_yes_behaviour_one').closest('.control-group').hide();
+		jQuery('.note_yes_behaviour_two').closest('.control-group').hide();
+	}
+}
+
+// the vvvvwak Some function
+function how_vvvvwak_SomeFunc(how_vvvvwak)
+{
+	// set the function logic
+	if (how_vvvvwak == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwal function
+function vvvvwal(how_vvvvwal)
+{
+	if (isSet(how_vvvvwal) && how_vvvvwal.constructor !== Array)
+	{
+		var temp_vvvvwal = how_vvvvwal;
+		var how_vvvvwal = [];
+		how_vvvvwal.push(temp_vvvvwal);
+	}
+	else if (!isSet(how_vvvvwal))
+	{
+		var how_vvvvwal = [];
+	}
+	var how = how_vvvvwal.some(how_vvvvwal_SomeFunc);
+
+
 	// set this function logic
 	if (how)
 	{
@@ -322,44 +322,44 @@ function vvvvwak(how_vvvvwak)
 	}
 }
 
-// the vvvvwak Some function
+// the vvvvwal Some function
-function how_vvvvwak_SomeFunc(how_vvvvwak)
+function how_vvvvwal_SomeFunc(how_vvvvwal)
 {
 	// set the function logic
-	if (how_vvvvwak == 4)
+	if (how_vvvvwal == 4)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwal function
+// the vvvvwam function
-function vvvvwal(type_vvvvwal)
+function vvvvwam(type_vvvvwam)
 {
 	// set the function logic
-	if (type_vvvvwal == 2)
+	if (type_vvvvwam == 2)
 	{
 		jQuery('#jform_libraries').closest('.control-group').show();
-		if (jform_vvvvwalvzu_required)
+		if (jform_vvvvwamvzv_required)
 		{
 			updateFieldRequired('libraries',0);
 			jQuery('#jform_libraries').prop('required','required');
 			jQuery('#jform_libraries').attr('aria-required',true);
 			jQuery('#jform_libraries').addClass('required');
-			jform_vvvvwalvzu_required = false;
+			jform_vvvvwamvzv_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_libraries').closest('.control-group').hide();
-		if (!jform_vvvvwalvzu_required)
+		if (!jform_vvvvwamvzv_required)
 		{
 			updateFieldRequired('libraries',1);
 			jQuery('#jform_libraries').removeAttr('required');
 			jQuery('#jform_libraries').removeAttr('aria-required');
 			jQuery('#jform_libraries').removeClass('required');
-			jform_vvvvwalvzu_required = true;
+			jform_vvvvwamvzv_required = true;
 		}
 	}
 }

admin/models/forms/server.js

@@ -9,175 +9,42 @@
  */
 
 // Some Global Values
-jform_vvvvwawwae_required = false;
+jform_vvvvwaxwaf_required = false;
-jform_vvvvwawwaf_required = false;
+jform_vvvvwaxwag_required = false;
-jform_vvvvwawwag_required = false;
+jform_vvvvwaxwah_required = false;
-jform_vvvvwawwah_required = false;
+jform_vvvvwaxwai_required = false;
-jform_vvvvwawwai_required = false;
 jform_vvvvwaxwaj_required = false;
 jform_vvvvwaywak_required = false;
-jform_vvvvwbawal_required = false;
+jform_vvvvwazwal_required = false;
-jform_vvvvwbcwam_required = false;
+jform_vvvvwbbwam_required = false;
+jform_vvvvwbdwan_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var protocol_vvvvwaw = jQuery("#jform_protocol").val();
-	vvvvwaw(protocol_vvvvwaw);
-
 	var protocol_vvvvwax = jQuery("#jform_protocol").val();
 	vvvvwax(protocol_vvvvwax);
 
 	var protocol_vvvvway = jQuery("#jform_protocol").val();
-	var authentication_vvvvway = jQuery("#jform_authentication").val();
+	vvvvway(protocol_vvvvway);
-	vvvvway(protocol_vvvvway,authentication_vvvvway);
 
-	var protocol_vvvvwba = jQuery("#jform_protocol").val();
+	var protocol_vvvvwaz = jQuery("#jform_protocol").val();
-	var authentication_vvvvwba = jQuery("#jform_authentication").val();
+	var authentication_vvvvwaz = jQuery("#jform_authentication").val();
-	vvvvwba(protocol_vvvvwba,authentication_vvvvwba);
+	vvvvwaz(protocol_vvvvwaz,authentication_vvvvwaz);
 
-	var protocol_vvvvwbc = jQuery("#jform_protocol").val();
+	var protocol_vvvvwbb = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbc = jQuery("#jform_authentication").val();
+	var authentication_vvvvwbb = jQuery("#jform_authentication").val();
-	vvvvwbc(protocol_vvvvwbc,authentication_vvvvwbc);
+	vvvvwbb(protocol_vvvvwbb,authentication_vvvvwbb);
 
-	var protocol_vvvvwbe = jQuery("#jform_protocol").val();
+	var protocol_vvvvwbd = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbe = jQuery("#jform_authentication").val();
+	var authentication_vvvvwbd = jQuery("#jform_authentication").val();
-	vvvvwbe(protocol_vvvvwbe,authentication_vvvvwbe);
+	vvvvwbd(protocol_vvvvwbd,authentication_vvvvwbd);
+
+	var protocol_vvvvwbf = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbf = jQuery("#jform_authentication").val();
+	vvvvwbf(protocol_vvvvwbf,authentication_vvvvwbf);
 });
 
-// the vvvvwaw function
-function vvvvwaw(protocol_vvvvwaw)
-{
-	if (isSet(protocol_vvvvwaw) && protocol_vvvvwaw.constructor !== Array)
-	{
-		var temp_vvvvwaw = protocol_vvvvwaw;
-		var protocol_vvvvwaw = [];
-		protocol_vvvvwaw.push(temp_vvvvwaw);
-	}
-	else if (!isSet(protocol_vvvvwaw))
-	{
-		var protocol_vvvvwaw = [];
-	}
-	var protocol = protocol_vvvvwaw.some(protocol_vvvvwaw_SomeFunc);
-
-
-	// set this function logic
-	if (protocol)
-	{
-		jQuery('#jform_authentication').closest('.control-group').show();
-		if (jform_vvvvwawwae_required)
-		{
-			updateFieldRequired('authentication',0);
-			jQuery('#jform_authentication').prop('required','required');
-			jQuery('#jform_authentication').attr('aria-required',true);
-			jQuery('#jform_authentication').addClass('required');
-			jform_vvvvwawwae_required = false;
-		}
-
-		jQuery('#jform_host').closest('.control-group').show();
-		if (jform_vvvvwawwaf_required)
-		{
-			updateFieldRequired('host',0);
-			jQuery('#jform_host').prop('required','required');
-			jQuery('#jform_host').attr('aria-required',true);
-			jQuery('#jform_host').addClass('required');
-			jform_vvvvwawwaf_required = false;
-		}
-
-		jQuery('#jform_port').closest('.control-group').show();
-		if (jform_vvvvwawwag_required)
-		{
-			updateFieldRequired('port',0);
-			jQuery('#jform_port').prop('required','required');
-			jQuery('#jform_port').attr('aria-required',true);
-			jQuery('#jform_port').addClass('required');
-			jform_vvvvwawwag_required = false;
-		}
-
-		jQuery('#jform_path').closest('.control-group').show();
-		if (jform_vvvvwawwah_required)
-		{
-			updateFieldRequired('path',0);
-			jQuery('#jform_path').prop('required','required');
-			jQuery('#jform_path').attr('aria-required',true);
-			jQuery('#jform_path').addClass('required');
-			jform_vvvvwawwah_required = false;
-		}
-
-		jQuery('.note_ssh_security').closest('.control-group').show();
-		jQuery('#jform_username').closest('.control-group').show();
-		if (jform_vvvvwawwai_required)
-		{
-			updateFieldRequired('username',0);
-			jQuery('#jform_username').prop('required','required');
-			jQuery('#jform_username').attr('aria-required',true);
-			jQuery('#jform_username').addClass('required');
-			jform_vvvvwawwai_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_authentication').closest('.control-group').hide();
-		if (!jform_vvvvwawwae_required)
-		{
-			updateFieldRequired('authentication',1);
-			jQuery('#jform_authentication').removeAttr('required');
-			jQuery('#jform_authentication').removeAttr('aria-required');
-			jQuery('#jform_authentication').removeClass('required');
-			jform_vvvvwawwae_required = true;
-		}
-		jQuery('#jform_host').closest('.control-group').hide();
-		if (!jform_vvvvwawwaf_required)
-		{
-			updateFieldRequired('host',1);
-			jQuery('#jform_host').removeAttr('required');
-			jQuery('#jform_host').removeAttr('aria-required');
-			jQuery('#jform_host').removeClass('required');
-			jform_vvvvwawwaf_required = true;
-		}
-		jQuery('#jform_port').closest('.control-group').hide();
-		if (!jform_vvvvwawwag_required)
-		{
-			updateFieldRequired('port',1);
-			jQuery('#jform_port').removeAttr('required');
-			jQuery('#jform_port').removeAttr('aria-required');
-			jQuery('#jform_port').removeClass('required');
-			jform_vvvvwawwag_required = true;
-		}
-		jQuery('#jform_path').closest('.control-group').hide();
-		if (!jform_vvvvwawwah_required)
-		{
-			updateFieldRequired('path',1);
-			jQuery('#jform_path').removeAttr('required');
-			jQuery('#jform_path').removeAttr('aria-required');
-			jQuery('#jform_path').removeClass('required');
-			jform_vvvvwawwah_required = true;
-		}
-		jQuery('.note_ssh_security').closest('.control-group').hide();
-		jQuery('#jform_username').closest('.control-group').hide();
-		if (!jform_vvvvwawwai_required)
-		{
-			updateFieldRequired('username',1);
-			jQuery('#jform_username').removeAttr('required');
-			jQuery('#jform_username').removeAttr('aria-required');
-			jQuery('#jform_username').removeClass('required');
-			jform_vvvvwawwai_required = true;
-		}
-	}
-}
-
-// the vvvvwaw Some function
-function protocol_vvvvwaw_SomeFunc(protocol_vvvvwaw)
-{
-	// set the function logic
-	if (protocol_vvvvwaw == 2)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwax function
 function vvvvwax(protocol_vvvvwax)
 {
@@ -197,28 +64,104 @@ function vvvvwax(protocol_vvvvwax)
 	// set this function logic
 	if (protocol)
 	{
-		jQuery('.note_ftp_signature').closest('.control-group').show();
+		jQuery('#jform_authentication').closest('.control-group').show();
-		jQuery('#jform_signature').closest('.control-group').show();
+		if (jform_vvvvwaxwaf_required)
+		{
+			updateFieldRequired('authentication',0);
+			jQuery('#jform_authentication').prop('required','required');
+			jQuery('#jform_authentication').attr('aria-required',true);
+			jQuery('#jform_authentication').addClass('required');
+			jform_vvvvwaxwaf_required = false;
+		}
+
+		jQuery('#jform_host').closest('.control-group').show();
+		if (jform_vvvvwaxwag_required)
+		{
+			updateFieldRequired('host',0);
+			jQuery('#jform_host').prop('required','required');
+			jQuery('#jform_host').attr('aria-required',true);
+			jQuery('#jform_host').addClass('required');
+			jform_vvvvwaxwag_required = false;
+		}
+
+		jQuery('#jform_port').closest('.control-group').show();
+		if (jform_vvvvwaxwah_required)
+		{
+			updateFieldRequired('port',0);
+			jQuery('#jform_port').prop('required','required');
+			jQuery('#jform_port').attr('aria-required',true);
+			jQuery('#jform_port').addClass('required');
+			jform_vvvvwaxwah_required = false;
+		}
+
+		jQuery('#jform_path').closest('.control-group').show();
+		if (jform_vvvvwaxwai_required)
+		{
+			updateFieldRequired('path',0);
+			jQuery('#jform_path').prop('required','required');
+			jQuery('#jform_path').attr('aria-required',true);
+			jQuery('#jform_path').addClass('required');
+			jform_vvvvwaxwai_required = false;
+		}
+
+		jQuery('.note_ssh_security').closest('.control-group').show();
+		jQuery('#jform_username').closest('.control-group').show();
 		if (jform_vvvvwaxwaj_required)
 		{
-			updateFieldRequired('signature',0);
+			updateFieldRequired('username',0);
-			jQuery('#jform_signature').prop('required','required');
+			jQuery('#jform_username').prop('required','required');
-			jQuery('#jform_signature').attr('aria-required',true);
+			jQuery('#jform_username').attr('aria-required',true);
-			jQuery('#jform_signature').addClass('required');
+			jQuery('#jform_username').addClass('required');
 			jform_vvvvwaxwaj_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('.note_ftp_signature').closest('.control-group').hide();
+		jQuery('#jform_authentication').closest('.control-group').hide();
-		jQuery('#jform_signature').closest('.control-group').hide();
+		if (!jform_vvvvwaxwaf_required)
+		{
+			updateFieldRequired('authentication',1);
+			jQuery('#jform_authentication').removeAttr('required');
+			jQuery('#jform_authentication').removeAttr('aria-required');
+			jQuery('#jform_authentication').removeClass('required');
+			jform_vvvvwaxwaf_required = true;
+		}
+		jQuery('#jform_host').closest('.control-group').hide();
+		if (!jform_vvvvwaxwag_required)
+		{
+			updateFieldRequired('host',1);
+			jQuery('#jform_host').removeAttr('required');
+			jQuery('#jform_host').removeAttr('aria-required');
+			jQuery('#jform_host').removeClass('required');
+			jform_vvvvwaxwag_required = true;
+		}
+		jQuery('#jform_port').closest('.control-group').hide();
+		if (!jform_vvvvwaxwah_required)
+		{
+			updateFieldRequired('port',1);
+			jQuery('#jform_port').removeAttr('required');
+			jQuery('#jform_port').removeAttr('aria-required');
+			jQuery('#jform_port').removeClass('required');
+			jform_vvvvwaxwah_required = true;
+		}
+		jQuery('#jform_path').closest('.control-group').hide();
+		if (!jform_vvvvwaxwai_required)
+		{
+			updateFieldRequired('path',1);
+			jQuery('#jform_path').removeAttr('required');
+			jQuery('#jform_path').removeAttr('aria-required');
+			jQuery('#jform_path').removeClass('required');
+			jform_vvvvwaxwai_required = true;
+		}
+		jQuery('.note_ssh_security').closest('.control-group').hide();
+		jQuery('#jform_username').closest('.control-group').hide();
 		if (!jform_vvvvwaxwaj_required)
 		{
-			updateFieldRequired('signature',1);
+			updateFieldRequired('username',1);
-			jQuery('#jform_signature').removeAttr('required');
+			jQuery('#jform_username').removeAttr('required');
-			jQuery('#jform_signature').removeAttr('aria-required');
+			jQuery('#jform_username').removeAttr('aria-required');
-			jQuery('#jform_signature').removeClass('required');
+			jQuery('#jform_username').removeClass('required');
 			jform_vvvvwaxwaj_required = true;
 		}
 	}
@@ -228,7 +171,7 @@ function vvvvwax(protocol_vvvvwax)
 function protocol_vvvvwax_SomeFunc(protocol_vvvvwax)
 {
 	// set the function logic
-	if (protocol_vvvvwax == 1)
+	if (protocol_vvvvwax == 2)
 	{
 		return true;
 	}
@@ -236,7 +179,7 @@ function protocol_vvvvwax_SomeFunc(protocol_vvvvwax)
 }
 
 // the vvvvway function
-function vvvvway(protocol_vvvvway,authentication_vvvvway)
+function vvvvway(protocol_vvvvway)
 {
 	if (isSet(protocol_vvvvway) && protocol_vvvvway.constructor !== Array)
 	{
@@ -250,42 +193,32 @@ function vvvvway(protocol_vvvvway,authentication_vvvvway)
 	}
 	var protocol = protocol_vvvvway.some(protocol_vvvvway_SomeFunc);
 
-	if (isSet(authentication_vvvvway) && authentication_vvvvway.constructor !== Array)
-	{
-		var temp_vvvvway = authentication_vvvvway;
-		var authentication_vvvvway = [];
-		authentication_vvvvway.push(temp_vvvvway);
-	}
-	else if (!isSet(authentication_vvvvway))
-	{
-		var authentication_vvvvway = [];
-	}
-	var authentication = authentication_vvvvway.some(authentication_vvvvway_SomeFunc);
-
 
 	// set this function logic
-	if (protocol && authentication)
+	if (protocol)
 	{
-		jQuery('#jform_password').closest('.control-group').show();
+		jQuery('.note_ftp_signature').closest('.control-group').show();
+		jQuery('#jform_signature').closest('.control-group').show();
 		if (jform_vvvvwaywak_required)
 		{
-			updateFieldRequired('password',0);
+			updateFieldRequired('signature',0);
-			jQuery('#jform_password').prop('required','required');
+			jQuery('#jform_signature').prop('required','required');
-			jQuery('#jform_password').attr('aria-required',true);
+			jQuery('#jform_signature').attr('aria-required',true);
-			jQuery('#jform_password').addClass('required');
+			jQuery('#jform_signature').addClass('required');
 			jform_vvvvwaywak_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_password').closest('.control-group').hide();
+		jQuery('.note_ftp_signature').closest('.control-group').hide();
+		jQuery('#jform_signature').closest('.control-group').hide();
 		if (!jform_vvvvwaywak_required)
 		{
-			updateFieldRequired('password',1);
+			updateFieldRequired('signature',1);
-			jQuery('#jform_password').removeAttr('required');
+			jQuery('#jform_signature').removeAttr('required');
-			jQuery('#jform_password').removeAttr('aria-required');
+			jQuery('#jform_signature').removeAttr('aria-required');
-			jQuery('#jform_password').removeClass('required');
+			jQuery('#jform_signature').removeClass('required');
 			jform_vvvvwaywak_required = true;
 		}
 	}
@@ -295,206 +228,273 @@ function vvvvway(protocol_vvvvway,authentication_vvvvway)
 function protocol_vvvvway_SomeFunc(protocol_vvvvway)
 {
 	// set the function logic
-	if (protocol_vvvvway == 2)
+	if (protocol_vvvvway == 1)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvway Some function
+// the vvvvwaz function
-function authentication_vvvvway_SomeFunc(authentication_vvvvway)
+function vvvvwaz(protocol_vvvvwaz,authentication_vvvvwaz)
+{
+	if (isSet(protocol_vvvvwaz) && protocol_vvvvwaz.constructor !== Array)
+	{
+		var temp_vvvvwaz = protocol_vvvvwaz;
+		var protocol_vvvvwaz = [];
+		protocol_vvvvwaz.push(temp_vvvvwaz);
+	}
+	else if (!isSet(protocol_vvvvwaz))
+	{
+		var protocol_vvvvwaz = [];
+	}
+	var protocol = protocol_vvvvwaz.some(protocol_vvvvwaz_SomeFunc);
+
+	if (isSet(authentication_vvvvwaz) && authentication_vvvvwaz.constructor !== Array)
+	{
+		var temp_vvvvwaz = authentication_vvvvwaz;
+		var authentication_vvvvwaz = [];
+		authentication_vvvvwaz.push(temp_vvvvwaz);
+	}
+	else if (!isSet(authentication_vvvvwaz))
+	{
+		var authentication_vvvvwaz = [];
+	}
+	var authentication = authentication_vvvvwaz.some(authentication_vvvvwaz_SomeFunc);
+
+
+	// set this function logic
+	if (protocol && authentication)
+	{
+		jQuery('#jform_password').closest('.control-group').show();
+		if (jform_vvvvwazwal_required)
+		{
+			updateFieldRequired('password',0);
+			jQuery('#jform_password').prop('required','required');
+			jQuery('#jform_password').attr('aria-required',true);
+			jQuery('#jform_password').addClass('required');
+			jform_vvvvwazwal_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_password').closest('.control-group').hide();
+		if (!jform_vvvvwazwal_required)
+		{
+			updateFieldRequired('password',1);
+			jQuery('#jform_password').removeAttr('required');
+			jQuery('#jform_password').removeAttr('aria-required');
+			jQuery('#jform_password').removeClass('required');
+			jform_vvvvwazwal_required = true;
+		}
+	}
+}
+
+// the vvvvwaz Some function
+function protocol_vvvvwaz_SomeFunc(protocol_vvvvwaz)
 {
 	// set the function logic
-	if (authentication_vvvvway == 1 || authentication_vvvvway == 3 || authentication_vvvvway == 5)
+	if (protocol_vvvvwaz == 2)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwba function
+// the vvvvwaz Some function
-function vvvvwba(protocol_vvvvwba,authentication_vvvvwba)
+function authentication_vvvvwaz_SomeFunc(authentication_vvvvwaz)
 {
-	if (isSet(protocol_vvvvwba) && protocol_vvvvwba.constructor !== Array)
+	// set the function logic
+	if (authentication_vvvvwaz == 1 || authentication_vvvvwaz == 3 || authentication_vvvvwaz == 5)
 	{
-		var temp_vvvvwba = protocol_vvvvwba;
+		return true;
-		var protocol_vvvvwba = [];
-		protocol_vvvvwba.push(temp_vvvvwba);
 	}
-	else if (!isSet(protocol_vvvvwba))
+	return false;
-	{
+}
-		var protocol_vvvvwba = [];
-	}
-	var protocol = protocol_vvvvwba.some(protocol_vvvvwba_SomeFunc);
 
-	if (isSet(authentication_vvvvwba) && authentication_vvvvwba.constructor !== Array)
+// the vvvvwbb function
+function vvvvwbb(protocol_vvvvwbb,authentication_vvvvwbb)
+{
+	if (isSet(protocol_vvvvwbb) && protocol_vvvvwbb.constructor !== Array)
 	{
-		var temp_vvvvwba = authentication_vvvvwba;
+		var temp_vvvvwbb = protocol_vvvvwbb;
-		var authentication_vvvvwba = [];
+		var protocol_vvvvwbb = [];
-		authentication_vvvvwba.push(temp_vvvvwba);
+		protocol_vvvvwbb.push(temp_vvvvwbb);
 	}
-	else if (!isSet(authentication_vvvvwba))
+	else if (!isSet(protocol_vvvvwbb))
 	{
-		var authentication_vvvvwba = [];
+		var protocol_vvvvwbb = [];
 	}
-	var authentication = authentication_vvvvwba.some(authentication_vvvvwba_SomeFunc);
+	var protocol = protocol_vvvvwbb.some(protocol_vvvvwbb_SomeFunc);
+
+	if (isSet(authentication_vvvvwbb) && authentication_vvvvwbb.constructor !== Array)
+	{
+		var temp_vvvvwbb = authentication_vvvvwbb;
+		var authentication_vvvvwbb = [];
+		authentication_vvvvwbb.push(temp_vvvvwbb);
+	}
+	else if (!isSet(authentication_vvvvwbb))
+	{
+		var authentication_vvvvwbb = [];
+	}
+	var authentication = authentication_vvvvwbb.some(authentication_vvvvwbb_SomeFunc);
 
 
 	// set this function logic
 	if (protocol && authentication)
 	{
 		jQuery('#jform_private').closest('.control-group').show();
-		if (jform_vvvvwbawal_required)
+		if (jform_vvvvwbbwam_required)
 		{
 			updateFieldRequired('private',0);
 			jQuery('#jform_private').prop('required','required');
 			jQuery('#jform_private').attr('aria-required',true);
 			jQuery('#jform_private').addClass('required');
-			jform_vvvvwbawal_required = false;
+			jform_vvvvwbbwam_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_private').closest('.control-group').hide();
-		if (!jform_vvvvwbawal_required)
+		if (!jform_vvvvwbbwam_required)
 		{
 			updateFieldRequired('private',1);
 			jQuery('#jform_private').removeAttr('required');
 			jQuery('#jform_private').removeAttr('aria-required');
 			jQuery('#jform_private').removeClass('required');
-			jform_vvvvwbawal_required = true;
+			jform_vvvvwbbwam_required = true;
 		}
 	}
 }
 
-// the vvvvwba Some function
+// the vvvvwbb Some function
-function protocol_vvvvwba_SomeFunc(protocol_vvvvwba)
+function protocol_vvvvwbb_SomeFunc(protocol_vvvvwbb)
 {
 	// set the function logic
-	if (protocol_vvvvwba == 2)
+	if (protocol_vvvvwbb == 2)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwba Some function
+// the vvvvwbb Some function
-function authentication_vvvvwba_SomeFunc(authentication_vvvvwba)
+function authentication_vvvvwbb_SomeFunc(authentication_vvvvwbb)
 {
 	// set the function logic
-	if (authentication_vvvvwba == 2 || authentication_vvvvwba == 3)
+	if (authentication_vvvvwbb == 2 || authentication_vvvvwbb == 3)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbc function
+// the vvvvwbd function
-function vvvvwbc(protocol_vvvvwbc,authentication_vvvvwbc)
+function vvvvwbd(protocol_vvvvwbd,authentication_vvvvwbd)
 {
-	if (isSet(protocol_vvvvwbc) && protocol_vvvvwbc.constructor !== Array)
+	if (isSet(protocol_vvvvwbd) && protocol_vvvvwbd.constructor !== Array)
 	{
-		var temp_vvvvwbc = protocol_vvvvwbc;
+		var temp_vvvvwbd = protocol_vvvvwbd;
-		var protocol_vvvvwbc = [];
+		var protocol_vvvvwbd = [];
-		protocol_vvvvwbc.push(temp_vvvvwbc);
+		protocol_vvvvwbd.push(temp_vvvvwbd);
 	}
-	else if (!isSet(protocol_vvvvwbc))
+	else if (!isSet(protocol_vvvvwbd))
 	{
-		var protocol_vvvvwbc = [];
+		var protocol_vvvvwbd = [];
 	}
-	var protocol = protocol_vvvvwbc.some(protocol_vvvvwbc_SomeFunc);
+	var protocol = protocol_vvvvwbd.some(protocol_vvvvwbd_SomeFunc);
 
-	if (isSet(authentication_vvvvwbc) && authentication_vvvvwbc.constructor !== Array)
+	if (isSet(authentication_vvvvwbd) && authentication_vvvvwbd.constructor !== Array)
 	{
-		var temp_vvvvwbc = authentication_vvvvwbc;
+		var temp_vvvvwbd = authentication_vvvvwbd;
-		var authentication_vvvvwbc = [];
+		var authentication_vvvvwbd = [];
-		authentication_vvvvwbc.push(temp_vvvvwbc);
+		authentication_vvvvwbd.push(temp_vvvvwbd);
 	}
-	else if (!isSet(authentication_vvvvwbc))
+	else if (!isSet(authentication_vvvvwbd))
 	{
-		var authentication_vvvvwbc = [];
+		var authentication_vvvvwbd = [];
 	}
-	var authentication = authentication_vvvvwbc.some(authentication_vvvvwbc_SomeFunc);
+	var authentication = authentication_vvvvwbd.some(authentication_vvvvwbd_SomeFunc);
 
 
 	// set this function logic
 	if (protocol && authentication)
 	{
 		jQuery('#jform_private_key').closest('.control-group').show();
-		if (jform_vvvvwbcwam_required)
+		if (jform_vvvvwbdwan_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_vvvvwbcwam_required = false;
+			jform_vvvvwbdwan_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_private_key').closest('.control-group').hide();
-		if (!jform_vvvvwbcwam_required)
+		if (!jform_vvvvwbdwan_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_vvvvwbcwam_required = true;
+			jform_vvvvwbdwan_required = true;
 		}
 	}
 }
 
-// the vvvvwbc Some function
+// the vvvvwbd Some function
-function protocol_vvvvwbc_SomeFunc(protocol_vvvvwbc)
+function protocol_vvvvwbd_SomeFunc(protocol_vvvvwbd)
 {
 	// set the function logic
-	if (protocol_vvvvwbc == 2)
+	if (protocol_vvvvwbd == 2)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbc Some function
+// the vvvvwbd Some function
-function authentication_vvvvwbc_SomeFunc(authentication_vvvvwbc)
+function authentication_vvvvwbd_SomeFunc(authentication_vvvvwbd)
 {
 	// set the function logic
-	if (authentication_vvvvwbc == 4 || authentication_vvvvwbc == 5)
+	if (authentication_vvvvwbd == 4 || authentication_vvvvwbd == 5)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbe function
+// the vvvvwbf function
-function vvvvwbe(protocol_vvvvwbe,authentication_vvvvwbe)
+function vvvvwbf(protocol_vvvvwbf,authentication_vvvvwbf)
 {
-	if (isSet(protocol_vvvvwbe) && protocol_vvvvwbe.constructor !== Array)
+	if (isSet(protocol_vvvvwbf) && protocol_vvvvwbf.constructor !== Array)
 	{
-		var temp_vvvvwbe = protocol_vvvvwbe;
+		var temp_vvvvwbf = protocol_vvvvwbf;
-		var protocol_vvvvwbe = [];
+		var protocol_vvvvwbf = [];
-		protocol_vvvvwbe.push(temp_vvvvwbe);
+		protocol_vvvvwbf.push(temp_vvvvwbf);
 	}
-	else if (!isSet(protocol_vvvvwbe))
+	else if (!isSet(protocol_vvvvwbf))
 	{
-		var protocol_vvvvwbe = [];
+		var protocol_vvvvwbf = [];
 	}
-	var protocol = protocol_vvvvwbe.some(protocol_vvvvwbe_SomeFunc);
+	var protocol = protocol_vvvvwbf.some(protocol_vvvvwbf_SomeFunc);
 
-	if (isSet(authentication_vvvvwbe) && authentication_vvvvwbe.constructor !== Array)
+	if (isSet(authentication_vvvvwbf) && authentication_vvvvwbf.constructor !== Array)
 	{
-		var temp_vvvvwbe = authentication_vvvvwbe;
+		var temp_vvvvwbf = authentication_vvvvwbf;
-		var authentication_vvvvwbe = [];
+		var authentication_vvvvwbf = [];
-		authentication_vvvvwbe.push(temp_vvvvwbe);
+		authentication_vvvvwbf.push(temp_vvvvwbf);
 	}
-	else if (!isSet(authentication_vvvvwbe))
+	else if (!isSet(authentication_vvvvwbf))
 	{
-		var authentication_vvvvwbe = [];
+		var authentication_vvvvwbf = [];
 	}
-	var authentication = authentication_vvvvwbe.some(authentication_vvvvwbe_SomeFunc);
+	var authentication = authentication_vvvvwbf.some(authentication_vvvvwbf_SomeFunc);
 
 
 	// set this function logic
@@ -508,22 +508,22 @@ function vvvvwbe(protocol_vvvvwbe,authentication_vvvvwbe)
 	}
 }
 
-// the vvvvwbe Some function
+// the vvvvwbf Some function
-function protocol_vvvvwbe_SomeFunc(protocol_vvvvwbe)
+function protocol_vvvvwbf_SomeFunc(protocol_vvvvwbf)
 {
 	// set the function logic
-	if (protocol_vvvvwbe == 2)
+	if (protocol_vvvvwbf == 2)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbe Some function
+// the vvvvwbf Some function
-function authentication_vvvvwbe_SomeFunc(authentication_vvvvwbe)
+function authentication_vvvvwbf_SomeFunc(authentication_vvvvwbf)
 {
 	// set the function logic
-	if (authentication_vvvvwbe == 2 || authentication_vvvvwbe == 3 || authentication_vvvvwbe == 4 || authentication_vvvvwbe == 5)
+	if (authentication_vvvvwbf == 2 || authentication_vvvvwbf == 3 || authentication_vvvvwbf == 4 || authentication_vvvvwbf == 5)
 	{
 		return true;
 	}

admin/models/forms/site_view.js

@@ -9,7 +9,6 @@
  */
 
 // Some Global Values
-jform_vvvvvyovyi_required = false;
 jform_vvvvvypvyj_required = false;
 jform_vvvvvyqvyk_required = false;
 jform_vvvvvyrvyl_required = false;
@@ -19,308 +18,309 @@ jform_vvvvvyuvyo_required = false;
 jform_vvvvvyvvyp_required = false;
 jform_vvvvvywvyq_required = false;
 jform_vvvvvyxvyr_required = false;
-jform_vvvvvyxvys_required = false;
+jform_vvvvvyyvys_required = false;
+jform_vvvvvyyvyt_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var add_php_view_vvvvvyo = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvyp = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyo(add_php_view_vvvvvyo);
+	vvvvvyp(add_php_view_vvvvvyp);
 
-	var add_php_jview_display_vvvvvyp = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	var add_php_jview_display_vvvvvyq = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvyp(add_php_jview_display_vvvvvyp);
+	vvvvvyq(add_php_jview_display_vvvvvyq);
 
-	var add_php_jview_vvvvvyq = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	var add_php_jview_vvvvvyr = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyq(add_php_jview_vvvvvyq);
+	vvvvvyr(add_php_jview_vvvvvyr);
 
-	var add_php_document_vvvvvyr = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	var add_php_document_vvvvvys = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyr(add_php_document_vvvvvyr);
+	vvvvvys(add_php_document_vvvvvys);
 
-	var add_css_document_vvvvvys = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	var add_css_document_vvvvvyt = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvys(add_css_document_vvvvvys);
+	vvvvvyt(add_css_document_vvvvvyt);
 
-	var add_javascript_file_vvvvvyt = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	var add_javascript_file_vvvvvyu = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvyt(add_javascript_file_vvvvvyt);
+	vvvvvyu(add_javascript_file_vvvvvyu);
 
-	var add_js_document_vvvvvyu = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	var add_js_document_vvvvvyv = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyu(add_js_document_vvvvvyu);
+	vvvvvyv(add_js_document_vvvvvyv);
 
-	var add_css_vvvvvyv = jQuery("#jform_add_css input[type='radio']:checked").val();
+	var add_css_vvvvvyw = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyv(add_css_vvvvvyv);
+	vvvvvyw(add_css_vvvvvyw);
 
-	var add_php_ajax_vvvvvyw = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	var add_php_ajax_vvvvvyx = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvyw(add_php_ajax_vvvvvyw);
+	vvvvvyx(add_php_ajax_vvvvvyx);
 
-	var add_custom_button_vvvvvyx = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	var add_custom_button_vvvvvyy = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyx(add_custom_button_vvvvvyx);
+	vvvvvyy(add_custom_button_vvvvvyy);
 
-	var button_position_vvvvvyy = jQuery("#jform_button_position").val();
+	var button_position_vvvvvyz = jQuery("#jform_button_position").val();
-	vvvvvyy(button_position_vvvvvyy);
+	vvvvvyz(button_position_vvvvvyz);
 });
 
-// the vvvvvyo function
+// the vvvvvyp function
-function vvvvvyo(add_php_view_vvvvvyo)
+function vvvvvyp(add_php_view_vvvvvyp)
 {
 	// set the function logic
-	if (add_php_view_vvvvvyo == 1)
+	if (add_php_view_vvvvvyp == 1)
 	{
 		jQuery('#jform_php_view-lbl').closest('.control-group').show();
-		if (jform_vvvvvyovyi_required)
+		if (jform_vvvvvypvyj_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_vvvvvyovyi_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_php_view-lbl').closest('.control-group').hide();
-		if (!jform_vvvvvyovyi_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_vvvvvyovyi_required = true;
-		}
-	}
-}
-
-// the vvvvvyp function
-function vvvvvyp(add_php_jview_display_vvvvvyp)
-{
-	// set the function logic
-	if (add_php_jview_display_vvvvvyp == 1)
-	{
-		jQuery('#jform_php_jview_display-lbl').closest('.control-group').show();
-		if (jform_vvvvvypvyj_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_vvvvvypvyj_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_php_jview_display-lbl').closest('.control-group').hide();
+		jQuery('#jform_php_view-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvypvyj_required)
 		{
-			updateFieldRequired('php_jview_display',1);
+			updateFieldRequired('php_view',1);
-			jQuery('#jform_php_jview_display').removeAttr('required');
+			jQuery('#jform_php_view').removeAttr('required');
-			jQuery('#jform_php_jview_display').removeAttr('aria-required');
+			jQuery('#jform_php_view').removeAttr('aria-required');
-			jQuery('#jform_php_jview_display').removeClass('required');
+			jQuery('#jform_php_view').removeClass('required');
 			jform_vvvvvypvyj_required = true;
 		}
 	}
 }
 
 // the vvvvvyq function
-function vvvvvyq(add_php_jview_vvvvvyq)
+function vvvvvyq(add_php_jview_display_vvvvvyq)
 {
 	// set the function logic
-	if (add_php_jview_vvvvvyq == 1)
+	if (add_php_jview_display_vvvvvyq == 1)
 	{
-		jQuery('#jform_php_jview-lbl').closest('.control-group').show();
+		jQuery('#jform_php_jview_display-lbl').closest('.control-group').show();
 		if (jform_vvvvvyqvyk_required)
 		{
-			updateFieldRequired('php_jview',0);
+			updateFieldRequired('php_jview_display',0);
-			jQuery('#jform_php_jview').prop('required','required');
+			jQuery('#jform_php_jview_display').prop('required','required');
-			jQuery('#jform_php_jview').attr('aria-required',true);
+			jQuery('#jform_php_jview_display').attr('aria-required',true);
-			jQuery('#jform_php_jview').addClass('required');
+			jQuery('#jform_php_jview_display').addClass('required');
 			jform_vvvvvyqvyk_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_php_jview-lbl').closest('.control-group').hide();
+		jQuery('#jform_php_jview_display-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvyqvyk_required)
 		{
-			updateFieldRequired('php_jview',1);
+			updateFieldRequired('php_jview_display',1);
-			jQuery('#jform_php_jview').removeAttr('required');
+			jQuery('#jform_php_jview_display').removeAttr('required');
-			jQuery('#jform_php_jview').removeAttr('aria-required');
+			jQuery('#jform_php_jview_display').removeAttr('aria-required');
-			jQuery('#jform_php_jview').removeClass('required');
+			jQuery('#jform_php_jview_display').removeClass('required');
 			jform_vvvvvyqvyk_required = true;
 		}
 	}
 }
 
 // the vvvvvyr function
-function vvvvvyr(add_php_document_vvvvvyr)
+function vvvvvyr(add_php_jview_vvvvvyr)
 {
 	// set the function logic
-	if (add_php_document_vvvvvyr == 1)
+	if (add_php_jview_vvvvvyr == 1)
 	{
-		jQuery('#jform_php_document-lbl').closest('.control-group').show();
+		jQuery('#jform_php_jview-lbl').closest('.control-group').show();
 		if (jform_vvvvvyrvyl_required)
 		{
-			updateFieldRequired('php_document',0);
+			updateFieldRequired('php_jview',0);
-			jQuery('#jform_php_document').prop('required','required');
+			jQuery('#jform_php_jview').prop('required','required');
-			jQuery('#jform_php_document').attr('aria-required',true);
+			jQuery('#jform_php_jview').attr('aria-required',true);
-			jQuery('#jform_php_document').addClass('required');
+			jQuery('#jform_php_jview').addClass('required');
 			jform_vvvvvyrvyl_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_php_document-lbl').closest('.control-group').hide();
+		jQuery('#jform_php_jview-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvyrvyl_required)
 		{
-			updateFieldRequired('php_document',1);
+			updateFieldRequired('php_jview',1);
-			jQuery('#jform_php_document').removeAttr('required');
+			jQuery('#jform_php_jview').removeAttr('required');
-			jQuery('#jform_php_document').removeAttr('aria-required');
+			jQuery('#jform_php_jview').removeAttr('aria-required');
-			jQuery('#jform_php_document').removeClass('required');
+			jQuery('#jform_php_jview').removeClass('required');
 			jform_vvvvvyrvyl_required = true;
 		}
 	}
 }
 
 // the vvvvvys function
-function vvvvvys(add_css_document_vvvvvys)
+function vvvvvys(add_php_document_vvvvvys)
 {
 	// set the function logic
-	if (add_css_document_vvvvvys == 1)
+	if (add_php_document_vvvvvys == 1)
 	{
-		jQuery('#jform_css_document-lbl').closest('.control-group').show();
+		jQuery('#jform_php_document-lbl').closest('.control-group').show();
 		if (jform_vvvvvysvym_required)
 		{
-			updateFieldRequired('css_document',0);
+			updateFieldRequired('php_document',0);
-			jQuery('#jform_css_document').prop('required','required');
+			jQuery('#jform_php_document').prop('required','required');
-			jQuery('#jform_css_document').attr('aria-required',true);
+			jQuery('#jform_php_document').attr('aria-required',true);
-			jQuery('#jform_css_document').addClass('required');
+			jQuery('#jform_php_document').addClass('required');
 			jform_vvvvvysvym_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_css_document-lbl').closest('.control-group').hide();
+		jQuery('#jform_php_document-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvysvym_required)
 		{
-			updateFieldRequired('css_document',1);
+			updateFieldRequired('php_document',1);
-			jQuery('#jform_css_document').removeAttr('required');
+			jQuery('#jform_php_document').removeAttr('required');
-			jQuery('#jform_css_document').removeAttr('aria-required');
+			jQuery('#jform_php_document').removeAttr('aria-required');
-			jQuery('#jform_css_document').removeClass('required');
+			jQuery('#jform_php_document').removeClass('required');
 			jform_vvvvvysvym_required = true;
 		}
 	}
 }
 
 // the vvvvvyt function
-function vvvvvyt(add_javascript_file_vvvvvyt)
+function vvvvvyt(add_css_document_vvvvvyt)
 {
 	// set the function logic
-	if (add_javascript_file_vvvvvyt == 1)
+	if (add_css_document_vvvvvyt == 1)
 	{
-		jQuery('#jform_javascript_file-lbl').closest('.control-group').show();
+		jQuery('#jform_css_document-lbl').closest('.control-group').show();
 		if (jform_vvvvvytvyn_required)
 		{
-			updateFieldRequired('javascript_file',0);
+			updateFieldRequired('css_document',0);
-			jQuery('#jform_javascript_file').prop('required','required');
+			jQuery('#jform_css_document').prop('required','required');
-			jQuery('#jform_javascript_file').attr('aria-required',true);
+			jQuery('#jform_css_document').attr('aria-required',true);
-			jQuery('#jform_javascript_file').addClass('required');
+			jQuery('#jform_css_document').addClass('required');
 			jform_vvvvvytvyn_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_javascript_file-lbl').closest('.control-group').hide();
+		jQuery('#jform_css_document-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvytvyn_required)
 		{
-			updateFieldRequired('javascript_file',1);
+			updateFieldRequired('css_document',1);
-			jQuery('#jform_javascript_file').removeAttr('required');
+			jQuery('#jform_css_document').removeAttr('required');
-			jQuery('#jform_javascript_file').removeAttr('aria-required');
+			jQuery('#jform_css_document').removeAttr('aria-required');
-			jQuery('#jform_javascript_file').removeClass('required');
+			jQuery('#jform_css_document').removeClass('required');
 			jform_vvvvvytvyn_required = true;
 		}
 	}
 }
 
 // the vvvvvyu function
-function vvvvvyu(add_js_document_vvvvvyu)
+function vvvvvyu(add_javascript_file_vvvvvyu)
 {
 	// set the function logic
-	if (add_js_document_vvvvvyu == 1)
+	if (add_javascript_file_vvvvvyu == 1)
 	{
-		jQuery('#jform_js_document-lbl').closest('.control-group').show();
+		jQuery('#jform_javascript_file-lbl').closest('.control-group').show();
 		if (jform_vvvvvyuvyo_required)
 		{
-			updateFieldRequired('js_document',0);
+			updateFieldRequired('javascript_file',0);
-			jQuery('#jform_js_document').prop('required','required');
+			jQuery('#jform_javascript_file').prop('required','required');
-			jQuery('#jform_js_document').attr('aria-required',true);
+			jQuery('#jform_javascript_file').attr('aria-required',true);
-			jQuery('#jform_js_document').addClass('required');
+			jQuery('#jform_javascript_file').addClass('required');
 			jform_vvvvvyuvyo_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_js_document-lbl').closest('.control-group').hide();
+		jQuery('#jform_javascript_file-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvyuvyo_required)
 		{
-			updateFieldRequired('js_document',1);
+			updateFieldRequired('javascript_file',1);
-			jQuery('#jform_js_document').removeAttr('required');
+			jQuery('#jform_javascript_file').removeAttr('required');
-			jQuery('#jform_js_document').removeAttr('aria-required');
+			jQuery('#jform_javascript_file').removeAttr('aria-required');
-			jQuery('#jform_js_document').removeClass('required');
+			jQuery('#jform_javascript_file').removeClass('required');
 			jform_vvvvvyuvyo_required = true;
 		}
 	}
 }
 
 // the vvvvvyv function
-function vvvvvyv(add_css_vvvvvyv)
+function vvvvvyv(add_js_document_vvvvvyv)
 {
 	// set the function logic
-	if (add_css_vvvvvyv == 1)
+	if (add_js_document_vvvvvyv == 1)
 	{
-		jQuery('#jform_css-lbl').closest('.control-group').show();
+		jQuery('#jform_js_document-lbl').closest('.control-group').show();
 		if (jform_vvvvvyvvyp_required)
 		{
-			updateFieldRequired('css',0);
+			updateFieldRequired('js_document',0);
-			jQuery('#jform_css').prop('required','required');
+			jQuery('#jform_js_document').prop('required','required');
-			jQuery('#jform_css').attr('aria-required',true);
+			jQuery('#jform_js_document').attr('aria-required',true);
-			jQuery('#jform_css').addClass('required');
+			jQuery('#jform_js_document').addClass('required');
 			jform_vvvvvyvvyp_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_css-lbl').closest('.control-group').hide();
+		jQuery('#jform_js_document-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvyvvyp_required)
 		{
-			updateFieldRequired('css',1);
+			updateFieldRequired('js_document',1);
-			jQuery('#jform_css').removeAttr('required');
+			jQuery('#jform_js_document').removeAttr('required');
-			jQuery('#jform_css').removeAttr('aria-required');
+			jQuery('#jform_js_document').removeAttr('aria-required');
-			jQuery('#jform_css').removeClass('required');
+			jQuery('#jform_js_document').removeClass('required');
 			jform_vvvvvyvvyp_required = true;
 		}
 	}
 }
 
 // the vvvvvyw function
-function vvvvvyw(add_php_ajax_vvvvvyw)
+function vvvvvyw(add_css_vvvvvyw)
 {
 	// set the function logic
-	if (add_php_ajax_vvvvvyw == 1)
+	if (add_css_vvvvvyw == 1)
+	{
+		jQuery('#jform_css-lbl').closest('.control-group').show();
+		if (jform_vvvvvywvyq_required)
+		{
+			updateFieldRequired('css',0);
+			jQuery('#jform_css').prop('required','required');
+			jQuery('#jform_css').attr('aria-required',true);
+			jQuery('#jform_css').addClass('required');
+			jform_vvvvvywvyq_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_css-lbl').closest('.control-group').hide();
+		if (!jform_vvvvvywvyq_required)
+		{
+			updateFieldRequired('css',1);
+			jQuery('#jform_css').removeAttr('required');
+			jQuery('#jform_css').removeAttr('aria-required');
+			jQuery('#jform_css').removeClass('required');
+			jform_vvvvvywvyq_required = true;
+		}
+	}
+}
+
+// the vvvvvyx function
+function vvvvvyx(add_php_ajax_vvvvvyx)
+{
+	// set the function logic
+	if (add_php_ajax_vvvvvyx == 1)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').show();
 		jQuery('#jform_php_ajaxmethod-lbl').closest('.control-group').show();
-		if (jform_vvvvvywvyq_required)
+		if (jform_vvvvvyxvyr_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_vvvvvywvyq_required = false;
+			jform_vvvvvyxvyr_required = false;
 		}
 
 	}
@@ -328,42 +328,42 @@ function vvvvvyw(add_php_ajax_vvvvvyw)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_ajaxmethod-lbl').closest('.control-group').hide();
-		if (!jform_vvvvvywvyq_required)
+		if (!jform_vvvvvyxvyr_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_vvvvvywvyq_required = true;
+			jform_vvvvvyxvyr_required = true;
 		}
 	}
 }
 
-// the vvvvvyx function
+// the vvvvvyy function
-function vvvvvyx(add_custom_button_vvvvvyx)
+function vvvvvyy(add_custom_button_vvvvvyy)
 {
 	// set the function logic
-	if (add_custom_button_vvvvvyx == 1)
+	if (add_custom_button_vvvvvyy == 1)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').show();
 		jQuery('#jform_php_controller-lbl').closest('.control-group').show();
-		if (jform_vvvvvyxvyr_required)
+		if (jform_vvvvvyyvys_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_vvvvvyxvyr_required = false;
+			jform_vvvvvyyvys_required = false;
 		}
 
 		jQuery('#jform_php_model-lbl').closest('.control-group').show();
-		if (jform_vvvvvyxvys_required)
+		if (jform_vvvvvyyvyt_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_vvvvvyxvys_required = false;
+			jform_vvvvvyyvyt_required = false;
 		}
 
 	}
@@ -371,40 +371,40 @@ function vvvvvyx(add_custom_button_vvvvvyx)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_controller-lbl').closest('.control-group').hide();
-		if (!jform_vvvvvyxvyr_required)
+		if (!jform_vvvvvyyvys_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_vvvvvyxvyr_required = true;
+			jform_vvvvvyyvys_required = true;
 		}
 		jQuery('#jform_php_model-lbl').closest('.control-group').hide();
-		if (!jform_vvvvvyxvys_required)
+		if (!jform_vvvvvyyvyt_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_vvvvvyxvys_required = true;
+			jform_vvvvvyyvyt_required = true;
 		}
 	}
 }
 
-// the vvvvvyy function
+// the vvvvvyz function
-function vvvvvyy(button_position_vvvvvyy)
+function vvvvvyz(button_position_vvvvvyz)
 {
-	if (isSet(button_position_vvvvvyy) && button_position_vvvvvyy.constructor !== Array)
+	if (isSet(button_position_vvvvvyz) && button_position_vvvvvyz.constructor !== Array)
 	{
-		var temp_vvvvvyy = button_position_vvvvvyy;
+		var temp_vvvvvyz = button_position_vvvvvyz;
-		var button_position_vvvvvyy = [];
+		var button_position_vvvvvyz = [];
-		button_position_vvvvvyy.push(temp_vvvvvyy);
+		button_position_vvvvvyz.push(temp_vvvvvyz);
 	}
-	else if (!isSet(button_position_vvvvvyy))
+	else if (!isSet(button_position_vvvvvyz))
 	{
-		var button_position_vvvvvyy = [];
+		var button_position_vvvvvyz = [];
 	}
-	var button_position = button_position_vvvvvyy.some(button_position_vvvvvyy_SomeFunc);
+	var button_position = button_position_vvvvvyz.some(button_position_vvvvvyz_SomeFunc);
 
 
 	// set this function logic
@@ -418,11 +418,11 @@ function vvvvvyy(button_position_vvvvvyy)
 	}
 }
 
-// the vvvvvyy Some function
+// the vvvvvyz Some function
-function button_position_vvvvvyy_SomeFunc(button_position_vvvvvyy)
+function button_position_vvvvvyz_SomeFunc(button_position_vvvvvyz)
 {
 	// set the function logic
-	if (button_position_vvvvvyy == 5)
+	if (button_position_vvvvvyz == 5)
 	{
 		return true;
 	}

admin/models/forms/template.js

@@ -9,42 +9,42 @@
  */
 
 // Some Global Values
-jform_vvvvvyzvyt_required = false;
+jform_vvvvvzavyu_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var add_php_view_vvvvvyz = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvza = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyz(add_php_view_vvvvvyz);
+	vvvvvza(add_php_view_vvvvvza);
 });
 
-// the vvvvvyz function
+// the vvvvvza function
-function vvvvvyz(add_php_view_vvvvvyz)
+function vvvvvza(add_php_view_vvvvvza)
 {
 	// set the function logic
-	if (add_php_view_vvvvvyz == 1)
+	if (add_php_view_vvvvvza == 1)
 	{
 		jQuery('#jform_php_view-lbl').closest('.control-group').show();
-		if (jform_vvvvvyzvyt_required)
+		if (jform_vvvvvzavyu_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_vvvvvyzvyt_required = false;
+			jform_vvvvvzavyu_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_view-lbl').closest('.control-group').hide();
-		if (!jform_vvvvvyzvyt_required)
+		if (!jform_vvvvvzavyu_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_vvvvvyzvyt_required = true;
+			jform_vvvvvzavyu_required = true;
 		}
 	}
 }

admin/models/help_document.php

@@ -182,6 +182,7 @@ class ComponentbuilderModelHelp_document extends JModelAdmin
 			}
 		}
 
+
 		return $form;
 	}
 

admin/models/joomla_component.php

@@ -362,6 +362,16 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 			}
 		}
 
+		// update all editors to use this components global editor
+		$global_editor = JComponentHelper::getParams('com_componentbuilder')->get('editor', 'none');
+		$editors = $form->getXml()->xpath("//field[@type='editor']");
+		foreach ($editors as $editor)
+		{
+			$name = (string) $editor['name'];
+			$form->setFieldAttribute($name, 'editor', $global_editor);
+		}
+
+
 		return $form;
 	}
 

admin/models/language.php

@@ -176,6 +176,7 @@ class ComponentbuilderModelLanguage extends JModelAdmin
 			}
 		}
 
+
 		return $form;
 	}
 

admin/models/language_translation.php

@@ -216,6 +216,7 @@ class ComponentbuilderModelLanguage_translation extends JModelAdmin
 			}
 		}
 
+
 		return $form;
 	}
 

admin/models/layout.php

@@ -222,6 +222,16 @@ class ComponentbuilderModelLayout extends JModelAdmin
 			}
 		}
 
+		// update all editors to use this components global editor
+		$global_editor = JComponentHelper::getParams('com_componentbuilder')->get('editor', 'none');
+		$editors = $form->getXml()->xpath("//field[@type='editor']");
+		foreach ($editors as $editor)
+		{
+			$name = (string) $editor['name'];
+			$form->setFieldAttribute($name, 'editor', $global_editor);
+		}
+
+
 		return $form;
 	}
 

admin/models/library.php

@@ -224,6 +224,7 @@ class ComponentbuilderModelLibrary extends JModelAdmin
 			}
 		}
 
+
 		return $form;
 	}
 

admin/models/library_config.php

@@ -186,6 +186,7 @@ class ComponentbuilderModelLibrary_config extends JModelAdmin
 			}
 		}
 
+
 		return $form;
 	}
 

admin/models/library_files_folders_urls.php

@@ -218,6 +218,7 @@ class ComponentbuilderModelLibrary_files_folders_urls extends JModelAdmin
 			}
 		}
 
+
 		return $form;
 	}
 

admin/models/server.php

@@ -156,7 +156,7 @@ class ComponentbuilderModelServer extends JModelAdmin
 	 *
 	 * @return mixed  An array of data items on success, false on failure.
 	 */
-	public function getWanlinked_components()
+	public function getWaolinked_components()
 	{
 		// Get the user object.
 		$user = JFactory::getUser();
@@ -317,6 +317,7 @@ class ComponentbuilderModelServer extends JModelAdmin
 			}
 		}
 
+
 		return $form;
 	}
 

admin/models/site_view.php

@@ -345,6 +345,16 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 			}
 		}
 
+		// update all editors to use this components global editor
+		$global_editor = JComponentHelper::getParams('com_componentbuilder')->get('editor', 'none');
+		$editors = $form->getXml()->xpath("//field[@type='editor']");
+		foreach ($editors as $editor)
+		{
+			$name = (string) $editor['name'];
+			$form->setFieldAttribute($name, 'editor', $global_editor);
+		}
+
+
 		return $form;
 	}
 

admin/models/snippet.php

@@ -182,6 +182,7 @@ class ComponentbuilderModelSnippet extends JModelAdmin
 			}
 		}
 
+
 		return $form;
 	}
 

admin/models/snippet_type.php

@@ -176,6 +176,7 @@ class ComponentbuilderModelSnippet_type extends JModelAdmin
 			}
 		}
 
+
 		return $form;
 	}
 

admin/models/template.php

@@ -222,6 +222,16 @@ class ComponentbuilderModelTemplate extends JModelAdmin
 			}
 		}
 
+		// update all editors to use this components global editor
+		$global_editor = JComponentHelper::getParams('com_componentbuilder')->get('editor', 'none');
+		$editors = $form->getXml()->xpath("//field[@type='editor']");
+		foreach ($editors as $editor)
+		{
+			$name = (string) $editor['name'];
+			$form->setFieldAttribute($name, 'editor', $global_editor);
+		}
+
+
 		return $form;
 	}
 

admin/models/validation_rule.php

@@ -208,6 +208,7 @@ class ComponentbuilderModelValidation_rule extends JModelAdmin
 			}
 		}
 
+
 		return $form;
 	}
 

admin/sql/install.mysql.utf8.sql

@@ -152,6 +152,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` (
 	`add_php_before_publish` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_php_before_save` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_php_document` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_php_getform` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_php_getitem` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_php_getitems` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_php_getitems_after_all` TINYINT(1) NOT NULL DEFAULT 0,
@@ -192,6 +193,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` (
 	`php_controller` MEDIUMTEXT NOT NULL,
 	`php_controller_list` MEDIUMTEXT NOT NULL,
 	`php_document` MEDIUMTEXT NOT NULL,
+	`php_getform` MEDIUMTEXT NOT NULL,
 	`php_getitem` MEDIUMTEXT NOT NULL,
 	`php_getitems` MEDIUMTEXT NOT NULL,
 	`php_getitems_after_all` MEDIUMTEXT NOT NULL,
@@ -231,25 +233,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_batchmove` (`add_php_batchmove`),
+	KEY `idx_add_php_before_publish` (`add_php_before_publish`),
-	KEY `idx_add_php_allowedit` (`add_php_allowedit`),
+	KEY `idx_add_php_batchcopy` (`add_php_batchcopy`),
-	KEY `idx_add_php_save` (`add_php_save`),
+	KEY `idx_add_php_postsavehook` (`add_php_postsavehook`),
-	KEY `idx_add_php_getlistquery` (`add_php_getlistquery`),
+	KEY `idx_add_php_before_save` (`add_php_before_save`),
-	KEY `idx_add_sql` (`add_sql`),
 	KEY `idx_type` (`type`),
 	KEY `idx_add_fadein` (`add_fadein`),
-	KEY `idx_add_php_after_publish` (`add_php_after_publish`),
-	KEY `idx_add_php_after_delete` (`add_php_after_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_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_custom_import` (`add_custom_import`),
-	KEY `idx_add_php_getitem` (`add_php_getitem`),
 	KEY `idx_add_php_getitems` (`add_php_getitems`),
+	KEY `idx_add_custom_import` (`add_custom_import`),
+	KEY `idx_add_php_getlistquery` (`add_php_getlistquery`),
+	KEY `idx_add_php_getitems_after_all` (`add_php_getitems_after_all`),
+	KEY `idx_add_php_getform` (`add_php_getform`),
+	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_after_delete` (`add_php_after_delete`),
+	KEY `idx_add_sql` (`add_sql`),
 	KEY `idx_add_css_view` (`add_css_view`),
 	KEY `idx_add_css_views` (`add_css_views`),
 	KEY `idx_add_javascript_view_file` (`add_javascript_view_file`),
@@ -258,7 +260,8 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` (
 	KEY `idx_add_javascript_views_footer` (`add_javascript_views_footer`),
 	KEY `idx_add_custom_button` (`add_custom_button`),
 	KEY `idx_source` (`source`),
-	KEY `idx_add_php_ajax` (`add_php_ajax`)
+	KEY `idx_add_php_ajax` (`add_php_ajax`),
+	KEY `idx_add_php_getitem` (`add_php_getitem`)
 ) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
 
 CREATE TABLE IF NOT EXISTS `#__componentbuilder_custom_admin_view` (
@@ -1348,7 +1351,7 @@ INSERT INTO `#__componentbuilder_library` (`id`, `addconditions`, `description`,
 (1, '', '', 1, '', 'No Library', '', 1, '2017-11-11 22:08:33', '2017-12-08 15:51:34', 4, '', 1),
 (2, '', '', 1, 1, 'Bootstrap v4', '', 1, '2017-11-12 02:08:39', '2017-12-17 09:04:10', 18, '', 2),
 (3, '', '', 1, 1, 'Uikit v3', '', 1, '2017-11-11 22:08:45', '2017-12-10 15:55:35', 18, '', 3),
-(4, '', '', 1, 4, 'Uikit v2', '', 1, '2017-11-11 22:08:51', '2017-12-10 15:53:17', 5, '', 4),
+(4, '', '', 1, 4, 'Uikit v2', '', 1, '2017-11-11 22:08:51', '2018-06-29 02:36:17', 6, '', 4),
 (5, '', '', 1, 4, 'FooTable v2', '', 1, '2017-11-11 22:08:57', '2017-12-11 20:07:32', 9, '', 5),
 (6, '', '', 1, 4, 'FooTable v3', '', 1, '2017-11-25 22:11:03', '2017-12-10 15:54:45', 12, '', 6);
 
@@ -1374,7 +1377,7 @@ INSERT INTO `#__componentbuilder_snippet` (`id`, `contributor_company`, `contrib
 (15, 'Vast Development Method', 'Joomla@vdm.io', 'Llewellyn van der Merwe', 'https://www.vdm.io/', '', 'Easlily create a nicely looking pagination to navigate through pages.', 4, 'Pagination', 'PHVsIGNsYXNzPSJ1ay1wYWdpbmF0aW9uIj4NCiAgICA8bGk+PGEgaHJlZj0iIyI+MTwvYT48L2xpPg0KICAgIDxsaT48c3Bhbj4uLi48L3NwYW4+PC9saT4NCiAgICA8bGk+PGEgaHJlZj0iIyI+ODwvYT48L2xpPg0KICAgIDxsaT48YSBocmVmPSIjIj45PC9hPjwvbGk+DQogICAgPGxpIGNsYXNzPSJ1ay1hY3RpdmUiPjxzcGFuPjEwPC9zcGFuPjwvbGk+DQogICAgPGxpPjxhIGhyZWY9IiMiPjExPC9hPjwvbGk+DQogICAgPGxpPjxhIGhyZWY9IiMiPjEyPC9hPjwvbGk+DQogICAgPGxpPjxzcGFuPi4uLjwvc3Bhbj48L2xpPg0KICAgIDxsaT48YSBocmVmPSIjIj4yMDwvYT48L2xpPg0KPC91bD4=', 2, 'http://getuikit.com/docs/pagination.html', 'The Pagination component consists of button-like styled links, that are aligned side by side.', '', 1, '2015-05-19 20:45:49', '2017-11-11 22:09:27', 53, '', 6),
 (16, 'Vast Development Method', 'Joomla@vdm.io', 'Llewellyn van der Merwe', 'https://www.vdm.io/', '', 'Create a tabbed navigation with different styles.', 4, 'Tab', 'PHVsIGNsYXNzPSJ1ay10YWIiIGRhdGEtdWstdGFiPg0KICAgIDxsaSBjbGFzcz0idWstYWN0aXZlIj48YSBocmVmPSIiPkFjdGl2ZTwvYT48L2xpPg0KICAgIDxsaT48YSBocmVmPSIiPkl0ZW08L2E+PC9saT4NCiAgICA8bGk+PGEgaHJlZj0iIj5JdGVtPC9hPjwvbGk+DQogICAgPGxpIGNsYXNzPSJ1ay1kaXNhYmxlZCI+PGEgaHJlZj0iIj5EaXNhYmxlZDwvYT48L2xpPg0KPC91bD4=', 2, 'http://getuikit.com/docs/tab.html', 'The Tab component consists of clickable tabs, that are aligned side by side.\r\n\r\nThe data-uk-tab attribute is required for two purposes. Firstly, it enables the responsive behaviour. If the parent container is too small to accomodate all tabs, they will be combined into a dropdown, toggled by a single tab, which represents the active tab item. This also requires the Dropdown component in order to work.\r\n\r\nAnd secondly, its functionality is coupled to the Switcher component, which is necessary to dynamically transition through different contents using tabbed navigation.', '', 1, '2015-05-19 20:47:34', '2017-11-11 22:09:27', 55, '', 6),
 (17, 'Vast Development Method', 'Joomla@vdm.io', 'Llewellyn van der Merwe', 'https://www.vdm.io/', '', 'Create a tabbed navigation with different styles.', 4, 'Thumbnav', 'PHVsIGNsYXNzPSJ1ay10aHVtYm5hdiI+DQogICAgPGxpIGNsYXNzPSJ1ay1hY3RpdmUiPjxhIGhyZWY9IiI+PGltZyBzcmM9IiIgYWx0PSIiPjwvYT48L2xpPg0KICAgIDxsaT48YSBocmVmPSIiPjxpbWcgc3JjPSIiIGFsdD0iIj48L2E+PC9saT4NCjwvdWw+', 2, 'http://getuikit.com/docs/thumbnav.html', 'To apply this component, add the .uk-thumbnav class to an  element and nest your thumbnail images inside  elements within the list items. The thumbnav will wrap into several rows, if it is wider than its container and automatically applies a gutter. Add the .uk-active class to create an active state.\r\n\r\nTo align a subnav, for example to horizontally center it, you can use the Flex component.', '', 1, '2015-05-19 20:48:42', '2017-11-11 22:09:27', 54, '', 6),
-(18, 'Vast Development Method', 'Joomla@vdm.io', 'Llewellyn van der Merwe', 'https://www.vdm.io/', 'Modifiers\r\n\r\nTo display the list in a different style, just add a modifier class to the the .uk-list class. The modifiers of the List component are not combinable with each other.', 'Easily create nicely looking lists, which come in different styles.', 4, 'List', 'PHVsIGNsYXNzPSJ1ay1saXN0IHVrLWxpc3Qtc3RyaXBlZCI+DQogICAgPGxpPi4uLjwvbGk+DQogICAgPGxpPi4uLjwvbGk+DQogICAgPGxpPi4uLjwvbGk+DQo8L3VsPg==', 3, 'http://getuikit.com/docs/list.html', 'To apply this component, add the .uk-list class to an unordered or ordered list. The list will now display without any spacing or list-style. [uk-list-line] [uk-list-space]', '', 1, '0000-00-00 00:00:00', '2018-03-21 02:26:43', 2, '', 6),
+(18, 'Vast Development Method', 'Joomla@vdm.io', 'Llewellyn van der Merwe', 'https://www.vdm.io/', 'Modifiers\r\n\r\nTo display the list in a different style, just add a modifier class to the the .uk-list class. The modifiers of the List component are not combinable with each other.', 'Easily create nicely looking lists, which come in different styles.', 4, 'List', 'PHVsIGNsYXNzPSJ1ay1saXN0IHVrLWxpc3Qtc3RyaXBlZCI+DQogICAgPGxpPi4uLjwvbGk+DQogICAgPGxpPi4uLjwvbGk+DQogICAgPGxpPi4uLjwvbGk+DQo8L3VsPg==', 3, 'http://getuikit.com/docs/list.html', 'To apply this component, add the .uk-list class to an unordered or ordered list. The list will now display without any spacing or list-style. [uk-list-line] [uk-list-space]', '', 1, '2015-06-01 16:09:04', '2017-11-11 22:09:27', 3, '', 6),
 (19, 'Vast Development Method', 'Joomla@vdm.io', 'Llewellyn van der Merwe', 'https://www.vdm.io/', 'Add the .uk-description-list-horizontal class to display terms and descriptions side by side.', 'Easily create nicely looking description lists, which come in different styles.', 4, 'Description list', 'PGRsIGNsYXNzPSJ1ay1kZXNjcmlwdGlvbi1saXN0LWhvcml6b250YWwiPg0KICAgIDxkdD4uLi48L2R0Pg0KICAgIDxkZD4uLi48L2RkPg0KPC9kbD4=', 3, 'http://getuikit.com/docs/description-list.html', 'There is no component class necessary to create a description list, but UIkit provides a couple of modifier classes to display the list in a different style. The modifiers of the Description list component are not combinable with each other. [uk-description-list-line]', '', 1, '2015-06-01 16:10:54', '2017-11-11 22:09:27', 54, '', 6),
 (20, 'Vast Development Method', 'Joomla@vdm.io', 'Llewellyn van der Merwe', 'https://www.vdm.io/', '', 'Easily create nicely looking tables, which come in different styles.', 4, 'Table', 'PHRhYmxlIGNsYXNzPSJ1ay10YWJsZSB1ay10YWJsZS1ob3ZlciI+DQogICAgPGNhcHRpb24+Li4uPC9jYXB0aW9uPg0KICAgIDx0aGVhZD4NCiAgICAgICAgPHRyPg0KICAgICAgICAgICAgPHRoPi4uLjwvdGg+DQogICAgICAgIDwvdHI+DQogICAgPC90aGVhZD4NCiAgICA8dGZvb3Q+DQogICAgICAgIDx0cj4NCiAgICAgICAgICAgIDx0ZD4uLi48L3RkPg0KICAgICAgICA8L3RyPg0KICAgIDwvdGZvb3Q+DQogICAgPHRib2R5Pg0KICAgICAgICA8dHI+DQogICAgICAgICAgICA8dGQ+Li4uPC90ZD4NCiAgICAgICAgPC90cj4NCiAgICA8L3Rib2R5Pg0KPC90YWJsZT4=', 3, 'http://getuikit.com/docs/table.html', 'To apply this component, add the .uk-table class to a  element.', '', 1, '2015-06-01 16:12:46', '2017-11-11 22:09:27', 53, '', 6),
 (21, 'Vast Development Method', 'Joomla@vdm.io', 'Llewellyn van der Merwe', 'https://www.vdm.io/', '', 'Easily create nicely looking buttons, which come in different styles.', 4, 'Button href', 'PGEgY2xhc3M9InVrLWJ1dHRvbiB1ay1idXR0b24tcHJpbWFyeSIgaHJlZj0iIj4uLi48L2E+', 4, 'http://getuikit.com/docs/button.html', 'To apply this component, add the .uk-button class to an  or  element. Now you have created a button. Add the disabled attribute to a  element to disable the button.', '', 1, '2015-06-01 16:17:24', '2017-11-11 22:09:27', 11, '', 7),
@@ -1555,7 +1558,8 @@ INSERT INTO `#__componentbuilder_fieldtype` (`id`, `catid`, `description`, `name
 (33, '', 'The menuitem form field type provides a drop down grouped list of the available menu items from your Joomla site.', 'menuitem', '{\"properties0\":{\"name\":\"type\",\"example\":\"menuitem\",\"adjustable\":\"0\",\"mandatory\":\"1\",\"translatable\":\"0\",\"description\":\"(mandatory) must be menuitem.\"},\"properties1\":{\"name\":\"name\",\"example\":\"mymenuitem\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"0\",\"description\":\"(mandatory) is the unique name of the field.\"},\"properties2\":{\"name\":\"label\",\"example\":\"Select a menu item\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"default\",\"example\":\"\",\"adjustable\":\"1\",\"mandatory\":\"0\",\"translatable\":\"0\",\"description\":\"(optional) is the default menu item. Note that this is the ItemID number of the menu item.\"},\"properties4\":{\"name\":\"description\",\"example\":\"\",\"adjustable\":\"1\",\"mandatory\":\"0\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the drop-down box.\"},\"properties5\":{\"name\":\"published\",\"example\":\"\",\"adjustable\":\"1\",\"mandatory\":\"0\",\"translatable\":\"0\",\"description\":\"(optional) determines whether all menu items are listed or only published menu items. If state is \'0\' then all menu items will be listed. If state is \'1\' then only published menu items will be listed.\"},\"properties6\":{\"name\":\"filter\",\"example\":\"int\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"0\",\"description\":\"(optional) allow the system to save certain html tags or raw data.\"},\"properties7\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"mandatory\":\"0\",\"translatable\":\"0\",\"description\":\"(optional) Allows you to hide the field based on the value(s) of another field; for Joomla 3.2.4+\"}}', 'provides a drop down list of the available menu items from your Joomla site.', '', 1, 2, '', 4),
 (34, '', 'Remember all views already have [accesslevel] added by default, only add this if you need more custom access selection! Provides a dropdown list of accesslevel options with the current option selected.', 'Accesslevel', '{\"properties0\":{\"name\":\"type\",\"example\":\"accesslevel\",\"mandatory\":\"1\",\"description\":\"(mandatory) must be accesslevel\"},\"properties1\":{\"name\":\"name\",\"example\":\"accesstwo\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the field. This must match the name of the query results column that contains the values that will be shown to the user in the drop-down list, unless a different name is specified in the value_field attribute. \"},\"properties2\":{\"name\":\"label\",\"example\":\"Access Two\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"description\",\"example\":\"Select an access level to this concept.\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the drop-down box.\"},\"properties4\":{\"name\":\"class\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) is a CSS class name for the HTML form field.\"},\"properties5\":{\"name\":\"required\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) is the field required true if yes.\"},\"properties6\":{\"name\":\"multiple\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) If set to multiple then allows more than one usergroup to be selected.\"},\"properties7\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) show this field on the bases of the value in another field.\"}}', 'List of accesslevels', '', 1, 2, '', 5),
 (35, '', 'Provides a form with rows of fields that you specify. As many options can be added as desired. Note this form field has a jQuery based javascript file as a dependency.', 'Subform', '{\"properties0\":{\"name\":\"type\",\"example\":\"subform\",\"description\":\"(mandatory) must be subform.\"},\"properties1\":{\"name\":\"name\",\"example\":\"options\",\"adjustable\":\"1\",\"description\":\"(mandatory) is the unique name of the parameter\"},\"properties2\":{\"name\":\"label\",\"example\":\"The Option List\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"layout\",\"example\":\"joomla.form.field.subform.repeatable-table\",\"adjustable\":\"1\",\"description\":\"(mandatory) The layout for the repeatable table.\"},\"properties4\":{\"name\":\"component\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) To change the component where it should search for layout\"},\"properties5\":{\"name\":\"client\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) Function to initialise the application client<br \\/>Frontend: <code>site<\\/code> or <code>0<\\/code><br \\/>Backend: <code>admin<\\/code> or <code>1<\\/code>\"},\"properties6\":{\"name\":\"multiple\",\"example\":\"true\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The rows to be multiple.\"},\"properties7\":{\"name\":\"buttons\",\"example\":\"add,remove,move\",\"adjustable\":\"1\",\"description\":\"(optional) Which buttons to show if multiple mode is true.<br \\/>Options: <code>add,remove,move<\\/code>\"},\"properties8\":{\"name\":\"fields\",\"example\":\"1,2,3\",\"adjustable\":\"1\",\"description\":\"(mandatory) The fields to add to the modal. All fields must first be created in component builder as a field before you can add them here, since you must use the id of the field. Separate the field ids with commas. Do not add custom fields that are not also used in this component.\"},\"properties9\":{\"name\":\"formsource\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) you can add a path to a xml file containing the fields.\"},\"properties10\":{\"name\":\"description\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) description text for the form field. Displays at the top of the modal with the name as well as in the usual position in the form\"},\"properties11\":{\"name\":\"default\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The default value for the form field if the field is left empty. Note this has to be a json string compatible with the contents of the form field.\"},\"properties12\":{\"name\":\"icon\",\"example\":\"list\",\"adjustable\":\"1\",\"description\":\"(optional) The icon to show on the select button (is prefixed with \\\"icon-\\\").\"},\"properties13\":{\"name\":\"max\",\"example\":\"50\",\"adjustable\":\"1\",\"description\":\"(optional) The maximum number of rows of fields allowed (by default 999 to be effectively infinite)\"},\"properties14\":{\"name\":\"min\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The minimum number of rows of fields required\"},\"properties15\":{\"name\":\"filter\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) Use only if you would like to save raw data, since the default is best.\"},\"properties16\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) show this field on the bases of the value in another field.\"}}', 'Allows form fields which can have as many options as the user desires.', '', 1, 12, '', 6),
-(36, '', 'Provides an input field for an email address.', 'Email', '{\"properties0\":{\"name\":\"type\",\"example\":\"email\",\"mandatory\":\"1\",\"description\":\"(mandatory) must be email.\"},\"properties1\":{\"name\":\"name\",\"example\":\"email\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the field.\"},\"properties2\":{\"name\":\"label\",\"example\":\"Email Address\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"size\",\"example\":\"10\",\"adjustable\":\"1\",\"description\":\"(optional) is the width of the text box in characters. If omitted the width is determined by the browser. The value of size does not limit the number of characters that may be entered.\"},\"properties4\":{\"name\":\"maxlength\",\"example\":\"50\",\"adjustable\":\"1\",\"description\":\"(optional) limits the number of characters that may be entered.\"},\"properties5\":{\"name\":\"default\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) (not translatable) is the default value.\"},\"properties6\":{\"name\":\"description\",\"example\":\"Enter some description\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the drop-down box.\"},\"properties7\":{\"name\":\"class\",\"example\":\"inputbox\",\"adjustable\":\"1\",\"description\":\"(optional) is a CSS class name for the HTML form field. If omitted this will default to \'text_area\'.\"},\"properties8\":{\"name\":\"readonly\",\"example\":\"false\",\"adjustable\":\"1\",\"description\":\"(optional) The field cannot be changed and will automatically inherit the default value\"},\"properties9\":{\"name\":\"disabled\",\"example\":\"false\",\"adjustable\":\"1\",\"description\":\"(optional) The field cannot be changed and will automatically inherit the default value - it will also not submit\"},\"properties10\":{\"name\":\"required\",\"example\":\"false\",\"adjustable\":\"1\",\"description\":\"(optional) The field must be filled before submitting the form.\"},\"properties11\":{\"name\":\"filter\",\"example\":\"STRING\",\"adjustable\":\"1\",\"description\":\"(optional) allow the system to save certain html tags or raw data.\"},\"properties12\":{\"name\":\"validate\",\"example\":\"email\",\"adjustable\":\"1\",\"description\":\"(optional) The validation method for the form field.  This value will determine which method is used to validate the value for a field.\"},\"properties13\":{\"name\":\"message\",\"example\":\"Error! Please add some text here.\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) The error message that will be displayed instead of the default message.\"},\"properties14\":{\"name\":\"hint\",\"example\":\"your@email.com\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) The placeholder to display inside the text box.\"},\"properties15\":{\"name\":\"autocomplete\",\"example\":\"on\",\"adjustable\":\"1\",\"description\":\"(optional) The autocomplete state for the form field.  If \'off\' element will not be automatically completed by browser.\"},\"properties16\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) Allows you to hide the field based on the value(s) of another field; for Joomla 3.2.4+\"},\"properties17\":{\"name\":\"onchange\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) HTML equivalent attribute (javascript use)\"}}', 'Email form field type', '', 1, 3, '', 7);
+(36, '', 'Provides an input field for an email address.', 'Email', '{\"properties0\":{\"name\":\"type\",\"example\":\"email\",\"mandatory\":\"1\",\"description\":\"(mandatory) must be email.\"},\"properties1\":{\"name\":\"name\",\"example\":\"email\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the field.\"},\"properties2\":{\"name\":\"label\",\"example\":\"Email Address\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"size\",\"example\":\"10\",\"adjustable\":\"1\",\"description\":\"(optional) is the width of the text box in characters. If omitted the width is determined by the browser. The value of size does not limit the number of characters that may be entered.\"},\"properties4\":{\"name\":\"maxlength\",\"example\":\"50\",\"adjustable\":\"1\",\"description\":\"(optional) limits the number of characters that may be entered.\"},\"properties5\":{\"name\":\"default\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) (not translatable) is the default value.\"},\"properties6\":{\"name\":\"description\",\"example\":\"Enter some description\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the drop-down box.\"},\"properties7\":{\"name\":\"class\",\"example\":\"inputbox\",\"adjustable\":\"1\",\"description\":\"(optional) is a CSS class name for the HTML form field. If omitted this will default to \'text_area\'.\"},\"properties8\":{\"name\":\"readonly\",\"example\":\"false\",\"adjustable\":\"1\",\"description\":\"(optional) The field cannot be changed and will automatically inherit the default value\"},\"properties9\":{\"name\":\"disabled\",\"example\":\"false\",\"adjustable\":\"1\",\"description\":\"(optional) The field cannot be changed and will automatically inherit the default value - it will also not submit\"},\"properties10\":{\"name\":\"required\",\"example\":\"false\",\"adjustable\":\"1\",\"description\":\"(optional) The field must be filled before submitting the form.\"},\"properties11\":{\"name\":\"filter\",\"example\":\"STRING\",\"adjustable\":\"1\",\"description\":\"(optional) allow the system to save certain html tags or raw data.\"},\"properties12\":{\"name\":\"validate\",\"example\":\"email\",\"adjustable\":\"1\",\"description\":\"(optional) The validation method for the form field.  This value will determine which method is used to validate the value for a field.\"},\"properties13\":{\"name\":\"message\",\"example\":\"Error! Please add some text here.\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) The error message that will be displayed instead of the default message.\"},\"properties14\":{\"name\":\"hint\",\"example\":\"your@email.com\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) The placeholder to display inside the text box.\"},\"properties15\":{\"name\":\"autocomplete\",\"example\":\"on\",\"adjustable\":\"1\",\"description\":\"(optional) The autocomplete state for the form field.  If \'off\' element will not be automatically completed by browser.\"},\"properties16\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) Allows you to hide the field based on the value(s) of another field; for Joomla 3.2.4+\"},\"properties17\":{\"name\":\"onchange\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) HTML equivalent attribute (javascript use)\"}}', 'Email form field type', '', 1, 3, '', 7),
+(37, '', 'Provides a dropdown list of plugin options from the folder.', 'Plugins', '{\"properties0\":{\"name\":\"type\",\"example\":\"plugins\",\"mandatory\":\"1\",\"description\":\"(mandatory) must be editors.\"},\"properties1\":{\"name\":\"name\",\"example\":\"editor\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the parameter.\"},\"properties2\":{\"name\":\"label\",\"example\":\"Select an editor\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"default\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) (not translatable) is the default value.\"},\"properties4\":{\"name\":\"description\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the label.\"},\"properties5\":{\"name\":\"folder\",\"example\":\"editors\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) editors or captcha.\"},\"properties6\":{\"name\":\"filter\",\"example\":\"cmd\",\"adjustable\":\"1\",\"description\":\"(optional) allow the system to save certain html tags or raw data.\"},\"properties7\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) show this field on the bases of the value in another field.\"}}', 'Provides a dropdown list of plugin options from the folder.', '', 1, 5, '', 8);
 
 --
 -- Dumping data for table `#__componentbuilder_language`

admin/sql/updates/mysql/2.7.10.sql

@@ -1,60 +1,3 @@
-CREATE TABLE IF NOT EXISTS `#__componentbuilder_field` (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`add_css_view` TINYINT(1) NOT NULL DEFAULT 0,
-	`add_css_views` TINYINT(1) NOT NULL DEFAULT 0,
-	`add_javascript_view_footer` TINYINT(1) NOT NULL DEFAULT 0,
-	`add_javascript_views_footer` TINYINT(1) NOT NULL DEFAULT 0,
-	`catid` INT(11) NOT NULL DEFAULT 0,
-	`css_view` TEXT NOT NULL,
-	`css_views` TEXT NOT NULL,
-	`datadefault` CHAR(64) NOT NULL DEFAULT '',
-	`datadefault_other` CHAR(64) NOT NULL DEFAULT '',
-	`datalenght` CHAR(64) NOT NULL DEFAULT '',
-	`datalenght_other` CHAR(64) NOT NULL DEFAULT '',
-	`datatype` CHAR(64) NOT NULL DEFAULT '',
-	`fieldtype` INT(11) NOT NULL DEFAULT 0,
-	`indexes` CHAR(64) NOT NULL DEFAULT '',
-	`javascript_view_footer` TEXT NOT NULL,
-	`javascript_views_footer` TEXT NOT NULL,
-	`name` VARCHAR(255) NOT NULL DEFAULT '',
-	`null_switch` CHAR(64) NOT NULL DEFAULT '',
-	`store` INT(11) NOT NULL DEFAULT 0,
-	`xml` TEXT NOT NULL,
-	`params` text NOT NULL DEFAULT '',
-	`published` TINYINT(3) NOT NULL DEFAULT 1,
-	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
-	`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`checked_out` int(11) unsigned NOT NULL DEFAULT 0,
-	`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`version` INT(10) unsigned NOT NULL DEFAULT 1,
-	`hits` INT(10) unsigned NOT NULL DEFAULT 0,
-	`access` INT(10) unsigned NOT NULL DEFAULT 0,
-	`ordering` INT(11) NOT NULL DEFAULT 0,
-	PRIMARY KEY  (`id`),
-	KEY `idx_access` (`access`),
-	KEY `idx_checkout` (`checked_out`),
-	KEY `idx_createdby` (`created_by`),
-	KEY `idx_modifiedby` (`modified_by`),
-	KEY `idx_state` (`published`),
-	KEY `idx_name` (`name`),
-	KEY `idx_fieldtype` (`fieldtype`),
-	KEY `idx_datatype` (`datatype`),
-	KEY `idx_indexes` (`indexes`),
-	KEY `idx_null_switch` (`null_switch`),
-	KEY `idx_catid` (`catid`),
-	KEY `idx_add_css_views` (`add_css_views`),
-	KEY `idx_add_css_view` (`add_css_view`),
-	KEY `idx_datalenght` (`datalenght`),
-	KEY `idx_add_javascript_views_footer` (`add_javascript_views_footer`),
-	KEY `idx_datadefault_other` (`datadefault_other`),
-	KEY `idx_datadefault` (`datadefault`),
-	KEY `idx_datalenght_other` (`datalenght_other`),
-	KEY `idx_add_javascript_view_footer` (`add_javascript_view_footer`)
-) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
-
 CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_fields_relations` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',

admin/sql/updates/mysql/2.8.1.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `#__componentbuilder_admin_view` ADD `add_php_getform` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_php_document`;
+ALTER TABLE `#__componentbuilder_admin_view` ADD `php_getform` MEDIUMTEXT NOT NULL AFTER `php_document`;

admin/views/admin_view/tmpl/edit.php

@@ -370,266 +370,266 @@ jQuery('#adminForm').on('change', '#jform_add_php_getlistquery',function (e)
 
 });
 
-// #jform_add_php_before_save listeners for add_php_before_save_vvvvvxl function
+// #jform_add_php_getform listeners for add_php_getform_vvvvvxl function
+jQuery('#jform_add_php_getform').on('keyup',function()
+{
+	var add_php_getform_vvvvvxl = jQuery("#jform_add_php_getform input[type='radio']:checked").val();
+	vvvvvxl(add_php_getform_vvvvvxl);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_php_getform',function (e)
+{
+	e.preventDefault();
+	var add_php_getform_vvvvvxl = jQuery("#jform_add_php_getform input[type='radio']:checked").val();
+	vvvvvxl(add_php_getform_vvvvvxl);
+
+});
+
+// #jform_add_php_before_save listeners for add_php_before_save_vvvvvxm function
 jQuery('#jform_add_php_before_save').on('keyup',function()
 {
-	var add_php_before_save_vvvvvxl = jQuery("#jform_add_php_before_save input[type='radio']:checked").val();
+	var add_php_before_save_vvvvvxm = jQuery("#jform_add_php_before_save input[type='radio']:checked").val();
-	vvvvvxl(add_php_before_save_vvvvvxl);
+	vvvvvxm(add_php_before_save_vvvvvxm);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_before_save',function (e)
 {
 	e.preventDefault();
-	var add_php_before_save_vvvvvxl = jQuery("#jform_add_php_before_save input[type='radio']:checked").val();
+	var add_php_before_save_vvvvvxm = jQuery("#jform_add_php_before_save input[type='radio']:checked").val();
-	vvvvvxl(add_php_before_save_vvvvvxl);
+	vvvvvxm(add_php_before_save_vvvvvxm);
 
 });
 
-// #jform_add_php_save listeners for add_php_save_vvvvvxm function
+// #jform_add_php_save listeners for add_php_save_vvvvvxn function
 jQuery('#jform_add_php_save').on('keyup',function()
 {
-	var add_php_save_vvvvvxm = jQuery("#jform_add_php_save input[type='radio']:checked").val();
+	var add_php_save_vvvvvxn = jQuery("#jform_add_php_save input[type='radio']:checked").val();
-	vvvvvxm(add_php_save_vvvvvxm);
+	vvvvvxn(add_php_save_vvvvvxn);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_save',function (e)
 {
 	e.preventDefault();
-	var add_php_save_vvvvvxm = jQuery("#jform_add_php_save input[type='radio']:checked").val();
+	var add_php_save_vvvvvxn = jQuery("#jform_add_php_save input[type='radio']:checked").val();
-	vvvvvxm(add_php_save_vvvvvxm);
+	vvvvvxn(add_php_save_vvvvvxn);
 
 });
 
-// #jform_add_php_postsavehook listeners for add_php_postsavehook_vvvvvxn function
+// #jform_add_php_postsavehook listeners for add_php_postsavehook_vvvvvxo function
 jQuery('#jform_add_php_postsavehook').on('keyup',function()
 {
-	var add_php_postsavehook_vvvvvxn = jQuery("#jform_add_php_postsavehook input[type='radio']:checked").val();
+	var add_php_postsavehook_vvvvvxo = jQuery("#jform_add_php_postsavehook input[type='radio']:checked").val();
-	vvvvvxn(add_php_postsavehook_vvvvvxn);
+	vvvvvxo(add_php_postsavehook_vvvvvxo);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_postsavehook',function (e)
 {
 	e.preventDefault();
-	var add_php_postsavehook_vvvvvxn = jQuery("#jform_add_php_postsavehook input[type='radio']:checked").val();
+	var add_php_postsavehook_vvvvvxo = jQuery("#jform_add_php_postsavehook input[type='radio']:checked").val();
-	vvvvvxn(add_php_postsavehook_vvvvvxn);
+	vvvvvxo(add_php_postsavehook_vvvvvxo);
 
 });
 
-// #jform_add_php_allowedit listeners for add_php_allowedit_vvvvvxo function
+// #jform_add_php_allowedit listeners for add_php_allowedit_vvvvvxp function
 jQuery('#jform_add_php_allowedit').on('keyup',function()
 {
-	var add_php_allowedit_vvvvvxo = jQuery("#jform_add_php_allowedit input[type='radio']:checked").val();
+	var add_php_allowedit_vvvvvxp = jQuery("#jform_add_php_allowedit input[type='radio']:checked").val();
-	vvvvvxo(add_php_allowedit_vvvvvxo);
+	vvvvvxp(add_php_allowedit_vvvvvxp);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_allowedit',function (e)
 {
 	e.preventDefault();
-	var add_php_allowedit_vvvvvxo = jQuery("#jform_add_php_allowedit input[type='radio']:checked").val();
+	var add_php_allowedit_vvvvvxp = jQuery("#jform_add_php_allowedit input[type='radio']:checked").val();
-	vvvvvxo(add_php_allowedit_vvvvvxo);
+	vvvvvxp(add_php_allowedit_vvvvvxp);
 
 });
 
-// #jform_add_php_batchcopy listeners for add_php_batchcopy_vvvvvxp function
+// #jform_add_php_batchcopy listeners for add_php_batchcopy_vvvvvxq function
 jQuery('#jform_add_php_batchcopy').on('keyup',function()
 {
-	var add_php_batchcopy_vvvvvxp = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val();
+	var add_php_batchcopy_vvvvvxq = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val();
-	vvvvvxp(add_php_batchcopy_vvvvvxp);
+	vvvvvxq(add_php_batchcopy_vvvvvxq);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_batchcopy',function (e)
 {
 	e.preventDefault();
-	var add_php_batchcopy_vvvvvxp = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val();
+	var add_php_batchcopy_vvvvvxq = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val();
-	vvvvvxp(add_php_batchcopy_vvvvvxp);
+	vvvvvxq(add_php_batchcopy_vvvvvxq);
 
 });
 
-// #jform_add_php_batchmove listeners for add_php_batchmove_vvvvvxq function
+// #jform_add_php_batchmove listeners for add_php_batchmove_vvvvvxr function
 jQuery('#jform_add_php_batchmove').on('keyup',function()
 {
-	var add_php_batchmove_vvvvvxq = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val();
+	var add_php_batchmove_vvvvvxr = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val();
-	vvvvvxq(add_php_batchmove_vvvvvxq);
+	vvvvvxr(add_php_batchmove_vvvvvxr);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_batchmove',function (e)
 {
 	e.preventDefault();
-	var add_php_batchmove_vvvvvxq = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val();
+	var add_php_batchmove_vvvvvxr = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val();
-	vvvvvxq(add_php_batchmove_vvvvvxq);
+	vvvvvxr(add_php_batchmove_vvvvvxr);
 
 });
 
-// #jform_add_php_before_publish listeners for add_php_before_publish_vvvvvxr function
+// #jform_add_php_before_publish listeners for add_php_before_publish_vvvvvxs function
 jQuery('#jform_add_php_before_publish').on('keyup',function()
 {
-	var add_php_before_publish_vvvvvxr = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val();
+	var add_php_before_publish_vvvvvxs = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val();
-	vvvvvxr(add_php_before_publish_vvvvvxr);
+	vvvvvxs(add_php_before_publish_vvvvvxs);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_before_publish',function (e)
 {
 	e.preventDefault();
-	var add_php_before_publish_vvvvvxr = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val();
+	var add_php_before_publish_vvvvvxs = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val();
-	vvvvvxr(add_php_before_publish_vvvvvxr);
+	vvvvvxs(add_php_before_publish_vvvvvxs);
 
 });
 
-// #jform_add_php_after_publish listeners for add_php_after_publish_vvvvvxs function
+// #jform_add_php_after_publish listeners for add_php_after_publish_vvvvvxt function
 jQuery('#jform_add_php_after_publish').on('keyup',function()
 {
-	var add_php_after_publish_vvvvvxs = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val();
+	var add_php_after_publish_vvvvvxt = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val();
-	vvvvvxs(add_php_after_publish_vvvvvxs);
+	vvvvvxt(add_php_after_publish_vvvvvxt);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_after_publish',function (e)
 {
 	e.preventDefault();
-	var add_php_after_publish_vvvvvxs = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val();
+	var add_php_after_publish_vvvvvxt = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val();
-	vvvvvxs(add_php_after_publish_vvvvvxs);
+	vvvvvxt(add_php_after_publish_vvvvvxt);
 
 });
 
-// #jform_add_php_before_delete listeners for add_php_before_delete_vvvvvxt function
+// #jform_add_php_before_delete listeners for add_php_before_delete_vvvvvxu function
 jQuery('#jform_add_php_before_delete').on('keyup',function()
 {
-	var add_php_before_delete_vvvvvxt = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val();
+	var add_php_before_delete_vvvvvxu = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val();
-	vvvvvxt(add_php_before_delete_vvvvvxt);
+	vvvvvxu(add_php_before_delete_vvvvvxu);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_before_delete',function (e)
 {
 	e.preventDefault();
-	var add_php_before_delete_vvvvvxt = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val();
+	var add_php_before_delete_vvvvvxu = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val();
-	vvvvvxt(add_php_before_delete_vvvvvxt);
+	vvvvvxu(add_php_before_delete_vvvvvxu);
 
 });
 
-// #jform_add_php_after_delete listeners for add_php_after_delete_vvvvvxu function
+// #jform_add_php_after_delete listeners for add_php_after_delete_vvvvvxv function
 jQuery('#jform_add_php_after_delete').on('keyup',function()
 {
-	var add_php_after_delete_vvvvvxu = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val();
+	var add_php_after_delete_vvvvvxv = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val();
-	vvvvvxu(add_php_after_delete_vvvvvxu);
+	vvvvvxv(add_php_after_delete_vvvvvxv);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_after_delete',function (e)
 {
 	e.preventDefault();
-	var add_php_after_delete_vvvvvxu = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val();
+	var add_php_after_delete_vvvvvxv = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val();
-	vvvvvxu(add_php_after_delete_vvvvvxu);
+	vvvvvxv(add_php_after_delete_vvvvvxv);
 
 });
 
-// #jform_add_php_document listeners for add_php_document_vvvvvxv function
+// #jform_add_php_document listeners for add_php_document_vvvvvxw function
 jQuery('#jform_add_php_document').on('keyup',function()
 {
-	var add_php_document_vvvvvxv = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	var add_php_document_vvvvvxw = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvxv(add_php_document_vvvvvxv);
+	vvvvvxw(add_php_document_vvvvvxw);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_document',function (e)
 {
 	e.preventDefault();
-	var add_php_document_vvvvvxv = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	var add_php_document_vvvvvxw = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvxv(add_php_document_vvvvvxv);
+	vvvvvxw(add_php_document_vvvvvxw);
-
-});
-
-// #jform_add_sql listeners for add_sql_vvvvvxw function
-jQuery('#jform_add_sql').on('keyup',function()
-{
-	var add_sql_vvvvvxw = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxw(add_sql_vvvvvxw);
-
-});
-jQuery('#adminForm').on('change', '#jform_add_sql',function (e)
-{
-	e.preventDefault();
-	var add_sql_vvvvvxw = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxw(add_sql_vvvvvxw);
-
-});
-
-// #jform_source listeners for source_vvvvvxx function
-jQuery('#jform_source').on('keyup',function()
-{
-	var source_vvvvvxx = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvxx = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxx(source_vvvvvxx,add_sql_vvvvvxx);
-
-});
-jQuery('#adminForm').on('change', '#jform_source',function (e)
-{
-	e.preventDefault();
-	var source_vvvvvxx = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvxx = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxx(source_vvvvvxx,add_sql_vvvvvxx);
 
 });
 
 // #jform_add_sql listeners for add_sql_vvvvvxx function
 jQuery('#jform_add_sql').on('keyup',function()
 {
-	var source_vvvvvxx = jQuery("#jform_source input[type='radio']:checked").val();
 	var add_sql_vvvvvxx = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxx(source_vvvvvxx,add_sql_vvvvvxx);
+	vvvvvxx(add_sql_vvvvvxx);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_sql',function (e)
 {
 	e.preventDefault();
-	var source_vvvvvxx = jQuery("#jform_source input[type='radio']:checked").val();
 	var add_sql_vvvvvxx = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxx(source_vvvvvxx,add_sql_vvvvvxx);
+	vvvvvxx(add_sql_vvvvvxx);
 
 });
 
-// #jform_source listeners for source_vvvvvxz function
+// #jform_source listeners for source_vvvvvxy function
 jQuery('#jform_source').on('keyup',function()
 {
-	var source_vvvvvxz = jQuery("#jform_source input[type='radio']:checked").val();
+	var source_vvvvvxy = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvxz = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	var add_sql_vvvvvxy = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxz(source_vvvvvxz,add_sql_vvvvvxz);
+	vvvvvxy(source_vvvvvxy,add_sql_vvvvvxy);
 
 });
 jQuery('#adminForm').on('change', '#jform_source',function (e)
 {
 	e.preventDefault();
-	var source_vvvvvxz = jQuery("#jform_source input[type='radio']:checked").val();
+	var source_vvvvvxy = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvxz = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	var add_sql_vvvvvxy = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxz(source_vvvvvxz,add_sql_vvvvvxz);
+	vvvvvxy(source_vvvvvxy,add_sql_vvvvvxy);
 
 });
 
-// #jform_add_sql listeners for add_sql_vvvvvxz function
+// #jform_add_sql listeners for add_sql_vvvvvxy function
 jQuery('#jform_add_sql').on('keyup',function()
 {
-	var source_vvvvvxz = jQuery("#jform_source input[type='radio']:checked").val();
+	var source_vvvvvxy = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvxz = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	var add_sql_vvvvvxy = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxz(source_vvvvvxz,add_sql_vvvvvxz);
+	vvvvvxy(source_vvvvvxy,add_sql_vvvvvxy);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_sql',function (e)
 {
 	e.preventDefault();
-	var source_vvvvvxz = jQuery("#jform_source input[type='radio']:checked").val();
+	var source_vvvvvxy = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvxz = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	var add_sql_vvvvvxy = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxz(source_vvvvvxz,add_sql_vvvvvxz);
+	vvvvvxy(source_vvvvvxy,add_sql_vvvvvxy);
 
 });
 
-// #jform_add_custom_import listeners for add_custom_import_vvvvvyb function
+// #jform_source listeners for source_vvvvvya function
-jQuery('#jform_add_custom_import').on('keyup',function()
+jQuery('#jform_source').on('keyup',function()
 {
-	var add_custom_import_vvvvvyb = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
+	var source_vvvvvya = jQuery("#jform_source input[type='radio']:checked").val();
-	vvvvvyb(add_custom_import_vvvvvyb);
+	var add_sql_vvvvvya = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvya(source_vvvvvya,add_sql_vvvvvya);
 
 });
-jQuery('#adminForm').on('change', '#jform_add_custom_import',function (e)
+jQuery('#adminForm').on('change', '#jform_source',function (e)
 {
 	e.preventDefault();
-	var add_custom_import_vvvvvyb = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
+	var source_vvvvvya = jQuery("#jform_source input[type='radio']:checked").val();
-	vvvvvyb(add_custom_import_vvvvvyb);
+	var add_sql_vvvvvya = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvya(source_vvvvvya,add_sql_vvvvvya);
+
+});
+
+// #jform_add_sql listeners for add_sql_vvvvvya function
+jQuery('#jform_add_sql').on('keyup',function()
+{
+	var source_vvvvvya = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvya = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvya(source_vvvvvya,add_sql_vvvvvya);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_sql',function (e)
+{
+	e.preventDefault();
+	var source_vvvvvya = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvya = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvya(source_vvvvvya,add_sql_vvvvvya);
 
 });
 
@@ -648,18 +648,33 @@ jQuery('#adminForm').on('change', '#jform_add_custom_import',function (e)
 
 });
 
-// #jform_add_custom_button listeners for add_custom_button_vvvvvyd function
+// #jform_add_custom_import listeners for add_custom_import_vvvvvyd function
+jQuery('#jform_add_custom_import').on('keyup',function()
+{
+	var add_custom_import_vvvvvyd = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
+	vvvvvyd(add_custom_import_vvvvvyd);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_custom_import',function (e)
+{
+	e.preventDefault();
+	var add_custom_import_vvvvvyd = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
+	vvvvvyd(add_custom_import_vvvvvyd);
+
+});
+
+// #jform_add_custom_button listeners for add_custom_button_vvvvvye function
 jQuery('#jform_add_custom_button').on('keyup',function()
 {
-	var add_custom_button_vvvvvyd = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	var add_custom_button_vvvvvye = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyd(add_custom_button_vvvvvyd);
+	vvvvvye(add_custom_button_vvvvvye);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_custom_button',function (e)
 {
 	e.preventDefault();
-	var add_custom_button_vvvvvyd = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	var add_custom_button_vvvvvye = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyd(add_custom_button_vvvvvyd);
+	vvvvvye(add_custom_button_vvvvvye);
 
 });
 

admin/views/custom_admin_view/tmpl/edit.php

@@ -159,153 +159,153 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 
 <script type="text/javascript">
 
-// #jform_add_php_view listeners for add_php_view_vvvvvye function
+// #jform_add_php_view listeners for add_php_view_vvvvvyf function
 jQuery('#jform_add_php_view').on('keyup',function()
 {
-	var add_php_view_vvvvvye = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvyf = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvye(add_php_view_vvvvvye);
+	vvvvvyf(add_php_view_vvvvvyf);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_view',function (e)
 {
 	e.preventDefault();
-	var add_php_view_vvvvvye = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvyf = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvye(add_php_view_vvvvvye);
+	vvvvvyf(add_php_view_vvvvvyf);
 
 });
 
-// #jform_add_php_jview_display listeners for add_php_jview_display_vvvvvyf function
+// #jform_add_php_jview_display listeners for add_php_jview_display_vvvvvyg function
 jQuery('#jform_add_php_jview_display').on('keyup',function()
 {
-	var add_php_jview_display_vvvvvyf = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	var add_php_jview_display_vvvvvyg = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvyf(add_php_jview_display_vvvvvyf);
+	vvvvvyg(add_php_jview_display_vvvvvyg);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_jview_display',function (e)
 {
 	e.preventDefault();
-	var add_php_jview_display_vvvvvyf = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	var add_php_jview_display_vvvvvyg = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvyf(add_php_jview_display_vvvvvyf);
+	vvvvvyg(add_php_jview_display_vvvvvyg);
 
 });
 
-// #jform_add_php_jview listeners for add_php_jview_vvvvvyg function
+// #jform_add_php_jview listeners for add_php_jview_vvvvvyh function
 jQuery('#jform_add_php_jview').on('keyup',function()
 {
-	var add_php_jview_vvvvvyg = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	var add_php_jview_vvvvvyh = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyg(add_php_jview_vvvvvyg);
+	vvvvvyh(add_php_jview_vvvvvyh);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_jview',function (e)
 {
 	e.preventDefault();
-	var add_php_jview_vvvvvyg = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	var add_php_jview_vvvvvyh = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyg(add_php_jview_vvvvvyg);
+	vvvvvyh(add_php_jview_vvvvvyh);
 
 });
 
-// #jform_add_php_document listeners for add_php_document_vvvvvyh function
+// #jform_add_php_document listeners for add_php_document_vvvvvyi function
 jQuery('#jform_add_php_document').on('keyup',function()
 {
-	var add_php_document_vvvvvyh = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	var add_php_document_vvvvvyi = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyh(add_php_document_vvvvvyh);
+	vvvvvyi(add_php_document_vvvvvyi);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_document',function (e)
 {
 	e.preventDefault();
-	var add_php_document_vvvvvyh = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	var add_php_document_vvvvvyi = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyh(add_php_document_vvvvvyh);
+	vvvvvyi(add_php_document_vvvvvyi);
 
 });
 
-// #jform_add_css_document listeners for add_css_document_vvvvvyi function
+// #jform_add_css_document listeners for add_css_document_vvvvvyj function
 jQuery('#jform_add_css_document').on('keyup',function()
 {
-	var add_css_document_vvvvvyi = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	var add_css_document_vvvvvyj = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvyi(add_css_document_vvvvvyi);
+	vvvvvyj(add_css_document_vvvvvyj);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css_document',function (e)
 {
 	e.preventDefault();
-	var add_css_document_vvvvvyi = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	var add_css_document_vvvvvyj = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvyi(add_css_document_vvvvvyi);
+	vvvvvyj(add_css_document_vvvvvyj);
 
 });
 
-// #jform_add_javascript_file listeners for add_javascript_file_vvvvvyj function
+// #jform_add_javascript_file listeners for add_javascript_file_vvvvvyk function
 jQuery('#jform_add_javascript_file').on('keyup',function()
 {
-	var add_javascript_file_vvvvvyj = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	var add_javascript_file_vvvvvyk = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvyj(add_javascript_file_vvvvvyj);
+	vvvvvyk(add_javascript_file_vvvvvyk);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_file',function (e)
 {
 	e.preventDefault();
-	var add_javascript_file_vvvvvyj = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	var add_javascript_file_vvvvvyk = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvyj(add_javascript_file_vvvvvyj);
+	vvvvvyk(add_javascript_file_vvvvvyk);
 
 });
 
-// #jform_add_js_document listeners for add_js_document_vvvvvyk function
+// #jform_add_js_document listeners for add_js_document_vvvvvyl function
 jQuery('#jform_add_js_document').on('keyup',function()
 {
-	var add_js_document_vvvvvyk = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	var add_js_document_vvvvvyl = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyk(add_js_document_vvvvvyk);
+	vvvvvyl(add_js_document_vvvvvyl);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_js_document',function (e)
 {
 	e.preventDefault();
-	var add_js_document_vvvvvyk = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	var add_js_document_vvvvvyl = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyk(add_js_document_vvvvvyk);
+	vvvvvyl(add_js_document_vvvvvyl);
 
 });
 
-// #jform_add_custom_button listeners for add_custom_button_vvvvvyl function
+// #jform_add_custom_button listeners for add_custom_button_vvvvvym function
 jQuery('#jform_add_custom_button').on('keyup',function()
 {
-	var add_custom_button_vvvvvyl = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	var add_custom_button_vvvvvym = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyl(add_custom_button_vvvvvyl);
+	vvvvvym(add_custom_button_vvvvvym);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_custom_button',function (e)
 {
 	e.preventDefault();
-	var add_custom_button_vvvvvyl = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	var add_custom_button_vvvvvym = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyl(add_custom_button_vvvvvyl);
+	vvvvvym(add_custom_button_vvvvvym);
 
 });
 
-// #jform_add_css listeners for add_css_vvvvvym function
+// #jform_add_css listeners for add_css_vvvvvyn function
 jQuery('#jform_add_css').on('keyup',function()
 {
-	var add_css_vvvvvym = jQuery("#jform_add_css input[type='radio']:checked").val();
+	var add_css_vvvvvyn = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvym(add_css_vvvvvym);
+	vvvvvyn(add_css_vvvvvyn);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css',function (e)
 {
 	e.preventDefault();
-	var add_css_vvvvvym = jQuery("#jform_add_css input[type='radio']:checked").val();
+	var add_css_vvvvvyn = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvym(add_css_vvvvvym);
+	vvvvvyn(add_css_vvvvvyn);
 
 });
 
-// #jform_add_php_ajax listeners for add_php_ajax_vvvvvyn function
+// #jform_add_php_ajax listeners for add_php_ajax_vvvvvyo function
 jQuery('#jform_add_php_ajax').on('keyup',function()
 {
-	var add_php_ajax_vvvvvyn = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	var add_php_ajax_vvvvvyo = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvyn(add_php_ajax_vvvvvyn);
+	vvvvvyo(add_php_ajax_vvvvvyo);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_ajax',function (e)
 {
 	e.preventDefault();
-	var add_php_ajax_vvvvvyn = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	var add_php_ajax_vvvvvyo = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvyn(add_php_ajax_vvvvvyn);
+	vvvvvyo(add_php_ajax_vvvvvyo);
 
 });
 

admin/views/custom_code/tmpl/edit.php

@@ -113,21 +113,6 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 
 <script type="text/javascript">
 
-// #jform_target listeners for target_vvvvwaa function
-jQuery('#jform_target').on('keyup',function()
-{
-	var target_vvvvwaa = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwaa(target_vvvvwaa);
-
-});
-jQuery('#adminForm').on('change', '#jform_target',function (e)
-{
-	e.preventDefault();
-	var target_vvvvwaa = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwaa(target_vvvvwaa);
-
-});
-
 // #jform_target listeners for target_vvvvwab function
 jQuery('#jform_target').on('keyup',function()
 {
@@ -147,67 +132,82 @@ jQuery('#adminForm').on('change', '#jform_target',function (e)
 jQuery('#jform_target').on('keyup',function()
 {
 	var target_vvvvwac = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvwac = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwac(target_vvvvwac);
-	vvvvwac(target_vvvvwac,type_vvvvwac);
 
 });
 jQuery('#adminForm').on('change', '#jform_target',function (e)
 {
 	e.preventDefault();
 	var target_vvvvwac = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvwac = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwac(target_vvvvwac);
-	vvvvwac(target_vvvvwac,type_vvvvwac);
-
-});
-
-// #jform_type listeners for type_vvvvwac function
-jQuery('#jform_type').on('keyup',function()
-{
-	var target_vvvvwac = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvwac = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwac(target_vvvvwac,type_vvvvwac);
-
-});
-jQuery('#adminForm').on('change', '#jform_type',function (e)
-{
-	e.preventDefault();
-	var target_vvvvwac = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvwac = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwac(target_vvvvwac,type_vvvvwac);
-
-});
-
-// #jform_type listeners for type_vvvvwad function
-jQuery('#jform_type').on('keyup',function()
-{
-	var type_vvvvwad = jQuery("#jform_type input[type='radio']:checked").val();
-	var target_vvvvwad = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwad(type_vvvvwad,target_vvvvwad);
-
-});
-jQuery('#adminForm').on('change', '#jform_type',function (e)
-{
-	e.preventDefault();
-	var type_vvvvwad = jQuery("#jform_type input[type='radio']:checked").val();
-	var target_vvvvwad = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwad(type_vvvvwad,target_vvvvwad);
 
 });
 
 // #jform_target listeners for target_vvvvwad function
 jQuery('#jform_target').on('keyup',function()
 {
-	var type_vvvvwad = jQuery("#jform_type input[type='radio']:checked").val();
 	var target_vvvvwad = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwad(type_vvvvwad,target_vvvvwad);
+	var type_vvvvwad = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwad(target_vvvvwad,type_vvvvwad);
 
 });
 jQuery('#adminForm').on('change', '#jform_target',function (e)
 {
 	e.preventDefault();
-	var type_vvvvwad = jQuery("#jform_type input[type='radio']:checked").val();
 	var target_vvvvwad = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwad(type_vvvvwad,target_vvvvwad);
+	var type_vvvvwad = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwad(target_vvvvwad,type_vvvvwad);
+
+});
+
+// #jform_type listeners for type_vvvvwad function
+jQuery('#jform_type').on('keyup',function()
+{
+	var target_vvvvwad = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvwad = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwad(target_vvvvwad,type_vvvvwad);
+
+});
+jQuery('#adminForm').on('change', '#jform_type',function (e)
+{
+	e.preventDefault();
+	var target_vvvvwad = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvwad = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwad(target_vvvvwad,type_vvvvwad);
+
+});
+
+// #jform_type listeners for type_vvvvwae function
+jQuery('#jform_type').on('keyup',function()
+{
+	var type_vvvvwae = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwae = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwae(type_vvvvwae,target_vvvvwae);
+
+});
+jQuery('#adminForm').on('change', '#jform_type',function (e)
+{
+	e.preventDefault();
+	var type_vvvvwae = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwae = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwae(type_vvvvwae,target_vvvvwae);
+
+});
+
+// #jform_target listeners for target_vvvvwae function
+jQuery('#jform_target').on('keyup',function()
+{
+	var type_vvvvwae = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwae = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwae(type_vvvvwae,target_vvvvwae);
+
+});
+jQuery('#adminForm').on('change', '#jform_target',function (e)
+{
+	e.preventDefault();
+	var type_vvvvwae = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwae = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwae(type_vvvvwae,target_vvvvwae);
 
 });
 

admin/views/dynamic_get/tmpl/edit.php

@@ -153,33 +153,18 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 
 <script type="text/javascript">
 
-// #jform_gettype listeners for gettype_vvvvvzb function
+// #jform_gettype listeners for gettype_vvvvvzc function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var gettype_vvvvvzb = jQuery("#jform_gettype").val();
+	var gettype_vvvvvzc = jQuery("#jform_gettype").val();
-	vvvvvzb(gettype_vvvvvzb);
+	vvvvvzc(gettype_vvvvvzc);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var gettype_vvvvvzb = jQuery("#jform_gettype").val();
+	var gettype_vvvvvzc = jQuery("#jform_gettype").val();
-	vvvvvzb(gettype_vvvvvzb);
+	vvvvvzc(gettype_vvvvvzc);
-
-});
-
-// #jform_main_source listeners for main_source_vvvvvzc function
-jQuery('#jform_main_source').on('keyup',function()
-{
-	var main_source_vvvvvzc = jQuery("#jform_main_source").val();
-	vvvvvzc(main_source_vvvvvzc);
-
-});
-jQuery('#adminForm').on('change', '#jform_main_source',function (e)
-{
-	e.preventDefault();
-	var main_source_vvvvvzc = jQuery("#jform_main_source").val();
-	vvvvvzc(main_source_vvvvvzc);
 
 });
 
@@ -228,18 +213,18 @@ jQuery('#adminForm').on('change', '#jform_main_source',function (e)
 
 });
 
-// #jform_addcalculation listeners for addcalculation_vvvvvzg function
+// #jform_main_source listeners for main_source_vvvvvzg function
-jQuery('#jform_addcalculation').on('keyup',function()
+jQuery('#jform_main_source').on('keyup',function()
 {
-	var addcalculation_vvvvvzg = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var main_source_vvvvvzg = jQuery("#jform_main_source").val();
-	vvvvvzg(addcalculation_vvvvvzg);
+	vvvvvzg(main_source_vvvvvzg);
 
 });
-jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
+jQuery('#adminForm').on('change', '#jform_main_source',function (e)
 {
 	e.preventDefault();
-	var addcalculation_vvvvvzg = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var main_source_vvvvvzg = jQuery("#jform_main_source").val();
-	vvvvvzg(addcalculation_vvvvvzg);
+	vvvvvzg(main_source_vvvvvzg);
 
 });
 
@@ -247,33 +232,14 @@ jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
 jQuery('#jform_addcalculation').on('keyup',function()
 {
 	var addcalculation_vvvvvzh = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvzh = jQuery("#jform_gettype").val();
+	vvvvvzh(addcalculation_vvvvvzh);
-	vvvvvzh(addcalculation_vvvvvzh,gettype_vvvvvzh);
 
 });
 jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
 {
 	e.preventDefault();
 	var addcalculation_vvvvvzh = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvzh = jQuery("#jform_gettype").val();
+	vvvvvzh(addcalculation_vvvvvzh);
-	vvvvvzh(addcalculation_vvvvvzh,gettype_vvvvvzh);
-
-});
-
-// #jform_gettype listeners for gettype_vvvvvzh function
-jQuery('#jform_gettype').on('keyup',function()
-{
-	var addcalculation_vvvvvzh = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvzh = jQuery("#jform_gettype").val();
-	vvvvvzh(addcalculation_vvvvvzh,gettype_vvvvvzh);
-
-});
-jQuery('#adminForm').on('change', '#jform_gettype',function (e)
-{
-	e.preventDefault();
-	var addcalculation_vvvvvzh = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvzh = jQuery("#jform_gettype").val();
-	vvvvvzh(addcalculation_vvvvvzh,gettype_vvvvvzh);
 
 });
 
@@ -311,18 +277,37 @@ jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 
 });
 
-// #jform_main_source listeners for main_source_vvvvvzl function
+// #jform_addcalculation listeners for addcalculation_vvvvvzj function
-jQuery('#jform_main_source').on('keyup',function()
+jQuery('#jform_addcalculation').on('keyup',function()
 {
-	var main_source_vvvvvzl = jQuery("#jform_main_source").val();
+	var addcalculation_vvvvvzj = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	vvvvvzl(main_source_vvvvvzl);
+	var gettype_vvvvvzj = jQuery("#jform_gettype").val();
+	vvvvvzj(addcalculation_vvvvvzj,gettype_vvvvvzj);
 
 });
-jQuery('#adminForm').on('change', '#jform_main_source',function (e)
+jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
 {
 	e.preventDefault();
-	var main_source_vvvvvzl = jQuery("#jform_main_source").val();
+	var addcalculation_vvvvvzj = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	vvvvvzl(main_source_vvvvvzl);
+	var gettype_vvvvvzj = jQuery("#jform_gettype").val();
+	vvvvvzj(addcalculation_vvvvvzj,gettype_vvvvvzj);
+
+});
+
+// #jform_gettype listeners for gettype_vvvvvzj function
+jQuery('#jform_gettype').on('keyup',function()
+{
+	var addcalculation_vvvvvzj = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzj = jQuery("#jform_gettype").val();
+	vvvvvzj(addcalculation_vvvvvzj,gettype_vvvvvzj);
+
+});
+jQuery('#adminForm').on('change', '#jform_gettype',function (e)
+{
+	e.preventDefault();
+	var addcalculation_vvvvvzj = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzj = jQuery("#jform_gettype").val();
+	vvvvvzj(addcalculation_vvvvvzj,gettype_vvvvvzj);
 
 });
 
@@ -341,203 +326,203 @@ jQuery('#adminForm').on('change', '#jform_main_source',function (e)
 
 });
 
-// #jform_add_php_before_getitem listeners for add_php_before_getitem_vvvvvzn function
+// #jform_main_source listeners for main_source_vvvvvzn function
+jQuery('#jform_main_source').on('keyup',function()
+{
+	var main_source_vvvvvzn = jQuery("#jform_main_source").val();
+	vvvvvzn(main_source_vvvvvzn);
+
+});
+jQuery('#adminForm').on('change', '#jform_main_source',function (e)
+{
+	e.preventDefault();
+	var main_source_vvvvvzn = jQuery("#jform_main_source").val();
+	vvvvvzn(main_source_vvvvvzn);
+
+});
+
+// #jform_add_php_before_getitem listeners for add_php_before_getitem_vvvvvzo function
 jQuery('#jform_add_php_before_getitem').on('keyup',function()
 {
-	var add_php_before_getitem_vvvvvzn = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
+	var add_php_before_getitem_vvvvvzo = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzn = jQuery("#jform_gettype").val();
+	var gettype_vvvvvzo = jQuery("#jform_gettype").val();
-	vvvvvzn(add_php_before_getitem_vvvvvzn,gettype_vvvvvzn);
+	vvvvvzo(add_php_before_getitem_vvvvvzo,gettype_vvvvvzo);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_before_getitem',function (e)
 {
 	e.preventDefault();
-	var add_php_before_getitem_vvvvvzn = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
+	var add_php_before_getitem_vvvvvzo = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzn = jQuery("#jform_gettype").val();
-	vvvvvzn(add_php_before_getitem_vvvvvzn,gettype_vvvvvzn);
-
-});
-
-// #jform_gettype listeners for gettype_vvvvvzn function
-jQuery('#jform_gettype').on('keyup',function()
-{
-	var add_php_before_getitem_vvvvvzn = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzn = jQuery("#jform_gettype").val();
-	vvvvvzn(add_php_before_getitem_vvvvvzn,gettype_vvvvvzn);
-
-});
-jQuery('#adminForm').on('change', '#jform_gettype',function (e)
-{
-	e.preventDefault();
-	var add_php_before_getitem_vvvvvzn = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzn = jQuery("#jform_gettype").val();
-	vvvvvzn(add_php_before_getitem_vvvvvzn,gettype_vvvvvzn);
-
-});
-
-// #jform_add_php_after_getitem listeners for add_php_after_getitem_vvvvvzo function
-jQuery('#jform_add_php_after_getitem').on('keyup',function()
-{
-	var add_php_after_getitem_vvvvvzo = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
 	var gettype_vvvvvzo = jQuery("#jform_gettype").val();
-	vvvvvzo(add_php_after_getitem_vvvvvzo,gettype_vvvvvzo);
+	vvvvvzo(add_php_before_getitem_vvvvvzo,gettype_vvvvvzo);
-
-});
-jQuery('#adminForm').on('change', '#jform_add_php_after_getitem',function (e)
-{
-	e.preventDefault();
-	var add_php_after_getitem_vvvvvzo = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzo = jQuery("#jform_gettype").val();
-	vvvvvzo(add_php_after_getitem_vvvvvzo,gettype_vvvvvzo);
 
 });
 
 // #jform_gettype listeners for gettype_vvvvvzo function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var add_php_after_getitem_vvvvvzo = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var add_php_before_getitem_vvvvvzo = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
 	var gettype_vvvvvzo = jQuery("#jform_gettype").val();
-	vvvvvzo(add_php_after_getitem_vvvvvzo,gettype_vvvvvzo);
+	vvvvvzo(add_php_before_getitem_vvvvvzo,gettype_vvvvvzo);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var add_php_after_getitem_vvvvvzo = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var add_php_before_getitem_vvvvvzo = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
 	var gettype_vvvvvzo = jQuery("#jform_gettype").val();
-	vvvvvzo(add_php_after_getitem_vvvvvzo,gettype_vvvvvzo);
+	vvvvvzo(add_php_before_getitem_vvvvvzo,gettype_vvvvvzo);
 
 });
 
-// #jform_gettype listeners for gettype_vvvvvzq function
+// #jform_add_php_after_getitem listeners for add_php_after_getitem_vvvvvzp function
+jQuery('#jform_add_php_after_getitem').on('keyup',function()
+{
+	var add_php_after_getitem_vvvvvzp = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var gettype_vvvvvzp = jQuery("#jform_gettype").val();
+	vvvvvzp(add_php_after_getitem_vvvvvzp,gettype_vvvvvzp);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_php_after_getitem',function (e)
+{
+	e.preventDefault();
+	var add_php_after_getitem_vvvvvzp = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var gettype_vvvvvzp = jQuery("#jform_gettype").val();
+	vvvvvzp(add_php_after_getitem_vvvvvzp,gettype_vvvvvzp);
+
+});
+
+// #jform_gettype listeners for gettype_vvvvvzp function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var gettype_vvvvvzq = jQuery("#jform_gettype").val();
+	var add_php_after_getitem_vvvvvzp = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
-	vvvvvzq(gettype_vvvvvzq);
+	var gettype_vvvvvzp = jQuery("#jform_gettype").val();
+	vvvvvzp(add_php_after_getitem_vvvvvzp,gettype_vvvvvzp);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var gettype_vvvvvzq = jQuery("#jform_gettype").val();
+	var add_php_after_getitem_vvvvvzp = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
-	vvvvvzq(gettype_vvvvvzq);
+	var gettype_vvvvvzp = jQuery("#jform_gettype").val();
-
+	vvvvvzp(add_php_after_getitem_vvvvvzp,gettype_vvvvvzp);
-});
-
-// #jform_add_php_getlistquery listeners for add_php_getlistquery_vvvvvzr function
-jQuery('#jform_add_php_getlistquery').on('keyup',function()
-{
-	var add_php_getlistquery_vvvvvzr = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
-	var gettype_vvvvvzr = jQuery("#jform_gettype").val();
-	vvvvvzr(add_php_getlistquery_vvvvvzr,gettype_vvvvvzr);
-
-});
-jQuery('#adminForm').on('change', '#jform_add_php_getlistquery',function (e)
-{
-	e.preventDefault();
-	var add_php_getlistquery_vvvvvzr = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
-	var gettype_vvvvvzr = jQuery("#jform_gettype").val();
-	vvvvvzr(add_php_getlistquery_vvvvvzr,gettype_vvvvvzr);
 
 });
 
 // #jform_gettype listeners for gettype_vvvvvzr function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var add_php_getlistquery_vvvvvzr = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzr = jQuery("#jform_gettype").val();
-	vvvvvzr(add_php_getlistquery_vvvvvzr,gettype_vvvvvzr);
+	vvvvvzr(gettype_vvvvvzr);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var add_php_getlistquery_vvvvvzr = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzr = jQuery("#jform_gettype").val();
-	vvvvvzr(add_php_getlistquery_vvvvvzr,gettype_vvvvvzr);
+	vvvvvzr(gettype_vvvvvzr);
 
 });
 
-// #jform_add_php_before_getitems listeners for add_php_before_getitems_vvvvvzs function
+// #jform_add_php_getlistquery listeners for add_php_getlistquery_vvvvvzs function
-jQuery('#jform_add_php_before_getitems').on('keyup',function()
+jQuery('#jform_add_php_getlistquery').on('keyup',function()
 {
-	var add_php_before_getitems_vvvvvzs = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvzs = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzs = jQuery("#jform_gettype").val();
-	vvvvvzs(add_php_before_getitems_vvvvvzs,gettype_vvvvvzs);
+	vvvvvzs(add_php_getlistquery_vvvvvzs,gettype_vvvvvzs);
 
 });
-jQuery('#adminForm').on('change', '#jform_add_php_before_getitems',function (e)
+jQuery('#adminForm').on('change', '#jform_add_php_getlistquery',function (e)
 {
 	e.preventDefault();
-	var add_php_before_getitems_vvvvvzs = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvzs = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzs = jQuery("#jform_gettype").val();
-	vvvvvzs(add_php_before_getitems_vvvvvzs,gettype_vvvvvzs);
+	vvvvvzs(add_php_getlistquery_vvvvvzs,gettype_vvvvvzs);
 
 });
 
 // #jform_gettype listeners for gettype_vvvvvzs function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var add_php_before_getitems_vvvvvzs = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvzs = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzs = jQuery("#jform_gettype").val();
-	vvvvvzs(add_php_before_getitems_vvvvvzs,gettype_vvvvvzs);
+	vvvvvzs(add_php_getlistquery_vvvvvzs,gettype_vvvvvzs);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var add_php_before_getitems_vvvvvzs = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvzs = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzs = jQuery("#jform_gettype").val();
-	vvvvvzs(add_php_before_getitems_vvvvvzs,gettype_vvvvvzs);
+	vvvvvzs(add_php_getlistquery_vvvvvzs,gettype_vvvvvzs);
 
 });
 
-// #jform_add_php_after_getitems listeners for add_php_after_getitems_vvvvvzt function
+// #jform_add_php_before_getitems listeners for add_php_before_getitems_vvvvvzt function
-jQuery('#jform_add_php_after_getitems').on('keyup',function()
+jQuery('#jform_add_php_before_getitems').on('keyup',function()
 {
-	var add_php_after_getitems_vvvvvzt = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_before_getitems_vvvvvzt = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
 	var gettype_vvvvvzt = jQuery("#jform_gettype").val();
-	vvvvvzt(add_php_after_getitems_vvvvvzt,gettype_vvvvvzt);
+	vvvvvzt(add_php_before_getitems_vvvvvzt,gettype_vvvvvzt);
 
 });
-jQuery('#adminForm').on('change', '#jform_add_php_after_getitems',function (e)
+jQuery('#adminForm').on('change', '#jform_add_php_before_getitems',function (e)
 {
 	e.preventDefault();
-	var add_php_after_getitems_vvvvvzt = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_before_getitems_vvvvvzt = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
 	var gettype_vvvvvzt = jQuery("#jform_gettype").val();
-	vvvvvzt(add_php_after_getitems_vvvvvzt,gettype_vvvvvzt);
+	vvvvvzt(add_php_before_getitems_vvvvvzt,gettype_vvvvvzt);
 
 });
 
 // #jform_gettype listeners for gettype_vvvvvzt function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var add_php_after_getitems_vvvvvzt = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_before_getitems_vvvvvzt = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
 	var gettype_vvvvvzt = jQuery("#jform_gettype").val();
-	vvvvvzt(add_php_after_getitems_vvvvvzt,gettype_vvvvvzt);
+	vvvvvzt(add_php_before_getitems_vvvvvzt,gettype_vvvvvzt);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var add_php_after_getitems_vvvvvzt = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_before_getitems_vvvvvzt = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
 	var gettype_vvvvvzt = jQuery("#jform_gettype").val();
-	vvvvvzt(add_php_after_getitems_vvvvvzt,gettype_vvvvvzt);
+	vvvvvzt(add_php_before_getitems_vvvvvzt,gettype_vvvvvzt);
 
 });
 
-// #jform_gettype listeners for gettype_vvvvvzv function
+// #jform_add_php_after_getitems listeners for add_php_after_getitems_vvvvvzu function
+jQuery('#jform_add_php_after_getitems').on('keyup',function()
+{
+	var add_php_after_getitems_vvvvvzu = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var gettype_vvvvvzu = jQuery("#jform_gettype").val();
+	vvvvvzu(add_php_after_getitems_vvvvvzu,gettype_vvvvvzu);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_php_after_getitems',function (e)
+{
+	e.preventDefault();
+	var add_php_after_getitems_vvvvvzu = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var gettype_vvvvvzu = jQuery("#jform_gettype").val();
+	vvvvvzu(add_php_after_getitems_vvvvvzu,gettype_vvvvvzu);
+
+});
+
+// #jform_gettype listeners for gettype_vvvvvzu function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var gettype_vvvvvzv = jQuery("#jform_gettype").val();
+	var add_php_after_getitems_vvvvvzu = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
-	vvvvvzv(gettype_vvvvvzv);
+	var gettype_vvvvvzu = jQuery("#jform_gettype").val();
+	vvvvvzu(add_php_after_getitems_vvvvvzu,gettype_vvvvvzu);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var gettype_vvvvvzv = jQuery("#jform_gettype").val();
+	var add_php_after_getitems_vvvvvzu = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
-	vvvvvzv(gettype_vvvvvzv);
+	var gettype_vvvvvzu = jQuery("#jform_gettype").val();
+	vvvvvzu(add_php_after_getitems_vvvvvzu,gettype_vvvvvzu);
 
 });
 
@@ -575,33 +560,48 @@ jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 jQuery('#jform_gettype').on('keyup',function()
 {
 	var gettype_vvvvvzy = jQuery("#jform_gettype").val();
-	var add_php_router_parse_vvvvvzy = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	vvvvvzy(gettype_vvvvvzy);
-	vvvvvzy(gettype_vvvvvzy,add_php_router_parse_vvvvvzy);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
 	var gettype_vvvvvzy = jQuery("#jform_gettype").val();
-	var add_php_router_parse_vvvvvzy = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	vvvvvzy(gettype_vvvvvzy);
-	vvvvvzy(gettype_vvvvvzy,add_php_router_parse_vvvvvzy);
 
 });
 
-// #jform_add_php_router_parse listeners for add_php_router_parse_vvvvvzy function
+// #jform_gettype listeners for gettype_vvvvvzz function
+jQuery('#jform_gettype').on('keyup',function()
+{
+	var gettype_vvvvvzz = jQuery("#jform_gettype").val();
+	var add_php_router_parse_vvvvvzz = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	vvvvvzz(gettype_vvvvvzz,add_php_router_parse_vvvvvzz);
+
+});
+jQuery('#adminForm').on('change', '#jform_gettype',function (e)
+{
+	e.preventDefault();
+	var gettype_vvvvvzz = jQuery("#jform_gettype").val();
+	var add_php_router_parse_vvvvvzz = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	vvvvvzz(gettype_vvvvvzz,add_php_router_parse_vvvvvzz);
+
+});
+
+// #jform_add_php_router_parse listeners for add_php_router_parse_vvvvvzz function
 jQuery('#jform_add_php_router_parse').on('keyup',function()
 {
-	var gettype_vvvvvzy = jQuery("#jform_gettype").val();
+	var gettype_vvvvvzz = jQuery("#jform_gettype").val();
-	var add_php_router_parse_vvvvvzy = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	var add_php_router_parse_vvvvvzz = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
-	vvvvvzy(gettype_vvvvvzy,add_php_router_parse_vvvvvzy);
+	vvvvvzz(gettype_vvvvvzz,add_php_router_parse_vvvvvzz);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_router_parse',function (e)
 {
 	e.preventDefault();
-	var gettype_vvvvvzy = jQuery("#jform_gettype").val();
+	var gettype_vvvvvzz = jQuery("#jform_gettype").val();
-	var add_php_router_parse_vvvvvzy = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	var add_php_router_parse_vvvvvzz = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
-	vvvvvzy(gettype_vvvvvzy,add_php_router_parse_vvvvvzy);
+	vvvvvzz(gettype_vvvvvzz,add_php_router_parse_vvvvvzz);
 
 });
 

admin/views/field/tmpl/edit.php

@@ -144,48 +144,33 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 
 <script type="text/javascript">
 
-// #jform_datalenght listeners for datalenght_vvvvwam function
+// #jform_datalenght listeners for datalenght_vvvvwan function
 jQuery('#jform_datalenght').on('keyup',function()
 {
-	var datalenght_vvvvwam = jQuery("#jform_datalenght").val();
+	var datalenght_vvvvwan = jQuery("#jform_datalenght").val();
-	vvvvwam(datalenght_vvvvwam);
+	vvvvwan(datalenght_vvvvwan);
 
 });
 jQuery('#adminForm').on('change', '#jform_datalenght',function (e)
 {
 	e.preventDefault();
-	var datalenght_vvvvwam = jQuery("#jform_datalenght").val();
+	var datalenght_vvvvwan = jQuery("#jform_datalenght").val();
-	vvvvwam(datalenght_vvvvwam);
+	vvvvwan(datalenght_vvvvwan);
 
 });
 
-// #jform_datadefault listeners for datadefault_vvvvwan function
+// #jform_datadefault listeners for datadefault_vvvvwao function
 jQuery('#jform_datadefault').on('keyup',function()
 {
-	var datadefault_vvvvwan = jQuery("#jform_datadefault").val();
+	var datadefault_vvvvwao = jQuery("#jform_datadefault").val();
-	vvvvwan(datadefault_vvvvwan);
+	vvvvwao(datadefault_vvvvwao);
 
 });
 jQuery('#adminForm').on('change', '#jform_datadefault',function (e)
 {
 	e.preventDefault();
-	var datadefault_vvvvwan = jQuery("#jform_datadefault").val();
+	var datadefault_vvvvwao = jQuery("#jform_datadefault").val();
-	vvvvwan(datadefault_vvvvwan);
+	vvvvwao(datadefault_vvvvwao);
-
-});
-
-// #jform_datatype listeners for datatype_vvvvwao function
-jQuery('#jform_datatype').on('keyup',function()
-{
-	var datatype_vvvvwao = jQuery("#jform_datatype").val();
-	vvvvwao(datatype_vvvvwao);
-
-});
-jQuery('#adminForm').on('change', '#jform_datatype',function (e)
-{
-	e.preventDefault();
-	var datatype_vvvvwao = jQuery("#jform_datatype").val();
-	vvvvwao(datatype_vvvvwao);
 
 });
 
@@ -204,97 +189,112 @@ jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 
 });
 
-// #jform_store listeners for store_vvvvwaq function
-jQuery('#jform_store').on('keyup',function()
-{
-	var store_vvvvwaq = jQuery("#jform_store").val();
-	var datatype_vvvvwaq = jQuery("#jform_datatype").val();
-	vvvvwaq(store_vvvvwaq,datatype_vvvvwaq);
-
-});
-jQuery('#adminForm').on('change', '#jform_store',function (e)
-{
-	e.preventDefault();
-	var store_vvvvwaq = jQuery("#jform_store").val();
-	var datatype_vvvvwaq = jQuery("#jform_datatype").val();
-	vvvvwaq(store_vvvvwaq,datatype_vvvvwaq);
-
-});
-
 // #jform_datatype listeners for datatype_vvvvwaq function
 jQuery('#jform_datatype').on('keyup',function()
 {
-	var store_vvvvwaq = jQuery("#jform_store").val();
 	var datatype_vvvvwaq = jQuery("#jform_datatype").val();
-	vvvvwaq(store_vvvvwaq,datatype_vvvvwaq);
+	vvvvwaq(datatype_vvvvwaq);
 
 });
 jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 {
 	e.preventDefault();
-	var store_vvvvwaq = jQuery("#jform_store").val();
 	var datatype_vvvvwaq = jQuery("#jform_datatype").val();
-	vvvvwaq(store_vvvvwaq,datatype_vvvvwaq);
+	vvvvwaq(datatype_vvvvwaq);
 
 });
 
-// #jform_add_css_view listeners for add_css_view_vvvvwas function
+// #jform_store listeners for store_vvvvwar function
+jQuery('#jform_store').on('keyup',function()
+{
+	var store_vvvvwar = jQuery("#jform_store").val();
+	var datatype_vvvvwar = jQuery("#jform_datatype").val();
+	vvvvwar(store_vvvvwar,datatype_vvvvwar);
+
+});
+jQuery('#adminForm').on('change', '#jform_store',function (e)
+{
+	e.preventDefault();
+	var store_vvvvwar = jQuery("#jform_store").val();
+	var datatype_vvvvwar = jQuery("#jform_datatype").val();
+	vvvvwar(store_vvvvwar,datatype_vvvvwar);
+
+});
+
+// #jform_datatype listeners for datatype_vvvvwar function
+jQuery('#jform_datatype').on('keyup',function()
+{
+	var store_vvvvwar = jQuery("#jform_store").val();
+	var datatype_vvvvwar = jQuery("#jform_datatype").val();
+	vvvvwar(store_vvvvwar,datatype_vvvvwar);
+
+});
+jQuery('#adminForm').on('change', '#jform_datatype',function (e)
+{
+	e.preventDefault();
+	var store_vvvvwar = jQuery("#jform_store").val();
+	var datatype_vvvvwar = jQuery("#jform_datatype").val();
+	vvvvwar(store_vvvvwar,datatype_vvvvwar);
+
+});
+
+// #jform_add_css_view listeners for add_css_view_vvvvwat function
 jQuery('#jform_add_css_view').on('keyup',function()
 {
-	var add_css_view_vvvvwas = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	var add_css_view_vvvvwat = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvwas(add_css_view_vvvvwas);
+	vvvvwat(add_css_view_vvvvwat);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css_view',function (e)
 {
 	e.preventDefault();
-	var add_css_view_vvvvwas = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	var add_css_view_vvvvwat = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvwas(add_css_view_vvvvwas);
+	vvvvwat(add_css_view_vvvvwat);
 
 });
 
-// #jform_add_css_views listeners for add_css_views_vvvvwat function
+// #jform_add_css_views listeners for add_css_views_vvvvwau function
 jQuery('#jform_add_css_views').on('keyup',function()
 {
-	var add_css_views_vvvvwat = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	var add_css_views_vvvvwau = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvwat(add_css_views_vvvvwat);
+	vvvvwau(add_css_views_vvvvwau);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css_views',function (e)
 {
 	e.preventDefault();
-	var add_css_views_vvvvwat = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	var add_css_views_vvvvwau = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvwat(add_css_views_vvvvwat);
+	vvvvwau(add_css_views_vvvvwau);
 
 });
 
-// #jform_add_javascript_view_footer listeners for add_javascript_view_footer_vvvvwau function
+// #jform_add_javascript_view_footer listeners for add_javascript_view_footer_vvvvwav function
 jQuery('#jform_add_javascript_view_footer').on('keyup',function()
 {
-	var add_javascript_view_footer_vvvvwau = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	var add_javascript_view_footer_vvvvwav = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvwau(add_javascript_view_footer_vvvvwau);
+	vvvvwav(add_javascript_view_footer_vvvvwav);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_view_footer',function (e)
 {
 	e.preventDefault();
-	var add_javascript_view_footer_vvvvwau = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	var add_javascript_view_footer_vvvvwav = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvwau(add_javascript_view_footer_vvvvwau);
+	vvvvwav(add_javascript_view_footer_vvvvwav);
 
 });
 
-// #jform_add_javascript_views_footer listeners for add_javascript_views_footer_vvvvwav function
+// #jform_add_javascript_views_footer listeners for add_javascript_views_footer_vvvvwaw function
 jQuery('#jform_add_javascript_views_footer').on('keyup',function()
 {
-	var add_javascript_views_footer_vvvvwav = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	var add_javascript_views_footer_vvvvwaw = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
-	vvvvwav(add_javascript_views_footer_vvvvwav);
+	vvvvwaw(add_javascript_views_footer_vvvvwaw);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_views_footer',function (e)
 {
 	e.preventDefault();
-	var add_javascript_views_footer_vvvvwav = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	var add_javascript_views_footer_vvvvwaw = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
-	vvvvwav(add_javascript_views_footer_vvvvwav);
+	vvvvwaw(add_javascript_views_footer_vvvvwaw);
 
 });
 

admin/views/fieldtype/view.html.php

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

admin/views/help_document/tmpl/edit.php

@@ -113,21 +113,6 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 
 <script type="text/javascript">
 
-// #jform_location listeners for location_vvvvwbg function
-jQuery('#jform_location').on('keyup',function()
-{
-	var location_vvvvwbg = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwbg(location_vvvvwbg);
-
-});
-jQuery('#adminForm').on('change', '#jform_location',function (e)
-{
-	e.preventDefault();
-	var location_vvvvwbg = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwbg(location_vvvvwbg);
-
-});
-
 // #jform_location listeners for location_vvvvwbh function
 jQuery('#jform_location').on('keyup',function()
 {
@@ -143,18 +128,18 @@ jQuery('#adminForm').on('change', '#jform_location',function (e)
 
 });
 
-// #jform_type listeners for type_vvvvwbi function
+// #jform_location listeners for location_vvvvwbi function
-jQuery('#jform_type').on('keyup',function()
+jQuery('#jform_location').on('keyup',function()
 {
-	var type_vvvvwbi = jQuery("#jform_type").val();
+	var location_vvvvwbi = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwbi(type_vvvvwbi);
+	vvvvwbi(location_vvvvwbi);
 
 });
-jQuery('#adminForm').on('change', '#jform_type',function (e)
+jQuery('#adminForm').on('change', '#jform_location',function (e)
 {
 	e.preventDefault();
-	var type_vvvvwbi = jQuery("#jform_type").val();
+	var location_vvvvwbi = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwbi(type_vvvvwbi);
+	vvvvwbi(location_vvvvwbi);
 
 });
 
@@ -188,18 +173,33 @@ jQuery('#adminForm').on('change', '#jform_type',function (e)
 
 });
 
-// #jform_target listeners for target_vvvvwbl function
+// #jform_type listeners for type_vvvvwbl function
+jQuery('#jform_type').on('keyup',function()
+{
+	var type_vvvvwbl = jQuery("#jform_type").val();
+	vvvvwbl(type_vvvvwbl);
+
+});
+jQuery('#adminForm').on('change', '#jform_type',function (e)
+{
+	e.preventDefault();
+	var type_vvvvwbl = jQuery("#jform_type").val();
+	vvvvwbl(type_vvvvwbl);
+
+});
+
+// #jform_target listeners for target_vvvvwbm function
 jQuery('#jform_target').on('keyup',function()
 {
-	var target_vvvvwbl = jQuery("#jform_target input[type='radio']:checked").val();
+	var target_vvvvwbm = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwbl(target_vvvvwbl);
+	vvvvwbm(target_vvvvwbm);
 
 });
 jQuery('#adminForm').on('change', '#jform_target',function (e)
 {
 	e.preventDefault();
-	var target_vvvvwbl = jQuery("#jform_target input[type='radio']:checked").val();
+	var target_vvvvwbm = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwbl(target_vvvvwbl);
+	vvvvwbm(target_vvvvwbm);
 
 });
 

admin/views/layout/tmpl/edit.php

@@ -125,18 +125,18 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 
 <script type="text/javascript">
 
-// #jform_add_php_view listeners for add_php_view_vvvvvza function
+// #jform_add_php_view listeners for add_php_view_vvvvvzb function
 jQuery('#jform_add_php_view').on('keyup',function()
 {
-	var add_php_view_vvvvvza = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvzb = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvza(add_php_view_vvvvvza);
+	vvvvvzb(add_php_view_vvvvvzb);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_view',function (e)
 {
 	e.preventDefault();
-	var add_php_view_vvvvvza = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvzb = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvza(add_php_view_vvvvvza);
+	vvvvvzb(add_php_view_vvvvvzb);
 
 });
 

admin/views/library/tmpl/edit.php

@@ -143,21 +143,6 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 
 <script type="text/javascript">
 
-// #jform_how listeners for how_vvvvwae function
-jQuery('#jform_how').on('keyup',function()
-{
-	var how_vvvvwae = jQuery("#jform_how").val();
-	vvvvwae(how_vvvvwae);
-
-});
-jQuery('#adminForm').on('change', '#jform_how',function (e)
-{
-	e.preventDefault();
-	var how_vvvvwae = jQuery("#jform_how").val();
-	vvvvwae(how_vvvvwae);
-
-});
-
 // #jform_how listeners for how_vvvvwaf function
 jQuery('#jform_how').on('keyup',function()
 {
@@ -248,18 +233,33 @@ jQuery('#adminForm').on('change', '#jform_how',function (e)
 
 });
 
-// #jform_type listeners for type_vvvvwal function
+// #jform_how listeners for how_vvvvwal function
+jQuery('#jform_how').on('keyup',function()
+{
+	var how_vvvvwal = jQuery("#jform_how").val();
+	vvvvwal(how_vvvvwal);
+
+});
+jQuery('#adminForm').on('change', '#jform_how',function (e)
+{
+	e.preventDefault();
+	var how_vvvvwal = jQuery("#jform_how").val();
+	vvvvwal(how_vvvvwal);
+
+});
+
+// #jform_type listeners for type_vvvvwam function
 jQuery('#jform_type').on('keyup',function()
 {
-	var type_vvvvwal = jQuery("#jform_type input[type='radio']:checked").val();
+	var type_vvvvwam = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwal(type_vvvvwal);
+	vvvvwam(type_vvvvwam);
 
 });
 jQuery('#adminForm').on('change', '#jform_type',function (e)
 {
 	e.preventDefault();
-	var type_vvvvwal = jQuery("#jform_type input[type='radio']:checked").val();
+	var type_vvvvwam = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwal(type_vvvvwal);
+	vvvvwam(type_vvvvwam);
 
 });
 

admin/views/server/tmpl/edit.php

@@ -122,21 +122,6 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 
 <script type="text/javascript">
 
-// #jform_protocol listeners for protocol_vvvvwaw function
-jQuery('#jform_protocol').on('keyup',function()
-{
-	var protocol_vvvvwaw = jQuery("#jform_protocol").val();
-	vvvvwaw(protocol_vvvvwaw);
-
-});
-jQuery('#adminForm').on('change', '#jform_protocol',function (e)
-{
-	e.preventDefault();
-	var protocol_vvvvwaw = jQuery("#jform_protocol").val();
-	vvvvwaw(protocol_vvvvwaw);
-
-});
-
 // #jform_protocol listeners for protocol_vvvvwax function
 jQuery('#jform_protocol').on('keyup',function()
 {
@@ -156,135 +141,150 @@ jQuery('#adminForm').on('change', '#jform_protocol',function (e)
 jQuery('#jform_protocol').on('keyup',function()
 {
 	var protocol_vvvvway = jQuery("#jform_protocol").val();
-	var authentication_vvvvway = jQuery("#jform_authentication").val();
+	vvvvway(protocol_vvvvway);
-	vvvvway(protocol_vvvvway,authentication_vvvvway);
 
 });
 jQuery('#adminForm').on('change', '#jform_protocol',function (e)
 {
 	e.preventDefault();
 	var protocol_vvvvway = jQuery("#jform_protocol").val();
-	var authentication_vvvvway = jQuery("#jform_authentication").val();
+	vvvvway(protocol_vvvvway);
-	vvvvway(protocol_vvvvway,authentication_vvvvway);
 
 });
 
-// #jform_authentication listeners for authentication_vvvvway function
+// #jform_protocol listeners for protocol_vvvvwaz function
-jQuery('#jform_authentication').on('keyup',function()
-{
-	var protocol_vvvvway = jQuery("#jform_protocol").val();
-	var authentication_vvvvway = jQuery("#jform_authentication").val();
-	vvvvway(protocol_vvvvway,authentication_vvvvway);
-
-});
-jQuery('#adminForm').on('change', '#jform_authentication',function (e)
-{
-	e.preventDefault();
-	var protocol_vvvvway = jQuery("#jform_protocol").val();
-	var authentication_vvvvway = jQuery("#jform_authentication").val();
-	vvvvway(protocol_vvvvway,authentication_vvvvway);
-
-});
-
-// #jform_protocol listeners for protocol_vvvvwba function
 jQuery('#jform_protocol').on('keyup',function()
 {
-	var protocol_vvvvwba = jQuery("#jform_protocol").val();
+	var protocol_vvvvwaz = jQuery("#jform_protocol").val();
-	var authentication_vvvvwba = jQuery("#jform_authentication").val();
+	var authentication_vvvvwaz = jQuery("#jform_authentication").val();
-	vvvvwba(protocol_vvvvwba,authentication_vvvvwba);
+	vvvvwaz(protocol_vvvvwaz,authentication_vvvvwaz);
 
 });
 jQuery('#adminForm').on('change', '#jform_protocol',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwba = jQuery("#jform_protocol").val();
+	var protocol_vvvvwaz = jQuery("#jform_protocol").val();
-	var authentication_vvvvwba = jQuery("#jform_authentication").val();
+	var authentication_vvvvwaz = jQuery("#jform_authentication").val();
-	vvvvwba(protocol_vvvvwba,authentication_vvvvwba);
+	vvvvwaz(protocol_vvvvwaz,authentication_vvvvwaz);
 
 });
 
-// #jform_authentication listeners for authentication_vvvvwba function
+// #jform_authentication listeners for authentication_vvvvwaz function
 jQuery('#jform_authentication').on('keyup',function()
 {
-	var protocol_vvvvwba = jQuery("#jform_protocol").val();
+	var protocol_vvvvwaz = jQuery("#jform_protocol").val();
-	var authentication_vvvvwba = jQuery("#jform_authentication").val();
+	var authentication_vvvvwaz = jQuery("#jform_authentication").val();
-	vvvvwba(protocol_vvvvwba,authentication_vvvvwba);
+	vvvvwaz(protocol_vvvvwaz,authentication_vvvvwaz);
 
 });
 jQuery('#adminForm').on('change', '#jform_authentication',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwba = jQuery("#jform_protocol").val();
+	var protocol_vvvvwaz = jQuery("#jform_protocol").val();
-	var authentication_vvvvwba = jQuery("#jform_authentication").val();
+	var authentication_vvvvwaz = jQuery("#jform_authentication").val();
-	vvvvwba(protocol_vvvvwba,authentication_vvvvwba);
+	vvvvwaz(protocol_vvvvwaz,authentication_vvvvwaz);
 
 });
 
-// #jform_protocol listeners for protocol_vvvvwbc function
+// #jform_protocol listeners for protocol_vvvvwbb function
 jQuery('#jform_protocol').on('keyup',function()
 {
-	var protocol_vvvvwbc = jQuery("#jform_protocol").val();
+	var protocol_vvvvwbb = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbc = jQuery("#jform_authentication").val();
+	var authentication_vvvvwbb = jQuery("#jform_authentication").val();
-	vvvvwbc(protocol_vvvvwbc,authentication_vvvvwbc);
+	vvvvwbb(protocol_vvvvwbb,authentication_vvvvwbb);
 
 });
 jQuery('#adminForm').on('change', '#jform_protocol',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwbc = jQuery("#jform_protocol").val();
+	var protocol_vvvvwbb = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbc = jQuery("#jform_authentication").val();
+	var authentication_vvvvwbb = jQuery("#jform_authentication").val();
-	vvvvwbc(protocol_vvvvwbc,authentication_vvvvwbc);
+	vvvvwbb(protocol_vvvvwbb,authentication_vvvvwbb);
 
 });
 
-// #jform_authentication listeners for authentication_vvvvwbc function
+// #jform_authentication listeners for authentication_vvvvwbb function
 jQuery('#jform_authentication').on('keyup',function()
 {
-	var protocol_vvvvwbc = jQuery("#jform_protocol").val();
+	var protocol_vvvvwbb = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbc = jQuery("#jform_authentication").val();
+	var authentication_vvvvwbb = jQuery("#jform_authentication").val();
-	vvvvwbc(protocol_vvvvwbc,authentication_vvvvwbc);
+	vvvvwbb(protocol_vvvvwbb,authentication_vvvvwbb);
 
 });
 jQuery('#adminForm').on('change', '#jform_authentication',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwbc = jQuery("#jform_protocol").val();
+	var protocol_vvvvwbb = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbc = jQuery("#jform_authentication").val();
+	var authentication_vvvvwbb = jQuery("#jform_authentication").val();
-	vvvvwbc(protocol_vvvvwbc,authentication_vvvvwbc);
+	vvvvwbb(protocol_vvvvwbb,authentication_vvvvwbb);
 
 });
 
-// #jform_protocol listeners for protocol_vvvvwbe function
+// #jform_protocol listeners for protocol_vvvvwbd function
 jQuery('#jform_protocol').on('keyup',function()
 {
-	var protocol_vvvvwbe = jQuery("#jform_protocol").val();
+	var protocol_vvvvwbd = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbe = jQuery("#jform_authentication").val();
+	var authentication_vvvvwbd = jQuery("#jform_authentication").val();
-	vvvvwbe(protocol_vvvvwbe,authentication_vvvvwbe);
+	vvvvwbd(protocol_vvvvwbd,authentication_vvvvwbd);
 
 });
 jQuery('#adminForm').on('change', '#jform_protocol',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwbe = jQuery("#jform_protocol").val();
+	var protocol_vvvvwbd = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbe = jQuery("#jform_authentication").val();
+	var authentication_vvvvwbd = jQuery("#jform_authentication").val();
-	vvvvwbe(protocol_vvvvwbe,authentication_vvvvwbe);
+	vvvvwbd(protocol_vvvvwbd,authentication_vvvvwbd);
 
 });
 
-// #jform_authentication listeners for authentication_vvvvwbe function
+// #jform_authentication listeners for authentication_vvvvwbd function
 jQuery('#jform_authentication').on('keyup',function()
 {
-	var protocol_vvvvwbe = jQuery("#jform_protocol").val();
+	var protocol_vvvvwbd = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbe = jQuery("#jform_authentication").val();
+	var authentication_vvvvwbd = jQuery("#jform_authentication").val();
-	vvvvwbe(protocol_vvvvwbe,authentication_vvvvwbe);
+	vvvvwbd(protocol_vvvvwbd,authentication_vvvvwbd);
 
 });
 jQuery('#adminForm').on('change', '#jform_authentication',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwbe = jQuery("#jform_protocol").val();
+	var protocol_vvvvwbd = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbe = jQuery("#jform_authentication").val();
+	var authentication_vvvvwbd = jQuery("#jform_authentication").val();
-	vvvvwbe(protocol_vvvvwbe,authentication_vvvvwbe);
+	vvvvwbd(protocol_vvvvwbd,authentication_vvvvwbd);
+
+});
+
+// #jform_protocol listeners for protocol_vvvvwbf function
+jQuery('#jform_protocol').on('keyup',function()
+{
+	var protocol_vvvvwbf = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbf = jQuery("#jform_authentication").val();
+	vvvvwbf(protocol_vvvvwbf,authentication_vvvvwbf);
+
+});
+jQuery('#adminForm').on('change', '#jform_protocol',function (e)
+{
+	e.preventDefault();
+	var protocol_vvvvwbf = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbf = jQuery("#jform_authentication").val();
+	vvvvwbf(protocol_vvvvwbf,authentication_vvvvwbf);
+
+});
+
+// #jform_authentication listeners for authentication_vvvvwbf function
+jQuery('#jform_authentication').on('keyup',function()
+{
+	var protocol_vvvvwbf = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbf = jQuery("#jform_authentication").val();
+	vvvvwbf(protocol_vvvvwbf,authentication_vvvvwbf);
+
+});
+jQuery('#adminForm').on('change', '#jform_authentication',function (e)
+{
+	e.preventDefault();
+	var protocol_vvvvwbf = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbf = jQuery("#jform_authentication").val();
+	vvvvwbf(protocol_vvvvwbf,authentication_vvvvwbf);
 
 });
 

admin/views/server/view.html.php

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

admin/views/site_view/tmpl/edit.php

@@ -162,168 +162,168 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 
 <script type="text/javascript">
 
-// #jform_add_php_view listeners for add_php_view_vvvvvyo function
+// #jform_add_php_view listeners for add_php_view_vvvvvyp function
 jQuery('#jform_add_php_view').on('keyup',function()
 {
-	var add_php_view_vvvvvyo = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvyp = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyo(add_php_view_vvvvvyo);
+	vvvvvyp(add_php_view_vvvvvyp);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_view',function (e)
 {
 	e.preventDefault();
-	var add_php_view_vvvvvyo = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvyp = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyo(add_php_view_vvvvvyo);
+	vvvvvyp(add_php_view_vvvvvyp);
 
 });
 
-// #jform_add_php_jview_display listeners for add_php_jview_display_vvvvvyp function
+// #jform_add_php_jview_display listeners for add_php_jview_display_vvvvvyq function
 jQuery('#jform_add_php_jview_display').on('keyup',function()
 {
-	var add_php_jview_display_vvvvvyp = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	var add_php_jview_display_vvvvvyq = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvyp(add_php_jview_display_vvvvvyp);
+	vvvvvyq(add_php_jview_display_vvvvvyq);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_jview_display',function (e)
 {
 	e.preventDefault();
-	var add_php_jview_display_vvvvvyp = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	var add_php_jview_display_vvvvvyq = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvyp(add_php_jview_display_vvvvvyp);
+	vvvvvyq(add_php_jview_display_vvvvvyq);
 
 });
 
-// #jform_add_php_jview listeners for add_php_jview_vvvvvyq function
+// #jform_add_php_jview listeners for add_php_jview_vvvvvyr function
 jQuery('#jform_add_php_jview').on('keyup',function()
 {
-	var add_php_jview_vvvvvyq = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	var add_php_jview_vvvvvyr = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyq(add_php_jview_vvvvvyq);
+	vvvvvyr(add_php_jview_vvvvvyr);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_jview',function (e)
 {
 	e.preventDefault();
-	var add_php_jview_vvvvvyq = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	var add_php_jview_vvvvvyr = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyq(add_php_jview_vvvvvyq);
+	vvvvvyr(add_php_jview_vvvvvyr);
 
 });
 
-// #jform_add_php_document listeners for add_php_document_vvvvvyr function
+// #jform_add_php_document listeners for add_php_document_vvvvvys function
 jQuery('#jform_add_php_document').on('keyup',function()
 {
-	var add_php_document_vvvvvyr = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	var add_php_document_vvvvvys = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyr(add_php_document_vvvvvyr);
+	vvvvvys(add_php_document_vvvvvys);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_document',function (e)
 {
 	e.preventDefault();
-	var add_php_document_vvvvvyr = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	var add_php_document_vvvvvys = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyr(add_php_document_vvvvvyr);
+	vvvvvys(add_php_document_vvvvvys);
 
 });
 
-// #jform_add_css_document listeners for add_css_document_vvvvvys function
+// #jform_add_css_document listeners for add_css_document_vvvvvyt function
 jQuery('#jform_add_css_document').on('keyup',function()
 {
-	var add_css_document_vvvvvys = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	var add_css_document_vvvvvyt = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvys(add_css_document_vvvvvys);
+	vvvvvyt(add_css_document_vvvvvyt);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css_document',function (e)
 {
 	e.preventDefault();
-	var add_css_document_vvvvvys = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	var add_css_document_vvvvvyt = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvys(add_css_document_vvvvvys);
+	vvvvvyt(add_css_document_vvvvvyt);
 
 });
 
-// #jform_add_javascript_file listeners for add_javascript_file_vvvvvyt function
+// #jform_add_javascript_file listeners for add_javascript_file_vvvvvyu function
 jQuery('#jform_add_javascript_file').on('keyup',function()
 {
-	var add_javascript_file_vvvvvyt = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	var add_javascript_file_vvvvvyu = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvyt(add_javascript_file_vvvvvyt);
+	vvvvvyu(add_javascript_file_vvvvvyu);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_file',function (e)
 {
 	e.preventDefault();
-	var add_javascript_file_vvvvvyt = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	var add_javascript_file_vvvvvyu = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvyt(add_javascript_file_vvvvvyt);
+	vvvvvyu(add_javascript_file_vvvvvyu);
 
 });
 
-// #jform_add_js_document listeners for add_js_document_vvvvvyu function
+// #jform_add_js_document listeners for add_js_document_vvvvvyv function
 jQuery('#jform_add_js_document').on('keyup',function()
 {
-	var add_js_document_vvvvvyu = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	var add_js_document_vvvvvyv = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyu(add_js_document_vvvvvyu);
+	vvvvvyv(add_js_document_vvvvvyv);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_js_document',function (e)
 {
 	e.preventDefault();
-	var add_js_document_vvvvvyu = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	var add_js_document_vvvvvyv = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyu(add_js_document_vvvvvyu);
+	vvvvvyv(add_js_document_vvvvvyv);
 
 });
 
-// #jform_add_css listeners for add_css_vvvvvyv function
+// #jform_add_css listeners for add_css_vvvvvyw function
 jQuery('#jform_add_css').on('keyup',function()
 {
-	var add_css_vvvvvyv = jQuery("#jform_add_css input[type='radio']:checked").val();
+	var add_css_vvvvvyw = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyv(add_css_vvvvvyv);
+	vvvvvyw(add_css_vvvvvyw);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css',function (e)
 {
 	e.preventDefault();
-	var add_css_vvvvvyv = jQuery("#jform_add_css input[type='radio']:checked").val();
+	var add_css_vvvvvyw = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyv(add_css_vvvvvyv);
+	vvvvvyw(add_css_vvvvvyw);
 
 });
 
-// #jform_add_php_ajax listeners for add_php_ajax_vvvvvyw function
+// #jform_add_php_ajax listeners for add_php_ajax_vvvvvyx function
 jQuery('#jform_add_php_ajax').on('keyup',function()
 {
-	var add_php_ajax_vvvvvyw = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	var add_php_ajax_vvvvvyx = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvyw(add_php_ajax_vvvvvyw);
+	vvvvvyx(add_php_ajax_vvvvvyx);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_ajax',function (e)
 {
 	e.preventDefault();
-	var add_php_ajax_vvvvvyw = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	var add_php_ajax_vvvvvyx = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvyw(add_php_ajax_vvvvvyw);
+	vvvvvyx(add_php_ajax_vvvvvyx);
 
 });
 
-// #jform_add_custom_button listeners for add_custom_button_vvvvvyx function
+// #jform_add_custom_button listeners for add_custom_button_vvvvvyy function
 jQuery('#jform_add_custom_button').on('keyup',function()
 {
-	var add_custom_button_vvvvvyx = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	var add_custom_button_vvvvvyy = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyx(add_custom_button_vvvvvyx);
+	vvvvvyy(add_custom_button_vvvvvyy);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_custom_button',function (e)
 {
 	e.preventDefault();
-	var add_custom_button_vvvvvyx = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	var add_custom_button_vvvvvyy = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyx(add_custom_button_vvvvvyx);
+	vvvvvyy(add_custom_button_vvvvvyy);
 
 });
 
-// #jform_button_position listeners for button_position_vvvvvyy function
+// #jform_button_position listeners for button_position_vvvvvyz function
 jQuery('#jform_button_position').on('keyup',function()
 {
-	var button_position_vvvvvyy = jQuery("#jform_button_position").val();
+	var button_position_vvvvvyz = jQuery("#jform_button_position").val();
-	vvvvvyy(button_position_vvvvvyy);
+	vvvvvyz(button_position_vvvvvyz);
 
 });
 jQuery('#adminForm').on('change', '#jform_button_position',function (e)
 {
 	e.preventDefault();
-	var button_position_vvvvvyy = jQuery("#jform_button_position").val();
+	var button_position_vvvvvyz = jQuery("#jform_button_position").val();
-	vvvvvyy(button_position_vvvvvyy);
+	vvvvvyz(button_position_vvvvvyz);
 
 });
 

admin/views/template/tmpl/edit.php

@@ -125,18 +125,18 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 
 <script type="text/javascript">
 
-// #jform_add_php_view listeners for add_php_view_vvvvvyz function
+// #jform_add_php_view listeners for add_php_view_vvvvvza function
 jQuery('#jform_add_php_view').on('keyup',function()
 {
-	var add_php_view_vvvvvyz = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvza = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyz(add_php_view_vvvvvyz);
+	vvvvvza(add_php_view_vvvvvza);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_view',function (e)
 {
 	e.preventDefault();
-	var add_php_view_vvvvvyz = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvza = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyz(add_php_view_vvvvvyz);
+	vvvvvza(add_php_view_vvvvvza);
 
 });
 

componentbuilder.xml

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

componentbuilder_update_server.xml

@@ -398,7 +398,24 @@
 		<version>2.8.1</version>
 		<infourl title="Component Builder!">http://www.joomlacomponentbuilder.com</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.8.1/JCB_v2.8.1.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.8.2/JCB_v2.8.2.zip</downloadurl>
+		</downloads>
+		<tags>
+			<tag>stable</tag>
+		</tags>
+		<maintainer>Llewellyn van der Merwe</maintainer>
+		<maintainerurl>http://www.joomlacomponentbuilder.com</maintainerurl>
+		<targetplatform name="joomla" version="3.*"/>
+	</update>
+	<update>
+		<name>Component Builder</name>
+		<description>Builds Complex Joomla Components</description>
+		<element>com_componentbuilder</element>
+		<type>component</type>
+		<version>2.8.2</version>
+		<infourl title="Component Builder!">http://www.joomlacomponentbuilder.com</infourl>
+		<downloads>
+			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.8.2/JCB_v2.8.2.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>stable</tag>

script.php

@@ -3380,9 +3380,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": "php_getitem","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_batchmove":"add_php_batchmove","add_php_allowedit":"add_php_allowedit","add_php_save":"add_php_save","add_php_getlistquery":"add_php_getlistquery","icon_add":"icon_add","html_import_view":"html_import_view","add_sql":"add_sql","type":"type","add_fadein":"add_fadein","description":"description","icon_category":"icon_category","add_php_after_publish":"add_php_after_publish","not_required":"not_required","add_php_after_delete":"add_php_after_delete","php_import_save":"php_import_save","add_php_getitems_after_all":"add_php_getitems_after_all","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","alias_builder_type":"alias_builder_type","add_php_before_delete":"add_php_before_delete","add_php_document":"add_php_document","alias_builder":"alias_builder","add_custom_import":"add_custom_import","add_php_getitem":"add_php_getitem","php_import_headers":"php_import_headers","add_php_getitems":"add_php_getitems","icon":"icon","php_getitem":"php_getitem","php_getitems":"php_getitems","add_css_view":"add_css_view","php_getitems_after_all":"php_getitems_after_all","css_view":"css_view","php_getlistquery":"php_getlistquery","add_css_views":"add_css_views","php_before_save":"php_before_save","css_views":"css_views","php_save":"php_save","add_javascript_view_file":"add_javascript_view_file","php_postsavehook":"php_postsavehook","javascript_view_file":"javascript_view_file","php_allowedit":"php_allowedit","add_javascript_view_footer":"add_javascript_view_footer","php_batchcopy":"php_batchcopy","javascript_view_footer":"javascript_view_footer","php_batchmove":"php_batchmove","add_javascript_views_file":"add_javascript_views_file","php_before_publish":"php_before_publish","javascript_views_file":"javascript_views_file","php_after_publish":"php_after_publish","add_javascript_views_footer":"add_javascript_views_footer","php_before_delete":"php_before_delete","javascript_views_footer":"javascript_views_footer","php_after_delete":"php_after_delete","add_custom_button":"add_custom_button","php_document":"php_document","source":"source","php_controller":"php_controller","sql":"sql","php_model":"php_model","php_controller_list":"php_controller_list","php_import_display":"php_import_display","php_model_list":"php_model_list","php_import":"php_import","add_php_ajax":"add_php_ajax","php_import_setdata":"php_import_setdata","php_ajaxmethod":"php_ajaxmethod","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": "php_getitem","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_before_publish":"add_php_before_publish","add_php_batchcopy":"add_php_batchcopy","add_php_postsavehook":"add_php_postsavehook","add_php_before_save":"add_php_before_save","icon_add":"icon_add","php_import_headers":"php_import_headers","type":"type","add_fadein":"add_fadein","description":"description","icon_category":"icon_category","add_php_before_delete":"add_php_before_delete","not_required":"not_required","add_php_document":"add_php_document","add_php_getitems":"add_php_getitems","add_custom_import":"add_custom_import","add_php_getlistquery":"add_php_getlistquery","icon":"icon","add_php_getitems_after_all":"add_php_getitems_after_all","add_php_getform":"add_php_getform","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","alias_builder_type":"alias_builder_type","add_sql":"add_sql","html_import_view":"html_import_view","alias_builder":"alias_builder","php_import_save":"php_import_save","php_getitem":"php_getitem","php_getitems":"php_getitems","add_css_view":"add_css_view","php_getitems_after_all":"php_getitems_after_all","css_view":"css_view","php_getlistquery":"php_getlistquery","add_css_views":"add_css_views","php_getform":"php_getform","css_views":"css_views","php_before_save":"php_before_save","add_javascript_view_file":"add_javascript_view_file","php_save":"php_save","javascript_view_file":"javascript_view_file","php_postsavehook":"php_postsavehook","add_javascript_view_footer":"add_javascript_view_footer","php_allowedit":"php_allowedit","javascript_view_footer":"javascript_view_footer","php_batchcopy":"php_batchcopy","add_javascript_views_file":"add_javascript_views_file","php_batchmove":"php_batchmove","javascript_views_file":"javascript_views_file","php_before_publish":"php_before_publish","add_javascript_views_footer":"add_javascript_views_footer","php_after_publish":"php_after_publish","javascript_views_footer":"javascript_views_footer","php_before_delete":"php_before_delete","add_custom_button":"add_custom_button","php_after_delete":"php_after_delete","php_document":"php_document","php_controller":"php_controller","source":"source","php_model":"php_model","sql":"sql","php_controller_list":"php_controller_list","php_model_list":"php_model_list","php_import_display":"php_import_display","add_php_ajax":"add_php_ajax","php_import":"php_import","php_ajaxmethod":"php_ajaxmethod","php_import_setdata":"php_import_setdata","php_import_ext":"php_import_ext","add_php_getitem":"add_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_batchmove","add_php_allowedit","add_php_save","add_php_getlistquery","add_sql","type","add_fadein","add_php_after_publish","add_php_after_delete","add_php_getitems_after_all","add_php_before_save","add_php_postsavehook","add_php_batchcopy","add_php_before_publish","add_php_before_delete","add_php_document","add_custom_import","add_php_getitem","add_php_getitems","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"],"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": "alias_builder","targetTable": "#__componentbuilder_field","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_before_publish","add_php_batchcopy","add_php_postsavehook","add_php_before_save","type","add_fadein","add_php_before_delete","add_php_document","add_php_getitems","add_custom_import","add_php_getlistquery","add_php_getitems_after_all","add_php_getform","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"},{"sourceColumn": "alias_builder","targetTable": "#__componentbuilder_field","targetColumn": "id","displayColumn": "name"}]}';
 
 			// Set the object into the content types table.
 			$admin_view_Inserted = $db->insertObject('#__content_types', $admin_view);
@@ -3776,7 +3776,7 @@ class com_componentbuilderInstallerScript
 			$query = $db->getQuery(true);
 			// Field to update.
 			$fields = array(
-				$db->quoteName('params') . ' = ' . $db->quote('{"autorName":"Llewellyn van der Merwe","autorEmail":"llewellyn@joomlacomponentbuilder.com","manage_jcb_package_directories":"2","add_menu_prefix":"1","menu_prefix":"»","minify":"0","set_browser_storage":"1","storage_time_to_live":"global","language":"en-GB","percentagelanguageadd":"50","compiler_field_builder_type":"2","development_method":"1","expansion":"0","return_options_build":"2","cronjob_backup_type":"1","cronjob_backup_server":"0","backup_package_name":"JCB_Backup_[YEAR]_[MONTH]_[DAY]","export_license":"GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html","export_copyright":"Copyright (C) 2015. All Rights Reserved","check_in":"-1 day","save_history":"1","history_limit":"10","uikit_load":"1","uikit_min":"","uikit_style":""}'),
+				$db->quoteName('params') . ' = ' . $db->quote('{"autorName":"Llewellyn van der Merwe","autorEmail":"llewellyn@joomlacomponentbuilder.com","editor":"none","manage_jcb_package_directories":"2","add_menu_prefix":"1","menu_prefix":"»","minify":"0","set_browser_storage":"1","storage_time_to_live":"global","language":"en-GB","percentagelanguageadd":"50","compiler_field_builder_type":"2","development_method":"1","expansion":"0","return_options_build":"2","cronjob_backup_type":"1","cronjob_backup_server":"0","backup_package_name":"JCB_Backup_[YEAR]_[MONTH]_[DAY]","export_license":"GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html","export_copyright":"Copyright (C) 2015. All Rights Reserved","check_in":"-1 day","save_history":"1","history_limit":"10","uikit_load":"1","uikit_min":"","uikit_style":""}'),
 			);
 			// Condition.
 			$conditions = array(
@@ -3831,9 +3831,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": "php_getitem","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_batchmove":"add_php_batchmove","add_php_allowedit":"add_php_allowedit","add_php_save":"add_php_save","add_php_getlistquery":"add_php_getlistquery","icon_add":"icon_add","html_import_view":"html_import_view","add_sql":"add_sql","type":"type","add_fadein":"add_fadein","description":"description","icon_category":"icon_category","add_php_after_publish":"add_php_after_publish","not_required":"not_required","add_php_after_delete":"add_php_after_delete","php_import_save":"php_import_save","add_php_getitems_after_all":"add_php_getitems_after_all","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","alias_builder_type":"alias_builder_type","add_php_before_delete":"add_php_before_delete","add_php_document":"add_php_document","alias_builder":"alias_builder","add_custom_import":"add_custom_import","add_php_getitem":"add_php_getitem","php_import_headers":"php_import_headers","add_php_getitems":"add_php_getitems","icon":"icon","php_getitem":"php_getitem","php_getitems":"php_getitems","add_css_view":"add_css_view","php_getitems_after_all":"php_getitems_after_all","css_view":"css_view","php_getlistquery":"php_getlistquery","add_css_views":"add_css_views","php_before_save":"php_before_save","css_views":"css_views","php_save":"php_save","add_javascript_view_file":"add_javascript_view_file","php_postsavehook":"php_postsavehook","javascript_view_file":"javascript_view_file","php_allowedit":"php_allowedit","add_javascript_view_footer":"add_javascript_view_footer","php_batchcopy":"php_batchcopy","javascript_view_footer":"javascript_view_footer","php_batchmove":"php_batchmove","add_javascript_views_file":"add_javascript_views_file","php_before_publish":"php_before_publish","javascript_views_file":"javascript_views_file","php_after_publish":"php_after_publish","add_javascript_views_footer":"add_javascript_views_footer","php_before_delete":"php_before_delete","javascript_views_footer":"javascript_views_footer","php_after_delete":"php_after_delete","add_custom_button":"add_custom_button","php_document":"php_document","source":"source","php_controller":"php_controller","sql":"sql","php_model":"php_model","php_controller_list":"php_controller_list","php_import_display":"php_import_display","php_model_list":"php_model_list","php_import":"php_import","add_php_ajax":"add_php_ajax","php_import_setdata":"php_import_setdata","php_ajaxmethod":"php_ajaxmethod","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": "php_getitem","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_before_publish":"add_php_before_publish","add_php_batchcopy":"add_php_batchcopy","add_php_postsavehook":"add_php_postsavehook","add_php_before_save":"add_php_before_save","icon_add":"icon_add","php_import_headers":"php_import_headers","type":"type","add_fadein":"add_fadein","description":"description","icon_category":"icon_category","add_php_before_delete":"add_php_before_delete","not_required":"not_required","add_php_document":"add_php_document","add_php_getitems":"add_php_getitems","add_custom_import":"add_custom_import","add_php_getlistquery":"add_php_getlistquery","icon":"icon","add_php_getitems_after_all":"add_php_getitems_after_all","add_php_getform":"add_php_getform","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","alias_builder_type":"alias_builder_type","add_sql":"add_sql","html_import_view":"html_import_view","alias_builder":"alias_builder","php_import_save":"php_import_save","php_getitem":"php_getitem","php_getitems":"php_getitems","add_css_view":"add_css_view","php_getitems_after_all":"php_getitems_after_all","css_view":"css_view","php_getlistquery":"php_getlistquery","add_css_views":"add_css_views","php_getform":"php_getform","css_views":"css_views","php_before_save":"php_before_save","add_javascript_view_file":"add_javascript_view_file","php_save":"php_save","javascript_view_file":"javascript_view_file","php_postsavehook":"php_postsavehook","add_javascript_view_footer":"add_javascript_view_footer","php_allowedit":"php_allowedit","javascript_view_footer":"javascript_view_footer","php_batchcopy":"php_batchcopy","add_javascript_views_file":"add_javascript_views_file","php_batchmove":"php_batchmove","javascript_views_file":"javascript_views_file","php_before_publish":"php_before_publish","add_javascript_views_footer":"add_javascript_views_footer","php_after_publish":"php_after_publish","javascript_views_footer":"javascript_views_footer","php_before_delete":"php_before_delete","add_custom_button":"add_custom_button","php_after_delete":"php_after_delete","php_document":"php_document","php_controller":"php_controller","source":"source","php_model":"php_model","sql":"sql","php_controller_list":"php_controller_list","php_model_list":"php_model_list","php_import_display":"php_import_display","add_php_ajax":"add_php_ajax","php_import":"php_import","php_ajaxmethod":"php_ajaxmethod","php_import_setdata":"php_import_setdata","php_import_ext":"php_import_ext","add_php_getitem":"add_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_batchmove","add_php_allowedit","add_php_save","add_php_getlistquery","add_sql","type","add_fadein","add_php_after_publish","add_php_after_delete","add_php_getitems_after_all","add_php_before_save","add_php_postsavehook","add_php_batchcopy","add_php_before_publish","add_php_before_delete","add_php_document","add_custom_import","add_php_getitem","add_php_getitems","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"],"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": "alias_builder","targetTable": "#__componentbuilder_field","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_before_publish","add_php_batchcopy","add_php_postsavehook","add_php_before_save","type","add_fadein","add_php_before_delete","add_php_document","add_php_getitems","add_custom_import","add_php_getlistquery","add_php_getitems_after_all","add_php_getform","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"},{"sourceColumn": "alias_builder","targetTable": "#__componentbuilder_field","targetColumn": "id","displayColumn": "name"}]}';
 
 			// Check if admin_view type is already in content_type DB.
 			$admin_view_id = null;
@@ -4991,7 +4991,7 @@ class com_componentbuilderInstallerScript
 			echo '<a target="_blank" href="http://www.joomlacomponentbuilder.com" title="Component Builder">
 				<img src="components/com_componentbuilder/assets/images/vdm-component.jpg"/>
 				</a>
-				<h3>Upgrade to Version 2.8.1 Was Successful! Let us know if anything is not working as expected.</h3>';
+				<h3>Upgrade to Version 2.8.2 Was Successful! Let us know if anything is not working as expected.</h3>';
 		}
 	}