Added an after cancel custom code area also in connection with gh-418 in the admin view.

README.md

@@ -12,7 +12,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.9.19) 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.9.20) 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)
 
@@ -147,12 +147,12 @@ TODO
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
 + *Last Build*: 12th June, 2019
-+ *Version*: 2.9.19
++ *Version*: 2.9.20
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **206728**
++ *Line count*: **206854**
-+ *Field count*: **1138**
++ *Field count*: **1140**
-+ *File count*: **1345**
++ *File count*: **1346**
 + *Folder count*: **209**
 
 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](http://joomlacomponentbuilder.com).

admin/README.txt

@@ -12,7 +12,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.9.19) 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.9.20) 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)
 
@@ -147,12 +147,12 @@ TODO
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
 + *Last Build*: 12th June, 2019
-+ *Version*: 2.9.19
++ *Version*: 2.9.20
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **206728**
++ *Line count*: **206854**
-+ *Field count*: **1138**
++ *Field count*: **1140**
-+ *File count*: **1345**
++ *File count*: **1346**
 + *Folder count*: **209**
 
 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](http://joomlacomponentbuilder.com).

admin/compiler/joomla_3/JControllerForm.php

@@ -177,7 +177,7 @@ class ###Component###Controller###View### extends JControllerForm
 					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
-		}
+		}###JCONTROLLERFORM_AFTERCANCEL###
 		return $cancel;
 	}
 

admin/helpers/compiler/a_Get.php

@@ -2046,7 +2046,7 @@ class Get
 				}
 			}
 			// add_php
-			$addArrayP = array('php_getitem', 'php_before_save', 'php_save', 'php_getform', 'php_postsavehook', 'php_getitems', 'php_getitems_after_all', 'php_getlistquery', 'php_allowadd', 'php_allowedit', 'php_before_cancel', '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_allowadd', 'php_allowedit', 'php_before_cancel', 'php_after_cancel', '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/f_Infusion.php

@@ -534,6 +534,9 @@ class Infusion extends Interpretation
 				// JCONTROLLERFORM_BEFORECANCEL <<<DYNAMIC>>>
 				$this->fileContentDynamic[$viewName_single][$this->hhh . 'JCONTROLLERFORM_BEFORECANCEL' . $this->hhh] = $this->getCustomScriptBuilder('php_before_cancel', $viewName_single, PHP_EOL, null, null, '');
 
+				// JCONTROLLERFORM_AFTERCANCEL <<<DYNAMIC>>>
+				$this->fileContentDynamic[$viewName_single][$this->hhh . 'JCONTROLLERFORM_AFTERCANCEL' . $this->hhh] = $this->getCustomScriptBuilder('php_after_cancel', $viewName_single, PHP_EOL, null, null, '');
+
 				// JCONTROLLERFORM_ALLOWEDIT <<<DYNAMIC>>>
 				$this->fileContentDynamic[$viewName_single][$this->hhh . 'JCONTROLLERFORM_ALLOWEDIT' . $this->hhh] = $this->setJcontrollerAllowEdit($viewName_single, $viewName_list);
 

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

@@ -493,6 +493,8 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_JAVASCRIPT_VIEW_FOOTER_LABEL="Add JavaScript
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_NEW_BUTTON="Add New Button"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_NEW_CLOSE_BUTTON="Add New & Close Button"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_NEW_NEW_CLOSE_BUTTON="Add New + New & Close Button"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_CANCEL="Add Php After Cancel"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_CANCEL_LABEL="Add PHP (script - after cancel)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_DELETE="Add Php After Delete"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_DELETE_LABEL="Add PHP (script - after delete)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_PUBLISH="Add Php After Publish"
@@ -971,6 +973,9 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_PERMISSION="Permissions"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHONE="Phone"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHONE_TWO="Phone 2"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP="PHP"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_CANCEL="Php After Cancel"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_CANCEL_DESCRIPTION="Add PHP Here that should run in the Cancel Method after cancel. Do not add the php tags."
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_CANCEL_LABEL="PHP Cancel Method after<br /><small>(string) $key is the name of the primary key of the URL variable.</small>"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_DELETE="Php After Delete"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_DELETE_DESCRIPTION="Add PHP Here that should run in the delete Method after items were deleted. Do not add the php tags."
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_DELETE_LABEL="PHP delete Method after<br /><small>Target (array) $pks  is an array of record primary keys.</small>"

admin/layouts/admin_view/php_fullwidth.php

@@ -40,6 +40,8 @@ $fields = $displayData->get('fields') ?: array(
 	'php_allowedit',
 	'add_php_before_cancel',
 	'php_before_cancel',
+	'add_php_after_cancel',
+	'php_after_cancel',
 	'add_php_batchcopy',
 	'php_batchcopy',
 	'add_php_batchmove',

admin/layouts/fieldtype/fields_fullwidth.php

@@ -13,7 +13,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items = $displayData->waqfields;
+$items = $displayData->warfields;
 $user = JFactory::getUser();
 $id = $displayData->item->id;
 // set the edit URL

admin/layouts/server/linked_components_fullwidth.php

@@ -13,7 +13,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items = $displayData->wbalinked_components;
+$items = $displayData->wbblinked_components;
 $user = JFactory::getUser();
 $id = $displayData->item->id;
 // set the edit URL

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_getitems_after_all))
 			{
 				// base64 Decode php_getitems_after_all.
@@ -182,10 +182,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->php_before_cancel = base64_decode($item->php_before_cancel);
 			}
 
-			if (!empty($item->php_batchcopy))
+			if (!empty($item->php_after_cancel))
 			{
-				// base64 Decode php_batchcopy.
+				// base64 Decode php_after_cancel.
-				$item->php_batchcopy = base64_decode($item->php_batchcopy);
+				$item->php_after_cancel = base64_decode($item->php_after_cancel);
 			}
 
 			if (!empty($item->javascript_views_file))
@@ -194,24 +194,30 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->javascript_views_file = base64_decode($item->javascript_views_file);
 			}
 
+			if (!empty($item->php_batchcopy))
+			{
+				// base64 Decode php_batchcopy.
+				$item->php_batchcopy = base64_decode($item->php_batchcopy);
+			}
+
 			if (!empty($item->php_batchmove))
 			{
 				// base64 Decode php_batchmove.
 				$item->php_batchmove = base64_decode($item->php_batchmove);
 			}
 
-			if (!empty($item->php_before_publish))
-			{
-				// base64 Decode php_before_publish.
-				$item->php_before_publish = base64_decode($item->php_before_publish);
-			}
-
 			if (!empty($item->javascript_views_footer))
 			{
 				// base64 Decode javascript_views_footer.
 				$item->javascript_views_footer = base64_decode($item->javascript_views_footer);
 			}
 
+			if (!empty($item->php_before_publish))
+			{
+				// base64 Decode php_before_publish.
+				$item->php_before_publish = base64_decode($item->php_before_publish);
+			}
+
 			if (!empty($item->php_after_publish))
 			{
 				// base64 Decode php_after_publish.
@@ -224,22 +230,16 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->php_before_delete = base64_decode($item->php_before_delete);
 			}
 
-			if (!empty($item->php_after_delete))
-			{
-				// base64 Decode php_after_delete.
-				$item->php_after_delete = base64_decode($item->php_after_delete);
-			}
-
 			if (!empty($item->php_controller))
 			{
 				// base64 Decode php_controller.
 				$item->php_controller = base64_decode($item->php_controller);
 			}
 
-			if (!empty($item->php_document))
+			if (!empty($item->php_after_delete))
 			{
-				// base64 Decode php_document.
+				// base64 Decode php_after_delete.
-				$item->php_document = base64_decode($item->php_document);
+				$item->php_after_delete = base64_decode($item->php_after_delete);
 			}
 
 			if (!empty($item->php_model))
@@ -248,6 +248,12 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->php_model = base64_decode($item->php_model);
 			}
 
+			if (!empty($item->php_document))
+			{
+				// base64 Decode php_document.
+				$item->php_document = base64_decode($item->php_document);
+			}
+
 			if (!empty($item->php_controller_list))
 			{
 				// base64 Decode php_controller_list.
@@ -260,52 +266,60 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->php_model_list = base64_decode($item->php_model_list);
 			}
 
-			if (!empty($item->sql))
-			{
-				// base64 Decode sql.
-				$item->sql = base64_decode($item->sql);
-			}
-
 			if (!empty($item->php_ajaxmethod))
 			{
 				// base64 Decode php_ajaxmethod.
 				$item->php_ajaxmethod = base64_decode($item->php_ajaxmethod);
 			}
 
+			if (!empty($item->sql))
+			{
+				// base64 Decode sql.
+				$item->sql = base64_decode($item->sql);
+			}
+
 			if (!empty($item->php_import_display))
 			{
 				// base64 Decode php_import_display.
 				$item->php_import_display = base64_decode($item->php_import_display);
 			}
 
-			if (!empty($item->php_import))
-			{
-				// base64 Decode php_import.
-				$item->php_import = base64_decode($item->php_import);
-			}
-
 			if (!empty($item->php_getitem))
 			{
 				// base64 Decode php_getitem.
 				$item->php_getitem = base64_decode($item->php_getitem);
 			}
 
+			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_getitems))
+			{
+				// base64 Decode php_getitems.
+				$item->php_getitems = base64_decode($item->php_getitems);
+			}
+
 			if (!empty($item->php_import_ext))
 			{
 				// base64 Decode php_import_ext.
 				$item->php_import_ext = base64_decode($item->php_import_ext);
 			}
 
-			if (!empty($item->php_getitems))
+			if (!empty($item->addtables))
 			{
-				// base64 Decode php_getitems.
+				// Convert the addtables field to an array.
-				$item->php_getitems = base64_decode($item->php_getitems);
+				$addtables = new Registry;
+				$addtables->loadString($item->addtables);
+				$item->addtables = $addtables->toArray();
 			}
 
 			if (!empty($item->addpermissions))
@@ -332,14 +346,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.
@@ -1244,6 +1250,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']))
 		{
@@ -1283,19 +1302,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']))
 		{
@@ -1335,6 +1341,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']))
 		{
@@ -1347,12 +1359,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_getitems_after_all string to base64 string.
 		if (isset($data['php_getitems_after_all']))
 		{
@@ -1431,10 +1437,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['php_before_cancel'] = base64_encode($data['php_before_cancel']);
 		}
 
-		// Set the php_batchcopy string to base64 string.
+		// Set the php_after_cancel string to base64 string.
-		if (isset($data['php_batchcopy']))
+		if (isset($data['php_after_cancel']))
 		{
-			$data['php_batchcopy'] = base64_encode($data['php_batchcopy']);
+			$data['php_after_cancel'] = base64_encode($data['php_after_cancel']);
 		}
 
 		// Set the javascript_views_file string to base64 string.
@@ -1443,24 +1449,30 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['javascript_views_file'] = base64_encode($data['javascript_views_file']);
 		}
 
+		// Set the php_batchcopy string to base64 string.
+		if (isset($data['php_batchcopy']))
+		{
+			$data['php_batchcopy'] = base64_encode($data['php_batchcopy']);
+		}
+
 		// Set the php_batchmove string to base64 string.
 		if (isset($data['php_batchmove']))
 		{
 			$data['php_batchmove'] = base64_encode($data['php_batchmove']);
 		}
 
-		// Set the 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_footer string to base64 string.
 		if (isset($data['javascript_views_footer']))
 		{
 			$data['javascript_views_footer'] = base64_encode($data['javascript_views_footer']);
 		}
 
+		// Set the php_before_publish string to base64 string.
+		if (isset($data['php_before_publish']))
+		{
+			$data['php_before_publish'] = base64_encode($data['php_before_publish']);
+		}
+
 		// Set the php_after_publish string to base64 string.
 		if (isset($data['php_after_publish']))
 		{
@@ -1473,22 +1485,16 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$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']))
-		{
-			$data['php_after_delete'] = base64_encode($data['php_after_delete']);
-		}
-
 		// Set the php_controller string to base64 string.
 		if (isset($data['php_controller']))
 		{
 			$data['php_controller'] = base64_encode($data['php_controller']);
 		}
 
-		// Set the php_document string to base64 string.
+		// Set the php_after_delete string to base64 string.
-		if (isset($data['php_document']))
+		if (isset($data['php_after_delete']))
 		{
-			$data['php_document'] = base64_encode($data['php_document']);
+			$data['php_after_delete'] = base64_encode($data['php_after_delete']);
 		}
 
 		// Set the php_model string to base64 string.
@@ -1497,6 +1503,12 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['php_model'] = base64_encode($data['php_model']);
 		}
 
+		// Set the php_document string to base64 string.
+		if (isset($data['php_document']))
+		{
+			$data['php_document'] = base64_encode($data['php_document']);
+		}
+
 		// Set the php_controller_list string to base64 string.
 		if (isset($data['php_controller_list']))
 		{
@@ -1509,54 +1521,54 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['php_model_list'] = base64_encode($data['php_model_list']);
 		}
 
-		// Set the sql string to base64 string.
-		if (isset($data['sql']))
-		{
-			$data['sql'] = base64_encode($data['sql']);
-		}
-
 		// Set the php_ajaxmethod string to base64 string.
 		if (isset($data['php_ajaxmethod']))
 		{
 			$data['php_ajaxmethod'] = base64_encode($data['php_ajaxmethod']);
 		}
 
+		// Set the sql string to base64 string.
+		if (isset($data['sql']))
+		{
+			$data['sql'] = base64_encode($data['sql']);
+		}
+
 		// Set the php_import_display string to base64 string.
 		if (isset($data['php_import_display']))
 		{
 			$data['php_import_display'] = base64_encode($data['php_import_display']);
 		}
 
-		// Set the php_import string to base64 string.
-		if (isset($data['php_import']))
-		{
-			$data['php_import'] = base64_encode($data['php_import']);
-		}
-
 		// Set the php_getitem string to base64 string.
 		if (isset($data['php_getitem']))
 		{
 			$data['php_getitem'] = base64_encode($data['php_getitem']);
 		}
 
+		// Set the php_import string to base64 string.
+		if (isset($data['php_import']))
+		{
+			$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_import_ext string to base64 string.
-		if (isset($data['php_import_ext']))
-		{
-			$data['php_import_ext'] = base64_encode($data['php_import_ext']);
-		}
-
 		// Set the php_getitems string to base64 string.
 		if (isset($data['php_getitems']))
 		{
 			$data['php_getitems'] = base64_encode($data['php_getitems']);
 		}
 
+		// Set the php_import_ext string to base64 string.
+		if (isset($data['php_import_ext']))
+		{
+			$data['php_import_ext'] = base64_encode($data['php_import_ext']);
+		}
+        
 		// Set the Params Items to data
 		if (isset($data['params']) && is_array($data['params']))
 		{

admin/models/admin_views.php

@@ -31,8 +31,8 @@ class ComponentbuilderModelAdmin_views extends JModelList
 				'a.name_single','name_single',
 				'a.short_description','short_description',
 				'a.add_fadein','add_fadein',
-				'a.type','type',
 				'a.add_custom_import','add_custom_import',
+				'a.type','type',
 				'a.add_custom_button','add_custom_button',
 				'a.add_php_ajax','add_php_ajax'
 			);
@@ -67,12 +67,12 @@ class ComponentbuilderModelAdmin_views extends JModelList
 		$add_fadein = $this->getUserStateFromRequest($this->context . '.filter.add_fadein', 'filter_add_fadein');
 		$this->setState('filter.add_fadein', $add_fadein);
 
-		$type = $this->getUserStateFromRequest($this->context . '.filter.type', 'filter_type');
-		$this->setState('filter.type', $type);
-
 		$add_custom_import = $this->getUserStateFromRequest($this->context . '.filter.add_custom_import', 'filter_add_custom_import');
 		$this->setState('filter.add_custom_import', $add_custom_import);
 
+		$type = $this->getUserStateFromRequest($this->context . '.filter.type', 'filter_type');
+		$this->setState('filter.type', $type);
+
 		$add_custom_button = $this->getUserStateFromRequest($this->context . '.filter.add_custom_button', 'filter_add_custom_button');
 		$this->setState('filter.add_custom_button', $add_custom_button);
 
@@ -136,10 +136,10 @@ class ComponentbuilderModelAdmin_views extends JModelList
 			{
 				// convert add_fadein
 				$item->add_fadein = $this->selectionTranslation($item->add_fadein, 'add_fadein');
-				// convert type
-				$item->type = $this->selectionTranslation($item->type, 'type');
 				// convert add_custom_import
 				$item->add_custom_import = $this->selectionTranslation($item->add_custom_import, 'add_custom_import');
+				// convert type
+				$item->type = $this->selectionTranslation($item->type, 'type');
 				// convert add_custom_button
 				$item->add_custom_button = $this->selectionTranslation($item->add_custom_button, 'add_custom_button');
 				// convert add_php_ajax
@@ -172,19 +172,6 @@ class ComponentbuilderModelAdmin_views extends JModelList
 				return $add_fadeinArray[$value];
 			}
 		}
-		// Array of type language strings
-		if ($name === 'type')
-		{
-			$typeArray = array(
-				1 => 'COM_COMPONENTBUILDER_ADMIN_VIEW_READWRITE',
-				2 => 'COM_COMPONENTBUILDER_ADMIN_VIEW_READONLY'
-			);
-			// Now check if value is found in this array
-			if (isset($typeArray[$value]) && ComponentbuilderHelper::checkString($typeArray[$value]))
-			{
-				return $typeArray[$value];
-			}
-		}
 		// Array of add_custom_import language strings
 		if ($name === 'add_custom_import')
 		{
@@ -198,6 +185,19 @@ class ComponentbuilderModelAdmin_views extends JModelList
 				return $add_custom_importArray[$value];
 			}
 		}
+		// Array of type language strings
+		if ($name === 'type')
+		{
+			$typeArray = array(
+				1 => 'COM_COMPONENTBUILDER_ADMIN_VIEW_READWRITE',
+				2 => 'COM_COMPONENTBUILDER_ADMIN_VIEW_READONLY'
+			);
+			// Now check if value is found in this array
+			if (isset($typeArray[$value]) && ComponentbuilderHelper::checkString($typeArray[$value]))
+			{
+				return $typeArray[$value];
+			}
+		}
 		// Array of add_custom_button language strings
 		if ($name === 'add_custom_button')
 		{
@@ -282,7 +282,7 @@ class ComponentbuilderModelAdmin_views extends JModelList
 			else
 			{
 				$search = $db->quote('%' . $db->escape($search) . '%');
-				$query->where('(a.system_name LIKE '.$search.' OR a.name_single LIKE '.$search.' OR a.short_description LIKE '.$search.' OR a.description LIKE '.$search.' OR a.type LIKE '.$search.' OR a.name_list LIKE '.$search.')');
+				$query->where('(a.system_name LIKE '.$search.' OR a.name_single LIKE '.$search.' OR a.short_description LIKE '.$search.' OR a.name_list LIKE '.$search.' OR a.description LIKE '.$search.' OR a.type LIKE '.$search.')');
 			}
 		}
 
@@ -291,16 +291,16 @@ class ComponentbuilderModelAdmin_views extends JModelList
 		{
 			$query->where('a.add_fadein = ' . $db->quote($db->escape($add_fadein)));
 		}
-		// Filter by Type.
-		if ($type = $this->getState('filter.type'))
-		{
-			$query->where('a.type = ' . $db->quote($db->escape($type)));
-		}
 		// Filter by Add_custom_import.
 		if ($add_custom_import = $this->getState('filter.add_custom_import'))
 		{
 			$query->where('a.add_custom_import = ' . $db->quote($db->escape($add_custom_import)));
 		}
+		// Filter by Type.
+		if ($type = $this->getState('filter.type'))
+		{
+			$query->where('a.type = ' . $db->quote($db->escape($type)));
+		}
 		// Filter by Add_custom_button.
 		if ($add_custom_button = $this->getState('filter.add_custom_button'))
 		{
@@ -376,12 +376,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_getitems_after_all
 						$item->php_getitems_after_all = base64_decode($item->php_getitems_after_all);
 						// decode php_getlistquery
@@ -408,48 +408,50 @@ class ComponentbuilderModelAdmin_views extends JModelList
 						$item->javascript_view_footer = base64_decode($item->javascript_view_footer);
 						// decode php_before_cancel
 						$item->php_before_cancel = base64_decode($item->php_before_cancel);
-						// decode php_batchcopy
+						// decode php_after_cancel
-						$item->php_batchcopy = base64_decode($item->php_batchcopy);
+						$item->php_after_cancel = base64_decode($item->php_after_cancel);
 						// decode javascript_views_file
 						$item->javascript_views_file = base64_decode($item->javascript_views_file);
+						// decode php_batchcopy
+						$item->php_batchcopy = base64_decode($item->php_batchcopy);
 						// decode php_batchmove
 						$item->php_batchmove = base64_decode($item->php_batchmove);
-						// decode php_before_publish
-						$item->php_before_publish = base64_decode($item->php_before_publish);
 						// decode javascript_views_footer
 						$item->javascript_views_footer = base64_decode($item->javascript_views_footer);
+						// decode php_before_publish
+						$item->php_before_publish = base64_decode($item->php_before_publish);
 						// decode php_after_publish
 						$item->php_after_publish = base64_decode($item->php_after_publish);
 						// decode php_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_controller
 						$item->php_controller = base64_decode($item->php_controller);
-						// decode php_document
+						// decode php_after_delete
-						$item->php_document = base64_decode($item->php_document);
+						$item->php_after_delete = base64_decode($item->php_after_delete);
 						// decode php_model
 						$item->php_model = base64_decode($item->php_model);
+						// decode php_document
+						$item->php_document = base64_decode($item->php_document);
 						// decode php_controller_list
 						$item->php_controller_list = base64_decode($item->php_controller_list);
 						// decode php_model_list
 						$item->php_model_list = base64_decode($item->php_model_list);
-						// decode sql
-						$item->sql = base64_decode($item->sql);
 						// decode php_ajaxmethod
 						$item->php_ajaxmethod = base64_decode($item->php_ajaxmethod);
+						// decode sql
+						$item->sql = base64_decode($item->sql);
 						// decode php_import_display
 						$item->php_import_display = base64_decode($item->php_import_display);
-						// decode php_import
-						$item->php_import = base64_decode($item->php_import);
 						// decode php_getitem
 						$item->php_getitem = base64_decode($item->php_getitem);
+						// decode php_import
+						$item->php_import = base64_decode($item->php_import);
 						// decode php_import_setdata
 						$item->php_import_setdata = base64_decode($item->php_import_setdata);
-						// decode php_import_ext
-						$item->php_import_ext = base64_decode($item->php_import_ext);
 						// decode php_getitems
 						$item->php_getitems = base64_decode($item->php_getitems);
+						// decode php_import_ext
+						$item->php_import_ext = base64_decode($item->php_import_ext);
 						// unset the values we don't want exported.
 						unset($item->asset_id);
 						unset($item->checked_out);
@@ -514,8 +516,8 @@ class ComponentbuilderModelAdmin_views extends JModelList
 		$id .= ':' . $this->getState('filter.name_single');
 		$id .= ':' . $this->getState('filter.short_description');
 		$id .= ':' . $this->getState('filter.add_fadein');
-		$id .= ':' . $this->getState('filter.type');
 		$id .= ':' . $this->getState('filter.add_custom_import');
+		$id .= ':' . $this->getState('filter.type');
 		$id .= ':' . $this->getState('filter.add_custom_button');
 		$id .= ':' . $this->getState('filter.add_php_ajax');
 

admin/models/fieldtype.php

@@ -155,7 +155,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 	 *
 	 * @return mixed  An array of data items on success, false on failure.
 	 */
-	public function getWaqfields()
+	public function getWarfields()
 	{
 		// Get the user object.
 		$user = JFactory::getUser();
@@ -237,13 +237,13 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 				foreach ($items as $nr => &$item)
 				{
 					// convert datatype
-					$item->datatype = $this->selectionTranslationWaqfields($item->datatype, 'datatype');
+					$item->datatype = $this->selectionTranslationWarfields($item->datatype, 'datatype');
 					// convert indexes
-					$item->indexes = $this->selectionTranslationWaqfields($item->indexes, 'indexes');
+					$item->indexes = $this->selectionTranslationWarfields($item->indexes, 'indexes');
 					// convert null_switch
-					$item->null_switch = $this->selectionTranslationWaqfields($item->null_switch, 'null_switch');
+					$item->null_switch = $this->selectionTranslationWarfields($item->null_switch, 'null_switch');
 					// convert store
-					$item->store = $this->selectionTranslationWaqfields($item->store, 'store');
+					$item->store = $this->selectionTranslationWarfields($item->store, 'store');
 				}
 			}
 
@@ -257,7 +257,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 	 *
 	 * @return translatable string
 	 */
-	public function selectionTranslationWaqfields($value,$name)
+	public function selectionTranslationWarfields($value,$name)
 	{
 		// Array of datatype language strings
 		if ($name === 'datatype')

admin/models/forms/admin_view.js

@@ -36,17 +36,18 @@ jform_vvvvvxyvxo_required = false;
 jform_vvvvvxzvxp_required = false;
 jform_vvvvvyavxq_required = false;
 jform_vvvvvybvxr_required = false;
-jform_vvvvvyfvxs_required = false;
+jform_vvvvvycvxs_required = false;
-jform_vvvvvyfvxt_required = false;
+jform_vvvvvygvxt_required = false;
-jform_vvvvvyfvxu_required = false;
+jform_vvvvvygvxu_required = false;
-jform_vvvvvyfvxv_required = false;
+jform_vvvvvygvxv_required = false;
-jform_vvvvvyfvxw_required = false;
+jform_vvvvvygvxw_required = false;
-jform_vvvvvyfvxx_required = false;
+jform_vvvvvygvxx_required = false;
-jform_vvvvvyfvxy_required = false;
+jform_vvvvvygvxy_required = false;
-jform_vvvvvyhvxz_required = false;
+jform_vvvvvygvxz_required = false;
-jform_vvvvvyhvya_required = false;
+jform_vvvvvyivya_required = false;
-jform_vvvvvyhvyb_required = false;
+jform_vvvvvyivyb_required = false;
-jform_vvvvvyhvyc_required = false;
+jform_vvvvvyivyc_required = false;
+jform_vvvvvyivyd_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -105,46 +106,49 @@ jQuery(document).ready(function()
 	var add_php_before_cancel_vvvvvxs = jQuery("#jform_add_php_before_cancel input[type='radio']:checked").val();
 	vvvvvxs(add_php_before_cancel_vvvvvxs);
 
-	var add_php_batchcopy_vvvvvxt = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val();
+	var add_php_after_cancel_vvvvvxt = jQuery("#jform_add_php_after_cancel input[type='radio']:checked").val();
-	vvvvvxt(add_php_batchcopy_vvvvvxt);
+	vvvvvxt(add_php_after_cancel_vvvvvxt);
 
-	var add_php_batchmove_vvvvvxu = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val();
+	var add_php_batchcopy_vvvvvxu = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val();
-	vvvvvxu(add_php_batchmove_vvvvvxu);
+	vvvvvxu(add_php_batchcopy_vvvvvxu);
 
-	var add_php_before_publish_vvvvvxv = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val();
+	var add_php_batchmove_vvvvvxv = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val();
-	vvvvvxv(add_php_before_publish_vvvvvxv);
+	vvvvvxv(add_php_batchmove_vvvvvxv);
 
-	var add_php_after_publish_vvvvvxw = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val();
+	var add_php_before_publish_vvvvvxw = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val();
-	vvvvvxw(add_php_after_publish_vvvvvxw);
+	vvvvvxw(add_php_before_publish_vvvvvxw);
 
-	var add_php_before_delete_vvvvvxx = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val();
+	var add_php_after_publish_vvvvvxx = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val();
-	vvvvvxx(add_php_before_delete_vvvvvxx);
+	vvvvvxx(add_php_after_publish_vvvvvxx);
 
-	var add_php_after_delete_vvvvvxy = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val();
+	var add_php_before_delete_vvvvvxy = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val();
-	vvvvvxy(add_php_after_delete_vvvvvxy);
+	vvvvvxy(add_php_before_delete_vvvvvxy);
 
-	var add_php_document_vvvvvxz = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	var add_php_after_delete_vvvvvxz = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val();
-	vvvvvxz(add_php_document_vvvvvxz);
+	vvvvvxz(add_php_after_delete_vvvvvxz);
 
-	var add_sql_vvvvvya = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	var add_php_document_vvvvvya = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvya(add_sql_vvvvvya);
+	vvvvvya(add_php_document_vvvvvya);
 
-	var source_vvvvvyb = jQuery("#jform_source input[type='radio']:checked").val();
 	var add_sql_vvvvvyb = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvyb(source_vvvvvyb,add_sql_vvvvvyb);
+	vvvvvyb(add_sql_vvvvvyb);
 
-	var source_vvvvvyd = jQuery("#jform_source input[type='radio']:checked").val();
+	var source_vvvvvyc = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvyd = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	var add_sql_vvvvvyc = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvyd(source_vvvvvyd,add_sql_vvvvvyd);
+	vvvvvyc(source_vvvvvyc,add_sql_vvvvvyc);
 
-	var add_custom_import_vvvvvyf = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
+	var source_vvvvvye = jQuery("#jform_source input[type='radio']:checked").val();
-	vvvvvyf(add_custom_import_vvvvvyf);
+	var add_sql_vvvvvye = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvye(source_vvvvvye,add_sql_vvvvvye);
 
 	var add_custom_import_vvvvvyg = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
 	vvvvvyg(add_custom_import_vvvvvyg);
 
-	var add_custom_button_vvvvvyh = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	var add_custom_import_vvvvvyh = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
-	vvvvvyh(add_custom_button_vvvvvyh);
+	vvvvvyh(add_custom_import_vvvvvyh);
+
+	var add_custom_button_vvvvvyi = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	vvvvvyi(add_custom_button_vvvvvyi);
 });
 
 // the vvvvvxb function
@@ -726,298 +730,330 @@ function vvvvvxs(add_php_before_cancel_vvvvvxs)
 }
 
 // the vvvvvxt function
-function vvvvvxt(add_php_batchcopy_vvvvvxt)
+function vvvvvxt(add_php_after_cancel_vvvvvxt)
 {
 	// set the function logic
-	if (add_php_batchcopy_vvvvvxt == 1)
+	if (add_php_after_cancel_vvvvvxt == 1)
 	{
-		jQuery('#jform_php_batchcopy-lbl').closest('.control-group').show();
+		jQuery('#jform_php_after_cancel-lbl').closest('.control-group').show();
-		// add required attribute to php_batchcopy field
+		// add required attribute to php_after_cancel field
 		if (jform_vvvvvxtvxj_required)
 		{
-			updateFieldRequired('php_batchcopy',0);
+			updateFieldRequired('php_after_cancel',0);
-			jQuery('#jform_php_batchcopy').prop('required','required');
+			jQuery('#jform_php_after_cancel').prop('required','required');
-			jQuery('#jform_php_batchcopy').attr('aria-required',true);
+			jQuery('#jform_php_after_cancel').attr('aria-required',true);
-			jQuery('#jform_php_batchcopy').addClass('required');
+			jQuery('#jform_php_after_cancel').addClass('required');
 			jform_vvvvvxtvxj_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_php_batchcopy-lbl').closest('.control-group').hide();
+		jQuery('#jform_php_after_cancel-lbl').closest('.control-group').hide();
-		// remove required attribute from php_batchcopy field
+		// remove required attribute from php_after_cancel field
 		if (!jform_vvvvvxtvxj_required)
 		{
-			updateFieldRequired('php_batchcopy',1);
+			updateFieldRequired('php_after_cancel',1);
-			jQuery('#jform_php_batchcopy').removeAttr('required');
+			jQuery('#jform_php_after_cancel').removeAttr('required');
-			jQuery('#jform_php_batchcopy').removeAttr('aria-required');
+			jQuery('#jform_php_after_cancel').removeAttr('aria-required');
-			jQuery('#jform_php_batchcopy').removeClass('required');
+			jQuery('#jform_php_after_cancel').removeClass('required');
 			jform_vvvvvxtvxj_required = true;
 		}
 	}
 }
 
 // the vvvvvxu function
-function vvvvvxu(add_php_batchmove_vvvvvxu)
+function vvvvvxu(add_php_batchcopy_vvvvvxu)
 {
 	// set the function logic
-	if (add_php_batchmove_vvvvvxu == 1)
+	if (add_php_batchcopy_vvvvvxu == 1)
 	{
-		jQuery('#jform_php_batchmove-lbl').closest('.control-group').show();
+		jQuery('#jform_php_batchcopy-lbl').closest('.control-group').show();
-		// add required attribute to php_batchmove field
+		// add required attribute to php_batchcopy field
 		if (jform_vvvvvxuvxk_required)
 		{
-			updateFieldRequired('php_batchmove',0);
+			updateFieldRequired('php_batchcopy',0);
-			jQuery('#jform_php_batchmove').prop('required','required');
+			jQuery('#jform_php_batchcopy').prop('required','required');
-			jQuery('#jform_php_batchmove').attr('aria-required',true);
+			jQuery('#jform_php_batchcopy').attr('aria-required',true);
-			jQuery('#jform_php_batchmove').addClass('required');
+			jQuery('#jform_php_batchcopy').addClass('required');
 			jform_vvvvvxuvxk_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_php_batchmove-lbl').closest('.control-group').hide();
+		jQuery('#jform_php_batchcopy-lbl').closest('.control-group').hide();
-		// remove required attribute from php_batchmove field
+		// remove required attribute from php_batchcopy field
 		if (!jform_vvvvvxuvxk_required)
 		{
-			updateFieldRequired('php_batchmove',1);
+			updateFieldRequired('php_batchcopy',1);
-			jQuery('#jform_php_batchmove').removeAttr('required');
+			jQuery('#jform_php_batchcopy').removeAttr('required');
-			jQuery('#jform_php_batchmove').removeAttr('aria-required');
+			jQuery('#jform_php_batchcopy').removeAttr('aria-required');
-			jQuery('#jform_php_batchmove').removeClass('required');
+			jQuery('#jform_php_batchcopy').removeClass('required');
 			jform_vvvvvxuvxk_required = true;
 		}
 	}
 }
 
 // the vvvvvxv function
-function vvvvvxv(add_php_before_publish_vvvvvxv)
+function vvvvvxv(add_php_batchmove_vvvvvxv)
 {
 	// set the function logic
-	if (add_php_before_publish_vvvvvxv == 1)
+	if (add_php_batchmove_vvvvvxv == 1)
 	{
-		jQuery('#jform_php_before_publish-lbl').closest('.control-group').show();
+		jQuery('#jform_php_batchmove-lbl').closest('.control-group').show();
-		// add required attribute to php_before_publish field
+		// add required attribute to php_batchmove field
 		if (jform_vvvvvxvvxl_required)
 		{
-			updateFieldRequired('php_before_publish',0);
+			updateFieldRequired('php_batchmove',0);
-			jQuery('#jform_php_before_publish').prop('required','required');
+			jQuery('#jform_php_batchmove').prop('required','required');
-			jQuery('#jform_php_before_publish').attr('aria-required',true);
+			jQuery('#jform_php_batchmove').attr('aria-required',true);
-			jQuery('#jform_php_before_publish').addClass('required');
+			jQuery('#jform_php_batchmove').addClass('required');
 			jform_vvvvvxvvxl_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_php_before_publish-lbl').closest('.control-group').hide();
+		jQuery('#jform_php_batchmove-lbl').closest('.control-group').hide();
-		// remove required attribute from php_before_publish field
+		// remove required attribute from php_batchmove field
 		if (!jform_vvvvvxvvxl_required)
 		{
-			updateFieldRequired('php_before_publish',1);
+			updateFieldRequired('php_batchmove',1);
-			jQuery('#jform_php_before_publish').removeAttr('required');
+			jQuery('#jform_php_batchmove').removeAttr('required');
-			jQuery('#jform_php_before_publish').removeAttr('aria-required');
+			jQuery('#jform_php_batchmove').removeAttr('aria-required');
-			jQuery('#jform_php_before_publish').removeClass('required');
+			jQuery('#jform_php_batchmove').removeClass('required');
 			jform_vvvvvxvvxl_required = true;
 		}
 	}
 }
 
 // the vvvvvxw function
-function vvvvvxw(add_php_after_publish_vvvvvxw)
+function vvvvvxw(add_php_before_publish_vvvvvxw)
 {
 	// set the function logic
-	if (add_php_after_publish_vvvvvxw == 1)
+	if (add_php_before_publish_vvvvvxw == 1)
 	{
-		jQuery('#jform_php_after_publish-lbl').closest('.control-group').show();
+		jQuery('#jform_php_before_publish-lbl').closest('.control-group').show();
-		// add required attribute to php_after_publish field
+		// add required attribute to php_before_publish field
 		if (jform_vvvvvxwvxm_required)
 		{
-			updateFieldRequired('php_after_publish',0);
+			updateFieldRequired('php_before_publish',0);
-			jQuery('#jform_php_after_publish').prop('required','required');
+			jQuery('#jform_php_before_publish').prop('required','required');
-			jQuery('#jform_php_after_publish').attr('aria-required',true);
+			jQuery('#jform_php_before_publish').attr('aria-required',true);
-			jQuery('#jform_php_after_publish').addClass('required');
+			jQuery('#jform_php_before_publish').addClass('required');
 			jform_vvvvvxwvxm_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_php_after_publish-lbl').closest('.control-group').hide();
+		jQuery('#jform_php_before_publish-lbl').closest('.control-group').hide();
-		// remove required attribute from php_after_publish field
+		// remove required attribute from php_before_publish field
 		if (!jform_vvvvvxwvxm_required)
 		{
-			updateFieldRequired('php_after_publish',1);
+			updateFieldRequired('php_before_publish',1);
-			jQuery('#jform_php_after_publish').removeAttr('required');
+			jQuery('#jform_php_before_publish').removeAttr('required');
-			jQuery('#jform_php_after_publish').removeAttr('aria-required');
+			jQuery('#jform_php_before_publish').removeAttr('aria-required');
-			jQuery('#jform_php_after_publish').removeClass('required');
+			jQuery('#jform_php_before_publish').removeClass('required');
 			jform_vvvvvxwvxm_required = true;
 		}
 	}
 }
 
 // the vvvvvxx function
-function vvvvvxx(add_php_before_delete_vvvvvxx)
+function vvvvvxx(add_php_after_publish_vvvvvxx)
 {
 	// set the function logic
-	if (add_php_before_delete_vvvvvxx == 1)
+	if (add_php_after_publish_vvvvvxx == 1)
 	{
-		jQuery('#jform_php_before_delete-lbl').closest('.control-group').show();
+		jQuery('#jform_php_after_publish-lbl').closest('.control-group').show();
-		// add required attribute to php_before_delete field
+		// add required attribute to php_after_publish field
 		if (jform_vvvvvxxvxn_required)
 		{
-			updateFieldRequired('php_before_delete',0);
+			updateFieldRequired('php_after_publish',0);
-			jQuery('#jform_php_before_delete').prop('required','required');
+			jQuery('#jform_php_after_publish').prop('required','required');
-			jQuery('#jform_php_before_delete').attr('aria-required',true);
+			jQuery('#jform_php_after_publish').attr('aria-required',true);
-			jQuery('#jform_php_before_delete').addClass('required');
+			jQuery('#jform_php_after_publish').addClass('required');
 			jform_vvvvvxxvxn_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_php_before_delete-lbl').closest('.control-group').hide();
+		jQuery('#jform_php_after_publish-lbl').closest('.control-group').hide();
-		// remove required attribute from php_before_delete field
+		// remove required attribute from php_after_publish field
 		if (!jform_vvvvvxxvxn_required)
 		{
-			updateFieldRequired('php_before_delete',1);
+			updateFieldRequired('php_after_publish',1);
-			jQuery('#jform_php_before_delete').removeAttr('required');
+			jQuery('#jform_php_after_publish').removeAttr('required');
-			jQuery('#jform_php_before_delete').removeAttr('aria-required');
+			jQuery('#jform_php_after_publish').removeAttr('aria-required');
-			jQuery('#jform_php_before_delete').removeClass('required');
+			jQuery('#jform_php_after_publish').removeClass('required');
 			jform_vvvvvxxvxn_required = true;
 		}
 	}
 }
 
 // the vvvvvxy function
-function vvvvvxy(add_php_after_delete_vvvvvxy)
+function vvvvvxy(add_php_before_delete_vvvvvxy)
 {
 	// set the function logic
-	if (add_php_after_delete_vvvvvxy == 1)
+	if (add_php_before_delete_vvvvvxy == 1)
 	{
-		jQuery('#jform_php_after_delete-lbl').closest('.control-group').show();
+		jQuery('#jform_php_before_delete-lbl').closest('.control-group').show();
-		// add required attribute to php_after_delete field
+		// add required attribute to php_before_delete field
 		if (jform_vvvvvxyvxo_required)
 		{
-			updateFieldRequired('php_after_delete',0);
+			updateFieldRequired('php_before_delete',0);
-			jQuery('#jform_php_after_delete').prop('required','required');
+			jQuery('#jform_php_before_delete').prop('required','required');
-			jQuery('#jform_php_after_delete').attr('aria-required',true);
+			jQuery('#jform_php_before_delete').attr('aria-required',true);
-			jQuery('#jform_php_after_delete').addClass('required');
+			jQuery('#jform_php_before_delete').addClass('required');
 			jform_vvvvvxyvxo_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_php_after_delete-lbl').closest('.control-group').hide();
+		jQuery('#jform_php_before_delete-lbl').closest('.control-group').hide();
-		// remove required attribute from php_after_delete field
+		// remove required attribute from php_before_delete field
 		if (!jform_vvvvvxyvxo_required)
 		{
-			updateFieldRequired('php_after_delete',1);
+			updateFieldRequired('php_before_delete',1);
-			jQuery('#jform_php_after_delete').removeAttr('required');
+			jQuery('#jform_php_before_delete').removeAttr('required');
-			jQuery('#jform_php_after_delete').removeAttr('aria-required');
+			jQuery('#jform_php_before_delete').removeAttr('aria-required');
-			jQuery('#jform_php_after_delete').removeClass('required');
+			jQuery('#jform_php_before_delete').removeClass('required');
 			jform_vvvvvxyvxo_required = true;
 		}
 	}
 }
 
 // the vvvvvxz function
-function vvvvvxz(add_php_document_vvvvvxz)
+function vvvvvxz(add_php_after_delete_vvvvvxz)
 {
 	// set the function logic
-	if (add_php_document_vvvvvxz == 1)
+	if (add_php_after_delete_vvvvvxz == 1)
 	{
-		jQuery('#jform_php_document-lbl').closest('.control-group').show();
+		jQuery('#jform_php_after_delete-lbl').closest('.control-group').show();
-		// add required attribute to php_document field
+		// add required attribute to php_after_delete field
 		if (jform_vvvvvxzvxp_required)
 		{
-			updateFieldRequired('php_document',0);
+			updateFieldRequired('php_after_delete',0);
-			jQuery('#jform_php_document').prop('required','required');
+			jQuery('#jform_php_after_delete').prop('required','required');
-			jQuery('#jform_php_document').attr('aria-required',true);
+			jQuery('#jform_php_after_delete').attr('aria-required',true);
-			jQuery('#jform_php_document').addClass('required');
+			jQuery('#jform_php_after_delete').addClass('required');
 			jform_vvvvvxzvxp_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_php_document-lbl').closest('.control-group').hide();
+		jQuery('#jform_php_after_delete-lbl').closest('.control-group').hide();
-		// remove required attribute from php_document field
+		// remove required attribute from php_after_delete field
 		if (!jform_vvvvvxzvxp_required)
 		{
-			updateFieldRequired('php_document',1);
+			updateFieldRequired('php_after_delete',1);
-			jQuery('#jform_php_document').removeAttr('required');
+			jQuery('#jform_php_after_delete').removeAttr('required');
-			jQuery('#jform_php_document').removeAttr('aria-required');
+			jQuery('#jform_php_after_delete').removeAttr('aria-required');
-			jQuery('#jform_php_document').removeClass('required');
+			jQuery('#jform_php_after_delete').removeClass('required');
 			jform_vvvvvxzvxp_required = true;
 		}
 	}
 }
 
 // the vvvvvya function
-function vvvvvya(add_sql_vvvvvya)
+function vvvvvya(add_php_document_vvvvvya)
 {
 	// set the function logic
-	if (add_sql_vvvvvya == 1)
+	if (add_php_document_vvvvvya == 1)
 	{
-		jQuery('#jform_source').closest('.control-group').show();
+		jQuery('#jform_php_document-lbl').closest('.control-group').show();
-		// add required attribute to source field
+		// add required attribute to php_document field
 		if (jform_vvvvvyavxq_required)
 		{
-			updateFieldRequired('source',0);
+			updateFieldRequired('php_document',0);
-			jQuery('#jform_source').prop('required','required');
+			jQuery('#jform_php_document').prop('required','required');
-			jQuery('#jform_source').attr('aria-required',true);
+			jQuery('#jform_php_document').attr('aria-required',true);
-			jQuery('#jform_source').addClass('required');
+			jQuery('#jform_php_document').addClass('required');
 			jform_vvvvvyavxq_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_source').closest('.control-group').hide();
+		jQuery('#jform_php_document-lbl').closest('.control-group').hide();
-		// remove required attribute from source field
+		// remove required attribute from php_document field
 		if (!jform_vvvvvyavxq_required)
 		{
-			updateFieldRequired('source',1);
+			updateFieldRequired('php_document',1);
-			jQuery('#jform_source').removeAttr('required');
+			jQuery('#jform_php_document').removeAttr('required');
-			jQuery('#jform_source').removeAttr('aria-required');
+			jQuery('#jform_php_document').removeAttr('aria-required');
-			jQuery('#jform_source').removeClass('required');
+			jQuery('#jform_php_document').removeClass('required');
 			jform_vvvvvyavxq_required = true;
 		}
 	}
 }
 
 // the vvvvvyb function
-function vvvvvyb(source_vvvvvyb,add_sql_vvvvvyb)
+function vvvvvyb(add_sql_vvvvvyb)
 {
 	// set the function logic
-	if (source_vvvvvyb == 2 && add_sql_vvvvvyb == 1)
+	if (add_sql_vvvvvyb == 1)
+	{
+		jQuery('#jform_source').closest('.control-group').show();
+		// add required attribute to source field
+		if (jform_vvvvvybvxr_required)
+		{
+			updateFieldRequired('source',0);
+			jQuery('#jform_source').prop('required','required');
+			jQuery('#jform_source').attr('aria-required',true);
+			jQuery('#jform_source').addClass('required');
+			jform_vvvvvybvxr_required = false;
+		}
+	}
+	else
+	{
+		jQuery('#jform_source').closest('.control-group').hide();
+		// remove required attribute from source field
+		if (!jform_vvvvvybvxr_required)
+		{
+			updateFieldRequired('source',1);
+			jQuery('#jform_source').removeAttr('required');
+			jQuery('#jform_source').removeAttr('aria-required');
+			jQuery('#jform_source').removeClass('required');
+			jform_vvvvvybvxr_required = true;
+		}
+	}
+}
+
+// the vvvvvyc function
+function vvvvvyc(source_vvvvvyc,add_sql_vvvvvyc)
+{
+	// set the function logic
+	if (source_vvvvvyc == 2 && add_sql_vvvvvyc == 1)
 	{
 		jQuery('#jform_sql').closest('.control-group').show();
 		// add required attribute to sql field
-		if (jform_vvvvvybvxr_required)
+		if (jform_vvvvvycvxs_required)
 		{
 			updateFieldRequired('sql',0);
 			jQuery('#jform_sql').prop('required','required');
 			jQuery('#jform_sql').attr('aria-required',true);
 			jQuery('#jform_sql').addClass('required');
-			jform_vvvvvybvxr_required = false;
+			jform_vvvvvycvxs_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_sql').closest('.control-group').hide();
 		// remove required attribute from sql field
-		if (!jform_vvvvvybvxr_required)
+		if (!jform_vvvvvycvxs_required)
 		{
 			updateFieldRequired('sql',1);
 			jQuery('#jform_sql').removeAttr('required');
 			jQuery('#jform_sql').removeAttr('aria-required');
 			jQuery('#jform_sql').removeClass('required');
-			jform_vvvvvybvxr_required = true;
+			jform_vvvvvycvxs_required = true;
 		}
 	}
 }
 
-// the vvvvvyd function
+// the vvvvvye function
-function vvvvvyd(source_vvvvvyd,add_sql_vvvvvyd)
+function vvvvvye(source_vvvvvye,add_sql_vvvvvye)
 {
 	// set the function logic
-	if (source_vvvvvyd == 1 && add_sql_vvvvvyd == 1)
+	if (source_vvvvvye == 1 && add_sql_vvvvvye == 1)
 	{
 		jQuery('#jform_addtables-lbl').closest('.control-group').show();
 	}
@@ -1027,165 +1063,165 @@ function vvvvvyd(source_vvvvvyd,add_sql_vvvvvyd)
 	}
 }
 
-// the vvvvvyf function
+// the vvvvvyg function
-function vvvvvyf(add_custom_import_vvvvvyf)
+function vvvvvyg(add_custom_import_vvvvvyg)
 {
 	// set the function logic
-	if (add_custom_import_vvvvvyf == 1)
+	if (add_custom_import_vvvvvyg == 1)
 	{
 		jQuery('#jform_html_import_view').closest('.control-group').show();
 		// add required attribute to html_import_view field
-		if (jform_vvvvvyfvxs_required)
+		if (jform_vvvvvygvxt_required)
 		{
 			updateFieldRequired('html_import_view',0);
 			jQuery('#jform_html_import_view').prop('required','required');
 			jQuery('#jform_html_import_view').attr('aria-required',true);
 			jQuery('#jform_html_import_view').addClass('required');
-			jform_vvvvvyfvxs_required = false;
+			jform_vvvvvygvxt_required = false;
 		}
 		jQuery('.note_advanced_import').closest('.control-group').show();
 		jQuery('#jform_php_import_display').closest('.control-group').show();
 		// add required attribute to php_import_display field
-		if (jform_vvvvvyfvxt_required)
+		if (jform_vvvvvygvxu_required)
 		{
 			updateFieldRequired('php_import_display',0);
 			jQuery('#jform_php_import_display').prop('required','required');
 			jQuery('#jform_php_import_display').attr('aria-required',true);
 			jQuery('#jform_php_import_display').addClass('required');
-			jform_vvvvvyfvxt_required = false;
+			jform_vvvvvygvxu_required = false;
 		}
 		jQuery('#jform_php_import_ext').closest('.control-group').show();
 		// add required attribute to php_import_ext field
-		if (jform_vvvvvyfvxu_required)
+		if (jform_vvvvvygvxv_required)
 		{
 			updateFieldRequired('php_import_ext',0);
 			jQuery('#jform_php_import_ext').prop('required','required');
 			jQuery('#jform_php_import_ext').attr('aria-required',true);
 			jQuery('#jform_php_import_ext').addClass('required');
-			jform_vvvvvyfvxu_required = false;
+			jform_vvvvvygvxv_required = false;
 		}
 		jQuery('#jform_php_import_headers').closest('.control-group').show();
 		// add required attribute to php_import_headers field
-		if (jform_vvvvvyfvxv_required)
+		if (jform_vvvvvygvxw_required)
 		{
 			updateFieldRequired('php_import_headers',0);
 			jQuery('#jform_php_import_headers').prop('required','required');
 			jQuery('#jform_php_import_headers').attr('aria-required',true);
 			jQuery('#jform_php_import_headers').addClass('required');
-			jform_vvvvvyfvxv_required = false;
+			jform_vvvvvygvxw_required = false;
 		}
 		jQuery('#jform_php_import').closest('.control-group').show();
 		// add required attribute to php_import field
-		if (jform_vvvvvyfvxw_required)
+		if (jform_vvvvvygvxx_required)
 		{
 			updateFieldRequired('php_import',0);
 			jQuery('#jform_php_import').prop('required','required');
 			jQuery('#jform_php_import').attr('aria-required',true);
 			jQuery('#jform_php_import').addClass('required');
-			jform_vvvvvyfvxw_required = false;
+			jform_vvvvvygvxx_required = false;
 		}
 		jQuery('#jform_php_import_save').closest('.control-group').show();
 		// add required attribute to php_import_save field
-		if (jform_vvvvvyfvxx_required)
+		if (jform_vvvvvygvxy_required)
 		{
 			updateFieldRequired('php_import_save',0);
 			jQuery('#jform_php_import_save').prop('required','required');
 			jQuery('#jform_php_import_save').attr('aria-required',true);
 			jQuery('#jform_php_import_save').addClass('required');
-			jform_vvvvvyfvxx_required = false;
+			jform_vvvvvygvxy_required = false;
 		}
 		jQuery('#jform_php_import_setdata').closest('.control-group').show();
 		// add required attribute to php_import_setdata field
-		if (jform_vvvvvyfvxy_required)
+		if (jform_vvvvvygvxz_required)
 		{
 			updateFieldRequired('php_import_setdata',0);
 			jQuery('#jform_php_import_setdata').prop('required','required');
 			jQuery('#jform_php_import_setdata').attr('aria-required',true);
 			jQuery('#jform_php_import_setdata').addClass('required');
-			jform_vvvvvyfvxy_required = false;
+			jform_vvvvvygvxz_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_html_import_view').closest('.control-group').hide();
 		// remove required attribute from html_import_view field
-		if (!jform_vvvvvyfvxs_required)
+		if (!jform_vvvvvygvxt_required)
 		{
 			updateFieldRequired('html_import_view',1);
 			jQuery('#jform_html_import_view').removeAttr('required');
 			jQuery('#jform_html_import_view').removeAttr('aria-required');
 			jQuery('#jform_html_import_view').removeClass('required');
-			jform_vvvvvyfvxs_required = true;
+			jform_vvvvvygvxt_required = true;
 		}
 		jQuery('.note_advanced_import').closest('.control-group').hide();
 		jQuery('#jform_php_import_display').closest('.control-group').hide();
 		// remove required attribute from php_import_display field
-		if (!jform_vvvvvyfvxt_required)
+		if (!jform_vvvvvygvxu_required)
 		{
 			updateFieldRequired('php_import_display',1);
 			jQuery('#jform_php_import_display').removeAttr('required');
 			jQuery('#jform_php_import_display').removeAttr('aria-required');
 			jQuery('#jform_php_import_display').removeClass('required');
-			jform_vvvvvyfvxt_required = true;
+			jform_vvvvvygvxu_required = true;
 		}
 		jQuery('#jform_php_import_ext').closest('.control-group').hide();
 		// remove required attribute from php_import_ext field
-		if (!jform_vvvvvyfvxu_required)
+		if (!jform_vvvvvygvxv_required)
 		{
 			updateFieldRequired('php_import_ext',1);
 			jQuery('#jform_php_import_ext').removeAttr('required');
 			jQuery('#jform_php_import_ext').removeAttr('aria-required');
 			jQuery('#jform_php_import_ext').removeClass('required');
-			jform_vvvvvyfvxu_required = true;
+			jform_vvvvvygvxv_required = true;
 		}
 		jQuery('#jform_php_import_headers').closest('.control-group').hide();
 		// remove required attribute from php_import_headers field
-		if (!jform_vvvvvyfvxv_required)
+		if (!jform_vvvvvygvxw_required)
 		{
 			updateFieldRequired('php_import_headers',1);
 			jQuery('#jform_php_import_headers').removeAttr('required');
 			jQuery('#jform_php_import_headers').removeAttr('aria-required');
 			jQuery('#jform_php_import_headers').removeClass('required');
-			jform_vvvvvyfvxv_required = true;
+			jform_vvvvvygvxw_required = true;
 		}
 		jQuery('#jform_php_import').closest('.control-group').hide();
 		// remove required attribute from php_import field
-		if (!jform_vvvvvyfvxw_required)
+		if (!jform_vvvvvygvxx_required)
 		{
 			updateFieldRequired('php_import',1);
 			jQuery('#jform_php_import').removeAttr('required');
 			jQuery('#jform_php_import').removeAttr('aria-required');
 			jQuery('#jform_php_import').removeClass('required');
-			jform_vvvvvyfvxw_required = true;
+			jform_vvvvvygvxx_required = true;
 		}
 		jQuery('#jform_php_import_save').closest('.control-group').hide();
 		// remove required attribute from php_import_save field
-		if (!jform_vvvvvyfvxx_required)
+		if (!jform_vvvvvygvxy_required)
 		{
 			updateFieldRequired('php_import_save',1);
 			jQuery('#jform_php_import_save').removeAttr('required');
 			jQuery('#jform_php_import_save').removeAttr('aria-required');
 			jQuery('#jform_php_import_save').removeClass('required');
-			jform_vvvvvyfvxx_required = true;
+			jform_vvvvvygvxy_required = true;
 		}
 		jQuery('#jform_php_import_setdata').closest('.control-group').hide();
 		// remove required attribute from php_import_setdata field
-		if (!jform_vvvvvyfvxy_required)
+		if (!jform_vvvvvygvxz_required)
 		{
 			updateFieldRequired('php_import_setdata',1);
 			jQuery('#jform_php_import_setdata').removeAttr('required');
 			jQuery('#jform_php_import_setdata').removeAttr('aria-required');
 			jQuery('#jform_php_import_setdata').removeClass('required');
-			jform_vvvvvyfvxy_required = true;
+			jform_vvvvvygvxz_required = true;
 		}
 	}
 }
 
-// the vvvvvyg function
+// the vvvvvyh function
-function vvvvvyg(add_custom_import_vvvvvyg)
+function vvvvvyh(add_custom_import_vvvvvyh)
 {
 	// set the function logic
-	if (add_custom_import_vvvvvyg == 0)
+	if (add_custom_import_vvvvvyh == 0)
 	{
 		jQuery('.note_beginner_import').closest('.control-group').show();
 	}
@@ -1195,52 +1231,52 @@ function vvvvvyg(add_custom_import_vvvvvyg)
 	}
 }
 
-// the vvvvvyh function
+// the vvvvvyi function
-function vvvvvyh(add_custom_button_vvvvvyh)
+function vvvvvyi(add_custom_button_vvvvvyi)
 {
 	// set the function logic
-	if (add_custom_button_vvvvvyh == 1)
+	if (add_custom_button_vvvvvyi == 1)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').show();
 		jQuery('#jform_php_controller-lbl').closest('.control-group').show();
 		// add required attribute to php_controller field
-		if (jform_vvvvvyhvxz_required)
+		if (jform_vvvvvyivya_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_vvvvvyhvxz_required = false;
+			jform_vvvvvyivya_required = false;
 		}
 		jQuery('#jform_php_controller_list-lbl').closest('.control-group').show();
 		// add required attribute to php_controller_list field
-		if (jform_vvvvvyhvya_required)
+		if (jform_vvvvvyivyb_required)
 		{
 			updateFieldRequired('php_controller_list',0);
 			jQuery('#jform_php_controller_list').prop('required','required');
 			jQuery('#jform_php_controller_list').attr('aria-required',true);
 			jQuery('#jform_php_controller_list').addClass('required');
-			jform_vvvvvyhvya_required = false;
+			jform_vvvvvyivyb_required = false;
 		}
 		jQuery('#jform_php_model-lbl').closest('.control-group').show();
 		// add required attribute to php_model field
-		if (jform_vvvvvyhvyb_required)
+		if (jform_vvvvvyivyc_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_vvvvvyhvyb_required = false;
+			jform_vvvvvyivyc_required = false;
 		}
 		jQuery('#jform_php_model_list-lbl').closest('.control-group').show();
 		// add required attribute to php_model_list field
-		if (jform_vvvvvyhvyc_required)
+		if (jform_vvvvvyivyd_required)
 		{
 			updateFieldRequired('php_model_list',0);
 			jQuery('#jform_php_model_list').prop('required','required');
 			jQuery('#jform_php_model_list').attr('aria-required',true);
 			jQuery('#jform_php_model_list').addClass('required');
-			jform_vvvvvyhvyc_required = false;
+			jform_vvvvvyivyd_required = false;
 		}
 	}
 	else
@@ -1248,43 +1284,43 @@ function vvvvvyh(add_custom_button_vvvvvyh)
 		jQuery('#jform_custom_button-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_controller-lbl').closest('.control-group').hide();
 		// remove required attribute from php_controller field
-		if (!jform_vvvvvyhvxz_required)
+		if (!jform_vvvvvyivya_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_vvvvvyhvxz_required = true;
+			jform_vvvvvyivya_required = true;
 		}
 		jQuery('#jform_php_controller_list-lbl').closest('.control-group').hide();
 		// remove required attribute from php_controller_list field
-		if (!jform_vvvvvyhvya_required)
+		if (!jform_vvvvvyivyb_required)
 		{
 			updateFieldRequired('php_controller_list',1);
 			jQuery('#jform_php_controller_list').removeAttr('required');
 			jQuery('#jform_php_controller_list').removeAttr('aria-required');
 			jQuery('#jform_php_controller_list').removeClass('required');
-			jform_vvvvvyhvya_required = true;
+			jform_vvvvvyivyb_required = true;
 		}
 		jQuery('#jform_php_model-lbl').closest('.control-group').hide();
 		// remove required attribute from php_model field
-		if (!jform_vvvvvyhvyb_required)
+		if (!jform_vvvvvyivyc_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_vvvvvyhvyb_required = true;
+			jform_vvvvvyivyc_required = true;
 		}
 		jQuery('#jform_php_model_list-lbl').closest('.control-group').hide();
 		// remove required attribute from php_model_list field
-		if (!jform_vvvvvyhvyc_required)
+		if (!jform_vvvvvyivyd_required)
 		{
 			updateFieldRequired('php_model_list',1);
 			jQuery('#jform_php_model_list').removeAttr('required');
 			jQuery('#jform_php_model_list').removeAttr('aria-required');
 			jQuery('#jform_php_model_list').removeClass('required');
-			jform_vvvvvyhvyc_required = true;
+			jform_vvvvvyivyd_required = true;
 		}
 	}
 }

admin/models/forms/custom_admin_view.js

@@ -9,7 +9,6 @@
  */
 
 // Some Global Values
-jform_vvvvvyivyd_required = false;
 jform_vvvvvyjvye_required = false;
 jform_vvvvvykvyf_required = false;
 jform_vvvvvylvyg_required = false;
@@ -17,294 +16,295 @@ jform_vvvvvymvyh_required = false;
 jform_vvvvvynvyi_required = false;
 jform_vvvvvyovyj_required = false;
 jform_vvvvvypvyk_required = false;
-jform_vvvvvypvyl_required = false;
+jform_vvvvvyqvyl_required = false;
 jform_vvvvvyqvym_required = false;
 jform_vvvvvyrvyn_required = false;
+jform_vvvvvysvyo_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var add_php_view_vvvvvyi = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvyj = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyi(add_php_view_vvvvvyi);
+	vvvvvyj(add_php_view_vvvvvyj);
 
-	var add_php_jview_display_vvvvvyj = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	var add_php_jview_display_vvvvvyk = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvyj(add_php_jview_display_vvvvvyj);
+	vvvvvyk(add_php_jview_display_vvvvvyk);
 
-	var add_php_jview_vvvvvyk = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	var add_php_jview_vvvvvyl = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyk(add_php_jview_vvvvvyk);
+	vvvvvyl(add_php_jview_vvvvvyl);
 
-	var add_php_document_vvvvvyl = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	var add_php_document_vvvvvym = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyl(add_php_document_vvvvvyl);
+	vvvvvym(add_php_document_vvvvvym);
 
-	var add_css_document_vvvvvym = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	var add_css_document_vvvvvyn = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvym(add_css_document_vvvvvym);
+	vvvvvyn(add_css_document_vvvvvyn);
 
-	var add_javascript_file_vvvvvyn = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	var add_javascript_file_vvvvvyo = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvyn(add_javascript_file_vvvvvyn);
+	vvvvvyo(add_javascript_file_vvvvvyo);
 
-	var add_js_document_vvvvvyo = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	var add_js_document_vvvvvyp = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyo(add_js_document_vvvvvyo);
+	vvvvvyp(add_js_document_vvvvvyp);
 
-	var add_custom_button_vvvvvyp = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	var add_custom_button_vvvvvyq = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyp(add_custom_button_vvvvvyp);
+	vvvvvyq(add_custom_button_vvvvvyq);
 
-	var add_css_vvvvvyq = jQuery("#jform_add_css input[type='radio']:checked").val();
+	var add_css_vvvvvyr = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyq(add_css_vvvvvyq);
+	vvvvvyr(add_css_vvvvvyr);
 
-	var add_php_ajax_vvvvvyr = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	var add_php_ajax_vvvvvys = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvyr(add_php_ajax_vvvvvyr);
+	vvvvvys(add_php_ajax_vvvvvys);
 });
 
-// the vvvvvyi function
+// the vvvvvyj function
-function vvvvvyi(add_php_view_vvvvvyi)
+function vvvvvyj(add_php_view_vvvvvyj)
 {
 	// set the function logic
-	if (add_php_view_vvvvvyi == 1)
+	if (add_php_view_vvvvvyj == 1)
 	{
 		jQuery('#jform_php_view-lbl').closest('.control-group').show();
 		// add required attribute to php_view field
-		if (jform_vvvvvyivyd_required)
+		if (jform_vvvvvyjvye_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_vvvvvyivyd_required = false;
+			jform_vvvvvyjvye_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_php_view-lbl').closest('.control-group').hide();
 		// remove required attribute from php_view field
-		if (!jform_vvvvvyivyd_required)
+		if (!jform_vvvvvyjvye_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_vvvvvyivyd_required = true;
-		}
-	}
-}
-
-// the vvvvvyj function
-function vvvvvyj(add_php_jview_display_vvvvvyj)
-{
-	// set the function logic
-	if (add_php_jview_display_vvvvvyj == 1)
-	{
-		jQuery('#jform_php_jview_display-lbl').closest('.control-group').show();
-		// add required attribute to php_jview_display field
-		if (jform_vvvvvyjvye_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_vvvvvyjvye_required = false;
-		}
-	}
-	else
-	{
-		jQuery('#jform_php_jview_display-lbl').closest('.control-group').hide();
-		// remove required attribute from php_jview_display field
-		if (!jform_vvvvvyjvye_required)
-		{
-			updateFieldRequired('php_jview_display',1);
-			jQuery('#jform_php_jview_display').removeAttr('required');
-			jQuery('#jform_php_jview_display').removeAttr('aria-required');
-			jQuery('#jform_php_jview_display').removeClass('required');
 			jform_vvvvvyjvye_required = true;
 		}
 	}
 }
 
 // the vvvvvyk function
-function vvvvvyk(add_php_jview_vvvvvyk)
+function vvvvvyk(add_php_jview_display_vvvvvyk)
 {
 	// set the function logic
-	if (add_php_jview_vvvvvyk == 1)
+	if (add_php_jview_display_vvvvvyk == 1)
 	{
-		jQuery('#jform_php_jview-lbl').closest('.control-group').show();
+		jQuery('#jform_php_jview_display-lbl').closest('.control-group').show();
-		// add required attribute to php_jview field
+		// add required attribute to php_jview_display field
 		if (jform_vvvvvykvyf_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_vvvvvykvyf_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_php_jview-lbl').closest('.control-group').hide();
+		jQuery('#jform_php_jview_display-lbl').closest('.control-group').hide();
-		// remove required attribute from php_jview field
+		// remove required attribute from php_jview_display field
 		if (!jform_vvvvvykvyf_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_vvvvvykvyf_required = true;
 		}
 	}
 }
 
 // the vvvvvyl function
-function vvvvvyl(add_php_document_vvvvvyl)
+function vvvvvyl(add_php_jview_vvvvvyl)
 {
 	// set the function logic
-	if (add_php_document_vvvvvyl == 1)
+	if (add_php_jview_vvvvvyl == 1)
 	{
-		jQuery('#jform_php_document-lbl').closest('.control-group').show();
+		jQuery('#jform_php_jview-lbl').closest('.control-group').show();
-		// add required attribute to php_document field
+		// add required attribute to php_jview field
 		if (jform_vvvvvylvyg_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_vvvvvylvyg_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_php_document-lbl').closest('.control-group').hide();
+		jQuery('#jform_php_jview-lbl').closest('.control-group').hide();
-		// remove required attribute from php_document field
+		// remove required attribute from php_jview field
 		if (!jform_vvvvvylvyg_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_vvvvvylvyg_required = true;
 		}
 	}
 }
 
 // the vvvvvym function
-function vvvvvym(add_css_document_vvvvvym)
+function vvvvvym(add_php_document_vvvvvym)
 {
 	// set the function logic
-	if (add_css_document_vvvvvym == 1)
+	if (add_php_document_vvvvvym == 1)
 	{
-		jQuery('#jform_css_document-lbl').closest('.control-group').show();
+		jQuery('#jform_php_document-lbl').closest('.control-group').show();
-		// add required attribute to css_document field
+		// add required attribute to php_document field
 		if (jform_vvvvvymvyh_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_vvvvvymvyh_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_css_document-lbl').closest('.control-group').hide();
+		jQuery('#jform_php_document-lbl').closest('.control-group').hide();
-		// remove required attribute from css_document field
+		// remove required attribute from php_document field
 		if (!jform_vvvvvymvyh_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_vvvvvymvyh_required = true;
 		}
 	}
 }
 
 // the vvvvvyn function
-function vvvvvyn(add_javascript_file_vvvvvyn)
+function vvvvvyn(add_css_document_vvvvvyn)
 {
 	// set the function logic
-	if (add_javascript_file_vvvvvyn == 1)
+	if (add_css_document_vvvvvyn == 1)
 	{
-		jQuery('#jform_javascript_file-lbl').closest('.control-group').show();
+		jQuery('#jform_css_document-lbl').closest('.control-group').show();
-		// add required attribute to javascript_file field
+		// add required attribute to css_document field
 		if (jform_vvvvvynvyi_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_vvvvvynvyi_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_javascript_file-lbl').closest('.control-group').hide();
+		jQuery('#jform_css_document-lbl').closest('.control-group').hide();
-		// remove required attribute from javascript_file field
+		// remove required attribute from css_document field
 		if (!jform_vvvvvynvyi_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_vvvvvynvyi_required = true;
 		}
 	}
 }
 
 // the vvvvvyo function
-function vvvvvyo(add_js_document_vvvvvyo)
+function vvvvvyo(add_javascript_file_vvvvvyo)
 {
 	// set the function logic
-	if (add_js_document_vvvvvyo == 1)
+	if (add_javascript_file_vvvvvyo == 1)
 	{
-		jQuery('#jform_js_document-lbl').closest('.control-group').show();
+		jQuery('#jform_javascript_file-lbl').closest('.control-group').show();
-		// add required attribute to js_document field
+		// add required attribute to javascript_file field
 		if (jform_vvvvvyovyj_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_vvvvvyovyj_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_js_document-lbl').closest('.control-group').hide();
+		jQuery('#jform_javascript_file-lbl').closest('.control-group').hide();
-		// remove required attribute from js_document field
+		// remove required attribute from javascript_file field
 		if (!jform_vvvvvyovyj_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_vvvvvyovyj_required = true;
 		}
 	}
 }
 
 // the vvvvvyp function
-function vvvvvyp(add_custom_button_vvvvvyp)
+function vvvvvyp(add_js_document_vvvvvyp)
 {
 	// set the function logic
-	if (add_custom_button_vvvvvyp == 1)
+	if (add_js_document_vvvvvyp == 1)
+	{
+		jQuery('#jform_js_document-lbl').closest('.control-group').show();
+		// add required attribute to js_document field
+		if (jform_vvvvvypvyk_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_vvvvvypvyk_required = false;
+		}
+	}
+	else
+	{
+		jQuery('#jform_js_document-lbl').closest('.control-group').hide();
+		// remove required attribute from js_document field
+		if (!jform_vvvvvypvyk_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_vvvvvypvyk_required = true;
+		}
+	}
+}
+
+// the vvvvvyq function
+function vvvvvyq(add_custom_button_vvvvvyq)
+{
+	// set the function logic
+	if (add_custom_button_vvvvvyq == 1)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').show();
 		jQuery('#jform_php_controller-lbl').closest('.control-group').show();
 		// add required attribute to php_controller field
-		if (jform_vvvvvypvyk_required)
+		if (jform_vvvvvyqvyl_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_vvvvvypvyk_required = false;
+			jform_vvvvvyqvyl_required = false;
 		}
 		jQuery('#jform_php_model-lbl').closest('.control-group').show();
 		// add required attribute to php_model field
-		if (jform_vvvvvypvyl_required)
+		if (jform_vvvvvyqvym_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_vvvvvypvyl_required = false;
+			jform_vvvvvyqvym_required = false;
 		}
 	}
 	else
@@ -312,75 +312,75 @@ function vvvvvyp(add_custom_button_vvvvvyp)
 		jQuery('#jform_custom_button-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_controller-lbl').closest('.control-group').hide();
 		// remove required attribute from php_controller field
-		if (!jform_vvvvvypvyk_required)
+		if (!jform_vvvvvyqvyl_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_vvvvvypvyk_required = true;
+			jform_vvvvvyqvyl_required = true;
 		}
 		jQuery('#jform_php_model-lbl').closest('.control-group').hide();
 		// remove required attribute from php_model field
-		if (!jform_vvvvvypvyl_required)
+		if (!jform_vvvvvyqvym_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_vvvvvypvyl_required = true;
-		}
-	}
-}
-
-// the vvvvvyq function
-function vvvvvyq(add_css_vvvvvyq)
-{
-	// set the function logic
-	if (add_css_vvvvvyq == 1)
-	{
-		jQuery('#jform_css-lbl').closest('.control-group').show();
-		// add required attribute to css field
-		if (jform_vvvvvyqvym_required)
-		{
-			updateFieldRequired('css',0);
-			jQuery('#jform_css').prop('required','required');
-			jQuery('#jform_css').attr('aria-required',true);
-			jQuery('#jform_css').addClass('required');
-			jform_vvvvvyqvym_required = false;
-		}
-	}
-	else
-	{
-		jQuery('#jform_css-lbl').closest('.control-group').hide();
-		// remove required attribute from css field
-		if (!jform_vvvvvyqvym_required)
-		{
-			updateFieldRequired('css',1);
-			jQuery('#jform_css').removeAttr('required');
-			jQuery('#jform_css').removeAttr('aria-required');
-			jQuery('#jform_css').removeClass('required');
 			jform_vvvvvyqvym_required = true;
 		}
 	}
 }
 
 // the vvvvvyr function
-function vvvvvyr(add_php_ajax_vvvvvyr)
+function vvvvvyr(add_css_vvvvvyr)
 {
 	// set the function logic
-	if (add_php_ajax_vvvvvyr == 1)
+	if (add_css_vvvvvyr == 1)
+	{
+		jQuery('#jform_css-lbl').closest('.control-group').show();
+		// add required attribute to css field
+		if (jform_vvvvvyrvyn_required)
+		{
+			updateFieldRequired('css',0);
+			jQuery('#jform_css').prop('required','required');
+			jQuery('#jform_css').attr('aria-required',true);
+			jQuery('#jform_css').addClass('required');
+			jform_vvvvvyrvyn_required = false;
+		}
+	}
+	else
+	{
+		jQuery('#jform_css-lbl').closest('.control-group').hide();
+		// remove required attribute from css field
+		if (!jform_vvvvvyrvyn_required)
+		{
+			updateFieldRequired('css',1);
+			jQuery('#jform_css').removeAttr('required');
+			jQuery('#jform_css').removeAttr('aria-required');
+			jQuery('#jform_css').removeClass('required');
+			jform_vvvvvyrvyn_required = true;
+		}
+	}
+}
+
+// the vvvvvys function
+function vvvvvys(add_php_ajax_vvvvvys)
+{
+	// set the function logic
+	if (add_php_ajax_vvvvvys == 1)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').show();
 		jQuery('#jform_php_ajaxmethod-lbl').closest('.control-group').show();
 		// add required attribute to php_ajaxmethod field
-		if (jform_vvvvvyrvyn_required)
+		if (jform_vvvvvysvyo_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_vvvvvyrvyn_required = false;
+			jform_vvvvvysvyo_required = false;
 		}
 	}
 	else
@@ -388,13 +388,13 @@ function vvvvvyr(add_php_ajax_vvvvvyr)
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_ajaxmethod-lbl').closest('.control-group').hide();
 		// remove required attribute from php_ajaxmethod field
-		if (!jform_vvvvvyrvyn_required)
+		if (!jform_vvvvvysvyo_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_vvvvvyrvyn_required = true;
+			jform_vvvvvysvyo_required = true;
 		}
 	}
 }

admin/models/forms/custom_code.js

@@ -9,44 +9,44 @@
  */
 
 // Some Global Values
-jform_vvvvwagvzv_required = false;
 jform_vvvvwahvzw_required = false;
-jform_vvvvwahvzx_required = false;
+jform_vvvvwaivzx_required = false;
-jform_vvvvwahvzy_required = false;
+jform_vvvvwaivzy_required = false;
+jform_vvvvwaivzz_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var target_vvvvwag = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwag(target_vvvvwag);
-
 	var target_vvvvwah = jQuery("#jform_target input[type='radio']:checked").val();
 	vvvvwah(target_vvvvwah);
 
 	var target_vvvvwai = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvwai = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwai(target_vvvvwai);
-	vvvvwai(target_vvvvwai,type_vvvvwai);
 
-	var type_vvvvwaj = jQuery("#jform_type input[type='radio']:checked").val();
 	var target_vvvvwaj = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwaj(type_vvvvwaj,target_vvvvwaj);
+	var type_vvvvwaj = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwaj(target_vvvvwaj,type_vvvvwaj);
+
+	var type_vvvvwak = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwak = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwak(type_vvvvwak,target_vvvvwak);
 });
 
-// the vvvvwag function
+// the vvvvwah function
-function vvvvwag(target_vvvvwag)
+function vvvvwah(target_vvvvwah)
 {
 	// set the function logic
-	if (target_vvvvwag == 2)
+	if (target_vvvvwah == 2)
 	{
 		jQuery('#jform_function_name').closest('.control-group').show();
 		// add required attribute to function_name field
-		if (jform_vvvvwagvzv_required)
+		if (jform_vvvvwahvzw_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_vvvvwagvzv_required = false;
+			jform_vvvvwahvzw_required = false;
 		}
 		jQuery('.note_jcb_placeholder').closest('.control-group').show();
 		jQuery('#jform_system_name').closest('.control-group').show();
@@ -55,102 +55,102 @@ function vvvvwag(target_vvvvwag)
 	{
 		jQuery('#jform_function_name').closest('.control-group').hide();
 		// remove required attribute from function_name field
-		if (!jform_vvvvwagvzv_required)
+		if (!jform_vvvvwahvzw_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_vvvvwagvzv_required = true;
+			jform_vvvvwahvzw_required = true;
 		}
 		jQuery('.note_jcb_placeholder').closest('.control-group').hide();
 		jQuery('#jform_system_name').closest('.control-group').hide();
 	}
 }
 
-// the vvvvwah function
+// the vvvvwai function
-function vvvvwah(target_vvvvwah)
+function vvvvwai(target_vvvvwai)
 {
 	// set the function logic
-	if (target_vvvvwah == 1)
+	if (target_vvvvwai == 1)
 	{
 		jQuery('#jform_component').closest('.control-group').show();
 		// add required attribute to component field
-		if (jform_vvvvwahvzw_required)
+		if (jform_vvvvwaivzx_required)
 		{
 			updateFieldRequired('component',0);
 			jQuery('#jform_component').prop('required','required');
 			jQuery('#jform_component').attr('aria-required',true);
 			jQuery('#jform_component').addClass('required');
-			jform_vvvvwahvzw_required = false;
+			jform_vvvvwaivzx_required = false;
 		}
 		jQuery('#jform_path').closest('.control-group').show();
 		// add required attribute to path field
-		if (jform_vvvvwahvzx_required)
+		if (jform_vvvvwaivzy_required)
 		{
 			updateFieldRequired('path',0);
 			jQuery('#jform_path').prop('required','required');
 			jQuery('#jform_path').attr('aria-required',true);
 			jQuery('#jform_path').addClass('required');
-			jform_vvvvwahvzx_required = false;
+			jform_vvvvwaivzy_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();
 		// add required attribute to type field
-		if (jform_vvvvwahvzy_required)
+		if (jform_vvvvwaivzz_required)
 		{
 			updateFieldRequired('type',0);
 			jQuery('#jform_type').prop('required','required');
 			jQuery('#jform_type').attr('aria-required',true);
 			jQuery('#jform_type').addClass('required');
-			jform_vvvvwahvzy_required = false;
+			jform_vvvvwaivzz_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_component').closest('.control-group').hide();
 		// remove required attribute from component field
-		if (!jform_vvvvwahvzw_required)
+		if (!jform_vvvvwaivzx_required)
 		{
 			updateFieldRequired('component',1);
 			jQuery('#jform_component').removeAttr('required');
 			jQuery('#jform_component').removeAttr('aria-required');
 			jQuery('#jform_component').removeClass('required');
-			jform_vvvvwahvzw_required = true;
+			jform_vvvvwaivzx_required = true;
 		}
 		jQuery('#jform_path').closest('.control-group').hide();
 		// remove required attribute from path field
-		if (!jform_vvvvwahvzx_required)
+		if (!jform_vvvvwaivzy_required)
 		{
 			updateFieldRequired('path',1);
 			jQuery('#jform_path').removeAttr('required');
 			jQuery('#jform_path').removeAttr('aria-required');
 			jQuery('#jform_path').removeClass('required');
-			jform_vvvvwahvzx_required = true;
+			jform_vvvvwaivzy_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();
 		// remove required attribute from type field
-		if (!jform_vvvvwahvzy_required)
+		if (!jform_vvvvwaivzz_required)
 		{
 			updateFieldRequired('type',1);
 			jQuery('#jform_type').removeAttr('required');
 			jQuery('#jform_type').removeAttr('aria-required');
 			jQuery('#jform_type').removeClass('required');
-			jform_vvvvwahvzy_required = true;
+			jform_vvvvwaivzz_required = true;
 		}
 	}
 }
 
-// the vvvvwai function
+// the vvvvwaj function
-function vvvvwai(target_vvvvwai,type_vvvvwai)
+function vvvvwaj(target_vvvvwaj,type_vvvvwaj)
 {
 	// set the function logic
-	if (target_vvvvwai == 1 && type_vvvvwai == 1)
+	if (target_vvvvwaj == 1 && type_vvvvwaj == 1)
 	{
 		jQuery('#jform_hashendtarget').closest('.control-group').show();
 		jQuery('#jform_to_line').closest('.control-group').show();
@@ -162,11 +162,11 @@ function vvvvwai(target_vvvvwai,type_vvvvwai)
 	}
 }
 
-// the vvvvwaj function
+// the vvvvwak function
-function vvvvwaj(type_vvvvwaj,target_vvvvwaj)
+function vvvvwak(type_vvvvwak,target_vvvvwak)
 {
 	// set the function logic
-	if (type_vvvvwaj == 1 && target_vvvvwaj == 1)
+	if (type_vvvvwak == 1 && target_vvvvwak == 1)
 	{
 		jQuery('#jform_hashendtarget').closest('.control-group').show();
 		jQuery('#jform_to_line').closest('.control-group').show();

admin/models/forms/field.js

@@ -9,61 +9,61 @@
  */
 
 // Some Global Values
-jform_vvvvwaswab_required = false;
 jform_vvvvwatwac_required = false;
 jform_vvvvwauwad_required = false;
 jform_vvvvwavwae_required = false;
-jform_vvvvwaywaf_required = false;
+jform_vvvvwawwaf_required = false;
 jform_vvvvwazwag_required = false;
 jform_vvvvwbawah_required = false;
 jform_vvvvwbbwai_required = false;
+jform_vvvvwbcwaj_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var datalenght_vvvvwas = jQuery("#jform_datalenght").val();
+	var datalenght_vvvvwat = jQuery("#jform_datalenght").val();
-	vvvvwas(datalenght_vvvvwas);
+	vvvvwat(datalenght_vvvvwat);
 
-	var datadefault_vvvvwat = jQuery("#jform_datadefault").val();
+	var datadefault_vvvvwau = jQuery("#jform_datadefault").val();
-	vvvvwat(datadefault_vvvvwat);
+	vvvvwau(datadefault_vvvvwau);
-
-	var datatype_vvvvwau = jQuery("#jform_datatype").val();
-	vvvvwau(datatype_vvvvwau);
 
 	var datatype_vvvvwav = jQuery("#jform_datatype").val();
 	vvvvwav(datatype_vvvvwav);
 
-	var store_vvvvwaw = jQuery("#jform_store").val();
 	var datatype_vvvvwaw = jQuery("#jform_datatype").val();
-	vvvvwaw(store_vvvvwaw,datatype_vvvvwaw);
+	vvvvwaw(datatype_vvvvwaw);
 
-	var add_css_view_vvvvway = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	var store_vvvvwax = jQuery("#jform_store").val();
-	vvvvway(add_css_view_vvvvway);
+	var datatype_vvvvwax = jQuery("#jform_datatype").val();
+	vvvvwax(store_vvvvwax,datatype_vvvvwax);
 
-	var add_css_views_vvvvwaz = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	var add_css_view_vvvvwaz = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvwaz(add_css_views_vvvvwaz);
+	vvvvwaz(add_css_view_vvvvwaz);
 
-	var add_javascript_view_footer_vvvvwba = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	var add_css_views_vvvvwba = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvwba(add_javascript_view_footer_vvvvwba);
+	vvvvwba(add_css_views_vvvvwba);
 
-	var add_javascript_views_footer_vvvvwbb = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	var add_javascript_view_footer_vvvvwbb = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvwbb(add_javascript_views_footer_vvvvwbb);
+	vvvvwbb(add_javascript_view_footer_vvvvwbb);
+
+	var add_javascript_views_footer_vvvvwbc = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	vvvvwbc(add_javascript_views_footer_vvvvwbc);
 });
 
-// the vvvvwas function
+// the vvvvwat function
-function vvvvwas(datalenght_vvvvwas)
+function vvvvwat(datalenght_vvvvwat)
 {
-	if (isSet(datalenght_vvvvwas) && datalenght_vvvvwas.constructor !== Array)
+	if (isSet(datalenght_vvvvwat) && datalenght_vvvvwat.constructor !== Array)
 	{
-		var temp_vvvvwas = datalenght_vvvvwas;
+		var temp_vvvvwat = datalenght_vvvvwat;
-		var datalenght_vvvvwas = [];
+		var datalenght_vvvvwat = [];
-		datalenght_vvvvwas.push(temp_vvvvwas);
+		datalenght_vvvvwat.push(temp_vvvvwat);
 	}
-	else if (!isSet(datalenght_vvvvwas))
+	else if (!isSet(datalenght_vvvvwat))
 	{
-		var datalenght_vvvvwas = [];
+		var datalenght_vvvvwat = [];
 	}
-	var datalenght = datalenght_vvvvwas.some(datalenght_vvvvwas_SomeFunc);
+	var datalenght = datalenght_vvvvwat.some(datalenght_vvvvwat_SomeFunc);
 
 
 	// set this function logic
@@ -71,91 +71,35 @@ function vvvvwas(datalenght_vvvvwas)
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').show();
 		// add required attribute to datalenght_other field
-		if (jform_vvvvwaswab_required)
+		if (jform_vvvvwatwac_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_vvvvwaswab_required = false;
+			jform_vvvvwatwac_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').hide();
 		// remove required attribute from datalenght_other field
-		if (!jform_vvvvwaswab_required)
+		if (!jform_vvvvwatwac_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_vvvvwaswab_required = true;
-		}
-	}
-}
-
-// the vvvvwas Some function
-function datalenght_vvvvwas_SomeFunc(datalenght_vvvvwas)
-{
-	// set the function logic
-	if (datalenght_vvvvwas == 'Other')
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvwat function
-function vvvvwat(datadefault_vvvvwat)
-{
-	if (isSet(datadefault_vvvvwat) && datadefault_vvvvwat.constructor !== Array)
-	{
-		var temp_vvvvwat = datadefault_vvvvwat;
-		var datadefault_vvvvwat = [];
-		datadefault_vvvvwat.push(temp_vvvvwat);
-	}
-	else if (!isSet(datadefault_vvvvwat))
-	{
-		var datadefault_vvvvwat = [];
-	}
-	var datadefault = datadefault_vvvvwat.some(datadefault_vvvvwat_SomeFunc);
-
-
-	// set this function logic
-	if (datadefault)
-	{
-		jQuery('#jform_datadefault_other').closest('.control-group').show();
-		// add required attribute to datadefault_other field
-		if (jform_vvvvwatwac_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_vvvvwatwac_required = false;
-		}
-	}
-	else
-	{
-		jQuery('#jform_datadefault_other').closest('.control-group').hide();
-		// remove required attribute from datadefault_other field
-		if (!jform_vvvvwatwac_required)
-		{
-			updateFieldRequired('datadefault_other',1);
-			jQuery('#jform_datadefault_other').removeAttr('required');
-			jQuery('#jform_datadefault_other').removeAttr('aria-required');
-			jQuery('#jform_datadefault_other').removeClass('required');
 			jform_vvvvwatwac_required = true;
 		}
 	}
 }
 
 // the vvvvwat Some function
-function datadefault_vvvvwat_SomeFunc(datadefault_vvvvwat)
+function datalenght_vvvvwat_SomeFunc(datalenght_vvvvwat)
 {
 	// set the function logic
-	if (datadefault_vvvvwat == 'Other')
+	if (datalenght_vvvvwat == 'Other')
 	{
 		return true;
 	}
@@ -163,59 +107,55 @@ function datadefault_vvvvwat_SomeFunc(datadefault_vvvvwat)
 }
 
 // the vvvvwau function
-function vvvvwau(datatype_vvvvwau)
+function vvvvwau(datadefault_vvvvwau)
 {
-	if (isSet(datatype_vvvvwau) && datatype_vvvvwau.constructor !== Array)
+	if (isSet(datadefault_vvvvwau) && datadefault_vvvvwau.constructor !== Array)
 	{
-		var temp_vvvvwau = datatype_vvvvwau;
+		var temp_vvvvwau = datadefault_vvvvwau;
-		var datatype_vvvvwau = [];
+		var datadefault_vvvvwau = [];
-		datatype_vvvvwau.push(temp_vvvvwau);
+		datadefault_vvvvwau.push(temp_vvvvwau);
 	}
-	else if (!isSet(datatype_vvvvwau))
+	else if (!isSet(datadefault_vvvvwau))
 	{
-		var datatype_vvvvwau = [];
+		var datadefault_vvvvwau = [];
 	}
-	var datatype = datatype_vvvvwau.some(datatype_vvvvwau_SomeFunc);
+	var datadefault = datadefault_vvvvwau.some(datadefault_vvvvwau_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();
+		// add required attribute to datadefault_other field
-		jQuery('#jform_indexes').closest('.control-group').show();
-		// add required attribute to indexes field
 		if (jform_vvvvwauwad_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_vvvvwauwad_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();
+		// remove required attribute from datadefault_other field
-		jQuery('#jform_indexes').closest('.control-group').hide();
-		// remove required attribute from indexes field
 		if (!jform_vvvvwauwad_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_vvvvwauwad_required = true;
 		}
 	}
 }
 
 // the vvvvwau Some function
-function datatype_vvvvwau_SomeFunc(datatype_vvvvwau)
+function datadefault_vvvvwau_SomeFunc(datadefault_vvvvwau)
 {
 	// set the function logic
-	if (datatype_vvvvwau == 'CHAR' || datatype_vvvvwau == 'VARCHAR' || datatype_vvvvwau == 'DATETIME' || datatype_vvvvwau == 'DATE' || datatype_vvvvwau == 'TIME' || datatype_vvvvwau == 'INT' || datatype_vvvvwau == 'TINYINT' || datatype_vvvvwau == 'BIGINT' || datatype_vvvvwau == 'FLOAT' || datatype_vvvvwau == 'DECIMAL' || datatype_vvvvwau == 'DOUBLE')
+	if (datadefault_vvvvwau == 'Other')
 	{
 		return true;
 	}
@@ -241,27 +181,31 @@ function vvvvwav(datatype_vvvvwav)
 	// set this function logic
 	if (datatype)
 	{
-		jQuery('#jform_store').closest('.control-group').show();
+		jQuery('#jform_datadefault').closest('.control-group').show();
-		// add required attribute to store field
+		jQuery('#jform_datalenght').closest('.control-group').show();
+		jQuery('#jform_indexes').closest('.control-group').show();
+		// add required attribute to indexes field
 		if (jform_vvvvwavwae_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_vvvvwavwae_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_store').closest('.control-group').hide();
+		jQuery('#jform_datadefault').closest('.control-group').hide();
-		// remove required attribute from store field
+		jQuery('#jform_datalenght').closest('.control-group').hide();
+		jQuery('#jform_indexes').closest('.control-group').hide();
+		// remove required attribute from indexes field
 		if (!jform_vvvvwavwae_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_vvvvwavwae_required = true;
 		}
 	}
@@ -271,7 +215,7 @@ function vvvvwav(datatype_vvvvwav)
 function datatype_vvvvwav_SomeFunc(datatype_vvvvwav)
 {
 	// set the function logic
-	if (datatype_vvvvwav == 'CHAR' || datatype_vvvvwav == 'VARCHAR' || datatype_vvvvwav == 'TEXT' || datatype_vvvvwav == 'MEDIUMTEXT' || datatype_vvvvwav == 'LONGTEXT' || datatype_vvvvwav == 'BLOB' || datatype_vvvvwav == 'TINYBLOB' || datatype_vvvvwav == 'MEDIUMBLOB' || datatype_vvvvwav == 'LONGBLOB')
+	if (datatype_vvvvwav == 'CHAR' || datatype_vvvvwav == 'VARCHAR' || datatype_vvvvwav == 'DATETIME' || datatype_vvvvwav == 'DATE' || datatype_vvvvwav == 'TIME' || datatype_vvvvwav == 'INT' || datatype_vvvvwav == 'TINYINT' || datatype_vvvvwav == 'BIGINT' || datatype_vvvvwav == 'FLOAT' || datatype_vvvvwav == 'DECIMAL' || datatype_vvvvwav == 'DOUBLE')
 	{
 		return true;
 	}
@@ -279,20 +223,8 @@ function datatype_vvvvwav_SomeFunc(datatype_vvvvwav)
 }
 
 // the vvvvwaw function
-function vvvvwaw(store_vvvvwaw,datatype_vvvvwaw)
+function vvvvwaw(datatype_vvvvwaw)
 {
-	if (isSet(store_vvvvwaw) && store_vvvvwaw.constructor !== Array)
-	{
-		var temp_vvvvwaw = store_vvvvwaw;
-		var store_vvvvwaw = [];
-		store_vvvvwaw.push(temp_vvvvwaw);
-	}
-	else if (!isSet(store_vvvvwaw))
-	{
-		var store_vvvvwaw = [];
-	}
-	var store = store_vvvvwaw.some(store_vvvvwaw_SomeFunc);
-
 	if (isSet(datatype_vvvvwaw) && datatype_vvvvwaw.constructor !== Array)
 	{
 		var temp_vvvvwaw = datatype_vvvvwaw;
@@ -307,25 +239,32 @@ function vvvvwaw(store_vvvvwaw,datatype_vvvvwaw)
 
 
 	// set this function logic
-	if (store && datatype)
+	if (datatype)
 	{
-		jQuery('.note_whmcs_encryption').closest('.control-group').show();
+		jQuery('#jform_store').closest('.control-group').show();
+		// add required attribute to store field
+		if (jform_vvvvwawwaf_required)
+		{
+			updateFieldRequired('store',0);
+			jQuery('#jform_store').prop('required','required');
+			jQuery('#jform_store').attr('aria-required',true);
+			jQuery('#jform_store').addClass('required');
+			jform_vvvvwawwaf_required = false;
+		}
 	}
 	else
 	{
-		jQuery('.note_whmcs_encryption').closest('.control-group').hide();
+		jQuery('#jform_store').closest('.control-group').hide();
-	}
+		// remove required attribute from store field
-}
+		if (!jform_vvvvwawwaf_required)
-
-// the vvvvwaw Some function
-function store_vvvvwaw_SomeFunc(store_vvvvwaw)
-{
-	// set the function logic
-	if (store_vvvvwaw == 4)
 		{
-		return true;
+			updateFieldRequired('store',1);
+			jQuery('#jform_store').removeAttr('required');
+			jQuery('#jform_store').removeAttr('aria-required');
+			jQuery('#jform_store').removeClass('required');
+			jform_vvvvwawwaf_required = true;
+		}
 	}
-	return false;
 }
 
 // the vvvvwaw Some function
@@ -339,130 +278,191 @@ function datatype_vvvvwaw_SomeFunc(datatype_vvvvwaw)
 	return false;
 }
 
-// the vvvvway function
+// the vvvvwax function
-function vvvvway(add_css_view_vvvvway)
+function vvvvwax(store_vvvvwax,datatype_vvvvwax)
+{
+	if (isSet(store_vvvvwax) && store_vvvvwax.constructor !== Array)
+	{
+		var temp_vvvvwax = store_vvvvwax;
+		var store_vvvvwax = [];
+		store_vvvvwax.push(temp_vvvvwax);
+	}
+	else if (!isSet(store_vvvvwax))
+	{
+		var store_vvvvwax = [];
+	}
+	var store = store_vvvvwax.some(store_vvvvwax_SomeFunc);
+
+	if (isSet(datatype_vvvvwax) && datatype_vvvvwax.constructor !== Array)
+	{
+		var temp_vvvvwax = datatype_vvvvwax;
+		var datatype_vvvvwax = [];
+		datatype_vvvvwax.push(temp_vvvvwax);
+	}
+	else if (!isSet(datatype_vvvvwax))
+	{
+		var datatype_vvvvwax = [];
+	}
+	var datatype = datatype_vvvvwax.some(datatype_vvvvwax_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 vvvvwax Some function
+function store_vvvvwax_SomeFunc(store_vvvvwax)
 {
 	// set the function logic
-	if (add_css_view_vvvvway == 1)
+	if (store_vvvvwax == 4)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwax Some function
+function datatype_vvvvwax_SomeFunc(datatype_vvvvwax)
+{
+	// set the function logic
+	if (datatype_vvvvwax == 'CHAR' || datatype_vvvvwax == 'VARCHAR' || datatype_vvvvwax == 'TEXT' || datatype_vvvvwax == 'MEDIUMTEXT' || datatype_vvvvwax == 'LONGTEXT' || datatype_vvvvwax == 'BLOB' || datatype_vvvvwax == 'TINYBLOB' || datatype_vvvvwax == 'MEDIUMBLOB' || datatype_vvvvwax == 'LONGBLOB')
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwaz function
+function vvvvwaz(add_css_view_vvvvwaz)
+{
+	// set the function logic
+	if (add_css_view_vvvvwaz == 1)
 	{
 		jQuery('#jform_css_view-lbl').closest('.control-group').show();
 		// add required attribute to css_view field
-		if (jform_vvvvwaywaf_required)
+		if (jform_vvvvwazwag_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_vvvvwaywaf_required = false;
+			jform_vvvvwazwag_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_css_view-lbl').closest('.control-group').hide();
 		// remove required attribute from css_view field
-		if (!jform_vvvvwaywaf_required)
+		if (!jform_vvvvwazwag_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_vvvvwaywaf_required = true;
-		}
-	}
-}
-
-// the vvvvwaz function
-function vvvvwaz(add_css_views_vvvvwaz)
-{
-	// set the function logic
-	if (add_css_views_vvvvwaz == 1)
-	{
-		jQuery('#jform_css_views-lbl').closest('.control-group').show();
-		// add required attribute to css_views field
-		if (jform_vvvvwazwag_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_vvvvwazwag_required = false;
-		}
-	}
-	else
-	{
-		jQuery('#jform_css_views-lbl').closest('.control-group').hide();
-		// remove required attribute from css_views field
-		if (!jform_vvvvwazwag_required)
-		{
-			updateFieldRequired('css_views',1);
-			jQuery('#jform_css_views').removeAttr('required');
-			jQuery('#jform_css_views').removeAttr('aria-required');
-			jQuery('#jform_css_views').removeClass('required');
 			jform_vvvvwazwag_required = true;
 		}
 	}
 }
 
 // the vvvvwba function
-function vvvvwba(add_javascript_view_footer_vvvvwba)
+function vvvvwba(add_css_views_vvvvwba)
 {
 	// set the function logic
-	if (add_javascript_view_footer_vvvvwba == 1)
+	if (add_css_views_vvvvwba == 1)
 	{
-		jQuery('#jform_javascript_view_footer-lbl').closest('.control-group').show();
+		jQuery('#jform_css_views-lbl').closest('.control-group').show();
-		// add required attribute to javascript_view_footer field
+		// add required attribute to css_views field
 		if (jform_vvvvwbawah_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_vvvvwbawah_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_javascript_view_footer-lbl').closest('.control-group').hide();
+		jQuery('#jform_css_views-lbl').closest('.control-group').hide();
-		// remove required attribute from javascript_view_footer field
+		// remove required attribute from css_views field
 		if (!jform_vvvvwbawah_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_vvvvwbawah_required = true;
 		}
 	}
 }
 
 // the vvvvwbb function
-function vvvvwbb(add_javascript_views_footer_vvvvwbb)
+function vvvvwbb(add_javascript_view_footer_vvvvwbb)
 {
 	// set the function logic
-	if (add_javascript_views_footer_vvvvwbb == 1)
+	if (add_javascript_view_footer_vvvvwbb == 1)
+	{
+		jQuery('#jform_javascript_view_footer-lbl').closest('.control-group').show();
+		// add required attribute to javascript_view_footer field
+		if (jform_vvvvwbbwai_required)
+		{
+			updateFieldRequired('javascript_view_footer',0);
+			jQuery('#jform_javascript_view_footer').prop('required','required');
+			jQuery('#jform_javascript_view_footer').attr('aria-required',true);
+			jQuery('#jform_javascript_view_footer').addClass('required');
+			jform_vvvvwbbwai_required = false;
+		}
+	}
+	else
+	{
+		jQuery('#jform_javascript_view_footer-lbl').closest('.control-group').hide();
+		// remove required attribute from javascript_view_footer field
+		if (!jform_vvvvwbbwai_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_vvvvwbbwai_required = true;
+		}
+	}
+}
+
+// the vvvvwbc function
+function vvvvwbc(add_javascript_views_footer_vvvvwbc)
+{
+	// set the function logic
+	if (add_javascript_views_footer_vvvvwbc == 1)
 	{
 		jQuery('#jform_javascript_views_footer-lbl').closest('.control-group').show();
 		// add required attribute to javascript_views_footer field
-		if (jform_vvvvwbbwai_required)
+		if (jform_vvvvwbcwaj_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_vvvvwbbwai_required = false;
+			jform_vvvvwbcwaj_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_javascript_views_footer-lbl').closest('.control-group').hide();
 		// remove required attribute from javascript_views_footer field
-		if (!jform_vvvvwbbwai_required)
+		if (!jform_vvvvwbcwaj_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_vvvvwbbwai_required = true;
+			jform_vvvvwbcwaj_required = true;
 		}
 	}
 }

admin/models/forms/fieldtype.js

@@ -9,82 +9,82 @@
  */
 
 // Some Global Values
-jform_vvvvwbcwaj_required = false;
+jform_vvvvwbdwak_required = false;
-jform_vvvvwbewak_required = false;
+jform_vvvvwbfwal_required = false;
-jform_vvvvwbgwal_required = false;
 jform_vvvvwbhwam_required = false;
 jform_vvvvwbiwan_required = false;
-jform_vvvvwbnwao_required = false;
+jform_vvvvwbjwao_required = false;
-jform_vvvvwbnwap_required = false;
+jform_vvvvwbowap_required = false;
+jform_vvvvwbowaq_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var datalenght_vvvvwbc = jQuery("#jform_datalenght").val();
+	var datalenght_vvvvwbd = jQuery("#jform_datalenght").val();
-	var has_defaults_vvvvwbc = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var has_defaults_vvvvwbd = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbc(datalenght_vvvvwbc,has_defaults_vvvvwbc);
+	vvvvwbd(datalenght_vvvvwbd,has_defaults_vvvvwbd);
 
-	var datadefault_vvvvwbe = jQuery("#jform_datadefault").val();
+	var datadefault_vvvvwbf = jQuery("#jform_datadefault").val();
-	var has_defaults_vvvvwbe = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var has_defaults_vvvvwbf = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbe(datadefault_vvvvwbe,has_defaults_vvvvwbe);
+	vvvvwbf(datadefault_vvvvwbf,has_defaults_vvvvwbf);
 
-	var datatype_vvvvwbg = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwbg = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbg(datatype_vvvvwbg,has_defaults_vvvvwbg);
-
-	var has_defaults_vvvvwbh = jQuery("#jform_has_defaults input[type='radio']:checked").val();
 	var datatype_vvvvwbh = jQuery("#jform_datatype").val();
-	vvvvwbh(has_defaults_vvvvwbh,datatype_vvvvwbh);
+	var has_defaults_vvvvwbh = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbh(datatype_vvvvwbh,has_defaults_vvvvwbh);
 
-	var datatype_vvvvwbi = jQuery("#jform_datatype").val();
 	var has_defaults_vvvvwbi = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbi(datatype_vvvvwbi,has_defaults_vvvvwbi);
+	var datatype_vvvvwbi = jQuery("#jform_datatype").val();
+	vvvvwbi(has_defaults_vvvvwbi,datatype_vvvvwbi);
 
-	var store_vvvvwbk = jQuery("#jform_store").val();
+	var datatype_vvvvwbj = jQuery("#jform_datatype").val();
-	var datatype_vvvvwbk = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwbj = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var has_defaults_vvvvwbk = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbj(datatype_vvvvwbj,has_defaults_vvvvwbj);
-	vvvvwbk(store_vvvvwbk,datatype_vvvvwbk,has_defaults_vvvvwbk);
 
-	var datatype_vvvvwbl = jQuery("#jform_datatype").val();
 	var store_vvvvwbl = jQuery("#jform_store").val();
+	var datatype_vvvvwbl = jQuery("#jform_datatype").val();
 	var has_defaults_vvvvwbl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbl(datatype_vvvvwbl,store_vvvvwbl,has_defaults_vvvvwbl);
+	vvvvwbl(store_vvvvwbl,datatype_vvvvwbl,has_defaults_vvvvwbl);
 
-	var has_defaults_vvvvwbm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var store_vvvvwbm = jQuery("#jform_store").val();
 	var datatype_vvvvwbm = jQuery("#jform_datatype").val();
-	vvvvwbm(has_defaults_vvvvwbm,store_vvvvwbm,datatype_vvvvwbm);
+	var store_vvvvwbm = jQuery("#jform_store").val();
+	var has_defaults_vvvvwbm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbm(datatype_vvvvwbm,store_vvvvwbm,has_defaults_vvvvwbm);
 
 	var has_defaults_vvvvwbn = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbn(has_defaults_vvvvwbn);
+	var store_vvvvwbn = jQuery("#jform_store").val();
+	var datatype_vvvvwbn = jQuery("#jform_datatype").val();
+	vvvvwbn(has_defaults_vvvvwbn,store_vvvvwbn,datatype_vvvvwbn);
+
+	var has_defaults_vvvvwbo = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbo(has_defaults_vvvvwbo);
 });
 
-// the vvvvwbc function
+// the vvvvwbd function
-function vvvvwbc(datalenght_vvvvwbc,has_defaults_vvvvwbc)
+function vvvvwbd(datalenght_vvvvwbd,has_defaults_vvvvwbd)
 {
-	if (isSet(datalenght_vvvvwbc) && datalenght_vvvvwbc.constructor !== Array)
+	if (isSet(datalenght_vvvvwbd) && datalenght_vvvvwbd.constructor !== Array)
 	{
-		var temp_vvvvwbc = datalenght_vvvvwbc;
+		var temp_vvvvwbd = datalenght_vvvvwbd;
-		var datalenght_vvvvwbc = [];
+		var datalenght_vvvvwbd = [];
-		datalenght_vvvvwbc.push(temp_vvvvwbc);
+		datalenght_vvvvwbd.push(temp_vvvvwbd);
 	}
-	else if (!isSet(datalenght_vvvvwbc))
+	else if (!isSet(datalenght_vvvvwbd))
 	{
-		var datalenght_vvvvwbc = [];
+		var datalenght_vvvvwbd = [];
 	}
-	var datalenght = datalenght_vvvvwbc.some(datalenght_vvvvwbc_SomeFunc);
+	var datalenght = datalenght_vvvvwbd.some(datalenght_vvvvwbd_SomeFunc);
 
-	if (isSet(has_defaults_vvvvwbc) && has_defaults_vvvvwbc.constructor !== Array)
+	if (isSet(has_defaults_vvvvwbd) && has_defaults_vvvvwbd.constructor !== Array)
 	{
-		var temp_vvvvwbc = has_defaults_vvvvwbc;
+		var temp_vvvvwbd = has_defaults_vvvvwbd;
-		var has_defaults_vvvvwbc = [];
+		var has_defaults_vvvvwbd = [];
-		has_defaults_vvvvwbc.push(temp_vvvvwbc);
+		has_defaults_vvvvwbd.push(temp_vvvvwbd);
 	}
-	else if (!isSet(has_defaults_vvvvwbc))
+	else if (!isSet(has_defaults_vvvvwbd))
 	{
-		var has_defaults_vvvvwbc = [];
+		var has_defaults_vvvvwbd = [];
 	}
-	var has_defaults = has_defaults_vvvvwbc.some(has_defaults_vvvvwbc_SomeFunc);
+	var has_defaults = has_defaults_vvvvwbd.some(has_defaults_vvvvwbd_SomeFunc);
 
 
 	// set this function logic
@@ -92,78 +92,78 @@ function vvvvwbc(datalenght_vvvvwbc,has_defaults_vvvvwbc)
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').show();
 		// add required attribute to datalenght_other field
-		if (jform_vvvvwbcwaj_required)
+		if (jform_vvvvwbdwak_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_vvvvwbcwaj_required = false;
+			jform_vvvvwbdwak_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').hide();
 		// remove required attribute from datalenght_other field
-		if (!jform_vvvvwbcwaj_required)
+		if (!jform_vvvvwbdwak_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_vvvvwbcwaj_required = true;
+			jform_vvvvwbdwak_required = true;
 		}
 	}
 }
 
-// the vvvvwbc Some function
+// the vvvvwbd Some function
-function datalenght_vvvvwbc_SomeFunc(datalenght_vvvvwbc)
+function datalenght_vvvvwbd_SomeFunc(datalenght_vvvvwbd)
 {
 	// set the function logic
-	if (datalenght_vvvvwbc == 'Other')
+	if (datalenght_vvvvwbd == 'Other')
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbc Some function
+// the vvvvwbd Some function
-function has_defaults_vvvvwbc_SomeFunc(has_defaults_vvvvwbc)
+function has_defaults_vvvvwbd_SomeFunc(has_defaults_vvvvwbd)
 {
 	// set the function logic
-	if (has_defaults_vvvvwbc == 1)
+	if (has_defaults_vvvvwbd == 1)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbe function
+// the vvvvwbf function
-function vvvvwbe(datadefault_vvvvwbe,has_defaults_vvvvwbe)
+function vvvvwbf(datadefault_vvvvwbf,has_defaults_vvvvwbf)
 {
-	if (isSet(datadefault_vvvvwbe) && datadefault_vvvvwbe.constructor !== Array)
+	if (isSet(datadefault_vvvvwbf) && datadefault_vvvvwbf.constructor !== Array)
 	{
-		var temp_vvvvwbe = datadefault_vvvvwbe;
+		var temp_vvvvwbf = datadefault_vvvvwbf;
-		var datadefault_vvvvwbe = [];
+		var datadefault_vvvvwbf = [];
-		datadefault_vvvvwbe.push(temp_vvvvwbe);
+		datadefault_vvvvwbf.push(temp_vvvvwbf);
 	}
-	else if (!isSet(datadefault_vvvvwbe))
+	else if (!isSet(datadefault_vvvvwbf))
 	{
-		var datadefault_vvvvwbe = [];
+		var datadefault_vvvvwbf = [];
 	}
-	var datadefault = datadefault_vvvvwbe.some(datadefault_vvvvwbe_SomeFunc);
+	var datadefault = datadefault_vvvvwbf.some(datadefault_vvvvwbf_SomeFunc);
 
-	if (isSet(has_defaults_vvvvwbe) && has_defaults_vvvvwbe.constructor !== Array)
+	if (isSet(has_defaults_vvvvwbf) && has_defaults_vvvvwbf.constructor !== Array)
 	{
-		var temp_vvvvwbe = has_defaults_vvvvwbe;
+		var temp_vvvvwbf = has_defaults_vvvvwbf;
-		var has_defaults_vvvvwbe = [];
+		var has_defaults_vvvvwbf = [];
-		has_defaults_vvvvwbe.push(temp_vvvvwbe);
+		has_defaults_vvvvwbf.push(temp_vvvvwbf);
 	}
-	else if (!isSet(has_defaults_vvvvwbe))
+	else if (!isSet(has_defaults_vvvvwbf))
 	{
-		var has_defaults_vvvvwbe = [];
+		var has_defaults_vvvvwbf = [];
 	}
-	var has_defaults = has_defaults_vvvvwbe.some(has_defaults_vvvvwbe_SomeFunc);
+	var has_defaults = has_defaults_vvvvwbf.some(has_defaults_vvvvwbf_SomeFunc);
 
 
 	// set this function logic
@@ -171,129 +171,46 @@ function vvvvwbe(datadefault_vvvvwbe,has_defaults_vvvvwbe)
 	{
 		jQuery('#jform_datadefault_other').closest('.control-group').show();
 		// add required attribute to datadefault_other field
-		if (jform_vvvvwbewak_required)
+		if (jform_vvvvwbfwal_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_vvvvwbewak_required = false;
+			jform_vvvvwbfwal_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_datadefault_other').closest('.control-group').hide();
 		// remove required attribute from datadefault_other field
-		if (!jform_vvvvwbewak_required)
+		if (!jform_vvvvwbfwal_required)
 		{
 			updateFieldRequired('datadefault_other',1);
 			jQuery('#jform_datadefault_other').removeAttr('required');
 			jQuery('#jform_datadefault_other').removeAttr('aria-required');
 			jQuery('#jform_datadefault_other').removeClass('required');
-			jform_vvvvwbewak_required = true;
+			jform_vvvvwbfwal_required = true;
 		}
 	}
 }
 
-// the vvvvwbe Some function
+// the vvvvwbf Some function
-function datadefault_vvvvwbe_SomeFunc(datadefault_vvvvwbe)
+function datadefault_vvvvwbf_SomeFunc(datadefault_vvvvwbf)
 {
 	// set the function logic
-	if (datadefault_vvvvwbe == 'Other')
+	if (datadefault_vvvvwbf == 'Other')
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbe Some function
+// the vvvvwbf Some function
-function has_defaults_vvvvwbe_SomeFunc(has_defaults_vvvvwbe)
+function has_defaults_vvvvwbf_SomeFunc(has_defaults_vvvvwbf)
 {
 	// set the function logic
-	if (has_defaults_vvvvwbe == 1)
+	if (has_defaults_vvvvwbf == 1)
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvwbg function
-function vvvvwbg(datatype_vvvvwbg,has_defaults_vvvvwbg)
-{
-	if (isSet(datatype_vvvvwbg) && datatype_vvvvwbg.constructor !== Array)
-	{
-		var temp_vvvvwbg = datatype_vvvvwbg;
-		var datatype_vvvvwbg = [];
-		datatype_vvvvwbg.push(temp_vvvvwbg);
-	}
-	else if (!isSet(datatype_vvvvwbg))
-	{
-		var datatype_vvvvwbg = [];
-	}
-	var datatype = datatype_vvvvwbg.some(datatype_vvvvwbg_SomeFunc);
-
-	if (isSet(has_defaults_vvvvwbg) && has_defaults_vvvvwbg.constructor !== Array)
-	{
-		var temp_vvvvwbg = has_defaults_vvvvwbg;
-		var has_defaults_vvvvwbg = [];
-		has_defaults_vvvvwbg.push(temp_vvvvwbg);
-	}
-	else if (!isSet(has_defaults_vvvvwbg))
-	{
-		var has_defaults_vvvvwbg = [];
-	}
-	var has_defaults = has_defaults_vvvvwbg.some(has_defaults_vvvvwbg_SomeFunc);
-
-
-	// set this function logic
-	if (datatype && has_defaults)
-	{
-		jQuery('#jform_datadefault').closest('.control-group').show();
-		jQuery('#jform_datalenght').closest('.control-group').show();
-		jQuery('#jform_indexes').closest('.control-group').show();
-		// add required attribute to indexes field
-		if (jform_vvvvwbgwal_required)
-		{
-			updateFieldRequired('indexes',0);
-			jQuery('#jform_indexes').prop('required','required');
-			jQuery('#jform_indexes').attr('aria-required',true);
-			jQuery('#jform_indexes').addClass('required');
-			jform_vvvvwbgwal_required = false;
-		}
-	}
-	else
-	{
-		jQuery('#jform_datadefault').closest('.control-group').hide();
-		jQuery('#jform_datalenght').closest('.control-group').hide();
-		jQuery('#jform_indexes').closest('.control-group').hide();
-		// remove required attribute from indexes field
-		if (!jform_vvvvwbgwal_required)
-		{
-			updateFieldRequired('indexes',1);
-			jQuery('#jform_indexes').removeAttr('required');
-			jQuery('#jform_indexes').removeAttr('aria-required');
-			jQuery('#jform_indexes').removeClass('required');
-			jform_vvvvwbgwal_required = true;
-		}
-	}
-}
-
-// the vvvvwbg Some function
-function datatype_vvvvwbg_SomeFunc(datatype_vvvvwbg)
-{
-	// set the function logic
-	if (datatype_vvvvwbg == 'CHAR' || datatype_vvvvwbg == 'VARCHAR' || datatype_vvvvwbg == 'DATETIME' || datatype_vvvvwbg == 'DATE' || datatype_vvvvwbg == 'TIME' || datatype_vvvvwbg == 'INT' || datatype_vvvvwbg == 'TINYINT' || datatype_vvvvwbg == 'BIGINT' || datatype_vvvvwbg == 'FLOAT' || datatype_vvvvwbg == 'DECIMAL' || datatype_vvvvwbg == 'DOUBLE')
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvwbg Some function
-function has_defaults_vvvvwbg_SomeFunc(has_defaults_vvvvwbg)
-{
-	// set the function logic
-	if (has_defaults_vvvvwbg == 1)
 	{
 		return true;
 	}
@@ -301,20 +218,8 @@ function has_defaults_vvvvwbg_SomeFunc(has_defaults_vvvvwbg)
 }
 
 // the vvvvwbh function
-function vvvvwbh(has_defaults_vvvvwbh,datatype_vvvvwbh)
+function vvvvwbh(datatype_vvvvwbh,has_defaults_vvvvwbh)
 {
-	if (isSet(has_defaults_vvvvwbh) && has_defaults_vvvvwbh.constructor !== Array)
-	{
-		var temp_vvvvwbh = has_defaults_vvvvwbh;
-		var has_defaults_vvvvwbh = [];
-		has_defaults_vvvvwbh.push(temp_vvvvwbh);
-	}
-	else if (!isSet(has_defaults_vvvvwbh))
-	{
-		var has_defaults_vvvvwbh = [];
-	}
-	var has_defaults = has_defaults_vvvvwbh.some(has_defaults_vvvvwbh_SomeFunc);
-
 	if (isSet(datatype_vvvvwbh) && datatype_vvvvwbh.constructor !== Array)
 	{
 		var temp_vvvvwbh = datatype_vvvvwbh;
@@ -327,9 +232,21 @@ function vvvvwbh(has_defaults_vvvvwbh,datatype_vvvvwbh)
 	}
 	var datatype = datatype_vvvvwbh.some(datatype_vvvvwbh_SomeFunc);
 
+	if (isSet(has_defaults_vvvvwbh) && has_defaults_vvvvwbh.constructor !== Array)
+	{
+		var temp_vvvvwbh = has_defaults_vvvvwbh;
+		var has_defaults_vvvvwbh = [];
+		has_defaults_vvvvwbh.push(temp_vvvvwbh);
+	}
+	else if (!isSet(has_defaults_vvvvwbh))
+	{
+		var has_defaults_vvvvwbh = [];
+	}
+	var has_defaults = has_defaults_vvvvwbh.some(has_defaults_vvvvwbh_SomeFunc);
+
 
 	// set this function logic
-	if (has_defaults && datatype)
+	if (datatype && has_defaults)
 	{
 		jQuery('#jform_datadefault').closest('.control-group').show();
 		jQuery('#jform_datalenght').closest('.control-group').show();
@@ -361,17 +278,6 @@ function vvvvwbh(has_defaults_vvvvwbh,datatype_vvvvwbh)
 	}
 }
 
-// the vvvvwbh Some function
-function has_defaults_vvvvwbh_SomeFunc(has_defaults_vvvvwbh)
-{
-	// set the function logic
-	if (has_defaults_vvvvwbh == 1)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwbh Some function
 function datatype_vvvvwbh_SomeFunc(datatype_vvvvwbh)
 {
@@ -383,21 +289,20 @@ function datatype_vvvvwbh_SomeFunc(datatype_vvvvwbh)
 	return false;
 }
 
-// the vvvvwbi function
+// the vvvvwbh Some function
-function vvvvwbi(datatype_vvvvwbi,has_defaults_vvvvwbi)
+function has_defaults_vvvvwbh_SomeFunc(has_defaults_vvvvwbh)
 {
-	if (isSet(datatype_vvvvwbi) && datatype_vvvvwbi.constructor !== Array)
+	// set the function logic
+	if (has_defaults_vvvvwbh == 1)
 	{
-		var temp_vvvvwbi = datatype_vvvvwbi;
+		return true;
-		var datatype_vvvvwbi = [];
-		datatype_vvvvwbi.push(temp_vvvvwbi);
 	}
-	else if (!isSet(datatype_vvvvwbi))
+	return false;
-	{
+}
-		var datatype_vvvvwbi = [];
-	}
-	var datatype = datatype_vvvvwbi.some(datatype_vvvvwbi_SomeFunc);
 
+// the vvvvwbi function
+function vvvvwbi(has_defaults_vvvvwbi,datatype_vvvvwbi)
+{
 	if (isSet(has_defaults_vvvvwbi) && has_defaults_vvvvwbi.constructor !== Array)
 	{
 		var temp_vvvvwbi = has_defaults_vvvvwbi;
@@ -410,47 +315,52 @@ function vvvvwbi(datatype_vvvvwbi,has_defaults_vvvvwbi)
 	}
 	var has_defaults = has_defaults_vvvvwbi.some(has_defaults_vvvvwbi_SomeFunc);
 
+	if (isSet(datatype_vvvvwbi) && datatype_vvvvwbi.constructor !== Array)
+	{
+		var temp_vvvvwbi = datatype_vvvvwbi;
+		var datatype_vvvvwbi = [];
+		datatype_vvvvwbi.push(temp_vvvvwbi);
+	}
+	else if (!isSet(datatype_vvvvwbi))
+	{
+		var datatype_vvvvwbi = [];
+	}
+	var datatype = datatype_vvvvwbi.some(datatype_vvvvwbi_SomeFunc);
+
 
 	// set this function logic
-	if (datatype && has_defaults)
+	if (has_defaults && datatype)
 	{
-		jQuery('#jform_store').closest('.control-group').show();
+		jQuery('#jform_datadefault').closest('.control-group').show();
-		// add required attribute to store field
+		jQuery('#jform_datalenght').closest('.control-group').show();
+		jQuery('#jform_indexes').closest('.control-group').show();
+		// add required attribute to indexes field
 		if (jform_vvvvwbiwan_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_vvvvwbiwan_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_store').closest('.control-group').hide();
+		jQuery('#jform_datadefault').closest('.control-group').hide();
-		// remove required attribute from store field
+		jQuery('#jform_datalenght').closest('.control-group').hide();
+		jQuery('#jform_indexes').closest('.control-group').hide();
+		// remove required attribute from indexes field
 		if (!jform_vvvvwbiwan_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_vvvvwbiwan_required = true;
 		}
 	}
 }
 
-// the vvvvwbi Some function
-function datatype_vvvvwbi_SomeFunc(datatype_vvvvwbi)
-{
-	// set the function logic
-	if (datatype_vvvvwbi == 'CHAR' || datatype_vvvvwbi == 'VARCHAR' || datatype_vvvvwbi == 'TEXT' || datatype_vvvvwbi == 'MEDIUMTEXT' || datatype_vvvvwbi == 'LONGTEXT' || datatype_vvvvwbi == 'BLOB' || datatype_vvvvwbi == 'TINYBLOB' || datatype_vvvvwbi == 'MEDIUMBLOB' || datatype_vvvvwbi == 'LONGBLOB')
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwbi Some function
 function has_defaults_vvvvwbi_SomeFunc(has_defaults_vvvvwbi)
 {
@@ -462,84 +372,90 @@ function has_defaults_vvvvwbi_SomeFunc(has_defaults_vvvvwbi)
 	return false;
 }
 
-// the vvvvwbk function
+// the vvvvwbi Some function
-function vvvvwbk(store_vvvvwbk,datatype_vvvvwbk,has_defaults_vvvvwbk)
+function datatype_vvvvwbi_SomeFunc(datatype_vvvvwbi)
 {
-	if (isSet(store_vvvvwbk) && store_vvvvwbk.constructor !== Array)
+	// set the function logic
+	if (datatype_vvvvwbi == 'CHAR' || datatype_vvvvwbi == 'VARCHAR' || datatype_vvvvwbi == 'DATETIME' || datatype_vvvvwbi == 'DATE' || datatype_vvvvwbi == 'TIME' || datatype_vvvvwbi == 'INT' || datatype_vvvvwbi == 'TINYINT' || datatype_vvvvwbi == 'BIGINT' || datatype_vvvvwbi == 'FLOAT' || datatype_vvvvwbi == 'DECIMAL' || datatype_vvvvwbi == 'DOUBLE')
 	{
-		var temp_vvvvwbk = store_vvvvwbk;
+		return true;
-		var store_vvvvwbk = [];
-		store_vvvvwbk.push(temp_vvvvwbk);
 	}
-	else if (!isSet(store_vvvvwbk))
+	return false;
-	{
+}
-		var store_vvvvwbk = [];
-	}
-	var store = store_vvvvwbk.some(store_vvvvwbk_SomeFunc);
 
-	if (isSet(datatype_vvvvwbk) && datatype_vvvvwbk.constructor !== Array)
+// the vvvvwbj function
+function vvvvwbj(datatype_vvvvwbj,has_defaults_vvvvwbj)
+{
+	if (isSet(datatype_vvvvwbj) && datatype_vvvvwbj.constructor !== Array)
 	{
-		var temp_vvvvwbk = datatype_vvvvwbk;
+		var temp_vvvvwbj = datatype_vvvvwbj;
-		var datatype_vvvvwbk = [];
+		var datatype_vvvvwbj = [];
-		datatype_vvvvwbk.push(temp_vvvvwbk);
+		datatype_vvvvwbj.push(temp_vvvvwbj);
 	}
-	else if (!isSet(datatype_vvvvwbk))
+	else if (!isSet(datatype_vvvvwbj))
 	{
-		var datatype_vvvvwbk = [];
+		var datatype_vvvvwbj = [];
 	}
-	var datatype = datatype_vvvvwbk.some(datatype_vvvvwbk_SomeFunc);
+	var datatype = datatype_vvvvwbj.some(datatype_vvvvwbj_SomeFunc);
 
-	if (isSet(has_defaults_vvvvwbk) && has_defaults_vvvvwbk.constructor !== Array)
+	if (isSet(has_defaults_vvvvwbj) && has_defaults_vvvvwbj.constructor !== Array)
 	{
-		var temp_vvvvwbk = has_defaults_vvvvwbk;
+		var temp_vvvvwbj = has_defaults_vvvvwbj;
-		var has_defaults_vvvvwbk = [];
+		var has_defaults_vvvvwbj = [];
-		has_defaults_vvvvwbk.push(temp_vvvvwbk);
+		has_defaults_vvvvwbj.push(temp_vvvvwbj);
 	}
-	else if (!isSet(has_defaults_vvvvwbk))
+	else if (!isSet(has_defaults_vvvvwbj))
 	{
-		var has_defaults_vvvvwbk = [];
+		var has_defaults_vvvvwbj = [];
 	}
-	var has_defaults = has_defaults_vvvvwbk.some(has_defaults_vvvvwbk_SomeFunc);
+	var has_defaults = has_defaults_vvvvwbj.some(has_defaults_vvvvwbj_SomeFunc);
 
 
 	// set this function logic
-	if (store && datatype && has_defaults)
+	if (datatype && has_defaults)
 	{
-		jQuery('.note_whmcs_encryption').closest('.control-group').show();
+		jQuery('#jform_store').closest('.control-group').show();
+		// add required attribute to store field
+		if (jform_vvvvwbjwao_required)
+		{
+			updateFieldRequired('store',0);
+			jQuery('#jform_store').prop('required','required');
+			jQuery('#jform_store').attr('aria-required',true);
+			jQuery('#jform_store').addClass('required');
+			jform_vvvvwbjwao_required = false;
+		}
 	}
 	else
 	{
-		jQuery('.note_whmcs_encryption').closest('.control-group').hide();
+		jQuery('#jform_store').closest('.control-group').hide();
+		// remove required attribute from store field
+		if (!jform_vvvvwbjwao_required)
+		{
+			updateFieldRequired('store',1);
+			jQuery('#jform_store').removeAttr('required');
+			jQuery('#jform_store').removeAttr('aria-required');
+			jQuery('#jform_store').removeClass('required');
+			jform_vvvvwbjwao_required = true;
+		}
 	}
 }
 
-// the vvvvwbk Some function
+// the vvvvwbj Some function
-function store_vvvvwbk_SomeFunc(store_vvvvwbk)
+function datatype_vvvvwbj_SomeFunc(datatype_vvvvwbj)
 {
 	// set the function logic
-	if (store_vvvvwbk == 4)
+	if (datatype_vvvvwbj == 'CHAR' || datatype_vvvvwbj == 'VARCHAR' || datatype_vvvvwbj == 'TEXT' || datatype_vvvvwbj == 'MEDIUMTEXT' || datatype_vvvvwbj == 'LONGTEXT' || datatype_vvvvwbj == 'BLOB' || datatype_vvvvwbj == 'TINYBLOB' || datatype_vvvvwbj == 'MEDIUMBLOB' || datatype_vvvvwbj == 'LONGBLOB')
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbk Some function
+// the vvvvwbj Some function
-function datatype_vvvvwbk_SomeFunc(datatype_vvvvwbk)
+function has_defaults_vvvvwbj_SomeFunc(has_defaults_vvvvwbj)
 {
 	// set the function logic
-	if (datatype_vvvvwbk == 'CHAR' || datatype_vvvvwbk == 'VARCHAR' || datatype_vvvvwbk == 'TEXT' || datatype_vvvvwbk == 'MEDIUMTEXT' || datatype_vvvvwbk == 'LONGTEXT' || datatype_vvvvwbk == 'BLOB' || datatype_vvvvwbk == 'TINYBLOB' || datatype_vvvvwbk == 'MEDIUMBLOB' || datatype_vvvvwbk == 'LONGBLOB')
+	if (has_defaults_vvvvwbj == 1)
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvwbk Some function
-function has_defaults_vvvvwbk_SomeFunc(has_defaults_vvvvwbk)
-{
-	// set the function logic
-	if (has_defaults_vvvvwbk == 1)
 	{
 		return true;
 	}
@@ -547,20 +463,8 @@ function has_defaults_vvvvwbk_SomeFunc(has_defaults_vvvvwbk)
 }
 
 // the vvvvwbl function
-function vvvvwbl(datatype_vvvvwbl,store_vvvvwbl,has_defaults_vvvvwbl)
+function vvvvwbl(store_vvvvwbl,datatype_vvvvwbl,has_defaults_vvvvwbl)
 {
-	if (isSet(datatype_vvvvwbl) && datatype_vvvvwbl.constructor !== Array)
-	{
-		var temp_vvvvwbl = datatype_vvvvwbl;
-		var datatype_vvvvwbl = [];
-		datatype_vvvvwbl.push(temp_vvvvwbl);
-	}
-	else if (!isSet(datatype_vvvvwbl))
-	{
-		var datatype_vvvvwbl = [];
-	}
-	var datatype = datatype_vvvvwbl.some(datatype_vvvvwbl_SomeFunc);
-
 	if (isSet(store_vvvvwbl) && store_vvvvwbl.constructor !== Array)
 	{
 		var temp_vvvvwbl = store_vvvvwbl;
@@ -573,6 +477,18 @@ function vvvvwbl(datatype_vvvvwbl,store_vvvvwbl,has_defaults_vvvvwbl)
 	}
 	var store = store_vvvvwbl.some(store_vvvvwbl_SomeFunc);
 
+	if (isSet(datatype_vvvvwbl) && datatype_vvvvwbl.constructor !== Array)
+	{
+		var temp_vvvvwbl = datatype_vvvvwbl;
+		var datatype_vvvvwbl = [];
+		datatype_vvvvwbl.push(temp_vvvvwbl);
+	}
+	else if (!isSet(datatype_vvvvwbl))
+	{
+		var datatype_vvvvwbl = [];
+	}
+	var datatype = datatype_vvvvwbl.some(datatype_vvvvwbl_SomeFunc);
+
 	if (isSet(has_defaults_vvvvwbl) && has_defaults_vvvvwbl.constructor !== Array)
 	{
 		var temp_vvvvwbl = has_defaults_vvvvwbl;
@@ -587,7 +503,7 @@ function vvvvwbl(datatype_vvvvwbl,store_vvvvwbl,has_defaults_vvvvwbl)
 
 
 	// set this function logic
-	if (datatype && store && has_defaults)
+	if (store && datatype && has_defaults)
 	{
 		jQuery('.note_whmcs_encryption').closest('.control-group').show();
 	}
@@ -598,10 +514,10 @@ function vvvvwbl(datatype_vvvvwbl,store_vvvvwbl,has_defaults_vvvvwbl)
 }
 
 // the vvvvwbl Some function
-function datatype_vvvvwbl_SomeFunc(datatype_vvvvwbl)
+function store_vvvvwbl_SomeFunc(store_vvvvwbl)
 {
 	// set the function logic
-	if (datatype_vvvvwbl == 'CHAR' || datatype_vvvvwbl == 'VARCHAR' || datatype_vvvvwbl == 'TEXT' || datatype_vvvvwbl == 'MEDIUMTEXT' || datatype_vvvvwbl == 'LONGTEXT' || datatype_vvvvwbl == 'BLOB' || datatype_vvvvwbl == 'TINYBLOB' || datatype_vvvvwbl == 'MEDIUMBLOB' || datatype_vvvvwbl == 'LONGBLOB')
+	if (store_vvvvwbl == 4)
 	{
 		return true;
 	}
@@ -609,10 +525,10 @@ function datatype_vvvvwbl_SomeFunc(datatype_vvvvwbl)
 }
 
 // the vvvvwbl Some function
-function store_vvvvwbl_SomeFunc(store_vvvvwbl)
+function datatype_vvvvwbl_SomeFunc(datatype_vvvvwbl)
 {
 	// set the function logic
-	if (store_vvvvwbl == 4)
+	if (datatype_vvvvwbl == 'CHAR' || datatype_vvvvwbl == 'VARCHAR' || datatype_vvvvwbl == 'TEXT' || datatype_vvvvwbl == 'MEDIUMTEXT' || datatype_vvvvwbl == 'LONGTEXT' || datatype_vvvvwbl == 'BLOB' || datatype_vvvvwbl == 'TINYBLOB' || datatype_vvvvwbl == 'MEDIUMBLOB' || datatype_vvvvwbl == 'LONGBLOB')
 	{
 		return true;
 	}
@@ -631,19 +547,19 @@ function has_defaults_vvvvwbl_SomeFunc(has_defaults_vvvvwbl)
 }
 
 // the vvvvwbm function
-function vvvvwbm(has_defaults_vvvvwbm,store_vvvvwbm,datatype_vvvvwbm)
+function vvvvwbm(datatype_vvvvwbm,store_vvvvwbm,has_defaults_vvvvwbm)
 {
-	if (isSet(has_defaults_vvvvwbm) && has_defaults_vvvvwbm.constructor !== Array)
+	if (isSet(datatype_vvvvwbm) && datatype_vvvvwbm.constructor !== Array)
 	{
-		var temp_vvvvwbm = has_defaults_vvvvwbm;
+		var temp_vvvvwbm = datatype_vvvvwbm;
-		var has_defaults_vvvvwbm = [];
+		var datatype_vvvvwbm = [];
-		has_defaults_vvvvwbm.push(temp_vvvvwbm);
+		datatype_vvvvwbm.push(temp_vvvvwbm);
 	}
-	else if (!isSet(has_defaults_vvvvwbm))
+	else if (!isSet(datatype_vvvvwbm))
 	{
-		var has_defaults_vvvvwbm = [];
+		var datatype_vvvvwbm = [];
 	}
-	var has_defaults = has_defaults_vvvvwbm.some(has_defaults_vvvvwbm_SomeFunc);
+	var datatype = datatype_vvvvwbm.some(datatype_vvvvwbm_SomeFunc);
 
 	if (isSet(store_vvvvwbm) && store_vvvvwbm.constructor !== Array)
 	{
@@ -657,21 +573,21 @@ function vvvvwbm(has_defaults_vvvvwbm,store_vvvvwbm,datatype_vvvvwbm)
 	}
 	var store = store_vvvvwbm.some(store_vvvvwbm_SomeFunc);
 
-	if (isSet(datatype_vvvvwbm) && datatype_vvvvwbm.constructor !== Array)
+	if (isSet(has_defaults_vvvvwbm) && has_defaults_vvvvwbm.constructor !== Array)
 	{
-		var temp_vvvvwbm = datatype_vvvvwbm;
+		var temp_vvvvwbm = has_defaults_vvvvwbm;
-		var datatype_vvvvwbm = [];
+		var has_defaults_vvvvwbm = [];
-		datatype_vvvvwbm.push(temp_vvvvwbm);
+		has_defaults_vvvvwbm.push(temp_vvvvwbm);
 	}
-	else if (!isSet(datatype_vvvvwbm))
+	else if (!isSet(has_defaults_vvvvwbm))
 	{
-		var datatype_vvvvwbm = [];
+		var has_defaults_vvvvwbm = [];
 	}
-	var datatype = datatype_vvvvwbm.some(datatype_vvvvwbm_SomeFunc);
+	var has_defaults = has_defaults_vvvvwbm.some(has_defaults_vvvvwbm_SomeFunc);
 
 
 	// set this function logic
-	if (has_defaults && store && datatype)
+	if (datatype && store && has_defaults)
 	{
 		jQuery('.note_whmcs_encryption').closest('.control-group').show();
 	}
@@ -682,10 +598,10 @@ function vvvvwbm(has_defaults_vvvvwbm,store_vvvvwbm,datatype_vvvvwbm)
 }
 
 // the vvvvwbm Some function
-function has_defaults_vvvvwbm_SomeFunc(has_defaults_vvvvwbm)
+function datatype_vvvvwbm_SomeFunc(datatype_vvvvwbm)
 {
 	// set the function logic
-	if (has_defaults_vvvvwbm == 1)
+	if (datatype_vvvvwbm == 'CHAR' || datatype_vvvvwbm == 'VARCHAR' || datatype_vvvvwbm == 'TEXT' || datatype_vvvvwbm == 'MEDIUMTEXT' || datatype_vvvvwbm == 'LONGTEXT' || datatype_vvvvwbm == 'BLOB' || datatype_vvvvwbm == 'TINYBLOB' || datatype_vvvvwbm == 'MEDIUMBLOB' || datatype_vvvvwbm == 'LONGBLOB')
 	{
 		return true;
 	}
@@ -704,10 +620,10 @@ function store_vvvvwbm_SomeFunc(store_vvvvwbm)
 }
 
 // the vvvvwbm Some function
-function datatype_vvvvwbm_SomeFunc(datatype_vvvvwbm)
+function has_defaults_vvvvwbm_SomeFunc(has_defaults_vvvvwbm)
 {
 	// set the function logic
-	if (datatype_vvvvwbm == 'CHAR' || datatype_vvvvwbm == 'VARCHAR' || datatype_vvvvwbm == 'TEXT' || datatype_vvvvwbm == 'MEDIUMTEXT' || datatype_vvvvwbm == 'LONGTEXT' || datatype_vvvvwbm == 'BLOB' || datatype_vvvvwbm == 'TINYBLOB' || datatype_vvvvwbm == 'MEDIUMBLOB' || datatype_vvvvwbm == 'LONGBLOB')
+	if (has_defaults_vvvvwbm == 1)
 	{
 		return true;
 	}
@@ -715,53 +631,137 @@ function datatype_vvvvwbm_SomeFunc(datatype_vvvvwbm)
 }
 
 // the vvvvwbn function
-function vvvvwbn(has_defaults_vvvvwbn)
+function vvvvwbn(has_defaults_vvvvwbn,store_vvvvwbn,datatype_vvvvwbn)
+{
+	if (isSet(has_defaults_vvvvwbn) && has_defaults_vvvvwbn.constructor !== Array)
+	{
+		var temp_vvvvwbn = has_defaults_vvvvwbn;
+		var has_defaults_vvvvwbn = [];
+		has_defaults_vvvvwbn.push(temp_vvvvwbn);
+	}
+	else if (!isSet(has_defaults_vvvvwbn))
+	{
+		var has_defaults_vvvvwbn = [];
+	}
+	var has_defaults = has_defaults_vvvvwbn.some(has_defaults_vvvvwbn_SomeFunc);
+
+	if (isSet(store_vvvvwbn) && store_vvvvwbn.constructor !== Array)
+	{
+		var temp_vvvvwbn = store_vvvvwbn;
+		var store_vvvvwbn = [];
+		store_vvvvwbn.push(temp_vvvvwbn);
+	}
+	else if (!isSet(store_vvvvwbn))
+	{
+		var store_vvvvwbn = [];
+	}
+	var store = store_vvvvwbn.some(store_vvvvwbn_SomeFunc);
+
+	if (isSet(datatype_vvvvwbn) && datatype_vvvvwbn.constructor !== Array)
+	{
+		var temp_vvvvwbn = datatype_vvvvwbn;
+		var datatype_vvvvwbn = [];
+		datatype_vvvvwbn.push(temp_vvvvwbn);
+	}
+	else if (!isSet(datatype_vvvvwbn))
+	{
+		var datatype_vvvvwbn = [];
+	}
+	var datatype = datatype_vvvvwbn.some(datatype_vvvvwbn_SomeFunc);
+
+
+	// set this function logic
+	if (has_defaults && store && datatype)
+	{
+		jQuery('.note_whmcs_encryption').closest('.control-group').show();
+	}
+	else
+	{
+		jQuery('.note_whmcs_encryption').closest('.control-group').hide();
+	}
+}
+
+// the vvvvwbn Some function
+function has_defaults_vvvvwbn_SomeFunc(has_defaults_vvvvwbn)
 {
 	// set the function logic
 	if (has_defaults_vvvvwbn == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwbn Some function
+function store_vvvvwbn_SomeFunc(store_vvvvwbn)
+{
+	// set the function logic
+	if (store_vvvvwbn == 4)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwbn Some function
+function datatype_vvvvwbn_SomeFunc(datatype_vvvvwbn)
+{
+	// set the function logic
+	if (datatype_vvvvwbn == 'CHAR' || datatype_vvvvwbn == 'VARCHAR' || datatype_vvvvwbn == 'TEXT' || datatype_vvvvwbn == 'MEDIUMTEXT' || datatype_vvvvwbn == 'LONGTEXT' || datatype_vvvvwbn == 'BLOB' || datatype_vvvvwbn == 'TINYBLOB' || datatype_vvvvwbn == 'MEDIUMBLOB' || datatype_vvvvwbn == 'LONGBLOB')
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwbo function
+function vvvvwbo(has_defaults_vvvvwbo)
+{
+	// set the function logic
+	if (has_defaults_vvvvwbo == 1)
 	{
 		jQuery('#jform_datatype').closest('.control-group').show();
 		// add required attribute to datatype field
-		if (jform_vvvvwbnwao_required)
+		if (jform_vvvvwbowap_required)
 		{
 			updateFieldRequired('datatype',0);
 			jQuery('#jform_datatype').prop('required','required');
 			jQuery('#jform_datatype').attr('aria-required',true);
 			jQuery('#jform_datatype').addClass('required');
-			jform_vvvvwbnwao_required = false;
+			jform_vvvvwbowap_required = false;
 		}
 		jQuery('#jform_null_switch').closest('.control-group').show();
 		// add required attribute to null_switch field
-		if (jform_vvvvwbnwap_required)
+		if (jform_vvvvwbowaq_required)
 		{
 			updateFieldRequired('null_switch',0);
 			jQuery('#jform_null_switch').prop('required','required');
 			jQuery('#jform_null_switch').attr('aria-required',true);
 			jQuery('#jform_null_switch').addClass('required');
-			jform_vvvvwbnwap_required = false;
+			jform_vvvvwbowaq_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_datatype').closest('.control-group').hide();
 		// remove required attribute from datatype field
-		if (!jform_vvvvwbnwao_required)
+		if (!jform_vvvvwbowap_required)
 		{
 			updateFieldRequired('datatype',1);
 			jQuery('#jform_datatype').removeAttr('required');
 			jQuery('#jform_datatype').removeAttr('aria-required');
 			jQuery('#jform_datatype').removeClass('required');
-			jform_vvvvwbnwao_required = true;
+			jform_vvvvwbowap_required = true;
 		}
 		jQuery('#jform_null_switch').closest('.control-group').hide();
 		// remove required attribute from null_switch field
-		if (!jform_vvvvwbnwap_required)
+		if (!jform_vvvvwbowaq_required)
 		{
 			updateFieldRequired('null_switch',1);
 			jQuery('#jform_null_switch').removeAttr('required');
 			jQuery('#jform_null_switch').removeAttr('aria-required');
 			jQuery('#jform_null_switch').removeClass('required');
-			jform_vvvvwbnwap_required = true;
+			jform_vvvvwbowaq_required = true;
 		}
 	}
 }

admin/models/forms/help_document.js

@@ -9,24 +9,21 @@
  */
 
 // Some Global Values
-jform_vvvvwbywbb_required = false;
 jform_vvvvwbzwbc_required = false;
 jform_vvvvwcawbd_required = false;
 jform_vvvvwcbwbe_required = false;
 jform_vvvvwccwbf_required = false;
 jform_vvvvwcdwbg_required = false;
+jform_vvvvwcewbh_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var location_vvvvwby = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwby(location_vvvvwby);
-
 	var location_vvvvwbz = jQuery("#jform_location input[type='radio']:checked").val();
 	vvvvwbz(location_vvvvwbz);
 
-	var type_vvvvwca = jQuery("#jform_type").val();
+	var location_vvvvwca = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwca(type_vvvvwca);
+	vvvvwca(location_vvvvwca);
 
 	var type_vvvvwcb = jQuery("#jform_type").val();
 	vvvvwcb(type_vvvvwcb);
@@ -34,130 +31,77 @@ jQuery(document).ready(function()
 	var type_vvvvwcc = jQuery("#jform_type").val();
 	vvvvwcc(type_vvvvwcc);
 
-	var target_vvvvwcd = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvwcd = jQuery("#jform_type").val();
-	vvvvwcd(target_vvvvwcd);
+	vvvvwcd(type_vvvvwcd);
+
+	var target_vvvvwce = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwce(target_vvvvwce);
 });
 
-// the vvvvwby function
+// the vvvvwbz function
-function vvvvwby(location_vvvvwby)
+function vvvvwbz(location_vvvvwbz)
 {
 	// set the function logic
-	if (location_vvvvwby == 1)
+	if (location_vvvvwbz == 1)
 	{
 		jQuery('#jform_admin_view').closest('.control-group').show();
 		// add required attribute to admin_view field
-		if (jform_vvvvwbywbb_required)
+		if (jform_vvvvwbzwbc_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_vvvvwbywbb_required = false;
+			jform_vvvvwbzwbc_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_admin_view').closest('.control-group').hide();
 		// remove required attribute from admin_view field
-		if (!jform_vvvvwbywbb_required)
+		if (!jform_vvvvwbzwbc_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_vvvvwbywbb_required = true;
-		}
-	}
-}
-
-// the vvvvwbz function
-function vvvvwbz(location_vvvvwbz)
-{
-	// set the function logic
-	if (location_vvvvwbz == 2)
-	{
-		jQuery('#jform_site_view').closest('.control-group').show();
-		// add required attribute to site_view field
-		if (jform_vvvvwbzwbc_required)
-		{
-			updateFieldRequired('site_view',0);
-			jQuery('#jform_site_view').prop('required','required');
-			jQuery('#jform_site_view').attr('aria-required',true);
-			jQuery('#jform_site_view').addClass('required');
-			jform_vvvvwbzwbc_required = false;
-		}
-	}
-	else
-	{
-		jQuery('#jform_site_view').closest('.control-group').hide();
-		// remove required attribute from site_view field
-		if (!jform_vvvvwbzwbc_required)
-		{
-			updateFieldRequired('site_view',1);
-			jQuery('#jform_site_view').removeAttr('required');
-			jQuery('#jform_site_view').removeAttr('aria-required');
-			jQuery('#jform_site_view').removeClass('required');
 			jform_vvvvwbzwbc_required = true;
 		}
 	}
 }
 
 // the vvvvwca function
-function vvvvwca(type_vvvvwca)
+function vvvvwca(location_vvvvwca)
 {
-	if (isSet(type_vvvvwca) && type_vvvvwca.constructor !== Array)
+	// set the function logic
+	if (location_vvvvwca == 2)
 	{
-		var temp_vvvvwca = type_vvvvwca;
+		jQuery('#jform_site_view').closest('.control-group').show();
-		var type_vvvvwca = [];
+		// add required attribute to site_view field
-		type_vvvvwca.push(temp_vvvvwca);
-	}
-	else if (!isSet(type_vvvvwca))
-	{
-		var type_vvvvwca = [];
-	}
-	var type = type_vvvvwca.some(type_vvvvwca_SomeFunc);
-
-
-	// set this function logic
-	if (type)
-	{
-		jQuery('#jform_url').closest('.control-group').show();
-		// add required attribute to url field
 		if (jform_vvvvwcawbd_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_vvvvwcawbd_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_url').closest('.control-group').hide();
+		jQuery('#jform_site_view').closest('.control-group').hide();
-		// remove required attribute from url field
+		// remove required attribute from site_view field
 		if (!jform_vvvvwcawbd_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_vvvvwcawbd_required = true;
 		}
 	}
 }
 
-// the vvvvwca Some function
-function type_vvvvwca_SomeFunc(type_vvvvwca)
-{
-	// set the function logic
-	if (type_vvvvwca == 3)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwcb function
 function vvvvwcb(type_vvvvwcb)
 {
@@ -177,27 +121,27 @@ function vvvvwcb(type_vvvvwcb)
 	// set this function logic
 	if (type)
 	{
-		jQuery('#jform_article').closest('.control-group').show();
+		jQuery('#jform_url').closest('.control-group').show();
-		// add required attribute to article field
+		// add required attribute to url field
 		if (jform_vvvvwcbwbe_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_vvvvwcbwbe_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_article').closest('.control-group').hide();
+		jQuery('#jform_url').closest('.control-group').hide();
-		// remove required attribute from article field
+		// remove required attribute from url field
 		if (!jform_vvvvwcbwbe_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_vvvvwcbwbe_required = true;
 		}
 	}
@@ -207,7 +151,7 @@ function vvvvwcb(type_vvvvwcb)
 function type_vvvvwcb_SomeFunc(type_vvvvwcb)
 {
 	// set the function logic
-	if (type_vvvvwcb == 1)
+	if (type_vvvvwcb == 3)
 	{
 		return true;
 	}
@@ -233,27 +177,27 @@ function vvvvwcc(type_vvvvwcc)
 	// set this function logic
 	if (type)
 	{
-		jQuery('#jform_content-lbl').closest('.control-group').show();
+		jQuery('#jform_article').closest('.control-group').show();
-		// add required attribute to content field
+		// add required attribute to article field
 		if (jform_vvvvwccwbf_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_vvvvwccwbf_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_content-lbl').closest('.control-group').hide();
+		jQuery('#jform_article').closest('.control-group').hide();
-		// remove required attribute from content field
+		// remove required attribute from article field
 		if (!jform_vvvvwccwbf_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_vvvvwccwbf_required = true;
 		}
 	}
@@ -263,7 +207,7 @@ function vvvvwcc(type_vvvvwcc)
 function type_vvvvwcc_SomeFunc(type_vvvvwcc)
 {
 	// set the function logic
-	if (type_vvvvwcc == 2)
+	if (type_vvvvwcc == 1)
 	{
 		return true;
 	}
@@ -271,33 +215,89 @@ function type_vvvvwcc_SomeFunc(type_vvvvwcc)
 }
 
 // the vvvvwcd function
-function vvvvwcd(target_vvvvwcd)
+function vvvvwcd(type_vvvvwcd)
+{
+	if (isSet(type_vvvvwcd) && type_vvvvwcd.constructor !== Array)
+	{
+		var temp_vvvvwcd = type_vvvvwcd;
+		var type_vvvvwcd = [];
+		type_vvvvwcd.push(temp_vvvvwcd);
+	}
+	else if (!isSet(type_vvvvwcd))
+	{
+		var type_vvvvwcd = [];
+	}
+	var type = type_vvvvwcd.some(type_vvvvwcd_SomeFunc);
+
+
+	// set this function logic
+	if (type)
+	{
+		jQuery('#jform_content-lbl').closest('.control-group').show();
+		// add required attribute to content field
+		if (jform_vvvvwcdwbg_required)
+		{
+			updateFieldRequired('content',0);
+			jQuery('#jform_content').prop('required','required');
+			jQuery('#jform_content').attr('aria-required',true);
+			jQuery('#jform_content').addClass('required');
+			jform_vvvvwcdwbg_required = false;
+		}
+	}
+	else
+	{
+		jQuery('#jform_content-lbl').closest('.control-group').hide();
+		// remove required attribute from content field
+		if (!jform_vvvvwcdwbg_required)
+		{
+			updateFieldRequired('content',1);
+			jQuery('#jform_content').removeAttr('required');
+			jQuery('#jform_content').removeAttr('aria-required');
+			jQuery('#jform_content').removeClass('required');
+			jform_vvvvwcdwbg_required = true;
+		}
+	}
+}
+
+// the vvvvwcd Some function
+function type_vvvvwcd_SomeFunc(type_vvvvwcd)
 {
 	// set the function logic
-	if (target_vvvvwcd == 1)
+	if (type_vvvvwcd == 2)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwce function
+function vvvvwce(target_vvvvwce)
+{
+	// set the function logic
+	if (target_vvvvwce == 1)
 	{
 		jQuery('#jform_groups').closest('.control-group').show();
 		// add required attribute to groups field
-		if (jform_vvvvwcdwbg_required)
+		if (jform_vvvvwcewbh_required)
 		{
 			updateFieldRequired('groups',0);
 			jQuery('#jform_groups').prop('required','required');
 			jQuery('#jform_groups').attr('aria-required',true);
 			jQuery('#jform_groups').addClass('required');
-			jform_vvvvwcdwbg_required = false;
+			jform_vvvvwcewbh_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_groups').closest('.control-group').hide();
 		// remove required attribute from groups field
-		if (!jform_vvvvwcdwbg_required)
+		if (!jform_vvvvwcewbh_required)
 		{
 			updateFieldRequired('groups',1);
 			jQuery('#jform_groups').removeAttr('required');
 			jQuery('#jform_groups').removeAttr('aria-required');
 			jQuery('#jform_groups').removeClass('required');
-			jform_vvvvwcdwbg_required = true;
+			jform_vvvvwcewbh_required = true;
 		}
 	}
 }

admin/models/forms/layout.js

@@ -9,43 +9,43 @@
  */
 
 // Some Global Values
-jform_vvvvvzevza_required = false;
+jform_vvvvvzfvzb_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var add_php_view_vvvvvze = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvzf = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvze(add_php_view_vvvvvze);
+	vvvvvzf(add_php_view_vvvvvzf);
 });
 
-// the vvvvvze function
+// the vvvvvzf function
-function vvvvvze(add_php_view_vvvvvze)
+function vvvvvzf(add_php_view_vvvvvzf)
 {
 	// set the function logic
-	if (add_php_view_vvvvvze == 1)
+	if (add_php_view_vvvvvzf == 1)
 	{
 		jQuery('#jform_php_view-lbl').closest('.control-group').show();
 		// add required attribute to php_view field
-		if (jform_vvvvvzevza_required)
+		if (jform_vvvvvzfvzb_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_vvvvvzevza_required = false;
+			jform_vvvvvzfvzb_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_php_view-lbl').closest('.control-group').hide();
 		// remove required attribute from php_view field
-		if (!jform_vvvvvzevza_required)
+		if (!jform_vvvvvzfvzb_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_vvvvvzevza_required = true;
+			jform_vvvvvzfvzb_required = true;
 		}
 	}
 }

admin/models/forms/library.js

@@ -9,15 +9,12 @@
  */
 
 // Some Global Values
-jform_vvvvwalvzz_required = false;
+jform_vvvvwamwaa_required = false;
-jform_vvvvwarwaa_required = false;
+jform_vvvvwaswab_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var how_vvvvwak = jQuery("#jform_how").val();
-	vvvvwak(how_vvvvwak);
-
 	var how_vvvvwal = jQuery("#jform_how").val();
 	vvvvwal(how_vvvvwal);
 
@@ -36,48 +33,13 @@ jQuery(document).ready(function()
 	var how_vvvvwaq = jQuery("#jform_how").val();
 	vvvvwaq(how_vvvvwaq);
 
-	var type_vvvvwar = jQuery("#jform_type input[type='radio']:checked").val();
+	var how_vvvvwar = jQuery("#jform_how").val();
-	vvvvwar(type_vvvvwar);
+	vvvvwar(how_vvvvwar);
+
+	var type_vvvvwas = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwas(type_vvvvwas);
 });
 
-// the vvvvwak function
-function vvvvwak(how_vvvvwak)
-{
-	if (isSet(how_vvvvwak) && how_vvvvwak.constructor !== Array)
-	{
-		var temp_vvvvwak = how_vvvvwak;
-		var how_vvvvwak = [];
-		how_vvvvwak.push(temp_vvvvwak);
-	}
-	else if (!isSet(how_vvvvwak))
-	{
-		var how_vvvvwak = [];
-	}
-	var how = how_vvvvwak.some(how_vvvvwak_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 vvvvwak Some function
-function how_vvvvwak_SomeFunc(how_vvvvwak)
-{
-	// set the function logic
-	if (how_vvvvwak == 2)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwal function
 function vvvvwal(how_vvvvwal)
 {
@@ -97,29 +59,11 @@ function vvvvwal(how_vvvvwal)
 	// set this function logic
 	if (how)
 	{
-		jQuery('#jform_php_setdocument').closest('.control-group').show();
+		jQuery('#jform_addconditions-lbl').closest('.control-group').show();
-		// add required attribute to php_setdocument field
-		if (jform_vvvvwalvzz_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_vvvvwalvzz_required = false;
-		}
 	}
 	else
 	{
-		jQuery('#jform_php_setdocument').closest('.control-group').hide();
+		jQuery('#jform_addconditions-lbl').closest('.control-group').hide();
-		// remove required attribute from php_setdocument field
-		if (!jform_vvvvwalvzz_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_vvvvwalvzz_required = true;
-		}
 	}
 }
 
@@ -127,7 +71,7 @@ function vvvvwal(how_vvvvwal)
 function how_vvvvwal_SomeFunc(how_vvvvwal)
 {
 	// set the function logic
-	if (how_vvvvwal == 3)
+	if (how_vvvvwal == 2)
 	{
 		return true;
 	}
@@ -153,11 +97,29 @@ function vvvvwam(how_vvvvwam)
 	// set this function logic
 	if (how)
 	{
-		jQuery('.note_display_library_config').closest('.control-group').show();
+		jQuery('#jform_php_setdocument').closest('.control-group').show();
+		// add required attribute to php_setdocument field
+		if (jform_vvvvwamwaa_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_vvvvwamwaa_required = false;
+		}
 	}
 	else
 	{
-		jQuery('.note_display_library_config').closest('.control-group').hide();
+		jQuery('#jform_php_setdocument').closest('.control-group').hide();
+		// remove required attribute from php_setdocument field
+		if (!jform_vvvvwamwaa_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_vvvvwamwaa_required = true;
+		}
 	}
 }
 
@@ -165,7 +127,7 @@ function vvvvwam(how_vvvvwam)
 function how_vvvvwam_SomeFunc(how_vvvvwam)
 {
 	// set the function logic
-	if (how_vvvvwam == 2 || how_vvvvwam == 3)
+	if (how_vvvvwam == 3)
 	{
 		return true;
 	}
@@ -191,11 +153,11 @@ function vvvvwan(how_vvvvwan)
 	// 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();
 	}
 }
 
@@ -203,7 +165,7 @@ function vvvvwan(how_vvvvwan)
 function how_vvvvwan_SomeFunc(how_vvvvwan)
 {
 	// set the function logic
-	if (how_vvvvwan == 1 || how_vvvvwan == 2 || how_vvvvwan == 3)
+	if (how_vvvvwan == 2 || how_vvvvwan == 3)
 	{
 		return true;
 	}
@@ -229,15 +191,11 @@ function vvvvwao(how_vvvvwao)
 	// 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();
 	}
 }
 
@@ -245,7 +203,7 @@ function vvvvwao(how_vvvvwao)
 function how_vvvvwao_SomeFunc(how_vvvvwao)
 {
 	// set the function logic
-	if (how_vvvvwao == 0)
+	if (how_vvvvwao == 1 || how_vvvvwao == 2 || how_vvvvwao == 3)
 	{
 		return true;
 	}
@@ -271,13 +229,15 @@ function vvvvwap(how_vvvvwap)
 	// 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();
 	}
 }
 
@@ -285,7 +245,7 @@ function vvvvwap(how_vvvvwap)
 function how_vvvvwap_SomeFunc(how_vvvvwap)
 {
 	// set the function logic
-	if (how_vvvvwap == 1)
+	if (how_vvvvwap == 0)
 	{
 		return true;
 	}
@@ -308,6 +268,46 @@ function vvvvwaq(how_vvvvwaq)
 	var how = how_vvvvwaq.some(how_vvvvwaq_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 vvvvwaq Some function
+function how_vvvvwaq_SomeFunc(how_vvvvwaq)
+{
+	// set the function logic
+	if (how_vvvvwaq == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwar function
+function vvvvwar(how_vvvvwar)
+{
+	if (isSet(how_vvvvwar) && how_vvvvwar.constructor !== Array)
+	{
+		var temp_vvvvwar = how_vvvvwar;
+		var how_vvvvwar = [];
+		how_vvvvwar.push(temp_vvvvwar);
+	}
+	else if (!isSet(how_vvvvwar))
+	{
+		var how_vvvvwar = [];
+	}
+	var how = how_vvvvwar.some(how_vvvvwar_SomeFunc);
+
+
 	// set this function logic
 	if (how)
 	{
@@ -323,45 +323,45 @@ function vvvvwaq(how_vvvvwaq)
 	}
 }
 
-// the vvvvwaq Some function
+// the vvvvwar Some function
-function how_vvvvwaq_SomeFunc(how_vvvvwaq)
+function how_vvvvwar_SomeFunc(how_vvvvwar)
 {
 	// set the function logic
-	if (how_vvvvwaq == 4)
+	if (how_vvvvwar == 4)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwar function
+// the vvvvwas function
-function vvvvwar(type_vvvvwar)
+function vvvvwas(type_vvvvwas)
 {
 	// set the function logic
-	if (type_vvvvwar == 2)
+	if (type_vvvvwas == 2)
 	{
 		jQuery('#jform_libraries').closest('.control-group').show();
 		// add required attribute to libraries field
-		if (jform_vvvvwarwaa_required)
+		if (jform_vvvvwaswab_required)
 		{
 			updateFieldRequired('libraries',0);
 			jQuery('#jform_libraries').prop('required','required');
 			jQuery('#jform_libraries').attr('aria-required',true);
 			jQuery('#jform_libraries').addClass('required');
-			jform_vvvvwarwaa_required = false;
+			jform_vvvvwaswab_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_libraries').closest('.control-group').hide();
 		// remove required attribute from libraries field
-		if (!jform_vvvvwarwaa_required)
+		if (!jform_vvvvwaswab_required)
 		{
 			updateFieldRequired('libraries',1);
 			jQuery('#jform_libraries').removeAttr('required');
 			jQuery('#jform_libraries').removeAttr('aria-required');
 			jQuery('#jform_libraries').removeClass('required');
-			jform_vvvvwarwaa_required = true;
+			jform_vvvvwaswab_required = true;
 		}
 	}
 }

admin/models/forms/server.js

@@ -9,180 +9,42 @@
  */
 
 // Some Global Values
-jform_vvvvwbowar_required = false;
+jform_vvvvwbpwas_required = false;
-jform_vvvvwbowas_required = false;
+jform_vvvvwbpwat_required = false;
-jform_vvvvwbowat_required = false;
+jform_vvvvwbpwau_required = false;
-jform_vvvvwbowau_required = false;
+jform_vvvvwbpwav_required = false;
-jform_vvvvwbowav_required = false;
 jform_vvvvwbpwaw_required = false;
 jform_vvvvwbqwax_required = false;
-jform_vvvvwbsway_required = false;
+jform_vvvvwbrway_required = false;
-jform_vvvvwbuwaz_required = false;
+jform_vvvvwbtwaz_required = false;
+jform_vvvvwbvwba_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var protocol_vvvvwbo = jQuery("#jform_protocol").val();
-	vvvvwbo(protocol_vvvvwbo);
-
 	var protocol_vvvvwbp = jQuery("#jform_protocol").val();
 	vvvvwbp(protocol_vvvvwbp);
 
 	var protocol_vvvvwbq = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbq = jQuery("#jform_authentication").val();
+	vvvvwbq(protocol_vvvvwbq);
-	vvvvwbq(protocol_vvvvwbq,authentication_vvvvwbq);
 
-	var protocol_vvvvwbs = jQuery("#jform_protocol").val();
+	var protocol_vvvvwbr = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbs = jQuery("#jform_authentication").val();
+	var authentication_vvvvwbr = jQuery("#jform_authentication").val();
-	vvvvwbs(protocol_vvvvwbs,authentication_vvvvwbs);
+	vvvvwbr(protocol_vvvvwbr,authentication_vvvvwbr);
 
-	var protocol_vvvvwbu = jQuery("#jform_protocol").val();
+	var protocol_vvvvwbt = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbu = jQuery("#jform_authentication").val();
+	var authentication_vvvvwbt = jQuery("#jform_authentication").val();
-	vvvvwbu(protocol_vvvvwbu,authentication_vvvvwbu);
+	vvvvwbt(protocol_vvvvwbt,authentication_vvvvwbt);
 
-	var protocol_vvvvwbw = jQuery("#jform_protocol").val();
+	var protocol_vvvvwbv = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbw = jQuery("#jform_authentication").val();
+	var authentication_vvvvwbv = jQuery("#jform_authentication").val();
-	vvvvwbw(protocol_vvvvwbw,authentication_vvvvwbw);
+	vvvvwbv(protocol_vvvvwbv,authentication_vvvvwbv);
+
+	var protocol_vvvvwbx = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbx = jQuery("#jform_authentication").val();
+	vvvvwbx(protocol_vvvvwbx,authentication_vvvvwbx);
 });
 
-// the vvvvwbo function
-function vvvvwbo(protocol_vvvvwbo)
-{
-	if (isSet(protocol_vvvvwbo) && protocol_vvvvwbo.constructor !== Array)
-	{
-		var temp_vvvvwbo = protocol_vvvvwbo;
-		var protocol_vvvvwbo = [];
-		protocol_vvvvwbo.push(temp_vvvvwbo);
-	}
-	else if (!isSet(protocol_vvvvwbo))
-	{
-		var protocol_vvvvwbo = [];
-	}
-	var protocol = protocol_vvvvwbo.some(protocol_vvvvwbo_SomeFunc);
-
-
-	// set this function logic
-	if (protocol)
-	{
-		jQuery('#jform_authentication').closest('.control-group').show();
-		// add required attribute to authentication field
-		if (jform_vvvvwbowar_required)
-		{
-			updateFieldRequired('authentication',0);
-			jQuery('#jform_authentication').prop('required','required');
-			jQuery('#jform_authentication').attr('aria-required',true);
-			jQuery('#jform_authentication').addClass('required');
-			jform_vvvvwbowar_required = false;
-		}
-		jQuery('#jform_host').closest('.control-group').show();
-		// add required attribute to host field
-		if (jform_vvvvwbowas_required)
-		{
-			updateFieldRequired('host',0);
-			jQuery('#jform_host').prop('required','required');
-			jQuery('#jform_host').attr('aria-required',true);
-			jQuery('#jform_host').addClass('required');
-			jform_vvvvwbowas_required = false;
-		}
-		jQuery('#jform_port').closest('.control-group').show();
-		// add required attribute to port field
-		if (jform_vvvvwbowat_required)
-		{
-			updateFieldRequired('port',0);
-			jQuery('#jform_port').prop('required','required');
-			jQuery('#jform_port').attr('aria-required',true);
-			jQuery('#jform_port').addClass('required');
-			jform_vvvvwbowat_required = false;
-		}
-		jQuery('#jform_path').closest('.control-group').show();
-		// add required attribute to path field
-		if (jform_vvvvwbowau_required)
-		{
-			updateFieldRequired('path',0);
-			jQuery('#jform_path').prop('required','required');
-			jQuery('#jform_path').attr('aria-required',true);
-			jQuery('#jform_path').addClass('required');
-			jform_vvvvwbowau_required = false;
-		}
-		jQuery('.note_ssh_security').closest('.control-group').show();
-		jQuery('#jform_username').closest('.control-group').show();
-		// add required attribute to username field
-		if (jform_vvvvwbowav_required)
-		{
-			updateFieldRequired('username',0);
-			jQuery('#jform_username').prop('required','required');
-			jQuery('#jform_username').attr('aria-required',true);
-			jQuery('#jform_username').addClass('required');
-			jform_vvvvwbowav_required = false;
-		}
-	}
-	else
-	{
-		jQuery('#jform_authentication').closest('.control-group').hide();
-		// remove required attribute from authentication field
-		if (!jform_vvvvwbowar_required)
-		{
-			updateFieldRequired('authentication',1);
-			jQuery('#jform_authentication').removeAttr('required');
-			jQuery('#jform_authentication').removeAttr('aria-required');
-			jQuery('#jform_authentication').removeClass('required');
-			jform_vvvvwbowar_required = true;
-		}
-		jQuery('#jform_host').closest('.control-group').hide();
-		// remove required attribute from host field
-		if (!jform_vvvvwbowas_required)
-		{
-			updateFieldRequired('host',1);
-			jQuery('#jform_host').removeAttr('required');
-			jQuery('#jform_host').removeAttr('aria-required');
-			jQuery('#jform_host').removeClass('required');
-			jform_vvvvwbowas_required = true;
-		}
-		jQuery('#jform_port').closest('.control-group').hide();
-		// remove required attribute from port field
-		if (!jform_vvvvwbowat_required)
-		{
-			updateFieldRequired('port',1);
-			jQuery('#jform_port').removeAttr('required');
-			jQuery('#jform_port').removeAttr('aria-required');
-			jQuery('#jform_port').removeClass('required');
-			jform_vvvvwbowat_required = true;
-		}
-		jQuery('#jform_path').closest('.control-group').hide();
-		// remove required attribute from path field
-		if (!jform_vvvvwbowau_required)
-		{
-			updateFieldRequired('path',1);
-			jQuery('#jform_path').removeAttr('required');
-			jQuery('#jform_path').removeAttr('aria-required');
-			jQuery('#jform_path').removeClass('required');
-			jform_vvvvwbowau_required = true;
-		}
-		jQuery('.note_ssh_security').closest('.control-group').hide();
-		jQuery('#jform_username').closest('.control-group').hide();
-		// remove required attribute from username field
-		if (!jform_vvvvwbowav_required)
-		{
-			updateFieldRequired('username',1);
-			jQuery('#jform_username').removeAttr('required');
-			jQuery('#jform_username').removeAttr('aria-required');
-			jQuery('#jform_username').removeClass('required');
-			jform_vvvvwbowav_required = true;
-		}
-	}
-}
-
-// the vvvvwbo Some function
-function protocol_vvvvwbo_SomeFunc(protocol_vvvvwbo)
-{
-	// set the function logic
-	if (protocol_vvvvwbo == 2)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwbp function
 function vvvvwbp(protocol_vvvvwbp)
 {
@@ -202,29 +64,109 @@ function vvvvwbp(protocol_vvvvwbp)
 	// 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();
+		// add required attribute to authentication field
-		// add required attribute to signature field
+		if (jform_vvvvwbpwas_required)
+		{
+			updateFieldRequired('authentication',0);
+			jQuery('#jform_authentication').prop('required','required');
+			jQuery('#jform_authentication').attr('aria-required',true);
+			jQuery('#jform_authentication').addClass('required');
+			jform_vvvvwbpwas_required = false;
+		}
+		jQuery('#jform_host').closest('.control-group').show();
+		// add required attribute to host field
+		if (jform_vvvvwbpwat_required)
+		{
+			updateFieldRequired('host',0);
+			jQuery('#jform_host').prop('required','required');
+			jQuery('#jform_host').attr('aria-required',true);
+			jQuery('#jform_host').addClass('required');
+			jform_vvvvwbpwat_required = false;
+		}
+		jQuery('#jform_port').closest('.control-group').show();
+		// add required attribute to port field
+		if (jform_vvvvwbpwau_required)
+		{
+			updateFieldRequired('port',0);
+			jQuery('#jform_port').prop('required','required');
+			jQuery('#jform_port').attr('aria-required',true);
+			jQuery('#jform_port').addClass('required');
+			jform_vvvvwbpwau_required = false;
+		}
+		jQuery('#jform_path').closest('.control-group').show();
+		// add required attribute to path field
+		if (jform_vvvvwbpwav_required)
+		{
+			updateFieldRequired('path',0);
+			jQuery('#jform_path').prop('required','required');
+			jQuery('#jform_path').attr('aria-required',true);
+			jQuery('#jform_path').addClass('required');
+			jform_vvvvwbpwav_required = false;
+		}
+		jQuery('.note_ssh_security').closest('.control-group').show();
+		jQuery('#jform_username').closest('.control-group').show();
+		// add required attribute to username field
 		if (jform_vvvvwbpwaw_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_vvvvwbpwaw_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();
+		// remove required attribute from authentication field
-		// remove required attribute from signature field
+		if (!jform_vvvvwbpwas_required)
+		{
+			updateFieldRequired('authentication',1);
+			jQuery('#jform_authentication').removeAttr('required');
+			jQuery('#jform_authentication').removeAttr('aria-required');
+			jQuery('#jform_authentication').removeClass('required');
+			jform_vvvvwbpwas_required = true;
+		}
+		jQuery('#jform_host').closest('.control-group').hide();
+		// remove required attribute from host field
+		if (!jform_vvvvwbpwat_required)
+		{
+			updateFieldRequired('host',1);
+			jQuery('#jform_host').removeAttr('required');
+			jQuery('#jform_host').removeAttr('aria-required');
+			jQuery('#jform_host').removeClass('required');
+			jform_vvvvwbpwat_required = true;
+		}
+		jQuery('#jform_port').closest('.control-group').hide();
+		// remove required attribute from port field
+		if (!jform_vvvvwbpwau_required)
+		{
+			updateFieldRequired('port',1);
+			jQuery('#jform_port').removeAttr('required');
+			jQuery('#jform_port').removeAttr('aria-required');
+			jQuery('#jform_port').removeClass('required');
+			jform_vvvvwbpwau_required = true;
+		}
+		jQuery('#jform_path').closest('.control-group').hide();
+		// remove required attribute from path field
+		if (!jform_vvvvwbpwav_required)
+		{
+			updateFieldRequired('path',1);
+			jQuery('#jform_path').removeAttr('required');
+			jQuery('#jform_path').removeAttr('aria-required');
+			jQuery('#jform_path').removeClass('required');
+			jform_vvvvwbpwav_required = true;
+		}
+		jQuery('.note_ssh_security').closest('.control-group').hide();
+		jQuery('#jform_username').closest('.control-group').hide();
+		// remove required attribute from username field
 		if (!jform_vvvvwbpwaw_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_vvvvwbpwaw_required = true;
 		}
 	}
@@ -234,7 +176,7 @@ function vvvvwbp(protocol_vvvvwbp)
 function protocol_vvvvwbp_SomeFunc(protocol_vvvvwbp)
 {
 	// set the function logic
-	if (protocol_vvvvwbp == 1)
+	if (protocol_vvvvwbp == 2)
 	{
 		return true;
 	}
@@ -242,7 +184,7 @@ function protocol_vvvvwbp_SomeFunc(protocol_vvvvwbp)
 }
 
 // the vvvvwbq function
-function vvvvwbq(protocol_vvvvwbq,authentication_vvvvwbq)
+function vvvvwbq(protocol_vvvvwbq)
 {
 	if (isSet(protocol_vvvvwbq) && protocol_vvvvwbq.constructor !== Array)
 	{
@@ -256,43 +198,33 @@ function vvvvwbq(protocol_vvvvwbq,authentication_vvvvwbq)
 	}
 	var protocol = protocol_vvvvwbq.some(protocol_vvvvwbq_SomeFunc);
 
-	if (isSet(authentication_vvvvwbq) && authentication_vvvvwbq.constructor !== Array)
-	{
-		var temp_vvvvwbq = authentication_vvvvwbq;
-		var authentication_vvvvwbq = [];
-		authentication_vvvvwbq.push(temp_vvvvwbq);
-	}
-	else if (!isSet(authentication_vvvvwbq))
-	{
-		var authentication_vvvvwbq = [];
-	}
-	var authentication = authentication_vvvvwbq.some(authentication_vvvvwbq_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();
-		// add required attribute to password field
+		jQuery('#jform_signature').closest('.control-group').show();
+		// add required attribute to signature field
 		if (jform_vvvvwbqwax_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_vvvvwbqwax_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_password').closest('.control-group').hide();
+		jQuery('.note_ftp_signature').closest('.control-group').hide();
-		// remove required attribute from password field
+		jQuery('#jform_signature').closest('.control-group').hide();
+		// remove required attribute from signature field
 		if (!jform_vvvvwbqwax_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_vvvvwbqwax_required = true;
 		}
 	}
@@ -302,50 +234,118 @@ function vvvvwbq(protocol_vvvvwbq,authentication_vvvvwbq)
 function protocol_vvvvwbq_SomeFunc(protocol_vvvvwbq)
 {
 	// set the function logic
-	if (protocol_vvvvwbq == 2)
+	if (protocol_vvvvwbq == 1)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbq Some function
+// the vvvvwbr function
-function authentication_vvvvwbq_SomeFunc(authentication_vvvvwbq)
+function vvvvwbr(protocol_vvvvwbr,authentication_vvvvwbr)
+{
+	if (isSet(protocol_vvvvwbr) && protocol_vvvvwbr.constructor !== Array)
+	{
+		var temp_vvvvwbr = protocol_vvvvwbr;
+		var protocol_vvvvwbr = [];
+		protocol_vvvvwbr.push(temp_vvvvwbr);
+	}
+	else if (!isSet(protocol_vvvvwbr))
+	{
+		var protocol_vvvvwbr = [];
+	}
+	var protocol = protocol_vvvvwbr.some(protocol_vvvvwbr_SomeFunc);
+
+	if (isSet(authentication_vvvvwbr) && authentication_vvvvwbr.constructor !== Array)
+	{
+		var temp_vvvvwbr = authentication_vvvvwbr;
+		var authentication_vvvvwbr = [];
+		authentication_vvvvwbr.push(temp_vvvvwbr);
+	}
+	else if (!isSet(authentication_vvvvwbr))
+	{
+		var authentication_vvvvwbr = [];
+	}
+	var authentication = authentication_vvvvwbr.some(authentication_vvvvwbr_SomeFunc);
+
+
+	// set this function logic
+	if (protocol && authentication)
+	{
+		jQuery('#jform_password').closest('.control-group').show();
+		// add required attribute to password field
+		if (jform_vvvvwbrway_required)
+		{
+			updateFieldRequired('password',0);
+			jQuery('#jform_password').prop('required','required');
+			jQuery('#jform_password').attr('aria-required',true);
+			jQuery('#jform_password').addClass('required');
+			jform_vvvvwbrway_required = false;
+		}
+	}
+	else
+	{
+		jQuery('#jform_password').closest('.control-group').hide();
+		// remove required attribute from password field
+		if (!jform_vvvvwbrway_required)
+		{
+			updateFieldRequired('password',1);
+			jQuery('#jform_password').removeAttr('required');
+			jQuery('#jform_password').removeAttr('aria-required');
+			jQuery('#jform_password').removeClass('required');
+			jform_vvvvwbrway_required = true;
+		}
+	}
+}
+
+// the vvvvwbr Some function
+function protocol_vvvvwbr_SomeFunc(protocol_vvvvwbr)
 {
 	// set the function logic
-	if (authentication_vvvvwbq == 1 || authentication_vvvvwbq == 3 || authentication_vvvvwbq == 5)
+	if (protocol_vvvvwbr == 2)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbs function
+// the vvvvwbr Some function
-function vvvvwbs(protocol_vvvvwbs,authentication_vvvvwbs)
+function authentication_vvvvwbr_SomeFunc(authentication_vvvvwbr)
 {
-	if (isSet(protocol_vvvvwbs) && protocol_vvvvwbs.constructor !== Array)
+	// set the function logic
+	if (authentication_vvvvwbr == 1 || authentication_vvvvwbr == 3 || authentication_vvvvwbr == 5)
 	{
-		var temp_vvvvwbs = protocol_vvvvwbs;
+		return true;
-		var protocol_vvvvwbs = [];
-		protocol_vvvvwbs.push(temp_vvvvwbs);
 	}
-	else if (!isSet(protocol_vvvvwbs))
+	return false;
-	{
+}
-		var protocol_vvvvwbs = [];
-	}
-	var protocol = protocol_vvvvwbs.some(protocol_vvvvwbs_SomeFunc);
 
-	if (isSet(authentication_vvvvwbs) && authentication_vvvvwbs.constructor !== Array)
+// the vvvvwbt function
+function vvvvwbt(protocol_vvvvwbt,authentication_vvvvwbt)
+{
+	if (isSet(protocol_vvvvwbt) && protocol_vvvvwbt.constructor !== Array)
 	{
-		var temp_vvvvwbs = authentication_vvvvwbs;
+		var temp_vvvvwbt = protocol_vvvvwbt;
-		var authentication_vvvvwbs = [];
+		var protocol_vvvvwbt = [];
-		authentication_vvvvwbs.push(temp_vvvvwbs);
+		protocol_vvvvwbt.push(temp_vvvvwbt);
 	}
-	else if (!isSet(authentication_vvvvwbs))
+	else if (!isSet(protocol_vvvvwbt))
 	{
-		var authentication_vvvvwbs = [];
+		var protocol_vvvvwbt = [];
 	}
-	var authentication = authentication_vvvvwbs.some(authentication_vvvvwbs_SomeFunc);
+	var protocol = protocol_vvvvwbt.some(protocol_vvvvwbt_SomeFunc);
+
+	if (isSet(authentication_vvvvwbt) && authentication_vvvvwbt.constructor !== Array)
+	{
+		var temp_vvvvwbt = authentication_vvvvwbt;
+		var authentication_vvvvwbt = [];
+		authentication_vvvvwbt.push(temp_vvvvwbt);
+	}
+	else if (!isSet(authentication_vvvvwbt))
+	{
+		var authentication_vvvvwbt = [];
+	}
+	var authentication = authentication_vvvvwbt.some(authentication_vvvvwbt_SomeFunc);
 
 
 	// set this function logic
@@ -353,78 +353,78 @@ function vvvvwbs(protocol_vvvvwbs,authentication_vvvvwbs)
 	{
 		jQuery('#jform_private').closest('.control-group').show();
 		// add required attribute to private field
-		if (jform_vvvvwbsway_required)
+		if (jform_vvvvwbtwaz_required)
 		{
 			updateFieldRequired('private',0);
 			jQuery('#jform_private').prop('required','required');
 			jQuery('#jform_private').attr('aria-required',true);
 			jQuery('#jform_private').addClass('required');
-			jform_vvvvwbsway_required = false;
+			jform_vvvvwbtwaz_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_private').closest('.control-group').hide();
 		// remove required attribute from private field
-		if (!jform_vvvvwbsway_required)
+		if (!jform_vvvvwbtwaz_required)
 		{
 			updateFieldRequired('private',1);
 			jQuery('#jform_private').removeAttr('required');
 			jQuery('#jform_private').removeAttr('aria-required');
 			jQuery('#jform_private').removeClass('required');
-			jform_vvvvwbsway_required = true;
+			jform_vvvvwbtwaz_required = true;
 		}
 	}
 }
 
-// the vvvvwbs Some function
+// the vvvvwbt Some function
-function protocol_vvvvwbs_SomeFunc(protocol_vvvvwbs)
+function protocol_vvvvwbt_SomeFunc(protocol_vvvvwbt)
 {
 	// set the function logic
-	if (protocol_vvvvwbs == 2)
+	if (protocol_vvvvwbt == 2)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbs Some function
+// the vvvvwbt Some function
-function authentication_vvvvwbs_SomeFunc(authentication_vvvvwbs)
+function authentication_vvvvwbt_SomeFunc(authentication_vvvvwbt)
 {
 	// set the function logic
-	if (authentication_vvvvwbs == 2 || authentication_vvvvwbs == 3)
+	if (authentication_vvvvwbt == 2 || authentication_vvvvwbt == 3)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbu function
+// the vvvvwbv function
-function vvvvwbu(protocol_vvvvwbu,authentication_vvvvwbu)
+function vvvvwbv(protocol_vvvvwbv,authentication_vvvvwbv)
 {
-	if (isSet(protocol_vvvvwbu) && protocol_vvvvwbu.constructor !== Array)
+	if (isSet(protocol_vvvvwbv) && protocol_vvvvwbv.constructor !== Array)
 	{
-		var temp_vvvvwbu = protocol_vvvvwbu;
+		var temp_vvvvwbv = protocol_vvvvwbv;
-		var protocol_vvvvwbu = [];
+		var protocol_vvvvwbv = [];
-		protocol_vvvvwbu.push(temp_vvvvwbu);
+		protocol_vvvvwbv.push(temp_vvvvwbv);
 	}
-	else if (!isSet(protocol_vvvvwbu))
+	else if (!isSet(protocol_vvvvwbv))
 	{
-		var protocol_vvvvwbu = [];
+		var protocol_vvvvwbv = [];
 	}
-	var protocol = protocol_vvvvwbu.some(protocol_vvvvwbu_SomeFunc);
+	var protocol = protocol_vvvvwbv.some(protocol_vvvvwbv_SomeFunc);
 
-	if (isSet(authentication_vvvvwbu) && authentication_vvvvwbu.constructor !== Array)
+	if (isSet(authentication_vvvvwbv) && authentication_vvvvwbv.constructor !== Array)
 	{
-		var temp_vvvvwbu = authentication_vvvvwbu;
+		var temp_vvvvwbv = authentication_vvvvwbv;
-		var authentication_vvvvwbu = [];
+		var authentication_vvvvwbv = [];
-		authentication_vvvvwbu.push(temp_vvvvwbu);
+		authentication_vvvvwbv.push(temp_vvvvwbv);
 	}
-	else if (!isSet(authentication_vvvvwbu))
+	else if (!isSet(authentication_vvvvwbv))
 	{
-		var authentication_vvvvwbu = [];
+		var authentication_vvvvwbv = [];
 	}
-	var authentication = authentication_vvvvwbu.some(authentication_vvvvwbu_SomeFunc);
+	var authentication = authentication_vvvvwbv.some(authentication_vvvvwbv_SomeFunc);
 
 
 	// set this function logic
@@ -432,78 +432,78 @@ function vvvvwbu(protocol_vvvvwbu,authentication_vvvvwbu)
 	{
 		jQuery('#jform_private_key').closest('.control-group').show();
 		// add required attribute to private_key field
-		if (jform_vvvvwbuwaz_required)
+		if (jform_vvvvwbvwba_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_vvvvwbuwaz_required = false;
+			jform_vvvvwbvwba_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_private_key').closest('.control-group').hide();
 		// remove required attribute from private_key field
-		if (!jform_vvvvwbuwaz_required)
+		if (!jform_vvvvwbvwba_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_vvvvwbuwaz_required = true;
+			jform_vvvvwbvwba_required = true;
 		}
 	}
 }
 
-// the vvvvwbu Some function
+// the vvvvwbv Some function
-function protocol_vvvvwbu_SomeFunc(protocol_vvvvwbu)
+function protocol_vvvvwbv_SomeFunc(protocol_vvvvwbv)
 {
 	// set the function logic
-	if (protocol_vvvvwbu == 2)
+	if (protocol_vvvvwbv == 2)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbu Some function
+// the vvvvwbv Some function
-function authentication_vvvvwbu_SomeFunc(authentication_vvvvwbu)
+function authentication_vvvvwbv_SomeFunc(authentication_vvvvwbv)
 {
 	// set the function logic
-	if (authentication_vvvvwbu == 4 || authentication_vvvvwbu == 5)
+	if (authentication_vvvvwbv == 4 || authentication_vvvvwbv == 5)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbw function
+// the vvvvwbx function
-function vvvvwbw(protocol_vvvvwbw,authentication_vvvvwbw)
+function vvvvwbx(protocol_vvvvwbx,authentication_vvvvwbx)
 {
-	if (isSet(protocol_vvvvwbw) && protocol_vvvvwbw.constructor !== Array)
+	if (isSet(protocol_vvvvwbx) && protocol_vvvvwbx.constructor !== Array)
 	{
-		var temp_vvvvwbw = protocol_vvvvwbw;
+		var temp_vvvvwbx = protocol_vvvvwbx;
-		var protocol_vvvvwbw = [];
+		var protocol_vvvvwbx = [];
-		protocol_vvvvwbw.push(temp_vvvvwbw);
+		protocol_vvvvwbx.push(temp_vvvvwbx);
 	}
-	else if (!isSet(protocol_vvvvwbw))
+	else if (!isSet(protocol_vvvvwbx))
 	{
-		var protocol_vvvvwbw = [];
+		var protocol_vvvvwbx = [];
 	}
-	var protocol = protocol_vvvvwbw.some(protocol_vvvvwbw_SomeFunc);
+	var protocol = protocol_vvvvwbx.some(protocol_vvvvwbx_SomeFunc);
 
-	if (isSet(authentication_vvvvwbw) && authentication_vvvvwbw.constructor !== Array)
+	if (isSet(authentication_vvvvwbx) && authentication_vvvvwbx.constructor !== Array)
 	{
-		var temp_vvvvwbw = authentication_vvvvwbw;
+		var temp_vvvvwbx = authentication_vvvvwbx;
-		var authentication_vvvvwbw = [];
+		var authentication_vvvvwbx = [];
-		authentication_vvvvwbw.push(temp_vvvvwbw);
+		authentication_vvvvwbx.push(temp_vvvvwbx);
 	}
-	else if (!isSet(authentication_vvvvwbw))
+	else if (!isSet(authentication_vvvvwbx))
 	{
-		var authentication_vvvvwbw = [];
+		var authentication_vvvvwbx = [];
 	}
-	var authentication = authentication_vvvvwbw.some(authentication_vvvvwbw_SomeFunc);
+	var authentication = authentication_vvvvwbx.some(authentication_vvvvwbx_SomeFunc);
 
 
 	// set this function logic
@@ -517,22 +517,22 @@ function vvvvwbw(protocol_vvvvwbw,authentication_vvvvwbw)
 	}
 }
 
-// the vvvvwbw Some function
+// the vvvvwbx Some function
-function protocol_vvvvwbw_SomeFunc(protocol_vvvvwbw)
+function protocol_vvvvwbx_SomeFunc(protocol_vvvvwbx)
 {
 	// set the function logic
-	if (protocol_vvvvwbw == 2)
+	if (protocol_vvvvwbx == 2)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbw Some function
+// the vvvvwbx Some function
-function authentication_vvvvwbw_SomeFunc(authentication_vvvvwbw)
+function authentication_vvvvwbx_SomeFunc(authentication_vvvvwbx)
 {
 	// set the function logic
-	if (authentication_vvvvwbw == 2 || authentication_vvvvwbw == 3 || authentication_vvvvwbw == 4 || authentication_vvvvwbw == 5)
+	if (authentication_vvvvwbx == 2 || authentication_vvvvwbx == 3 || authentication_vvvvwbx == 4 || authentication_vvvvwbx == 5)
 	{
 		return true;
 	}

admin/models/forms/site_view.js

@@ -9,7 +9,6 @@
  */
 
 // Some Global Values
-jform_vvvvvysvyo_required = false;
 jform_vvvvvytvyp_required = false;
 jform_vvvvvyuvyq_required = false;
 jform_vvvvvyvvyr_required = false;
@@ -19,317 +18,318 @@ jform_vvvvvyyvyu_required = false;
 jform_vvvvvyzvyv_required = false;
 jform_vvvvvzavyw_required = false;
 jform_vvvvvzbvyx_required = false;
-jform_vvvvvzbvyy_required = false;
+jform_vvvvvzcvyy_required = false;
+jform_vvvvvzcvyz_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var add_php_view_vvvvvys = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvyt = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvys(add_php_view_vvvvvys);
+	vvvvvyt(add_php_view_vvvvvyt);
 
-	var add_php_jview_display_vvvvvyt = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	var add_php_jview_display_vvvvvyu = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvyt(add_php_jview_display_vvvvvyt);
+	vvvvvyu(add_php_jview_display_vvvvvyu);
 
-	var add_php_jview_vvvvvyu = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	var add_php_jview_vvvvvyv = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyu(add_php_jview_vvvvvyu);
+	vvvvvyv(add_php_jview_vvvvvyv);
 
-	var add_php_document_vvvvvyv = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	var add_php_document_vvvvvyw = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyv(add_php_document_vvvvvyv);
+	vvvvvyw(add_php_document_vvvvvyw);
 
-	var add_css_document_vvvvvyw = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	var add_css_document_vvvvvyx = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvyw(add_css_document_vvvvvyw);
+	vvvvvyx(add_css_document_vvvvvyx);
 
-	var add_javascript_file_vvvvvyx = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	var add_javascript_file_vvvvvyy = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvyx(add_javascript_file_vvvvvyx);
+	vvvvvyy(add_javascript_file_vvvvvyy);
 
-	var add_js_document_vvvvvyy = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	var add_js_document_vvvvvyz = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyy(add_js_document_vvvvvyy);
+	vvvvvyz(add_js_document_vvvvvyz);
 
-	var add_css_vvvvvyz = jQuery("#jform_add_css input[type='radio']:checked").val();
+	var add_css_vvvvvza = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyz(add_css_vvvvvyz);
+	vvvvvza(add_css_vvvvvza);
 
-	var add_php_ajax_vvvvvza = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	var add_php_ajax_vvvvvzb = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvza(add_php_ajax_vvvvvza);
+	vvvvvzb(add_php_ajax_vvvvvzb);
 
-	var add_custom_button_vvvvvzb = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	var add_custom_button_vvvvvzc = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvzb(add_custom_button_vvvvvzb);
+	vvvvvzc(add_custom_button_vvvvvzc);
 
-	var button_position_vvvvvzc = jQuery("#jform_button_position").val();
+	var button_position_vvvvvzd = jQuery("#jform_button_position").val();
-	vvvvvzc(button_position_vvvvvzc);
+	vvvvvzd(button_position_vvvvvzd);
 });
 
-// the vvvvvys function
+// the vvvvvyt function
-function vvvvvys(add_php_view_vvvvvys)
+function vvvvvyt(add_php_view_vvvvvyt)
 {
 	// set the function logic
-	if (add_php_view_vvvvvys == 1)
+	if (add_php_view_vvvvvyt == 1)
 	{
 		jQuery('#jform_php_view-lbl').closest('.control-group').show();
 		// add required attribute to php_view field
-		if (jform_vvvvvysvyo_required)
+		if (jform_vvvvvytvyp_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_vvvvvysvyo_required = false;
+			jform_vvvvvytvyp_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_php_view-lbl').closest('.control-group').hide();
 		// remove required attribute from php_view field
-		if (!jform_vvvvvysvyo_required)
+		if (!jform_vvvvvytvyp_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_vvvvvysvyo_required = true;
-		}
-	}
-}
-
-// the vvvvvyt function
-function vvvvvyt(add_php_jview_display_vvvvvyt)
-{
-	// set the function logic
-	if (add_php_jview_display_vvvvvyt == 1)
-	{
-		jQuery('#jform_php_jview_display-lbl').closest('.control-group').show();
-		// add required attribute to php_jview_display field
-		if (jform_vvvvvytvyp_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_vvvvvytvyp_required = false;
-		}
-	}
-	else
-	{
-		jQuery('#jform_php_jview_display-lbl').closest('.control-group').hide();
-		// remove required attribute from php_jview_display field
-		if (!jform_vvvvvytvyp_required)
-		{
-			updateFieldRequired('php_jview_display',1);
-			jQuery('#jform_php_jview_display').removeAttr('required');
-			jQuery('#jform_php_jview_display').removeAttr('aria-required');
-			jQuery('#jform_php_jview_display').removeClass('required');
 			jform_vvvvvytvyp_required = true;
 		}
 	}
 }
 
 // the vvvvvyu function
-function vvvvvyu(add_php_jview_vvvvvyu)
+function vvvvvyu(add_php_jview_display_vvvvvyu)
 {
 	// set the function logic
-	if (add_php_jview_vvvvvyu == 1)
+	if (add_php_jview_display_vvvvvyu == 1)
 	{
-		jQuery('#jform_php_jview-lbl').closest('.control-group').show();
+		jQuery('#jform_php_jview_display-lbl').closest('.control-group').show();
-		// add required attribute to php_jview field
+		// add required attribute to php_jview_display field
 		if (jform_vvvvvyuvyq_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_vvvvvyuvyq_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_php_jview-lbl').closest('.control-group').hide();
+		jQuery('#jform_php_jview_display-lbl').closest('.control-group').hide();
-		// remove required attribute from php_jview field
+		// remove required attribute from php_jview_display field
 		if (!jform_vvvvvyuvyq_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_vvvvvyuvyq_required = true;
 		}
 	}
 }
 
 // the vvvvvyv function
-function vvvvvyv(add_php_document_vvvvvyv)
+function vvvvvyv(add_php_jview_vvvvvyv)
 {
 	// set the function logic
-	if (add_php_document_vvvvvyv == 1)
+	if (add_php_jview_vvvvvyv == 1)
 	{
-		jQuery('#jform_php_document-lbl').closest('.control-group').show();
+		jQuery('#jform_php_jview-lbl').closest('.control-group').show();
-		// add required attribute to php_document field
+		// add required attribute to php_jview field
 		if (jform_vvvvvyvvyr_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_vvvvvyvvyr_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_php_document-lbl').closest('.control-group').hide();
+		jQuery('#jform_php_jview-lbl').closest('.control-group').hide();
-		// remove required attribute from php_document field
+		// remove required attribute from php_jview field
 		if (!jform_vvvvvyvvyr_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_vvvvvyvvyr_required = true;
 		}
 	}
 }
 
 // the vvvvvyw function
-function vvvvvyw(add_css_document_vvvvvyw)
+function vvvvvyw(add_php_document_vvvvvyw)
 {
 	// set the function logic
-	if (add_css_document_vvvvvyw == 1)
+	if (add_php_document_vvvvvyw == 1)
 	{
-		jQuery('#jform_css_document-lbl').closest('.control-group').show();
+		jQuery('#jform_php_document-lbl').closest('.control-group').show();
-		// add required attribute to css_document field
+		// add required attribute to php_document field
 		if (jform_vvvvvywvys_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_vvvvvywvys_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_css_document-lbl').closest('.control-group').hide();
+		jQuery('#jform_php_document-lbl').closest('.control-group').hide();
-		// remove required attribute from css_document field
+		// remove required attribute from php_document field
 		if (!jform_vvvvvywvys_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_vvvvvywvys_required = true;
 		}
 	}
 }
 
 // the vvvvvyx function
-function vvvvvyx(add_javascript_file_vvvvvyx)
+function vvvvvyx(add_css_document_vvvvvyx)
 {
 	// set the function logic
-	if (add_javascript_file_vvvvvyx == 1)
+	if (add_css_document_vvvvvyx == 1)
 	{
-		jQuery('#jform_javascript_file-lbl').closest('.control-group').show();
+		jQuery('#jform_css_document-lbl').closest('.control-group').show();
-		// add required attribute to javascript_file field
+		// add required attribute to css_document field
 		if (jform_vvvvvyxvyt_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_vvvvvyxvyt_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_javascript_file-lbl').closest('.control-group').hide();
+		jQuery('#jform_css_document-lbl').closest('.control-group').hide();
-		// remove required attribute from javascript_file field
+		// remove required attribute from css_document field
 		if (!jform_vvvvvyxvyt_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_vvvvvyxvyt_required = true;
 		}
 	}
 }
 
 // the vvvvvyy function
-function vvvvvyy(add_js_document_vvvvvyy)
+function vvvvvyy(add_javascript_file_vvvvvyy)
 {
 	// set the function logic
-	if (add_js_document_vvvvvyy == 1)
+	if (add_javascript_file_vvvvvyy == 1)
 	{
-		jQuery('#jform_js_document-lbl').closest('.control-group').show();
+		jQuery('#jform_javascript_file-lbl').closest('.control-group').show();
-		// add required attribute to js_document field
+		// add required attribute to javascript_file field
 		if (jform_vvvvvyyvyu_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_vvvvvyyvyu_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_js_document-lbl').closest('.control-group').hide();
+		jQuery('#jform_javascript_file-lbl').closest('.control-group').hide();
-		// remove required attribute from js_document field
+		// remove required attribute from javascript_file field
 		if (!jform_vvvvvyyvyu_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_vvvvvyyvyu_required = true;
 		}
 	}
 }
 
 // the vvvvvyz function
-function vvvvvyz(add_css_vvvvvyz)
+function vvvvvyz(add_js_document_vvvvvyz)
 {
 	// set the function logic
-	if (add_css_vvvvvyz == 1)
+	if (add_js_document_vvvvvyz == 1)
 	{
-		jQuery('#jform_css-lbl').closest('.control-group').show();
+		jQuery('#jform_js_document-lbl').closest('.control-group').show();
-		// add required attribute to css field
+		// add required attribute to js_document field
 		if (jform_vvvvvyzvyv_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_vvvvvyzvyv_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_css-lbl').closest('.control-group').hide();
+		jQuery('#jform_js_document-lbl').closest('.control-group').hide();
-		// remove required attribute from css field
+		// remove required attribute from js_document field
 		if (!jform_vvvvvyzvyv_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_vvvvvyzvyv_required = true;
 		}
 	}
 }
 
 // the vvvvvza function
-function vvvvvza(add_php_ajax_vvvvvza)
+function vvvvvza(add_css_vvvvvza)
 {
 	// set the function logic
-	if (add_php_ajax_vvvvvza == 1)
+	if (add_css_vvvvvza == 1)
+	{
+		jQuery('#jform_css-lbl').closest('.control-group').show();
+		// add required attribute to css field
+		if (jform_vvvvvzavyw_required)
+		{
+			updateFieldRequired('css',0);
+			jQuery('#jform_css').prop('required','required');
+			jQuery('#jform_css').attr('aria-required',true);
+			jQuery('#jform_css').addClass('required');
+			jform_vvvvvzavyw_required = false;
+		}
+	}
+	else
+	{
+		jQuery('#jform_css-lbl').closest('.control-group').hide();
+		// remove required attribute from css field
+		if (!jform_vvvvvzavyw_required)
+		{
+			updateFieldRequired('css',1);
+			jQuery('#jform_css').removeAttr('required');
+			jQuery('#jform_css').removeAttr('aria-required');
+			jQuery('#jform_css').removeClass('required');
+			jform_vvvvvzavyw_required = true;
+		}
+	}
+}
+
+// the vvvvvzb function
+function vvvvvzb(add_php_ajax_vvvvvzb)
+{
+	// set the function logic
+	if (add_php_ajax_vvvvvzb == 1)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').show();
 		jQuery('#jform_php_ajaxmethod-lbl').closest('.control-group').show();
 		// add required attribute to php_ajaxmethod field
-		if (jform_vvvvvzavyw_required)
+		if (jform_vvvvvzbvyx_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_vvvvvzavyw_required = false;
+			jform_vvvvvzbvyx_required = false;
 		}
 	}
 	else
@@ -337,43 +337,43 @@ function vvvvvza(add_php_ajax_vvvvvza)
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_ajaxmethod-lbl').closest('.control-group').hide();
 		// remove required attribute from php_ajaxmethod field
-		if (!jform_vvvvvzavyw_required)
+		if (!jform_vvvvvzbvyx_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_vvvvvzavyw_required = true;
+			jform_vvvvvzbvyx_required = true;
 		}
 	}
 }
 
-// the vvvvvzb function
+// the vvvvvzc function
-function vvvvvzb(add_custom_button_vvvvvzb)
+function vvvvvzc(add_custom_button_vvvvvzc)
 {
 	// set the function logic
-	if (add_custom_button_vvvvvzb == 1)
+	if (add_custom_button_vvvvvzc == 1)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').show();
 		jQuery('#jform_php_controller-lbl').closest('.control-group').show();
 		// add required attribute to php_controller field
-		if (jform_vvvvvzbvyx_required)
+		if (jform_vvvvvzcvyy_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_vvvvvzbvyx_required = false;
+			jform_vvvvvzcvyy_required = false;
 		}
 		jQuery('#jform_php_model-lbl').closest('.control-group').show();
 		// add required attribute to php_model field
-		if (jform_vvvvvzbvyy_required)
+		if (jform_vvvvvzcvyz_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_vvvvvzbvyy_required = false;
+			jform_vvvvvzcvyz_required = false;
 		}
 	}
 	else
@@ -381,41 +381,41 @@ function vvvvvzb(add_custom_button_vvvvvzb)
 		jQuery('#jform_custom_button-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_controller-lbl').closest('.control-group').hide();
 		// remove required attribute from php_controller field
-		if (!jform_vvvvvzbvyx_required)
+		if (!jform_vvvvvzcvyy_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_vvvvvzbvyx_required = true;
+			jform_vvvvvzcvyy_required = true;
 		}
 		jQuery('#jform_php_model-lbl').closest('.control-group').hide();
 		// remove required attribute from php_model field
-		if (!jform_vvvvvzbvyy_required)
+		if (!jform_vvvvvzcvyz_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_vvvvvzbvyy_required = true;
+			jform_vvvvvzcvyz_required = true;
 		}
 	}
 }
 
-// the vvvvvzc function
+// the vvvvvzd function
-function vvvvvzc(button_position_vvvvvzc)
+function vvvvvzd(button_position_vvvvvzd)
 {
-	if (isSet(button_position_vvvvvzc) && button_position_vvvvvzc.constructor !== Array)
+	if (isSet(button_position_vvvvvzd) && button_position_vvvvvzd.constructor !== Array)
 	{
-		var temp_vvvvvzc = button_position_vvvvvzc;
+		var temp_vvvvvzd = button_position_vvvvvzd;
-		var button_position_vvvvvzc = [];
+		var button_position_vvvvvzd = [];
-		button_position_vvvvvzc.push(temp_vvvvvzc);
+		button_position_vvvvvzd.push(temp_vvvvvzd);
 	}
-	else if (!isSet(button_position_vvvvvzc))
+	else if (!isSet(button_position_vvvvvzd))
 	{
-		var button_position_vvvvvzc = [];
+		var button_position_vvvvvzd = [];
 	}
-	var button_position = button_position_vvvvvzc.some(button_position_vvvvvzc_SomeFunc);
+	var button_position = button_position_vvvvvzd.some(button_position_vvvvvzd_SomeFunc);
 
 
 	// set this function logic
@@ -429,11 +429,11 @@ function vvvvvzc(button_position_vvvvvzc)
 	}
 }
 
-// the vvvvvzc Some function
+// the vvvvvzd Some function
-function button_position_vvvvvzc_SomeFunc(button_position_vvvvvzc)
+function button_position_vvvvvzd_SomeFunc(button_position_vvvvvzd)
 {
 	// set the function logic
-	if (button_position_vvvvvzc == 5)
+	if (button_position_vvvvvzd == 5)
 	{
 		return true;
 	}

admin/models/forms/template.js

@@ -9,43 +9,43 @@
  */
 
 // Some Global Values
-jform_vvvvvzdvyz_required = false;
+jform_vvvvvzevza_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var add_php_view_vvvvvzd = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvze = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvzd(add_php_view_vvvvvzd);
+	vvvvvze(add_php_view_vvvvvze);
 });
 
-// the vvvvvzd function
+// the vvvvvze function
-function vvvvvzd(add_php_view_vvvvvzd)
+function vvvvvze(add_php_view_vvvvvze)
 {
 	// set the function logic
-	if (add_php_view_vvvvvzd == 1)
+	if (add_php_view_vvvvvze == 1)
 	{
 		jQuery('#jform_php_view-lbl').closest('.control-group').show();
 		// add required attribute to php_view field
-		if (jform_vvvvvzdvyz_required)
+		if (jform_vvvvvzevza_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_vvvvvzdvyz_required = false;
+			jform_vvvvvzevza_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_php_view-lbl').closest('.control-group').hide();
 		// remove required attribute from php_view field
-		if (!jform_vvvvvzdvyz_required)
+		if (!jform_vvvvvzevza_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_vvvvvzdvyz_required = true;
+			jform_vvvvvzevza_required = true;
 		}
 	}
 }

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 getWbalinked_components()
+	public function getWbblinked_components()
 	{
 		// Get the user object.
 		$user = JFactory::getUser();

admin/sql/install.mysql.utf8.sql

@@ -153,6 +153,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` (
 	`add_javascript_view_footer` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_javascript_views_file` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_javascript_views_footer` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_php_after_cancel` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_php_after_delete` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_php_after_publish` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_php_ajax` TINYINT(1) NOT NULL DEFAULT 0,
@@ -198,6 +199,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` (
 	`mysql_table_row_format` VARCHAR(64) NOT NULL DEFAULT 0,
 	`name_list` CHAR(64) NOT NULL DEFAULT '',
 	`name_single` CHAR(64) NOT NULL DEFAULT '',
+	`php_after_cancel` MEDIUMTEXT NOT NULL,
 	`php_after_delete` MEDIUMTEXT NOT NULL,
 	`php_after_publish` MEDIUMTEXT NOT NULL,
 	`php_ajaxmethod` MEDIUMTEXT NOT NULL,
@@ -255,25 +257,25 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` (
 	KEY `idx_add_php_allowadd` (`add_php_allowadd`),
 	KEY `idx_add_php_save` (`add_php_save`),
 	KEY `idx_add_php_getform` (`add_php_getform`),
-	KEY `idx_add_php_getitems_after_all` (`add_php_getitems_after_all`),
+	KEY `idx_name_list` (`name_list`),
-	KEY `idx_add_php_after_delete` (`add_php_after_delete`),
+	KEY `idx_add_php_before_delete` (`add_php_before_delete`),
 	KEY `idx_add_fadein` (`add_fadein`),
-	KEY `idx_add_php_batchmove` (`add_php_batchmove`),
+	KEY `idx_add_php_batchcopy` (`add_php_batchcopy`),
-	KEY `idx_add_sql` (`add_sql`),
+	KEY `idx_mysql_table_collate` (`mysql_table_collate`),
-	KEY `idx_add_php_after_publish` (`add_php_after_publish`),
+	KEY `idx_add_php_before_publish` (`add_php_before_publish`),
-	KEY `idx_mysql_table_engine` (`mysql_table_engine`),
+	KEY `idx_add_custom_import` (`add_custom_import`),
+	KEY `idx_add_php_document` (`add_php_document`),
 	KEY `idx_type` (`type`),
 	KEY `idx_add_php_getlistquery` (`add_php_getlistquery`),
 	KEY `idx_add_php_before_save` (`add_php_before_save`),
 	KEY `idx_add_php_postsavehook` (`add_php_postsavehook`),
 	KEY `idx_add_php_allowedit` (`add_php_allowedit`),
-	KEY `idx_add_php_batchcopy` (`add_php_batchcopy`),
+	KEY `idx_add_php_after_cancel` (`add_php_after_cancel`),
-	KEY `idx_add_php_before_publish` (`add_php_before_publish`),
+	KEY `idx_add_php_batchmove` (`add_php_batchmove`),
-	KEY `idx_add_php_before_delete` (`add_php_before_delete`),
+	KEY `idx_add_php_after_publish` (`add_php_after_publish`),
-	KEY `idx_add_php_document` (`add_php_document`),
+	KEY `idx_add_php_after_delete` (`add_php_after_delete`),
-	KEY `idx_mysql_table_collate` (`mysql_table_collate`),
+	KEY `idx_mysql_table_engine` (`mysql_table_engine`),
-	KEY `idx_add_custom_import` (`add_custom_import`),
+	KEY `idx_add_sql` (`add_sql`),
-	KEY `idx_name_list` (`name_list`),
 	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`),
@@ -283,10 +285,11 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` (
 	KEY `idx_add_custom_button` (`add_custom_button`),
 	KEY `idx_mysql_table_charset` (`mysql_table_charset`),
 	KEY `idx_mysql_table_row_format` (`mysql_table_row_format`),
-	KEY `idx_source` (`source`),
 	KEY `idx_add_php_ajax` (`add_php_ajax`),
+	KEY `idx_source` (`source`),
 	KEY `idx_add_php_getitem` (`add_php_getitem`),
-	KEY `idx_add_php_getitems` (`add_php_getitems`)
+	KEY `idx_add_php_getitems` (`add_php_getitems`),
+	KEY `idx_add_php_getitems_after_all` (`add_php_getitems_after_all`)
 ) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
 
 CREATE TABLE IF NOT EXISTS `#__componentbuilder_custom_admin_view` (

admin/sql/updates/mysql/2.9.19.sql

@@ -0,0 +1,3 @@
+ALTER TABLE `#__componentbuilder_admin_view` ADD `add_php_after_cancel` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_javascript_views_footer`;
+
+ALTER TABLE `#__componentbuilder_admin_view` ADD `php_after_cancel` MEDIUMTEXT NOT NULL AFTER `name_single`;

admin/views/admin_view/tmpl/edit.php

@@ -478,206 +478,206 @@ jQuery('#adminForm').on('change', '#jform_add_php_before_cancel',function (e)
 
 });
 
-// #jform_add_php_batchcopy listeners for add_php_batchcopy_vvvvvxt function
+// #jform_add_php_after_cancel listeners for add_php_after_cancel_vvvvvxt function
+jQuery('#jform_add_php_after_cancel').on('keyup',function()
+{
+	var add_php_after_cancel_vvvvvxt = jQuery("#jform_add_php_after_cancel input[type='radio']:checked").val();
+	vvvvvxt(add_php_after_cancel_vvvvvxt);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_php_after_cancel',function (e)
+{
+	e.preventDefault();
+	var add_php_after_cancel_vvvvvxt = jQuery("#jform_add_php_after_cancel input[type='radio']:checked").val();
+	vvvvvxt(add_php_after_cancel_vvvvvxt);
+
+});
+
+// #jform_add_php_batchcopy listeners for add_php_batchcopy_vvvvvxu function
 jQuery('#jform_add_php_batchcopy').on('keyup',function()
 {
-	var add_php_batchcopy_vvvvvxt = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val();
+	var add_php_batchcopy_vvvvvxu = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val();
-	vvvvvxt(add_php_batchcopy_vvvvvxt);
+	vvvvvxu(add_php_batchcopy_vvvvvxu);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_batchcopy',function (e)
 {
 	e.preventDefault();
-	var add_php_batchcopy_vvvvvxt = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val();
+	var add_php_batchcopy_vvvvvxu = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val();
-	vvvvvxt(add_php_batchcopy_vvvvvxt);
+	vvvvvxu(add_php_batchcopy_vvvvvxu);
 
 });
 
-// #jform_add_php_batchmove listeners for add_php_batchmove_vvvvvxu function
+// #jform_add_php_batchmove listeners for add_php_batchmove_vvvvvxv function
 jQuery('#jform_add_php_batchmove').on('keyup',function()
 {
-	var add_php_batchmove_vvvvvxu = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val();
+	var add_php_batchmove_vvvvvxv = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val();
-	vvvvvxu(add_php_batchmove_vvvvvxu);
+	vvvvvxv(add_php_batchmove_vvvvvxv);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_batchmove',function (e)
 {
 	e.preventDefault();
-	var add_php_batchmove_vvvvvxu = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val();
+	var add_php_batchmove_vvvvvxv = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val();
-	vvvvvxu(add_php_batchmove_vvvvvxu);
+	vvvvvxv(add_php_batchmove_vvvvvxv);
 
 });
 
-// #jform_add_php_before_publish listeners for add_php_before_publish_vvvvvxv function
+// #jform_add_php_before_publish listeners for add_php_before_publish_vvvvvxw function
 jQuery('#jform_add_php_before_publish').on('keyup',function()
 {
-	var add_php_before_publish_vvvvvxv = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val();
+	var add_php_before_publish_vvvvvxw = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val();
-	vvvvvxv(add_php_before_publish_vvvvvxv);
+	vvvvvxw(add_php_before_publish_vvvvvxw);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_before_publish',function (e)
 {
 	e.preventDefault();
-	var add_php_before_publish_vvvvvxv = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val();
+	var add_php_before_publish_vvvvvxw = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val();
-	vvvvvxv(add_php_before_publish_vvvvvxv);
+	vvvvvxw(add_php_before_publish_vvvvvxw);
 
 });
 
-// #jform_add_php_after_publish listeners for add_php_after_publish_vvvvvxw function
+// #jform_add_php_after_publish listeners for add_php_after_publish_vvvvvxx function
 jQuery('#jform_add_php_after_publish').on('keyup',function()
 {
-	var add_php_after_publish_vvvvvxw = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val();
+	var add_php_after_publish_vvvvvxx = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val();
-	vvvvvxw(add_php_after_publish_vvvvvxw);
+	vvvvvxx(add_php_after_publish_vvvvvxx);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_after_publish',function (e)
 {
 	e.preventDefault();
-	var add_php_after_publish_vvvvvxw = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val();
+	var add_php_after_publish_vvvvvxx = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val();
-	vvvvvxw(add_php_after_publish_vvvvvxw);
+	vvvvvxx(add_php_after_publish_vvvvvxx);
 
 });
 
-// #jform_add_php_before_delete listeners for add_php_before_delete_vvvvvxx function
+// #jform_add_php_before_delete listeners for add_php_before_delete_vvvvvxy function
 jQuery('#jform_add_php_before_delete').on('keyup',function()
 {
-	var add_php_before_delete_vvvvvxx = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val();
+	var add_php_before_delete_vvvvvxy = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val();
-	vvvvvxx(add_php_before_delete_vvvvvxx);
+	vvvvvxy(add_php_before_delete_vvvvvxy);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_before_delete',function (e)
 {
 	e.preventDefault();
-	var add_php_before_delete_vvvvvxx = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val();
+	var add_php_before_delete_vvvvvxy = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val();
-	vvvvvxx(add_php_before_delete_vvvvvxx);
+	vvvvvxy(add_php_before_delete_vvvvvxy);
 
 });
 
-// #jform_add_php_after_delete listeners for add_php_after_delete_vvvvvxy function
+// #jform_add_php_after_delete listeners for add_php_after_delete_vvvvvxz function
 jQuery('#jform_add_php_after_delete').on('keyup',function()
 {
-	var add_php_after_delete_vvvvvxy = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val();
+	var add_php_after_delete_vvvvvxz = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val();
-	vvvvvxy(add_php_after_delete_vvvvvxy);
+	vvvvvxz(add_php_after_delete_vvvvvxz);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_after_delete',function (e)
 {
 	e.preventDefault();
-	var add_php_after_delete_vvvvvxy = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val();
+	var add_php_after_delete_vvvvvxz = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val();
-	vvvvvxy(add_php_after_delete_vvvvvxy);
+	vvvvvxz(add_php_after_delete_vvvvvxz);
 
 });
 
-// #jform_add_php_document listeners for add_php_document_vvvvvxz function
+// #jform_add_php_document listeners for add_php_document_vvvvvya function
 jQuery('#jform_add_php_document').on('keyup',function()
 {
-	var add_php_document_vvvvvxz = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	var add_php_document_vvvvvya = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvxz(add_php_document_vvvvvxz);
+	vvvvvya(add_php_document_vvvvvya);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_document',function (e)
 {
 	e.preventDefault();
-	var add_php_document_vvvvvxz = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	var add_php_document_vvvvvya = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvxz(add_php_document_vvvvvxz);
+	vvvvvya(add_php_document_vvvvvya);
-
-});
-
-// #jform_add_sql listeners for add_sql_vvvvvya function
-jQuery('#jform_add_sql').on('keyup',function()
-{
-	var add_sql_vvvvvya = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvya(add_sql_vvvvvya);
-
-});
-jQuery('#adminForm').on('change', '#jform_add_sql',function (e)
-{
-	e.preventDefault();
-	var add_sql_vvvvvya = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvya(add_sql_vvvvvya);
-
-});
-
-// #jform_source listeners for source_vvvvvyb function
-jQuery('#jform_source').on('keyup',function()
-{
-	var source_vvvvvyb = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvyb = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvyb(source_vvvvvyb,add_sql_vvvvvyb);
-
-});
-jQuery('#adminForm').on('change', '#jform_source',function (e)
-{
-	e.preventDefault();
-	var source_vvvvvyb = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvyb = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvyb(source_vvvvvyb,add_sql_vvvvvyb);
 
 });
 
 // #jform_add_sql listeners for add_sql_vvvvvyb function
 jQuery('#jform_add_sql').on('keyup',function()
 {
-	var source_vvvvvyb = jQuery("#jform_source input[type='radio']:checked").val();
 	var add_sql_vvvvvyb = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvyb(source_vvvvvyb,add_sql_vvvvvyb);
+	vvvvvyb(add_sql_vvvvvyb);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_sql',function (e)
 {
 	e.preventDefault();
-	var source_vvvvvyb = jQuery("#jform_source input[type='radio']:checked").val();
 	var add_sql_vvvvvyb = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvyb(source_vvvvvyb,add_sql_vvvvvyb);
+	vvvvvyb(add_sql_vvvvvyb);
 
 });
 
-// #jform_source listeners for source_vvvvvyd function
+// #jform_source listeners for source_vvvvvyc function
 jQuery('#jform_source').on('keyup',function()
 {
-	var source_vvvvvyd = jQuery("#jform_source input[type='radio']:checked").val();
+	var source_vvvvvyc = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvyd = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	var add_sql_vvvvvyc = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvyd(source_vvvvvyd,add_sql_vvvvvyd);
+	vvvvvyc(source_vvvvvyc,add_sql_vvvvvyc);
 
 });
 jQuery('#adminForm').on('change', '#jform_source',function (e)
 {
 	e.preventDefault();
-	var source_vvvvvyd = jQuery("#jform_source input[type='radio']:checked").val();
+	var source_vvvvvyc = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvyd = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	var add_sql_vvvvvyc = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvyd(source_vvvvvyd,add_sql_vvvvvyd);
+	vvvvvyc(source_vvvvvyc,add_sql_vvvvvyc);
 
 });
 
-// #jform_add_sql listeners for add_sql_vvvvvyd function
+// #jform_add_sql listeners for add_sql_vvvvvyc function
 jQuery('#jform_add_sql').on('keyup',function()
 {
-	var source_vvvvvyd = jQuery("#jform_source input[type='radio']:checked").val();
+	var source_vvvvvyc = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvyd = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	var add_sql_vvvvvyc = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvyd(source_vvvvvyd,add_sql_vvvvvyd);
+	vvvvvyc(source_vvvvvyc,add_sql_vvvvvyc);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_sql',function (e)
 {
 	e.preventDefault();
-	var source_vvvvvyd = jQuery("#jform_source input[type='radio']:checked").val();
+	var source_vvvvvyc = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvyd = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	var add_sql_vvvvvyc = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvyd(source_vvvvvyd,add_sql_vvvvvyd);
+	vvvvvyc(source_vvvvvyc,add_sql_vvvvvyc);
 
 });
 
-// #jform_add_custom_import listeners for add_custom_import_vvvvvyf function
+// #jform_source listeners for source_vvvvvye function
-jQuery('#jform_add_custom_import').on('keyup',function()
+jQuery('#jform_source').on('keyup',function()
 {
-	var add_custom_import_vvvvvyf = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
+	var source_vvvvvye = jQuery("#jform_source input[type='radio']:checked").val();
-	vvvvvyf(add_custom_import_vvvvvyf);
+	var add_sql_vvvvvye = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvye(source_vvvvvye,add_sql_vvvvvye);
 
 });
-jQuery('#adminForm').on('change', '#jform_add_custom_import',function (e)
+jQuery('#adminForm').on('change', '#jform_source',function (e)
 {
 	e.preventDefault();
-	var add_custom_import_vvvvvyf = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
+	var source_vvvvvye = jQuery("#jform_source input[type='radio']:checked").val();
-	vvvvvyf(add_custom_import_vvvvvyf);
+	var add_sql_vvvvvye = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvye(source_vvvvvye,add_sql_vvvvvye);
+
+});
+
+// #jform_add_sql listeners for add_sql_vvvvvye function
+jQuery('#jform_add_sql').on('keyup',function()
+{
+	var source_vvvvvye = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvye = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvye(source_vvvvvye,add_sql_vvvvvye);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_sql',function (e)
+{
+	e.preventDefault();
+	var source_vvvvvye = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvye = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvye(source_vvvvvye,add_sql_vvvvvye);
 
 });
 
@@ -696,18 +696,33 @@ jQuery('#adminForm').on('change', '#jform_add_custom_import',function (e)
 
 });
 
-// #jform_add_custom_button listeners for add_custom_button_vvvvvyh function
+// #jform_add_custom_import listeners for add_custom_import_vvvvvyh function
+jQuery('#jform_add_custom_import').on('keyup',function()
+{
+	var add_custom_import_vvvvvyh = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
+	vvvvvyh(add_custom_import_vvvvvyh);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_custom_import',function (e)
+{
+	e.preventDefault();
+	var add_custom_import_vvvvvyh = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
+	vvvvvyh(add_custom_import_vvvvvyh);
+
+});
+
+// #jform_add_custom_button listeners for add_custom_button_vvvvvyi function
 jQuery('#jform_add_custom_button').on('keyup',function()
 {
-	var add_custom_button_vvvvvyh = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	var add_custom_button_vvvvvyi = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyh(add_custom_button_vvvvvyh);
+	vvvvvyi(add_custom_button_vvvvvyi);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_custom_button',function (e)
 {
 	e.preventDefault();
-	var add_custom_button_vvvvvyh = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	var add_custom_button_vvvvvyi = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyh(add_custom_button_vvvvvyh);
+	vvvvvyi(add_custom_button_vvvvvyi);
 
 });
 

admin/views/admin_views/view.html.php

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

admin/views/custom_admin_view/tmpl/edit.php

@@ -163,153 +163,153 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_add_php_view listeners for add_php_view_vvvvvyi function
+// #jform_add_php_view listeners for add_php_view_vvvvvyj function
 jQuery('#jform_add_php_view').on('keyup',function()
 {
-	var add_php_view_vvvvvyi = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvyj = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyi(add_php_view_vvvvvyi);
+	vvvvvyj(add_php_view_vvvvvyj);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_view',function (e)
 {
 	e.preventDefault();
-	var add_php_view_vvvvvyi = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvyj = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyi(add_php_view_vvvvvyi);
+	vvvvvyj(add_php_view_vvvvvyj);
 
 });
 
-// #jform_add_php_jview_display listeners for add_php_jview_display_vvvvvyj function
+// #jform_add_php_jview_display listeners for add_php_jview_display_vvvvvyk function
 jQuery('#jform_add_php_jview_display').on('keyup',function()
 {
-	var add_php_jview_display_vvvvvyj = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	var add_php_jview_display_vvvvvyk = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvyj(add_php_jview_display_vvvvvyj);
+	vvvvvyk(add_php_jview_display_vvvvvyk);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_jview_display',function (e)
 {
 	e.preventDefault();
-	var add_php_jview_display_vvvvvyj = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	var add_php_jview_display_vvvvvyk = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvyj(add_php_jview_display_vvvvvyj);
+	vvvvvyk(add_php_jview_display_vvvvvyk);
 
 });
 
-// #jform_add_php_jview listeners for add_php_jview_vvvvvyk function
+// #jform_add_php_jview listeners for add_php_jview_vvvvvyl function
 jQuery('#jform_add_php_jview').on('keyup',function()
 {
-	var add_php_jview_vvvvvyk = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	var add_php_jview_vvvvvyl = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyk(add_php_jview_vvvvvyk);
+	vvvvvyl(add_php_jview_vvvvvyl);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_jview',function (e)
 {
 	e.preventDefault();
-	var add_php_jview_vvvvvyk = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	var add_php_jview_vvvvvyl = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyk(add_php_jview_vvvvvyk);
+	vvvvvyl(add_php_jview_vvvvvyl);
 
 });
 
-// #jform_add_php_document listeners for add_php_document_vvvvvyl function
+// #jform_add_php_document listeners for add_php_document_vvvvvym function
 jQuery('#jform_add_php_document').on('keyup',function()
 {
-	var add_php_document_vvvvvyl = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	var add_php_document_vvvvvym = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyl(add_php_document_vvvvvyl);
+	vvvvvym(add_php_document_vvvvvym);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_document',function (e)
 {
 	e.preventDefault();
-	var add_php_document_vvvvvyl = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	var add_php_document_vvvvvym = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyl(add_php_document_vvvvvyl);
+	vvvvvym(add_php_document_vvvvvym);
 
 });
 
-// #jform_add_css_document listeners for add_css_document_vvvvvym function
+// #jform_add_css_document listeners for add_css_document_vvvvvyn function
 jQuery('#jform_add_css_document').on('keyup',function()
 {
-	var add_css_document_vvvvvym = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	var add_css_document_vvvvvyn = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvym(add_css_document_vvvvvym);
+	vvvvvyn(add_css_document_vvvvvyn);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css_document',function (e)
 {
 	e.preventDefault();
-	var add_css_document_vvvvvym = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	var add_css_document_vvvvvyn = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvym(add_css_document_vvvvvym);
+	vvvvvyn(add_css_document_vvvvvyn);
 
 });
 
-// #jform_add_javascript_file listeners for add_javascript_file_vvvvvyn function
+// #jform_add_javascript_file listeners for add_javascript_file_vvvvvyo function
 jQuery('#jform_add_javascript_file').on('keyup',function()
 {
-	var add_javascript_file_vvvvvyn = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	var add_javascript_file_vvvvvyo = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvyn(add_javascript_file_vvvvvyn);
+	vvvvvyo(add_javascript_file_vvvvvyo);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_file',function (e)
 {
 	e.preventDefault();
-	var add_javascript_file_vvvvvyn = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	var add_javascript_file_vvvvvyo = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvyn(add_javascript_file_vvvvvyn);
+	vvvvvyo(add_javascript_file_vvvvvyo);
 
 });
 
-// #jform_add_js_document listeners for add_js_document_vvvvvyo function
+// #jform_add_js_document listeners for add_js_document_vvvvvyp function
 jQuery('#jform_add_js_document').on('keyup',function()
 {
-	var add_js_document_vvvvvyo = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	var add_js_document_vvvvvyp = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyo(add_js_document_vvvvvyo);
+	vvvvvyp(add_js_document_vvvvvyp);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_js_document',function (e)
 {
 	e.preventDefault();
-	var add_js_document_vvvvvyo = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	var add_js_document_vvvvvyp = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyo(add_js_document_vvvvvyo);
+	vvvvvyp(add_js_document_vvvvvyp);
 
 });
 
-// #jform_add_custom_button listeners for add_custom_button_vvvvvyp function
+// #jform_add_custom_button listeners for add_custom_button_vvvvvyq function
 jQuery('#jform_add_custom_button').on('keyup',function()
 {
-	var add_custom_button_vvvvvyp = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	var add_custom_button_vvvvvyq = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyp(add_custom_button_vvvvvyp);
+	vvvvvyq(add_custom_button_vvvvvyq);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_custom_button',function (e)
 {
 	e.preventDefault();
-	var add_custom_button_vvvvvyp = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	var add_custom_button_vvvvvyq = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyp(add_custom_button_vvvvvyp);
+	vvvvvyq(add_custom_button_vvvvvyq);
 
 });
 
-// #jform_add_css listeners for add_css_vvvvvyq function
+// #jform_add_css listeners for add_css_vvvvvyr function
 jQuery('#jform_add_css').on('keyup',function()
 {
-	var add_css_vvvvvyq = jQuery("#jform_add_css input[type='radio']:checked").val();
+	var add_css_vvvvvyr = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyq(add_css_vvvvvyq);
+	vvvvvyr(add_css_vvvvvyr);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css',function (e)
 {
 	e.preventDefault();
-	var add_css_vvvvvyq = jQuery("#jform_add_css input[type='radio']:checked").val();
+	var add_css_vvvvvyr = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyq(add_css_vvvvvyq);
+	vvvvvyr(add_css_vvvvvyr);
 
 });
 
-// #jform_add_php_ajax listeners for add_php_ajax_vvvvvyr function
+// #jform_add_php_ajax listeners for add_php_ajax_vvvvvys function
 jQuery('#jform_add_php_ajax').on('keyup',function()
 {
-	var add_php_ajax_vvvvvyr = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	var add_php_ajax_vvvvvys = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvyr(add_php_ajax_vvvvvyr);
+	vvvvvys(add_php_ajax_vvvvvys);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_ajax',function (e)
 {
 	e.preventDefault();
-	var add_php_ajax_vvvvvyr = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	var add_php_ajax_vvvvvys = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvyr(add_php_ajax_vvvvvyr);
+	vvvvvys(add_php_ajax_vvvvvys);
 
 });
 

admin/views/custom_code/tmpl/edit.php

@@ -116,21 +116,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_target listeners for target_vvvvwag function
-jQuery('#jform_target').on('keyup',function()
-{
-	var target_vvvvwag = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwag(target_vvvvwag);
-
-});
-jQuery('#adminForm').on('change', '#jform_target',function (e)
-{
-	e.preventDefault();
-	var target_vvvvwag = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwag(target_vvvvwag);
-
-});
-
 // #jform_target listeners for target_vvvvwah function
 jQuery('#jform_target').on('keyup',function()
 {
@@ -150,67 +135,82 @@ jQuery('#adminForm').on('change', '#jform_target',function (e)
 jQuery('#jform_target').on('keyup',function()
 {
 	var target_vvvvwai = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvwai = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwai(target_vvvvwai);
-	vvvvwai(target_vvvvwai,type_vvvvwai);
 
 });
 jQuery('#adminForm').on('change', '#jform_target',function (e)
 {
 	e.preventDefault();
 	var target_vvvvwai = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvwai = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwai(target_vvvvwai);
-	vvvvwai(target_vvvvwai,type_vvvvwai);
-
-});
-
-// #jform_type listeners for type_vvvvwai function
-jQuery('#jform_type').on('keyup',function()
-{
-	var target_vvvvwai = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvwai = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwai(target_vvvvwai,type_vvvvwai);
-
-});
-jQuery('#adminForm').on('change', '#jform_type',function (e)
-{
-	e.preventDefault();
-	var target_vvvvwai = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvwai = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwai(target_vvvvwai,type_vvvvwai);
-
-});
-
-// #jform_type listeners for type_vvvvwaj function
-jQuery('#jform_type').on('keyup',function()
-{
-	var type_vvvvwaj = jQuery("#jform_type input[type='radio']:checked").val();
-	var target_vvvvwaj = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwaj(type_vvvvwaj,target_vvvvwaj);
-
-});
-jQuery('#adminForm').on('change', '#jform_type',function (e)
-{
-	e.preventDefault();
-	var type_vvvvwaj = jQuery("#jform_type input[type='radio']:checked").val();
-	var target_vvvvwaj = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwaj(type_vvvvwaj,target_vvvvwaj);
 
 });
 
 // #jform_target listeners for target_vvvvwaj function
 jQuery('#jform_target').on('keyup',function()
 {
-	var type_vvvvwaj = jQuery("#jform_type input[type='radio']:checked").val();
 	var target_vvvvwaj = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwaj(type_vvvvwaj,target_vvvvwaj);
+	var type_vvvvwaj = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwaj(target_vvvvwaj,type_vvvvwaj);
 
 });
 jQuery('#adminForm').on('change', '#jform_target',function (e)
 {
 	e.preventDefault();
-	var type_vvvvwaj = jQuery("#jform_type input[type='radio']:checked").val();
 	var target_vvvvwaj = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwaj(type_vvvvwaj,target_vvvvwaj);
+	var type_vvvvwaj = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwaj(target_vvvvwaj,type_vvvvwaj);
+
+});
+
+// #jform_type listeners for type_vvvvwaj function
+jQuery('#jform_type').on('keyup',function()
+{
+	var target_vvvvwaj = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvwaj = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwaj(target_vvvvwaj,type_vvvvwaj);
+
+});
+jQuery('#adminForm').on('change', '#jform_type',function (e)
+{
+	e.preventDefault();
+	var target_vvvvwaj = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvwaj = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwaj(target_vvvvwaj,type_vvvvwaj);
+
+});
+
+// #jform_type listeners for type_vvvvwak function
+jQuery('#jform_type').on('keyup',function()
+{
+	var type_vvvvwak = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwak = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwak(type_vvvvwak,target_vvvvwak);
+
+});
+jQuery('#adminForm').on('change', '#jform_type',function (e)
+{
+	e.preventDefault();
+	var type_vvvvwak = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwak = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwak(type_vvvvwak,target_vvvvwak);
+
+});
+
+// #jform_target listeners for target_vvvvwak function
+jQuery('#jform_target').on('keyup',function()
+{
+	var type_vvvvwak = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwak = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwak(type_vvvvwak,target_vvvvwak);
+
+});
+jQuery('#adminForm').on('change', '#jform_target',function (e)
+{
+	e.preventDefault();
+	var type_vvvvwak = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwak = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwak(type_vvvvwak,target_vvvvwak);
 
 });
 

admin/views/dynamic_get/tmpl/edit.php

@@ -159,33 +159,18 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_gettype listeners for gettype_vvvvvzf function
+// #jform_gettype listeners for gettype_vvvvvzg function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var gettype_vvvvvzf = jQuery("#jform_gettype").val();
+	var gettype_vvvvvzg = jQuery("#jform_gettype").val();
-	vvvvvzf(gettype_vvvvvzf);
+	vvvvvzg(gettype_vvvvvzg);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var gettype_vvvvvzf = jQuery("#jform_gettype").val();
+	var gettype_vvvvvzg = jQuery("#jform_gettype").val();
-	vvvvvzf(gettype_vvvvvzf);
+	vvvvvzg(gettype_vvvvvzg);
-
-});
-
-// #jform_main_source listeners for main_source_vvvvvzg function
-jQuery('#jform_main_source').on('keyup',function()
-{
-	var main_source_vvvvvzg = jQuery("#jform_main_source").val();
-	vvvvvzg(main_source_vvvvvzg);
-
-});
-jQuery('#adminForm').on('change', '#jform_main_source',function (e)
-{
-	e.preventDefault();
-	var main_source_vvvvvzg = jQuery("#jform_main_source").val();
-	vvvvvzg(main_source_vvvvvzg);
 
 });
 
@@ -249,18 +234,18 @@ jQuery('#adminForm').on('change', '#jform_main_source',function (e)
 
 });
 
-// #jform_addcalculation listeners for addcalculation_vvvvvzl function
+// #jform_main_source listeners for main_source_vvvvvzl function
-jQuery('#jform_addcalculation').on('keyup',function()
+jQuery('#jform_main_source').on('keyup',function()
 {
-	var addcalculation_vvvvvzl = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var main_source_vvvvvzl = jQuery("#jform_main_source").val();
-	vvvvvzl(addcalculation_vvvvvzl);
+	vvvvvzl(main_source_vvvvvzl);
 
 });
-jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
+jQuery('#adminForm').on('change', '#jform_main_source',function (e)
 {
 	e.preventDefault();
-	var addcalculation_vvvvvzl = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var main_source_vvvvvzl = jQuery("#jform_main_source").val();
-	vvvvvzl(addcalculation_vvvvvzl);
+	vvvvvzl(main_source_vvvvvzl);
 
 });
 
@@ -268,33 +253,14 @@ jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
 jQuery('#jform_addcalculation').on('keyup',function()
 {
 	var addcalculation_vvvvvzm = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvzm = jQuery("#jform_gettype").val();
+	vvvvvzm(addcalculation_vvvvvzm);
-	vvvvvzm(addcalculation_vvvvvzm,gettype_vvvvvzm);
 
 });
 jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
 {
 	e.preventDefault();
 	var addcalculation_vvvvvzm = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvzm = jQuery("#jform_gettype").val();
+	vvvvvzm(addcalculation_vvvvvzm);
-	vvvvvzm(addcalculation_vvvvvzm,gettype_vvvvvzm);
-
-});
-
-// #jform_gettype listeners for gettype_vvvvvzm function
-jQuery('#jform_gettype').on('keyup',function()
-{
-	var addcalculation_vvvvvzm = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvzm = jQuery("#jform_gettype").val();
-	vvvvvzm(addcalculation_vvvvvzm,gettype_vvvvvzm);
-
-});
-jQuery('#adminForm').on('change', '#jform_gettype',function (e)
-{
-	e.preventDefault();
-	var addcalculation_vvvvvzm = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvzm = jQuery("#jform_gettype").val();
-	vvvvvzm(addcalculation_vvvvvzm,gettype_vvvvvzm);
 
 });
 
@@ -332,18 +298,37 @@ jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 
 });
 
-// #jform_main_source listeners for main_source_vvvvvzq function
+// #jform_addcalculation listeners for addcalculation_vvvvvzo function
-jQuery('#jform_main_source').on('keyup',function()
+jQuery('#jform_addcalculation').on('keyup',function()
 {
-	var main_source_vvvvvzq = jQuery("#jform_main_source").val();
+	var addcalculation_vvvvvzo = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	vvvvvzq(main_source_vvvvvzq);
+	var gettype_vvvvvzo = jQuery("#jform_gettype").val();
+	vvvvvzo(addcalculation_vvvvvzo,gettype_vvvvvzo);
 
 });
-jQuery('#adminForm').on('change', '#jform_main_source',function (e)
+jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
 {
 	e.preventDefault();
-	var main_source_vvvvvzq = jQuery("#jform_main_source").val();
+	var addcalculation_vvvvvzo = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	vvvvvzq(main_source_vvvvvzq);
+	var gettype_vvvvvzo = jQuery("#jform_gettype").val();
+	vvvvvzo(addcalculation_vvvvvzo,gettype_vvvvvzo);
+
+});
+
+// #jform_gettype listeners for gettype_vvvvvzo function
+jQuery('#jform_gettype').on('keyup',function()
+{
+	var addcalculation_vvvvvzo = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzo = jQuery("#jform_gettype").val();
+	vvvvvzo(addcalculation_vvvvvzo,gettype_vvvvvzo);
+
+});
+jQuery('#adminForm').on('change', '#jform_gettype',function (e)
+{
+	e.preventDefault();
+	var addcalculation_vvvvvzo = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzo = jQuery("#jform_gettype").val();
+	vvvvvzo(addcalculation_vvvvvzo,gettype_vvvvvzo);
 
 });
 
@@ -362,203 +347,203 @@ jQuery('#adminForm').on('change', '#jform_main_source',function (e)
 
 });
 
-// #jform_add_php_before_getitem listeners for add_php_before_getitem_vvvvvzs function
+// #jform_main_source listeners for main_source_vvvvvzs function
+jQuery('#jform_main_source').on('keyup',function()
+{
+	var main_source_vvvvvzs = jQuery("#jform_main_source").val();
+	vvvvvzs(main_source_vvvvvzs);
+
+});
+jQuery('#adminForm').on('change', '#jform_main_source',function (e)
+{
+	e.preventDefault();
+	var main_source_vvvvvzs = jQuery("#jform_main_source").val();
+	vvvvvzs(main_source_vvvvvzs);
+
+});
+
+// #jform_add_php_before_getitem listeners for add_php_before_getitem_vvvvvzt function
 jQuery('#jform_add_php_before_getitem').on('keyup',function()
 {
-	var add_php_before_getitem_vvvvvzs = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
+	var add_php_before_getitem_vvvvvzt = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzs = jQuery("#jform_gettype").val();
+	var gettype_vvvvvzt = jQuery("#jform_gettype").val();
-	vvvvvzs(add_php_before_getitem_vvvvvzs,gettype_vvvvvzs);
+	vvvvvzt(add_php_before_getitem_vvvvvzt,gettype_vvvvvzt);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_before_getitem',function (e)
 {
 	e.preventDefault();
-	var add_php_before_getitem_vvvvvzs = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
+	var add_php_before_getitem_vvvvvzt = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzs = jQuery("#jform_gettype").val();
-	vvvvvzs(add_php_before_getitem_vvvvvzs,gettype_vvvvvzs);
-
-});
-
-// #jform_gettype listeners for gettype_vvvvvzs function
-jQuery('#jform_gettype').on('keyup',function()
-{
-	var add_php_before_getitem_vvvvvzs = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzs = jQuery("#jform_gettype").val();
-	vvvvvzs(add_php_before_getitem_vvvvvzs,gettype_vvvvvzs);
-
-});
-jQuery('#adminForm').on('change', '#jform_gettype',function (e)
-{
-	e.preventDefault();
-	var add_php_before_getitem_vvvvvzs = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzs = jQuery("#jform_gettype").val();
-	vvvvvzs(add_php_before_getitem_vvvvvzs,gettype_vvvvvzs);
-
-});
-
-// #jform_add_php_after_getitem listeners for add_php_after_getitem_vvvvvzt function
-jQuery('#jform_add_php_after_getitem').on('keyup',function()
-{
-	var add_php_after_getitem_vvvvvzt = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
 	var gettype_vvvvvzt = jQuery("#jform_gettype").val();
-	vvvvvzt(add_php_after_getitem_vvvvvzt,gettype_vvvvvzt);
+	vvvvvzt(add_php_before_getitem_vvvvvzt,gettype_vvvvvzt);
-
-});
-jQuery('#adminForm').on('change', '#jform_add_php_after_getitem',function (e)
-{
-	e.preventDefault();
-	var add_php_after_getitem_vvvvvzt = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzt = jQuery("#jform_gettype").val();
-	vvvvvzt(add_php_after_getitem_vvvvvzt,gettype_vvvvvzt);
 
 });
 
 // #jform_gettype listeners for gettype_vvvvvzt function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var add_php_after_getitem_vvvvvzt = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var add_php_before_getitem_vvvvvzt = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
 	var gettype_vvvvvzt = jQuery("#jform_gettype").val();
-	vvvvvzt(add_php_after_getitem_vvvvvzt,gettype_vvvvvzt);
+	vvvvvzt(add_php_before_getitem_vvvvvzt,gettype_vvvvvzt);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var add_php_after_getitem_vvvvvzt = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var add_php_before_getitem_vvvvvzt = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
 	var gettype_vvvvvzt = jQuery("#jform_gettype").val();
-	vvvvvzt(add_php_after_getitem_vvvvvzt,gettype_vvvvvzt);
+	vvvvvzt(add_php_before_getitem_vvvvvzt,gettype_vvvvvzt);
 
 });
 
-// #jform_gettype listeners for gettype_vvvvvzv function
+// #jform_add_php_after_getitem listeners for add_php_after_getitem_vvvvvzu function
+jQuery('#jform_add_php_after_getitem').on('keyup',function()
+{
+	var add_php_after_getitem_vvvvvzu = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var gettype_vvvvvzu = jQuery("#jform_gettype").val();
+	vvvvvzu(add_php_after_getitem_vvvvvzu,gettype_vvvvvzu);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_php_after_getitem',function (e)
+{
+	e.preventDefault();
+	var add_php_after_getitem_vvvvvzu = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var gettype_vvvvvzu = jQuery("#jform_gettype").val();
+	vvvvvzu(add_php_after_getitem_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_getitem_vvvvvzu = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
-	vvvvvzv(gettype_vvvvvzv);
+	var gettype_vvvvvzu = jQuery("#jform_gettype").val();
+	vvvvvzu(add_php_after_getitem_vvvvvzu,gettype_vvvvvzu);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var gettype_vvvvvzv = jQuery("#jform_gettype").val();
+	var add_php_after_getitem_vvvvvzu = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
-	vvvvvzv(gettype_vvvvvzv);
+	var gettype_vvvvvzu = jQuery("#jform_gettype").val();
-
+	vvvvvzu(add_php_after_getitem_vvvvvzu,gettype_vvvvvzu);
-});
-
-// #jform_add_php_getlistquery listeners for add_php_getlistquery_vvvvvzw function
-jQuery('#jform_add_php_getlistquery').on('keyup',function()
-{
-	var add_php_getlistquery_vvvvvzw = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
-	var gettype_vvvvvzw = jQuery("#jform_gettype").val();
-	vvvvvzw(add_php_getlistquery_vvvvvzw,gettype_vvvvvzw);
-
-});
-jQuery('#adminForm').on('change', '#jform_add_php_getlistquery',function (e)
-{
-	e.preventDefault();
-	var add_php_getlistquery_vvvvvzw = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
-	var gettype_vvvvvzw = jQuery("#jform_gettype").val();
-	vvvvvzw(add_php_getlistquery_vvvvvzw,gettype_vvvvvzw);
 
 });
 
 // #jform_gettype listeners for gettype_vvvvvzw function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var add_php_getlistquery_vvvvvzw = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzw = jQuery("#jform_gettype").val();
-	vvvvvzw(add_php_getlistquery_vvvvvzw,gettype_vvvvvzw);
+	vvvvvzw(gettype_vvvvvzw);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var add_php_getlistquery_vvvvvzw = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzw = jQuery("#jform_gettype").val();
-	vvvvvzw(add_php_getlistquery_vvvvvzw,gettype_vvvvvzw);
+	vvvvvzw(gettype_vvvvvzw);
 
 });
 
-// #jform_add_php_before_getitems listeners for add_php_before_getitems_vvvvvzx function
+// #jform_add_php_getlistquery listeners for add_php_getlistquery_vvvvvzx function
-jQuery('#jform_add_php_before_getitems').on('keyup',function()
+jQuery('#jform_add_php_getlistquery').on('keyup',function()
 {
-	var add_php_before_getitems_vvvvvzx = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvzx = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzx = jQuery("#jform_gettype").val();
-	vvvvvzx(add_php_before_getitems_vvvvvzx,gettype_vvvvvzx);
+	vvvvvzx(add_php_getlistquery_vvvvvzx,gettype_vvvvvzx);
 
 });
-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_vvvvvzx = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvzx = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzx = jQuery("#jform_gettype").val();
-	vvvvvzx(add_php_before_getitems_vvvvvzx,gettype_vvvvvzx);
+	vvvvvzx(add_php_getlistquery_vvvvvzx,gettype_vvvvvzx);
 
 });
 
 // #jform_gettype listeners for gettype_vvvvvzx function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var add_php_before_getitems_vvvvvzx = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvzx = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzx = jQuery("#jform_gettype").val();
-	vvvvvzx(add_php_before_getitems_vvvvvzx,gettype_vvvvvzx);
+	vvvvvzx(add_php_getlistquery_vvvvvzx,gettype_vvvvvzx);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var add_php_before_getitems_vvvvvzx = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvzx = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzx = jQuery("#jform_gettype").val();
-	vvvvvzx(add_php_before_getitems_vvvvvzx,gettype_vvvvvzx);
+	vvvvvzx(add_php_getlistquery_vvvvvzx,gettype_vvvvvzx);
 
 });
 
-// #jform_add_php_after_getitems listeners for add_php_after_getitems_vvvvvzy function
+// #jform_add_php_before_getitems listeners for add_php_before_getitems_vvvvvzy function
-jQuery('#jform_add_php_after_getitems').on('keyup',function()
+jQuery('#jform_add_php_before_getitems').on('keyup',function()
 {
-	var add_php_after_getitems_vvvvvzy = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_before_getitems_vvvvvzy = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
 	var gettype_vvvvvzy = jQuery("#jform_gettype").val();
-	vvvvvzy(add_php_after_getitems_vvvvvzy,gettype_vvvvvzy);
+	vvvvvzy(add_php_before_getitems_vvvvvzy,gettype_vvvvvzy);
 
 });
-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_vvvvvzy = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_before_getitems_vvvvvzy = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
 	var gettype_vvvvvzy = jQuery("#jform_gettype").val();
-	vvvvvzy(add_php_after_getitems_vvvvvzy,gettype_vvvvvzy);
+	vvvvvzy(add_php_before_getitems_vvvvvzy,gettype_vvvvvzy);
 
 });
 
 // #jform_gettype listeners for gettype_vvvvvzy function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var add_php_after_getitems_vvvvvzy = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_before_getitems_vvvvvzy = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
 	var gettype_vvvvvzy = jQuery("#jform_gettype").val();
-	vvvvvzy(add_php_after_getitems_vvvvvzy,gettype_vvvvvzy);
+	vvvvvzy(add_php_before_getitems_vvvvvzy,gettype_vvvvvzy);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var add_php_after_getitems_vvvvvzy = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_before_getitems_vvvvvzy = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
 	var gettype_vvvvvzy = jQuery("#jform_gettype").val();
-	vvvvvzy(add_php_after_getitems_vvvvvzy,gettype_vvvvvzy);
+	vvvvvzy(add_php_before_getitems_vvvvvzy,gettype_vvvvvzy);
 
 });
 
-// #jform_gettype listeners for gettype_vvvvwaa function
+// #jform_add_php_after_getitems listeners for add_php_after_getitems_vvvvvzz function
+jQuery('#jform_add_php_after_getitems').on('keyup',function()
+{
+	var add_php_after_getitems_vvvvvzz = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var gettype_vvvvvzz = jQuery("#jform_gettype").val();
+	vvvvvzz(add_php_after_getitems_vvvvvzz,gettype_vvvvvzz);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_php_after_getitems',function (e)
+{
+	e.preventDefault();
+	var add_php_after_getitems_vvvvvzz = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var gettype_vvvvvzz = jQuery("#jform_gettype").val();
+	vvvvvzz(add_php_after_getitems_vvvvvzz,gettype_vvvvvzz);
+
+});
+
+// #jform_gettype listeners for gettype_vvvvvzz function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var gettype_vvvvwaa = jQuery("#jform_gettype").val();
+	var add_php_after_getitems_vvvvvzz = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
-	vvvvwaa(gettype_vvvvwaa);
+	var gettype_vvvvvzz = jQuery("#jform_gettype").val();
+	vvvvvzz(add_php_after_getitems_vvvvvzz,gettype_vvvvvzz);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var gettype_vvvvwaa = jQuery("#jform_gettype").val();
+	var add_php_after_getitems_vvvvvzz = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
-	vvvvwaa(gettype_vvvvwaa);
+	var gettype_vvvvvzz = jQuery("#jform_gettype").val();
+	vvvvvzz(add_php_after_getitems_vvvvvzz,gettype_vvvvvzz);
 
 });
 
@@ -596,48 +581,63 @@ jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 jQuery('#jform_gettype').on('keyup',function()
 {
 	var gettype_vvvvwad = jQuery("#jform_gettype").val();
-	var add_php_router_parse_vvvvwad = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	vvvvwad(gettype_vvvvwad);
-	vvvvwad(gettype_vvvvwad,add_php_router_parse_vvvvwad);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
 	var gettype_vvvvwad = jQuery("#jform_gettype").val();
-	var add_php_router_parse_vvvvwad = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	vvvvwad(gettype_vvvvwad);
-	vvvvwad(gettype_vvvvwad,add_php_router_parse_vvvvwad);
 
 });
 
-// #jform_add_php_router_parse listeners for add_php_router_parse_vvvvwad function
+// #jform_gettype listeners for gettype_vvvvwae function
+jQuery('#jform_gettype').on('keyup',function()
+{
+	var gettype_vvvvwae = jQuery("#jform_gettype").val();
+	var add_php_router_parse_vvvvwae = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	vvvvwae(gettype_vvvvwae,add_php_router_parse_vvvvwae);
+
+});
+jQuery('#adminForm').on('change', '#jform_gettype',function (e)
+{
+	e.preventDefault();
+	var gettype_vvvvwae = jQuery("#jform_gettype").val();
+	var add_php_router_parse_vvvvwae = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	vvvvwae(gettype_vvvvwae,add_php_router_parse_vvvvwae);
+
+});
+
+// #jform_add_php_router_parse listeners for add_php_router_parse_vvvvwae function
 jQuery('#jform_add_php_router_parse').on('keyup',function()
 {
-	var gettype_vvvvwad = jQuery("#jform_gettype").val();
+	var gettype_vvvvwae = jQuery("#jform_gettype").val();
-	var add_php_router_parse_vvvvwad = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	var add_php_router_parse_vvvvwae = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
-	vvvvwad(gettype_vvvvwad,add_php_router_parse_vvvvwad);
+	vvvvwae(gettype_vvvvwae,add_php_router_parse_vvvvwae);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_router_parse',function (e)
 {
 	e.preventDefault();
-	var gettype_vvvvwad = jQuery("#jform_gettype").val();
+	var gettype_vvvvwae = jQuery("#jform_gettype").val();
-	var add_php_router_parse_vvvvwad = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	var add_php_router_parse_vvvvwae = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
-	vvvvwad(gettype_vvvvwad,add_php_router_parse_vvvvwad);
+	vvvvwae(gettype_vvvvwae,add_php_router_parse_vvvvwae);
 
 });
 
-// #jform_gettype listeners for gettype_vvvvwaf function
+// #jform_gettype listeners for gettype_vvvvwag function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var gettype_vvvvwaf = jQuery("#jform_gettype").val();
+	var gettype_vvvvwag = jQuery("#jform_gettype").val();
-	vvvvwaf(gettype_vvvvwaf);
+	vvvvwag(gettype_vvvvwag);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var gettype_vvvvwaf = jQuery("#jform_gettype").val();
+	var gettype_vvvvwag = jQuery("#jform_gettype").val();
-	vvvvwaf(gettype_vvvvwaf);
+	vvvvwag(gettype_vvvvwag);
 
 });
 

admin/views/field/tmpl/edit.php

@@ -147,48 +147,33 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_datalenght listeners for datalenght_vvvvwas function
+// #jform_datalenght listeners for datalenght_vvvvwat function
 jQuery('#jform_datalenght').on('keyup',function()
 {
-	var datalenght_vvvvwas = jQuery("#jform_datalenght").val();
+	var datalenght_vvvvwat = jQuery("#jform_datalenght").val();
-	vvvvwas(datalenght_vvvvwas);
+	vvvvwat(datalenght_vvvvwat);
 
 });
 jQuery('#adminForm').on('change', '#jform_datalenght',function (e)
 {
 	e.preventDefault();
-	var datalenght_vvvvwas = jQuery("#jform_datalenght").val();
+	var datalenght_vvvvwat = jQuery("#jform_datalenght").val();
-	vvvvwas(datalenght_vvvvwas);
+	vvvvwat(datalenght_vvvvwat);
 
 });
 
-// #jform_datadefault listeners for datadefault_vvvvwat function
+// #jform_datadefault listeners for datadefault_vvvvwau function
 jQuery('#jform_datadefault').on('keyup',function()
 {
-	var datadefault_vvvvwat = jQuery("#jform_datadefault").val();
+	var datadefault_vvvvwau = jQuery("#jform_datadefault").val();
-	vvvvwat(datadefault_vvvvwat);
+	vvvvwau(datadefault_vvvvwau);
 
 });
 jQuery('#adminForm').on('change', '#jform_datadefault',function (e)
 {
 	e.preventDefault();
-	var datadefault_vvvvwat = jQuery("#jform_datadefault").val();
+	var datadefault_vvvvwau = jQuery("#jform_datadefault").val();
-	vvvvwat(datadefault_vvvvwat);
+	vvvvwau(datadefault_vvvvwau);
-
-});
-
-// #jform_datatype listeners for datatype_vvvvwau function
-jQuery('#jform_datatype').on('keyup',function()
-{
-	var datatype_vvvvwau = jQuery("#jform_datatype").val();
-	vvvvwau(datatype_vvvvwau);
-
-});
-jQuery('#adminForm').on('change', '#jform_datatype',function (e)
-{
-	e.preventDefault();
-	var datatype_vvvvwau = jQuery("#jform_datatype").val();
-	vvvvwau(datatype_vvvvwau);
 
 });
 
@@ -207,97 +192,112 @@ jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 
 });
 
-// #jform_store listeners for store_vvvvwaw function
-jQuery('#jform_store').on('keyup',function()
-{
-	var store_vvvvwaw = jQuery("#jform_store").val();
-	var datatype_vvvvwaw = jQuery("#jform_datatype").val();
-	vvvvwaw(store_vvvvwaw,datatype_vvvvwaw);
-
-});
-jQuery('#adminForm').on('change', '#jform_store',function (e)
-{
-	e.preventDefault();
-	var store_vvvvwaw = jQuery("#jform_store").val();
-	var datatype_vvvvwaw = jQuery("#jform_datatype").val();
-	vvvvwaw(store_vvvvwaw,datatype_vvvvwaw);
-
-});
-
 // #jform_datatype listeners for datatype_vvvvwaw function
 jQuery('#jform_datatype').on('keyup',function()
 {
-	var store_vvvvwaw = jQuery("#jform_store").val();
 	var datatype_vvvvwaw = jQuery("#jform_datatype").val();
-	vvvvwaw(store_vvvvwaw,datatype_vvvvwaw);
+	vvvvwaw(datatype_vvvvwaw);
 
 });
 jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 {
 	e.preventDefault();
-	var store_vvvvwaw = jQuery("#jform_store").val();
 	var datatype_vvvvwaw = jQuery("#jform_datatype").val();
-	vvvvwaw(store_vvvvwaw,datatype_vvvvwaw);
+	vvvvwaw(datatype_vvvvwaw);
 
 });
 
-// #jform_add_css_view listeners for add_css_view_vvvvway function
+// #jform_store listeners for store_vvvvwax function
+jQuery('#jform_store').on('keyup',function()
+{
+	var store_vvvvwax = jQuery("#jform_store").val();
+	var datatype_vvvvwax = jQuery("#jform_datatype").val();
+	vvvvwax(store_vvvvwax,datatype_vvvvwax);
+
+});
+jQuery('#adminForm').on('change', '#jform_store',function (e)
+{
+	e.preventDefault();
+	var store_vvvvwax = jQuery("#jform_store").val();
+	var datatype_vvvvwax = jQuery("#jform_datatype").val();
+	vvvvwax(store_vvvvwax,datatype_vvvvwax);
+
+});
+
+// #jform_datatype listeners for datatype_vvvvwax function
+jQuery('#jform_datatype').on('keyup',function()
+{
+	var store_vvvvwax = jQuery("#jform_store").val();
+	var datatype_vvvvwax = jQuery("#jform_datatype").val();
+	vvvvwax(store_vvvvwax,datatype_vvvvwax);
+
+});
+jQuery('#adminForm').on('change', '#jform_datatype',function (e)
+{
+	e.preventDefault();
+	var store_vvvvwax = jQuery("#jform_store").val();
+	var datatype_vvvvwax = jQuery("#jform_datatype").val();
+	vvvvwax(store_vvvvwax,datatype_vvvvwax);
+
+});
+
+// #jform_add_css_view listeners for add_css_view_vvvvwaz function
 jQuery('#jform_add_css_view').on('keyup',function()
 {
-	var add_css_view_vvvvway = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	var add_css_view_vvvvwaz = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvway(add_css_view_vvvvway);
+	vvvvwaz(add_css_view_vvvvwaz);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css_view',function (e)
 {
 	e.preventDefault();
-	var add_css_view_vvvvway = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	var add_css_view_vvvvwaz = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvway(add_css_view_vvvvway);
+	vvvvwaz(add_css_view_vvvvwaz);
 
 });
 
-// #jform_add_css_views listeners for add_css_views_vvvvwaz function
+// #jform_add_css_views listeners for add_css_views_vvvvwba function
 jQuery('#jform_add_css_views').on('keyup',function()
 {
-	var add_css_views_vvvvwaz = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	var add_css_views_vvvvwba = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvwaz(add_css_views_vvvvwaz);
+	vvvvwba(add_css_views_vvvvwba);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css_views',function (e)
 {
 	e.preventDefault();
-	var add_css_views_vvvvwaz = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	var add_css_views_vvvvwba = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvwaz(add_css_views_vvvvwaz);
+	vvvvwba(add_css_views_vvvvwba);
 
 });
 
-// #jform_add_javascript_view_footer listeners for add_javascript_view_footer_vvvvwba function
+// #jform_add_javascript_view_footer listeners for add_javascript_view_footer_vvvvwbb function
 jQuery('#jform_add_javascript_view_footer').on('keyup',function()
 {
-	var add_javascript_view_footer_vvvvwba = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	var add_javascript_view_footer_vvvvwbb = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvwba(add_javascript_view_footer_vvvvwba);
+	vvvvwbb(add_javascript_view_footer_vvvvwbb);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_view_footer',function (e)
 {
 	e.preventDefault();
-	var add_javascript_view_footer_vvvvwba = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	var add_javascript_view_footer_vvvvwbb = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvwba(add_javascript_view_footer_vvvvwba);
+	vvvvwbb(add_javascript_view_footer_vvvvwbb);
 
 });
 
-// #jform_add_javascript_views_footer listeners for add_javascript_views_footer_vvvvwbb function
+// #jform_add_javascript_views_footer listeners for add_javascript_views_footer_vvvvwbc function
 jQuery('#jform_add_javascript_views_footer').on('keyup',function()
 {
-	var add_javascript_views_footer_vvvvwbb = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	var add_javascript_views_footer_vvvvwbc = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
-	vvvvwbb(add_javascript_views_footer_vvvvwbb);
+	vvvvwbc(add_javascript_views_footer_vvvvwbc);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_views_footer',function (e)
 {
 	e.preventDefault();
-	var add_javascript_views_footer_vvvvwbb = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	var add_javascript_views_footer_vvvvwbc = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
-	vvvvwbb(add_javascript_views_footer_vvvvwbb);
+	vvvvwbc(add_javascript_views_footer_vvvvwbc);
 
 });
 

admin/views/fieldtype/tmpl/edit.php

@@ -136,344 +136,287 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_datalenght listeners for datalenght_vvvvwbc function
+// #jform_datalenght listeners for datalenght_vvvvwbd function
 jQuery('#jform_datalenght').on('keyup',function()
 {
-	var datalenght_vvvvwbc = jQuery("#jform_datalenght").val();
+	var datalenght_vvvvwbd = jQuery("#jform_datalenght").val();
-	var has_defaults_vvvvwbc = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var has_defaults_vvvvwbd = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbc(datalenght_vvvvwbc,has_defaults_vvvvwbc);
+	vvvvwbd(datalenght_vvvvwbd,has_defaults_vvvvwbd);
 
 });
 jQuery('#adminForm').on('change', '#jform_datalenght',function (e)
 {
 	e.preventDefault();
-	var datalenght_vvvvwbc = jQuery("#jform_datalenght").val();
+	var datalenght_vvvvwbd = jQuery("#jform_datalenght").val();
-	var has_defaults_vvvvwbc = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var has_defaults_vvvvwbd = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbc(datalenght_vvvvwbc,has_defaults_vvvvwbc);
+	vvvvwbd(datalenght_vvvvwbd,has_defaults_vvvvwbd);
 
 });
 
-// #jform_has_defaults listeners for has_defaults_vvvvwbc function
+// #jform_has_defaults listeners for has_defaults_vvvvwbd function
 jQuery('#jform_has_defaults').on('keyup',function()
 {
-	var datalenght_vvvvwbc = jQuery("#jform_datalenght").val();
+	var datalenght_vvvvwbd = jQuery("#jform_datalenght").val();
-	var has_defaults_vvvvwbc = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var has_defaults_vvvvwbd = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbc(datalenght_vvvvwbc,has_defaults_vvvvwbc);
+	vvvvwbd(datalenght_vvvvwbd,has_defaults_vvvvwbd);
 
 });
 jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
 {
 	e.preventDefault();
-	var datalenght_vvvvwbc = jQuery("#jform_datalenght").val();
+	var datalenght_vvvvwbd = jQuery("#jform_datalenght").val();
-	var has_defaults_vvvvwbc = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var has_defaults_vvvvwbd = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbc(datalenght_vvvvwbc,has_defaults_vvvvwbc);
+	vvvvwbd(datalenght_vvvvwbd,has_defaults_vvvvwbd);
 
 });
 
-// #jform_datadefault listeners for datadefault_vvvvwbe function
+// #jform_datadefault listeners for datadefault_vvvvwbf function
 jQuery('#jform_datadefault').on('keyup',function()
 {
-	var datadefault_vvvvwbe = jQuery("#jform_datadefault").val();
+	var datadefault_vvvvwbf = jQuery("#jform_datadefault").val();
-	var has_defaults_vvvvwbe = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var has_defaults_vvvvwbf = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbe(datadefault_vvvvwbe,has_defaults_vvvvwbe);
+	vvvvwbf(datadefault_vvvvwbf,has_defaults_vvvvwbf);
 
 });
 jQuery('#adminForm').on('change', '#jform_datadefault',function (e)
 {
 	e.preventDefault();
-	var datadefault_vvvvwbe = jQuery("#jform_datadefault").val();
+	var datadefault_vvvvwbf = jQuery("#jform_datadefault").val();
-	var has_defaults_vvvvwbe = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var has_defaults_vvvvwbf = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbe(datadefault_vvvvwbe,has_defaults_vvvvwbe);
+	vvvvwbf(datadefault_vvvvwbf,has_defaults_vvvvwbf);
 
 });
 
-// #jform_has_defaults listeners for has_defaults_vvvvwbe function
+// #jform_has_defaults listeners for has_defaults_vvvvwbf function
 jQuery('#jform_has_defaults').on('keyup',function()
 {
-	var datadefault_vvvvwbe = jQuery("#jform_datadefault").val();
+	var datadefault_vvvvwbf = jQuery("#jform_datadefault").val();
-	var has_defaults_vvvvwbe = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var has_defaults_vvvvwbf = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbe(datadefault_vvvvwbe,has_defaults_vvvvwbe);
+	vvvvwbf(datadefault_vvvvwbf,has_defaults_vvvvwbf);
 
 });
 jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
 {
 	e.preventDefault();
-	var datadefault_vvvvwbe = jQuery("#jform_datadefault").val();
+	var datadefault_vvvvwbf = jQuery("#jform_datadefault").val();
-	var has_defaults_vvvvwbe = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var has_defaults_vvvvwbf = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbe(datadefault_vvvvwbe,has_defaults_vvvvwbe);
+	vvvvwbf(datadefault_vvvvwbf,has_defaults_vvvvwbf);
-
-});
-
-// #jform_datatype listeners for datatype_vvvvwbg function
-jQuery('#jform_datatype').on('keyup',function()
-{
-	var datatype_vvvvwbg = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwbg = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbg(datatype_vvvvwbg,has_defaults_vvvvwbg);
-
-});
-jQuery('#adminForm').on('change', '#jform_datatype',function (e)
-{
-	e.preventDefault();
-	var datatype_vvvvwbg = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwbg = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbg(datatype_vvvvwbg,has_defaults_vvvvwbg);
-
-});
-
-// #jform_has_defaults listeners for has_defaults_vvvvwbg function
-jQuery('#jform_has_defaults').on('keyup',function()
-{
-	var datatype_vvvvwbg = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwbg = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbg(datatype_vvvvwbg,has_defaults_vvvvwbg);
-
-});
-jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
-{
-	e.preventDefault();
-	var datatype_vvvvwbg = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwbg = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbg(datatype_vvvvwbg,has_defaults_vvvvwbg);
-
-});
-
-// #jform_has_defaults listeners for has_defaults_vvvvwbh function
-jQuery('#jform_has_defaults').on('keyup',function()
-{
-	var has_defaults_vvvvwbh = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var datatype_vvvvwbh = jQuery("#jform_datatype").val();
-	vvvvwbh(has_defaults_vvvvwbh,datatype_vvvvwbh);
-
-});
-jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
-{
-	e.preventDefault();
-	var has_defaults_vvvvwbh = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var datatype_vvvvwbh = jQuery("#jform_datatype").val();
-	vvvvwbh(has_defaults_vvvvwbh,datatype_vvvvwbh);
 
 });
 
 // #jform_datatype listeners for datatype_vvvvwbh function
 jQuery('#jform_datatype').on('keyup',function()
 {
-	var has_defaults_vvvvwbh = jQuery("#jform_has_defaults input[type='radio']:checked").val();
 	var datatype_vvvvwbh = jQuery("#jform_datatype").val();
-	vvvvwbh(has_defaults_vvvvwbh,datatype_vvvvwbh);
+	var has_defaults_vvvvwbh = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbh(datatype_vvvvwbh,has_defaults_vvvvwbh);
 
 });
 jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 {
 	e.preventDefault();
-	var has_defaults_vvvvwbh = jQuery("#jform_has_defaults input[type='radio']:checked").val();
 	var datatype_vvvvwbh = jQuery("#jform_datatype").val();
-	vvvvwbh(has_defaults_vvvvwbh,datatype_vvvvwbh);
+	var has_defaults_vvvvwbh = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbh(datatype_vvvvwbh,has_defaults_vvvvwbh);
 
 });
 
-// #jform_datatype listeners for datatype_vvvvwbi function
+// #jform_has_defaults listeners for has_defaults_vvvvwbh function
-jQuery('#jform_datatype').on('keyup',function()
+jQuery('#jform_has_defaults').on('keyup',function()
 {
-	var datatype_vvvvwbi = jQuery("#jform_datatype").val();
+	var datatype_vvvvwbh = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwbi = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var has_defaults_vvvvwbh = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbi(datatype_vvvvwbi,has_defaults_vvvvwbi);
+	vvvvwbh(datatype_vvvvwbh,has_defaults_vvvvwbh);
 
 });
-jQuery('#adminForm').on('change', '#jform_datatype',function (e)
+jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
 {
 	e.preventDefault();
-	var datatype_vvvvwbi = jQuery("#jform_datatype").val();
+	var datatype_vvvvwbh = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwbi = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var has_defaults_vvvvwbh = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbi(datatype_vvvvwbi,has_defaults_vvvvwbi);
+	vvvvwbh(datatype_vvvvwbh,has_defaults_vvvvwbh);
 
 });
 
 // #jform_has_defaults listeners for has_defaults_vvvvwbi function
 jQuery('#jform_has_defaults').on('keyup',function()
 {
-	var datatype_vvvvwbi = jQuery("#jform_datatype").val();
 	var has_defaults_vvvvwbi = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbi(datatype_vvvvwbi,has_defaults_vvvvwbi);
+	var datatype_vvvvwbi = jQuery("#jform_datatype").val();
+	vvvvwbi(has_defaults_vvvvwbi,datatype_vvvvwbi);
 
 });
 jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
 {
 	e.preventDefault();
-	var datatype_vvvvwbi = jQuery("#jform_datatype").val();
 	var has_defaults_vvvvwbi = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbi(datatype_vvvvwbi,has_defaults_vvvvwbi);
+	var datatype_vvvvwbi = jQuery("#jform_datatype").val();
+	vvvvwbi(has_defaults_vvvvwbi,datatype_vvvvwbi);
 
 });
 
-// #jform_store listeners for store_vvvvwbk function
+// #jform_datatype listeners for datatype_vvvvwbi function
-jQuery('#jform_store').on('keyup',function()
-{
-	var store_vvvvwbk = jQuery("#jform_store").val();
-	var datatype_vvvvwbk = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwbk = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbk(store_vvvvwbk,datatype_vvvvwbk,has_defaults_vvvvwbk);
-
-});
-jQuery('#adminForm').on('change', '#jform_store',function (e)
-{
-	e.preventDefault();
-	var store_vvvvwbk = jQuery("#jform_store").val();
-	var datatype_vvvvwbk = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwbk = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbk(store_vvvvwbk,datatype_vvvvwbk,has_defaults_vvvvwbk);
-
-});
-
-// #jform_datatype listeners for datatype_vvvvwbk function
 jQuery('#jform_datatype').on('keyup',function()
 {
-	var store_vvvvwbk = jQuery("#jform_store").val();
+	var has_defaults_vvvvwbi = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var datatype_vvvvwbk = jQuery("#jform_datatype").val();
+	var datatype_vvvvwbi = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwbk = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbi(has_defaults_vvvvwbi,datatype_vvvvwbi);
-	vvvvwbk(store_vvvvwbk,datatype_vvvvwbk,has_defaults_vvvvwbk);
 
 });
 jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 {
 	e.preventDefault();
-	var store_vvvvwbk = jQuery("#jform_store").val();
+	var has_defaults_vvvvwbi = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var datatype_vvvvwbk = jQuery("#jform_datatype").val();
+	var datatype_vvvvwbi = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwbk = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbi(has_defaults_vvvvwbi,datatype_vvvvwbi);
-	vvvvwbk(store_vvvvwbk,datatype_vvvvwbk,has_defaults_vvvvwbk);
 
 });
 
-// #jform_has_defaults listeners for has_defaults_vvvvwbk function
+// #jform_datatype listeners for datatype_vvvvwbj function
+jQuery('#jform_datatype').on('keyup',function()
+{
+	var datatype_vvvvwbj = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwbj = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbj(datatype_vvvvwbj,has_defaults_vvvvwbj);
+
+});
+jQuery('#adminForm').on('change', '#jform_datatype',function (e)
+{
+	e.preventDefault();
+	var datatype_vvvvwbj = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwbj = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbj(datatype_vvvvwbj,has_defaults_vvvvwbj);
+
+});
+
+// #jform_has_defaults listeners for has_defaults_vvvvwbj function
 jQuery('#jform_has_defaults').on('keyup',function()
 {
-	var store_vvvvwbk = jQuery("#jform_store").val();
+	var datatype_vvvvwbj = jQuery("#jform_datatype").val();
-	var datatype_vvvvwbk = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwbj = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var has_defaults_vvvvwbk = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbj(datatype_vvvvwbj,has_defaults_vvvvwbj);
-	vvvvwbk(store_vvvvwbk,datatype_vvvvwbk,has_defaults_vvvvwbk);
 
 });
 jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
 {
 	e.preventDefault();
-	var store_vvvvwbk = jQuery("#jform_store").val();
+	var datatype_vvvvwbj = jQuery("#jform_datatype").val();
-	var datatype_vvvvwbk = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwbj = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var has_defaults_vvvvwbk = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbj(datatype_vvvvwbj,has_defaults_vvvvwbj);
-	vvvvwbk(store_vvvvwbk,datatype_vvvvwbk,has_defaults_vvvvwbk);
-
-});
-
-// #jform_datatype listeners for datatype_vvvvwbl function
-jQuery('#jform_datatype').on('keyup',function()
-{
-	var datatype_vvvvwbl = jQuery("#jform_datatype").val();
-	var store_vvvvwbl = jQuery("#jform_store").val();
-	var has_defaults_vvvvwbl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbl(datatype_vvvvwbl,store_vvvvwbl,has_defaults_vvvvwbl);
-
-});
-jQuery('#adminForm').on('change', '#jform_datatype',function (e)
-{
-	e.preventDefault();
-	var datatype_vvvvwbl = jQuery("#jform_datatype").val();
-	var store_vvvvwbl = jQuery("#jform_store").val();
-	var has_defaults_vvvvwbl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbl(datatype_vvvvwbl,store_vvvvwbl,has_defaults_vvvvwbl);
 
 });
 
 // #jform_store listeners for store_vvvvwbl function
 jQuery('#jform_store').on('keyup',function()
 {
-	var datatype_vvvvwbl = jQuery("#jform_datatype").val();
 	var store_vvvvwbl = jQuery("#jform_store").val();
+	var datatype_vvvvwbl = jQuery("#jform_datatype").val();
 	var has_defaults_vvvvwbl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbl(datatype_vvvvwbl,store_vvvvwbl,has_defaults_vvvvwbl);
+	vvvvwbl(store_vvvvwbl,datatype_vvvvwbl,has_defaults_vvvvwbl);
 
 });
 jQuery('#adminForm').on('change', '#jform_store',function (e)
 {
 	e.preventDefault();
-	var datatype_vvvvwbl = jQuery("#jform_datatype").val();
 	var store_vvvvwbl = jQuery("#jform_store").val();
+	var datatype_vvvvwbl = jQuery("#jform_datatype").val();
 	var has_defaults_vvvvwbl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbl(datatype_vvvvwbl,store_vvvvwbl,has_defaults_vvvvwbl);
+	vvvvwbl(store_vvvvwbl,datatype_vvvvwbl,has_defaults_vvvvwbl);
+
+});
+
+// #jform_datatype listeners for datatype_vvvvwbl function
+jQuery('#jform_datatype').on('keyup',function()
+{
+	var store_vvvvwbl = jQuery("#jform_store").val();
+	var datatype_vvvvwbl = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwbl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbl(store_vvvvwbl,datatype_vvvvwbl,has_defaults_vvvvwbl);
+
+});
+jQuery('#adminForm').on('change', '#jform_datatype',function (e)
+{
+	e.preventDefault();
+	var store_vvvvwbl = jQuery("#jform_store").val();
+	var datatype_vvvvwbl = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwbl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbl(store_vvvvwbl,datatype_vvvvwbl,has_defaults_vvvvwbl);
 
 });
 
 // #jform_has_defaults listeners for has_defaults_vvvvwbl function
 jQuery('#jform_has_defaults').on('keyup',function()
 {
-	var datatype_vvvvwbl = jQuery("#jform_datatype").val();
 	var store_vvvvwbl = jQuery("#jform_store").val();
+	var datatype_vvvvwbl = jQuery("#jform_datatype").val();
 	var has_defaults_vvvvwbl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbl(datatype_vvvvwbl,store_vvvvwbl,has_defaults_vvvvwbl);
+	vvvvwbl(store_vvvvwbl,datatype_vvvvwbl,has_defaults_vvvvwbl);
 
 });
 jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
 {
 	e.preventDefault();
-	var datatype_vvvvwbl = jQuery("#jform_datatype").val();
 	var store_vvvvwbl = jQuery("#jform_store").val();
+	var datatype_vvvvwbl = jQuery("#jform_datatype").val();
 	var has_defaults_vvvvwbl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbl(datatype_vvvvwbl,store_vvvvwbl,has_defaults_vvvvwbl);
+	vvvvwbl(store_vvvvwbl,datatype_vvvvwbl,has_defaults_vvvvwbl);
-
-});
-
-// #jform_has_defaults listeners for has_defaults_vvvvwbm function
-jQuery('#jform_has_defaults').on('keyup',function()
-{
-	var has_defaults_vvvvwbm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var store_vvvvwbm = jQuery("#jform_store").val();
-	var datatype_vvvvwbm = jQuery("#jform_datatype").val();
-	vvvvwbm(has_defaults_vvvvwbm,store_vvvvwbm,datatype_vvvvwbm);
-
-});
-jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
-{
-	e.preventDefault();
-	var has_defaults_vvvvwbm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var store_vvvvwbm = jQuery("#jform_store").val();
-	var datatype_vvvvwbm = jQuery("#jform_datatype").val();
-	vvvvwbm(has_defaults_vvvvwbm,store_vvvvwbm,datatype_vvvvwbm);
-
-});
-
-// #jform_store listeners for store_vvvvwbm function
-jQuery('#jform_store').on('keyup',function()
-{
-	var has_defaults_vvvvwbm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var store_vvvvwbm = jQuery("#jform_store").val();
-	var datatype_vvvvwbm = jQuery("#jform_datatype").val();
-	vvvvwbm(has_defaults_vvvvwbm,store_vvvvwbm,datatype_vvvvwbm);
-
-});
-jQuery('#adminForm').on('change', '#jform_store',function (e)
-{
-	e.preventDefault();
-	var has_defaults_vvvvwbm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var store_vvvvwbm = jQuery("#jform_store").val();
-	var datatype_vvvvwbm = jQuery("#jform_datatype").val();
-	vvvvwbm(has_defaults_vvvvwbm,store_vvvvwbm,datatype_vvvvwbm);
 
 });
 
 // #jform_datatype listeners for datatype_vvvvwbm function
 jQuery('#jform_datatype').on('keyup',function()
 {
-	var has_defaults_vvvvwbm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var store_vvvvwbm = jQuery("#jform_store").val();
 	var datatype_vvvvwbm = jQuery("#jform_datatype").val();
-	vvvvwbm(has_defaults_vvvvwbm,store_vvvvwbm,datatype_vvvvwbm);
+	var store_vvvvwbm = jQuery("#jform_store").val();
+	var has_defaults_vvvvwbm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbm(datatype_vvvvwbm,store_vvvvwbm,has_defaults_vvvvwbm);
 
 });
 jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 {
 	e.preventDefault();
-	var has_defaults_vvvvwbm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var store_vvvvwbm = jQuery("#jform_store").val();
 	var datatype_vvvvwbm = jQuery("#jform_datatype").val();
-	vvvvwbm(has_defaults_vvvvwbm,store_vvvvwbm,datatype_vvvvwbm);
+	var store_vvvvwbm = jQuery("#jform_store").val();
+	var has_defaults_vvvvwbm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbm(datatype_vvvvwbm,store_vvvvwbm,has_defaults_vvvvwbm);
+
+});
+
+// #jform_store listeners for store_vvvvwbm function
+jQuery('#jform_store').on('keyup',function()
+{
+	var datatype_vvvvwbm = jQuery("#jform_datatype").val();
+	var store_vvvvwbm = jQuery("#jform_store").val();
+	var has_defaults_vvvvwbm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbm(datatype_vvvvwbm,store_vvvvwbm,has_defaults_vvvvwbm);
+
+});
+jQuery('#adminForm').on('change', '#jform_store',function (e)
+{
+	e.preventDefault();
+	var datatype_vvvvwbm = jQuery("#jform_datatype").val();
+	var store_vvvvwbm = jQuery("#jform_store").val();
+	var has_defaults_vvvvwbm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbm(datatype_vvvvwbm,store_vvvvwbm,has_defaults_vvvvwbm);
+
+});
+
+// #jform_has_defaults listeners for has_defaults_vvvvwbm function
+jQuery('#jform_has_defaults').on('keyup',function()
+{
+	var datatype_vvvvwbm = jQuery("#jform_datatype").val();
+	var store_vvvvwbm = jQuery("#jform_store").val();
+	var has_defaults_vvvvwbm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbm(datatype_vvvvwbm,store_vvvvwbm,has_defaults_vvvvwbm);
+
+});
+jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
+{
+	e.preventDefault();
+	var datatype_vvvvwbm = jQuery("#jform_datatype").val();
+	var store_vvvvwbm = jQuery("#jform_store").val();
+	var has_defaults_vvvvwbm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbm(datatype_vvvvwbm,store_vvvvwbm,has_defaults_vvvvwbm);
 
 });
 
@@ -481,14 +424,71 @@ jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 jQuery('#jform_has_defaults').on('keyup',function()
 {
 	var has_defaults_vvvvwbn = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbn(has_defaults_vvvvwbn);
+	var store_vvvvwbn = jQuery("#jform_store").val();
+	var datatype_vvvvwbn = jQuery("#jform_datatype").val();
+	vvvvwbn(has_defaults_vvvvwbn,store_vvvvwbn,datatype_vvvvwbn);
 
 });
 jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
 {
 	e.preventDefault();
 	var has_defaults_vvvvwbn = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbn(has_defaults_vvvvwbn);
+	var store_vvvvwbn = jQuery("#jform_store").val();
+	var datatype_vvvvwbn = jQuery("#jform_datatype").val();
+	vvvvwbn(has_defaults_vvvvwbn,store_vvvvwbn,datatype_vvvvwbn);
+
+});
+
+// #jform_store listeners for store_vvvvwbn function
+jQuery('#jform_store').on('keyup',function()
+{
+	var has_defaults_vvvvwbn = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var store_vvvvwbn = jQuery("#jform_store").val();
+	var datatype_vvvvwbn = jQuery("#jform_datatype").val();
+	vvvvwbn(has_defaults_vvvvwbn,store_vvvvwbn,datatype_vvvvwbn);
+
+});
+jQuery('#adminForm').on('change', '#jform_store',function (e)
+{
+	e.preventDefault();
+	var has_defaults_vvvvwbn = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var store_vvvvwbn = jQuery("#jform_store").val();
+	var datatype_vvvvwbn = jQuery("#jform_datatype").val();
+	vvvvwbn(has_defaults_vvvvwbn,store_vvvvwbn,datatype_vvvvwbn);
+
+});
+
+// #jform_datatype listeners for datatype_vvvvwbn function
+jQuery('#jform_datatype').on('keyup',function()
+{
+	var has_defaults_vvvvwbn = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var store_vvvvwbn = jQuery("#jform_store").val();
+	var datatype_vvvvwbn = jQuery("#jform_datatype").val();
+	vvvvwbn(has_defaults_vvvvwbn,store_vvvvwbn,datatype_vvvvwbn);
+
+});
+jQuery('#adminForm').on('change', '#jform_datatype',function (e)
+{
+	e.preventDefault();
+	var has_defaults_vvvvwbn = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var store_vvvvwbn = jQuery("#jform_store").val();
+	var datatype_vvvvwbn = jQuery("#jform_datatype").val();
+	vvvvwbn(has_defaults_vvvvwbn,store_vvvvwbn,datatype_vvvvwbn);
+
+});
+
+// #jform_has_defaults listeners for has_defaults_vvvvwbo function
+jQuery('#jform_has_defaults').on('keyup',function()
+{
+	var has_defaults_vvvvwbo = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbo(has_defaults_vvvvwbo);
+
+});
+jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
+{
+	e.preventDefault();
+	var has_defaults_vvvvwbo = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbo(has_defaults_vvvvwbo);
 
 });
 

admin/views/fieldtype/view.html.php

@@ -57,7 +57,7 @@ class ComponentbuilderViewFieldtype extends JViewLegacy
 		}
 
 		// Get Linked view data
-		$this->waqfields = $this->get('Waqfields');
+		$this->warfields = $this->get('Warfields');
 
 		// Set the toolbar
 		$this->addToolBar();

admin/views/help_document/tmpl/edit.php

@@ -116,21 +116,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_location listeners for location_vvvvwby function
-jQuery('#jform_location').on('keyup',function()
-{
-	var location_vvvvwby = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwby(location_vvvvwby);
-
-});
-jQuery('#adminForm').on('change', '#jform_location',function (e)
-{
-	e.preventDefault();
-	var location_vvvvwby = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwby(location_vvvvwby);
-
-});
-
 // #jform_location listeners for location_vvvvwbz function
 jQuery('#jform_location').on('keyup',function()
 {
@@ -146,18 +131,18 @@ jQuery('#adminForm').on('change', '#jform_location',function (e)
 
 });
 
-// #jform_type listeners for type_vvvvwca function
+// #jform_location listeners for location_vvvvwca function
-jQuery('#jform_type').on('keyup',function()
+jQuery('#jform_location').on('keyup',function()
 {
-	var type_vvvvwca = jQuery("#jform_type").val();
+	var location_vvvvwca = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwca(type_vvvvwca);
+	vvvvwca(location_vvvvwca);
 
 });
-jQuery('#adminForm').on('change', '#jform_type',function (e)
+jQuery('#adminForm').on('change', '#jform_location',function (e)
 {
 	e.preventDefault();
-	var type_vvvvwca = jQuery("#jform_type").val();
+	var location_vvvvwca = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwca(type_vvvvwca);
+	vvvvwca(location_vvvvwca);
 
 });
 
@@ -191,18 +176,33 @@ jQuery('#adminForm').on('change', '#jform_type',function (e)
 
 });
 
-// #jform_target listeners for target_vvvvwcd function
+// #jform_type listeners for type_vvvvwcd function
+jQuery('#jform_type').on('keyup',function()
+{
+	var type_vvvvwcd = jQuery("#jform_type").val();
+	vvvvwcd(type_vvvvwcd);
+
+});
+jQuery('#adminForm').on('change', '#jform_type',function (e)
+{
+	e.preventDefault();
+	var type_vvvvwcd = jQuery("#jform_type").val();
+	vvvvwcd(type_vvvvwcd);
+
+});
+
+// #jform_target listeners for target_vvvvwce function
 jQuery('#jform_target').on('keyup',function()
 {
-	var target_vvvvwcd = jQuery("#jform_target input[type='radio']:checked").val();
+	var target_vvvvwce = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwcd(target_vvvvwcd);
+	vvvvwce(target_vvvvwce);
 
 });
 jQuery('#adminForm').on('change', '#jform_target',function (e)
 {
 	e.preventDefault();
-	var target_vvvvwcd = jQuery("#jform_target input[type='radio']:checked").val();
+	var target_vvvvwce = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwcd(target_vvvvwcd);
+	vvvvwce(target_vvvvwce);
 
 });
 

admin/views/layout/tmpl/edit.php

@@ -129,18 +129,18 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_add_php_view listeners for add_php_view_vvvvvze function
+// #jform_add_php_view listeners for add_php_view_vvvvvzf function
 jQuery('#jform_add_php_view').on('keyup',function()
 {
-	var add_php_view_vvvvvze = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvzf = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvze(add_php_view_vvvvvze);
+	vvvvvzf(add_php_view_vvvvvzf);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_view',function (e)
 {
 	e.preventDefault();
-	var add_php_view_vvvvvze = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvzf = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvze(add_php_view_vvvvvze);
+	vvvvvzf(add_php_view_vvvvvzf);
 
 });
 

admin/views/library/tmpl/edit.php

@@ -146,21 +146,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_how listeners for how_vvvvwak function
-jQuery('#jform_how').on('keyup',function()
-{
-	var how_vvvvwak = jQuery("#jform_how").val();
-	vvvvwak(how_vvvvwak);
-
-});
-jQuery('#adminForm').on('change', '#jform_how',function (e)
-{
-	e.preventDefault();
-	var how_vvvvwak = jQuery("#jform_how").val();
-	vvvvwak(how_vvvvwak);
-
-});
-
 // #jform_how listeners for how_vvvvwal function
 jQuery('#jform_how').on('keyup',function()
 {
@@ -251,18 +236,33 @@ jQuery('#adminForm').on('change', '#jform_how',function (e)
 
 });
 
-// #jform_type listeners for type_vvvvwar function
+// #jform_how listeners for how_vvvvwar function
+jQuery('#jform_how').on('keyup',function()
+{
+	var how_vvvvwar = jQuery("#jform_how").val();
+	vvvvwar(how_vvvvwar);
+
+});
+jQuery('#adminForm').on('change', '#jform_how',function (e)
+{
+	e.preventDefault();
+	var how_vvvvwar = jQuery("#jform_how").val();
+	vvvvwar(how_vvvvwar);
+
+});
+
+// #jform_type listeners for type_vvvvwas function
 jQuery('#jform_type').on('keyup',function()
 {
-	var type_vvvvwar = jQuery("#jform_type input[type='radio']:checked").val();
+	var type_vvvvwas = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwar(type_vvvvwar);
+	vvvvwas(type_vvvvwas);
 
 });
 jQuery('#adminForm').on('change', '#jform_type',function (e)
 {
 	e.preventDefault();
-	var type_vvvvwar = jQuery("#jform_type input[type='radio']:checked").val();
+	var type_vvvvwas = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwar(type_vvvvwar);
+	vvvvwas(type_vvvvwas);
 
 });
 

admin/views/server/tmpl/edit.php

@@ -125,21 +125,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_protocol listeners for protocol_vvvvwbo function
-jQuery('#jform_protocol').on('keyup',function()
-{
-	var protocol_vvvvwbo = jQuery("#jform_protocol").val();
-	vvvvwbo(protocol_vvvvwbo);
-
-});
-jQuery('#adminForm').on('change', '#jform_protocol',function (e)
-{
-	e.preventDefault();
-	var protocol_vvvvwbo = jQuery("#jform_protocol").val();
-	vvvvwbo(protocol_vvvvwbo);
-
-});
-
 // #jform_protocol listeners for protocol_vvvvwbp function
 jQuery('#jform_protocol').on('keyup',function()
 {
@@ -159,135 +144,150 @@ jQuery('#adminForm').on('change', '#jform_protocol',function (e)
 jQuery('#jform_protocol').on('keyup',function()
 {
 	var protocol_vvvvwbq = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbq = jQuery("#jform_authentication").val();
+	vvvvwbq(protocol_vvvvwbq);
-	vvvvwbq(protocol_vvvvwbq,authentication_vvvvwbq);
 
 });
 jQuery('#adminForm').on('change', '#jform_protocol',function (e)
 {
 	e.preventDefault();
 	var protocol_vvvvwbq = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbq = jQuery("#jform_authentication").val();
+	vvvvwbq(protocol_vvvvwbq);
-	vvvvwbq(protocol_vvvvwbq,authentication_vvvvwbq);
 
 });
 
-// #jform_authentication listeners for authentication_vvvvwbq function
+// #jform_protocol listeners for protocol_vvvvwbr function
-jQuery('#jform_authentication').on('keyup',function()
-{
-	var protocol_vvvvwbq = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbq = jQuery("#jform_authentication").val();
-	vvvvwbq(protocol_vvvvwbq,authentication_vvvvwbq);
-
-});
-jQuery('#adminForm').on('change', '#jform_authentication',function (e)
-{
-	e.preventDefault();
-	var protocol_vvvvwbq = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbq = jQuery("#jform_authentication").val();
-	vvvvwbq(protocol_vvvvwbq,authentication_vvvvwbq);
-
-});
-
-// #jform_protocol listeners for protocol_vvvvwbs function
 jQuery('#jform_protocol').on('keyup',function()
 {
-	var protocol_vvvvwbs = jQuery("#jform_protocol").val();
+	var protocol_vvvvwbr = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbs = jQuery("#jform_authentication").val();
+	var authentication_vvvvwbr = jQuery("#jform_authentication").val();
-	vvvvwbs(protocol_vvvvwbs,authentication_vvvvwbs);
+	vvvvwbr(protocol_vvvvwbr,authentication_vvvvwbr);
 
 });
 jQuery('#adminForm').on('change', '#jform_protocol',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwbs = jQuery("#jform_protocol").val();
+	var protocol_vvvvwbr = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbs = jQuery("#jform_authentication").val();
+	var authentication_vvvvwbr = jQuery("#jform_authentication").val();
-	vvvvwbs(protocol_vvvvwbs,authentication_vvvvwbs);
+	vvvvwbr(protocol_vvvvwbr,authentication_vvvvwbr);
 
 });
 
-// #jform_authentication listeners for authentication_vvvvwbs function
+// #jform_authentication listeners for authentication_vvvvwbr function
 jQuery('#jform_authentication').on('keyup',function()
 {
-	var protocol_vvvvwbs = jQuery("#jform_protocol").val();
+	var protocol_vvvvwbr = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbs = jQuery("#jform_authentication").val();
+	var authentication_vvvvwbr = jQuery("#jform_authentication").val();
-	vvvvwbs(protocol_vvvvwbs,authentication_vvvvwbs);
+	vvvvwbr(protocol_vvvvwbr,authentication_vvvvwbr);
 
 });
 jQuery('#adminForm').on('change', '#jform_authentication',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwbs = jQuery("#jform_protocol").val();
+	var protocol_vvvvwbr = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbs = jQuery("#jform_authentication").val();
+	var authentication_vvvvwbr = jQuery("#jform_authentication").val();
-	vvvvwbs(protocol_vvvvwbs,authentication_vvvvwbs);
+	vvvvwbr(protocol_vvvvwbr,authentication_vvvvwbr);
 
 });
 
-// #jform_protocol listeners for protocol_vvvvwbu function
+// #jform_protocol listeners for protocol_vvvvwbt function
 jQuery('#jform_protocol').on('keyup',function()
 {
-	var protocol_vvvvwbu = jQuery("#jform_protocol").val();
+	var protocol_vvvvwbt = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbu = jQuery("#jform_authentication").val();
+	var authentication_vvvvwbt = jQuery("#jform_authentication").val();
-	vvvvwbu(protocol_vvvvwbu,authentication_vvvvwbu);
+	vvvvwbt(protocol_vvvvwbt,authentication_vvvvwbt);
 
 });
 jQuery('#adminForm').on('change', '#jform_protocol',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwbu = jQuery("#jform_protocol").val();
+	var protocol_vvvvwbt = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbu = jQuery("#jform_authentication").val();
+	var authentication_vvvvwbt = jQuery("#jform_authentication").val();
-	vvvvwbu(protocol_vvvvwbu,authentication_vvvvwbu);
+	vvvvwbt(protocol_vvvvwbt,authentication_vvvvwbt);
 
 });
 
-// #jform_authentication listeners for authentication_vvvvwbu function
+// #jform_authentication listeners for authentication_vvvvwbt function
 jQuery('#jform_authentication').on('keyup',function()
 {
-	var protocol_vvvvwbu = jQuery("#jform_protocol").val();
+	var protocol_vvvvwbt = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbu = jQuery("#jform_authentication").val();
+	var authentication_vvvvwbt = jQuery("#jform_authentication").val();
-	vvvvwbu(protocol_vvvvwbu,authentication_vvvvwbu);
+	vvvvwbt(protocol_vvvvwbt,authentication_vvvvwbt);
 
 });
 jQuery('#adminForm').on('change', '#jform_authentication',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwbu = jQuery("#jform_protocol").val();
+	var protocol_vvvvwbt = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbu = jQuery("#jform_authentication").val();
+	var authentication_vvvvwbt = jQuery("#jform_authentication").val();
-	vvvvwbu(protocol_vvvvwbu,authentication_vvvvwbu);
+	vvvvwbt(protocol_vvvvwbt,authentication_vvvvwbt);
 
 });
 
-// #jform_protocol listeners for protocol_vvvvwbw function
+// #jform_protocol listeners for protocol_vvvvwbv function
 jQuery('#jform_protocol').on('keyup',function()
 {
-	var protocol_vvvvwbw = jQuery("#jform_protocol").val();
+	var protocol_vvvvwbv = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbw = jQuery("#jform_authentication").val();
+	var authentication_vvvvwbv = jQuery("#jform_authentication").val();
-	vvvvwbw(protocol_vvvvwbw,authentication_vvvvwbw);
+	vvvvwbv(protocol_vvvvwbv,authentication_vvvvwbv);
 
 });
 jQuery('#adminForm').on('change', '#jform_protocol',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwbw = jQuery("#jform_protocol").val();
+	var protocol_vvvvwbv = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbw = jQuery("#jform_authentication").val();
+	var authentication_vvvvwbv = jQuery("#jform_authentication").val();
-	vvvvwbw(protocol_vvvvwbw,authentication_vvvvwbw);
+	vvvvwbv(protocol_vvvvwbv,authentication_vvvvwbv);
 
 });
 
-// #jform_authentication listeners for authentication_vvvvwbw function
+// #jform_authentication listeners for authentication_vvvvwbv function
 jQuery('#jform_authentication').on('keyup',function()
 {
-	var protocol_vvvvwbw = jQuery("#jform_protocol").val();
+	var protocol_vvvvwbv = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbw = jQuery("#jform_authentication").val();
+	var authentication_vvvvwbv = jQuery("#jform_authentication").val();
-	vvvvwbw(protocol_vvvvwbw,authentication_vvvvwbw);
+	vvvvwbv(protocol_vvvvwbv,authentication_vvvvwbv);
 
 });
 jQuery('#adminForm').on('change', '#jform_authentication',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwbw = jQuery("#jform_protocol").val();
+	var protocol_vvvvwbv = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbw = jQuery("#jform_authentication").val();
+	var authentication_vvvvwbv = jQuery("#jform_authentication").val();
-	vvvvwbw(protocol_vvvvwbw,authentication_vvvvwbw);
+	vvvvwbv(protocol_vvvvwbv,authentication_vvvvwbv);
+
+});
+
+// #jform_protocol listeners for protocol_vvvvwbx function
+jQuery('#jform_protocol').on('keyup',function()
+{
+	var protocol_vvvvwbx = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbx = jQuery("#jform_authentication").val();
+	vvvvwbx(protocol_vvvvwbx,authentication_vvvvwbx);
+
+});
+jQuery('#adminForm').on('change', '#jform_protocol',function (e)
+{
+	e.preventDefault();
+	var protocol_vvvvwbx = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbx = jQuery("#jform_authentication").val();
+	vvvvwbx(protocol_vvvvwbx,authentication_vvvvwbx);
+
+});
+
+// #jform_authentication listeners for authentication_vvvvwbx function
+jQuery('#jform_authentication').on('keyup',function()
+{
+	var protocol_vvvvwbx = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbx = jQuery("#jform_authentication").val();
+	vvvvwbx(protocol_vvvvwbx,authentication_vvvvwbx);
+
+});
+jQuery('#adminForm').on('change', '#jform_authentication',function (e)
+{
+	e.preventDefault();
+	var protocol_vvvvwbx = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbx = jQuery("#jform_authentication").val();
+	vvvvwbx(protocol_vvvvwbx,authentication_vvvvwbx);
 
 });
 

admin/views/server/view.html.php

@@ -57,7 +57,7 @@ class ComponentbuilderViewServer extends JViewLegacy
 		}
 
 		// Get Linked view data
-		$this->wbalinked_components = $this->get('Wbalinked_components');
+		$this->wbblinked_components = $this->get('Wbblinked_components');
 
 		// Set the toolbar
 		$this->addToolBar();

admin/views/site_view/tmpl/edit.php

@@ -166,168 +166,168 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_add_php_view listeners for add_php_view_vvvvvys function
+// #jform_add_php_view listeners for add_php_view_vvvvvyt function
 jQuery('#jform_add_php_view').on('keyup',function()
 {
-	var add_php_view_vvvvvys = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvyt = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvys(add_php_view_vvvvvys);
+	vvvvvyt(add_php_view_vvvvvyt);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_view',function (e)
 {
 	e.preventDefault();
-	var add_php_view_vvvvvys = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvyt = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvys(add_php_view_vvvvvys);
+	vvvvvyt(add_php_view_vvvvvyt);
 
 });
 
-// #jform_add_php_jview_display listeners for add_php_jview_display_vvvvvyt function
+// #jform_add_php_jview_display listeners for add_php_jview_display_vvvvvyu function
 jQuery('#jform_add_php_jview_display').on('keyup',function()
 {
-	var add_php_jview_display_vvvvvyt = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	var add_php_jview_display_vvvvvyu = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvyt(add_php_jview_display_vvvvvyt);
+	vvvvvyu(add_php_jview_display_vvvvvyu);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_jview_display',function (e)
 {
 	e.preventDefault();
-	var add_php_jview_display_vvvvvyt = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	var add_php_jview_display_vvvvvyu = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvyt(add_php_jview_display_vvvvvyt);
+	vvvvvyu(add_php_jview_display_vvvvvyu);
 
 });
 
-// #jform_add_php_jview listeners for add_php_jview_vvvvvyu function
+// #jform_add_php_jview listeners for add_php_jview_vvvvvyv function
 jQuery('#jform_add_php_jview').on('keyup',function()
 {
-	var add_php_jview_vvvvvyu = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	var add_php_jview_vvvvvyv = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyu(add_php_jview_vvvvvyu);
+	vvvvvyv(add_php_jview_vvvvvyv);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_jview',function (e)
 {
 	e.preventDefault();
-	var add_php_jview_vvvvvyu = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	var add_php_jview_vvvvvyv = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyu(add_php_jview_vvvvvyu);
+	vvvvvyv(add_php_jview_vvvvvyv);
 
 });
 
-// #jform_add_php_document listeners for add_php_document_vvvvvyv function
+// #jform_add_php_document listeners for add_php_document_vvvvvyw function
 jQuery('#jform_add_php_document').on('keyup',function()
 {
-	var add_php_document_vvvvvyv = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	var add_php_document_vvvvvyw = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyv(add_php_document_vvvvvyv);
+	vvvvvyw(add_php_document_vvvvvyw);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_document',function (e)
 {
 	e.preventDefault();
-	var add_php_document_vvvvvyv = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	var add_php_document_vvvvvyw = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyv(add_php_document_vvvvvyv);
+	vvvvvyw(add_php_document_vvvvvyw);
 
 });
 
-// #jform_add_css_document listeners for add_css_document_vvvvvyw function
+// #jform_add_css_document listeners for add_css_document_vvvvvyx function
 jQuery('#jform_add_css_document').on('keyup',function()
 {
-	var add_css_document_vvvvvyw = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	var add_css_document_vvvvvyx = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvyw(add_css_document_vvvvvyw);
+	vvvvvyx(add_css_document_vvvvvyx);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css_document',function (e)
 {
 	e.preventDefault();
-	var add_css_document_vvvvvyw = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	var add_css_document_vvvvvyx = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvyw(add_css_document_vvvvvyw);
+	vvvvvyx(add_css_document_vvvvvyx);
 
 });
 
-// #jform_add_javascript_file listeners for add_javascript_file_vvvvvyx function
+// #jform_add_javascript_file listeners for add_javascript_file_vvvvvyy function
 jQuery('#jform_add_javascript_file').on('keyup',function()
 {
-	var add_javascript_file_vvvvvyx = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	var add_javascript_file_vvvvvyy = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvyx(add_javascript_file_vvvvvyx);
+	vvvvvyy(add_javascript_file_vvvvvyy);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_file',function (e)
 {
 	e.preventDefault();
-	var add_javascript_file_vvvvvyx = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	var add_javascript_file_vvvvvyy = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvyx(add_javascript_file_vvvvvyx);
+	vvvvvyy(add_javascript_file_vvvvvyy);
 
 });
 
-// #jform_add_js_document listeners for add_js_document_vvvvvyy function
+// #jform_add_js_document listeners for add_js_document_vvvvvyz function
 jQuery('#jform_add_js_document').on('keyup',function()
 {
-	var add_js_document_vvvvvyy = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	var add_js_document_vvvvvyz = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyy(add_js_document_vvvvvyy);
+	vvvvvyz(add_js_document_vvvvvyz);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_js_document',function (e)
 {
 	e.preventDefault();
-	var add_js_document_vvvvvyy = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	var add_js_document_vvvvvyz = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyy(add_js_document_vvvvvyy);
+	vvvvvyz(add_js_document_vvvvvyz);
 
 });
 
-// #jform_add_css listeners for add_css_vvvvvyz function
+// #jform_add_css listeners for add_css_vvvvvza function
 jQuery('#jform_add_css').on('keyup',function()
 {
-	var add_css_vvvvvyz = jQuery("#jform_add_css input[type='radio']:checked").val();
+	var add_css_vvvvvza = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyz(add_css_vvvvvyz);
+	vvvvvza(add_css_vvvvvza);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css',function (e)
 {
 	e.preventDefault();
-	var add_css_vvvvvyz = jQuery("#jform_add_css input[type='radio']:checked").val();
+	var add_css_vvvvvza = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyz(add_css_vvvvvyz);
+	vvvvvza(add_css_vvvvvza);
 
 });
 
-// #jform_add_php_ajax listeners for add_php_ajax_vvvvvza function
+// #jform_add_php_ajax listeners for add_php_ajax_vvvvvzb function
 jQuery('#jform_add_php_ajax').on('keyup',function()
 {
-	var add_php_ajax_vvvvvza = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	var add_php_ajax_vvvvvzb = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvza(add_php_ajax_vvvvvza);
+	vvvvvzb(add_php_ajax_vvvvvzb);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_ajax',function (e)
 {
 	e.preventDefault();
-	var add_php_ajax_vvvvvza = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	var add_php_ajax_vvvvvzb = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvza(add_php_ajax_vvvvvza);
+	vvvvvzb(add_php_ajax_vvvvvzb);
 
 });
 
-// #jform_add_custom_button listeners for add_custom_button_vvvvvzb function
+// #jform_add_custom_button listeners for add_custom_button_vvvvvzc function
 jQuery('#jform_add_custom_button').on('keyup',function()
 {
-	var add_custom_button_vvvvvzb = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	var add_custom_button_vvvvvzc = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvzb(add_custom_button_vvvvvzb);
+	vvvvvzc(add_custom_button_vvvvvzc);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_custom_button',function (e)
 {
 	e.preventDefault();
-	var add_custom_button_vvvvvzb = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	var add_custom_button_vvvvvzc = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvzb(add_custom_button_vvvvvzb);
+	vvvvvzc(add_custom_button_vvvvvzc);
 
 });
 
-// #jform_button_position listeners for button_position_vvvvvzc function
+// #jform_button_position listeners for button_position_vvvvvzd function
 jQuery('#jform_button_position').on('keyup',function()
 {
-	var button_position_vvvvvzc = jQuery("#jform_button_position").val();
+	var button_position_vvvvvzd = jQuery("#jform_button_position").val();
-	vvvvvzc(button_position_vvvvvzc);
+	vvvvvzd(button_position_vvvvvzd);
 
 });
 jQuery('#adminForm').on('change', '#jform_button_position',function (e)
 {
 	e.preventDefault();
-	var button_position_vvvvvzc = jQuery("#jform_button_position").val();
+	var button_position_vvvvvzd = jQuery("#jform_button_position").val();
-	vvvvvzc(button_position_vvvvvzc);
+	vvvvvzd(button_position_vvvvvzd);
 
 });
 

admin/views/template/tmpl/edit.php

@@ -129,18 +129,18 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_add_php_view listeners for add_php_view_vvvvvzd function
+// #jform_add_php_view listeners for add_php_view_vvvvvze function
 jQuery('#jform_add_php_view').on('keyup',function()
 {
-	var add_php_view_vvvvvzd = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvze = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvzd(add_php_view_vvvvvzd);
+	vvvvvze(add_php_view_vvvvvze);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_view',function (e)
 {
 	e.preventDefault();
-	var add_php_view_vvvvvzd = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvze = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvzd(add_php_view_vvvvvzd);
+	vvvvvze(add_php_view_vvvvvze);
 
 });
 

componentbuilder.xml

@@ -7,9 +7,9 @@
 	<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>
 	<copyright>Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>2.9.19</version>
+	<version>2.9.20</version>
 	<description><![CDATA[
-		<h1>Component Builder (v.2.9.19)</h1>
+		<h1>Component Builder (v.2.9.20)</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

@@ -687,7 +687,24 @@
 		<version>2.9.19</version>
 		<infourl title="Component Builder!">http://www.joomlacomponentbuilder.com</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">http://domain.com/demo.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.9.20/JCB_v2.9.20.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.9.20</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.9.20/JCB_v2.9.20.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>stable</tag>

script.php

@@ -3692,9 +3692,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_getitems_after_all","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","short_description":"short_description","add_php_before_cancel":"add_php_before_cancel","add_php_allowadd":"add_php_allowadd","add_php_save":"add_php_save","add_php_getform":"add_php_getform","add_php_getitems_after_all":"add_php_getitems_after_all","icon":"icon","add_php_after_delete":"add_php_after_delete","add_fadein":"add_fadein","description":"description","icon_category":"icon_category","icon_add":"icon_add","add_php_batchmove":"add_php_batchmove","add_sql":"add_sql","add_php_after_publish":"add_php_after_publish","html_import_view":"html_import_view","mysql_table_engine":"mysql_table_engine","type":"type","not_required":"not_required","php_import_save":"php_import_save","add_php_getlistquery":"add_php_getlistquery","add_php_before_save":"add_php_before_save","add_php_postsavehook":"add_php_postsavehook","add_php_allowedit":"add_php_allowedit","add_php_batchcopy":"add_php_batchcopy","add_php_before_publish":"add_php_before_publish","add_php_before_delete":"add_php_before_delete","add_php_document":"add_php_document","alias_builder_type":"alias_builder_type","mysql_table_collate":"mysql_table_collate","add_custom_import":"add_custom_import","alias_builder":"alias_builder","php_import_headers":"php_import_headers","name_list":"name_list","php_getitems_after_all":"php_getitems_after_all","add_css_view":"add_css_view","php_getlistquery":"php_getlistquery","css_view":"css_view","php_getform":"php_getform","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_allowadd":"php_allowadd","add_javascript_view_footer":"add_javascript_view_footer","php_allowedit":"php_allowedit","javascript_view_footer":"javascript_view_footer","php_before_cancel":"php_before_cancel","add_javascript_views_file":"add_javascript_views_file","php_batchcopy":"php_batchcopy","javascript_views_file":"javascript_views_file","php_batchmove":"php_batchmove","add_javascript_views_footer":"add_javascript_views_footer","php_before_publish":"php_before_publish","javascript_views_footer":"javascript_views_footer","php_after_publish":"php_after_publish","add_custom_button":"add_custom_button","php_before_delete":"php_before_delete","php_after_delete":"php_after_delete","php_controller":"php_controller","php_document":"php_document","php_model":"php_model","mysql_table_charset":"mysql_table_charset","php_controller_list":"php_controller_list","mysql_table_row_format":"mysql_table_row_format","php_model_list":"php_model_list","source":"source","add_php_ajax":"add_php_ajax","sql":"sql","php_ajaxmethod":"php_ajaxmethod","php_import_display":"php_import_display","add_php_getitem":"add_php_getitem","php_import":"php_import","php_getitem":"php_getitem","php_import_setdata":"php_import_setdata","add_php_getitems":"add_php_getitems","php_import_ext":"php_import_ext","php_getitems":"php_getitems"}}';
+			$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_getitems_after_all","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","short_description":"short_description","add_php_before_cancel":"add_php_before_cancel","add_php_allowadd":"add_php_allowadd","add_php_save":"add_php_save","add_php_getform":"add_php_getform","name_list":"name_list","icon":"icon","add_php_before_delete":"add_php_before_delete","add_fadein":"add_fadein","description":"description","icon_category":"icon_category","icon_add":"icon_add","add_php_batchcopy":"add_php_batchcopy","mysql_table_collate":"mysql_table_collate","add_php_before_publish":"add_php_before_publish","add_custom_import":"add_custom_import","add_php_document":"add_php_document","type":"type","not_required":"not_required","php_import_headers":"php_import_headers","add_php_getlistquery":"add_php_getlistquery","add_php_before_save":"add_php_before_save","add_php_postsavehook":"add_php_postsavehook","add_php_allowedit":"add_php_allowedit","add_php_after_cancel":"add_php_after_cancel","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","mysql_table_engine":"mysql_table_engine","add_sql":"add_sql","alias_builder":"alias_builder","html_import_view":"html_import_view","php_import_save":"php_import_save","php_getitems_after_all":"php_getitems_after_all","add_css_view":"add_css_view","php_getlistquery":"php_getlistquery","css_view":"css_view","php_getform":"php_getform","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_allowadd":"php_allowadd","add_javascript_view_footer":"add_javascript_view_footer","php_allowedit":"php_allowedit","javascript_view_footer":"javascript_view_footer","php_before_cancel":"php_before_cancel","add_javascript_views_file":"add_javascript_views_file","php_after_cancel":"php_after_cancel","javascript_views_file":"javascript_views_file","php_batchcopy":"php_batchcopy","add_javascript_views_footer":"add_javascript_views_footer","php_batchmove":"php_batchmove","javascript_views_footer":"javascript_views_footer","php_before_publish":"php_before_publish","add_custom_button":"add_custom_button","php_after_publish":"php_after_publish","php_before_delete":"php_before_delete","php_controller":"php_controller","php_after_delete":"php_after_delete","php_model":"php_model","php_document":"php_document","php_controller_list":"php_controller_list","mysql_table_charset":"mysql_table_charset","php_model_list":"php_model_list","mysql_table_row_format":"mysql_table_row_format","add_php_ajax":"add_php_ajax","source":"source","php_ajaxmethod":"php_ajaxmethod","sql":"sql","add_php_getitem":"add_php_getitem","php_import_display":"php_import_display","php_getitem":"php_getitem","php_import":"php_import","add_php_getitems":"add_php_getitems","php_import_setdata":"php_import_setdata","php_getitems":"php_getitems","php_import_ext":"php_import_ext","add_php_getitems_after_all":"add_php_getitems_after_all"}}';
 			$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_before_cancel","add_php_allowadd","add_php_save","add_php_getform","add_php_getitems_after_all","add_php_after_delete","add_fadein","add_php_batchmove","add_sql","add_php_after_publish","type","add_php_getlistquery","add_php_before_save","add_php_postsavehook","add_php_allowedit","add_php_batchcopy","add_php_before_publish","add_php_before_delete","add_php_document","add_custom_import","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","add_php_getitems"],"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_cancel","add_php_allowadd","add_php_save","add_php_getform","add_php_before_delete","add_fadein","add_php_batchcopy","add_php_before_publish","add_custom_import","add_php_document","type","add_php_getlistquery","add_php_before_save","add_php_postsavehook","add_php_allowedit","add_php_after_cancel","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","add_php_ajax","source","add_php_getitem","add_php_getitems","add_php_getitems_after_all"],"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);
@@ -4179,9 +4179,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_getitems_after_all","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","short_description":"short_description","add_php_before_cancel":"add_php_before_cancel","add_php_allowadd":"add_php_allowadd","add_php_save":"add_php_save","add_php_getform":"add_php_getform","add_php_getitems_after_all":"add_php_getitems_after_all","icon":"icon","add_php_after_delete":"add_php_after_delete","add_fadein":"add_fadein","description":"description","icon_category":"icon_category","icon_add":"icon_add","add_php_batchmove":"add_php_batchmove","add_sql":"add_sql","add_php_after_publish":"add_php_after_publish","html_import_view":"html_import_view","mysql_table_engine":"mysql_table_engine","type":"type","not_required":"not_required","php_import_save":"php_import_save","add_php_getlistquery":"add_php_getlistquery","add_php_before_save":"add_php_before_save","add_php_postsavehook":"add_php_postsavehook","add_php_allowedit":"add_php_allowedit","add_php_batchcopy":"add_php_batchcopy","add_php_before_publish":"add_php_before_publish","add_php_before_delete":"add_php_before_delete","add_php_document":"add_php_document","alias_builder_type":"alias_builder_type","mysql_table_collate":"mysql_table_collate","add_custom_import":"add_custom_import","alias_builder":"alias_builder","php_import_headers":"php_import_headers","name_list":"name_list","php_getitems_after_all":"php_getitems_after_all","add_css_view":"add_css_view","php_getlistquery":"php_getlistquery","css_view":"css_view","php_getform":"php_getform","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_allowadd":"php_allowadd","add_javascript_view_footer":"add_javascript_view_footer","php_allowedit":"php_allowedit","javascript_view_footer":"javascript_view_footer","php_before_cancel":"php_before_cancel","add_javascript_views_file":"add_javascript_views_file","php_batchcopy":"php_batchcopy","javascript_views_file":"javascript_views_file","php_batchmove":"php_batchmove","add_javascript_views_footer":"add_javascript_views_footer","php_before_publish":"php_before_publish","javascript_views_footer":"javascript_views_footer","php_after_publish":"php_after_publish","add_custom_button":"add_custom_button","php_before_delete":"php_before_delete","php_after_delete":"php_after_delete","php_controller":"php_controller","php_document":"php_document","php_model":"php_model","mysql_table_charset":"mysql_table_charset","php_controller_list":"php_controller_list","mysql_table_row_format":"mysql_table_row_format","php_model_list":"php_model_list","source":"source","add_php_ajax":"add_php_ajax","sql":"sql","php_ajaxmethod":"php_ajaxmethod","php_import_display":"php_import_display","add_php_getitem":"add_php_getitem","php_import":"php_import","php_getitem":"php_getitem","php_import_setdata":"php_import_setdata","add_php_getitems":"add_php_getitems","php_import_ext":"php_import_ext","php_getitems":"php_getitems"}}';
+			$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_getitems_after_all","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","short_description":"short_description","add_php_before_cancel":"add_php_before_cancel","add_php_allowadd":"add_php_allowadd","add_php_save":"add_php_save","add_php_getform":"add_php_getform","name_list":"name_list","icon":"icon","add_php_before_delete":"add_php_before_delete","add_fadein":"add_fadein","description":"description","icon_category":"icon_category","icon_add":"icon_add","add_php_batchcopy":"add_php_batchcopy","mysql_table_collate":"mysql_table_collate","add_php_before_publish":"add_php_before_publish","add_custom_import":"add_custom_import","add_php_document":"add_php_document","type":"type","not_required":"not_required","php_import_headers":"php_import_headers","add_php_getlistquery":"add_php_getlistquery","add_php_before_save":"add_php_before_save","add_php_postsavehook":"add_php_postsavehook","add_php_allowedit":"add_php_allowedit","add_php_after_cancel":"add_php_after_cancel","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","mysql_table_engine":"mysql_table_engine","add_sql":"add_sql","alias_builder":"alias_builder","html_import_view":"html_import_view","php_import_save":"php_import_save","php_getitems_after_all":"php_getitems_after_all","add_css_view":"add_css_view","php_getlistquery":"php_getlistquery","css_view":"css_view","php_getform":"php_getform","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_allowadd":"php_allowadd","add_javascript_view_footer":"add_javascript_view_footer","php_allowedit":"php_allowedit","javascript_view_footer":"javascript_view_footer","php_before_cancel":"php_before_cancel","add_javascript_views_file":"add_javascript_views_file","php_after_cancel":"php_after_cancel","javascript_views_file":"javascript_views_file","php_batchcopy":"php_batchcopy","add_javascript_views_footer":"add_javascript_views_footer","php_batchmove":"php_batchmove","javascript_views_footer":"javascript_views_footer","php_before_publish":"php_before_publish","add_custom_button":"add_custom_button","php_after_publish":"php_after_publish","php_before_delete":"php_before_delete","php_controller":"php_controller","php_after_delete":"php_after_delete","php_model":"php_model","php_document":"php_document","php_controller_list":"php_controller_list","mysql_table_charset":"mysql_table_charset","php_model_list":"php_model_list","mysql_table_row_format":"mysql_table_row_format","add_php_ajax":"add_php_ajax","source":"source","php_ajaxmethod":"php_ajaxmethod","sql":"sql","add_php_getitem":"add_php_getitem","php_import_display":"php_import_display","php_getitem":"php_getitem","php_import":"php_import","add_php_getitems":"add_php_getitems","php_import_setdata":"php_import_setdata","php_getitems":"php_getitems","php_import_ext":"php_import_ext","add_php_getitems_after_all":"add_php_getitems_after_all"}}';
 			$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_before_cancel","add_php_allowadd","add_php_save","add_php_getform","add_php_getitems_after_all","add_php_after_delete","add_fadein","add_php_batchmove","add_sql","add_php_after_publish","type","add_php_getlistquery","add_php_before_save","add_php_postsavehook","add_php_allowedit","add_php_batchcopy","add_php_before_publish","add_php_before_delete","add_php_document","add_custom_import","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","add_php_getitems"],"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_cancel","add_php_allowadd","add_php_save","add_php_getform","add_php_before_delete","add_fadein","add_php_batchcopy","add_php_before_publish","add_custom_import","add_php_document","type","add_php_getlistquery","add_php_before_save","add_php_postsavehook","add_php_allowedit","add_php_after_cancel","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","add_php_ajax","source","add_php_getitem","add_php_getitems","add_php_getitems_after_all"],"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;
@@ -5426,7 +5426,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.9.19 Was Successful! Let us know if anything is not working as expected.</h3>';
+				<h3>Upgrade to Version 2.9.20 Was Successful! Let us know if anything is not working as expected.</h3>';
 		}
 	}