Added the feature to use admin and custom admin views as the dashboard of the back-end of a component, requested in gh-148

README.md

@@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.6.17) 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.6.18) 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)
 
@@ -126,13 +126,13 @@ Component Builder is mapped as a component in itself on my local development env
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](http://joomlacomponentbuilder.com)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 6th March, 2018
++ *Last Build*: 9th March, 2018
-+ *Version*: 2.6.17
++ *Version*: 2.6.18
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-+ *Line count*: **183633**
++ *Line count*: **184097**
-+ *Field count*: **1645**
++ *Field count*: **1651**
-+ *File count*: **1169**
++ *File count*: **1172**
 + *Folder count*: **189**
 
 > This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com).

admin/README.txt

@@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.6.17) 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.6.18) 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)
 
@@ -126,13 +126,13 @@ Component Builder is mapped as a component in itself on my local development env
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](http://joomlacomponentbuilder.com)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 6th March, 2018
++ *Last Build*: 9th March, 2018
-+ *Version*: 2.6.17
++ *Version*: 2.6.18
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-+ *Line count*: **183633**
++ *Line count*: **184097**
-+ *Field count*: **1645**
++ *Field count*: **1651**
-+ *File count*: **1169**
++ *File count*: **1172**
 + *Folder count*: **189**
 
 > This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com).

admin/assets/css/joomla_component.css

@@ -25,3 +25,6 @@
 /* CSS Document */
 
 
+#jform_dashboard_chzn {
+width: 100% !important;
+}

admin/compiler/joomla_3/JControllerLegacy.php

@@ -37,6 +37,23 @@ jimport('joomla.application.component.controller');
  */
 class ###Component###Controller extends JControllerLegacy
 {
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 * Recognized key values include 'name', 'default_task', 'model_path', and
+	 * 'view_path' (this list is not meant to be comprehensive).
+	 *
+	 * @since   3.0
+	 */
+	public function __construct($config = array())
+	{
+		// set the default view
+		$config['default_view'] = '###DASHBOARDVIEW###';
+
+		parent::__construct($config);
+	}
+	
 	/**
 	 * display task
 	 *
@@ -45,7 +62,7 @@ class ###Component###Controller extends JControllerLegacy
 	function display($cachable = false, $urlparams = false)
 	{
 		// set default view if not set
-		$view   = $this->input->getCmd('view', '###Component###');
+		$view   = $this->input->getCmd('view', '###DASHBOARDVIEW###');
 		$data	= $this->getViewRelation($view);
 		$layout	= $this->input->get('layout', null, 'WORD');
 		$id    	= $this->input->getInt('id');

admin/controller.php

@@ -34,6 +34,23 @@ jimport('joomla.application.component.controller');
  */
 class ComponentbuilderController extends JControllerLegacy
 {
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 * Recognized key values include 'name', 'default_task', 'model_path', and
+	 * 'view_path' (this list is not meant to be comprehensive).
+	 *
+	 * @since   3.0
+	 */
+	public function __construct($config = array())
+	{
+		// set the default view
+		$config['default_view'] = 'componentbuilder';
+
+		parent::__construct($config);
+	}
+	
 	/**
 	 * display task
 	 *
@@ -42,7 +59,7 @@ class ComponentbuilderController extends JControllerLegacy
 	function display($cachable = false, $urlparams = false)
 	{
 		// set default view if not set
-		$view   = $this->input->getCmd('view', 'Componentbuilder');
+		$view   = $this->input->getCmd('view', 'componentbuilder');
 		$data	= $this->getViewRelation($view);
 		$layout	= $this->input->get('layout', null, 'WORD');
 		$id    	= $this->input->getInt('id');

admin/helpers/compiler/a_Get.php

@@ -1135,10 +1135,10 @@ class Get
 		{
 			$component->readme = '';
 		}
+		
 		// set lang now
 		$nowLang = $this->lang;
 		$this->lang = 'admin';
-
 		// dashboard methods
 		$component->dashboard_tab = (isset($component->dashboard_tab) && ComponentbuilderHelper::checkJson($component->dashboard_tab)) ? json_decode($component->dashboard_tab, true) : null;
 		if (ComponentbuilderHelper::checkArray($component->dashboard_tab))

admin/helpers/compiler/b_Structure.php

@@ -320,6 +320,13 @@ class Structure extends Get
 	 */
 	protected $lastModifiedDate = array();
 
+	/**
+	 * The default view switch
+	 * 
+	 * @var     bool/string
+	 */
+	public $dynamicDashboard = false;
+
 	/**
 	 * Constructor
 	 */
@@ -349,6 +356,8 @@ class Structure extends Get
 			$this->setLibaries();
 			// set the Joomla Version Data
 			$this->joomlaVersionData = $this->setJoomlaVersionData();
+			// set the dashboard
+			$this->setDynamicDashboard();
 			// set the new folders
 			if (!$this->setFolders())
 			{
@@ -524,6 +533,67 @@ class Structure extends Get
 		}
 	}
 
+	/**
+	 * set the dynamic dashboard if set
+	 * 
+	 * @return  void
+	 * 
+	 */
+	private function setDynamicDashboard()
+	{
+		// only do the dashboard stuff it the default is used
+		if (isset($this->componentData->dashboard_type) && 2 == $this->componentData->dashboard_type
+			&& isset($this->componentData->dashboard) && ComponentbuilderHelper::checkString($this->componentData->dashboard)
+			&& strpos($this->componentData->dashboard, '_') !== false)
+		{
+			// set the default view
+			$getter = explode('_',$this->componentData->dashboard);
+			if (count($getter) == 2 && is_numeric($getter[1]))
+			{
+				$id = $getter[1];
+				// custom admin view
+				if ('C' === $getter[0])
+				{
+					$dashboard = array_filter($this->componentData->custom_admin_views, function($view) use($id){
+						if (isset($view['customadminview']) && $id == $view['customadminview'])
+						{
+							return true;
+						}
+						return false;
+					});
+					// check if somthing was returned
+					if (count($dashboard) && isset($dashboard[0]['settings']) && isset($dashboard[0]['settings']->code))
+					{
+						$this->dynamicDashboard = $dashboard[0]['settings']->code;
+					}
+				}
+				// admin view
+				elseif ('A' === $getter[0])
+				{
+					$dashboard = array_filter($this->componentData->admin_views, function($view) use($id){
+						if (isset($view['adminview']) && $id == $view['adminview'])
+						{
+							return true;
+						}
+						return false;
+					});
+					// check if somthing was returned
+					if (count($dashboard) && isset($dashboard[0]['settings']) && isset($dashboard[0]['settings']->name_list))
+					{
+						$this->dynamicDashboard = ComponentbuilderHelper::safeString($dashboard[0]['settings']->name_list);
+					}
+				}
+			}
+			// if default was changed to dynamic dashboard the remove default tab and methods
+			if (ComponentbuilderHelper::checkString($this->dynamicDashboard))
+			{
+				// dynamic dashboard is used
+				$this->componentData->dashboard_tab = '';
+				$this->componentData->php_dashboard_methods = '';
+			}
+		}
+	}
+
 	/**
 	 * Write data to file
 	 * 
@@ -796,10 +866,13 @@ class Structure extends Get
 		$back = false;
 		$front = false;
 		if ((isset($this->joomlaVersionData->move->dynamic) && ComponentbuilderHelper::checkObject($this->joomlaVersionData->move->dynamic)) && (isset($this->componentData->admin_views) && ComponentbuilderHelper::checkArray($this->componentData->admin_views)))
+		{
+			if (!ComponentbuilderHelper::checkString($this->dynamicDashboard))
 			{
 				// setup dashboard
 				$target = array('admin' => $this->componentData->name_code);
 				$this->buildDynamique($target, 'dashboard');
+			}
 			// now the rest of the views
 			foreach ($this->componentData->admin_views as $nr => $view)
 			{

admin/helpers/compiler/e_Interpretation.php

@@ -678,17 +678,17 @@ class Interpretation extends Fields
 				$function[] = "\tpublic static function getMediumCryptKey(\$path)";
 				$function[] = "\t{";
 				$function[] = "\t\t//" . $this->setLine(__LINE__) . " Prep the path a little";
-				$function[] = "\t\t\$path = '/'. trim('/', str_replace('//', '/', \$path));";
+				$function[] = "\t\t\$path = '/'. trim(str_replace('//', '/', \$path), '/');";
-				$function[] = "\t\t/jimport('joomla.filesystem.folder');";
+				$function[] = "\t\tjimport('joomla.filesystem.folder');";
 				$function[] = "\t\t///" . $this->setLine(__LINE__) . " Check if folder exist";
-				$function[] = "\t\t/if (!JFolder::exists(\$path))";
+				$function[] = "\t\tif (!JFolder::exists(\$path))";
-				$function[] = "\t\t/{";
+				$function[] = "\t\t{";
-				$function[] = "\t\t//" . $this->setLine(__LINE__) . " Lock key.";
+				$function[] = "\t\t\t//" . $this->setLine(__LINE__) . " Lock key.";
 				$function[] = "\t\t\tself::\$mediumCryptKey = 'none';";
-				$function[] = "\t\t//" . $this->setLine(__LINE__) . " Set the error message.";
+				$function[] = "\t\t\t//" . $this->setLine(__LINE__) . " Set the error message.";
 				$function[] = "\t\t\tJFactory::getApplication()->enqueueMessage(JText::_('" . $this->langPrefix . "_CONFIG_MEDIUM_KEY_PATH_ERROR'), 'Error');";
 				$function[] = "\t\t\treturn false;";
-				$function[] = "\t\t/}";
+				$function[] = "\t\t}";
 				$function[] = "\t\t//" . $this->setLine(__LINE__) . " Create FileName and set file path";
 				$function[] = "\t\t\$filePath = \$path.'/.'.md5('medium_crypt_key_file');";
 				$function[] = "\t\t//" . $this->setLine(__LINE__) . " Check if we already have the file set";
@@ -699,30 +699,30 @@ class Interpretation extends Fields
 				$function[] = "\t\t//" . $this->setLine(__LINE__) . " Set the key for the first time";
 				$function[] = "\t\tself::\$mediumCryptKey = self::randomkey(128);";
 				$function[] = "\t\t//" . $this->setLine(__LINE__) . " Open the key file";
-				$function[] = "\t\t\$fh = fopen(\$filePath, 'w');";
+				$function[] = "\t\t\$fh = @fopen(\$filePath, 'w');";
 				$function[] = "\t\tif (!is_resource(\$fh))";
 				$function[] = "\t\t{";
-				$function[] = "\t\t//" . $this->setLine(__LINE__) . " Lock key.";
+				$function[] = "\t\t\t//" . $this->setLine(__LINE__) . " Lock key.";
 				$function[] = "\t\t\tself::\$mediumCryptKey = 'none';";
-				$function[] = "\t\t//" . $this->setLine(__LINE__) . " Set the error message.";
+				$function[] = "\t\t\t//" . $this->setLine(__LINE__) . " Set the error message.";
 				$function[] = "\t\t\tJFactory::getApplication()->enqueueMessage(JText::_('" . $this->langPrefix . "_CONFIG_MEDIUM_KEY_PATH_ERROR'), 'Error');";
 				$function[] = "\t\t\treturn false;";
 				$function[] = "\t\t}";
 				$function[] = "\t\t//" . $this->setLine(__LINE__) . " Write to the key file";
 				$function[] = "\t\tif (!fwrite(\$fh, self::\$mediumCryptKey))";
 				$function[] = "\t\t{";
-				$function[] = "\t\t//" . $this->setLine(__LINE__) . " Close key file.";
+				$function[] = "\t\t\t//" . $this->setLine(__LINE__) . " Close key file.";
 				$function[] = "\t\t\tfclose(\$fh);";
-				$function[] = "\t\t//" . $this->setLine(__LINE__) . " Lock key.";
+				$function[] = "\t\t\t//" . $this->setLine(__LINE__) . " Lock key.";
 				$function[] = "\t\t\tself::\$mediumCryptKey = 'none';";
-				$function[] = "\t\t//" . $this->setLine(__LINE__) . " Set the error message.";
+				$function[] = "\t\t\t//" . $this->setLine(__LINE__) . " Set the error message.";
 				$function[] = "\t\t\tJFactory::getApplication()->enqueueMessage(JText::_('" . $this->langPrefix . "_CONFIG_MEDIUM_KEY_PATH_ERROR'), 'Error');";
 				$function[] = "\t\t\treturn false;";
 				$function[] = "\t\t}";
 				$function[] = "\t\t//" . $this->setLine(__LINE__) . " Close key file.";
 				$function[] = "\t\tfclose(\$fh);";
 				$function[] = "\t\t//" . $this->setLine(__LINE__) . " Key is set.";
-				$function[] = PHP_EOL . "\t\treturn true;";
+				$function[] = "\t\treturn true;";
 				$function[] = "\t}";
 			}
 			// return the help methods
@@ -11772,7 +11772,7 @@ class Interpretation extends Fields
 				}
 				else
 				{
-					if ($item['method'] == 2 || $item['method'] == 3 || $item['method'] == 4)
+					if ($item['method'] == 2 || $item['method'] == 3 || $item['method'] == 4 || $item['method'] == 5)
 					{
 						$taber = '';
 						if ($item['method'] == 3)
@@ -11803,7 +11803,7 @@ class Interpretation extends Fields
 						}
 						$fix .= PHP_EOL . "\t" . $tab . $taber . "\t\t\t\$item->" . $item['name'] . " = " . $decode . "(\$item->" . $item['name'] . ");";
 
-						if ($item['method'] == 3 || $item['method'] == 4)
+						if ($item['method'] == 3 || $item['method'] == 4 || $item['method'] == 5)
 						{
 							$fix .= PHP_EOL . "\t" . $tab . "\t\t\t}";
 						}
@@ -12486,9 +12486,12 @@ class Interpretation extends Fields
 			$lang = $this->langPrefix . '_SUBMENU';
 			// set the code name
 			$codeName = ComponentbuilderHelper::safeString($this->componentData->name_code);
-			// set dashboard
+			// set default dashboard
+			if (!ComponentbuilderHelper::checkString($this->dynamicDashboard))
+			{
 				$menus .= "JHtmlSidebar::addEntry(JText:".":_('" . $lang . "_DASHBOARD'), 'index.php?option=com_" . $codeName . "&view=" . $codeName . "', \$submenu === '" . $codeName . "');";
 				$this->langContent[$this->lang][$lang . '_DASHBOARD'] = 'Dashboard';
+			}
 			$catArray = array();
 			foreach ($this->componentData->admin_views as $view)
 			{

admin/helpers/compiler/f_Infusion.php

@@ -753,6 +753,12 @@ class Infusion extends Interpretation
 			// ###UPDATE_VERSION_MYSQL###
 			$this->setVersionController();
 			
+			// only set these if default dashboard it used
+			if (!ComponentbuilderHelper::checkString($this->dynamicDashboard))
+			{
+				// ###DASHBOARDVIEW###
+				$this->fileContentStatic['###DASHBOARDVIEW###'] = $this->fileContentStatic['###component###'];
+				
 				// ###DASHBOARDICONS###
 				$this->fileContentDynamic[$this->fileContentStatic['###component###']]['###DASHBOARDICONS###'] = $this->setDashboardIcons();
 
@@ -767,6 +773,12 @@ class Infusion extends Interpretation
 
 				// ###DASH_DISPLAY_DATA###
 				$this->fileContentDynamic[$this->fileContentStatic['###component###']]['###DASH_DISPLAY_DATA###'] = $this->setDashboardDisplayData();
+			}
+			else
+			{
+				// ###DASHBOARDVIEW###
+				$this->fileContentStatic['###DASHBOARDVIEW###'] = $this->dynamicDashboard;
+			}
 
 			// add import
 			if (isset($this->addEximport) && $this->addEximport)

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

@@ -3830,8 +3830,10 @@ COM_COMPONENTBUILDER_FIELD_NOTE_FILTER_INFORMATION_DESCRIPTION="<div class='form
 <div id='display_linked_to'>Searching the database.<span class='loading-dots'></span></div>
 </div>
 </div>"
-COM_COMPONENTBUILDER_FIELD_NOTE_VDM_ENCRYPTION_DESCRIPTION="When using the VDM encryption you need to get a VDM public key from https://www.vdm.io/ "
+COM_COMPONENTBUILDER_FIELD_NOTE_WHMCS_ENCRYPTION_DESCRIPTION="<p>When using the WHMCS encryption you need to get a WHMCS key from:<br /><a href='https://www.vdm.io/support' target='_blank'>https://www.vdm.io</a>, or your own WHMCS install.</p><p>Please note that you will need to <b>enable the add-on</b> in the Joomla Component area (Add WHMCS)->Yes.</p><p>You can get more info about the WHMCS licensing add-on at the following links.</p><p><b>Helpful Links:</b><br />
-COM_COMPONENTBUILDER_FIELD_NOTE_VDM_ENCRYPTION_LABEL="The VDM Encryption"
+<a href='https://www.whmcs.com/addons/licensing-addon/' target='_blank'>https://www.whmcs.com/addons/licensing-addon/</a><br />
+<a href='http://docs.whmcs.com/Licensing_Addon/' target='_blank'>http://docs.whmcs.com/Licensing_Addon/</a></p>"
+COM_COMPONENTBUILDER_FIELD_NOTE_WHMCS_ENCRYPTION_LABEL="The WHMCS Encryption"
 COM_COMPONENTBUILDER_FIELD_NOT_NULL="NOT NULL"
 COM_COMPONENTBUILDER_FIELD_NOT_REQUIRED="Not Required"
 COM_COMPONENTBUILDER_FIELD_NULL="NULL"
@@ -4152,8 +4154,8 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_FOOTABLE_VTWO="Add FooTable V2"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_JAVASCRIPT="Add Javascript"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_JAVASCRIPT_LABEL="Add Javascript"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_LICENSE="Add License"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_LICENSE_DESCRIPTION="Add the option to use a license in the component."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_LICENSE_DESCRIPTION="Add the option to use the whmcs license add-on in the component."
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_LICENSE_LABEL="Add License (whmcs)"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_LICENSE_LABEL="Add WHMCS<br /><small>(license add-on)</small>"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_PHP_HELPER_ADMIN="Add Php Helper Admin"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_PHP_HELPER_ADMIN_LABEL="Add PHP (helper_admin Class)"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_PHP_HELPER_BOTH="Add Php Helper Both"
@@ -4184,7 +4186,6 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_UIKIT_VTWO="Add Uikit v2"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_UPDATE_SERVER="Add Update Server"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_UPDATE_SERVER_LABEL="Add Update Server"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADMIN_VIEWS="Admin Views"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADVANCED_ENCRYPTION_ONLY_TO_LOCK_DATA="Advanced encryption (only to lock data)"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_AUTHOR="Author"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_AUTHOR_DESCRIPTION="The Author's Name &amp; Surname."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_AUTHOR_HINT="Author Name &amp; Surname Here"
@@ -4235,9 +4236,16 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_SITE_HINT="// CSS for the entire front
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_SITE_LABEL="CSS (site)"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CUSTOM_ADMIN_VIEWS="Custom Admin Views"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CUSTOM_USED_IN_CUSTOM_CODE="Custom (used in custom code)"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DASHBOARD="Dashboard"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DASHBOARD_DESCRIPTION="Select a custom admin view that is already linked to this component as a dynamic dashboard."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DASHBOARD_LABEL="Dynamic Dashboard<br /><small>(admin or custom admin view)</small>"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DASHBOARD_TYPE="Dashboard Type"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DASHBOARD_TYPE_DESCRIPTION="Select the type of dashboard you would like to use."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DASHBOARD_TYPE_LABEL="Dashboard Type"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DEBUG_LINENR="Debug Linenr"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DEBUG_LINENR_DESCRIPTION="Add corresponding line numbers to the dynamic comments, so to see where in the compiler the lines of code was build. This will help if you need to get more technical with an issue on github."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DEBUG_LINENR_LABEL="Debug (line numbers)"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DEFAULT="Default"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DESCRIPTION="Description"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DESCRIPTION_DESCRIPTION="Add Description Here"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DESCRIPTION_HINT="Add Description Here"
@@ -4320,8 +4328,8 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ADD_CONFIG_DESCRIPTION="You can add c
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ADD_CONFIG_LABEL="Adding Custom Config Fields"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ADD_CUSTOM_MENUS_DESCRIPTION="You can add custom menus to the component here. The normal Menus are already being added so only add custom Menus that you would like to use for custom scripts.<span id='jform_button_add_custom_menus'></span>"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ADD_CUSTOM_MENUS_LABEL="Adding Custom Menus"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_BOTTON_COMPONENT_DASHBOARD_DESCRIPTION="<p>You can add more tabs to the component dashboard.</p><span id='jform_button_component_dashboard'></span>"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_BOTTON_COMPONENT_DASHBOARD_DESCRIPTION="<p>The default dashboard has all the icons of the views you have selected as <b>Dashboard (add record)</b> or <b>Dashboard (list of records)</b>, to expand it you can add more tabs.</p><span id='jform_button_component_dashboard'></span>"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_BOTTON_COMPONENT_DASHBOARD_LABEL="Customize the Component Dashboard"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_BOTTON_COMPONENT_DASHBOARD_LABEL="Default Dashboard Option"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_BUILDCOMP_DYNAMIC_MYSQL_DESCRIPTION="You can dynamically build the components back-end views and fields by adding a mySql table dump, that has all the tables, or some more tables with its columns and data types. A very basic and generic set of fields and tables will be created, and added to the existing fields and tables of this component."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_BUILDCOMP_DYNAMIC_MYSQL_LABEL="Dynamic Builder (mySql) Option"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_COMPONENT_FILES_FOLDERS_DESCRIPTION="You can add custom files and folders to the component, simply add the files to the administrator/components/com_componentbuilder/custom folder and then select them here.<span id='jform_button_component_files_folders'></span>"
@@ -4329,6 +4337,8 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_COMPONENT_FILES_FOLDERS_LABEL="Adding
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_DISPLAY_COMPONENT_ADMIN_VIEWS_DESCRIPTION="<h4>Linked Admin Views <span id='header_component_admin_views_buttons'></span></h4><div id='display_component_admin_views' >Display of the admin views will load here!</div>"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_DISPLAY_COMPONENT_CUSTOM_ADMIN_VIEWS_DESCRIPTION="<h4>Linked Custom Admin Views <span id='header_component_custom_admin_views_buttons'></span></h4><div id='display_component_custom_admin_views' >Display of the custom admin views will load here!</div>"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_DISPLAY_COMPONENT_SITE_VIEWS_DESCRIPTION="<h4>Linked Site Views <span id='header_component_site_views_buttons'></span></h4><div id='display_component_site_views' >Display of the site views will load here!</div>"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_DYNAMIC_DASHBOARD_DESCRIPTION="The dynamic dashboard is basically the option of taking an <b>Admin View</b> or <b>Custom Admin View</b> that is already linked to this component, and making it the dashboard."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_DYNAMIC_DASHBOARD_LABEL="Dynamic Dashboard Option"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_MOVED_VIEWS_DESCRIPTION="We have moved the views in to their own tabs for your convenience.<span id='jform_button_create_edit_views'></span>"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_MOVED_VIEWS_LABEL="To add views, please open the corresponding tab."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_MYSQL_TWEAK_OPTIONS_DESCRIPTION="In each admin view you can add data from a MySQL Table (this is done in the admin view MySQL tab). Here you can limit that data in relation to this component. This feature is useful when an admin view with demo data is used in more then one component, and you would like to exclude some demo data without creating a new admin view.<span id='jform_button_mysql_tweak_options'></span>"
@@ -4493,7 +4503,7 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TOIGNORE_LABEL="Repository Folders or File
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TO_IGNORE_NOTE_DESCRIPTION="During compilation JCB deletes all files and folders from the repository folder, and then adds the newly created files and folders back into the repository folder. Yet there may be files or folders you may not want deleted, like the <b>.git</b> folder, since JCB does not dynamically create that folder and so it will not be placed back, but simply delete it, unless you add it in this text field below, so that it will be ignored, and therefore not deleted in the first place. You can add multiple folders and files, separated by commas. Like: <code>.git, .hg</code>"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TO_IGNORE_NOTE_LABEL="Repository Folders or Files to Ignore"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TRANSLATION="Translation"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATES_USED_IN_JOOMLA_UPDATER="Updates (used in Joomla updater)"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATES_NOT_READY="Updates (NOT READY!)"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATE_SERVER="Update Server"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATE_SERVER_DESCRIPTION="Select your update server for this component."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATE_SERVER_LABEL="Update Server"
@@ -4518,6 +4528,7 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_DESCRIPTION="Enter website address
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_HINT="http://www.example.com"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_LABEL="Website"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_MESSAGE="Error! Please add website here."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_ENCRYPTION_ONLY_TO_LOCK_DATAFIELDS="WHMCS encryption (only to lock data/fields)"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_KEY="Whmcs Key"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_KEY_DESCRIPTION="Add your WHMCS Secret Key here that is needed for this license"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_KEY_HINT="Secret Key"
@@ -5270,6 +5281,7 @@ COM_COMPONENTBUILDER_RIGHT_OF_TABS="Right of Tabs"
 COM_COMPONENTBUILDER_SAVE_SUCCESS="Great! Item successfully saved."
 COM_COMPONENTBUILDER_SAVE_WARNING="The value already existed so please select another."
 COM_COMPONENTBUILDER_SEARCHABLE="Searchable"
+COM_COMPONENTBUILDER_SELECT_AN_OPTION="Select an option"
 COM_COMPONENTBUILDER_SELECT_A_SNIPPET="select a snippet"
 COM_COMPONENTBUILDER_SELECT_THE_COMPONENT_TO_COMPILE="Select the component to compile"
 COM_COMPONENTBUILDER_SERVER="Server"
@@ -5337,7 +5349,7 @@ COM_COMPONENTBUILDER_SERVER_FTP="FTP"
 COM_COMPONENTBUILDER_SERVER_HOST="Host"
 COM_COMPONENTBUILDER_SERVER_HOST_DESCRIPTION="Add the server host name/IP here"
 COM_COMPONENTBUILDER_SERVER_HOST_HINT="yourhost.com"
-COM_COMPONENTBUILDER_SERVER_HOST_LABEL="Host/IP<br /><small>(basic encryption)</small>"
+COM_COMPONENTBUILDER_SERVER_HOST_LABEL="Host/IP<br /><small>(encrypted field)</small>"
 COM_COMPONENTBUILDER_SERVER_HOST_MESSAGE="Error! Please add server host name here."
 COM_COMPONENTBUILDER_SERVER_ID="Id"
 COM_COMPONENTBUILDER_SERVER_LINKED_COMPONENTS="Linked Components"
@@ -5359,17 +5371,17 @@ COM_COMPONENTBUILDER_SERVER_NOT_REQUIRED="Not Required"
 COM_COMPONENTBUILDER_SERVER_ORDERING_LABEL="Ordering"
 COM_COMPONENTBUILDER_SERVER_PASSWORD="Password"
 COM_COMPONENTBUILDER_SERVER_PASSWORD_DESCRIPTION="Enter the password."
-COM_COMPONENTBUILDER_SERVER_PASSWORD_LABEL="Password<br /><small>(basic encryption)</small>"
+COM_COMPONENTBUILDER_SERVER_PASSWORD_LABEL="Password<br /><small>(encrypted field)</small>"
 COM_COMPONENTBUILDER_SERVER_PATH="Path"
 COM_COMPONENTBUILDER_SERVER_PATH_DESCRIPTION="Set the path to the remote destination folder. The user must have write permissions to this folder."
 COM_COMPONENTBUILDER_SERVER_PATH_HINT="/home/username/folder/"
-COM_COMPONENTBUILDER_SERVER_PATH_LABEL="Remote Destination Folder Path<br /><small>(basic encryption)</small>"
+COM_COMPONENTBUILDER_SERVER_PATH_LABEL="Remote Destination Folder Path<br /><small>(encrypted field)</small>"
 COM_COMPONENTBUILDER_SERVER_PATH_MESSAGE="Error! Please add destination path."
 COM_COMPONENTBUILDER_SERVER_PERMISSION="Permissions"
 COM_COMPONENTBUILDER_SERVER_PORT="Port"
 COM_COMPONENTBUILDER_SERVER_PORT_DESCRIPTION="The port number"
 COM_COMPONENTBUILDER_SERVER_PORT_HINT="22"
-COM_COMPONENTBUILDER_SERVER_PORT_LABEL="Port Number<br /><small>(basic encryption)</small>"
+COM_COMPONENTBUILDER_SERVER_PORT_LABEL="Port Number<br /><small>(encrypted field)</small>"
 COM_COMPONENTBUILDER_SERVER_PORT_MESSAGE="Error! Please add port number here."
 COM_COMPONENTBUILDER_SERVER_PRIVATE="Private"
 COM_COMPONENTBUILDER_SERVER_PRIVATE_DESCRIPTION="Set the path to the private key."
@@ -5392,9 +5404,9 @@ MD4pm2tpMRV52YIRi07J70ex/PbLULd5cCTh6jgXAwz71AVSiBY/jTtKqV3YkzJo
 09oGIZIcI/wzk1zLloqNAkB8qHxAtmUZFdo5sssaUDTOB82QAPfiHUqIFPaYuc0f
 4NqtXZm+fv4liR3QJEo8zkiBs3NjBnm7Hh3BMSqGh3d+
 -----END RSA PRIVATE KEY-----"
-COM_COMPONENTBUILDER_SERVER_PRIVATE_KEY_LABEL="PRIVATE KEY<br /><small>(basic encryption)</small>"
+COM_COMPONENTBUILDER_SERVER_PRIVATE_KEY_LABEL="PRIVATE KEY<br /><small>(encrypted field)</small>"
 COM_COMPONENTBUILDER_SERVER_PRIVATE_KEY_TEXT_FIELD="Private Key - Text Field"
-COM_COMPONENTBUILDER_SERVER_PRIVATE_LABEL="Private Key Path<br /><small>(basic encryption)</small>"
+COM_COMPONENTBUILDER_SERVER_PRIVATE_LABEL="Private Key Path<br /><small>(encrypted field)</small>"
 COM_COMPONENTBUILDER_SERVER_PRIVATE_MESSAGE="Error! Please add private key path."
 COM_COMPONENTBUILDER_SERVER_PROTOCOL="Protocol"
 COM_COMPONENTBUILDER_SERVER_PROTOCOL_DESCRIPTION="Select the protocol used to connect to this server."
@@ -5403,7 +5415,7 @@ COM_COMPONENTBUILDER_SERVER_PUBLISHING="Publishing"
 COM_COMPONENTBUILDER_SERVER_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Server to customise the alias."
 COM_COMPONENTBUILDER_SERVER_SECRET="Secret"
 COM_COMPONENTBUILDER_SERVER_SECRET_DESCRIPTION="If private key file is encrypted (which it should be), the passphrase must be provided."
-COM_COMPONENTBUILDER_SERVER_SECRET_LABEL="Passphrase<br /><small>(basic encryption)</small>"
+COM_COMPONENTBUILDER_SERVER_SECRET_LABEL="Passphrase<br /><small>(encrypted field)</small>"
 COM_COMPONENTBUILDER_SERVER_SELECT_AN_OPTION="Select an option"
 COM_COMPONENTBUILDER_SERVER_SFTP="SFTP"
 COM_COMPONENTBUILDER_SERVER_SIGNATURE="Signature"
@@ -5415,7 +5427,7 @@ COM_COMPONENTBUILDER_SERVER_STATUS="Status"
 COM_COMPONENTBUILDER_SERVER_USERNAME="Username"
 COM_COMPONENTBUILDER_SERVER_USERNAME_DESCRIPTION="Enter the username."
 COM_COMPONENTBUILDER_SERVER_USERNAME_HINT="root"
-COM_COMPONENTBUILDER_SERVER_USERNAME_LABEL="Username<br /><small>(basic encryption)</small>"
+COM_COMPONENTBUILDER_SERVER_USERNAME_LABEL="Username<br /><small>(encrypted field)</small>"
 COM_COMPONENTBUILDER_SERVER_USERNAME_MESSAGE="Error! Please add the username here."
 COM_COMPONENTBUILDER_SERVER_VERSION_DESC="A count of the number of times this Server has been revised."
 COM_COMPONENTBUILDER_SERVER_VERSION_LABEL="Revision"
@@ -6322,6 +6334,7 @@ COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_IMPORT_A_COMPONENT_PLEASE_CON
 COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_SHARE_THE_SNIPPETS_PLEASE_CONTACT_YOUR_SYSTEM_ADMINISTRATOR_FOR_MORE_HELP="You do not have permission to share the snippets, please contact your system administrator for more help."
 COM_COMPONENTBUILDER_YOU_HAVE_S_S_ADDING_MORE_THEN_FIFTY_S_IS_CONSIDERED_BAD_PRACTICE="You have %s %s. Adding more then 50 %s is considered bad practice."
 COM_COMPONENTBUILDER_YOU_HAVE_S_S_ADDING_MORE_THEN_FIFTY_S_IS_CONSIDERED_BAD_PRACTICE_YOUR_S_PAGE_LOAD_IN_JCB_WILL_SLOWDOWN_YOU_SHOULD_CONSIDER_DECOUPLING_SOME_OF_THESE_S="You have %s %s. Adding more then 50 %s is considered bad practice. Your %s page load in JCB will slowdown. You should consider decoupling some of these %s."
+COM_COMPONENTBUILDER_YOU_MUST_FIRST_LINK_AN_ADMIN_OR_A_CUSTOM_ADMIN_VIEW_TO_THIS_COMPONENT_THEN_YOU_CAN_SELECT_IT_HERE="You must first link an admin or a custom admin view to this component, then you can select it here"
 COM_COMPONENTBUILDER_YOU_MUST_SELECT_A_COMPONENT="You must select a component!"
 COM_COMPONENTBUILDER_YOU_SHOULD_ADD_THE_CORRECT_OWNER_DETAILS="You should add the correct owner details."
 COM_COMPONENTBUILDER_YOU_SHOULD_ONLY_CONTINUE_THIS_IMPORT_IF_YOU_HAVE_BACKUP_YOUR_COMPONENTS_AND_INSURED_THAT_THE_PACKAGE_OWNER_IS_REPUTABLE="You should only continue this import if you have backup your components, and insured that the package owner is reputable."

admin/layouts/field/details_left.php

@@ -41,7 +41,7 @@ $fields = $displayData->get('fields') ?: array(
 	'indexes',
 	'null_switch',
 	'store',
-	'note_vdm_encryption'
+	'note_whmcs_encryption'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();

admin/layouts/joomla_component/php_left.php

@@ -30,7 +30,7 @@ defined('_JEXEC') or die('Restricted access');
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
-	'note_botton_component_dashboard'
+	'dashboard_type'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();

admin/layouts/joomla_component/php_right.php

@@ -0,0 +1,56 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@version		2.6.x
+	@created		30th April, 2015
+	@package		Component Builder
+	@subpackage		php_right.php
+	@author			Llewellyn van der Merwe <http://joomlacomponentbuilder.com>	
+	@github			Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	
+	Builds Complex Joomla Components 
+                                                             
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+// No direct access to this file
+
+defined('_JEXEC') or die('Restricted access');
+
+$form = $displayData->getForm();
+
+$fields = $displayData->get('fields') ?: array(
+	'note_dynamic_dashboard',
+	'dashboard',
+	'note_botton_component_dashboard'
+);
+
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
+foreach ($fields as $field)
+{
+	$field = is_array($field) ? $field : array($field);
+	foreach ($field as $f)
+	{
+		if ($form->getField($f))
+		{
+			if (in_array($f, $hiddenFields))
+			{
+				$form->setFieldAttribute($f, 'type', 'hidden');
+			}
+
+			echo $form->renderField($f);
+			break;
+		}
+	}
+}

admin/models/ajax.php

@@ -274,11 +274,13 @@ class ComponentbuilderModelAjax extends JModelList
 			{
 				// get the view name & id
 				$values = $this->getViewID();
+				// set the button ID
+				$css_class = 'control-group-'.ComponentbuilderHelper::safeString($type. '-' . $size, 'L', '-');
 				// check if new item
 				$ref = '';
 				if (!is_null($values['a_id']) && $values['a_id'] > 0 && strlen($values['a_view']))
 				{
-					// only load referal if not new item.
+					// only load referral if not new item.
 					$ref = '&ref=' . $values['a_view'] . '&refid=' . $values['a_id'];
 					// get item id
 					if ($id = ComponentbuilderHelper::getVar($type, $values['a_id'], $values['a_view'], 'id'))
@@ -299,7 +301,7 @@ class ComponentbuilderModelAjax extends JModelList
 					$button = array();
 					if (1 == $size)
 					{
-						$button[] = '<div class="control-group">';
+						$button[] = '<div class="control-group '.$css_class.'">';
 						$button[] = '<div class="control-label">';
 						$button[] = '<label>' . ComponentbuilderHelper::safeString($type, 'Ww') . '</label>';
 						$button[] = '</div>';
@@ -326,7 +328,7 @@ class ComponentbuilderModelAjax extends JModelList
 				// only return notice if big button
 				if (1 == $size)
 				{
-					return '<div class="control-group"><div class="alert alert-info">' . JText::sprintf('COM_COMPONENTBUILDER_BUTTON_TO_CREATE_S_WILL_SHOW_ONCE_S_IS_SAVED_FOR_THE_FIRST_TIME', ComponentbuilderHelper::safeString($type, 'w'), ComponentbuilderHelper::safeString($values['a_view'], 'w')) . '</div></div>';
+					return '<div class="control-group '.$css_class.'"><div class="alert alert-info">' . JText::sprintf('COM_COMPONENTBUILDER_BUTTON_TO_CREATE_S_WILL_SHOW_ONCE_S_IS_SAVED_FOR_THE_FIRST_TIME', ComponentbuilderHelper::safeString($type, 'w'), ComponentbuilderHelper::safeString($values['a_view'], 'w')) . '</div></div>';
 				}
 			}
 		}

admin/models/compiler.php

@@ -228,6 +228,8 @@ class ComponentbuilderModelCompiler extends JModelList
 	
 	public function install($p_file)
 	{
+		$this->setState('action', 'install');
+
 		// Set FTP credentials, if given.
 		JClientHelper::setCredentialsFromRequest('ftp');
 		$app = JFactory::getApplication();
@@ -246,7 +248,8 @@ class ComponentbuilderModelCompiler extends JModelList
 		{
 			return true;
 		}
-		elseif (in_array(false, $results, true))
+
+		if (in_array(false, $results, true))
 		{
 			return false;
 		}
@@ -256,8 +259,10 @@ class ComponentbuilderModelCompiler extends JModelList
 
 		// Unpack the downloaded package file.
 		$package = JInstallerHelper::unpack($tmp_dest . '/' . $p_file, true);
-		// insure the install type is folder
+
+		// insure the install type is folder (JCB zip file is in the folder)
 		$installType = 'folder';
+
 		// This event allows a custom installation of the package or a customization of the package:
 		$results = $dispatcher->trigger('onInstallerBeforeInstaller', array($this, &$package));
 
@@ -317,6 +322,16 @@ class ComponentbuilderModelCompiler extends JModelList
 
 		JInstallerHelper::cleanupInstall($package['packagefile'], $package['extractdir']);
 
+		// Clear the cached extension data and menu cache
+		$this->cleanCache('_system', 0);
+		$this->cleanCache('_system', 1);
+		$this->cleanCache('com_modules', 0);
+		$this->cleanCache('com_modules', 1);
+		$this->cleanCache('com_plugins', 0);
+		$this->cleanCache('com_plugins', 1);
+		$this->cleanCache('mod_menu', 0);
+		$this->cleanCache('mod_menu', 1);
+
 		return $result;
 	}
 }

admin/models/fields/dynamicdashboard.php

@@ -0,0 +1,217 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@version		2.6.x
+	@created		30th April, 2015
+	@package		Component Builder
+	@subpackage		dynamicdashboard.php
+	@author			Llewellyn van der Merwe <http://joomlacomponentbuilder.com>	
+	@github			Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	
+	Builds Complex Joomla Components 
+                                                             
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Dynamicdashboard Form Field class for the Componentbuilder component
+ */
+class JFormFieldDynamicdashboard extends JFormFieldList
+{
+	/**
+	 * The dynamicdashboard field type.
+	 *
+	 * @var		string
+	 */
+	public $type = 'dynamicdashboard'; 
+	/**
+	 * Override to add new button
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   3.2
+	 */
+	protected function getInput()
+	{
+		// see if we should add buttons
+		$setButton = $this->getAttribute('button');
+		// get html
+		$html = parent::getInput();
+		// if true set button
+		if ($setButton === 'true')
+		{
+			$button = array();
+			$script = array();
+			$buttonName = $this->getAttribute('name');
+			// get the input from url
+			$app = JFactory::getApplication();
+			$jinput = $app->input;
+			// get the view name & id
+			$values = $jinput->getArray(array(
+				'id' => 'int',
+				'view' => 'word'
+			));
+			// check if new item
+			$ref = '';
+			$refJ = '';
+			if (!is_null($values['id']) && strlen($values['view']))
+			{
+				// only load referal if not new item.
+				$ref = '&amp;ref=' . $values['view'] . '&amp;refid=' . $values['id'];
+				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
+			}
+			$user = JFactory::getUser();
+			// only add if user allowed to create custom_admin_view
+			if ($user->authorise('core.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
+			{
+				// build Create button
+				$buttonNamee = trim($buttonName);
+				$buttonNamee = preg_replace('/_+/', ' ', $buttonNamee);
+				$buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee);
+				$buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee);
+				$buttonNamee = ucfirst(strtolower($buttonNamee));
+				$button[] = '<a id="'.$buttonName.'Create" class="btn btn-small btn-success hasTooltip" title="'.JText::sprintf('COM_COMPONENTBUILDER_CREATE_NEW_S', $buttonNamee).'" style="border-radius: 0px 4px 4px 0px; padding: 4px 4px 4px 7px;"
+					href="index.php?option=com_componentbuilder&amp;view=custom_admin_view&amp;layout=edit'.$ref.'" >
+					<span class="icon-new icon-white"></span></a>';
+			}
+			// only add if user allowed to edit custom_admin_view
+			if (($buttonName === 'custom_admin_view' || $buttonName === 'custom_admin_views')  && $user->authorise('core.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
+			{
+				// build edit button
+				$buttonNamee = trim($buttonName);
+				$buttonNamee = preg_replace('/_+/', ' ', $buttonNamee);
+				$buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee);
+				$buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee);
+				$buttonNamee = ucfirst(strtolower($buttonNamee));
+				$button[] = '<a id="'.$buttonName.'Edit" class="btn btn-small hasTooltip" title="'.JText::sprintf('COM_COMPONENTBUILDER_EDIT_S', $buttonNamee).'" style="display: none; padding: 4px 4px 4px 7px;" href="#" >
+					<span class="icon-edit"></span></a>';
+				// build script
+				$script[] = "
+					jQuery(document).ready(function() {
+						jQuery('#adminForm').on('change', '#jform_".$buttonName."',function (e) {
+							e.preventDefault();
+							var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val();
+							".$buttonName."Button(".$buttonName."Value);
+						});
+						var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val();
+						".$buttonName."Button(".$buttonName."Value);
+					});
+					function ".$buttonName."Button(value) {
+						if (value > 0) {
+							// hide the create button
+							jQuery('#".$buttonName."Create').hide();
+							// show edit button
+							jQuery('#".$buttonName."Edit').show();
+							var url = 'index.php?option=com_componentbuilder&view=custom_admin_views&task=custom_admin_view.edit&id='+value+'".$refJ."';
+							jQuery('#".$buttonName."Edit').attr('href', url);
+						} else {
+							// show the create button
+							jQuery('#".$buttonName."Create').show();
+							// hide edit button
+							jQuery('#".$buttonName."Edit').hide();
+						}
+					}";
+			}
+			// check if button was created for custom_admin_view field.
+			if (is_array($button) && count($button) > 0)
+			{
+				// Load the needed script.
+				$document = JFactory::getDocument();
+				$document->addScriptDeclaration(implode(' ',$script));
+				// return the button attached to input field.
+				return '<div class="input-append">' .$html . implode('',$button).'</div>';
+			}
+		}
+		return $html;
+	}
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return	array		An array of JHtml options.
+	 */
+	public function getOptions()
+	{
+		// load the db opbject
+		$db = JFactory::getDBO();		
+		// get the input from url
+		$jinput = JFactory::getApplication()->input;
+		// get the id
+		$ID = $jinput->getInt('id', 0);
+		// set the targets
+		$targets = array('adminview' => 'admin_view', 'customadminview' => 'custom_admin_view');
+		$t = array('adminview' => 'A', 'customadminview' => 'C');
+		// rest the options
+		$options = array();
+		// reset the custom admin views array
+		$views = false;
+		if (is_numeric($ID) && $ID >= 1)
+		{
+			// get the linked back-end views
+			foreach ($targets as $target => $view)
+			{
+				if ($result = ComponentbuilderHelper::getVar('component_'.$view.'s', (int) $ID, 'joomla_component', 'add'.$view.'s'))
+				{
+					$views[$target] = $result;
+				}
+			}
+		}
+		else
+		{
+			// not linked so there is none available
+			return array(JHtml::_('select.option', '', JText::_('COM_COMPONENTBUILDER_YOU_MUST_FIRST_LINK_AN_ADMIN_OR_A_CUSTOM_ADMIN_VIEW_TO_THIS_COMPONENT_THEN_YOU_CAN_SELECT_IT_HERE')));
+		}
+		// check if we found any values
+		if (ComponentbuilderHelper::checkArray($views))
+		{
+			foreach ($targets as $target => $view)
+			{
+				if (isset($views[$target]) && ComponentbuilderHelper::checkJson($views[$target]))
+				{
+					// convert to an array
+					$value = json_decode($views[$target], true);
+					$type = ComponentbuilderHelper::safeString($view, 'w');
+					if (ComponentbuilderHelper::checkArray($value))
+					{
+						foreach ($value as $_view)
+						{
+							if (isset($_view[$target]) && is_numeric($_view[$target]))
+							{
+								// set the view to the selections if found
+								if ($name = ComponentbuilderHelper::getVar($view, (int) $_view[$target], 'id', 'system_name'))
+								{
+									$options[] = JHtml::_('select.option', $t[$target].'_'.$_view[$target], $name.'  ['.$type.']');
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+		// return found options
+		if (ComponentbuilderHelper::checkArray($options))
+		{
+			array_unshift($options , JHtml::_('select.option', '', JText::_('COM_COMPONENTBUILDER_SELECT_AN_OPTION')));
+			return $options;
+		}
+		// not linked so there is none available
+		return array(JHtml::_('select.option', '', JText::_('COM_COMPONENTBUILDER_YOU_MUST_FIRST_LINK_AN_ADMIN_OR_A_CUSTOM_ADMIN_VIEW_TO_THIS_COMPONENT_THEN_YOU_CAN_SELECT_IT_HERE')));
+	}
+}

admin/models/forms/custom_admin_view.js

@@ -23,294 +23,294 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvvybvxx_required = false;
+jform_vvvvvydvxx_required = false;
-jform_vvvvvycvxy_required = false;
+jform_vvvvvyevxy_required = false;
-jform_vvvvvydvxz_required = false;
+jform_vvvvvyfvxz_required = false;
-jform_vvvvvyevya_required = false;
+jform_vvvvvygvya_required = false;
-jform_vvvvvyfvyb_required = false;
+jform_vvvvvyhvyb_required = false;
-jform_vvvvvygvyc_required = false;
+jform_vvvvvyivyc_required = false;
-jform_vvvvvyhvyd_required = false;
+jform_vvvvvyjvyd_required = false;
-jform_vvvvvyivye_required = false;
+jform_vvvvvykvye_required = false;
-jform_vvvvvyivyf_required = false;
+jform_vvvvvykvyf_required = false;
-jform_vvvvvyjvyg_required = false;
+jform_vvvvvylvyg_required = false;
-jform_vvvvvykvyh_required = false;
+jform_vvvvvymvyh_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var add_php_view_vvvvvyb = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvyd = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyb(add_php_view_vvvvvyb);
+	vvvvvyd(add_php_view_vvvvvyd);
 
-	var add_php_jview_display_vvvvvyc = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	var add_php_jview_display_vvvvvye = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvyc(add_php_jview_display_vvvvvyc);
+	vvvvvye(add_php_jview_display_vvvvvye);
 
-	var add_php_jview_vvvvvyd = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	var add_php_jview_vvvvvyf = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyd(add_php_jview_vvvvvyd);
+	vvvvvyf(add_php_jview_vvvvvyf);
 
-	var add_php_document_vvvvvye = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	var add_php_document_vvvvvyg = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvye(add_php_document_vvvvvye);
+	vvvvvyg(add_php_document_vvvvvyg);
 
-	var add_css_document_vvvvvyf = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	var add_css_document_vvvvvyh = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvyf(add_css_document_vvvvvyf);
+	vvvvvyh(add_css_document_vvvvvyh);
 
-	var add_javascript_file_vvvvvyg = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	var add_javascript_file_vvvvvyi = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvyg(add_javascript_file_vvvvvyg);
+	vvvvvyi(add_javascript_file_vvvvvyi);
 
-	var add_js_document_vvvvvyh = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	var add_js_document_vvvvvyj = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyh(add_js_document_vvvvvyh);
+	vvvvvyj(add_js_document_vvvvvyj);
 
-	var add_custom_button_vvvvvyi = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	var add_custom_button_vvvvvyk = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyi(add_custom_button_vvvvvyi);
+	vvvvvyk(add_custom_button_vvvvvyk);
 
-	var add_css_vvvvvyj = jQuery("#jform_add_css input[type='radio']:checked").val();
+	var add_css_vvvvvyl = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyj(add_css_vvvvvyj);
+	vvvvvyl(add_css_vvvvvyl);
 
-	var add_php_ajax_vvvvvyk = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	var add_php_ajax_vvvvvym = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvyk(add_php_ajax_vvvvvyk);
+	vvvvvym(add_php_ajax_vvvvvym);
 });
 
-// the vvvvvyb function
+// the vvvvvyd function
-function vvvvvyb(add_php_view_vvvvvyb)
+function vvvvvyd(add_php_view_vvvvvyd)
 {
 	// set the function logic
-	if (add_php_view_vvvvvyb == 1)
+	if (add_php_view_vvvvvyd == 1)
 	{
 		jQuery('#jform_php_view').closest('.control-group').show();
-		if (jform_vvvvvybvxx_required)
+		if (jform_vvvvvydvxx_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_vvvvvybvxx_required = false;
+			jform_vvvvvydvxx_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_view').closest('.control-group').hide();
-		if (!jform_vvvvvybvxx_required)
+		if (!jform_vvvvvydvxx_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_vvvvvybvxx_required = true;
+			jform_vvvvvydvxx_required = true;
 		}
 	}
 }
 
-// the vvvvvyc function
+// the vvvvvye function
-function vvvvvyc(add_php_jview_display_vvvvvyc)
+function vvvvvye(add_php_jview_display_vvvvvye)
 {
 	// set the function logic
-	if (add_php_jview_display_vvvvvyc == 1)
+	if (add_php_jview_display_vvvvvye == 1)
 	{
 		jQuery('#jform_php_jview_display').closest('.control-group').show();
-		if (jform_vvvvvycvxy_required)
+		if (jform_vvvvvyevxy_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_vvvvvycvxy_required = false;
+			jform_vvvvvyevxy_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_jview_display').closest('.control-group').hide();
-		if (!jform_vvvvvycvxy_required)
+		if (!jform_vvvvvyevxy_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_vvvvvycvxy_required = true;
+			jform_vvvvvyevxy_required = true;
 		}
 	}
 }
 
-// the vvvvvyd function
+// the vvvvvyf function
-function vvvvvyd(add_php_jview_vvvvvyd)
+function vvvvvyf(add_php_jview_vvvvvyf)
 {
 	// set the function logic
-	if (add_php_jview_vvvvvyd == 1)
+	if (add_php_jview_vvvvvyf == 1)
 	{
 		jQuery('#jform_php_jview').closest('.control-group').show();
-		if (jform_vvvvvydvxz_required)
+		if (jform_vvvvvyfvxz_required)
 		{
 			updateFieldRequired('php_jview',0);
 			jQuery('#jform_php_jview').prop('required','required');
 			jQuery('#jform_php_jview').attr('aria-required',true);
 			jQuery('#jform_php_jview').addClass('required');
-			jform_vvvvvydvxz_required = false;
+			jform_vvvvvyfvxz_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_jview').closest('.control-group').hide();
-		if (!jform_vvvvvydvxz_required)
+		if (!jform_vvvvvyfvxz_required)
 		{
 			updateFieldRequired('php_jview',1);
 			jQuery('#jform_php_jview').removeAttr('required');
 			jQuery('#jform_php_jview').removeAttr('aria-required');
 			jQuery('#jform_php_jview').removeClass('required');
-			jform_vvvvvydvxz_required = true;
+			jform_vvvvvyfvxz_required = true;
 		}
 	}
 }
 
-// the vvvvvye function
+// the vvvvvyg function
-function vvvvvye(add_php_document_vvvvvye)
+function vvvvvyg(add_php_document_vvvvvyg)
 {
 	// set the function logic
-	if (add_php_document_vvvvvye == 1)
+	if (add_php_document_vvvvvyg == 1)
 	{
 		jQuery('#jform_php_document').closest('.control-group').show();
-		if (jform_vvvvvyevya_required)
+		if (jform_vvvvvygvya_required)
 		{
 			updateFieldRequired('php_document',0);
 			jQuery('#jform_php_document').prop('required','required');
 			jQuery('#jform_php_document').attr('aria-required',true);
 			jQuery('#jform_php_document').addClass('required');
-			jform_vvvvvyevya_required = false;
+			jform_vvvvvygvya_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_document').closest('.control-group').hide();
-		if (!jform_vvvvvyevya_required)
+		if (!jform_vvvvvygvya_required)
 		{
 			updateFieldRequired('php_document',1);
 			jQuery('#jform_php_document').removeAttr('required');
 			jQuery('#jform_php_document').removeAttr('aria-required');
 			jQuery('#jform_php_document').removeClass('required');
-			jform_vvvvvyevya_required = true;
+			jform_vvvvvygvya_required = true;
 		}
 	}
 }
 
-// the vvvvvyf function
+// the vvvvvyh function
-function vvvvvyf(add_css_document_vvvvvyf)
+function vvvvvyh(add_css_document_vvvvvyh)
 {
 	// set the function logic
-	if (add_css_document_vvvvvyf == 1)
+	if (add_css_document_vvvvvyh == 1)
 	{
 		jQuery('#jform_css_document').closest('.control-group').show();
-		if (jform_vvvvvyfvyb_required)
+		if (jform_vvvvvyhvyb_required)
 		{
 			updateFieldRequired('css_document',0);
 			jQuery('#jform_css_document').prop('required','required');
 			jQuery('#jform_css_document').attr('aria-required',true);
 			jQuery('#jform_css_document').addClass('required');
-			jform_vvvvvyfvyb_required = false;
+			jform_vvvvvyhvyb_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_css_document').closest('.control-group').hide();
-		if (!jform_vvvvvyfvyb_required)
+		if (!jform_vvvvvyhvyb_required)
 		{
 			updateFieldRequired('css_document',1);
 			jQuery('#jform_css_document').removeAttr('required');
 			jQuery('#jform_css_document').removeAttr('aria-required');
 			jQuery('#jform_css_document').removeClass('required');
-			jform_vvvvvyfvyb_required = true;
+			jform_vvvvvyhvyb_required = true;
 		}
 	}
 }
 
-// the vvvvvyg function
+// the vvvvvyi function
-function vvvvvyg(add_javascript_file_vvvvvyg)
+function vvvvvyi(add_javascript_file_vvvvvyi)
 {
 	// set the function logic
-	if (add_javascript_file_vvvvvyg == 1)
+	if (add_javascript_file_vvvvvyi == 1)
 	{
 		jQuery('#jform_javascript_file').closest('.control-group').show();
-		if (jform_vvvvvygvyc_required)
+		if (jform_vvvvvyivyc_required)
 		{
 			updateFieldRequired('javascript_file',0);
 			jQuery('#jform_javascript_file').prop('required','required');
 			jQuery('#jform_javascript_file').attr('aria-required',true);
 			jQuery('#jform_javascript_file').addClass('required');
-			jform_vvvvvygvyc_required = false;
+			jform_vvvvvyivyc_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_javascript_file').closest('.control-group').hide();
-		if (!jform_vvvvvygvyc_required)
+		if (!jform_vvvvvyivyc_required)
 		{
 			updateFieldRequired('javascript_file',1);
 			jQuery('#jform_javascript_file').removeAttr('required');
 			jQuery('#jform_javascript_file').removeAttr('aria-required');
 			jQuery('#jform_javascript_file').removeClass('required');
-			jform_vvvvvygvyc_required = true;
+			jform_vvvvvyivyc_required = true;
 		}
 	}
 }
 
-// the vvvvvyh function
+// the vvvvvyj function
-function vvvvvyh(add_js_document_vvvvvyh)
+function vvvvvyj(add_js_document_vvvvvyj)
 {
 	// set the function logic
-	if (add_js_document_vvvvvyh == 1)
+	if (add_js_document_vvvvvyj == 1)
 	{
 		jQuery('#jform_js_document').closest('.control-group').show();
-		if (jform_vvvvvyhvyd_required)
+		if (jform_vvvvvyjvyd_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_vvvvvyhvyd_required = false;
+			jform_vvvvvyjvyd_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_js_document').closest('.control-group').hide();
-		if (!jform_vvvvvyhvyd_required)
+		if (!jform_vvvvvyjvyd_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_vvvvvyhvyd_required = true;
+			jform_vvvvvyjvyd_required = true;
 		}
 	}
 }
 
-// the vvvvvyi function
+// the vvvvvyk function
-function vvvvvyi(add_custom_button_vvvvvyi)
+function vvvvvyk(add_custom_button_vvvvvyk)
 {
 	// set the function logic
-	if (add_custom_button_vvvvvyi == 1)
+	if (add_custom_button_vvvvvyk == 1)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').show();
 		jQuery('#jform_php_controller').closest('.control-group').show();
-		if (jform_vvvvvyivye_required)
+		if (jform_vvvvvykvye_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_vvvvvyivye_required = false;
+			jform_vvvvvykvye_required = false;
 		}
 
 		jQuery('#jform_php_model').closest('.control-group').show();
-		if (jform_vvvvvyivyf_required)
+		if (jform_vvvvvykvyf_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_vvvvvyivyf_required = false;
+			jform_vvvvvykvyf_required = false;
 		}
 
 	}
@@ -318,72 +318,72 @@ function vvvvvyi(add_custom_button_vvvvvyi)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_controller').closest('.control-group').hide();
-		if (!jform_vvvvvyivye_required)
+		if (!jform_vvvvvykvye_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_vvvvvyivye_required = true;
+			jform_vvvvvykvye_required = true;
 		}
 		jQuery('#jform_php_model').closest('.control-group').hide();
-		if (!jform_vvvvvyivyf_required)
+		if (!jform_vvvvvykvyf_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_vvvvvyivyf_required = true;
+			jform_vvvvvykvyf_required = true;
 		}
 	}
 }
 
-// the vvvvvyj function
+// the vvvvvyl function
-function vvvvvyj(add_css_vvvvvyj)
+function vvvvvyl(add_css_vvvvvyl)
 {
 	// set the function logic
-	if (add_css_vvvvvyj == 1)
+	if (add_css_vvvvvyl == 1)
 	{
 		jQuery('#jform_css').closest('.control-group').show();
-		if (jform_vvvvvyjvyg_required)
+		if (jform_vvvvvylvyg_required)
 		{
 			updateFieldRequired('css',0);
 			jQuery('#jform_css').prop('required','required');
 			jQuery('#jform_css').attr('aria-required',true);
 			jQuery('#jform_css').addClass('required');
-			jform_vvvvvyjvyg_required = false;
+			jform_vvvvvylvyg_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_css').closest('.control-group').hide();
-		if (!jform_vvvvvyjvyg_required)
+		if (!jform_vvvvvylvyg_required)
 		{
 			updateFieldRequired('css',1);
 			jQuery('#jform_css').removeAttr('required');
 			jQuery('#jform_css').removeAttr('aria-required');
 			jQuery('#jform_css').removeClass('required');
-			jform_vvvvvyjvyg_required = true;
+			jform_vvvvvylvyg_required = true;
 		}
 	}
 }
 
-// the vvvvvyk function
+// the vvvvvym function
-function vvvvvyk(add_php_ajax_vvvvvyk)
+function vvvvvym(add_php_ajax_vvvvvym)
 {
 	// set the function logic
-	if (add_php_ajax_vvvvvyk == 1)
+	if (add_php_ajax_vvvvvym == 1)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').show();
 		jQuery('#jform_php_ajaxmethod').closest('.control-group').show();
-		if (jform_vvvvvykvyh_required)
+		if (jform_vvvvvymvyh_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_vvvvvykvyh_required = false;
+			jform_vvvvvymvyh_required = false;
 		}
 
 	}
@@ -391,13 +391,13 @@ function vvvvvyk(add_php_ajax_vvvvvyk)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_ajaxmethod').closest('.control-group').hide();
-		if (!jform_vvvvvykvyh_required)
+		if (!jform_vvvvvymvyh_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_vvvvvykvyh_required = true;
+			jform_vvvvvymvyh_required = true;
 		}
 	}
 }

admin/models/forms/custom_code.js

@@ -23,43 +23,43 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvvzxvzp_required = false;
+jform_vvvvvzzvzp_required = false;
-jform_vvvvvzyvzq_required = false;
+jform_vvvvwaavzq_required = false;
-jform_vvvvvzyvzr_required = false;
+jform_vvvvwaavzr_required = false;
-jform_vvvvvzyvzs_required = false;
+jform_vvvvwaavzs_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var target_vvvvvzx = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzx(target_vvvvvzx);
-
-	var target_vvvvvzy = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzy(target_vvvvvzy);
-
 	var target_vvvvvzz = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvvzz = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvvzz(target_vvvvvzz);
-	vvvvvzz(target_vvvvvzz,type_vvvvvzz);
 
-	var type_vvvvwaa = jQuery("#jform_type input[type='radio']:checked").val();
 	var target_vvvvwaa = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwaa(type_vvvvwaa,target_vvvvwaa);
+	vvvvwaa(target_vvvvwaa);
+
+	var target_vvvvwab = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvwab = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwab(target_vvvvwab,type_vvvvwab);
+
+	var type_vvvvwac = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwac = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwac(type_vvvvwac,target_vvvvwac);
 });
 
-// the vvvvvzx function
+// the vvvvvzz function
-function vvvvvzx(target_vvvvvzx)
+function vvvvvzz(target_vvvvvzz)
 {
 	// set the function logic
-	if (target_vvvvvzx == 2)
+	if (target_vvvvvzz == 2)
 	{
 		jQuery('#jform_function_name').closest('.control-group').show();
-		if (jform_vvvvvzxvzp_required)
+		if (jform_vvvvvzzvzp_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_vvvvvzxvzp_required = false;
+			jform_vvvvvzzvzp_required = false;
 		}
 
 		jQuery('.note_jcb_placeholder').closest('.control-group').show();
@@ -68,99 +68,99 @@ function vvvvvzx(target_vvvvvzx)
 	else
 	{
 		jQuery('#jform_function_name').closest('.control-group').hide();
-		if (!jform_vvvvvzxvzp_required)
+		if (!jform_vvvvvzzvzp_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_vvvvvzxvzp_required = true;
+			jform_vvvvvzzvzp_required = true;
 		}
 		jQuery('.note_jcb_placeholder').closest('.control-group').hide();
 		jQuery('#jform_system_name').closest('.control-group').hide();
 	}
 }
 
-// the vvvvvzy function
+// the vvvvwaa function
-function vvvvvzy(target_vvvvvzy)
+function vvvvwaa(target_vvvvwaa)
 {
 	// set the function logic
-	if (target_vvvvvzy == 1)
+	if (target_vvvvwaa == 1)
 	{
 		jQuery('#jform_component').closest('.control-group').show();
-		if (jform_vvvvvzyvzq_required)
+		if (jform_vvvvwaavzq_required)
 		{
 			updateFieldRequired('component',0);
 			jQuery('#jform_component').prop('required','required');
 			jQuery('#jform_component').attr('aria-required',true);
 			jQuery('#jform_component').addClass('required');
-			jform_vvvvvzyvzq_required = false;
+			jform_vvvvwaavzq_required = false;
 		}
 
 		jQuery('#jform_path').closest('.control-group').show();
-		if (jform_vvvvvzyvzr_required)
+		if (jform_vvvvwaavzr_required)
 		{
 			updateFieldRequired('path',0);
 			jQuery('#jform_path').prop('required','required');
 			jQuery('#jform_path').attr('aria-required',true);
 			jQuery('#jform_path').addClass('required');
-			jform_vvvvvzyvzr_required = false;
+			jform_vvvvwaavzr_required = false;
 		}
 
 		jQuery('#jform_from_line').closest('.control-group').show();
 		jQuery('#jform_hashtarget').closest('.control-group').show();
 		jQuery('#jform_to_line').closest('.control-group').show();
 		jQuery('#jform_type').closest('.control-group').show();
-		if (jform_vvvvvzyvzs_required)
+		if (jform_vvvvwaavzs_required)
 		{
 			updateFieldRequired('type',0);
 			jQuery('#jform_type').prop('required','required');
 			jQuery('#jform_type').attr('aria-required',true);
 			jQuery('#jform_type').addClass('required');
-			jform_vvvvvzyvzs_required = false;
+			jform_vvvvwaavzs_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_component').closest('.control-group').hide();
-		if (!jform_vvvvvzyvzq_required)
+		if (!jform_vvvvwaavzq_required)
 		{
 			updateFieldRequired('component',1);
 			jQuery('#jform_component').removeAttr('required');
 			jQuery('#jform_component').removeAttr('aria-required');
 			jQuery('#jform_component').removeClass('required');
-			jform_vvvvvzyvzq_required = true;
+			jform_vvvvwaavzq_required = true;
 		}
 		jQuery('#jform_path').closest('.control-group').hide();
-		if (!jform_vvvvvzyvzr_required)
+		if (!jform_vvvvwaavzr_required)
 		{
 			updateFieldRequired('path',1);
 			jQuery('#jform_path').removeAttr('required');
 			jQuery('#jform_path').removeAttr('aria-required');
 			jQuery('#jform_path').removeClass('required');
-			jform_vvvvvzyvzr_required = true;
+			jform_vvvvwaavzr_required = true;
 		}
 		jQuery('#jform_from_line').closest('.control-group').hide();
 		jQuery('#jform_hashtarget').closest('.control-group').hide();
 		jQuery('#jform_to_line').closest('.control-group').hide();
 		jQuery('#jform_type').closest('.control-group').hide();
-		if (!jform_vvvvvzyvzs_required)
+		if (!jform_vvvvwaavzs_required)
 		{
 			updateFieldRequired('type',1);
 			jQuery('#jform_type').removeAttr('required');
 			jQuery('#jform_type').removeAttr('aria-required');
 			jQuery('#jform_type').removeClass('required');
-			jform_vvvvvzyvzs_required = true;
+			jform_vvvvwaavzs_required = true;
 		}
 	}
 }
 
-// the vvvvvzz function
+// the vvvvwab function
-function vvvvvzz(target_vvvvvzz,type_vvvvvzz)
+function vvvvwab(target_vvvvwab,type_vvvvwab)
 {
 	// set the function logic
-	if (target_vvvvvzz == 1 && type_vvvvvzz == 1)
+	if (target_vvvvwab == 1 && type_vvvvwab == 1)
 	{
 		jQuery('#jform_hashendtarget').closest('.control-group').show();
 		jQuery('#jform_to_line').closest('.control-group').show();
@@ -172,11 +172,11 @@ function vvvvvzz(target_vvvvvzz,type_vvvvvzz)
 	}
 }
 
-// the vvvvwaa function
+// the vvvvwac function
-function vvvvwaa(type_vvvvwaa,target_vvvvwaa)
+function vvvvwac(type_vvvvwac,target_vvvvwac)
 {
 	// set the function logic
-	if (type_vvvvwaa == 1 && target_vvvvwaa == 1)
+	if (type_vvvvwac == 1 && target_vvvvwac == 1)
 	{
 		jQuery('#jform_hashendtarget').closest('.control-group').show();
 		jQuery('#jform_to_line').closest('.control-group').show();

admin/models/forms/field.js

@@ -23,210 +23,96 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvwajvzv_required = false;
+jform_vvvvwalvzv_required = false;
-jform_vvvvwakvzw_required = false;
+jform_vvvvwamvzw_required = false;
-jform_vvvvwalvzx_required = false;
+jform_vvvvwanvzx_required = false;
-jform_vvvvwamvzy_required = false;
+jform_vvvvwaovzy_required = false;
-jform_vvvvwapvzz_required = false;
+jform_vvvvwarvzz_required = false;
-jform_vvvvwaqwaa_required = false;
+jform_vvvvwaswaa_required = false;
-jform_vvvvwarwab_required = false;
+jform_vvvvwatwab_required = false;
-jform_vvvvwaswac_required = false;
+jform_vvvvwauwac_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var datalenght_vvvvwaj = jQuery("#jform_datalenght").val();
+	var datalenght_vvvvwal = jQuery("#jform_datalenght").val();
-	vvvvwaj(datalenght_vvvvwaj);
+	vvvvwal(datalenght_vvvvwal);
 
-	var datadefault_vvvvwak = jQuery("#jform_datadefault").val();
+	var datadefault_vvvvwam = jQuery("#jform_datadefault").val();
-	vvvvwak(datadefault_vvvvwak);
+	vvvvwam(datadefault_vvvvwam);
 
-	var datatype_vvvvwal = jQuery("#jform_datatype").val();
-	vvvvwal(datatype_vvvvwal);
-
-	var datatype_vvvvwam = jQuery("#jform_datatype").val();
-	vvvvwam(datatype_vvvvwam);
-
-	var store_vvvvwan = jQuery("#jform_store").val();
 	var datatype_vvvvwan = jQuery("#jform_datatype").val();
-	vvvvwan(store_vvvvwan,datatype_vvvvwan);
+	vvvvwan(datatype_vvvvwan);
 
-	var add_css_view_vvvvwap = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	var datatype_vvvvwao = jQuery("#jform_datatype").val();
-	vvvvwap(add_css_view_vvvvwap);
+	vvvvwao(datatype_vvvvwao);
 
-	var add_css_views_vvvvwaq = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	var store_vvvvwap = jQuery("#jform_store").val();
-	vvvvwaq(add_css_views_vvvvwaq);
+	var datatype_vvvvwap = jQuery("#jform_datatype").val();
+	vvvvwap(store_vvvvwap,datatype_vvvvwap);
 
-	var add_javascript_view_footer_vvvvwar = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	var add_css_view_vvvvwar = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvwar(add_javascript_view_footer_vvvvwar);
+	vvvvwar(add_css_view_vvvvwar);
 
-	var add_javascript_views_footer_vvvvwas = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	var add_css_views_vvvvwas = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvwas(add_javascript_views_footer_vvvvwas);
+	vvvvwas(add_css_views_vvvvwas);
+
+	var add_javascript_view_footer_vvvvwat = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	vvvvwat(add_javascript_view_footer_vvvvwat);
+
+	var add_javascript_views_footer_vvvvwau = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	vvvvwau(add_javascript_views_footer_vvvvwau);
 });
 
-// the vvvvwaj function
+// the vvvvwal function
-function vvvvwaj(datalenght_vvvvwaj)
+function vvvvwal(datalenght_vvvvwal)
 {
-	if (isSet(datalenght_vvvvwaj) && datalenght_vvvvwaj.constructor !== Array)
+	if (isSet(datalenght_vvvvwal) && datalenght_vvvvwal.constructor !== Array)
 	{
-		var temp_vvvvwaj = datalenght_vvvvwaj;
+		var temp_vvvvwal = datalenght_vvvvwal;
-		var datalenght_vvvvwaj = [];
+		var datalenght_vvvvwal = [];
-		datalenght_vvvvwaj.push(temp_vvvvwaj);
+		datalenght_vvvvwal.push(temp_vvvvwal);
 	}
-	else if (!isSet(datalenght_vvvvwaj))
+	else if (!isSet(datalenght_vvvvwal))
 	{
-		var datalenght_vvvvwaj = [];
+		var datalenght_vvvvwal = [];
 	}
-	var datalenght = datalenght_vvvvwaj.some(datalenght_vvvvwaj_SomeFunc);
+	var datalenght = datalenght_vvvvwal.some(datalenght_vvvvwal_SomeFunc);
 
 
 	// set this function logic
 	if (datalenght)
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').show();
-		if (jform_vvvvwajvzv_required)
+		if (jform_vvvvwalvzv_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_vvvvwajvzv_required = false;
+			jform_vvvvwalvzv_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').hide();
-		if (!jform_vvvvwajvzv_required)
+		if (!jform_vvvvwalvzv_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_vvvvwajvzv_required = true;
+			jform_vvvvwalvzv_required = true;
-		}
-	}
-}
-
-// the vvvvwaj Some function
-function datalenght_vvvvwaj_SomeFunc(datalenght_vvvvwaj)
-{
-	// set the function logic
-	if (datalenght_vvvvwaj == 'Other')
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvwak function
-function vvvvwak(datadefault_vvvvwak)
-{
-	if (isSet(datadefault_vvvvwak) && datadefault_vvvvwak.constructor !== Array)
-	{
-		var temp_vvvvwak = datadefault_vvvvwak;
-		var datadefault_vvvvwak = [];
-		datadefault_vvvvwak.push(temp_vvvvwak);
-	}
-	else if (!isSet(datadefault_vvvvwak))
-	{
-		var datadefault_vvvvwak = [];
-	}
-	var datadefault = datadefault_vvvvwak.some(datadefault_vvvvwak_SomeFunc);
-
-
-	// set this function logic
-	if (datadefault)
-	{
-		jQuery('#jform_datadefault_other').closest('.control-group').show();
-		if (jform_vvvvwakvzw_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_vvvvwakvzw_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_datadefault_other').closest('.control-group').hide();
-		if (!jform_vvvvwakvzw_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_vvvvwakvzw_required = true;
-		}
-	}
-}
-
-// the vvvvwak Some function
-function datadefault_vvvvwak_SomeFunc(datadefault_vvvvwak)
-{
-	// set the function logic
-	if (datadefault_vvvvwak == 'Other')
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvwal function
-function vvvvwal(datatype_vvvvwal)
-{
-	if (isSet(datatype_vvvvwal) && datatype_vvvvwal.constructor !== Array)
-	{
-		var temp_vvvvwal = datatype_vvvvwal;
-		var datatype_vvvvwal = [];
-		datatype_vvvvwal.push(temp_vvvvwal);
-	}
-	else if (!isSet(datatype_vvvvwal))
-	{
-		var datatype_vvvvwal = [];
-	}
-	var datatype = datatype_vvvvwal.some(datatype_vvvvwal_SomeFunc);
-
-
-	// set this function logic
-	if (datatype)
-	{
-		jQuery('#jform_datadefault').closest('.control-group').show();
-		jQuery('#jform_datalenght').closest('.control-group').show();
-		jQuery('#jform_indexes').closest('.control-group').show();
-		if (jform_vvvvwalvzx_required)
-		{
-			updateFieldRequired('indexes',0);
-			jQuery('#jform_indexes').prop('required','required');
-			jQuery('#jform_indexes').attr('aria-required',true);
-			jQuery('#jform_indexes').addClass('required');
-			jform_vvvvwalvzx_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_datadefault').closest('.control-group').hide();
-		jQuery('#jform_datalenght').closest('.control-group').hide();
-		jQuery('#jform_indexes').closest('.control-group').hide();
-		if (!jform_vvvvwalvzx_required)
-		{
-			updateFieldRequired('indexes',1);
-			jQuery('#jform_indexes').removeAttr('required');
-			jQuery('#jform_indexes').removeAttr('aria-required');
-			jQuery('#jform_indexes').removeClass('required');
-			jform_vvvvwalvzx_required = true;
 		}
 	}
 }
 
 // the vvvvwal Some function
-function datatype_vvvvwal_SomeFunc(datatype_vvvvwal)
+function datalenght_vvvvwal_SomeFunc(datalenght_vvvvwal)
 {
 	// set the function logic
-	if (datatype_vvvvwal == 'CHAR' || datatype_vvvvwal == 'VARCHAR' || datatype_vvvvwal == 'DATETIME' || datatype_vvvvwal == 'DATE' || datatype_vvvvwal == 'TIME' || datatype_vvvvwal == 'INT' || datatype_vvvvwal == 'TINYINT' || datatype_vvvvwal == 'BIGINT' || datatype_vvvvwal == 'FLOAT' || datatype_vvvvwal == 'DECIMAL' || datatype_vvvvwal == 'DOUBLE')
+	if (datalenght_vvvvwal == 'Other')
 	{
 		return true;
 	}
@@ -234,54 +120,54 @@ function datatype_vvvvwal_SomeFunc(datatype_vvvvwal)
 }
 
 // the vvvvwam function
-function vvvvwam(datatype_vvvvwam)
+function vvvvwam(datadefault_vvvvwam)
 {
-	if (isSet(datatype_vvvvwam) && datatype_vvvvwam.constructor !== Array)
+	if (isSet(datadefault_vvvvwam) && datadefault_vvvvwam.constructor !== Array)
 	{
-		var temp_vvvvwam = datatype_vvvvwam;
+		var temp_vvvvwam = datadefault_vvvvwam;
-		var datatype_vvvvwam = [];
+		var datadefault_vvvvwam = [];
-		datatype_vvvvwam.push(temp_vvvvwam);
+		datadefault_vvvvwam.push(temp_vvvvwam);
 	}
-	else if (!isSet(datatype_vvvvwam))
+	else if (!isSet(datadefault_vvvvwam))
 	{
-		var datatype_vvvvwam = [];
+		var datadefault_vvvvwam = [];
 	}
-	var datatype = datatype_vvvvwam.some(datatype_vvvvwam_SomeFunc);
+	var datadefault = datadefault_vvvvwam.some(datadefault_vvvvwam_SomeFunc);
 
 
 	// set this function logic
-	if (datatype)
+	if (datadefault)
 	{
-		jQuery('#jform_store').closest('.control-group').show();
+		jQuery('#jform_datadefault_other').closest('.control-group').show();
-		if (jform_vvvvwamvzy_required)
+		if (jform_vvvvwamvzw_required)
 		{
-			updateFieldRequired('store',0);
+			updateFieldRequired('datadefault_other',0);
-			jQuery('#jform_store').prop('required','required');
+			jQuery('#jform_datadefault_other').prop('required','required');
-			jQuery('#jform_store').attr('aria-required',true);
+			jQuery('#jform_datadefault_other').attr('aria-required',true);
-			jQuery('#jform_store').addClass('required');
+			jQuery('#jform_datadefault_other').addClass('required');
-			jform_vvvvwamvzy_required = false;
+			jform_vvvvwamvzw_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_store').closest('.control-group').hide();
+		jQuery('#jform_datadefault_other').closest('.control-group').hide();
-		if (!jform_vvvvwamvzy_required)
+		if (!jform_vvvvwamvzw_required)
 		{
-			updateFieldRequired('store',1);
+			updateFieldRequired('datadefault_other',1);
-			jQuery('#jform_store').removeAttr('required');
+			jQuery('#jform_datadefault_other').removeAttr('required');
-			jQuery('#jform_store').removeAttr('aria-required');
+			jQuery('#jform_datadefault_other').removeAttr('aria-required');
-			jQuery('#jform_store').removeClass('required');
+			jQuery('#jform_datadefault_other').removeClass('required');
-			jform_vvvvwamvzy_required = true;
+			jform_vvvvwamvzw_required = true;
 		}
 	}
 }
 
 // the vvvvwam Some function
-function datatype_vvvvwam_SomeFunc(datatype_vvvvwam)
+function datadefault_vvvvwam_SomeFunc(datadefault_vvvvwam)
 {
 	// set the function logic
-	if (datatype_vvvvwam == 'CHAR' || datatype_vvvvwam == 'VARCHAR' || datatype_vvvvwam == 'TEXT' || datatype_vvvvwam == 'MEDIUMTEXT' || datatype_vvvvwam == 'LONGTEXT')
+	if (datadefault_vvvvwam == 'Other')
 	{
 		return true;
 	}
@@ -289,20 +175,8 @@ function datatype_vvvvwam_SomeFunc(datatype_vvvvwam)
 }
 
 // the vvvvwan function
-function vvvvwan(store_vvvvwan,datatype_vvvvwan)
+function vvvvwan(datatype_vvvvwan)
 {
-	if (isSet(store_vvvvwan) && store_vvvvwan.constructor !== Array)
-	{
-		var temp_vvvvwan = store_vvvvwan;
-		var store_vvvvwan = [];
-		store_vvvvwan.push(temp_vvvvwan);
-	}
-	else if (!isSet(store_vvvvwan))
-	{
-		var store_vvvvwan = [];
-	}
-	var store = store_vvvvwan.some(store_vvvvwan_SomeFunc);
-
 	if (isSet(datatype_vvvvwan) && datatype_vvvvwan.constructor !== Array)
 	{
 		var temp_vvvvwan = datatype_vvvvwan;
@@ -317,32 +191,97 @@ function vvvvwan(store_vvvvwan,datatype_vvvvwan)
 
 
 	// set this function logic
-	if (store && datatype)
+	if (datatype)
 	{
-		jQuery('.note_vdm_encryption').closest('.control-group').show();
+		jQuery('#jform_datadefault').closest('.control-group').show();
+		jQuery('#jform_datalenght').closest('.control-group').show();
+		jQuery('#jform_indexes').closest('.control-group').show();
+		if (jform_vvvvwanvzx_required)
+		{
+			updateFieldRequired('indexes',0);
+			jQuery('#jform_indexes').prop('required','required');
+			jQuery('#jform_indexes').attr('aria-required',true);
+			jQuery('#jform_indexes').addClass('required');
+			jform_vvvvwanvzx_required = false;
+		}
+
 	}
 	else
 	{
-		jQuery('.note_vdm_encryption').closest('.control-group').hide();
+		jQuery('#jform_datadefault').closest('.control-group').hide();
-	}
+		jQuery('#jform_datalenght').closest('.control-group').hide();
-}
+		jQuery('#jform_indexes').closest('.control-group').hide();
-
+		if (!jform_vvvvwanvzx_required)
-// the vvvvwan Some function
-function store_vvvvwan_SomeFunc(store_vvvvwan)
 		{
-	// set the function logic
+			updateFieldRequired('indexes',1);
-	if (store_vvvvwan == 4)
+			jQuery('#jform_indexes').removeAttr('required');
-	{
+			jQuery('#jform_indexes').removeAttr('aria-required');
-		return true;
+			jQuery('#jform_indexes').removeClass('required');
+			jform_vvvvwanvzx_required = true;
+		}
 	}
-	return false;
 }
 
 // the vvvvwan Some function
 function datatype_vvvvwan_SomeFunc(datatype_vvvvwan)
 {
 	// set the function logic
-	if (datatype_vvvvwan == 'CHAR' || datatype_vvvvwan == 'VARCHAR' || datatype_vvvvwan == 'TEXT' || datatype_vvvvwan == 'MEDIUMTEXT' || datatype_vvvvwan == 'LONGTEXT')
+	if (datatype_vvvvwan == 'CHAR' || datatype_vvvvwan == 'VARCHAR' || datatype_vvvvwan == 'DATETIME' || datatype_vvvvwan == 'DATE' || datatype_vvvvwan == 'TIME' || datatype_vvvvwan == 'INT' || datatype_vvvvwan == 'TINYINT' || datatype_vvvvwan == 'BIGINT' || datatype_vvvvwan == 'FLOAT' || datatype_vvvvwan == 'DECIMAL' || datatype_vvvvwan == 'DOUBLE')
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwao function
+function vvvvwao(datatype_vvvvwao)
+{
+	if (isSet(datatype_vvvvwao) && datatype_vvvvwao.constructor !== Array)
+	{
+		var temp_vvvvwao = datatype_vvvvwao;
+		var datatype_vvvvwao = [];
+		datatype_vvvvwao.push(temp_vvvvwao);
+	}
+	else if (!isSet(datatype_vvvvwao))
+	{
+		var datatype_vvvvwao = [];
+	}
+	var datatype = datatype_vvvvwao.some(datatype_vvvvwao_SomeFunc);
+
+
+	// set this function logic
+	if (datatype)
+	{
+		jQuery('#jform_store').closest('.control-group').show();
+		if (jform_vvvvwaovzy_required)
+		{
+			updateFieldRequired('store',0);
+			jQuery('#jform_store').prop('required','required');
+			jQuery('#jform_store').attr('aria-required',true);
+			jQuery('#jform_store').addClass('required');
+			jform_vvvvwaovzy_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_store').closest('.control-group').hide();
+		if (!jform_vvvvwaovzy_required)
+		{
+			updateFieldRequired('store',1);
+			jQuery('#jform_store').removeAttr('required');
+			jQuery('#jform_store').removeAttr('aria-required');
+			jQuery('#jform_store').removeClass('required');
+			jform_vvvvwaovzy_required = true;
+		}
+	}
+}
+
+// the vvvvwao Some function
+function datatype_vvvvwao_SomeFunc(datatype_vvvvwao)
+{
+	// set the function logic
+	if (datatype_vvvvwao == 'CHAR' || datatype_vvvvwao == 'VARCHAR' || datatype_vvvvwao == 'TEXT' || datatype_vvvvwao == 'MEDIUMTEXT' || datatype_vvvvwao == 'LONGTEXT')
 	{
 		return true;
 	}
@@ -350,125 +289,186 @@ function datatype_vvvvwan_SomeFunc(datatype_vvvvwan)
 }
 
 // the vvvvwap function
-function vvvvwap(add_css_view_vvvvwap)
+function vvvvwap(store_vvvvwap,datatype_vvvvwap)
+{
+	if (isSet(store_vvvvwap) && store_vvvvwap.constructor !== Array)
+	{
+		var temp_vvvvwap = store_vvvvwap;
+		var store_vvvvwap = [];
+		store_vvvvwap.push(temp_vvvvwap);
+	}
+	else if (!isSet(store_vvvvwap))
+	{
+		var store_vvvvwap = [];
+	}
+	var store = store_vvvvwap.some(store_vvvvwap_SomeFunc);
+
+	if (isSet(datatype_vvvvwap) && datatype_vvvvwap.constructor !== Array)
+	{
+		var temp_vvvvwap = datatype_vvvvwap;
+		var datatype_vvvvwap = [];
+		datatype_vvvvwap.push(temp_vvvvwap);
+	}
+	else if (!isSet(datatype_vvvvwap))
+	{
+		var datatype_vvvvwap = [];
+	}
+	var datatype = datatype_vvvvwap.some(datatype_vvvvwap_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 vvvvwap Some function
+function store_vvvvwap_SomeFunc(store_vvvvwap)
 {
 	// set the function logic
-	if (add_css_view_vvvvwap == 1)
+	if (store_vvvvwap == 4)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwap Some function
+function datatype_vvvvwap_SomeFunc(datatype_vvvvwap)
+{
+	// set the function logic
+	if (datatype_vvvvwap == 'CHAR' || datatype_vvvvwap == 'VARCHAR' || datatype_vvvvwap == 'TEXT' || datatype_vvvvwap == 'MEDIUMTEXT' || datatype_vvvvwap == 'LONGTEXT')
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwar function
+function vvvvwar(add_css_view_vvvvwar)
+{
+	// set the function logic
+	if (add_css_view_vvvvwar == 1)
 	{
 		jQuery('#jform_css_view').closest('.control-group').show();
-		if (jform_vvvvwapvzz_required)
+		if (jform_vvvvwarvzz_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_vvvvwapvzz_required = false;
+			jform_vvvvwarvzz_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_css_view').closest('.control-group').hide();
-		if (!jform_vvvvwapvzz_required)
+		if (!jform_vvvvwarvzz_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_vvvvwapvzz_required = true;
+			jform_vvvvwarvzz_required = true;
 		}
 	}
 }
 
-// the vvvvwaq function
+// the vvvvwas function
-function vvvvwaq(add_css_views_vvvvwaq)
+function vvvvwas(add_css_views_vvvvwas)
 {
 	// set the function logic
-	if (add_css_views_vvvvwaq == 1)
+	if (add_css_views_vvvvwas == 1)
 	{
 		jQuery('#jform_css_views').closest('.control-group').show();
-		if (jform_vvvvwaqwaa_required)
+		if (jform_vvvvwaswaa_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_vvvvwaqwaa_required = false;
+			jform_vvvvwaswaa_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_css_views').closest('.control-group').hide();
-		if (!jform_vvvvwaqwaa_required)
+		if (!jform_vvvvwaswaa_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_vvvvwaqwaa_required = true;
+			jform_vvvvwaswaa_required = true;
 		}
 	}
 }
 
-// the vvvvwar function
+// the vvvvwat function
-function vvvvwar(add_javascript_view_footer_vvvvwar)
+function vvvvwat(add_javascript_view_footer_vvvvwat)
 {
 	// set the function logic
-	if (add_javascript_view_footer_vvvvwar == 1)
+	if (add_javascript_view_footer_vvvvwat == 1)
 	{
 		jQuery('#jform_javascript_view_footer').closest('.control-group').show();
-		if (jform_vvvvwarwab_required)
+		if (jform_vvvvwatwab_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_vvvvwarwab_required = false;
+			jform_vvvvwatwab_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_javascript_view_footer').closest('.control-group').hide();
-		if (!jform_vvvvwarwab_required)
+		if (!jform_vvvvwatwab_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_vvvvwarwab_required = true;
+			jform_vvvvwatwab_required = true;
 		}
 	}
 }
 
-// the vvvvwas function
+// the vvvvwau function
-function vvvvwas(add_javascript_views_footer_vvvvwas)
+function vvvvwau(add_javascript_views_footer_vvvvwau)
 {
 	// set the function logic
-	if (add_javascript_views_footer_vvvvwas == 1)
+	if (add_javascript_views_footer_vvvvwau == 1)
 	{
 		jQuery('#jform_javascript_views_footer').closest('.control-group').show();
-		if (jform_vvvvwaswac_required)
+		if (jform_vvvvwauwac_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_vvvvwaswac_required = false;
+			jform_vvvvwauwac_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_javascript_views_footer').closest('.control-group').hide();
-		if (!jform_vvvvwaswac_required)
+		if (!jform_vvvvwauwac_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_vvvvwaswac_required = true;
+			jform_vvvvwauwac_required = true;
 		}
 	}
 }

admin/models/forms/field.xml

@@ -342,14 +342,13 @@
                        filter="raw"
                        hint="COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEW_FOOTER_HINT"
                        required="true" />
-                <!-- Note_vdm_encryption Field. Type: Note. A None Database Field. (joomla)-->
+                <!-- Note_whmcs_encryption Field. Type: Note. A None Database Field. (joomla)-->
                 <field type="note"
-                       name="note_vdm_encryption"
+                       name="note_whmcs_encryption"
-                       label="COM_COMPONENTBUILDER_FIELD_NOTE_VDM_ENCRYPTION_LABEL"
+                       label="COM_COMPONENTBUILDER_FIELD_NOTE_WHMCS_ENCRYPTION_LABEL"
-                       description="COM_COMPONENTBUILDER_FIELD_NOTE_VDM_ENCRYPTION_DESCRIPTION"
+                       description="COM_COMPONENTBUILDER_FIELD_NOTE_WHMCS_ENCRYPTION_DESCRIPTION"
                        heading="h4"
-                       class="alert alert-success note_vdm_encryption"
+                       class="alert alert-success note_whmcs_encryption" />
-                       close="true" />
                 <!-- Javascript_views_footer Field. Type: Textarea. (joomla)-->
                 <field type="textarea"
                        name="javascript_views_footer"

admin/models/forms/help_document.js

@@ -23,207 +23,97 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvwbdwao_required = false;
+jform_vvvvwbfwao_required = false;
-jform_vvvvwbewap_required = false;
+jform_vvvvwbgwap_required = false;
-jform_vvvvwbfwaq_required = false;
+jform_vvvvwbhwaq_required = false;
-jform_vvvvwbgwar_required = false;
+jform_vvvvwbiwar_required = false;
-jform_vvvvwbhwas_required = false;
+jform_vvvvwbjwas_required = false;
-jform_vvvvwbiwat_required = false;
+jform_vvvvwbkwat_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var location_vvvvwbd = jQuery("#jform_location input[type='radio']:checked").val();
+	var location_vvvvwbf = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwbd(location_vvvvwbd);
+	vvvvwbf(location_vvvvwbf);
 
-	var location_vvvvwbe = jQuery("#jform_location input[type='radio']:checked").val();
+	var location_vvvvwbg = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwbe(location_vvvvwbe);
+	vvvvwbg(location_vvvvwbg);
-
-	var type_vvvvwbf = jQuery("#jform_type").val();
-	vvvvwbf(type_vvvvwbf);
-
-	var type_vvvvwbg = jQuery("#jform_type").val();
-	vvvvwbg(type_vvvvwbg);
 
 	var type_vvvvwbh = jQuery("#jform_type").val();
 	vvvvwbh(type_vvvvwbh);
 
-	var target_vvvvwbi = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvwbi = jQuery("#jform_type").val();
-	vvvvwbi(target_vvvvwbi);
+	vvvvwbi(type_vvvvwbi);
+
+	var type_vvvvwbj = jQuery("#jform_type").val();
+	vvvvwbj(type_vvvvwbj);
+
+	var target_vvvvwbk = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbk(target_vvvvwbk);
 });
 
-// the vvvvwbd function
+// the vvvvwbf function
-function vvvvwbd(location_vvvvwbd)
+function vvvvwbf(location_vvvvwbf)
 {
 	// set the function logic
-	if (location_vvvvwbd == 1)
+	if (location_vvvvwbf == 1)
 	{
 		jQuery('#jform_admin_view').closest('.control-group').show();
-		if (jform_vvvvwbdwao_required)
+		if (jform_vvvvwbfwao_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_vvvvwbdwao_required = false;
+			jform_vvvvwbfwao_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_admin_view').closest('.control-group').hide();
-		if (!jform_vvvvwbdwao_required)
+		if (!jform_vvvvwbfwao_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_vvvvwbdwao_required = true;
+			jform_vvvvwbfwao_required = true;
 		}
 	}
 }
 
-// the vvvvwbe function
+// the vvvvwbg function
-function vvvvwbe(location_vvvvwbe)
+function vvvvwbg(location_vvvvwbg)
 {
 	// set the function logic
-	if (location_vvvvwbe == 2)
+	if (location_vvvvwbg == 2)
 	{
 		jQuery('#jform_site_view').closest('.control-group').show();
-		if (jform_vvvvwbewap_required)
+		if (jform_vvvvwbgwap_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_vvvvwbewap_required = false;
+			jform_vvvvwbgwap_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_site_view').closest('.control-group').hide();
-		if (!jform_vvvvwbewap_required)
+		if (!jform_vvvvwbgwap_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_vvvvwbewap_required = true;
+			jform_vvvvwbgwap_required = true;
 		}
 	}
 }
 
-// the vvvvwbf function
-function vvvvwbf(type_vvvvwbf)
-{
-	if (isSet(type_vvvvwbf) && type_vvvvwbf.constructor !== Array)
-	{
-		var temp_vvvvwbf = type_vvvvwbf;
-		var type_vvvvwbf = [];
-		type_vvvvwbf.push(temp_vvvvwbf);
-	}
-	else if (!isSet(type_vvvvwbf))
-	{
-		var type_vvvvwbf = [];
-	}
-	var type = type_vvvvwbf.some(type_vvvvwbf_SomeFunc);
-
-
-	// set this function logic
-	if (type)
-	{
-		jQuery('#jform_url').closest('.control-group').show();
-		if (jform_vvvvwbfwaq_required)
-		{
-			updateFieldRequired('url',0);
-			jQuery('#jform_url').prop('required','required');
-			jQuery('#jform_url').attr('aria-required',true);
-			jQuery('#jform_url').addClass('required');
-			jform_vvvvwbfwaq_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_url').closest('.control-group').hide();
-		if (!jform_vvvvwbfwaq_required)
-		{
-			updateFieldRequired('url',1);
-			jQuery('#jform_url').removeAttr('required');
-			jQuery('#jform_url').removeAttr('aria-required');
-			jQuery('#jform_url').removeClass('required');
-			jform_vvvvwbfwaq_required = true;
-		}
-	}
-}
-
-// the vvvvwbf Some function
-function type_vvvvwbf_SomeFunc(type_vvvvwbf)
-{
-	// set the function logic
-	if (type_vvvvwbf == 3)
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvwbg function
-function vvvvwbg(type_vvvvwbg)
-{
-	if (isSet(type_vvvvwbg) && type_vvvvwbg.constructor !== Array)
-	{
-		var temp_vvvvwbg = type_vvvvwbg;
-		var type_vvvvwbg = [];
-		type_vvvvwbg.push(temp_vvvvwbg);
-	}
-	else if (!isSet(type_vvvvwbg))
-	{
-		var type_vvvvwbg = [];
-	}
-	var type = type_vvvvwbg.some(type_vvvvwbg_SomeFunc);
-
-
-	// set this function logic
-	if (type)
-	{
-		jQuery('#jform_article').closest('.control-group').show();
-		if (jform_vvvvwbgwar_required)
-		{
-			updateFieldRequired('article',0);
-			jQuery('#jform_article').prop('required','required');
-			jQuery('#jform_article').attr('aria-required',true);
-			jQuery('#jform_article').addClass('required');
-			jform_vvvvwbgwar_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_article').closest('.control-group').hide();
-		if (!jform_vvvvwbgwar_required)
-		{
-			updateFieldRequired('article',1);
-			jQuery('#jform_article').removeAttr('required');
-			jQuery('#jform_article').removeAttr('aria-required');
-			jQuery('#jform_article').removeClass('required');
-			jform_vvvvwbgwar_required = true;
-		}
-	}
-}
-
-// the vvvvwbg Some function
-function type_vvvvwbg_SomeFunc(type_vvvvwbg)
-{
-	// set the function logic
-	if (type_vvvvwbg == 1)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwbh function
 function vvvvwbh(type_vvvvwbh)
 {
@@ -243,27 +133,27 @@ function vvvvwbh(type_vvvvwbh)
 	// set this function logic
 	if (type)
 	{
-		jQuery('#jform_content-lbl').closest('.control-group').show();
+		jQuery('#jform_url').closest('.control-group').show();
-		if (jform_vvvvwbhwas_required)
+		if (jform_vvvvwbhwaq_required)
 		{
-			updateFieldRequired('content',0);
+			updateFieldRequired('url',0);
-			jQuery('#jform_content').prop('required','required');
+			jQuery('#jform_url').prop('required','required');
-			jQuery('#jform_content').attr('aria-required',true);
+			jQuery('#jform_url').attr('aria-required',true);
-			jQuery('#jform_content').addClass('required');
+			jQuery('#jform_url').addClass('required');
-			jform_vvvvwbhwas_required = false;
+			jform_vvvvwbhwaq_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_content-lbl').closest('.control-group').hide();
+		jQuery('#jform_url').closest('.control-group').hide();
-		if (!jform_vvvvwbhwas_required)
+		if (!jform_vvvvwbhwaq_required)
 		{
-			updateFieldRequired('content',1);
+			updateFieldRequired('url',1);
-			jQuery('#jform_content').removeAttr('required');
+			jQuery('#jform_url').removeAttr('required');
-			jQuery('#jform_content').removeAttr('aria-required');
+			jQuery('#jform_url').removeAttr('aria-required');
-			jQuery('#jform_content').removeClass('required');
+			jQuery('#jform_url').removeClass('required');
-			jform_vvvvwbhwas_required = true;
+			jform_vvvvwbhwaq_required = true;
 		}
 	}
 }
@@ -272,7 +162,7 @@ function vvvvwbh(type_vvvvwbh)
 function type_vvvvwbh_SomeFunc(type_vvvvwbh)
 {
 	// set the function logic
-	if (type_vvvvwbh == 2)
+	if (type_vvvvwbh == 3)
 	{
 		return true;
 	}
@@ -280,32 +170,142 @@ function type_vvvvwbh_SomeFunc(type_vvvvwbh)
 }
 
 // the vvvvwbi function
-function vvvvwbi(target_vvvvwbi)
+function vvvvwbi(type_vvvvwbi)
+{
+	if (isSet(type_vvvvwbi) && type_vvvvwbi.constructor !== Array)
+	{
+		var temp_vvvvwbi = type_vvvvwbi;
+		var type_vvvvwbi = [];
+		type_vvvvwbi.push(temp_vvvvwbi);
+	}
+	else if (!isSet(type_vvvvwbi))
+	{
+		var type_vvvvwbi = [];
+	}
+	var type = type_vvvvwbi.some(type_vvvvwbi_SomeFunc);
+
+
+	// set this function logic
+	if (type)
+	{
+		jQuery('#jform_article').closest('.control-group').show();
+		if (jform_vvvvwbiwar_required)
+		{
+			updateFieldRequired('article',0);
+			jQuery('#jform_article').prop('required','required');
+			jQuery('#jform_article').attr('aria-required',true);
+			jQuery('#jform_article').addClass('required');
+			jform_vvvvwbiwar_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_article').closest('.control-group').hide();
+		if (!jform_vvvvwbiwar_required)
+		{
+			updateFieldRequired('article',1);
+			jQuery('#jform_article').removeAttr('required');
+			jQuery('#jform_article').removeAttr('aria-required');
+			jQuery('#jform_article').removeClass('required');
+			jform_vvvvwbiwar_required = true;
+		}
+	}
+}
+
+// the vvvvwbi Some function
+function type_vvvvwbi_SomeFunc(type_vvvvwbi)
 {
 	// set the function logic
-	if (target_vvvvwbi == 1)
+	if (type_vvvvwbi == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwbj function
+function vvvvwbj(type_vvvvwbj)
+{
+	if (isSet(type_vvvvwbj) && type_vvvvwbj.constructor !== Array)
+	{
+		var temp_vvvvwbj = type_vvvvwbj;
+		var type_vvvvwbj = [];
+		type_vvvvwbj.push(temp_vvvvwbj);
+	}
+	else if (!isSet(type_vvvvwbj))
+	{
+		var type_vvvvwbj = [];
+	}
+	var type = type_vvvvwbj.some(type_vvvvwbj_SomeFunc);
+
+
+	// set this function logic
+	if (type)
+	{
+		jQuery('#jform_content-lbl').closest('.control-group').show();
+		if (jform_vvvvwbjwas_required)
+		{
+			updateFieldRequired('content',0);
+			jQuery('#jform_content').prop('required','required');
+			jQuery('#jform_content').attr('aria-required',true);
+			jQuery('#jform_content').addClass('required');
+			jform_vvvvwbjwas_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_content-lbl').closest('.control-group').hide();
+		if (!jform_vvvvwbjwas_required)
+		{
+			updateFieldRequired('content',1);
+			jQuery('#jform_content').removeAttr('required');
+			jQuery('#jform_content').removeAttr('aria-required');
+			jQuery('#jform_content').removeClass('required');
+			jform_vvvvwbjwas_required = true;
+		}
+	}
+}
+
+// the vvvvwbj Some function
+function type_vvvvwbj_SomeFunc(type_vvvvwbj)
+{
+	// set the function logic
+	if (type_vvvvwbj == 2)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwbk function
+function vvvvwbk(target_vvvvwbk)
+{
+	// set the function logic
+	if (target_vvvvwbk == 1)
 	{
 		jQuery('#jform_groups').closest('.control-group').show();
-		if (jform_vvvvwbiwat_required)
+		if (jform_vvvvwbkwat_required)
 		{
 			updateFieldRequired('groups',0);
 			jQuery('#jform_groups').prop('required','required');
 			jQuery('#jform_groups').attr('aria-required',true);
 			jQuery('#jform_groups').addClass('required');
-			jform_vvvvwbiwat_required = false;
+			jform_vvvvwbkwat_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_groups').closest('.control-group').hide();
-		if (!jform_vvvvwbiwat_required)
+		if (!jform_vvvvwbkwat_required)
 		{
 			updateFieldRequired('groups',1);
 			jQuery('#jform_groups').removeAttr('required');
 			jQuery('#jform_groups').removeAttr('aria-required');
 			jQuery('#jform_groups').removeClass('required');
-			jform_vvvvwbiwat_required = true;
+			jform_vvvvwbkwat_required = true;
 		}
 	}
 }

admin/models/forms/joomla_component.js

@@ -126,6 +126,12 @@ jQuery(document).ready(function()
 
 	var buildcomp_vvvvvww = jQuery("#jform_buildcomp input[type='radio']:checked").val();
 	vvvvvww(buildcomp_vvvvvww);
+
+	var dashboard_type_vvvvvwx = jQuery("#jform_dashboard_type input[type='radio']:checked").val();
+	vvvvvwx(dashboard_type_vvvvvwx);
+
+	var dashboard_type_vvvvvwy = jQuery("#jform_dashboard_type input[type='radio']:checked").val();
+	vvvvvwy(dashboard_type_vvvvvwy);
 });
 
 // the vvvvvvv function
@@ -808,6 +814,36 @@ function vvvvvww(buildcomp_vvvvvww)
 	}
 }
 
+// the vvvvvwx function
+function vvvvvwx(dashboard_type_vvvvvwx)
+{
+	// set the function logic
+	if (dashboard_type_vvvvvwx == 2)
+	{
+		jQuery('#jform_dashboard').closest('.control-group').show();
+		jQuery('.note_dynamic_dashboard').closest('.control-group').show();
+	}
+	else
+	{
+		jQuery('#jform_dashboard').closest('.control-group').hide();
+		jQuery('.note_dynamic_dashboard').closest('.control-group').hide();
+	}
+}
+
+// the vvvvvwy function
+function vvvvvwy(dashboard_type_vvvvvwy)
+{
+	// set the function logic
+	if (dashboard_type_vvvvvwy == 1)
+	{
+		jQuery('.note_botton_component_dashboard').closest('.control-group').show();
+	}
+	else
+	{
+		jQuery('.note_botton_component_dashboard').closest('.control-group').hide();
+	}
+}
+
 // update required fields
 function updateFieldRequired(name,status)
 {
@@ -846,9 +882,11 @@ function isSet(val)
 
 jQuery(document).ready(function()
 {
+	// check what is the dashboard switch
+	var dasboard_type = jQuery("#jform_dashboard_type input[type='radio']:checked").val();
+	dasboardSwitch(dasboard_type);
 	// set buttons
 	function setButtons1() {
-		addButtonID('component_dashboard','button_component_dashboard', 1);
 		addButtonID('component_files_folders','button_component_files_folders', 1);
 		addButtonID('component_site_views','button_create_edit_views', 1);
 	 }
@@ -915,6 +953,20 @@ function addData(result, where){
 	jQuery(result).insertAfter(jQuery(where).closest('.control-group'));
 }
 
+function dasboardSwitch(value){
+	// hide if default
+	if (2 == value) {
+		jQuery('.control-group-componentdashboard-one').hide();
+	} else {
+		// default behaviour
+		if (jQuery('div.control-group-componentdashboard-one').length) {
+			jQuery('.control-group-componentdashboard-one').show();
+		} else {
+			addButtonID('component_dashboard','button_component_dashboard', 1);
+		}
+	}
+}
+
 
 function addButtonID_server(type, size){
 	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getButtonID&format=json&vdm="+vastDevMod);

admin/models/forms/layout.js

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

admin/models/forms/library.js

@@ -23,18 +23,12 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvwacvzt_required = false;
+jform_vvvvwaevzt_required = false;
-jform_vvvvwaivzu_required = false;
+jform_vvvvwakvzu_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var how_vvvvwab = jQuery("#jform_how").val();
-	vvvvwab(how_vvvvwab);
-
-	var how_vvvvwac = jQuery("#jform_how").val();
-	vvvvwac(how_vvvvwac);
-
 	var how_vvvvwad = jQuery("#jform_how").val();
 	vvvvwad(how_vvvvwad);
 
@@ -50,103 +44,16 @@ jQuery(document).ready(function()
 	var how_vvvvwah = jQuery("#jform_how").val();
 	vvvvwah(how_vvvvwah);
 
-	var type_vvvvwai = jQuery("#jform_type input[type='radio']:checked").val();
+	var how_vvvvwai = jQuery("#jform_how").val();
-	vvvvwai(type_vvvvwai);
+	vvvvwai(how_vvvvwai);
+
+	var how_vvvvwaj = jQuery("#jform_how").val();
+	vvvvwaj(how_vvvvwaj);
+
+	var type_vvvvwak = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwak(type_vvvvwak);
 });
 
-// the vvvvwab function
-function vvvvwab(how_vvvvwab)
-{
-	if (isSet(how_vvvvwab) && how_vvvvwab.constructor !== Array)
-	{
-		var temp_vvvvwab = how_vvvvwab;
-		var how_vvvvwab = [];
-		how_vvvvwab.push(temp_vvvvwab);
-	}
-	else if (!isSet(how_vvvvwab))
-	{
-		var how_vvvvwab = [];
-	}
-	var how = how_vvvvwab.some(how_vvvvwab_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 vvvvwab Some function
-function how_vvvvwab_SomeFunc(how_vvvvwab)
-{
-	// set the function logic
-	if (how_vvvvwab == 2)
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvwac function
-function vvvvwac(how_vvvvwac)
-{
-	if (isSet(how_vvvvwac) && how_vvvvwac.constructor !== Array)
-	{
-		var temp_vvvvwac = how_vvvvwac;
-		var how_vvvvwac = [];
-		how_vvvvwac.push(temp_vvvvwac);
-	}
-	else if (!isSet(how_vvvvwac))
-	{
-		var how_vvvvwac = [];
-	}
-	var how = how_vvvvwac.some(how_vvvvwac_SomeFunc);
-
-
-	// set this function logic
-	if (how)
-	{
-		jQuery('#jform_php_setdocument').closest('.control-group').show();
-		if (jform_vvvvwacvzt_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_vvvvwacvzt_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_php_setdocument').closest('.control-group').hide();
-		if (!jform_vvvvwacvzt_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_vvvvwacvzt_required = true;
-		}
-	}
-}
-
-// the vvvvwac Some function
-function how_vvvvwac_SomeFunc(how_vvvvwac)
-{
-	// set the function logic
-	if (how_vvvvwac == 3)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwad function
 function vvvvwad(how_vvvvwad)
 {
@@ -166,11 +73,11 @@ function vvvvwad(how_vvvvwad)
 	// set this function logic
 	if (how)
 	{
-		jQuery('.note_display_library_config').closest('.control-group').show();
+		jQuery('#jform_addconditions-lbl').closest('.control-group').show();
 	}
 	else
 	{
-		jQuery('.note_display_library_config').closest('.control-group').hide();
+		jQuery('#jform_addconditions-lbl').closest('.control-group').hide();
 	}
 }
 
@@ -178,7 +85,7 @@ function vvvvwad(how_vvvvwad)
 function how_vvvvwad_SomeFunc(how_vvvvwad)
 {
 	// set the function logic
-	if (how_vvvvwad == 2 || how_vvvvwad == 3)
+	if (how_vvvvwad == 2)
 	{
 		return true;
 	}
@@ -204,11 +111,28 @@ function vvvvwae(how_vvvvwae)
 	// set this function logic
 	if (how)
 	{
-		jQuery('.note_display_library_files_folders_urls').closest('.control-group').show();
+		jQuery('#jform_php_setdocument').closest('.control-group').show();
+		if (jform_vvvvwaevzt_required)
+		{
+			updateFieldRequired('php_setdocument',0);
+			jQuery('#jform_php_setdocument').prop('required','required');
+			jQuery('#jform_php_setdocument').attr('aria-required',true);
+			jQuery('#jform_php_setdocument').addClass('required');
+			jform_vvvvwaevzt_required = false;
+		}
+
 	}
 	else
 	{
-		jQuery('.note_display_library_files_folders_urls').closest('.control-group').hide();
+		jQuery('#jform_php_setdocument').closest('.control-group').hide();
+		if (!jform_vvvvwaevzt_required)
+		{
+			updateFieldRequired('php_setdocument',1);
+			jQuery('#jform_php_setdocument').removeAttr('required');
+			jQuery('#jform_php_setdocument').removeAttr('aria-required');
+			jQuery('#jform_php_setdocument').removeClass('required');
+			jform_vvvvwaevzt_required = true;
+		}
 	}
 }
 
@@ -216,7 +140,7 @@ function vvvvwae(how_vvvvwae)
 function how_vvvvwae_SomeFunc(how_vvvvwae)
 {
 	// set the function logic
-	if (how_vvvvwae == 1 || how_vvvvwae == 2 || how_vvvvwae == 3)
+	if (how_vvvvwae == 3)
 	{
 		return true;
 	}
@@ -242,15 +166,11 @@ function vvvvwaf(how_vvvvwaf)
 	// set this function logic
 	if (how)
 	{
-		jQuery('.note_no_behaviour_one').closest('.control-group').show();
+		jQuery('.note_display_library_config').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_config').closest('.control-group').hide();
-		jQuery('.note_no_behaviour_three').closest('.control-group').hide();
-		jQuery('.note_no_behaviour_two').closest('.control-group').hide();
 	}
 }
 
@@ -258,7 +178,7 @@ function vvvvwaf(how_vvvvwaf)
 function how_vvvvwaf_SomeFunc(how_vvvvwaf)
 {
 	// set the function logic
-	if (how_vvvvwaf == 0)
+	if (how_vvvvwaf == 2 || how_vvvvwaf == 3)
 	{
 		return true;
 	}
@@ -284,13 +204,11 @@ function vvvvwag(how_vvvvwag)
 	// set this function logic
 	if (how)
 	{
-		jQuery('.note_yes_behaviour_one').closest('.control-group').show();
+		jQuery('.note_display_library_files_folders_urls').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_display_library_files_folders_urls').closest('.control-group').hide();
-		jQuery('.note_yes_behaviour_two').closest('.control-group').hide();
 	}
 }
 
@@ -298,7 +216,7 @@ function vvvvwag(how_vvvvwag)
 function how_vvvvwag_SomeFunc(how_vvvvwag)
 {
 	// set the function logic
-	if (how_vvvvwag == 1)
+	if (how_vvvvwag == 1 || how_vvvvwag == 2 || how_vvvvwag == 3)
 	{
 		return true;
 	}
@@ -321,6 +239,88 @@ function vvvvwah(how_vvvvwah)
 	var how = how_vvvvwah.some(how_vvvvwah_SomeFunc);
 
 
+	// set this function logic
+	if (how)
+	{
+		jQuery('.note_no_behaviour_one').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_no_behaviour_three').closest('.control-group').hide();
+		jQuery('.note_no_behaviour_two').closest('.control-group').hide();
+	}
+}
+
+// the vvvvwah Some function
+function how_vvvvwah_SomeFunc(how_vvvvwah)
+{
+	// set the function logic
+	if (how_vvvvwah == 0)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwai function
+function vvvvwai(how_vvvvwai)
+{
+	if (isSet(how_vvvvwai) && how_vvvvwai.constructor !== Array)
+	{
+		var temp_vvvvwai = how_vvvvwai;
+		var how_vvvvwai = [];
+		how_vvvvwai.push(temp_vvvvwai);
+	}
+	else if (!isSet(how_vvvvwai))
+	{
+		var how_vvvvwai = [];
+	}
+	var how = how_vvvvwai.some(how_vvvvwai_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 vvvvwai Some function
+function how_vvvvwai_SomeFunc(how_vvvvwai)
+{
+	// set the function logic
+	if (how_vvvvwai == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwaj function
+function vvvvwaj(how_vvvvwaj)
+{
+	if (isSet(how_vvvvwaj) && how_vvvvwaj.constructor !== Array)
+	{
+		var temp_vvvvwaj = how_vvvvwaj;
+		var how_vvvvwaj = [];
+		how_vvvvwaj.push(temp_vvvvwaj);
+	}
+	else if (!isSet(how_vvvvwaj))
+	{
+		var how_vvvvwaj = [];
+	}
+	var how = how_vvvvwaj.some(how_vvvvwaj_SomeFunc);
+
+
 	// set this function logic
 	if (how)
 	{
@@ -336,44 +336,44 @@ function vvvvwah(how_vvvvwah)
 	}
 }
 
-// the vvvvwah Some function
+// the vvvvwaj Some function
-function how_vvvvwah_SomeFunc(how_vvvvwah)
+function how_vvvvwaj_SomeFunc(how_vvvvwaj)
 {
 	// set the function logic
-	if (how_vvvvwah == 4)
+	if (how_vvvvwaj == 4)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwai function
+// the vvvvwak function
-function vvvvwai(type_vvvvwai)
+function vvvvwak(type_vvvvwak)
 {
 	// set the function logic
-	if (type_vvvvwai == 2)
+	if (type_vvvvwak == 2)
 	{
 		jQuery('#jform_libraries').closest('.control-group').show();
-		if (jform_vvvvwaivzu_required)
+		if (jform_vvvvwakvzu_required)
 		{
 			updateFieldRequired('libraries',0);
 			jQuery('#jform_libraries').prop('required','required');
 			jQuery('#jform_libraries').attr('aria-required',true);
 			jQuery('#jform_libraries').addClass('required');
-			jform_vvvvwaivzu_required = false;
+			jform_vvvvwakvzu_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_libraries').closest('.control-group').hide();
-		if (!jform_vvvvwaivzu_required)
+		if (!jform_vvvvwakvzu_required)
 		{
 			updateFieldRequired('libraries',1);
 			jQuery('#jform_libraries').removeAttr('required');
 			jQuery('#jform_libraries').removeAttr('aria-required');
 			jQuery('#jform_libraries').removeClass('required');
-			jform_vvvvwaivzu_required = true;
+			jform_vvvvwakvzu_required = true;
 		}
 	}
 }

admin/models/forms/server.js

@@ -23,28 +23,24 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvwatwae_required = false;
+jform_vvvvwavwae_required = false;
-jform_vvvvwatwaf_required = false;
+jform_vvvvwavwaf_required = false;
-jform_vvvvwatwag_required = false;
+jform_vvvvwavwag_required = false;
-jform_vvvvwatwah_required = false;
+jform_vvvvwavwah_required = false;
-jform_vvvvwatwai_required = false;
+jform_vvvvwavwai_required = false;
-jform_vvvvwauwaj_required = false;
+jform_vvvvwawwaj_required = false;
-jform_vvvvwavwak_required = false;
+jform_vvvvwaxwak_required = false;
-jform_vvvvwaxwal_required = false;
+jform_vvvvwazwal_required = false;
-jform_vvvvwazwam_required = false;
+jform_vvvvwbbwam_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var protocol_vvvvwat = jQuery("#jform_protocol").val();
-	vvvvwat(protocol_vvvvwat);
-
-	var protocol_vvvvwau = jQuery("#jform_protocol").val();
-	vvvvwau(protocol_vvvvwau);
-
 	var protocol_vvvvwav = jQuery("#jform_protocol").val();
-	var authentication_vvvvwav = jQuery("#jform_authentication").val();
+	vvvvwav(protocol_vvvvwav);
-	vvvvwav(protocol_vvvvwav,authentication_vvvvwav);
+
+	var protocol_vvvvwaw = jQuery("#jform_protocol").val();
+	vvvvwaw(protocol_vvvvwaw);
 
 	var protocol_vvvvwax = jQuery("#jform_protocol").val();
 	var authentication_vvvvwax = jQuery("#jform_authentication").val();
@@ -57,200 +53,14 @@ jQuery(document).ready(function()
 	var protocol_vvvvwbb = jQuery("#jform_protocol").val();
 	var authentication_vvvvwbb = jQuery("#jform_authentication").val();
 	vvvvwbb(protocol_vvvvwbb,authentication_vvvvwbb);
+
+	var protocol_vvvvwbd = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbd = jQuery("#jform_authentication").val();
+	vvvvwbd(protocol_vvvvwbd,authentication_vvvvwbd);
 });
 
-// the vvvvwat function
-function vvvvwat(protocol_vvvvwat)
-{
-	if (isSet(protocol_vvvvwat) && protocol_vvvvwat.constructor !== Array)
-	{
-		var temp_vvvvwat = protocol_vvvvwat;
-		var protocol_vvvvwat = [];
-		protocol_vvvvwat.push(temp_vvvvwat);
-	}
-	else if (!isSet(protocol_vvvvwat))
-	{
-		var protocol_vvvvwat = [];
-	}
-	var protocol = protocol_vvvvwat.some(protocol_vvvvwat_SomeFunc);
-
-
-	// set this function logic
-	if (protocol)
-	{
-		jQuery('#jform_authentication').closest('.control-group').show();
-		if (jform_vvvvwatwae_required)
-		{
-			updateFieldRequired('authentication',0);
-			jQuery('#jform_authentication').prop('required','required');
-			jQuery('#jform_authentication').attr('aria-required',true);
-			jQuery('#jform_authentication').addClass('required');
-			jform_vvvvwatwae_required = false;
-		}
-
-		jQuery('#jform_host').closest('.control-group').show();
-		if (jform_vvvvwatwaf_required)
-		{
-			updateFieldRequired('host',0);
-			jQuery('#jform_host').prop('required','required');
-			jQuery('#jform_host').attr('aria-required',true);
-			jQuery('#jform_host').addClass('required');
-			jform_vvvvwatwaf_required = false;
-		}
-
-		jQuery('#jform_port').closest('.control-group').show();
-		if (jform_vvvvwatwag_required)
-		{
-			updateFieldRequired('port',0);
-			jQuery('#jform_port').prop('required','required');
-			jQuery('#jform_port').attr('aria-required',true);
-			jQuery('#jform_port').addClass('required');
-			jform_vvvvwatwag_required = false;
-		}
-
-		jQuery('#jform_path').closest('.control-group').show();
-		if (jform_vvvvwatwah_required)
-		{
-			updateFieldRequired('path',0);
-			jQuery('#jform_path').prop('required','required');
-			jQuery('#jform_path').attr('aria-required',true);
-			jQuery('#jform_path').addClass('required');
-			jform_vvvvwatwah_required = false;
-		}
-
-		jQuery('.note_ssh_security').closest('.control-group').show();
-		jQuery('#jform_username').closest('.control-group').show();
-		if (jform_vvvvwatwai_required)
-		{
-			updateFieldRequired('username',0);
-			jQuery('#jform_username').prop('required','required');
-			jQuery('#jform_username').attr('aria-required',true);
-			jQuery('#jform_username').addClass('required');
-			jform_vvvvwatwai_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_authentication').closest('.control-group').hide();
-		if (!jform_vvvvwatwae_required)
-		{
-			updateFieldRequired('authentication',1);
-			jQuery('#jform_authentication').removeAttr('required');
-			jQuery('#jform_authentication').removeAttr('aria-required');
-			jQuery('#jform_authentication').removeClass('required');
-			jform_vvvvwatwae_required = true;
-		}
-		jQuery('#jform_host').closest('.control-group').hide();
-		if (!jform_vvvvwatwaf_required)
-		{
-			updateFieldRequired('host',1);
-			jQuery('#jform_host').removeAttr('required');
-			jQuery('#jform_host').removeAttr('aria-required');
-			jQuery('#jform_host').removeClass('required');
-			jform_vvvvwatwaf_required = true;
-		}
-		jQuery('#jform_port').closest('.control-group').hide();
-		if (!jform_vvvvwatwag_required)
-		{
-			updateFieldRequired('port',1);
-			jQuery('#jform_port').removeAttr('required');
-			jQuery('#jform_port').removeAttr('aria-required');
-			jQuery('#jform_port').removeClass('required');
-			jform_vvvvwatwag_required = true;
-		}
-		jQuery('#jform_path').closest('.control-group').hide();
-		if (!jform_vvvvwatwah_required)
-		{
-			updateFieldRequired('path',1);
-			jQuery('#jform_path').removeAttr('required');
-			jQuery('#jform_path').removeAttr('aria-required');
-			jQuery('#jform_path').removeClass('required');
-			jform_vvvvwatwah_required = true;
-		}
-		jQuery('.note_ssh_security').closest('.control-group').hide();
-		jQuery('#jform_username').closest('.control-group').hide();
-		if (!jform_vvvvwatwai_required)
-		{
-			updateFieldRequired('username',1);
-			jQuery('#jform_username').removeAttr('required');
-			jQuery('#jform_username').removeAttr('aria-required');
-			jQuery('#jform_username').removeClass('required');
-			jform_vvvvwatwai_required = true;
-		}
-	}
-}
-
-// the vvvvwat Some function
-function protocol_vvvvwat_SomeFunc(protocol_vvvvwat)
-{
-	// set the function logic
-	if (protocol_vvvvwat == 2)
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvwau function
-function vvvvwau(protocol_vvvvwau)
-{
-	if (isSet(protocol_vvvvwau) && protocol_vvvvwau.constructor !== Array)
-	{
-		var temp_vvvvwau = protocol_vvvvwau;
-		var protocol_vvvvwau = [];
-		protocol_vvvvwau.push(temp_vvvvwau);
-	}
-	else if (!isSet(protocol_vvvvwau))
-	{
-		var protocol_vvvvwau = [];
-	}
-	var protocol = protocol_vvvvwau.some(protocol_vvvvwau_SomeFunc);
-
-
-	// set this function logic
-	if (protocol)
-	{
-		jQuery('.note_ftp_signature').closest('.control-group').show();
-		jQuery('#jform_signature').closest('.control-group').show();
-		if (jform_vvvvwauwaj_required)
-		{
-			updateFieldRequired('signature',0);
-			jQuery('#jform_signature').prop('required','required');
-			jQuery('#jform_signature').attr('aria-required',true);
-			jQuery('#jform_signature').addClass('required');
-			jform_vvvvwauwaj_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('.note_ftp_signature').closest('.control-group').hide();
-		jQuery('#jform_signature').closest('.control-group').hide();
-		if (!jform_vvvvwauwaj_required)
-		{
-			updateFieldRequired('signature',1);
-			jQuery('#jform_signature').removeAttr('required');
-			jQuery('#jform_signature').removeAttr('aria-required');
-			jQuery('#jform_signature').removeClass('required');
-			jform_vvvvwauwaj_required = true;
-		}
-	}
-}
-
-// the vvvvwau Some function
-function protocol_vvvvwau_SomeFunc(protocol_vvvvwau)
-{
-	// set the function logic
-	if (protocol_vvvvwau == 1)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwav function
-function vvvvwav(protocol_vvvvwav,authentication_vvvvwav)
+function vvvvwav(protocol_vvvvwav)
 {
 	if (isSet(protocol_vvvvwav) && protocol_vvvvwav.constructor !== Array)
 	{
@@ -264,43 +74,109 @@ function vvvvwav(protocol_vvvvwav,authentication_vvvvwav)
 	}
 	var protocol = protocol_vvvvwav.some(protocol_vvvvwav_SomeFunc);
 
-	if (isSet(authentication_vvvvwav) && authentication_vvvvwav.constructor !== Array)
-	{
-		var temp_vvvvwav = authentication_vvvvwav;
-		var authentication_vvvvwav = [];
-		authentication_vvvvwav.push(temp_vvvvwav);
-	}
-	else if (!isSet(authentication_vvvvwav))
-	{
-		var authentication_vvvvwav = [];
-	}
-	var authentication = authentication_vvvvwav.some(authentication_vvvvwav_SomeFunc);
-
 
 	// set this function logic
-	if (protocol && authentication)
+	if (protocol)
 	{
-		jQuery('#jform_password').closest('.control-group').show();
+		jQuery('#jform_authentication').closest('.control-group').show();
-		if (jform_vvvvwavwak_required)
+		if (jform_vvvvwavwae_required)
 		{
-			updateFieldRequired('password',0);
+			updateFieldRequired('authentication',0);
-			jQuery('#jform_password').prop('required','required');
+			jQuery('#jform_authentication').prop('required','required');
-			jQuery('#jform_password').attr('aria-required',true);
+			jQuery('#jform_authentication').attr('aria-required',true);
-			jQuery('#jform_password').addClass('required');
+			jQuery('#jform_authentication').addClass('required');
-			jform_vvvvwavwak_required = false;
+			jform_vvvvwavwae_required = false;
+		}
+
+		jQuery('#jform_host').closest('.control-group').show();
+		if (jform_vvvvwavwaf_required)
+		{
+			updateFieldRequired('host',0);
+			jQuery('#jform_host').prop('required','required');
+			jQuery('#jform_host').attr('aria-required',true);
+			jQuery('#jform_host').addClass('required');
+			jform_vvvvwavwaf_required = false;
+		}
+
+		jQuery('#jform_port').closest('.control-group').show();
+		if (jform_vvvvwavwag_required)
+		{
+			updateFieldRequired('port',0);
+			jQuery('#jform_port').prop('required','required');
+			jQuery('#jform_port').attr('aria-required',true);
+			jQuery('#jform_port').addClass('required');
+			jform_vvvvwavwag_required = false;
+		}
+
+		jQuery('#jform_path').closest('.control-group').show();
+		if (jform_vvvvwavwah_required)
+		{
+			updateFieldRequired('path',0);
+			jQuery('#jform_path').prop('required','required');
+			jQuery('#jform_path').attr('aria-required',true);
+			jQuery('#jform_path').addClass('required');
+			jform_vvvvwavwah_required = false;
+		}
+
+		jQuery('.note_ssh_security').closest('.control-group').show();
+		jQuery('#jform_username').closest('.control-group').show();
+		if (jform_vvvvwavwai_required)
+		{
+			updateFieldRequired('username',0);
+			jQuery('#jform_username').prop('required','required');
+			jQuery('#jform_username').attr('aria-required',true);
+			jQuery('#jform_username').addClass('required');
+			jform_vvvvwavwai_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_password').closest('.control-group').hide();
+		jQuery('#jform_authentication').closest('.control-group').hide();
-		if (!jform_vvvvwavwak_required)
+		if (!jform_vvvvwavwae_required)
 		{
-			updateFieldRequired('password',1);
+			updateFieldRequired('authentication',1);
-			jQuery('#jform_password').removeAttr('required');
+			jQuery('#jform_authentication').removeAttr('required');
-			jQuery('#jform_password').removeAttr('aria-required');
+			jQuery('#jform_authentication').removeAttr('aria-required');
-			jQuery('#jform_password').removeClass('required');
+			jQuery('#jform_authentication').removeClass('required');
-			jform_vvvvwavwak_required = true;
+			jform_vvvvwavwae_required = true;
+		}
+		jQuery('#jform_host').closest('.control-group').hide();
+		if (!jform_vvvvwavwaf_required)
+		{
+			updateFieldRequired('host',1);
+			jQuery('#jform_host').removeAttr('required');
+			jQuery('#jform_host').removeAttr('aria-required');
+			jQuery('#jform_host').removeClass('required');
+			jform_vvvvwavwaf_required = true;
+		}
+		jQuery('#jform_port').closest('.control-group').hide();
+		if (!jform_vvvvwavwag_required)
+		{
+			updateFieldRequired('port',1);
+			jQuery('#jform_port').removeAttr('required');
+			jQuery('#jform_port').removeAttr('aria-required');
+			jQuery('#jform_port').removeClass('required');
+			jform_vvvvwavwag_required = true;
+		}
+		jQuery('#jform_path').closest('.control-group').hide();
+		if (!jform_vvvvwavwah_required)
+		{
+			updateFieldRequired('path',1);
+			jQuery('#jform_path').removeAttr('required');
+			jQuery('#jform_path').removeAttr('aria-required');
+			jQuery('#jform_path').removeClass('required');
+			jform_vvvvwavwah_required = true;
+		}
+		jQuery('.note_ssh_security').closest('.control-group').hide();
+		jQuery('#jform_username').closest('.control-group').hide();
+		if (!jform_vvvvwavwai_required)
+		{
+			updateFieldRequired('username',1);
+			jQuery('#jform_username').removeAttr('required');
+			jQuery('#jform_username').removeAttr('aria-required');
+			jQuery('#jform_username').removeClass('required');
+			jform_vvvvwavwai_required = true;
 		}
 	}
 }
@@ -316,11 +192,57 @@ function protocol_vvvvwav_SomeFunc(protocol_vvvvwav)
 	return false;
 }
 
-// the vvvvwav Some function
+// the vvvvwaw function
-function authentication_vvvvwav_SomeFunc(authentication_vvvvwav)
+function vvvvwaw(protocol_vvvvwaw)
+{
+	if (isSet(protocol_vvvvwaw) && protocol_vvvvwaw.constructor !== Array)
+	{
+		var temp_vvvvwaw = protocol_vvvvwaw;
+		var protocol_vvvvwaw = [];
+		protocol_vvvvwaw.push(temp_vvvvwaw);
+	}
+	else if (!isSet(protocol_vvvvwaw))
+	{
+		var protocol_vvvvwaw = [];
+	}
+	var protocol = protocol_vvvvwaw.some(protocol_vvvvwaw_SomeFunc);
+
+
+	// set this function logic
+	if (protocol)
+	{
+		jQuery('.note_ftp_signature').closest('.control-group').show();
+		jQuery('#jform_signature').closest('.control-group').show();
+		if (jform_vvvvwawwaj_required)
+		{
+			updateFieldRequired('signature',0);
+			jQuery('#jform_signature').prop('required','required');
+			jQuery('#jform_signature').attr('aria-required',true);
+			jQuery('#jform_signature').addClass('required');
+			jform_vvvvwawwaj_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('.note_ftp_signature').closest('.control-group').hide();
+		jQuery('#jform_signature').closest('.control-group').hide();
+		if (!jform_vvvvwawwaj_required)
+		{
+			updateFieldRequired('signature',1);
+			jQuery('#jform_signature').removeAttr('required');
+			jQuery('#jform_signature').removeAttr('aria-required');
+			jQuery('#jform_signature').removeClass('required');
+			jform_vvvvwawwaj_required = true;
+		}
+	}
+}
+
+// the vvvvwaw Some function
+function protocol_vvvvwaw_SomeFunc(protocol_vvvvwaw)
 {
 	// set the function logic
-	if (authentication_vvvvwav == 1 || authentication_vvvvwav == 3 || authentication_vvvvwav == 5)
+	if (protocol_vvvvwaw == 1)
 	{
 		return true;
 	}
@@ -358,27 +280,27 @@ function vvvvwax(protocol_vvvvwax,authentication_vvvvwax)
 	// set this function logic
 	if (protocol && authentication)
 	{
-		jQuery('#jform_private').closest('.control-group').show();
+		jQuery('#jform_password').closest('.control-group').show();
-		if (jform_vvvvwaxwal_required)
+		if (jform_vvvvwaxwak_required)
 		{
-			updateFieldRequired('private',0);
+			updateFieldRequired('password',0);
-			jQuery('#jform_private').prop('required','required');
+			jQuery('#jform_password').prop('required','required');
-			jQuery('#jform_private').attr('aria-required',true);
+			jQuery('#jform_password').attr('aria-required',true);
-			jQuery('#jform_private').addClass('required');
+			jQuery('#jform_password').addClass('required');
-			jform_vvvvwaxwal_required = false;
+			jform_vvvvwaxwak_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_private').closest('.control-group').hide();
+		jQuery('#jform_password').closest('.control-group').hide();
-		if (!jform_vvvvwaxwal_required)
+		if (!jform_vvvvwaxwak_required)
 		{
-			updateFieldRequired('private',1);
+			updateFieldRequired('password',1);
-			jQuery('#jform_private').removeAttr('required');
+			jQuery('#jform_password').removeAttr('required');
-			jQuery('#jform_private').removeAttr('aria-required');
+			jQuery('#jform_password').removeAttr('aria-required');
-			jQuery('#jform_private').removeClass('required');
+			jQuery('#jform_password').removeClass('required');
-			jform_vvvvwaxwal_required = true;
+			jform_vvvvwaxwak_required = true;
 		}
 	}
 }
@@ -398,7 +320,7 @@ function protocol_vvvvwax_SomeFunc(protocol_vvvvwax)
 function authentication_vvvvwax_SomeFunc(authentication_vvvvwax)
 {
 	// set the function logic
-	if (authentication_vvvvwax == 2 || authentication_vvvvwax == 3)
+	if (authentication_vvvvwax == 1 || authentication_vvvvwax == 3 || authentication_vvvvwax == 5)
 	{
 		return true;
 	}
@@ -436,27 +358,27 @@ function vvvvwaz(protocol_vvvvwaz,authentication_vvvvwaz)
 	// set this function logic
 	if (protocol && authentication)
 	{
-		jQuery('#jform_private_key').closest('.control-group').show();
+		jQuery('#jform_private').closest('.control-group').show();
-		if (jform_vvvvwazwam_required)
+		if (jform_vvvvwazwal_required)
 		{
-			updateFieldRequired('private_key',0);
+			updateFieldRequired('private',0);
-			jQuery('#jform_private_key').prop('required','required');
+			jQuery('#jform_private').prop('required','required');
-			jQuery('#jform_private_key').attr('aria-required',true);
+			jQuery('#jform_private').attr('aria-required',true);
-			jQuery('#jform_private_key').addClass('required');
+			jQuery('#jform_private').addClass('required');
-			jform_vvvvwazwam_required = false;
+			jform_vvvvwazwal_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_private_key').closest('.control-group').hide();
+		jQuery('#jform_private').closest('.control-group').hide();
-		if (!jform_vvvvwazwam_required)
+		if (!jform_vvvvwazwal_required)
 		{
-			updateFieldRequired('private_key',1);
+			updateFieldRequired('private',1);
-			jQuery('#jform_private_key').removeAttr('required');
+			jQuery('#jform_private').removeAttr('required');
-			jQuery('#jform_private_key').removeAttr('aria-required');
+			jQuery('#jform_private').removeAttr('aria-required');
-			jQuery('#jform_private_key').removeClass('required');
+			jQuery('#jform_private').removeClass('required');
-			jform_vvvvwazwam_required = true;
+			jform_vvvvwazwal_required = true;
 		}
 	}
 }
@@ -476,7 +398,7 @@ function protocol_vvvvwaz_SomeFunc(protocol_vvvvwaz)
 function authentication_vvvvwaz_SomeFunc(authentication_vvvvwaz)
 {
 	// set the function logic
-	if (authentication_vvvvwaz == 4 || authentication_vvvvwaz == 5)
+	if (authentication_vvvvwaz == 2 || authentication_vvvvwaz == 3)
 	{
 		return true;
 	}
@@ -514,11 +436,28 @@ function vvvvwbb(protocol_vvvvwbb,authentication_vvvvwbb)
 	// set this function logic
 	if (protocol && authentication)
 	{
-		jQuery('#jform_secret').closest('.control-group').show();
+		jQuery('#jform_private_key').closest('.control-group').show();
+		if (jform_vvvvwbbwam_required)
+		{
+			updateFieldRequired('private_key',0);
+			jQuery('#jform_private_key').prop('required','required');
+			jQuery('#jform_private_key').attr('aria-required',true);
+			jQuery('#jform_private_key').addClass('required');
+			jform_vvvvwbbwam_required = false;
+		}
+
 	}
 	else
 	{
-		jQuery('#jform_secret').closest('.control-group').hide();
+		jQuery('#jform_private_key').closest('.control-group').hide();
+		if (!jform_vvvvwbbwam_required)
+		{
+			updateFieldRequired('private_key',1);
+			jQuery('#jform_private_key').removeAttr('required');
+			jQuery('#jform_private_key').removeAttr('aria-required');
+			jQuery('#jform_private_key').removeClass('required');
+			jform_vvvvwbbwam_required = true;
+		}
 	}
 }
 
@@ -537,7 +476,68 @@ function protocol_vvvvwbb_SomeFunc(protocol_vvvvwbb)
 function authentication_vvvvwbb_SomeFunc(authentication_vvvvwbb)
 {
 	// set the function logic
-	if (authentication_vvvvwbb == 2 || authentication_vvvvwbb == 3 || authentication_vvvvwbb == 4 || authentication_vvvvwbb == 5)
+	if (authentication_vvvvwbb == 4 || authentication_vvvvwbb == 5)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwbd function
+function vvvvwbd(protocol_vvvvwbd,authentication_vvvvwbd)
+{
+	if (isSet(protocol_vvvvwbd) && protocol_vvvvwbd.constructor !== Array)
+	{
+		var temp_vvvvwbd = protocol_vvvvwbd;
+		var protocol_vvvvwbd = [];
+		protocol_vvvvwbd.push(temp_vvvvwbd);
+	}
+	else if (!isSet(protocol_vvvvwbd))
+	{
+		var protocol_vvvvwbd = [];
+	}
+	var protocol = protocol_vvvvwbd.some(protocol_vvvvwbd_SomeFunc);
+
+	if (isSet(authentication_vvvvwbd) && authentication_vvvvwbd.constructor !== Array)
+	{
+		var temp_vvvvwbd = authentication_vvvvwbd;
+		var authentication_vvvvwbd = [];
+		authentication_vvvvwbd.push(temp_vvvvwbd);
+	}
+	else if (!isSet(authentication_vvvvwbd))
+	{
+		var authentication_vvvvwbd = [];
+	}
+	var authentication = authentication_vvvvwbd.some(authentication_vvvvwbd_SomeFunc);
+
+
+	// set this function logic
+	if (protocol && authentication)
+	{
+		jQuery('#jform_secret').closest('.control-group').show();
+	}
+	else
+	{
+		jQuery('#jform_secret').closest('.control-group').hide();
+	}
+}
+
+// the vvvvwbd Some function
+function protocol_vvvvwbd_SomeFunc(protocol_vvvvwbd)
+{
+	// set the function logic
+	if (protocol_vvvvwbd == 2)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwbd Some function
+function authentication_vvvvwbd_SomeFunc(authentication_vvvvwbd)
+{
+	// set the function logic
+	if (authentication_vvvvwbd == 2 || authentication_vvvvwbd == 3 || authentication_vvvvwbd == 4 || authentication_vvvvwbd == 5)
 	{
 		return true;
 	}

admin/models/forms/site_view.js

@@ -23,318 +23,318 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvvylvyi_required = false;
+jform_vvvvvynvyi_required = false;
-jform_vvvvvymvyj_required = false;
+jform_vvvvvyovyj_required = false;
-jform_vvvvvynvyk_required = false;
+jform_vvvvvypvyk_required = false;
-jform_vvvvvyovyl_required = false;
+jform_vvvvvyqvyl_required = false;
-jform_vvvvvypvym_required = false;
+jform_vvvvvyrvym_required = false;
-jform_vvvvvyqvyn_required = false;
+jform_vvvvvysvyn_required = false;
-jform_vvvvvyrvyo_required = false;
+jform_vvvvvytvyo_required = false;
-jform_vvvvvysvyp_required = false;
+jform_vvvvvyuvyp_required = false;
-jform_vvvvvytvyq_required = false;
+jform_vvvvvyvvyq_required = false;
-jform_vvvvvyuvyr_required = false;
+jform_vvvvvywvyr_required = false;
-jform_vvvvvyuvys_required = false;
+jform_vvvvvywvys_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var add_php_view_vvvvvyl = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvyn = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyl(add_php_view_vvvvvyl);
+	vvvvvyn(add_php_view_vvvvvyn);
 
-	var add_php_jview_display_vvvvvym = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	var add_php_jview_display_vvvvvyo = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvym(add_php_jview_display_vvvvvym);
+	vvvvvyo(add_php_jview_display_vvvvvyo);
 
-	var add_php_jview_vvvvvyn = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	var add_php_jview_vvvvvyp = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyn(add_php_jview_vvvvvyn);
+	vvvvvyp(add_php_jview_vvvvvyp);
 
-	var add_php_document_vvvvvyo = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	var add_php_document_vvvvvyq = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyo(add_php_document_vvvvvyo);
+	vvvvvyq(add_php_document_vvvvvyq);
 
-	var add_css_document_vvvvvyp = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	var add_css_document_vvvvvyr = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvyp(add_css_document_vvvvvyp);
+	vvvvvyr(add_css_document_vvvvvyr);
 
-	var add_javascript_file_vvvvvyq = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	var add_javascript_file_vvvvvys = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvyq(add_javascript_file_vvvvvyq);
+	vvvvvys(add_javascript_file_vvvvvys);
 
-	var add_js_document_vvvvvyr = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	var add_js_document_vvvvvyt = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyr(add_js_document_vvvvvyr);
+	vvvvvyt(add_js_document_vvvvvyt);
 
-	var add_css_vvvvvys = jQuery("#jform_add_css input[type='radio']:checked").val();
+	var add_css_vvvvvyu = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvys(add_css_vvvvvys);
+	vvvvvyu(add_css_vvvvvyu);
 
-	var add_php_ajax_vvvvvyt = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	var add_php_ajax_vvvvvyv = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvyt(add_php_ajax_vvvvvyt);
+	vvvvvyv(add_php_ajax_vvvvvyv);
 
-	var add_custom_button_vvvvvyu = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	var add_custom_button_vvvvvyw = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyu(add_custom_button_vvvvvyu);
+	vvvvvyw(add_custom_button_vvvvvyw);
 
-	var button_position_vvvvvyv = jQuery("#jform_button_position").val();
+	var button_position_vvvvvyx = jQuery("#jform_button_position").val();
-	vvvvvyv(button_position_vvvvvyv);
+	vvvvvyx(button_position_vvvvvyx);
 });
 
-// the vvvvvyl function
+// the vvvvvyn function
-function vvvvvyl(add_php_view_vvvvvyl)
+function vvvvvyn(add_php_view_vvvvvyn)
 {
 	// set the function logic
-	if (add_php_view_vvvvvyl == 1)
+	if (add_php_view_vvvvvyn == 1)
 	{
 		jQuery('#jform_php_view').closest('.control-group').show();
-		if (jform_vvvvvylvyi_required)
+		if (jform_vvvvvynvyi_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_vvvvvylvyi_required = false;
+			jform_vvvvvynvyi_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_view').closest('.control-group').hide();
-		if (!jform_vvvvvylvyi_required)
+		if (!jform_vvvvvynvyi_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_vvvvvylvyi_required = true;
+			jform_vvvvvynvyi_required = true;
 		}
 	}
 }
 
-// the vvvvvym function
+// the vvvvvyo function
-function vvvvvym(add_php_jview_display_vvvvvym)
+function vvvvvyo(add_php_jview_display_vvvvvyo)
 {
 	// set the function logic
-	if (add_php_jview_display_vvvvvym == 1)
+	if (add_php_jview_display_vvvvvyo == 1)
 	{
 		jQuery('#jform_php_jview_display').closest('.control-group').show();
-		if (jform_vvvvvymvyj_required)
+		if (jform_vvvvvyovyj_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_vvvvvymvyj_required = false;
+			jform_vvvvvyovyj_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_jview_display').closest('.control-group').hide();
-		if (!jform_vvvvvymvyj_required)
+		if (!jform_vvvvvyovyj_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_vvvvvymvyj_required = true;
+			jform_vvvvvyovyj_required = true;
 		}
 	}
 }
 
-// the vvvvvyn function
+// the vvvvvyp function
-function vvvvvyn(add_php_jview_vvvvvyn)
+function vvvvvyp(add_php_jview_vvvvvyp)
 {
 	// set the function logic
-	if (add_php_jview_vvvvvyn == 1)
+	if (add_php_jview_vvvvvyp == 1)
 	{
 		jQuery('#jform_php_jview').closest('.control-group').show();
-		if (jform_vvvvvynvyk_required)
+		if (jform_vvvvvypvyk_required)
 		{
 			updateFieldRequired('php_jview',0);
 			jQuery('#jform_php_jview').prop('required','required');
 			jQuery('#jform_php_jview').attr('aria-required',true);
 			jQuery('#jform_php_jview').addClass('required');
-			jform_vvvvvynvyk_required = false;
+			jform_vvvvvypvyk_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_jview').closest('.control-group').hide();
-		if (!jform_vvvvvynvyk_required)
+		if (!jform_vvvvvypvyk_required)
 		{
 			updateFieldRequired('php_jview',1);
 			jQuery('#jform_php_jview').removeAttr('required');
 			jQuery('#jform_php_jview').removeAttr('aria-required');
 			jQuery('#jform_php_jview').removeClass('required');
-			jform_vvvvvynvyk_required = true;
+			jform_vvvvvypvyk_required = true;
 		}
 	}
 }
 
-// the vvvvvyo function
+// the vvvvvyq function
-function vvvvvyo(add_php_document_vvvvvyo)
+function vvvvvyq(add_php_document_vvvvvyq)
 {
 	// set the function logic
-	if (add_php_document_vvvvvyo == 1)
+	if (add_php_document_vvvvvyq == 1)
 	{
 		jQuery('#jform_php_document').closest('.control-group').show();
-		if (jform_vvvvvyovyl_required)
+		if (jform_vvvvvyqvyl_required)
 		{
 			updateFieldRequired('php_document',0);
 			jQuery('#jform_php_document').prop('required','required');
 			jQuery('#jform_php_document').attr('aria-required',true);
 			jQuery('#jform_php_document').addClass('required');
-			jform_vvvvvyovyl_required = false;
+			jform_vvvvvyqvyl_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_document').closest('.control-group').hide();
-		if (!jform_vvvvvyovyl_required)
+		if (!jform_vvvvvyqvyl_required)
 		{
 			updateFieldRequired('php_document',1);
 			jQuery('#jform_php_document').removeAttr('required');
 			jQuery('#jform_php_document').removeAttr('aria-required');
 			jQuery('#jform_php_document').removeClass('required');
-			jform_vvvvvyovyl_required = true;
+			jform_vvvvvyqvyl_required = true;
 		}
 	}
 }
 
-// the vvvvvyp function
+// the vvvvvyr function
-function vvvvvyp(add_css_document_vvvvvyp)
+function vvvvvyr(add_css_document_vvvvvyr)
 {
 	// set the function logic
-	if (add_css_document_vvvvvyp == 1)
+	if (add_css_document_vvvvvyr == 1)
 	{
 		jQuery('#jform_css_document').closest('.control-group').show();
-		if (jform_vvvvvypvym_required)
+		if (jform_vvvvvyrvym_required)
 		{
 			updateFieldRequired('css_document',0);
 			jQuery('#jform_css_document').prop('required','required');
 			jQuery('#jform_css_document').attr('aria-required',true);
 			jQuery('#jform_css_document').addClass('required');
-			jform_vvvvvypvym_required = false;
+			jform_vvvvvyrvym_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_css_document').closest('.control-group').hide();
-		if (!jform_vvvvvypvym_required)
+		if (!jform_vvvvvyrvym_required)
 		{
 			updateFieldRequired('css_document',1);
 			jQuery('#jform_css_document').removeAttr('required');
 			jQuery('#jform_css_document').removeAttr('aria-required');
 			jQuery('#jform_css_document').removeClass('required');
-			jform_vvvvvypvym_required = true;
+			jform_vvvvvyrvym_required = true;
 		}
 	}
 }
 
-// the vvvvvyq function
+// the vvvvvys function
-function vvvvvyq(add_javascript_file_vvvvvyq)
+function vvvvvys(add_javascript_file_vvvvvys)
 {
 	// set the function logic
-	if (add_javascript_file_vvvvvyq == 1)
+	if (add_javascript_file_vvvvvys == 1)
 	{
 		jQuery('#jform_javascript_file').closest('.control-group').show();
-		if (jform_vvvvvyqvyn_required)
+		if (jform_vvvvvysvyn_required)
 		{
 			updateFieldRequired('javascript_file',0);
 			jQuery('#jform_javascript_file').prop('required','required');
 			jQuery('#jform_javascript_file').attr('aria-required',true);
 			jQuery('#jform_javascript_file').addClass('required');
-			jform_vvvvvyqvyn_required = false;
+			jform_vvvvvysvyn_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_javascript_file').closest('.control-group').hide();
-		if (!jform_vvvvvyqvyn_required)
+		if (!jform_vvvvvysvyn_required)
 		{
 			updateFieldRequired('javascript_file',1);
 			jQuery('#jform_javascript_file').removeAttr('required');
 			jQuery('#jform_javascript_file').removeAttr('aria-required');
 			jQuery('#jform_javascript_file').removeClass('required');
-			jform_vvvvvyqvyn_required = true;
+			jform_vvvvvysvyn_required = true;
 		}
 	}
 }
 
-// the vvvvvyr function
+// the vvvvvyt function
-function vvvvvyr(add_js_document_vvvvvyr)
+function vvvvvyt(add_js_document_vvvvvyt)
 {
 	// set the function logic
-	if (add_js_document_vvvvvyr == 1)
+	if (add_js_document_vvvvvyt == 1)
 	{
 		jQuery('#jform_js_document').closest('.control-group').show();
-		if (jform_vvvvvyrvyo_required)
+		if (jform_vvvvvytvyo_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_vvvvvyrvyo_required = false;
+			jform_vvvvvytvyo_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_js_document').closest('.control-group').hide();
-		if (!jform_vvvvvyrvyo_required)
+		if (!jform_vvvvvytvyo_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_vvvvvyrvyo_required = true;
+			jform_vvvvvytvyo_required = true;
 		}
 	}
 }
 
-// the vvvvvys function
+// the vvvvvyu function
-function vvvvvys(add_css_vvvvvys)
+function vvvvvyu(add_css_vvvvvyu)
 {
 	// set the function logic
-	if (add_css_vvvvvys == 1)
+	if (add_css_vvvvvyu == 1)
 	{
 		jQuery('#jform_css').closest('.control-group').show();
-		if (jform_vvvvvysvyp_required)
+		if (jform_vvvvvyuvyp_required)
 		{
 			updateFieldRequired('css',0);
 			jQuery('#jform_css').prop('required','required');
 			jQuery('#jform_css').attr('aria-required',true);
 			jQuery('#jform_css').addClass('required');
-			jform_vvvvvysvyp_required = false;
+			jform_vvvvvyuvyp_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_css').closest('.control-group').hide();
-		if (!jform_vvvvvysvyp_required)
+		if (!jform_vvvvvyuvyp_required)
 		{
 			updateFieldRequired('css',1);
 			jQuery('#jform_css').removeAttr('required');
 			jQuery('#jform_css').removeAttr('aria-required');
 			jQuery('#jform_css').removeClass('required');
-			jform_vvvvvysvyp_required = true;
+			jform_vvvvvyuvyp_required = true;
 		}
 	}
 }
 
-// the vvvvvyt function
+// the vvvvvyv function
-function vvvvvyt(add_php_ajax_vvvvvyt)
+function vvvvvyv(add_php_ajax_vvvvvyv)
 {
 	// set the function logic
-	if (add_php_ajax_vvvvvyt == 1)
+	if (add_php_ajax_vvvvvyv == 1)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').show();
 		jQuery('#jform_php_ajaxmethod').closest('.control-group').show();
-		if (jform_vvvvvytvyq_required)
+		if (jform_vvvvvyvvyq_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_vvvvvytvyq_required = false;
+			jform_vvvvvyvvyq_required = false;
 		}
 
 	}
@@ -342,42 +342,42 @@ function vvvvvyt(add_php_ajax_vvvvvyt)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_ajaxmethod').closest('.control-group').hide();
-		if (!jform_vvvvvytvyq_required)
+		if (!jform_vvvvvyvvyq_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_vvvvvytvyq_required = true;
+			jform_vvvvvyvvyq_required = true;
 		}
 	}
 }
 
-// the vvvvvyu function
+// the vvvvvyw function
-function vvvvvyu(add_custom_button_vvvvvyu)
+function vvvvvyw(add_custom_button_vvvvvyw)
 {
 	// set the function logic
-	if (add_custom_button_vvvvvyu == 1)
+	if (add_custom_button_vvvvvyw == 1)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').show();
 		jQuery('#jform_php_controller').closest('.control-group').show();
-		if (jform_vvvvvyuvyr_required)
+		if (jform_vvvvvywvyr_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_vvvvvyuvyr_required = false;
+			jform_vvvvvywvyr_required = false;
 		}
 
 		jQuery('#jform_php_model').closest('.control-group').show();
-		if (jform_vvvvvyuvys_required)
+		if (jform_vvvvvywvys_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_vvvvvyuvys_required = false;
+			jform_vvvvvywvys_required = false;
 		}
 
 	}
@@ -385,40 +385,40 @@ function vvvvvyu(add_custom_button_vvvvvyu)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_controller').closest('.control-group').hide();
-		if (!jform_vvvvvyuvyr_required)
+		if (!jform_vvvvvywvyr_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_vvvvvyuvyr_required = true;
+			jform_vvvvvywvyr_required = true;
 		}
 		jQuery('#jform_php_model').closest('.control-group').hide();
-		if (!jform_vvvvvyuvys_required)
+		if (!jform_vvvvvywvys_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_vvvvvyuvys_required = true;
+			jform_vvvvvywvys_required = true;
 		}
 	}
 }
 
-// the vvvvvyv function
+// the vvvvvyx function
-function vvvvvyv(button_position_vvvvvyv)
+function vvvvvyx(button_position_vvvvvyx)
 {
-	if (isSet(button_position_vvvvvyv) && button_position_vvvvvyv.constructor !== Array)
+	if (isSet(button_position_vvvvvyx) && button_position_vvvvvyx.constructor !== Array)
 	{
-		var temp_vvvvvyv = button_position_vvvvvyv;
+		var temp_vvvvvyx = button_position_vvvvvyx;
-		var button_position_vvvvvyv = [];
+		var button_position_vvvvvyx = [];
-		button_position_vvvvvyv.push(temp_vvvvvyv);
+		button_position_vvvvvyx.push(temp_vvvvvyx);
 	}
-	else if (!isSet(button_position_vvvvvyv))
+	else if (!isSet(button_position_vvvvvyx))
 	{
-		var button_position_vvvvvyv = [];
+		var button_position_vvvvvyx = [];
 	}
-	var button_position = button_position_vvvvvyv.some(button_position_vvvvvyv_SomeFunc);
+	var button_position = button_position_vvvvvyx.some(button_position_vvvvvyx_SomeFunc);
 
 
 	// set this function logic
@@ -432,11 +432,11 @@ function vvvvvyv(button_position_vvvvvyv)
 	}
 }
 
-// the vvvvvyv Some function
+// the vvvvvyx Some function
-function button_position_vvvvvyv_SomeFunc(button_position_vvvvvyv)
+function button_position_vvvvvyx_SomeFunc(button_position_vvvvvyx)
 {
 	// set the function logic
-	if (button_position_vvvvvyv == 5)
+	if (button_position_vvvvvyx == 5)
 	{
 		return true;
 	}

admin/models/forms/template.js

@@ -23,42 +23,42 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvvywvyt_required = false;
+jform_vvvvvyyvyt_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var add_php_view_vvvvvyw = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvyy = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyw(add_php_view_vvvvvyw);
+	vvvvvyy(add_php_view_vvvvvyy);
 });
 
-// the vvvvvyw function
+// the vvvvvyy function
-function vvvvvyw(add_php_view_vvvvvyw)
+function vvvvvyy(add_php_view_vvvvvyy)
 {
 	// set the function logic
-	if (add_php_view_vvvvvyw == 1)
+	if (add_php_view_vvvvvyy == 1)
 	{
 		jQuery('#jform_php_view').closest('.control-group').show();
-		if (jform_vvvvvywvyt_required)
+		if (jform_vvvvvyyvyt_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_vvvvvywvyt_required = false;
+			jform_vvvvvyyvyt_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_view').closest('.control-group').hide();
-		if (!jform_vvvvvywvyt_required)
+		if (!jform_vvvvvyyvyt_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_vvvvvywvyt_required = true;
+			jform_vvvvvyyvyt_required = true;
 		}
 	}
 }

admin/models/joomla_component.php

@@ -108,16 +108,28 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 				$item->addcontributors = $addcontributors->toArray();
 			}
 
+			if (!empty($item->php_postflight_install))
+			{
+				// base64 Decode php_postflight_install.
+				$item->php_postflight_install = base64_decode($item->php_postflight_install);
+			}
+
+			if (!empty($item->php_site_event))
+			{
+				// base64 Decode php_site_event.
+				$item->php_site_event = base64_decode($item->php_site_event);
+			}
+
 			if (!empty($item->readme))
 			{
 				// base64 Decode readme.
 				$item->readme = base64_decode($item->readme);
 			}
 
-			if (!empty($item->php_postflight_install))
+			if (!empty($item->css_admin))
 			{
-				// base64 Decode php_postflight_install.
+				// base64 Decode css_admin.
-				$item->php_postflight_install = base64_decode($item->php_postflight_install);
+				$item->css_admin = base64_decode($item->css_admin);
 			}
 
 			if (!empty($item->php_preflight_install))
@@ -132,6 +144,42 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 				$item->php_method_uninstall = base64_decode($item->php_method_uninstall);
 			}
 
+			if (!empty($item->php_helper_both))
+			{
+				// base64 Decode php_helper_both.
+				$item->php_helper_both = base64_decode($item->php_helper_both);
+			}
+
+			if (!empty($item->php_admin_event))
+			{
+				// base64 Decode php_admin_event.
+				$item->php_admin_event = base64_decode($item->php_admin_event);
+			}
+
+			if (!empty($item->php_helper_admin))
+			{
+				// base64 Decode php_helper_admin.
+				$item->php_helper_admin = base64_decode($item->php_helper_admin);
+			}
+
+			if (!empty($item->php_helper_site))
+			{
+				// base64 Decode php_helper_site.
+				$item->php_helper_site = base64_decode($item->php_helper_site);
+			}
+
+			if (!empty($item->javascript))
+			{
+				// base64 Decode javascript.
+				$item->javascript = base64_decode($item->javascript);
+			}
+
+			if (!empty($item->css_site))
+			{
+				// base64 Decode css_site.
+				$item->css_site = base64_decode($item->css_site);
+			}
+
 			if (!empty($item->php_preflight_update))
 			{
 				// base64 Decode php_preflight_update.
@@ -150,54 +198,6 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 				$item->sql = base64_decode($item->sql);
 			}
 
-			if (!empty($item->php_helper_both))
-			{
-				// base64 Decode php_helper_both.
-				$item->php_helper_both = base64_decode($item->php_helper_both);
-			}
-
-			if (!empty($item->php_helper_admin))
-			{
-				// base64 Decode php_helper_admin.
-				$item->php_helper_admin = base64_decode($item->php_helper_admin);
-			}
-
-			if (!empty($item->php_admin_event))
-			{
-				// base64 Decode php_admin_event.
-				$item->php_admin_event = base64_decode($item->php_admin_event);
-			}
-
-			if (!empty($item->php_helper_site))
-			{
-				// base64 Decode php_helper_site.
-				$item->php_helper_site = base64_decode($item->php_helper_site);
-			}
-
-			if (!empty($item->php_site_event))
-			{
-				// base64 Decode php_site_event.
-				$item->php_site_event = base64_decode($item->php_site_event);
-			}
-
-			if (!empty($item->javascript))
-			{
-				// base64 Decode javascript.
-				$item->javascript = base64_decode($item->javascript);
-			}
-
-			if (!empty($item->css_admin))
-			{
-				// base64 Decode css_admin.
-				$item->css_admin = base64_decode($item->css_admin);
-			}
-
-			if (!empty($item->css_site))
-			{
-				// base64 Decode css_site.
-				$item->css_site = base64_decode($item->css_site);
-			}
-
 			if (!empty($item->buildcompsql))
 			{
 				// base64 Decode buildcompsql.
@@ -1247,16 +1247,28 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 			$data['addcontributors'] = '';
 		}
 
+		// Set the php_postflight_install string to base64 string.
+		if (isset($data['php_postflight_install']))
+		{
+			$data['php_postflight_install'] = base64_encode($data['php_postflight_install']);
+		}
+
+		// Set the php_site_event string to base64 string.
+		if (isset($data['php_site_event']))
+		{
+			$data['php_site_event'] = base64_encode($data['php_site_event']);
+		}
+
 		// Set the readme string to base64 string.
 		if (isset($data['readme']))
 		{
 			$data['readme'] = base64_encode($data['readme']);
 		}
 
-		// Set the php_postflight_install string to base64 string.
+		// Set the css_admin string to base64 string.
-		if (isset($data['php_postflight_install']))
+		if (isset($data['css_admin']))
 		{
-			$data['php_postflight_install'] = base64_encode($data['php_postflight_install']);
+			$data['css_admin'] = base64_encode($data['css_admin']);
 		}
 
 		// Set the php_preflight_install string to base64 string.
@@ -1271,6 +1283,42 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 			$data['php_method_uninstall'] = base64_encode($data['php_method_uninstall']);
 		}
 
+		// Set the php_helper_both string to base64 string.
+		if (isset($data['php_helper_both']))
+		{
+			$data['php_helper_both'] = base64_encode($data['php_helper_both']);
+		}
+
+		// Set the php_admin_event string to base64 string.
+		if (isset($data['php_admin_event']))
+		{
+			$data['php_admin_event'] = base64_encode($data['php_admin_event']);
+		}
+
+		// Set the php_helper_admin string to base64 string.
+		if (isset($data['php_helper_admin']))
+		{
+			$data['php_helper_admin'] = base64_encode($data['php_helper_admin']);
+		}
+
+		// Set the php_helper_site string to base64 string.
+		if (isset($data['php_helper_site']))
+		{
+			$data['php_helper_site'] = base64_encode($data['php_helper_site']);
+		}
+
+		// Set the javascript string to base64 string.
+		if (isset($data['javascript']))
+		{
+			$data['javascript'] = base64_encode($data['javascript']);
+		}
+
+		// Set the css_site string to base64 string.
+		if (isset($data['css_site']))
+		{
+			$data['css_site'] = base64_encode($data['css_site']);
+		}
+
 		// Set the php_preflight_update string to base64 string.
 		if (isset($data['php_preflight_update']))
 		{
@@ -1289,54 +1337,6 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 			$data['sql'] = base64_encode($data['sql']);
 		}
 
-		// Set the php_helper_both string to base64 string.
-		if (isset($data['php_helper_both']))
-		{
-			$data['php_helper_both'] = base64_encode($data['php_helper_both']);
-		}
-
-		// Set the php_helper_admin string to base64 string.
-		if (isset($data['php_helper_admin']))
-		{
-			$data['php_helper_admin'] = base64_encode($data['php_helper_admin']);
-		}
-
-		// Set the php_admin_event string to base64 string.
-		if (isset($data['php_admin_event']))
-		{
-			$data['php_admin_event'] = base64_encode($data['php_admin_event']);
-		}
-
-		// Set the php_helper_site string to base64 string.
-		if (isset($data['php_helper_site']))
-		{
-			$data['php_helper_site'] = base64_encode($data['php_helper_site']);
-		}
-
-		// Set the php_site_event string to base64 string.
-		if (isset($data['php_site_event']))
-		{
-			$data['php_site_event'] = base64_encode($data['php_site_event']);
-		}
-
-		// Set the javascript string to base64 string.
-		if (isset($data['javascript']))
-		{
-			$data['javascript'] = base64_encode($data['javascript']);
-		}
-
-		// Set the css_admin string to base64 string.
-		if (isset($data['css_admin']))
-		{
-			$data['css_admin'] = base64_encode($data['css_admin']);
-		}
-
-		// Set the css_site string to base64 string.
-		if (isset($data['css_site']))
-		{
-			$data['css_site'] = base64_encode($data['css_site']);
-		}
-
 		// Set the buildcompsql string to base64 string.
 		if (isset($data['buildcompsql']))
 		{

admin/models/joomla_components.php

@@ -1723,14 +1723,30 @@ class ComponentbuilderModelJoomla_components extends JModelList
 							continue;
 						}
 
-						// decode readme
-						$item->readme = base64_decode($item->readme);
 						// decode php_postflight_install
 						$item->php_postflight_install = base64_decode($item->php_postflight_install);
+						// decode php_site_event
+						$item->php_site_event = base64_decode($item->php_site_event);
+						// decode readme
+						$item->readme = base64_decode($item->readme);
+						// decode css_admin
+						$item->css_admin = base64_decode($item->css_admin);
 						// decode php_preflight_install
 						$item->php_preflight_install = base64_decode($item->php_preflight_install);
 						// decode php_method_uninstall
 						$item->php_method_uninstall = base64_decode($item->php_method_uninstall);
+						// decode php_helper_both
+						$item->php_helper_both = base64_decode($item->php_helper_both);
+						// decode php_admin_event
+						$item->php_admin_event = base64_decode($item->php_admin_event);
+						// decode php_helper_admin
+						$item->php_helper_admin = base64_decode($item->php_helper_admin);
+						// decode php_helper_site
+						$item->php_helper_site = base64_decode($item->php_helper_site);
+						// decode javascript
+						$item->javascript = base64_decode($item->javascript);
+						// decode css_site
+						$item->css_site = base64_decode($item->css_site);
 						if ($basickey && !is_numeric($item->whmcs_key) && $item->whmcs_key === base64_encode(base64_decode($item->whmcs_key, true)))
 						{
 							// decrypt whmcs_key
@@ -1742,22 +1758,6 @@ class ComponentbuilderModelJoomla_components extends JModelList
 						$item->php_postflight_update = base64_decode($item->php_postflight_update);
 						// decode sql
 						$item->sql = base64_decode($item->sql);
-						// decode php_helper_both
-						$item->php_helper_both = base64_decode($item->php_helper_both);
-						// decode php_helper_admin
-						$item->php_helper_admin = base64_decode($item->php_helper_admin);
-						// decode php_admin_event
-						$item->php_admin_event = base64_decode($item->php_admin_event);
-						// decode php_helper_site
-						$item->php_helper_site = base64_decode($item->php_helper_site);
-						// decode php_site_event
-						$item->php_site_event = base64_decode($item->php_site_event);
-						// decode javascript
-						$item->javascript = base64_decode($item->javascript);
-						// decode css_admin
-						$item->css_admin = base64_decode($item->css_admin);
-						// decode css_site
-						$item->css_site = base64_decode($item->css_site);
 						if ($basickey && !is_numeric($item->export_key) && $item->export_key === base64_encode(base64_decode($item->export_key, true)))
 						{
 							// decrypt export_key

admin/sql/updates/mysql/2.6.17.sql

@@ -0,0 +1,5 @@
+ALTER TABLE `#__componentbuilder_joomla_component` ADD `dashboard` VARCHAR(64) NOT NULL DEFAULT '' AFTER `css_site`;
+
+ALTER TABLE `#__componentbuilder_joomla_component` ADD `dashboard_type` TINYINT(1) NOT NULL DEFAULT 1 AFTER `dashboard`;
+
+UPDATE `#__componentbuilder_joomla_component` SET `dashboard_type`=1;

admin/views/admin_view/tmpl/edit.php

@@ -219,382 +219,348 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 
 <script type="text/javascript">
 
-// #jform_add_css_view listeners for add_css_view_vvvvvwx function
+// #jform_add_css_view listeners for add_css_view_vvvvvwz function
 jQuery('#jform_add_css_view').on('keyup',function()
 {
-	var add_css_view_vvvvvwx = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	var add_css_view_vvvvvwz = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvvwx(add_css_view_vvvvvwx);
+	vvvvvwz(add_css_view_vvvvvwz);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css_view',function (e)
 {
 	e.preventDefault();
-	var add_css_view_vvvvvwx = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	var add_css_view_vvvvvwz = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvvwx(add_css_view_vvvvvwx);
+	vvvvvwz(add_css_view_vvvvvwz);
 
 });
 
-// #jform_add_css_views listeners for add_css_views_vvvvvwy function
+// #jform_add_css_views listeners for add_css_views_vvvvvxa function
 jQuery('#jform_add_css_views').on('keyup',function()
 {
-	var add_css_views_vvvvvwy = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	var add_css_views_vvvvvxa = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvvwy(add_css_views_vvvvvwy);
+	vvvvvxa(add_css_views_vvvvvxa);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css_views',function (e)
 {
 	e.preventDefault();
-	var add_css_views_vvvvvwy = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	var add_css_views_vvvvvxa = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvvwy(add_css_views_vvvvvwy);
+	vvvvvxa(add_css_views_vvvvvxa);
 
 });
 
-// #jform_add_javascript_view_file listeners for add_javascript_view_file_vvvvvwz function
+// #jform_add_javascript_view_file listeners for add_javascript_view_file_vvvvvxb function
 jQuery('#jform_add_javascript_view_file').on('keyup',function()
 {
-	var add_javascript_view_file_vvvvvwz = jQuery("#jform_add_javascript_view_file input[type='radio']:checked").val();
+	var add_javascript_view_file_vvvvvxb = jQuery("#jform_add_javascript_view_file input[type='radio']:checked").val();
-	vvvvvwz(add_javascript_view_file_vvvvvwz);
+	vvvvvxb(add_javascript_view_file_vvvvvxb);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_view_file',function (e)
 {
 	e.preventDefault();
-	var add_javascript_view_file_vvvvvwz = jQuery("#jform_add_javascript_view_file input[type='radio']:checked").val();
+	var add_javascript_view_file_vvvvvxb = jQuery("#jform_add_javascript_view_file input[type='radio']:checked").val();
-	vvvvvwz(add_javascript_view_file_vvvvvwz);
+	vvvvvxb(add_javascript_view_file_vvvvvxb);
 
 });
 
-// #jform_add_javascript_views_file listeners for add_javascript_views_file_vvvvvxa function
+// #jform_add_javascript_views_file listeners for add_javascript_views_file_vvvvvxc function
 jQuery('#jform_add_javascript_views_file').on('keyup',function()
 {
-	var add_javascript_views_file_vvvvvxa = jQuery("#jform_add_javascript_views_file input[type='radio']:checked").val();
+	var add_javascript_views_file_vvvvvxc = jQuery("#jform_add_javascript_views_file input[type='radio']:checked").val();
-	vvvvvxa(add_javascript_views_file_vvvvvxa);
+	vvvvvxc(add_javascript_views_file_vvvvvxc);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_views_file',function (e)
 {
 	e.preventDefault();
-	var add_javascript_views_file_vvvvvxa = jQuery("#jform_add_javascript_views_file input[type='radio']:checked").val();
+	var add_javascript_views_file_vvvvvxc = jQuery("#jform_add_javascript_views_file input[type='radio']:checked").val();
-	vvvvvxa(add_javascript_views_file_vvvvvxa);
+	vvvvvxc(add_javascript_views_file_vvvvvxc);
 
 });
 
-// #jform_add_javascript_view_footer listeners for add_javascript_view_footer_vvvvvxb function
+// #jform_add_javascript_view_footer listeners for add_javascript_view_footer_vvvvvxd function
 jQuery('#jform_add_javascript_view_footer').on('keyup',function()
 {
-	var add_javascript_view_footer_vvvvvxb = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	var add_javascript_view_footer_vvvvvxd = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvvxb(add_javascript_view_footer_vvvvvxb);
+	vvvvvxd(add_javascript_view_footer_vvvvvxd);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_view_footer',function (e)
 {
 	e.preventDefault();
-	var add_javascript_view_footer_vvvvvxb = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	var add_javascript_view_footer_vvvvvxd = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvvxb(add_javascript_view_footer_vvvvvxb);
+	vvvvvxd(add_javascript_view_footer_vvvvvxd);
 
 });
 
-// #jform_add_javascript_views_footer listeners for add_javascript_views_footer_vvvvvxc function
+// #jform_add_javascript_views_footer listeners for add_javascript_views_footer_vvvvvxe function
 jQuery('#jform_add_javascript_views_footer').on('keyup',function()
 {
-	var add_javascript_views_footer_vvvvvxc = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	var add_javascript_views_footer_vvvvvxe = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
-	vvvvvxc(add_javascript_views_footer_vvvvvxc);
+	vvvvvxe(add_javascript_views_footer_vvvvvxe);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_views_footer',function (e)
 {
 	e.preventDefault();
-	var add_javascript_views_footer_vvvvvxc = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	var add_javascript_views_footer_vvvvvxe = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
-	vvvvvxc(add_javascript_views_footer_vvvvvxc);
+	vvvvvxe(add_javascript_views_footer_vvvvvxe);
 
 });
 
-// #jform_add_php_ajax listeners for add_php_ajax_vvvvvxd function
+// #jform_add_php_ajax listeners for add_php_ajax_vvvvvxf function
 jQuery('#jform_add_php_ajax').on('keyup',function()
 {
-	var add_php_ajax_vvvvvxd = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	var add_php_ajax_vvvvvxf = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvxd(add_php_ajax_vvvvvxd);
+	vvvvvxf(add_php_ajax_vvvvvxf);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_ajax',function (e)
 {
 	e.preventDefault();
-	var add_php_ajax_vvvvvxd = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	var add_php_ajax_vvvvvxf = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvxd(add_php_ajax_vvvvvxd);
+	vvvvvxf(add_php_ajax_vvvvvxf);
 
 });
 
-// #jform_add_php_getitem listeners for add_php_getitem_vvvvvxe function
+// #jform_add_php_getitem listeners for add_php_getitem_vvvvvxg function
 jQuery('#jform_add_php_getitem').on('keyup',function()
 {
-	var add_php_getitem_vvvvvxe = jQuery("#jform_add_php_getitem input[type='radio']:checked").val();
+	var add_php_getitem_vvvvvxg = jQuery("#jform_add_php_getitem input[type='radio']:checked").val();
-	vvvvvxe(add_php_getitem_vvvvvxe);
+	vvvvvxg(add_php_getitem_vvvvvxg);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_getitem',function (e)
 {
 	e.preventDefault();
-	var add_php_getitem_vvvvvxe = jQuery("#jform_add_php_getitem input[type='radio']:checked").val();
+	var add_php_getitem_vvvvvxg = jQuery("#jform_add_php_getitem input[type='radio']:checked").val();
-	vvvvvxe(add_php_getitem_vvvvvxe);
+	vvvvvxg(add_php_getitem_vvvvvxg);
 
 });
 
-// #jform_add_php_getitems listeners for add_php_getitems_vvvvvxf function
+// #jform_add_php_getitems listeners for add_php_getitems_vvvvvxh function
 jQuery('#jform_add_php_getitems').on('keyup',function()
 {
-	var add_php_getitems_vvvvvxf = jQuery("#jform_add_php_getitems input[type='radio']:checked").val();
+	var add_php_getitems_vvvvvxh = jQuery("#jform_add_php_getitems input[type='radio']:checked").val();
-	vvvvvxf(add_php_getitems_vvvvvxf);
+	vvvvvxh(add_php_getitems_vvvvvxh);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_getitems',function (e)
 {
 	e.preventDefault();
-	var add_php_getitems_vvvvvxf = jQuery("#jform_add_php_getitems input[type='radio']:checked").val();
+	var add_php_getitems_vvvvvxh = jQuery("#jform_add_php_getitems input[type='radio']:checked").val();
-	vvvvvxf(add_php_getitems_vvvvvxf);
+	vvvvvxh(add_php_getitems_vvvvvxh);
 
 });
 
-// #jform_add_php_getitems_after_all listeners for add_php_getitems_after_all_vvvvvxg function
+// #jform_add_php_getitems_after_all listeners for add_php_getitems_after_all_vvvvvxi function
 jQuery('#jform_add_php_getitems_after_all').on('keyup',function()
 {
-	var add_php_getitems_after_all_vvvvvxg = jQuery("#jform_add_php_getitems_after_all input[type='radio']:checked").val();
+	var add_php_getitems_after_all_vvvvvxi = jQuery("#jform_add_php_getitems_after_all input[type='radio']:checked").val();
-	vvvvvxg(add_php_getitems_after_all_vvvvvxg);
+	vvvvvxi(add_php_getitems_after_all_vvvvvxi);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_getitems_after_all',function (e)
 {
 	e.preventDefault();
-	var add_php_getitems_after_all_vvvvvxg = jQuery("#jform_add_php_getitems_after_all input[type='radio']:checked").val();
+	var add_php_getitems_after_all_vvvvvxi = jQuery("#jform_add_php_getitems_after_all input[type='radio']:checked").val();
-	vvvvvxg(add_php_getitems_after_all_vvvvvxg);
+	vvvvvxi(add_php_getitems_after_all_vvvvvxi);
 
 });
 
-// #jform_add_php_getlistquery listeners for add_php_getlistquery_vvvvvxh function
+// #jform_add_php_getlistquery listeners for add_php_getlistquery_vvvvvxj function
 jQuery('#jform_add_php_getlistquery').on('keyup',function()
 {
-	var add_php_getlistquery_vvvvvxh = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvxj = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
-	vvvvvxh(add_php_getlistquery_vvvvvxh);
+	vvvvvxj(add_php_getlistquery_vvvvvxj);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_getlistquery',function (e)
 {
 	e.preventDefault();
-	var add_php_getlistquery_vvvvvxh = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvxj = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
-	vvvvvxh(add_php_getlistquery_vvvvvxh);
+	vvvvvxj(add_php_getlistquery_vvvvvxj);
 
 });
 
-// #jform_add_php_before_save listeners for add_php_before_save_vvvvvxi function
+// #jform_add_php_before_save listeners for add_php_before_save_vvvvvxk function
 jQuery('#jform_add_php_before_save').on('keyup',function()
 {
-	var add_php_before_save_vvvvvxi = jQuery("#jform_add_php_before_save input[type='radio']:checked").val();
+	var add_php_before_save_vvvvvxk = jQuery("#jform_add_php_before_save input[type='radio']:checked").val();
-	vvvvvxi(add_php_before_save_vvvvvxi);
+	vvvvvxk(add_php_before_save_vvvvvxk);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_before_save',function (e)
 {
 	e.preventDefault();
-	var add_php_before_save_vvvvvxi = jQuery("#jform_add_php_before_save input[type='radio']:checked").val();
+	var add_php_before_save_vvvvvxk = jQuery("#jform_add_php_before_save input[type='radio']:checked").val();
-	vvvvvxi(add_php_before_save_vvvvvxi);
+	vvvvvxk(add_php_before_save_vvvvvxk);
 
 });
 
-// #jform_add_php_save listeners for add_php_save_vvvvvxj function
+// #jform_add_php_save listeners for add_php_save_vvvvvxl function
 jQuery('#jform_add_php_save').on('keyup',function()
 {
-	var add_php_save_vvvvvxj = jQuery("#jform_add_php_save input[type='radio']:checked").val();
+	var add_php_save_vvvvvxl = jQuery("#jform_add_php_save input[type='radio']:checked").val();
-	vvvvvxj(add_php_save_vvvvvxj);
+	vvvvvxl(add_php_save_vvvvvxl);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_save',function (e)
 {
 	e.preventDefault();
-	var add_php_save_vvvvvxj = jQuery("#jform_add_php_save input[type='radio']:checked").val();
+	var add_php_save_vvvvvxl = jQuery("#jform_add_php_save input[type='radio']:checked").val();
-	vvvvvxj(add_php_save_vvvvvxj);
+	vvvvvxl(add_php_save_vvvvvxl);
 
 });
 
-// #jform_add_php_postsavehook listeners for add_php_postsavehook_vvvvvxk function
+// #jform_add_php_postsavehook listeners for add_php_postsavehook_vvvvvxm function
 jQuery('#jform_add_php_postsavehook').on('keyup',function()
 {
-	var add_php_postsavehook_vvvvvxk = jQuery("#jform_add_php_postsavehook input[type='radio']:checked").val();
+	var add_php_postsavehook_vvvvvxm = jQuery("#jform_add_php_postsavehook input[type='radio']:checked").val();
-	vvvvvxk(add_php_postsavehook_vvvvvxk);
+	vvvvvxm(add_php_postsavehook_vvvvvxm);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_postsavehook',function (e)
 {
 	e.preventDefault();
-	var add_php_postsavehook_vvvvvxk = jQuery("#jform_add_php_postsavehook input[type='radio']:checked").val();
+	var add_php_postsavehook_vvvvvxm = jQuery("#jform_add_php_postsavehook input[type='radio']:checked").val();
-	vvvvvxk(add_php_postsavehook_vvvvvxk);
+	vvvvvxm(add_php_postsavehook_vvvvvxm);
 
 });
 
-// #jform_add_php_allowedit listeners for add_php_allowedit_vvvvvxl function
+// #jform_add_php_allowedit listeners for add_php_allowedit_vvvvvxn function
 jQuery('#jform_add_php_allowedit').on('keyup',function()
 {
-	var add_php_allowedit_vvvvvxl = jQuery("#jform_add_php_allowedit input[type='radio']:checked").val();
+	var add_php_allowedit_vvvvvxn = jQuery("#jform_add_php_allowedit input[type='radio']:checked").val();
-	vvvvvxl(add_php_allowedit_vvvvvxl);
+	vvvvvxn(add_php_allowedit_vvvvvxn);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_allowedit',function (e)
 {
 	e.preventDefault();
-	var add_php_allowedit_vvvvvxl = jQuery("#jform_add_php_allowedit input[type='radio']:checked").val();
+	var add_php_allowedit_vvvvvxn = jQuery("#jform_add_php_allowedit input[type='radio']:checked").val();
-	vvvvvxl(add_php_allowedit_vvvvvxl);
+	vvvvvxn(add_php_allowedit_vvvvvxn);
 
 });
 
-// #jform_add_php_batchcopy listeners for add_php_batchcopy_vvvvvxm function
+// #jform_add_php_batchcopy listeners for add_php_batchcopy_vvvvvxo function
 jQuery('#jform_add_php_batchcopy').on('keyup',function()
 {
-	var add_php_batchcopy_vvvvvxm = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val();
+	var add_php_batchcopy_vvvvvxo = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val();
-	vvvvvxm(add_php_batchcopy_vvvvvxm);
+	vvvvvxo(add_php_batchcopy_vvvvvxo);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_batchcopy',function (e)
 {
 	e.preventDefault();
-	var add_php_batchcopy_vvvvvxm = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val();
+	var add_php_batchcopy_vvvvvxo = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val();
-	vvvvvxm(add_php_batchcopy_vvvvvxm);
+	vvvvvxo(add_php_batchcopy_vvvvvxo);
 
 });
 
-// #jform_add_php_batchmove listeners for add_php_batchmove_vvvvvxn function
+// #jform_add_php_batchmove listeners for add_php_batchmove_vvvvvxp function
 jQuery('#jform_add_php_batchmove').on('keyup',function()
 {
-	var add_php_batchmove_vvvvvxn = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val();
+	var add_php_batchmove_vvvvvxp = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val();
-	vvvvvxn(add_php_batchmove_vvvvvxn);
+	vvvvvxp(add_php_batchmove_vvvvvxp);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_batchmove',function (e)
 {
 	e.preventDefault();
-	var add_php_batchmove_vvvvvxn = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val();
+	var add_php_batchmove_vvvvvxp = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val();
-	vvvvvxn(add_php_batchmove_vvvvvxn);
+	vvvvvxp(add_php_batchmove_vvvvvxp);
 
 });
 
-// #jform_add_php_before_publish listeners for add_php_before_publish_vvvvvxo function
+// #jform_add_php_before_publish listeners for add_php_before_publish_vvvvvxq function
 jQuery('#jform_add_php_before_publish').on('keyup',function()
 {
-	var add_php_before_publish_vvvvvxo = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val();
+	var add_php_before_publish_vvvvvxq = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val();
-	vvvvvxo(add_php_before_publish_vvvvvxo);
+	vvvvvxq(add_php_before_publish_vvvvvxq);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_before_publish',function (e)
 {
 	e.preventDefault();
-	var add_php_before_publish_vvvvvxo = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val();
+	var add_php_before_publish_vvvvvxq = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val();
-	vvvvvxo(add_php_before_publish_vvvvvxo);
+	vvvvvxq(add_php_before_publish_vvvvvxq);
 
 });
 
-// #jform_add_php_after_publish listeners for add_php_after_publish_vvvvvxp function
+// #jform_add_php_after_publish listeners for add_php_after_publish_vvvvvxr function
 jQuery('#jform_add_php_after_publish').on('keyup',function()
 {
-	var add_php_after_publish_vvvvvxp = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val();
+	var add_php_after_publish_vvvvvxr = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val();
-	vvvvvxp(add_php_after_publish_vvvvvxp);
+	vvvvvxr(add_php_after_publish_vvvvvxr);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_after_publish',function (e)
 {
 	e.preventDefault();
-	var add_php_after_publish_vvvvvxp = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val();
+	var add_php_after_publish_vvvvvxr = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val();
-	vvvvvxp(add_php_after_publish_vvvvvxp);
+	vvvvvxr(add_php_after_publish_vvvvvxr);
 
 });
 
-// #jform_add_php_before_delete listeners for add_php_before_delete_vvvvvxq function
+// #jform_add_php_before_delete listeners for add_php_before_delete_vvvvvxs function
 jQuery('#jform_add_php_before_delete').on('keyup',function()
 {
-	var add_php_before_delete_vvvvvxq = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val();
+	var add_php_before_delete_vvvvvxs = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val();
-	vvvvvxq(add_php_before_delete_vvvvvxq);
+	vvvvvxs(add_php_before_delete_vvvvvxs);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_before_delete',function (e)
 {
 	e.preventDefault();
-	var add_php_before_delete_vvvvvxq = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val();
+	var add_php_before_delete_vvvvvxs = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val();
-	vvvvvxq(add_php_before_delete_vvvvvxq);
+	vvvvvxs(add_php_before_delete_vvvvvxs);
 
 });
 
-// #jform_add_php_after_delete listeners for add_php_after_delete_vvvvvxr function
+// #jform_add_php_after_delete listeners for add_php_after_delete_vvvvvxt function
 jQuery('#jform_add_php_after_delete').on('keyup',function()
 {
-	var add_php_after_delete_vvvvvxr = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val();
+	var add_php_after_delete_vvvvvxt = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val();
-	vvvvvxr(add_php_after_delete_vvvvvxr);
+	vvvvvxt(add_php_after_delete_vvvvvxt);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_after_delete',function (e)
 {
 	e.preventDefault();
-	var add_php_after_delete_vvvvvxr = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val();
+	var add_php_after_delete_vvvvvxt = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val();
-	vvvvvxr(add_php_after_delete_vvvvvxr);
+	vvvvvxt(add_php_after_delete_vvvvvxt);
 
 });
 
-// #jform_add_php_document listeners for add_php_document_vvvvvxs function
+// #jform_add_php_document listeners for add_php_document_vvvvvxu function
 jQuery('#jform_add_php_document').on('keyup',function()
 {
-	var add_php_document_vvvvvxs = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	var add_php_document_vvvvvxu = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvxs(add_php_document_vvvvvxs);
+	vvvvvxu(add_php_document_vvvvvxu);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_document',function (e)
 {
 	e.preventDefault();
-	var add_php_document_vvvvvxs = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	var add_php_document_vvvvvxu = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvxs(add_php_document_vvvvvxs);
+	vvvvvxu(add_php_document_vvvvvxu);
 
 });
 
-// #jform_add_sql listeners for add_sql_vvvvvxt function
+// #jform_add_sql listeners for add_sql_vvvvvxv function
 jQuery('#jform_add_sql').on('keyup',function()
 {
-	var add_sql_vvvvvxt = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	var add_sql_vvvvvxv = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxt(add_sql_vvvvvxt);
+	vvvvvxv(add_sql_vvvvvxv);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_sql',function (e)
 {
 	e.preventDefault();
-	var add_sql_vvvvvxt = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	var add_sql_vvvvvxv = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxt(add_sql_vvvvvxt);
+	vvvvvxv(add_sql_vvvvvxv);
-
-});
-
-// #jform_source listeners for source_vvvvvxu function
-jQuery('#jform_source').on('keyup',function()
-{
-	var source_vvvvvxu = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvxu = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxu(source_vvvvvxu,add_sql_vvvvvxu);
-
-});
-jQuery('#adminForm').on('change', '#jform_source',function (e)
-{
-	e.preventDefault();
-	var source_vvvvvxu = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvxu = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxu(source_vvvvvxu,add_sql_vvvvvxu);
-
-});
-
-// #jform_add_sql listeners for add_sql_vvvvvxu function
-jQuery('#jform_add_sql').on('keyup',function()
-{
-	var source_vvvvvxu = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvxu = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxu(source_vvvvvxu,add_sql_vvvvvxu);
-
-});
-jQuery('#adminForm').on('change', '#jform_add_sql',function (e)
-{
-	e.preventDefault();
-	var source_vvvvvxu = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvxu = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxu(source_vvvvvxu,add_sql_vvvvvxu);
 
 });
 
@@ -632,48 +598,82 @@ jQuery('#adminForm').on('change', '#jform_add_sql',function (e)
 
 });
 
-// #jform_add_custom_import listeners for add_custom_import_vvvvvxy function
+// #jform_source listeners for source_vvvvvxy function
+jQuery('#jform_source').on('keyup',function()
+{
+	var source_vvvvvxy = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvxy = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvxy(source_vvvvvxy,add_sql_vvvvvxy);
+
+});
+jQuery('#adminForm').on('change', '#jform_source',function (e)
+{
+	e.preventDefault();
+	var source_vvvvvxy = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvxy = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvxy(source_vvvvvxy,add_sql_vvvvvxy);
+
+});
+
+// #jform_add_sql listeners for add_sql_vvvvvxy function
+jQuery('#jform_add_sql').on('keyup',function()
+{
+	var source_vvvvvxy = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvxy = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvxy(source_vvvvvxy,add_sql_vvvvvxy);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_sql',function (e)
+{
+	e.preventDefault();
+	var source_vvvvvxy = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvxy = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvxy(source_vvvvvxy,add_sql_vvvvvxy);
+
+});
+
+// #jform_add_custom_import listeners for add_custom_import_vvvvvya function
 jQuery('#jform_add_custom_import').on('keyup',function()
 {
-	var add_custom_import_vvvvvxy = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
+	var add_custom_import_vvvvvya = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
-	vvvvvxy(add_custom_import_vvvvvxy);
+	vvvvvya(add_custom_import_vvvvvya);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_custom_import',function (e)
 {
 	e.preventDefault();
-	var add_custom_import_vvvvvxy = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
+	var add_custom_import_vvvvvya = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
-	vvvvvxy(add_custom_import_vvvvvxy);
+	vvvvvya(add_custom_import_vvvvvya);
 
 });
 
-// #jform_add_custom_import listeners for add_custom_import_vvvvvxz function
+// #jform_add_custom_import listeners for add_custom_import_vvvvvyb function
 jQuery('#jform_add_custom_import').on('keyup',function()
 {
-	var add_custom_import_vvvvvxz = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
+	var add_custom_import_vvvvvyb = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
-	vvvvvxz(add_custom_import_vvvvvxz);
+	vvvvvyb(add_custom_import_vvvvvyb);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_custom_import',function (e)
 {
 	e.preventDefault();
-	var add_custom_import_vvvvvxz = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
+	var add_custom_import_vvvvvyb = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
-	vvvvvxz(add_custom_import_vvvvvxz);
+	vvvvvyb(add_custom_import_vvvvvyb);
 
 });
 
-// #jform_add_custom_button listeners for add_custom_button_vvvvvya function
+// #jform_add_custom_button listeners for add_custom_button_vvvvvyc function
 jQuery('#jform_add_custom_button').on('keyup',function()
 {
-	var add_custom_button_vvvvvya = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	var add_custom_button_vvvvvyc = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvya(add_custom_button_vvvvvya);
+	vvvvvyc(add_custom_button_vvvvvyc);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_custom_button',function (e)
 {
 	e.preventDefault();
-	var add_custom_button_vvvvvya = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	var add_custom_button_vvvvvyc = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvya(add_custom_button_vvvvvya);
+	vvvvvyc(add_custom_button_vvvvvyc);
 
 });
 

admin/views/custom_admin_view/tmpl/edit.php

@@ -173,153 +173,153 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 
 <script type="text/javascript">
 
-// #jform_add_php_view listeners for add_php_view_vvvvvyb function
+// #jform_add_php_view listeners for add_php_view_vvvvvyd function
 jQuery('#jform_add_php_view').on('keyup',function()
 {
-	var add_php_view_vvvvvyb = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvyd = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyb(add_php_view_vvvvvyb);
+	vvvvvyd(add_php_view_vvvvvyd);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_view',function (e)
 {
 	e.preventDefault();
-	var add_php_view_vvvvvyb = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvyd = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyb(add_php_view_vvvvvyb);
+	vvvvvyd(add_php_view_vvvvvyd);
 
 });
 
-// #jform_add_php_jview_display listeners for add_php_jview_display_vvvvvyc function
+// #jform_add_php_jview_display listeners for add_php_jview_display_vvvvvye function
 jQuery('#jform_add_php_jview_display').on('keyup',function()
 {
-	var add_php_jview_display_vvvvvyc = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	var add_php_jview_display_vvvvvye = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvyc(add_php_jview_display_vvvvvyc);
+	vvvvvye(add_php_jview_display_vvvvvye);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_jview_display',function (e)
 {
 	e.preventDefault();
-	var add_php_jview_display_vvvvvyc = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	var add_php_jview_display_vvvvvye = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvyc(add_php_jview_display_vvvvvyc);
+	vvvvvye(add_php_jview_display_vvvvvye);
 
 });
 
-// #jform_add_php_jview listeners for add_php_jview_vvvvvyd function
+// #jform_add_php_jview listeners for add_php_jview_vvvvvyf function
 jQuery('#jform_add_php_jview').on('keyup',function()
 {
-	var add_php_jview_vvvvvyd = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	var add_php_jview_vvvvvyf = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyd(add_php_jview_vvvvvyd);
+	vvvvvyf(add_php_jview_vvvvvyf);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_jview',function (e)
 {
 	e.preventDefault();
-	var add_php_jview_vvvvvyd = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	var add_php_jview_vvvvvyf = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyd(add_php_jview_vvvvvyd);
+	vvvvvyf(add_php_jview_vvvvvyf);
 
 });
 
-// #jform_add_php_document listeners for add_php_document_vvvvvye function
+// #jform_add_php_document listeners for add_php_document_vvvvvyg function
 jQuery('#jform_add_php_document').on('keyup',function()
 {
-	var add_php_document_vvvvvye = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	var add_php_document_vvvvvyg = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvye(add_php_document_vvvvvye);
+	vvvvvyg(add_php_document_vvvvvyg);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_document',function (e)
 {
 	e.preventDefault();
-	var add_php_document_vvvvvye = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	var add_php_document_vvvvvyg = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvye(add_php_document_vvvvvye);
+	vvvvvyg(add_php_document_vvvvvyg);
 
 });
 
-// #jform_add_css_document listeners for add_css_document_vvvvvyf function
+// #jform_add_css_document listeners for add_css_document_vvvvvyh function
 jQuery('#jform_add_css_document').on('keyup',function()
 {
-	var add_css_document_vvvvvyf = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	var add_css_document_vvvvvyh = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvyf(add_css_document_vvvvvyf);
+	vvvvvyh(add_css_document_vvvvvyh);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css_document',function (e)
 {
 	e.preventDefault();
-	var add_css_document_vvvvvyf = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	var add_css_document_vvvvvyh = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvyf(add_css_document_vvvvvyf);
+	vvvvvyh(add_css_document_vvvvvyh);
 
 });
 
-// #jform_add_javascript_file listeners for add_javascript_file_vvvvvyg function
+// #jform_add_javascript_file listeners for add_javascript_file_vvvvvyi function
 jQuery('#jform_add_javascript_file').on('keyup',function()
 {
-	var add_javascript_file_vvvvvyg = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	var add_javascript_file_vvvvvyi = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvyg(add_javascript_file_vvvvvyg);
+	vvvvvyi(add_javascript_file_vvvvvyi);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_file',function (e)
 {
 	e.preventDefault();
-	var add_javascript_file_vvvvvyg = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	var add_javascript_file_vvvvvyi = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvyg(add_javascript_file_vvvvvyg);
+	vvvvvyi(add_javascript_file_vvvvvyi);
 
 });
 
-// #jform_add_js_document listeners for add_js_document_vvvvvyh function
+// #jform_add_js_document listeners for add_js_document_vvvvvyj function
 jQuery('#jform_add_js_document').on('keyup',function()
 {
-	var add_js_document_vvvvvyh = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	var add_js_document_vvvvvyj = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyh(add_js_document_vvvvvyh);
+	vvvvvyj(add_js_document_vvvvvyj);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_js_document',function (e)
 {
 	e.preventDefault();
-	var add_js_document_vvvvvyh = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	var add_js_document_vvvvvyj = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyh(add_js_document_vvvvvyh);
+	vvvvvyj(add_js_document_vvvvvyj);
 
 });
 
-// #jform_add_custom_button listeners for add_custom_button_vvvvvyi function
+// #jform_add_custom_button listeners for add_custom_button_vvvvvyk function
 jQuery('#jform_add_custom_button').on('keyup',function()
 {
-	var add_custom_button_vvvvvyi = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	var add_custom_button_vvvvvyk = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyi(add_custom_button_vvvvvyi);
+	vvvvvyk(add_custom_button_vvvvvyk);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_custom_button',function (e)
 {
 	e.preventDefault();
-	var add_custom_button_vvvvvyi = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	var add_custom_button_vvvvvyk = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyi(add_custom_button_vvvvvyi);
+	vvvvvyk(add_custom_button_vvvvvyk);
 
 });
 
-// #jform_add_css listeners for add_css_vvvvvyj function
+// #jform_add_css listeners for add_css_vvvvvyl function
 jQuery('#jform_add_css').on('keyup',function()
 {
-	var add_css_vvvvvyj = jQuery("#jform_add_css input[type='radio']:checked").val();
+	var add_css_vvvvvyl = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyj(add_css_vvvvvyj);
+	vvvvvyl(add_css_vvvvvyl);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css',function (e)
 {
 	e.preventDefault();
-	var add_css_vvvvvyj = jQuery("#jform_add_css input[type='radio']:checked").val();
+	var add_css_vvvvvyl = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyj(add_css_vvvvvyj);
+	vvvvvyl(add_css_vvvvvyl);
 
 });
 
-// #jform_add_php_ajax listeners for add_php_ajax_vvvvvyk function
+// #jform_add_php_ajax listeners for add_php_ajax_vvvvvym function
 jQuery('#jform_add_php_ajax').on('keyup',function()
 {
-	var add_php_ajax_vvvvvyk = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	var add_php_ajax_vvvvvym = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvyk(add_php_ajax_vvvvvyk);
+	vvvvvym(add_php_ajax_vvvvvym);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_ajax',function (e)
 {
 	e.preventDefault();
-	var add_php_ajax_vvvvvyk = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	var add_php_ajax_vvvvvym = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvyk(add_php_ajax_vvvvvyk);
+	vvvvvym(add_php_ajax_vvvvvym);
 
 });
 

admin/views/custom_code/tmpl/edit.php

@@ -127,101 +127,101 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 
 <script type="text/javascript">
 
-// #jform_target listeners for target_vvvvvzx function
-jQuery('#jform_target').on('keyup',function()
-{
-	var target_vvvvvzx = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzx(target_vvvvvzx);
-
-});
-jQuery('#adminForm').on('change', '#jform_target',function (e)
-{
-	e.preventDefault();
-	var target_vvvvvzx = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzx(target_vvvvvzx);
-
-});
-
-// #jform_target listeners for target_vvvvvzy function
-jQuery('#jform_target').on('keyup',function()
-{
-	var target_vvvvvzy = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzy(target_vvvvvzy);
-
-});
-jQuery('#adminForm').on('change', '#jform_target',function (e)
-{
-	e.preventDefault();
-	var target_vvvvvzy = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzy(target_vvvvvzy);
-
-});
-
 // #jform_target listeners for target_vvvvvzz function
 jQuery('#jform_target').on('keyup',function()
 {
 	var target_vvvvvzz = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvvzz = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvvzz(target_vvvvvzz);
-	vvvvvzz(target_vvvvvzz,type_vvvvvzz);
 
 });
 jQuery('#adminForm').on('change', '#jform_target',function (e)
 {
 	e.preventDefault();
 	var target_vvvvvzz = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvvzz = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvvzz(target_vvvvvzz);
-	vvvvvzz(target_vvvvvzz,type_vvvvvzz);
-
-});
-
-// #jform_type listeners for type_vvvvvzz function
-jQuery('#jform_type').on('keyup',function()
-{
-	var target_vvvvvzz = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvvzz = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvvzz(target_vvvvvzz,type_vvvvvzz);
-
-});
-jQuery('#adminForm').on('change', '#jform_type',function (e)
-{
-	e.preventDefault();
-	var target_vvvvvzz = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvvzz = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvvzz(target_vvvvvzz,type_vvvvvzz);
-
-});
-
-// #jform_type listeners for type_vvvvwaa function
-jQuery('#jform_type').on('keyup',function()
-{
-	var type_vvvvwaa = jQuery("#jform_type input[type='radio']:checked").val();
-	var target_vvvvwaa = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwaa(type_vvvvwaa,target_vvvvwaa);
-
-});
-jQuery('#adminForm').on('change', '#jform_type',function (e)
-{
-	e.preventDefault();
-	var type_vvvvwaa = jQuery("#jform_type input[type='radio']:checked").val();
-	var target_vvvvwaa = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwaa(type_vvvvwaa,target_vvvvwaa);
 
 });
 
 // #jform_target listeners for target_vvvvwaa function
 jQuery('#jform_target').on('keyup',function()
 {
-	var type_vvvvwaa = jQuery("#jform_type input[type='radio']:checked").val();
 	var target_vvvvwaa = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwaa(type_vvvvwaa,target_vvvvwaa);
+	vvvvwaa(target_vvvvwaa);
 
 });
 jQuery('#adminForm').on('change', '#jform_target',function (e)
 {
 	e.preventDefault();
-	var type_vvvvwaa = jQuery("#jform_type input[type='radio']:checked").val();
 	var target_vvvvwaa = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwaa(type_vvvvwaa,target_vvvvwaa);
+	vvvvwaa(target_vvvvwaa);
+
+});
+
+// #jform_target listeners for target_vvvvwab function
+jQuery('#jform_target').on('keyup',function()
+{
+	var target_vvvvwab = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvwab = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwab(target_vvvvwab,type_vvvvwab);
+
+});
+jQuery('#adminForm').on('change', '#jform_target',function (e)
+{
+	e.preventDefault();
+	var target_vvvvwab = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvwab = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwab(target_vvvvwab,type_vvvvwab);
+
+});
+
+// #jform_type listeners for type_vvvvwab function
+jQuery('#jform_type').on('keyup',function()
+{
+	var target_vvvvwab = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvwab = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwab(target_vvvvwab,type_vvvvwab);
+
+});
+jQuery('#adminForm').on('change', '#jform_type',function (e)
+{
+	e.preventDefault();
+	var target_vvvvwab = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvwab = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwab(target_vvvvwab,type_vvvvwab);
+
+});
+
+// #jform_type listeners for type_vvvvwac function
+jQuery('#jform_type').on('keyup',function()
+{
+	var type_vvvvwac = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwac = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwac(type_vvvvwac,target_vvvvwac);
+
+});
+jQuery('#adminForm').on('change', '#jform_type',function (e)
+{
+	e.preventDefault();
+	var type_vvvvwac = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwac = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwac(type_vvvvwac,target_vvvvwac);
+
+});
+
+// #jform_target listeners for target_vvvvwac function
+jQuery('#jform_target').on('keyup',function()
+{
+	var type_vvvvwac = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwac = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwac(type_vvvvwac,target_vvvvwac);
+
+});
+jQuery('#adminForm').on('change', '#jform_target',function (e)
+{
+	e.preventDefault();
+	var type_vvvvwac = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwac = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwac(type_vvvvwac,target_vvvvwac);
 
 });
 

admin/views/dynamic_get/tmpl/edit.php

@@ -167,48 +167,18 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 
 <script type="text/javascript">
 
-// #jform_gettype listeners for gettype_vvvvvyy function
+// #jform_gettype listeners for gettype_vvvvvza function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var gettype_vvvvvyy = jQuery("#jform_gettype").val();
+	var gettype_vvvvvza = jQuery("#jform_gettype").val();
-	vvvvvyy(gettype_vvvvvyy);
+	vvvvvza(gettype_vvvvvza);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var gettype_vvvvvyy = jQuery("#jform_gettype").val();
+	var gettype_vvvvvza = jQuery("#jform_gettype").val();
-	vvvvvyy(gettype_vvvvvyy);
+	vvvvvza(gettype_vvvvvza);
-
-});
-
-// #jform_main_source listeners for main_source_vvvvvyz function
-jQuery('#jform_main_source').on('keyup',function()
-{
-	var main_source_vvvvvyz = jQuery("#jform_main_source").val();
-	vvvvvyz(main_source_vvvvvyz);
-
-});
-jQuery('#adminForm').on('change', '#jform_main_source',function (e)
-{
-	e.preventDefault();
-	var main_source_vvvvvyz = jQuery("#jform_main_source").val();
-	vvvvvyz(main_source_vvvvvyz);
-
-});
-
-// #jform_main_source listeners for main_source_vvvvvza function
-jQuery('#jform_main_source').on('keyup',function()
-{
-	var main_source_vvvvvza = jQuery("#jform_main_source").val();
-	vvvvvza(main_source_vvvvvza);
-
-});
-jQuery('#adminForm').on('change', '#jform_main_source',function (e)
-{
-	e.preventDefault();
-	var main_source_vvvvvza = jQuery("#jform_main_source").val();
-	vvvvvza(main_source_vvvvvza);
 
 });
 
@@ -242,52 +212,33 @@ jQuery('#adminForm').on('change', '#jform_main_source',function (e)
 
 });
 
-// #jform_addcalculation listeners for addcalculation_vvvvvzd function
+// #jform_main_source listeners for main_source_vvvvvzd function
-jQuery('#jform_addcalculation').on('keyup',function()
+jQuery('#jform_main_source').on('keyup',function()
 {
-	var addcalculation_vvvvvzd = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var main_source_vvvvvzd = jQuery("#jform_main_source").val();
-	vvvvvzd(addcalculation_vvvvvzd);
+	vvvvvzd(main_source_vvvvvzd);
 
 });
-jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
+jQuery('#adminForm').on('change', '#jform_main_source',function (e)
 {
 	e.preventDefault();
-	var addcalculation_vvvvvzd = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var main_source_vvvvvzd = jQuery("#jform_main_source").val();
-	vvvvvzd(addcalculation_vvvvvzd);
+	vvvvvzd(main_source_vvvvvzd);
 
 });
 
-// #jform_addcalculation listeners for addcalculation_vvvvvze function
+// #jform_main_source listeners for main_source_vvvvvze function
-jQuery('#jform_addcalculation').on('keyup',function()
+jQuery('#jform_main_source').on('keyup',function()
 {
-	var addcalculation_vvvvvze = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var main_source_vvvvvze = jQuery("#jform_main_source").val();
-	var gettype_vvvvvze = jQuery("#jform_gettype").val();
+	vvvvvze(main_source_vvvvvze);
-	vvvvvze(addcalculation_vvvvvze,gettype_vvvvvze);
 
 });
-jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
+jQuery('#adminForm').on('change', '#jform_main_source',function (e)
 {
 	e.preventDefault();
-	var addcalculation_vvvvvze = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var main_source_vvvvvze = jQuery("#jform_main_source").val();
-	var gettype_vvvvvze = jQuery("#jform_gettype").val();
+	vvvvvze(main_source_vvvvvze);
-	vvvvvze(addcalculation_vvvvvze,gettype_vvvvvze);
-
-});
-
-// #jform_gettype listeners for gettype_vvvvvze function
-jQuery('#jform_gettype').on('keyup',function()
-{
-	var addcalculation_vvvvvze = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvze = jQuery("#jform_gettype").val();
-	vvvvvze(addcalculation_vvvvvze,gettype_vvvvvze);
-
-});
-jQuery('#adminForm').on('change', '#jform_gettype',function (e)
-{
-	e.preventDefault();
-	var addcalculation_vvvvvze = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvze = jQuery("#jform_gettype").val();
-	vvvvvze(addcalculation_vvvvvze,gettype_vvvvvze);
 
 });
 
@@ -295,278 +246,297 @@ jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 jQuery('#jform_addcalculation').on('keyup',function()
 {
 	var addcalculation_vvvvvzf = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvzf = jQuery("#jform_gettype").val();
+	vvvvvzf(addcalculation_vvvvvzf);
-	vvvvvzf(addcalculation_vvvvvzf,gettype_vvvvvzf);
 
 });
 jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
 {
 	e.preventDefault();
 	var addcalculation_vvvvvzf = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvzf = jQuery("#jform_gettype").val();
+	vvvvvzf(addcalculation_vvvvvzf);
-	vvvvvzf(addcalculation_vvvvvzf,gettype_vvvvvzf);
 
 });
 
-// #jform_gettype listeners for gettype_vvvvvzf function
+// #jform_addcalculation listeners for addcalculation_vvvvvzg function
+jQuery('#jform_addcalculation').on('keyup',function()
+{
+	var addcalculation_vvvvvzg = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzg = jQuery("#jform_gettype").val();
+	vvvvvzg(addcalculation_vvvvvzg,gettype_vvvvvzg);
+
+});
+jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
+{
+	e.preventDefault();
+	var addcalculation_vvvvvzg = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzg = jQuery("#jform_gettype").val();
+	vvvvvzg(addcalculation_vvvvvzg,gettype_vvvvvzg);
+
+});
+
+// #jform_gettype listeners for gettype_vvvvvzg function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var addcalculation_vvvvvzf = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var addcalculation_vvvvvzg = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvzf = jQuery("#jform_gettype").val();
+	var gettype_vvvvvzg = jQuery("#jform_gettype").val();
-	vvvvvzf(addcalculation_vvvvvzf,gettype_vvvvvzf);
+	vvvvvzg(addcalculation_vvvvvzg,gettype_vvvvvzg);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var addcalculation_vvvvvzf = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var addcalculation_vvvvvzg = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvzf = jQuery("#jform_gettype").val();
+	var gettype_vvvvvzg = jQuery("#jform_gettype").val();
-	vvvvvzf(addcalculation_vvvvvzf,gettype_vvvvvzf);
+	vvvvvzg(addcalculation_vvvvvzg,gettype_vvvvvzg);
 
 });
 
-// #jform_main_source listeners for main_source_vvvvvzi function
+// #jform_addcalculation listeners for addcalculation_vvvvvzh function
+jQuery('#jform_addcalculation').on('keyup',function()
+{
+	var addcalculation_vvvvvzh = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzh = jQuery("#jform_gettype").val();
+	vvvvvzh(addcalculation_vvvvvzh,gettype_vvvvvzh);
+
+});
+jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
+{
+	e.preventDefault();
+	var addcalculation_vvvvvzh = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzh = jQuery("#jform_gettype").val();
+	vvvvvzh(addcalculation_vvvvvzh,gettype_vvvvvzh);
+
+});
+
+// #jform_gettype listeners for gettype_vvvvvzh function
+jQuery('#jform_gettype').on('keyup',function()
+{
+	var addcalculation_vvvvvzh = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzh = jQuery("#jform_gettype").val();
+	vvvvvzh(addcalculation_vvvvvzh,gettype_vvvvvzh);
+
+});
+jQuery('#adminForm').on('change', '#jform_gettype',function (e)
+{
+	e.preventDefault();
+	var addcalculation_vvvvvzh = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzh = jQuery("#jform_gettype").val();
+	vvvvvzh(addcalculation_vvvvvzh,gettype_vvvvvzh);
+
+});
+
+// #jform_main_source listeners for main_source_vvvvvzk function
 jQuery('#jform_main_source').on('keyup',function()
 {
-	var main_source_vvvvvzi = jQuery("#jform_main_source").val();
+	var main_source_vvvvvzk = jQuery("#jform_main_source").val();
-	vvvvvzi(main_source_vvvvvzi);
+	vvvvvzk(main_source_vvvvvzk);
 
 });
 jQuery('#adminForm').on('change', '#jform_main_source',function (e)
 {
 	e.preventDefault();
-	var main_source_vvvvvzi = jQuery("#jform_main_source").val();
+	var main_source_vvvvvzk = jQuery("#jform_main_source").val();
-	vvvvvzi(main_source_vvvvvzi);
+	vvvvvzk(main_source_vvvvvzk);
 
 });
 
-// #jform_main_source listeners for main_source_vvvvvzj function
+// #jform_main_source listeners for main_source_vvvvvzl function
 jQuery('#jform_main_source').on('keyup',function()
 {
-	var main_source_vvvvvzj = jQuery("#jform_main_source").val();
+	var main_source_vvvvvzl = jQuery("#jform_main_source").val();
-	vvvvvzj(main_source_vvvvvzj);
+	vvvvvzl(main_source_vvvvvzl);
 
 });
 jQuery('#adminForm').on('change', '#jform_main_source',function (e)
 {
 	e.preventDefault();
-	var main_source_vvvvvzj = jQuery("#jform_main_source").val();
+	var main_source_vvvvvzl = jQuery("#jform_main_source").val();
-	vvvvvzj(main_source_vvvvvzj);
+	vvvvvzl(main_source_vvvvvzl);
 
 });
 
-// #jform_add_php_before_getitem listeners for add_php_before_getitem_vvvvvzk function
+// #jform_add_php_before_getitem listeners for add_php_before_getitem_vvvvvzm function
 jQuery('#jform_add_php_before_getitem').on('keyup',function()
 {
-	var add_php_before_getitem_vvvvvzk = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
+	var add_php_before_getitem_vvvvvzm = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzk = jQuery("#jform_gettype").val();
+	var gettype_vvvvvzm = jQuery("#jform_gettype").val();
-	vvvvvzk(add_php_before_getitem_vvvvvzk,gettype_vvvvvzk);
+	vvvvvzm(add_php_before_getitem_vvvvvzm,gettype_vvvvvzm);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_before_getitem',function (e)
 {
 	e.preventDefault();
-	var add_php_before_getitem_vvvvvzk = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
+	var add_php_before_getitem_vvvvvzm = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzk = jQuery("#jform_gettype").val();
+	var gettype_vvvvvzm = jQuery("#jform_gettype").val();
-	vvvvvzk(add_php_before_getitem_vvvvvzk,gettype_vvvvvzk);
+	vvvvvzm(add_php_before_getitem_vvvvvzm,gettype_vvvvvzm);
 
 });
 
-// #jform_gettype listeners for gettype_vvvvvzk function
+// #jform_gettype listeners for gettype_vvvvvzm function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var add_php_before_getitem_vvvvvzk = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
+	var add_php_before_getitem_vvvvvzm = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzk = jQuery("#jform_gettype").val();
+	var gettype_vvvvvzm = jQuery("#jform_gettype").val();
-	vvvvvzk(add_php_before_getitem_vvvvvzk,gettype_vvvvvzk);
+	vvvvvzm(add_php_before_getitem_vvvvvzm,gettype_vvvvvzm);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var add_php_before_getitem_vvvvvzk = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
+	var add_php_before_getitem_vvvvvzm = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzk = jQuery("#jform_gettype").val();
+	var gettype_vvvvvzm = jQuery("#jform_gettype").val();
-	vvvvvzk(add_php_before_getitem_vvvvvzk,gettype_vvvvvzk);
+	vvvvvzm(add_php_before_getitem_vvvvvzm,gettype_vvvvvzm);
 
 });
 
-// #jform_add_php_after_getitem listeners for add_php_after_getitem_vvvvvzl function
+// #jform_add_php_after_getitem listeners for add_php_after_getitem_vvvvvzn function
 jQuery('#jform_add_php_after_getitem').on('keyup',function()
 {
-	var add_php_after_getitem_vvvvvzl = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var add_php_after_getitem_vvvvvzn = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzl = jQuery("#jform_gettype").val();
+	var gettype_vvvvvzn = jQuery("#jform_gettype").val();
-	vvvvvzl(add_php_after_getitem_vvvvvzl,gettype_vvvvvzl);
+	vvvvvzn(add_php_after_getitem_vvvvvzn,gettype_vvvvvzn);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_after_getitem',function (e)
 {
 	e.preventDefault();
-	var add_php_after_getitem_vvvvvzl = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var add_php_after_getitem_vvvvvzn = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzl = jQuery("#jform_gettype").val();
+	var gettype_vvvvvzn = jQuery("#jform_gettype").val();
-	vvvvvzl(add_php_after_getitem_vvvvvzl,gettype_vvvvvzl);
+	vvvvvzn(add_php_after_getitem_vvvvvzn,gettype_vvvvvzn);
-
-});
-
-// #jform_gettype listeners for gettype_vvvvvzl function
-jQuery('#jform_gettype').on('keyup',function()
-{
-	var add_php_after_getitem_vvvvvzl = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzl = jQuery("#jform_gettype").val();
-	vvvvvzl(add_php_after_getitem_vvvvvzl,gettype_vvvvvzl);
-
-});
-jQuery('#adminForm').on('change', '#jform_gettype',function (e)
-{
-	e.preventDefault();
-	var add_php_after_getitem_vvvvvzl = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzl = jQuery("#jform_gettype").val();
-	vvvvvzl(add_php_after_getitem_vvvvvzl,gettype_vvvvvzl);
 
 });
 
 // #jform_gettype listeners for gettype_vvvvvzn function
 jQuery('#jform_gettype').on('keyup',function()
 {
+	var add_php_after_getitem_vvvvvzn = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
 	var gettype_vvvvvzn = jQuery("#jform_gettype").val();
-	vvvvvzn(gettype_vvvvvzn);
+	vvvvvzn(add_php_after_getitem_vvvvvzn,gettype_vvvvvzn);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
+	var add_php_after_getitem_vvvvvzn = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
 	var gettype_vvvvvzn = jQuery("#jform_gettype").val();
-	vvvvvzn(gettype_vvvvvzn);
+	vvvvvzn(add_php_after_getitem_vvvvvzn,gettype_vvvvvzn);
-
-});
-
-// #jform_add_php_getlistquery listeners for add_php_getlistquery_vvvvvzo function
-jQuery('#jform_add_php_getlistquery').on('keyup',function()
-{
-	var add_php_getlistquery_vvvvvzo = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
-	var gettype_vvvvvzo = jQuery("#jform_gettype").val();
-	vvvvvzo(add_php_getlistquery_vvvvvzo,gettype_vvvvvzo);
-
-});
-jQuery('#adminForm').on('change', '#jform_add_php_getlistquery',function (e)
-{
-	e.preventDefault();
-	var add_php_getlistquery_vvvvvzo = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
-	var gettype_vvvvvzo = jQuery("#jform_gettype").val();
-	vvvvvzo(add_php_getlistquery_vvvvvzo,gettype_vvvvvzo);
-
-});
-
-// #jform_gettype listeners for gettype_vvvvvzo function
-jQuery('#jform_gettype').on('keyup',function()
-{
-	var add_php_getlistquery_vvvvvzo = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
-	var gettype_vvvvvzo = jQuery("#jform_gettype").val();
-	vvvvvzo(add_php_getlistquery_vvvvvzo,gettype_vvvvvzo);
-
-});
-jQuery('#adminForm').on('change', '#jform_gettype',function (e)
-{
-	e.preventDefault();
-	var add_php_getlistquery_vvvvvzo = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
-	var gettype_vvvvvzo = jQuery("#jform_gettype").val();
-	vvvvvzo(add_php_getlistquery_vvvvvzo,gettype_vvvvvzo);
-
-});
-
-// #jform_add_php_before_getitems listeners for add_php_before_getitems_vvvvvzp function
-jQuery('#jform_add_php_before_getitems').on('keyup',function()
-{
-	var add_php_before_getitems_vvvvvzp = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
-	var gettype_vvvvvzp = jQuery("#jform_gettype").val();
-	vvvvvzp(add_php_before_getitems_vvvvvzp,gettype_vvvvvzp);
-
-});
-jQuery('#adminForm').on('change', '#jform_add_php_before_getitems',function (e)
-{
-	e.preventDefault();
-	var add_php_before_getitems_vvvvvzp = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
-	var gettype_vvvvvzp = jQuery("#jform_gettype").val();
-	vvvvvzp(add_php_before_getitems_vvvvvzp,gettype_vvvvvzp);
 
 });
 
 // #jform_gettype listeners for gettype_vvvvvzp function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var add_php_before_getitems_vvvvvzp = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
 	var gettype_vvvvvzp = jQuery("#jform_gettype").val();
-	vvvvvzp(add_php_before_getitems_vvvvvzp,gettype_vvvvvzp);
+	vvvvvzp(gettype_vvvvvzp);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var add_php_before_getitems_vvvvvzp = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
 	var gettype_vvvvvzp = jQuery("#jform_gettype").val();
-	vvvvvzp(add_php_before_getitems_vvvvvzp,gettype_vvvvvzp);
+	vvvvvzp(gettype_vvvvvzp);
 
 });
 
-// #jform_add_php_after_getitems listeners for add_php_after_getitems_vvvvvzq function
+// #jform_add_php_getlistquery listeners for add_php_getlistquery_vvvvvzq function
-jQuery('#jform_add_php_after_getitems').on('keyup',function()
+jQuery('#jform_add_php_getlistquery').on('keyup',function()
 {
-	var add_php_after_getitems_vvvvvzq = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvzq = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzq = jQuery("#jform_gettype").val();
-	vvvvvzq(add_php_after_getitems_vvvvvzq,gettype_vvvvvzq);
+	vvvvvzq(add_php_getlistquery_vvvvvzq,gettype_vvvvvzq);
 
 });
-jQuery('#adminForm').on('change', '#jform_add_php_after_getitems',function (e)
+jQuery('#adminForm').on('change', '#jform_add_php_getlistquery',function (e)
 {
 	e.preventDefault();
-	var add_php_after_getitems_vvvvvzq = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvzq = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzq = jQuery("#jform_gettype").val();
-	vvvvvzq(add_php_after_getitems_vvvvvzq,gettype_vvvvvzq);
+	vvvvvzq(add_php_getlistquery_vvvvvzq,gettype_vvvvvzq);
 
 });
 
 // #jform_gettype listeners for gettype_vvvvvzq function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var add_php_after_getitems_vvvvvzq = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvzq = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzq = jQuery("#jform_gettype").val();
-	vvvvvzq(add_php_after_getitems_vvvvvzq,gettype_vvvvvzq);
+	vvvvvzq(add_php_getlistquery_vvvvvzq,gettype_vvvvvzq);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var add_php_after_getitems_vvvvvzq = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvzq = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzq = jQuery("#jform_gettype").val();
-	vvvvvzq(add_php_after_getitems_vvvvvzq,gettype_vvvvvzq);
+	vvvvvzq(add_php_getlistquery_vvvvvzq,gettype_vvvvvzq);
+
+});
+
+// #jform_add_php_before_getitems listeners for add_php_before_getitems_vvvvvzr function
+jQuery('#jform_add_php_before_getitems').on('keyup',function()
+{
+	var add_php_before_getitems_vvvvvzr = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+	var gettype_vvvvvzr = jQuery("#jform_gettype").val();
+	vvvvvzr(add_php_before_getitems_vvvvvzr,gettype_vvvvvzr);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_php_before_getitems',function (e)
+{
+	e.preventDefault();
+	var add_php_before_getitems_vvvvvzr = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+	var gettype_vvvvvzr = jQuery("#jform_gettype").val();
+	vvvvvzr(add_php_before_getitems_vvvvvzr,gettype_vvvvvzr);
+
+});
+
+// #jform_gettype listeners for gettype_vvvvvzr function
+jQuery('#jform_gettype').on('keyup',function()
+{
+	var add_php_before_getitems_vvvvvzr = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+	var gettype_vvvvvzr = jQuery("#jform_gettype").val();
+	vvvvvzr(add_php_before_getitems_vvvvvzr,gettype_vvvvvzr);
+
+});
+jQuery('#adminForm').on('change', '#jform_gettype',function (e)
+{
+	e.preventDefault();
+	var add_php_before_getitems_vvvvvzr = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+	var gettype_vvvvvzr = jQuery("#jform_gettype").val();
+	vvvvvzr(add_php_before_getitems_vvvvvzr,gettype_vvvvvzr);
+
+});
+
+// #jform_add_php_after_getitems listeners for add_php_after_getitems_vvvvvzs function
+jQuery('#jform_add_php_after_getitems').on('keyup',function()
+{
+	var add_php_after_getitems_vvvvvzs = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var gettype_vvvvvzs = jQuery("#jform_gettype").val();
+	vvvvvzs(add_php_after_getitems_vvvvvzs,gettype_vvvvvzs);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_php_after_getitems',function (e)
+{
+	e.preventDefault();
+	var add_php_after_getitems_vvvvvzs = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var gettype_vvvvvzs = jQuery("#jform_gettype").val();
+	vvvvvzs(add_php_after_getitems_vvvvvzs,gettype_vvvvvzs);
 
 });
 
 // #jform_gettype listeners for gettype_vvvvvzs function
 jQuery('#jform_gettype').on('keyup',function()
 {
+	var add_php_after_getitems_vvvvvzs = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
 	var gettype_vvvvvzs = jQuery("#jform_gettype").val();
-	vvvvvzs(gettype_vvvvvzs);
+	vvvvvzs(add_php_after_getitems_vvvvvzs,gettype_vvvvvzs);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
+	var add_php_after_getitems_vvvvvzs = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
 	var gettype_vvvvvzs = jQuery("#jform_gettype").val();
-	vvvvvzs(gettype_vvvvvzs);
+	vvvvvzs(add_php_after_getitems_vvvvvzs,gettype_vvvvvzs);
-
-});
-
-// #jform_gettype listeners for gettype_vvvvvzt function
-jQuery('#jform_gettype').on('keyup',function()
-{
-	var gettype_vvvvvzt = jQuery("#jform_gettype").val();
-	vvvvvzt(gettype_vvvvvzt);
-
-});
-jQuery('#adminForm').on('change', '#jform_gettype',function (e)
-{
-	e.preventDefault();
-	var gettype_vvvvvzt = jQuery("#jform_gettype").val();
-	vvvvvzt(gettype_vvvvvzt);
 
 });
 
@@ -589,33 +559,63 @@ jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 jQuery('#jform_gettype').on('keyup',function()
 {
 	var gettype_vvvvvzv = jQuery("#jform_gettype").val();
-	var add_php_router_parse_vvvvvzv = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	vvvvvzv(gettype_vvvvvzv);
-	vvvvvzv(gettype_vvvvvzv,add_php_router_parse_vvvvvzv);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
 	var gettype_vvvvvzv = jQuery("#jform_gettype").val();
-	var add_php_router_parse_vvvvvzv = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	vvvvvzv(gettype_vvvvvzv);
-	vvvvvzv(gettype_vvvvvzv,add_php_router_parse_vvvvvzv);
 
 });
 
-// #jform_add_php_router_parse listeners for add_php_router_parse_vvvvvzv function
+// #jform_gettype listeners for gettype_vvvvvzw function
+jQuery('#jform_gettype').on('keyup',function()
+{
+	var gettype_vvvvvzw = jQuery("#jform_gettype").val();
+	vvvvvzw(gettype_vvvvvzw);
+
+});
+jQuery('#adminForm').on('change', '#jform_gettype',function (e)
+{
+	e.preventDefault();
+	var gettype_vvvvvzw = jQuery("#jform_gettype").val();
+	vvvvvzw(gettype_vvvvvzw);
+
+});
+
+// #jform_gettype listeners for gettype_vvvvvzx function
+jQuery('#jform_gettype').on('keyup',function()
+{
+	var gettype_vvvvvzx = jQuery("#jform_gettype").val();
+	var add_php_router_parse_vvvvvzx = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	vvvvvzx(gettype_vvvvvzx,add_php_router_parse_vvvvvzx);
+
+});
+jQuery('#adminForm').on('change', '#jform_gettype',function (e)
+{
+	e.preventDefault();
+	var gettype_vvvvvzx = jQuery("#jform_gettype").val();
+	var add_php_router_parse_vvvvvzx = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	vvvvvzx(gettype_vvvvvzx,add_php_router_parse_vvvvvzx);
+
+});
+
+// #jform_add_php_router_parse listeners for add_php_router_parse_vvvvvzx function
 jQuery('#jform_add_php_router_parse').on('keyup',function()
 {
-	var gettype_vvvvvzv = jQuery("#jform_gettype").val();
+	var gettype_vvvvvzx = jQuery("#jform_gettype").val();
-	var add_php_router_parse_vvvvvzv = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	var add_php_router_parse_vvvvvzx = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
-	vvvvvzv(gettype_vvvvvzv,add_php_router_parse_vvvvvzv);
+	vvvvvzx(gettype_vvvvvzx,add_php_router_parse_vvvvvzx);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_router_parse',function (e)
 {
 	e.preventDefault();
-	var gettype_vvvvvzv = jQuery("#jform_gettype").val();
+	var gettype_vvvvvzx = jQuery("#jform_gettype").val();
-	var add_php_router_parse_vvvvvzv = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	var add_php_router_parse_vvvvvzx = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
-	vvvvvzv(gettype_vvvvvzv,add_php_router_parse_vvvvvzv);
+	vvvvvzx(gettype_vvvvvzx,add_php_router_parse_vvvvvzx);
 
 });
 

admin/views/field/tmpl/edit.php

@@ -137,157 +137,157 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 
 <script type="text/javascript">
 
-// #jform_datalenght listeners for datalenght_vvvvwaj function
+// #jform_datalenght listeners for datalenght_vvvvwal function
 jQuery('#jform_datalenght').on('keyup',function()
 {
-	var datalenght_vvvvwaj = jQuery("#jform_datalenght").val();
+	var datalenght_vvvvwal = jQuery("#jform_datalenght").val();
-	vvvvwaj(datalenght_vvvvwaj);
+	vvvvwal(datalenght_vvvvwal);
 
 });
 jQuery('#adminForm').on('change', '#jform_datalenght',function (e)
 {
 	e.preventDefault();
-	var datalenght_vvvvwaj = jQuery("#jform_datalenght").val();
+	var datalenght_vvvvwal = jQuery("#jform_datalenght").val();
-	vvvvwaj(datalenght_vvvvwaj);
+	vvvvwal(datalenght_vvvvwal);
 
 });
 
-// #jform_datadefault listeners for datadefault_vvvvwak function
+// #jform_datadefault listeners for datadefault_vvvvwam function
 jQuery('#jform_datadefault').on('keyup',function()
 {
-	var datadefault_vvvvwak = jQuery("#jform_datadefault").val();
+	var datadefault_vvvvwam = jQuery("#jform_datadefault").val();
-	vvvvwak(datadefault_vvvvwak);
+	vvvvwam(datadefault_vvvvwam);
 
 });
 jQuery('#adminForm').on('change', '#jform_datadefault',function (e)
 {
 	e.preventDefault();
-	var datadefault_vvvvwak = jQuery("#jform_datadefault").val();
+	var datadefault_vvvvwam = jQuery("#jform_datadefault").val();
-	vvvvwak(datadefault_vvvvwak);
+	vvvvwam(datadefault_vvvvwam);
-
-});
-
-// #jform_datatype listeners for datatype_vvvvwal function
-jQuery('#jform_datatype').on('keyup',function()
-{
-	var datatype_vvvvwal = jQuery("#jform_datatype").val();
-	vvvvwal(datatype_vvvvwal);
-
-});
-jQuery('#adminForm').on('change', '#jform_datatype',function (e)
-{
-	e.preventDefault();
-	var datatype_vvvvwal = jQuery("#jform_datatype").val();
-	vvvvwal(datatype_vvvvwal);
-
-});
-
-// #jform_datatype listeners for datatype_vvvvwam function
-jQuery('#jform_datatype').on('keyup',function()
-{
-	var datatype_vvvvwam = jQuery("#jform_datatype").val();
-	vvvvwam(datatype_vvvvwam);
-
-});
-jQuery('#adminForm').on('change', '#jform_datatype',function (e)
-{
-	e.preventDefault();
-	var datatype_vvvvwam = jQuery("#jform_datatype").val();
-	vvvvwam(datatype_vvvvwam);
-
-});
-
-// #jform_store listeners for store_vvvvwan function
-jQuery('#jform_store').on('keyup',function()
-{
-	var store_vvvvwan = jQuery("#jform_store").val();
-	var datatype_vvvvwan = jQuery("#jform_datatype").val();
-	vvvvwan(store_vvvvwan,datatype_vvvvwan);
-
-});
-jQuery('#adminForm').on('change', '#jform_store',function (e)
-{
-	e.preventDefault();
-	var store_vvvvwan = jQuery("#jform_store").val();
-	var datatype_vvvvwan = jQuery("#jform_datatype").val();
-	vvvvwan(store_vvvvwan,datatype_vvvvwan);
 
 });
 
 // #jform_datatype listeners for datatype_vvvvwan function
 jQuery('#jform_datatype').on('keyup',function()
 {
-	var store_vvvvwan = jQuery("#jform_store").val();
 	var datatype_vvvvwan = jQuery("#jform_datatype").val();
-	vvvvwan(store_vvvvwan,datatype_vvvvwan);
+	vvvvwan(datatype_vvvvwan);
 
 });
 jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 {
 	e.preventDefault();
-	var store_vvvvwan = jQuery("#jform_store").val();
 	var datatype_vvvvwan = jQuery("#jform_datatype").val();
-	vvvvwan(store_vvvvwan,datatype_vvvvwan);
+	vvvvwan(datatype_vvvvwan);
 
 });
 
-// #jform_add_css_view listeners for add_css_view_vvvvwap function
+// #jform_datatype listeners for datatype_vvvvwao function
+jQuery('#jform_datatype').on('keyup',function()
+{
+	var datatype_vvvvwao = jQuery("#jform_datatype").val();
+	vvvvwao(datatype_vvvvwao);
+
+});
+jQuery('#adminForm').on('change', '#jform_datatype',function (e)
+{
+	e.preventDefault();
+	var datatype_vvvvwao = jQuery("#jform_datatype").val();
+	vvvvwao(datatype_vvvvwao);
+
+});
+
+// #jform_store listeners for store_vvvvwap function
+jQuery('#jform_store').on('keyup',function()
+{
+	var store_vvvvwap = jQuery("#jform_store").val();
+	var datatype_vvvvwap = jQuery("#jform_datatype").val();
+	vvvvwap(store_vvvvwap,datatype_vvvvwap);
+
+});
+jQuery('#adminForm').on('change', '#jform_store',function (e)
+{
+	e.preventDefault();
+	var store_vvvvwap = jQuery("#jform_store").val();
+	var datatype_vvvvwap = jQuery("#jform_datatype").val();
+	vvvvwap(store_vvvvwap,datatype_vvvvwap);
+
+});
+
+// #jform_datatype listeners for datatype_vvvvwap function
+jQuery('#jform_datatype').on('keyup',function()
+{
+	var store_vvvvwap = jQuery("#jform_store").val();
+	var datatype_vvvvwap = jQuery("#jform_datatype").val();
+	vvvvwap(store_vvvvwap,datatype_vvvvwap);
+
+});
+jQuery('#adminForm').on('change', '#jform_datatype',function (e)
+{
+	e.preventDefault();
+	var store_vvvvwap = jQuery("#jform_store").val();
+	var datatype_vvvvwap = jQuery("#jform_datatype").val();
+	vvvvwap(store_vvvvwap,datatype_vvvvwap);
+
+});
+
+// #jform_add_css_view listeners for add_css_view_vvvvwar function
 jQuery('#jform_add_css_view').on('keyup',function()
 {
-	var add_css_view_vvvvwap = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	var add_css_view_vvvvwar = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvwap(add_css_view_vvvvwap);
+	vvvvwar(add_css_view_vvvvwar);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css_view',function (e)
 {
 	e.preventDefault();
-	var add_css_view_vvvvwap = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	var add_css_view_vvvvwar = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvwap(add_css_view_vvvvwap);
+	vvvvwar(add_css_view_vvvvwar);
 
 });
 
-// #jform_add_css_views listeners for add_css_views_vvvvwaq function
+// #jform_add_css_views listeners for add_css_views_vvvvwas function
 jQuery('#jform_add_css_views').on('keyup',function()
 {
-	var add_css_views_vvvvwaq = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	var add_css_views_vvvvwas = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvwaq(add_css_views_vvvvwaq);
+	vvvvwas(add_css_views_vvvvwas);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css_views',function (e)
 {
 	e.preventDefault();
-	var add_css_views_vvvvwaq = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	var add_css_views_vvvvwas = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvwaq(add_css_views_vvvvwaq);
+	vvvvwas(add_css_views_vvvvwas);
 
 });
 
-// #jform_add_javascript_view_footer listeners for add_javascript_view_footer_vvvvwar function
+// #jform_add_javascript_view_footer listeners for add_javascript_view_footer_vvvvwat function
 jQuery('#jform_add_javascript_view_footer').on('keyup',function()
 {
-	var add_javascript_view_footer_vvvvwar = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	var add_javascript_view_footer_vvvvwat = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvwar(add_javascript_view_footer_vvvvwar);
+	vvvvwat(add_javascript_view_footer_vvvvwat);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_view_footer',function (e)
 {
 	e.preventDefault();
-	var add_javascript_view_footer_vvvvwar = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	var add_javascript_view_footer_vvvvwat = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvwar(add_javascript_view_footer_vvvvwar);
+	vvvvwat(add_javascript_view_footer_vvvvwat);
 
 });
 
-// #jform_add_javascript_views_footer listeners for add_javascript_views_footer_vvvvwas function
+// #jform_add_javascript_views_footer listeners for add_javascript_views_footer_vvvvwau function
 jQuery('#jform_add_javascript_views_footer').on('keyup',function()
 {
-	var add_javascript_views_footer_vvvvwas = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	var add_javascript_views_footer_vvvvwau = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
-	vvvvwas(add_javascript_views_footer_vvvvwas);
+	vvvvwau(add_javascript_views_footer_vvvvwau);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_views_footer',function (e)
 {
 	e.preventDefault();
-	var add_javascript_views_footer_vvvvwas = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	var add_javascript_views_footer_vvvvwau = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
-	vvvvwas(add_javascript_views_footer_vvvvwas);
+	vvvvwau(add_javascript_views_footer_vvvvwau);
 
 });
 

admin/views/help_document/tmpl/edit.php

@@ -127,63 +127,33 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 
 <script type="text/javascript">
 
-// #jform_location listeners for location_vvvvwbd function
+// #jform_location listeners for location_vvvvwbf function
 jQuery('#jform_location').on('keyup',function()
 {
-	var location_vvvvwbd = jQuery("#jform_location input[type='radio']:checked").val();
+	var location_vvvvwbf = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwbd(location_vvvvwbd);
+	vvvvwbf(location_vvvvwbf);
 
 });
 jQuery('#adminForm').on('change', '#jform_location',function (e)
 {
 	e.preventDefault();
-	var location_vvvvwbd = jQuery("#jform_location input[type='radio']:checked").val();
+	var location_vvvvwbf = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwbd(location_vvvvwbd);
+	vvvvwbf(location_vvvvwbf);
 
 });
 
-// #jform_location listeners for location_vvvvwbe function
+// #jform_location listeners for location_vvvvwbg function
 jQuery('#jform_location').on('keyup',function()
 {
-	var location_vvvvwbe = jQuery("#jform_location input[type='radio']:checked").val();
+	var location_vvvvwbg = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwbe(location_vvvvwbe);
+	vvvvwbg(location_vvvvwbg);
 
 });
 jQuery('#adminForm').on('change', '#jform_location',function (e)
 {
 	e.preventDefault();
-	var location_vvvvwbe = jQuery("#jform_location input[type='radio']:checked").val();
+	var location_vvvvwbg = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwbe(location_vvvvwbe);
+	vvvvwbg(location_vvvvwbg);
-
-});
-
-// #jform_type listeners for type_vvvvwbf function
-jQuery('#jform_type').on('keyup',function()
-{
-	var type_vvvvwbf = jQuery("#jform_type").val();
-	vvvvwbf(type_vvvvwbf);
-
-});
-jQuery('#adminForm').on('change', '#jform_type',function (e)
-{
-	e.preventDefault();
-	var type_vvvvwbf = jQuery("#jform_type").val();
-	vvvvwbf(type_vvvvwbf);
-
-});
-
-// #jform_type listeners for type_vvvvwbg function
-jQuery('#jform_type').on('keyup',function()
-{
-	var type_vvvvwbg = jQuery("#jform_type").val();
-	vvvvwbg(type_vvvvwbg);
-
-});
-jQuery('#adminForm').on('change', '#jform_type',function (e)
-{
-	e.preventDefault();
-	var type_vvvvwbg = jQuery("#jform_type").val();
-	vvvvwbg(type_vvvvwbg);
 
 });
 
@@ -202,18 +172,48 @@ jQuery('#adminForm').on('change', '#jform_type',function (e)
 
 });
 
-// #jform_target listeners for target_vvvvwbi function
+// #jform_type listeners for type_vvvvwbi function
+jQuery('#jform_type').on('keyup',function()
+{
+	var type_vvvvwbi = jQuery("#jform_type").val();
+	vvvvwbi(type_vvvvwbi);
+
+});
+jQuery('#adminForm').on('change', '#jform_type',function (e)
+{
+	e.preventDefault();
+	var type_vvvvwbi = jQuery("#jform_type").val();
+	vvvvwbi(type_vvvvwbi);
+
+});
+
+// #jform_type listeners for type_vvvvwbj function
+jQuery('#jform_type').on('keyup',function()
+{
+	var type_vvvvwbj = jQuery("#jform_type").val();
+	vvvvwbj(type_vvvvwbj);
+
+});
+jQuery('#adminForm').on('change', '#jform_type',function (e)
+{
+	e.preventDefault();
+	var type_vvvvwbj = jQuery("#jform_type").val();
+	vvvvwbj(type_vvvvwbj);
+
+});
+
+// #jform_target listeners for target_vvvvwbk function
 jQuery('#jform_target').on('keyup',function()
 {
-	var target_vvvvwbi = jQuery("#jform_target input[type='radio']:checked").val();
+	var target_vvvvwbk = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwbi(target_vvvvwbi);
+	vvvvwbk(target_vvvvwbk);
 
 });
 jQuery('#adminForm').on('change', '#jform_target',function (e)
 {
 	e.preventDefault();
-	var target_vvvvwbi = jQuery("#jform_target input[type='radio']:checked").val();
+	var target_vvvvwbk = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwbi(target_vvvvwbi);
+	vvvvwbk(target_vvvvwbk);
 
 });
 

admin/views/joomla_component/tmpl/edit.php

@@ -132,9 +132,12 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 
 	<?php echo JHtml::_('bootstrap.addTab', 'joomla_componentTab', 'php', JText::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP', true)); ?>
 		<div class="row-fluid form-horizontal-desktop">
-			<div class="span12">
+			<div class="span6">
 				<?php echo JLayoutHelper::render('joomla_component.php_left', $this); ?>
 			</div>
+			<div class="span6">
+				<?php echo JLayoutHelper::render('joomla_component.php_right', $this); ?>
+			</div>
 		</div>
 		<div class="row-fluid form-horizontal-desktop">
 			<div class="span12">
@@ -710,6 +713,36 @@ jQuery('#adminForm').on('change', '#jform_buildcomp',function (e)
 
 });
 
+// #jform_dashboard_type listeners for dashboard_type_vvvvvwx function
+jQuery('#jform_dashboard_type').on('keyup',function()
+{
+	var dashboard_type_vvvvvwx = jQuery("#jform_dashboard_type input[type='radio']:checked").val();
+	vvvvvwx(dashboard_type_vvvvvwx);
+
+});
+jQuery('#adminForm').on('change', '#jform_dashboard_type',function (e)
+{
+	e.preventDefault();
+	var dashboard_type_vvvvvwx = jQuery("#jform_dashboard_type input[type='radio']:checked").val();
+	vvvvvwx(dashboard_type_vvvvvwx);
+
+});
+
+// #jform_dashboard_type listeners for dashboard_type_vvvvvwy function
+jQuery('#jform_dashboard_type').on('keyup',function()
+{
+	var dashboard_type_vvvvvwy = jQuery("#jform_dashboard_type input[type='radio']:checked").val();
+	vvvvvwy(dashboard_type_vvvvvwy);
+
+});
+jQuery('#adminForm').on('change', '#jform_dashboard_type',function (e)
+{
+	e.preventDefault();
+	var dashboard_type_vvvvvwy = jQuery("#jform_dashboard_type input[type='radio']:checked").val();
+	vvvvvwy(dashboard_type_vvvvvwy);
+
+});
+
 
 
 <?php
@@ -741,4 +774,11 @@ jQuery(document).ready( function($) {
 	$(".loading-dots").text(dots);
   } , 500);
 });
+// check when dashboard switch changes
+jQuery('#adminForm').on('change', '#jform_dashboard_type',function (e)
+{
+	e.preventDefault();
+	var dasboard_type = jQuery("#jform_dashboard_type input[type='radio']:checked").val();
+	dasboardSwitch(dasboard_type);
+});
 </script>

admin/views/layout/tmpl/edit.php

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

admin/views/library/tmpl/edit.php

@@ -157,36 +157,6 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 
 <script type="text/javascript">
 
-// #jform_how listeners for how_vvvvwab function
-jQuery('#jform_how').on('keyup',function()
-{
-	var how_vvvvwab = jQuery("#jform_how").val();
-	vvvvwab(how_vvvvwab);
-
-});
-jQuery('#adminForm').on('change', '#jform_how',function (e)
-{
-	e.preventDefault();
-	var how_vvvvwab = jQuery("#jform_how").val();
-	vvvvwab(how_vvvvwab);
-
-});
-
-// #jform_how listeners for how_vvvvwac function
-jQuery('#jform_how').on('keyup',function()
-{
-	var how_vvvvwac = jQuery("#jform_how").val();
-	vvvvwac(how_vvvvwac);
-
-});
-jQuery('#adminForm').on('change', '#jform_how',function (e)
-{
-	e.preventDefault();
-	var how_vvvvwac = jQuery("#jform_how").val();
-	vvvvwac(how_vvvvwac);
-
-});
-
 // #jform_how listeners for how_vvvvwad function
 jQuery('#jform_how').on('keyup',function()
 {
@@ -262,18 +232,48 @@ jQuery('#adminForm').on('change', '#jform_how',function (e)
 
 });
 
-// #jform_type listeners for type_vvvvwai function
+// #jform_how listeners for how_vvvvwai function
+jQuery('#jform_how').on('keyup',function()
+{
+	var how_vvvvwai = jQuery("#jform_how").val();
+	vvvvwai(how_vvvvwai);
+
+});
+jQuery('#adminForm').on('change', '#jform_how',function (e)
+{
+	e.preventDefault();
+	var how_vvvvwai = jQuery("#jform_how").val();
+	vvvvwai(how_vvvvwai);
+
+});
+
+// #jform_how listeners for how_vvvvwaj function
+jQuery('#jform_how').on('keyup',function()
+{
+	var how_vvvvwaj = jQuery("#jform_how").val();
+	vvvvwaj(how_vvvvwaj);
+
+});
+jQuery('#adminForm').on('change', '#jform_how',function (e)
+{
+	e.preventDefault();
+	var how_vvvvwaj = jQuery("#jform_how").val();
+	vvvvwaj(how_vvvvwaj);
+
+});
+
+// #jform_type listeners for type_vvvvwak function
 jQuery('#jform_type').on('keyup',function()
 {
-	var type_vvvvwai = jQuery("#jform_type input[type='radio']:checked").val();
+	var type_vvvvwak = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwai(type_vvvvwai);
+	vvvvwak(type_vvvvwak);
 
 });
 jQuery('#adminForm').on('change', '#jform_type',function (e)
 {
 	e.preventDefault();
-	var type_vvvvwai = jQuery("#jform_type input[type='radio']:checked").val();
+	var type_vvvvwak = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwai(type_vvvvwai);
+	vvvvwak(type_vvvvwak);
 
 });
 

admin/views/server/tmpl/edit.php

@@ -136,67 +136,33 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 
 <script type="text/javascript">
 
-// #jform_protocol listeners for protocol_vvvvwat function
-jQuery('#jform_protocol').on('keyup',function()
-{
-	var protocol_vvvvwat = jQuery("#jform_protocol").val();
-	vvvvwat(protocol_vvvvwat);
-
-});
-jQuery('#adminForm').on('change', '#jform_protocol',function (e)
-{
-	e.preventDefault();
-	var protocol_vvvvwat = jQuery("#jform_protocol").val();
-	vvvvwat(protocol_vvvvwat);
-
-});
-
-// #jform_protocol listeners for protocol_vvvvwau function
-jQuery('#jform_protocol').on('keyup',function()
-{
-	var protocol_vvvvwau = jQuery("#jform_protocol").val();
-	vvvvwau(protocol_vvvvwau);
-
-});
-jQuery('#adminForm').on('change', '#jform_protocol',function (e)
-{
-	e.preventDefault();
-	var protocol_vvvvwau = jQuery("#jform_protocol").val();
-	vvvvwau(protocol_vvvvwau);
-
-});
-
 // #jform_protocol listeners for protocol_vvvvwav function
 jQuery('#jform_protocol').on('keyup',function()
 {
 	var protocol_vvvvwav = jQuery("#jform_protocol").val();
-	var authentication_vvvvwav = jQuery("#jform_authentication").val();
+	vvvvwav(protocol_vvvvwav);
-	vvvvwav(protocol_vvvvwav,authentication_vvvvwav);
 
 });
 jQuery('#adminForm').on('change', '#jform_protocol',function (e)
 {
 	e.preventDefault();
 	var protocol_vvvvwav = jQuery("#jform_protocol").val();
-	var authentication_vvvvwav = jQuery("#jform_authentication").val();
+	vvvvwav(protocol_vvvvwav);
-	vvvvwav(protocol_vvvvwav,authentication_vvvvwav);
 
 });
 
-// #jform_authentication listeners for authentication_vvvvwav function
+// #jform_protocol listeners for protocol_vvvvwaw function
-jQuery('#jform_authentication').on('keyup',function()
+jQuery('#jform_protocol').on('keyup',function()
 {
-	var protocol_vvvvwav = jQuery("#jform_protocol").val();
+	var protocol_vvvvwaw = jQuery("#jform_protocol").val();
-	var authentication_vvvvwav = jQuery("#jform_authentication").val();
+	vvvvwaw(protocol_vvvvwaw);
-	vvvvwav(protocol_vvvvwav,authentication_vvvvwav);
 
 });
-jQuery('#adminForm').on('change', '#jform_authentication',function (e)
+jQuery('#adminForm').on('change', '#jform_protocol',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwav = jQuery("#jform_protocol").val();
+	var protocol_vvvvwaw = jQuery("#jform_protocol").val();
-	var authentication_vvvvwav = jQuery("#jform_authentication").val();
+	vvvvwaw(protocol_vvvvwaw);
-	vvvvwav(protocol_vvvvwav,authentication_vvvvwav);
 
 });
 
@@ -302,4 +268,38 @@ jQuery('#adminForm').on('change', '#jform_authentication',function (e)
 
 });
 
+// #jform_protocol listeners for protocol_vvvvwbd function
+jQuery('#jform_protocol').on('keyup',function()
+{
+	var protocol_vvvvwbd = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbd = jQuery("#jform_authentication").val();
+	vvvvwbd(protocol_vvvvwbd,authentication_vvvvwbd);
+
+});
+jQuery('#adminForm').on('change', '#jform_protocol',function (e)
+{
+	e.preventDefault();
+	var protocol_vvvvwbd = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbd = jQuery("#jform_authentication").val();
+	vvvvwbd(protocol_vvvvwbd,authentication_vvvvwbd);
+
+});
+
+// #jform_authentication listeners for authentication_vvvvwbd function
+jQuery('#jform_authentication').on('keyup',function()
+{
+	var protocol_vvvvwbd = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbd = jQuery("#jform_authentication").val();
+	vvvvwbd(protocol_vvvvwbd,authentication_vvvvwbd);
+
+});
+jQuery('#adminForm').on('change', '#jform_authentication',function (e)
+{
+	e.preventDefault();
+	var protocol_vvvvwbd = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbd = jQuery("#jform_authentication").val();
+	vvvvwbd(protocol_vvvvwbd,authentication_vvvvwbd);
+
+});
+
 </script>

admin/views/site_view/tmpl/edit.php

@@ -176,168 +176,168 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 
 <script type="text/javascript">
 
-// #jform_add_php_view listeners for add_php_view_vvvvvyl function
+// #jform_add_php_view listeners for add_php_view_vvvvvyn function
 jQuery('#jform_add_php_view').on('keyup',function()
 {
-	var add_php_view_vvvvvyl = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvyn = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyl(add_php_view_vvvvvyl);
+	vvvvvyn(add_php_view_vvvvvyn);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_view',function (e)
 {
 	e.preventDefault();
-	var add_php_view_vvvvvyl = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvyn = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyl(add_php_view_vvvvvyl);
+	vvvvvyn(add_php_view_vvvvvyn);
 
 });
 
-// #jform_add_php_jview_display listeners for add_php_jview_display_vvvvvym function
+// #jform_add_php_jview_display listeners for add_php_jview_display_vvvvvyo function
 jQuery('#jform_add_php_jview_display').on('keyup',function()
 {
-	var add_php_jview_display_vvvvvym = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	var add_php_jview_display_vvvvvyo = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvym(add_php_jview_display_vvvvvym);
+	vvvvvyo(add_php_jview_display_vvvvvyo);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_jview_display',function (e)
 {
 	e.preventDefault();
-	var add_php_jview_display_vvvvvym = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	var add_php_jview_display_vvvvvyo = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvym(add_php_jview_display_vvvvvym);
+	vvvvvyo(add_php_jview_display_vvvvvyo);
 
 });
 
-// #jform_add_php_jview listeners for add_php_jview_vvvvvyn function
+// #jform_add_php_jview listeners for add_php_jview_vvvvvyp function
 jQuery('#jform_add_php_jview').on('keyup',function()
 {
-	var add_php_jview_vvvvvyn = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	var add_php_jview_vvvvvyp = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyn(add_php_jview_vvvvvyn);
+	vvvvvyp(add_php_jview_vvvvvyp);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_jview',function (e)
 {
 	e.preventDefault();
-	var add_php_jview_vvvvvyn = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	var add_php_jview_vvvvvyp = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyn(add_php_jview_vvvvvyn);
+	vvvvvyp(add_php_jview_vvvvvyp);
 
 });
 
-// #jform_add_php_document listeners for add_php_document_vvvvvyo function
+// #jform_add_php_document listeners for add_php_document_vvvvvyq function
 jQuery('#jform_add_php_document').on('keyup',function()
 {
-	var add_php_document_vvvvvyo = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	var add_php_document_vvvvvyq = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyo(add_php_document_vvvvvyo);
+	vvvvvyq(add_php_document_vvvvvyq);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_document',function (e)
 {
 	e.preventDefault();
-	var add_php_document_vvvvvyo = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	var add_php_document_vvvvvyq = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyo(add_php_document_vvvvvyo);
+	vvvvvyq(add_php_document_vvvvvyq);
 
 });
 
-// #jform_add_css_document listeners for add_css_document_vvvvvyp function
+// #jform_add_css_document listeners for add_css_document_vvvvvyr function
 jQuery('#jform_add_css_document').on('keyup',function()
 {
-	var add_css_document_vvvvvyp = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	var add_css_document_vvvvvyr = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvyp(add_css_document_vvvvvyp);
+	vvvvvyr(add_css_document_vvvvvyr);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css_document',function (e)
 {
 	e.preventDefault();
-	var add_css_document_vvvvvyp = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	var add_css_document_vvvvvyr = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvyp(add_css_document_vvvvvyp);
+	vvvvvyr(add_css_document_vvvvvyr);
 
 });
 
-// #jform_add_javascript_file listeners for add_javascript_file_vvvvvyq function
+// #jform_add_javascript_file listeners for add_javascript_file_vvvvvys function
 jQuery('#jform_add_javascript_file').on('keyup',function()
 {
-	var add_javascript_file_vvvvvyq = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	var add_javascript_file_vvvvvys = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvyq(add_javascript_file_vvvvvyq);
+	vvvvvys(add_javascript_file_vvvvvys);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_file',function (e)
 {
 	e.preventDefault();
-	var add_javascript_file_vvvvvyq = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	var add_javascript_file_vvvvvys = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvyq(add_javascript_file_vvvvvyq);
+	vvvvvys(add_javascript_file_vvvvvys);
 
 });
 
-// #jform_add_js_document listeners for add_js_document_vvvvvyr function
+// #jform_add_js_document listeners for add_js_document_vvvvvyt function
 jQuery('#jform_add_js_document').on('keyup',function()
 {
-	var add_js_document_vvvvvyr = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	var add_js_document_vvvvvyt = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyr(add_js_document_vvvvvyr);
+	vvvvvyt(add_js_document_vvvvvyt);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_js_document',function (e)
 {
 	e.preventDefault();
-	var add_js_document_vvvvvyr = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	var add_js_document_vvvvvyt = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyr(add_js_document_vvvvvyr);
+	vvvvvyt(add_js_document_vvvvvyt);
 
 });
 
-// #jform_add_css listeners for add_css_vvvvvys function
+// #jform_add_css listeners for add_css_vvvvvyu function
 jQuery('#jform_add_css').on('keyup',function()
 {
-	var add_css_vvvvvys = jQuery("#jform_add_css input[type='radio']:checked").val();
+	var add_css_vvvvvyu = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvys(add_css_vvvvvys);
+	vvvvvyu(add_css_vvvvvyu);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css',function (e)
 {
 	e.preventDefault();
-	var add_css_vvvvvys = jQuery("#jform_add_css input[type='radio']:checked").val();
+	var add_css_vvvvvyu = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvys(add_css_vvvvvys);
+	vvvvvyu(add_css_vvvvvyu);
 
 });
 
-// #jform_add_php_ajax listeners for add_php_ajax_vvvvvyt function
+// #jform_add_php_ajax listeners for add_php_ajax_vvvvvyv function
 jQuery('#jform_add_php_ajax').on('keyup',function()
 {
-	var add_php_ajax_vvvvvyt = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	var add_php_ajax_vvvvvyv = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvyt(add_php_ajax_vvvvvyt);
+	vvvvvyv(add_php_ajax_vvvvvyv);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_ajax',function (e)
 {
 	e.preventDefault();
-	var add_php_ajax_vvvvvyt = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	var add_php_ajax_vvvvvyv = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvyt(add_php_ajax_vvvvvyt);
+	vvvvvyv(add_php_ajax_vvvvvyv);
 
 });
 
-// #jform_add_custom_button listeners for add_custom_button_vvvvvyu function
+// #jform_add_custom_button listeners for add_custom_button_vvvvvyw function
 jQuery('#jform_add_custom_button').on('keyup',function()
 {
-	var add_custom_button_vvvvvyu = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	var add_custom_button_vvvvvyw = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyu(add_custom_button_vvvvvyu);
+	vvvvvyw(add_custom_button_vvvvvyw);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_custom_button',function (e)
 {
 	e.preventDefault();
-	var add_custom_button_vvvvvyu = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	var add_custom_button_vvvvvyw = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyu(add_custom_button_vvvvvyu);
+	vvvvvyw(add_custom_button_vvvvvyw);
 
 });
 
-// #jform_button_position listeners for button_position_vvvvvyv function
+// #jform_button_position listeners for button_position_vvvvvyx function
 jQuery('#jform_button_position').on('keyup',function()
 {
-	var button_position_vvvvvyv = jQuery("#jform_button_position").val();
+	var button_position_vvvvvyx = jQuery("#jform_button_position").val();
-	vvvvvyv(button_position_vvvvvyv);
+	vvvvvyx(button_position_vvvvvyx);
 
 });
 jQuery('#adminForm').on('change', '#jform_button_position',function (e)
 {
 	e.preventDefault();
-	var button_position_vvvvvyv = jQuery("#jform_button_position").val();
+	var button_position_vvvvvyx = jQuery("#jform_button_position").val();
-	vvvvvyv(button_position_vvvvvyv);
+	vvvvvyx(button_position_vvvvvyx);
 
 });
 

admin/views/template/tmpl/edit.php

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

componentbuilder.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>6th March, 2018</creationDate>
+	<creationDate>9th March, 2018</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
 	<authorUrl>http://joomlacomponentbuilder.com</authorUrl>
 	<copyright>Copyright (C) 2015. All Rights Reserved</copyright>
 	<license>GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html</license>
-	<version>2.6.17</version>
+	<version>2.6.18</version>
 	<description><![CDATA[
-		<h1>Component Builder (v.2.6.17)</h1>
+		<h1>Component Builder (v.2.6.18)</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

@@ -458,4 +458,21 @@
 		<maintainerurl>http://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.6.18</version>
+		<infourl title="Component Builder!">http://joomlacomponentbuilder.com</infourl>
+		<downloads>
+			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.6.18/JCB_v2.6.18.zip</downloadurl>
+		</downloads>
+		<tags>
+			<tag>stable</tag>
+		</tags>
+		<maintainer>Llewellyn van der Merwe</maintainer>
+		<maintainerurl>http://joomlacomponentbuilder.com</maintainerurl>
+		<targetplatform name="joomla" version="3.*"/>
+	</update>
 </updates>

script.php

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